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-30T23:44:20Z

Result

MERGE_RESULT: CONFLICTS

The upstream/main merge for upstream release v0.83.0 was aborted because one semantic conflict could not be resolved with confidence in this headless pass.

Refs

• Current branch: automation/upstream-v0.83.0-30590535626
• Current HEAD before merge: 77a7680963f4729c7889aedce0f13c508b333c8d
• Merge base / current upstream pin: 5bc1c2c0a6f07e00e8c240304182f213ab8d311f
• Fetched upstream/main: 74caa2649f10ed71b4378ce69f5d9fbfd2466ca5
• Upstream release tag v0.83.0: 845d6ff1f6643aba440341cce877ce1c43ebbc39

Verified Not No-Op

The branch was not already synced:

• upstream/main is not an ancestor of HEAD.
• HEAD is not an ancestor of upstream/main.
• HEAD..upstream/main is non-empty and includes the v0.83.0 release commit plus post-release upstream commits through 74caa2649.

Conflict Analysis

The merge produced many mechanical conflicts in package metadata, changelogs, docs, and runtime files. Most were resolvable by the fork rules: keep fork changelogs/manifests where branding and CalVer intentionally diverge, take upstream lockfiles for regeneration, remove upstream npm-shrinkwrap.json, and combine additive API fields such as serviceTier with upstream scopedModels.

The unresolved conflict is the TUI renderer split:

• packages/tui/src/tui.ts
• packages/tui/src/TuiMainScreen.ts
• packages/tui/src/TuiAltScreen.ts
• packages/tui/src/terminal-image.ts
• packages/tui/src/components/markdown.ts
• related TUI tests

Upstream split the renderer into TuiBase, TuiMainScreen, and TuiAltScreen to support alternate-screen rendering and markdown transform APIs. The fork's packages/tui/src/tui.ts intentionally carries large renderer invariants documented in packages/tui/src/changes.md, including tmux focus/capability refresh, Kitty image row preservation, no-clear scrollback replay, configurable render FPS, previous raw-line tracking, over-wide diagnostic throttling, and autowrap-disabled frame writes.

The new upstream TuiMainScreen.ts is based on the upstream main-screen renderer and does not contain those fork invariants. A safe merge requires semantically porting the fork's main-screen behavior into the new split while keeping upstream's TuiBase/alternate-screen contract. That is not a reliable mechanical conflict resolution, so the merge was aborted instead of guessing.

QA

No build, check, tests, changelog audit, pin update, or senpi QA were run after the abort. The working tree was restored to the pre-merge state before this report was written.

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

[code-yeongyu]

Closing duplicate automated upstream-sync conflict report.