@skaile/workspaces 1.12.1 → 1.12.2

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.12.2
+
+### Patch Changes
+
+- [#422](https://github.com/skaile-ai/workspaces/pull/422) [`47a9896`](https://github.com/skaile-ai/workspaces/commit/47a989633a22c0c090fb7c50c4c3355738f73aca) Thanks [@Frozen666](https://github.com/Frozen666)! - Fix a dropped in-flight prompt when a skill-change driver restart races a live
+  turn. The runner now serializes prompt turns against out-of-band driver swaps via
+  a bidirectional gate: a swap defers to an in-flight turn (so the driver is never
+  killed mid-prompt), and a prompt arriving during a swap binds to the fresh driver.
+  Previously the killed SDK process emitted no completion event and the UI hung on
+  "AI is thinking…" forever.
+
 ## 1.12.1
 
 ### Patch Changes

package/dist/{chunk-ZA465CPE.js → chunk-IO3K4PTB.js}

@@ -2939,6 +2939,70 @@ function cleanupCloudCredentialFiles(projectDir) {
   }
 }
 
+// runner/src/driver-swap-gate.ts
+var DriverSwapGate = class {
+  /** Resolves when the in-flight driver recreate settles (resolve or reject). */
+  activeDriverSwap = null;
+  /** FIFO chain; resolves once every started turn has settled. */
+  turnTail = Promise.resolve();
+  /**
+   * Mark a turn as in flight. Call at the real `driver.prompt()` dispatch — not
+   * earlier — so a same-handler restart (e.g. restaging skills before the turn)
+   * cannot self-deadlock by awaiting the very turn that spawned it. Returns an
+   * idempotent `endTurn`; call it in a `finally` around the dispatch.
+   */
+  beginTurn() {
+    let resolveTurn;
+    const turn = new Promise((resolve4) => {
+      resolveTurn = resolve4;
+    });
+    this.turnTail = this.turnTail.then(() => turn);
+    let ended = false;
+    return () => {
+      if (ended) return;
+      ended = true;
+      resolveTurn();
+    };
+  }
+  /**
+   * Await any in-flight turn before tearing a driver down. Awaits the FIFO tail
+   * (not a single "latest turn" field) so an earlier turn that outlives a later
+   * one still holds the swap off — the tail resolves only once every started
+   * turn has settled. Never throws: a rejected turn is still a settled turn, and
+   * the swap may proceed (the driver is idle either way).
+   */
+  async awaitActiveTurn() {
+    try {
+      await this.turnTail;
+    } catch {
+    }
+  }
+  /**
+   * Register the in-flight recreate promise so concurrent prompts defer to it.
+   * Auto-clears when `recreate` settles (resolve OR reject) so a failed recreate
+   * never blocks prompts forever.
+   */
+  beginSwap(recreate) {
+    this.activeDriverSwap = recreate;
+    const clear = () => {
+      if (this.activeDriverSwap === recreate) this.activeDriverSwap = null;
+    };
+    recreate.then(clear, clear);
+  }
+  /**
+   * Await the in-flight swap before reading the live driver. Re-checks in a loop
+   * so a second swap starting during the wait is also awaited.
+   */
+  async awaitSwap() {
+    while (this.activeDriverSwap) {
+      try {
+        await this.activeDriverSwap;
+      } catch {
+      }
+    }
+  }
+};
+
 // runner/src/compaction/prompt.ts
 var DEFAULT_COMPACTION_PROMPT = `You are being asked to compact this conversation into a structured summary.
 This summary will replace the full conversation history when the session
@@ -4837,6 +4901,7 @@ async function startAgentServer(opts) {
     sendEvent(rewriteFileChangedPath(event, opts.projectDir, mounts));
   }
   let driverStarted = false;
+  const driverSwapGate = new DriverSwapGate();
   let driver = secretsMode === "env" ? agentSession.driver : void 0;
   let secretsProvisioned = secretsMode === "env";
   function swapDriver() {
@@ -5250,6 +5315,20 @@ async function startAgentServer(opts) {
     return { needsWireFallbackRecreate, needsWireAgentConfigRecreate };
   }
   async function recreateAgentSession(overrides) {
+    let markSwapDone;
+    driverSwapGate.beginSwap(
+      new Promise((resolve4) => {
+        markSwapDone = resolve4;
+      })
+    );
+    try {
+      await driverSwapGate.awaitActiveTurn();
+      await recreateAgentSessionInner(overrides);
+    } finally {
+      markSwapDone();
+    }
+  }
+  async function recreateAgentSessionInner(overrides) {
     const disposedManager = agentSession.resourceManager;
     await agentSession.dispose();
     agentSession = await createAgentSession({ ...sessionConfig, ...overrides });
@@ -5582,6 +5661,7 @@ async function startAgentServer(opts) {
       return;
     }
     log(`[serve] prompt: ${cmd.prompt.slice(0, 80)}...`);
+    await driverSwapGate.awaitSwap();
     await restageMaterializedSkills(true);
     const activeFlow = getOnlyActiveFlow();
     if (activeFlow) {
@@ -5631,18 +5711,23 @@ async function startAgentServer(opts) {
       });
     }
     sendEvent({ type: "status", phase: "thinking" });
+    const endTurn = driverSwapGate.beginTurn();
     try {
       await driver.prompt(cmd.prompt);
     } catch (err) {
       const errMsg = err instanceof Error ? err.message : String(err);
       log(`[serve] prompt failed: ${errMsg}`);
       sendEvent({ type: "error", message: `Prompt failed: ${errMsg}`, fatal: true });
+    } finally {
+      endTurn();
     }
   }
   async function handleReply(cmd) {
     if (!await awaitSessionReadyOrFail()) return;
     log(`[serve] reply: ${cmd.answer.slice(0, 80)}...`);
+    await driverSwapGate.awaitSwap();
     if (driver.hasPendingQuestion() && driver.answerQuestion(cmd.answer)) return;
+    const endTurn = driverSwapGate.beginTurn();
     try {
       await driver.prompt(cmd.answer);
     } catch (err) {
@@ -5651,6 +5736,8 @@ async function startAgentServer(opts) {
         message: `Reply failed: ${err instanceof Error ? err.message : String(err)}`,
         fatal: false
       });
+    } finally {
+      endTurn();
     }
   }
   async function handleCancel() {
@@ -6225,5 +6312,5 @@ function touchSession(state) {
 }
 
 export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CapabilityRegistry, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, MarkdownStreamer, PreInitRingSink, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildStoreSnapshotReplay, builtinCapabilities, capabilityLogInstance, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, connectorRefreshKind, createAgentSession, createSessionStimulusBus, defineCapability, deleteSession, dispatchRunnerCapabilityInvocation, emitSystemPromptComposed, ensureGitConfigInclude, extractClaudeAiOauthExpiresAt, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, hasNonTerminalFlow, hostOpResumeStimulus, installPreInitRingSink, isTerminalFlowStatus, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadSession, loadSessionById, mcpAuthSecretKey, newSession, pickRepointedManager, planFlowMutate, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveMixin, runAgentChat, saveSession, setCurrentSession, startAgentServer, stimulusFromMetas, touchSession, writeClaudeCodeCredentialsFile };
-//# sourceMappingURL=chunk-ZA465CPE.js.map
-//# sourceMappingURL=chunk-ZA465CPE.js.map
+//# sourceMappingURL=chunk-IO3K4PTB.js.map
+//# sourceMappingURL=chunk-IO3K4PTB.js.map