@namzu/cli 36.3.1 → 36.5.0

package/dist/chunks/{chunk-H6MWKPHM.js → chunk-WBR7JG42.js}

@@ -2,16 +2,16 @@ import { createRequire as __namzuCreateRequire } from 'node:module';
 const require = __namzuCreateRequire(import.meta.url);
 import {
   openManagedWorktrees
-} from "./chunk-52OVP5BG.js";
+} from "./chunk-P6AM76US.js";
 import {
   createBrowserControl
 } from "./chunk-WHODOMXA.js";
 import {
   connectMcpServers
-} from "./chunk-JCDTR2ZU.js";
+} from "./chunk-R5QMJRF7.js";
 import {
   createSessionSkillCatalog
-} from "./chunk-XCWZZZOW.js";
+} from "./chunk-6G3TX6QD.js";
 import {
   SAVE_SKILL_TOOL_NAME,
   WORKFLOW_TOOL_DESCRIPTION,
@@ -27,10 +27,10 @@ import {
   viewFromJournal,
   workflowOffered,
   workflowRefusal
-} from "./chunk-74KMYYM2.js";
+} from "./chunk-CAOXGCUA.js";
 import {
   openInBrowser
-} from "./chunk-AP5KD43Y.js";
+} from "./chunk-DQNJEGUV.js";
 import {
   CredentialRefreshRejectedError,
   CredentialWithdrawnError,
@@ -38,7 +38,7 @@ import {
   ensureFreshStoredCodexCredential,
   readSubscriptionCredential,
   sameOAuthCredential
-} from "./chunk-5URT3ZM2.js";
+} from "./chunk-ZBWLULPM.js";
 import {
   debugRequested
 } from "./chunk-GNBMKISG.js";
@@ -46,7 +46,7 @@ import {
   configuredPassthroughTools,
   resolveToolResultScreens,
   unmatchedPassthroughTools
-} from "./chunk-MBBFX64S.js";
+} from "./chunk-ZHWB7GXV.js";
 import {
   formatSize,
   homePath,
@@ -74,7 +74,7 @@ import {
   requiresCredentialForModel,
   resolveChainCapabilities,
   unresolvedMembers
-} from "./chunk-DYUOXP5Q.js";
+} from "./chunk-QNHDYR4J.js";
 import {
   PROVIDER_REGISTRY,
   missingCredentialMessage,
@@ -82,11 +82,11 @@ import {
 } from "./chunk-6LLJQ3KY.js";
 import {
   cliLogger
-} from "./chunk-FU4GQ7K2.js";
+} from "./chunk-GKVDZZN6.js";
 import {
   isPermissionMode,
   permissionModeLabel
-} from "./chunk-LBH5WVXU.js";
+} from "./chunk-QLB4KNQA.js";
 import {
   probeCapabilities
 } from "./chunk-OH6TB27S.js";
@@ -97,7 +97,7 @@ import {
 import {
   conversationLogPath,
   ensureSessionStarted
-} from "./chunk-EKUJUPFA.js";
+} from "./chunk-XMN2OSBG.js";
 import {
   INSTRUCTIONS_FILENAME,
   MAX_CHARS_PER_FILE,
@@ -107,13 +107,13 @@ import {
 } from "./chunk-H6B6AROX.js";
 import {
   ensurePrivateStateDirectory
-} from "./chunk-S6MZK4LD.js";
+} from "./chunk-BQYV3WGF.js";
 import {
   restrictToOwner
-} from "./chunk-BOV53LZO.js";
+} from "./chunk-R5OZ6DCD.js";
 import {
   namzuHomePath
-} from "./chunk-HKDPP2JF.js";
+} from "./chunk-7RP7HIBA.js";
 import {
   AgentManager,
   AgentRegistry,
@@ -183,7 +183,9 @@ import {
   buildResidentHistoryTools,
   buildResidentToolEvidenceTools,
   buildSessionGoalTools,
+  builtinCommandArguments,
   classifyEvidenceSource,
+  collectChatCompletion,
   compactNow,
   compactSession,
   computerUseUnavailableReason,
@@ -199,7 +201,9 @@ import {
   createReviewHandler,
   createSessionTextEvidenceSource,
   createSkillTool,
+  createSystemMessage,
   createToolPresenter,
+  createUserMessage,
   deferred,
   defineTool,
   discoverAgentDefinitions,
@@ -248,7 +252,7 @@ import {
   windowsShellNotice,
   withProviderFallback,
   wrapUntrusted
-} from "./chunk-V3ZLK3XQ.js";
+} from "./chunk-E2OJSRDE.js";
 import {
   __name
 } from "./chunk-76FLAFCG.js";
@@ -3939,7 +3943,7 @@ async function searchConversationCore(sessions, sessionId, request, signal, acti
         result.excludedToolResults = (result.excludedToolResults ?? 0) + page.excludedToolResults;
       if (page.excludedSummaries)
         result.excludedSummaries = (result.excludedSummaries ?? 0) + page.excludedSummaries;
-      const matches = page.matches.map(
+      const matches2 = page.matches.map(
         (match) => ({
           seq: match.seq,
           recordedAt: match.recordedAt,
@@ -3954,11 +3958,11 @@ async function searchConversationCore(sessions, sessionId, request, signal, acti
           ...match.characterOffset === void 0 ? {} : { byteOffset: match.byteOffset }
         })
       );
-      const bytes = Buffer.byteLength(JSON.stringify(matches));
+      const bytes = Buffer.byteLength(JSON.stringify(matches2));
       if (outputBytes + bytes > OUTPUT_BYTES)
         throw new Error("Evidence exceeded its output allowance.");
       outputBytes += bytes;
-      result.matches.push(...matches);
+      result.matches.push(...matches2);
       result.unavailable += page.unavailable.length;
       result.incomplete ||= page.incomplete || page.unavailable.length > 0;
       state.omitted ||= page.incomplete || page.unavailable.length > 0;
@@ -4493,6 +4497,7 @@ var SubagentActivityMonitor = class {
     if (!prior || !prior.closed || this.options.replay)
       throw new Error("This child conversation is not available for continuation.");
     const opened = this.open(input, viewId);
+    opened.record.resumed = true;
     opened.record.rows = [...prior.rows];
     opened.record.sessionId = prior.sessionId;
     pushRow(opened.record, {
@@ -4521,6 +4526,7 @@ var SubagentActivityMonitor = class {
         model: bounded(input.model.trim(), MAX_AGENT_ACTIVITY_LABEL_CODE_UNITS)
       } : {},
       description: bounded(input.description, MAX_AGENT_ACTIVITY_LABEL_CODE_UNITS),
+      ...input.background ? { background: true } : {},
       prompt: bounded(input.prompt, MAX_PROMPT_CODE_UNITS),
       batchId,
       ...input.toolUseId ? { toolUseId: bounded(input.toolUseId, MAX_IDENTITY_LABEL_CODE_UNITS) } : {},
@@ -4561,6 +4567,7 @@ var SubagentActivityMonitor = class {
           return;
         }
         owned.completedAt = handle.completedAt ?? Date.now();
+        owned.queued = 0;
         owned.latestActivity = handle.result?.stopReason && handle.result.stopReason !== "end_turn" ? `Stopped \xB7 ${handle.result.stopReason}` : terminalLabel(owned.status);
         if (owned.rows.length === 0) {
           pushRow(owned, {
@@ -4655,7 +4662,7 @@ var SubagentActivityMonitor = class {
    * matching record (already pruned, or never tracked) is a silent no-op:
    * there is no row left to explain what was sent.
    */
-  recordMessage(taskId, text, direction) {
+  recordMessage(taskId, text, direction, kind = "queued") {
     if (this.closed) return;
     const record = [...this.records.values()].find((entry) => entry.taskId === taskId);
     if (!record) return;
@@ -4665,8 +4672,36 @@ var SubagentActivityMonitor = class {
       text: bounded(text, MAX_ROW_CODE_UNITS),
       direction
     });
+    if (kind === "queued" && !isTerminal(record.status)) record.queued = (record.queued ?? 0) + 1;
     this.notifyNow();
   }
+  /**
+   * Records who is stopping a running agent, so the line that closes it can
+   * say. The first answer stands; an agent that has ended is left alone.
+   */
+  markStopped(viewId, by) {
+    const record = this.records.get(viewId);
+    if (!record || this.closed || isTerminal(record.status) || record.stoppedBy) return;
+    record.stoppedBy = by;
+    this.scheduleNotify();
+  }
+  /** The parent's wait on this agent ended before it did; see {@link SubagentActivity.released}. */
+  markReleased(viewId) {
+    const record = this.records.get(viewId);
+    if (!record || this.closed || isTerminal(record.status) || record.released) return;
+    record.released = true;
+    this.scheduleNotify();
+  }
+  /**
+   * Sets the live label of a running agent (see `activity-label.ts`). Ignored
+   * once the agent has ended, and for an unknown row.
+   */
+  setSummary(viewId, label) {
+    const record = this.records.get(viewId);
+    if (!record || this.closed || isTerminal(record.status)) return;
+    record.summary = bounded(label, MAX_AGENT_ACTIVITY_LABEL_CODE_UNITS);
+    this.scheduleNotify();
+  }
   /**
    * Retains one line of PARENT-authored commentary for the rail to show.
    *
@@ -4737,6 +4772,12 @@ var SubagentActivityMonitor = class {
       ...record.tokens !== void 0 ? { tokens: record.tokens } : {},
       ...record.toolCalls !== void 0 ? { toolCalls: record.toolCalls } : {},
       description: record.description,
+      ...record.summary && !isTerminal(record.status) ? { summary: record.summary } : {},
+      ...record.queued ? { queued: record.queued } : {},
+      ...record.resumed ? { resumed: true } : {},
+      ...record.background ? { background: true } : {},
+      ...record.released ? { released: true } : {},
+      ...record.stoppedBy ? { stoppedBy: record.stoppedBy } : {},
       prompt: record.prompt,
       batchId: record.batchId,
       ...record.toolUseId ? { toolUseId: record.toolUseId } : {},
@@ -5004,6 +5045,7 @@ function projectEvent(record, event) {
           };
         }
       }
+      record.queued = 0;
       record.latestActivity = event.isError ? `${event.toolName} failed` : `${event.toolName} done`;
       return;
     }
@@ -5634,6 +5676,147 @@ var NamzuCliAgent = class extends QueryAgent {
   }
 };
 
+// src/integrations/subagents/activity-label.ts
+var LABEL_INTERVAL_MS = 3e4;
+var LABEL_MIN_MESSAGES = 3;
+var LABEL_MAX_CHARS = 100;
+var LABEL_CONTEXT_ROWS = 40;
+var LABEL_ROW_CHARS = 600;
+var LABEL_INSTRUCTION = [
+  "Say what this agent is doing right now, as a short status label for a list.",
+  'Rules: three to five words; present tense (for example "Reading config loader"); name the file or function it is working on rather than a branch or a goal; one line, no quotes, no punctuation at the end, no markdown.',
+  "Write the label in the predominant language of the notes below. A stray word or code token in another language does not change it, and neither does the language of these instructions.",
+  "If a previous label is shown and the agent is still doing that, repeat it; otherwise say what is new.",
+  "Use no tools. Reply with the label only."
+].join("\n");
+function validateLabel(reply) {
+  const trimmed = reply.trim();
+  if (trimmed.length === 0 || trimmed.length > LABEL_MAX_CHARS) return void 0;
+  if (/[\r\n]/u.test(trimmed)) return void 0;
+  if (trimmed.startsWith("#") || trimmed.includes("```")) return void 0;
+  return trimmed;
+}
+__name(validateLabel, "validateLabel");
+function labelPrompt(agent) {
+  const rows = agent.transcript.slice(-LABEL_CONTEXT_ROWS).map((row) => {
+    const who = row.kind === "assistant" ? "agent" : row.kind === "tool" ? "tool" : row.direction ? "message" : "note";
+    const text = row.kind === "tool" && row.detail ? `${row.text} -> ${row.detail}` : row.text;
+    return `${who}: ${text.replace(/\s+/gu, " ").slice(0, LABEL_ROW_CHARS)}`;
+  }).join("\n");
+  return [
+    `Task given to the agent:
+${agent.prompt.slice(0, 1500)}`,
+    `What it has done so far (oldest first):
+${rows}`,
+    agent.summary ? `Previous label: ${agent.summary}` : "No previous label."
+  ].join("\n\n");
+}
+__name(labelPrompt, "labelPrompt");
+function messageCount(agent) {
+  return 1 + agent.transcript.length;
+}
+__name(messageCount, "messageCount");
+function signature(agent) {
+  const last = agent.transcript.at(-1);
+  return `${agent.transcript.length}:${last?.id ?? ""}:${last && "text" in last ? last.text.length : 0}`;
+}
+__name(signature, "signature");
+function startActivityLabeler(options) {
+  const seen = /* @__PURE__ */ new Map();
+  const inFlight = /* @__PURE__ */ new Map();
+  const tick = /* @__PURE__ */ __name(() => {
+    const live = /* @__PURE__ */ new Set();
+    for (const agent of options.activity.getSnapshot()) {
+      const running = agent.status === "working" || agent.status === "queued";
+      if (!running) continue;
+      live.add(agent.viewId);
+      if (agent.background !== true || agent.replayed === true) continue;
+      if (agent.workflowRunId !== void 0) continue;
+      if (messageCount(agent) < LABEL_MIN_MESSAGES) continue;
+      if (inFlight.has(agent.viewId)) continue;
+      const sig = signature(agent);
+      if (seen.get(agent.viewId) === sig) continue;
+      seen.set(agent.viewId, sig);
+      const controller = new AbortController();
+      inFlight.set(agent.viewId, controller);
+      void options.ask(agent, LABEL_INSTRUCTION, labelPrompt(agent), controller.signal).then((reply) => {
+        if (!reply || controller.signal.aborted) return;
+        const label = validateLabel(reply.text);
+        if (label) options.activity.setSummary(agent.viewId, label);
+      }).catch(() => void 0).finally(() => {
+        inFlight.delete(agent.viewId);
+      });
+    }
+    for (const [id, controller] of inFlight) {
+      if (!live.has(id)) controller.abort();
+    }
+    for (const id of seen.keys()) if (!live.has(id)) seen.delete(id);
+  }, "tick");
+  const timer = setInterval(tick, options.intervalMs ?? LABEL_INTERVAL_MS);
+  timer.unref?.();
+  return {
+    stop() {
+      clearInterval(timer);
+      for (const controller of inFlight.values()) controller.abort();
+      inFlight.clear();
+    }
+  };
+}
+__name(startActivityLabeler, "startActivityLabeler");
+
+// src/integrations/subagents/label-ledger.ts
+var LABEL_REQUEST_ALLOWANCE_TOKENS = 8e3;
+var NOTHING = {
+  promptTokens: 0,
+  completionTokens: 0,
+  totalTokens: 0,
+  cachedTokens: 0,
+  cacheWriteTokens: 0
+};
+async function chargeLabelRequest(input) {
+  const { budget, sessionId, signal } = input;
+  let account;
+  try {
+    const remaining = budget.remaining;
+    const limited = Number.isFinite(remaining);
+    const allowance = limited ? Math.min(remaining, LABEL_REQUEST_ALLOWANCE_TOKENS) : 0;
+    if (limited && allowance < input.estimatedPromptTokens) return void 0;
+    account = budget.reserve(allowance);
+    try {
+      account.bindTurn(sessionId, generateTurnId());
+    } catch (error) {
+      account.settle();
+      throw error;
+    }
+  } catch {
+    return void 0;
+  }
+  let requestId;
+  try {
+    requestId = await account.beginRequest();
+  } catch {
+    account.settle();
+    return void 0;
+  }
+  try {
+    const result = await input.request();
+    await account.finishRequest(requestId, result.usage);
+    return result.value;
+  } catch (error) {
+    const cancelled2 = signal.aborted;
+    const prompt = cancelled2 ? Math.max(0, Math.ceil(input.estimatedPromptTokens)) : 0;
+    await account.finishRequest(requestId, {
+      ...NOTHING,
+      promptTokens: prompt,
+      totalTokens: prompt
+    }).catch(() => void 0);
+    throw error;
+  } finally {
+    account.settle();
+  }
+}
+__name(chargeLabelRequest, "chargeLabelRequest");
+
 // src/integrations/subagents/policy.ts
 var CLI_INTERACTIVE_TURN_TIMEOUT_MS = 0;
 
@@ -5852,7 +6035,12 @@ var refuseUnownedChildReview = /* @__PURE__ */ __name(async () => ({
   action: "abort",
   reason: "The parent turn no longer owns an interactive review channel for this sub-agent."
 }), "refuseUnownedChildReview");
-async function createSubagentRuntime(opts) {
+async function createSubagentRuntime(input) {
+  const childMessageListeners = /* @__PURE__ */ new Set();
+  const opts = {
+    ...input,
+    childExtraTools: /* @__PURE__ */ __name(() => childMessageListeners.size > 0 ? [toolset("agents:message-main", [messageMainTool])] : [], "childExtraTools")
+  };
   const registry = new AgentRegistry();
   registry.register(
     buildDefinition(
@@ -6057,6 +6245,7 @@ async function createSubagentRuntime(opts) {
         const runtime = {
           gateway,
           completionInbox,
+          budget,
           close() {
             if (released) return;
             released = true;
@@ -6102,8 +6291,38 @@ async function createSubagentRuntime(opts) {
     return (await pending).completionInbox;
   }, "completionInboxForTurn");
   const activity = new SubagentActivityMonitor();
+  const labeler = startActivityLabeler({
+    activity,
+    ask: /* @__PURE__ */ __name(async (agent, instruction, body, signal) => {
+      const owned = conversations.get(agent.viewId);
+      if (!owned || closed || owned.config.model !== void 0) return void 0;
+      const parent = await resolveParent(owned.turnId);
+      const turn = await parents.get(owned.turnId)?.catch(() => void 0);
+      if (!turn) return void 0;
+      const provider = await opts.buildProvider(parent.sessionId);
+      const model = owned.seed.model ?? opts.model;
+      const text = await chargeLabelRequest({
+        budget: turn.budget,
+        sessionId: parent.sessionId,
+        estimatedPromptTokens: Math.ceil((instruction.length + body.length) / 4),
+        signal,
+        request: /* @__PURE__ */ __name(async () => {
+          const response = await collectChatCompletion(
+            provider.chatStream({
+              model,
+              messages: [createSystemMessage(instruction), createUserMessage(body)],
+              maxTokens: 60,
+              signal
+            })
+          );
+          return { value: response.message.content ?? "", usage: response.usage };
+        }, "request")
+      });
+      return text === void 0 ? void 0 : { text };
+    }, "ask")
+  });
   let dynCounter = 0;
-  const launchChild = /* @__PURE__ */ __name(async (input, context, hooks = {}) => {
+  const launchChild = /* @__PURE__ */ __name(async (input2, context, hooks = {}) => {
     const {
       description,
       prompt,
@@ -6118,7 +6337,7 @@ async function createSubagentRuntime(opts) {
       model: requestedModel,
       provider: requestedProvider,
       effort: requestedEffort
-    } = input;
+    } = input2;
     if (!requestedModel && (requestedProvider || requestedEffort))
       throw new Error("Supply model when selecting a child provider or effort.");
     const explore = subagent_type === EXPLORE_SUBAGENT;
@@ -6168,6 +6387,7 @@ ${persona}` : persona || (explore ? EXPLORE_PROMPT : SUBAGENT_PROMPT),
       agentId,
       model: selection?.model ?? fileAgent?.model ?? parentModel,
       description,
+      ...run_in_background === true ? { background: true } : {},
       prompt,
       batchId: context.toolBatchId,
       toolUseId: context.toolUseId,
@@ -6283,6 +6503,8 @@ ${persona}` : persona || (explore ? EXPLORE_PROMPT : SUBAGENT_PROMPT),
           } : tracker.onEvent
         }
       });
+      if (outcome.kind === "yielded" && run_in_background !== true)
+        activity.markReleased(tracker.viewId);
       return { outcome, agentId };
     } catch (error) {
       tracker.fail(error);
@@ -6313,7 +6535,7 @@ ${persona}` : persona || (explore ? EXPLORE_PROMPT : SUBAGENT_PROMPT),
       properties: {
         description: {
           type: "string",
-          description: "Short label for tracking (shown to the user)."
+          description: "A short (3-5 word) description of the task."
         },
         prompt: {
           type: "string",
@@ -6387,9 +6609,9 @@ ${persona}` : persona || (explore ? EXPLORE_PROMPT : SUBAGENT_PROMPT),
     destructive: false,
     concurrencySafe: true,
     timeoutMs: opts.resolveLimits ? 0 : opts.timeoutMs ?? CLI_INTERACTIVE_TURN_TIMEOUT_MS,
-    async execute(input, context) {
-      const { description, run_in_background } = input;
-      const { outcome, agentId } = await launchChild(input, context);
+    async execute(input2, context) {
+      const { description, run_in_background } = input2;
+      const { outcome, agentId } = await launchChild(input2, context);
       if (outcome.kind === "yielded") {
         const progress = outcome.handle.state === "pending" ? "queued for an available slot" : "still running";
         return {
@@ -6514,8 +6736,8 @@ ${JSON.stringify(launch.schema)}`;
     readOnly: true,
     destructive: false,
     concurrencySafe: true,
-    async execute(input, context) {
-      const request = input;
+    async execute(input2, context) {
+      const request = input2;
       if (request.history || request.session_id) {
         if (!opts.savedAgents)
           return {
@@ -6536,9 +6758,8 @@ ${JSON.stringify(launch.schema)}`;
       }
       const gateway = await gatewayForTurn(context.turnId);
       const tasks = gateway.listTasks();
-      const labels = new Map(
-        activity.getSnapshot().map((entry) => [entry.taskId, entry.description])
-      );
+      const snapshot = activity.getSnapshot();
+      const labels = new Map(snapshot.map((entry) => [entry.taskId, entry.description]));
       const shown = tasks.slice(-40).map((task) => ({
         description: labels.get(task.taskId) ?? task.agentId,
         task_id: task.taskId,
@@ -6582,10 +6803,10 @@ ${JSON.stringify(launch.schema)}`;
     destructive: false,
     concurrencySafe: true,
     timeoutMs: opts.resolveLimits ? 0 : opts.timeoutMs ?? CLI_INTERACTIVE_TURN_TIMEOUT_MS,
-    async execute(input, context) {
+    async execute(input2, context) {
       const gateway = await gatewayForTurn(context.turnId);
       let taskId;
-      const asked = input.task_id;
+      const asked = input2.task_id;
       if (typeof asked === "string" && /^w[0-9a-z]{8}$/.test(asked.trim())) {
         return {
           success: true,
@@ -6640,7 +6861,7 @@ ${JSON.stringify(launch.schema)}`;
   });
   const sendMessageTool = defineTool({
     name: "send_message",
-    description: "Queue a correction or additional context for a running or queued sub-agent task owned by this turn. The child receives it at its next request boundary; acceptance is not delivery. This does not start new work or restart finished tasks.",
+    description: "Send a correction or additional context to a sub-agent owned by this turn, addressed by its task id. A running or queued agent receives it at its next tool round; acceptance is not delivery. A finished agent is resumed from its own transcript with the message. An agent the user stopped is not resumed.",
     inputSchema: mcpJsonSchemaToZod({
       type: "object",
       properties: {
@@ -6663,9 +6884,9 @@ ${JSON.stringify(launch.schema)}`;
     readOnly: false,
     destructive: false,
     concurrencySafe: false,
-    async execute(input, context) {
+    async execute(input2, context) {
       context.abortSignal.throwIfAborted();
-      const { task_id, message: message2 } = input;
+      const { task_id, message: message2 } = input2;
       if (!message2.trim())
         return {
           success: false,
@@ -6681,18 +6902,36 @@ ${JSON.stringify(launch.schema)}`;
           output: "",
           error: `Task ${taskId} does not belong to this parent turn.`
         };
-      if (isTerminalAgentTaskState(task.state))
+      if (isTerminalAgentTaskState(task.state)) {
+        const shown = activity.getSnapshot().find((entry) => entry.taskId === String(taskId));
+        const label = shown?.agentId ?? String(taskId);
+        if (!shown)
+          return {
+            success: false,
+            output: "",
+            error: `Task ${taskId} has finished and cannot be resumed from here.`
+          };
+        try {
+          await messageChild(shown.viewId, message2, context.turnId, context.abortSignal, "parent");
+        } catch (error) {
+          return {
+            success: false,
+            output: "",
+            error: error instanceof Error ? error.message : String(error)
+          };
+        }
         return {
-          success: false,
-          output: "",
-          error: "This task has finished; send_message cannot restart it."
+          success: true,
+          output: `Resuming agent ${label}. It will notify you again when it finishes.`,
+          data: { task_id: taskId, status: "resumed" }
         };
+      }
       context.abortSignal.throwIfAborted();
       await gateway.continueTask(taskId, message2);
       activity.recordMessage(String(taskId), message2, "to-child");
       return {
         success: true,
-        output: `Message queued for task ${taskId}; it will be available at the child's next request boundary.`,
+        output: `Message queued for delivery to task ${taskId} at its next tool round. If it finishes first, it is resumed with the message and notifies again, so wait for that notification before resending.`,
         data: { task_id: taskId, status: "queued" }
       };
     }
@@ -6716,9 +6955,9 @@ ${JSON.stringify(launch.schema)}`;
     readOnly: false,
     destructive: false,
     concurrencySafe: false,
-    async execute(input, context) {
+    async execute(input2, context) {
       context.abortSignal.throwIfAborted();
-      const taskId = asTaskId(input.task_id);
+      const taskId = asTaskId(input2.task_id);
       const gateway = await gatewayForTurn(context.turnId);
       const task = gateway.getTask(taskId);
       if (!task)
@@ -6733,6 +6972,9 @@ ${JSON.stringify(launch.schema)}`;
           output: `Task ${taskId} already ended: ${agentTaskOutcome(task)}. No cancellation sent.`
         };
       context.abortSignal.throwIfAborted();
+      for (const [shownId, owned] of conversations) {
+        if (owned.task.taskId === taskId) activity.markStopped(shownId, "parent");
+      }
       gateway.cancelTask(taskId, "user");
       return {
         success: true,
@@ -6741,6 +6983,72 @@ ${JSON.stringify(launch.schema)}`;
       };
     }
   });
+  const messageMainTool = defineTool({
+    name: "send_message",
+    description: 'Send a message to the main conversation while you keep working. Your plain text output is not visible to the main conversation; to tell it something before you finish, you must call this tool with to "main". It is delivered with its next turn. Your final response goes to whoever launched you without this. Do not send routine progress: send what the main conversation needs to know or decide now.',
+    inputSchema: mcpJsonSchemaToZod({
+      type: "object",
+      properties: {
+        to: {
+          type: "string",
+          description: 'Recipient: "main", the main conversation.'
+        },
+        message: {
+          type: "string",
+          minLength: 1,
+          maxLength: 16e3,
+          description: "What to tell the main conversation."
+        }
+      },
+      required: ["to", "message"],
+      additionalProperties: false
+    }),
+    category: "custom",
+    permissions: [],
+    // Reads and writes nothing in the world; the text lands in the main
+    // conversation's context, framed as the child's own words.
+    readOnly: true,
+    destructive: false,
+    concurrencySafe: true,
+    async execute(input2, context) {
+      context.abortSignal.throwIfAborted();
+      const { to, message: message2 } = input2;
+      if (to !== "main")
+        return {
+          success: false,
+          output: "",
+          error: `No agent named '${to}' is currently addressable. Only "main" can be messaged from here.`
+        };
+      if (!message2.trim())
+        return { success: false, output: "", error: "Message must not be blank." };
+      const shown = activity.getSnapshot().find((entry) => entry.sessionId === String(context.sessionId));
+      const owned = shown ? conversations.get(shown.viewId) : void 0;
+      if (!shown || !owned || closed || childMessageListeners.size === 0 || shown.stoppedBy !== void 0)
+        return {
+          success: false,
+          output: "",
+          error: "Not sent. You cannot use send_message in this session: it is switched off for sub-agents, or you were stopped. Put what you need to pass on in your final response, which goes to whoever launched or resumed you."
+        };
+      const parent = await resolveParent(owned.turnId);
+      for (const listener of [...childMessageListeners]) {
+        try {
+          listener({
+            parentSessionId: String(parent.sessionId),
+            viewId: shown.viewId,
+            agentId: shown.agentId,
+            description: shown.description,
+            ...shown.taskId ? { taskId: shown.taskId } : {},
+            text: message2
+          });
+        } catch {
+        }
+      }
+      return {
+        success: true,
+        output: "Message queued for the main conversation's next turn."
+      };
+    }
+  });
   const narrationTool = defineTool({
     name: NARRATION_TOOL_NAME,
     description: [
@@ -6796,9 +7104,9 @@ ${JSON.stringify(launch.schema)}`;
       label: "Narrating",
       presentation: "activity"
     }), "presentCall"),
-    async execute(input, context) {
+    async execute(input2, context) {
       context.abortSignal.throwIfAborted();
-      const { line } = input;
+      const { line } = input2;
       const outcome = activity.narrate(line);
       if (outcome.kind === "empty")
         return {
@@ -6819,7 +7127,7 @@ ${JSON.stringify(launch.schema)}`;
       };
     }
   });
-  const messageChild = /* @__PURE__ */ __name(async (viewId, message2, turnId, signal) => {
+  const messageChild = /* @__PURE__ */ __name(async (viewId, message2, turnId, signal, source = "operator") => {
     if (closed) throw new Error("Sub-agent runtime is closed.");
     if (!message2.trim() || message2.length > 16e3)
       throw new Error("A child message must contain 1\u201316000 characters.");
@@ -6827,6 +7135,10 @@ ${JSON.stringify(launch.schema)}`;
     const shown = activity.getSnapshot().find((value) => value.viewId === viewId);
     if (!owned || !shown || shown.replayed)
       throw new Error("This child is saved evidence or is no longer owned by this host.");
+    if (shown.status === "cancelled")
+      throw new Error(
+        source === "operator" ? `${shown.agentId} was stopped, so it cannot take a message. Start a new agent for that work.` : `Agent "${shown.agentId}" was stopped by the user and was not resumed. Treat its work as cancelled; only start a new agent for it if the user explicitly asks.`
+      );
     if (owned.busy) throw new Error("A message to this child is already being admitted.");
     owned.busy = true;
     const id = randomUUID4();
@@ -6857,7 +7169,7 @@ ${JSON.stringify(launch.schema)}`;
       const parent = await resolveParent(turnId);
       if (owned.parentKey !== sessionKey(parent))
         throw new Error("This child belongs to a different parent conversation.");
-      if (opts.paths) {
+      if (opts.paths && source === "operator") {
         const directory = opts.paths.sessionDir({
           sessionId: parent.sessionId
         });
@@ -6918,7 +7230,12 @@ ${JSON.stringify(launch.schema)}`;
         kind = "started";
       }
       admitted = true;
-      activity.recordMessage(String(task.taskId), message2, "operator-to-child");
+      activity.recordMessage(
+        String(task.taskId),
+        message2,
+        source === "operator" ? "operator-to-child" : "to-child",
+        kind === "started" ? "started" : "queued"
+      );
       let auditWarning;
       try {
         await audit("accepted", String(task.taskId));
@@ -6951,6 +7268,7 @@ ${JSON.stringify(launch.schema)}`;
     if (closePromise) return closePromise;
     closed = true;
     closePromise = (async () => {
+      labeler.stop();
       await Promise.all([...parents.keys()].map(releaseTurn));
       await Promise.all(
         [...sessions.values()].map(async (entry) => (await entry.ready).manager.dispose())
@@ -6982,11 +7300,11 @@ ${JSON.stringify(launch.schema)}`;
     readOnly: true,
     destructive: false,
     concurrencySafe: true,
-    async execute(input, context) {
+    async execute(input2, context) {
       return {
         success: true,
         output: await listModels(
-          input.query ?? "",
+          input2.query ?? "",
           context.abortSignal
         )
       };
@@ -6999,10 +7317,17 @@ ${JSON.stringify(launch.schema)}`;
     if (!owned || !shown || shown.replayed) return false;
     const current = owned.gateway.getTask(owned.task.taskId) ?? owned.task;
     if (isTerminalAgentTaskState(current.state)) return false;
+    activity.markStopped(viewId, "user");
     owned.gateway.cancelTask(owned.task.taskId, "user");
     return true;
   }, "stopChild");
   return {
+    onChildMessage(listener) {
+      childMessageListeners.add(listener);
+      return () => {
+        childMessageListeners.delete(listener);
+      };
+    },
     cancelAgentTool,
     modelCatalogueTool,
     messageChild,
@@ -7016,9 +7341,9 @@ ${JSON.stringify(launch.schema)}`;
     sendMessageTool,
     narrationTool,
     allowedAgentIds: agentTypeIds,
-    launchesReadOnlyAgent(input) {
-      if (typeof input !== "object" || input === null) return false;
-      const fields = input;
+    launchesReadOnlyAgent(input2) {
+      if (typeof input2 !== "object" || input2 === null) return false;
+      const fields = input2;
       if (fields.workspace === "worktree") return false;
       if (fields.provider !== void 0 || fields.effort !== void 0) return false;
       const inherits = /* @__PURE__ */ __name((model) => model === void 0 || model === opts.model, "inherits");
@@ -7214,7 +7539,9 @@ ${SUBAGENT_PROMPT}`;
       const environment = opts.readEnvironment ? await opts.readEnvironment(childCwd) : null;
       const parent = options.parentTurnId ? await opts.resolveParent(asTurnId(options.parentTurnId)) : void 0;
       const provider = await opts.buildProvider(parent?.sessionId, selection);
-      const toolsets = tools();
+      const roster = tools();
+      const extra = opts.childExtraTools?.() ?? [];
+      const toolsets = extra.length > 0 ? [...roster, ...extra] : roster;
       const webSearch = opts.configureWebSearch?.(provider, options.model ?? model, toolsets);
       const resolvedToolsets = webSearch ? toolsets.map((ts) => filtered(ts, (tool) => tool.name !== "web_search")) : toolsets;
       return {
@@ -8416,6 +8743,121 @@ function createLiveModeControl(options) {
 }
 __name(createLiveModeControl, "createLiveModeControl");
 
+// src/permissions/session-allow.ts
+var WEB_FETCH_TOOL = "web_fetch";
+var MAX_LABEL_COMMAND = 60;
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+__name(isRecord2, "isRecord");
+function alwaysAsked(call) {
+  return call.escalation !== void 0 || call.requiresApproval === true || call.authorization?.explicitReview === true || call.isDestructive === true;
+}
+__name(alwaysAsked, "alwaysAsked");
+function allowFor(call, commands) {
+  if (alwaysAsked(call)) return void 0;
+  const input = isRecord2(call.input) ? call.input : void 0;
+  const commandArgument = commands.get(call.name);
+  if (commandArgument !== void 0) {
+    const line = input?.[commandArgument];
+    if (typeof line !== "string") return void 0;
+    const command = line.trim();
+    if (command === "" || /[\n\r;&|<>`$()*?{}\\]/.test(command)) return void 0;
+    if (input?.dangerously_disable_sandbox === true) return void 0;
+    return { kind: "command", tool: call.name, command };
+  }
+  if (call.name === WEB_FETCH_TOOL) {
+    const url = input?.url;
+    if (typeof url !== "string") return void 0;
+    try {
+      const host = new URL(url).hostname;
+      if (host === "" || host.includes("*")) return void 0;
+      return { kind: "host", tool: call.name, host };
+    } catch {
+      return void 0;
+    }
+  }
+  if (call.name.startsWith("mcp__")) return { kind: "tool", tool: call.name };
+  return void 0;
+}
+__name(allowFor, "allowFor");
+function allowsForBatch(calls, commands) {
+  if (calls.length === 0) return void 0;
+  const out = [];
+  for (const call of calls) {
+    const allow = allowFor(call, commands);
+    if (!allow) return void 0;
+    if (!out.some((existing) => sameAllow(existing, allow))) out.push(allow);
+  }
+  return out;
+}
+__name(allowsForBatch, "allowsForBatch");
+function sameAllow(a, b) {
+  if (a.kind !== b.kind || a.tool !== b.tool) return false;
+  if (a.kind === "command" && b.kind === "command") return a.command === b.command;
+  if (a.kind === "host" && b.kind === "host") return a.host === b.host;
+  return true;
+}
+__name(sameAllow, "sameAllow");
+function shorten(text) {
+  return text.length > MAX_LABEL_COMMAND ? `${text.slice(0, MAX_LABEL_COMMAND - 1)}\u2026` : text;
+}
+__name(shorten, "shorten");
+function describeAllows(allows) {
+  const parts = allows.map((allow) => {
+    switch (allow.kind) {
+      case "command":
+        return `${shorten(allow.command)} commands`;
+      case "host":
+        return allow.host;
+      case "tool":
+        return allow.tool.replace(/^mcp__/, "").replace(/__/g, " ");
+    }
+  });
+  return parts.length <= 1 ? parts[0] ?? "" : `${parts.slice(0, -1).join(", ")} and ${parts.at(-1)}`;
+}
+__name(describeAllows, "describeAllows");
+function matches(allow, toolName2, toolInput, commands) {
+  if (allow.tool !== toolName2) return false;
+  switch (allow.kind) {
+    case "tool":
+      return true;
+    case "host": {
+      const url = isRecord2(toolInput) ? toolInput.url : void 0;
+      if (typeof url !== "string") return false;
+      try {
+        return new URL(url).hostname === allow.host;
+      } catch {
+        return false;
+      }
+    }
+    case "command": {
+      const argument = commands.get(toolName2);
+      if (argument === void 0 || !isRecord2(toolInput)) return false;
+      const line = toolInput[argument];
+      return typeof line === "string" && line.trim() === allow.command && toolInput.dangerously_disable_sandbox !== true;
+    }
+  }
+}
+__name(matches, "matches");
+function createSessionAllows(commands) {
+  const entries = [];
+  return {
+    add(allows) {
+      for (const allow of allows) {
+        if (!entries.some((existing) => sameAllow(existing, allow))) entries.push(allow);
+      }
+    },
+    list: /* @__PURE__ */ __name(() => [...entries], "list"),
+    rule: {
+      type: "predicate",
+      description: "allowed for this session by an answer at a prompt",
+      decide: /* @__PURE__ */ __name((call) => entries.some((allow) => matches(allow, call.toolName, call.toolInput, commands)) ? "allow" : null, "decide")
+    }
+  };
+}
+__name(createSessionAllows, "createSessionAllows");
+
 // src/skills/directory.ts
 function createSkillDirectoryResolver(options) {
   return async (skill, context) => {
@@ -8572,17 +9014,17 @@ async function resolveModelSwitch(request, options) {
   const first = selected ?? usable.find(({ entry }) => entry.id === options.currentProvider);
   if (first && await inspect(first)) return resolve9(first);
   const candidates = selected ? [selected] : usable;
-  const matches = selected ? [] : (await Promise.all(
+  const matches2 = selected ? [] : (await Promise.all(
     candidates.filter((candidate) => candidate !== first).map(async (candidate) => await inspect(candidate) ? candidate : void 0)
   )).filter((candidate) => candidate !== void 0);
   signal?.throwIfAborted();
-  const uniqueMatch = matches.length === 1 ? matches[0] : void 0;
+  const uniqueMatch = matches2.length === 1 ? matches2[0] : void 0;
   if (uniqueMatch) return resolve9(uniqueMatch);
-  if (matches.length > 1) {
+  if (matches2.length > 1) {
     return {
       kind: "rejected",
-      reason: `Model "${model}" is available from multiple providers. Specify one: ${matches.map(({ entry }) => entry.id).join(", ")}.`,
-      choices: matches.map(({ entry }) => ({ provider: entry.id, model }))
+      reason: `Model "${model}" is available from multiple providers. Specify one: ${matches2.map(({ entry }) => entry.id).join(", ")}.`,
+      choices: matches2.map(({ entry }) => ({ provider: entry.id, model }))
     };
   }
   const choices = candidates.flatMap((candidate) => {
@@ -9001,12 +9443,15 @@ function clipRequestContext(prompt, limit, kind) {
 __name(clipRequestContext, "clipRequestContext");
 async function createAgentSession(prefs, detected, options = {}) {
   if (options.palEnvironment) {
-    const { createPalAgentSession } = await import("./agent-session-DU55LD4P.js");
+    const { createPalAgentSession } = await import("./agent-session-FXZ4RXQH.js");
     return createPalAgentSession(prefs, detected, options);
   }
-  const { palAtWorkspace } = await import("./store-7WZWQXKX.js");
+  const { palAtWorkspace } = await import("./store-ULDTJXKN.js");
   if (palAtWorkspace(options.cwd ?? process.cwd()))
     throw new Error("This Pal requires its owned virtual computer. Open it with namzu pal chat.");
+  const commandArguments = builtinCommandArguments();
+  const sessionAllows = createSessionAllows(commandArguments);
+  const sessionRules = [...options.rules ?? [], sessionAllows.rule];
   const fileObservations = /* @__PURE__ */ new Map();
   const observationsFor = /* @__PURE__ */ __name((id, prior) => {
     let seeded = fileObservations.get(id);
@@ -9741,10 +10186,10 @@ async function createAgentSession(prefs, detected, options = {}) {
             }
           })
         );
-        const matches = catalogues.flat();
+        const matches2 = catalogues.flat();
         return JSON.stringify({
-          models: matches.slice(0, 40),
-          omitted: Math.max(0, matches.length - 40),
+          models: matches2.slice(0, 40),
+          omitted: Math.max(0, matches2.length - 40),
           guidance: "Use exact IDs. Omitted capability fields are unknown, not unsupported. Narrow query when results are omitted."
         });
       }, "listModels"),
@@ -9780,7 +10225,7 @@ async function createAgentSession(prefs, detected, options = {}) {
           childToolsets.push(toolset("web-search", [createWebSearchTool()]));
         return childToolsets;
       }, "buildTools"),
-      authorizationGate: gateFor(options.rules)
+      authorizationGate: gateFor(sessionRules)
     });
     subagentRuntime = sub;
     const agentToolsets = [toolset("agents", [sub.agentTool, sub.waitForTaskTool])];
@@ -9934,7 +10379,7 @@ async function createAgentSession(prefs, detected, options = {}) {
   if (options.openUrl) toolsets.push(toolset("open-url", [createOpenUrlTool()]));
   const decisionTool = maybeCreateDecisionTool(options.decision, process.env);
   if (decisionTool) toolsets.push(toolset("decide", [decisionTool]));
-  const operatorPals = await import("./operator-tools-H4MYC5PE.js");
+  const operatorPals = await import("./operator-tools-BRBJUOP5.js");
   toolsets.push(
     readyWhen(
       toolset(
@@ -10294,7 +10739,7 @@ async function createAgentSession(prefs, detected, options = {}) {
         ...subagentRuntime ? {
           taskScheduler: await subagentRuntime.gatewayForTurn(entry2.turnId)
         } : {},
-        authorizationGate: gateFor(rules ?? options.rules),
+        authorizationGate: gateFor(rules ?? sessionRules),
         ...pendingDecision ? { pendingDecision } : {},
         compactionConfig: compactionConfigFor(options.compaction),
         retainedToolPreviewChars: options.conversationSessions ? options.compaction?.retainedToolPreviewChars ?? 4e3 : void 0,
@@ -10574,6 +11019,8 @@ async function createAgentSession(prefs, detected, options = {}) {
           directChildReports.delete(listener);
         };
       }, "onSubagentReport"),
+      onSubagentMessage: /* @__PURE__ */ __name((listener) => subagentRuntime?.onChildMessage(listener) ?? (() => {
+      }), "onSubagentMessage"),
       stopSubagent: /* @__PURE__ */ __name((viewId) => subagentRuntime?.stopChild(viewId) ?? false, "stopSubagent"),
       messageSubagent: /* @__PURE__ */ __name((viewId, message2, opts) => operations.promise(opts?.signal, async (signal) => {
         const runtime = subagentRuntime;
@@ -10757,10 +11204,8 @@ async function createAgentSession(prefs, detected, options = {}) {
     errorHint: null,
     errorKind: null,
     // Reads the same object the handler mutates, at call time.
-    approvalLatched: /* @__PURE__ */ __name(() => approval.all, "approvalLatched"),
-    resetApprovalLatch: /* @__PURE__ */ __name(() => {
-      approval.all = false;
-    }, "resetApprovalLatch"),
+    allowForSession: /* @__PURE__ */ __name((allows) => sessionAllows.add(allows), "allowForSession"),
+    commandArguments,
     setPermissionMode: /* @__PURE__ */ __name(async (mode, reason) => {
       await Promise.all(
         [...liveModeControls].map(
@@ -11052,7 +11497,7 @@ async function createAgentSession(prefs, detected, options = {}) {
               escalation,
               limits: turnLimits,
               sandboxWorkspace,
-              rules: options.rules,
+              rules: sessionRules,
               structuredOutput: options.structuredOutput,
               reviewAnswer: options.reviewAnswer,
               maxAnswerReviews: options.maxAnswerReviews,
@@ -12356,9 +12801,6 @@ function emptySession(errorHint, errorKind = "environment", rawDetail) {
     configNotices: [],
     errorHint,
     // No turn can run here, so no prompt can have been answered.
-    approvalLatched: /* @__PURE__ */ __name(() => false, "approvalLatched"),
-    resetApprovalLatch: /* @__PURE__ */ __name(() => {
-    }, "resetApprovalLatch"),
     // No registry was built, so there is no roster to report on.
     promptExemptTools: /* @__PURE__ */ __name(() => [], "promptExemptTools"),
     send: /* @__PURE__ */ __name(async function* () {
@@ -12417,6 +12859,8 @@ export {
   renderMemorySaveResult,
   renderTypedNoteResult,
   renderStoredMemorySection,
+  allowsForBatch,
+  describeAllows,
   assistantTranscriptTexts,
   projectTurnConversation,
   resolveModelSwitch,
@@ -12446,4 +12890,4 @@ export {
   RESULT_SUMMARY_WHOLE_MAX,
   resultSummaryLine
 };
-//# sourceMappingURL=chunk-H6MWKPHM.js.map
+//# sourceMappingURL=chunk-WBR7JG42.js.map