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-24T18:41:02Z

Result

MERGE_RESULT: CONFLICTS

The attempted history-preserving merge of upstream/main into
automation/upstream-v0.82.0-30117653506 was aborted because the conflict set
contains broad semantic collisions in fork-owned runtime behavior. A mechanical
ours/theirs resolution would risk dropping either fork behavior or upstream
release fixes.

No pin update, changelog audit, QA, push, PR, tag, or release was performed.

Refs

• Current branch: automation/upstream-v0.82.0-30117653506
• HEAD before merge: f2b74d62f8423db9c30e71f056c38b0dbedb5f7a
• Upstream target: upstream/main
• Upstream target SHA: a9f5b1c123a4f13457e88522a3be89aeb4823d66
• Latest upstream release tag requested: v0.82.0
• v0.82.0 tag SHA: 083e61621276bff9f6faefab87ce07fcd98734e2
• Merge base: 3da591ab74ab9ab407e72ed882600b2c851fae21
• Fork-only commits at merge attempt: 2146
• Upstream commits pending integration: 106

Preserved Fork Commits

The merge was aborted, so all fork commits remain unchanged. Recent first-parent
fork commits include:

• f2b74d62f feat(coding-agent): add Claude Opus 5 prompt preset
• 38bd3a3cf Merge pull request #310 from minpeter/fix/compaction-fallback-fsm
• 4bdbadcee Merge pull request #312 from code-yeongyu/feat/multi-session-rpc
• 928e90064 Merge pull request #306 from code-yeongyu/fix/compaction-anthropic-tool-pair
• e048fd340 release: v2026.7.23

Conflict Analysis

The merge was attempted with:

git merge --no-ff upstream/main -m "merge: sync automation/upstream-v0.82.0-30117653506 with upstream/main"

Git reported 112 unmerged paths. The ambiguous areas are:

• packages/agent/src/agent-loop.ts and packages/agent/src/agent.ts: upstream
  introduces stream-fn.ts/default stream-function plumbing while the fork has
  timeout abort ownership, terminal event normalization, queued-message recovery,
  thinking timing, and active-run drain suppression recorded in
  packages/agent/src/changes.md.
• packages/ai/: upstream adds model-data hydration/offline build paths,
  constrained sampling, provider retry behavior, Radius gateway OAuth routing,
  Anthropic bearer-token env support, and generated catalog changes. The fork
  carries session-scoped provider registries, video input modality, text tool-call
  recovery contracts, Anthropic thinking replay behavior, custom model catalogs,
  and generated model files that must not be edited by hand.
• packages/coding-agent/src/core/agent-session.ts and related compaction/model
  runtime files: upstream changes overlap with fork retry fallback, compaction
  lifecycle, session-owned provider/config-reload state, multi-session RPC, and
  manual compaction abort-subscription behavior recorded in
  packages/coding-agent/src/changes.md.
• packages/coding-agent/src/modes/rpc/rpc-mode.ts and test harnesses: upstream
  changes collide with the fork's multi-session RPC protocol and compatibility
  guarantees.
• packages/tui/src/tui.ts: upstream renderer/editor changes collide with the
  fork's differential rendering, autowrap frame guards, viewport replay, render
  FPS cap, and restart hardening recorded in packages/tui/src/changes.md.
• Package metadata and lockfiles: upstream release versioning, storage workspace,
  model-data scripts, and protobufjs pin overlap with fork package identity,
  @code-yeongyu/senpi branding, bundled dependencies, Node 24/TypeScript 6
  choices, and fork-only package/workspace layout.
• packages/orchestrator to packages/server rename: upstream file-location
  conflicts overlap with fork-side server/orchestrator changes.

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

Commands Run

git fetch upstream main --tags
git fetch --tags upstream "+refs/heads/main:refs/remotes/upstream/main"
git rev-parse HEAD upstream/main refs/tags/v0.82.0
git merge-base HEAD upstream/main
git rev-list --count upstream/main..HEAD
git rev-list --count HEAD..upstream/main
git merge --no-ff upstream/main -m "merge: sync automation/upstream-v0.82.0-30117653506 with upstream/main"
git diff --name-only --diff-filter=U
git merge --abort

Follow-Up Needed

A human or dedicated semantic merge pass should resolve the runtime conflicts
package by package, regenerate the lockfiles and generated model catalogs through
their owning scripts, then continue with the upstream pin update, /cl changelog
audit, build/check/test gates, CLI smoke tests, and senpi-qa evidence.

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