{
"kind": "daily",
"result": "conflict",
"upstream_range": "6ae9662d fix(web): restore selected themes in dark mode (#6665)\n8c628f14 fix(web): align pull request action menu rows (#6534)\n48ddb3d4 feat(web): older chat timestamps show the date, not just the time (#6654)\n804cba43 revert: refresh workspace layouts and tool activity (#6657)\nd7abd7f3 feat(web): refresh workspace layouts and tool activity\n57a299a7 feat(web): open remote environments in your local editor over SSH (#6572)\n74f7b434 fix(web): bound OKLCH gamut mapping (#6485)\ne25021af feat(packaging): maintain AUR packages in-repo (#4128)\nf0719072 fix(server): handle files named HEAD in git status (#6397)\n9885a845 refactor(web): simplify global styling (#6381)\n",
"upstream_head": "6ae9662d8ed215476e697adc12403ce035500828\n",
"conflicted_files": "apps/desktop/src/ipc/DesktopIpcHandlers.ts \n",
"culprit_commits": "57a299a7 feat(web): open remote environments in your local editor over SSH (#6572)\n",
"failing_step": "\n",
"dropped_patches": "\n",
"patch_manifest": "df027ec0 docs(coil): fix seam-ledger rows the #71 rename left pointing at t3x names (#116)\n96a78dac fix(coil): the verify gate must not require Bun-runtime imports the shipped app cannot reach (#107)\nf95a7704 fix(coil): verify every packaged layer, and fail on layers the gate cannot see (#102) (#106)\nfdf853a4 docs(coil): re-measure the seam ledger on the landing branch\n0a68d26e fix(coil): drop a stray blank seam line the rebase left in ThreadComposer\n3f4500eb fix(web): surface enqueue failures as a toast, not the maskable error banner\ndbd3527f docs(coil): re-baseline the seam ledger against the 2026-08-14 merge-base\n5a4df105 chore(deps): regenerate the lockfile against the 2026-08-14 upstream tree\nf9804cf5 fix(server): name why a clone failed, and which provider it was\ne868530b fix(coil): stop shipping upstream's update feed, which we never actually disabled\nafae5e8d fix(coil): restore the release, and make two of its checks capable of failing\n2626de5b fix(coil): publish a canonical Latest release, and re-arm retention\nc2ecb21f docs(coil): design a canonical Latest release for the fork\n6e7424e7 fix(coil): tell the truth about the one macOS prompt an update raises\n67cbb2d0 perf(coil): halve the desktop release bundle (#53)\n4ed152ed docs(coil): re-baseline the ledger for the sidebar wordmark row\n0ca045ab feat(coil): finish the app rename at the surfaces that name the app (#71)\n4bfa891e docs(coil): repoint two ledger citations at the paths #71 moved\n77163afb refactor(coil): retire the local desktop autobuild\n57816200 fix(coil): reach the renamed relay through a service binding (#71)\n9ffb4909 fix(coil): make --rotate emit the CI secret commands itself (#71)\n130232d3 fix(coil): finish the certificate rotation and list all 47 rows in the ledger (#71)\n9c5142ca chore(coil): re-record the designated requirement after the certificate rotation\n781befeb fix(coil): compute the build-counter offset in bash, not in an expression (#71)\n4a8e8d9d fix(coil): repoint the last references to moved files (#71)\n1a3e1c92 style(coil): format the files this rename touched (#71)\n3f2602fa docs(coil): re-baseline the seam ledger and correct the runbooks (#71)\n0021e7d3 fix(coil): carry PRs #78 and #84 across the rename (#71)\nef238710 feat(coil): move the relay, keeping the old hostname alive as a proxy (#71)\ne635d997 feat(coil): cut the sync automation over to coil names (#71)\n88d9e1a0 feat(coil): move the release identity, offsetting the counter so clients keep updating (#71)\ndec1b2f3 feat(coil): rename the app to T3 Coil, with its own bundle id and certificate (#71)\nbc2156f7 refactor(coil): move the fork's directories and symbols off t3x (#71)\n9d9164b8 docs(coil): design the t3x -> coil rename around its four silent failures (#71)\nc2115fb5 fix(deps): clear the sharp and @hono/node-server advisories by re-resolution (#58) (#87)\naceb4e23 feat(coil): put the real install steps on the download page, from one source (#72)\n6ae7d3d3 feat(coil): a real link-preview card for shared URLs\n40555f49 fix(t3x): push the sync as a workflow-scoped token, and escalate when it fails\na8214530 fix(web): steering-path leftovers from the queue transition (#40 A1-A4)\na0ad06de fix(t3x): stop a user message destroying a pending auto-resume\n308c87f9 docs(t3x): note that the trusted certificate is listed twice, and why that is fine\n7c68f27a docs(t3x): correct the runbook's seam claim \u2014 the bundle id spends one upstream line\n8d504c3d fix(t3x): pin the designated requirement the fork's identity produces (#70)\n520e30cd fix(t3x): give the fork its own bundle id, so it stops sharing TCC rows with upstream (#70)\nc30d9fda fix(t3x): sign the macOS build with a stable identity so permission grants survive updates (#70)\n06a0fa85 fix(web): an edit saved during dispatch no longer disappears (#40 A5)\n12f634f0 fix(t3x): derive and verify the autobuild agent's PATH, and correct the runbook interval (#41)\n559c63dd fix(t3x): the Windows transient-crash retry could never fire; classify on the code vp prints (#47)\nf7fb3d5d docs(worklog): write down how the skill actually gets installed (#65)\n84f86de9 fix(worklog): satisfy the repo lint rules the suite files were breaking (#65)\n74f19b81 fix(worklog): correct the numbers the report is built on (#65)\n487d2f0b feat(t3x): add the /worklog daily work-log skill (#65)\neff60e2d fix(t3x): widen the release retry window past the observed 403 duration\n57105481 fix(coil): stop the deploy verify step failing on Cloudflare bot mitigation\n47ed9c24 fix(coil): put pnpm on PATH in the homepage deploy workflow\n45f8076b docs(coil): fix the stale deploy-workflow pointer, note the secret is set\n35ea3b01 docs(coil): recapture the hero evidence with all five marks restored\n3dd74b7c fix(coil): bring the hero marks back on mobile as an in-flow row\n5c792ed8 docs(coil): recapture mobile evidence after the collision fix\nc2244abd fix(coil): stop the hero marks colliding with mobile content, equalise stacked buttons\nd48f15f5 docs(coil): recapture the homepage evidence against coil.curlycloud.dev\nc9964d92 feat(coil): reposition the homepage as Coil, a personal fork\n9ef6b2f9 docs(coil): design for repositioning the homepage as Coil\n9b9814d9 docs(t3x): capture homepage screenshots and a scroll-through for review\n7d6e35a0 ci(t3x): pin the deploy wrangler exactly, not to a floating major\nc1d54783 docs(t3x): record the fork homepage on the seam ledger and sync runbook\n636a0c7f ci(t3x): auto-deploy the homepage to Cloudflare on push to main\n2b62cb8a feat(t3x): deploy the homepage as a Cloudflare assets-only Worker\nb8a578d1 feat(t3x): serve downloads from the fork's update-relay manifest and wire the sync strip\n112bb956 feat(t3x): rebrand the homepage copy, chrome, and fork graph\nfce42ae0 feat(t3x): strip upstream-only social proof, store links, and legal pages\nc28eec3f feat(t3x): seed the fork homepage from apps/marketing\nc2ec996c docs(t3x): record before/after capture for the capsule anchor fix (#67)\na0ba546e fix(t3x): anchor the auto-resume capsule to the composer's measured box (#67)\nb0cea932 fix(t3x): retry the relay notify, and surface DO failures as readable 503s (#66)\nf74145ab docs(t3x): re-baseline the seam ledger against upstream v0.0.33\n499b6a8b docs(t3x): record the mobile sendLabel mirror on the ledger\nb625f9c1 docs(t3x): re-baseline the seam ledger against the follow-up merge-base\n0468f8cf docs(t3x): re-baseline the seam ledger against the 2026-08-08 merge-base\ne7276313 test(t3x): retime the tolerant-budget tests to upstream's new retry ladder\n6366b7ee fix(t3x): drop the settings imports upstream stopped needing\n97457e70 fix(t3x): give the crash-recovery test the registries upstream added\nef0bf4fa chore(deps): regenerate the lockfile against the 2026-08-08 upstream tree\nb50468b9 docs(t3x): archive the Loop Watch design before its branch is deleted\nc1685558 fix(t3x): put ~/.cargo/bin on the autobuild agent's PATH\ne85656dd fix(t3x): track the composer's top edge so banners cannot cover the capsule\n9ab04a72 fix(t3x): align the auto-resume capsule with the composer's right edge\n852191a0 fix(t3x): put the auto-resume capsule back above the composer\nfae45f25 fix(t3x): pin the countdown width, spring the toggle, move the capsule top-right\ncb46a0a9 fix(t3x): make auto-resume teardown re-armable so StrictMode cannot kill it\n7049e469 feat(t3x): rebuild the auto-resume capsule and cover it with tests\n14744bd7 chore(t3x): stop Dependabot re-failing on advisories it cannot fix\n0be4eff3 fix(t3x): stop a transient 403 from discarding a whole release build\nd0a3c843 feat(t3x): verify the install actually happened, and offer to report it when it did not\ndf5b3507 fix(t3x): stop calling the Windows update a restart\nd299b152 Update toast: changelog-forward design, and a restart that waits for you (#55)\n3817ad5b chore(deps): dedupe nanoid onto 3.3.17, closing the two alerts the sweep reopened\n77592c60 chore(deps): clear 56 of the 62 open transitive advisories in the root lockfile\nf95b767b chore(deps): bump electron to 41.10.3, and stop Dependabot on the vendored subtrees\nc6f4b518 docs(t3x): put the manual-install commands on the release page\nef938f6e fix(t3x): follow the 302 on GitHub release asset downloads\nbf18844b fix(t3x): actually serialise the release bundle build\n634bf534 fix(t3x): scope ensure:electron, and refuse updates without a release counter\n1ae2b4d4 fix(t3x): wait for the condition in the auto-resume reactor tests\n76ec3d7c Update delivery: CI builds, relay pushes, the app offers a restart (#51)\n9dc95d33 ci(t3x): raise the hook timeout alongside the test timeout\nc35884a2 docs(t3x): remeasure the seam ledger against the 2026-08-02 merge-base\n2c51fbaa fix(t3x): adapt the crash-recovery startup test to upstream's new startup internals\n01a63816 fix(web): keep the queue's reorder controls usable, and leave a dispatch trail (#35)\ncf508269 feat(web): steer a running turn instead of queuing behind it (#35)\ne827b9a8 feat(web): make the thread outbox read as composer chrome, and let it be reordered (#35)\nebf86c98 docs(t3x): point the self-reference rule at the renamed Claude doc\n7ea179f9 docs(t3x): follow upstream's rename of the Claude provider doc\n4e8cf973 docs(t3x): remeasure the seam ledger against the 2026-07-30 merge-base\nd49b63e2 fix(web): apply upstream's detail-loading send gate to the queue path\n041fd45b fix(t3x): apply the sync test-timeout to every gate, not just fork CI (#32)\n841dd4ac ci(t3x): raise the test timeout for the fork's slower runners\n748fa4f0 docs(t3x): replace the fictional seam ledger with a measured one\n02efffe8 docs(providers): fix the broken Claude multi-account recipe\nb71fa48f test(t3x): move fork settings coverage out of the upstream test file\n85f7ae97 feat(t3x): auto-build from origin/main in a dedicated worktree\nf3a4ef14 fix(client-runtime): reset tolerant reconnect budget across a network drop\n2caea47b fix(web): address Web Push review findings (reactor priming, VAPID recovery, cleanup)\n533914d3 feat(web): closed-tab Web Push notifications (SW + PWA + server VAPID push)\n39a2980f fix(connection): tolerate a slow-but-alive local backend + heap headroom\n54812834 feat(web): queue messages while a chat is running (thread outbox)\nf74e2c36 ci(t3x): add fork-runnable PR/main verify gate (t3x-ci.yml)\n568945b9 docs(t3x): document how to land a sync PR (force-update, not merge button)\n3d236d0c fix(t3x): resolve pre-existing typecheck/lint red on fork test files\ncc4e4ceb fix(t3x): pin sync escalation gh calls to the fork (GH_REPO)\nbe537f51 feat(t3x): on-demand agent to resolve escalated upstream-sync conflicts\ndee7bdb9 fix(t3x): make sync escalation always open the t3x-sync issue\nee73ed20 fix(mobile): iOS Shift+Return inserts a newline instead of submitting\n412d3ffb feat(mobile): queue/send from the keyboard Return key\n3be5a128 chore(t3x): auto-build on a 12h cadence, not every main commit\n17e7b9f3 fix(notifications): final-review fixes \u2014 web notification guard, desktop coalescing, draft-route suppression\nab2cb333 feat(web): needs-input notification setting and web permission UX\nf5d1bd4b feat(web): notification coordinator with platform shim and click-to-navigate\n65444c41 feat(desktop): native OS notification IPC with click-to-reveal activation\n0a569600 feat(web): add pure needs-attention tracker and suppression logic\n742af496 feat(contracts): add notifyOnNeedsInput setting and DesktopBridge notification surface\n6fa3f48c fix(server): reconcile crash-frozen `running` turns to interrupted on boot\n8ca86cd3 test(server): cover non-spawn `--version` failure mapping to available\n3a761fe5 fix(server): treat slow `az --version` as present, not missing\nb793948a fix(t3x): don't cancel auto-resume as thread-advanced when the limited turn settles\n250cb992 fix(t3x): auto-build fixes found running it for real\n312c4cc7 docs(t3x): correct which .app a default auto-build replaces\n407e1f09 fix(t3x): resolve adversarial-review findings in auto-build\n5fd0eeb1 fix(t3x): resolve auto-build review findings\nbd6f93a2 fix(t3x): strip trailing newline from auto-build status JSON values\nce39f3d2 feat(t3x): auto-build & install the desktop app on change\n67076866 fix(t3x): prototype-chain threadId corrupted the auto-resume state file\n5b7718ca test(t3x): route-level tests for /api/t3x/auto-resume\nda6d195d docs(t3x): record the auto-resume UI seams\nefdedf64 feat(t3x): per-thread auto-resume overlay in the thread view\n4c2776c0 feat(t3x): authenticated /api/t3x/auto-resume route\n5002e851 feat(t3x): per-thread auto-resume switch (server state + gating)\n895d964c docs(t3x): design + plan for per-thread auto-resume UI (floating card)\nd90c81b9 docs(t3x): plan for auto-build + install desktop app on change\n51db03b9 fix(t3x): resolve third-pass verified review findings\n8df62712 docs(t3x): align auto-resume spec with final implementation\ne9e92b43 fix(t3x): resolve adversarial-review findings across auto-resume + sync\na2876344 feat(t3x): usage-limit auto-resume reactor (Project B)\nf042c758 docs/ci(t3x): incorporate adversarial review findings\n32192973 feat(t3x): fork setup + daily upstream sync + weekly verify (Project A)\n72029fde docs(t3x): add fork-sync and usage-limit auto-resume design specs\n",
"detail": "rebase aborted; working tree restored\n"
}
Automated daily upstream sync could not complete.
Result:
conflictRecovery tag:
coil/last-good-20260815-081507Run: https://github.com/radroid/t3code/actions/runs/31873971558
status JSON
{ "kind": "daily", "result": "conflict", "upstream_range": "6ae9662d fix(web): restore selected themes in dark mode (#6665)\n8c628f14 fix(web): align pull request action menu rows (#6534)\n48ddb3d4 feat(web): older chat timestamps show the date, not just the time (#6654)\n804cba43 revert: refresh workspace layouts and tool activity (#6657)\nd7abd7f3 feat(web): refresh workspace layouts and tool activity\n57a299a7 feat(web): open remote environments in your local editor over SSH (#6572)\n74f7b434 fix(web): bound OKLCH gamut mapping (#6485)\ne25021af feat(packaging): maintain AUR packages in-repo (#4128)\nf0719072 fix(server): handle files named HEAD in git status (#6397)\n9885a845 refactor(web): simplify global styling (#6381)\n", "upstream_head": "6ae9662d8ed215476e697adc12403ce035500828\n", "conflicted_files": "apps/desktop/src/ipc/DesktopIpcHandlers.ts \n", "culprit_commits": "57a299a7 feat(web): open remote environments in your local editor over SSH (#6572)\n", "failing_step": "\n", "dropped_patches": "\n", "patch_manifest": "df027ec0 docs(coil): fix seam-ledger rows the #71 rename left pointing at t3x names (#116)\n96a78dac fix(coil): the verify gate must not require Bun-runtime imports the shipped app cannot reach (#107)\nf95a7704 fix(coil): verify every packaged layer, and fail on layers the gate cannot see (#102) (#106)\nfdf853a4 docs(coil): re-measure the seam ledger on the landing branch\n0a68d26e fix(coil): drop a stray blank seam line the rebase left in ThreadComposer\n3f4500eb fix(web): surface enqueue failures as a toast, not the maskable error banner\ndbd3527f docs(coil): re-baseline the seam ledger against the 2026-08-14 merge-base\n5a4df105 chore(deps): regenerate the lockfile against the 2026-08-14 upstream tree\nf9804cf5 fix(server): name why a clone failed, and which provider it was\ne868530b fix(coil): stop shipping upstream's update feed, which we never actually disabled\nafae5e8d fix(coil): restore the release, and make two of its checks capable of failing\n2626de5b fix(coil): publish a canonical Latest release, and re-arm retention\nc2ecb21f docs(coil): design a canonical Latest release for the fork\n6e7424e7 fix(coil): tell the truth about the one macOS prompt an update raises\n67cbb2d0 perf(coil): halve the desktop release bundle (#53)\n4ed152ed docs(coil): re-baseline the ledger for the sidebar wordmark row\n0ca045ab feat(coil): finish the app rename at the surfaces that name the app (#71)\n4bfa891e docs(coil): repoint two ledger citations at the paths #71 moved\n77163afb refactor(coil): retire the local desktop autobuild\n57816200 fix(coil): reach the renamed relay through a service binding (#71)\n9ffb4909 fix(coil): make --rotate emit the CI secret commands itself (#71)\n130232d3 fix(coil): finish the certificate rotation and list all 47 rows in the ledger (#71)\n9c5142ca chore(coil): re-record the designated requirement after the certificate rotation\n781befeb fix(coil): compute the build-counter offset in bash, not in an expression (#71)\n4a8e8d9d fix(coil): repoint the last references to moved files (#71)\n1a3e1c92 style(coil): format the files this rename touched (#71)\n3f2602fa docs(coil): re-baseline the seam ledger and correct the runbooks (#71)\n0021e7d3 fix(coil): carry PRs #78 and #84 across the rename (#71)\nef238710 feat(coil): move the relay, keeping the old hostname alive as a proxy (#71)\ne635d997 feat(coil): cut the sync automation over to coil names (#71)\n88d9e1a0 feat(coil): move the release identity, offsetting the counter so clients keep updating (#71)\ndec1b2f3 feat(coil): rename the app to T3 Coil, with its own bundle id and certificate (#71)\nbc2156f7 refactor(coil): move the fork's directories and symbols off t3x (#71)\n9d9164b8 docs(coil): design the t3x -> coil rename around its four silent failures (#71)\nc2115fb5 fix(deps): clear the sharp and @hono/node-server advisories by re-resolution (#58) (#87)\naceb4e23 feat(coil): put the real install steps on the download page, from one source (#72)\n6ae7d3d3 feat(coil): a real link-preview card for shared URLs\n40555f49 fix(t3x): push the sync as a workflow-scoped token, and escalate when it fails\na8214530 fix(web): steering-path leftovers from the queue transition (#40 A1-A4)\na0ad06de fix(t3x): stop a user message destroying a pending auto-resume\n308c87f9 docs(t3x): note that the trusted certificate is listed twice, and why that is fine\n7c68f27a docs(t3x): correct the runbook's seam claim \u2014 the bundle id spends one upstream line\n8d504c3d fix(t3x): pin the designated requirement the fork's identity produces (#70)\n520e30cd fix(t3x): give the fork its own bundle id, so it stops sharing TCC rows with upstream (#70)\nc30d9fda fix(t3x): sign the macOS build with a stable identity so permission grants survive updates (#70)\n06a0fa85 fix(web): an edit saved during dispatch no longer disappears (#40 A5)\n12f634f0 fix(t3x): derive and verify the autobuild agent's PATH, and correct the runbook interval (#41)\n559c63dd fix(t3x): the Windows transient-crash retry could never fire; classify on the code vp prints (#47)\nf7fb3d5d docs(worklog): write down how the skill actually gets installed (#65)\n84f86de9 fix(worklog): satisfy the repo lint rules the suite files were breaking (#65)\n74f19b81 fix(worklog): correct the numbers the report is built on (#65)\n487d2f0b feat(t3x): add the /worklog daily work-log skill (#65)\neff60e2d fix(t3x): widen the release retry window past the observed 403 duration\n57105481 fix(coil): stop the deploy verify step failing on Cloudflare bot mitigation\n47ed9c24 fix(coil): put pnpm on PATH in the homepage deploy workflow\n45f8076b docs(coil): fix the stale deploy-workflow pointer, note the secret is set\n35ea3b01 docs(coil): recapture the hero evidence with all five marks restored\n3dd74b7c fix(coil): bring the hero marks back on mobile as an in-flow row\n5c792ed8 docs(coil): recapture mobile evidence after the collision fix\nc2244abd fix(coil): stop the hero marks colliding with mobile content, equalise stacked buttons\nd48f15f5 docs(coil): recapture the homepage evidence against coil.curlycloud.dev\nc9964d92 feat(coil): reposition the homepage as Coil, a personal fork\n9ef6b2f9 docs(coil): design for repositioning the homepage as Coil\n9b9814d9 docs(t3x): capture homepage screenshots and a scroll-through for review\n7d6e35a0 ci(t3x): pin the deploy wrangler exactly, not to a floating major\nc1d54783 docs(t3x): record the fork homepage on the seam ledger and sync runbook\n636a0c7f ci(t3x): auto-deploy the homepage to Cloudflare on push to main\n2b62cb8a feat(t3x): deploy the homepage as a Cloudflare assets-only Worker\nb8a578d1 feat(t3x): serve downloads from the fork's update-relay manifest and wire the sync strip\n112bb956 feat(t3x): rebrand the homepage copy, chrome, and fork graph\nfce42ae0 feat(t3x): strip upstream-only social proof, store links, and legal pages\nc28eec3f feat(t3x): seed the fork homepage from apps/marketing\nc2ec996c docs(t3x): record before/after capture for the capsule anchor fix (#67)\na0ba546e fix(t3x): anchor the auto-resume capsule to the composer's measured box (#67)\nb0cea932 fix(t3x): retry the relay notify, and surface DO failures as readable 503s (#66)\nf74145ab docs(t3x): re-baseline the seam ledger against upstream v0.0.33\n499b6a8b docs(t3x): record the mobile sendLabel mirror on the ledger\nb625f9c1 docs(t3x): re-baseline the seam ledger against the follow-up merge-base\n0468f8cf docs(t3x): re-baseline the seam ledger against the 2026-08-08 merge-base\ne7276313 test(t3x): retime the tolerant-budget tests to upstream's new retry ladder\n6366b7ee fix(t3x): drop the settings imports upstream stopped needing\n97457e70 fix(t3x): give the crash-recovery test the registries upstream added\nef0bf4fa chore(deps): regenerate the lockfile against the 2026-08-08 upstream tree\nb50468b9 docs(t3x): archive the Loop Watch design before its branch is deleted\nc1685558 fix(t3x): put ~/.cargo/bin on the autobuild agent's PATH\ne85656dd fix(t3x): track the composer's top edge so banners cannot cover the capsule\n9ab04a72 fix(t3x): align the auto-resume capsule with the composer's right edge\n852191a0 fix(t3x): put the auto-resume capsule back above the composer\nfae45f25 fix(t3x): pin the countdown width, spring the toggle, move the capsule top-right\ncb46a0a9 fix(t3x): make auto-resume teardown re-armable so StrictMode cannot kill it\n7049e469 feat(t3x): rebuild the auto-resume capsule and cover it with tests\n14744bd7 chore(t3x): stop Dependabot re-failing on advisories it cannot fix\n0be4eff3 fix(t3x): stop a transient 403 from discarding a whole release build\nd0a3c843 feat(t3x): verify the install actually happened, and offer to report it when it did not\ndf5b3507 fix(t3x): stop calling the Windows update a restart\nd299b152 Update toast: changelog-forward design, and a restart that waits for you (#55)\n3817ad5b chore(deps): dedupe nanoid onto 3.3.17, closing the two alerts the sweep reopened\n77592c60 chore(deps): clear 56 of the 62 open transitive advisories in the root lockfile\nf95b767b chore(deps): bump electron to 41.10.3, and stop Dependabot on the vendored subtrees\nc6f4b518 docs(t3x): put the manual-install commands on the release page\nef938f6e fix(t3x): follow the 302 on GitHub release asset downloads\nbf18844b fix(t3x): actually serialise the release bundle build\n634bf534 fix(t3x): scope ensure:electron, and refuse updates without a release counter\n1ae2b4d4 fix(t3x): wait for the condition in the auto-resume reactor tests\n76ec3d7c Update delivery: CI builds, relay pushes, the app offers a restart (#51)\n9dc95d33 ci(t3x): raise the hook timeout alongside the test timeout\nc35884a2 docs(t3x): remeasure the seam ledger against the 2026-08-02 merge-base\n2c51fbaa fix(t3x): adapt the crash-recovery startup test to upstream's new startup internals\n01a63816 fix(web): keep the queue's reorder controls usable, and leave a dispatch trail (#35)\ncf508269 feat(web): steer a running turn instead of queuing behind it (#35)\ne827b9a8 feat(web): make the thread outbox read as composer chrome, and let it be reordered (#35)\nebf86c98 docs(t3x): point the self-reference rule at the renamed Claude doc\n7ea179f9 docs(t3x): follow upstream's rename of the Claude provider doc\n4e8cf973 docs(t3x): remeasure the seam ledger against the 2026-07-30 merge-base\nd49b63e2 fix(web): apply upstream's detail-loading send gate to the queue path\n041fd45b fix(t3x): apply the sync test-timeout to every gate, not just fork CI (#32)\n841dd4ac ci(t3x): raise the test timeout for the fork's slower runners\n748fa4f0 docs(t3x): replace the fictional seam ledger with a measured one\n02efffe8 docs(providers): fix the broken Claude multi-account recipe\nb71fa48f test(t3x): move fork settings coverage out of the upstream test file\n85f7ae97 feat(t3x): auto-build from origin/main in a dedicated worktree\nf3a4ef14 fix(client-runtime): reset tolerant reconnect budget across a network drop\n2caea47b fix(web): address Web Push review findings (reactor priming, VAPID recovery, cleanup)\n533914d3 feat(web): closed-tab Web Push notifications (SW + PWA + server VAPID push)\n39a2980f fix(connection): tolerate a slow-but-alive local backend + heap headroom\n54812834 feat(web): queue messages while a chat is running (thread outbox)\nf74e2c36 ci(t3x): add fork-runnable PR/main verify gate (t3x-ci.yml)\n568945b9 docs(t3x): document how to land a sync PR (force-update, not merge button)\n3d236d0c fix(t3x): resolve pre-existing typecheck/lint red on fork test files\ncc4e4ceb fix(t3x): pin sync escalation gh calls to the fork (GH_REPO)\nbe537f51 feat(t3x): on-demand agent to resolve escalated upstream-sync conflicts\ndee7bdb9 fix(t3x): make sync escalation always open the t3x-sync issue\nee73ed20 fix(mobile): iOS Shift+Return inserts a newline instead of submitting\n412d3ffb feat(mobile): queue/send from the keyboard Return key\n3be5a128 chore(t3x): auto-build on a 12h cadence, not every main commit\n17e7b9f3 fix(notifications): final-review fixes \u2014 web notification guard, desktop coalescing, draft-route suppression\nab2cb333 feat(web): needs-input notification setting and web permission UX\nf5d1bd4b feat(web): notification coordinator with platform shim and click-to-navigate\n65444c41 feat(desktop): native OS notification IPC with click-to-reveal activation\n0a569600 feat(web): add pure needs-attention tracker and suppression logic\n742af496 feat(contracts): add notifyOnNeedsInput setting and DesktopBridge notification surface\n6fa3f48c fix(server): reconcile crash-frozen `running` turns to interrupted on boot\n8ca86cd3 test(server): cover non-spawn `--version` failure mapping to available\n3a761fe5 fix(server): treat slow `az --version` as present, not missing\nb793948a fix(t3x): don't cancel auto-resume as thread-advanced when the limited turn settles\n250cb992 fix(t3x): auto-build fixes found running it for real\n312c4cc7 docs(t3x): correct which .app a default auto-build replaces\n407e1f09 fix(t3x): resolve adversarial-review findings in auto-build\n5fd0eeb1 fix(t3x): resolve auto-build review findings\nbd6f93a2 fix(t3x): strip trailing newline from auto-build status JSON values\nce39f3d2 feat(t3x): auto-build & install the desktop app on change\n67076866 fix(t3x): prototype-chain threadId corrupted the auto-resume state file\n5b7718ca test(t3x): route-level tests for /api/t3x/auto-resume\nda6d195d docs(t3x): record the auto-resume UI seams\nefdedf64 feat(t3x): per-thread auto-resume overlay in the thread view\n4c2776c0 feat(t3x): authenticated /api/t3x/auto-resume route\n5002e851 feat(t3x): per-thread auto-resume switch (server state + gating)\n895d964c docs(t3x): design + plan for per-thread auto-resume UI (floating card)\nd90c81b9 docs(t3x): plan for auto-build + install desktop app on change\n51db03b9 fix(t3x): resolve third-pass verified review findings\n8df62712 docs(t3x): align auto-resume spec with final implementation\ne9e92b43 fix(t3x): resolve adversarial-review findings across auto-resume + sync\na2876344 feat(t3x): usage-limit auto-resume reactor (Project B)\nf042c758 docs/ci(t3x): incorporate adversarial review findings\n32192973 feat(t3x): fork setup + daily upstream sync + weekly verify (Project A)\n72029fde docs(t3x): add fork-sync and usage-limit auto-resume design specs\n", "detail": "rebase aborted; working tree restored\n" }▶ To fix: comment
@claude resolveon 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 tomain. Runbook:docs/coil/sync-agent-runbook.md.