@nicknisi/pi-workflows 0.1.0 → 0.2.0

package/dist/index.js

@@ -36,13 +36,7 @@ const DEFAULT_TIMEOUT_MS = 10 * 60 * 1000;
 const MAX_TIMEOUT_MS = 30 * 60 * 1000;
 const MAX_RESULT_CHARS = 16 * 1024;
 const MAX_LOG_CHARS = 2000;
-// ── Live runId → AbortController, so `stop` can cancel in-flight spawns. ──
-// Mirrors @nicknisi/pi-subagents' cascading-cancellation registry. Each
-// agent() call spawns detached and registers its controller here; stop(runId)
-// aborts it. Runs from other hosts show up via readRunArtifacts but are not
-// cancellable here (they belong to a different process).
-const cancellables = new Map();
-function spawnCancellable(runtime, opts, externalSignal) {
+function spawnCancellable(cancellables, runtime, opts, externalSignal) {
     const controller = new AbortController();
     const onExternalAbort = () => controller.abort();
     if (externalSignal) {
@@ -59,7 +53,7 @@ function spawnCancellable(runtime, opts, externalSignal) {
     });
     return Object.assign(done, { runId });
 }
-function makeSpawnFn(runtime, cwd, externalSignal) {
+function makeSpawnFn(cancellables, runtime, cwd, externalSignal) {
     return async (opts) => {
         const spawnOpts = {
             prompt: opts.prompt,
@@ -79,7 +73,7 @@ function makeSpawnFn(runtime, cwd, externalSignal) {
             spawnOpts.tools = opts.tools;
         else
             spawnOpts.tools = ['read', 'grep', 'find', 'ls'];
-        const res = await spawnCancellable(runtime, spawnOpts, externalSignal);
+        const res = await spawnCancellable(cancellables, runtime, spawnOpts, externalSignal);
         // Surface the worktree `.patch` path (recorded on the run record after
         // settle) so workflow scripts can return it for the `/patches` apply flow.
         if (res.ok) {
@@ -199,6 +193,7 @@ function formatRunResult(result, label) {
 }
 // ── Extension ─────────────────────────────────────────────────────────────
 export default function workflows(pi) {
+    const cancellables = new Map();
     const runtime = createSubagentRuntime({ namespace: NAMESPACE, artifactsDir: ARTIFACTS_ROOT });
     sweepRunArtifactsOnce(ARTIFACTS_ROOT);
     pi.registerTool({
@@ -296,7 +291,7 @@ export default function workflows(pi) {
                 if (!runId) {
                     return { content: [{ type: 'text', text: 'stop requires runId.' }], details: {} };
                 }
-                const controller = resolveCancellable(runtime, runId);
+                const controller = resolveCancellable(cancellables, runtime, runId);
                 if (!controller) {
                     const record = findRun(runtime, runId);
                     const msg = record && (record.status === 'running' || record.status === 'queued')
@@ -355,17 +350,40 @@ export default function workflows(pi) {
                     details: {},
                 };
             }
-            const spawnFn = makeSpawnFn(runtime, ctx.cwd, signal ?? undefined);
+            // One controller for BOTH abort sources: the tool's signal AND the
+            // timeout. spawnCancellable wires it into every child spawn, so firing
+            // it actually cancels in-flight work (previously the timeout controller
+            // was connected to nothing — dead code).
             const controller = new AbortController();
-            const timer = setTimeout(() => controller.abort(), timeoutMs);
+            let timedOut = false;
+            const onToolAbort = () => controller.abort();
+            if (signal) {
+                if (signal.aborted)
+                    controller.abort();
+                else
+                    signal.addEventListener('abort', onToolAbort, { once: true });
+            }
+            const timer = setTimeout(() => {
+                timedOut = true;
+                controller.abort();
+            }, timeoutMs);
+            const spawnFn = makeSpawnFn(cancellables, runtime, ctx.cwd, controller.signal);
+            const timeoutPromise = new Promise((_, reject) => {
+                controller.signal.addEventListener('abort', () => reject(new Error(timedOut
+                    ? `Timed out after ${timeoutMs}ms (in-flight subagents were aborted)`
+                    : 'Aborted by the host session')), { once: true });
+            });
             try {
-                const result = await runScript({
-                    script: src,
-                    args: params.args,
-                    spawn: spawnFn,
-                    cwd: ctx.cwd,
-                    onLog: () => { },
-                });
+                const result = await Promise.race([
+                    runScript({
+                        script: src,
+                        args: params.args,
+                        spawn: spawnFn,
+                        cwd: ctx.cwd,
+                        onLog: () => { },
+                    }),
+                    timeoutPromise,
+                ]);
                 const text = formatRunResult(result, label);
                 return {
                     content: [{ type: 'text', text }],
@@ -387,6 +405,7 @@ export default function workflows(pi) {
             }
             finally {
                 clearTimeout(timer);
+                signal?.removeEventListener('abort', onToolAbort);
             }
         },
     });
@@ -403,12 +422,12 @@ export default function workflows(pi) {
             return subs.map((s) => ({ value: s + ' ', label: s }));
         },
         handler: async (args, ctx) => {
-            await cmdWf(args, ctx, runtime);
+            await cmdWf(args, ctx, runtime, cancellables);
         },
     });
 }
 // ── /wf handler (shared, typed against the runtime) ───────────────────────
-async function cmdWf(args, ctx, runtime) {
+async function cmdWf(args, ctx, runtime, cancellables) {
     const parts = args.trim().split(/\s+/).filter(Boolean);
     const sub = parts[0];
     if (!sub || sub === 'list') {
@@ -453,7 +472,7 @@ async function cmdWf(args, ctx, runtime) {
         }
         ctx.ui.setStatus('workflows', `running ${name}…`);
         try {
-            const spawnFn = makeSpawnFn(runtime, ctx.cwd, ctx.signal ?? undefined);
+            const spawnFn = makeSpawnFn(cancellables, runtime, ctx.cwd, ctx.signal ?? undefined);
             const result = await runScript({ script: src, args: parsedArgs, spawn: spawnFn, cwd: ctx.cwd });
             ctx.ui.notify(formatRunResult(result, name), 'info');
         }
@@ -485,7 +504,7 @@ async function cmdWf(args, ctx, runtime) {
             ctx.ui.notify('Usage: /wf stop <runId>', 'warning');
             return;
         }
-        const controller = resolveCancellable(runtime, runId);
+        const controller = resolveCancellable(cancellables, runtime, runId);
         if (!controller) {
             const record = findRun(runtime, runId);
             ctx.ui.notify(record && (record.status === 'running' || record.status === 'queued')
@@ -520,7 +539,7 @@ function findRun(runtime, runId) {
     return undefined;
 }
 /** Resolve a cancellable controller by full id or unique prefix. */
-function resolveCancellable(_runtime, runId) {
+function resolveCancellable(cancellables, _runtime, runId) {
     if (cancellables.has(runId))
         return cancellables.get(runId);
     if (runId.length >= 8) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nicknisi/pi-workflows",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Model-facing front door to the first-party workflow engine — run JS workflow scripts over the subagent runtime, replacing the third-party @quintinshaw/pi-dynamic-workflows extension",
   "keywords": [
     "pi",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "typebox": "^1.1.0",
-    "@nicknisi/pi-shared": "0.3.0"
+    "@nicknisi/pi-shared": "0.4.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "*"