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-31T17:39:45Z

Result

MERGE_RESULT: CONFLICTS

The attempted history-preserving merge of upstream/main into the current automation branch was aborted. The
conflict set crossed multiple fork-protected runtime surfaces with explicit changes.md warnings, so resolving by
bulk choosing either side would risk silently dropping fork behavior or upstream runtime changes.

Refs

• Current branch: automation/upstream-v0.83.0-30651762087
• Current HEAD before merge: f134f681e94e81ba3ea472148dd21fd2720acbc7
• Live upstream/main: 977ec833bbb86e245057e9162dbc1443c7b6e707
• Latest upstream release tag requested: v0.83.0
• v0.83.0 commit: 845d6ff1f6643aba440341cce877ce1c43ebbc39
• Merge base: 5bc1c2c0a6f07e00e8c240304182f213ab8d311f

No-Op Check

This was not a no-op:

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

Preserved Fork Work Seen Before Abort

The fork side contains substantial post-base work that must be preserved semantically. Recent examples include:

• f134f681e merge of high-reasoning warning dedupe
• 39d7dbdd0 merge of monitor duplicate wake fix
• 6f20df9f4 merge of todo widget strike animation
• 5414e9294 terminal monitor duplicate batch suppression
• 2f7db41d3 merge of apply-patch failure status
• 6ddfbff00 todo widget completion animation
• 09e72d094 TUI line-normalization memoization and viewport-bounded rendering
• 70172d9cb Codex WebSocket fallback recovery
• 3b2fa38e3 Codex cache affinity headers

Unresolved Conflicts

The attempted merge reported these unmerged 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

• packages/coding-agent/src/core/agent-session.ts conflicted in the highest-risk fork-owned session lifecycle
  surface. The local changes.md marks compaction lifecycle, queue ownership, fallback admission, warning dedupe,
  model switching, and retry cleanup as intentional fork behavior.
• packages/coding-agent/src/modes/interactive/interactive-mode.ts conflicted in queue restoration, compaction
  handoff, startup/header, editor handoff, and TUI behavior surfaces. The local notes mark several of these as
  recent bug fixes.
• packages/tui/src/tui.ts, terminal-image.ts, markdown tests, and render tests conflicted in the renderer and
  image/markdown pipeline. The local notes mark these as performance and terminal-correctness changes.
• packages/ai/src/api/* conflicted in provider adapters where the fork has recent Codex cache/fallback,
  Anthropic tool demotion, Kimi XTML recovery, static credential header, and stream lifecycle changes.
• Metadata conflicts were not sufficient to resolve the merge because package identities, CalVer versions, generated
  lockfiles, upstream npm-shrinkwrap.json, and fork-specific publish/install rules overlap.

Work Not Performed

Because the conflict stop condition fired:

• .github/upstream.json was not updated.
• Changelogs were not audited or edited.
• npm run build, npm run check, npm test, CLI smoke tests, and senpi-qa were not run.
• No commits, tags, pushes, pull requests, releases, rebases, or force operations were made.

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

[code-yeongyu]

Closing duplicate automated upstream-sync conflict report.