Automated daily upstream sync could not complete.
Result: conflict
Recovery tag: coil/last-good-20260913-125526
Run: https://github.com/radroid/t3code/actions/runs/34758355160
status JSON
{
"kind": "daily",
"result": "conflict",
"upstream_range": "20363c32c feat(web): add provider selector to pull request toolbar (#11524)\n17f8e2a8a feat(mobile): add pooled subscription usage widgets (#11506)\n0a91b9a11 feat(mobile): show startup crashes in Settings \u2192 Diagnostics (#11540)\n20a8f1de3 chore(mobile): enable noUncheckedIndexedAccess and noImplicitOverride (#11538)\ndb6e0531e feat(github): route pull request operations across matching accounts (#11367)\n8b3ddf51c fix(mobile): stop crashing on launch before the shell snapshot arrives (#11537)\nd7c71f91d feat(web): float the pull request comment composer (#11531)\n21d53ca2e fix(files): browse ignored files and load folders on demand (#11527)\n2ec59ca1f fix(web): hide back button for single linked pull requests (#11520)\n46140c96a fix(web): unify panel resizing and retain final drag width (#11529)\n3138f5716 fix(grok): emit task lifecycle for monitors and background shells (#9139)\n0c5771d60 fix(web): match draft row heights to thread rows (#11512)\n6fd68f5c3 feat(source-control): support Forgejo and Gitea with fj and tea (#11436)\nc29976458 fix(server): open Cursor links in classic IDE mode (#11498)\n0e0ddaeed feat(web): add opt-in thread notifications and sounds (#11481)\naf0657e3b fix(mobile): stop alerting that shared content vanished after sending it (#11487)\n5781e2be2 fix(mobile): stop crashing on launch when a thread has a PR stack (#11486)\n2587c8060 feat(web): switch saved environments off instead of removing them (#11478)\n2db675aef fix(usage): respect provider account homes (#11485)\n6cdbf76fa feat(web): expose each chat message as a heading for screen readers (#11199)\n68c2277f5 feat(composer): fold large pastes into text attachments (#11442)\n36caf200c feat(web): choose the default diff file state (#11484)\n8ddd9f7ef fix(desktop): bound backend shutdown wait during quit (#7599)\nfcbe45796 fix(usage): make unavailable account limits more visible (#10601)\naf2baccd1 fix(web): keep subagent rows visible under folded turns (#11474)\nc0ddfb3a8 feat(web): subagent spawns render as an expandable work row (#11433)\nb0c6c3b2f fix(web): tighten sidebar search and footer spacing (#11466)\nc1ff6ab3d fix(web): move viewer controls outside media and restore arrow navigation (#11470)\n75d8b132c feat(web): tint image chips with their average color (#11468)\n03e135577 fix(web): complete thread status icons and keep input threads prominent (#11461)\ncfeaca41a fix(web): preserve preview focus on window return (#11444)\n348645152 fix(chat): keep user input outside collapsed work (#11363)\nc542b781c fix(desktop): keep the native preview User-Agent so Turnstile passes (#7110)\nbbedad027 fix(mobile): render photo library picks to a bounded JPEG off the JS thread (#11440)\na43f9b45a fix(web): preserve snapshot preview size in sent messages (#11429)\n534952210 Delete .pnpm-store/v11 directory\n18d8cbfd9 fix(mobile): pin expo-audio so the release smoke patch stays in use (#11426)\n",
"upstream_head": "20363c32c9bfdbf49c2716ef11d1f18483fcc01b\n",
"conflicted_files": "apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt apps/mobile/modules/t3-composer-editor/ios/T3ComposerEditorView.swift apps/web/src/components/settings/settingsSearch.ts \n",
"culprit_commits": "db6e0531e feat(github): route pull request operations across matching accounts (#11367)\n6fd68f5c3 feat(source-control): support Forgejo and Gitea with fj and tea (#11436)\n0e0ddaeed feat(web): add opt-in thread notifications and sounds (#11481)\n68c2277f5 feat(composer): fold large pastes into text attachments (#11442)\n36caf200c feat(web): choose the default diff file state (#11484)\n",
"failing_step": "\n",
"patch_manifest": "5d3360ccc test(coil): the doomed-turn replay waits for the reactor's verdict, not a turn count\ndc619218e fix(coil): the bundle gate no longer fails a good release on regex quotes or JXA imports\n4b5c186a4 chore(deps): keep the astro 7.2.8 bump lock-only and inside the release-age policy\n3c3db729a chore(deps): resolve the lockfile for sharp 0.35.4 in /scripts\n4fae7d5d1 fix(coil): give http_ece a license notice so the desktop build passes\nfdada32d4 chore(deps): bump astro from 7.2.0 to 7.2.8\n0f9537582 chore(deps): bump sharp from 0.34.5 to 0.35.4 in /scripts\na068bb6de docs(coil): re-baseline the seam ledger for the 2026-09-12 sync\na81b3bd93 chore(coil): keep two seams additive after the merge\na0de8ee9d test(coil): the pre-ready desktop entry carries the fork's app name\nae3329145 ci(coil): install libsecret on Linux runners and the renamed Spectre component\nb8b4cb613 fix(coil): crash recovery leaves prepared restart continuations alone\n2eec9cf7d fix(coil): read Claude rate-limit rejections from the runtime warning\ne0438aaec fix(coil): queued messages carry structured context like a normal send\nc2207685f fix(coil): follow the Effect rc.112 and TypeScript 7 toolchain bumps\n89d522523 fix(coil): one failed auto-resume fire no longer aborts the tick\naefebcff3 test(coil): replay the #118 spend-limit payloads through the auto-resume classifier\nc48265fe4 test(coil): auto-resume tests wait on receipts, never on scheduler turns\n86054c7cb fix(server): classify Azure DevOps \"not authorized\" failures as authentication\n8391a6a32 fix(coil): the update toast's build age advances while the toast is visible\n8ed54891d test(coil): loops \u2014 tests wait on receipts, never on scheduler turns\n1c1af59ee feat(coil): loops \u2014 the supervisor announces what it did\n5c6b6f37a perf(coil): loops \u2014 pruning happens when a run ends, not on every write\nb14796927 fix(coil): loops \u2014 the test harness never moves the clock on its own\naafdeed80 fix(coil): loops \u2014 one store read per tick, and a harness that waits for the answer\n8e998c5fb fix(coil): loops \u2014 the console tells the truth about what it is showing\n588780000 fix(coil): loops \u2014 bound the state file and close the route and toolkit holes\n97de6179c fix(coil): loops \u2014 install the adapter hooks in production and correct the decision table\n8f07eb778 docs(coil): format the loops prototypes and rebuild the report\nabf29cfd7 fix(coil): loops \u2014 one store instance and loop_done wired across phases\n55dcd248e docs(coil): ledger totals for the loops seam row\n9397ad2d5 feat(coil): loops \u2014 the reactor, wired in (Phase 2)\n1ef7a6f92 feat(coil): loops \u2014 raise_blocker, loop_status and loop_done (Phase 5)\n3f15ffe71 docs(user): loops\nf16916d41 feat(coil): loops \u2014 Settings \u2192 Loops (Phase 4)\nb63e34b3e feat(coil): loops \u2014 the console overlay and the answer route (Phase 3)\ncc268cb68 docs(coil-home): the site no longer promises a daily rebase\n02f3b2cec docs(coil): the sync runbook and specs for a merge-based sync\ncfd948fe6 ci(coil): sync upstream by merging, not rebasing\n5caa9afa0 feat(coil): loops \u2014 the sentinel and the HTTP API (Phases 1\u20132)\n252ed85be feat(coil): loops \u2014 the pure decision table and guards (Phase 2)\n8af8a1fd0 feat(coil): loops \u2014 record the agent's own scheduled wakes and pending questions (Phase 1)\nea836a96e feat(coil): loops \u2014 the durable record, config and cron parse (Phase 1 foundation)\nffef26c1b docs(coil): resolve the #125 review findings and verify the plan's assumptions\n7ca73fa6d refactor(coil): isClaudeThread accepts a thread shell\n368b7b368 refactor(coil): one scope-auth helper for every fork route\n93c1e67b8 docs(coil): re-baseline the seam ledger against the 2026-09-02 merge-base\ndcf49a1c1 fix(mobile): Return no longer submits while dictation freezes the composer\n3bdf109e2 fix(coil): report the DPoP failure reason on the auto-resume route\n88d5e2421 fix(coil): a server auto-settle must not destroy an armed auto-resume\n5ac7b67f4 fix(web): the queue path counts file attachments, not just images\naab748d91 fix(coil): re-home the outbox idle gate upstream deleted with canSettle\n55ef32cd2 fix(coil): drop the pre-rename fork-seam import the rebase left behind\n50f65243a chore(deps): regenerate the lockfile against the 2026-09-02 upstream tree\nd96d6da07 test(coil): wait for the collided arm to be destroyed instead of looking once\nd029a8377 fix(coil): stop the fork's boot reconcile from swallowing upstream's orphan pass\nd9defcd55 docs(coil): re-baseline the seam ledger against the 2026-08-27 merge-base\nd6ba8b8e6 test(coil): provide the services upstream's orphaned-session reconcile now needs\ne7b51fbd1 docs(coil): Loops \u2014 design, prototypes and implementation plan (#42, #38 residue) (#120)\n178ed120f fix(coil): a turn that died inside the closed window isn't advancement (#121)\n8ebb3b3ba docs(coil): repoint the ledger at the final merge-base\naa9d1eff8 docs(coil): re-baseline the seam ledger against the 2026-08-17 merge-base\na216210a8 test(web): reconcile upstream's new running-send assertion with the fork's steer label\n9fcf81f4b test(coil): carry the app rename onto upstream's new DMG title assertion\n096d2cc53 fix(coil): migrate the update toast off the native title tooltip\n094d0abde docs(coil): fix seam-ledger rows the #71 rename left pointing at t3x names (#116)\na4a5098fd fix(coil): the verify gate must not require Bun-runtime imports the shipped app cannot reach (#107)\n470816d96 fix(coil): verify every packaged layer, and fail on layers the gate cannot see (#102) (#106)\n9bdd817b2 docs(coil): re-measure the seam ledger on the landing branch\nc6ad39389 fix(coil): drop a stray blank seam line the rebase left in ThreadComposer\ne49d1369d fix(web): surface enqueue failures as a toast, not the maskable error banner\n2aad2f7a1 docs(coil): re-baseline the seam ledger against the 2026-08-14 merge-base\n40b271d32 fix(server): name why a clone failed, and which provider it was\nf616ba3aa fix(coil): stop shipping upstream's update feed, which we never actually disabled\nf659ea8dd fix(coil): restore the release, and make two of its checks capable of failing\n51ee891dc fix(coil): publish a canonical Latest release, and re-arm retention\n723f95941 docs(coil): design a canonical Latest release for the fork\nf751f0a01 fix(coil): tell the truth about the one macOS prompt an update raises\ne0e8e22ff perf(coil): halve the desktop release bundle (#53)\n0602eef1c docs(coil): re-baseline the ledger for the sidebar wordmark row\nf404119d0 feat(coil): finish the app rename at the surfaces that name the app (#71)\n4c57838a2 docs(coil): repoint two ledger citations at the paths #71 moved\n324f88ca5 refactor(coil): retire the local desktop autobuild\n02ca4fd19 fix(coil): reach the renamed relay through a service binding (#71)\n81e6ec966 fix(coil): make --rotate emit the CI secret commands itself (#71)\n9b440b7b5 fix(coil): finish the certificate rotation and list all 47 rows in the ledger (#71)\n82db9038e chore(coil): re-record the designated requirement after the certificate rotation\nf02d7775d fix(coil): compute the build-counter offset in bash, not in an expression (#71)\ndd33f974b fix(coil): repoint the last references to moved files (#71)\nc181de9be style(coil): format the files this rename touched (#71)\neafe55a81 docs(coil): re-baseline the seam ledger and correct the runbooks (#71)\n490939a7e fix(coil): carry PRs #78 and #84 across the rename (#71)\n9426bcb8d feat(coil): move the relay, keeping the old hostname alive as a proxy (#71)\nbd8c6a5c3 feat(coil): cut the sync automation over to coil names (#71)\ne18120a1c feat(coil): move the release identity, offsetting the counter so clients keep updating (#71)\naa5bf5c8b feat(coil): rename the app to T3 Coil, with its own bundle id and certificate (#71)\neaad55239 refactor(coil): move the fork's directories and symbols off t3x (#71)\n893ff9dc5 docs(coil): design the t3x -> coil rename around its four silent failures (#71)\nc2533809c fix(deps): clear the sharp and @hono/node-server advisories by re-resolution (#58) (#87)\n08935e020 feat(coil): put the real install steps on the download page, from one source (#72)\n",
"detail": "merge 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 merge, resolves the conflicts, runs typecheck/lint/test, and opens an ordinary PR for review — nothing is pushed to main. Runbook: docs/coil/sync-agent-runbook.md.
Automated daily upstream sync could not complete.
Result:
conflictRecovery tag:
coil/last-good-20260913-125526Run: https://github.com/radroid/t3code/actions/runs/34758355160
status JSON
{ "kind": "daily", "result": "conflict", "upstream_range": "20363c32c feat(web): add provider selector to pull request toolbar (#11524)\n17f8e2a8a feat(mobile): add pooled subscription usage widgets (#11506)\n0a91b9a11 feat(mobile): show startup crashes in Settings \u2192 Diagnostics (#11540)\n20a8f1de3 chore(mobile): enable noUncheckedIndexedAccess and noImplicitOverride (#11538)\ndb6e0531e feat(github): route pull request operations across matching accounts (#11367)\n8b3ddf51c fix(mobile): stop crashing on launch before the shell snapshot arrives (#11537)\nd7c71f91d feat(web): float the pull request comment composer (#11531)\n21d53ca2e fix(files): browse ignored files and load folders on demand (#11527)\n2ec59ca1f fix(web): hide back button for single linked pull requests (#11520)\n46140c96a fix(web): unify panel resizing and retain final drag width (#11529)\n3138f5716 fix(grok): emit task lifecycle for monitors and background shells (#9139)\n0c5771d60 fix(web): match draft row heights to thread rows (#11512)\n6fd68f5c3 feat(source-control): support Forgejo and Gitea with fj and tea (#11436)\nc29976458 fix(server): open Cursor links in classic IDE mode (#11498)\n0e0ddaeed feat(web): add opt-in thread notifications and sounds (#11481)\naf0657e3b fix(mobile): stop alerting that shared content vanished after sending it (#11487)\n5781e2be2 fix(mobile): stop crashing on launch when a thread has a PR stack (#11486)\n2587c8060 feat(web): switch saved environments off instead of removing them (#11478)\n2db675aef fix(usage): respect provider account homes (#11485)\n6cdbf76fa feat(web): expose each chat message as a heading for screen readers (#11199)\n68c2277f5 feat(composer): fold large pastes into text attachments (#11442)\n36caf200c feat(web): choose the default diff file state (#11484)\n8ddd9f7ef fix(desktop): bound backend shutdown wait during quit (#7599)\nfcbe45796 fix(usage): make unavailable account limits more visible (#10601)\naf2baccd1 fix(web): keep subagent rows visible under folded turns (#11474)\nc0ddfb3a8 feat(web): subagent spawns render as an expandable work row (#11433)\nb0c6c3b2f fix(web): tighten sidebar search and footer spacing (#11466)\nc1ff6ab3d fix(web): move viewer controls outside media and restore arrow navigation (#11470)\n75d8b132c feat(web): tint image chips with their average color (#11468)\n03e135577 fix(web): complete thread status icons and keep input threads prominent (#11461)\ncfeaca41a fix(web): preserve preview focus on window return (#11444)\n348645152 fix(chat): keep user input outside collapsed work (#11363)\nc542b781c fix(desktop): keep the native preview User-Agent so Turnstile passes (#7110)\nbbedad027 fix(mobile): render photo library picks to a bounded JPEG off the JS thread (#11440)\na43f9b45a fix(web): preserve snapshot preview size in sent messages (#11429)\n534952210 Delete .pnpm-store/v11 directory\n18d8cbfd9 fix(mobile): pin expo-audio so the release smoke patch stays in use (#11426)\n", "upstream_head": "20363c32c9bfdbf49c2716ef11d1f18483fcc01b\n", "conflicted_files": "apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt apps/mobile/modules/t3-composer-editor/ios/T3ComposerEditorView.swift apps/web/src/components/settings/settingsSearch.ts \n", "culprit_commits": "db6e0531e feat(github): route pull request operations across matching accounts (#11367)\n6fd68f5c3 feat(source-control): support Forgejo and Gitea with fj and tea (#11436)\n0e0ddaeed feat(web): add opt-in thread notifications and sounds (#11481)\n68c2277f5 feat(composer): fold large pastes into text attachments (#11442)\n36caf200c feat(web): choose the default diff file state (#11484)\n", "failing_step": "\n", "patch_manifest": "5d3360ccc test(coil): the doomed-turn replay waits for the reactor's verdict, not a turn count\ndc619218e fix(coil): the bundle gate no longer fails a good release on regex quotes or JXA imports\n4b5c186a4 chore(deps): keep the astro 7.2.8 bump lock-only and inside the release-age policy\n3c3db729a chore(deps): resolve the lockfile for sharp 0.35.4 in /scripts\n4fae7d5d1 fix(coil): give http_ece a license notice so the desktop build passes\nfdada32d4 chore(deps): bump astro from 7.2.0 to 7.2.8\n0f9537582 chore(deps): bump sharp from 0.34.5 to 0.35.4 in /scripts\na068bb6de docs(coil): re-baseline the seam ledger for the 2026-09-12 sync\na81b3bd93 chore(coil): keep two seams additive after the merge\na0de8ee9d test(coil): the pre-ready desktop entry carries the fork's app name\nae3329145 ci(coil): install libsecret on Linux runners and the renamed Spectre component\nb8b4cb613 fix(coil): crash recovery leaves prepared restart continuations alone\n2eec9cf7d fix(coil): read Claude rate-limit rejections from the runtime warning\ne0438aaec fix(coil): queued messages carry structured context like a normal send\nc2207685f fix(coil): follow the Effect rc.112 and TypeScript 7 toolchain bumps\n89d522523 fix(coil): one failed auto-resume fire no longer aborts the tick\naefebcff3 test(coil): replay the #118 spend-limit payloads through the auto-resume classifier\nc48265fe4 test(coil): auto-resume tests wait on receipts, never on scheduler turns\n86054c7cb fix(server): classify Azure DevOps \"not authorized\" failures as authentication\n8391a6a32 fix(coil): the update toast's build age advances while the toast is visible\n8ed54891d test(coil): loops \u2014 tests wait on receipts, never on scheduler turns\n1c1af59ee feat(coil): loops \u2014 the supervisor announces what it did\n5c6b6f37a perf(coil): loops \u2014 pruning happens when a run ends, not on every write\nb14796927 fix(coil): loops \u2014 the test harness never moves the clock on its own\naafdeed80 fix(coil): loops \u2014 one store read per tick, and a harness that waits for the answer\n8e998c5fb fix(coil): loops \u2014 the console tells the truth about what it is showing\n588780000 fix(coil): loops \u2014 bound the state file and close the route and toolkit holes\n97de6179c fix(coil): loops \u2014 install the adapter hooks in production and correct the decision table\n8f07eb778 docs(coil): format the loops prototypes and rebuild the report\nabf29cfd7 fix(coil): loops \u2014 one store instance and loop_done wired across phases\n55dcd248e docs(coil): ledger totals for the loops seam row\n9397ad2d5 feat(coil): loops \u2014 the reactor, wired in (Phase 2)\n1ef7a6f92 feat(coil): loops \u2014 raise_blocker, loop_status and loop_done (Phase 5)\n3f15ffe71 docs(user): loops\nf16916d41 feat(coil): loops \u2014 Settings \u2192 Loops (Phase 4)\nb63e34b3e feat(coil): loops \u2014 the console overlay and the answer route (Phase 3)\ncc268cb68 docs(coil-home): the site no longer promises a daily rebase\n02f3b2cec docs(coil): the sync runbook and specs for a merge-based sync\ncfd948fe6 ci(coil): sync upstream by merging, not rebasing\n5caa9afa0 feat(coil): loops \u2014 the sentinel and the HTTP API (Phases 1\u20132)\n252ed85be feat(coil): loops \u2014 the pure decision table and guards (Phase 2)\n8af8a1fd0 feat(coil): loops \u2014 record the agent's own scheduled wakes and pending questions (Phase 1)\nea836a96e feat(coil): loops \u2014 the durable record, config and cron parse (Phase 1 foundation)\nffef26c1b docs(coil): resolve the #125 review findings and verify the plan's assumptions\n7ca73fa6d refactor(coil): isClaudeThread accepts a thread shell\n368b7b368 refactor(coil): one scope-auth helper for every fork route\n93c1e67b8 docs(coil): re-baseline the seam ledger against the 2026-09-02 merge-base\ndcf49a1c1 fix(mobile): Return no longer submits while dictation freezes the composer\n3bdf109e2 fix(coil): report the DPoP failure reason on the auto-resume route\n88d5e2421 fix(coil): a server auto-settle must not destroy an armed auto-resume\n5ac7b67f4 fix(web): the queue path counts file attachments, not just images\naab748d91 fix(coil): re-home the outbox idle gate upstream deleted with canSettle\n55ef32cd2 fix(coil): drop the pre-rename fork-seam import the rebase left behind\n50f65243a chore(deps): regenerate the lockfile against the 2026-09-02 upstream tree\nd96d6da07 test(coil): wait for the collided arm to be destroyed instead of looking once\nd029a8377 fix(coil): stop the fork's boot reconcile from swallowing upstream's orphan pass\nd9defcd55 docs(coil): re-baseline the seam ledger against the 2026-08-27 merge-base\nd6ba8b8e6 test(coil): provide the services upstream's orphaned-session reconcile now needs\ne7b51fbd1 docs(coil): Loops \u2014 design, prototypes and implementation plan (#42, #38 residue) (#120)\n178ed120f fix(coil): a turn that died inside the closed window isn't advancement (#121)\n8ebb3b3ba docs(coil): repoint the ledger at the final merge-base\naa9d1eff8 docs(coil): re-baseline the seam ledger against the 2026-08-17 merge-base\na216210a8 test(web): reconcile upstream's new running-send assertion with the fork's steer label\n9fcf81f4b test(coil): carry the app rename onto upstream's new DMG title assertion\n096d2cc53 fix(coil): migrate the update toast off the native title tooltip\n094d0abde docs(coil): fix seam-ledger rows the #71 rename left pointing at t3x names (#116)\na4a5098fd fix(coil): the verify gate must not require Bun-runtime imports the shipped app cannot reach (#107)\n470816d96 fix(coil): verify every packaged layer, and fail on layers the gate cannot see (#102) (#106)\n9bdd817b2 docs(coil): re-measure the seam ledger on the landing branch\nc6ad39389 fix(coil): drop a stray blank seam line the rebase left in ThreadComposer\ne49d1369d fix(web): surface enqueue failures as a toast, not the maskable error banner\n2aad2f7a1 docs(coil): re-baseline the seam ledger against the 2026-08-14 merge-base\n40b271d32 fix(server): name why a clone failed, and which provider it was\nf616ba3aa fix(coil): stop shipping upstream's update feed, which we never actually disabled\nf659ea8dd fix(coil): restore the release, and make two of its checks capable of failing\n51ee891dc fix(coil): publish a canonical Latest release, and re-arm retention\n723f95941 docs(coil): design a canonical Latest release for the fork\nf751f0a01 fix(coil): tell the truth about the one macOS prompt an update raises\ne0e8e22ff perf(coil): halve the desktop release bundle (#53)\n0602eef1c docs(coil): re-baseline the ledger for the sidebar wordmark row\nf404119d0 feat(coil): finish the app rename at the surfaces that name the app (#71)\n4c57838a2 docs(coil): repoint two ledger citations at the paths #71 moved\n324f88ca5 refactor(coil): retire the local desktop autobuild\n02ca4fd19 fix(coil): reach the renamed relay through a service binding (#71)\n81e6ec966 fix(coil): make --rotate emit the CI secret commands itself (#71)\n9b440b7b5 fix(coil): finish the certificate rotation and list all 47 rows in the ledger (#71)\n82db9038e chore(coil): re-record the designated requirement after the certificate rotation\nf02d7775d fix(coil): compute the build-counter offset in bash, not in an expression (#71)\ndd33f974b fix(coil): repoint the last references to moved files (#71)\nc181de9be style(coil): format the files this rename touched (#71)\neafe55a81 docs(coil): re-baseline the seam ledger and correct the runbooks (#71)\n490939a7e fix(coil): carry PRs #78 and #84 across the rename (#71)\n9426bcb8d feat(coil): move the relay, keeping the old hostname alive as a proxy (#71)\nbd8c6a5c3 feat(coil): cut the sync automation over to coil names (#71)\ne18120a1c feat(coil): move the release identity, offsetting the counter so clients keep updating (#71)\naa5bf5c8b feat(coil): rename the app to T3 Coil, with its own bundle id and certificate (#71)\neaad55239 refactor(coil): move the fork's directories and symbols off t3x (#71)\n893ff9dc5 docs(coil): design the t3x -> coil rename around its four silent failures (#71)\nc2533809c fix(deps): clear the sharp and @hono/node-server advisories by re-resolution (#58) (#87)\n08935e020 feat(coil): put the real install steps on the download page, from one source (#72)\n", "detail": "merge aborted; working tree restored\n" }▶ To fix: comment
@claude resolveon this issue (or run the coil sync resolve (agent) workflow). An agent replays the merge, resolves the conflicts, runs typecheck/lint/test, and opens an ordinary PR for review — nothing is pushed tomain. Runbook:docs/coil/sync-agent-runbook.md.