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-24T00:49:29Z

Result

MERGE_RESULT: CONFLICTS

The attempted history-preserving merge of upstream/main was aborted. The tree was restored to the pre-merge fork head before writing this report.

Refs

• Current branch: automation/upstream-v0.81.1-30057132758
• Preserved fork HEAD: 4bdbadcee713efe0ca0f80a1a3fe7c30b89734ad
• origin/main: 4bdbadcee713efe0ca0f80a1a3fe7c30b89734ad
• upstream/main: 24bace27cf308c89707cf8005b4795d873e23f17
• Requested upstream release tag: v0.81.1
• v0.81.1 commit: 20be4b18d4c57487f8993d2762bace129f0cf7c6
• Merge base: 3da591ab74ab9ab407e72ed882600b2c851fae21

No-op checks failed: neither upstream/main nor HEAD was an ancestor of the other. HEAD..upstream/main was non-empty.

Upstream commits sampled

• 24bace27c feat(ai): support constrained sampling (#6341)
• ec1a87e85 fix(coding-agent): require protobufjs 7.6.5, closes #7005
• 6abb4b064 fix(coding-agent): use llama context for output limit (#7034)
• 241431c69 fix(agent,ai): don't cache write compaction or branch summaries (#6618)
• 37bedb7f0 fix(tui): truncate narrow editor scroll indicators (#7015)
• fc85bdd88 feat(coding-agent): emit bash_execution_update events (#6971)
• 7af8533c6 fix(ai): make provider retries abortable (#6980)
• 7b52cef2e feat(ai): add OpenRouter OAuth support (#6927)

Fork commits preserved

The aborted merge preserved the current fork branch unchanged. Recent first-parent fork commits include:

• 4bdbadcee Merge pull request #312 from code-yeongyu/feat/multi-session-rpc
• 928e90064 Merge pull request #306 from code-yeongyu/fix/compaction-anthropic-tool-pair
• e048fd340 release: v2026.7.23
• 8dd9fa0e5 Merge pull request #304 from code-yeongyu/fix/openai-codex-remote-compaction
• 854294816 Merge pull request #301 from code-yeongyu/feature/gpt-code-mode-runtime
• 6334f3782 Merge pull request #294 from code-yeongyu/feat/openai-remote-compaction-capability-gate
• b6f435728 Merge pull request #291 from code-yeongyu/feat/thinking-block-durations
• 5d75a539c Merge pull request #293 from code-yeongyu/feature/eval-first-codemode

Conflicts

The merge produced conflicts in these files:

• .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

Analysis

Several conflicts were mechanical by policy, including package-lock.json, package metadata, and changelogs. Those were not resolved because many adjacent source conflicts must be settled first to know the correct dependency, changelog, and generated-artifact state.

The blocking conflicts are semantic:

• packages/agent/src/agent-loop.ts overlaps upstream abortable provider retries and compaction-cache changes with fork-owned stream idle timeout aborts, truncation-recovery failed tool calls, terminating queue recovery, abort terminal normalization, and parallel tool completion behavior.
• packages/ai/src/api/*, packages/ai/src/types.ts, packages/ai/scripts/generate-models.ts, and generated model shards overlap upstream constrained sampling, OpenRouter OAuth/retry updates, and generated catalog changes with fork-owned provider scoping, video modality, Kimi compatibility, OpenAI Responses replay fixes, and explicit live-test gates. packages/ai/src/models.generated.ts must not be hand-edited, so a safe resolution needs a deliberate regeneration/source strategy.
• packages/coding-agent/src/core/agent-session.ts overlaps upstream summarization isolation and bash/session metadata changes with fork-owned multi-session behavior, compaction lifecycle fixes, fallback events, executeTool bridging, provider scope, and session-work barrier rules.
• packages/coding-agent/src/core/compaction/* overlaps upstream compaction cache isolation with fork-owned stream watchdog, base64-aware token estimation, branch compaction hooks, and empty-summary rejection.
• packages/coding-agent/src/modes/rpc/rpc-mode.ts overlaps upstream RPC behavior with fork-owned multi-session RPC, auth RPC, Neo daemon support, event buffering, and turn-scoped thinking controls.
• packages/coding-agent/src/modes/interactive/interactive-mode.ts and packages/tui/src/tui.ts overlap upstream TUI/editor fixes with fork-owned smooth streaming, tool argument pacing, todo strike animation shutdown, model fallback rendering, configurable render FPS, scrollback replay, and terminal repaint hardening.
• The upstream packages/orchestrator to packages/server rename conflicted with fork-modified orchestrator files and package metadata; resolving it safely requires deciding how the fork's server/orchestrator notes and tests map across the rename.

Because these conflicts are in runtime behavior and generated catalogs, an automated blanket ours/theirs resolution would risk silently dropping fork functionality or missing upstream fixes. Per the merge driver, the merge was aborted rather than guessed.

Steps skipped

• .github/upstream.json was not updated.
• Changelog audit was not run.
• npm run build, npm run check, npm test, CLI smoke tests, and Senpi QA were not run.
• No commit, tag, push, release, or pull request was created.

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