@ashx-j/lunr 0.2.21 → 0.2.23

package/dist/node-runtime/{pi-subagents-6MUIFNDM.js → pi-subagents-CDWK2AKY.js}

@@ -27,6 +27,8 @@ import {
   SUBAGENT_PARENT_SESSION_ENV,
   SUBAGENT_RESULT_INTERCOM_EVENT,
   SUBAGENT_STEERING_NOTICE_EVENT,
+  SUPERVISOR_PROGRESS_TYPE,
+  SUPERVISOR_REQUEST_TYPE,
   TEMP_ROOT_DIR,
   WIDGET_KEY,
   assertJsonSchemaObject,
@@ -45,7 +47,6 @@ import {
   formatAsyncRunProgressLabel,
   formatAsyncRunTranscript,
   formatCompactModelBadge,
-  formatControlNoticeMessage,
   formatDuration,
   formatModelSelection,
   formatNestedAggregate,
@@ -61,10 +62,12 @@ import {
   handleSubagentControlNotice,
   hasLiveNestedDescendants,
   isAsyncSubagentExecution,
+  legacySupervisorBody,
   listAsyncRuns,
   normalizeAsyncLaunchConfig,
   normalizeParallelGroups,
   projectNestedRegistryForRoot,
+  readCommunication,
   readStatus,
   readSteerCapability,
   reconcileAsyncRun,
@@ -72,6 +75,7 @@ import {
   registerMainWatchdog,
   requestAsyncSteer,
   resolveAsyncRunLocation,
+  resolveCommunicationPeer,
   resolveCurrentSessionId,
   resolveSubagentRequestParams,
   resolveSubagentResultStatus,
@@ -82,6 +86,7 @@ import {
   sanitizeChildDescription,
   sanitizeSummary,
   shortenPath,
+  stopRequestPath,
   subagentLaunchRunsAsync,
   summarizeAsyncStatus,
   updateAsyncJobNestedProjection,
@@ -89,30 +94,36 @@ import {
   validateExecutionAcceptance,
   validateToolBudgetConfig,
   writeAtomicJson
-} from "./chunk-SY2TFMLO.js";
+} from "./chunk-RIR5EDDJ.js";
 import {
-  createSubagentCancellation,
-  getSubagentSpinnerDefinition,
-  registerSubagentCancellation
-} from "./chunk-A3KMVBZV.js";
+  formatControlNoticeMessage
+} from "./chunk-OAR4TYZE.js";
+import {
+  getSubagentSpinnerDefinition
+} from "./chunk-US544NN6.js";
 import "./chunk-5ZH3ZFIZ.js";
-import "./chunk-25I2BHAA.js";
-import "./chunk-WKDK4C5P.js";
+import "./chunk-CSUZVNYE.js";
+import "./chunk-YDO2F2IA.js";
 import "./chunk-53YJI7JU.js";
-import "./chunk-KBKMCJDU.js";
-import "./chunk-CSFI6YXL.js";
-import "./chunk-LISUTZS3.js";
-import "./chunk-FVDOXRUD.js";
+import "./chunk-5ZQXRPMC.js";
 import "./chunk-AD6VXAO7.js";
-import "./chunk-6N22HULO.js";
+import "./chunk-LISUTZS3.js";
+import {
+  createSubagentCancellation,
+  registerSubagentCancellation
+} from "./chunk-BBUVIEZB.js";
+import "./chunk-5D7LC2ZQ.js";
 import "./chunk-M3LZLQW2.js";
+import "./chunk-KKUTQQV7.js";
+import "./chunk-CSFI6YXL.js";
+import "./chunk-FVDOXRUD.js";
 import "./chunk-RQ2Q5IYR.js";
 import {
   keyText
-} from "./chunk-DDWHZ633.js";
+} from "./chunk-GS42T6MX.js";
 import {
   getMarkdownTheme
-} from "./chunk-RNBHABBA.js";
+} from "./chunk-RDDAZOMU.js";
 import "./chunk-FQMM2EZ2.js";
 import "./chunk-Q4Q6D4IY.js";
 import "./chunk-BRJX2PRC.js";
@@ -122,7 +133,7 @@ import { randomUUID as randomUUID4 } from "node:crypto";
 import * as fs10 from "node:fs";
 import * as os from "node:os";
 import * as path12 from "node:path";
-import { Box, Container as Container2, Spacer as Spacer2, Text as Text2, truncateToWidth as truncateToWidth2, visibleWidth as visibleWidth3, wrapTextWithAnsi as wrapTextWithAnsi2 } from "@ashx-j/lunr-tui";
+import { Box as Box2, Container as Container3, Spacer as Spacer2, Text as Text3, truncateToWidth as truncateToWidth2, visibleWidth as visibleWidth3, wrapTextWithAnsi as wrapTextWithAnsi2 } from "@ashx-j/lunr-tui";
 
 // packages/coding-agent/dist/builtin-extensions/pi-subagents/src/tui/render.js
 import { Container, Markdown, Spacer, Text, visibleWidth } from "@ashx-j/lunr-tui";
@@ -4467,6 +4478,7 @@ function parseQuestionRecord(raw) {
     runId: input.runId.trim(),
     childIndex,
     childId: input.childId.trim(),
+    ...typeof input.childDescription == "string" && input.childDescription.trim() ? { childDescription: input.childDescription.trim() } : {},
     parentSessionId: input.parentSessionId.trim(),
     parentGeneration,
     ...incarnation ? { childIncarnation: incarnation } : {}
@@ -4575,6 +4587,7 @@ function createSupervisorQuestion(input) {
     runId: input.runId,
     childIndex: input.childIndex,
     childId: input.childId,
+    ...input.childDescription ? { childDescription: input.childDescription } : {},
     parentSessionId: input.parentSessionId,
     parentGeneration: input.parentGeneration,
     ...input.childIncarnation ? { childIncarnation: input.childIncarnation } : {}
@@ -4640,8 +4653,7 @@ function formatParentQuestionForChild(question) {
 function formatSupervisorQuestionAnswer(question) {
   let state = supervisorQuestionPublicState(question), lines = [
     state === "answered" ? `Subagent answer (${question.id})` : `Subagent question ${state} (${question.id})`,
-    `Run: ${question.runId}`,
-    `Child: ${question.childId} [#${question.childIndex}]`,
+    `From: ${question.childDescription ?? `Subagent ${question.childIndex + 1}`}`,
     `Decision: ${question.reason}`
   ];
   return state === "answered" && question.answer?.trim() ? lines.push("", question.answer.trim()) : question.cancelReason && lines.push("", question.cancelReason), lines.join(`
@@ -4798,8 +4810,9 @@ function askRunningAsyncChild(input) {
   let capability = readSteerCapability(resolved.location.asyncDir, child.index);
   if (!capability?.supported)
     throw new Error("This child is not ready to receive questions. Continue other work until it is ready; no question was queued.");
-  let incarnation = { pid: capability.pid, readyAt: capability.readyAt }, question = createSupervisorQuestion({
+  let incarnation = { pid: capability.pid, readyAt: capability.readyAt }, step = status.steps?.[child.index], childDescription = resolveCommunicationPeer(input.state, status.runId, child.index, child.childId, step?.description ?? child.agent), question = createSupervisorQuestion({
     channelDir,
+    childDescription,
     reason,
     message,
     runId: status.runId,
@@ -4829,12 +4842,50 @@ function askRunningAsyncChild(input) {
       runId: status.runId,
       childIndex: child.index,
       childId: child.childId,
+      communication: { direction: "to", peer: childDescription, message, kind: "question" },
       delivered: !1,
       answered: !1
     }
   };
 }
 
+// packages/coding-agent/dist/builtin-extensions/pi-subagents/src/tui/communication.js
+import { Box, Container as Container2, Text as Text2 } from "@ashx-j/lunr-tui";
+function renderCommunicationBody(communication, theme) {
+  let direction = communication.direction === "from" ? "From" : "To";
+  return new Text2(`${theme.fg("muted", `${direction}: ${communication.peer}`)}
+
+${communication.message}`, 0, 0);
+}
+function renderCommunicationCard(communication, expanded, theme) {
+  let box = new Box(1, 1, (text) => theme.bg("toolSuccessBg", text));
+  return box.addChild(new Text2(theme.fg("toolTitle", theme.bold(`\u25CF subagent ${communication.kind}`)), 0, 0)), expanded && box.addChild(renderCommunicationBody(communication, theme)), box;
+}
+function renderCommunicationCall(name, args, theme, context, communication, displayTitle) {
+  let container = new Container2(), details = context?.result?.details, saved = readCommunication(details?.communication) ?? communication, action = args.action ?? (args.reason === "need_decision" ? "request" : args.reason === "interview_request" ? "interview" : args.reason === "progress_update" ? "progress" : args.reason), title = theme.fg("toolTitle", theme.bold(`${name}${action ? ` ${action}` : ""}`));
+  return container.addChild(new Text2(displayTitle ? `${title} ${theme.fg("accent", displayTitle)}` : title, 0, 0)), context?.expanded && saved && container.addChild(renderCommunicationBody(saved, theme)), container;
+}
+function renderCommunicationResult(content, details, expanded, isError, theme) {
+  let container = new Container2();
+  if (!expanded)
+    return container;
+  if (isError)
+    container.addChild(new Text2(theme.fg("error", content.filter((part) => part.type === "text").map((part) => part.text ?? "").join(`
+`)), 0, 0));
+  else {
+    let saved = details;
+    saved?.response ? container.addChild(new Text2(`
+${theme.fg("muted", "From: Supervisor")}
+
+${saved.response}`, 0, 0)) : saved?.steering?.state ? container.addChild(new Text2(`
+Delivery: ${saved.steering.state === "recovered" ? "recovered; replacement launched" : saved.steering.state}`, 0, 0)) : saved?.asyncId && saved.communication ? container.addChild(new Text2(`
+Continuation launched.`, 0, 0)) : saved?.state && saved.communication ? container.addChild(new Text2(`
+${saved.state === "pending" ? "Question queued; awaiting an answer." : saved.state}`, 0, 0)) : saved?.communication || container.addChild(new Text2(content.filter((part) => part.type === "text").map((part) => part.text ?? "").join(`
+`), 0, 0));
+  }
+  return container;
+}
+
 // packages/coding-agent/dist/builtin-extensions/pi-subagents/src/intercom/native-supervisor-channel.js
 var REQUESTS_DIR = "requests", REPLIES_DIR = "replies", NATIVE_SUPERVISOR_TOOL_NAME = "subagent_supervisor";
 var MAX_MESSAGE_BYTES2 = 64 * 1024, DEFAULT_ASK_TIMEOUT_MS2 = 600 * 1e3, CHANNEL_POLL_MS = Math.min(POLL_INTERVAL_MS, 500), STALE_EMPTY_CHANNEL_AGE_MS = 60 * 1e3, STALE_EMPTY_CHANNEL_CLEANUP_INTERVAL_MS = 60 * 1e3, PARENT_ASK_DESCRIPTION = [
@@ -4846,11 +4897,13 @@ var MAX_MESSAGE_BYTES2 = 64 * 1024, DEFAULT_ASK_TIMEOUT_MS2 = 600 * 1e3, CHANNEL
   "Use pending or list to find child requests awaiting your reply; status reports channel availability. Free-form send is unsupported. Asking never revives a child or changes its assignment.",
   'Reply: { action: "reply", replyTo: "<requestId>", message: "..." }'
 ].join(" "), CHILD_CONTACT_DESCRIPTION = [
-  "Contact the parent/supervisor session for a blocking decision, structured interview, progress update, or reply to a parent question.",
+  "Contact the supervisor for decisions outside your assigned authority, safety concerns, or blockers. Make reversible implementation choices within your scope yourself.",
+  "need_decision/interview_request wait for a reply: state the blocked decision, evidence, and recommended choice. Consolidate related questions; continue independent work before opening a blocking request.",
+  "Return one self-contained final report with outcomes, verification, blockers, and artifact paths; the runtime delivers it. Routine work already appears in activity indicators.",
   "For parent questions use action='reply' with replyTo set to the question id. Answer from current findings and uncertainty; do not start extra investigation just to reply. Continue the assigned task after replying.",
   "Do not open a blocking need_decision while a parent question is already outstanding for this child."
 ].join(" "), ContactSupervisorParamsSchema = Type2.Object({
-  reason: Type2.Optional(Type2.String({ enum: ["need_decision", "interview_request", "progress_update"] })),
+  reason: Type2.Optional(Type2.String({ enum: ["need_decision", "interview_request", "progress_update", "handoff"] })),
   message: Type2.Optional(Type2.String()),
   interview: Type2.Optional(Type2.Unsafe({ type: "object", additionalProperties: !0 })),
   action: Type2.Optional(Type2.String({ enum: ["reply"] })),
@@ -4874,6 +4927,40 @@ function safeSegment2(value) {
 function replyPath(channelDir, requestId) {
   return path8.join(channelDir, REPLIES_DIR, `${safeSegment2(requestId)}.json`);
 }
+function communicationKind(reason) {
+  return reason === "progress_update" ? "progress" : reason === "handoff" ? "handoff" : reason === "interview_request" ? "interview" : "request";
+}
+function communicationBody(message, interview, protocolVersion) {
+  let body = protocolVersion === 2 ? message : legacySupervisorBody(message);
+  return interview !== void 0 && protocolVersion === 2 ? `${body}
+
+${JSON.stringify(interview, null, 2)}` : body;
+}
+function requestCommunication(request, state) {
+  return {
+    direction: "from",
+    peer: resolveCommunicationPeer(state, request.runId, request.childIndex, request.agent, request.description),
+    message: communicationBody(request.message, request.interview, request.protocolVersion),
+    kind: communicationKind(request.reason)
+  };
+}
+function registerSupervisorRenderers(pi, state) {
+  for (let customType of [SUPERVISOR_REQUEST_TYPE, SUBAGENT_SUPERVISOR_ANSWER_TYPE])
+    pi.registerMessageRenderer(customType, (message, options, theme) => {
+      let details = message.details, communication = readCommunication(details?.communication) ?? {
+        direction: "from",
+        peer: details?.runId ? resolveCommunicationPeer(state, details.runId, details.childIndex ?? 0, details.childId ?? details.agent) : "Subagent",
+        message: legacySupervisorBody(typeof message.content == "string" ? message.content : message.content.filter((part) => part.type === "text").map((part) => part.text).join(`
+`)),
+        kind: customType === SUBAGENT_SUPERVISOR_ANSWER_TYPE ? "answer" : communicationKind(details?.reason)
+      };
+      return renderCommunicationCard(communication, options.expanded, theme);
+    });
+  pi.registerEntryRenderer(SUPERVISOR_PROGRESS_TYPE, (entry, options, theme) => {
+    let communication = readCommunication(entry.data?.communication);
+    return communication ? renderCommunicationCard(communication, options.expanded, theme) : void 0;
+  });
+}
 function askTimeoutMs2() {
   let parsed = Number(process.env.PI_INTERCOM_ASK_TIMEOUT_MS);
   return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_ASK_TIMEOUT_MS2;
@@ -4888,7 +4975,7 @@ function hasTool(pi, name) {
 function parseRequestFile(file, channelDir) {
   try {
     let parsed = JSON.parse(fs7.readFileSync(file, "utf-8"));
-    return parsed.type !== "subagent.supervisor.request" || parsed.supervisorSessionId !== void 0 && (typeof parsed.supervisorSessionId != "string" || !parsed.supervisorSessionId.trim()) || typeof parsed.id != "string" || !parsed.id || parsed.reason !== "need_decision" && parsed.reason !== "interview_request" && parsed.reason !== "progress_update" || typeof parsed.message != "string" || !parsed.message || typeof parsed.runId != "string" || typeof parsed.agent != "string" || typeof parsed.childIndex != "number" ? void 0 : { ...parsed, channelDir, requestFile: file };
+    return parsed.type !== "subagent.supervisor.request" || parsed.supervisorSessionId !== void 0 && (typeof parsed.supervisorSessionId != "string" || !parsed.supervisorSessionId.trim()) || typeof parsed.id != "string" || !parsed.id || parsed.reason !== "need_decision" && parsed.reason !== "interview_request" && parsed.reason !== "progress_update" && parsed.reason !== "handoff" || parsed.protocolVersion !== void 0 && parsed.protocolVersion !== 2 || parsed.protocolVersion === 2 && parsed.expectsReply !== (parsed.reason === "need_decision" || parsed.reason === "interview_request") || parsed.reason === "handoff" && parsed.protocolVersion !== 2 || parsed.description !== void 0 && typeof parsed.description != "string" || typeof parsed.message != "string" || !parsed.message || typeof parsed.runId != "string" || typeof parsed.agent != "string" || typeof parsed.childIndex != "number" ? void 0 : { ...parsed, channelDir, requestFile: file };
   } catch {
     return;
   }
@@ -5014,22 +5101,26 @@ function requestExpiresAt(request, now) {
   let expiresAt = request.expiresAt;
   return typeof expiresAt == "number" && Number.isFinite(expiresAt) ? expiresAt : Number.isFinite(request.createdAt) ? request.createdAt + askTimeoutMs2() : now;
 }
-function requestRunInactive(request, state) {
+function requestRunState(request, state) {
   if (state.foregroundControls.has(request.runId))
-    return !1;
+    return "active";
   let foregroundRun = state.foregroundRuns?.get(request.runId), foregroundChild = foregroundRun?.children.find((child) => child.index === request.childIndex && child.agent === request.agent) ?? foregroundRun?.children[request.childIndex];
   if (foregroundChild)
-    return foregroundChild.status !== "detached";
-  let asyncJob = state.asyncJobs.get(request.runId);
-  if (!asyncJob)
-    return !1;
-  if (asyncJob.status === "complete" || asyncJob.status === "failed" || asyncJob.status === "paused")
-    return !0;
-  let stepStatus = asyncJob.steps?.[request.childIndex]?.status;
-  return stepStatus === "complete" || stepStatus === "completed" || stepStatus === "failed" || stepStatus === "paused";
+    return foregroundChild.status === "stopped" ? "stopped" : foregroundChild.status === "detached" ? "active" : "inactive";
+  let job = state.asyncJobs.get(request.runId) ?? state.fleetJobs?.get(request.runId), asyncDir = job?.asyncDir ?? path8.join(ASYNC_DIR, safeSegment2(request.runId)), status = readStatus(asyncDir), runStatus = status?.state ?? job?.status, stepStatus = (status?.steps ?? job?.steps)?.[request.childIndex]?.status;
+  return fs7.existsSync(stopRequestPath(asyncDir)) || runStatus === "stopped" || job?.status === "stopped" || status?.stopped || stepStatus === "stopped" ? "stopped" : ["complete", "failed", "paused"].includes(runStatus ?? "") || ["complete", "completed", "failed", "paused"].includes(stepStatus ?? "") ? "inactive" : "active";
 }
 function requestLifecycle(request, state, ctx, now) {
-  return ctx && !requestMatchesContext(request, state, ctx) ? "wrong-session" : fs7.existsSync(request.requestFile) ? request.expectsReply && fs7.existsSync(replyPath(request.channelDir, request.id)) ? "resolved" : request.expectsReply && now > requestExpiresAt(request, now) ? "expired" : request.expectsReply && requestRunInactive(request, state) ? "inactive" : "pending" : "missing";
+  if (ctx && !requestMatchesContext(request, state, ctx))
+    return "wrong-session";
+  if (!fs7.existsSync(request.requestFile))
+    return "missing";
+  if (request.expectsReply && fs7.existsSync(replyPath(request.channelDir, request.id)))
+    return "resolved";
+  if (request.expectsReply && now > requestExpiresAt(request, now))
+    return "expired";
+  let runState = requestRunState(request, state);
+  return runState === "stopped" || request.expectsReply && runState === "inactive" ? "inactive" : "pending";
 }
 function cleanupRequestLifecycle(request, lifecycle) {
   (lifecycle === "resolved" || lifecycle === "expired" || lifecycle === "inactive") && removeRequestFile(request.requestFile);
@@ -5045,9 +5136,9 @@ function formatPendingLine(request) {
   let replyHint = request.expectsReply ? ` Reply: ${NATIVE_SUPERVISOR_TOOL_NAME}({ action: "reply", replyTo: "${request.id}", message: "..." })` : "";
   return `- ${request.id}: ${request.agent} [${request.runId}#${request.childIndex}] ${request.reason}.${replyHint}`;
 }
-function requestVisibleText(request) {
-  let lines = [request.message];
-  return request.expectsReply && lines.push("", `Reply with: ${NATIVE_SUPERVISOR_TOOL_NAME}({ action: "reply", replyTo: "${request.id}", message: "..." })`), lines.join(`
+function requestVisibleText(request, communication) {
+  let lines = [`From: ${communication.peer}`, "", communication.message];
+  return request.reason === "interview_request" && lines.push("", "Reply with JSON matching the requested interview shape."), request.expectsReply && lines.push("", `Reply with: ${NATIVE_SUPERVISOR_TOOL_NAME}({ action: "reply", replyTo: "${request.id}", message: "..." })`), lines.join(`
 `);
 }
 function writeReply(request, message) {
@@ -5096,6 +5187,13 @@ function buildParentIntercomTool(pending, state, name = "intercom") {
     label: name === "intercom" ? "Intercom" : "Subagent Supervisor",
     description: PARENT_ASK_DESCRIPTION,
     parameters: ParentSupervisorParamsSchema,
+    renderCall(args, theme, context) {
+      let request = args.action === "reply" ? pending.get(args.replyTo) : void 0, peer = request ? requestCommunication(request, state).peer : args.id ? resolveCommunicationPeer(state, args.id, args.index ?? 0, args.childId) : "Subagent";
+      return renderCommunicationCall(name, args, theme, context, args.message ? { direction: "to", peer, message: args.message, kind: args.action === "ask" ? "question" : "reply" } : void 0);
+    },
+    renderResult(result2, options, theme, context) {
+      return renderCommunicationResult(result2.content, result2.details, options.expanded, context.isError, theme);
+    },
     async execute(_id, params) {
       refreshPendingRequests(pending, state, state.lastUiContext ?? void 0);
       let input = params;
@@ -5108,7 +5206,7 @@ function buildParentIntercomTool(pending, state, name = "intercom") {
       }
       if (input.action === "reply") {
         let request = resolvePendingRequest(pending, input);
-        return writeReply(request, input.message ?? ""), pending.delete(request.id), { content: [{ type: "text", text: `Replied to supervisor request ${request.id}.` }], details: { replyTo: request.id, runId: request.runId, agent: request.agent } };
+        return writeReply(request, input.message ?? ""), pending.delete(request.id), { content: [{ type: "text", text: `Replied to ${requestCommunication(request, state).peer}.` }], details: { replyTo: request.id, runId: request.runId, agent: request.agent, communication: { ...requestCommunication(request, state), direction: "to", kind: "reply", message: input.message } } };
       }
       if (input.action === "ask")
         return askRunningAsyncChild({
@@ -5130,29 +5228,30 @@ function questionMatchesParentContext(question, state, ctx) {
   let sessionId = currentSupervisorSessionId(state, ctx);
   return !(!sessionId || question.parentSessionId !== sessionId || (state.sessionGeneration ?? 0) !== question.parentGeneration);
 }
-function notifyQuestionTerminal(pi, question, channelDir) {
+function notifyQuestionTerminal(pi, question, channelDir, state) {
   if (!supervisorQuestionIsTerminal(question) || question.notifiedAt || (pi.events?.emit(SUBAGENT_QUESTION_EVENT, {
     questionId: question.id,
     state: supervisorQuestionPublicState(question),
     runId: question.runId
   }), isQuestionWaitActive(question.id)) || !claimQuestionNotification(channelDir, question.id))
     return;
-  let state = supervisorQuestionPublicState(question);
+  let outcome = supervisorQuestionPublicState(question), communication = { direction: "from", peer: question.childDescription ?? resolveCommunicationPeer(state, question.runId, question.childIndex, question.childId), message: question.answer ?? question.cancelReason ?? outcome, kind: "answer" };
   pi.sendMessage({
     customType: SUBAGENT_SUPERVISOR_ANSWER_TYPE,
     content: formatSupervisorQuestionAnswer(question),
-    display: state === "answered",
+    display: outcome === "answered",
     details: {
       questionId: question.id,
-      state,
+      state: outcome,
+      communication,
       runId: question.runId,
       childIndex: question.childIndex,
       childId: question.childId,
       reason: question.reason,
-      answered: state === "answered",
+      answered: outcome === "answered",
       delivered: !!question.deliveredAt
     }
-  }, { triggerTurn: state === "answered" });
+  }, { triggerTurn: outcome === "answered" });
 }
 function pollSupervisorQuestions(pi, state, ctx) {
   for (let channelDir of listSupervisorChannelDirs())
@@ -5160,11 +5259,11 @@ function pollSupervisorQuestions(pi, state, ctx) {
       if (!questionMatchesParentContext(question, state, ctx))
         continue;
       let current = reconcileAsyncQuestion(channelDir, question, state);
-      notifyQuestionTerminal(pi, current, channelDir);
+      notifyQuestionTerminal(pi, current, channelDir, state);
     }
 }
 function createNativeSupervisorChannel(pi, state) {
-  let pending = /* @__PURE__ */ new Map(), seenFiles = /* @__PURE__ */ new Set(), poller, lastStaleCleanupAt = 0, registerParentTools = () => {
+  let pending = /* @__PURE__ */ new Map(), seenFiles = /* @__PURE__ */ new Set(), deliveredRequests = /* @__PURE__ */ new Set(), poller, lastStaleCleanupAt = 0, registerParentTools = () => {
     hasTool(pi, NATIVE_SUPERVISOR_TOOL_NAME) || pi.registerTool(buildParentIntercomTool(pending, state, NATIVE_SUPERVISOR_TOOL_NAME)), hasTool(pi, "intercom") || pi.registerTool(buildParentIntercomTool(pending, state));
   }, cleanupStaleChannelsIfDue = () => {
     let nowMs = Date.now();
@@ -5205,19 +5304,25 @@ function createNativeSupervisorChannel(pi, state) {
         seenFiles.add(file), cleanupRequestLifecycle(request, lifecycle);
         continue;
       }
-      if (seenFiles.add(file), request.expectsReply ? pending.set(request.id, request) : removeRequestFile(request.requestFile), pi.sendMessage({
-        customType: "subagent_supervisor_request",
-        content: requestVisibleText(request),
+      if (request.expectsReply && pending.set(request.id, request), deliveredRequests.has(request.id)) {
+        seenFiles.add(file);
+        continue;
+      }
+      let communication = requestCommunication(request, state), details = {
+        id: request.id,
+        reason: request.reason,
+        expectsReply: request.expectsReply,
+        runId: request.runId,
+        agent: request.agent,
+        childIndex: request.childIndex,
+        communication
+      };
+      if (request.reason === "progress_update" && request.protocolVersion === 2 ? pi.appendEntry(SUPERVISOR_PROGRESS_TYPE, details) : pi.sendMessage({
+        customType: SUPERVISOR_REQUEST_TYPE,
+        content: requestVisibleText(request, communication),
         display: !0,
-        details: {
-          id: request.id,
-          reason: request.reason,
-          expectsReply: request.expectsReply,
-          runId: request.runId,
-          agent: request.agent,
-          childIndex: request.childIndex
-        }
-      }), request.expectsReply) {
+        details
+      }, { triggerTurn: request.expectsReply || request.reason === "handoff" }), deliveredRequests.add(request.id), seenFiles.add(file), request.expectsReply || removeRequestFile(request.requestFile), request.expectsReply) {
         let job = state.asyncJobs.get(request.runId);
         job && (job.activityState = "needs_attention");
         let events = pi.events;
@@ -5238,10 +5343,17 @@ function createNativeSupervisorChannel(pi, state) {
   };
   return {
     start: () => {
-      poller || (registerParentTools(), poll(), poller = setInterval(poll, CHANNEL_POLL_MS), poller.unref?.());
+      if (!poller) {
+        registerParentTools();
+        for (let entry of state.lastUiContext?.sessionManager.getBranch?.() ?? []) {
+          let data = entry.type === "custom_message" && entry.customType === SUPERVISOR_REQUEST_TYPE ? entry.details : entry.type === "custom" && entry.customType === SUPERVISOR_PROGRESS_TYPE ? entry.data : void 0;
+          data && typeof data == "object" && "id" in data && typeof data.id == "string" && deliveredRequests.add(data.id);
+        }
+        poll(), poller = setInterval(poll, CHANNEL_POLL_MS), poller.unref?.();
+      }
     },
     dispose: () => {
-      cancelOwnedQuestions("parent supervisor channel disposed"), poller && clearInterval(poller), poller = void 0, pending.clear(), seenFiles.clear();
+      cancelOwnedQuestions("parent supervisor channel disposed"), poller && clearInterval(poller), poller = void 0, pending.clear(), seenFiles.clear(), deliveredRequests.clear();
     },
     pending,
     cancelOwnedQuestions,
@@ -5722,6 +5834,8 @@ async function waitForDetachedForegroundRun(run, signal, deps, startedAt, now, p
       let outcome = summarizeForegroundChildren(current, initialDetachedIndices);
       return result(`Waited ${formatDuration(now() - startedAt)} for remembered detached foreground run "${run.runId}"; done. Outcome: ${outcome || "no recovered child status"}. Completion event observed; inspect with subagent({ action: "status", id: "${run.runId}" }) for recovered output.`);
     }
+    if (deps.wasInterrupted?.())
+      return result("Wait interrupted by user input; background work remains active.");
     if (signal?.aborted)
       return result(`Wait aborted after ${formatDuration(now() - startedAt)}. Remembered foreground run "${run.runId}" remains detached.`, !0);
     if (now() - startedAt >= timeoutMs)
@@ -5761,6 +5875,8 @@ async function waitForSupervisorQuestion(questionId, signal, deps, startedAt, no
           }
         };
       }
+      if (deps.wasInterrupted?.())
+        return result("Wait interrupted by user input; background work remains active.");
       if (signal?.aborted)
         return result(`Wait aborted after ${formatDuration(now() - startedAt)} for supervisor question "${questionId}".`, !0);
       if (now() - startedAt >= timeoutMs)
@@ -5811,8 +5927,12 @@ async function waitForSubagents(params, signal, deps) {
       ...activeInitialRuns.map((run) => `${run.id} (${run.state})`),
       ...activeInitialProviderItems.map((item) => `${item.provider}/${item.id}`)
     ].join(", ");
+    if (deps.wasInterrupted?.())
+      return result("Wait interrupted by user input; background work remains active.");
     if (signal?.aborted)
       return result(`Wait aborted after ${formatDuration(now() - startedAt)}. Still active: ${stillActive}.`, !0);
+    if (deps.shouldYield?.())
+      return result("Wait yielded for pending session messages; background work remains active.");
     if (now() - startedAt >= timeoutMs)
       return result(`Wait timed out after ${formatDuration(timeoutMs)} with ${activeInitialRuns.length} async run(s) and ${activeInitialProviderItems.length} provider item(s) still active: ${stillActive}. The work keeps going; call subagent_wait again or inspect subagent status.`, !0);
     try {
@@ -5842,6 +5962,16 @@ async function waitForSubagents(params, signal, deps) {
 }
 
 // packages/coding-agent/dist/builtin-extensions/pi-subagents/src/runs/background/wait-tool.js
+var WAIT_INTERRUPTION_SYMBOL = /* @__PURE__ */ Symbol.for("@lunr/subagent-wait-interruption");
+function registerWaitInterruption(sessionId) {
+  return sessionId ? globalThis[WAIT_INTERRUPTION_SYMBOL]?.owners?.get(sessionId)?.register() : void 0;
+}
+function interruptedResult() {
+  return {
+    content: [{ type: "text", text: "Wait interrupted by user input; background work remains active." }],
+    details: { mode: "management", results: [] }
+  };
+}
 function registerWaitTool(pi, state, enabled = resolveWaitToolConfig().enabled, waitForPendingLaunches) {
   let tool = {
     name: "subagent_wait",
@@ -5861,7 +5991,25 @@ Provider jobs are session-scoped and identified exactly, so replacing one job wi
 Configured behavior: subagent_wait is disabled by config.waitTool or PI_SUBAGENT_WAIT_TOOL_ENABLED and returns immediately without blocking.`}`,
     parameters: SubagentWaitParams,
     async execute(_id, params, signal) {
-      return await Promise.resolve(), await waitForPendingLaunches?.(signal), signal?.throwIfAborted(), waitForSubagents(params, signal, { state, events: pi.events, enabled });
+      await Promise.resolve();
+      let interruption = registerWaitInterruption(state.currentSessionId), waitSignal = interruption ? signal ? AbortSignal.any([signal, interruption.signal]) : interruption.signal : signal;
+      try {
+        try {
+          await waitForPendingLaunches?.(waitSignal);
+        } catch (error) {
+          if (interruption?.wasInterrupted())
+            return interruptedResult();
+          throw error;
+        }
+        return interruption?.wasInterrupted() ? interruptedResult() : (signal?.throwIfAborted(), waitForSubagents(params, waitSignal, {
+          state,
+          events: pi.events,
+          enabled,
+          wasInterrupted: interruption?.wasInterrupted
+        }));
+      } finally {
+        interruption?.unregister();
+      }
     }
   };
   pi.registerTool(tool);
@@ -5888,7 +6036,7 @@ async function drainOutstandingWork(deps) {
   if (!Number.isFinite(timeoutMs) || timeoutMs <= 0)
     throw new Error("Auto-drain timeoutMs must be a positive finite number.");
   let deadlineAt = now() + timeoutMs, hasWork = deps.hasWork ?? hasOutstandingWork, wait = deps.wait ?? waitForSubagents;
-  for (; hasWork(sessionId, now()); ) {
+  for (; !deps.hasPendingMessages?.() && hasWork(sessionId, now()); ) {
     let remainingMs = deadlineAt - now();
     if (remainingMs <= 0)
       throw new Error(`Auto-drain timed out after ${timeoutMs}ms with background work still active in session '${sessionId}'.`);
@@ -5897,6 +6045,7 @@ async function drainOutstandingWork(deps) {
       events: deps.events,
       now,
       stopOnAttention: !1,
+      shouldYield: deps.hasPendingMessages,
       failOnFailedRuns: !0
     });
     if (waitResult.isError)
@@ -6186,7 +6335,7 @@ var CUSTOM_TOOL_DESCRIPTION_FILE = "subagent-tool-description.md", CUSTOM_TOOL_D
 \u2022 Choose the lowest tier that can reliably complete the task.
 \u2022 light: Use for simple, straightforward tasks that require little reasoning. Good for quick checks, finding information, collecting facts for research, inspecting a small amount of code, or verifying a specific fact.
 \u2022 standard: Use for moderately difficult work and everyday coding tasks. Good for writing simple code, fixing a clearly described bug, reviewing a focused change, or completing work with clear requirements. Use heavy when the task requires deep architectural understanding or complex reasoning.
-\u2022 heavy: Use for complex or ambiguous tasks that require deep reasoning and strong code understanding. Good for implementing complex plans, debugging difficult or poorly understood problems, reviewing large or high-risk changes, and making architectural decisions.`, SUBAGENT_SAFETY_GUIDANCE = `SAFETY-CRITICAL SUBAGENT GUIDANCE:
+\u2022 heavy: Use for complex or ambiguous tasks that require deep reasoning and strong code understanding. Good for implementing complex plans, debugging difficult or poorly understood problems, reviewing large or high-risk changes, and making architectural decisions.`, SUBAGENT_COORDINATION_GUIDANCE = "Define file ownership, local decision authority, and required outputs at launch. Establish shared contracts before dependent parallel work; use chains and artifacts to pass results. Native child intercom reaches the supervisor only, not siblings. Reserve parent relays for actionable exceptions, not routine progress or implementation approvals.", SUBAGENT_SAFETY_GUIDANCE = `SAFETY-CRITICAL SUBAGENT GUIDANCE:
 \u2022 Prompt children directly. There is no agent roster. Every execution task needs task (the full child prompt) and description (a concise UI label).
 \u2022 Every executable child chooses exactly one of tier: "light"|"standard"|"heavy" (default) or model: "provider/id" when the user names a model. Do not pass both, and do not use inherit. Missing, disabled, unconfigured, unavailable, or unauthenticated selections fail before launch.
 \u2022 Optional thinking (off/minimal/low/medium/high/xhigh/max) is only valid with an explicit model. Tier launches use the configured tier thinking level.
@@ -6196,6 +6345,7 @@ ${SUBAGENT_TIER_GUIDANCE}
 \u2022 ${SUBAGENT_ASYNC_GUIDANCE}
 \u2022 Child-safety boundary: ordinary children are not orchestrators and must not run subagents. Only explicitly configured fanout children may use the child-safe subagent tool, still bounded by depth/session limits.
 \u2022 Writing/review safety: keep one full-access writer for the same cwd/worktree. Use fresh-context permissions: "read-only" children for independent review, then have the parent synthesize and apply fixes as the sole writer unless an isolated worktree was intentionally requested.
+\u2022 ${SUBAGENT_COORDINATION_GUIDANCE}
 \u2022 Artifacts/status essentials: chain outputs live under {chain_dir}; async runs expose asyncId/asyncDir with status.json, events.jsonl, output logs, and status via { action: "status", id }. Include output paths and residual risks when reporting results.`, FULL_SUBAGENT_TOOL_DESCRIPTION = `Delegate work to generic children by prompting them directly. There are no named agent types.
 
 EXECUTION (use exactly ONE mode):
@@ -6247,6 +6397,7 @@ EXECUTE:
 \u2022 description is required (single-line, max 80 chars, UI only). task is the full child prompt. permissions omitted = full. Plan-mode parents must pass permissions:"read-only".
 \u2022 Exactly one of tier:"light"|"standard"|"heavy" (default) or model:"provider/id" when the user names a model. thinking only with model. No inherit; fail closed on unavailable selections. Children always start fresh. timeoutMs/maxRuntimeMs apply to foreground and async/background runs.
 ${SUBAGENT_TIER_GUIDANCE}
+\u2022 ${SUBAGENT_COORDINATION_GUIDANCE}
 \u2022 Chain templates may use {task}, {previous}, {chain_dir}, and named outputs. Parallel worktree isolation requires a clean git repo.
 \u2022 Chain example: { chain: [{task:"Analyze {task}", description:"Analyze request", tier:"standard"}, {parallel: [{task:"Check {previous}", description:"Check prior result", tier:"light", permissions:"read-only", count: 3}]}] }
 
@@ -6419,20 +6570,20 @@ function resolveSubagentActionDisplayTitle(args, state) {
 function renderSubagentCall(rawArgs, theme, context, options) {
   let args = resolveSubagentRequestParams(rawArgs);
   if (args.action) {
-    let target = context?.result?.details?.displayTitle || options?.resolveActionTitle?.(args) || args.id || args.runId || "";
-    return new Text2(`${theme.fg("toolTitle", theme.bold("subagent "))}${args.action}${target ? ` ${theme.fg("accent", target)}` : ""}`, 0, 0);
+    let resolvedTitle = context?.result?.details?.displayTitle || options?.resolveActionTitle?.(args), target = resolvedTitle || args.id || args.runId || "";
+    return (args.action === "steer" || args.action === "resume") && args.message ? renderCommunicationCall("subagent", args, theme, context, { direction: "to", peer: resolvedTitle || "Subagent", kind: "steer", message: args.message }, resolvedTitle) : new Text3(`${theme.fg("toolTitle", theme.bold("subagent "))}${args.action}${target ? ` ${theme.fg("accent", target)}` : ""}`, 0, 0);
   }
   let isParallel = (args.tasks?.length ?? 0) > 0, parallelCount = effectiveParallelTaskCount(args.tasks), asyncMark = subagentLaunchRunsAsync(args) ? `${theme.fg("warning", "async")} ` : "";
   if (args.chain?.length)
-    return new Text2(`${theme.fg("toolTitle", theme.bold("subagent "))}${asyncMark}chain (${args.chain.length})`, 0, 0);
+    return new Text3(`${theme.fg("toolTitle", theme.bold("subagent "))}${asyncMark}chain (${args.chain.length})`, 0, 0);
   if (isParallel)
-    return new Text2(`${theme.fg("toolTitle", theme.bold("subagent "))}${asyncMark}parallel (${parallelCount})`, 0, 0);
+    return new Text3(`${theme.fg("toolTitle", theme.bold("subagent "))}${asyncMark}parallel (${parallelCount})`, 0, 0);
   let description = !context?.result && !context?.isPartial && !context?.expanded && !context?.isError ? theme.fg("accent", args.description || args.task || "?") : "", title = theme.fg("toolTitle", theme.bold("subagent")), rest = [asyncMark.trim() ? theme.fg("warning", "async") : "", description].filter(Boolean).join(" ");
-  return new Text2(rest ? `${title} ${rest}` : title, 0, 0);
+  return new Text3(rest ? `${title} ${rest}` : title, 0, 0);
 }
 function renderSubagentNotify(details, theme) {
   let status = typeof details?.status == "string" ? details.status : "", icon = status === "completed" ? theme.fg("success", "\u2713") : status === "failed" ? theme.fg("error", "\u2717") : theme.fg("warning", "\u25A0"), title = details?.agent || "child";
-  return new Text2(`${icon} ${theme.bold(title)} ${theme.fg("dim", status)}`, 0, 0);
+  return new Text3(`${icon} ${theme.bold(title)} ${theme.fg("dim", status)}`, 0, 0);
 }
 function ensureSubagentResultAnimation(context) {
   let state = context.state;
@@ -6459,14 +6610,14 @@ function isStaleExtensionContextError(error) {
 }
 function rebuildSlashResultContainer(container, result2, options, theme) {
   container.clear(), container.addChild(new Spacer2(1));
-  let boxTheme = isSlashResultRunning(result2) ? "toolPendingBg" : isSlashResultError(result2) ? "toolErrorBg" : "toolSuccessBg", box = new Box(1, 1, (text) => theme.bg(boxTheme, text));
+  let boxTheme = isSlashResultRunning(result2) ? "toolPendingBg" : isSlashResultError(result2) ? "toolErrorBg" : "toolSuccessBg", box = new Box2(1, 1, (text) => theme.bg(boxTheme, text));
   box.addChild(renderSubagentResult(result2, options, theme)), container.addChild(box);
 }
 function createSlashResultComponent(details, options, theme) {
-  let container = new Container2(), lastVersion = -1;
+  let container = new Container3(), lastVersion = -1;
   return container.render = (width) => {
     let snapshot = getSlashRenderableSnapshot(details);
-    return (snapshot.version !== lastVersion || isSlashResultRunning(snapshot.result)) && (lastVersion = snapshot.version, rebuildSlashResultContainer(container, snapshot.result, options, theme)), Container2.prototype.render.call(container, width);
+    return (snapshot.version !== lastVersion || isSlashResultRunning(snapshot.result)) && (lastVersion = snapshot.version, rebuildSlashResultContainer(container, snapshot.result, options, theme)), Container3.prototype.render.call(container, width);
   }, container;
 }
 function registerSubagentExtension(pi) {
@@ -6534,7 +6685,7 @@ function registerSubagentExtension(pi) {
       try {
         let currentGeneration = generation;
         if (signal?.throwIfAborted(), !executorPromise) {
-          let pending = import("./subagent-executor-MH4A7CCF.js").then(({ createSubagentExecutor }) => {
+          let pending = import("./subagent-executor-M5VWB3D3.js").then(({ createSubagentExecutor }) => {
             if (generation !== currentGeneration)
               throw new Error("Subagent session changed before initialization");
             return createSubagentExecutor({
@@ -6563,27 +6714,31 @@ function registerSubagentExtension(pi) {
       }
     }
   };
-  executorExecute = executor.execute, pi.registerMessageRenderer(SLASH_RESULT_TYPE, (message, options, theme) => {
+  executorExecute = executor.execute, registerSupervisorRenderers(pi, state), pi.registerMessageRenderer(SLASH_RESULT_TYPE, (message, options, theme) => {
     let details = resolveSlashMessageDetails(message.details);
     if (details)
       return createSlashResultComponent(details, options, theme);
   }), pi.registerMessageRenderer(SLASH_TEXT_RESULT_TYPE, (message, _options, _theme) => {
     let content = typeof message.content == "string" ? message.content : message.content.filter((entry) => entry.type === "text").map((entry) => entry.text).join(`
 `);
-    return new Text2(content, 0, 0);
+    return new Text3(content, 0, 0);
   }), pi.registerMessageRenderer("subagent-notify", (message, _options, theme) => {
     let content = typeof message.content == "string" ? message.content : "", details = message.details ?? parseSubagentNotifyContent(content);
-    return details ? renderSubagentNotify(details, theme) : new Text2(content, 0, 0);
+    return details ? renderSubagentNotify(details, theme) : new Text3(content, 0, 0);
   }), pi.registerMessageRenderer(SUBAGENT_STEERING_MESSAGE_TYPE, (message, _options, theme) => {
     let details = message.details;
     if (details)
-      return new Text2(theme.fg(details.state === "recovered" ? "warning" : "error", formatSteeringNotice(details)), 0, 0);
+      return new Text3(theme.fg(details.state === "recovered" ? "warning" : "error", formatSteeringNotice(details)), 0, 0);
   }), pi.registerMessageRenderer(SUBAGENT_CONTROL_MESSAGE_TYPE, () => {
   });
   let executeSubagentCollapsed = async (id, params, signal, onUpdate, ctx) => {
     ctx.hasUI && ctx.ui.setToolsExpanded(!1);
-    let displayTitle = params.action === "steer" ? resolveSubagentActionDisplayTitle(params, state) : void 0, result2 = await executor.execute(id, params, signal, onUpdate, ctx);
-    return displayTitle && result2.details && (result2.details.displayTitle = displayTitle), result2;
+    let isCommunication = (params.action === "steer" || params.action === "resume") && typeof params.message == "string", displayTitle = isCommunication ? resolveSubagentActionDisplayTitle(params, state) : void 0, jobs = isCommunication ? matchingActionJobs(state, (params.id || params.runId || "").trim()) : [], targetNames = new Map(jobs.length === 1 ? jobs[0].steps?.map((step, index) => [step.index ?? index, childRowLabel(step)]) : []), result2 = await executor.execute(id, params, signal, onUpdate, ctx);
+    if (displayTitle && result2.details && (result2.details.displayTitle = displayTitle), isCommunication && result2.details) {
+      let targets = result2.details.steering?.targets.map((target) => targetNames.get(target.index) ?? `Subagent ${target.index + 1}`), peer = targets?.length ? targets.join(", ") : displayTitle || "Subagent";
+      result2.details.communication = { direction: "to", peer, kind: "steer", message: params.message };
+    }
+    return result2;
   }, slashBridge = registerSlashSubagentBridge({
     events: pi.events,
     getContext: () => state.lastUiContext,
@@ -6613,6 +6768,8 @@ function registerSubagentExtension(pi) {
       resolveActionTitle: (params) => resolveSubagentActionDisplayTitle(params, state)
     }),
     renderResult(result2, options, theme, context) {
+      if (result2.details?.communication)
+        return renderCommunicationResult(result2.content, result2.details, options.expanded, context.isError, theme);
       subagentResultIsRunning(result2) ? ensureSubagentResultAnimation(context) : clearLegacyResultAnimationTimer(context);
       let state2 = context.state, entries = [];
       state2.animEntries = entries, subagentAnimSink.current = entries;
@@ -6630,7 +6787,7 @@ function registerSubagentExtension(pi) {
     launches.length !== 0 && await awaitWithAbort(Promise.all(launches).then(() => {
     }), signal);
   }), pi.on("agent_end", async (_event, ctx) => {
-    ctx.hasUI || await drainOutstandingWork({ state, events: pi.events });
+    ctx.hasUI || await drainOutstandingWork({ state, events: pi.events, hasPendingMessages: () => ctx.hasPendingMessages() });
   }), registerSlashCommands(pi, state);
   let eventUnsubscribeStoreKey = "__piSubagentEventUnsubscribes", controlNoticeSeenStoreKey = "__piSubagentVisibleControlNotices", previousEventUnsubscribes = globalStore[eventUnsubscribeStoreKey];
   if (Array.isArray(previousEventUnsubscribes)) {