@namzu/cli 36.4.0 → 36.6.0

package/dist/chunks/{chunk-RAKBF6PY.js → chunk-IKGTBMN2.js}

@@ -2,16 +2,16 @@ import { createRequire as __namzuCreateRequire } from 'node:module';
 const require = __namzuCreateRequire(import.meta.url);
 import {
   openManagedWorktrees
-} from "./chunk-WIPSZYIM.js";
+} from "./chunk-DZEWXEUN.js";
 import {
   createBrowserControl
 } from "./chunk-WHODOMXA.js";
 import {
   connectMcpServers
-} from "./chunk-TCHEQRJE.js";
+} from "./chunk-Z6GVIPO2.js";
 import {
   createSessionSkillCatalog
-} from "./chunk-6ZEROVY4.js";
+} from "./chunk-VE322URM.js";
 import {
   SAVE_SKILL_TOOL_NAME,
   WORKFLOW_TOOL_DESCRIPTION,
@@ -27,10 +27,10 @@ import {
   viewFromJournal,
   workflowOffered,
   workflowRefusal
-} from "./chunk-ZJXRPK5W.js";
+} from "./chunk-LFHTKWQ5.js";
 import {
   openInBrowser
-} from "./chunk-IGHTIUKD.js";
+} from "./chunk-V6WLAAXC.js";
 import {
   CredentialRefreshRejectedError,
   CredentialWithdrawnError,
@@ -38,7 +38,7 @@ import {
   ensureFreshStoredCodexCredential,
   readSubscriptionCredential,
   sameOAuthCredential
-} from "./chunk-3N3CDMDI.js";
+} from "./chunk-P7NKAQ6I.js";
 import {
   debugRequested
 } from "./chunk-GNBMKISG.js";
@@ -46,7 +46,7 @@ import {
   configuredPassthroughTools,
   resolveToolResultScreens,
   unmatchedPassthroughTools
-} from "./chunk-MUUBLY7G.js";
+} from "./chunk-UFPOA63T.js";
 import {
   formatSize,
   homePath,
@@ -74,7 +74,7 @@ import {
   requiresCredentialForModel,
   resolveChainCapabilities,
   unresolvedMembers
-} from "./chunk-QZSP4UWJ.js";
+} from "./chunk-EOPRQEHH.js";
 import {
   PROVIDER_REGISTRY,
   missingCredentialMessage,
@@ -82,11 +82,11 @@ import {
 } from "./chunk-6LLJQ3KY.js";
 import {
   cliLogger
-} from "./chunk-KZJUG4HN.js";
+} from "./chunk-TUN5WPEN.js";
 import {
   isPermissionMode,
   permissionModeLabel
-} from "./chunk-DHXMHWOW.js";
+} from "./chunk-OTG2DGSA.js";
 import {
   probeCapabilities
 } from "./chunk-OH6TB27S.js";
@@ -97,7 +97,7 @@ import {
 import {
   conversationLogPath,
   ensureSessionStarted
-} from "./chunk-ZSPSXPRH.js";
+} from "./chunk-XQWG6PQN.js";
 import {
   INSTRUCTIONS_FILENAME,
   MAX_CHARS_PER_FILE,
@@ -107,13 +107,13 @@ import {
 } from "./chunk-H6B6AROX.js";
 import {
   ensurePrivateStateDirectory
-} from "./chunk-PAE4DIXR.js";
+} from "./chunk-GZHWOIKT.js";
 import {
   restrictToOwner
-} from "./chunk-O5FRXERG.js";
+} from "./chunk-AY6EUCML.js";
 import {
   namzuHomePath
-} from "./chunk-IQKT222K.js";
+} from "./chunk-PH72277Q.js";
 import {
   AgentManager,
   AgentRegistry,
@@ -183,6 +183,7 @@ import {
   buildResidentHistoryTools,
   buildResidentToolEvidenceTools,
   buildSessionGoalTools,
+  builtinCommandArguments,
   classifyEvidenceSource,
   collectChatCompletion,
   compactNow,
@@ -251,7 +252,7 @@ import {
   windowsShellNotice,
   withProviderFallback,
   wrapUntrusted
-} from "./chunk-5YWWQUJ5.js";
+} from "./chunk-2JVVUMXC.js";
 import {
   __name
 } from "./chunk-76FLAFCG.js";
@@ -3942,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,
@@ -3957,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;
@@ -8742,6 +8743,135 @@ 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/provider-retry.ts
+var TERMINAL_PROVIDER_RETRY = {
+  maxRetries: 10,
+  initialDelayMs: 500,
+  maxDelayMs: 32e3,
+  maxRetryAfterMs: 6e4,
+  jitter: "proportional",
+  retryAfter: "floor"
+};
+function terminalProviderRetry(restartableOutput) {
+  return restartableOutput ? { ...TERMINAL_PROVIDER_RETRY, retryMidStream: true } : TERMINAL_PROVIDER_RETRY;
+}
+__name(terminalProviderRetry, "terminalProviderRetry");
+
 // src/skills/directory.ts
 function createSkillDirectoryResolver(options) {
   return async (skill, context) => {
@@ -8898,17 +9028,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) => {
@@ -9327,12 +9457,15 @@ function clipRequestContext(prompt, limit, kind) {
 __name(clipRequestContext, "clipRequestContext");
 async function createAgentSession(prefs, detected, options = {}) {
   if (options.palEnvironment) {
-    const { createPalAgentSession } = await import("./agent-session-NATAL4BA.js");
+    const { createPalAgentSession } = await import("./agent-session-F5XU36CE.js");
     return createPalAgentSession(prefs, detected, options);
   }
-  const { palAtWorkspace } = await import("./store-VVOUETR5.js");
+  const { palAtWorkspace } = await import("./store-QLMY3B43.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);
@@ -10067,10 +10200,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"),
@@ -10106,7 +10239,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])];
@@ -10260,7 +10393,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-4NS32VMF.js");
+  const operatorPals = await import("./operator-tools-JRMP2OHZ.js");
   toolsets.push(
     readyWhen(
       toolset(
@@ -10620,7 +10753,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,
@@ -11085,10 +11218,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(
@@ -11380,7 +11511,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,
@@ -11546,7 +11677,10 @@ function constructProvider(id, det, model, context = {}) {
         type: "openai",
         apiKey: det?.apiKey ?? "",
         baseURL: det?.baseUrl,
-        model
+        model,
+        // The kernel retries, counts and shows each try; the vendor SDK must not
+        // try again silently underneath.
+        maxRetries: 0
       });
       return provider;
     }
@@ -11561,7 +11695,8 @@ function constructProvider(id, det, model, context = {}) {
         accessToken: det.apiKey ?? "",
         accountId: det.codex.accountId,
         baseURL: det.baseUrl,
-        model
+        model,
+        maxRetries: 0
       });
       return provider;
     }
@@ -11581,7 +11716,8 @@ function constructProvider(id, det, model, context = {}) {
         type: "deepseek",
         apiKey: det?.apiKey ?? "",
         baseURL: det?.baseUrl,
-        model
+        model,
+        maxRetries: 0
       });
       return provider;
     }
@@ -11947,6 +12083,7 @@ async function* runTurn({
       turnId,
       ...opts?.origin ? { origin: opts.origin } : {},
       ...opts?.abandonInterrupted ? { abandonInterrupted: true } : {},
+      retry: terminalProviderRetry(opts?.restartableOutput === true),
       // Omitted rather than empty when there is no tail. `query` treats the
       // two the same, but an absent option reads as "this turn has no chain"
       // where `[]` reads as "this turn has a chain with nothing in it".
@@ -12051,7 +12188,7 @@ async function* runTurn({
     if (isTurnInProgressError(err)) {
       yield {
         kind: "error",
-        message: `This conversation already has a ${err.state} turn (${err.activeTurnId}). ${err.state === "running" ? "Wait for it to finish." : "Resume it with /resume, or close it with /abandon."}`,
+        message: `This conversation already has a ${err.state} turn. ${err.state === "running" ? "Wait for it to finish." : "Resume it with /resume, or close it with /abandon."}`,
         turnInProgress: {
           sessionId: String(err.sessionId),
           activeTurnId: String(err.activeTurnId),
@@ -12247,7 +12384,8 @@ function toAgentEvent(event, presenter, readsOnly) {
         attempt: event.attempt,
         maxRetries: event.maxRetries,
         code: event.code,
-        ...event.status !== void 0 ? { status: event.status } : {}
+        ...event.status !== void 0 ? { status: event.status } : {},
+        ...event.restart ? { restart: true } : {}
       };
     case "tool_progress":
       return {
@@ -12684,9 +12822,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* () {
@@ -12745,6 +12880,8 @@ export {
   renderMemorySaveResult,
   renderTypedNoteResult,
   renderStoredMemorySection,
+  allowsForBatch,
+  describeAllows,
   assistantTranscriptTexts,
   projectTurnConversation,
   resolveModelSwitch,
@@ -12774,4 +12911,4 @@ export {
   RESULT_SUMMARY_WHOLE_MAX,
   resultSummaryLine
 };
-//# sourceMappingURL=chunk-RAKBF6PY.js.map
+//# sourceMappingURL=chunk-IKGTBMN2.js.map