@ashx-j/lunr 0.2.11 → 0.2.13

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

@@ -21,7 +21,8 @@ import { DEFAULT_MAX_OUTPUT, SUBAGENT_LIFECYCLE_ARTIFACT_VERSION, truncateOutput
 import { DEFAULT_CONTROL_CONFIG, buildControlEvent, deriveActivityState, claimControlNotification, formatControlIntercomMessage, formatControlNoticeMessage, } from "../shared/subagent-control.js";
 import { isDynamicRunnerGroup, isParallelGroup, flattenSteps, mapConcurrent, aggregateParallelOutputs, MAX_PARALLEL_CONCURRENCY, DEFAULT_GLOBAL_CONCURRENCY_LIMIT, Semaphore, } from "../shared/parallel-utils.js";
 import { applyThinkingSuffix, buildPiArgs, cleanupTempDir } from "../shared/pi-args.js";
-import { filterToolsForInheritedChild, snapshotParentPermissionMode } from "../../../../../core/subagent-permission-inherit.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 { createStructuredOutputRuntime, readStructuredOutput } from "../shared/structured-output.js";
 import { readChildToolDiagnosticError } from "../shared/tool-availability.js";
@@ -853,6 +854,11 @@ async function runSingleStep(step, ctx) {
             })
             : undefined;
         const parentPermissionMode = step.parentPermissionMode ?? snapshotParentPermissionMode(step.parentSessionId);
+        const childPermission = step.permissions === "read-only" || parentPermissionMode === "plan" ? "read-only" : "full";
+        const excludeTools = resolveChildExcludeTools({
+            permissions: childPermission,
+            fanoutAuthorized: Array.isArray(step.tools) && step.tools.includes("subagent"),
+        });
         const { args, env, tempDir, toolDiagnosticPath } = buildPiArgs({
             parentSessionId: step.parentSessionId,
             baseArgs: ["--mode", "json", "-p"],
@@ -861,21 +867,21 @@ async function runSingleStep(step, ctx) {
             sessionDir,
             sessionFile: step.sessionFile,
             model: candidate,
-            inheritProjectContext: step.inheritProjectContext,
-            inheritSkills: step.inheritSkills,
+            inheritProjectContext: true,
+            inheritSkills: false,
             requireReadTool: Boolean(step.skills?.length),
-            tools: filterToolsForInheritedChild(step.tools, parentPermissionMode),
-            extensions: step.extensions,
-            subagentOnlyExtensions: step.subagentOnlyExtensions,
-            systemPrompt: appendTurnBudgetSystemPrompt(step.systemPrompt ?? "", ctx.turnBudget),
-            systemPromptMode: step.systemPromptMode,
-            mcpDirectTools: step.mcpDirectTools,
+            excludeTools,
+            childPermission,
+            childId: step.childId ?? step.agent,
+            childDescription: step.description ?? step.agent,
+            systemPrompt: appendTurnBudgetSystemPrompt(step.systemPrompt && !step.systemPrompt.includes("You are `") ? step.systemPrompt : "", ctx.turnBudget) || undefined,
+            systemPromptMode: "append",
             cwd: step.cwd ?? ctx.cwd,
-            promptFileStem: step.agent,
+            promptFileStem: step.childId ?? step.agent,
             intercomSessionName: ctx.childIntercomTarget,
             orchestratorIntercomTarget: ctx.orchestratorIntercomTarget,
             runId: ctx.id,
-            childAgentName: step.agent,
+            childAgentName: step.childId ?? step.agent,
             childIndex: ctx.flatIndex,
             parentEventSink: ctx.nestedRoute?.eventSink,
             parentControlInbox: ctx.nestedRoute?.controlInbox,
@@ -1081,6 +1087,9 @@ async function runSingleStep(step, ctx) {
         }
     }
     return {
+        childId: step.childId,
+        description: step.description,
+        permissions: step.permissions,
         agent: step.agent,
         output: outputForSummary,
         exitCode: effectiveFinalExitCode,
@@ -1250,6 +1259,9 @@ async function runSubagent(config, onWriterProcess) {
                 const taskFlatIndex = flatStepCount;
                 const transcriptPath = resolveAsyncStepTranscriptPath({ artifactsDir, artifactConfig, runId: id, agent: task.agent, flatIndex: taskFlatIndex, flatStepCount: initialFlatStepCount });
                 initialStatusSteps.push({
+                    childId: task.childId,
+                    description: task.description,
+                    permissions: task.permissions,
                     agent: task.agent,
                     phase: task.phase,
                     label: task.label,
@@ -1288,6 +1300,9 @@ async function runSubagent(config, onWriterProcess) {
             const stepFlatIndex = flatStepCount;
             const transcriptPath = resolveAsyncStepTranscriptPath({ artifactsDir, artifactConfig, runId: id, agent: step.agent, flatIndex: stepFlatIndex, flatStepCount: initialFlatStepCount });
             initialStatusSteps.push({
+                childId: step.childId,
+                description: step.description,
+                permissions: step.permissions,
                 agent: step.agent,
                 phase: step.phase,
                 label: step.label,
@@ -1617,7 +1632,7 @@ async function runSubagent(config, onWriterProcess) {
         mutatingFailureStates.push(...Array.from({ length: added.addedFlatSteps }, () => createMutatingFailureState()));
         pendingToolResults.push(...Array.from({ length: added.addedFlatSteps }, () => undefined));
         if (config.childIntercomTargets) {
-            config.childIntercomTargets = statusPayload.steps.map((statusStep, index) => resolveSubagentIntercomTarget(id, statusStep.agent, index));
+            config.childIntercomTargets = statusPayload.steps.map((statusStep, index) => resolveSubagentIntercomTarget(id, statusStep.childId ?? statusStep.agent, index));
         }
         writeStatusPayload();
         for (const request of requests) {
@@ -2430,7 +2445,7 @@ async function runSubagent(config, onWriterProcess) {
             });
             statusPayload.steps.splice(groupStartFlatIndex, 1, ...dynamicStatusSteps);
             if (config.childIntercomTargets) {
-                config.childIntercomTargets = statusPayload.steps.map((statusStep, index) => resolveSubagentIntercomTarget(id, statusStep.agent, index));
+                config.childIntercomTargets = statusPayload.steps.map((statusStep, index) => resolveSubagentIntercomTarget(id, statusStep.childId ?? statusStep.agent, index));
             }
             mutatingFailureStates.splice(groupStartFlatIndex, 1, ...dynamicStatusSteps.map(() => createMutatingFailureState()));
             pendingToolResults.splice(groupStartFlatIndex, 1, ...dynamicStatusSteps.map(() => undefined));
@@ -3338,6 +3353,9 @@ async function runSubagent(config, onWriterProcess) {
             ...(statusPayload.toolBudgetBlocked ? { toolBudgetBlocked: true } : {}),
             ...(stopped ? { stopped: true, error: stopMessage } : timedOut ? { timedOut: true, error: timeoutMessage ?? "Subagent timed out." } : turnBudgetExceeded ? { error: statusPayload.error ?? "Subagent exceeded turn budget." } : {}),
             results: results.map((r) => ({
+                childId: r.childId,
+                description: r.description,
+                permissions: r.permissions,
                 agent: r.agent,
                 output: r.output,
                 error: r.error,