chore(coil): merge upstream/main 7445aa733a (335 commits) - #153
Merged
Merged
Conversation
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
… only (pingdotgg#11770) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…gg#11572) Co-authored-by: maria-rcks <maria@kuuro.net>
…e palette open (pingdotgg#11762) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
… on the clone (pingdotgg#11774) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…1765) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…nect login (pingdotgg#11794) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…ingdotgg#11811) Co-authored-by: Bil0000 <bilal.bakr.elsherif@gmail.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…rets (pingdotgg#11760) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…tgg#11832) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ingdotgg#11833) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Removed labels from effect service conventions.
Removed labels from UI consistency configuration.
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…7861) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…exists (pingdotgg#12540) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…gg#12635) Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…art (pingdotgg#12625) Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Absorbs upstream main through 2026-09-19 (issue #151). 23 files conflicted; six were retired-workflow modify/deletes resolved as deleted, plus two new upstream workflows (release-desktop.yml, desktop-macos-preview-publish.yml) retired on arrival and added to the sync policy list. Three fork seams shrank because upstream did the fork's work itself: - pingdotgg#11673 ships a client-side queue for a running turn. The fork's steer-a-running-turn decision (composerSteering.logic.ts) and its label are retired; the thread outbox now queues only while disconnected or behind earlier messages. - pingdotgg#11762 rewrote the clone with progress callbacks and a redacted stderr tail. The fork's non-zero-exit branch is gone; describeGitCloneFailure classifies upstream's tail, NON_INTERACTIVE_GIT_ENV joins CLONE_ENV, and the provider is still derived from the remote URL. - pingdotgg#11679 added an iOS enterBehavior setting with its own Return key commands. The fork's soft-keyboard Return intercept is gated on it and its line-break flag folds into upstream's insertNewline. Also: ThreadCoilOverlay follows the thread route body into ThreadRouteView (pingdotgg#12015); the WSL heap flag sits in upstream's new command array (pingdotgg#11511); worktree-setups.reconcile lands in upstream's startup slot (pingdotgg#11852). The effect rc.112 -> rc.115 bump broke two fork-owned files with no seam involved: HttpServer.TcpAddress is now NetAddress.InetAddress, and stat floors nanoseconds so a +1 ms utimes fixture read as stale. pnpm-lock.yaml regenerated from the fork's pre-sync lock. SEAMS.md re-baselined against 7445aa7: 78 files, +2688/-5064. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Upstream pingdotgg#11410 bundles the Electron main process and stages only the packages in scripts/lib/desktop-external-packages.ts; the server bundle already followed scripts/lib/cli-external-packages.ts. The staged app therefore has no node_modules presence for anything else, by construction. The gate still required every bare specifier a bundle named, so the first artifact after the sync failed on x11 and ajv (requires left inside inlined dependencies) and on effect (a `from "effect"` in embedded prose the comment scanner does not blank). None of these is a fork exclusion, and none can be resolved in a bundle upstream ships this way. Each layer now requires only its own externals. The end-to-end fixtures name native externals instead of arbitrary packages, and glob attribution is tested with an explicit list since no default glob names an external. Verified against the packaged macOS artifact built from this branch: "imports checked: 4 packages", verification passed. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Owner
Author
|
Second commit: the first packaged macOS artifact built from this branch tripped the fork's asar gate on |
radroid
added a commit
that referenced
this pull request
Sep 20, 2026
The sync merge (#153) bumped effect to rc.115, which renamed the unstable CLI helpers Flag.string/Flag.boolean to Flag.String/Flag.Boolean. verify-mac-signature still used the old names, so the scripts package failed typecheck on main and the release was withheld. sync-upstream.test.ts also tripped the nodeBuiltinImport diagnostic; it now carries the same per-file opt-out header upstream puts on its own scripts tests that shell out to real processes. Co-authored-by: Claude Fable 5.1 <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.
Closes #151.
Absorbs upstream
mainthrough 2026-09-19 (7445aa733a, 335 commits). 23 files conflicted: six retired-workflow modify/deletes kept deleted, two new upstream workflows (release-desktop.yml,desktop-macos-preview-publish.yml) retired on arrival and added toscripts/coil/sync-upstream.sh, the lockfile regenerated from the fork's pre-sync lock, and 14 source conflicts resolved by hand.Three fork seams shrank because upstream did the fork's work itself:
composerSteering.logic.ts, its label, and thesteerablebreadcrumb) is retired. The thread outbox now queues only while disconnected or behind earlier messages; a mid-turn send goes to upstream's queue and steers in at the next tool boundary.ChatView.tsx+237 → +217.allowNonZeroExitbranch is gone.describeGitCloneFailureclassifies upstream's tail,NON_INTERACTIVE_GIT_ENVis spread intoCLONE_ENV, and the provider is still derived from the remote URL. Upstream's one test that echoed the raw tail now asserts the classified sentence (the two could not both be true).SourceControlRepositoryService.ts+101/-19 → +70/-20.enterBehaviorsetting). The fork's soft-keyboard Return intercept is gated onenterBehavior == .send, and itsisInsertingHardLineBreakflag folds into upstream'sinsertNewline. Android still submits on every bare Enter; upstream's setting is iOS-only by its own doc.T3ComposerEditorView.swift+37 → +28.Other resolutions:
ThreadCoilOverlayfollows the route body intoThreadRouteView.tsx(pingdotgg#12015, +5/-0); the WSL heap flag moves into upstream'scommandarray for the node-script runtime (pingdotgg#11511);worktree-setups.reconciletakes upstream's startup slot while the fork's hoistedprovider-sessions.reconcilestays (pingdotgg#11852); both settings rows, both search entries, both icon imports kept.Effect
rc.112 → rc.115broke two fork-owned files with no seam involved:HttpServer.TcpAddress→NetAddress.InetAddress(coil/http/testAuth.ts), andstatnow floors nanoseconds so a+1 msutimesfixture read as stale (coil/loop/sentinel.test.ts, now+1 s).docs/coil/SEAMS.mdre-baselined against7445aa733a: 78 files, +2688/-5064.Verified locally: typecheck on contracts, shared, server, web, desktop, mobile (0 errors);
vp teston every touched test file plusapps/server/src/coil,sourceControl,serverRuntimeStartup,apps/web/src/outbox,scripts/coil(all green); lint andvp fmt --checkon every changed file;apps/webbuild and the server bundle build both pass.Land as a merge commit, never a squash.
🤖 Generated with Claude Code
Summary by CodeRabbit
New Features
Updates
Removed