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-24T11:59:23Z

Result

MERGE_RESULT: CONFLICTS

The bot branch attempted a history-preserving merge of upstream/main for upstream release v0.82.0, but the merge was aborted because the unresolved conflicts include multiple high-risk fork-owned runtime surfaces. A mechanical resolution would risk silently dropping fork behavior.

Refs

• Current branch before merge: automation/upstream-v0.82.0-30090125925
• Fork/base HEAD: 38bd3a3cf8a47c1201969117b1a82a5af7daac9c
• Fetched upstream/main: 7df73a00c6cf85c000bf1ce1594c9284067a92f0
• Upstream release tag v0.82.0: 083e61621276bff9f6faefab87ce07fcd98734e2

Upstream range sampled

• 7df73a00c Add [Unreleased] section for next cycle
• 083e61621 Release v0.82.0
• e8d97fee1 feat(ai): update generated image models
• e16172069 docs(coding-agent): add model reload changelog entry
• f87468131 fix(coding-agent): reload model config in picker (#7036)
• 8472c486f docs(coding-agent): add missing clipboard changelog entry
• fc8048d23 fix(coding-agent): bundle model data in release source
• ee0dca45b docs: audit unreleased changelog entries
• edbf941da chore: approve contributors from issue #7040
• 2d3f55542 fix: await wl-copy exit code and fall through to xclip on failure (#7009)
• 24bace27c feat(ai): support constrained sampling (#6341)
• ec1a87e85 fix(coding-agent): require protobufjs 7.6.5, closes #7005

Preserved fork work sampled

• 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
• 668735508 test(coding-agent): pin fallback retry overflow ownership past post-retry compaction skip

Why automatic resolution stopped

The merge conflicts cross the fork notes' highest-risk areas:

• packages/coding-agent/src/core/agent-session.ts, packages/coding-agent/src/core/compaction/*, and related tests conflict with fork-owned compaction lifecycle, retry/fallback admission, queue ownership, provenance, and manual compaction abort semantics.
• packages/coding-agent/src/modes/rpc/rpc-mode.ts conflicts with fork-owned multi-session RPC behavior, auth commands, event pass-through, and session-owned provider/MCP state.
• packages/ai/src/types.ts and provider adapters conflict between fork-owned freeform/text-tool-call/video/provider-scope behavior and upstream constrained-sampling/model-data changes.
• packages/agent/src/agent-loop.ts and packages/agent/src/agent.ts conflict between fork-owned stream timeout, incomplete tool-call retry, queued-message drain suppression, and upstream default stream-function refactor.
• packages/tui/src/tui.ts and render tests conflict with fork-owned differential-rendering, FPS cap, and scrollback behavior.
• Upstream renamed packages/orchestrator to packages/server; the fork has package-specific AGENTS guidance, config/env semantics, and Radius credential behavior that need a semantic package-rename decision.
• Generated model files conflict. They should be regenerated from merged generator/data changes, not edited by hand.

Unresolved conflict 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/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

Work not performed

• No upstream pin update was made.
• No changelog audit was run.
• No build, check, tests, CLI smoke, or senpi QA were run.
• No commits, tags, pushes, pull requests, or releases were created.

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