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

Date: 2026-07-24
Result: CONFLICTS

Refs

• Current branch: automation/upstream-v0.82.0-30080846709
• Current HEAD / origin/main: 4bdbadcee713efe0ca0f80a1a3fe7c30b89734ad
• Fetched upstream/main: 7df73a00c6cf85c000bf1ce1594c9284067a92f0
• Latest upstream release tag requested: v0.82.0
• v0.82.0 tag commit: 083e61621276bff9f6faefab87ce07fcd98734e2
• Merge base: 3da591ab74ab9ab407e72ed882600b2c851fae21
• Fork commits preserved before merge attempt: 2124 commits in upstream/main..HEAD

Action Taken

• Fetched live upstream/main and tags from badlogic/pi-mono.
• Verified this was not a no-op: neither upstream/main nor HEAD was an ancestor of the other.
• Attempted a history-preserving merge with git merge --no-ff upstream/main -m "merge: upstream v0.82.0".
• The merge produced 111 conflicted files.
• Aborted the merge with git merge --abort as required for ambiguous semantic conflicts.
• Did not update .github/upstream.json.
• Did not run the changelog audit.
• Did not run build/check/test/CLI QA.
• Did not push, open a PR, create tags, or run release tooling.

Why This Was Not Safely Auto-Resolvable

The conflict set spans high-risk fork-owned runtime behavior and upstream release changes in the same regions. The fork notes in changes.md identify several invariants that must be preserved manually, including session-scoped provider resolution, multi-session RPC state isolation, model fallback lifecycle, compaction recovery, text tool-call recovery, smooth streaming reveal, TUI render scheduling, and packaging/name/bundle semantics.

Representative ambiguous overlaps:

• packages/agent/src/agent-loop.ts: upstream introduces the stream-fn.ts default stream path while the fork modifies the same loop for idle-timeout abort propagation, truncated tool-call retry behavior, and terminating queue restoration.
• packages/coding-agent/src/core/agent-session.ts: upstream release changes overlap fork behavior for multi-session launch profiles, compaction continuation, fallback model switching, provider scoping, executeTool, and queue serialization.
• packages/coding-agent/src/modes/interactive/interactive-mode.ts: upstream edits overlap fork-owned smooth streaming, tool-argument reveal, compaction queue transfer, fallback notices, and tool animation lifecycle.
• packages/tui/src/tui.ts: upstream edits overlap fork-owned render throttle/FPS controls, mux-aware full render policy, synchronized frame boundaries, viewport repaint, scrollback replay, and restart scheduling hardening.
• packages/ai/src/api/* and packages/ai/src/types.ts: upstream provider and constrained-sampling changes overlap fork-owned video modality, text tool-call recovery, provider-native replay fixes, classifier stop details, and custom tool-call replay guards.
• packages/ai/src/models.generated.ts and provider model shards conflicted. These files are generated and must not be hand-edited; resolution would require the correct generator-side merge first.
• Package manifests and locks conflict across upstream 0.82.0 release metadata and fork 2026.7.23 packaging, bundled dependency, pty, codemode, and exact-pin policy.
• packages/orchestrator versus packages/server rename conflicts require a semantic decision about fork-only AGENTS/test/changelog files under the renamed upstream package.

Because these conflicts require choosing between overlapping runtime contracts, resolving by broad ours/theirs selection would risk silently dropping either upstream fixes or intentional fork behavior.

Conflicted 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

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