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

[github-actions]

Automated daily upstream sync could not complete.

Result: conflict
Recovery tag: coil/last-good-20260812-090018
Run: https://github.com/radroid/t3code/actions/runs/31580859935

status JSON

{
 "kind": "daily",
 "result": "conflict",
 "upstream_range": "5a846148 fix(web): align the composer model picker (#6252)\n63e6faef chore: add dara to vouched (#6259)\nd37a9b09 feat(mobile): add thread title regeneration (#6253)\n560d4a45 fix(web): keep sidebar wordmark visible at minimum width (#6246)\n52e5a75a feat(web): compact sidebar footer actions (#6210)\nc196f422 fix(web): clean up composer resize animation (#6209)\nf0b57ca2 feat(web): add Open VSX theme search (#5654)\n2db08457 fix(web): use upload icon for disabled push action (#6207)\n083fa4ab feat(web): use OKLCH for theme palettes (#6036)\n35172010 fix(web): use a clearer pull action icon (#6194)\n57b10526 fix(web): thread error banner dismiss survives reconnect and rerenders (#6123)\n1e355a2a fix(web): render dropdowns above toasts (#6165)\n44621c34 feat(web): add back buttons for the pull requests and usage pages in the sidebar footer (#6031)\n220e573b fix(shared): detect Azure DevOps SSH remotes (ssh.dev.azure.com) (#6187)\n6befe42e fix(shared): normalize a bare Windows drive root the same as C:\\ / C:/ (#6189)\nb30a9bc4 feat(web): make environment artwork theme aware (#6183)\nac4780f4 fix(web): restore typography font sizes to defaults (#6172)\n3da7f9c5 fix(mobile): guard App Store release versions (#6177)\nc842c6f5 Add hourly past-24-hour usage view (#6170)\n6676f9c8 fix(mobile): stabilize thread composer and interactions (#5986)\n65b005f1 feat(web): add Copy Thread ID to the sidebar and chat header thread context menu (#5574)\n752acbf6 feat: add ability to create a new thread in the current project with shift+click and show shortcut in tooltip (#5994)\nf5fce741 fix(pull-requests): route self-hosted GitLab remotes (#6061)\n9c7622da fix(server): handle unborn HEAD in VCS status (#5944)\nc14bcca1 fix(server): advertise 256-color TERM on Windows terminals (#5693)\n1fa315ea fix(server): skip Linux libc detection on Windows/macOS (#5354)\nf9730979 perf(web): skip base64 for oversized image candidates (#5220)\n59d0c922 fix(web): persist sidebar shelf collapse state (#5136)\n2ea51bd3 fix(server): OpenCode model parsing drops models with a slash in the JSON body (#5072)\ne5c82d79 fix(mobile): keep chat composer above the Android gesture bar (#5988)\n9afef94a feat: add three-hour snooze option (#5914)\na7b0366c fix(web): account for Windows window controls in PR page header (#6049)\n428d9f9f Allow Android tablets to rotate (#5613)\n1b120f35 fix(ci): extend release publish timeout (#6034)\n0a7c662d fix(web): improve built-in theme contrast (#6000)\nb91a000a feat(web): add duplicate action to the T3 Code default theme (#6013)\n8de0aa24 perf(desktop): probe the Windows shell environment concurrently (#5878)\ncad2c936 feat: multi-provider pull requests page with in-app reviews (#4849)\n",
 "upstream_head": "5a84614809b6e853b872f9e57ff4b97e9df5df02\n",
 "conflicted_files": "apps/mobile/src/features/threads/ThreadComposer.tsx \n",
 "culprit_commits": "6676f9c8 fix(mobile): stabilize thread composer and interactions (#5986)\n",
 "failing_step": "\n",
 "dropped_patches": "\n",
 "patch_manifest": "56a5b2db Merge pull request #90 from radroid/t3x/coil-relay-shim-host\n9b981116 fix(coil): reach the renamed relay through a service binding (#71)\n15c6e723 Merge pull request #88 from radroid/t3x/coil-rename\n34ede74d fix(coil): make --rotate emit the CI secret commands itself (#71)\n169c8a27 fix(coil): finish the certificate rotation and list all 47 rows in the ledger (#71)\n5af5ad71 chore(coil): re-record the designated requirement after the certificate rotation\n61d38fba fix(coil): compute the build-counter offset in bash, not in an expression (#71)\n29137c59 fix(coil): repoint the last references to moved files (#71)\n2c12f0dd style(coil): format the files this rename touched (#71)\n5adcad76 docs(coil): re-baseline the seam ledger and correct the runbooks (#71)\n08561974 fix(coil): carry PRs #78 and #84 across the rename (#71)\nbac87413 feat(coil): move the relay, keeping the old hostname alive as a proxy (#71)\n9435bb75 feat(coil): cut the sync automation over to coil names (#71)\necefeba7 feat(coil): move the release identity, offsetting the counter so clients keep updating (#71)\n2666bcd7 feat(coil): rename the app to T3 Coil, with its own bundle id and certificate (#71)\nbb20d52f refactor(coil): move the fork's directories and symbols off t3x (#71)\n431fd909 docs(coil): design the t3x -> coil rename around its four silent failures (#71)\nbc9730cd fix(deps): clear the sharp and @hono/node-server advisories by re-resolution (#58) (#87)\nf45bb46c Merge pull request #78 from radroid/t3x/install-instructions\n50eda595 feat(coil): put the real install steps on the download page, from one source (#72)\ne44bf26b Merge pull request #84 from radroid/t3x/coil-og-card\n69ab1832 Merge pull request #86 from radroid/t3x/sync-push-workflow-scope\n1b3a6b65 Merge pull request #81 from radroid/t3x/steering-cleanup\n60e55271 fix(t3x): push the sync as a workflow-scoped token, and escalate when it fails\n0f020ed4 fix(web): steering-path leftovers from the queue transition (#40 A1-A4)\na5e2abcc Merge pull request #80 from radroid/t3x/auto-resume-user-message\n456b7bdb Merge pull request #85 from radroid/t3x/mac-signing\n4e1f44d6 Merge pull request #82 from radroid/t3x/outbox-edit-race\ne5a71479 Merge pull request #77 from radroid/t3x/autobuild-launchd-path\nda5c939a Merge pull request #79 from radroid/t3x/win-exit-diagnostics\n5e1bf197 Merge pull request #73 from radroid/t3code/worklog-daily-report-skill\na47c41a5 docs(t3x): note that the trusted certificate is listed twice, and why that is fine\na0835090 docs(t3x): correct the runbook's seam claim \u2014 the bundle id spends one upstream line\n34f73e0e fix(t3x): pin the designated requirement the fork's identity produces (#70)\n003e6b14 fix(t3x): give the fork its own bundle id, so it stops sharing TCC rows with upstream (#70)\n167aa6f8 fix(t3x): sign the macOS build with a stable identity so permission grants survive updates (#70)\na6ba47ab feat(coil): a real link-preview card for shared URLs\ncff11854 fix(web): an edit saved during dispatch no longer disappears (#40 A5)\n3e954a62 fix(t3x): stop a user message destroying a pending auto-resume\nabbbfcd2 fix(t3x): the Windows transient-crash retry could never fire; classify on the code vp prints (#47)\n440ee34e fix(t3x): derive and verify the autobuild agent's PATH, and correct the runbook interval (#41)\ndb5fef00 docs(worklog): write down how the skill actually gets installed (#65)\n39be659e fix(worklog): satisfy the repo lint rules the suite files were breaking (#65)\n29000937 Merge pull request #76 from radroid/t3x/release-retry-window\ne072ee6f fix(t3x): widen the release retry window past the observed 403 duration\n8e4d64c9 Merge pull request #75 from radroid/t3x/coil-deploy-verify\n0c466b51 fix(coil): stop the deploy verify step failing on Cloudflare bot mitigation\ncaf00658 Merge pull request #74 from radroid/t3x/coil-deploy-pnpm\n826d574f fix(coil): put pnpm on PATH in the homepage deploy workflow\nab6f6f0a Merge pull request #69 from radroid/t3x/homepage\nb482dc43 docs(coil): fix the stale deploy-workflow pointer, note the secret is set\necc64cab fix(worklog): correct the numbers the report is built on (#65)\n9c946968 feat(t3x): add the /worklog daily work-log skill (#65)\n927109ff docs(coil): recapture the hero evidence with all five marks restored\nafc2f2ae fix(coil): bring the hero marks back on mobile as an in-flow row\n32063b9e docs(coil): recapture mobile evidence after the collision fix\nacc3476f fix(coil): stop the hero marks colliding with mobile content, equalise stacked buttons\n220de98c docs(coil): recapture the homepage evidence against coil.curlycloud.dev\n7197fa58 feat(coil): reposition the homepage as Coil, a personal fork\n86b86d72 docs(coil): design for repositioning the homepage as Coil\n10b56048 docs(t3x): capture homepage screenshots and a scroll-through for review\ndd45537a ci(t3x): pin the deploy wrangler exactly, not to a floating major\n4961da11 docs(t3x): record the fork homepage on the seam ledger and sync runbook\n96bbab59 ci(t3x): auto-deploy the homepage to Cloudflare on push to main\n0fd3a955 feat(t3x): deploy the homepage as a Cloudflare assets-only Worker\n7e9f598a feat(t3x): serve downloads from the fork's update-relay manifest and wire the sync strip\ncaa3fa5f feat(t3x): rebrand the homepage copy, chrome, and fork graph\n2a605374 feat(t3x): strip upstream-only social proof, store links, and legal pages\n99b83bf5 feat(t3x): seed the fork homepage from apps/marketing\n714b866b docs(t3x): record before/after capture for the capsule anchor fix (#67)\ndc065d78 fix(t3x): anchor the auto-resume capsule to the composer's measured box (#67)\ndbb7c658 fix(t3x): retry the relay notify, and surface DO failures as readable 503s (#66)\n4882a70c docs(t3x): re-baseline the seam ledger against upstream v0.0.33\na060afd1 docs(t3x): record the mobile sendLabel mirror on the ledger\n8154b6d3 docs(t3x): re-baseline the seam ledger against the follow-up merge-base\n295e89f2 fix(deps): restore the security sweep's resolutions lost in the sync\n4a11f68f docs(t3x): re-baseline the seam ledger against the 2026-08-08 merge-base\naedc29af test(t3x): retime the tolerant-budget tests to upstream's new retry ladder\n0c30af89 fix(t3x): drop the settings imports upstream stopped needing\ne2a92c1d fix(t3x): give the crash-recovery test the registries upstream added\n77ab4ec8 chore(deps): regenerate the lockfile against the 2026-08-08 upstream tree\n67fb23e8 docs(t3x): archive the Loop Watch design before its branch is deleted\nc33e5a36 fix(t3x): put ~/.cargo/bin on the autobuild agent's PATH\na75fdd12 fix(t3x): track the composer's top edge so banners cannot cover the capsule\n6135345c fix(t3x): align the auto-resume capsule with the composer's right edge\neefaf4be fix(t3x): put the auto-resume capsule back above the composer\n6ef96180 fix(t3x): pin the countdown width, spring the toggle, move the capsule top-right\nc40fdfe5 fix(t3x): make auto-resume teardown re-armable so StrictMode cannot kill it\n875345d0 feat(t3x): rebuild the auto-resume capsule and cover it with tests\n15283572 chore(t3x): stop Dependabot re-failing on advisories it cannot fix\n3ba9e655 fix(t3x): stop a transient 403 from discarding a whole release build\n37ccb2b1 feat(t3x): verify the install actually happened, and offer to report it when it did not\n603607b2 fix(t3x): stop calling the Windows update a restart\n4b84d6b6 Update toast: changelog-forward design, and a restart that waits for you (#55)\nd949cdcb chore(deps): dedupe nanoid onto 3.3.17, closing the two alerts the sweep reopened\nccafbe04 chore(deps): clear 56 of the 62 open transitive advisories in the root lockfile\n1ee1ca2a chore(deps): bump electron to 41.10.3, and stop Dependabot on the vendored subtrees\n14686df8 docs(t3x): put the manual-install commands on the release page\n2ce231b3 fix(t3x): follow the 302 on GitHub release asset downloads\n8fbbe730 fix(t3x): actually serialise the release bundle build\nabc569b0 fix(t3x): scope ensure:electron, and refuse updates without a release counter\n3c8b3df8 fix(t3x): wait for the condition in the auto-resume reactor tests\n8ae17079 Update delivery: CI builds, relay pushes, the app offers a restart (#51)\na0184e11 ci(t3x): raise the hook timeout alongside the test timeout\n8cfe5665 docs(t3x): remeasure the seam ledger against the 2026-08-02 merge-base\n43c128a1 fix(t3x): adapt the crash-recovery startup test to upstream's new startup internals\nc1487807 fix(web): keep the queue's reorder controls usable, and leave a dispatch trail (#35)\n0319f00e feat(web): steer a running turn instead of queuing behind it (#35)\n180c654f feat(web): make the thread outbox read as composer chrome, and let it be reordered (#35)\nfb2c3f6d docs(t3x): point the self-reference rule at the renamed Claude doc\n8dd65659 docs(t3x): follow upstream's rename of the Claude provider doc\n208cb618 docs(t3x): remeasure the seam ledger against the 2026-07-30 merge-base\n56a39853 fix(web): apply upstream's detail-loading send gate to the queue path\n1f73d954 fix(t3x): apply the sync test-timeout to every gate, not just fork CI (#32)\nacf30fa8 ci(t3x): raise the test timeout for the fork's slower runners\n73d0f972 docs(t3x): replace the fictional seam ledger with a measured one\n45dc8aad docs(providers): fix the broken Claude multi-account recipe\naee298b3 test(t3x): move fork settings coverage out of the upstream test file\n6feb09f6 feat(t3x): auto-build from origin/main in a dedicated worktree\nd662461b fix(client-runtime): reset tolerant reconnect budget across a network drop\n4ef31f61 fix(web): address Web Push review findings (reactor priming, VAPID recovery, cleanup)\nfd7baccb feat(web): closed-tab Web Push notifications (SW + PWA + server VAPID push)\n4f7c743a fix(connection): tolerate a slow-but-alive local backend + heap headroom\n9057996d feat(web): queue messages while a chat is running (thread outbox)\nb0d0ba19 ci(t3x): add fork-runnable PR/main verify gate (t3x-ci.yml)\nb6b5837b docs(t3x): document how to land a sync PR (force-update, not merge button)\ne87a7d91 fix(t3x): resolve pre-existing typecheck/lint red on fork test files\n1963464c fix(t3x): pin sync escalation gh calls to the fork (GH_REPO)\n4a2a4cb9 feat(t3x): on-demand agent to resolve escalated upstream-sync conflicts\n44fdee1c fix(t3x): make sync escalation always open the t3x-sync issue\nd56f891d fix(mobile): iOS Shift+Return inserts a newline instead of submitting\n3f0f4131 feat(mobile): queue/send from the keyboard Return key\n4232eb59 chore(t3x): auto-build on a 12h cadence, not every main commit\n362baa81 fix(notifications): final-review fixes \u2014 web notification guard, desktop coalescing, draft-route suppression\n36ca0e15 feat(web): needs-input notification setting and web permission UX\n3fa27363 feat(web): notification coordinator with platform shim and click-to-navigate\n52fa984e feat(desktop): native OS notification IPC with click-to-reveal activation\na4abc1bc feat(web): add pure needs-attention tracker and suppression logic\nd7ef2670 feat(contracts): add notifyOnNeedsInput setting and DesktopBridge notification surface\n0757729b fix(server): reconcile crash-frozen `running` turns to interrupted on boot\nbfd1dfe6 test(server): cover non-spawn `--version` failure mapping to available\nbf5eacd3 fix(server): treat slow `az --version` as present, not missing\n9b39b878 fix(t3x): don't cancel auto-resume as thread-advanced when the limited turn settles\n085785e3 fix(t3x): auto-build fixes found running it for real\n03300445 docs(t3x): correct which .app a default auto-build replaces\n1eba45cb fix(t3x): resolve adversarial-review findings in auto-build\n1348fa23 fix(t3x): resolve auto-build review findings\nfb24d941 fix(t3x): strip trailing newline from auto-build status JSON values\n324123fb feat(t3x): auto-build & install the desktop app on change\na650f5d7 fix(t3x): prototype-chain threadId corrupted the auto-resume state file\nfbf153bb test(t3x): route-level tests for /api/t3x/auto-resume\ncda71ac0 docs(t3x): record the auto-resume UI seams\ndf9b864a feat(t3x): per-thread auto-resume overlay in the thread view\n99700d81 feat(t3x): authenticated /api/t3x/auto-resume route\nb4a4b404 feat(t3x): per-thread auto-resume switch (server state + gating)\n8bd13f91 docs(t3x): design + plan for per-thread auto-resume UI (floating card)\n3240f026 docs(t3x): plan for auto-build + install desktop app on change\nfd65aa57 fix(t3x): resolve third-pass verified review findings\n6d4e584d docs(t3x): align auto-resume spec with final implementation\n3fa76a39 fix(t3x): resolve adversarial-review findings across auto-resume + sync\n1567e811 feat(t3x): usage-limit auto-resume reactor (Project B)\n2c1a6d43 docs/ci(t3x): incorporate adversarial review findings\n4afaac6d feat(t3x): fork setup + daily upstream sync + weekly verify (Project A)\n2f4149f2 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 coil 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/coil/sync-agent-runbook.md.

[github-actions]

Automated daily upstream sync could not complete.

Result: conflict
Recovery tag: coil/last-good-20260813-090218
Run: https://github.com/radroid/t3code/actions/runs/31684645721

status JSON

{
 "kind": "daily",
 "result": "conflict",
 "upstream_range": "df19f6cf fix(server): align Codex collaboration prompts (#6432)\n6bc6cb6b fix(web): keep diff file lists scrollable past expanded files (#6423)\n1e59b4c4 fix(web): keep the typed prompt when a draft changes repo (#6393)\n33f97059 fix(web): make reset zoom hover visible (#6385)\nda6253b3 web/settings: fix source control scan on relay environments (#6230)\nac1264e2 feat(web): project favicon and workspace icons in command subtitles (#6330)\n2eb099fd fix(web): cmd+click sidebar PR numbers open in the browser (#6378)\nb28f9bf0 feat(web): pull request surfaces \u2014 filters & qualifiers, all-server listing, update branch, reactions, in-place editing, smarter diffs (#6039)\nd0b8d630 feat(connect): deregister account environments from any client (#4844)\n9666b875 fix(web): preserve appearance mode when changing themes (#6343)\ne3a9c251 test(mobile): seed snoozed showcase threads (#5155)\n18918d1c Fix mobile command popover glass rendering (#6370)\n8d24b513 fix(web): open modified PR clicks in browser (#6278)\n770946d0 fix(web): render tooltips above dropdowns (#6241)\n86017972 fix(web): align update toast release notes link (#6322)\nb73232bd feat(web): reset sidebar width on double click (#6320)\nf131228a fix(web): theme Clerk surfaces (#6300)\ne321667b fix(web): prevent changed files header overlap (#6314)\n849bac89 fix(connect): preserve CLI OAuth parameters through browser sign-in (#6285)\n6fd088af fix(web): align mobile onboarding header (#6293)\nb54bfc93 feat(web): a better right panel empty state (#6258)\ne1378a1f fix(mobile): keep ordered lists inside user bubbles (#6154)\n5a846148 fix(web): align the composer model picker (#6252)\n63e6faef chore: add dara to vouched (#6259)\nd37a9b09 feat(mobile): add thread title regeneration (#6253)\n560d4a45 fix(web): keep sidebar wordmark visible at minimum width (#6246)\n52e5a75a feat(web): compact sidebar footer actions (#6210)\nc196f422 fix(web): clean up composer resize animation (#6209)\nf0b57ca2 feat(web): add Open VSX theme search (#5654)\n2db08457 fix(web): use upload icon for disabled push action (#6207)\n083fa4ab feat(web): use OKLCH for theme palettes (#6036)\n35172010 fix(web): use a clearer pull action icon (#6194)\n57b10526 fix(web): thread error banner dismiss survives reconnect and rerenders (#6123)\n1e355a2a fix(web): render dropdowns above toasts (#6165)\n44621c34 feat(web): add back buttons for the pull requests and usage pages in the sidebar footer (#6031)\n220e573b fix(shared): detect Azure DevOps SSH remotes (ssh.dev.azure.com) (#6187)\n6befe42e fix(shared): normalize a bare Windows drive root the same as C:\\ / C:/ (#6189)\nb30a9bc4 feat(web): make environment artwork theme aware (#6183)\nac4780f4 fix(web): restore typography font sizes to defaults (#6172)\n3da7f9c5 fix(mobile): guard App Store release versions (#6177)\nc842c6f5 Add hourly past-24-hour usage view (#6170)\n6676f9c8 fix(mobile): stabilize thread composer and interactions (#5986)\n65b005f1 feat(web): add Copy Thread ID to the sidebar and chat header thread context menu (#5574)\n752acbf6 feat: add ability to create a new thread in the current project with shift+click and show shortcut in tooltip (#5994)\nf5fce741 fix(pull-requests): route self-hosted GitLab remotes (#6061)\n9c7622da fix(server): handle unborn HEAD in VCS status (#5944)\nc14bcca1 fix(server): advertise 256-color TERM on Windows terminals (#5693)\n1fa315ea fix(server): skip Linux libc detection on Windows/macOS (#5354)\nf9730979 perf(web): skip base64 for oversized image candidates (#5220)\n59d0c922 fix(web): persist sidebar shelf collapse state (#5136)\n2ea51bd3 fix(server): OpenCode model parsing drops models with a slash in the JSON body (#5072)\ne5c82d79 fix(mobile): keep chat composer above the Android gesture bar (#5988)\n9afef94a feat: add three-hour snooze option (#5914)\na7b0366c fix(web): account for Windows window controls in PR page header (#6049)\n428d9f9f Allow Android tablets to rotate (#5613)\n1b120f35 fix(ci): extend release publish timeout (#6034)\n0a7c662d fix(web): improve built-in theme contrast (#6000)\nb91a000a feat(web): add duplicate action to the T3 Code default theme (#6013)\n8de0aa24 perf(desktop): probe the Windows shell environment concurrently (#5878)\ncad2c936 feat: multi-provider pull requests page with in-app reviews (#4849)\n",
 "upstream_head": "df19f6cfe3046dbbeb4073a3aac4c12f991b8fc7\n",
 "conflicted_files": "apps/mobile/src/features/threads/ThreadComposer.tsx \n",
 "culprit_commits": "6676f9c8 fix(mobile): stabilize thread composer and interactions (#5986)\n",
 "failing_step": "\n",
 "dropped_patches": "\n",
 "patch_manifest": "e7ad1959 Merge pull request #100 from radroid/coil/clone-failure-diagnostics\ndf1139d2 fix(server): name why a clone failed, and which provider it was\nc52a8aa1 Merge pull request #99 from radroid/coil/disable-upstream-update-feed\n8bc7c5a4 fix(coil): stop shipping upstream's update feed, which we never actually disabled\ndeffbbc5 Merge pull request #97 from radroid/coil/fix-release-bundle-checks\n5ee76a87 fix(coil): restore the release, and make two of its checks capable of failing\nda8bd187 Merge pull request #96 from radroid/coil/github-latest-release\n565830d5 Merge pull request #95 from radroid/coil/update-toast-permission-note\nd854dbd1 Merge pull request #89 from radroid/t3x/desktop-bundle-size\n408f26cc fix(coil): publish a canonical Latest release, and re-arm retention\n0143984b fix(coil): tell the truth about the one macOS prompt an update raises\n1a4ec3b2 docs(coil): design a canonical Latest release for the fork\n451c5d1d perf(coil): halve the desktop release bundle (#53)\n4b9df5bf Merge pull request #94 from radroid/coil/finish-app-rename\n0effff8e docs(coil): re-baseline the ledger for the sidebar wordmark row\ne77aaf3e feat(coil): finish the app rename at the surfaces that name the app (#71)\n136b3514 Merge pull request #93 from radroid/t3x/seams-stale-paths\n737cd0e6 docs(coil): repoint two ledger citations at the paths #71 moved\nfdeb5284 Merge pull request #92 from radroid/t3x/retire-autobuild\nd4c3f9cc refactor(coil): retire the local desktop autobuild\n56a5b2db Merge pull request #90 from radroid/t3x/coil-relay-shim-host\n9b981116 fix(coil): reach the renamed relay through a service binding (#71)\n15c6e723 Merge pull request #88 from radroid/t3x/coil-rename\n34ede74d fix(coil): make --rotate emit the CI secret commands itself (#71)\n169c8a27 fix(coil): finish the certificate rotation and list all 47 rows in the ledger (#71)\n5af5ad71 chore(coil): re-record the designated requirement after the certificate rotation\n61d38fba fix(coil): compute the build-counter offset in bash, not in an expression (#71)\n29137c59 fix(coil): repoint the last references to moved files (#71)\n2c12f0dd style(coil): format the files this rename touched (#71)\n5adcad76 docs(coil): re-baseline the seam ledger and correct the runbooks (#71)\n08561974 fix(coil): carry PRs #78 and #84 across the rename (#71)\nbac87413 feat(coil): move the relay, keeping the old hostname alive as a proxy (#71)\n9435bb75 feat(coil): cut the sync automation over to coil names (#71)\necefeba7 feat(coil): move the release identity, offsetting the counter so clients keep updating (#71)\n2666bcd7 feat(coil): rename the app to T3 Coil, with its own bundle id and certificate (#71)\nbb20d52f refactor(coil): move the fork's directories and symbols off t3x (#71)\n431fd909 docs(coil): design the t3x -> coil rename around its four silent failures (#71)\nbc9730cd fix(deps): clear the sharp and @hono/node-server advisories by re-resolution (#58) (#87)\nf45bb46c Merge pull request #78 from radroid/t3x/install-instructions\n50eda595 feat(coil): put the real install steps on the download page, from one source (#72)\ne44bf26b Merge pull request #84 from radroid/t3x/coil-og-card\n69ab1832 Merge pull request #86 from radroid/t3x/sync-push-workflow-scope\n1b3a6b65 Merge pull request #81 from radroid/t3x/steering-cleanup\n60e55271 fix(t3x): push the sync as a workflow-scoped token, and escalate when it fails\n0f020ed4 fix(web): steering-path leftovers from the queue transition (#40 A1-A4)\na5e2abcc Merge pull request #80 from radroid/t3x/auto-resume-user-message\n456b7bdb Merge pull request #85 from radroid/t3x/mac-signing\n4e1f44d6 Merge pull request #82 from radroid/t3x/outbox-edit-race\ne5a71479 Merge pull request #77 from radroid/t3x/autobuild-launchd-path\nda5c939a Merge pull request #79 from radroid/t3x/win-exit-diagnostics\n5e1bf197 Merge pull request #73 from radroid/t3code/worklog-daily-report-skill\na47c41a5 docs(t3x): note that the trusted certificate is listed twice, and why that is fine\na0835090 docs(t3x): correct the runbook's seam claim \u2014 the bundle id spends one upstream line\n34f73e0e fix(t3x): pin the designated requirement the fork's identity produces (#70)\n003e6b14 fix(t3x): give the fork its own bundle id, so it stops sharing TCC rows with upstream (#70)\n167aa6f8 fix(t3x): sign the macOS build with a stable identity so permission grants survive updates (#70)\na6ba47ab feat(coil): a real link-preview card for shared URLs\ncff11854 fix(web): an edit saved during dispatch no longer disappears (#40 A5)\n3e954a62 fix(t3x): stop a user message destroying a pending auto-resume\nabbbfcd2 fix(t3x): the Windows transient-crash retry could never fire; classify on the code vp prints (#47)\n440ee34e fix(t3x): derive and verify the autobuild agent's PATH, and correct the runbook interval (#41)\ndb5fef00 docs(worklog): write down how the skill actually gets installed (#65)\n39be659e fix(worklog): satisfy the repo lint rules the suite files were breaking (#65)\n29000937 Merge pull request #76 from radroid/t3x/release-retry-window\ne072ee6f fix(t3x): widen the release retry window past the observed 403 duration\n8e4d64c9 Merge pull request #75 from radroid/t3x/coil-deploy-verify\n0c466b51 fix(coil): stop the deploy verify step failing on Cloudflare bot mitigation\ncaf00658 Merge pull request #74 from radroid/t3x/coil-deploy-pnpm\n826d574f fix(coil): put pnpm on PATH in the homepage deploy workflow\nab6f6f0a Merge pull request #69 from radroid/t3x/homepage\nb482dc43 docs(coil): fix the stale deploy-workflow pointer, note the secret is set\necc64cab fix(worklog): correct the numbers the report is built on (#65)\n9c946968 feat(t3x): add the /worklog daily work-log skill (#65)\n927109ff docs(coil): recapture the hero evidence with all five marks restored\nafc2f2ae fix(coil): bring the hero marks back on mobile as an in-flow row\n32063b9e docs(coil): recapture mobile evidence after the collision fix\nacc3476f fix(coil): stop the hero marks colliding with mobile content, equalise stacked buttons\n220de98c docs(coil): recapture the homepage evidence against coil.curlycloud.dev\n7197fa58 feat(coil): reposition the homepage as Coil, a personal fork\n86b86d72 docs(coil): design for repositioning the homepage as Coil\n10b56048 docs(t3x): capture homepage screenshots and a scroll-through for review\ndd45537a ci(t3x): pin the deploy wrangler exactly, not to a floating major\n4961da11 docs(t3x): record the fork homepage on the seam ledger and sync runbook\n96bbab59 ci(t3x): auto-deploy the homepage to Cloudflare on push to main\n0fd3a955 feat(t3x): deploy the homepage as a Cloudflare assets-only Worker\n7e9f598a feat(t3x): serve downloads from the fork's update-relay manifest and wire the sync strip\ncaa3fa5f feat(t3x): rebrand the homepage copy, chrome, and fork graph\n2a605374 feat(t3x): strip upstream-only social proof, store links, and legal pages\n99b83bf5 feat(t3x): seed the fork homepage from apps/marketing\n714b866b docs(t3x): record before/after capture for the capsule anchor fix (#67)\ndc065d78 fix(t3x): anchor the auto-resume capsule to the composer's measured box (#67)\ndbb7c658 fix(t3x): retry the relay notify, and surface DO failures as readable 503s (#66)\n4882a70c docs(t3x): re-baseline the seam ledger against upstream v0.0.33\na060afd1 docs(t3x): record the mobile sendLabel mirror on the ledger\n8154b6d3 docs(t3x): re-baseline the seam ledger against the follow-up merge-base\n295e89f2 fix(deps): restore the security sweep's resolutions lost in the sync\n4a11f68f docs(t3x): re-baseline the seam ledger against the 2026-08-08 merge-base\naedc29af test(t3x): retime the tolerant-budget tests to upstream's new retry ladder\n0c30af89 fix(t3x): drop the settings imports upstream stopped needing\ne2a92c1d fix(t3x): give the crash-recovery test the registries upstream added\n77ab4ec8 chore(deps): regenerate the lockfile against the 2026-08-08 upstream tree\n67fb23e8 docs(t3x): archive the Loop Watch design before its branch is deleted\nc33e5a36 fix(t3x): put ~/.cargo/bin on the autobuild agent's PATH\na75fdd12 fix(t3x): track the composer's top edge so banners cannot cover the capsule\n6135345c fix(t3x): align the auto-resume capsule with the composer's right edge\neefaf4be fix(t3x): put the auto-resume capsule back above the composer\n6ef96180 fix(t3x): pin the countdown width, spring the toggle, move the capsule top-right\nc40fdfe5 fix(t3x): make auto-resume teardown re-armable so StrictMode cannot kill it\n875345d0 feat(t3x): rebuild the auto-resume capsule and cover it with tests\n15283572 chore(t3x): stop Dependabot re-failing on advisories it cannot fix\n3ba9e655 fix(t3x): stop a transient 403 from discarding a whole release build\n37ccb2b1 feat(t3x): verify the install actually happened, and offer to report it when it did not\n603607b2 fix(t3x): stop calling the Windows update a restart\n4b84d6b6 Update toast: changelog-forward design, and a restart that waits for you (#55)\nd949cdcb chore(deps): dedupe nanoid onto 3.3.17, closing the two alerts the sweep reopened\nccafbe04 chore(deps): clear 56 of the 62 open transitive advisories in the root lockfile\n1ee1ca2a chore(deps): bump electron to 41.10.3, and stop Dependabot on the vendored subtrees\n14686df8 docs(t3x): put the manual-install commands on the release page\n2ce231b3 fix(t3x): follow the 302 on GitHub release asset downloads\n8fbbe730 fix(t3x): actually serialise the release bundle build\nabc569b0 fix(t3x): scope ensure:electron, and refuse updates without a release counter\n3c8b3df8 fix(t3x): wait for the condition in the auto-resume reactor tests\n8ae17079 Update delivery: CI builds, relay pushes, the app offers a restart (#51)\na0184e11 ci(t3x): raise the hook timeout alongside the test timeout\n8cfe5665 docs(t3x): remeasure the seam ledger against the 2026-08-02 merge-base\n43c128a1 fix(t3x): adapt the crash-recovery startup test to upstream's new startup internals\nc1487807 fix(web): keep the queue's reorder controls usable, and leave a dispatch trail (#35)\n0319f00e feat(web): steer a running turn instead of queuing behind it (#35)\n180c654f feat(web): make the thread outbox read as composer chrome, and let it be reordered (#35)\nfb2c3f6d docs(t3x): point the self-reference rule at the renamed Claude doc\n8dd65659 docs(t3x): follow upstream's rename of the Claude provider doc\n208cb618 docs(t3x): remeasure the seam ledger against the 2026-07-30 merge-base\n56a39853 fix(web): apply upstream's detail-loading send gate to the queue path\n1f73d954 fix(t3x): apply the sync test-timeout to every gate, not just fork CI (#32)\nacf30fa8 ci(t3x): raise the test timeout for the fork's slower runners\n73d0f972 docs(t3x): replace the fictional seam ledger with a measured one\n45dc8aad docs(providers): fix the broken Claude multi-account recipe\naee298b3 test(t3x): move fork settings coverage out of the upstream test file\n6feb09f6 feat(t3x): auto-build from origin/main in a dedicated worktree\nd662461b fix(client-runtime): reset tolerant reconnect budget across a network drop\n4ef31f61 fix(web): address Web Push review findings (reactor priming, VAPID recovery, cleanup)\nfd7baccb feat(web): closed-tab Web Push notifications (SW + PWA + server VAPID push)\n4f7c743a fix(connection): tolerate a slow-but-alive local backend + heap headroom\n9057996d feat(web): queue messages while a chat is running (thread outbox)\nb0d0ba19 ci(t3x): add fork-runnable PR/main verify gate (t3x-ci.yml)\nb6b5837b docs(t3x): document how to land a sync PR (force-update, not merge button)\ne87a7d91 fix(t3x): resolve pre-existing typecheck/lint red on fork test files\n1963464c fix(t3x): pin sync escalation gh calls to the fork (GH_REPO)\n4a2a4cb9 feat(t3x): on-demand agent to resolve escalated upstream-sync conflicts\n44fdee1c fix(t3x): make sync escalation always open the t3x-sync issue\nd56f891d fix(mobile): iOS Shift+Return inserts a newline instead of submitting\n3f0f4131 feat(mobile): queue/send from the keyboard Return key\n4232eb59 chore(t3x): auto-build on a 12h cadence, not every main commit\n362baa81 fix(notifications): final-review fixes \u2014 web notification guard, desktop coalescing, draft-route suppression\n36ca0e15 feat(web): needs-input notification setting and web permission UX\n3fa27363 feat(web): notification coordinator with platform shim and click-to-navigate\n52fa984e feat(desktop): native OS notification IPC with click-to-reveal activation\na4abc1bc feat(web): add pure needs-attention tracker and suppression logic\nd7ef2670 feat(contracts): add notifyOnNeedsInput setting and DesktopBridge notification surface\n0757729b fix(server): reconcile crash-frozen `running` turns to interrupted on boot\nbfd1dfe6 test(server): cover non-spawn `--version` failure mapping to available\nbf5eacd3 fix(server): treat slow `az --version` as present, not missing\n9b39b878 fix(t3x): don't cancel auto-resume as thread-advanced when the limited turn settles\n085785e3 fix(t3x): auto-build fixes found running it for real\n03300445 docs(t3x): correct which .app a default auto-build replaces\n1eba45cb fix(t3x): resolve adversarial-review findings in auto-build\n1348fa23 fix(t3x): resolve auto-build review findings\nfb24d941 fix(t3x): strip trailing newline from auto-build status JSON values\n324123fb feat(t3x): auto-build & install the desktop app on change\na650f5d7 fix(t3x): prototype-chain threadId corrupted the auto-resume state file\nfbf153bb test(t3x): route-level tests for /api/t3x/auto-resume\ncda71ac0 docs(t3x): record the auto-resume UI seams\ndf9b864a feat(t3x): per-thread auto-resume overlay in the thread view\n99700d81 feat(t3x): authenticated /api/t3x/auto-resume route\nb4a4b404 feat(t3x): per-thread auto-resume switch (server state + gating)\n8bd13f91 docs(t3x): design + plan for per-thread auto-resume UI (floating card)\n3240f026 docs(t3x): plan for auto-build + install desktop app on change\nfd65aa57 fix(t3x): resolve third-pass verified review findings\n6d4e584d docs(t3x): align auto-resume spec with final implementation\n3fa76a39 fix(t3x): resolve adversarial-review findings across auto-resume + sync\n1567e811 feat(t3x): usage-limit auto-resume reactor (Project B)\n2c1a6d43 docs/ci(t3x): incorporate adversarial review findings\n4afaac6d feat(t3x): fork setup + daily upstream sync + weekly verify (Project A)\n2f4149f2 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 coil 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/coil/sync-agent-runbook.md.

[github-actions]

Automated daily upstream sync could not complete.

Result: conflict
Recovery tag: coil/last-good-20260814-085722
Run: https://github.com/radroid/t3code/actions/runs/31785993521

status JSON

{
 "kind": "daily",
 "result": "conflict",
 "upstream_range": "21a3669c fix(mobile): prevent OTA update restart crashes (#6324)\nb3b4b577 fix(mobile): preserve keyboard suggestions while typing (#6323)\n6ae44b41 refactor(mobile): name the iOS nav bar height fallback (#6589)\n4a2f8b04 fix(web): keep thread rename open during IME composition (#6281)\n8f9ab084 fix(mobile): add breathing room between the git progress overlay and the app bar (#6587)\nbaaeda30 fix: avoid stale Live Activities when publishing is disabled (#6325)\n7e01d33f perf(build): stop unpacking node_modules wholesale from the Windows asar (#5877)\n9fd788b5 fix(preview): only show browser-ready local servers (#6021)\n710fd0ee feat(desktop): add favicons to the Browser panel (#5644)\ne15f655b fix(web): show background policy tooltips sooner (#6506)\n59be6f78 fix(web): simplify the desktop-managed server update banner copy (#6549)\n5304f3e9 chore(mobile): bump app version to 1.0.4\n85389b98 Nest mobile task settings in bottom sheets (#6224)\ndb1507e9 feat: allow disabling auto-settle on merge (#5880)\n96bfa67b fix(web): align the snoozed thread wake icon (#6215)\n5ff3a03a fix(web): align sidebar wordmark label (#6086)\n23d45d91 fix(web): restore default stage artwork colors (#6535)\nbad1143b fix(mobile): show a real settings cog in the Android sidebar header (#6520)\n92d4a2e9 fix(web): scope pull request errors to their environment (#6490)\n2fab18e2 fix(web): show unlinked icon when viewport aspect ratio is unlocked (#6509)\n1b16ed66 fix(web): avoid Clerk close button overlap (#6442)\n83ad26c3 fix(mobile): prevent invalid HTML entities from crashing markdown (#6495)\nfd51561b fix(mobile): extend blockquotes across wrapped lines (#6482)\n9e201941 Remove rebase requirement before opening PR (#6479)\n2ab188f1 fix: ignore pull request actions in latency tracker (#6476)\n9513e62e Add bil0000 to VOUCHED contributors list (#6462)\n97db94c9 fix(web): keep pull request panel within viewport (#6451)\n5015d7cf fix(web): keep turn minimap stable as composer grows (#6414)\ndf19f6cf fix(server): align Codex collaboration prompts (#6432)\n6bc6cb6b fix(web): keep diff file lists scrollable past expanded files (#6423)\n1e59b4c4 fix(web): keep the typed prompt when a draft changes repo (#6393)\n33f97059 fix(web): make reset zoom hover visible (#6385)\nda6253b3 web/settings: fix source control scan on relay environments (#6230)\nac1264e2 feat(web): project favicon and workspace icons in command subtitles (#6330)\n2eb099fd fix(web): cmd+click sidebar PR numbers open in the browser (#6378)\nb28f9bf0 feat(web): pull request surfaces \u2014 filters & qualifiers, all-server listing, update branch, reactions, in-place editing, smarter diffs (#6039)\nd0b8d630 feat(connect): deregister account environments from any client (#4844)\n9666b875 fix(web): preserve appearance mode when changing themes (#6343)\ne3a9c251 test(mobile): seed snoozed showcase threads (#5155)\n18918d1c Fix mobile command popover glass rendering (#6370)\n8d24b513 fix(web): open modified PR clicks in browser (#6278)\n770946d0 fix(web): render tooltips above dropdowns (#6241)\n86017972 fix(web): align update toast release notes link (#6322)\nb73232bd feat(web): reset sidebar width on double click (#6320)\nf131228a fix(web): theme Clerk surfaces (#6300)\ne321667b fix(web): prevent changed files header overlap (#6314)\n849bac89 fix(connect): preserve CLI OAuth parameters through browser sign-in (#6285)\n6fd088af fix(web): align mobile onboarding header (#6293)\nb54bfc93 feat(web): a better right panel empty state (#6258)\ne1378a1f fix(mobile): keep ordered lists inside user bubbles (#6154)\n5a846148 fix(web): align the composer model picker (#6252)\n63e6faef chore: add dara to vouched (#6259)\nd37a9b09 feat(mobile): add thread title regeneration (#6253)\n560d4a45 fix(web): keep sidebar wordmark visible at minimum width (#6246)\n52e5a75a feat(web): compact sidebar footer actions (#6210)\nc196f422 fix(web): clean up composer resize animation (#6209)\nf0b57ca2 feat(web): add Open VSX theme search (#5654)\n2db08457 fix(web): use upload icon for disabled push action (#6207)\n083fa4ab feat(web): use OKLCH for theme palettes (#6036)\n35172010 fix(web): use a clearer pull action icon (#6194)\n57b10526 fix(web): thread error banner dismiss survives reconnect and rerenders (#6123)\n1e355a2a fix(web): render dropdowns above toasts (#6165)\n44621c34 feat(web): add back buttons for the pull requests and usage pages in the sidebar footer (#6031)\n220e573b fix(shared): detect Azure DevOps SSH remotes (ssh.dev.azure.com) (#6187)\n6befe42e fix(shared): normalize a bare Windows drive root the same as C:\\ / C:/ (#6189)\nb30a9bc4 feat(web): make environment artwork theme aware (#6183)\nac4780f4 fix(web): restore typography font sizes to defaults (#6172)\n3da7f9c5 fix(mobile): guard App Store release versions (#6177)\nc842c6f5 Add hourly past-24-hour usage view (#6170)\n6676f9c8 fix(mobile): stabilize thread composer and interactions (#5986)\n65b005f1 feat(web): add Copy Thread ID to the sidebar and chat header thread context menu (#5574)\n752acbf6 feat: add ability to create a new thread in the current project with shift+click and show shortcut in tooltip (#5994)\nf5fce741 fix(pull-requests): route self-hosted GitLab remotes (#6061)\n9c7622da fix(server): handle unborn HEAD in VCS status (#5944)\nc14bcca1 fix(server): advertise 256-color TERM on Windows terminals (#5693)\n1fa315ea fix(server): skip Linux libc detection on Windows/macOS (#5354)\nf9730979 perf(web): skip base64 for oversized image candidates (#5220)\n59d0c922 fix(web): persist sidebar shelf collapse state (#5136)\n2ea51bd3 fix(server): OpenCode model parsing drops models with a slash in the JSON body (#5072)\ne5c82d79 fix(mobile): keep chat composer above the Android gesture bar (#5988)\n9afef94a feat: add three-hour snooze option (#5914)\na7b0366c fix(web): account for Windows window controls in PR page header (#6049)\n428d9f9f Allow Android tablets to rotate (#5613)\n1b120f35 fix(ci): extend release publish timeout (#6034)\n0a7c662d fix(web): improve built-in theme contrast (#6000)\nb91a000a feat(web): add duplicate action to the T3 Code default theme (#6013)\n8de0aa24 perf(desktop): probe the Windows shell environment concurrently (#5878)\ncad2c936 feat: multi-provider pull requests page with in-app reviews (#4849)\n",
 "upstream_head": "21a3669cee0c6fb54f5afe065cf0eb0348bd232c\n",
 "conflicted_files": "apps/mobile/src/features/threads/ThreadComposer.tsx \n",
 "culprit_commits": "baaeda30 fix: avoid stale Live Activities when publishing is disabled (#6325)\n85389b98 Nest mobile task settings in bottom sheets (#6224)\n6676f9c8 fix(mobile): stabilize thread composer and interactions (#5986)\n",
 "failing_step": "\n",
 "dropped_patches": "\n",
 "patch_manifest": "e7ad1959 Merge pull request #100 from radroid/coil/clone-failure-diagnostics\ndf1139d2 fix(server): name why a clone failed, and which provider it was\nc52a8aa1 Merge pull request #99 from radroid/coil/disable-upstream-update-feed\n8bc7c5a4 fix(coil): stop shipping upstream's update feed, which we never actually disabled\ndeffbbc5 Merge pull request #97 from radroid/coil/fix-release-bundle-checks\n5ee76a87 fix(coil): restore the release, and make two of its checks capable of failing\nda8bd187 Merge pull request #96 from radroid/coil/github-latest-release\n565830d5 Merge pull request #95 from radroid/coil/update-toast-permission-note\nd854dbd1 Merge pull request #89 from radroid/t3x/desktop-bundle-size\n408f26cc fix(coil): publish a canonical Latest release, and re-arm retention\n0143984b fix(coil): tell the truth about the one macOS prompt an update raises\n1a4ec3b2 docs(coil): design a canonical Latest release for the fork\n451c5d1d perf(coil): halve the desktop release bundle (#53)\n4b9df5bf Merge pull request #94 from radroid/coil/finish-app-rename\n0effff8e docs(coil): re-baseline the ledger for the sidebar wordmark row\ne77aaf3e feat(coil): finish the app rename at the surfaces that name the app (#71)\n136b3514 Merge pull request #93 from radroid/t3x/seams-stale-paths\n737cd0e6 docs(coil): repoint two ledger citations at the paths #71 moved\nfdeb5284 Merge pull request #92 from radroid/t3x/retire-autobuild\nd4c3f9cc refactor(coil): retire the local desktop autobuild\n56a5b2db Merge pull request #90 from radroid/t3x/coil-relay-shim-host\n9b981116 fix(coil): reach the renamed relay through a service binding (#71)\n15c6e723 Merge pull request #88 from radroid/t3x/coil-rename\n34ede74d fix(coil): make --rotate emit the CI secret commands itself (#71)\n169c8a27 fix(coil): finish the certificate rotation and list all 47 rows in the ledger (#71)\n5af5ad71 chore(coil): re-record the designated requirement after the certificate rotation\n61d38fba fix(coil): compute the build-counter offset in bash, not in an expression (#71)\n29137c59 fix(coil): repoint the last references to moved files (#71)\n2c12f0dd style(coil): format the files this rename touched (#71)\n5adcad76 docs(coil): re-baseline the seam ledger and correct the runbooks (#71)\n08561974 fix(coil): carry PRs #78 and #84 across the rename (#71)\nbac87413 feat(coil): move the relay, keeping the old hostname alive as a proxy (#71)\n9435bb75 feat(coil): cut the sync automation over to coil names (#71)\necefeba7 feat(coil): move the release identity, offsetting the counter so clients keep updating (#71)\n2666bcd7 feat(coil): rename the app to T3 Coil, with its own bundle id and certificate (#71)\nbb20d52f refactor(coil): move the fork's directories and symbols off t3x (#71)\n431fd909 docs(coil): design the t3x -> coil rename around its four silent failures (#71)\nbc9730cd fix(deps): clear the sharp and @hono/node-server advisories by re-resolution (#58) (#87)\nf45bb46c Merge pull request #78 from radroid/t3x/install-instructions\n50eda595 feat(coil): put the real install steps on the download page, from one source (#72)\ne44bf26b Merge pull request #84 from radroid/t3x/coil-og-card\n69ab1832 Merge pull request #86 from radroid/t3x/sync-push-workflow-scope\n1b3a6b65 Merge pull request #81 from radroid/t3x/steering-cleanup\n60e55271 fix(t3x): push the sync as a workflow-scoped token, and escalate when it fails\n0f020ed4 fix(web): steering-path leftovers from the queue transition (#40 A1-A4)\na5e2abcc Merge pull request #80 from radroid/t3x/auto-resume-user-message\n456b7bdb Merge pull request #85 from radroid/t3x/mac-signing\n4e1f44d6 Merge pull request #82 from radroid/t3x/outbox-edit-race\ne5a71479 Merge pull request #77 from radroid/t3x/autobuild-launchd-path\nda5c939a Merge pull request #79 from radroid/t3x/win-exit-diagnostics\n5e1bf197 Merge pull request #73 from radroid/t3code/worklog-daily-report-skill\na47c41a5 docs(t3x): note that the trusted certificate is listed twice, and why that is fine\na0835090 docs(t3x): correct the runbook's seam claim \u2014 the bundle id spends one upstream line\n34f73e0e fix(t3x): pin the designated requirement the fork's identity produces (#70)\n003e6b14 fix(t3x): give the fork its own bundle id, so it stops sharing TCC rows with upstream (#70)\n167aa6f8 fix(t3x): sign the macOS build with a stable identity so permission grants survive updates (#70)\na6ba47ab feat(coil): a real link-preview card for shared URLs\ncff11854 fix(web): an edit saved during dispatch no longer disappears (#40 A5)\n3e954a62 fix(t3x): stop a user message destroying a pending auto-resume\nabbbfcd2 fix(t3x): the Windows transient-crash retry could never fire; classify on the code vp prints (#47)\n440ee34e fix(t3x): derive and verify the autobuild agent's PATH, and correct the runbook interval (#41)\ndb5fef00 docs(worklog): write down how the skill actually gets installed (#65)\n39be659e fix(worklog): satisfy the repo lint rules the suite files were breaking (#65)\n29000937 Merge pull request #76 from radroid/t3x/release-retry-window\ne072ee6f fix(t3x): widen the release retry window past the observed 403 duration\n8e4d64c9 Merge pull request #75 from radroid/t3x/coil-deploy-verify\n0c466b51 fix(coil): stop the deploy verify step failing on Cloudflare bot mitigation\ncaf00658 Merge pull request #74 from radroid/t3x/coil-deploy-pnpm\n826d574f fix(coil): put pnpm on PATH in the homepage deploy workflow\nab6f6f0a Merge pull request #69 from radroid/t3x/homepage\nb482dc43 docs(coil): fix the stale deploy-workflow pointer, note the secret is set\necc64cab fix(worklog): correct the numbers the report is built on (#65)\n9c946968 feat(t3x): add the /worklog daily work-log skill (#65)\n927109ff docs(coil): recapture the hero evidence with all five marks restored\nafc2f2ae fix(coil): bring the hero marks back on mobile as an in-flow row\n32063b9e docs(coil): recapture mobile evidence after the collision fix\nacc3476f fix(coil): stop the hero marks colliding with mobile content, equalise stacked buttons\n220de98c docs(coil): recapture the homepage evidence against coil.curlycloud.dev\n7197fa58 feat(coil): reposition the homepage as Coil, a personal fork\n86b86d72 docs(coil): design for repositioning the homepage as Coil\n10b56048 docs(t3x): capture homepage screenshots and a scroll-through for review\ndd45537a ci(t3x): pin the deploy wrangler exactly, not to a floating major\n4961da11 docs(t3x): record the fork homepage on the seam ledger and sync runbook\n96bbab59 ci(t3x): auto-deploy the homepage to Cloudflare on push to main\n0fd3a955 feat(t3x): deploy the homepage as a Cloudflare assets-only Worker\n7e9f598a feat(t3x): serve downloads from the fork's update-relay manifest and wire the sync strip\ncaa3fa5f feat(t3x): rebrand the homepage copy, chrome, and fork graph\n2a605374 feat(t3x): strip upstream-only social proof, store links, and legal pages\n99b83bf5 feat(t3x): seed the fork homepage from apps/marketing\n714b866b docs(t3x): record before/after capture for the capsule anchor fix (#67)\ndc065d78 fix(t3x): anchor the auto-resume capsule to the composer's measured box (#67)\ndbb7c658 fix(t3x): retry the relay notify, and surface DO failures as readable 503s (#66)\n4882a70c docs(t3x): re-baseline the seam ledger against upstream v0.0.33\na060afd1 docs(t3x): record the mobile sendLabel mirror on the ledger\n8154b6d3 docs(t3x): re-baseline the seam ledger against the follow-up merge-base\n295e89f2 fix(deps): restore the security sweep's resolutions lost in the sync\n4a11f68f docs(t3x): re-baseline the seam ledger against the 2026-08-08 merge-base\naedc29af test(t3x): retime the tolerant-budget tests to upstream's new retry ladder\n0c30af89 fix(t3x): drop the settings imports upstream stopped needing\ne2a92c1d fix(t3x): give the crash-recovery test the registries upstream added\n77ab4ec8 chore(deps): regenerate the lockfile against the 2026-08-08 upstream tree\n67fb23e8 docs(t3x): archive the Loop Watch design before its branch is deleted\nc33e5a36 fix(t3x): put ~/.cargo/bin on the autobuild agent's PATH\na75fdd12 fix(t3x): track the composer's top edge so banners cannot cover the capsule\n6135345c fix(t3x): align the auto-resume capsule with the composer's right edge\neefaf4be fix(t3x): put the auto-resume capsule back above the composer\n6ef96180 fix(t3x): pin the countdown width, spring the toggle, move the capsule top-right\nc40fdfe5 fix(t3x): make auto-resume teardown re-armable so StrictMode cannot kill it\n875345d0 feat(t3x): rebuild the auto-resume capsule and cover it with tests\n15283572 chore(t3x): stop Dependabot re-failing on advisories it cannot fix\n3ba9e655 fix(t3x): stop a transient 403 from discarding a whole release build\n37ccb2b1 feat(t3x): verify the install actually happened, and offer to report it when it did not\n603607b2 fix(t3x): stop calling the Windows update a restart\n4b84d6b6 Update toast: changelog-forward design, and a restart that waits for you (#55)\nd949cdcb chore(deps): dedupe nanoid onto 3.3.17, closing the two alerts the sweep reopened\nccafbe04 chore(deps): clear 56 of the 62 open transitive advisories in the root lockfile\n1ee1ca2a chore(deps): bump electron to 41.10.3, and stop Dependabot on the vendored subtrees\n14686df8 docs(t3x): put the manual-install commands on the release page\n2ce231b3 fix(t3x): follow the 302 on GitHub release asset downloads\n8fbbe730 fix(t3x): actually serialise the release bundle build\nabc569b0 fix(t3x): scope ensure:electron, and refuse updates without a release counter\n3c8b3df8 fix(t3x): wait for the condition in the auto-resume reactor tests\n8ae17079 Update delivery: CI builds, relay pushes, the app offers a restart (#51)\na0184e11 ci(t3x): raise the hook timeout alongside the test timeout\n8cfe5665 docs(t3x): remeasure the seam ledger against the 2026-08-02 merge-base\n43c128a1 fix(t3x): adapt the crash-recovery startup test to upstream's new startup internals\nc1487807 fix(web): keep the queue's reorder controls usable, and leave a dispatch trail (#35)\n0319f00e feat(web): steer a running turn instead of queuing behind it (#35)\n180c654f feat(web): make the thread outbox read as composer chrome, and let it be reordered (#35)\nfb2c3f6d docs(t3x): point the self-reference rule at the renamed Claude doc\n8dd65659 docs(t3x): follow upstream's rename of the Claude provider doc\n208cb618 docs(t3x): remeasure the seam ledger against the 2026-07-30 merge-base\n56a39853 fix(web): apply upstream's detail-loading send gate to the queue path\n1f73d954 fix(t3x): apply the sync test-timeout to every gate, not just fork CI (#32)\nacf30fa8 ci(t3x): raise the test timeout for the fork's slower runners\n73d0f972 docs(t3x): replace the fictional seam ledger with a measured one\n45dc8aad docs(providers): fix the broken Claude multi-account recipe\naee298b3 test(t3x): move fork settings coverage out of the upstream test file\n6feb09f6 feat(t3x): auto-build from origin/main in a dedicated worktree\nd662461b fix(client-runtime): reset tolerant reconnect budget across a network drop\n4ef31f61 fix(web): address Web Push review findings (reactor priming, VAPID recovery, cleanup)\nfd7baccb feat(web): closed-tab Web Push notifications (SW + PWA + server VAPID push)\n4f7c743a fix(connection): tolerate a slow-but-alive local backend + heap headroom\n9057996d feat(web): queue messages while a chat is running (thread outbox)\nb0d0ba19 ci(t3x): add fork-runnable PR/main verify gate (t3x-ci.yml)\nb6b5837b docs(t3x): document how to land a sync PR (force-update, not merge button)\ne87a7d91 fix(t3x): resolve pre-existing typecheck/lint red on fork test files\n1963464c fix(t3x): pin sync escalation gh calls to the fork (GH_REPO)\n4a2a4cb9 feat(t3x): on-demand agent to resolve escalated upstream-sync conflicts\n44fdee1c fix(t3x): make sync escalation always open the t3x-sync issue\nd56f891d fix(mobile): iOS Shift+Return inserts a newline instead of submitting\n3f0f4131 feat(mobile): queue/send from the keyboard Return key\n4232eb59 chore(t3x): auto-build on a 12h cadence, not every main commit\n362baa81 fix(notifications): final-review fixes \u2014 web notification guard, desktop coalescing, draft-route suppression\n36ca0e15 feat(web): needs-input notification setting and web permission UX\n3fa27363 feat(web): notification coordinator with platform shim and click-to-navigate\n52fa984e feat(desktop): native OS notification IPC with click-to-reveal activation\na4abc1bc feat(web): add pure needs-attention tracker and suppression logic\nd7ef2670 feat(contracts): add notifyOnNeedsInput setting and DesktopBridge notification surface\n0757729b fix(server): reconcile crash-frozen `running` turns to interrupted on boot\nbfd1dfe6 test(server): cover non-spawn `--version` failure mapping to available\nbf5eacd3 fix(server): treat slow `az --version` as present, not missing\n9b39b878 fix(t3x): don't cancel auto-resume as thread-advanced when the limited turn settles\n085785e3 fix(t3x): auto-build fixes found running it for real\n03300445 docs(t3x): correct which .app a default auto-build replaces\n1eba45cb fix(t3x): resolve adversarial-review findings in auto-build\n1348fa23 fix(t3x): resolve auto-build review findings\nfb24d941 fix(t3x): strip trailing newline from auto-build status JSON values\n324123fb feat(t3x): auto-build & install the desktop app on change\na650f5d7 fix(t3x): prototype-chain threadId corrupted the auto-resume state file\nfbf153bb test(t3x): route-level tests for /api/t3x/auto-resume\ncda71ac0 docs(t3x): record the auto-resume UI seams\ndf9b864a feat(t3x): per-thread auto-resume overlay in the thread view\n99700d81 feat(t3x): authenticated /api/t3x/auto-resume route\nb4a4b404 feat(t3x): per-thread auto-resume switch (server state + gating)\n8bd13f91 docs(t3x): design + plan for per-thread auto-resume UI (floating card)\n3240f026 docs(t3x): plan for auto-build + install desktop app on change\nfd65aa57 fix(t3x): resolve third-pass verified review findings\n6d4e584d docs(t3x): align auto-resume spec with final implementation\n3fa76a39 fix(t3x): resolve adversarial-review findings across auto-resume + sync\n1567e811 feat(t3x): usage-limit auto-resume reactor (Project B)\n2c1a6d43 docs/ci(t3x): incorporate adversarial review findings\n4afaac6d feat(t3x): fork setup + daily upstream sync + weekly verify (Project A)\n2f4149f2 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 coil 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/coil/sync-agent-runbook.md.

[github-actions]

Resolved: #101

Rebased the fork's 159 patches onto upstream/main (78f462c4e → 196c8ea0, 95 upstream commits). Six conflicts across five files, one patch dropped as an empty merge artefact (158 patches now). All three verify steps are green on the branch: vp run typecheck 0 errors, vp run lint 0 errors, vp run test --testTimeout=120000 8,559 passed / 7 skipped / 0 failed.

The PR body has the per-file resolutions and the seam review. Two items worth a reviewer's eye are called out there: the resolveComposerSendLabel mirror had to follow upstream pingdotgg#6543 (mobile now steers active turns by default, so activeThreadBusy is gone from ThreadComposerProps), and the ComposerPrimaryActions send-button hoist had gone stale against upstream pingdotgg#6183 and was re-taken.

Not pushed to main — land it per the runbook's force-update recipe, not the GitHub merge button.

[radroid]

Landed by force-updating main to fdf853a48 (PR #101's rebase plus four follow-up commits: seam-ledger re-baseline against 196c8ea0d, an enqueue-failure toast fix for the upstream pingdotgg#6123 dismissal-mask interaction, and two cleanups).

Verified before landing: typecheck 0 errors, lint clean, full test suite green locally (server 2629, web 2652, mobile 712, desktop 659, plus all library packages), and PR #101's own CI run succeeded. One fork patch dropped as absorbed (the 2026-08-08 security-sweep lock repair — its pins were already in the seeded lock; sharp 0.35.3 / @hono/node-server 2.1.0 / nanoid 3.3.17 verified present).

Rollback point if needed: coil/last-good-20260814-085722.