@skaile/workspaces 5.13.0 → 5.15.0

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

@@ -1,28 +1,29 @@
 import { formatDroppedToolsNotice, filterInProcessMcpServerTools, checkToolPropertyKeys } from '../../chunk-X5O56UO4.js';
 import { freshBudget, isFirstAttempt, spend, isSpent, decide, isAvailable } from '../../chunk-IZCR27MU.js';
 import { AskSlots } from '../../chunk-EPBKISS5.js';
-import { scrubPoisonedTranscript, transcriptStoreForRuntime, resolveClaudeConfigDir, claudeEndpointMode, buildClaudeEndpointEnv } from '../../chunk-YTZFSKWL.js';
-import { dispatchCapability } from '../../chunk-2H73V6XR.js';
-import { fetchProviderModels } from '../../chunk-B7CZYFB2.js';
+import { scrubPoisonedTranscript, transcriptStoreForRuntime, resolveClaudeConfigDir, claudeEndpointMode, buildClaudeEndpointEnv } from '../../chunk-TCWECSEB.js';
+import { dispatchCapability } from '../../chunk-PW3TYWOI.js';
+import { fetchProviderModels } from '../../chunk-GLMKS6V6.js';
 import { ReconfigureLedger, AuthError, stripRunnerPrivateEnv, classifyClaudeSdkError, reclassifyAuthAsAccountUnavailable, AccountUnavailableError, isLongContextEntitlementRejection, LONG_CONTEXT_CREDITS_API_ERROR } from '../../chunk-B4X2N7JQ.js';
 import { agentExecRequested, wrapAgentCommand, resolveAgentExec } from '../../chunk-YROR332M.js';
-import { BUILTIN_DRIVER_CATALOG, AgentDriver, getBridgeLogger, entryCredentialValue, registryDriverConfig } from '../../chunk-BVJU2GKE.js';
+import { AgentDriver, getBridgeLogger, registryDriverConfig } from '../../chunk-4AKR4XPQ.js';
+import { BUILTIN_DRIVER_CATALOG, entryCredentialValue } from '../../chunk-GQ5OYFVD.js';
 import '../../chunk-6E6PKKAD.js';
-import { withActivityLabelShape } from '../../chunk-F4NJDSR7.js';
-import '../../chunk-57SF6W6E.js';
-import { installCommandFor } from '../../chunk-BF422IDP.js';
+import { withActivityLabelShape } from '../../chunk-D5WTOVLG.js';
+import '../../chunk-MGM5EJQQ.js';
+import { loadDriverSdk } from '../../chunk-4QINFQ27.js';
 import '../../chunk-4GY63JU6.js';
-import '../../chunk-QO7CR3KB.js';
+import '../../chunk-X7DIT65W.js';
 import '../../chunk-D54T2F54.js';
 import '../../chunk-5BEFNLOR.js';
 import '../../chunk-A2ULN3KX.js';
-import '../../chunk-L3ZGYSWY.js';
+import '../../chunk-J76LDUDS.js';
 import '../../chunk-L5VSIPQD.js';
 import '../../chunk-IG5LZ3WU.js';
-import '../../chunk-IY5E7Y5W.js';
+import '../../chunk-ANSZULXH.js';
 import '../../chunk-RVRB27AN.js';
-import '../../chunk-M3P4BYRK.js';
-import '../../chunk-J4OYIYFQ.js';
+import '../../chunk-SP5NGNBV.js';
+import '../../chunk-VY6NTFE7.js';
 import '../../chunk-ICSCSM5D.js';
 import '../../chunk-DKXNKFKP.js';
 import { mergeRegistries, parseModelRef, isEntryEnabled, resolveEntryBaseUrl } from '../../chunk-MJHSLODD.js';
@@ -164,6 +165,120 @@ function sumBucket(items) {
   return { tokens: sumTokens(items), items };
 }
 
+// bridge/src/drivers/claude-self-turns.ts
+var MAX_TRACKED_TASKS = 64;
+var SelfTurnTracker = class {
+  constructor(emit) {
+    this.emit = emit;
+  }
+  emit;
+  active = false;
+  /** A prompt was pushed while the self-started turn ran; the CLI answers it inside that turn. */
+  joined = false;
+  /** Tasks the CLI reported settled since the last turn ended, oldest first. */
+  settled = /* @__PURE__ */ new Set();
+  /** Tasks registered in the foreground: reported only if they move to the background. */
+  foreground = /* @__PURE__ */ new Set();
+  /** Whether the turn running now is one the driver did not prompt. */
+  get selfTurnActive() {
+    return this.active;
+  }
+  /**
+   * Feed every SDK message before the driver handles it, so a self-started
+   * turn is announced ahead of its first output. `promptedTurnInFlight` is true
+   * while a turn the driver dispatched holds the CLI.
+   */
+  observe(msg, promptedTurnInFlight) {
+    const inTurn = promptedTurnInFlight || this.active;
+    if (msg.type === "system") {
+      this.observeTask(msg, inTurn);
+      return;
+    }
+    if (msg.type !== "assistant" && msg.type !== "stream_event" && msg.type !== "user") return;
+    if (msg.parent_tool_use_id) return;
+    if (inTurn) return;
+    this.active = true;
+    const taskIds = [...this.settled];
+    this.settled.clear();
+    this.emit({ type: "self_turn_started", taskIds });
+  }
+  /**
+   * Whether the running turn's terminal events should carry `selfStarted`. Not
+   * once a prompt joined it: that turn's result then answers the prompt too.
+   */
+  get stampsTerminal() {
+    return this.active && !this.joined;
+  }
+  /**
+   * The driver pushed a prompt into the live CLI. During a self-started turn the
+   * CLI folds it into that turn, whose result then ends the prompted turn too.
+   */
+  onPromptPushed() {
+    if (this.active) this.joined = true;
+  }
+  /** The running turn's `result` was handled. */
+  onResult() {
+    if (!this.active) return;
+    this.active = false;
+    this.joined = false;
+    this.settled.clear();
+  }
+  /**
+   * A prompted turn ended. A task that settled while it ran was handed to that
+   * turn, or wakes a later one that cannot be tied to it: forget it either way.
+   */
+  onPromptedTurnEnd() {
+    this.settled.clear();
+  }
+  /** The CLI process is gone: its tasks will never report again. */
+  reset() {
+    this.active = false;
+    this.joined = false;
+    this.settled.clear();
+    this.foreground.clear();
+  }
+  observeTask(msg, inTurn) {
+    const taskId = msg.task_id;
+    if (typeof taskId !== "string" || taskId.length === 0) return;
+    const ambient = msg.ambient === true || msg.skip_transcript === true;
+    if (msg.subtype === "task_started") {
+      if (ambient) return;
+      if (msg.is_backgrounded === false) {
+        remember(this.foreground, taskId);
+        return;
+      }
+      this.reportStarted(taskId, inTurn);
+      return;
+    }
+    if (msg.subtype === "task_updated") {
+      if (!this.foreground.has(taskId)) return;
+      if (msg.patch?.is_backgrounded === true) {
+        this.foreground.delete(taskId);
+        this.reportStarted(taskId, inTurn);
+      } else if (msg.patch?.status && msg.patch.status !== "running" && msg.patch.status !== "pending") {
+        this.foreground.delete(taskId);
+      }
+      return;
+    }
+    if (msg.subtype === "task_notification") {
+      this.foreground.delete(taskId);
+      if (!ambient) remember(this.settled, taskId);
+    }
+  }
+  reportStarted(taskId, inTurn) {
+    if (!inTurn) return;
+    this.emit({ type: "background_task_started", taskId });
+  }
+};
+function remember(set, taskId) {
+  set.delete(taskId);
+  set.add(taskId);
+  if (set.size > MAX_TRACKED_TASKS) {
+    const oldest = set.values().next().value;
+    if (oldest !== void 0) set.delete(oldest);
+  }
+}
+
 // bridge/src/drivers/claude-tool-allowlist.ts
 var CAPABILITY_MCP_SERVER = "skaile-capabilities";
 var CLAUDE_CODE_BUILTIN_TOOLS = /* @__PURE__ */ new Set([
@@ -659,6 +774,16 @@ var ClaudeSdkDriver = class extends AgentDriver {
   subagentToolAllowlists = /* @__PURE__ */ new Map();
   /** Guards against duplicate agent_end emissions per turn. */
   turnCompleted = false;
+  /** Announces the turns the CLI starts by itself and the background tasks they continue. */
+  selfTurns = new SelfTurnTracker((event) => {
+    try {
+      this.emit("agent-event", event);
+    } catch (emitErr) {
+      this.log.warn("agent-event listener threw on a turn-origin event; suppressing", {
+        error: emitErr instanceof Error ? emitErr.message : String(emitErr)
+      });
+    }
+  });
   /** Set by {@link kill}: no turn may start or replay on this driver again. */
   killed = false;
   /** `Date.now()` of the most recent SDK message — the watchdog's liveness signal. */
@@ -920,17 +1045,13 @@ var ClaudeSdkDriver = class extends AgentDriver {
    *   the package manager's add command for `@anthropic-ai/claude-agent-sdk`.
    */
   async start() {
-    try {
-      this.sdk = await import('@anthropic-ai/claude-agent-sdk');
-      this.log.info("Claude Agent SDK loaded");
-    } catch {
-      throw new Error(
-        `Claude Agent SDK not installed. Run: ${installCommandFor(
-          "@anthropic-ai/claude-agent-sdk",
-          this.config.cwd
-        )}`
-      );
-    }
+    this.sdk = await loadDriverSdk(
+      "@anthropic-ai/claude-agent-sdk",
+      this.config.cwd,
+      () => import('@anthropic-ai/claude-agent-sdk'),
+      "Claude Agent SDK"
+    );
+    this.log.info("Claude Agent SDK loaded");
   }
   /**
    * Sends a user message to the Claude Agent SDK and resolves when the turn completes.
@@ -1037,6 +1158,7 @@ var ClaudeSdkDriver = class extends AgentDriver {
     try {
       if (this.query && this.inputStream) {
         this.inputStream.push(this.buildUserMessage(message));
+        this.selfTurns.onPromptPushed();
       } else {
         await this.startQuery(message);
       }
@@ -1320,6 +1442,7 @@ var ClaudeSdkDriver = class extends AgentDriver {
       }
       this.query = null;
     }
+    this.selfTurns.reset();
     this.abortController?.abort();
   }
   /**
@@ -2064,7 +2187,11 @@ var ClaudeSdkDriver = class extends AgentDriver {
     if (tools.length === 0) return { server: null, dropped };
     let sdk;
     try {
-      sdk = await import('@anthropic-ai/claude-agent-sdk');
+      sdk = await loadDriverSdk(
+        "@anthropic-ai/claude-agent-sdk",
+        this.config.cwd,
+        () => import('@anthropic-ai/claude-agent-sdk')
+      );
     } catch {
       this.log.warn("claude-agent-sdk unavailable; cannot build capability MCP server");
       return { server: null, dropped };
@@ -2169,6 +2296,7 @@ var ClaudeSdkDriver = class extends AgentDriver {
       this.log.debug("query generator ended");
       if (this.query === servedQuery) {
         this.query = null;
+        this.selfTurns.reset();
         this.endInputStream();
         const neverDispatched = !this.turnCompleted && this.turnReject != null && !this.firstSdkMessageSeen && !this.abortController?.signal.aborted;
         if (neverDispatched) {
@@ -2242,6 +2370,7 @@ var ClaudeSdkDriver = class extends AgentDriver {
   completeTurn() {
     if (this.turnCompleted) return;
     this.turnCompleted = true;
+    this.selfTurns.onPromptedTurnEnd();
     this.disarmTurnStallWatchdog();
     this.disarmErrorResultGrace();
     if (this.turnResolve) {
@@ -2321,6 +2450,7 @@ var ClaudeSdkDriver = class extends AgentDriver {
     this.disarmTurnStallWatchdog();
     this.disarmErrorResultGrace();
     const hadPendingTurn = this.turnReject != null;
+    if (hadPendingTurn) this.selfTurns.onPromptedTurnEnd();
     if (this.turnReject) {
       this.turnReject(err);
       this.turnResolve = null;
@@ -2330,7 +2460,8 @@ var ClaudeSdkDriver = class extends AgentDriver {
     const event = {
       type: "error",
       error: err.message,
-      ...detail ? { detail } : {}
+      ...detail ? { detail } : {},
+      ...!hadPendingTurn && this.selfTurns.stampsTerminal ? { selfStarted: true } : {}
     };
     if (hadPendingTurn) {
       const decision = decided ?? this.decideRecovery(err);
@@ -2415,6 +2546,7 @@ var ClaudeSdkDriver = class extends AgentDriver {
   // Message handling
   // ---------------------------------------------------------------------------
   handleSdkMessage(msg) {
+    this.selfTurns.observe(msg, this.turnReject != null);
     if (this.handleRateLimitEvent(msg)) return;
     if (msg.type === "assistant") {
       this.handleAssistantMessage(msg);
@@ -2711,6 +2843,7 @@ var ClaudeSdkDriver = class extends AgentDriver {
     } else {
       this.handleErrorResult(msg);
     }
+    this.selfTurns.onResult();
   }
   /**
    * Capture the per-call context size from an assistant message. Its `usage`
@@ -2794,7 +2927,8 @@ var ClaudeSdkDriver = class extends AgentDriver {
         summary: result ?? "Task completed",
         costUsd: this._lastTurnCostUsd,
         ...this._lastTokens ? { tokens: this._lastTokens } : {},
-        ...this.turnUsageFields()
+        ...this.turnUsageFields(),
+        ...this.selfTurns.stampsTerminal ? { selfStarted: true } : {}
       })
     );
   }
@@ -2814,7 +2948,8 @@ var ClaudeSdkDriver = class extends AgentDriver {
       errors,
       ...this._lastCostReported ? { costUsd: this._lastTurnCostUsd } : {},
       ...this._lastTokens ? { tokens: this._lastTokens } : {},
-      ...this.turnUsageFields()
+      ...this.turnUsageFields(),
+      ...this.selfTurns.stampsTerminal ? { selfStarted: true } : {}
     };
     if (this.limitTurnRejectedForFailover) {
       this.heldFailoverResult = resultEvent;