@skaile/workspaces 3.24.0 → 3.25.0

package/dist/{chunk-Q3YS5M3E.js → chunk-4YRRPWHY.js}

@@ -1,19 +1,19 @@
 import { buildWorkspaceToolDefs } from './chunk-J4WDQL42.js';
 import { findAiAssetsRoot } from './chunk-7IRJ4K4F.js';
-import { WorkspacePlugin } from './chunk-Y5PKES63.js';
+import { WorkspacePlugin } from './chunk-5PFJVZ7F.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
-import { WebSocketServerTransport } from './chunk-WQ7DE5UC.js';
+import { WebSocketServerTransport } from './chunk-73ZXUUL6.js';
 import { prepareNativePolicy, codexInstanceEnvironment, parseCodexCredential, parseCodexRefreshInput, parseCodexRefreshResult } from './chunk-T3YLZQS4.js';
-import { resolveFlowPath } from './chunk-IDY7A5KA.js';
+import { resolveFlowPath } from './chunk-UEW6C64M.js';
 import { findAiAssetsRoot as findAiAssetsRoot$1, deployCatalogEntry, undeployCatalogEntry } from './chunk-7BUZQVRR.js';
-import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, ConnectorStartupError, buildSdkConnectorTools, buildConnectorToolDefs, buildFlowToolDefs, driveOrchestratorTurn, SessionNodeExecutor, SessionSubpromptRunner, SessionInlineSubFlowRunner, buildSdkFlowTools } from './chunk-Z6YHCANW.js';
+import { registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, ConnectorStartupError, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, driveOrchestratorTurn, SessionNodeExecutor, SessionSubpromptRunner, SessionInlineSubFlowRunner, buildSdkFlowTools } from './chunk-WMZT7VDS.js';
 import { loadConnectorDeclarations, SecretProviderChain, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, isKnownSecretRef, deriveSingleMaterializedConnectorDeclaration } from './chunk-SIREWRZE.js';
-import { EventNormalizer } from './chunk-QBR3WRXB.js';
+import { EventNormalizer } from './chunk-NKPDUYRH.js';
 import { SUPPORTED_CLOUDS, probeResumeTranscript, CLOUD_SECRET_ENV_KEYS } from './chunk-3NCGSSCU.js';
 import { CodexNativeStateUnavailable } from './chunk-LOO5CB5M.js';
 import { dispatchCapability } from './chunk-HTIGD3DR.js';
 import { classifyClaudeSdkError } from './chunk-GAH4YRCI.js';
-import { createDriver } from './chunk-6EJOXLVH.js';
+import { createDriver } from './chunk-X3DODPMF.js';
 import { loadFlow } from './chunk-W5LPG3X6.js';
 import { parseFlowDefinition } from './chunk-CP62G5PK.js';
 import { renderStimulusPrompt } from './chunk-2D5BYAL6.js';
@@ -2349,6 +2349,8 @@ async function createAgentSession(config) {
   const maxTurns = maxTurnsOverride ?? manifest?.runtime?.max_turns;
   let driver;
   try {
+    const extraMcpServers = driverType === "claude-sdk" ? await config.extraInProcessMcpServers?.() : void 0;
+    const driverMcpServers = extraMcpServers ? { ...mcpServers, ...extraMcpServers } : mcpServers;
     driver = await createSessionDriver({
       config,
       driverType,
@@ -2365,7 +2367,7 @@ async function createAgentSession(config) {
       effort,
       sessionId,
       resumeSessionId,
-      mcpServers,
+      mcpServers: driverMcpServers,
       agentDir
     });
   } catch (error) {
@@ -3812,6 +3814,10 @@ var CompactionGate = class {
     this.release = null;
     release2?.();
   }
+  /** Whether no compaction holds the driver right now. */
+  isIdle() {
+    return this.held.size === 0;
+  }
   /**
    * Wait for the driver to be free.
    *
@@ -3892,6 +3898,29 @@ var DriverSwapGate = class {
       resolveTurn();
     };
   }
+  /**
+   * Take a turn slot behind every turn already in flight, and resolve once they
+   * have all settled. Unlike {@link beginTurn}, the caller waits its turn: a
+   * turn whose completion is observed by listening for the driver's next
+   * `agent_end` must not dispatch while another turn is still running, or it
+   * observes that turn's end instead of its own. The slot is claimed
+   * synchronously, so a swap that starts during the wait awaits this turn too —
+   * check {@link isSwapping} after acquiring and release the slot if one is
+   * pending, or the swap and this turn wait on each other.
+   */
+  async beginQueuedTurn() {
+    const earlier = this.turnTail;
+    const endTurn = this.beginTurn();
+    try {
+      await earlier;
+    } catch {
+    }
+    return endTurn;
+  }
+  /** Whether a driver swap is registered and has not settled yet. */
+  isSwapping() {
+    return this.activeDriverSwap !== null;
+  }
   /**
    * 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
@@ -3931,6 +3960,53 @@ var DriverSwapGate = class {
   }
 };
 
+// runner/src/flow-turn-dispatch.ts
+var FLOW_TURN_COMPACTION_TIMEOUT = "Flow turn abandoned: a compaction held the driver";
+async function dispatchFlowTurn(deps, prompt, timeoutMs) {
+  for (; ; ) {
+    await deps.gate.awaitSwap();
+    if (!await deps.awaitCompactionIdle()) throw new Error(FLOW_TURN_COMPACTION_TIMEOUT);
+    const endTurn = await deps.gate.beginQueuedTurn();
+    if (deps.gate.isSwapping() || deps.isCompacting()) {
+      endTurn();
+      continue;
+    }
+    try {
+      await deps.ensureDriverStarted();
+      await awaitAgentEnd(deps.getDriver(), prompt, timeoutMs);
+      return;
+    } finally {
+      endTurn();
+    }
+  }
+}
+function awaitAgentEnd(driver, prompt, timeoutMs) {
+  return new Promise((resolve5, reject) => {
+    let settled = false;
+    const onEvent = (raw) => {
+      const event = raw;
+      if (event.type === "agent_end") done();
+      else if (event.type === "error")
+        done(new Error(event.error ?? event.message ?? "Agent error"));
+    };
+    const done = (err) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      if (driver.off) driver.off("agent-event", onEvent);
+      else driver.removeListener("agent-event", onEvent);
+      if (err) reject(err);
+      else resolve5();
+    };
+    const timer = setTimeout(
+      () => done(new Error(`Flow turn timed out after ${timeoutMs / 1e3}s`)),
+      timeoutMs
+    );
+    driver.on("agent-event", onEvent);
+    driver.prompt(prompt).catch(done);
+  });
+}
+
 // runner/src/reply-routing.ts
 async function routeReply(deps) {
   const current = deps.getDriver();
@@ -5524,6 +5600,16 @@ function registerActiveFlow(flows, runId, entry) {
   flows.set(runId, entry);
   return removed;
 }
+function pickFlowToolTarget(flows, manager) {
+  let latest;
+  for (const entry of flows) latest = entry;
+  if (!latest || !manager) return null;
+  if (isTerminalFlowStatus(latest.adapter.getExecution(latest.handle).status)) return null;
+  return { manager, connectorId: latest.connectorId };
+}
+function flowStartNeedsDriverRestart(state) {
+  return state.driverStarted && state.driverType === "claude-sdk" && !state.flowToolsBaked;
+}
 async function setUpFlowConnector(deps) {
   const recreated = await deps.recreateForFlowTools();
   const manager = deps.resolveManager();
@@ -6428,6 +6514,8 @@ async function startAgentServer(opts) {
       ...cloudSecrets ? { cloudSecrets } : {},
       ...wireAgentConfig?.thinking ? { thinking: wireAgentConfig.thinking } : {},
       ...wireAgentConfig?.effort ? { effort: wireAgentConfig.effort } : {},
+      // Every claude-sdk driver carries the flow tools, so a run can start mid-turn.
+      extraInProcessMcpServers: buildPermanentFlowMcpServers,
       // Protocol v2 `<CAPABILITIES>` block — joins each registered capability's
       // `promptFragment` (framework first, then client, then agent-side
       // surfaces). Built lazily inside `buildSessionConfig` so newly registered
@@ -6513,6 +6601,7 @@ async function startAgentServer(opts) {
   });
   let sessionConfig;
   let agentSession;
+  let flowToolsBaked = false;
   let secretProvider;
   let runtimeIdentity;
   let preMintedSecrets;
@@ -6767,6 +6856,16 @@ async function startAgentServer(opts) {
     const iter = activeFlows.values().next();
     return iter.done ? null : iter.value;
   }
+  function resolveFlowToolTarget() {
+    return pickFlowToolTarget(activeFlows.values(), resourceManager);
+  }
+  async function buildPermanentFlowMcpServers() {
+    const server = await buildLazySdkFlowTools(describeFlowOperations(), resolveFlowToolTarget, {
+      z: z
+    });
+    flowToolsBaked = server !== null;
+    return server ? { "skaile-flow": server } : void 0;
+  }
   const flowConnectorReadiness = createFlowConnectorReadiness(() => getOnlyActiveFlow() !== null);
   const flowMutateConnectorWaitMs = resolveFlowMutateConnectorWaitMs();
   async function ensureDriverStarted() {
@@ -6833,33 +6932,17 @@ async function startAgentServer(opts) {
     return stimulusBus;
   }
   function awaitFlowAgentEnd(prompt, timeoutMs) {
-    return new Promise((resolve5, reject) => {
-      let settled = false;
-      const onEvent = (event) => {
-        if (event.type === "agent_end") done();
-        else if (event.type === "error") {
-          const msg = event.error ?? event.message ?? "Agent error";
-          done(new Error(msg));
-        }
-      };
-      const done = (err) => {
-        if (settled) return;
-        settled = true;
-        clearTimeout(timer);
-        driver.off?.(
-          "agent-event",
-          onEvent
-        ) ?? driver.removeListener("agent-event", onEvent);
-        if (err) reject(err);
-        else resolve5();
-      };
-      const timer = setTimeout(
-        () => done(new Error(`Flow turn timed out after ${timeoutMs / 1e3}s`)),
-        timeoutMs
-      );
-      driver.on("agent-event", onEvent);
-      driver.prompt(prompt).catch(done);
-    });
+    return dispatchFlowTurn(
+      {
+        gate: driverSwapGate,
+        awaitCompactionIdle: () => awaitCompactionIdle("flow turn"),
+        isCompacting: () => !compactionGate.isIdle(),
+        ensureDriverStarted,
+        getDriver: () => driver
+      },
+      prompt,
+      timeoutMs
+    );
   }
   function ensureResourceManagerForFlow() {
     if (!resourceManager) {
@@ -6873,7 +6956,13 @@ async function startAgentServer(opts) {
     return resourceManager;
   }
   async function recreateDriverForFlowTools() {
-    if (!driverStarted || agentSession?.driverType !== "claude-sdk") return false;
+    if (!flowStartNeedsDriverRestart({
+      driverStarted,
+      driverType: agentSession?.driverType,
+      flowToolsBaked
+    })) {
+      return false;
+    }
     const prevSessionId = driver.runtimeSessionId;
     log(
       `[serve] restarting driver to register flow connector tools (resume=${prevSessionId ?? "none"})`
@@ -6983,9 +7072,14 @@ async function startAgentServer(opts) {
     if (agentSession?.driverType === "claude-sdk") {
       try {
         const server = await buildSdkConnectorTools(manager, { z: z });
-        const flowServer = await buildSdkFlowTools(manager, connectorId, { z: z });
+        const flowServer = flowToolsBaked ? null : await buildSdkFlowTools(manager, connectorId, { z: z });
+        const driverConfig = driver.config;
+        driverConfig.mcpServers = {
+          ...driverConfig.mcpServers,
+          ...server ? { "skaile-connectors": server } : {},
+          ...flowServer ? { "skaile-flow": flowServer } : {}
+        };
         if (server) {
-          driver.config.mcpServers = flowServer ? { "skaile-connectors": server, "skaile-flow": flowServer } : { "skaile-connectors": server };
           log(
             `[serve] rebuilt MCP connector tools for flow ${connectorId}` + (flowServer ? " (+ skaile-flow agent tools)" : "")
           );
@@ -7388,7 +7482,8 @@ async function startAgentServer(opts) {
     try {
       const server = await buildSdkConnectorTools(resourceManager, { z: z });
       if (server) {
-        driver.config.mcpServers = { "skaile-connectors": server };
+        const driverConfig = driver.config;
+        driverConfig.mcpServers = { ...driverConfig.mcpServers, "skaile-connectors": server };
         log(`[serve] rebuilt MCP connector tools (${storesRegistered} new store(s))`);
       } else {
         log(`[serve] buildSdkConnectorTools returned null`);
@@ -8387,6 +8482,6 @@ function touchSession(state) {
   return { ...state, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
 }
 
-export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CapabilityRegistry, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, DEFAULT_FLOW_MUTATE_CONNECTOR_WAIT_MS, MOUNT_LIST_MAX_DEPTH, MOUNT_LIST_MAX_ENTRIES, MOUNT_READ_DEADLINE_FACTOR, MOUNT_TREE_OP_DEADLINE_FACTOR, MarkdownStreamer, PreInitRingSink, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildStoreSnapshotReplay, builtinCapabilities, capabilityLogInstance, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, connectorRefreshKind, createAgentSession, createFlowConnectorReadiness, createManagedCodexSubpromptDriver, createSessionStimulusBus, defineCapability, deleteSession, dispatchRunnerCapabilityInvocation, emitSystemPromptComposed, ensureClaudeSettingsDisablesConnectors, ensureGitConfigInclude, executeConnectorMutate, extractClaudeAiOauthExpiresAt, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, hasNonTerminalFlow, hostOpResumeStimulus, installPreInitRingSink, isTerminalFlowStatus, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadManagedCodexHostConfig, loadSession, loadSessionById, mcpAuthSecretKey, newSession, nulTailPaddingLength, pickRepointedManager, planFlowMutate, prepareCodexTools, reconcilePendingDecisions, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveFlowMutateConnectorWaitMs, resolveMixin, runAgentChat, saveSession, setCurrentSession, setUpFlowConnector, startAgentServer, stimulusFromMetas, supportsLiveToolUpdates, touchSession, validateInputResponse, writeClaudeCodeCredentialsFile };
-//# sourceMappingURL=chunk-Q3YS5M3E.js.map
-//# sourceMappingURL=chunk-Q3YS5M3E.js.map
+export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CapabilityRegistry, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, DEFAULT_FLOW_MUTATE_CONNECTOR_WAIT_MS, MOUNT_LIST_MAX_DEPTH, MOUNT_LIST_MAX_ENTRIES, MOUNT_READ_DEADLINE_FACTOR, MOUNT_TREE_OP_DEADLINE_FACTOR, MarkdownStreamer, PreInitRingSink, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildStoreSnapshotReplay, builtinCapabilities, capabilityLogInstance, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, connectorRefreshKind, createAgentSession, createFlowConnectorReadiness, createManagedCodexSubpromptDriver, createSessionStimulusBus, defineCapability, deleteSession, dispatchRunnerCapabilityInvocation, emitSystemPromptComposed, ensureClaudeSettingsDisablesConnectors, ensureGitConfigInclude, executeConnectorMutate, extractClaudeAiOauthExpiresAt, flowStartNeedsDriverRestart, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, hasNonTerminalFlow, hostOpResumeStimulus, installPreInitRingSink, isTerminalFlowStatus, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadManagedCodexHostConfig, loadSession, loadSessionById, mcpAuthSecretKey, newSession, nulTailPaddingLength, pickFlowToolTarget, pickRepointedManager, planFlowMutate, prepareCodexTools, reconcilePendingDecisions, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveFlowMutateConnectorWaitMs, resolveMixin, runAgentChat, saveSession, setCurrentSession, setUpFlowConnector, startAgentServer, stimulusFromMetas, supportsLiveToolUpdates, touchSession, validateInputResponse, writeClaudeCodeCredentialsFile };
+//# sourceMappingURL=chunk-4YRRPWHY.js.map
+//# sourceMappingURL=chunk-4YRRPWHY.js.map