upstream merge needs attention: v0.81.1 (CONFLICTS)

[code-yeongyu]

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

Agent report

Upstream Merge Report

Result: CONFLICTS
Generated: 2026-07-23T23:36:53Z

Refs

• Current branch: automation/upstream-v0.81.1-30053089651
• Current HEAD before merge attempt: 4bdbadcee713efe0ca0f80a1a3fe7c30b89734ad
• Live upstream/main: 24bace27cf308c89707cf8005b4795d873e23f17
• Requested upstream release tag: v0.81.1
• v0.81.1 SHA: 20be4b18d4c57487f8993d2762bace129f0cf7c6
• Merge base: 3da591ab74ab9ab407e72ed882600b2c851fae21

upstream/main was fetched live. This was not a verified no-op: upstream/main
was not an ancestor of HEAD, HEAD was not an ancestor of upstream/main,
and HEAD..upstream/main was non-empty.

Action Taken

Attempted:

git merge --no-ff upstream/main

The merge produced broad semantic conflicts across the runtime packages,
generated model catalog surfaces, release tooling, workflows, docs, tests, and
the upstream packages/orchestrator to packages/server rename. After reading
the applicable fork changes.md notes, the conflicts were judged unsafe to
resolve by automatic side choice. The merge was aborted with:

git merge --abort

The branch is back at 4bdbadcee713efe0ca0f80a1a3fe7c30b89734ad.

Preserved Fork Work

No merge commit was created, so all existing fork commits remain preserved
unchanged. Recent fork commits that materially overlap with upstream include:

• 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
• 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
• 96df126dd feat(compaction): support OpenAI Codex remote compaction
• fe6a8bccb feat(compaction): gate openai remote compaction on provider capability
• bc1e0b240 feat(agent): stamp thinking block timing in the agent loop
• 9bcefa8e2 fix(tui): unify tool progress durations

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

Conflict Analysis

• packages/agent/src/agent-loop.ts overlaps with fork-preserved queue
  recovery, idle-timeout abort propagation, flagged truncated tool-call retry
  handling, tool abort termination, and upstream changes for retry/compaction
  cache behavior and harness compatibility.
• packages/coding-agent/src/core/agent-session.ts overlaps with fork
  streaming queue bypass, remote compaction, fallback chains, executeTool,
  config reload, auth events, and upstream summarization/session metadata
  changes.
• packages/coding-agent/src/modes/rpc/rpc-mode.ts overlaps with the fork's
  multi-session RPC host and upstream RPC/model availability additions.
• packages/tui/src/tui.ts overlaps with fork renderer invariants for
  flicker-free scrollback, frame bracketing, restart hardening, and configurable
  FPS, while upstream also changes debug/crash log placement and editor
  behavior.
• packages/ai/src/models.generated.ts and provider model files conflict, but
  repository policy forbids hand-editing generated model catalogs. Resolving
  this requires the generator path and validation sequence after a semantic
  source merge.
• packages/orchestrator to packages/server conflicts require preserving
  fork-specific AGENTS.md/changelog notes while accepting upstream's rename,
  which cannot be done safely as a blind rename resolution.
• Dependency files conflict across root and package manifests/locks. The
  lockfile rule says to take upstream and regenerate, but manifest conflicts
  first require semantic package decisions.

Because the conflicting files are fork-owned behavior boundaries documented as
medium/high risk in changes.md, guessing would risk dropping fork behavior or
misapplying upstream runtime changes.

Changelog And Pin

• .github/upstream.json was not updated because the merge did not complete.
• /cl changelog audit was not run because the procedure stops on conflicts.
• No changelog entries were added.

QA

QA was not run. The merge was aborted before producing a merged tree, so build,
check, tests, CLI smoke, and senpi-qa would not be meaningful.

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