@ashx-j/lunr 0.2.22 → 0.2.24

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

@@ -3,6 +3,8 @@ import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { snapshotParentPermissionMode } from "../../../../../core/subagent-permission-inherit.js";
+import { subagentCommunicationEnabled } from "../../../../../core/settings-manager.js";
+import { getAgentDir } from "../../shared/utils.js";
 import { normalizeChildSpec } from "../../shared/child-spec.js";
 import { getArtifactsDir, getProjectChainRunsDir } from "../../shared/artifacts.js";
 import { ChainClarifyComponent } from "./chain-clarify.js";
@@ -956,6 +958,7 @@ async function resumeAsyncRun(input) {
     const sessionName = resolveIntercomSessionTarget(input.deps.pi.getSessionName(), input.ctx.sessionManager.getSessionId());
     const intercomBridge = resolveIntercomBridge({
         config: input.deps.config.intercomBridge,
+        cwd: input.requestCwd,
         context: input.params.context,
         orchestratorTarget: sessionName,
     });
@@ -1019,6 +1022,7 @@ async function resumeAsyncRun(input) {
             worktreeSetupHookTimeoutMs: input.deps.config.worktreeSetupHookTimeoutMs,
             worktreeBaseDir: input.deps.config.worktreeBaseDir,
             controlConfig: resolveControlConfig(input.deps.config.control, input.params.control),
+            communicationEnabled: intercomBridge.communicationEnabled,
             controlIntercomTarget: intercomBridge.active ? intercomBridge.orchestratorTarget : undefined,
             childIntercomTarget: intercomBridge.active ? (agent, index) => resolveSubagentIntercomTarget(runId, agent, index) : undefined,
             globalConcurrencyLimit: input.deps.config.globalConcurrencyLimit,
@@ -1117,6 +1121,7 @@ async function resumeAsyncRun(input) {
         worktreeSetupHookTimeoutMs: input.deps.config.worktreeSetupHookTimeoutMs,
         worktreeBaseDir: input.deps.config.worktreeBaseDir,
         controlConfig: recoveryDescriptor?.controlConfig ?? resolveControlConfig(input.deps.config.control, input.params.control),
+        communicationEnabled: intercomBridge.communicationEnabled,
         controlIntercomTarget: intercomBridge.active ? intercomBridge.orchestratorTarget : undefined,
         childIntercomTarget: intercomBridge.active ? (agent, index) => resolveSubagentIntercomTarget(runId, agent, index) : undefined,
         availableModels,
@@ -1774,7 +1779,9 @@ function runAsyncPath(data, deps) {
             description: task.description,
             permissions: task.permissions,
             cwd: task.cwd,
+            model: task.model,
             tier: task.tier,
+            thinking: task.thinking,
             ...(skillOverrides[index] !== undefined ? { skill: skillOverrides[index] } : {}),
             ...(task.output !== undefined && task.output !== true ? { output: task.output } : {}),
             ...(task.outputMode !== undefined ? { outputMode: task.outputMode } : {}),
@@ -1790,6 +1797,7 @@ function runAsyncPath(data, deps) {
                     worktree: params.worktree,
                 }],
             resultMode: "parallel",
+            communicationEnabled: intercomBridge.communicationEnabled,
             goal: params.tasks[0]?.task ?? "",
             ctx: asyncCtx,
             availableModels,
@@ -1827,6 +1835,7 @@ function runAsyncPath(data, deps) {
             chain,
             task: params.task,
             goal: resolveAsyncEventGoal(params.task, rawChain),
+            communicationEnabled: intercomBridge.communicationEnabled,
             ctx: asyncCtx,
             availableModels,
             cwd: effectiveCwd,
@@ -1923,6 +1932,7 @@ function runAsyncPath(data, deps) {
             worktreeSetupHookTimeoutMs: deps.config.worktreeSetupHookTimeoutMs,
             worktreeBaseDir: deps.config.worktreeBaseDir,
             controlConfig,
+            communicationEnabled: intercomBridge.communicationEnabled,
             controlIntercomTarget,
             childIntercomTarget: childIntercomTarget ? (agent, index) => childIntercomTarget(agent, index) : undefined,
             nestedRoute,
@@ -1968,6 +1978,7 @@ async function runChainPath(data, deps) {
         controlConfig,
         childIntercomTarget: childIntercomTarget ? (agent, index) => childIntercomTarget(runId, agent, index) : undefined,
         orchestratorIntercomTarget: data.intercomBridge.active ? data.intercomBridge.orchestratorTarget : undefined,
+        communicationEnabled: data.intercomBridge.communicationEnabled,
         foregroundControl,
         nestedRoute: foregroundControl?.nestedRoute,
         chainSkills,
@@ -2030,6 +2041,7 @@ async function runChainPath(data, deps) {
             controlConfig,
             controlIntercomTarget: data.intercomBridge.active ? data.intercomBridge.orchestratorTarget : undefined,
             childIntercomTarget: data.intercomBridge.active ? (agent, index) => resolveSubagentIntercomTarget(id, agent, index) : undefined,
+            communicationEnabled: data.intercomBridge.communicationEnabled,
             nestedRoute: data.nestedRoute,
             timeoutMs: data.timeoutMs,
             turnBudget: data.turnBudget,
@@ -2222,6 +2234,7 @@ async function runForegroundParallelTasks(input) {
             onDetachedExit: (result) => updateRememberedForegroundChild(input.state, { runId: input.runId, mode: "parallel", cwd: taskCwd, sessionId: input.parentSessionId, index, result, events: input.intercomEvents }),
             intercomSessionName: input.childIntercomTarget?.(task.agent, index),
             orchestratorIntercomTarget: input.orchestratorIntercomTarget,
+            communicationEnabled: input.communicationEnabled,
             nestedRoute: input.foregroundControl?.nestedRoute,
             modelOverride: input.modelOverrides[index],
             thinkingOverride: input.thinkingOverrideForTask(task.agent, index, input.modelOverrides[index]),
@@ -2389,7 +2402,9 @@ async function runParallelPath(data, deps) {
                     description: t.description,
                     permissions: t.permissions,
                     cwd: t.cwd,
+                    model: t.model,
                     tier: t.tier,
+                    thinking: t.thinking,
                     ...(skillOverrides[i] !== undefined ? { skill: skillOverrides[i] } : {}),
                     ...(behaviorOverrides[i]?.output !== undefined ? { output: behaviorOverrides[i].output } : {}),
                     ...(behaviorOverrides[i]?.outputMode !== undefined ? { outputMode: behaviorOverrides[i].outputMode } : {}),
@@ -2403,6 +2418,7 @@ async function runParallelPath(data, deps) {
                 chain: [{ parallel: parallelTasks, concurrency: parallelConcurrency, worktree: params.worktree }],
                 resultMode: "parallel",
                 goal: taskTexts[0] ?? "",
+                communicationEnabled: data.intercomBridge.communicationEnabled,
                 ctx: asyncCtx,
                 availableModels,
                 cwd: effectiveCwd,
@@ -2495,6 +2511,7 @@ async function runParallelPath(data, deps) {
             onControlEvent,
             childIntercomTarget: childIntercomTarget ? (agent, index) => childIntercomTarget(runId, agent, index) : undefined,
             orchestratorIntercomTarget: data.intercomBridge.active ? data.intercomBridge.orchestratorTarget : undefined,
+            communicationEnabled: data.intercomBridge.communicationEnabled,
             foregroundControl,
             concurrencyLimit: parallelConcurrency,
             globalSemaphore: new Semaphore(deps.config.globalConcurrencyLimit ?? DEFAULT_GLOBAL_CONCURRENCY_LIMIT),
@@ -2684,6 +2701,7 @@ async function runSinglePath(data, deps) {
             };
             return executeAsyncSingle(id, {
                 spec: { ...spec, task: shouldForkAgent(contextPolicy, params.agent) ? wrapForkTask(task) : task },
+                communicationEnabled: data.intercomBridge.communicationEnabled,
                 goal: task,
                 ctx: asyncCtx,
                 availableModels,
@@ -2792,6 +2810,7 @@ async function runSinglePath(data, deps) {
         onControlEvent,
         intercomSessionName: childIntercomTarget,
         orchestratorIntercomTarget: data.intercomBridge.active ? data.intercomBridge.orchestratorTarget : undefined,
+        communicationEnabled: data.intercomBridge.communicationEnabled,
         nestedRoute: foregroundControl?.nestedRoute,
         index: 0,
         modelOverride,
@@ -3017,6 +3036,9 @@ export function createSubagentExecutor(deps) {
                 return resumeAsyncRun({ params: paramsWithResolvedCwd, requestCwd, ctx, deps });
             }
             if (action === "steer") {
+                if (!subagentCommunicationEnabled(requestCwd, getAgentDir())) {
+                    return { content: [{ type: "text", text: "Subagent communication is off in /settings. Wait for the child to complete instead of steering it." }], isError: true, details: { mode: "management", results: [] } };
+                }
                 deps.state.currentSessionId = resolveCurrentSessionId(ctx.sessionManager);
                 const message = (paramsWithResolvedCwd.message ?? paramsWithResolvedCwd.task ?? "").trim();
                 if (!message)
@@ -3203,6 +3225,7 @@ export function createSubagentExecutor(deps) {
         const sessionName = resolveIntercomSessionTarget(deps.pi.getSessionName(), ctx.sessionManager.getSessionId());
         const intercomBridge = resolveIntercomBridge({
             config: deps.config.intercomBridge,
+            cwd: ctx.cwd,
             context: effectiveParams.context,
             orchestratorTarget: sessionName,
         });