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-24T07:15:04Z

Result

MERGE_RESULT: CONFLICTS

The attempted history-preserving merge of upstream/main into
automation/upstream-v0.82.0-30074035077 was aborted because the conflict set
included multiple fork-owned runtime seams whose correct resolution requires
semantic owner review. I did not push, tag, open a PR, run release tooling,
update .github/upstream.json, audit changelogs, or run QA after aborting.

Refs

• Current branch before merge: automation/upstream-v0.82.0-30074035077
• Current branch HEAD: 4bdbadcee713efe0ca0f80a1a3fe7c30b89734ad
• Current upstream pin before merge: v0.80.10
• Current upstream pin SHA before merge: 216e672e7c9fc65682553394b74e483c0c9e47f7
• Requested upstream release tag: v0.82.0
• v0.82.0 commit: 083e61621276bff9f6faefab87ce07fcd98734e2
• Fetched upstream/main: 7df73a00c6cf85c000bf1ce1594c9284067a92f0
• Merge command attempted: git merge --no-ff upstream/main
• Merge command result: conflicts, then git merge --abort

Preserved Fork Commits

The fork side has many intentional commits on top of upstream, including:

• 4bdbadcee Merge pull request feat(rpc): multi-session mode for the plain-RPC protocol #312 from code-yeongyu/feat/multi-session-rpc
• 63b69d8b1 test(rpc): exercise config-reload isolation with peer session mid-stream
• eb2e71145 test(rpc): discriminating provider isolation and real config-reload mutation proof
• 0bd03dacd test(rpc): drive multi-session isolation through real routing stack; restore classic pins
• 5cacf9c85 fix(rpc): synchronous session-closing state and atomic open rollback
• 6f5a42b11 fix(rpc): apply open_session provider/model/thinking on create
• 3e44bfffe fix(neo): restore invocation-local dispatch and bridge exhaustiveness for rpc command union
• 928fdcb18 docs(rpc): multi-session protocol documentation and changes.md
• f5b9ccd2f test(rpc): multi-session concurrency and isolation battery
• 601564611 feat(rpc): open_session resume/create parity and close_session semantics
• 02ea4fd2a feat(rpc): per-session tagged output with fair record scheduling
• c0f08d7f1 feat(rpc): multi-session host with session routing and protocol info
• 95373cf0c refactor(mcp): session-owned MCP and config-reload state for multi-session mode
• f7d92c0c6 fix(compaction): sanitize Anthropic tool pairs on summarization requests
• edf3e0b51 feat(pi-ai): session-scoped provider resolution via node-only AsyncLocalStorage subpath

Fork Notes Read

I read the relevant fork notes before deciding not to guess:

• packages/ai/changes.md
• packages/ai/src/changes.md
• packages/agent/src/changes.md
• packages/coding-agent/changes.md
• packages/coding-agent/src/changes.md
• packages/coding-agent/src/core/changes.md
• packages/coding-agent/src/core/compaction/changes.md
• packages/coding-agent/src/core/extensions/changes.md
• packages/coding-agent/src/core/tools/changes.md
• packages/coding-agent/src/modes/interactive/changes.md
• packages/coding-agent/src/modes/rpc/changes.md
• packages/tui/src/changes.md

Unresolved Conflict Analysis

Mechanical conflicts exist and are likely resolvable by policy, but they should
not be resolved independently because downstream package/source conflicts
change their required final content:

• package-lock.json: policy says take upstream and regenerate with
  npm install --package-lock-only --ignore-scripts.
• Markdown/docs conflicts: policy generally prefers upstream unless the fork
  intentionally diverged.
• Changelog conflicts: should preserve fork release history and add new
  [Unreleased] audit entries only after a clean source merge.
• Generated model catalogs: packages/ai/src/models.generated.ts conflicted;
  it must not be hand-edited.

The ambiguous semantic conflicts are in fork-owned behavior documented in the
changes.md files:

• packages/agent/src/agent-loop.ts: upstream changed default stream-function
  plumbing while the fork owns request abort teardown, idle-timeout handling,
  terminal failure normalization, flagged incomplete tool calls, queued
  continuation recovery, and thinking timing propagation.
• packages/coding-agent/src/core/agent-session.ts: upstream added
  summarization retry and bash execution events while the fork owns retry
  fallback lifecycle, auth event flow, compaction rejection semantics,
  executeTool, session work barriers, multi-session provider scope, and
  compaction continuation recovery.
• packages/coding-agent/src/core/compaction/compaction.ts and
  branch-summarization.ts: upstream retry behavior overlaps with fork
  idle-watchdog, base64 token estimation, empty-summary rejection, and
  compaction-hook branch summaries.
• packages/coding-agent/src/core/extensions/runner.ts,
  types.ts, and related extension files: upstream extension API changes
  overlap with fork MCP registration, model-select live system-prompt options,
  config reload, fallback settings, and structured compaction cancellation.
• packages/coding-agent/src/modes/interactive/interactive-mode.ts and
  components/footer.ts: upstream TUI updates overlap with fork smooth
  streaming reveal, tool-argument pacing, fallback notices, compaction error
  rendering, todo strike animation, and compact footer token formatting.
• packages/coding-agent/src/modes/rpc/rpc-mode.ts: upstream RPC updates
  overlap with fork multi-session routing, auth commands, event coalescing,
  thinking-level commands, and Neo daemon extraction.
• packages/tui/src/tui.ts: upstream renderer changes overlap with fork
  render FPS caps, autowrap frame bracketing, scrollback replay, viewport
  repaint, mux-aware render policy, and render-failure containment.

Additional conflicted runtime/test files observed during 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.json
• packages/agent/CHANGELOG.md
• packages/agent/package.json
• 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/*.models.ts
• packages/ai/src/types.ts
• packages/ai/src/utils/uuid.ts
• packages/ai/test/*.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/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/test/*.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/test/tui-render.test.ts
• scripts/local-release.mjs
• scripts/release.mjs
• scripts/sync-versions.js
• test.sh
• tsconfig.json

Changelog And QA

Changelog audit was intentionally not run because the merge did not reach a
clean tree. Runtime QA was intentionally not run because there is no resolved
merged runtime to validate.

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