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

{
  "kind": "daily",
  "result": "conflict",
  "upstream_range": "79f1fadfc6 fix(server): bump Antigravity quota probe UA to hub/2.24.0 so Gemini limits appear (#28090)\n9c0fb54e8c chore(release): prepare v0.1.6\neef35b0262 fix(clients): stop loading thread families when opening chats (#26762)\n2359643cff fix(web): model picker stays open until dismissed, with a Show more row (#28076)\n793bbf47b3 fix(web): long titles no longer overflow the pull request list tooltip (#28077)\na24ec905c8 fix(web): machine label no longer shifts between one and many machines (#28070)\nffaa1dba76 feat: pin favorite projects and archive old ones (#26154)\n85bd3f2a2a fix(web): hide Ultrathink from the Claude effort picker (#28044)\n4146e51198 fix(gitlab): a failed child pipeline no longer shows as a passing check (#24688)\nb010581aea fix(usage): combine duplicated skipped-record warnings (#23411)\ncde3620577 fix(web): forward native Copy and Cut from server browser tabs (#26633)\nd544d786bf fix(server): Pi transcripts carry their home path (#28061)\nc96c1b69f5 feat(web): pick the model and its effort from one control (#28057)\n94a53a2f79 fix(acp): Copilot threads get T3's tools (#26968)\n251834c161 fix(claude): retain measured usage after a steered query exits (#25200)\n385b1b1a8b fix(server): Source Control names a CLI built for another CPU instead of asking to install it (#21606)\nd7d5d7c79b fix(server): cleanup keeps worktrees waiting for a usage-limit reset (#24689)\n66eb776c9b fix(server): preserve merge ancestry on selected-file commits (#24744)\n7fe6934ed5 fix(mobile): new thread project list no longer shifts when the No project option appears (#23391)\n7671644754 fix(web): restore No project name and icon from settings (#26798)\ne20b1d96ed fix(desktop): keep Hyprland SnapShot metadata when a CLI title spinner ticks (#22116)\n9bf3d559fd fix(server): wake no-checks PR watches at the configured deadline (#25437)\n23f9c2c99a perf(server): skip the per-listing SSH probe once a host reports Android (#23748)\nac49a626c2 fix(install): verify archives in homes with backslashes or newlines (#25240)\n8003dd8c7b fix(web): Shift+Tab moves a nested composer list item back out (#27016)\n9f018954d0 fix(opencode): show a readable message when a provider error is <none> (#24734)\n4e08e9d141 fix(server): imported Codex threads keep their saved Codex names (#24982)\n80fd67eca6 fix(provider-cursor): Cursor keeps working when a team blocks /v1/me (#24639)\n43b56b1790 fix(device): forward numeric keypad keys to iOS simulators (#23339)\n19a773f893 fix(mobile): hardware Enter keeps the Android terminal focused (#24928)\n62efa4bf5e perf(acp): stop re-saving the whole terminal log on every output chunk (#24024)\ne1e60080b9 fix(web): collapsing a changed-files folder no longer leaves a one-frame gap (#22311)\nf7e55652df fix(server): Forgejo checks keep the final status when it shares a second with a pending one (#24871)\n7cd9a73b2f fix(web): thread alerts missed during a disconnect fire on reconnect (#24493)\n8f0d66de5f fix(web): servers still restarting after an app update no longer offer the update again (#26109)\n15b58ffd31 fix(server): omit Windows host-only adapters from LAN routes (#25217)\nf1e2e5d65d perf(acp): MCP calls over ACP no longer wait behind a long call (#23834)\nbfb44fbe6c feat(web): copy the app version from General settings (#24788)\nec9d994f00 fix(server): changing Claude effort no longer re-sends the model (#22272)\n0346d644a1 fix(server): every commit hook reports finishing with its real exit code (#22939)\n5927111c60 fix(server): Codex permission requests for glob paths no longer show as command approvals (#24257)\n1c8ada5023 fix(web): composer notices no longer flicker next to a floating preview (#22974)\n52df13ea93 fix(mobile): preserve notification responses when navigation fails (#22084)\n25dde99a51 fix(claude): failed advisor calls no longer show as completed (#24254)\n29724995e2 fix(relay): mark a tunnel released only after deletion succeeds (#22337)\n1d4c5e023f fix(web): show the correct Tailscale URL when switching to port 443 (#24890)\nc94ff9b6e5 fix(desktop): data: popups no longer replace the preview tab (#24866)\nec1fa9abec fix(cli): t3 uninstall on Windows removes the downloaded runtime (#24874)\n63b0e3d82e fix(server): do not freshly arm days-old usage-limit recoveries (#21735)\n9f52b7d419 fix(usage): use the freshest reported pooled plan (#25214)\n2296a4aee8 fix(bitbucket): page through pull requests that share a millisecond (#23635)\n146dd04890 perf(acp): long agent terminal output no longer ties up the server (#24479)\n61b535e919 fix(desktop): handle macOS back and forward gestures (#25188)\nff2f0eeb93 fix(azure-devops): looking up a project/repository finds the repository (#26068)\n044775d697 fix(server): keep relay catch-up requests working after startup (#25201)\n82503ccf2e fix(acp): fail requests when stdout closes before the agent exits (#21323)\na6e2236c4d fix(server): Antigravity failed logins due to missing skills folders  (#27153)\nf021c21da2 fix(server): show Codex tool-output images inline (#23284)\n44e7318c79 fix(mobile): reject unknown app variants (#23681)\n300baf8ebe fix(server): the Codex plan badge updates after a ChatGPT downgrade (#24978)\na83ab55e80 fix(cursor): grep count results say \"1 match\", not \"1 matches\" (#26065)\n1a93920dea fix(mobile): opening another stack layer no longer shows the previous PR (#24730)\n9cee35ac4a fix(web): accept comma as decimal in usage price entry (#21939)\n5d46778313 fix(mobile): PR tab switches no longer leave Liquid Glass behind (#26041)\nc17a469bb7 fix(mobile): keep PRs readable when image URLs are malformed (#23466)\n399d96d095 fix(mobile): review file navigation respects reduced motion (#23348)\n5882ccd7f7 fix(mobile): Android floating tab bar fills the row when compose is hidden (#26939)\n640c614fc2 fix(cli): t3 triage issues get the via-triage label for every reporter (#24955)\nb65f8686b3 fix(mobile): leaving the iOS app for a few seconds no longer drops the connection (#26540)\n8f258f0216 fix(usage): use each account accent colour in limit bars (#24630)\n5e0d0fd74c fix(server): truncated file previews no longer end in a replacement character (#24255)\n09ac55639a fix(web): popovers fade out in place instead of jumping after a pick (#26716)\n6eef6811c3 refactor(server): share a path check between file readers (#28041)\ncd7791de1e fix(web): expired terminal context toasts say \"them\" for several contexts (#24251)\necbb2081d6 fix(mobile): review guide buttons stay on one line (#24764)\nceb06de3bb fix(mobile): keep source text bold for numeric font weights (#23688)\n083c903950 fix(web): right panel's tab bar no longer slides under the title bar controls (#26233)\n3dbc157153 docs(desktop): explain recovery after an Alpha update (#25424)\n1fbbf03681 fix(mobile): strip image and link punctuation from subagent previews (#23538)\nb47d71da28 fix(mobile): review's empty state stays below the header on iOS (#22420)\nf2cd7a1e63 fix(web): show complete tooltip labels when opening (#25199)\n45d29b45fe fix(web): a refused review shows GitHub's reason (#22382)\nfa81facb92 fix(android): preserve styled text in incoming shares (#22359)\n3989f5a3b6 fix(gitlab): keep scheduled pipelines pending (#25195)\n7cdbb8ef59 fix(web): show the worktree picker in the composer strip at default width (#27114)\nc0d279f18e fix(azure-devops): file comments name the path the diff shows (#23468)\n3e2dff4206 fix(grok): Grok updates actually install on npm 12 (#24246)\nf204389a66 fix(web): match sidebar footer bottom padding to its horizontal inset (#22027)\nf4a82ca6a0 fix(mobile): models stay visible in the picker with Android animations removed (#23888)\na0aefbee11 fix(shared): give attached threads a canonical read call (#23784)\ne00f98fde2 fix(web): stacked composer notices line up their details buttons (#22236)\ncadf7d5fe3 feat(cli): t3 up asks how your other devices reach this machine (#27996)\n1aa46d0cdf fix(connect): T3 Connect sockets no longer drop every hour (#27998)\ne5909e53c3 fix(desktop): name the running app in Windows installer prompts (#27886)\n50c1c5dc53 feat: side chats beside the main thread (#26901)\nb823dcf5c6 ci(release): release version bump no longer fails on the pre-commit hook (#26978)\nbf8e132439 fix(server): preview discovery stops sending HTTP and TLS to agent-started ports (#27893)\n961026c6c9 feat(web): context meter fills up and shows tokens against the limit (#27892)\nd6d2433609 fix(web): back-to-back messages stack tight with joined corners (#27978)\n6d46336476 fix(observability): redact credential URL params in spans and type them as Redacted (#27986)\n",
  "upstream_head": "79f1fadfc6020b820d541ca4691d2feebb15dd1b\n",
  "conflicted_files": "packages/source-control-core/src/server/discovery.ts \n",
  "culprit_commits": "385b1b1a8b fix(server): Source Control names a CLI built for another CPU instead of asking to install it (#21606)\n",
  "failing_step": "\n",
  "patch_manifest": "06d7231930 fix(coil): fork clone and Azure discovery tests follow the merged upstream\nde1789d3ba fix(coil): the daily sync installs before verify when a merge changes dependencies\nd0a53da1cb ci(coil): the daily sync's merge commit skips authoring hooks\n0d3d6e6844 fix(coil): knip:check passes on the fork\n844108a6f4 fix(coil): update toast effects use upstream's renamed effect lint rule\n0e8d251a02 ci(coil): skip the one upstream server test git 2.56 breaks\n1d2842182d fix(coil): the update toast says why each of its effects exists\n68c43cb522 fix(coil): fork comments fit upstream's four-line comment cap\n6667ba026b fix(coil): point fork clone code at upstream's forge definitions\n7085f2ca07 fix(coil): fork copy passes upstream's no-em-dash lint rule\n56d34883f2 fix(deps): pin eight security fixes upstream's ranges already allow (#194)\n5b57b1e473 ci(coil): desktop tests no longer race Electron's download (#195)\n5026317e6e fix(coil): a clone that fails over SSH and HTTPS says the shared cause once\n3ac51f7d99 chore(coil): the app is called T3 Code again\nb00ea1f567 ci(coil): each upstream sync lands as a PR that says what changed for users\ne9b1842e8d ci(coil): web tests get Chromium and upstream's release repository\n8aab919b0b docs(coil): repoint the seam ledger at 67c0fc0cda\nc94c9b29a6 fix(coil): upstream's new Linux URL handler test uses the fork's app name\n9338847968 fix(coil): hosted pages name and link the fork's desktop app\nc49a622173 fix(coil): install instructions follow upstream's Alpha to Beta rename\nf7a33471f2 fix(coil): fork code passes upstream's prefer-effect-fn lint rule\nf0f7bae650 fix(coil): fork code passes upstream's new comment and memo lint rules\ne1f1a870dd ci(coil): the daily sync re-resolves a lockfile-only conflict\nc16d3e35c3 chore(coil): prune security pins upstream already covers\n98cd4a0840 chore(coil): mount the update toast outside __root.tsx\n1ae2f5c7d5 chore(coil): use upstream's mobile composer Return handling\ne1db9a3d06 docs(coil): a start page for building on the fork\n1e3e9f6064 chore(coil): retire parked and absorbed fork features\na09120ded2 docs(coil): repoint the seam ledger at 7ac952c630\n941f9fdd9e docs(coil): repoint the seam ledger at 6002c5c68c\n4faec437bd docs(coil): repoint the seam ledger at 6524a8d437\n7fb9b0166e docs(coil): re-baseline the seam ledger at 58d253231d\n7a65e076d7 fix(coil): point fork source-control code at upstream's new packages\n48c28b09d8 ci(coil): run web tests alone in the single-runner sync verifies\n31846e0650 ci(coil): split the test gate like upstream so web tests get their own runner\ne99c8a3a07 docs(coil): repoint the seam ledger at the final merge-base\n91ec07ee86 ci(coil): give the test gate room for upstream's larger server suite\nf1cd9cf359 docs(coil): re-baseline the seam ledger at cdd331b6c3\n09609366fe docs(coil-home): drop parked features from the feature list\n8652ef2a4b fix(coil): bring fork code up to the merged upstream\n23779805a8 ci(coil): install Chromium for server tests; retire the release-workflow test\na1a141261c chore(coil): park fork features built on orchestration v1\nd1e974ffa3 docs(coil): repoint the seam ledger at the final merge-base\n77505136d4 test(coil): the toggle's timing assertions read its inline transition\nafbb22d520 docs(coil): re-baseline the seam ledger for the 2026-09-28 sync\nd60080285c fix(coil): the outbox drain waits for upstream's queue to send first\n80ba53d112 docs(coil-home): carry upstream's refreshed OpenAI and OpenCode logos\na32c48020d fix(coil): fork UI passes upstream's design-system lint gate\n2edd6909e6 docs(coil): repoint the seam ledger at the final merge-base\n85cc654807 docs(coil): re-baseline the seam ledger for the 2026-09-22 sync\n2041766bee fix(coil): the offline queue releases the attachment uploads it drops\n8df97aad19 fix(deps): patch Nanoid zero-size advisory\n5379a8e499 chore(coil): Dependabot runs go green: vendored repos excluded, 38 advisories re-resolved (#155)\nfecbf70d11 fix(coil): scripts typecheck passes on effect rc.115 (#154)\n2c426238be fix(coil): the bundle gate requires only each layer's native externals\n3acc43842c chore(coil): delete inherited upstream workflows instead of disabling th\n5d3360ccc5 test(coil): the doomed-turn replay waits for the reactor's verdict, not a turn count\ndc619218ed fix(coil): the bundle gate no longer fails a good release on regex quotes or JXA imports\n4b5c186a4f chore(deps): keep the astro 7.2.8 bump lock-only and inside the release-age policy\n3c3db729a4 chore(deps): resolve the lockfile for sharp 0.35.4 in /scripts\n4fae7d5d14 fix(coil): give http_ece a license notice so the desktop build passes\nfdada32d42 chore(deps): bump astro from 7.2.0 to 7.2.8\n0f95375822 chore(deps): bump sharp from 0.34.5 to 0.35.4 in /scripts\na068bb6de3 docs(coil): re-baseline the seam ledger for the 2026-09-12 sync\na81b3bd933 chore(coil): keep two seams additive after the merge\na0de8ee9db test(coil): the pre-ready desktop entry carries the fork's app name\nae3329145d ci(coil): install libsecret on Linux runners and the renamed Spectre component\nb8b4cb6130 fix(coil): crash recovery leaves prepared restart continuations alone\n2eec9cf7da fix(coil): read Claude rate-limit rejections from the runtime warning\ne0438aaec1 fix(coil): queued messages carry structured context like a normal send\nc2207685fe fix(coil): follow the Effect rc.112 and TypeScript 7 toolchain bumps\n89d522523d fix(coil): one failed auto-resume fire no longer aborts the tick\naefebcff3c test(coil): replay the #118 spend-limit payloads through the auto-resume classifier\nc48265fe4b test(coil): auto-resume tests wait on receipts, never on scheduler turns\n86054c7cb1 fix(server): classify Azure DevOps \"not authorized\" failures as authentication\n8391a6a32a fix(coil): the update toast's build age advances while the toast is visible\n8ed54891d1 test(coil): loops \u2014 tests wait on receipts, never on scheduler turns\n1c1af59ee0 feat(coil): loops \u2014 the supervisor announces what it did\n5c6b6f37aa perf(coil): loops \u2014 pruning happens when a run ends, not on every write\nb147969270 fix(coil): loops \u2014 the test harness never moves the clock on its own\naafdeed80f fix(coil): loops \u2014 one store read per tick, and a harness that waits for the answer\n8e998c5fbe fix(coil): loops \u2014 the console tells the truth about what it is showing\n588780000c fix(coil): loops \u2014 bound the state file and close the route and toolkit holes\n97de6179cf fix(coil): loops \u2014 install the adapter hooks in production and correct the decision table\n8f07eb7783 docs(coil): format the loops prototypes and rebuild the report\nabf29cfd75 fix(coil): loops \u2014 one store instance and loop_done wired across phases\n55dcd248e1 docs(coil): ledger totals for the loops seam row\n9397ad2d57 feat(coil): loops \u2014 the reactor, wired in (Phase 2)\n1ef7a6f929 feat(coil): loops \u2014 raise_blocker, loop_status and loop_done (Phase 5)\n3f15ffe717 docs(user): loops\nf16916d41d feat(coil): loops \u2014 Settings \u2192 Loops (Phase 4)\nb63e34b3e9 feat(coil): loops \u2014 the console overlay and the answer route (Phase 3)\ncc268cb685 docs(coil-home): the site no longer promises a daily rebase\n02f3b2cec9 docs(coil): the sync runbook and specs for a merge-based sync\ncfd948fe62 ci(coil): sync upstream by merging, not rebasing\n5caa9afa0c feat(coil): loops \u2014 the sentinel and the HTTP API (Phases 1\u20132)\n252ed85beb feat(coil): loops \u2014 the pure decision table and guards (Phase 2)\n8af8a1fd0f feat(coil): loops \u2014 record the agent's own scheduled wakes and pending questions (Phase 1)\nea836a96e5 feat(coil): loops \u2014 the durable record, config and cron parse (Phase 1 foundation)\nffef26c1b5 docs(coil): resolve the #125 review findings and verify the plan's assumptions\n",
  "detail": "merge aborted; working tree restored\n"
}