upstream merge needs attention: v0.82.0 (CONFLICTS)

[code-yeongyu]

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

Agent report

Upstream Merge Report

Generated: 2026-07-24T17:37:58Z
Result: CONFLICTS

Upstream target

• Upstream tag: v0.82.0
• Upstream tag SHA: 083e61621276bff9f6faefab87ce07fcd98734e2
• Fetched upstream/main SHA: a9f5b1c123a4f13457e88522a3be89aeb4823d66
• Local branch: automation/upstream-v0.82.0-30113588820
• Local HEAD before merge: 38bd3a3cf8a47c1201969117b1a82a5af7daac9c
• Merge base: 3da591ab74ab9ab407e72ed882600b2c851fae21

HEAD..upstream/main was not empty. The required no-op terminal condition did not apply.

Action taken

Attempted a history-preserving merge:

git fetch upstream main --tags --prune
git merge --no-ff upstream/main

The merge produced broad semantic conflicts. Per the driver instructions, the merge was aborted instead of guessing at runtime behavior:

git merge --abort

The worktree was clean after abort before this report was written.

Preserved fork commits

Representative fork-side commits that must be preserved during a manual merge include:

• 38bd3a3cf Merge pull request fix(coding-agent): stabilize compaction lifecycle #310 from minpeter/fix/compaction-fallback-fsm
• b3f643e91 fix(coding-agent): canonicalize replay tenant identity
• 10a82f30d fix(coding-agent): bind remote replay provenance
• 9bda06bda fix(coding-agent): validate remote replay provenance
• 4bf034432 fix(coding-agent): preserve compaction hook semantics
• 0a2abcc1a fix(coding-agent): apply hooks to compaction providers
• b159746bd fix(coding-agent): preserve compacted context redaction
• a0d5a41ea fix(coding-agent): claim compaction admission synchronously
• 019bcb75f fix(coding-agent): serialize compaction continuations
• 4437cbdb7 fix(coding-agent): close final provider boundaries
• 8970f6754 fix(coding-agent): preserve retry compaction ownership
• 55df9a088 fix(coding-agent): preserve resumed compaction contracts
• 4bdbadcee Merge pull request feat(rpc): multi-session mode for the plain-RPC protocol #312 from code-yeongyu/feat/multi-session-rpc
• 601564611 feat(rpc): multi-session host with session routing and protocol info
• 928e90064 Merge pull request fix(compaction): sanitize Anthropic tool pairs on summarization requests #306 from code-yeongyu/fix/compaction-anthropic-tool-pair
• f7d92c0c6 fix(compaction): sanitize Anthropic tool pairs on summarization requests
• e048fd340 tag v2026.7.23

Conflicts observed

The conflict set was too broad for confident automated resolution. It included:

• GitHub workflows and issue templates, including modify/delete conflicts for contributor and gate workflows.
• Root metadata and docs: .gitignore, CONTRIBUTING.md, README.md, package.json, package-lock.json.
• Changelogs for packages/ai, packages/agent, packages/coding-agent, and packages/tui.
• AI provider and model-generation surfaces, including packages/ai/scripts/generate-models.ts, API adapters, provider model catalogs, generated model files, and tests.
• Agent runtime surfaces, including packages/agent/src/agent-loop.ts, packages/agent/src/agent.ts, and loop/session tests.
• Coding-agent compaction, model, extension, session, RPC, tool, and interactive-mode surfaces, including packages/coding-agent/src/core/agent-session.ts and packages/coding-agent/src/modes/interactive/interactive-mode.ts.
• The upstream packages/orchestrator to packages/server rename, including file-location conflicts for fork-side AGENTS.md and tests.
• TUI renderer conflicts in packages/tui/src/tui.ts, editor components, and renderer tests.
• Release/build scripts and tsconfig.json.

Why this was ambiguous

The fork's changes.md files mark several conflicted areas as intentional fork behavior with medium or high expected conflict risk:

• packages/coding-agent/src/core/changes.md describes session-owned compaction lifecycle, provider admission, queue ownership, remote replay provenance, and fallback state as private AgentSession invariants. The merge conflicted directly in agent-session.ts and adjacent compaction/session files.
• packages/agent/src/changes.md records intentional queue-drain, abort, truncation recovery, and provider-request lifetime changes inside agent-loop.ts. The merge conflicted directly in agent-loop.ts and related tests.
• packages/tui/src/changes.md marks tui.ts renderer behavior as high-risk fork logic around differential rendering, scrollback replay, frame bracketing, render throttling, and terminal restart handling. The merge conflicted directly in tui.ts and renderer tests.
• packages/coding-agent/src/modes/interactive/changes.md records fork-specific interactive behavior around compaction queue transfer, smooth streaming, fallback notices, token formatting, and tool rendering. The merge conflicted directly in interactive-mode.ts and footer rendering.

Because upstream also changes AI retry/auth/model-catalog behavior, compaction and branch-summary behavior, release packaging, CLI model reloads, and the orchestrator/server package structure, choosing ours or theirs mechanically would risk dropping either fork invariants or upstream release fixes.

Changelog and QA

Changelog audit and QA were intentionally not run. The merge did not produce a clean tree, and the instructions require the conflict terminal path before change-dependent work.

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