chore(coil): merge upstream/main ba79610d16 (192 commits) - #160
Merged
Merged
Conversation
…ingdotgg#13139) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#12983) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… className ternaries (pingdotgg#13161)
…uniwind variants broke both platforms) (pingdotgg#13169)
…g#13104) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
pingdotgg#13144) Co-authored-by: Apex by Callstack <noreply@callstack.com>
…tgg#13175) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…pingdotgg#13172) Co-authored-by: julusy <julius@t3.codes>
… className ternaries (pingdotgg#13185)
… variants (pingdotgg#13188) Co-authored-by: julusy <julius@t3.codes>
…13189) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#13198) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#13200) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…th failed repacks (pingdotgg#13812) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…al (pingdotgg#13491) Co-authored-by: eshaan Sood <eshaansood@192.168.1.14> Co-authored-by: Gabriel De Andrade <30420087+gabrielelpidio@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#13736) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…otgg#13935) Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: Exotic <118054752+extoci@users.noreply.github.com> Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
…ncy improvement (pingdotgg#13884) Co-authored-by: GPT-6 Astra <noreply@openai.com>
Conflicts resolved:
- .github/workflows/{ci,deploy-relay,mobile-eas-preview,mobile-showcase-screenshots,release-desktop,release}.yml:
retired upstream workflows, kept deleted (scripts/coil/sync-upstream.sh policy).
- apps/desktop/src/ipc/channels.ts: upstream's TRACKPAD_SCROLL_END_CHANNEL above the fork's
notification channels; both kept.
- apps/web/src/routes/__root.tsx: upstream's RunningThreadKeepAlive import beside the fork's
coordinator imports; both kept.
- apps/web/src/components/chat/ComposerPrimaryActions.tsx: kept the fork's split stop-button base
class and carried upstream's new inset-shadow tokens (pingdotgg#13397) into filledStopEmphasis.
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Upstream pingdotgg#13210 turned shadcn/no-restyle, no-arbitrary-values, no-raw-colors and no-unknown-classes into errors, and 45 findings in fork-owned web UI failed lint. - Off-scale text sizes move to the theme scale (text-2xs, text-3xs, text-xs). - The loop console's raw amber icon uses the theme's warning color. - Queue becomes a composer-owned message-action pill, like upstream's Submit and Refine (pingdotgg#13209). - Loop answer options use Button's sm-multiline size instead of hand-set padding. - The two overlay Collapsibles space their panel with a margin instead of a gap. - The auto-resume toggle's spring curve has no theme token, so it moves to an inline style. The auto-resume capsule and loop console also still referenced chat-composer-horizontal-inset, which upstream deleted in pingdotgg#6381, and a fixed max-w-3xl. They now follow the composer's current geometry: --workspace-gutter-* padding and the Chat width setting's --chat-max-width (pingdotgg#11594), so they stay aligned on wide chat layouts. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Ports upstream pingdotgg#13611 and pingdotgg#13365 from apps/marketing. Upstream's new Linux .deb download card is not ported: Coil does not publish Linux builds. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Upstream pingdotgg#13764 moved its in-memory queue's sender to the app root, so it now runs for every thread, not just the open one. After a reconnect it and the fork's outbox drain can both find a thread idle in the same tick. A message saved to the outbox while offline could then start its turn ahead of a message queued earlier, during the running turn. The drain's hasQueuedTurnStart check cannot see the earlier message while it is still preparing, because the server has no record of it yet. The drain now treats a thread as busy while upstream's queue holds a message that will leave on its own. This is the rule upstream's onSend already applies to a new send. A message held for the user after a failed send does not block. The change is entirely in fork-owned files. Also drops a stale comment above the send button: it described a fork aria-label branch that no longer exists, and the button is now byte-identical to upstream's. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Remeasured against merge-base ed57bed: 78 files, +2553/-5111. Churn and risk regenerated for every row. Records the design-system lint gate, the logic mirror that had been dead since pingdotgg#6381, and the new parallel path between the outbox drain and upstream's root-level queue sender. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
… account registration (pingdotgg#14127) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
The spring curve moved from an arbitrary-value class to an inline style to pass upstream's design-system lint, so the rendered markup spells it with spaces instead of underscores. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The daily sync failed five days running (issue #159), on conflicts in
channels.ts,ComposerPrimaryActions.tsxand__root.tsx. This merges upstreamed57bed8e7(191 commits), plus a one-commit second pass (ba79610d16) that landed during verification. It lands as merge commits, so the merge-base advances.Conflicts
ci,deploy-relay,mobile-eas-preview,mobile-showcase-screenshots,release-desktop,release): kept deleted, perscripts/coil/sync-upstream.sh. No new upstream workflows arrived.apps/desktop/src/ipc/channels.ts: kept both. Upstream'sTRACKPAD_SCROLL_END_CHANNELsits above the fork's notification channels. Still+10/-0.apps/web/src/routes/__root.tsx: kept both imports, upstream'sRunningThreadKeepAlivebeside the fork's coordinators. Still+9/-0.ComposerPrimaryActions.tsx: kept the fork's split stop-button base class, and moved upstream's new inset-shadow tokens (fix(web): appearance classes use theme tokens and scale values pingdotgg/t3code#13397) intofilledStopEmphasis.The lockfile merged textually and installs with
--frozen-lockfile. The security sweep's pins are unchanged (sharp, nanoid, tar, undici, astro).Fixes made during the sync
a32c48020d). Upstream chore(web): no-restyle fails lint, and the ceiling gate goes pingdotgg/t3code#13210 turnedshadcn/no-restyle,no-arbitrary-values,no-raw-colorsandno-unknown-classesinto errors, and 45 findings in fork UI failedvp run lint.message-actionresolves toprimary.Button'ssm-multilinesize.chat-composer-horizontal-inset, a class upstream deleted in refactor(web): simplify global styling pingdotgg/t3code#6381, plus a fixedmax-w-3xl. The last sync deferred this as cosmetic. It is no longer cosmetic: upstream's new Chat width setting (feat(web): add chat width setting for wide screens pingdotgg/t3code#11594) would strand both overlays at 48rem on a wide chat column. They now read--workspace-gutter-*and--chat-max-width, like the composer.d60080285c). Upstream fix(web): queued messages send while their thread is not open pingdotgg/t3code#13764 moved its queue sender to the app root, so it now runs for every thread, not only the open one. After a reconnect, it and the fork's drain could both find a thread idle in the same tick. An outbox message could then overtake a message queued earlier during the running turn. The drain now treats the thread as busy while upstream's queue still holds a message that will send on its own. That is the same rule upstream'sonSendapplies. The fix is in fork-owned files only, has tests, and is registered in the SEAMS parallel-paths table.coil-homecarries upstream's refreshed OpenAI and OpenCode logos (fix: update OpenAI logo to current brand asset pingdotgg/t3code#13611, fix(marketing): use the official OpenCode and Antigravity logos pingdotgg/t3code#13365). Upstream's Linux.debdownload card is not ported, because Coil publishes no Linux builds.Seam review
ClaudeAdapter's newinterrupt()Stop path vs. the loop hooks, and upstream's T3 Connect tunnel rewrite inserver.tsvs.CoilLayerLive.boot.cjs/ compile-cache entry, and the.debself-update path, which stays unreachable because the fork's update feed is disabled.notifyOnNeedsInputfollows upstream's new settings-field pattern.onSend, so the fork'slogComposerDispatchNowbreadcrumb does not log them. This is diagnostics only and is noted in SEAMS.ba79610d16, with churn and risk regenerated for every row. The code footprint moved by six lines.Verification (local)
vp run typecheck: all 17 packages pass, includingscripts.vp run lint: 0 errors.Tests, run per package:
swiftc, which this Mac can't run until the Xcode license is accepted.arm64, which is not cross on this host. The fork's edits in that file are unrelated env hatches.Built the desktop and server bundles. The bundle gate's
collectRequiredPackagesstill requires 4 native externals, and none is excluded by the fork's packaging globs.Not in this PR
image-sizealerts, opened 09-24/25 before this sync.Closes #159
🤖 Generated with Claude Code — Claude Opus 5.5 (1M context), running in T3 Code