Repository navigation
Merge upstream/main e85539ab59 into coder-only - #217
Merged
Merged
Conversation
…#19680) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…story (pingdotgg#9221) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…15636) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#11943) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#13859) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#12513) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Brings upstream's 20 commits since fb99076: the traced Effect.fn refactor (pingdotgg#21989-pingdotgg#22000), helper processes no longer outliving the backend (pingdotgg#12513), terminal modes a dead shell leaves in history reset (pingdotgg#9221), atomic synchronized terminal paint (pingdotgg#9867), and new threads choosing each repository checkout (pingdotgg#15636). Resolution: - Cut: hosted-app empty state (pingdotgg#19680), relay tracing opt-out (pingdotgg#14413), mobile changes, the prefer-effect-fn lint rule, and the mobile-only react-native-image-viewing patch. - Functions the fork replaced keep their fork bodies under upstream's Effect.fn wrapper: the Kilo Code, Codex, and Claude driver `create`, ACP registry inspect/resolve, and the ws.ts handlers the helper serves. Refactor-only files take upstream's file with the fork delta replayed (patch -l), so they match upstream's shape. - Metrics stay cut where upstream re-wrapped them (OrchestratorMcpService, ScheduledTaskService, terminal restarts). Review fixes (Fable review of the three-stage sync): - Remove BranchToolbar.tsx.orig, a patch backup committed in the fb99076 merge. - Carry upstream's webhook span-attribute test, which needs no cut surface. - server.refreshProviders with refreshModels drops cached latest versions per instance (upstream pingdotgg#19580) without the model-manifest refresh the bundled catalog has no use for; ws.projects.test stubs the new ProviderLatestVersions dependency. - Carry upstream's filesystem-root clone test on a GitLab URL. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The seams doc names server.ts's automatic fetch interval layer, and the sync checklist adds the replay technique for mechanical refactors and a check for stray patch backups. Co-Authored-By: Claude Opus 5.5 <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.
Stage 3 of 3: merges upstream
mainate85539ab59(20 commits sincefb990765a4). This also brings in the fixes from a Fable review of all three stages.Brings:
Effect.fnrefactor (docs: establish traced Effect function conventions pingdotgg/t3code#21989–feat(lint): require Effect functions for reusable generator wrappers pingdotgg/t3code#22000).Resolution (details in the merge commit):
Review fixes:
BranchToolbar.tsx.origcommitted in Merge upstream/main fb990765a4 into coder-only #216..orig/.rejfiles.Verification:
pnpm knip:check,pnpm build, andvp fmt --checkpass.test:coderrun was green except two known flakes that pass alone: theserverSettingssymlink watcher and thelocalApihook timeout. The files changed by the review fixes were rerun on their own.Left for a follow-up (older fork gaps the review found, not caused by this sync):
🤖 Generated with Claude Code