@ashx-j/lunr 0.2.20 → 0.2.21

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

@@ -43,7 +43,7 @@ import { attachRootChildrenToSteps, createNestedRoute, readNestedControlResults,
 import { resolveSubagentRunId } from "../background/run-id-resolver.js";
 import { formatNestedRunStatusLines } from "../shared/nested-render.js";
 import { inspectSubagentStatus } from "../background/run-status.js";
-import { applyForceTopLevelAsyncOverride } from "../background/top-level-async.js";
+import { subagentLaunchRunsAsync } from "../background/top-level-async.js";
 import { cleanupWorktrees, createWorktrees, diffWorktrees, findWorktreeTaskCwdConflict, formatWorktreeDiffSummary, formatWorktreeTaskCwdConflict, } from "../shared/worktree.js";
 import { ASYNC_DIR, DEFAULT_ARTIFACT_CONFIG, DEFAULT_FORK_PREAMBLE, RESULTS_DIR, SUBAGENT_ACTIONS, SUBAGENT_CONTROL_EVENT, SUBAGENT_CONTROL_INTERCOM_EVENT, SUBAGENT_FOREGROUND_COMPLETE_EVENT, checkSubagentDepth, resolveMaxSubagentSpawnsPerSession, resolveTopLevelParallelConcurrency, resolveTopLevelParallelMaxTasks, resolveChildMaxSubagentDepth, resolveCurrentMaxSubagentDepth, wrapForkTask, } from "../../shared/types.js";
 const MUTATING_MANAGEMENT_ACTIONS = new Set(["create", "update", "delete", "eject", "disable", "enable", "reset"]);
@@ -1083,6 +1083,7 @@ async function resumeAsyncRun(input) {
     }
     const result = executeAsyncSingle(runId, {
         spec: recoverySpec,
+        completionTask: followUp,
         goal: followUp,
         ctx: {
             pi: input.deps.pi,
@@ -2905,7 +2906,7 @@ function foregroundCapacityResult(params, inFlight, limit) {
     return {
         content: [{
                 type: "text",
-                text: `Foreground subagent capacity reached (${inFlight}/${limit} running). Wait for a child to finish, use ONE subagent call with tasks: [{task, description}, …], or set async: true.`,
+                text: `Foreground subagent capacity reached (${inFlight}/${limit} running). Wait for a child to finish, combine work in ONE tasks call, or launch without async:false or clarify:true when foreground execution is unnecessary.`,
             }],
         isError: true,
         details: { mode: inferExecutionMode(params), results: [] },
@@ -3165,7 +3166,7 @@ export function createSubagentExecutor(deps) {
         if (normalized.error)
             return normalized.error;
         const normalizedParams = normalized.params;
-        let effectiveParams = applyForceTopLevelAsyncOverride(normalizedParams, depth, deps.config.forceTopLevelAsync === true);
+        let effectiveParams = normalizedParams;
         const runToolBudget = resolveToolBudget(effectiveParams.toolBudget, "toolBudget");
         if (runToolBudget.error)
             return buildRequestedModeError(effectiveParams, runToolBudget.error);
@@ -3245,9 +3246,10 @@ export function createSubagentExecutor(deps) {
         catch (error) {
             return toExecutionErrorResult(effectiveParams, error);
         }
-        const requestedAsync = effectiveParams.async ?? deps.asyncByDefault;
-        const backgroundRequestedWhileClarifying = (hasChain || hasTasks) && requestedAsync && effectiveParams.clarify === true;
-        const effectiveAsync = requestedAsync && effectiveParams.clarify !== true;
+        const backgroundRequestedWhileClarifying = (hasChain || hasTasks)
+            && effectiveParams.async === true
+            && effectiveParams.clarify === true;
+        const effectiveAsync = subagentLaunchRunsAsync(effectiveParams);
         const controlConfig = resolveControlConfig(deps.config.control, effectiveParams.control);
         const artifactConfig = {
             ...DEFAULT_ARTIFACT_CONFIG,
@@ -3478,9 +3480,7 @@ export function createSubagentExecutor(deps) {
         const requestParams = resolveSubagentRequestParams(params);
         if (requestParams.action)
             return execute(id, requestParams, signal, onUpdate, ctx);
-        const { depth } = checkSubagentDepth(deps.config.maxSubagentDepth);
-        const dispatchParams = applyForceTopLevelAsyncOverride(requestParams, depth, deps.config.forceTopLevelAsync === true);
-        const runsForeground = dispatchParams.clarify === true || (dispatchParams.async ?? deps.asyncByDefault) !== true;
+        const runsForeground = !subagentLaunchRunsAsync(requestParams);
         if (!runsForeground)
             return execute(id, requestParams, signal, onUpdate, ctx);
         const limit = resolveTopLevelParallelConcurrency(undefined, deps.config.parallel?.concurrency);