@skaile/workspaces 1.15.0 → 1.15.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.15.1
+
+### Patch Changes
+
+- [#449](https://github.com/skaile-ai/workspaces/pull/449) [`1f50da7`](https://github.com/skaile-ai/workspaces/commit/1f50da7ada57f19801162b86f23161dafa54f275) Thanks [@peteralbert](https://github.com/peteralbert)! - Serialize concurrent Claude SDK prompts so each logical turn completes before the next begins.
+
 ## 1.15.0
 
 ### Minor Changes

package/dist/bridge/drivers/claude-sdk.js

@@ -2,7 +2,7 @@ import { SUPPORTED_CLOUDS, buildClaudeCloudEnv } from '../../chunk-ISQWMBKD.js';
 import { dispatchCapability } from '../../chunk-RRVQAE5D.js';
 import { fetchProviderModels } from '../../chunk-BMQKMOQY.js';
 import { AuthError, classifyClaudeSdkError, reclassifyAuthAsAccountUnavailable, AccountUnavailableError } from '../../chunk-GAH4YRCI.js';
-import { BUILTIN_DRIVER_CATALOG, AgentDriver, getBridgeLogger } from '../../chunk-LTQOZIJO.js';
+import { BUILTIN_DRIVER_CATALOG, AgentDriver, getBridgeLogger } from '../../chunk-ACWCVB5Q.js';
 import '../../chunk-6E6PKKAD.js';
 import '../../chunk-JB35MVBN.js';
 import '../../chunk-NSBPE2FW.js';
@@ -348,11 +348,10 @@ var ClaudeSdkDriver = class extends AgentDriver {
   /** Rejects when the current turn errors. */
   turnReject = null;
   /**
-   * The in-flight turn's promise, awaited when a new prompt supersedes a pending question.
-   * Deliberately outlives {@link completeTurn} / {@link failTurn} — only {@link prompt}'s
-   * `finally` clears it, and not on a retry recursion. Nulling it earlier reopens #436.
+   * Settled tail for complete logical prompts. Rejections are swallowed only on
+   * the tail so one failed turn cannot wedge later callers.
    */
-  turnPromise = null;
+  promptTail = Promise.resolve();
   /** Guards against duplicate agent_end emissions per turn. */
   turnCompleted = false;
   /** `Date.now()` of the most recent SDK message — the watchdog's liveness signal. */
@@ -365,7 +364,7 @@ var ClaudeSdkDriver = class extends AgentDriver {
    * been spent. Read by {@link failTurn} to decide whether to defer the
    * `agent-event: error` emission for a self-healable auth error.
    *
-   * Set unconditionally at the top of every {@link prompt} invocation; never
+   * Set unconditionally at the top of every {@link runPrompt} attempt; never
    * reset elsewhere — the next call's set is the only legitimate transition.
    */
   authSelfHealUsed = false;
@@ -459,16 +458,23 @@ var ClaudeSdkDriver = class extends AgentDriver {
    * "No conversation found with session ID …" — a recoverable stale-resume error that
    * occurs after a container crash that prevented the SDK from flushing its session file.
    */
-  async prompt(message, _budget = freshRetryBudget()) {
+  prompt(message) {
+    this.denyPendingQuestion("superseded by a new prompt");
+    const queuedPrompt = this.promptTail.then(() => this.runPrompt(message, freshRetryBudget()));
+    this.promptTail = queuedPrompt.then(
+      () => void 0,
+      () => void 0
+    );
+    return queuedPrompt;
+  }
+  /**
+   * Runs one complete logical prompt inside its acquired FIFO slot.
+   *
+   * Retries recurse here rather than through {@link prompt}, so they cannot
+   * enqueue behind themselves and deadlock.
+   */
+  async runPrompt(message, _budget) {
     if (!this.sdk) await this.start();
-    if (this.pendingQuestion) {
-      this.denyPendingQuestion("superseded by a new prompt");
-      let awaited = null;
-      while (this.turnPromise && this.turnPromise !== awaited) {
-        awaited = this.turnPromise;
-        await awaited.catch(() => void 0);
-      }
-    }
     this.authSelfHealUsed = _budget.auth;
     let retrying = false;
     const isFirstAttempt = !_budget.staleResume && !_budget.poison && !_budget.auth;
@@ -482,7 +488,6 @@ var ClaudeSdkDriver = class extends AgentDriver {
       this.turnResolve = resolve;
       this.turnReject = reject;
     });
-    this.turnPromise = turnPromise;
     try {
       if (this.query) {
         const userMsg = this.buildUserMessage(message);
@@ -493,7 +498,6 @@ var ClaudeSdkDriver = class extends AgentDriver {
     } catch (err) {
       this.turnResolve = null;
       this.turnReject = null;
-      this.turnPromise = null;
       this.running = false;
       throw err;
     }
@@ -506,21 +510,21 @@ var ClaudeSdkDriver = class extends AgentDriver {
       if (isStaleResume) {
         this.prepareStaleResumeRetry();
         retrying = true;
-        return this.prompt(message, { ..._budget, staleResume: true });
+        return this.runPrompt(message, { ..._budget, staleResume: true });
       }
       const isPoisonedHistory = !_budget.poison && /invalid_request_error/i.test(errMsg) && /media[_ ]?type|could not process image|image exceeds|cache_control/i.test(errMsg);
       const poisonSessionId = this.config.resumeSessionId || this.sessionId;
       if (isPoisonedHistory && poisonSessionId) {
         if (this.attemptPoisonScrubRetry(poisonSessionId)) {
           retrying = true;
-          return this.prompt(message, { ..._budget, poison: true });
+          return this.runPrompt(message, { ..._budget, poison: true });
         }
       }
       const isAuthError = err instanceof AuthError && !_budget.auth;
       if (isAuthError && this.config.onAuthError) {
         if (await this.attemptAuthSelfHeal(err)) {
           retrying = true;
-          return this.prompt(message, { ..._budget, auth: true });
+          return this.runPrompt(message, { ..._budget, auth: true });
         }
       }
       throw err;
@@ -529,7 +533,6 @@ var ClaudeSdkDriver = class extends AgentDriver {
         this.disarmTurnStallWatchdog();
         this.turnResolve = null;
         this.turnReject = null;
-        this.turnPromise = null;
         this.running = false;
       }
     }
@@ -1494,20 +1497,22 @@ var ClaudeSdkDriver = class extends AgentDriver {
    */
   async abort() {
     this.denyPendingQuestion("turn aborted before the question was answered");
-    if (this.query) {
+    const abortedQuery = this.query;
+    const abortedController = this.abortController;
+    if (abortedQuery) {
       try {
-        await this.query.interrupt();
+        await abortedQuery.interrupt();
       } catch {
       }
     }
-    this.abortController?.abort();
+    abortedController?.abort();
     const deadline = Date.now() + ABORT_GRACE_MS;
-    while (this.query && Date.now() < deadline) {
+    while (abortedQuery && this.query === abortedQuery && Date.now() < deadline) {
       await new Promise((resolve) => {
         setTimeout(resolve, 100).unref?.();
       });
     }
-    if (this.query) {
+    if (abortedQuery && this.query === abortedQuery) {
       this.log.warn("query did not unwind after abort; forcing teardown");
       this.hardResetQuery();
       this.completeTurn();