@ashx-j/lunr 0.2.11 → 0.2.13

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

@@ -5,20 +5,21 @@
 import { spawn } from "node:child_process";
 import { splitKnownThinkingSuffix } from "../../shared/model-info.js";
 import { existsSync, unlinkSync } from "node:fs";
-import * as path from "node:path";
+import { childRowLabel } from "../../shared/types.js";
 import { ensureArtifactsDir, getArtifactPaths, writeArtifact, writeMetadata, } from "../../shared/artifacts.js";
 import { createChildTranscriptWriter } from "../../shared/child-transcript.js";
 import { DEFAULT_MAX_OUTPUT, INTERCOM_DETACH_REQUEST_EVENT, INTERCOM_DETACH_RESPONSE_EVENT, truncateOutput, getSubagentDepthEnv, } from "../../shared/types.js";
 import { DEFAULT_CONTROL_CONFIG, buildControlEvent, claimControlNotification, deriveActivityState, shouldNotifyControlEvent, } from "../shared/subagent-control.js";
 import { getFinalOutput, findLatestSessionFile, detectSubagentError, extractToolArgsPreview, extractTextFromContent, } from "../../shared/utils.js";
 import { buildSkillInjection, resolveSkillsWithFallback } from "../../agents/skills.js";
-import { buildAgentMemoryInjection } from "../../agents/agent-memory.js";
+import { resolveChildExcludeTools } from "../shared/child-tools.js";
+import { normalizeSkillInput } from "../../agents/skills.js";
 import { evaluateCompletionMutationGuard } from "../shared/completion-guard.js";
 import { getPiSpawnCommand } from "../shared/pi-spawn.js";
 import { createJsonlWriter } from "../../shared/jsonl-writer.js";
 import { attachPostExitStdioGuard, trySignalChild } from "../../shared/post-exit-stdio-guard.js";
 import { applyThinkingSuffix, buildPiArgs, cleanupTempDir } from "../shared/pi-args.js";
-import { filterToolsForInheritedChild, snapshotParentPermissionMode } from "../../../../../core/subagent-permission-inherit.js";
+import { PLAN_MODE_WRITE_SPAWN_ERROR, resolveChildPermissions, snapshotParentPermissionMode } from "../../../../../core/subagent-permission-inherit.js";
 import { readStructuredOutput } from "../shared/structured-output.js";
 import { readChildToolDiagnosticError } from "../shared/tool-availability.js";
 import { captureSingleOutputSnapshot, extractChildWrittenOutput, formatSavedOutputReference, injectOutputPathSystemPrompt, resolveSingleOutput, validateFileOnlyOutputMode } from "../shared/single-output.js";
@@ -130,19 +131,23 @@ function snapshotResult(result, progress) {
         outputReference: result.outputReference ? { ...result.outputReference } : undefined,
     };
 }
-async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared) {
-    const effectiveThinking = options.thinkingOverride ?? agent.thinking;
+async function runSingleAttempt(runtimeCwd, spec, task, model, options, shared) {
+    const effectiveThinking = options.thinkingOverride;
     const modelArg = applyThinkingSuffix(model, effectiveThinking, options.thinkingOverride !== undefined);
     const watchdogConfig = resolveWatchdogConfig(options.cwd ?? runtimeCwd);
     const childWatchdog = watchdogConfig.ok
         ? resolveChildWatchdogConfig({
             config: watchdogConfig.config,
-            agent: agent.name,
+            agent: spec.childId,
             runId: options.runId,
             childIndex: options.index ?? 0,
         })
         : undefined;
-    const parentPermissionMode = snapshotParentPermissionMode(options.parentSessionId);
+    const excludeTools = resolveChildExcludeTools({
+        permissions: spec.effectivePermissions,
+        fanoutAuthorized: spec.fanoutAuthorized,
+    });
+    const appendPrompt = appendTurnBudgetSystemPrompt(shared.systemPrompt, options.turnBudget);
     const { args, env: sharedEnv, tempDir, toolDiagnosticPath } = buildPiArgs({
         baseArgs: ["--mode", "json", "-p"],
         task,
@@ -151,21 +156,21 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
         sessionFile: options.sessionFile,
         model: modelArg,
         thinking: effectiveThinking,
-        systemPromptMode: agent.systemPromptMode,
-        inheritProjectContext: agent.inheritProjectContext,
-        inheritSkills: agent.inheritSkills,
+        systemPromptMode: "append",
+        inheritProjectContext: true,
+        inheritSkills: false,
         requireReadTool: Boolean(shared.resolvedSkillNames?.length),
-        tools: filterToolsForInheritedChild(agent.tools, parentPermissionMode),
-        extensions: agent.extensions,
-        subagentOnlyExtensions: agent.subagentOnlyExtensions,
-        systemPrompt: appendTurnBudgetSystemPrompt(shared.systemPrompt, options.turnBudget),
-        mcpDirectTools: agent.mcpDirectTools,
+        excludeTools,
+        childPermission: spec.effectivePermissions,
+        childId: spec.childId,
+        childDescription: spec.description,
+        systemPrompt: appendPrompt || undefined,
         cwd: options.cwd ?? runtimeCwd,
-        promptFileStem: agent.name,
+        promptFileStem: spec.childId,
         intercomSessionName: options.intercomSessionName,
         orchestratorIntercomTarget: options.orchestratorIntercomTarget,
         runId: options.runId,
-        childAgentName: agent.name,
+        childAgentName: spec.childId,
         childIndex: options.index ?? 0,
         parentEventSink: options.nestedRoute?.eventSink,
         parentControlInbox: options.nestedRoute?.controlInbox,
@@ -176,11 +181,13 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
         toolBudget: options.toolBudget,
         childWatchdog,
         waitToolEnabled: options.waitToolEnabled,
-        parentPermissionMode,
     });
     const thinkingFromModel = modelArg ? splitKnownThinkingSuffix(modelArg).thinkingSuffix.slice(1) || undefined : undefined;
     const result = {
-        agent: agent.name,
+        childId: spec.childId,
+        description: spec.description,
+        permissions: spec.effectivePermissions,
+        agent: spec.description,
         task: shared.originalTask ?? task,
         exitCode: 0,
         messages: [],
@@ -220,7 +227,10 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
     };
     const progress = {
         index: options.index ?? 0,
-        agent: agent.name,
+        childId: spec.childId,
+        description: spec.description,
+        permissions: spec.effectivePermissions,
+        agent: spec.description,
         status: "running",
         task,
         skills: shared.resolvedSkillNames,
@@ -413,14 +423,14 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
             if (hasRoute) {
                 if (typeof event.runId === "string" && event.runId !== options.runId)
                     return;
-                if (typeof event.agent === "string" && event.agent !== agent.name)
+                if (typeof event.agent === "string" && event.agent !== spec.childId && event.agent !== spec.description)
                     return;
                 if (typeof event.childIndex === "number" && event.childIndex !== (options.index ?? 0))
                     return;
             }
             else if (!intercomStarted)
                 return;
-            options.intercomEvents?.emit(INTERCOM_DETACH_RESPONSE_EVENT, { requestId, accepted: true, runId: options.runId, agent: agent.name, childIndex: options.index ?? 0 });
+            options.intercomEvents?.emit(INTERCOM_DETACH_RESPONSE_EVENT, { requestId, accepted: true, runId: options.runId, agent: spec.childId, childIndex: options.index ?? 0 });
             detachForIntercom();
         });
         const finish = (code) => {
@@ -467,7 +477,7 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
                 from: previous,
                 to: "needs_attention",
                 runId: options.runId,
-                agent: agent.name,
+                agent: spec.description,
                 index: options.index,
                 ts: now,
                 lastActivityAt: progress.lastActivityAt,
@@ -495,10 +505,10 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
                 from: previous,
                 to: "active_long_running",
                 runId: options.runId,
-                agent: agent.name,
+                agent: spec.description,
                 index: options.index,
                 ts: now,
-                message: `${agent.name} is still active but long-running`,
+                message: `${spec.description} is still active but long-running`,
                 reason,
                 turns: result.usage.turns,
                 tokens: progress.tokens,
@@ -623,7 +633,10 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
                     current: childWatchdogState,
                     event: evt,
                     runId: options.runId,
-                    agent: agent.name,
+                    childId: spec.childId,
+                    description: spec.description,
+                    permissions: spec.effectivePermissions,
+                    agent: spec.description,
                     childIndex: options.index ?? 0,
                 });
                 if (!next)
@@ -750,7 +763,7 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
                     }, mutatingFailureWindowMs);
                     if (shouldEscalateMutatingFailures(mutatingFailures, controlConfig.failedToolAttemptsBeforeAttention)) {
                         emitNeedsAttention(now, {
-                            message: `${agent.name} needs attention after repeated mutating tool failures`,
+                            message: `${spec.description} needs attention after repeated mutating tool failures`,
                             reason: "tool_failures",
                             currentTool: toolSnapshot.tool,
                             currentPath: toolSnapshot.path,
@@ -1063,13 +1076,12 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
         const note = turnBudgetSoftNote(result.turnBudget, result.turnBudget.wrapUpRequestedAtTurn ?? result.turnBudget.turnCount);
         fullOutput = fullOutput.trim() ? `${note}\n\n${fullOutput}` : note;
     }
-    const completionGuard = result.exitCode === 0 && !result.error && agent.completionGuard !== false
+    const completionGuard = result.exitCode === 0 && !result.error
         ? evaluateCompletionMutationGuard({
-            agent: agent.name,
+            agent: spec.effectivePermissions,
             task: shared.originalTask ?? task,
             messages: result.messages,
-            tools: agent.tools,
-            mcpDirectTools: agent.mcpDirectTools,
+            tools: spec.effectivePermissions === "read-only" ? ["read", "grep", "find", "ls", "bash"] : undefined,
         })
         : undefined;
     if (completionGuard?.triggered && !observedMutationAttempt) {
@@ -1080,11 +1092,11 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
         emitControlEvent(buildControlEvent({
             from: progress.activityState,
             to: "needs_attention",
-            runId: options.runId ?? agent.name,
-            agent: agent.name,
+            runId: options.runId ?? spec.childId,
+            agent: spec.description,
             index: options.index,
             ts: Date.now(),
-            message: `${agent.name} completed without making edits for an implementation task`,
+            message: `${spec.description} completed without making edits for an implementation task`,
             reason: "completion_guard",
         }));
     }
@@ -1123,22 +1135,32 @@ async function runSingleAttempt(runtimeCwd, agent, task, model, options, shared)
 /**
  * Run a subagent synchronously (blocking until complete)
  */
-export async function runSync(runtimeCwd, agents, agentName, task, options) {
-    const agent = agents.find((a) => a.name === agentName);
-    if (!agent) {
+export async function runSync(runtimeCwd, spec, options) {
+    const task = spec.task;
+    const label = childRowLabel(spec);
+    const parentMode = snapshotParentPermissionMode(options.parentSessionId);
+    const resolvedPermissions = resolveChildPermissions(parentMode, spec.requestedPermissions);
+    if (!resolvedPermissions.ok) {
+        const error = resolvedPermissions.error || PLAN_MODE_WRITE_SPAWN_ERROR;
         return {
-            agent: agentName,
+            childId: spec.childId,
+            description: spec.description,
+            permissions: spec.effectivePermissions,
+            agent: spec.description,
             task,
             exitCode: 1,
             messages: [],
             usage: emptyUsage(),
-            error: `Unknown agent: ${agentName}`,
+            error,
         };
     }
-    const outputModeValidationError = validateFileOnlyOutputMode(options.outputMode, options.outputPath, `Single run (${agentName})`);
+    const outputModeValidationError = validateFileOnlyOutputMode(options.outputMode, options.outputPath, `Single run (${label})`);
     if (outputModeValidationError) {
         return {
-            agent: agentName,
+            childId: spec.childId,
+            description: spec.description,
+            permissions: spec.effectivePermissions,
+            agent: spec.description,
             task,
             exitCode: 1,
             messages: [],
@@ -1149,9 +1171,8 @@ export async function runSync(runtimeCwd, agents, agentName, task, options) {
     }
     const shareEnabled = options.share === true;
     const effectiveAcceptance = resolveEffectiveAcceptance({
-        explicit: options.acceptance,
-        agentName,
-        acceptanceRole: agent.acceptanceRole,
+        explicit: options.acceptance ?? spec.acceptance,
+        permissions: spec.effectivePermissions,
         task,
         mode: options.acceptanceContext?.mode ?? "single",
         async: options.acceptanceContext?.async,
@@ -1161,12 +1182,15 @@ export async function runSync(runtimeCwd, agents, agentName, task, options) {
     const acceptancePrompt = formatAcceptancePrompt(effectiveAcceptance);
     const taskWithAcceptance = acceptancePrompt ? `${task}\n${acceptancePrompt}` : task;
     const sessionEnabled = Boolean(options.sessionFile || options.sessionDir) || shareEnabled;
-    const skillNames = options.skills ?? agent.skills ?? [];
-    const skillCwd = options.cwd ?? runtimeCwd;
-    const { resolved: resolvedSkills, missing: missingSkills } = resolveSkillsWithFallback(skillNames, skillCwd, runtimeCwd, agent.skillPath, agent.filePath ? path.dirname(agent.filePath) : skillCwd);
+    const skillNames = options.skills ?? (spec.skill === false ? [] : (normalizeSkillInput(spec.skill) || []));
+    const skillCwd = options.cwd ?? spec.cwd ?? runtimeCwd;
+    const { resolved: resolvedSkills, missing: missingSkills } = resolveSkillsWithFallback(skillNames, skillCwd, runtimeCwd, undefined, skillCwd);
     if (skillNames.some((skill) => skill.trim() === "pi-subagents") && missingSkills.includes("pi-subagents")) {
         return {
-            agent: agentName,
+            childId: spec.childId,
+            description: spec.description,
+            permissions: spec.effectivePermissions,
+            agent: spec.description,
             task,
             exitCode: 1,
             messages: [],
@@ -1174,17 +1198,14 @@ export async function runSync(runtimeCwd, agents, agentName, task, options) {
             error: "Skills not found: pi-subagents",
         };
     }
-    let systemPrompt = agent.systemPrompt?.trim() || "";
+    let systemPrompt = "";
     if (resolvedSkills.length > 0) {
-        const skillInjection = buildSkillInjection(resolvedSkills);
-        systemPrompt = systemPrompt ? `${systemPrompt}\n\n${skillInjection}` : skillInjection;
-    }
-    const memoryInjection = buildAgentMemoryInjection(agent, skillCwd);
-    if (memoryInjection) {
-        systemPrompt = systemPrompt ? `${systemPrompt}\n\n${memoryInjection}` : memoryInjection;
+        systemPrompt = buildSkillInjection(resolvedSkills);
     }
-    systemPrompt = injectOutputPathSystemPrompt(systemPrompt, options.outputPath, agent);
-    const candidates = buildModelCandidates(options.modelOverride ?? agent.model, agent.fallbackModels, options.availableModels, options.preferredModelProvider, { scope: options.modelScope });
+    systemPrompt = injectOutputPathSystemPrompt(systemPrompt, options.outputPath, {
+        tools: spec.effectivePermissions === "read-only" ? ["read", "grep", "find", "ls", "bash"] : undefined,
+    });
+    const candidates = buildModelCandidates(options.modelOverride ?? spec.model, undefined, options.availableModels, options.preferredModelProvider, { scope: options.modelScope });
     const attemptedModels = [];
     const modelAttempts = [];
     const aggregateUsage = emptyUsage();
@@ -1195,10 +1216,10 @@ export async function runSync(runtimeCwd, agents, agentName, task, options) {
     let jsonlPath;
     let transcriptWriter;
     if (options.artifactsDir && options.artifactConfig?.enabled !== false) {
-        artifactPathsResult = getArtifactPaths(options.artifactsDir, options.runId, agentName, options.index);
+        artifactPathsResult = getArtifactPaths(options.artifactsDir, options.runId, spec.childId, options.index);
         ensureArtifactsDir(options.artifactsDir);
         if (options.artifactConfig?.includeInput !== false) {
-            writeArtifact(artifactPathsResult.inputPath, `# Task for ${agentName}\n\n${taskWithAcceptance}`);
+            writeArtifact(artifactPathsResult.inputPath, `# Task for ${label}\n\n${taskWithAcceptance}`);
         }
         if (options.artifactConfig?.includeJsonl !== false) {
             jsonlPath = artifactPathsResult.jsonlPath;
@@ -1208,7 +1229,7 @@ export async function runSync(runtimeCwd, agents, agentName, task, options) {
                 transcriptPath: artifactPathsResult.transcriptPath,
                 source: "foreground",
                 runId: options.runId,
-                agent: agentName,
+                agent: spec.childId,
                 childIndex: options.index,
                 cwd: options.cwd ?? runtimeCwd,
             });
@@ -1220,7 +1241,9 @@ export async function runSync(runtimeCwd, agents, agentName, task, options) {
             return;
         writeMetadata(artifactPathsResult.metadataPath, {
             runId: options.runId,
-            agent: agentName,
+            childId: spec.childId,
+            description: spec.description,
+            permissions: spec.effectivePermissions,
             task,
             exitCode: target.exitCode,
             usage: target.usage,
@@ -1280,7 +1303,7 @@ export async function runSync(runtimeCwd, agents, agentName, task, options) {
     for (let i = 0; i < modelsToTry.length; i++) {
         const candidate = modelsToTry[i];
         const outputSnapshot = captureSingleOutputSnapshot(options.outputPath);
-        const result = await runSingleAttempt(runtimeCwd, agent, taskWithAcceptance, candidate, detachedAwareOptions, {
+        const result = await runSingleAttempt(runtimeCwd, spec, taskWithAcceptance, candidate, detachedAwareOptions, {
             sessionEnabled,
             systemPrompt,
             resolvedSkillNames: resolvedSkills.length > 0 ? resolvedSkills.map((skill) => skill.name) : undefined,
@@ -1302,7 +1325,7 @@ export async function runSync(runtimeCwd, agents, agentName, task, options) {
         totalDurationMs += result.progressSummary?.durationMs ?? 0;
         const attemptSucceeded = result.exitCode === 0 && !result.error;
         const attempt = {
-            model: result.model ?? candidate ?? agent.model ?? "default",
+            model: result.model ?? candidate ?? spec.model ?? "default",
             success: attemptSucceeded,
             exitCode: result.exitCode,
             error: result.error,
@@ -1321,7 +1344,10 @@ export async function runSync(runtimeCwd, agents, agentName, task, options) {
         attemptNotes.push(formatModelAttemptNote(attempt, modelsToTry[i + 1]));
     }
     const result = lastResult ?? {
-        agent: agentName,
+        childId: spec.childId,
+        description: spec.description,
+        permissions: spec.effectivePermissions,
+        agent: spec.description,
         task,
         exitCode: 1,
         messages: [],