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

Automated daily upstream sync could not complete.

Result: conflict
Recovery tag: coil/last-good-20260828-194435
Run: https://github.com/radroid/t3code/actions/runs/33205105878

status JSON

{
  "kind": "daily",
  "result": "conflict",
  "upstream_range": "acb599d2d fix(mobile): show OpenCode model sources in picker (#8573)\nf94a0d646 fix(desktop): Cache Runtime locally on WSL Filesystem, dramatically improving launch times  (#5769)\n018d7f277 refactor(mobile): compile semantic themes for Uniwind (#7327)\n9257bd860 fix(web): add back button to project settings (#8168)\n4c51b4c9b feat(web): toggle thread pin from the keyboard\n8f4913221 feat(server): accept PDF, ZIP, and other file uploads up to 50MB (#8235)\n88be5631f feat(analytics): report connected client platforms (#8481)\n49f6241dd fix(codex): show sub-agent models (#8502)\n7068e86f7 fix(web): open GitHub pull requests in browser when loading fails (#8507)\nf276e632c fix(web): stabilize the provider settings editor (#8472)\n5766dfbf5 fix(release): move nightly schedule to minute 38\nc8aba2587 test(web): remove redundant cache key test (#8484)\n2fbe31309 fix(desktop): allow preview automation in agent-created threads (#8483)\n850e4582e fix(mobile): refine Git action toast glass styling (#8399)\nf1e6f0c9b fix(web): stop showing red x summaries for ordinary tool failures (#8395)\nb982847ab fix(mobile): keep iOS home header stable (#8467)\nb0ae3f3a8 fix(tooling): allow ignored-only staged changes (#8468)\n94401d01b fix(codex): accept Codex 0.150 account plans (#8447)\ne2d4d12a8 feat(web): split provider settings into list and editor (#8380)\n348367dcc Fix Android adaptive launcher icon (#4332)\n",
  "upstream_head": "acb599d2dc5b28d5bad82fa2a280ac2abe771ec9\n",
  "conflicted_files": "pnpm-lock.yaml \n",
  "culprit_commits": "88be5631f feat(analytics): report connected client platforms (#8481)\nb982847ab fix(mobile): keep iOS home header stable (#8467)\n",
  "failing_step": "\n",
  "dropped_patches": "\n",
  "patch_manifest": "672b4a575 test(coil): wait for the collided arm to be destroyed instead of looking once\n74e9dedc9 fix(coil): stop the fork's boot reconcile from swallowing upstream's orphan pass\nc4658796f docs(coil): re-baseline the seam ledger against the 2026-08-27 merge-base\n345b668f0 chore(deps): regenerate the lockfile against the 2026-08-27 upstream tree\n63bcd2602 test(coil): provide the services upstream's orphaned-session reconcile now needs\n1a74357c7 docs(coil): Loops \u2014 design, prototypes and implementation plan (#42, #38 residue) (#120)\nd1808cde1 fix(coil): a turn that died inside the closed window isn't advancement (#121)\n4c821870d docs(coil): repoint the ledger at the final merge-base\n98da3ac14 docs(coil): re-baseline the seam ledger against the 2026-08-17 merge-base\n2dfbdb2f9 test(web): reconcile upstream's new running-send assertion with the fork's steer label\nffed2df23 test(coil): carry the app rename onto upstream's new DMG title assertion\n4ef890529 fix(coil): migrate the update toast off the native title tooltip\n4254abc2d docs(coil): fix seam-ledger rows the #71 rename left pointing at t3x names (#116)\n555b5f1de fix(coil): the verify gate must not require Bun-runtime imports the shipped app cannot reach (#107)\n182b14a31 fix(coil): verify every packaged layer, and fail on layers the gate cannot see (#102) (#106)\n5919a2588 docs(coil): re-measure the seam ledger on the landing branch\n20c037b67 fix(coil): drop a stray blank seam line the rebase left in ThreadComposer\n9d23145d6 fix(web): surface enqueue failures as a toast, not the maskable error banner\n04d32b806 docs(coil): re-baseline the seam ledger against the 2026-08-14 merge-base\nd2a6a909f chore(deps): regenerate the lockfile against the 2026-08-14 upstream tree\n6ddc1626b fix(server): name why a clone failed, and which provider it was\n78e6b1bb1 fix(coil): stop shipping upstream's update feed, which we never actually disabled\nb31228ba3 fix(coil): restore the release, and make two of its checks capable of failing\n94fbbeb75 fix(coil): publish a canonical Latest release, and re-arm retention\ndd3c1e08b docs(coil): design a canonical Latest release for the fork\n1915023d5 fix(coil): tell the truth about the one macOS prompt an update raises\n92d3c39d8 perf(coil): halve the desktop release bundle (#53)\nd06998660 docs(coil): re-baseline the ledger for the sidebar wordmark row\n6f5834bcd feat(coil): finish the app rename at the surfaces that name the app (#71)\nb3a14e77c docs(coil): repoint two ledger citations at the paths #71 moved\ncb1eaf62a refactor(coil): retire the local desktop autobuild\n7a3539432 fix(coil): reach the renamed relay through a service binding (#71)\n98c2f9543 fix(coil): make --rotate emit the CI secret commands itself (#71)\n4464a95c4 fix(coil): finish the certificate rotation and list all 47 rows in the ledger (#71)\nc62956577 chore(coil): re-record the designated requirement after the certificate rotation\nb08bfea4c fix(coil): compute the build-counter offset in bash, not in an expression (#71)\nf3082be1e fix(coil): repoint the last references to moved files (#71)\n66b90bfac style(coil): format the files this rename touched (#71)\n00f42158a docs(coil): re-baseline the seam ledger and correct the runbooks (#71)\nb1a5a7bf9 fix(coil): carry PRs #78 and #84 across the rename (#71)\n08fcaf3a7 feat(coil): move the relay, keeping the old hostname alive as a proxy (#71)\n0b629a947 feat(coil): cut the sync automation over to coil names (#71)\n776e87736 feat(coil): move the release identity, offsetting the counter so clients keep updating (#71)\n3601821ee feat(coil): rename the app to T3 Coil, with its own bundle id and certificate (#71)\n925ad2110 refactor(coil): move the fork's directories and symbols off t3x (#71)\n9922e8856 docs(coil): design the t3x -> coil rename around its four silent failures (#71)\n523982307 fix(deps): clear the sharp and @hono/node-server advisories by re-resolution (#58) (#87)\n1f4772fc6 feat(coil): put the real install steps on the download page, from one source (#72)\n045695577 feat(coil): a real link-preview card for shared URLs\n65917e7e1 fix(t3x): push the sync as a workflow-scoped token, and escalate when it fails\n9f4c0cf95 fix(web): steering-path leftovers from the queue transition (#40 A1-A4)\nd1a5864d7 fix(t3x): stop a user message destroying a pending auto-resume\n93bebbd86 docs(t3x): note that the trusted certificate is listed twice, and why that is fine\n5c10317be docs(t3x): correct the runbook's seam claim \u2014 the bundle id spends one upstream line\nc39130f39 fix(t3x): pin the designated requirement the fork's identity produces (#70)\n70a5bae6d fix(t3x): give the fork its own bundle id, so it stops sharing TCC rows with upstream (#70)\nf9890410d fix(t3x): sign the macOS build with a stable identity so permission grants survive updates (#70)\ne1542d051 fix(web): an edit saved during dispatch no longer disappears (#40 A5)\nc8bc37375 fix(t3x): derive and verify the autobuild agent's PATH, and correct the runbook interval (#41)\nb79576def fix(t3x): the Windows transient-crash retry could never fire; classify on the code vp prints (#47)\nff0c38108 docs(worklog): write down how the skill actually gets installed (#65)\n193de9249 fix(worklog): satisfy the repo lint rules the suite files were breaking (#65)\nd568fff8e fix(worklog): correct the numbers the report is built on (#65)\n6171be49f feat(t3x): add the /worklog daily work-log skill (#65)\nd6b74ff96 fix(t3x): widen the release retry window past the observed 403 duration\n763df8a67 fix(coil): stop the deploy verify step failing on Cloudflare bot mitigation\n982bca41a fix(coil): put pnpm on PATH in the homepage deploy workflow\n7e5bb5b40 docs(coil): fix the stale deploy-workflow pointer, note the secret is set\na0c7bddbd docs(coil): recapture the hero evidence with all five marks restored\ne7d59577e fix(coil): bring the hero marks back on mobile as an in-flow row\n6379eb094 docs(coil): recapture mobile evidence after the collision fix\nf113d287d fix(coil): stop the hero marks colliding with mobile content, equalise stacked buttons\n1b2a3a844 docs(coil): recapture the homepage evidence against coil.curlycloud.dev\n26ee7a3eb feat(coil): reposition the homepage as Coil, a personal fork\n2b8fc5130 docs(coil): design for repositioning the homepage as Coil\na49d57763 docs(t3x): capture homepage screenshots and a scroll-through for review\ne730c8f44 ci(t3x): pin the deploy wrangler exactly, not to a floating major\naabe59feb docs(t3x): record the fork homepage on the seam ledger and sync runbook\ned6f9a499 ci(t3x): auto-deploy the homepage to Cloudflare on push to main\nac5b36d2e feat(t3x): deploy the homepage as a Cloudflare assets-only Worker\n062d91907 feat(t3x): serve downloads from the fork's update-relay manifest and wire the sync strip\n689660080 feat(t3x): rebrand the homepage copy, chrome, and fork graph\nf1f7cdf8c feat(t3x): strip upstream-only social proof, store links, and legal pages\n20d077a74 feat(t3x): seed the fork homepage from apps/marketing\na0afbe701 docs(t3x): record before/after capture for the capsule anchor fix (#67)\n85526109c fix(t3x): anchor the auto-resume capsule to the composer's measured box (#67)\n267c83127 fix(t3x): retry the relay notify, and surface DO failures as readable 503s (#66)\na10413a81 docs(t3x): re-baseline the seam ledger against upstream v0.0.33\nae67db4ea docs(t3x): record the mobile sendLabel mirror on the ledger\n6b595a438 docs(t3x): re-baseline the seam ledger against the follow-up merge-base\n540e4817b docs(t3x): re-baseline the seam ledger against the 2026-08-08 merge-base\nda5b3c7bb test(t3x): retime the tolerant-budget tests to upstream's new retry ladder\n67c2aa916 fix(t3x): drop the settings imports upstream stopped needing\n6bcd62319 fix(t3x): give the crash-recovery test the registries upstream added\n1a414355c chore(deps): regenerate the lockfile against the 2026-08-08 upstream tree\n4fbafe3b3 docs(t3x): archive the Loop Watch design before its branch is deleted\n77f1e969a fix(t3x): put ~/.cargo/bin on the autobuild agent's PATH\nf4e2911d9 fix(t3x): track the composer's top edge so banners cannot cover the capsule\nacaa74770 fix(t3x): align the auto-resume capsule with the composer's right edge\naad2b4b4d fix(t3x): put the auto-resume capsule back above the composer\n4049b03ee fix(t3x): pin the countdown width, spring the toggle, move the capsule top-right\n6cb2c7b5b fix(t3x): make auto-resume teardown re-armable so StrictMode cannot kill it\nddf79bf12 feat(t3x): rebuild the auto-resume capsule and cover it with tests\nddc52c6b9 chore(t3x): stop Dependabot re-failing on advisories it cannot fix\n28f56d5e4 fix(t3x): stop a transient 403 from discarding a whole release build\n47bd0f636 feat(t3x): verify the install actually happened, and offer to report it when it did not\n0febab9be fix(t3x): stop calling the Windows update a restart\n29c23bba1 Update toast: changelog-forward design, and a restart that waits for you (#55)\n4a61ba80b chore(deps): dedupe nanoid onto 3.3.17, closing the two alerts the sweep reopened\n8ccbbaab2 chore(deps): clear 56 of the 62 open transitive advisories in the root lockfile\n559c20b01 chore(deps): bump electron to 41.10.3, and stop Dependabot on the vendored subtrees\na460c6d2f docs(t3x): put the manual-install commands on the release page\n070379ea7 fix(t3x): follow the 302 on GitHub release asset downloads\n4a11fcd79 fix(t3x): actually serialise the release bundle build\nab09847b3 fix(t3x): scope ensure:electron, and refuse updates without a release counter\n6f30b35bd fix(t3x): wait for the condition in the auto-resume reactor tests\nda04c3e9b Update delivery: CI builds, relay pushes, the app offers a restart (#51)\nef0e10932 ci(t3x): raise the hook timeout alongside the test timeout\n3de64bf7d docs(t3x): remeasure the seam ledger against the 2026-08-02 merge-base\ndcb408c44 fix(t3x): adapt the crash-recovery startup test to upstream's new startup internals\n700e302ad fix(web): keep the queue's reorder controls usable, and leave a dispatch trail (#35)\n62af2534e feat(web): steer a running turn instead of queuing behind it (#35)\nc308a1b98 feat(web): make the thread outbox read as composer chrome, and let it be reordered (#35)\nffce54b82 docs(t3x): point the self-reference rule at the renamed Claude doc\n446c40ce2 docs(t3x): follow upstream's rename of the Claude provider doc\nf5ef6e3e2 docs(t3x): remeasure the seam ledger against the 2026-07-30 merge-base\n39b031007 fix(web): apply upstream's detail-loading send gate to the queue path\n08aabe000 fix(t3x): apply the sync test-timeout to every gate, not just fork CI (#32)\n7e1a8481e ci(t3x): raise the test timeout for the fork's slower runners\n0a753b236 docs(t3x): replace the fictional seam ledger with a measured one\nee5e6b533 docs(providers): fix the broken Claude multi-account recipe\nb640e841b test(t3x): move fork settings coverage out of the upstream test file\n2834951d3 feat(t3x): auto-build from origin/main in a dedicated worktree\nf307c1136 fix(client-runtime): reset tolerant reconnect budget across a network drop\n40661edc2 fix(web): address Web Push review findings (reactor priming, VAPID recovery, cleanup)\nefc5d1cbf feat(web): closed-tab Web Push notifications (SW + PWA + server VAPID push)\ndde97d739 fix(connection): tolerate a slow-but-alive local backend + heap headroom\n4d53599f2 feat(web): queue messages while a chat is running (thread outbox)\nfedbfa3ba ci(t3x): add fork-runnable PR/main verify gate (t3x-ci.yml)\ne968c00cd docs(t3x): document how to land a sync PR (force-update, not merge button)\n4d34cd326 fix(t3x): resolve pre-existing typecheck/lint red on fork test files\n44f3c0828 fix(t3x): pin sync escalation gh calls to the fork (GH_REPO)\n7a3a1d369 feat(t3x): on-demand agent to resolve escalated upstream-sync conflicts\ndc2131a3e fix(t3x): make sync escalation always open the t3x-sync issue\nd2e9a59d8 fix(mobile): iOS Shift+Return inserts a newline instead of submitting\nd5d4e5107 feat(mobile): queue/send from the keyboard Return key\n7bd7550aa chore(t3x): auto-build on a 12h cadence, not every main commit\n3a9cc4d2c fix(notifications): final-review fixes \u2014 web notification guard, desktop coalescing, draft-route suppression\n73301648f feat(web): needs-input notification setting and web permission UX\n676749187 feat(web): notification coordinator with platform shim and click-to-navigate\n3a9cf75d1 feat(desktop): native OS notification IPC with click-to-reveal activation\n54d81ef48 feat(web): add pure needs-attention tracker and suppression logic\n86d5502a5 feat(contracts): add notifyOnNeedsInput setting and DesktopBridge notification surface\n3db95d9c4 fix(server): reconcile crash-frozen `running` turns to interrupted on boot\nd67111c45 test(server): cover non-spawn `--version` failure mapping to available\n8e40b2018 fix(server): treat slow `az --version` as present, not missing\n91cbd43c8 fix(t3x): don't cancel auto-resume as thread-advanced when the limited turn settles\n20914c5fa fix(t3x): auto-build fixes found running it for real\n0d9f762ed docs(t3x): correct which .app a default auto-build replaces\n4013cdb16 fix(t3x): resolve adversarial-review findings in auto-build\n1b1e00820 fix(t3x): resolve auto-build review findings\ndb2bf8cf1 fix(t3x): strip trailing newline from auto-build status JSON values\n4e6d9d796 feat(t3x): auto-build & install the desktop app on change\n80c6fa015 fix(t3x): prototype-chain threadId corrupted the auto-resume state file\n6e372c554 test(t3x): route-level tests for /api/t3x/auto-resume\n3b79dede4 docs(t3x): record the auto-resume UI seams\nded01d959 feat(t3x): per-thread auto-resume overlay in the thread view\n61332d1a8 feat(t3x): authenticated /api/t3x/auto-resume route\nd6e906e56 feat(t3x): per-thread auto-resume switch (server state + gating)\n5832db1e5 docs(t3x): design + plan for per-thread auto-resume UI (floating card)\n11f02ac95 docs(t3x): plan for auto-build + install desktop app on change\nbb9266d0c fix(t3x): resolve third-pass verified review findings\n2de841002 docs(t3x): align auto-resume spec with final implementation\n7dbe029d4 fix(t3x): resolve adversarial-review findings across auto-resume + sync\n591658e82 feat(t3x): usage-limit auto-resume reactor (Project B)\n7baeb4eb4 docs/ci(t3x): incorporate adversarial review findings\n5577e3a79 feat(t3x): fork setup + daily upstream sync + weekly verify (Project A)\n77ddf8077 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.

Automated daily upstream sync could not complete.

Result: conflict
Recovery tag: coil/last-good-20260829-132756
Run: https://github.com/radroid/t3code/actions/runs/33255043736

status JSON

{
  "kind": "daily",
  "result": "conflict",
  "upstream_range": "053affbed fix(mobile): prevent header overflow and back-button artifacts (#8624)\n074bcd6dc fix(web): keep project picker popup inside the sidebar (#8627)\n5e63aea2d fix(web): clean up provider settings list and editor (#8504)\nc1c2d5401 feat: let an environment publish themes as a file (#8569)\nbe218ac76 feat(web): keybinding settings as settings rows (#8532)\nd22709f75 fix(web): pass stashShortcutLabel in the mixed-attachments stash test\nbcb855a63 feat(web): attach PDFs, ZIPs, and other files to a turn (#8236)\n6a9d9f988 chore: vouch ryanrhughes (#8613)\nc131f2892 fix(server): stop querying Claude context usage after turns (#8610)\n38dcd7a40 fix(mobile): harden native header toolbar items (#8611)\n3e6ab36f6 chore(mobile): upgrade to Expo SDK 57 (#8609)\n4669eab8e fix(mobile): stabilize iOS header item transitions (#8607)\n702a6ade3 fix(codex): avoid quadratic app-server input buffering (#8605)\n2bc9e8ef6 Require human review for pull requests changing product defaults (#8603)\n3251b7548 chore(release): prepare v0.0.36\nac3a33191 Remove Messages Glass Lab experiment (#8599)\n8fc7f2294 fix(mobile): restore composer glass and rounded shadows (#8597)\n38154388d fix: restore automatic thread settling defaults (#8596)\n22c311dde feat(web): add toggleable confirmation before unpinning a thread (#7313)\nac3b2adf9 fix(web): show the configured stash shortcut (#8437)\ne89800895 fix(mobile): show composer menus when starting a task (#8587)\nb654911f8 fix(web): stop session activity timing test from blocking releases (#8585)\n0bbecfabf fix: make thread auto-settling opt-in (#8321)\ncb49e5d72 fix(opencode): handle child approvals, stops, and model catalogs (#8480)\n0009aacdf fix(web): keep long task drawers usable on small screens (#8313)\n0e2905eb7 fix(desktop): oauth popups open from the browser preview (#8435)\nff1761012 fix(desktop): stop hidden previews draining battery (#8567)\na40aef4cc fix(server): a draft can retry its first send after a failed bootstrap (#8226)\n48c176b3c feat(web): make the sidebar project filter a searchable combobox (#5931)\n94f194816 fix(connect): explain DPoP connection failures (#8351)\n45c0dff8e fix(mobile): show file actions on Android (#8215)\n84b9d9bc2 fix(clients): honor project default models in new threads (#6011)\nacb599d2d fix(mobile): show OpenCode model sources in picker (#8573)\nf94a0d646 fix(desktop): Cache Runtime locally on WSL Filesystem, dramatically improving launch times  (#5769)\n018d7f277 refactor(mobile): compile semantic themes for Uniwind (#7327)\n9257bd860 fix(web): add back button to project settings (#8168)\n4c51b4c9b feat(web): toggle thread pin from the keyboard\n8f4913221 feat(server): accept PDF, ZIP, and other file uploads up to 50MB (#8235)\n88be5631f feat(analytics): report connected client platforms (#8481)\n49f6241dd fix(codex): show sub-agent models (#8502)\n7068e86f7 fix(web): open GitHub pull requests in browser when loading fails (#8507)\nf276e632c fix(web): stabilize the provider settings editor (#8472)\n5766dfbf5 fix(release): move nightly schedule to minute 38\nc8aba2587 test(web): remove redundant cache key test (#8484)\n2fbe31309 fix(desktop): allow preview automation in agent-created threads (#8483)\n850e4582e fix(mobile): refine Git action toast glass styling (#8399)\nf1e6f0c9b fix(web): stop showing red x summaries for ordinary tool failures (#8395)\nb982847ab fix(mobile): keep iOS home header stable (#8467)\nb0ae3f3a8 fix(tooling): allow ignored-only staged changes (#8468)\n94401d01b fix(codex): accept Codex 0.150 account plans (#8447)\ne2d4d12a8 feat(web): split provider settings into list and editor (#8380)\n348367dcc Fix Android adaptive launcher icon (#4332)\n",
  "upstream_head": "053affbed2659f90cd1b1efaaa7a75865c4131c7\n",
  "conflicted_files": "apps/mobile/src/features/threads/ThreadComposer.tsx \n",
  "culprit_commits": "8fc7f2294 fix(mobile): restore composer glass and rounded shadows (#8597)\ne89800895 fix(mobile): show composer menus when starting a task (#8587)\ncb49e5d72 fix(opencode): handle child approvals, stops, and model catalogs (#8480)\n018d7f277 refactor(mobile): compile semantic themes for Uniwind (#7327)\n",
  "failing_step": "\n",
  "dropped_patches": "\n",
  "patch_manifest": "672b4a575 test(coil): wait for the collided arm to be destroyed instead of looking once\n74e9dedc9 fix(coil): stop the fork's boot reconcile from swallowing upstream's orphan pass\nc4658796f docs(coil): re-baseline the seam ledger against the 2026-08-27 merge-base\n345b668f0 chore(deps): regenerate the lockfile against the 2026-08-27 upstream tree\n63bcd2602 test(coil): provide the services upstream's orphaned-session reconcile now needs\n1a74357c7 docs(coil): Loops \u2014 design, prototypes and implementation plan (#42, #38 residue) (#120)\nd1808cde1 fix(coil): a turn that died inside the closed window isn't advancement (#121)\n4c821870d docs(coil): repoint the ledger at the final merge-base\n98da3ac14 docs(coil): re-baseline the seam ledger against the 2026-08-17 merge-base\n2dfbdb2f9 test(web): reconcile upstream's new running-send assertion with the fork's steer label\nffed2df23 test(coil): carry the app rename onto upstream's new DMG title assertion\n4ef890529 fix(coil): migrate the update toast off the native title tooltip\n4254abc2d docs(coil): fix seam-ledger rows the #71 rename left pointing at t3x names (#116)\n555b5f1de fix(coil): the verify gate must not require Bun-runtime imports the shipped app cannot reach (#107)\n182b14a31 fix(coil): verify every packaged layer, and fail on layers the gate cannot see (#102) (#106)\n5919a2588 docs(coil): re-measure the seam ledger on the landing branch\n20c037b67 fix(coil): drop a stray blank seam line the rebase left in ThreadComposer\n9d23145d6 fix(web): surface enqueue failures as a toast, not the maskable error banner\n04d32b806 docs(coil): re-baseline the seam ledger against the 2026-08-14 merge-base\nd2a6a909f chore(deps): regenerate the lockfile against the 2026-08-14 upstream tree\n6ddc1626b fix(server): name why a clone failed, and which provider it was\n78e6b1bb1 fix(coil): stop shipping upstream's update feed, which we never actually disabled\nb31228ba3 fix(coil): restore the release, and make two of its checks capable of failing\n94fbbeb75 fix(coil): publish a canonical Latest release, and re-arm retention\ndd3c1e08b docs(coil): design a canonical Latest release for the fork\n1915023d5 fix(coil): tell the truth about the one macOS prompt an update raises\n92d3c39d8 perf(coil): halve the desktop release bundle (#53)\nd06998660 docs(coil): re-baseline the ledger for the sidebar wordmark row\n6f5834bcd feat(coil): finish the app rename at the surfaces that name the app (#71)\nb3a14e77c docs(coil): repoint two ledger citations at the paths #71 moved\ncb1eaf62a refactor(coil): retire the local desktop autobuild\n7a3539432 fix(coil): reach the renamed relay through a service binding (#71)\n98c2f9543 fix(coil): make --rotate emit the CI secret commands itself (#71)\n4464a95c4 fix(coil): finish the certificate rotation and list all 47 rows in the ledger (#71)\nc62956577 chore(coil): re-record the designated requirement after the certificate rotation\nb08bfea4c fix(coil): compute the build-counter offset in bash, not in an expression (#71)\nf3082be1e fix(coil): repoint the last references to moved files (#71)\n66b90bfac style(coil): format the files this rename touched (#71)\n00f42158a docs(coil): re-baseline the seam ledger and correct the runbooks (#71)\nb1a5a7bf9 fix(coil): carry PRs #78 and #84 across the rename (#71)\n08fcaf3a7 feat(coil): move the relay, keeping the old hostname alive as a proxy (#71)\n0b629a947 feat(coil): cut the sync automation over to coil names (#71)\n776e87736 feat(coil): move the release identity, offsetting the counter so clients keep updating (#71)\n3601821ee feat(coil): rename the app to T3 Coil, with its own bundle id and certificate (#71)\n925ad2110 refactor(coil): move the fork's directories and symbols off t3x (#71)\n9922e8856 docs(coil): design the t3x -> coil rename around its four silent failures (#71)\n523982307 fix(deps): clear the sharp and @hono/node-server advisories by re-resolution (#58) (#87)\n1f4772fc6 feat(coil): put the real install steps on the download page, from one source (#72)\n045695577 feat(coil): a real link-preview card for shared URLs\n65917e7e1 fix(t3x): push the sync as a workflow-scoped token, and escalate when it fails\n9f4c0cf95 fix(web): steering-path leftovers from the queue transition (#40 A1-A4)\nd1a5864d7 fix(t3x): stop a user message destroying a pending auto-resume\n93bebbd86 docs(t3x): note that the trusted certificate is listed twice, and why that is fine\n5c10317be docs(t3x): correct the runbook's seam claim \u2014 the bundle id spends one upstream line\nc39130f39 fix(t3x): pin the designated requirement the fork's identity produces (#70)\n70a5bae6d fix(t3x): give the fork its own bundle id, so it stops sharing TCC rows with upstream (#70)\nf9890410d fix(t3x): sign the macOS build with a stable identity so permission grants survive updates (#70)\ne1542d051 fix(web): an edit saved during dispatch no longer disappears (#40 A5)\nc8bc37375 fix(t3x): derive and verify the autobuild agent's PATH, and correct the runbook interval (#41)\nb79576def fix(t3x): the Windows transient-crash retry could never fire; classify on the code vp prints (#47)\nff0c38108 docs(worklog): write down how the skill actually gets installed (#65)\n193de9249 fix(worklog): satisfy the repo lint rules the suite files were breaking (#65)\nd568fff8e fix(worklog): correct the numbers the report is built on (#65)\n6171be49f feat(t3x): add the /worklog daily work-log skill (#65)\nd6b74ff96 fix(t3x): widen the release retry window past the observed 403 duration\n763df8a67 fix(coil): stop the deploy verify step failing on Cloudflare bot mitigation\n982bca41a fix(coil): put pnpm on PATH in the homepage deploy workflow\n7e5bb5b40 docs(coil): fix the stale deploy-workflow pointer, note the secret is set\na0c7bddbd docs(coil): recapture the hero evidence with all five marks restored\ne7d59577e fix(coil): bring the hero marks back on mobile as an in-flow row\n6379eb094 docs(coil): recapture mobile evidence after the collision fix\nf113d287d fix(coil): stop the hero marks colliding with mobile content, equalise stacked buttons\n1b2a3a844 docs(coil): recapture the homepage evidence against coil.curlycloud.dev\n26ee7a3eb feat(coil): reposition the homepage as Coil, a personal fork\n2b8fc5130 docs(coil): design for repositioning the homepage as Coil\na49d57763 docs(t3x): capture homepage screenshots and a scroll-through for review\ne730c8f44 ci(t3x): pin the deploy wrangler exactly, not to a floating major\naabe59feb docs(t3x): record the fork homepage on the seam ledger and sync runbook\ned6f9a499 ci(t3x): auto-deploy the homepage to Cloudflare on push to main\nac5b36d2e feat(t3x): deploy the homepage as a Cloudflare assets-only Worker\n062d91907 feat(t3x): serve downloads from the fork's update-relay manifest and wire the sync strip\n689660080 feat(t3x): rebrand the homepage copy, chrome, and fork graph\nf1f7cdf8c feat(t3x): strip upstream-only social proof, store links, and legal pages\n20d077a74 feat(t3x): seed the fork homepage from apps/marketing\na0afbe701 docs(t3x): record before/after capture for the capsule anchor fix (#67)\n85526109c fix(t3x): anchor the auto-resume capsule to the composer's measured box (#67)\n267c83127 fix(t3x): retry the relay notify, and surface DO failures as readable 503s (#66)\na10413a81 docs(t3x): re-baseline the seam ledger against upstream v0.0.33\nae67db4ea docs(t3x): record the mobile sendLabel mirror on the ledger\n6b595a438 docs(t3x): re-baseline the seam ledger against the follow-up merge-base\n540e4817b docs(t3x): re-baseline the seam ledger against the 2026-08-08 merge-base\nda5b3c7bb test(t3x): retime the tolerant-budget tests to upstream's new retry ladder\n67c2aa916 fix(t3x): drop the settings imports upstream stopped needing\n6bcd62319 fix(t3x): give the crash-recovery test the registries upstream added\n1a414355c chore(deps): regenerate the lockfile against the 2026-08-08 upstream tree\n4fbafe3b3 docs(t3x): archive the Loop Watch design before its branch is deleted\n77f1e969a fix(t3x): put ~/.cargo/bin on the autobuild agent's PATH\nf4e2911d9 fix(t3x): track the composer's top edge so banners cannot cover the capsule\nacaa74770 fix(t3x): align the auto-resume capsule with the composer's right edge\naad2b4b4d fix(t3x): put the auto-resume capsule back above the composer\n4049b03ee fix(t3x): pin the countdown width, spring the toggle, move the capsule top-right\n6cb2c7b5b fix(t3x): make auto-resume teardown re-armable so StrictMode cannot kill it\nddf79bf12 feat(t3x): rebuild the auto-resume capsule and cover it with tests\nddc52c6b9 chore(t3x): stop Dependabot re-failing on advisories it cannot fix\n28f56d5e4 fix(t3x): stop a transient 403 from discarding a whole release build\n47bd0f636 feat(t3x): verify the install actually happened, and offer to report it when it did not\n0febab9be fix(t3x): stop calling the Windows update a restart\n29c23bba1 Update toast: changelog-forward design, and a restart that waits for you (#55)\n4a61ba80b chore(deps): dedupe nanoid onto 3.3.17, closing the two alerts the sweep reopened\n8ccbbaab2 chore(deps): clear 56 of the 62 open transitive advisories in the root lockfile\n559c20b01 chore(deps): bump electron to 41.10.3, and stop Dependabot on the vendored subtrees\na460c6d2f docs(t3x): put the manual-install commands on the release page\n070379ea7 fix(t3x): follow the 302 on GitHub release asset downloads\n4a11fcd79 fix(t3x): actually serialise the release bundle build\nab09847b3 fix(t3x): scope ensure:electron, and refuse updates without a release counter\n6f30b35bd fix(t3x): wait for the condition in the auto-resume reactor tests\nda04c3e9b Update delivery: CI builds, relay pushes, the app offers a restart (#51)\nef0e10932 ci(t3x): raise the hook timeout alongside the test timeout\n3de64bf7d docs(t3x): remeasure the seam ledger against the 2026-08-02 merge-base\ndcb408c44 fix(t3x): adapt the crash-recovery startup test to upstream's new startup internals\n700e302ad fix(web): keep the queue's reorder controls usable, and leave a dispatch trail (#35)\n62af2534e feat(web): steer a running turn instead of queuing behind it (#35)\nc308a1b98 feat(web): make the thread outbox read as composer chrome, and let it be reordered (#35)\nffce54b82 docs(t3x): point the self-reference rule at the renamed Claude doc\n446c40ce2 docs(t3x): follow upstream's rename of the Claude provider doc\nf5ef6e3e2 docs(t3x): remeasure the seam ledger against the 2026-07-30 merge-base\n39b031007 fix(web): apply upstream's detail-loading send gate to the queue path\n08aabe000 fix(t3x): apply the sync test-timeout to every gate, not just fork CI (#32)\n7e1a8481e ci(t3x): raise the test timeout for the fork's slower runners\n0a753b236 docs(t3x): replace the fictional seam ledger with a measured one\nee5e6b533 docs(providers): fix the broken Claude multi-account recipe\nb640e841b test(t3x): move fork settings coverage out of the upstream test file\n2834951d3 feat(t3x): auto-build from origin/main in a dedicated worktree\nf307c1136 fix(client-runtime): reset tolerant reconnect budget across a network drop\n40661edc2 fix(web): address Web Push review findings (reactor priming, VAPID recovery, cleanup)\nefc5d1cbf feat(web): closed-tab Web Push notifications (SW + PWA + server VAPID push)\ndde97d739 fix(connection): tolerate a slow-but-alive local backend + heap headroom\n4d53599f2 feat(web): queue messages while a chat is running (thread outbox)\nfedbfa3ba ci(t3x): add fork-runnable PR/main verify gate (t3x-ci.yml)\ne968c00cd docs(t3x): document how to land a sync PR (force-update, not merge button)\n4d34cd326 fix(t3x): resolve pre-existing typecheck/lint red on fork test files\n44f3c0828 fix(t3x): pin sync escalation gh calls to the fork (GH_REPO)\n7a3a1d369 feat(t3x): on-demand agent to resolve escalated upstream-sync conflicts\ndc2131a3e fix(t3x): make sync escalation always open the t3x-sync issue\nd2e9a59d8 fix(mobile): iOS Shift+Return inserts a newline instead of submitting\nd5d4e5107 feat(mobile): queue/send from the keyboard Return key\n7bd7550aa chore(t3x): auto-build on a 12h cadence, not every main commit\n3a9cc4d2c fix(notifications): final-review fixes \u2014 web notification guard, desktop coalescing, draft-route suppression\n73301648f feat(web): needs-input notification setting and web permission UX\n676749187 feat(web): notification coordinator with platform shim and click-to-navigate\n3a9cf75d1 feat(desktop): native OS notification IPC with click-to-reveal activation\n54d81ef48 feat(web): add pure needs-attention tracker and suppression logic\n86d5502a5 feat(contracts): add notifyOnNeedsInput setting and DesktopBridge notification surface\n3db95d9c4 fix(server): reconcile crash-frozen `running` turns to interrupted on boot\nd67111c45 test(server): cover non-spawn `--version` failure mapping to available\n8e40b2018 fix(server): treat slow `az --version` as present, not missing\n91cbd43c8 fix(t3x): don't cancel auto-resume as thread-advanced when the limited turn settles\n20914c5fa fix(t3x): auto-build fixes found running it for real\n0d9f762ed docs(t3x): correct which .app a default auto-build replaces\n4013cdb16 fix(t3x): resolve adversarial-review findings in auto-build\n1b1e00820 fix(t3x): resolve auto-build review findings\ndb2bf8cf1 fix(t3x): strip trailing newline from auto-build status JSON values\n4e6d9d796 feat(t3x): auto-build & install the desktop app on change\n80c6fa015 fix(t3x): prototype-chain threadId corrupted the auto-resume state file\n6e372c554 test(t3x): route-level tests for /api/t3x/auto-resume\n3b79dede4 docs(t3x): record the auto-resume UI seams\nded01d959 feat(t3x): per-thread auto-resume overlay in the thread view\n61332d1a8 feat(t3x): authenticated /api/t3x/auto-resume route\nd6e906e56 feat(t3x): per-thread auto-resume switch (server state + gating)\n5832db1e5 docs(t3x): design + plan for per-thread auto-resume UI (floating card)\n11f02ac95 docs(t3x): plan for auto-build + install desktop app on change\nbb9266d0c fix(t3x): resolve third-pass verified review findings\n2de841002 docs(t3x): align auto-resume spec with final implementation\n7dbe029d4 fix(t3x): resolve adversarial-review findings across auto-resume + sync\n591658e82 feat(t3x): usage-limit auto-resume reactor (Project B)\n7baeb4eb4 docs/ci(t3x): incorporate adversarial review findings\n5577e3a79 feat(t3x): fork setup + daily upstream sync + weekly verify (Project A)\n77ddf8077 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.

Automated daily upstream sync could not complete.

Result: conflict
Recovery tag: coil/last-good-20260830-132411
Run: https://github.com/radroid/t3code/actions/runs/33314039609

status JSON

{
  "kind": "daily",
  "result": "conflict",
  "upstream_range": "2daff8c25 test(web): remove tests for unreachable helpers (#8738)\n8dcb96314 revert(web): restore previous composer banners (#8733)\n1f8ed54ad fix(mobile): reduce dev-client reload and Metro startup cost (#8694)\n3d32797f6 fix(web): unify activity logs and composer banners (#8693)\nc0e09f323 fix(web): render nested markdown images correctly (#8501)\n72c44a847 perf(desktop): skip duplicate browser updates (#8018)\n660cddd3b fix(web): four composer spacing defects (#8090)\nebb9b9fda fix(client-runtime): refresh edited pull request comments (#8094)\nfc262f1a2 fix(server): retry automatic thread title generation (#8087)\n053affbed fix(mobile): prevent header overflow and back-button artifacts (#8624)\n074bcd6dc fix(web): keep project picker popup inside the sidebar (#8627)\n5e63aea2d fix(web): clean up provider settings list and editor (#8504)\nc1c2d5401 feat: let an environment publish themes as a file (#8569)\nbe218ac76 feat(web): keybinding settings as settings rows (#8532)\nd22709f75 fix(web): pass stashShortcutLabel in the mixed-attachments stash test\nbcb855a63 feat(web): attach PDFs, ZIPs, and other files to a turn (#8236)\n6a9d9f988 chore: vouch ryanrhughes (#8613)\nc131f2892 fix(server): stop querying Claude context usage after turns (#8610)\n38dcd7a40 fix(mobile): harden native header toolbar items (#8611)\n3e6ab36f6 chore(mobile): upgrade to Expo SDK 57 (#8609)\n4669eab8e fix(mobile): stabilize iOS header item transitions (#8607)\n702a6ade3 fix(codex): avoid quadratic app-server input buffering (#8605)\n2bc9e8ef6 Require human review for pull requests changing product defaults (#8603)\n3251b7548 chore(release): prepare v0.0.36\nac3a33191 Remove Messages Glass Lab experiment (#8599)\n8fc7f2294 fix(mobile): restore composer glass and rounded shadows (#8597)\n38154388d fix: restore automatic thread settling defaults (#8596)\n22c311dde feat(web): add toggleable confirmation before unpinning a thread (#7313)\nac3b2adf9 fix(web): show the configured stash shortcut (#8437)\ne89800895 fix(mobile): show composer menus when starting a task (#8587)\nb654911f8 fix(web): stop session activity timing test from blocking releases (#8585)\n0bbecfabf fix: make thread auto-settling opt-in (#8321)\ncb49e5d72 fix(opencode): handle child approvals, stops, and model catalogs (#8480)\n0009aacdf fix(web): keep long task drawers usable on small screens (#8313)\n0e2905eb7 fix(desktop): oauth popups open from the browser preview (#8435)\nff1761012 fix(desktop): stop hidden previews draining battery (#8567)\na40aef4cc fix(server): a draft can retry its first send after a failed bootstrap (#8226)\n48c176b3c feat(web): make the sidebar project filter a searchable combobox (#5931)\n94f194816 fix(connect): explain DPoP connection failures (#8351)\n45c0dff8e fix(mobile): show file actions on Android (#8215)\n84b9d9bc2 fix(clients): honor project default models in new threads (#6011)\nacb599d2d fix(mobile): show OpenCode model sources in picker (#8573)\nf94a0d646 fix(desktop): Cache Runtime locally on WSL Filesystem, dramatically improving launch times  (#5769)\n018d7f277 refactor(mobile): compile semantic themes for Uniwind (#7327)\n9257bd860 fix(web): add back button to project settings (#8168)\n4c51b4c9b feat(web): toggle thread pin from the keyboard\n8f4913221 feat(server): accept PDF, ZIP, and other file uploads up to 50MB (#8235)\n88be5631f feat(analytics): report connected client platforms (#8481)\n49f6241dd fix(codex): show sub-agent models (#8502)\n7068e86f7 fix(web): open GitHub pull requests in browser when loading fails (#8507)\nf276e632c fix(web): stabilize the provider settings editor (#8472)\n5766dfbf5 fix(release): move nightly schedule to minute 38\nc8aba2587 test(web): remove redundant cache key test (#8484)\n2fbe31309 fix(desktop): allow preview automation in agent-created threads (#8483)\n850e4582e fix(mobile): refine Git action toast glass styling (#8399)\nf1e6f0c9b fix(web): stop showing red x summaries for ordinary tool failures (#8395)\nb982847ab fix(mobile): keep iOS home header stable (#8467)\nb0ae3f3a8 fix(tooling): allow ignored-only staged changes (#8468)\n94401d01b fix(codex): accept Codex 0.150 account plans (#8447)\ne2d4d12a8 feat(web): split provider settings into list and editor (#8380)\n348367dcc Fix Android adaptive launcher icon (#4332)\n",
  "upstream_head": "2daff8c25adf701fddd062ae93b94cc57d420ec2\n",
  "conflicted_files": "apps/mobile/src/components/AppSymbol.tsx apps/mobile/src/features/threads/ThreadComposer.tsx \n",
  "culprit_commits": "1f8ed54ad fix(mobile): reduce dev-client reload and Metro startup cost (#8694)\n8fc7f2294 fix(mobile): restore composer glass and rounded shadows (#8597)\ne89800895 fix(mobile): show composer menus when starting a task (#8587)\ncb49e5d72 fix(opencode): handle child approvals, stops, and model catalogs (#8480)\n018d7f277 refactor(mobile): compile semantic themes for Uniwind (#7327)\n",
  "failing_step": "\n",
  "dropped_patches": "\n",
  "patch_manifest": "672b4a575 test(coil): wait for the collided arm to be destroyed instead of looking once\n74e9dedc9 fix(coil): stop the fork's boot reconcile from swallowing upstream's orphan pass\nc4658796f docs(coil): re-baseline the seam ledger against the 2026-08-27 merge-base\n345b668f0 chore(deps): regenerate the lockfile against the 2026-08-27 upstream tree\n63bcd2602 test(coil): provide the services upstream's orphaned-session reconcile now needs\n1a74357c7 docs(coil): Loops \u2014 design, prototypes and implementation plan (#42, #38 residue) (#120)\nd1808cde1 fix(coil): a turn that died inside the closed window isn't advancement (#121)\n4c821870d docs(coil): repoint the ledger at the final merge-base\n98da3ac14 docs(coil): re-baseline the seam ledger against the 2026-08-17 merge-base\n2dfbdb2f9 test(web): reconcile upstream's new running-send assertion with the fork's steer label\nffed2df23 test(coil): carry the app rename onto upstream's new DMG title assertion\n4ef890529 fix(coil): migrate the update toast off the native title tooltip\n4254abc2d docs(coil): fix seam-ledger rows the #71 rename left pointing at t3x names (#116)\n555b5f1de fix(coil): the verify gate must not require Bun-runtime imports the shipped app cannot reach (#107)\n182b14a31 fix(coil): verify every packaged layer, and fail on layers the gate cannot see (#102) (#106)\n5919a2588 docs(coil): re-measure the seam ledger on the landing branch\n20c037b67 fix(coil): drop a stray blank seam line the rebase left in ThreadComposer\n9d23145d6 fix(web): surface enqueue failures as a toast, not the maskable error banner\n04d32b806 docs(coil): re-baseline the seam ledger against the 2026-08-14 merge-base\nd2a6a909f chore(deps): regenerate the lockfile against the 2026-08-14 upstream tree\n6ddc1626b fix(server): name why a clone failed, and which provider it was\n78e6b1bb1 fix(coil): stop shipping upstream's update feed, which we never actually disabled\nb31228ba3 fix(coil): restore the release, and make two of its checks capable of failing\n94fbbeb75 fix(coil): publish a canonical Latest release, and re-arm retention\ndd3c1e08b docs(coil): design a canonical Latest release for the fork\n1915023d5 fix(coil): tell the truth about the one macOS prompt an update raises\n92d3c39d8 perf(coil): halve the desktop release bundle (#53)\nd06998660 docs(coil): re-baseline the ledger for the sidebar wordmark row\n6f5834bcd feat(coil): finish the app rename at the surfaces that name the app (#71)\nb3a14e77c docs(coil): repoint two ledger citations at the paths #71 moved\ncb1eaf62a refactor(coil): retire the local desktop autobuild\n7a3539432 fix(coil): reach the renamed relay through a service binding (#71)\n98c2f9543 fix(coil): make --rotate emit the CI secret commands itself (#71)\n4464a95c4 fix(coil): finish the certificate rotation and list all 47 rows in the ledger (#71)\nc62956577 chore(coil): re-record the designated requirement after the certificate rotation\nb08bfea4c fix(coil): compute the build-counter offset in bash, not in an expression (#71)\nf3082be1e fix(coil): repoint the last references to moved files (#71)\n66b90bfac style(coil): format the files this rename touched (#71)\n00f42158a docs(coil): re-baseline the seam ledger and correct the runbooks (#71)\nb1a5a7bf9 fix(coil): carry PRs #78 and #84 across the rename (#71)\n08fcaf3a7 feat(coil): move the relay, keeping the old hostname alive as a proxy (#71)\n0b629a947 feat(coil): cut the sync automation over to coil names (#71)\n776e87736 feat(coil): move the release identity, offsetting the counter so clients keep updating (#71)\n3601821ee feat(coil): rename the app to T3 Coil, with its own bundle id and certificate (#71)\n925ad2110 refactor(coil): move the fork's directories and symbols off t3x (#71)\n9922e8856 docs(coil): design the t3x -> coil rename around its four silent failures (#71)\n523982307 fix(deps): clear the sharp and @hono/node-server advisories by re-resolution (#58) (#87)\n1f4772fc6 feat(coil): put the real install steps on the download page, from one source (#72)\n045695577 feat(coil): a real link-preview card for shared URLs\n65917e7e1 fix(t3x): push the sync as a workflow-scoped token, and escalate when it fails\n9f4c0cf95 fix(web): steering-path leftovers from the queue transition (#40 A1-A4)\nd1a5864d7 fix(t3x): stop a user message destroying a pending auto-resume\n93bebbd86 docs(t3x): note that the trusted certificate is listed twice, and why that is fine\n5c10317be docs(t3x): correct the runbook's seam claim \u2014 the bundle id spends one upstream line\nc39130f39 fix(t3x): pin the designated requirement the fork's identity produces (#70)\n70a5bae6d fix(t3x): give the fork its own bundle id, so it stops sharing TCC rows with upstream (#70)\nf9890410d fix(t3x): sign the macOS build with a stable identity so permission grants survive updates (#70)\ne1542d051 fix(web): an edit saved during dispatch no longer disappears (#40 A5)\nc8bc37375 fix(t3x): derive and verify the autobuild agent's PATH, and correct the runbook interval (#41)\nb79576def fix(t3x): the Windows transient-crash retry could never fire; classify on the code vp prints (#47)\nff0c38108 docs(worklog): write down how the skill actually gets installed (#65)\n193de9249 fix(worklog): satisfy the repo lint rules the suite files were breaking (#65)\nd568fff8e fix(worklog): correct the numbers the report is built on (#65)\n6171be49f feat(t3x): add the /worklog daily work-log skill (#65)\nd6b74ff96 fix(t3x): widen the release retry window past the observed 403 duration\n763df8a67 fix(coil): stop the deploy verify step failing on Cloudflare bot mitigation\n982bca41a fix(coil): put pnpm on PATH in the homepage deploy workflow\n7e5bb5b40 docs(coil): fix the stale deploy-workflow pointer, note the secret is set\na0c7bddbd docs(coil): recapture the hero evidence with all five marks restored\ne7d59577e fix(coil): bring the hero marks back on mobile as an in-flow row\n6379eb094 docs(coil): recapture mobile evidence after the collision fix\nf113d287d fix(coil): stop the hero marks colliding with mobile content, equalise stacked buttons\n1b2a3a844 docs(coil): recapture the homepage evidence against coil.curlycloud.dev\n26ee7a3eb feat(coil): reposition the homepage as Coil, a personal fork\n2b8fc5130 docs(coil): design for repositioning the homepage as Coil\na49d57763 docs(t3x): capture homepage screenshots and a scroll-through for review\ne730c8f44 ci(t3x): pin the deploy wrangler exactly, not to a floating major\naabe59feb docs(t3x): record the fork homepage on the seam ledger and sync runbook\ned6f9a499 ci(t3x): auto-deploy the homepage to Cloudflare on push to main\nac5b36d2e feat(t3x): deploy the homepage as a Cloudflare assets-only Worker\n062d91907 feat(t3x): serve downloads from the fork's update-relay manifest and wire the sync strip\n689660080 feat(t3x): rebrand the homepage copy, chrome, and fork graph\nf1f7cdf8c feat(t3x): strip upstream-only social proof, store links, and legal pages\n20d077a74 feat(t3x): seed the fork homepage from apps/marketing\na0afbe701 docs(t3x): record before/after capture for the capsule anchor fix (#67)\n85526109c fix(t3x): anchor the auto-resume capsule to the composer's measured box (#67)\n267c83127 fix(t3x): retry the relay notify, and surface DO failures as readable 503s (#66)\na10413a81 docs(t3x): re-baseline the seam ledger against upstream v0.0.33\nae67db4ea docs(t3x): record the mobile sendLabel mirror on the ledger\n6b595a438 docs(t3x): re-baseline the seam ledger against the follow-up merge-base\n540e4817b docs(t3x): re-baseline the seam ledger against the 2026-08-08 merge-base\nda5b3c7bb test(t3x): retime the tolerant-budget tests to upstream's new retry ladder\n67c2aa916 fix(t3x): drop the settings imports upstream stopped needing\n6bcd62319 fix(t3x): give the crash-recovery test the registries upstream added\n1a414355c chore(deps): regenerate the lockfile against the 2026-08-08 upstream tree\n4fbafe3b3 docs(t3x): archive the Loop Watch design before its branch is deleted\n77f1e969a fix(t3x): put ~/.cargo/bin on the autobuild agent's PATH\nf4e2911d9 fix(t3x): track the composer's top edge so banners cannot cover the capsule\nacaa74770 fix(t3x): align the auto-resume capsule with the composer's right edge\naad2b4b4d fix(t3x): put the auto-resume capsule back above the composer\n4049b03ee fix(t3x): pin the countdown width, spring the toggle, move the capsule top-right\n6cb2c7b5b fix(t3x): make auto-resume teardown re-armable so StrictMode cannot kill it\nddf79bf12 feat(t3x): rebuild the auto-resume capsule and cover it with tests\nddc52c6b9 chore(t3x): stop Dependabot re-failing on advisories it cannot fix\n28f56d5e4 fix(t3x): stop a transient 403 from discarding a whole release build\n47bd0f636 feat(t3x): verify the install actually happened, and offer to report it when it did not\n0febab9be fix(t3x): stop calling the Windows update a restart\n29c23bba1 Update toast: changelog-forward design, and a restart that waits for you (#55)\n4a61ba80b chore(deps): dedupe nanoid onto 3.3.17, closing the two alerts the sweep reopened\n8ccbbaab2 chore(deps): clear 56 of the 62 open transitive advisories in the root lockfile\n559c20b01 chore(deps): bump electron to 41.10.3, and stop Dependabot on the vendored subtrees\na460c6d2f docs(t3x): put the manual-install commands on the release page\n070379ea7 fix(t3x): follow the 302 on GitHub release asset downloads\n4a11fcd79 fix(t3x): actually serialise the release bundle build\nab09847b3 fix(t3x): scope ensure:electron, and refuse updates without a release counter\n6f30b35bd fix(t3x): wait for the condition in the auto-resume reactor tests\nda04c3e9b Update delivery: CI builds, relay pushes, the app offers a restart (#51)\nef0e10932 ci(t3x): raise the hook timeout alongside the test timeout\n3de64bf7d docs(t3x): remeasure the seam ledger against the 2026-08-02 merge-base\ndcb408c44 fix(t3x): adapt the crash-recovery startup test to upstream's new startup internals\n700e302ad fix(web): keep the queue's reorder controls usable, and leave a dispatch trail (#35)\n62af2534e feat(web): steer a running turn instead of queuing behind it (#35)\nc308a1b98 feat(web): make the thread outbox read as composer chrome, and let it be reordered (#35)\nffce54b82 docs(t3x): point the self-reference rule at the renamed Claude doc\n446c40ce2 docs(t3x): follow upstream's rename of the Claude provider doc\nf5ef6e3e2 docs(t3x): remeasure the seam ledger against the 2026-07-30 merge-base\n39b031007 fix(web): apply upstream's detail-loading send gate to the queue path\n08aabe000 fix(t3x): apply the sync test-timeout to every gate, not just fork CI (#32)\n7e1a8481e ci(t3x): raise the test timeout for the fork's slower runners\n0a753b236 docs(t3x): replace the fictional seam ledger with a measured one\nee5e6b533 docs(providers): fix the broken Claude multi-account recipe\nb640e841b test(t3x): move fork settings coverage out of the upstream test file\n2834951d3 feat(t3x): auto-build from origin/main in a dedicated worktree\nf307c1136 fix(client-runtime): reset tolerant reconnect budget across a network drop\n40661edc2 fix(web): address Web Push review findings (reactor priming, VAPID recovery, cleanup)\nefc5d1cbf feat(web): closed-tab Web Push notifications (SW + PWA + server VAPID push)\ndde97d739 fix(connection): tolerate a slow-but-alive local backend + heap headroom\n4d53599f2 feat(web): queue messages while a chat is running (thread outbox)\nfedbfa3ba ci(t3x): add fork-runnable PR/main verify gate (t3x-ci.yml)\ne968c00cd docs(t3x): document how to land a sync PR (force-update, not merge button)\n4d34cd326 fix(t3x): resolve pre-existing typecheck/lint red on fork test files\n44f3c0828 fix(t3x): pin sync escalation gh calls to the fork (GH_REPO)\n7a3a1d369 feat(t3x): on-demand agent to resolve escalated upstream-sync conflicts\ndc2131a3e fix(t3x): make sync escalation always open the t3x-sync issue\nd2e9a59d8 fix(mobile): iOS Shift+Return inserts a newline instead of submitting\nd5d4e5107 feat(mobile): queue/send from the keyboard Return key\n7bd7550aa chore(t3x): auto-build on a 12h cadence, not every main commit\n3a9cc4d2c fix(notifications): final-review fixes \u2014 web notification guard, desktop coalescing, draft-route suppression\n73301648f feat(web): needs-input notification setting and web permission UX\n676749187 feat(web): notification coordinator with platform shim and click-to-navigate\n3a9cf75d1 feat(desktop): native OS notification IPC with click-to-reveal activation\n54d81ef48 feat(web): add pure needs-attention tracker and suppression logic\n86d5502a5 feat(contracts): add notifyOnNeedsInput setting and DesktopBridge notification surface\n3db95d9c4 fix(server): reconcile crash-frozen `running` turns to interrupted on boot\nd67111c45 test(server): cover non-spawn `--version` failure mapping to available\n8e40b2018 fix(server): treat slow `az --version` as present, not missing\n91cbd43c8 fix(t3x): don't cancel auto-resume as thread-advanced when the limited turn settles\n20914c5fa fix(t3x): auto-build fixes found running it for real\n0d9f762ed docs(t3x): correct which .app a default auto-build replaces\n4013cdb16 fix(t3x): resolve adversarial-review findings in auto-build\n1b1e00820 fix(t3x): resolve auto-build review findings\ndb2bf8cf1 fix(t3x): strip trailing newline from auto-build status JSON values\n4e6d9d796 feat(t3x): auto-build & install the desktop app on change\n80c6fa015 fix(t3x): prototype-chain threadId corrupted the auto-resume state file\n6e372c554 test(t3x): route-level tests for /api/t3x/auto-resume\n3b79dede4 docs(t3x): record the auto-resume UI seams\nded01d959 feat(t3x): per-thread auto-resume overlay in the thread view\n61332d1a8 feat(t3x): authenticated /api/t3x/auto-resume route\nd6e906e56 feat(t3x): per-thread auto-resume switch (server state + gating)\n5832db1e5 docs(t3x): design + plan for per-thread auto-resume UI (floating card)\n11f02ac95 docs(t3x): plan for auto-build + install desktop app on change\nbb9266d0c fix(t3x): resolve third-pass verified review findings\n2de841002 docs(t3x): align auto-resume spec with final implementation\n7dbe029d4 fix(t3x): resolve adversarial-review findings across auto-resume + sync\n591658e82 feat(t3x): usage-limit auto-resume reactor (Project B)\n7baeb4eb4 docs/ci(t3x): incorporate adversarial review findings\n5577e3a79 feat(t3x): fork setup + daily upstream sync + weekly verify (Project A)\n77ddf8077 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.

Automated daily upstream sync could not complete.

Result: conflict
Recovery tag: coil/last-good-20260831-153812
Run: https://github.com/radroid/t3code/actions/runs/33409456032

status JSON

{
  "kind": "daily",
  "result": "conflict",
  "upstream_range": "9b2d04317 fix(mobile): replace Callstack glass with Expo glass (#8862)\ne9c4775e8 fix(web): mark pull request links as external (#8856)\n395811105 fix(preview): improve browser recording quality (#8839)\n3f62e6fa6 fix(web): widen sync banners and simplify the working timer (#8855)\n9842518c9 fix(web): address composer banner review follow-ups (#8850)\n30175a8af fix(web): restore unified activity logs and composer banners (#8734)\nf9137a0c8 fix(mobile): map native menu icon colors explicitly\ne3dcc1615 Add mobile composer attachment menu with video support (#8843)\n7963ac740 chore(release): prepare v0.0.37\ncefec32d6 fix(web): prevent pull request metadata overlap (#8790)\n352710d49 feat(mobile): add offline iPhone voice input (#8614)\n8b817cbca fix(web): use circle alert for failed tool calls (#8840)\n17c48f7fc fix(web): fold interim turn responses (#8828)\ne4f7b14fa chore: add Windows setup script to t3.json (#8814)\nc1e70b5f8 fix(web,mobile): render Codex citations and artifact templates (#8584)\ne09b88b6a fix(web): keep right panel synced with agent edits (#8803)\n5885a68ad fix(web): keep image preview above sidebar control (#8811)\n9072aa1fd fix(server): stop overpricing cached Claude tokens (#8806)\n60f2ce027 fix(git): follow repository instructions in generated source control text (#8804)\n8f525af5a fix(web): open agent images in expanded preview (#8807)\n12fe2d6d0 fix(windows): strip quotes from repaired PATH (#8746)\n6e324b9bb fix(web): reduce title bar scroll fade height (#8799)\n86c9a9288 feat(mobile): pick, share, and receive files in threads (#8237)\n7880a6e58 fix(grok): allow model changes in existing threads (#8392)\n7980dfddb fix(web,mobile): snooze menu no longer offers the same wake time twice (#8741)\nac4aae101 feat(web): play video attachments in chat (#8688)\nf15680bd3 feat(mobile): update tool summaries and chat transitions (#8793)\n2daff8c25 test(web): remove tests for unreachable helpers (#8738)\n8dcb96314 revert(web): restore previous composer banners (#8733)\n1f8ed54ad fix(mobile): reduce dev-client reload and Metro startup cost (#8694)\n3d32797f6 fix(web): unify activity logs and composer banners (#8693)\nc0e09f323 fix(web): render nested markdown images correctly (#8501)\n72c44a847 perf(desktop): skip duplicate browser updates (#8018)\n660cddd3b fix(web): four composer spacing defects (#8090)\nebb9b9fda fix(client-runtime): refresh edited pull request comments (#8094)\nfc262f1a2 fix(server): retry automatic thread title generation (#8087)\n053affbed fix(mobile): prevent header overflow and back-button artifacts (#8624)\n074bcd6dc fix(web): keep project picker popup inside the sidebar (#8627)\n5e63aea2d fix(web): clean up provider settings list and editor (#8504)\nc1c2d5401 feat: let an environment publish themes as a file (#8569)\nbe218ac76 feat(web): keybinding settings as settings rows (#8532)\nd22709f75 fix(web): pass stashShortcutLabel in the mixed-attachments stash test\nbcb855a63 feat(web): attach PDFs, ZIPs, and other files to a turn (#8236)\n6a9d9f988 chore: vouch ryanrhughes (#8613)\nc131f2892 fix(server): stop querying Claude context usage after turns (#8610)\n38dcd7a40 fix(mobile): harden native header toolbar items (#8611)\n3e6ab36f6 chore(mobile): upgrade to Expo SDK 57 (#8609)\n4669eab8e fix(mobile): stabilize iOS header item transitions (#8607)\n702a6ade3 fix(codex): avoid quadratic app-server input buffering (#8605)\n2bc9e8ef6 Require human review for pull requests changing product defaults (#8603)\n3251b7548 chore(release): prepare v0.0.36\nac3a33191 Remove Messages Glass Lab experiment (#8599)\n8fc7f2294 fix(mobile): restore composer glass and rounded shadows (#8597)\n38154388d fix: restore automatic thread settling defaults (#8596)\n22c311dde feat(web): add toggleable confirmation before unpinning a thread (#7313)\nac3b2adf9 fix(web): show the configured stash shortcut (#8437)\ne89800895 fix(mobile): show composer menus when starting a task (#8587)\nb654911f8 fix(web): stop session activity timing test from blocking releases (#8585)\n0bbecfabf fix: make thread auto-settling opt-in (#8321)\ncb49e5d72 fix(opencode): handle child approvals, stops, and model catalogs (#8480)\n0009aacdf fix(web): keep long task drawers usable on small screens (#8313)\n0e2905eb7 fix(desktop): oauth popups open from the browser preview (#8435)\nff1761012 fix(desktop): stop hidden previews draining battery (#8567)\na40aef4cc fix(server): a draft can retry its first send after a failed bootstrap (#8226)\n48c176b3c feat(web): make the sidebar project filter a searchable combobox (#5931)\n94f194816 fix(connect): explain DPoP connection failures (#8351)\n45c0dff8e fix(mobile): show file actions on Android (#8215)\n84b9d9bc2 fix(clients): honor project default models in new threads (#6011)\nacb599d2d fix(mobile): show OpenCode model sources in picker (#8573)\nf94a0d646 fix(desktop): Cache Runtime locally on WSL Filesystem, dramatically improving launch times  (#5769)\n018d7f277 refactor(mobile): compile semantic themes for Uniwind (#7327)\n9257bd860 fix(web): add back button to project settings (#8168)\n4c51b4c9b feat(web): toggle thread pin from the keyboard\n8f4913221 feat(server): accept PDF, ZIP, and other file uploads up to 50MB (#8235)\n88be5631f feat(analytics): report connected client platforms (#8481)\n49f6241dd fix(codex): show sub-agent models (#8502)\n7068e86f7 fix(web): open GitHub pull requests in browser when loading fails (#8507)\nf276e632c fix(web): stabilize the provider settings editor (#8472)\n5766dfbf5 fix(release): move nightly schedule to minute 38\nc8aba2587 test(web): remove redundant cache key test (#8484)\n2fbe31309 fix(desktop): allow preview automation in agent-created threads (#8483)\n850e4582e fix(mobile): refine Git action toast glass styling (#8399)\nf1e6f0c9b fix(web): stop showing red x summaries for ordinary tool failures (#8395)\nb982847ab fix(mobile): keep iOS home header stable (#8467)\nb0ae3f3a8 fix(tooling): allow ignored-only staged changes (#8468)\n94401d01b fix(codex): accept Codex 0.150 account plans (#8447)\ne2d4d12a8 feat(web): split provider settings into list and editor (#8380)\n348367dcc Fix Android adaptive launcher icon (#4332)\n",
  "upstream_head": "9b2d04317c68233782e0630464ac86d77d0686f3\n",
  "conflicted_files": "apps/mobile/src/components/AppSymbol.tsx apps/mobile/src/features/threads/ThreadComposer.tsx \n",
  "culprit_commits": "e3dcc1615 Add mobile composer attachment menu with video support (#8843)\n352710d49 feat(mobile): add offline iPhone voice input (#8614)\n86c9a9288 feat(mobile): pick, share, and receive files in threads (#8237)\nf15680bd3 feat(mobile): update tool summaries and chat transitions (#8793)\n1f8ed54ad fix(mobile): reduce dev-client reload and Metro startup cost (#8694)\n8fc7f2294 fix(mobile): restore composer glass and rounded shadows (#8597)\ne89800895 fix(mobile): show composer menus when starting a task (#8587)\ncb49e5d72 fix(opencode): handle child approvals, stops, and model catalogs (#8480)\n018d7f277 refactor(mobile): compile semantic themes for Uniwind (#7327)\n",
  "failing_step": "\n",
  "dropped_patches": "\n",
  "patch_manifest": "672b4a575 test(coil): wait for the collided arm to be destroyed instead of looking once\n74e9dedc9 fix(coil): stop the fork's boot reconcile from swallowing upstream's orphan pass\nc4658796f docs(coil): re-baseline the seam ledger against the 2026-08-27 merge-base\n345b668f0 chore(deps): regenerate the lockfile against the 2026-08-27 upstream tree\n63bcd2602 test(coil): provide the services upstream's orphaned-session reconcile now needs\n1a74357c7 docs(coil): Loops \u2014 design, prototypes and implementation plan (#42, #38 residue) (#120)\nd1808cde1 fix(coil): a turn that died inside the closed window isn't advancement (#121)\n4c821870d docs(coil): repoint the ledger at the final merge-base\n98da3ac14 docs(coil): re-baseline the seam ledger against the 2026-08-17 merge-base\n2dfbdb2f9 test(web): reconcile upstream's new running-send assertion with the fork's steer label\nffed2df23 test(coil): carry the app rename onto upstream's new DMG title assertion\n4ef890529 fix(coil): migrate the update toast off the native title tooltip\n4254abc2d docs(coil): fix seam-ledger rows the #71 rename left pointing at t3x names (#116)\n555b5f1de fix(coil): the verify gate must not require Bun-runtime imports the shipped app cannot reach (#107)\n182b14a31 fix(coil): verify every packaged layer, and fail on layers the gate cannot see (#102) (#106)\n5919a2588 docs(coil): re-measure the seam ledger on the landing branch\n20c037b67 fix(coil): drop a stray blank seam line the rebase left in ThreadComposer\n9d23145d6 fix(web): surface enqueue failures as a toast, not the maskable error banner\n04d32b806 docs(coil): re-baseline the seam ledger against the 2026-08-14 merge-base\nd2a6a909f chore(deps): regenerate the lockfile against the 2026-08-14 upstream tree\n6ddc1626b fix(server): name why a clone failed, and which provider it was\n78e6b1bb1 fix(coil): stop shipping upstream's update feed, which we never actually disabled\nb31228ba3 fix(coil): restore the release, and make two of its checks capable of failing\n94fbbeb75 fix(coil): publish a canonical Latest release, and re-arm retention\ndd3c1e08b docs(coil): design a canonical Latest release for the fork\n1915023d5 fix(coil): tell the truth about the one macOS prompt an update raises\n92d3c39d8 perf(coil): halve the desktop release bundle (#53)\nd06998660 docs(coil): re-baseline the ledger for the sidebar wordmark row\n6f5834bcd feat(coil): finish the app rename at the surfaces that name the app (#71)\nb3a14e77c docs(coil): repoint two ledger citations at the paths #71 moved\ncb1eaf62a refactor(coil): retire the local desktop autobuild\n7a3539432 fix(coil): reach the renamed relay through a service binding (#71)\n98c2f9543 fix(coil): make --rotate emit the CI secret commands itself (#71)\n4464a95c4 fix(coil): finish the certificate rotation and list all 47 rows in the ledger (#71)\nc62956577 chore(coil): re-record the designated requirement after the certificate rotation\nb08bfea4c fix(coil): compute the build-counter offset in bash, not in an expression (#71)\nf3082be1e fix(coil): repoint the last references to moved files (#71)\n66b90bfac style(coil): format the files this rename touched (#71)\n00f42158a docs(coil): re-baseline the seam ledger and correct the runbooks (#71)\nb1a5a7bf9 fix(coil): carry PRs #78 and #84 across the rename (#71)\n08fcaf3a7 feat(coil): move the relay, keeping the old hostname alive as a proxy (#71)\n0b629a947 feat(coil): cut the sync automation over to coil names (#71)\n776e87736 feat(coil): move the release identity, offsetting the counter so clients keep updating (#71)\n3601821ee feat(coil): rename the app to T3 Coil, with its own bundle id and certificate (#71)\n925ad2110 refactor(coil): move the fork's directories and symbols off t3x (#71)\n9922e8856 docs(coil): design the t3x -> coil rename around its four silent failures (#71)\n523982307 fix(deps): clear the sharp and @hono/node-server advisories by re-resolution (#58) (#87)\n1f4772fc6 feat(coil): put the real install steps on the download page, from one source (#72)\n045695577 feat(coil): a real link-preview card for shared URLs\n65917e7e1 fix(t3x): push the sync as a workflow-scoped token, and escalate when it fails\n9f4c0cf95 fix(web): steering-path leftovers from the queue transition (#40 A1-A4)\nd1a5864d7 fix(t3x): stop a user message destroying a pending auto-resume\n93bebbd86 docs(t3x): note that the trusted certificate is listed twice, and why that is fine\n5c10317be docs(t3x): correct the runbook's seam claim \u2014 the bundle id spends one upstream line\nc39130f39 fix(t3x): pin the designated requirement the fork's identity produces (#70)\n70a5bae6d fix(t3x): give the fork its own bundle id, so it stops sharing TCC rows with upstream (#70)\nf9890410d fix(t3x): sign the macOS build with a stable identity so permission grants survive updates (#70)\ne1542d051 fix(web): an edit saved during dispatch no longer disappears (#40 A5)\nc8bc37375 fix(t3x): derive and verify the autobuild agent's PATH, and correct the runbook interval (#41)\nb79576def fix(t3x): the Windows transient-crash retry could never fire; classify on the code vp prints (#47)\nff0c38108 docs(worklog): write down how the skill actually gets installed (#65)\n193de9249 fix(worklog): satisfy the repo lint rules the suite files were breaking (#65)\nd568fff8e fix(worklog): correct the numbers the report is built on (#65)\n6171be49f feat(t3x): add the /worklog daily work-log skill (#65)\nd6b74ff96 fix(t3x): widen the release retry window past the observed 403 duration\n763df8a67 fix(coil): stop the deploy verify step failing on Cloudflare bot mitigation\n982bca41a fix(coil): put pnpm on PATH in the homepage deploy workflow\n7e5bb5b40 docs(coil): fix the stale deploy-workflow pointer, note the secret is set\na0c7bddbd docs(coil): recapture the hero evidence with all five marks restored\ne7d59577e fix(coil): bring the hero marks back on mobile as an in-flow row\n6379eb094 docs(coil): recapture mobile evidence after the collision fix\nf113d287d fix(coil): stop the hero marks colliding with mobile content, equalise stacked buttons\n1b2a3a844 docs(coil): recapture the homepage evidence against coil.curlycloud.dev\n26ee7a3eb feat(coil): reposition the homepage as Coil, a personal fork\n2b8fc5130 docs(coil): design for repositioning the homepage as Coil\na49d57763 docs(t3x): capture homepage screenshots and a scroll-through for review\ne730c8f44 ci(t3x): pin the deploy wrangler exactly, not to a floating major\naabe59feb docs(t3x): record the fork homepage on the seam ledger and sync runbook\ned6f9a499 ci(t3x): auto-deploy the homepage to Cloudflare on push to main\nac5b36d2e feat(t3x): deploy the homepage as a Cloudflare assets-only Worker\n062d91907 feat(t3x): serve downloads from the fork's update-relay manifest and wire the sync strip\n689660080 feat(t3x): rebrand the homepage copy, chrome, and fork graph\nf1f7cdf8c feat(t3x): strip upstream-only social proof, store links, and legal pages\n20d077a74 feat(t3x): seed the fork homepage from apps/marketing\na0afbe701 docs(t3x): record before/after capture for the capsule anchor fix (#67)\n85526109c fix(t3x): anchor the auto-resume capsule to the composer's measured box (#67)\n267c83127 fix(t3x): retry the relay notify, and surface DO failures as readable 503s (#66)\na10413a81 docs(t3x): re-baseline the seam ledger against upstream v0.0.33\nae67db4ea docs(t3x): record the mobile sendLabel mirror on the ledger\n6b595a438 docs(t3x): re-baseline the seam ledger against the follow-up merge-base\n540e4817b docs(t3x): re-baseline the seam ledger against the 2026-08-08 merge-base\nda5b3c7bb test(t3x): retime the tolerant-budget tests to upstream's new retry ladder\n67c2aa916 fix(t3x): drop the settings imports upstream stopped needing\n6bcd62319 fix(t3x): give the crash-recovery test the registries upstream added\n1a414355c chore(deps): regenerate the lockfile against the 2026-08-08 upstream tree\n4fbafe3b3 docs(t3x): archive the Loop Watch design before its branch is deleted\n77f1e969a fix(t3x): put ~/.cargo/bin on the autobuild agent's PATH\nf4e2911d9 fix(t3x): track the composer's top edge so banners cannot cover the capsule\nacaa74770 fix(t3x): align the auto-resume capsule with the composer's right edge\naad2b4b4d fix(t3x): put the auto-resume capsule back above the composer\n4049b03ee fix(t3x): pin the countdown width, spring the toggle, move the capsule top-right\n6cb2c7b5b fix(t3x): make auto-resume teardown re-armable so StrictMode cannot kill it\nddf79bf12 feat(t3x): rebuild the auto-resume capsule and cover it with tests\nddc52c6b9 chore(t3x): stop Dependabot re-failing on advisories it cannot fix\n28f56d5e4 fix(t3x): stop a transient 403 from discarding a whole release build\n47bd0f636 feat(t3x): verify the install actually happened, and offer to report it when it did not\n0febab9be fix(t3x): stop calling the Windows update a restart\n29c23bba1 Update toast: changelog-forward design, and a restart that waits for you (#55)\n4a61ba80b chore(deps): dedupe nanoid onto 3.3.17, closing the two alerts the sweep reopened\n8ccbbaab2 chore(deps): clear 56 of the 62 open transitive advisories in the root lockfile\n559c20b01 chore(deps): bump electron to 41.10.3, and stop Dependabot on the vendored subtrees\na460c6d2f docs(t3x): put the manual-install commands on the release page\n070379ea7 fix(t3x): follow the 302 on GitHub release asset downloads\n4a11fcd79 fix(t3x): actually serialise the release bundle build\nab09847b3 fix(t3x): scope ensure:electron, and refuse updates without a release counter\n6f30b35bd fix(t3x): wait for the condition in the auto-resume reactor tests\nda04c3e9b Update delivery: CI builds, relay pushes, the app offers a restart (#51)\nef0e10932 ci(t3x): raise the hook timeout alongside the test timeout\n3de64bf7d docs(t3x): remeasure the seam ledger against the 2026-08-02 merge-base\ndcb408c44 fix(t3x): adapt the crash-recovery startup test to upstream's new startup internals\n700e302ad fix(web): keep the queue's reorder controls usable, and leave a dispatch trail (#35)\n62af2534e feat(web): steer a running turn instead of queuing behind it (#35)\nc308a1b98 feat(web): make the thread outbox read as composer chrome, and let it be reordered (#35)\nffce54b82 docs(t3x): point the self-reference rule at the renamed Claude doc\n446c40ce2 docs(t3x): follow upstream's rename of the Claude provider doc\nf5ef6e3e2 docs(t3x): remeasure the seam ledger against the 2026-07-30 merge-base\n39b031007 fix(web): apply upstream's detail-loading send gate to the queue path\n08aabe000 fix(t3x): apply the sync test-timeout to every gate, not just fork CI (#32)\n7e1a8481e ci(t3x): raise the test timeout for the fork's slower runners\n0a753b236 docs(t3x): replace the fictional seam ledger with a measured one\nee5e6b533 docs(providers): fix the broken Claude multi-account recipe\nb640e841b test(t3x): move fork settings coverage out of the upstream test file\n2834951d3 feat(t3x): auto-build from origin/main in a dedicated worktree\nf307c1136 fix(client-runtime): reset tolerant reconnect budget across a network drop\n40661edc2 fix(web): address Web Push review findings (reactor priming, VAPID recovery, cleanup)\nefc5d1cbf feat(web): closed-tab Web Push notifications (SW + PWA + server VAPID push)\ndde97d739 fix(connection): tolerate a slow-but-alive local backend + heap headroom\n4d53599f2 feat(web): queue messages while a chat is running (thread outbox)\nfedbfa3ba ci(t3x): add fork-runnable PR/main verify gate (t3x-ci.yml)\ne968c00cd docs(t3x): document how to land a sync PR (force-update, not merge button)\n4d34cd326 fix(t3x): resolve pre-existing typecheck/lint red on fork test files\n44f3c0828 fix(t3x): pin sync escalation gh calls to the fork (GH_REPO)\n7a3a1d369 feat(t3x): on-demand agent to resolve escalated upstream-sync conflicts\ndc2131a3e fix(t3x): make sync escalation always open the t3x-sync issue\nd2e9a59d8 fix(mobile): iOS Shift+Return inserts a newline instead of submitting\nd5d4e5107 feat(mobile): queue/send from the keyboard Return key\n7bd7550aa chore(t3x): auto-build on a 12h cadence, not every main commit\n3a9cc4d2c fix(notifications): final-review fixes \u2014 web notification guard, desktop coalescing, draft-route suppression\n73301648f feat(web): needs-input notification setting and web permission UX\n676749187 feat(web): notification coordinator with platform shim and click-to-navigate\n3a9cf75d1 feat(desktop): native OS notification IPC with click-to-reveal activation\n54d81ef48 feat(web): add pure needs-attention tracker and suppression logic\n86d5502a5 feat(contracts): add notifyOnNeedsInput setting and DesktopBridge notification surface\n3db95d9c4 fix(server): reconcile crash-frozen `running` turns to interrupted on boot\nd67111c45 test(server): cover non-spawn `--version` failure mapping to available\n8e40b2018 fix(server): treat slow `az --version` as present, not missing\n91cbd43c8 fix(t3x): don't cancel auto-resume as thread-advanced when the limited turn settles\n20914c5fa fix(t3x): auto-build fixes found running it for real\n0d9f762ed docs(t3x): correct which .app a default auto-build replaces\n4013cdb16 fix(t3x): resolve adversarial-review findings in auto-build\n1b1e00820 fix(t3x): resolve auto-build review findings\ndb2bf8cf1 fix(t3x): strip trailing newline from auto-build status JSON values\n4e6d9d796 feat(t3x): auto-build & install the desktop app on change\n80c6fa015 fix(t3x): prototype-chain threadId corrupted the auto-resume state file\n6e372c554 test(t3x): route-level tests for /api/t3x/auto-resume\n3b79dede4 docs(t3x): record the auto-resume UI seams\nded01d959 feat(t3x): per-thread auto-resume overlay in the thread view\n61332d1a8 feat(t3x): authenticated /api/t3x/auto-resume route\nd6e906e56 feat(t3x): per-thread auto-resume switch (server state + gating)\n5832db1e5 docs(t3x): design + plan for per-thread auto-resume UI (floating card)\n11f02ac95 docs(t3x): plan for auto-build + install desktop app on change\nbb9266d0c fix(t3x): resolve third-pass verified review findings\n2de841002 docs(t3x): align auto-resume spec with final implementation\n7dbe029d4 fix(t3x): resolve adversarial-review findings across auto-resume + sync\n591658e82 feat(t3x): usage-limit auto-resume reactor (Project B)\n7baeb4eb4 docs/ci(t3x): incorporate adversarial review findings\n5577e3a79 feat(t3x): fork setup + daily upstream sync + weekly verify (Project A)\n77ddf8077 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.

Automated daily upstream sync could not complete.

Result: conflict
Recovery tag: coil/last-good-20260901-125204
Run: https://github.com/radroid/t3code/actions/runs/33509967418

status JSON

{
  "kind": "daily",
  "result": "conflict",
  "upstream_range": "b883fc066 perf(client-runtime): halve server config bootstrap traffic (#8367)\ne86604d33 perf(server): skip full-message reads while streaming (#9032)\n3c73fa7ce perf(web): defer pull request line stats until visible (#6471)\n62d39bf00 fix(server): stop OpenCode child sessions (#9005)\n8b033de48 fix(clients): dedupe skills in composer menus (#8043)\nf32f9a2f4 fix(server): settle threads server-side (#8600)\n7e4ce3bbb perf(server): cut chatty tool-update frames by 90% (#8368)\n8f1ef8b9e perf(server): scan only appended transcript bytes for usage summaries (#9024)\n0bfb6df34 perf(server): cut idle CPU use and stop provider event leaks (#8187)\na9ffb8279 perf(server): bound snapshot activity payload memory (#9000)\n73776d4e5 test: remove static presentation snapshots (#9008)\n0947c30e6 fix(client): use package import for markdown image helpers (#9010)\nce71c04f0 feat(client): render viewed images in work logs (#8936)\nff93aba61 feat(web): search individual settings by detail (#8831)\nd35c71d1b feat(web): add pull request list filters (#8809)\nb17cc3d1b perf(server): reduce frequency of full tool call output being loaded into memory from db (#8988)\n42a8fd510 feat(pull-requests): link GitHub references in markdown (#8812)\nc78ae50a5 fix(server): isolate remote web session cookies (#8085)\n9ecfc07a8 fix(chat): keep agent activity visible between actions (#8984)\n9bc7a5684 feat(mobile): upload attachments while composing (#8978)\n85b656ff3 style: format CodeRabbit configuration\n0df043fd4 Add auto_review configuration to coderabbit.yaml\n17f00f602 feat(web): add expand/collapse all control to the files surface (#8889)\nc50b0b4ef fix(web): make WSL settings searchable (#8881)\n929f7e647 fix(shared): preserve Windows shell PATH priority (#8748)\n41adccc83 fix(server): allow long thread IDs in HTTP routes (#8898)\nf8e4accf2 feat(mobile): add native image and PDF previews (#8959)\n6d15c5bbc fix(server): preserve usage cache outside walked roots (#8540)\nf47e74004 fix(web): prevent chat metadata overlap (#8851)\n31c1c5996 feat(mobile): add video playback with native iOS controls (#8919)\nef84bc987 fix(chat): smooth worktree setup status (#8922)\n4a9d2d0ce chore(deps): bump Electron to 43.4.1 (#8626)\n5ce92c2f1 fix(mobile): shimmer active tool rows (#8932)\n35da58133 fix(web): show scrollbar for wide markdown tables (#8868)\n038bf3739 Delete app.json (#8934)\n4e8e64fc0 chore: disable CodeRabbit review status (#8933)\n746c932e1 fix(mobile): defer draft navigation until submission completes (#8914)\nbba79cc25 fix(web): hide invalid slash skill completions (#8904)\n2921050c6 fix(contracts): accept CLI event origins (#8905)\nad38700ac chore(macroscope): review diagnostic overrides (#8917)\nf86c5e8c8 fix(server): skip IDE detection in Claude probes (#8634)\n9b2d04317 fix(mobile): replace Callstack glass with Expo glass (#8862)\ne9c4775e8 fix(web): mark pull request links as external (#8856)\n395811105 fix(preview): improve browser recording quality (#8839)\n3f62e6fa6 fix(web): widen sync banners and simplify the working timer (#8855)\n9842518c9 fix(web): address composer banner review follow-ups (#8850)\n30175a8af fix(web): restore unified activity logs and composer banners (#8734)\nf9137a0c8 fix(mobile): map native menu icon colors explicitly\ne3dcc1615 Add mobile composer attachment menu with video support (#8843)\n7963ac740 chore(release): prepare v0.0.37\ncefec32d6 fix(web): prevent pull request metadata overlap (#8790)\n352710d49 feat(mobile): add offline iPhone voice input (#8614)\n8b817cbca fix(web): use circle alert for failed tool calls (#8840)\n17c48f7fc fix(web): fold interim turn responses (#8828)\ne4f7b14fa chore: add Windows setup script to t3.json (#8814)\nc1e70b5f8 fix(web,mobile): render Codex citations and artifact templates (#8584)\ne09b88b6a fix(web): keep right panel synced with agent edits (#8803)\n5885a68ad fix(web): keep image preview above sidebar control (#8811)\n9072aa1fd fix(server): stop overpricing cached Claude tokens (#8806)\n60f2ce027 fix(git): follow repository instructions in generated source control text (#8804)\n8f525af5a fix(web): open agent images in expanded preview (#8807)\n12fe2d6d0 fix(windows): strip quotes from repaired PATH (#8746)\n6e324b9bb fix(web): reduce title bar scroll fade height (#8799)\n86c9a9288 feat(mobile): pick, share, and receive files in threads (#8237)\n7880a6e58 fix(grok): allow model changes in existing threads (#8392)\n7980dfddb fix(web,mobile): snooze menu no longer offers the same wake time twice (#8741)\nac4aae101 feat(web): play video attachments in chat (#8688)\nf15680bd3 feat(mobile): update tool summaries and chat transitions (#8793)\n2daff8c25 test(web): remove tests for unreachable helpers (#8738)\n8dcb96314 revert(web): restore previous composer banners (#8733)\n1f8ed54ad fix(mobile): reduce dev-client reload and Metro startup cost (#8694)\n3d32797f6 fix(web): unify activity logs and composer banners (#8693)\nc0e09f323 fix(web): render nested markdown images correctly (#8501)\n72c44a847 perf(desktop): skip duplicate browser updates (#8018)\n660cddd3b fix(web): four composer spacing defects (#8090)\nebb9b9fda fix(client-runtime): refresh edited pull request comments (#8094)\nfc262f1a2 fix(server): retry automatic thread title generation (#8087)\n053affbed fix(mobile): prevent header overflow and back-button artifacts (#8624)\n074bcd6dc fix(web): keep project picker popup inside the sidebar (#8627)\n5e63aea2d fix(web): clean up provider settings list and editor (#8504)\nc1c2d5401 feat: let an environment publish themes as a file (#8569)\nbe218ac76 feat(web): keybinding settings as settings rows (#8532)\nd22709f75 fix(web): pass stashShortcutLabel in the mixed-attachments stash test\nbcb855a63 feat(web): attach PDFs, ZIPs, and other files to a turn (#8236)\n6a9d9f988 chore: vouch ryanrhughes (#8613)\nc131f2892 fix(server): stop querying Claude context usage after turns (#8610)\n38dcd7a40 fix(mobile): harden native header toolbar items (#8611)\n3e6ab36f6 chore(mobile): upgrade to Expo SDK 57 (#8609)\n4669eab8e fix(mobile): stabilize iOS header item transitions (#8607)\n702a6ade3 fix(codex): avoid quadratic app-server input buffering (#8605)\n2bc9e8ef6 Require human review for pull requests changing product defaults (#8603)\n3251b7548 chore(release): prepare v0.0.36\nac3a33191 Remove Messages Glass Lab experiment (#8599)\n8fc7f2294 fix(mobile): restore composer glass and rounded shadows (#8597)\n38154388d fix: restore automatic thread settling defaults (#8596)\n22c311dde feat(web): add toggleable confirmation before unpinning a thread (#7313)\nac3b2adf9 fix(web): show the configured stash shortcut (#8437)\ne89800895 fix(mobile): show composer menus when starting a task (#8587)\nb654911f8 fix(web): stop session activity timing test from blocking releases (#8585)\n0bbecfabf fix: make thread auto-settling opt-in (#8321)\n",
  "upstream_head": "b883fc066ea5c9bebbe1c3e9b4bc2471aab3685f\n",
  "conflicted_files": "apps/server/src/server.ts \n",
  "culprit_commits": "f32f9a2f4 fix(server): settle threads server-side (#8600)\nc78ae50a5 fix(server): isolate remote web session cookies (#8085)\n41adccc83 fix(server): allow long thread IDs in HTTP routes (#8898)\nc1c2d5401 feat: let an environment publish themes as a file (#8569)\n",
  "failing_step": "\n",
  "dropped_patches": "\n",
  "patch_manifest": "672b4a575 test(coil): wait for the collided arm to be destroyed instead of looking once\n74e9dedc9 fix(coil): stop the fork's boot reconcile from swallowing upstream's orphan pass\nc4658796f docs(coil): re-baseline the seam ledger against the 2026-08-27 merge-base\n345b668f0 chore(deps): regenerate the lockfile against the 2026-08-27 upstream tree\n63bcd2602 test(coil): provide the services upstream's orphaned-session reconcile now needs\n1a74357c7 docs(coil): Loops \u2014 design, prototypes and implementation plan (#42, #38 residue) (#120)\nd1808cde1 fix(coil): a turn that died inside the closed window isn't advancement (#121)\n4c821870d docs(coil): repoint the ledger at the final merge-base\n98da3ac14 docs(coil): re-baseline the seam ledger against the 2026-08-17 merge-base\n2dfbdb2f9 test(web): reconcile upstream's new running-send assertion with the fork's steer label\nffed2df23 test(coil): carry the app rename onto upstream's new DMG title assertion\n4ef890529 fix(coil): migrate the update toast off the native title tooltip\n4254abc2d docs(coil): fix seam-ledger rows the #71 rename left pointing at t3x names (#116)\n555b5f1de fix(coil): the verify gate must not require Bun-runtime imports the shipped app cannot reach (#107)\n182b14a31 fix(coil): verify every packaged layer, and fail on layers the gate cannot see (#102) (#106)\n5919a2588 docs(coil): re-measure the seam ledger on the landing branch\n20c037b67 fix(coil): drop a stray blank seam line the rebase left in ThreadComposer\n9d23145d6 fix(web): surface enqueue failures as a toast, not the maskable error banner\n04d32b806 docs(coil): re-baseline the seam ledger against the 2026-08-14 merge-base\nd2a6a909f chore(deps): regenerate the lockfile against the 2026-08-14 upstream tree\n6ddc1626b fix(server): name why a clone failed, and which provider it was\n78e6b1bb1 fix(coil): stop shipping upstream's update feed, which we never actually disabled\nb31228ba3 fix(coil): restore the release, and make two of its checks capable of failing\n94fbbeb75 fix(coil): publish a canonical Latest release, and re-arm retention\ndd3c1e08b docs(coil): design a canonical Latest release for the fork\n1915023d5 fix(coil): tell the truth about the one macOS prompt an update raises\n92d3c39d8 perf(coil): halve the desktop release bundle (#53)\nd06998660 docs(coil): re-baseline the ledger for the sidebar wordmark row\n6f5834bcd feat(coil): finish the app rename at the surfaces that name the app (#71)\nb3a14e77c docs(coil): repoint two ledger citations at the paths #71 moved\ncb1eaf62a refactor(coil): retire the local desktop autobuild\n7a3539432 fix(coil): reach the renamed relay through a service binding (#71)\n98c2f9543 fix(coil): make --rotate emit the CI secret commands itself (#71)\n4464a95c4 fix(coil): finish the certificate rotation and list all 47 rows in the ledger (#71)\nc62956577 chore(coil): re-record the designated requirement after the certificate rotation\nb08bfea4c fix(coil): compute the build-counter offset in bash, not in an expression (#71)\nf3082be1e fix(coil): repoint the last references to moved files (#71)\n66b90bfac style(coil): format the files this rename touched (#71)\n00f42158a docs(coil): re-baseline the seam ledger and correct the runbooks (#71)\nb1a5a7bf9 fix(coil): carry PRs #78 and #84 across the rename (#71)\n08fcaf3a7 feat(coil): move the relay, keeping the old hostname alive as a proxy (#71)\n0b629a947 feat(coil): cut the sync automation over to coil names (#71)\n776e87736 feat(coil): move the release identity, offsetting the counter so clients keep updating (#71)\n3601821ee feat(coil): rename the app to T3 Coil, with its own bundle id and certificate (#71)\n925ad2110 refactor(coil): move the fork's directories and symbols off t3x (#71)\n9922e8856 docs(coil): design the t3x -> coil rename around its four silent failures (#71)\n523982307 fix(deps): clear the sharp and @hono/node-server advisories by re-resolution (#58) (#87)\n1f4772fc6 feat(coil): put the real install steps on the download page, from one source (#72)\n045695577 feat(coil): a real link-preview card for shared URLs\n65917e7e1 fix(t3x): push the sync as a workflow-scoped token, and escalate when it fails\n9f4c0cf95 fix(web): steering-path leftovers from the queue transition (#40 A1-A4)\nd1a5864d7 fix(t3x): stop a user message destroying a pending auto-resume\n93bebbd86 docs(t3x): note that the trusted certificate is listed twice, and why that is fine\n5c10317be docs(t3x): correct the runbook's seam claim \u2014 the bundle id spends one upstream line\nc39130f39 fix(t3x): pin the designated requirement the fork's identity produces (#70)\n70a5bae6d fix(t3x): give the fork its own bundle id, so it stops sharing TCC rows with upstream (#70)\nf9890410d fix(t3x): sign the macOS build with a stable identity so permission grants survive updates (#70)\ne1542d051 fix(web): an edit saved during dispatch no longer disappears (#40 A5)\nc8bc37375 fix(t3x): derive and verify the autobuild agent's PATH, and correct the runbook interval (#41)\nb79576def fix(t3x): the Windows transient-crash retry could never fire; classify on the code vp prints (#47)\nff0c38108 docs(worklog): write down how the skill actually gets installed (#65)\n193de9249 fix(worklog): satisfy the repo lint rules the suite files were breaking (#65)\nd568fff8e fix(worklog): correct the numbers the report is built on (#65)\n6171be49f feat(t3x): add the /worklog daily work-log skill (#65)\nd6b74ff96 fix(t3x): widen the release retry window past the observed 403 duration\n763df8a67 fix(coil): stop the deploy verify step failing on Cloudflare bot mitigation\n982bca41a fix(coil): put pnpm on PATH in the homepage deploy workflow\n7e5bb5b40 docs(coil): fix the stale deploy-workflow pointer, note the secret is set\na0c7bddbd docs(coil): recapture the hero evidence with all five marks restored\ne7d59577e fix(coil): bring the hero marks back on mobile as an in-flow row\n6379eb094 docs(coil): recapture mobile evidence after the collision fix\nf113d287d fix(coil): stop the hero marks colliding with mobile content, equalise stacked buttons\n1b2a3a844 docs(coil): recapture the homepage evidence against coil.curlycloud.dev\n26ee7a3eb feat(coil): reposition the homepage as Coil, a personal fork\n2b8fc5130 docs(coil): design for repositioning the homepage as Coil\na49d57763 docs(t3x): capture homepage screenshots and a scroll-through for review\ne730c8f44 ci(t3x): pin the deploy wrangler exactly, not to a floating major\naabe59feb docs(t3x): record the fork homepage on the seam ledger and sync runbook\ned6f9a499 ci(t3x): auto-deploy the homepage to Cloudflare on push to main\nac5b36d2e feat(t3x): deploy the homepage as a Cloudflare assets-only Worker\n062d91907 feat(t3x): serve downloads from the fork's update-relay manifest and wire the sync strip\n689660080 feat(t3x): rebrand the homepage copy, chrome, and fork graph\nf1f7cdf8c feat(t3x): strip upstream-only social proof, store links, and legal pages\n20d077a74 feat(t3x): seed the fork homepage from apps/marketing\na0afbe701 docs(t3x): record before/after capture for the capsule anchor fix (#67)\n85526109c fix(t3x): anchor the auto-resume capsule to the composer's measured box (#67)\n267c83127 fix(t3x): retry the relay notify, and surface DO failures as readable 503s (#66)\na10413a81 docs(t3x): re-baseline the seam ledger against upstream v0.0.33\nae67db4ea docs(t3x): record the mobile sendLabel mirror on the ledger\n6b595a438 docs(t3x): re-baseline the seam ledger against the follow-up merge-base\n540e4817b docs(t3x): re-baseline the seam ledger against the 2026-08-08 merge-base\nda5b3c7bb test(t3x): retime the tolerant-budget tests to upstream's new retry ladder\n67c2aa916 fix(t3x): drop the settings imports upstream stopped needing\n6bcd62319 fix(t3x): give the crash-recovery test the registries upstream added\n1a414355c chore(deps): regenerate the lockfile against the 2026-08-08 upstream tree\n4fbafe3b3 docs(t3x): archive the Loop Watch design before its branch is deleted\n77f1e969a fix(t3x): put ~/.cargo/bin on the autobuild agent's PATH\nf4e2911d9 fix(t3x): track the composer's top edge so banners cannot cover the capsule\nacaa74770 fix(t3x): align the auto-resume capsule with the composer's right edge\naad2b4b4d fix(t3x): put the auto-resume capsule back above the composer\n4049b03ee fix(t3x): pin the countdown width, spring the toggle, move the capsule top-right\n6cb2c7b5b fix(t3x): make auto-resume teardown re-armable so StrictMode cannot kill it\nddf79bf12 feat(t3x): rebuild the auto-resume capsule and cover it with tests\nddc52c6b9 chore(t3x): stop Dependabot re-failing on advisories it cannot fix\n28f56d5e4 fix(t3x): stop a transient 403 from discarding a whole release build\n47bd0f636 feat(t3x): verify the install actually happened, and offer to report it when it did not\n0febab9be fix(t3x): stop calling the Windows update a restart\n29c23bba1 Update toast: changelog-forward design, and a restart that waits for you (#55)\n4a61ba80b chore(deps): dedupe nanoid onto 3.3.17, closing the two alerts the sweep reopened\n8ccbbaab2 chore(deps): clear 56 of the 62 open transitive advisories in the root lockfile\n559c20b01 chore(deps): bump electron to 41.10.3, and stop Dependabot on the vendored subtrees\na460c6d2f docs(t3x): put the manual-install commands on the release page\n070379ea7 fix(t3x): follow the 302 on GitHub release asset downloads\n4a11fcd79 fix(t3x): actually serialise the release bundle build\nab09847b3 fix(t3x): scope ensure:electron, and refuse updates without a release counter\n6f30b35bd fix(t3x): wait for the condition in the auto-resume reactor tests\nda04c3e9b Update delivery: CI builds, relay pushes, the app offers a restart (#51)\nef0e10932 ci(t3x): raise the hook timeout alongside the test timeout\n3de64bf7d docs(t3x): remeasure the seam ledger against the 2026-08-02 merge-base\ndcb408c44 fix(t3x): adapt the crash-recovery startup test to upstream's new startup internals\n700e302ad fix(web): keep the queue's reorder controls usable, and leave a dispatch trail (#35)\n62af2534e feat(web): steer a running turn instead of queuing behind it (#35)\nc308a1b98 feat(web): make the thread outbox read as composer chrome, and let it be reordered (#35)\nffce54b82 docs(t3x): point the self-reference rule at the renamed Claude doc\n446c40ce2 docs(t3x): follow upstream's rename of the Claude provider doc\nf5ef6e3e2 docs(t3x): remeasure the seam ledger against the 2026-07-30 merge-base\n39b031007 fix(web): apply upstream's detail-loading send gate to the queue path\n08aabe000 fix(t3x): apply the sync test-timeout to every gate, not just fork CI (#32)\n7e1a8481e ci(t3x): raise the test timeout for the fork's slower runners\n0a753b236 docs(t3x): replace the fictional seam ledger with a measured one\nee5e6b533 docs(providers): fix the broken Claude multi-account recipe\nb640e841b test(t3x): move fork settings coverage out of the upstream test file\n2834951d3 feat(t3x): auto-build from origin/main in a dedicated worktree\nf307c1136 fix(client-runtime): reset tolerant reconnect budget across a network drop\n40661edc2 fix(web): address Web Push review findings (reactor priming, VAPID recovery, cleanup)\nefc5d1cbf feat(web): closed-tab Web Push notifications (SW + PWA + server VAPID push)\ndde97d739 fix(connection): tolerate a slow-but-alive local backend + heap headroom\n4d53599f2 feat(web): queue messages while a chat is running (thread outbox)\nfedbfa3ba ci(t3x): add fork-runnable PR/main verify gate (t3x-ci.yml)\ne968c00cd docs(t3x): document how to land a sync PR (force-update, not merge button)\n4d34cd326 fix(t3x): resolve pre-existing typecheck/lint red on fork test files\n44f3c0828 fix(t3x): pin sync escalation gh calls to the fork (GH_REPO)\n7a3a1d369 feat(t3x): on-demand agent to resolve escalated upstream-sync conflicts\ndc2131a3e fix(t3x): make sync escalation always open the t3x-sync issue\nd2e9a59d8 fix(mobile): iOS Shift+Return inserts a newline instead of submitting\nd5d4e5107 feat(mobile): queue/send from the keyboard Return key\n7bd7550aa chore(t3x): auto-build on a 12h cadence, not every main commit\n3a9cc4d2c fix(notifications): final-review fixes \u2014 web notification guard, desktop coalescing, draft-route suppression\n73301648f feat(web): needs-input notification setting and web permission UX\n676749187 feat(web): notification coordinator with platform shim and click-to-navigate\n3a9cf75d1 feat(desktop): native OS notification IPC with click-to-reveal activation\n54d81ef48 feat(web): add pure needs-attention tracker and suppression logic\n86d5502a5 feat(contracts): add notifyOnNeedsInput setting and DesktopBridge notification surface\n3db95d9c4 fix(server): reconcile crash-frozen `running` turns to interrupted on boot\nd67111c45 test(server): cover non-spawn `--version` failure mapping to available\n8e40b2018 fix(server): treat slow `az --version` as present, not missing\n91cbd43c8 fix(t3x): don't cancel auto-resume as thread-advanced when the limited turn settles\n20914c5fa fix(t3x): auto-build fixes found running it for real\n0d9f762ed docs(t3x): correct which .app a default auto-build replaces\n4013cdb16 fix(t3x): resolve adversarial-review findings in auto-build\n1b1e00820 fix(t3x): resolve auto-build review findings\ndb2bf8cf1 fix(t3x): strip trailing newline from auto-build status JSON values\n4e6d9d796 feat(t3x): auto-build & install the desktop app on change\n80c6fa015 fix(t3x): prototype-chain threadId corrupted the auto-resume state file\n6e372c554 test(t3x): route-level tests for /api/t3x/auto-resume\n3b79dede4 docs(t3x): record the auto-resume UI seams\nded01d959 feat(t3x): per-thread auto-resume overlay in the thread view\n61332d1a8 feat(t3x): authenticated /api/t3x/auto-resume route\nd6e906e56 feat(t3x): per-thread auto-resume switch (server state + gating)\n5832db1e5 docs(t3x): design + plan for per-thread auto-resume UI (floating card)\n11f02ac95 docs(t3x): plan for auto-build + install desktop app on change\nbb9266d0c fix(t3x): resolve third-pass verified review findings\n2de841002 docs(t3x): align auto-resume spec with final implementation\n7dbe029d4 fix(t3x): resolve adversarial-review findings across auto-resume + sync\n591658e82 feat(t3x): usage-limit auto-resume reactor (Project B)\n7baeb4eb4 docs/ci(t3x): incorporate adversarial review findings\n5577e3a79 feat(t3x): fork setup + daily upstream sync + weekly verify (Project A)\n77ddf8077 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.

Landed by force-updating main to 93c1e67b8 (PR #129), after coil fork CI went green on the branch (9m29s).

182 upstream commits absorbed; 175 fork patches replayed. The only three dropped are the historical lockfile-regeneration commits, replaced by one fresh regeneration seeded from the fork's pre-sync lock — verified the advisory sweep survived it.

Four fork behaviours broke with no textual conflict and are fixed in their own commits; two upstream capabilities that need a design decision rather than a rebase fix are filed as #130.

Recovery point: coil/pre-sync-20260902 (672b4a575).

Navigation Menu

Repository navigation

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

Metadata

Assignees

Labels

Projects

Milestone

Relationships

Development

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

Description

Activity

github-actions commented on Aug 29, 2026

github-actions commented on Aug 30, 2026

github-actions commented on Aug 31, 2026

github-actions commented on Sep 1, 2026

radroid commented on Sep 2, 2026

Metadata

Metadata

Assignees

Labels

Projects

Milestone

Relationships

Development

Issue actions