chore(coil): sync onto the 2026-08-27 upstream tree (185 commits, #123) by radroid · Pull Request #126 · radroid/t3code

radroid · 2026-08-27T14:55:10Z

Resolves the eight consecutive failed daily syncs tracked in #123. The fork's 173 patches are rebased onto upstream f6f2be32d, zero dropped.

Do not use the merge button. This is the fork's patch series rebased onto new upstream, so main is not an ancestor of it and GitHub will report CONFLICTING. Land it with:
git push --force-with-lease origin coil/sync-20260827:main
Rollback point: tag coil/pre-sync-20260827.

Verification

Check	Result
`vp run typecheck`	exit 0, 0 errors
`vp run lint`	exit 0, 0 errors (20 warnings, all upstream's)
`vp run test`	green except two proven non-regressions, below

build-desktop-artifact cross-arch probe — fails on pristine upstream code and on the pre-sync tree as well, so it predates this sync entirely. It is arch-dependent (asserts a cross-architecture skip with targetArch: "arm64"; this machine is arm64, CI is x64). Expected green in CI.

client-runtime exit 137 — OOM under parallel contention. Passes clean in isolation: 50 files, 680 tests.

The three conflicts

SettingsPanels.tsx — upstream's skills-in-/-menu row (feat(web): redesign skills in $ menu and in / menu pingdotgg/t3code#8009) and the fork's needs-input toggle were inserted at the same point. Split into two rows; both survive.
ChatComposer.tsx — the one worth reading. Upstream moved the bottom toolbar, so git presented the fork's change as a 130-line block against an empty upstream side, when the original patch was only +16/-2. Taking that block would have silently reverted upstream's refactor of the approval branch into isComposerApprovalState. The duplicate was dropped and the fork's two props (sendLabel, canQueue) moved onto upstream's ComposerFooterPrimaryActions. The row measures +16/-2 afterwards — its exact pre-sync delta.
pnpm-lock.yaml — regenerated seeded from the fork's own pre-sync lock, not upstream's, so the security sweep survives. Verified unchanged: sharp@0.35.3, nanoid@3.3.17. Picks up upstream's new heic-to@1.5.2.

Semantic drift no conflict would have flagged

Upstream pingdotgg#7719 (0929907ff) added an orphaned-provider-session pass to ServerRuntimeStartup.make, giving it two new service requirements. The fork's startup-ordering test drives make directly with doubles, so it broke. The provider double now reports the seeded thread as live, so the new pass finds no orphans and dispatches nothing — otherwise its dispatch would have landed a second "reconcile" in the same order ref the test asserts on.

Ledger

docs/coil/SEAMS.md re-baselined against f6f2be32d: 53 rows, +2590/-1042 → +2601/-1042, deletion count byte-identical. That identical -1042 is the real result — any displacement of upstream code moves a deletion count, and it did not move.

Also fixes a pre-existing ledger bug: two rows were both labelled apps/server/package.json. The +2/-2 one is apps/desktop/package.json, and its rationale was wrong too.

Parallel path

Three upstream apps/marketing commits checked against apps/coil-home, none ported: pingdotgg#7477 and pingdotgg#7473 both fix serving an Intel Mac build to Apple Silicon, and coil-home only ever publishes darwin-arm64 — there is no Intel artifact to mis-serve. pingdotgg#8070 is Vercel config; coil-home deploys through Cloudflare.

coderabbitai · 2026-08-27T14:55:21Z

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: e689d51a-81dd-4607-b972-485130aebd87

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

radroid · 2026-08-27T14:55:10Z

Resolves the eight consecutive failed daily syncs tracked in #123. The fork's 173 patches are rebased onto upstream f6f2be32d, zero dropped.

Do not use the merge button. This is the fork's patch series rebased onto new upstream, so main is not an ancestor of it and GitHub will report CONFLICTING. Land it with:
git push --force-with-lease origin coil/sync-20260827:main
Rollback point: tag coil/pre-sync-20260827.

Verification

Check	Result
`vp run typecheck`	exit 0, 0 errors
`vp run lint`	exit 0, 0 errors (20 warnings, all upstream's)
`vp run test`	green except two proven non-regressions, below

build-desktop-artifact cross-arch probe — fails on pristine upstream code and on the pre-sync tree as well, so it predates this sync entirely. It is arch-dependent (asserts a cross-architecture skip with targetArch: "arm64"; this machine is arm64, CI is x64). Expected green in CI.

client-runtime exit 137 — OOM under parallel contention. Passes clean in isolation: 50 files, 680 tests.

The three conflicts

SettingsPanels.tsx — upstream's skills-in-/-menu row (feat(web): redesign skills in $ menu and in / menu pingdotgg/t3code#8009) and the fork's needs-input toggle were inserted at the same point. Split into two rows; both survive.
ChatComposer.tsx — the one worth reading. Upstream moved the bottom toolbar, so git presented the fork's change as a 130-line block against an empty upstream side, when the original patch was only +16/-2. Taking that block would have silently reverted upstream's refactor of the approval branch into isComposerApprovalState. The duplicate was dropped and the fork's two props (sendLabel, canQueue) moved onto upstream's ComposerFooterPrimaryActions. The row measures +16/-2 afterwards — its exact pre-sync delta.
pnpm-lock.yaml — regenerated seeded from the fork's own pre-sync lock, not upstream's, so the security sweep survives. Verified unchanged: sharp@0.35.3, nanoid@3.3.17. Picks up upstream's new heic-to@1.5.2.

Semantic drift no conflict would have flagged

Upstream pingdotgg#7719 (0929907ff) added an orphaned-provider-session pass to ServerRuntimeStartup.make, giving it two new service requirements. The fork's startup-ordering test drives make directly with doubles, so it broke. The provider double now reports the seeded thread as live, so the new pass finds no orphans and dispatches nothing — otherwise its dispatch would have landed a second "reconcile" in the same order ref the test asserts on.

Ledger

docs/coil/SEAMS.md re-baselined against f6f2be32d: 53 rows, +2590/-1042 → +2601/-1042, deletion count byte-identical. That identical -1042 is the real result — any displacement of upstream code moves a deletion count, and it did not move.

Also fixes a pre-existing ledger bug: two rows were both labelled apps/server/package.json. The +2/-2 one is apps/desktop/package.json, and its rationale was wrong too.

Parallel path

Three upstream apps/marketing commits checked against apps/coil-home, none ported: pingdotgg#7477 and pingdotgg#7473 both fix serving an Intel Mac build to Apple Silicon, and coil-home only ever publishes darwin-arm64 — there is no Intel artifact to mis-serve. pingdotgg#8070 is Vercel config; coil-home deploys through Cloudflare.

coderabbitai · 2026-08-27T14:55:21Z

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: e689d51a-81dd-4607-b972-485130aebd87

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

radroid · 2026-08-27T14:55:10Z

Resolves the eight consecutive failed daily syncs tracked in #123. The fork's 173 patches are rebased onto upstream f6f2be32d, zero dropped.

Do not use the merge button. This is the fork's patch series rebased onto new upstream, so main is not an ancestor of it and GitHub will report CONFLICTING. Land it with:
git push --force-with-lease origin coil/sync-20260827:main
Rollback point: tag coil/pre-sync-20260827.

Verification

Check	Result
`vp run typecheck`	exit 0, 0 errors
`vp run lint`	exit 0, 0 errors (20 warnings, all upstream's)
`vp run test`	green except two proven non-regressions, below

build-desktop-artifact cross-arch probe — fails on pristine upstream code and on the pre-sync tree as well, so it predates this sync entirely. It is arch-dependent (asserts a cross-architecture skip with targetArch: "arm64"; this machine is arm64, CI is x64). Expected green in CI.

client-runtime exit 137 — OOM under parallel contention. Passes clean in isolation: 50 files, 680 tests.

The three conflicts

SettingsPanels.tsx — upstream's skills-in-/-menu row (feat(web): redesign skills in $ menu and in / menu pingdotgg/t3code#8009) and the fork's needs-input toggle were inserted at the same point. Split into two rows; both survive.
ChatComposer.tsx — the one worth reading. Upstream moved the bottom toolbar, so git presented the fork's change as a 130-line block against an empty upstream side, when the original patch was only +16/-2. Taking that block would have silently reverted upstream's refactor of the approval branch into isComposerApprovalState. The duplicate was dropped and the fork's two props (sendLabel, canQueue) moved onto upstream's ComposerFooterPrimaryActions. The row measures +16/-2 afterwards — its exact pre-sync delta.
pnpm-lock.yaml — regenerated seeded from the fork's own pre-sync lock, not upstream's, so the security sweep survives. Verified unchanged: sharp@0.35.3, nanoid@3.3.17. Picks up upstream's new heic-to@1.5.2.

Semantic drift no conflict would have flagged

Upstream pingdotgg#7719 (0929907ff) added an orphaned-provider-session pass to ServerRuntimeStartup.make, giving it two new service requirements. The fork's startup-ordering test drives make directly with doubles, so it broke. The provider double now reports the seeded thread as live, so the new pass finds no orphans and dispatches nothing — otherwise its dispatch would have landed a second "reconcile" in the same order ref the test asserts on.

Ledger

docs/coil/SEAMS.md re-baselined against f6f2be32d: 53 rows, +2590/-1042 → +2601/-1042, deletion count byte-identical. That identical -1042 is the real result — any displacement of upstream code moves a deletion count, and it did not move.

Also fixes a pre-existing ledger bug: two rows were both labelled apps/server/package.json. The +2/-2 one is apps/desktop/package.json, and its rationale was wrong too.

Parallel path

Three upstream apps/marketing commits checked against apps/coil-home, none ported: pingdotgg#7477 and pingdotgg#7473 both fix serving an Intel Mac build to Apple Silicon, and coil-home only ever publishes darwin-arm64 — there is no Intel artifact to mis-serve. pingdotgg#8070 is Vercel config; coil-home deploys through Cloudflare.

coderabbitai · 2026-08-27T14:55:21Z

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: e689d51a-81dd-4607-b972-485130aebd87

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

radroid · 2026-08-27T14:55:10Z

Resolves the eight consecutive failed daily syncs tracked in #123. The fork's 173 patches are rebased onto upstream f6f2be32d, zero dropped.

Do not use the merge button. This is the fork's patch series rebased onto new upstream, so main is not an ancestor of it and GitHub will report CONFLICTING. Land it with:
git push --force-with-lease origin coil/sync-20260827:main
Rollback point: tag coil/pre-sync-20260827.

Verification

Check	Result
`vp run typecheck`	exit 0, 0 errors
`vp run lint`	exit 0, 0 errors (20 warnings, all upstream's)
`vp run test`	green except two proven non-regressions, below

build-desktop-artifact cross-arch probe — fails on pristine upstream code and on the pre-sync tree as well, so it predates this sync entirely. It is arch-dependent (asserts a cross-architecture skip with targetArch: "arm64"; this machine is arm64, CI is x64). Expected green in CI.

client-runtime exit 137 — OOM under parallel contention. Passes clean in isolation: 50 files, 680 tests.

The three conflicts

SettingsPanels.tsx — upstream's skills-in-/-menu row (feat(web): redesign skills in $ menu and in / menu pingdotgg/t3code#8009) and the fork's needs-input toggle were inserted at the same point. Split into two rows; both survive.
ChatComposer.tsx — the one worth reading. Upstream moved the bottom toolbar, so git presented the fork's change as a 130-line block against an empty upstream side, when the original patch was only +16/-2. Taking that block would have silently reverted upstream's refactor of the approval branch into isComposerApprovalState. The duplicate was dropped and the fork's two props (sendLabel, canQueue) moved onto upstream's ComposerFooterPrimaryActions. The row measures +16/-2 afterwards — its exact pre-sync delta.
pnpm-lock.yaml — regenerated seeded from the fork's own pre-sync lock, not upstream's, so the security sweep survives. Verified unchanged: sharp@0.35.3, nanoid@3.3.17. Picks up upstream's new heic-to@1.5.2.

Semantic drift no conflict would have flagged

Upstream pingdotgg#7719 (0929907ff) added an orphaned-provider-session pass to ServerRuntimeStartup.make, giving it two new service requirements. The fork's startup-ordering test drives make directly with doubles, so it broke. The provider double now reports the seeded thread as live, so the new pass finds no orphans and dispatches nothing — otherwise its dispatch would have landed a second "reconcile" in the same order ref the test asserts on.

Ledger

docs/coil/SEAMS.md re-baselined against f6f2be32d: 53 rows, +2590/-1042 → +2601/-1042, deletion count byte-identical. That identical -1042 is the real result — any displacement of upstream code moves a deletion count, and it did not move.

Also fixes a pre-existing ledger bug: two rows were both labelled apps/server/package.json. The +2/-2 one is apps/desktop/package.json, and its rationale was wrong too.

Parallel path

Three upstream apps/marketing commits checked against apps/coil-home, none ported: pingdotgg#7477 and pingdotgg#7473 both fix serving an Intel Mac build to Apple Silicon, and coil-home only ever publishes darwin-arm64 — there is no Intel artifact to mis-serve. pingdotgg#8070 is Vercel config; coil-home deploys through Cloudflare.

coderabbitai · 2026-08-27T14:55:21Z

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: e689d51a-81dd-4607-b972-485130aebd87

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

radroid · 2026-08-27T14:55:10Z

Resolves the eight consecutive failed daily syncs tracked in #123. The fork's 173 patches are rebased onto upstream f6f2be32d, zero dropped.

Do not use the merge button. This is the fork's patch series rebased onto new upstream, so main is not an ancestor of it and GitHub will report CONFLICTING. Land it with:
git push --force-with-lease origin coil/sync-20260827:main
Rollback point: tag coil/pre-sync-20260827.

Verification

Check	Result
`vp run typecheck`	exit 0, 0 errors
`vp run lint`	exit 0, 0 errors (20 warnings, all upstream's)
`vp run test`	green except two proven non-regressions, below

build-desktop-artifact cross-arch probe — fails on pristine upstream code and on the pre-sync tree as well, so it predates this sync entirely. It is arch-dependent (asserts a cross-architecture skip with targetArch: "arm64"; this machine is arm64, CI is x64). Expected green in CI.

client-runtime exit 137 — OOM under parallel contention. Passes clean in isolation: 50 files, 680 tests.

The three conflicts

SettingsPanels.tsx — upstream's skills-in-/-menu row (feat(web): redesign skills in $ menu and in / menu pingdotgg/t3code#8009) and the fork's needs-input toggle were inserted at the same point. Split into two rows; both survive.
ChatComposer.tsx — the one worth reading. Upstream moved the bottom toolbar, so git presented the fork's change as a 130-line block against an empty upstream side, when the original patch was only +16/-2. Taking that block would have silently reverted upstream's refactor of the approval branch into isComposerApprovalState. The duplicate was dropped and the fork's two props (sendLabel, canQueue) moved onto upstream's ComposerFooterPrimaryActions. The row measures +16/-2 afterwards — its exact pre-sync delta.
pnpm-lock.yaml — regenerated seeded from the fork's own pre-sync lock, not upstream's, so the security sweep survives. Verified unchanged: sharp@0.35.3, nanoid@3.3.17. Picks up upstream's new heic-to@1.5.2.

Semantic drift no conflict would have flagged

Upstream pingdotgg#7719 (0929907ff) added an orphaned-provider-session pass to ServerRuntimeStartup.make, giving it two new service requirements. The fork's startup-ordering test drives make directly with doubles, so it broke. The provider double now reports the seeded thread as live, so the new pass finds no orphans and dispatches nothing — otherwise its dispatch would have landed a second "reconcile" in the same order ref the test asserts on.

Ledger

docs/coil/SEAMS.md re-baselined against f6f2be32d: 53 rows, +2590/-1042 → +2601/-1042, deletion count byte-identical. That identical -1042 is the real result — any displacement of upstream code moves a deletion count, and it did not move.

Also fixes a pre-existing ledger bug: two rows were both labelled apps/server/package.json. The +2/-2 one is apps/desktop/package.json, and its rationale was wrong too.

Parallel path

Three upstream apps/marketing commits checked against apps/coil-home, none ported: pingdotgg#7477 and pingdotgg#7473 both fix serving an Intel Mac build to Apple Silicon, and coil-home only ever publishes darwin-arm64 — there is no Intel artifact to mis-serve. pingdotgg#8070 is Vercel config; coil-home deploys through Cloudflare.

coderabbitai · 2026-08-27T14:55:21Z

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: e689d51a-81dd-4607-b972-485130aebd87

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

radroid · 2026-08-27T14:55:10Z

Resolves the eight consecutive failed daily syncs tracked in #123. The fork's 173 patches are rebased onto upstream f6f2be32d, zero dropped.

Do not use the merge button. This is the fork's patch series rebased onto new upstream, so main is not an ancestor of it and GitHub will report CONFLICTING. Land it with:
git push --force-with-lease origin coil/sync-20260827:main
Rollback point: tag coil/pre-sync-20260827.

Verification

Check	Result
`vp run typecheck`	exit 0, 0 errors
`vp run lint`	exit 0, 0 errors (20 warnings, all upstream's)
`vp run test`	green except two proven non-regressions, below

build-desktop-artifact cross-arch probe — fails on pristine upstream code and on the pre-sync tree as well, so it predates this sync entirely. It is arch-dependent (asserts a cross-architecture skip with targetArch: "arm64"; this machine is arm64, CI is x64). Expected green in CI.

client-runtime exit 137 — OOM under parallel contention. Passes clean in isolation: 50 files, 680 tests.

The three conflicts

SettingsPanels.tsx — upstream's skills-in-/-menu row (feat(web): redesign skills in $ menu and in / menu pingdotgg/t3code#8009) and the fork's needs-input toggle were inserted at the same point. Split into two rows; both survive.
ChatComposer.tsx — the one worth reading. Upstream moved the bottom toolbar, so git presented the fork's change as a 130-line block against an empty upstream side, when the original patch was only +16/-2. Taking that block would have silently reverted upstream's refactor of the approval branch into isComposerApprovalState. The duplicate was dropped and the fork's two props (sendLabel, canQueue) moved onto upstream's ComposerFooterPrimaryActions. The row measures +16/-2 afterwards — its exact pre-sync delta.
pnpm-lock.yaml — regenerated seeded from the fork's own pre-sync lock, not upstream's, so the security sweep survives. Verified unchanged: sharp@0.35.3, nanoid@3.3.17. Picks up upstream's new heic-to@1.5.2.

Semantic drift no conflict would have flagged

Upstream pingdotgg#7719 (0929907ff) added an orphaned-provider-session pass to ServerRuntimeStartup.make, giving it two new service requirements. The fork's startup-ordering test drives make directly with doubles, so it broke. The provider double now reports the seeded thread as live, so the new pass finds no orphans and dispatches nothing — otherwise its dispatch would have landed a second "reconcile" in the same order ref the test asserts on.

Ledger

docs/coil/SEAMS.md re-baselined against f6f2be32d: 53 rows, +2590/-1042 → +2601/-1042, deletion count byte-identical. That identical -1042 is the real result — any displacement of upstream code moves a deletion count, and it did not move.

Also fixes a pre-existing ledger bug: two rows were both labelled apps/server/package.json. The +2/-2 one is apps/desktop/package.json, and its rationale was wrong too.

Parallel path

Three upstream apps/marketing commits checked against apps/coil-home, none ported: pingdotgg#7477 and pingdotgg#7473 both fix serving an Intel Mac build to Apple Silicon, and coil-home only ever publishes darwin-arm64 — there is no Intel artifact to mis-serve. pingdotgg#8070 is Vercel config; coil-home deploys through Cloudflare.

coderabbitai · 2026-08-27T14:55:21Z

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: e689d51a-81dd-4607-b972-485130aebd87

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

radroid · 2026-08-27T14:55:10Z

Resolves the eight consecutive failed daily syncs tracked in #123. The fork's 173 patches are rebased onto upstream f6f2be32d, zero dropped.

Do not use the merge button. This is the fork's patch series rebased onto new upstream, so main is not an ancestor of it and GitHub will report CONFLICTING. Land it with:
git push --force-with-lease origin coil/sync-20260827:main
Rollback point: tag coil/pre-sync-20260827.

Verification

Check	Result
`vp run typecheck`	exit 0, 0 errors
`vp run lint`	exit 0, 0 errors (20 warnings, all upstream's)
`vp run test`	green except two proven non-regressions, below

build-desktop-artifact cross-arch probe — fails on pristine upstream code and on the pre-sync tree as well, so it predates this sync entirely. It is arch-dependent (asserts a cross-architecture skip with targetArch: "arm64"; this machine is arm64, CI is x64). Expected green in CI.

client-runtime exit 137 — OOM under parallel contention. Passes clean in isolation: 50 files, 680 tests.

The three conflicts

SettingsPanels.tsx — upstream's skills-in-/-menu row (feat(web): redesign skills in $ menu and in / menu pingdotgg/t3code#8009) and the fork's needs-input toggle were inserted at the same point. Split into two rows; both survive.
ChatComposer.tsx — the one worth reading. Upstream moved the bottom toolbar, so git presented the fork's change as a 130-line block against an empty upstream side, when the original patch was only +16/-2. Taking that block would have silently reverted upstream's refactor of the approval branch into isComposerApprovalState. The duplicate was dropped and the fork's two props (sendLabel, canQueue) moved onto upstream's ComposerFooterPrimaryActions. The row measures +16/-2 afterwards — its exact pre-sync delta.
pnpm-lock.yaml — regenerated seeded from the fork's own pre-sync lock, not upstream's, so the security sweep survives. Verified unchanged: sharp@0.35.3, nanoid@3.3.17. Picks up upstream's new heic-to@1.5.2.

Semantic drift no conflict would have flagged

Upstream pingdotgg#7719 (0929907ff) added an orphaned-provider-session pass to ServerRuntimeStartup.make, giving it two new service requirements. The fork's startup-ordering test drives make directly with doubles, so it broke. The provider double now reports the seeded thread as live, so the new pass finds no orphans and dispatches nothing — otherwise its dispatch would have landed a second "reconcile" in the same order ref the test asserts on.

Ledger

docs/coil/SEAMS.md re-baselined against f6f2be32d: 53 rows, +2590/-1042 → +2601/-1042, deletion count byte-identical. That identical -1042 is the real result — any displacement of upstream code moves a deletion count, and it did not move.

Also fixes a pre-existing ledger bug: two rows were both labelled apps/server/package.json. The +2/-2 one is apps/desktop/package.json, and its rationale was wrong too.

Parallel path

Three upstream apps/marketing commits checked against apps/coil-home, none ported: pingdotgg#7477 and pingdotgg#7473 both fix serving an Intel Mac build to Apple Silicon, and coil-home only ever publishes darwin-arm64 — there is no Intel artifact to mis-serve. pingdotgg#8070 is Vercel config; coil-home deploys through Cloudflare.

coderabbitai · 2026-08-27T14:55:21Z

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: e689d51a-81dd-4607-b972-485130aebd87

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

radroid · 2026-08-27T14:55:10Z

Resolves the eight consecutive failed daily syncs tracked in #123. The fork's 173 patches are rebased onto upstream f6f2be32d, zero dropped.

Do not use the merge button. This is the fork's patch series rebased onto new upstream, so main is not an ancestor of it and GitHub will report CONFLICTING. Land it with:
git push --force-with-lease origin coil/sync-20260827:main
Rollback point: tag coil/pre-sync-20260827.

Verification

Check	Result
`vp run typecheck`	exit 0, 0 errors
`vp run lint`	exit 0, 0 errors (20 warnings, all upstream's)
`vp run test`	green except two proven non-regressions, below

build-desktop-artifact cross-arch probe — fails on pristine upstream code and on the pre-sync tree as well, so it predates this sync entirely. It is arch-dependent (asserts a cross-architecture skip with targetArch: "arm64"; this machine is arm64, CI is x64). Expected green in CI.

client-runtime exit 137 — OOM under parallel contention. Passes clean in isolation: 50 files, 680 tests.

The three conflicts

SettingsPanels.tsx — upstream's skills-in-/-menu row (feat(web): redesign skills in $ menu and in / menu pingdotgg/t3code#8009) and the fork's needs-input toggle were inserted at the same point. Split into two rows; both survive.
ChatComposer.tsx — the one worth reading. Upstream moved the bottom toolbar, so git presented the fork's change as a 130-line block against an empty upstream side, when the original patch was only +16/-2. Taking that block would have silently reverted upstream's refactor of the approval branch into isComposerApprovalState. The duplicate was dropped and the fork's two props (sendLabel, canQueue) moved onto upstream's ComposerFooterPrimaryActions. The row measures +16/-2 afterwards — its exact pre-sync delta.
pnpm-lock.yaml — regenerated seeded from the fork's own pre-sync lock, not upstream's, so the security sweep survives. Verified unchanged: sharp@0.35.3, nanoid@3.3.17. Picks up upstream's new heic-to@1.5.2.

Semantic drift no conflict would have flagged

Upstream pingdotgg#7719 (0929907ff) added an orphaned-provider-session pass to ServerRuntimeStartup.make, giving it two new service requirements. The fork's startup-ordering test drives make directly with doubles, so it broke. The provider double now reports the seeded thread as live, so the new pass finds no orphans and dispatches nothing — otherwise its dispatch would have landed a second "reconcile" in the same order ref the test asserts on.

Ledger

docs/coil/SEAMS.md re-baselined against f6f2be32d: 53 rows, +2590/-1042 → +2601/-1042, deletion count byte-identical. That identical -1042 is the real result — any displacement of upstream code moves a deletion count, and it did not move.

Also fixes a pre-existing ledger bug: two rows were both labelled apps/server/package.json. The +2/-2 one is apps/desktop/package.json, and its rationale was wrong too.

Parallel path

Three upstream apps/marketing commits checked against apps/coil-home, none ported: pingdotgg#7477 and pingdotgg#7473 both fix serving an Intel Mac build to Apple Silicon, and coil-home only ever publishes darwin-arm64 — there is no Intel artifact to mis-serve. pingdotgg#8070 is Vercel config; coil-home deploys through Cloudflare.

coderabbitai · 2026-08-27T14:55:21Z

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: e689d51a-81dd-4607-b972-485130aebd87

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

radroid merged commit 672b4a5 into mainAug 27, 2026
2 checks passed

radroid force-pushed the main branch from 3d91c57 to 672b4a5Compare August 27, 2026 16:13