@ashx-j/lunr 0.2.26 → 0.2.27

package/dist/builtin-extensions/pi-subagents/src/runs/foreground/subagent-executor.js

@@ -365,7 +365,7 @@ function resolveResumeTarget(params, state, options = {}) {
         throw asyncError;
     throw new Error("Run not found. Provide id or runId.");
 }
-function getAsyncInterruptTarget(state, runId, location, options = {}) {
+function getAsyncInterruptTarget(state, runId, location) {
     if (location?.asyncDir) {
         return {
             asyncId: location.resolvedId ?? runId ?? path.basename(location.asyncDir),
@@ -376,8 +376,7 @@ function getAsyncInterruptTarget(state, runId, location, options = {}) {
         const direct = state.asyncJobs.get(runId);
         if (direct)
             return { asyncId: direct.asyncId, asyncDir: direct.asyncDir };
-        if (options.fallbackToNewest === false)
-            return undefined;
+        return undefined;
     }
     let newest;
     for (const job of state.asyncJobs.values()) {
@@ -417,6 +416,13 @@ function interruptAsyncRun(state, runId, kill, location) {
     if (!target)
         return null;
     const status = reconcileAsyncRun(target.asyncDir, { kill }).status;
+    if (state.currentSessionId && status?.sessionId !== state.currentSessionId) {
+        return {
+            content: [{ type: "text", text: `Async run '${target.asyncId}' was not found in the active session.` }],
+            isError: true,
+            details: { mode: "management", results: [] },
+        };
+    }
     if (!status || status.state !== "running" || typeof status.pid !== "number") {
         return {
             content: [{ type: "text", text: `No running async run with an interrupt-capable pid was found for '${runId ?? "current"}'.` }],
@@ -446,7 +452,7 @@ function interruptAsyncRun(state, runId, kill, location) {
     }
 }
 function stopAsyncRun(state, runId, kill, location) {
-    const target = getAsyncInterruptTarget(state, runId, location, { fallbackToNewest: false });
+    const target = getAsyncInterruptTarget(state, runId, location);
     if (!target)
         return null;
     const status = reconcileAsyncRun(target.asyncDir, { kill }).status;
@@ -2291,7 +2297,14 @@ async function runForegroundParallelTasks(input) {
                 input.foregroundControl.updatedAt = Date.now();
             }
         });
-    }, input.globalSemaphore);
+    }, input.globalSemaphore, {
+        signal: input.signal,
+        onAbort: (task) => ({
+            agent: task.agent, task: task.task ?? "", exitCode: 1, messages: [],
+            usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 },
+            error: "Subagent launch cancelled.",
+        }),
+    });
 }
 async function runParallelPath(data, deps) {
     const { params, effectiveCwd, agents, ctx, signal, runId, sessionDirForIndex, sessionFileForIndex, sessionFileForTask, thinkingOverrideForTask, shareEnabled, artifactConfig, artifactsDir, backgroundRequestedWhileClarifying, onUpdate, sessionRoot, controlConfig, contextPolicy, } = data;
@@ -3123,6 +3136,13 @@ export function createSubagentExecutor(deps) {
             }
             if (action === "interrupt") {
                 const targetRunId = paramsWithResolvedCwd.runId ?? paramsWithResolvedCwd.id;
+                if (targetRunId !== undefined && !targetRunId.trim()) {
+                    return {
+                        content: [{ type: "text", text: "Explicit interrupt id must be non-empty." }],
+                        isError: true,
+                        details: { mode: "management", results: [] },
+                    };
+                }
                 let resolved;
                 if (targetRunId) {
                     try {