[t3x-sync] daily rebase needs attention (conflict)

[github-actions]

Automated daily upstream sync could not complete.

Result: conflict
Recovery tag: t3x/last-good-20260728-103910
Run: https://github.com/radroid/t3code/actions/runs/30351497935

status JSON

{
  "kind": "daily",
  "result": "conflict",
  "upstream_range": "3c50a648 fix(web): prevent diff panel scroll jumping (#4724)\n9ccfd9df fix(desktop): allow updater-controlled relaunch (#4721)\n4f584da0 feat(web): add appearance settings category (#4715)\n362f1279 feat(web): add maria's sidebar header artwork toggle (#4652)\n9cf9fc9c Settle merged PR threads immediately (#4704)\ne00781a6 Fix relay credential lookup for unlinked environments (#4692)\nd25b1573 Fix mobile showcase workflow without Clerk (#4718)\nb0c4992c Make mobile Thread List v2 the default (#4717)\ndd5ea324 fix(web): 33 web UI fixes (#4700)\nc13a021e feat: default sidebar v2 on for nightly and dev builds (#4491)\n476d69cd fix(mobile): threads load snapped to bottom on iOS (#4689)\na148e081 Add OTA update checks to mobile settings (#4686)\n831eb66f chore(release): prepare v0.0.29\n1153afb4 fix(mobile): match react version to react-native 0.85.3 vendored renderer (19.2.3) (#4675)\na2ffb122 Show origin ref in branch trigger label (#4680)\n3957a958 Use glass surfaces for web toasts (#4681)\n6a3df517 Fix sidebar highlighting for draft threads (#4679)\n6afbed3c Clear provider update actions while updating (#4676)\neea3ea4c feat(diff-panel): show total line additions and deletions (#4674)\n10bca3f4 feat: add configurable source control writing settings (#4204)\ne77f42c1 Prevent draft thread detail polling before shell registration (#4670)\n6e3b7388 fix(server): bound editor discovery during config loading (#4291)\n5ba6ef7f Use tarball archiving for hosted web deploys (#4669)\n80ead5f3 Add glass styling for thread tooltips and simplify preview tab handling (#4665)\n32af2f00 fix(preview): stabilize PiP viewport identity (#4661)\nf0121f31 fix: close actions dropdown when editing (#4660)\n0e19c103 Keep MCP credentials alive across provider turns (#4659)\n32843c25 fix(web): constrain branch toolbar context (#4657)\nda11342e Fix live sidebar resize limits and defer Alchemy runtime context (#4655)\n180620e4 Fix Relay Worker RuntimeContext wiring (#4653)\n96398e37 feat(connect): release the Cloudflare tunnel when the environment shuts down (#4531)\nd2d40b6c Drop redundant Relay user indexes (#4648)\n72488771 fix(web): scope PR state to the thread branch (#4460)\nbdf99c17 feat: allow new thread creation through project breadcrumbs (#4638)\n108e0174 Upgrade Effect and Alchemy betas (#4643)\n200fa826 feat(web): prompt stash \u2014 cmd+S saves the composer to a per-provider queue (#4453)\nf4c39432 Add background preview capture and picture-in-picture support (#4397)\n2b06c08a Add managed tunnel limits migration (#4635)\na78f245d feat(relay): limit managed tunnels per user (#4530)\n23ea08da test: account for lazy thread feed details (#4628)\nb4680cbf perf(mobile): defer work-log detail serialization (#4607)\nd60f6e97 fix: cut websocket throughput in half by pruning activity payloads (#4622)\n",
  "upstream_head": "3c50a6488503f3ca73e0abe6e50ebdf5cb1a8167\n",
  "conflicted_files": "packages/contracts/src/settings.test.ts \n",
  "culprit_commits": "362f1279 feat(web): add maria's sidebar header artwork toggle (#4652)\nc13a021e feat: default sidebar v2 on for nightly and dev builds (#4491)\n10bca3f4 feat: add configurable source control writing settings (#4204)\n",
  "failing_step": "\n",
  "dropped_patches": "\n",
  "patch_manifest": "3f13841c Merge pull request #28 from radroid/t3x/autobuild-origin-main\n7772b552 Merge pull request #27 from radroid/t3x/issue-21-offline-tolerant-reset\nfd249a0e feat(t3x): auto-build from origin/main in a dedicated worktree\nd12be933 fix(client-runtime): reset tolerant reconnect budget across a network drop\n9541837f Merge pull request #23 from radroid/t3code/web-push-notifications\na19b7ebe fix(web): address Web Push review findings (reactor priming, VAPID recovery, cleanup)\ncee9f95d feat(web): closed-tab Web Push notifications (SW + PWA + server VAPID push)\n1e10fc38 Merge pull request #25 from radroid/t3x/issue-21-ws-keepalive-reconnect-heap\n72b2a169 Merge pull request #26 from radroid/t3code/web-message-queue\n3cced855 feat(web): queue messages while a chat is running (thread outbox)\nb7cec634 Merge pull request #24 from radroid/t3x/fork-ci-pr-gate\n14779d11 fix(connection): tolerate a slow-but-alive local backend + heap headroom\nb8aacb54 ci(t3x): add fork-runnable PR/main verify gate (t3x-ci.yml)\n6dc983fe docs(t3x): document how to land a sync PR (force-update, not merge button)\n1acb5518 fix(t3x): resolve pre-existing typecheck/lint red on fork test files\ne6df779e fix(t3x): pin sync escalation gh calls to the fork (GH_REPO)\n9fbc6aa4 feat(t3x): on-demand agent to resolve escalated upstream-sync conflicts\n70ad31cd fix(t3x): make sync escalation always open the t3x-sync issue\n41ba2b03 fix(mobile): iOS Shift+Return inserts a newline instead of submitting\n683ffe4f feat(mobile): queue/send from the keyboard Return key\n29fcc57e chore(t3x): auto-build on a 12h cadence, not every main commit\n8493ab37 fix(notifications): final-review fixes \u2014 web notification guard, desktop coalescing, draft-route suppression\nce39aa1a feat(web): needs-input notification setting and web permission UX\n717f8088 feat(web): notification coordinator with platform shim and click-to-navigate\nf1c9dc90 feat(desktop): native OS notification IPC with click-to-reveal activation\n2de8535f feat(web): add pure needs-attention tracker and suppression logic\na2ea115b feat(contracts): add notifyOnNeedsInput setting and DesktopBridge notification surface\n06e2d743 fix(server): reconcile crash-frozen `running` turns to interrupted on boot\ne9e93a3f test(server): cover non-spawn `--version` failure mapping to available\n79e03e6e fix(server): treat slow `az --version` as present, not missing\n563680ee fix(t3x): don't cancel auto-resume as thread-advanced when the limited turn settles\n6fd14e66 fix(t3x): auto-build fixes found running it for real\n21cc876c docs(t3x): correct which .app a default auto-build replaces\n1c9a77c1 fix(t3x): resolve adversarial-review findings in auto-build\n66685f5e fix(t3x): resolve auto-build review findings\n96b2f57e fix(t3x): strip trailing newline from auto-build status JSON values\nb5fe17dc feat(t3x): auto-build & install the desktop app on change\n22c60cc2 fix(t3x): prototype-chain threadId corrupted the auto-resume state file\n37c53695 test(t3x): route-level tests for /api/t3x/auto-resume\n2b01760e docs(t3x): record the auto-resume UI seams\nb7034a5f feat(t3x): per-thread auto-resume overlay in the thread view\neee973b4 feat(t3x): authenticated /api/t3x/auto-resume route\n080a202c feat(t3x): per-thread auto-resume switch (server state + gating)\n68ebc17a docs(t3x): design + plan for per-thread auto-resume UI (floating card)\n464e57ab docs(t3x): plan for auto-build + install desktop app on change\n0ed35ba9 fix(t3x): resolve third-pass verified review findings\n0c45e5fb docs(t3x): align auto-resume spec with final implementation\nb6e71110 fix(t3x): resolve adversarial-review findings across auto-resume + sync\n91ecb7f2 feat(t3x): usage-limit auto-resume reactor (Project B)\n1134cd6f docs/ci(t3x): incorporate adversarial review findings\nfe5866ab feat(t3x): fork setup + daily upstream sync + weekly verify (Project A)\nd5f52c75 docs(t3x): add fork-sync and usage-limit auto-resume design specs\n",
  "detail": "rebase aborted; working tree restored\n"
}

---

▶ To fix: comment @claude resolve on this issue (or run the t3x sync resolve (agent) workflow). An agent replays the rebase, resolves the conflicts, runs typecheck/lint/test, and opens a PR for review — nothing is pushed to main. Runbook: docs/t3x/sync-agent-runbook.md.

[radroid]

Landed by force-updating main to 1c9a216 (the GitHub merge button does not apply — the branch is a rebase onto upstream, so main was not an ancestor).

Resolved locally rather than via the CI resolver: the range was 45 upstream commits against 49 fork patches, and the one prior successful resolve used 81% of its 45-minute budget on a smaller range.

Four conflicts, all resolved by intent:

• packages/contracts/src/settings.test.ts (twice) — the reported conflict. Upstream's environmentIdentificationMode block collided with the fork's notifyOnNeedsInput block at the same anchor. Resolved by dropping the fork hunk entirely, so the replayed patch series no longer touches that file at all. This is the durable fix — PR t3x: shrink the upstream conflict surface and fix the Claude multi-account docs #31 moved the coverage to a fork-owned t3x/ sibling first.
• apps/web/src/components/settings/SettingsPanels.tsx — upstream split the appearance settings into a new panel, so the rebase tried to place the fork's notificationPermission state in AppearanceSettingsPanel while its UI row had landed in GeneralSettingsPanel. Taking both sides would have duplicated three upstream hooks. Kept upstream's side; moved the fork's state to the panel that uses it.
• pnpm-lock.yaml — took upstream's lock and regenerated.

Note for next time: the other two "culprit commits" in the escalation JSON were false positives — sync-upstream.sh lists every commit that touched the file, not the ones that conflict.

Verification: 49/49 patches replayed, none dropped · typecheck 0 · lint 0 · 5,370 tests · fork CI green · four independent seam reviews SAFE · independent model review approved.

CI was red on an inherited upstream test (stashImageCompression) timing out at 15s. A control run on pristine upstream/main proved it was not a rebase defect; fixed in the fork-owned t3x-ci.yml rather than by patching apps/web/vite.config.ts, which would have added a 35th seam row.

Rollback point if needed: t3x/local-presync-2c59e5c8f (= the pre-sync main).