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

{
  "kind": "daily",
  "result": "conflict",
  "upstream_range": "3908c4eab3 fix(terminal): answer OSC color queries so CLIs pick light colors (#36777)\n6cb47acfb8 fix(web): Escape that cancels a thread rename no longer also closes the find bar (#36768)\n0351dbb092 fix(acp): refused and limit-stopped turns no longer show as completed (#28797)\n10a44f5553 fix(web): RTF previews keep named spaces, hyphens and joiners (#36767)\n313f601fb2 fix(server): Browser tab titles follow page title changes (#36764)\n5fe2f7e456 fix(web): diagnostics no longer shows near-second spans as \"1000 ms\" (#29377)\n77a39e9a37 fix(server): cancelling worktree setup removes its unclaimed worktree and branch (#36760)\n9441a7285c fix(mobile): Reconnect and Retry now on a switched-off environment switch it back on (#28628)\n566370f2ee fix(server): storage cleanup no longer reports idle threads on a branchless checkout as busy (#29027)\n719042d942 fix(server): MCP-launched threads no longer flash in Inbox before Working (#36682)\n12102c74a3 fix(web,mobile): Linked environments shows links made outside the app (#28907)\n3b816cf6c7 fix(web): ChatGPT sign-in error no longer points to a missing redirect URL field (#36753)\n616067de84 fix(web): pressing Enter in the Add CLIProxyAPI hub dialog adds the hub (#36755)\n629242b8d3 fix(server): long scheduled-task titles no longer end in a broken character (#28831)\n68bc28196d fix(desktop): Settings opens while the separate preview window has focus (#36747)\n34a7c0d85d fix(cursor): preserve catalog aliases in model discovery (#36752)\n3d9aeaf757 fix(shared): preview semicolon-separated CSV files as tables (#36738)\ndb0ae7b6e1 fix(acp): a blank line from an ACP agent no longer ends the session (#28851)\n64d70f8828 fix(mobile): sort pull request lists and timelines by time (#28391)\ne53417b2d4 fix(server): selected-file commits work again with Git older than 2.25 (#28850)\n76748e942b test(web): wait for Settings focus before testing the theme editor's Escape (#36754)\n2b596b8690 fix(web): context meter no longer keeps the retired provider's usage (#28581)\nacd192fc64 fix(web): removing an environment dismisses its notification toasts (#36726)\n07885556d9 fix(shared): honor Windows PATHEXT regardless of key casing (#29376)\ne26e21c06b fix(web,mobile): bound scheduled tasks no longer offer a model their runs ignore (#36628)\n96ca66f218 fix(server): a nested repository with no commits no longer breaks the review diff (#28632)\nf84ad6f30b fix(web): discarded drafts stay discarded after image compression (#36732)\ncc0a7bb9d8 fix(shared): file links with parentheses in the path keep their parent folder labels (#28644)\ne72dd5055e fix(client): closed terminal views release the shared grid (#36647)\n77d3358a1f fix(server): ACP teardown survives processes exiting during the /proc scan (#36719)\na575d45286 fix(web,server): the branch label no longer flips back after a switch (#28575)\n5e27bae22e fix(web): a stashed prompt keeps its machine mentions (#28780)\n35483c198a fix(opencode): show usage-limit warnings while OpenCode 2 retries (#28375)\n5fa95d99af fix(opencode): wait for the whole listening line before reading the server address (#28348)\n20d21cf1ca fix(mobile): disabled send arrow no longer darkens where its strokes overlap (#29028)\n0e250fa6f6 fix(server): selected-file commits keep a conflicted multi-commit cherry-pick and reftable cherry-picks (#28912)\nd9973dc3f8 fix(mobile): a shared file no longer fails to send with \"Too much context\" (#28535)\na678948483 fix(web): pending-question digit shortcuts ignore dialogs, menus and selects (#28388)\ne2f164d6bb fix(web): let subagent lists pass scrolling to the details panel (#28968)\nb90ffeaf28 fix(mobile): drop duplicate attachments, as on web (#29143)\n666631e94e fix(web): copied inline code keeps meaningful edge spaces (#36712)\ncb6670b01d fix(server): a timed-out Git check no longer turns off threads without a project until restart (#36704)\n740a7cc21f fix(marketing): download page shows its Releases fallback when the GitHub API rejects the request (#28339)\n243d66a295 fix(server): first commit dialog shows net file changes (#36716)\nb28dc0eb1d perf(mobile): Changes tab no longer redraws every file when one changes (#25872)\n0200dcf242 perf(shared): queued SQLite reads stop waiting on one reader while another is free (#27979)\n414d938513 fix(server): publish Create PR branches to split push URLs (#36695)\n0fdc99c870 fix(web): notebook previews strip ANSI colors from saved tracebacks (#36703)\n13a6782a6c fix(web): ODS time cells without display text show their value (#36685)\ndafd053a19 fix(mobile): closed PR numbers match their red icon in the thread list (#29327)\n250e502bfa fix(mobile): scheduled-task edits made in quick succession are no longer lost (#27220)\nf4e65cd843 fix(contracts): a null model selection options value is treated as omitted (#29149)\n71c2410a67 fix(web): thread details slides in on close (#28929)\n19f643856e fix(server): interrupted checkpoint restores no longer leave files staged (#36687)\n0e5e0bb652 fix(mobile): removing an environment no longer fails when a queued message can't be read (#28322)\nc3517ec0bf fix(shared): theme CSS checks allow url() inside a quoted data: address (#36696)\n96735d7311 fix(web): picking a sidebar search result scrolls the list to that thread (#27109)\ne096deebf6 fix(web): the publish-repository path no longer submits on an IME composition Enter (#28277)\nae837398a2 fix(server): analytics record the thread binding a scheduled task actually got (#28761)\nead133ce70 fix(web): SSH port field no longer turns 22.5 into port 22 (#28297)\nfd6d0ea022 fix(web): stashing waits for pasted images to finish compressing (#28308)\nf161a4d2b5 fix(shared): preserve literal ampersands in citation Markdown paths (#28103)\n6effe74c59 fix(web): show repeated table rows and cells in ODT previews (#36689)\n0acca1de27 fix(server): Resume keeps unaccepted replacement images (#36677)\n92c91aac8f fix(client-runtime): keep inherited qualifier values as PR search text (#28095)\n8a45c51d8b fix(desktop): Browser Screenshot saves fresh pixels while T3 Code is hidden (#36671)\nbb9fde6fcd fix(scripts): test:cached no longer crashes when vp writes no cache summary (#28651)\n1535f3f32e fix(desktop): theme changes no longer stop at windows without a title bar overlay (#28081)\n913d7fc45e fix(web): PageUp and PageDown shortcut labels no longer read Pageup and Pagedown (#28319)\n1159aa2991 fix(client-runtime): preserve PR reference links across embedded media (#36660)\n8cb551a3ce fix(web): saved files show external edits after a failed reload (#36664)\nae49f4d2a7 fix(server): honor custom Claude thinking choices (#28024)\n0c306f4520 fix(ssh): wait for a boot service's server instead of starting a second one (#36672)\n121f0cf014 fix(server): t3_thread_list clamps an oversized limit instead of failing (#27814)\n3d3275b067 fix(server): PR checkout respects restricted fetch mappings (#27853)\n179c032b3f fix(server): include managed Claude skills in the skill menu (#26732)\n071ae4e951 fix(server): deleted projects keep their worktree cleanup policy (#36649)\n77ad2ebec5 fix(server): end obsolete link cards after a matching retry succeeds (#26944)\nbc1dc2a81e fix(mobile): keep the thread column out of the iPhone Duo fold (#26923)\n0a8aaa3ccb fix(server): retained forks keep inherited shell item counts after source deletion (#36657)\n5ba3a84db4 fix(server): a locked database no longer leaves a thread stuck in \"starting\" (#36635)\n060ac23d6f fix(devices): explain missing npm during tool updates (#27084)\n6aa14d3cd5 fix(server): short search prefixes find accented messages (#36632)\nc5f842d4c7 fix(server): regenerate titles on fresh run forks (#36637)\n6be1bd6472 perf(cursor): long command output streams without copying its tail per chunk (#26934)\n5958d00ede perf(web): Update everything downloads a server's update while providers install (#35346)\n487733ba0a fix(server): recover Claude cooldown reset times from proxy errors (#36642)\n4c2f04d35d fix(web): queued runs, relationships and changed files no longer re-render on every streamed token (#24055)\n9ff435b060 fix(server): pause service restart when disk is full (#25924)\nf2764f71b2 fix(desktop): desktop tests no longer race to install Electron (#26654)\ndf8c1a1fd4 fix(web): Narrator highlights the sidebar thread title where it is drawn (#25269)\nf3b43efd9a fix(server): a hung Codex app-server no longer blocks every later Codex run (#26555)\n298c38d7f2 fix(server): subagent hover cards show reasoning effort again (#35333)\n820f620e3d fix(web): model picks no longer inherit another model\u2019s traits (#36621)\n38b3feeb75 fix(server): cached refs include a newly checked-out external branch (#36626)\n8a072ca51d fix(ci): pin unenv so release smoke installs resolve its exact peer (#36638)\n13f89ae0a7 fix(server): repeated imports reach older worktree history (#36608)\n0fee26d5bf fix(mobile): launch terminal commands after the measured resize (#36584)\n89f1acb0f0 fix(pi): text generation uses the thinking level picked in Settings (#26069)\n02e29ce8fa perf(usage): show saved totals before scanning history (#25711)\n",
  "upstream_head": "3908c4eab3ac33eb990e3b961738fbbb3951e0ff\n",
  "conflicted_files": "packages/source-control-azure-devops/src/server/AzureDevOpsCli.test.ts \n",
  "culprit_commits": "ca1a0280da fix(server): run the Azure CLI in UTF-8 on Windows (#25801)\n",
  "failing_step": "\n",
  "patch_manifest": "af2606a694 ci(coil): the daily sync and resolver run web tests in two shards too\nddb59e92d0 ci(coil): web tests run in two shards so headless Chromium no longer drops mid-run\n378f360d8b ci(coil): retire upstream's issue-vouch workflow like pr-vouch\nd637fa07a4 fix(coil): upstream's slow-CLI discovery tests follow the fork's available status\nec8acc304b chore(coil): the PWA manifest uses upstream's web icons\nb27b88ada4 fix(coil): desktop heap headroom reads NODE_OPTIONS through HostProcess.Environment\n65bd4513cc build(coil): typecheck the update relay through effect-tsgo like upstream's infra\ne46d544a36 chore(coil): merge upstream/main 12ec17ce4c (494 commits) (#217)\nd6dbacdc7a test(coil): provide CoilUpdateDelivery to upstream's DesktopApp startup test\na7c4da6094 docs(coil): the discovery seam keeps only its status line after upstream #21606\n06d7231930 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\n",
  "detail": "merge aborted; working tree restored\n"
}