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-23T18:37:48Z

Result

MERGE_RESULT: CONFLICTS

The attempted history-preserving merge of upstream/main into the current bot branch was aborted because several
overlapping source conflicts require semantic product decisions. The tree was restored to the pre-merge state before
this report was written.

Refs

• Current branch: automation/upstream-v0.81.1-30034273539
• Current HEAD before merge: 4bdbadcee713efe0ca0f80a1a3fe7c30b89734ad
• Merge base: 3da591ab74ab9ab407e72ed882600b2c851fae21
• Upstream main fetched: 65ff8e7f6db447dcddb1a9c8fd05f081c5cda76a
• Latest upstream release tag requested: v0.81.1
• v0.81.1 commit: 20be4b18d4c57487f8993d2762bace129f0cf7c6

Preserved Fork Work Present on HEAD

Recent first-parent fork commits preserved by abort 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
• 715cba9c0 Merge pull request feat(coding-agent): add /btw parallel side-question command #261 from code-yeongyu/feat/btw-side-query
• b6d1323e0 Merge pull request fix: recover leaked Claude XML tool calls #255 from code-yeongyu/feat/claude-xml-toolcall-recovery

Upstream Work Pending

HEAD..upstream/main was non-empty. Notable upstream changes in the pending range include:

• 20be4b18d Release v0.81.1
• 4b91ec66f feat(coding-agent): add release source archives (#6913)
• 37eb243d2 feat(agent): add AgentHarness execution tools
• 9e7582aa0 feat: sqlite session storage (#6594)
• 8e53e0e49 compaction & branch summarization follow retry policy
• 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)
• 5dc40fee3 feat(ai): derive generated model types from JSON
• 65ff8e7f6 fix lint

Conflict Set Observed

The merge produced conflicts in these high-risk runtime areas:

• packages/agent/src/agent-loop.ts
• packages/agent/src/agent.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-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/modes/interactive/interactive-mode.ts
• packages/coding-agent/src/modes/rpc/rpc-mode.ts
• packages/tui/src/tui.ts
• multiple packages/ai/src/api/*, packages/ai/src/providers/*.models.ts, and packages/ai/test/* files
• packages/server/* from the upstream orchestrator to server rename
• root/package lockfiles, package manifests, workflows, docs, changelogs, and release scripts

Why This Was Not Resolved Automatically

• packages/coding-agent/src/core/agent-session.ts overlaps fork retry-fallback, auth-login, compaction acceptance,
  session-work-barrier, provider-scope, and prompt-continuation logic with upstream summarization retry events, usage
  accounting, and bash execution update events. The correct result is not a side-choice; it needs a deliberate merge of
  event contracts and compaction/retry ordering.
• packages/agent/src/agent-loop.ts overlaps fork stream idle-timeout abort teardown, terminal assistant-message
  normalization, queued continuation recovery, and thinking timing with upstream stream-function compatibility and
  harness execution-tool work.
• packages/tui/src/tui.ts overlaps fork differential-rendering/flicker controls, autowrap frame guards, cursor
  coalescing, and .senpi diagnostic-log behavior with upstream configurable log-directory behavior.
• packages/ai conflicts include generated model catalogs and generated provider shards. The repo rules forbid
  hand-editing generated model outputs, while the fork also records intentional catalog-generation behavior and video
  modality support.
• Workflow and release-script conflicts combine fork-specific publish, native-prebuild, and upstream-merge automation
  with upstream release source archive and CI changes.

Because these conflicts cross runtime behavior, public event shapes, generated catalogs, and release automation, a
blind ours/theirs resolution would risk silently dropping either fork guarantees or upstream fixes.

Changelog And QA

Changelog audit and QA were not run because the merge did not reach a resolved tree. The upstream pin was not updated.

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