orkestrator 2.22.3 → 2.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orkestrator",
-  "version": "2.22.3",
+  "version": "2.23.0",
   "description": "Run the Orkestrator backend service without the desktop application",
   "homepage": "https://orkestrator.dev",
   "repository": {
@@ -39,8 +39,8 @@
     "sharp": "0.35.5"
   },
   "devDependencies": {
-    "@orkestrator/protocol": "2.22.3",
-    "@orkestrator/toolchain": "2.22.3"
+    "@orkestrator/protocol": "2.23.0",
+    "@orkestrator/toolchain": "2.23.0"
   },
   "engines": {
     "bun": ">=1.4.3"

package/resources/claude-bridge/dist/index.js

@@ -2377,6 +2377,7 @@ var DEBUG_EVENTS = new Set([
   "[session-manager] Prompt completed",
   "[session-manager] Query completed successfully",
   "[session-manager] Query result",
+  "[session-manager] Query stopped by the user",
   "[session-manager] Question not found for requestId:",
   "[session-manager] Re-prompting after approved-plan ExitPlanMode failure",
   "[session-manager] Re-prompting with plan rejection feedback",
@@ -2535,6 +2536,19 @@ function claudeCommandChangesDir() {
 }
 
 // ../../bridges/claude-bridge/src/services/session-preferences.ts
+function parseTurnInFlightMark(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return;
+  const record = value;
+  if (typeof record.bridgeInstanceId !== "string" || record.bridgeInstanceId.length === 0 || record.bridgeInstanceId.length > 64 || typeof record.pid !== "number" || !Number.isSafeInteger(record.pid) || record.pid <= 0 || typeof record.startedAt !== "number" || !Number.isFinite(record.startedAt)) {
+    return;
+  }
+  return {
+    bridgeInstanceId: record.bridgeInstanceId,
+    pid: record.pid,
+    startedAt: record.startedAt
+  };
+}
 var MAX_SHELL_TASK_DETAILS = 256;
 function parseShellTaskDetails(value) {
   if (!value || typeof value !== "object")
@@ -2782,6 +2796,9 @@ function parsePreferences(raw) {
   if (Array.isArray(record.shellTaskDetails)) {
     preferences.shellTaskDetails = record.shellTaskDetails.slice(-MAX_SHELL_TASK_DETAILS).map(parseShellTaskDetails).filter((entry) => entry !== undefined);
   }
+  const turnInFlight = parseTurnInFlightMark(record.turnInFlight);
+  if (turnInFlight)
+    preferences.turnInFlight = turnInFlight;
   return preferences;
 }
 function parseSteerJournalEntry(value) {
@@ -6620,6 +6637,64 @@ function normalizePersistedSessionMessages(persisted) {
   return { messages, taskRegistry, backgroundTasks };
 }
 
+// ../../bridges/claude-bridge/src/services/session-manager-turn-interruption.ts
+import { randomUUID } from "node:crypto";
+var CLAUDE_RESTARTED_MID_TURN_MESSAGE = "Claude restarted before this turn finished, so its work stopped partway. Send a message to continue.";
+var BRIDGE_INSTANCE_ID = randomUUID();
+function claudeProcessKilledMessage(signal) {
+  return `Claude Code was stopped (${signal}) before this turn finished, so its work stopped partway. Send a message to continue.`;
+}
+function killedClaudeProcessSignal(error) {
+  if (!error || typeof error !== "object")
+    return;
+  const record = error;
+  if (record.errorClass !== "process_killed_by_signal")
+    return;
+  return typeof record.signal === "string" && /^SIG[A-Z0-9]{1,8}$/.test(record.signal) ? record.signal : "a signal";
+}
+function turnInFlight(session) {
+  return session.status === "running" || (session.retainedContinuationRequestIds?.size ?? 0) > 0 || session.status === "error" && session.interruption === "restart";
+}
+function syncTurnInFlightMark(session, options = {}) {
+  if (session.deleting)
+    return;
+  writeTurnInFlightMark(session, options.stopped !== true && turnInFlight(session), options.started);
+}
+function clearTurnInFlightMarkForClose(session) {
+  writeTurnInFlightMark(session, false);
+}
+function writeTurnInFlightMark(session, wanted, claim = false) {
+  if (wanted === (session.turnInFlightMarked === true) && !(wanted && claim && !session.turnInFlightMarkOwned))
+    return;
+  const sdkSessionId = session.sdkSessionId ?? sdkSessionIdFromBridgeId(session.id);
+  if (!sdkSessionId)
+    return;
+  session.turnInFlightMarked = wanted;
+  session.turnInFlightMarkOwned = wanted;
+  const update = {
+    turnInFlight: wanted ? { bridgeInstanceId: BRIDGE_INSTANCE_ID, pid: process.pid, startedAt: Date.now() } : undefined
+  };
+  updateSessionPreferences(sdkSessionId, update).catch((error) => {
+    debugLog("[session-manager] Failed to record the turn-in-flight mark:", error instanceof Error ? error.message : String(error));
+  });
+}
+function restoredTurnInterruption(preferences) {
+  const mark = preferences?.turnInFlight;
+  if (!mark)
+    return { status: "idle" };
+  if (mark.bridgeInstanceId === BRIDGE_INSTANCE_ID) {
+    return { status: "idle", turnInFlightMarked: true, turnInFlightMarkOwned: true };
+  }
+  if (mark.pid !== process.pid && processIsAlive(mark.pid))
+    return { status: "idle" };
+  return {
+    status: "error",
+    error: CLAUDE_RESTARTED_MID_TURN_MESSAGE,
+    interruption: "restart",
+    turnInFlightMarked: true
+  };
+}
+
 // ../../bridges/claude-bridge/src/services/session-manager-lifecycle.ts
 async function getSessionActivity(sessionId) {
   const session = sessions.get(sessionId);
@@ -6879,6 +6954,7 @@ function abortSession(sessionId) {
     session.activity = undefined;
     session.thinkingTokens = undefined;
     releaseQueryControl(session);
+    syncTurnInFlightMark(session, { stopped: true });
     cleanupPendingInteractions(sessionId);
     appendInterruptedNotice(session, sessionId);
     eventEmitter.emit({
@@ -7539,7 +7615,7 @@ async function readJournal(path, maxEntries) {
 
 // ../protocol/src/node/workspace-change-probe.ts
 import { execFile as execFile3, spawn as spawn2 } from "node:child_process";
-import { randomUUID } from "node:crypto";
+import { randomUUID as randomUUID2 } from "node:crypto";
 import { rmSync } from "node:fs";
 import { copyFile, lstat, mkdtemp, rm as rm3 } from "node:fs/promises";
 import { tmpdir } from "node:os";
@@ -7842,7 +7918,7 @@ class WorkspaceChangeProbe {
       return;
     const { root, indexPath } = repo.location;
     const started = this.now();
-    const tempIndex = join4(this.tempDir, `orkestrator-probe-${randomUUID()}.index`);
+    const tempIndex = join4(this.tempDir, `orkestrator-probe-${randomUUID2()}.index`);
     const objectDirectory = await mkdtemp(join4(this.tempDir, "orkestrator-probe-objects-"));
     temporaryObjectDirectories.add(objectDirectory);
     let retained = false;
@@ -8185,7 +8261,7 @@ async function reconcilePersistedSessions() {
       id,
       title: info.customTitle || info.summary || `Session ${info.sessionId.slice(-6)}`,
       messages: [],
-      status: "idle",
+      ...restoredTurnInterruption(storedPreferences),
       createdAt: new Date(info.createdAt ?? info.lastModified),
       lastActivity: new Date(info.lastModified),
       sdkSessionId: info.sessionId,
@@ -8227,7 +8303,7 @@ async function materializePersistedSessionState(sessionId, sdkId) {
     id: sessionId,
     title: info.customTitle || info.summary || `Session ${sdkId.slice(-6)}`,
     messages: [],
-    status: "idle",
+    ...restoredTurnInterruption(preferences),
     createdAt: new Date(info.createdAt ?? info.lastModified),
     lastActivity: new Date(info.lastModified),
     sdkSessionId: sdkId,
@@ -9876,6 +9952,7 @@ function releaseCompletedTurnToBackgroundTasks(turn, backgroundTasksRunning) {
   if (turn.dispatchRequestId) {
     recordPromptDispatch(sessionId, turn.dispatchRequestId, "already-processed");
   }
+  syncTurnInFlightMark(session);
   eventEmitter.emit({
     type: "session.idle",
     sessionId,
@@ -9896,6 +9973,7 @@ function stopWaitingForContinuation(turn) {
       session.retainedContinuationRequestIds = undefined;
     }
   }
+  syncTurnInFlightMark(session);
 }
 function waitForContinuationAfterNotification(turn) {
   const { session } = turn;
@@ -9905,6 +9983,7 @@ function waitForContinuationAfterNotification(turn) {
   if (turn.dispatchRequestId) {
     (session.retainedContinuationRequestIds ??= new Set).add(turn.dispatchRequestId);
   }
+  syncTurnInFlightMark(session);
   if (turn.runtime?.idleTimer)
     armClaudeRuntimeIdleDetach(turn.runtime);
 }
@@ -9996,6 +10075,7 @@ function captureTurnStartup(session) {
     turnStartedAt: session.turnStartedAt,
     abortController: session.abortController,
     error: session.error,
+    interruption: session.interruption,
     lastActivity: session.lastActivity,
     persistedMessagesLoaded: session.persistedMessagesLoaded,
     structuredOutput: session.structuredOutput,
@@ -10164,6 +10244,7 @@ async function applyPromptPlanMode(admission, planMode) {
       session.status = beforeStartup.status;
       session.turnStartedAt = beforeStartup.turnStartedAt;
       session.error = beforeStartup.error;
+      session.interruption = beforeStartup.interruption;
       session.lastActivity = beforeStartup.lastActivity;
       session.persistedMessagesLoaded = beforeStartup.persistedMessagesLoaded;
       if (needsTranscriptHydration)
@@ -10183,6 +10264,7 @@ async function applyPromptPlanMode(admission, planMode) {
 function beginPromptActivity(admission) {
   const { session, sessionId } = admission;
   session.error = undefined;
+  session.interruption = undefined;
   session.lastActivity = new Date;
   if (session.promptSuggestion !== undefined) {
     session.promptSuggestion = undefined;
@@ -10468,7 +10550,7 @@ async function getMcpRuntimeConfig(cwd, env = process.env, connection, sources =
 }
 
 // ../../bridges/claude-bridge/src/services/session-manager-commands.ts
-import { randomUUID as randomUUID2 } from "node:crypto";
+import { randomUUID as randomUUID3 } from "node:crypto";
 
 // ../protocol/src/agent-command-catalogue.ts
 var NATIVE_AGENT_COMMAND_CATALOGUE_VERSION = 1;
@@ -11355,9 +11437,11 @@ async function configureClaudeSession(session, input) {
   }
 }
 async function gracefulInterruptClaudeSession(sessionId) {
-  const control = sessions.get(sessionId)?.queryControl;
-  if (!control?.interrupt)
+  const session = sessions.get(sessionId);
+  const control = session?.queryControl;
+  if (!session || !control?.interrupt)
     return { interrupted: false, stillQueued: [] };
+  session.interruptRequestedGeneration = session.latestTurnGeneration;
   try {
     const receipt = await control.interrupt();
     return { interrupted: true, stillQueued: receipt?.still_queued ?? [] };
@@ -11368,7 +11452,7 @@ async function gracefulInterruptClaudeSession(sessionId) {
 }
 
 // ../../bridges/claude-bridge/src/services/session-manager-commands.ts
-var CATALOGUE_GENERATION = randomUUID2();
+var CATALOGUE_GENERATION = randomUUID3();
 var COMMAND_PROBE_TIMEOUT_MS = 30000;
 var MAX_LOCAL_COMMAND_OUTPUT_BYTES = 64 * 1024;
 var MAX_MESSAGE_BYTES = 512;
@@ -11980,7 +12064,7 @@ function createStaleMcpServerHook(mcp) {
       hookSpecificOutput: {
         hookEventName: "PreToolUse",
         permissionDecision: "deny",
-        permissionDecisionReason: `The MCP server "${server}" was removed from this session's configuration, so ${input.tool_name} is not available. Claude is still running background work in this session; the server unloads when that work finishes or the session is stopped.`
+        permissionDecisionReason: `The MCP server "${server}" was removed from this session's configuration, so ${input.tool_name} is not available. This Claude process loaded it at launch and cannot unload it; it is gone once the process closes after an idle period, or when the session is stopped.`
       }
     };
   };
@@ -13600,6 +13684,10 @@ function claudeStartupFailureMessage(reason) {
       return "Anthropic refused your organization's required Claude settings for this sign-in. Sign in to Claude again; if that does not help, ask an administrator to allow Claude Code for this account.";
   }
 }
+var STOPPED_TERMINAL_REASONS = new Set([
+  "aborted_streaming",
+  "aborted_tools"
+]);
 async function handleResultMessage(turn, message) {
   const { session, sessionId, stream } = turn;
   const resultMsg = message;
@@ -13642,6 +13730,9 @@ async function handleResultMessage(turn, message) {
   turn.diagnostics?.terminalSettled("resolved");
   turn.receivedResult = true;
   turn.receivedPromptResult = true;
+  const interruptRequested = session.interruptRequestedGeneration === turn.turnGeneration;
+  if (interruptRequested)
+    session.interruptRequestedGeneration = undefined;
   debugLog("[session-manager] Query result", {
     sessionId,
     subtype: resultMsg.subtype,
@@ -13716,6 +13807,9 @@ async function handleResultMessage(turn, message) {
     }
     debugLog("[session-manager] Query completed successfully", { sessionId });
     finishTurnInputIfSettled(turn);
+  } else if (!turn.options?.outputSchema && STOPPED_TERMINAL_REASONS.has(resultMsg.terminal_reason ?? "") && interruptRequested) {
+    debugLog("[session-manager] Query stopped by the user", { sessionId });
+    finishTurnInputIfSettled(turn);
   } else {
     console.error("[session-manager] Query error:", resultMsg.subtype, {
       sessionId,
@@ -14552,9 +14646,24 @@ function endClaudeRuntime(runtime, failure) {
   disarmClaudeRuntimeIdleDetach(runtime);
   runtime.input.close();
   const { session, control } = runtime;
+  const killedBy = session.claudeRuntime === runtime && !runtime.abortController.signal.aborted ? killedClaudeProcessSignal(failure?.error) : undefined;
   if (session.claudeRuntime === runtime)
     session.claudeRuntime = undefined;
   const orphanedForeground = !runtime.waitingTurns.has(runtime.latestTurn) && session.queryControl === control && session.status === "running";
+  const interruptedOutsidePrompt = killedBy && (orphanedForeground || session.abortController === undefined) && (session.status === "running" || (session.retainedContinuationRequestIds?.size ?? 0) > 0 || claudeRuntimeOwesWork(runtime));
+  if (interruptedOutsidePrompt) {
+    session.status = "error";
+    session.error = claudeProcessKilledMessage(killedBy);
+    session.interruption = "restart";
+    session.turnStartedAt = undefined;
+    session.abortController = undefined;
+    session.completionBlockedByBackgroundTasks = false;
+    eventEmitter.emit({
+      type: "session.error",
+      sessionId: session.id,
+      data: { error: session.error }
+    });
+  }
   removeBackgroundTaskCandidatesOwnedBy(session, control);
   forgetSettlingBackgroundTasksOwnedBy(session, control);
   const settled = settleTasksOwnedByClosedControl(session, control, "The Claude session that owned this task ended before it reported a result");
@@ -14571,8 +14680,9 @@ function endClaudeRuntime(runtime, failure) {
   for (const turn of turns) {
     turn.runtimeEnded(turn === failedTurn && failure ? { error: failure.error } : undefined);
   }
-  if (orphanedForeground)
+  if (orphanedForeground && !interruptedOutsidePrompt)
     releaseOrphanedForeground(runtime, failure?.error);
+  syncTurnInFlightMark(session);
 }
 function releaseOrphanedForeground(runtime, error) {
   const { session } = runtime;
@@ -14697,6 +14807,7 @@ function markQueryStarted(turn, testHooks) {
   }, { once: true });
   session.finishTurnInputIfSettled = turn.finishTurnInputForThisTurn;
   turn.queryStarted = true;
+  syncTurnInFlightMark(session, { started: true });
   testHooks?.onQueryStarted?.();
   readLiveCommandInventory(session, control);
   reportUltracodeRuntime(session, control);
@@ -14842,6 +14953,7 @@ function settleFailedTurn(turn, error) {
     session.turnStartedAt = turn.beforeStartup.turnStartedAt;
     session.abortController = turn.beforeStartup.abortController;
     session.error = turn.beforeStartup.error;
+    session.interruption = turn.beforeStartup.interruption;
     session.inProgressUsage = turn.beforeStartup.inProgressUsage;
     session.inProgressUsageGeneration = turn.beforeStartup.inProgressUsageGeneration;
     const index = session.messages.indexOf(userMessage);
@@ -14859,12 +14971,17 @@ function settleFailedTurn(turn, error) {
     errorClass: diagnosticErrorClass(error)
   });
   if (session.abortController === abortController) {
+    const killedBy = killedClaudeProcessSignal(error);
+    const failure = killedBy ? claudeProcessKilledMessage(killedBy) : error instanceof Error ? error.message : String(error);
     if (options?.outputSchema && structuredRequestId && !session.structuredOutput) {
-      recordStructuredOutput(session, structuredOutputFailure("claude", "provider_error", error instanceof Error ? error.message : String(error), { requestId: structuredRequestId }));
+      recordStructuredOutput(session, structuredOutputFailure("claude", "provider_error", failure, {
+        requestId: structuredRequestId
+      }));
     }
     session.status = "error";
     session.turnStartedAt = undefined;
-    session.error = error instanceof Error ? error.message : String(error);
+    session.error = failure;
+    session.interruption = killedBy ? "restart" : undefined;
     session.abortController = undefined;
     session.completionBlockedByBackgroundTasks = false;
     cleanupPendingInteractions(sessionId);
@@ -14904,6 +15021,9 @@ function finalizeTurn(turn) {
     diagnostics
   } = turn;
   turn.queryEnded = true;
+  if (session.interruptRequestedGeneration === turnGeneration) {
+    session.interruptRequestedGeneration = undefined;
+  }
   diagnostics?.close();
   flushDebugLogs();
   abortController.signal.removeEventListener("abort", turn.observeAbort);
@@ -14952,6 +15072,8 @@ function finalizeTurn(turn) {
   }
   reconcileIdleClaudeRuntime(session);
   stream.clearFlushTimer();
+  if (sessions.get(sessionId) === session)
+    syncTurnInFlightMark(session);
 }
 
 // ../../bridges/claude-bridge/src/services/session-manager-prompt.ts
@@ -15032,6 +15154,7 @@ function closeSessionRetainingHistory(sessionId, options = {}) {
       throw new SessionCloseNotConfirmedError("A racing prompt dispatch did not settle");
     }
     forgetPromptDispatchesForSession(sessionId);
+    clearTurnInFlightMarkForClose(session);
     if (sessions.get(sessionId) === session)
       sessions.delete(sessionId);
     return "closed";
@@ -15094,7 +15217,7 @@ config.get("/models", async (c) => {
 var config_default = config;
 
 // ../../bridges/claude-bridge/src/routes/session.ts
-import { randomUUID as randomUUID3 } from "node:crypto";
+import { randomUUID as randomUUID4 } from "node:crypto";
 
 // ../../node_modules/.bun/hono@4.13.13/node_modules/hono/dist/middleware/body-limit/index.js
 var ERROR_MESSAGE = "Payload Too Large";
@@ -16040,7 +16163,7 @@ function registerSessionTranscriptRoutes(app, generation) {
 
 // ../../bridges/claude-bridge/src/routes/session.ts
 var session = new Hono2;
-var TRANSCRIPT_GENERATION = randomUUID3();
+var TRANSCRIPT_GENERATION = randomUUID4();
 var MAX_IMAGE_ATTACHMENT_BYTES2 = 8 * 1024 * 1024;
 var MAX_QUESTION_ANSWER_REQUEST_BYTES = AGENT_INTERACTION_LIMITS.maxSerializedPayloadBytes + 1024;
 var MAX_CLAUDE_TRANSCRIPT_RESPONSE_BYTES = 16 * 1024 * 1024;
@@ -16182,6 +16305,7 @@ session.get("/:id", async (c) => {
     createdAt: sessionData.createdAt.toISOString(),
     lastActivity: sessionData.lastActivity.toISOString(),
     error: sessionData.error,
+    ...sessionData.status === "error" && sessionData.interruption ? { interruption: sessionData.interruption } : {},
     structuredOutputRequestId: sessionData.structuredOutputRequestId,
     structuredOutput: sessionData.structuredOutput,
     contextUsage: sessionData.inProgressUsage ?? sessionData.usage,