Scope git checkout effects and update Effect/Node dependency set

[juliusmarminge]

Summary

• scopes git.checkoutBranch execution with Effect.scoped(...) in the WebSocket handler to align with the updated GitCore service effect requirements
• updates GitCore service typing so checkoutBranch explicitly requires Scope.Scope
• adjusts CodexAdapter attachment error flow to return toRequestError(...) directly in the effect pipeline
• includes formatting/cleanup changes in git and orchestration layers (no intended behavior change)
• bumps Effect package catalog refs to 8881a9b and upgrades @types/node to ^24.10.13 across root/server/desktop

Testing

• Not run (no test output provided in this patch context)
• Not run: bun lint
• Not run: bun typecheck

---

Note

Medium Risk
Updates Effect and Node type dependencies and changes git.checkoutBranch to run in a Scope, which could impact runtime behavior of git checkout/background upstream refresh if scoping is incorrect.

Overview
Scopes git checkout execution. GitCoreShape.checkoutBranch now requires Scope.Scope in its environment, and the WebSocket gitCheckout handler wraps the call in Effect.scoped(...) so the background forkScoped upstream refresh is tied to a proper scope.

Dependency/tooling updates. Bumps the Effect catalog refs to 8881a9b and upgrades @types/node to ^24.10.13 across root/server/desktop (with corresponding bun.lock changes).

Minor refactors/formatting. Small non-functional cleanups in GitCore parsing/branch logic, provider runtime ingestion, wsServer import formatting, and a small adjustment to Codex attachment invalid-id error handling.

^{Written by Cursor Bugbot for commit 8105951. This will update automatically on new commits. Configure here.}

Note

Scope WS git checkout handling with Effect.scoped in wsServer.ts to ensure GitCoreShape.checkoutBranch runs with a Scope

Require Scope.Scope for GitCoreShape.checkoutBranch and wrap the WS git checkout call in Effect.scoped; update Effect-related package pins and bump @types/node to 24.10.13.

📍Where to Start

Start with the WS router createServer switch handling WS_METHODS.gitCheckout in wsServer.ts, then review the GitCoreShape change in apps/server/src/git/Services/GitCore.ts.

📊 Macroscope summarized 8105951. 5 files reviewed, 4 issues evaluated, 1 issue filtered, 1 comment posted

🗂️ Filtered Issues

apps/server/src/git/Layers/GitCore.ts — 0 comments posted, 1 evaluated, 1 filtered

• line 1164: The checkoutBranch method spawns a background task refreshCheckedOutBranchUpstream using Effect.forkScoped. This attaches the background fiber's lifecycle to the Scope provided by the caller. When checkoutBranch returns, if the caller-provided Scope is closed (which is the standard behavior when using Effect.scoped to execute an operation), the background fiber will be immediately interrupted before it can complete. This causes the upstream reference refresh to silently fail, leaving the repository state potentially stale, defeating the stated purpose of keeping the checkout responsive. [ Out of scope ]

[coderabbitai]

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.

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

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch feature/add-vscode-open-in-support

---

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

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix prepared a fix for the issue found in the latest run.

• ✅ Fixed: Scoped checkout immediately interrupts background upstream refresh
  • Changed Effect.forkScoped to Effect.forkDetach so the background upstream refresh fiber runs independently of the enclosing scope, and removed the now-unnecessary Effect.scoped wrapper and Scope.Scope type requirement.

Or push these changes by commenting:

@cursor push de7f50ec6b

Preview (de7f50ec6b)

diff --git a/apps/server/src/git/Layers/GitCore.ts b/apps/server/src/git/Layers/GitCore.ts
--- a/apps/server/src/git/Layers/GitCore.ts
+++ b/apps/server/src/git/Layers/GitCore.ts
@@ -1161,7 +1161,7 @@
       });
 
       // Refresh upstream refs in the background so checkout remains responsive.
-      yield* Effect.forkScoped(
+      yield* Effect.forkDetach(
         refreshCheckedOutBranchUpstream(input.cwd).pipe(Effect.catch(() => Effect.void)),
       );
     });

diff --git a/apps/server/src/git/Services/GitCore.ts b/apps/server/src/git/Services/GitCore.ts
--- a/apps/server/src/git/Services/GitCore.ts
+++ b/apps/server/src/git/Services/GitCore.ts
@@ -7,7 +7,7 @@
  * @module GitCore
  */
 import { ServiceMap } from "effect";
-import type { Effect, Scope } from "effect";
+import type { Effect } from "effect";
 import type {
   GitCheckoutInput,
   GitCreateBranchInput,
@@ -151,7 +151,7 @@
    */
   readonly checkoutBranch: (
     input: GitCheckoutInput,
-  ) => Effect.Effect<void, GitCommandError, Scope.Scope>;
+  ) => Effect.Effect<void, GitCommandError>;
 
   /**
    * Initialize a repository in the provided directory.

diff --git a/apps/server/src/wsServer.ts b/apps/server/src/wsServer.ts
--- a/apps/server/src/wsServer.ts
+++ b/apps/server/src/wsServer.ts
@@ -689,7 +689,7 @@
 
       case WS_METHODS.gitCheckout: {
         const body = stripRequestTag(request.body);
-        return yield* Effect.scoped(git.checkoutBranch(body));
+        return yield* git.checkoutBranch(body);
       }
 
       case WS_METHODS.gitInit: {

[cursor]

Scoped checkout immediately interrupts background upstream refresh

High Severity

Wrapping git.checkoutBranch(body) with Effect.scoped(...) creates a short-lived scope that closes as soon as the checkout effect completes. Inside checkoutBranch, Effect.forkScoped is used to fork a background fiber for refreshCheckedOutBranchUpstream, which performs a network git fetch. When Effect.scoped closes the scope immediately after checkout, it interrupts the forked fiber — effectively killing the background refresh before the fetch can complete. The comment "Refresh upstream refs in the background so checkout remains responsive" describes the intended behavior, but this change silently breaks it.

Additional Locations (1)

• apps/server/src/git/Layers/GitCore.ts#L1163-L1166

 

[macroscopeapp]

🔴 Critical Layers/CodexAdapter.ts:492

yield* toRequestError(...) yields the error object directly, but the rest of this file uses Effect.fail(error) to fail Effects. Consider wrapping with Effect.fail() for consistency and to avoid a potential TypeError if the error isn't iterable.

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:

In file apps/server/src/provider/Layers/CodexAdapter.ts around line 492:

`yield* toRequestError(...)` yields the error object directly, but the rest of this file uses `Effect.fail(error)` to fail Effects. Consider wrapping with `Effect.fail()` for consistency and to avoid a potential `TypeError` if the error isn't iterable.

Evidence trail:
apps/server/src/provider/Layers/CodexAdapter.ts lines 492-495 (yield* toRequestError usage), lines 73-88 (toRequestError definition returns ProviderAdapterError), lines 460 and 538 (Effect.fail pattern elsewhere), apps/server/src/provider/Errors.ts lines 57-68 (ProviderAdapterRequestError is a Schema.TaggedErrorClass, not an Effect)