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 at: 2026-08-01T03:15:43Z
• Fork branch: automation/upstream-v0.83.0-30681473618
• Fork HEAD before merge attempt: f134f681e94e81ba3ea472148dd21fd2720acbc7
• Upstream target: upstream/main
• Upstream target SHA: 4488ad55c18f07ae89a489096c90de8667b3adfb
• Requested upstream release tag: v0.83.0
• Requested tag SHA: 845d6ff1f6643aba440341cce877ce1c43ebbc39
• Existing upstream pin before attempt: v0.82.1 / 5bc1c2c0a6f07e00e8c240304182f213ab8d311f

Result

git merge --no-ff upstream/main was attempted and then aborted because the conflict set contains semantic fork/upstream conflicts that are not mechanically resolvable with confidence. Per the merge-driver instructions, no upstream pin update, changelog audit, QA, push, PR, tag, or release was performed after the ambiguous conflict state was identified.

Final working tree after git merge --abort: clean except for this report.

No-op Check

The verified no-op terminal condition did not apply.

• HEAD: f134f681e94e81ba3ea472148dd21fd2720acbc7
• upstream/main: 4488ad55c18f07ae89a489096c90de8667b3adfb
• git merge-base --is-ancestor upstream/main HEAD: false
• git merge-base --is-ancestor HEAD upstream/main: false
• Divergence count from git rev-list --left-right --count upstream/main...HEAD: 199 3204

Preserved Fork Commits

The fork side contains 3204 commits not in upstream/main. Recent first-parent fork commits include:

• f134f681e Merge pull request fix(coding-agent): dedupe high-reasoning warnings per model #599 from code-yeongyu/fix/high-reasoning-warning-dedupe
• 39d7dbdd0 Merge pull request fix(terminal): drop duplicate monitor batches instead of re-waking the session #612 from code-yeongyu/fix/monitor-duplicate-wake
• 6f20df9f4 Merge pull request feat(coding-agent): animate todo widget completions #602 from code-yeongyu/feat/todo-widget-strike-animation
• 2f7db41d3 Merge pull request fix(coding-agent): surface apply_patch failures #605 from code-yeongyu/fix/apply-patch-failure-status
• 0814c7962 Merge pull request perf(tui): memoize line normalization and default viewport-bounded rendering #604 from code-yeongyu/perf/tui-frame-normalize-memo
• bf843165f Merge pull request fix(deps): remediate PostCSS path traversal advisory #601 from code-yeongyu/fix/postcss-ghsa-r28c
• 6a5a09001 Merge pull request fix(ai): recover Codex WebSocket fallback sessions #600 from code-yeongyu/fix/589-websocket-fallback-recovery

Upstream Commits Awaiting Integration

The upstream side contains 199 commits not in the fork. Recent upstream commits include:

• 4488ad55c Merge pull request #7410 from earendil-works/fix/sqlite-session-linear-time
• 5cd0f98e9 docs(agent): clarify staged branch handling
• c2adb4d1d fix(agent): use SQLite trigger for rollback test
• 06a1ceb8d Merge pull request #7409 from earendil-works/feat/coding-agent-remote-client-controller
• 57583617e fix(agent): make SQLite session operations linear
• a3ec51d2a feat: add remote session client coordination
• 0d43c5804 Merge pull request #7408 from earendil-works/refactor/session-reader

Unresolved Conflict Files

.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

• package.json conflicts between the fork's scripts/build-all.mjs based build/check flow, fork-specific run-web-ui-check, and upstream's newly expanded protocol/client/storage build graph. Either side alone drops important workflow behavior.
• scripts/publish.mjs and scripts/local-release.mjs conflict between fork-owned scoped publish manifests (@code-yeongyu/senpi-*, source-only codemode, temporary manifest rewriting) and upstream's new protocol, client, and storage packages. The correct result requires a deliberate fork publishing policy decision.
• packages/coding-agent/src/core/auth-storage.ts conflicts between the fork's OAuth/multi-account credential surface and upstream's auth file revision/cache changes. Accepting either side risks losing credential behavior or upstream lock/read freshness fixes.
• packages/coding-agent/src/core/extensions/runner.ts and types.ts conflict between fork service-tier extension context and upstream scoped-model extension context. The merged extension API should likely expose both, but that requires compatible type/runtime/test edits across extension consumers.
• packages/coding-agent/src/core/agent-session.ts, model-registry.ts, settings-manager.ts, resource-loader.ts, and interactive-mode.ts are documented fork-modified semantic surfaces. The conflicts overlap active fork features such as queue chronology, high-reasoning warning behavior, service-tier lookup, resource metadata, and TUI compaction recovery with upstream session/client/UI changes.
• packages/tui/src/tui.ts conflicts between fork renderer internals (frame guards, memoized normalization, tmux focus, cursor visibility coalescing, viewport counters) and upstream's new TuiBase/viewport layout abstractions. This is a high-risk renderer architecture merge, not a formatting choice.
• packages/ai/src/api/* and related tests conflict in provider request construction and streaming behavior, including header/fetch injection and fork provider compatibility changes. These need source-level API review plus focused provider tests.

Changelog And QA

Skipped because the upstream merge did not complete. No changelog entries were added, no pin was updated, and no QA commands were run.

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

[code-yeongyu]

Closing duplicate automated upstream-sync conflict report.