@ashx-j/lunr 0.2.19 → 0.2.21

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

@@ -10,7 +10,7 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 import { spawn, spawnSync } from "node:child_process";
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { pathToFileURL } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { writeAtomicJson } from "../../shared/atomic-json.js";
 import { createChildTranscriptWriter } from "../../shared/child-transcript.js";
 import { closeSteerInbox, consumeInterruptRequest, consumeSteerRequests, deliverInterruptRequest, deliverStopRequest, deliverTimeoutRequest, enqueueStepSteer, steerAcksDir, steerCapabilityPath, stepSteerInboxDir, watchAsyncControlInbox } from "./control-channel.js";
@@ -704,7 +704,7 @@ function writeRunLog(logPath, input) {
     fs.writeFileSync(logPath, lines.join("\n"), "utf-8");
 }
 /** Run a single pi agent step, returning output and metadata */
-async function runSingleStep(step, ctx) {
+export async function runSingleStep(step, ctx) {
     if (step.importAsyncRoot) {
         let importTimedOut = false;
         let importStopped = false;
@@ -785,7 +785,7 @@ async function runSingleStep(step, ctx) {
     let task = step.task.replace(placeholderRegex, () => ctx.previousOutput);
     if (ctx.outputs)
         task = resolveOutputReferences(task, ctx.outputs);
-    const taskForCompletionGuard = task;
+    const taskForCompletionGuard = step.completionTask ?? task;
     if (step.effectiveAcceptance) {
         const acceptancePrompt = formatAcceptancePrompt(step.effectiveAcceptance);
         if (acceptancePrompt)
@@ -861,6 +861,7 @@ async function runSingleStep(step, ctx) {
         });
         const { args, env, tempDir, toolDiagnosticPath } = buildPiArgs({
             parentSessionId: step.parentSessionId,
+            supervisorSessionId: ctx.supervisorSessionId,
             baseArgs: ["--mode", "json", "-p"],
             task,
             sessionEnabled,
@@ -936,7 +937,7 @@ async function runSingleStep(step, ctx) {
         }
         const completionGuard = run.exitCode === 0 && !run.error && !toolAvailabilityError && !hiddenError?.hasError && !emptyOutputError && step.completionGuard !== false
             ? evaluateCompletionMutationGuard({
-                agent: step.agent,
+                permissions: childPermission,
                 task: taskForCompletionGuard,
                 messages: run.messages,
                 tools: step.tools,
@@ -1676,6 +1677,10 @@ async function runSubagent(config, onWriterProcess) {
     const pendingToolResults = initialStatusSteps.map(() => undefined);
     const mutatingFailureWindowMs = 5 * 60_000;
     const appendControlEvent = (event) => {
+        if (event.reason === "completion_guard") {
+            appendJsonl(eventsPath, JSON.stringify({ type: "subagent.control", event, channels: [] }));
+            return;
+        }
         if (!controlConfig.enabled)
             return;
         const childIntercomTarget = config.childIntercomTargets?.[event.index ?? statusPayload.currentStep];
@@ -1777,6 +1782,9 @@ async function runSubagent(config, onWriterProcess) {
         return updated;
     };
     const emitTerminalSteeringNotice = (requestId, failureMessage) => {
+        // Question outcomes are reconciled by the supervisor channel, not actionable steering notices.
+        if (steeringStatus(statusPayload).recent.find((request) => request.id === requestId)?.source === "supervisor-question")
+            return;
         const state = terminalSteeringNoticeState(steeringStatus(statusPayload), requestId);
         if (state === "partial")
             emitSteeringNotice(requestId, "partial", `Steering partially delivered for run ${id}.`);
@@ -2528,6 +2536,7 @@ async function runSubagent(config, onWriterProcess) {
                 appendJsonl(eventsPath, JSON.stringify({ type: "subagent.step.started", ts: taskStartTime, runId: id, stepIndex: fi, agent: task.agent }));
                 flushPendingStepSteers(fi);
                 const singleResult = await runSingleStep(task, {
+                    supervisorSessionId: config.sessionId ?? undefined,
                     previousOutput, placeholder, cwd, sessionEnabled,
                     outputs,
                     sessionDir: config.sessionDir ? path.join(config.sessionDir, `dynamic-${stepIndex}-${taskIdx}`) : undefined,
@@ -2832,6 +2841,7 @@ async function runSubagent(config, onWriterProcess) {
                     const { taskForRun, taskCwd } = prepareParallelTaskRun(task, cwd, worktreeSetup, taskIdx);
                     flushPendingStepSteers(fi);
                     const singleResult = await runSingleStep(taskForRun, {
+                        supervisorSessionId: config.sessionId ?? undefined,
                         previousOutput, placeholder, cwd: taskCwd, sessionEnabled,
                         outputs,
                         sessionDir: taskSessionDir,
@@ -3036,6 +3046,7 @@ async function runSubagent(config, onWriterProcess) {
             }));
             flushPendingStepSteers(flatIndex);
             const singleResult = await runSingleStep(seqStep, {
+                supervisorSessionId: config.sessionId ?? undefined,
                 previousOutput, placeholder, cwd, sessionEnabled,
                 outputs: statusPayload.mode === "single" ? undefined : outputs,
                 sessionDir: config.sessionDir,
@@ -3499,39 +3510,43 @@ function startConfiguredSubagent(config) {
         process.exit(1);
     });
 }
-const configArg = process.argv[2];
-if (configArg) {
-    try {
-        const configJson = fs.readFileSync(configArg, "utf-8");
-        const config = JSON.parse(configJson);
-        try {
-            fs.unlinkSync(configArg);
-        }
-        catch {
-            // Temp config cleanup is best effort.
-        }
-        startConfiguredSubagent(config);
-    }
-    catch (err) {
-        console.error("Subagent runner error:", err);
-        process.exit(1);
-    }
-}
-else {
-    let input = "";
-    process.stdin.setEncoding("utf-8");
-    process.stdin.on("data", (chunk) => {
-        input += chunk;
-    });
-    process.stdin.on("end", () => {
+function main() {
+    const configArg = process.argv[2];
+    if (configArg) {
         try {
-            const config = JSON.parse(input);
+            const configJson = fs.readFileSync(configArg, "utf-8");
+            const config = JSON.parse(configJson);
+            try {
+                fs.unlinkSync(configArg);
+            }
+            catch {
+                // Temp config cleanup is best effort.
+            }
             startConfiguredSubagent(config);
         }
         catch (err) {
             console.error("Subagent runner error:", err);
             process.exit(1);
         }
-    });
+    }
+    else {
+        let input = "";
+        process.stdin.setEncoding("utf-8");
+        process.stdin.on("data", (chunk) => {
+            input += chunk;
+        });
+        process.stdin.on("end", () => {
+            try {
+                const config = JSON.parse(input);
+                startConfiguredSubagent(config);
+            }
+            catch (err) {
+                console.error("Subagent runner error:", err);
+                process.exit(1);
+            }
+        });
+    }
 }
+if (process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url))
+    main();
 //# sourceMappingURL=subagent-runner.js.map