upstream merge needs attention: v0.83.0 (CONFLICTS)

[code-yeongyu]

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

Agent report

Upstream Merge Report

Result

MERGE_RESULT: CONFLICTS

The history-preserving merge of upstream/main was attempted with:

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

The merge was aborted because the remaining conflicts included broad semantic overlaps in fork-protected runtime
files. Resolving them by choosing either side mechanically would risk dropping fork behavior or upstream release
changes.

Refs

• Current branch: automation/upstream-v0.83.0-30678439731
• Current HEAD before merge attempt: f134f681e94e81ba3ea472148dd21fd2720acbc7
• Target upstream ref: upstream/main
• Target upstream SHA: 4488ad55c18f07ae89a489096c90de8667b3adfb
• Requested release tag: v0.83.0
• v0.83.0 SHA: 845d6ff1f6643aba440341cce877ce1c43ebbc39
• Divergence before merge: 199 upstream-only commits, 3204 fork-only commits.

No-Op Check

This was not a no-op:

• git merge-base --is-ancestor upstream/main HEAD failed.
• HEAD..upstream/main was non-empty.
• .github/upstream.json still records v0.82.1 at 5bc1c2c0a6f07e00e8c240304182f213ab8d311f.

Conflict Set

The merge produced conflicts in:

.pi/extensions/prompt-url-widget.ts
package-lock.json
package.json
packages/agent/CHANGELOG.md
packages/agent/package.json
packages/ai/CHANGELOG.md
packages/ai/package.json
packages/ai/src/api/anthropic-messages.ts
packages/ai/src/api/openai-codex-responses.ts
packages/ai/src/api/openai-completions.ts
packages/ai/src/api/openai-responses.ts
packages/ai/src/types.ts
packages/ai/test/openai-completions-tool-choice.test.ts
packages/ai/test/total-tokens.test.ts
packages/coding-agent/CHANGELOG.md
packages/coding-agent/README.md
packages/coding-agent/docs/session-format.md
packages/coding-agent/examples/extensions/custom-provider-anthropic/package-lock.json
packages/coding-agent/examples/extensions/custom-provider-anthropic/package.json
packages/coding-agent/examples/extensions/custom-provider-gitlab-duo/package.json
packages/coding-agent/examples/extensions/gondolin/package-lock.json
packages/coding-agent/examples/extensions/gondolin/package.json
packages/coding-agent/examples/extensions/sandbox/package-lock.json
packages/coding-agent/examples/extensions/sandbox/package.json
packages/coding-agent/examples/extensions/with-deps/package-lock.json
packages/coding-agent/examples/extensions/with-deps/package.json
packages/coding-agent/install-lock/package-lock.json
packages/coding-agent/install-lock/package.json
packages/coding-agent/npm-shrinkwrap.json
packages/coding-agent/package.json
packages/coding-agent/src/cli/args.ts
packages/coding-agent/src/cli/config-selector.ts
packages/coding-agent/src/cli/startup-ui.ts
packages/coding-agent/src/core/agent-session-runtime.ts
packages/coding-agent/src/core/agent-session.ts
packages/coding-agent/src/core/auth-storage.ts
packages/coding-agent/src/core/extensions/runner.ts
packages/coding-agent/src/core/extensions/types.ts
packages/coding-agent/src/core/model-registry.ts
packages/coding-agent/src/core/package-manager.ts
packages/coding-agent/src/core/resource-loader.ts
packages/coding-agent/src/core/settings-manager.ts
packages/coding-agent/src/index.ts
packages/coding-agent/src/main.ts
packages/coding-agent/src/modes/interactive/components/assistant-message.ts
packages/coding-agent/src/modes/interactive/interactive-mode.ts
packages/coding-agent/src/modes/rpc/rpc-mode.ts
packages/coding-agent/test/extensions-runner.test.ts
packages/coding-agent/test/trigger-compact-extension.test.ts
packages/coding-agent/vitest.config.ts
packages/evals/package.json
packages/evals/src/pi-harness.ts
packages/server/CHANGELOG.md
packages/server/package.json
packages/storage/sqlite-node/CHANGELOG.md
packages/storage/sqlite-node/package.json
packages/tui/CHANGELOG.md
packages/tui/package.json
packages/tui/src/components/markdown.ts
packages/tui/src/index.ts
packages/tui/src/terminal-image.ts
packages/tui/src/tui.ts
packages/tui/test/key-tester.ts
packages/tui/test/markdown.test.ts
packages/tui/test/terminal-image.test.ts
packages/tui/test/tui-render.test.ts
scripts/local-release.mjs
scripts/publish.mjs
tsconfig.json

Ambiguity Analysis

The ambiguous conflicts are concentrated in the same surfaces the fork notes identify as semantically modified:

• packages/coding-agent/src/core/agent-session.ts overlaps required-compaction recovery, queue chronology,
  retry lifecycle, high-reasoning warnings, runtime API-key routing, and remote-client/session changes.
• packages/coding-agent/src/modes/interactive/interactive-mode.ts overlaps failed-compaction queue restoration,
  global queue chronology, TUI warning rendering, and upstream session/client UI changes.
• packages/coding-agent/src/core/resource-loader.ts, model-registry.ts, and settings-manager.ts overlap
  fork-specific package loading, service-tier lookup, nearest-parent settings, and upstream package/client changes.
• packages/tui/src/tui.ts, terminal-image.ts, and Markdown rendering overlap fork renderer performance,
  tmux/Kitty behavior, LaTeX rendering, and upstream alternate-screen/fullscreen-scrollbar work.
• packages/ai/src/api/* and packages/ai/src/types.ts overlap fork recovery/stream metadata changes with upstream
  provider transport and usage/accounting updates.

Some conflicts were mechanically understood during inspection, including lockfile regeneration, package identity
preservation, fork changelog preservation, and npm-shrinkwrap.json deletion. They were not committed because the
semantic source conflicts made the overall merge unsafe.

Skipped Work

Because the merge was aborted:

• .github/upstream.json was not updated.
• Changelog audit was not run.
• npm run build, npm run check, npm test, CLI smoke tests, and senpi-qa were not run.
• No commit, push, PR, tag, or release was created.

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

[code-yeongyu]

Closing duplicate automated upstream-sync conflict report.