Commit 79b8fd7b0096c3a75e69e877df1d5253daa7e1f8 | the-knife

author	Cursor Agent <cursoragent@cursor.com> 2026-02-26 18:49:09+00:00
committer	Julius Marminge <jmarminge@gmail.com> 2026-02-26 13:20:36-08:00
log	79b8fd7b0096c3a75e69e877df1d5253daa7e1f8
tree	6ee1c31768322d01ca0bf1abe7d4ae5ac0b8a174
parent	61560bef235fb6a04c36b99190a762713141e35a

Fix ProviderCommandReactor: add error recovery and deduplicate CWD resolution

- Wrap processDomainEvent in catchCause to prevent the reactor fiber from
  terminating on handler errors, matching the pattern used by
  ProviderRuntimeIngestion and CheckpointReactor.
- Replace duplicated resolveEffectiveThreadCwd with the shared
  resolveThreadWorkspaceCwd from checkpointing/Utils.ts.

1 files changed, 17 insertions(+), 21 deletions(-)

apps
- server
  - src
    orchestration
    Layers
    ProviderCommandReactor.ts

apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+17-21

 @@ -8,8 +8,9 @@ import {
   type ThreadId,
   type TurnId,
 } from "@t3tools/contracts";
-import { Cache, Duration, Effect, Layer, Option, Queue, Stream } from "effect";
+import { Cache, Cause, Duration, Effect, Layer, Option, Queue, Stream } from "effect";
+import { resolveThreadWorkspaceCwd } from "../../checkpointing/Utils.ts";
 import { ProviderService } from "../../provider/Services/ProviderService.ts";
 import { OrchestrationEngineService } from "../Services/OrchestrationEngine.ts";
 import {
 @@ -33,24 +34,6 @@ function toNonEmptyProviderInput(value: string | undefined): string | undefined
   return normalized && normalized.length > 0 ? normalized : undefined;
 }
-function resolveEffectiveThreadCwd(input: {
-  readonly thread: {
-    readonly projectId: string;
-    readonly worktreePath: string | null;
-  };
-  readonly projects: ReadonlyArray<{
-    readonly id: string;
-    readonly workspaceRoot: string;
-  }>;
-}): string | undefined {
-  const worktreeCwd = input.thread.worktreePath ?? undefined;
-  if (worktreeCwd) {
-    return worktreeCwd;
-  }
-  return input.projects.find((project) => project.id === input.thread.projectId)?.workspaceRoot;
-}
 function mapProviderSessionStatusToOrchestrationStatus(
   status: "connecting" | "ready" | "running" | "error" | "closed",
 ): OrchestrationSession["status"] {
 @@ -161,7 +144,7 @@ const make = Effect.gen(function* () {
       thread.session?.providerName === "codex" || thread.session?.providerName === "claudeCode"
         ? thread.session.providerName
         : undefined;
-    const effectiveCwd = resolveEffectiveThreadCwd({
+    const effectiveCwd = resolveThreadWorkspaceCwd({
       thread,
       projects: readModel.projects,
     });
 @@ -353,12 +336,25 @@ const make = Effect.gen(function* () {
       }
     });
+  const processDomainEventSafely = (event: ProviderIntentEvent) =>
+    processDomainEvent(event).pipe(
+      Effect.catchCause((cause) => {
+        if (Cause.hasInterruptsOnly(cause)) {
+          return Effect.failCause(cause);
+        }
+        return Effect.logWarning("provider command reactor failed to process event", {
+          eventType: event.type,
+          cause: Cause.pretty(cause),
+        });
+      }),
+    );
   const start: ProviderCommandReactorShape["start"] = Effect.gen(function* () {
     const queue = yield* Queue.unbounded<ProviderIntentEvent>();
     yield* Effect.addFinalizer(() => Queue.shutdown(queue).pipe(Effect.asVoid));
     yield* Effect.forkScoped(
-      Effect.forever(Queue.take(queue).pipe(Effect.flatMap(processDomainEvent))),
+      Effect.forever(Queue.take(queue).pipe(Effect.flatMap(processDomainEventSafely))),
     );
     yield* Effect.forkScoped(