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

• Result: conflicts; merge aborted before any source, package, changelog, pin, QA, push, PR, tag, or release action.
• Attempted command: git merge --no-ff upstream/main
• Report time: 2026-07-24T16:41:49Z

Upstream target

• Requested release tag: v0.82.0
• v0.82.0 commit: 083e61621276bff9f6faefab87ce07fcd98734e2
• Live upstream/main: a9f5b1c123a4f13457e88522a3be89aeb4823d66
• Current branch HEAD before/after aborted merge: 38bd3a3cf8a47c1201969117b1a82a5af7daac9c
• Merge base: 3da591ab74ab9ab407e72ed882600b2c851fae21
• Ahead/behind before merge: 2145 106 (HEAD...upstream/main)

upstream/main is ahead of the requested tag by post-release fixes, including:

• a9f5b1c12 fix(ai): route Radius OAuth through gateway
• 24e5cc04f fix(ai): support Anthropic bearer token env (#6148)
• 7df73a00c Add [Unreleased] section for next cycle

Preserved fork commits

The merge was aborted, so all fork commits currently reachable from HEAD are preserved unchanged. The top fork-side commits at the time of the attempt were:

• 38bd3a3cf Merge pull request #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

Why this was not resolved automatically

The conflict set is broad and includes multiple high-risk semantic overlaps explicitly documented in fork changes.md files:

• packages/coding-agent/src/core/agent-session.ts has upstream summarization retry and bash execution event additions overlapping fork retry-fallback, auth-login, compaction-lifecycle, admission, replay-provenance, queue-ownership, and fallback-state changes. Choosing either side would drop behavior.
• packages/agent/src/agent-loop.ts overlaps upstream stream-function plumbing with fork queue-drain refresh, terminating-turn recovery, flagged truncated-call retry, and idle-timeout abort behavior.
• packages/tui/src/tui.ts overlaps upstream renderer changes with fork-owned flicker-free viewport remap, synchronized/autowrap frame guards, restart scheduling resets, and FPS-cap behavior.
• packages/ai/src/models.generated.ts and provider catalog files conflicted. The repository explicitly forbids hand-editing generated model outputs; this needs generator-aware resolution after source conflicts are settled.
• Upstream renamed packages/orchestrator to packages/server, while the fork has local packages/orchestrator notes/tests and server conflicts. This needs a deliberate package-surface decision.
• Lockfiles and publish/install locks conflicted, but they depend on the final package/source resolution and should be regenerated only after the semantic merge is complete.

Because these are not safe policy-only conflicts, the merge was aborted per the driver rule: do not guess on semantic conflicts.

Unresolved files from the aborted merge

.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/anthropic.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/coding-agent/test/suite/harness.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

Changelog and QA

Not run. The merge did not reach a clean tree, so the upstream pin, changelog audit, build/check/test gates, CLI smoke, and senpi-qa evidence were intentionally skipped.

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