@skaile/workspaces 3.3.0 → 3.4.1

package/dist/{chunk-E5S2WGTS.js → chunk-4GYL5TCP.js}

@@ -1,16 +1,16 @@
-import { resolveAuthRef } from './chunk-ZNIHTT22.js';
-import { EventNormalizer } from './chunk-KPZZI2KG.js';
+import { resolveAuthRef } from './chunk-3UU3D2Q3.js';
+import { EventNormalizer } from './chunk-HV3ZCE4M.js';
 import { resolveModelTier } from './chunk-V34ZEXSE.js';
-import { createDriver } from './chunk-VT6HDD2L.js';
+import { createDriver } from './chunk-4YYJV6TW.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-5FLEP4X6.js';
+import { resolveNodeBindings, getConsumedOutputSchema, validateConsumedNodeOutput, appendAttempt, resolveTerminalFailureStatus, remainingActiveExecutionMs, interpolateNodeInstruction, deriveCheckEvidence, computeFlowStateFromSnapshots, availableRouterFrontier, evaluateRouterSelection, routerSelectionOutput, planRouterSkips, unsettledRouterBranchIds, countFailedAttempts, hasAutomaticRetryBudget, persistedRouterSelection } from './chunk-HBF7A7JB.js';
 import { parseFlowDefinition } from './chunk-B4J6TV4G.js';
 import { renderSubpromptPrompt, renderStimulusPrompt } from './chunk-HGFKNJA5.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-P43HBWKK.js';
-import { withFsDeadline, tryWithFsDeadline, FsDeadlineError, fsDeadlineMs } from './chunk-DYMWJAL4.js';
-import { createLogger } from './chunk-7GOCNYUV.js';
+import { portableSpawn } from './chunk-AZPXCHDK.js';
+import { withFsDeadline, tryWithFsDeadline, FsDeadlineError, fsDeadlineMs } from './chunk-VQ4P7UYE.js';
+import { createLogger } from './chunk-3A5IKBHQ.js';
 import { resolve, relative, sep, isAbsolute, join, dirname } from 'path';
 import { mkdir, rename, writeFile, readFile, stat, cp, readdir, chmod, realpath } from 'fs/promises';
 import * as z4 from 'zod';
@@ -346,6 +346,28 @@ function commandFor(node) {
       return ["python3", "-c", node.run.command];
   }
 }
+var ABORT_SIGKILL_GRACE_MS = 2e3;
+function abortError(nodeLabel2) {
+  const error = new Error(`${nodeLabel2} was aborted`);
+  error.name = "AbortError";
+  return error;
+}
+var liveDetachedChildren = /* @__PURE__ */ new Set();
+var shutdownSweepInstalled = false;
+function sweepOnShutdown(child) {
+  liveDetachedChildren.add(child);
+  void child.exited.then(() => liveDetachedChildren.delete(child));
+  if (shutdownSweepInstalled) return;
+  shutdownSweepInstalled = true;
+  globalThis.process.once("exit", () => {
+    for (const live of liveDetachedChildren) {
+      try {
+        live.kill("SIGKILL");
+      } catch {
+      }
+    }
+  });
+}
 var SessionNodeExecutor = class {
   workspaceDir;
   /** Creates an executor scoped to one already-materialized session workspace. */
@@ -353,7 +375,7 @@ var SessionNodeExecutor = class {
     this.workspaceDir = resolve(options.workspaceDir);
   }
   /** Runs one function or check node process with session environment and binding overrides. */
-  async execute(request) {
+  async execute(request, options) {
     const nodeLabel2 = `${deterministicNodeKindLabel(request.node.run.kind)} node ${request.node.id}`;
     const cwd = resolve(this.workspaceDir, request.node.run.cwd ?? ".");
     const workspaceRelative = relative(this.workspaceDir, cwd);
@@ -366,16 +388,35 @@ var SessionNodeExecutor = class {
         serializeEnvironmentInput(name, value, nodeLabel2)
       ])
     );
+    const signal = options?.signal;
+    if (signal?.aborted) throw abortError(nodeLabel2);
     const process2 = portableSpawn(commandFor(request.node), {
       cwd,
-      env: { ...globalThis.process.env, ...boundEnvironment }
+      env: { ...globalThis.process.env, ...boundEnvironment },
+      detached: true
     });
-    const [stdout, stderr, exitStatus] = await Promise.all([
-      new Response(process2.stdout).text(),
-      new Response(process2.stderr).text(),
-      process2.exited
-    ]);
-    return { exitStatus, stdout, stderr };
+    sweepOnShutdown(process2);
+    let aborted = false;
+    let escalation;
+    const onAbort = () => {
+      aborted = true;
+      process2.kill("SIGTERM");
+      escalation = setTimeout(() => process2.kill("SIGKILL"), ABORT_SIGKILL_GRACE_MS);
+      escalation.unref?.();
+    };
+    signal?.addEventListener("abort", onAbort, { once: true });
+    try {
+      const [stdout, stderr, exitStatus] = await Promise.all([
+        new Response(process2.stdout).text(),
+        new Response(process2.stderr).text(),
+        process2.exited
+      ]);
+      if (aborted) throw abortError(nodeLabel2);
+      return { exitStatus, stdout, stderr };
+    } finally {
+      if (escalation) clearTimeout(escalation);
+      signal?.removeEventListener("abort", onAbort);
+    }
   }
 };
 
@@ -7584,6 +7625,18 @@ function raceWithTimeout(promise, ms, timeoutMessage) {
     );
   });
 }
+var ABORTED_ATTEMPT_SETTLE_MS = ABORT_SIGKILL_GRACE_MS + 1e3;
+function settleWithin(promise, ms) {
+  return new Promise((resolve6) => {
+    const timer = setTimeout(resolve6, ms);
+    timer.unref?.();
+    const settled = () => {
+      clearTimeout(timer);
+      resolve6();
+    };
+    promise.then(settled, settled);
+  });
+}
 function mergeInteractionHistory(history, interaction) {
   if (!interaction) return history;
   const next = [...history];
@@ -8799,6 +8852,7 @@ var FlowAdapter = class extends AbstractConnector {
   }
   async drainAvailableRuntimeNodes(handle, includeRoutersAndGates) {
     const advancedSubFlows = /* @__PURE__ */ new Set();
+    let abortedAttempt;
     while (true) {
       const state = this.s(handle);
       if (state.execution.status === "cancelled" || state.execution.status === "failed") break;
@@ -8874,7 +8928,7 @@ var FlowAdapter = class extends AbstractConnector {
             state.flowInputOrigins
           );
           subFlowInputOrigins = resolved.origins;
-          const runPromise = runner.run({
+          const runPromise2 = runner.run({
             node,
             flowId: node.run.flow,
             inputs: resolved.values,
@@ -8892,10 +8946,10 @@ var FlowAdapter = class extends AbstractConnector {
             }
           });
           result = remainingMs !== void 0 ? await raceWithTimeout(
-            runPromise,
+            runPromise2,
             Math.max(0, remainingMs),
             `Sub-flow node ${node.id} timed out after ${timeoutSec}s`
-          ) : await runPromise;
+          ) : await runPromise2;
         } catch (error) {
           if (error instanceof NodeTimeoutError) {
             const target = state.inlineOperationTargets.get(node.id);
@@ -9015,17 +9069,17 @@ var FlowAdapter = class extends AbstractConnector {
             interpolateNodeInstruction(instruction, resolved.values),
             outputSchema
           );
-          const runPromise = runner.execute({
+          const runPromise2 = runner.execute({
             node,
             prompt,
             inputs: resolved.values,
             inputOrigins: resolved.origins
           });
           const result = subpromptRemainingMs !== void 0 ? await raceWithTimeout(
-            runPromise,
+            runPromise2,
             Math.max(0, subpromptRemainingMs),
             `Subprompt node ${node.id} timed out after ${subpromptTimeoutSec}s`
-          ) : await runPromise;
+          ) : await runPromise2;
           subpromptOutput = subpromptNodeOutput(node, result.text);
           const validation = validateConsumedNodeOutput(
             state.flowDef,
@@ -9099,6 +9153,12 @@ var FlowAdapter = class extends AbstractConnector {
         continue;
       }
       if (!isFunctionNode(node) && !isCheckNode(node)) continue;
+      if (abortedAttempt) {
+        const settling = abortedAttempt;
+        abortedAttempt = void 0;
+        await settleWithin(settling, ABORTED_ATTEMPT_SETTLE_MS);
+        continue;
+      }
       this.mutate(
         handle,
         (current) => {
@@ -9129,6 +9189,8 @@ var FlowAdapter = class extends AbstractConnector {
       let capturedInputOrigins;
       let checkEvidence;
       let deterministicOutcome;
+      const deterministicAbort = new AbortController();
+      let runPromise;
       try {
         const executor = state.nodeExecutor;
         if (!executor)
@@ -9140,11 +9202,10 @@ var FlowAdapter = class extends AbstractConnector {
           state.flowInputOrigins
         );
         capturedInputOrigins = resolved.origins;
-        const runPromise = executor.execute({
-          node,
-          inputs: resolved.values,
-          inputOrigins: resolved.origins
-        });
+        runPromise = executor.execute(
+          { node, inputs: resolved.values, inputOrigins: resolved.origins },
+          { signal: deterministicAbort.signal }
+        );
         const result = deterministicRemainingMs !== void 0 ? await raceWithTimeout(
           runPromise,
           Math.max(0, deterministicRemainingMs),
@@ -9193,12 +9254,21 @@ var FlowAdapter = class extends AbstractConnector {
           deterministicOutcome = { kind: "success" };
         }
       } catch (error) {
-        deterministicOutcome = error instanceof NodeTimeoutError ? { kind: "failure", message: error.message } : {
-          kind: "failure",
-          message: `${deterministicKindLabel} node ${node.id} failed: ${error instanceof Error ? error.message : String(error)}`
-        };
+        if (error instanceof NodeTimeoutError) {
+          deterministicAbort.abort();
+          abortedAttempt = runPromise;
+          deterministicOutcome = { kind: "failure", message: error.message };
+        } else {
+          deterministicOutcome = {
+            kind: "failure",
+            message: `${deterministicKindLabel} node ${node.id} failed: ${error instanceof Error ? error.message : String(error)}`
+          };
+        }
+      }
+      if (this.s(handle).executionGeneration !== deterministicExecutionGeneration) {
+        deterministicAbort.abort();
+        break;
       }
-      if (this.s(handle).executionGeneration !== deterministicExecutionGeneration) break;
       if (deterministicOutcome.kind === "success") {
         this.mutate(
           handle,
@@ -9978,5 +10048,5 @@ function createConnector() {
 }
 
 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, 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, ensureDirMode, ensureFleetMounted, findGitRoot, findMissingPackages, getConnector, installNpmPackages, isFleetManaged, isPackageResolvable, listConnectors, listWorktrees, readGitSyncStatus, registerBuiltinConnectors, removeMountBlock, renderCredentialHelperScript, tryGetConnector, worktreeRegistry, writeHelperScript, writeMountBlock };
-//# sourceMappingURL=chunk-E5S2WGTS.js.map
-//# sourceMappingURL=chunk-E5S2WGTS.js.map
+//# sourceMappingURL=chunk-4GYL5TCP.js.map
+//# sourceMappingURL=chunk-4GYL5TCP.js.map