chore(coil): merge upstream/main 83bbfa7e87 (90 commits) - #158
Merged
Merged
Conversation
…10831) Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…tgg#12657) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…ion (pingdotgg#10098) Co-authored-by: shivamhwp <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#12808) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…off (pingdotgg#12807) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…s page (pingdotgg#12536) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…2243) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…2805) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
pingdotgg#12833) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Queued messages are text-only, so handleQueueComposerSubmission clears the composer's images and files without sending them. It never released their uploads. Upstream pingdotgg#10338 now keeps a failed upload's job alive and retries it on reconnect, and the queue path runs mostly while disconnected, so every discarded attachment would silently re-upload later and leave an orphan pending upload. Route the discard through releaseDraftAttachments like upstream's own discard paths. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Measured against merge-base 17e3477: 78 files, +2557/-5012. Every code seam kept its pre-sync footprint; only the retired ci.yml, the regenerated lock, the pnpm-workspace overrides row (stale since #155/#157) and ChatView's queue fix moved. Churn and risk remeasured; the queue path's attachment release is registered as a parallel path. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ingdotgg#13020) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…otgg#13022) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ingdotgg#13025) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…dotgg#13031) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ve (pingdotgg#13033) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…gdotgg#13034) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…pingdotgg#13035) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…s a Textarea (pingdotgg#13036) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ingdotgg#13039) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ingdotgg#13041) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…otgg#13042) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ingdotgg#13043) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Second pass: upstream moved while the first merge was being verified. No conflicts; the range is web restyle refactors of components/ui.
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 had been failing since 09-21 (issue #156) on conflicts in
apps/desktop/src/ipc/channels.tsandpnpm-lock.yaml. This merges upstream83bbfa7e87: 66 commits, plus a 24-commit second pass that landed upstream while the first was being verified. It lands as merge commits, so the merge-base advances.Conflicts
.github/workflows/ci.yml: kept deleted. It is a retired upstream workflow, perscripts/coil/sync-upstream.sh.apps/desktop/src/ipc/channels.ts: kept both sides. Upstream'sPREVIEW_RECORDING_INPUT_CHANNELgoes above the fork's appended coil update block, so the seam stays+10/-0.pnpm-lock.yaml: seeded from the fork's lock and regenerated with--lockfile-only. Every resolved version that moved went up (vite-plus 0.3.0 → 0.3.3, oxlint, oxfmt,@shadcn/lint). The security sweep's pins are unchanged.The second pass had no conflicts.
Fix made during the sync
2041766bee). Queued messages are text-only, sohandleQueueComposerSubmissiondiscards the composer's images and files. It never released their uploads. Upstream fix(web): retry failed attachment uploads after reconnect pingdotgg/t3code#10338 now keeps a failed upload alive and retries it on reconnect, and the queue runs mostly while disconnected. So every dropped attachment would have re-uploaded later and left an orphan pending upload. It now goes throughreleaseDraftAttachments, as upstream's own discard paths do. This is registered in the SEAMS parallel-paths table.Seam review
ci.ymland the regenerated lock moved in the merge.83bbfa7e87, with churn and risk remeasured. It also fixes stalepnpm-workspace.yamltotals (+23→+29) that chore(coil): Dependabot runs go green: vendored repos excluded, 38 advisories re-resolved #155 and fix(deps): patch Nanoid zero-size advisory #157 never updated.threadEnvModeexport removal,message-sentevents without a turnId, t3.json submodule settings, the OTLP settings refactor, and the attachment limit going from 8 to 100.apps/marketingchanges to port tocoil-home, and no new upstream workflows.Verification (local)
vp run typecheck: all 17 packages pass, includingscripts.vp run lint: passes, warnings only.Tests, run per package:
/var→/private/vartmpdir symlinks. WithTMPDIRresolved, all 286 of their tests pass. They are byte-identical to upstream and pass on Linux CI.swiftc, which this Mac can't run until the Xcode license is accepted.Built the desktop and server bundles (
vp run --filter @t3tools/desktop --filter t3 build, which includes the web build and its license plugin).collectRequiredPackagesover them. The required native externals are unchanged, and none is excluded by the fork's packaging globs..appwas not packaged locally, because the Xcode license blocks clang and iconutil.Deferred (not sync fixes)
lint:restyle-ceilingratchet (chore(lint): report className restyling of components/ui exports pingdotgg/t3code#12982). It is not a fork gate, because it lived only in upstream'sci.yml. Fork UI putsapps/web/srcat 635 findings against upstream's ceiling of 628. Recorded in SEAMS.chat-composer-horizontal-inset, a class upstream deleted in August.Closes #156
🤖 Generated with Claude Code — Claude Opus 5.5 (1M context), running in T3 Code