@ashx-j/lunr 0.2.25 → 0.2.27

package/dist/builtin-extensions/pi-subagents/src/runs/background/subagent-runner.js

@@ -23,7 +23,7 @@ import { isDynamicRunnerGroup, isParallelGroup, flattenSteps, mapConcurrent, agg
 import { applyThinkingSuffix, buildPiArgs, cleanupTempDir } from "../shared/pi-args.js";
 import { snapshotParentPermissionMode } from "../../../../../core/subagent-permission-inherit.js";
 import { resolveChildExcludeTools } from "../shared/child-tools.js";
-import { outputEntryFromAsyncResult, resolveOutputReferences } from "../shared/chain-outputs.js";
+import { outputEntryFromAsyncResult, resolveOutputReferences, withChainHandoff } from "../shared/chain-outputs.js";
 import { createStructuredOutputRuntime, readStructuredOutput } from "../shared/structured-output.js";
 import { readChildToolDiagnosticError } from "../shared/tool-availability.js";
 import { collectDynamicResults, DynamicFanoutError, materializeDynamicParallelStep, validateDynamicCollection } from "../shared/dynamic-fanout.js";
@@ -46,6 +46,7 @@ import { appendTurnBudgetSystemPrompt, formatTurnBudgetOutput, initialTurnBudget
 import { initialToolBudgetState, toolBudgetState } from "../shared/tool-budget.js";
 import { resolveWatchdogConfig } from "../../watchdog/settings.js";
 import { createBoundedByteTail, createBoundedLineReader, formatProtocolOutputLimit, MAX_CHILD_STDERR_BYTES, projectChildLifecycle } from "../shared/child-protocol.js";
+import { createChildEventDecoder } from "../../../../../core/subagent-event-transport.js";
 import { acquireSessionLease } from "../shared/session-lease.js";
 import { CHILD_WATCHDOG_CONFIG_ENV, acceptChildWatchdogEvent, childWatchdogIsActive, decodeChildWatchdogConfig, isChildWatchdogStatusEvent, resolveChildWatchdogConfig, } from "../../watchdog/child-status.js";
 const ASYNC_INTERRUPT_SIGNAL = process.platform === "win32" ? "SIGBREAK" : "SIGUSR2";
@@ -264,12 +265,16 @@ function runPiStreaming(args, cwd, outputFile, env, piPackageRoot, piArgv1, maxS
             else
                 transcriptWriter?.writeStderrLine(line);
         };
+        const decodeChildEvent = createChildEventDecoder();
         const processStdoutLine = (line) => {
             if (!line.trim())
                 return;
             let event;
             try {
-                event = JSON.parse(line);
+                const assembled = decodeChildEvent(line);
+                if (assembled === undefined)
+                    return;
+                event = JSON.parse(assembled);
             }
             catch {
                 rawStdoutTail.push(`${line}\n`);
@@ -791,6 +796,7 @@ export async function runSingleStep(step, ctx) {
         if (acceptancePrompt)
             task = `${task}\n${acceptancePrompt}`;
     }
+    task = withChainHandoff(task, ctx.handoffToNext === true);
     const sessionEnabled = Boolean(step.sessionFile) || ctx.sessionEnabled;
     const sessionDir = step.sessionFile ? undefined : ctx.sessionDir;
     let artifactPaths;
@@ -1245,6 +1251,7 @@ async function runSubagent(config, onWriterProcess) {
     const stopMessage = "Subagent stopped by user.";
     const timeoutAbortController = new AbortController();
     const stopAbortController = new AbortController();
+    const launchInterruptController = new AbortController();
     let previousCumulativeTokens = { input: 0, output: 0, total: 0 };
     let latestSessionFile;
     const flatSteps = flattenSteps(steps);
@@ -2133,11 +2140,18 @@ async function runSubagent(config, onWriterProcess) {
         }, 1000);
         activityTimer.unref?.();
     }
+    const launchCancellation = {
+        signal: combinedAbortSignal([timeoutAbortController.signal, stopAbortController.signal, launchInterruptController.signal]),
+        onAbort: (task) => stopped
+            ? stoppedStepResult(task.agent)
+            : timedOut ? timedOutStepResult(task.agent) : pausedStepResult(task.agent),
+    };
     const interruptRunner = () => {
         consumeInterruptRequest(asyncDir);
         if (interrupted || statusPayload.state !== "running")
             return;
         interrupted = true;
+        launchInterruptController.abort();
         const now = Date.now();
         statusPayload.state = "paused";
         currentActivityState = undefined;
@@ -2538,6 +2552,7 @@ async function runSubagent(config, onWriterProcess) {
                 const singleResult = await runSingleStep(task, {
                     supervisorSessionId: config.sessionId ?? undefined,
                     previousOutput, placeholder, cwd, sessionEnabled,
+                    handoffToNext: config.mode === "chain" && stepIndex < steps.length - 1,
                     outputs,
                     sessionDir: config.sessionDir ? path.join(config.sessionDir, `dynamic-${stepIndex}-${taskIdx}`) : undefined,
                     artifactsDir, artifactConfig, id,
@@ -2612,7 +2627,7 @@ async function runSubagent(config, onWriterProcess) {
                 if (singleResult.exitCode !== 0 && failFast)
                     aborted = true;
                 return stopped || childStopped ? { ...singleResult, output: stopMessage, error: stopMessage, exitCode: 1, interrupted: false, timedOut: false, stopped: true, skipped: false } : timedOut ? { ...singleResult, output: timeoutMessage ?? "Subagent timed out.", error: timeoutMessage ?? "Subagent timed out.", exitCode: 1, interrupted: false, timedOut: true, skipped: false } : { ...singleResult, skipped: false };
-            }, globalSemaphore);
+            }, globalSemaphore, launchCancellation);
             flatIndex += dynamicSteps.length;
             for (const pr of parallelResults) {
                 results.push({
@@ -2843,6 +2858,7 @@ async function runSubagent(config, onWriterProcess) {
                     const singleResult = await runSingleStep(taskForRun, {
                         supervisorSessionId: config.sessionId ?? undefined,
                         previousOutput, placeholder, cwd: taskCwd, sessionEnabled,
+                        handoffToNext: config.mode === "chain" && stepIndex < steps.length - 1,
                         outputs,
                         sessionDir: taskSessionDir,
                         artifactsDir, artifactConfig, id,
@@ -2934,7 +2950,7 @@ async function runSubagent(config, onWriterProcess) {
                     if (singleResult.exitCode !== 0 && failFast)
                         aborted = true;
                     return stopped || childStopped ? { ...singleResult, output: stopMessage, error: stopMessage, exitCode: 1, interrupted: false, timedOut: false, stopped: true, skipped: false } : timedOut ? { ...singleResult, output: timeoutMessage ?? "Subagent timed out.", error: timeoutMessage ?? "Subagent timed out.", exitCode: 1, interrupted: false, timedOut: true, skipped: false } : { ...singleResult, skipped: false };
-                }, globalSemaphore);
+                }, globalSemaphore, launchCancellation);
                 flatIndex += group.parallel.length;
                 for (let t = 0; t < group.parallel.length; t++) {
                     const fi = groupStartFlatIndex + t;
@@ -3048,6 +3064,7 @@ async function runSubagent(config, onWriterProcess) {
             const singleResult = await runSingleStep(seqStep, {
                 supervisorSessionId: config.sessionId ?? undefined,
                 previousOutput, placeholder, cwd, sessionEnabled,
+                handoffToNext: config.mode === "chain" && stepIndex < steps.length - 1,
                 outputs: statusPayload.mode === "single" ? undefined : outputs,
                 sessionDir: config.sessionDir,
                 artifactsDir, artifactConfig, id,