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

Generated: 2026-07-31T16:58:22Z

Result

MERGE_RESULT: CONFLICTS

The attempted history-preserving merge of upstream/main was aborted because the
conflict set includes overlapping semantic edits in fork-owned runtime surfaces.
Resolving those conflicts mechanically would risk dropping intentional fork
behavior or partially applying upstream API changes.

Refs

• Current branch: automation/upstream-v0.83.0-30647967610
• Starting HEAD: f134f681e94e81ba3ea472148dd21fd2720acbc7
• Upstream main: 977ec833bbb86e245057e9162dbc1443c7b6e707
• Latest upstream release tag requested: v0.83.0
• v0.83.0 tag object/commit: 845d6ff1f6643aba440341cce877ce1c43ebbc39
• Previous upstream pin: v0.82.1 at 5bc1c2c0a6f07e00e8c240304182f213ab8d311f
• Merge base for attempted merge: 5bc1c2c0a6f07e00e8c240304182f213ab8d311f

No-op Check

The verified no-op terminal condition did not apply.

• upstream/main is not an ancestor of HEAD.
• HEAD is not an ancestor of upstream/main.
• HEAD..upstream/main is non-empty.

Preserved Fork Commits

No merge commit was created and no fork commits were rewritten. The merge was
aborted with git merge --abort, leaving the branch at
f134f681e94e81ba3ea472148dd21fd2720acbc7.

Conflicts

The attempted git merge --no-ff upstream/main -m "merge: upstream v0.83.0"
reported these unresolved paths:

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

Conflict Analysis

Mechanical rules are available for lockfiles, changelogs, docs, and some
package metadata, but the merge also conflicts in high-risk fork-owned runtime
code:

• packages/coding-agent/src/core/agent-session.ts overlaps the fork's
  compaction lifecycle, retry/fallback, queue restoration, thinking-level,
  extension-context, and model-switch behavior.
• packages/coding-agent/src/core/resource-loader.ts,
  settings-manager.ts, and model-registry.ts overlap builtin extension
  loading, model metadata, provider filtering, service-tier, and settings
  semantics preserved by the fork notes.
• packages/coding-agent/src/core/extensions/runner.ts and types.ts overlap
  additive extension APIs for compaction, tool status, model-selection prompt
  changes, and retry metadata.
• packages/coding-agent/src/modes/interactive/interactive-mode.ts overlaps
  queue recovery, compaction transfer, smooth streaming, startup tips, warning
  surfaces, stdout guards, and model/fallback status rendering.
• packages/tui/src/tui.ts, terminal-image.ts, components/markdown.ts,
  and related tests overlap the fork's differential-rendering guarantees,
  tmux/Kitty image handling, and native terminal math rendering.
• packages/ai/src/api/* and packages/ai/src/types.ts overlap provider
  streaming, raw stop reasons, deferred tools, and request option typing.
• scripts/local-release.mjs, scripts/publish.mjs, package manifests, and
  shrinkwrap/install-lock files overlap fork packaging policy. In particular,
  the fork guide forbids replacing packages/coding-agent/publish-deps.lock.json
  with npm-shrinkwrap.json, while upstream reintroduced
  packages/coding-agent/npm-shrinkwrap.json.

Because these areas encode intentional fork behavior documented in the nearest
changes.md files, resolving by blanket ours or theirs would not be
reviewer-safe.

Changelog And Pin

The upstream pin was not updated and changelog audit was not run. The procedure
requires stopping at MERGE_RESULT: CONFLICTS after aborting an ambiguous merge.

QA

No build, check, test, CLI smoke, or Senpi QA harness was run. The tree was
restored to the pre-merge state before writing this report.

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

[code-yeongyu]

Closing duplicate automated upstream-sync conflict report.