upstream merge needs attention: v0.81.1 (CONFLICTS)

[code-yeongyu]

Automated upstream merge for v0.81.1 did not complete cleanly (result: CONFLICTS).

Agent report

Upstream Merge Report

Generated: 2026-07-24T01:43:22Z

Result

MERGE_RESULT: CONFLICTS

The upstream merge was attempted with:

git merge --no-ff upstream/main -m "merge: sync automation/upstream-v0.81.1-30059592422 with upstream/main"

The merge produced 110 unmerged paths, including multiple fork-intent hot spots in runtime code. Per the
upstream merge driver contract, the merge was aborted instead of guessing at semantic resolutions.

Refs

• Current branch: automation/upstream-v0.81.1-30059592422
• Pre-merge HEAD: 4bdbadcee713efe0ca0f80a1a3fe7c30b89734ad
• Upstream target: upstream/main
• Upstream target SHA: 24bace27cf308c89707cf8005b4795d873e23f17
• Latest upstream release tag requested: v0.81.1
• Latest upstream release tag SHA: 20be4b18d4c57487f8993d2762bace129f0cf7c6
• Merge base: 3da591ab74ab9ab407e72ed882600b2c851fae21
• Divergence before merge attempt: 2124 commits unique to the fork branch, 94 commits unique to upstream/main

Preserved Fork Commits

The merge was aborted, so all fork commits remain unchanged. Recent first-parent fork commits preserved include:

• 4bdbadcee Merge pull request feat(rpc): multi-session mode for the plain-RPC protocol #312 from code-yeongyu/feat/multi-session-rpc
• 928e90064 Merge pull request fix(compaction): sanitize Anthropic tool pairs on summarization requests #306 from code-yeongyu/fix/compaction-anthropic-tool-pair
• e048fd340 release: v2026.7.23
• 8dd9fa0e5 Merge pull request feat(compaction): support OpenAI Codex remote compaction #304 from code-yeongyu/fix/openai-codex-remote-compaction
• 854294816 Merge pull request feat(codemode): add GPT exec runtime #301 from code-yeongyu/feature/gpt-code-mode-runtime
• 6334f3782 Merge pull request feat(compaction): capability-gated OpenAI remote compaction with faithful history degradation #294 from code-yeongyu/feat/openai-remote-compaction-capability-gate
• b6f435728 Merge pull request feat: per-thinking-block duration display in the interactive TUI #291 from code-yeongyu/feat/thinking-block-durations

Conflict Analysis

No conflicts were resolved.

The conflict set is not safely auto-resolvable because it spans:

• Runtime lifecycle hot spots with recorded fork behavior: packages/agent/src/agent-loop.ts, packages/coding-agent/src/core/agent-session.ts, packages/coding-agent/src/modes/interactive/interactive-mode.ts, and packages/tui/src/tui.ts.
• Provider/API behavior and type contracts across packages/ai/src/api/*, packages/ai/src/types.ts, generated model catalogs, and model provider definitions.
• Compaction/session behavior in packages/coding-agent/src/core/compaction/*, session-manager.ts, extension runner/types, and matching tests.
• Package metadata, lockfiles, release scripts, and publish shrinkwrap files that require regeneration after a clean semantic merge.
• The upstream packages/orchestrator to packages/server rename, with fork-local AGENTS.md, changelog, config, and test files needing an ownership decision.
• Changelog files where already-released sections must not be edited until the runtime merge shape is known.

Unresolved Paths

.github/ISSUE_TEMPLATE/bug.yml
.github/ISSUE_TEMPLATE/contribution.yml
.github/workflows/approve-contributor.yml
.github/workflows/build-binaries.yml
.github/workflows/ci.yml
.github/workflows/issue-analysis.yml
.github/workflows/issue-gate.yml
.github/workflows/npm-audit.yml
.github/workflows/pr-gate.yml
.gitignore
CONTRIBUTING.md
README.md
package-lock.json
package.json
packages/agent/CHANGELOG.md
packages/agent/package.json
packages/agent/src/agent-loop.ts
packages/agent/src/agent.ts
packages/agent/test/agent-loop.test.ts
packages/agent/test/agent.test.ts
packages/ai/CHANGELOG.md
packages/ai/README.md
packages/ai/package.json
packages/ai/scripts/generate-models.ts
packages/ai/src/api/anthropic-messages.ts
packages/ai/src/api/bedrock-converse-stream.ts
packages/ai/src/api/google-generative-ai.ts
packages/ai/src/api/google-vertex.ts
packages/ai/src/api/mistral-conversations.ts
packages/ai/src/api/openai-codex-responses.ts
packages/ai/src/api/openai-completions.ts
packages/ai/src/api/openai-responses-shared.ts
packages/ai/src/api/openai-responses.ts
packages/ai/src/index.ts
packages/ai/src/models.generated.ts
packages/ai/src/providers/google-vertex.models.ts
packages/ai/src/providers/google.models.ts
packages/ai/src/providers/huggingface.models.ts
packages/ai/src/providers/kimi-coding.models.ts
packages/ai/src/providers/nvidia.models.ts
packages/ai/src/providers/opencode-go.models.ts
packages/ai/src/providers/opencode.models.ts
packages/ai/src/providers/openrouter.models.ts
packages/ai/src/providers/together.models.ts
packages/ai/src/providers/vercel-ai-gateway.models.ts
packages/ai/src/types.ts
packages/ai/src/utils/uuid.ts
packages/ai/test/abort.test.ts
packages/ai/test/cache-retention.test.ts
packages/ai/test/context-overflow.test.ts
packages/ai/test/cross-provider-handoff.test.ts
packages/ai/test/deferred-tools.test.ts
packages/ai/test/empty.test.ts
packages/ai/test/image-tool-result.test.ts
packages/ai/test/openai-codex-stream.test.ts
packages/ai/test/openai-completions-thinking-as-text.test.ts
packages/ai/test/openai-completions-tool-result-images.test.ts
packages/ai/test/providers.test.ts
packages/ai/test/retry.test.ts
packages/ai/test/stream.test.ts
packages/ai/test/supports-xhigh.test.ts
packages/ai/test/tokens.test.ts
packages/ai/test/tool-call-without-result.test.ts
packages/ai/test/total-tokens.test.ts
packages/ai/test/unicode-surrogate.test.ts
packages/coding-agent/CHANGELOG.md
packages/coding-agent/docs/session-format.md
packages/coding-agent/install-lock/package-lock.json
packages/coding-agent/install-lock/package.json
packages/coding-agent/package.json
packages/coding-agent/publish-deps.lock.json
packages/coding-agent/src/cli/config-selector.ts
packages/coding-agent/src/cli/startup-ui.ts
packages/coding-agent/src/core/agent-session.ts
packages/coding-agent/src/core/compaction/branch-summarization.ts
packages/coding-agent/src/core/compaction/compaction.ts
packages/coding-agent/src/core/compaction/utils.ts
packages/coding-agent/src/core/extensions/runner.ts
packages/coding-agent/src/core/extensions/types.ts
packages/coding-agent/src/core/model-config.ts
packages/coding-agent/src/core/model-resolver.ts
packages/coding-agent/src/core/model-runtime.ts
packages/coding-agent/src/core/sdk.ts
packages/coding-agent/src/core/session-manager.ts
packages/coding-agent/src/core/tools/bash.ts
packages/coding-agent/src/core/tools/tool-definition-wrapper.ts
packages/coding-agent/src/index.ts
packages/coding-agent/src/modes/interactive/components/footer.ts
packages/coding-agent/src/modes/interactive/interactive-mode.ts
packages/coding-agent/src/modes/rpc/rpc-mode.ts
packages/coding-agent/test/agent-session-compaction.test.ts
packages/coding-agent/test/compaction-extensions.test.ts
packages/coding-agent/test/compaction-summary-reasoning.test.ts
packages/orchestrator/CHANGELOG.md
packages/server/AGENTS.md
packages/server/README.md
packages/server/package.json
packages/server/src/config.ts
packages/server/src/radius.ts
packages/server/test/config.test.ts
packages/tui/CHANGELOG.md
packages/tui/package.json
packages/tui/src/components/editor.ts
packages/tui/src/tui.ts
packages/tui/test/tui-render.test.ts
scripts/local-release.mjs
scripts/release.mjs
scripts/sync-versions.js
test.sh
tsconfig.json

Follow-up Work Not Performed

• .github/upstream.json was not updated.
• Changelog audit was not run.
• Build, check, tests, CLI smoke, and senpi-qa were not run.
• No commits, tags, pushes, or pull requests were created.

Resolve manually, then re-run Upstream Agent Merge with force=true.