@skaile/workspaces 3.16.2 → 3.18.0

package/dist/{chunk-EXT2LNST.js → chunk-SH7GXS7V.js}

@@ -1,15 +1,15 @@
-import { resolveAuthRef } from './chunk-5KSIVLOX.js';
-import { EventNormalizer } from './chunk-PBRMY64S.js';
+import { resolveAuthRef } from './chunk-5T7Y3AZU.js';
+import { EventNormalizer } from './chunk-CQY7XKRV.js';
 import { resolveModelTier } from './chunk-GURXUF2J.js';
-import { createDriver } from './chunk-FRER2PEN.js';
+import { createDriver } from './chunk-J7VSUGGH.js';
 import { pluginRegistry } from './chunk-6E6PKKAD.js';
 import { computeStimulus } from './chunk-IFGTRL2I.js';
-import { resolveNodeBindings, getConsumedOutputSchema, validateConsumedNodeOutput, appendAttempt, resolveTerminalFailureStatus, remainingActiveExecutionMs, interpolateNodeInstruction, deriveCheckEvidence, computeFlowStateFromSnapshots, availableRouterFrontier, evaluateRouterSelection, routerSelectionOutput, planRouterSkips, unsettledRouterBranchIds, countFailedAttempts, hasAutomaticRetryBudget, persistedRouterSelection } from './chunk-BQMRUH7J.js';
-import { INPUT_SCHEMA_SHAPES_HINT, coerceInputSchema } from './chunk-AXEOG4B5.js';
-import { parseFlowDefinition } from './chunk-HY6CIKFH.js';
+import { resolveNodeBindings, getConsumedOutputSchema, validateConsumedNodeOutput, appendAttempt, resolveTerminalFailureStatus, remainingActiveExecutionMs, interpolateNodeInstruction, deriveCheckEvidence, computeFlowStateFromSnapshots, availableRouterFrontier, evaluateRouterSelection, routerSelectionOutput, planRouterSkips, unsettledRouterBranchIds, countFailedAttempts, hasAutomaticRetryBudget, persistedRouterSelection } from './chunk-SFCVAEJ5.js';
+import { INPUT_SCHEMA_SHAPES_HINT, coerceInputSchema } from './chunk-YCMHWNZA.js';
+import { parseFlowDefinition } from './chunk-CP62G5PK.js';
 import { describeStimulus, buildOrchestratorPrompt, renderSubpromptPrompt, renderStimulusPrompt } from './chunk-2D5BYAL6.js';
 import { deterministicNodeKindLabel, flowDefaults, isAgentNode, isGateNode, isCheckNode, nodeRequiresApproval, isSubFlowNode, isFunctionNode, isSubpromptNode, nodeInstruction, isRouterNode, isActiveRuntimeNode, nodeIsOptional, nodeLabel, nodeAssets } from './chunk-ELPR5XBG.js';
-import { portableSpawn } from './chunk-CIPK5JMJ.js';
+import { portableSpawn } from './chunk-H662SXKS.js';
 import { withFsDeadline, tryWithFsDeadline, FsDeadlineError, fsDeadlineMs } from './chunk-MKZOK4JU.js';
 import { createLogger } from './chunk-W4IPN3DD.js';
 import { resolve, relative, sep, isAbsolute, join, dirname } from 'path';
@@ -470,6 +470,8 @@ var SessionSubpromptRunner = class {
       cloud: this.options.cloud,
       overrides: this.options.modelTierOverrides
     });
+    if (model && this.options.availableModels && !this.options.availableModels.includes(model))
+      throw new Error("CODEX_MODEL_UNAVAILABLE");
     const config = {
       cwd: this.options.workspaceDir,
       provider: this.options.provider,
@@ -478,27 +480,76 @@ var SessionSubpromptRunner = class {
       // multi-turn agentic loop (claude-sdk: 15), which would let a node that
       // was asked to classify a string go off and work instead.
       maxTurns: 1,
-      ...this.options.apiKey ? { apiKeys: { [this.options.provider ?? "anthropic"]: this.options.apiKey } } : {},
+      ...this.options.apiKey ? {
+        apiKeys: {
+          [this.options.provider ?? "anthropic"]: this.options.apiKey
+        }
+      } : {},
       ...this.options.cloud && this.options.cloud !== "default" ? { cloud: this.options.cloud } : {},
       ...this.options.cloudConfig ? { cloudConfig: this.options.cloudConfig } : {},
       ...this.options.cloudSecrets ? { cloudSecrets: this.options.cloudSecrets } : {}
     };
-    const driver = await createDriver(this.options.driverType, config);
+    if (request.signal?.aborted) throw new Error("isolated subprompt call cancelled");
+    const timeoutMs = this.options.timeoutMs ?? DEFAULT_SUBPROMPT_TIMEOUT_MS;
+    let owned;
+    let cleanupPromise;
+    const cleanup = async (abort) => {
+      if (!owned) return;
+      cleanupPromise ??= (async () => {
+        if (abort) await owned.driver.abort().catch(() => {
+        });
+        await owned.driver.dispose();
+        await owned.dispose?.();
+      })();
+      await cleanupPromise;
+    };
+    let rejectStopped;
+    let shouldAbort = false;
+    const stopped = new Promise((_, reject) => {
+      rejectStopped = reject;
+    });
+    const stop = (error) => {
+      shouldAbort = true;
+      rejectStopped(error);
+      void cleanup(true).catch(() => {
+      });
+    };
+    const cancelled = () => stop(new Error("isolated subprompt call cancelled"));
+    const timer = setTimeout(
+      () => stop(new Error(`isolated subprompt call exceeded ${timeoutMs}ms`)),
+      timeoutMs
+    );
+    if (request.signal?.aborted) cancelled();
+    else request.signal?.addEventListener("abort", cancelled, { once: true });
+    const construction = this.options.createIsolatedDriver ? this.options.createIsolatedDriver(model) : createDriver(this.options.driverType, config).then((driver) => ({
+      driver
+    }));
     try {
-      await driver.start();
-      const text = await runIsolatedPrompt(
-        driver,
-        request.prompt,
-        this.options.timeoutMs ?? DEFAULT_SUBPROMPT_TIMEOUT_MS
-      );
+      owned = await Promise.race([construction, stopped]);
+      const starting = owned.driver.start();
+      void starting.catch(() => {
+      });
+      await Promise.race([starting, stopped]);
+      const prompting = runIsolatedPrompt(owned.driver, request.prompt);
+      void prompting.catch(() => {
+      });
+      const text = await Promise.race([prompting, stopped]);
       return { text };
     } finally {
-      driver.kill();
+      clearTimeout(timer);
+      request.signal?.removeEventListener("abort", cancelled);
+      if (!owned) {
+        void construction.then((late) => {
+          owned = late;
+          return cleanup(true);
+        }).catch(() => {
+        });
+      } else await cleanup(shouldAbort);
     }
   }
 };
 var DEFAULT_SUBPROMPT_TIMEOUT_MS = 5 * 6e4;
-function runIsolatedPrompt(driver, prompt, timeoutMs) {
+function runIsolatedPrompt(driver, prompt) {
   return new Promise((resolve6, reject) => {
     const normalizer = new EventNormalizer();
     let text = "";
@@ -506,15 +557,10 @@ function runIsolatedPrompt(driver, prompt, timeoutMs) {
     const done = (err) => {
       if (settled) return;
       settled = true;
-      clearTimeout(timer);
       driver.off("agent-event", onEvent);
       if (err) reject(err);
       else resolve6(text);
     };
-    const timer = setTimeout(
-      () => done(new Error(`isolated subprompt call exceeded ${timeoutMs}ms`)),
-      timeoutMs
-    );
     const onEvent = (event) => {
       for (const normalized of normalizer.normalize(event)) {
         if (normalized.type === "text") text += normalized.content;
@@ -6880,7 +6926,6 @@ function readFailedConnectors(manager) {
   }
 }
 async function buildSdkConnectorTools(manager, options) {
-  const shellAccess = options?.shellAccess ?? true;
   let sdk = options?.sdk;
   if (!sdk) {
     try {
@@ -6889,6 +6934,13 @@ async function buildSdkConnectorTools(manager, options) {
       return null;
     }
   }
+  return sdk.createSdkMcpServer({
+    name: "skaile-connectors",
+    tools: buildConnectorToolDefs(manager, options)
+  });
+}
+function buildConnectorToolDefs(manager, options) {
+  const shellAccess = options?.shellAccess ?? true;
   const z5 = options?.z ?? zStatic;
   const tools = [];
   tools.push({
@@ -7042,7 +7094,7 @@ async function buildSdkConnectorTools(manager, options) {
       inputSchema: {
         connector_id: z5.string().describe("Connector ID"),
         operation: z5.string().describe("Operation name (e.g. 'send_message', 'query')"),
-        args: z5.record(z5.unknown()).describe("Named arguments for the operation (without -- prefix)")
+        args: z5.record(z5.string(), z5.unknown()).describe("Named arguments for the operation (without -- prefix)")
       },
       handler: async ({
         connector_id,
@@ -7061,7 +7113,7 @@ async function buildSdkConnectorTools(manager, options) {
       }
     });
   }
-  return sdk.createSdkMcpServer({ name: "skaile-connectors", tools });
+  return tools;
 }
 var FLOW_AGENT_OPS = /* @__PURE__ */ new Set([
   "get_available",
@@ -7085,15 +7137,19 @@ async function buildSdkFlowTools(manager, connectorId, options) {
       return null;
     }
   }
+  const tools = buildFlowToolDefs(manager, connectorId, options);
+  return tools.length ? sdk.createSdkMcpServer({ name: "skaile-flow", tools }) : null;
+}
+function buildFlowToolDefs(manager, connectorId, options) {
   const z5 = options?.z ?? zStatic;
   let ops;
   try {
     ops = manager.getOperations(connectorId);
   } catch {
-    return null;
+    return [];
   }
   const agentOps = ops.filter((op) => FLOW_AGENT_OPS.has(op.name));
-  if (agentOps.length === 0) return null;
+  if (agentOps.length === 0) return [];
   const tools = agentOps.map((op) => ({
     name: op.name,
     description: op.description,
@@ -7110,7 +7166,7 @@ async function buildSdkFlowTools(manager, connectorId, options) {
       }
     }
   }));
-  return sdk.createSdkMcpServer({ name: "skaile-flow", tools });
+  return tools;
 }
 function buildOperationInputSchema(args, z5) {
   const shape = {};
@@ -8342,6 +8398,8 @@ var FlowAdapter = class extends AbstractConnector {
       subpromptRunner: options.subpromptRunner,
       inlineSubFlowRunner: options.inlineSubFlowRunner,
       inlineOperationTargets: /* @__PURE__ */ new Map(),
+      subpromptOperations: /* @__PURE__ */ new Map(),
+      subpromptCleanup: /* @__PURE__ */ new Set(),
       flowInputOrigins: options.flowInputOrigins,
       inlineSubFlowAncestry: options.inlineSubFlowAncestry ?? [flowDef.id],
       executionGeneration: 0,
@@ -8355,6 +8413,7 @@ var FlowAdapter = class extends AbstractConnector {
   async disconnect(handle) {
     const state = this.s(handle);
     state.executionGeneration += 1;
+    await this.cancelSubprompts(state);
     this.clearWakeTimer(state);
     await this.cancelInlineTargets(state);
     handle.status = "disconnected";
@@ -8364,6 +8423,18 @@ var FlowAdapter = class extends AbstractConnector {
     s.inlineOperationTargets.clear();
     for (const target of targets) await target.cancel();
   }
+  async cancelSubprompts(s) {
+    for (const operation of s.subpromptOperations.values()) {
+      operation.controller.abort();
+      s.subpromptCleanup.add(operation.promise);
+      void operation.promise.then(
+        () => s.subpromptCleanup.delete(operation.promise),
+        () => s.subpromptCleanup.delete(operation.promise)
+      );
+    }
+    s.subpromptOperations.clear();
+    await Promise.allSettled([...s.subpromptCleanup]);
+  }
   projectInlineInteraction(handle, parentNodeId, projection2) {
     this.mutate(
       handle,
@@ -8394,6 +8465,7 @@ var FlowAdapter = class extends AbstractConnector {
    */
   hydrate(handle, execution) {
     const s = this.s(handle);
+    void this.cancelSubprompts(s);
     assertLegal(
       s.inlineOperationTargets.size === 0,
       "hydrate requires live inline children to be cancelled first"
@@ -8901,6 +8973,7 @@ var FlowAdapter = class extends AbstractConnector {
       throw new Error("FlowAdapter: start requires args.seed.runId + args.seed.startedBy");
     }
     s.flowDef = flow;
+    void this.cancelSubprompts(s);
     s.executionGeneration += 1;
     s.execution = buildInitialExecution(flow, {
       runId: seed.runId,
@@ -9330,6 +9403,7 @@ var FlowAdapter = class extends AbstractConnector {
    */
   cancel(handle) {
     this.mutate(handle, (s) => {
+      void this.cancelSubprompts(s);
       s.execution = { ...s.execution, status: "cancelled" };
       s.executionGeneration += 1;
       return void 0;
@@ -9415,6 +9489,7 @@ var FlowAdapter = class extends AbstractConnector {
     let abortedAttempt;
     while (true) {
       const state = this.s(handle);
+      if (state.subpromptCleanup.size > 0) await Promise.allSettled([...state.subpromptCleanup]);
       if (state.execution.status === "cancelled" || state.execution.status === "failed") break;
       if (includeRoutersAndGates && this.settleAvailableRouters(handle)) continue;
       const node = state.flowDef.nodes.find((candidate) => {
@@ -9629,17 +9704,30 @@ var FlowAdapter = class extends AbstractConnector {
             interpolateNodeInstruction(instruction, resolved.values),
             outputSchema
           );
+          const subpromptAbort = new AbortController();
           const runPromise2 = runner.execute({
             node,
             prompt,
             inputs: resolved.values,
-            inputOrigins: resolved.origins
+            inputOrigins: resolved.origins,
+            signal: subpromptAbort.signal
           });
-          const result = subpromptRemainingMs !== void 0 ? await raceWithTimeout(
-            runPromise2,
-            Math.max(0, subpromptRemainingMs),
-            `Subprompt node ${node.id} timed out after ${subpromptTimeoutSec}s`
-          ) : await runPromise2;
+          const operation = { controller: subpromptAbort, promise: runPromise2 };
+          state.subpromptOperations.set(node.id, operation);
+          let result;
+          try {
+            result = subpromptRemainingMs !== void 0 ? await raceWithTimeout(
+              runPromise2,
+              Math.max(0, subpromptRemainingMs),
+              `Subprompt node ${node.id} timed out after ${subpromptTimeoutSec}s`
+            ) : await runPromise2;
+          } finally {
+            subpromptAbort.abort();
+            await runPromise2.catch(() => {
+            });
+            if (state.subpromptOperations.get(node.id) === operation)
+              state.subpromptOperations.delete(node.id);
+          }
           subpromptOutput = subpromptNodeOutput(node, result.text);
           const validation = validateConsumedNodeOutput(
             state.flowDef,
@@ -10596,6 +10684,6 @@ function createConnector() {
   return new FlowAdapter();
 }
 
-export { AbstractConnector, BUILTIN_CONNECTOR_CATALOG, BoxConnector, ConnectorFieldMissingError, ConnectorManager, ConnectorStartupError, DeployConnector, DevServerConnector, FlowAdapter, GitConnector, GmailConnector, GoogleDriveConnector, LocalConnector, LogBuffer, ManagedGitconfigCollisionError, MattermostConnector, MemoryConnector, MinIOConnector, PortPool, PostgresConnector, S3Connector, SQLiteConnector, SessionInlineSubFlowRunner, SessionNodeExecutor, SessionSubpromptRunner, SharePointConnector, StaticServerConnector, TunnelConnector, WebDAVConnector, XStateConnector, XStateStoreConnector, __test, atomicReplaceCredential, buildConnectorPromptSection, buildFlowPromptEvent, buildSdkConnectorTools, buildSdkFlowTools, createConnector, createConnector10, createConnector11, createConnector12, createConnector13, createConnector14, createConnector15, createConnector16, createConnector17, createConnector18, createConnector19, createConnector2, createConnector20, createConnector3, createConnector4, createConnector5, createConnector6, createConnector7, createConnector8, createConnector9, createFsWatcher, createWorktree, defaultSpawn, driveOrchestratorTurn, ensureDirMode, ensureFleetMounted, ensureRefreshAttemptStamp, findGitRoot, findMissingPackages, getConnector, installNpmPackages, isFleetManaged, isPackageResolvable, listConnectors, listWorktrees, readGitSyncStatus, registerBuiltinConnectors, removeMountBlock, removeUnavailableMountBlock, renderCredentialHelperScript, tryGetConnector, worktreeRegistry, writeHelperScript, writeMountBlock, writeUnavailableMountBlock };
-//# sourceMappingURL=chunk-EXT2LNST.js.map
-//# sourceMappingURL=chunk-EXT2LNST.js.map
+export { AbstractConnector, BUILTIN_CONNECTOR_CATALOG, BoxConnector, ConnectorFieldMissingError, ConnectorManager, ConnectorStartupError, DeployConnector, DevServerConnector, FlowAdapter, GitConnector, GmailConnector, GoogleDriveConnector, LocalConnector, LogBuffer, ManagedGitconfigCollisionError, MattermostConnector, MemoryConnector, MinIOConnector, PortPool, PostgresConnector, S3Connector, SQLiteConnector, SessionInlineSubFlowRunner, SessionNodeExecutor, SessionSubpromptRunner, SharePointConnector, StaticServerConnector, TunnelConnector, WebDAVConnector, XStateConnector, XStateStoreConnector, __test, atomicReplaceCredential, buildConnectorPromptSection, buildConnectorToolDefs, buildFlowPromptEvent, buildFlowToolDefs, buildSdkConnectorTools, buildSdkFlowTools, createConnector, createConnector10, createConnector11, createConnector12, createConnector13, createConnector14, createConnector15, createConnector16, createConnector17, createConnector18, createConnector19, createConnector2, createConnector20, createConnector3, createConnector4, createConnector5, createConnector6, createConnector7, createConnector8, createConnector9, createFsWatcher, createWorktree, defaultSpawn, driveOrchestratorTurn, ensureDirMode, ensureFleetMounted, ensureRefreshAttemptStamp, findGitRoot, findMissingPackages, getConnector, installNpmPackages, isFleetManaged, isPackageResolvable, listConnectors, listWorktrees, readGitSyncStatus, registerBuiltinConnectors, removeMountBlock, removeUnavailableMountBlock, renderCredentialHelperScript, tryGetConnector, worktreeRegistry, writeHelperScript, writeMountBlock, writeUnavailableMountBlock };
+//# sourceMappingURL=chunk-SH7GXS7V.js.map
+//# sourceMappingURL=chunk-SH7GXS7V.js.map