@namzu/cli 36.4.0 → 36.6.0

package/dist/chunks/{tui-23RXXZL2.js → tui-FZJ37KG2.js}

@@ -2,26 +2,26 @@ import { createRequire as __namzuCreateRequire } from 'node:module';
 const require = __namzuCreateRequire(import.meta.url);
 import {
   reportCrash
-} from "./chunk-GTJVK5TJ.js";
+} from "./chunk-5SVMKOEG.js";
 import {
   changesBlock,
   changesSinceConfirmed,
   confirmationView,
   describeChanges,
   permissionsChanged
-} from "./chunk-MGFWBSDV.js";
+} from "./chunk-KWYQCOJA.js";
 import {
   visibleScheduleMessage
 } from "./chunk-NADQQMMG.js";
 import {
   settleAnsweredPark
-} from "./chunk-6T4UA6AV.js";
+} from "./chunk-ODSPUOYW.js";
 import "./chunk-GWQEMJFS.js";
 import {
   DELIVERY_READ_LIMIT,
   readSourceDeliveryPage,
   takeSuppressedCount
-} from "./chunk-COPHNRLH.js";
+} from "./chunk-VU7JHAR6.js";
 import {
   DEFAULT_MAX_ITERATIONS,
   DEFAULT_TIMEOUT_MS,
@@ -34,7 +34,7 @@ import {
   runsPerDay,
   scriptShellUnavailableReason,
   verifyScheduledScript
-} from "./chunk-4JPJV4QO.js";
+} from "./chunk-2NUNK4JI.js";
 import {
   callsCount
 } from "./chunk-E5VLANCO.js";
@@ -43,22 +43,22 @@ import {
   compileJobPolicy,
   compileScriptCheckPolicy,
   isPresetName
-} from "./chunk-UEDWEOYF.js";
+} from "./chunk-WFAZLQ5N.js";
 import {
   formatResumeShellCommand,
   parkedRunWords,
   resumeCommand
-} from "./chunk-NS7TSLQK.js";
+} from "./chunk-BVJQ5NVZ.js";
 import {
   appendHistory,
   nextFireOf,
   readHistory,
   readState
-} from "./chunk-BPWCZOTB.js";
-import "./chunk-II72PLUA.js";
+} from "./chunk-5X6ADRCM.js";
+import "./chunk-DII3AAD5.js";
 import {
   setUserConfigValue
-} from "./chunk-Q4AASGFT.js";
+} from "./chunk-RPRM4YIC.js";
 import {
   callEndpoint,
   readEndpoint
@@ -94,10 +94,10 @@ import {
   turnLimitCommands,
   wrapBalancedText,
   wrapChoiceText
-} from "./chunk-5ZRZZKPU.js";
+} from "./chunk-6XVYUSCD.js";
 import {
   handleTerminationSignals
-} from "./chunk-HZ5AGRNO.js";
+} from "./chunk-MMCTEOXA.js";
 import "./chunk-TBIX6JRE.js";
 import {
   describeAllCredentialsLogout,
@@ -123,20 +123,20 @@ import {
   withAutoChoice,
   withDebugDetail,
   writeConversationExport
-} from "./chunk-JHPCQLRT.js";
+} from "./chunk-YUIZ3I52.js";
 import {
   tuiPalDefinition,
   tuiPalEnvironment,
   tuiPalOwner,
   tuiPalPreferences
-} from "./chunk-BXWH4UAN.js";
-import "./chunk-MEWIPARY.js";
-import "./chunk-UH5LZDKB.js";
-import "./chunk-WDIIFX5X.js";
+} from "./chunk-PQOGAHD5.js";
+import "./chunk-ZU4YCZVG.js";
+import "./chunk-AO3RYELY.js";
+import "./chunk-QQFWOGD2.js";
 import {
   claimPalConversation,
   listPalConversations
-} from "./chunk-FAPXHMTL.js";
+} from "./chunk-X6SYXGAY.js";
 import {
   DEFAULT_AGENT_PHASE,
   DEFAULT_AGENT_WORKFLOW,
@@ -144,11 +144,13 @@ import {
   NOT_SHOWN_LINE,
   NO_BATCHES_MESSAGE,
   StartupRefusal,
+  allowsForBatch,
   appendMemoryWithStatus,
   assistantTranscriptTexts,
   combineBatches,
   createAgentSession,
   declinedLine,
+  describeAllows,
   describeProviderModels,
   explainFailure,
   formatCompactCount,
@@ -171,20 +173,21 @@ import {
   webCallTitle,
   webLiveStatus,
   webSettledLine
-} from "./chunk-RAKBF6PY.js";
+} from "./chunk-IKGTBMN2.js";
 import {
   openManagedWorktrees,
   worktreeOpenHint
-} from "./chunk-WIPSZYIM.js";
+} from "./chunk-DZEWXEUN.js";
 import {
   describePlainInterruption,
-  describeProviderWait
-} from "./chunk-ZORZAWSH.js";
+  describeProviderWait,
+  describeProviderWaitClock
+} from "./chunk-QMDN7FIB.js";
 import {
   describeBrowserStatus
 } from "./chunk-WHODOMXA.js";
-import "./chunk-TCHEQRJE.js";
-import "./chunk-6ZEROVY4.js";
+import "./chunk-Z6GVIPO2.js";
+import "./chunk-VE322URM.js";
 import {
   SAVE_SKILL_TOOL_NAME,
   SKILL_CREATOR_SKILL,
@@ -200,15 +203,15 @@ import {
   newSkillPrompt,
   resolveTurnGuards,
   runTokens
-} from "./chunk-ZJXRPK5W.js";
+} from "./chunk-LFHTKWQ5.js";
 import {
   openInBrowser
-} from "./chunk-IGHTIUKD.js";
+} from "./chunk-V6WLAAXC.js";
 import {
   beginCodexDeviceLogin,
   beginSubscriptionLogin,
   parsePastedInput
-} from "./chunk-3N3CDMDI.js";
+} from "./chunk-P7NKAQ6I.js";
 import {
   NO_SKILLS_FOUND,
   composeSkillsPrompt,
@@ -216,7 +219,7 @@ import {
   loadSkillBody,
   renderSkillRoster,
   skillTierLabel
-} from "./chunk-4TZPG75O.js";
+} from "./chunk-SMUEQ5RA.js";
 import "./chunk-ZWA2JRJV.js";
 import "./chunk-NUGPLXVK.js";
 import {
@@ -246,11 +249,11 @@ import {
   loadConfigWithProvenance,
   readPermissionLayers,
   resolveComposerTriggers
-} from "./chunk-RSRL3R7C.js";
+} from "./chunk-4WM5CKTI.js";
 import "./chunk-KONYGNG6.js";
 import {
   formatConfigSource
-} from "./chunk-KDOMBH7Q.js";
+} from "./chunk-GKEBBQ3Z.js";
 import "./chunk-HE7WUOX2.js";
 import {
   pinTrustedProjectPath,
@@ -259,7 +262,7 @@ import {
 import {
   debugRequested
 } from "./chunk-GNBMKISG.js";
-import "./chunk-MUUBLY7G.js";
+import "./chunk-UFPOA63T.js";
 import {
   displayPath,
   formatSize,
@@ -283,7 +286,7 @@ import {
   primaryProvider,
   signedInSubscriptionProviders,
   writePreferences
-} from "./chunk-QZSP4UWJ.js";
+} from "./chunk-EOPRQEHH.js";
 import {
   ALL_PROVIDER_IDS,
   PROVIDER_REGISTRY,
@@ -296,27 +299,28 @@ import {
 } from "./chunk-Y7B67G22.js";
 import {
   applyProviderFlags
-} from "./chunk-LH4NC5YB.js";
+} from "./chunk-G2DJRAN7.js";
 import "./chunk-XEUQN4JC.js";
-import "./chunk-K5JGJIJV.js";
+import "./chunk-ZNAE3DVS.js";
 import {
   PAUSED_TURN_LINES,
   currentTimeLine,
   describeTurnStop,
   handoffContinuationNote
-} from "./chunk-RDFZIPD5.js";
+} from "./chunk-2EUHQ3UU.js";
 import {
   contextLogging,
   installCliLogging
-} from "./chunk-KZJUG4HN.js";
+} from "./chunk-TUN5WPEN.js";
 import {
   terminalDisplayText
 } from "./chunk-EEDZOGV4.js";
 import {
-  effectivePermissionMode,
+  bypassAvailableAtLaunch,
+  nextCycleMode,
   permissionModeDescription,
   permissionModeLabel
-} from "./chunk-DHXMHWOW.js";
+} from "./chunk-OTG2DGSA.js";
 import "./chunk-LXB3S4IC.js";
 import "./chunk-OH6TB27S.js";
 import "./chunk-U3JIZFOS.js";
@@ -325,6 +329,7 @@ import {
   ConversationIndexRefreshError,
   activeConversationTurn,
   archiveConversation,
+  closableProviderPause,
   displayConversationTitle,
   forkConversation,
   forkConversationBeforeUser,
@@ -338,14 +343,14 @@ import {
   startConversation,
   titleOf,
   unarchiveConversation
-} from "./chunk-ZSPSXPRH.js";
+} from "./chunk-XQWG6PQN.js";
 import "./chunk-H6B6AROX.js";
-import "./chunk-PAE4DIXR.js";
-import "./chunk-JRVKQITY.js";
+import "./chunk-GZHWOIKT.js";
+import "./chunk-7QVXN3FK.js";
 import {
   isTrusted,
   trustDir
-} from "./chunk-CYYGWTKF.js";
+} from "./chunk-2LBM3V3N.js";
 import "./chunk-JORONMD3.js";
 import {
   clearAllStoredCredentials,
@@ -359,9 +364,10 @@ import {
   readStoredSubscriptionCredential,
   restrictToOwner,
   writeStoredGeminiApiKey
-} from "./chunk-O5FRXERG.js";
-import "./chunk-IQKT222K.js";
+} from "./chunk-AY6EUCML.js";
+import "./chunk-PH72277Q.js";
 import {
+  ACCEPT_EDITS_TOOLS,
   DECLINED_TOOL_CALL_FEEDBACK,
   DEFAULT_MAX_GOAL_ROUNDS,
   DiskMessageFeedbackStore,
@@ -415,7 +421,7 @@ import {
   validateTimeZone,
   wrapUntrusted,
   writePeerRecord
-} from "./chunk-5YWWQUJ5.js";
+} from "./chunk-2JVVUMXC.js";
 import {
   __commonJS,
   __export,
@@ -35616,12 +35622,6 @@ function permissionReviewPageRows(terminalRows) {
   return Math.min(24, Math.max(PERMISSION_REVIEW_PAGE_ROWS, rows - 18));
 }
 __name(permissionReviewPageRows, "permissionReviewPageRows");
-function releasedByApproveAll(toolCalls) {
-  return !toolCalls.some(
-    (call) => call.escalation?.sandboxEscape === true || (call.escalation?.outsidePaths?.length ?? 0) > 0
-  );
-}
-__name(releasedByApproveAll, "releasedByApproveAll");
 function permissionReviewRefusal(reason) {
   return reason === "too_large" ? `Refused: the complete tool batch exceeds the ${MAX_PERMISSION_REVIEW_BYTES}-byte interactive review limit. Split it into smaller calls or add an explicit allow rule after reviewing the operation another way.` : "Refused: this tool batch contains input the interactive permission protocol cannot represent exactly. Use JSON-compatible input or add an explicit allow rule after reviewing the operation another way.";
 }
@@ -37231,6 +37231,15 @@ __name(shellToneColor, "shellToneColor");
 
 // src/tui/LiveActivity.tsx
 var import_jsx_runtime4 = __toESM(require_jsx_runtime(), 1);
+function useSecondTick(active) {
+  const [, setTick] = (0, import_react36.useState)(0);
+  (0, import_react36.useEffect)(() => {
+    if (!active) return;
+    const timer = setInterval(() => setTick((n) => n + 1), 1e3);
+    return () => clearInterval(timer);
+  }, [active]);
+}
+__name(useSecondTick, "useSecondTick");
 var MAX_VISIBLE_TOOLS = 3;
 function LiveActivity({
   compact = false,
@@ -37260,6 +37269,7 @@ function LiveActivity({
     pausedRef.current.total += Date.now() - pausedRef.current.since;
     pausedRef.current.since = null;
   }
+  useSecondTick(waitNotice !== null);
   const { frame: tick } = useAnimation({
     isActive: active && motion && !waitingForYou,
     interval: 120
@@ -37287,9 +37297,15 @@ function LiveActivity({
   const waiting = waitingLine(activeTools);
   const visibleTools = waiting ? [] : activeTools.slice(0, MAX_VISIBLE_TOOLS);
   const hiddenTools = waiting ? 0 : activeTools.length - visibleTools.length;
-  const noticeRow = waitNotice ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(Text, { color: theme.status.warn, children: [
-    "\u23F3 ",
-    terminalDisplayText(waitNotice)
+  const noticeRow = waitNotice ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(Text, { wrap: "truncate-end", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(Text, { color: theme.status.error, children: [
+      "\u25CF ",
+      terminalDisplayText(waitNotice.what)
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(Text, { color: theme.text.muted, children: [
+      " \xB7 ",
+      describeProviderWaitClock(waitNotice, now)
+    ] })
   ] }) }) : null;
   const waitingRow = waiting ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(Text, { color: theme.text.secondary, wrap: "truncate-end", children: [
     "\u273B ",
@@ -42031,13 +42047,13 @@ function permissionEscalationNotes(toolCalls) {
   const notes = [];
   if (toolCalls.some((call) => call.escalation?.sandboxEscape === true)) {
     notes.push(
-      'Runs OUTSIDE the sandbox, on this machine. Asked every time; "allow all" never covers it.'
+      "Runs OUTSIDE the sandbox, on this machine. Asked every time; no earlier answer covers it."
     );
   }
   const outside = toolCalls.flatMap((call) => call.escalation?.outsidePaths ?? []);
   if (outside.length > 0) {
     notes.push(
-      `Outside the working directory: ${outside.join(", ")}. Asked every time; "allow all" never covers it.`
+      `Outside the working directory: ${outside.join(", ")}. Asked every time; no earlier answer covers it.`
     );
   }
   return notes;
@@ -42053,20 +42069,29 @@ function permissionAnswers(toolCalls, options = {}) {
   const agents = workflow || toolCalls.length > 0 && toolCalls.every((call) => call.name === "Agent");
   const approve = workflow ? "Start this workflow" : agents ? toolCalls.length === 1 ? "Start this agent" : `Start these ${toolCalls.length} agents` : "Yes";
   const reject = agents ? "Do not start" : "No, and tell namzu what to do differently (esc)";
-  if (options.batchOnly) {
-    return [
-      { label: approve, kind: "approve" },
-      { label: reject, kind: "reject" }
-    ];
-  }
-  const approveAll = agents ? "Start and allow all tools for this conversation" : toolCalls.some((call) => call.escalation?.sandboxEscape === true) ? "Yes, and allow other tools for this conversation (not sandbox escapes)" : toolCalls.some((call) => (call.escalation?.outsidePaths?.length ?? 0) > 0) ? "Yes, and allow other tools for this conversation (not paths outside it)" : "Yes, allow all tools for this conversation";
+  const extra = options.batchOnly ? void 0 : extraAnswer(toolCalls, options);
   return [
     { label: approve, kind: "approve" },
-    { label: approveAll, kind: "approve-all" },
+    ...extra ? [extra] : [],
     { label: reject, kind: "reject" }
   ];
 }
 __name(permissionAnswers, "permissionAnswers");
+function extraAnswer(toolCalls, options) {
+  if (options.mode === "prompt" && toolCalls.length > 0 && toolCalls.every(
+    (call) => ACCEPT_EDITS_TOOLS.has(call.name) && call.escalation === void 0 && call.isDestructive !== true && call.requiresApproval !== true && call.authorization?.explicitReview !== true
+  ))
+    return { label: "Yes, and switch to accept edits for this session", kind: "approve-edits" };
+  if (options.commandArguments === void 0) return void 0;
+  const allows = allowsForBatch(toolCalls, options.commandArguments);
+  if (!allows) return void 0;
+  return {
+    label: `Yes, and don't ask again for ${describeAllows(allows)} this session`,
+    kind: "approve-rule",
+    allows
+  };
+}
+__name(extraAnswer, "extraAnswer");
 function permissionChoices(toolCalls, options = {}) {
   return permissionAnswers(toolCalls, options).map((answer) => answer.label);
 }
@@ -42097,6 +42122,8 @@ function PermissionOverlay({
   columns,
   rows: terminalRows,
   batchOnly = false,
+  mode,
+  commandArguments,
   siteNotes = [],
   screenConsent
 }) {
@@ -42114,7 +42141,12 @@ function PermissionOverlay({
   const last = Math.min(rows.length, offset + pageRows);
   const destructive = toolCalls.some((call) => call.isDestructive);
   const sharing = screenConsent !== void 0;
-  const choices2 = permissionChoices(toolCalls, { batchOnly, screenConsent: sharing });
+  const choices2 = permissionChoices(toolCalls, {
+    batchOnly,
+    screenConsent: sharing,
+    ...mode ? { mode } : {},
+    ...commandArguments ? { commandArguments } : {}
+  });
   const escalationNotes = permissionEscalationNotes(toolCalls);
   const sharingNotes = sharing ? screenConsentNotes(screenConsent.provider) : [];
   return /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(
@@ -42168,8 +42200,8 @@ function PermissionOverlay({
             { text: "\u2191\u2193 select", rank: 5 },
             { text: "enter confirm", short: "enter ok", rank: 5 },
             {
-              text: `${batchOnly || sharing ? "y / n" : "y / a / n"} answer`,
-              short: batchOnly || sharing ? "y / n" : "y / a / n",
+              text: "y / n answer",
+              short: "y / n",
               rank: 5
             },
             { text: "esc decline", short: "esc no", rank: 5 },
@@ -49786,6 +49818,12 @@ function App2({
     launchPermissionMode ?? (ctx.skipPermissions === true || ctx.palId ? "auto" : "prompt")
   );
   const permissionModeRef = (0, import_react49.useRef)(permissionMode);
+  const bypassAvailableRef = (0, import_react49.useRef)(
+    bypassAvailableAtLaunch({
+      launchMode: permissionMode,
+      allowDangerouslySkipPermissions: ctx.allowDangerouslySkipPermissions === true
+    })
+  );
   const permissionModeSourceRef = (0, import_react49.useRef)(
     launchPermissionMode ? "launch-flag" : ctx.skipPermissions === true ? "launch-bypass" : "default"
   );
@@ -51079,15 +51117,8 @@ ${blocks.join("\n\n")}`;
         pushMessage("system", "Choose a model before changing permissions.");
         return;
       }
-      if (!session.resetApprovalLatch) {
-        pushMessage(
-          "system",
-          "Permissions cannot be changed in this conversation. Start a new conversation and try again."
-        );
-        return;
-      }
-      session.resetApprovalLatch();
       permissionModeRef.current = mode;
+      if (mode === "auto" && announce) bypassAvailableRef.current = true;
       permissionModeSourceRef.current = "session";
       setPermissionModeState(mode);
       void session.setPermissionMode?.(mode);
@@ -51432,8 +51463,7 @@ ${blocks.join("\n\n")}`;
   }, [hasUnsettledTurn, pushMessage, state]);
   const cyclePermissionMode = (0, import_react49.useCallback)(() => {
     const current = permissionModeRef.current;
-    const next = current === "prompt" ? "accept-edits" : current === "accept-edits" ? "plan" : "prompt";
-    applyPermissionMode(next, false);
+    applyPermissionMode(nextCycleMode(current, bypassAvailableRef.current), false);
   }, [applyPermissionMode]);
   const runConversationExport = (0, import_react49.useCallback)(
     (destination) => {
@@ -51785,11 +51815,7 @@ ${blocks.join("\n\n")}`;
       }
       if (picker.kind === "permission-mode") {
         if (value === "more") {
-          const child = permissionPicker(
-            permissionModeRef.current,
-            session?.approvalLatched() ?? false,
-            true
-          );
+          const child = permissionPicker(permissionModeRef.current, true);
           setSelectedChoice(
             Math.max(
               0,
@@ -52732,7 +52758,6 @@ ${blocks.join("\n\n")}`;
       // reporting a posture the operator has already changed. The
       // function keeps that impossible by construction rather than by a
       // coincidence three lines away.
-      approvalLatched: /* @__PURE__ */ __name(() => session?.approvalLatched() ?? false, "approvalLatched"),
       neverPrompted: /* @__PURE__ */ __name(() => session?.promptExemptTools() ?? [], "neverPrompted")
     },
     instructionFiles: session?.instructionFiles ?? [],
@@ -52953,6 +52978,12 @@ ${blocks.join("\n\n")}`;
       pushMessage("system", explainFailure(err, "Could not list archived conversations."));
     }
   }, [ensureSessions, hasUnsettledTurn, pushMessage, state]);
+  const permissionAnswerOptions = /* @__PURE__ */ __name((pending) => ({
+    batchOnly: pending.batchOnly === true,
+    screenConsent: pending.screenConsent === true,
+    mode: permissionModeRef.current,
+    ...session?.allowForSession && session.commandArguments ? { commandArguments: session.commandArguments } : {}
+  }), "permissionAnswerOptions");
   const resolvePermission = (0, import_react49.useCallback)(
     (decision) => {
       const resolve6 = permissionResolveRef.current;
@@ -52966,15 +52997,6 @@ ${blocks.join("\n\n")}`;
         setState("thinking");
         resolve6(decision);
       }
-      if (decision.kind === "approve-all") {
-        const kept = [];
-        for (const pending of permissionQueueRef.current.splice(0)) {
-          if (pending.permission.screenConsent !== true && releasedByApproveAll(pending.permission.toolCalls))
-            pending.resolve(decision);
-          else kept.push(pending);
-        }
-        permissionQueueRef.current.push(...kept);
-      }
       const next = permissionQueueRef.current.shift();
       setQueuedPermissionCount(permissionQueueRef.current.length);
       if (next) {
@@ -53813,6 +53835,17 @@ ${blocks.join("\n\n")}`;
         const notice = describeProviderWait(event, scheduleLiveRef.current?.model?.provider);
         providerWaitNoticeRef.current = notice;
         setProviderWaitNotice(notice);
+        if (event.restart) {
+          if (st.releaseTimer) clearTimeout(st.releaseTimer);
+          st.releaseTimer = void 0;
+          st.pending = "";
+          st.text = st.text.slice(0, st.messageTextStart ?? st.text.length);
+          st.streamedChars = 0;
+          setTurnTokens(st.reportedOutputTokens ?? 0);
+          const abandoned = st.assistantId;
+          st.assistantId = null;
+          if (abandoned) setMessages((prev) => prev.filter((m) => m.id !== abandoned));
+        }
       } else if (providerWaitNoticeRef.current !== null) {
         providerWaitNoticeRef.current = null;
         setProviderWaitNotice(null);
@@ -53889,6 +53922,9 @@ ${blocks.join("\n\n")}`;
           }
           st.releasedAt ??= Date.now();
           setThinking(null);
+          if (st.messageTextStart === void 0 || st.assistantId === null && !st.pending) {
+            st.messageTextStart = st.text.length;
+          }
           st.text += event.text;
           st.pending = (st.pending ?? "") + event.text;
           const { ready, rest } = splitCompleteBlocks(st.pending);
@@ -54451,6 +54487,19 @@ ${jobLines.map(([, line]) => `- ${line}`).join("\n")}`] : []
         } : prompt.kind === "peer" ? { type: "runtime-context", kind: "peer-message" } : prompt.kind === "notice" ? { type: "runtime-context", kind: noticeKind } : void 0
       );
       const priorForSdk = [...historyBeforeTurn, userMessage];
+      const closeStoppedReply = /* @__PURE__ */ __name(async () => {
+        const sessions = sessionsRef.current;
+        const scope = scopeRef.current;
+        if (!sessions || !scope || !conversationMaterializedRef.current || !session?.abandonTurn)
+          return;
+        const stopped = await closableProviderPause(sessions, scope.sessionId);
+        if (!stopped) return;
+        await session.abandonTurn(
+          stopped.turnId,
+          "The operator went on with a new message instead of retrying."
+        );
+        setHandoffPark(null);
+      }, "closeStoppedReply");
       const turnId = generateTurnId();
       const requestedTriggers = prompt.kind === "human" ? prompt.triggers ?? [] : [];
       const triggerContext = triggerContextNow();
@@ -54693,6 +54742,7 @@ ${jobLines.map(([, line]) => `- ${line}`).join("\n")}`] : []
           workflowNoticeSnapshot = new Map(workflowNoticesRef.current);
           childMessageSnapshot = new Map(childMessagesRef.current);
           const operatorShellSnapshot = drainOperatorShell();
+          await closeStoppedReply();
           for await (const event of session.send(priorForSdk, {
             signal: ac.signal,
             turnId,
@@ -54700,6 +54750,8 @@ ${jobLines.map(([, line]) => `- ${line}`).join("\n")}`] : []
             // The TUI never resumes a turn whose process is gone; the next
             // prompt closes it. A paused turn is never closed this way.
             abandonInterrupted: true,
+            // A redrawing screen can take back a reply a dropped connection cut short.
+            restartableOutput: true,
             permissionMode: turnPermissionMode,
             // Read at every decision: the operator may change the mode
             // while this turn runs, and the change governs what follows.
@@ -55496,7 +55548,7 @@ Available: ${agentIds.join(", ")}` : "\nNo agents are configured."}`
               {
                 name: "permissions",
                 label: "Permissions",
-                description: `${permissionModeLabel(effectivePermissionMode(permissionModeRef.current, session?.approvalLatched() ?? false))} \xB7 this conversation.`
+                description: `${permissionModeLabel(permissionModeRef.current)} \xB7 this conversation.`
               },
               {
                 name: "config limits",
@@ -55709,14 +55761,11 @@ Available: ${agentIds.join(", ")}` : "\nNo agents are configured."}`
               pushMessage("system", "Choose a model before changing permissions.");
               return;
             }
-            if (state !== "idle" || abortRef.current !== null || hasUnsettledTurn() || queuedRef.current.length > 0 || permissionResolveRef.current !== null || compactingRef.current || !session.resetApprovalLatch) {
-              pushMessage(
-                "system",
-                !session.resetApprovalLatch ? "Permissions cannot be changed in this conversation. Start a new conversation and try again." : "Finish or stop the current work before changing permissions."
-              );
+            if (state !== "idle" || abortRef.current !== null || hasUnsettledTurn() || queuedRef.current.length > 0 || permissionResolveRef.current !== null || compactingRef.current) {
+              pushMessage("system", "Finish or stop the current work before changing permissions.");
               return;
             }
-            const picker = permissionPicker(permissionModeRef.current, session.approvalLatched());
+            const picker = permissionPicker(permissionModeRef.current);
             setSelectedChoice(
               Math.max(
                 0,
@@ -56996,10 +57045,7 @@ ${lines.join("\n")}`);
         }
         if (permission && (key.upArrow || key.downArrow)) {
           const current = permissionChoiceRef.current;
-          const last = permissionAnswers(permission.toolCalls, {
-            batchOnly: permission.batchOnly === true,
-            screenConsent: permission.screenConsent === true
-          }).length - 1;
+          const last = permissionAnswers(permission.toolCalls, permissionAnswerOptions(permission)).length - 1;
           const next = key.upArrow ? Math.max(0, current - 1) : Math.min(last, current + 1);
           setPermissionChoice(next);
           return;
@@ -57026,14 +57072,19 @@ ${lines.join("\n")}`);
           return;
         }
         if (!approvalIsDeliberate(permissionOpenedAtRef.current, Date.now())) return;
-        const answers = permissionAnswers(permission?.toolCalls ?? [], {
-          batchOnly: permission?.batchOnly === true,
-          screenConsent: permission?.screenConsent === true
-        });
+        const answers = permission ? permissionAnswers(permission.toolCalls, permissionAnswerOptions(permission)) : [];
         const numbered = /^[1-9]$/.test(ch) ? Number(ch) - 1 : null;
         const chosen = key.return ? permissionChoiceRef.current : numbered;
-        const kind = ch === "y" ? "approve" : ch === "a" ? answers.some((answer) => answer.kind === "approve-all") ? "approve-all" : void 0 : chosen !== null ? answers[chosen]?.kind : void 0;
-        if (kind) resolvePermission(kind === "reject" ? { kind, declined: {} } : { kind });
+        const answer = ch === "y" ? answers[0] : chosen !== null ? answers[chosen] : void 0;
+        if (!answer) return;
+        if (answer.kind === "reject") {
+          resolvePermission({ kind: "reject", declined: {} });
+          return;
+        }
+        if (answer.kind === "approve-edits") applyPermissionMode("accept-edits", false);
+        else if (answer.kind === "approve-rule" && answer.allows)
+          session?.allowForSession?.(answer.allows);
+        resolvePermission({ kind: "approve" });
         return;
       }
       const shellView = jobSurfaceRef.current;
@@ -57663,10 +57714,7 @@ ${lines.join("\n")}`);
   const permissionSource = reviewSource(permission, scopeRef.current?.sessionId);
   const permissionOwner = permissionSource ? subagents.find((agent) => agent.sessionId === permissionSource) : void 0;
   const permissionSourceLabel = permissionSource ? permissionOwner ? `Agent: ${permissionOwner.description}` : "Agent: another agent" : void 0;
-  const displayedPermissionMode = effectivePermissionMode(
-    permissionMode,
-    session?.approvalLatched() ?? false
-  );
+  const displayedPermissionMode = permissionMode;
   const highestEffort = highestReasoningEffort(session?.reasoningEffortLevels);
   const hypermodeLevel = hypermodeEffort(session?.reasoningEffortLevels);
   const composerTriggers = composerTriggersOn ? {
@@ -57815,6 +57863,8 @@ ${lines.join("\n")}`);
             columns: terminal.columns,
             rows: terminal.rows,
             batchOnly: permission.batchOnly === true,
+            mode: permissionMode,
+            ...session?.allowForSession && session.commandArguments ? { commandArguments: session.commandArguments } : {},
             siteNotes: permission.siteNotes,
             ...permission.screenConsent === true ? { screenConsent: { provider: session?.providerSummary ?? null } } : {}
           }
@@ -58192,8 +58242,8 @@ function pluginActionPicker(owner, name) {
   };
 }
 __name(pluginActionPicker, "pluginActionPicker");
-function permissionPicker(mode, approvedAll, more = false) {
-  const current = effectivePermissionMode(mode, approvedAll);
+function permissionPicker(mode, more = false) {
+  const current = mode;
   const values = more ? ["auto", "strict", "rules"] : ["prompt", "accept-edits", "plan", "more"];
   return {
     kind: "permission-mode",
@@ -58606,4 +58656,4 @@ react/cjs/react-jsx-runtime.development.js:
    * LICENSE file in the root directory of this source tree.
    *)
 */
-//# sourceMappingURL=tui-23RXXZL2.js.map
+//# sourceMappingURL=tui-FZJ37KG2.js.map