@creative-dswork/dscode 0.2.0 → 0.2.1

package/dist/dscode.mjs

@@ -601,6 +601,123 @@ var init_theme = __esm({
   }
 });
 
+// src/permissions/fuzzy.ts
+function deriveFuzzyPattern(toolName) {
+  if (!toolName) return null;
+  const match = toolName.match(/^(mcp__[^_]+(?:_[^_]+)*?)__/);
+  if (match) {
+    return match[1] + "__*";
+  }
+  return toolName;
+}
+function deriveFuzzyArgPattern(toolName, args) {
+  if (args == null) return null;
+  if (toolName === "bash") {
+    const cmd = typeof args === "string" ? args : JSON.stringify(args);
+    const firstWord = cmd.match(/^"?(\w+)/);
+    if (firstWord) {
+      return `^"${firstWord[1]}`;
+    }
+    return null;
+  }
+  if (toolName === "read_file" || toolName === "write_file" || toolName === "edit" || toolName === "grep" || toolName === "glob" || toolName === "list_files") {
+    const a = args;
+    const path = typeof a.path === "string" ? a.path : null;
+    if (!path) return null;
+    const lastSlash = path.lastIndexOf("/");
+    const dir = lastSlash >= 0 ? path.slice(0, lastSlash + 1) : "";
+    if (!dir) return null;
+    const escaped = dir.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    return `${escaped}[^"]*`;
+  }
+  return null;
+}
+function describeFuzzyArgPattern(toolName, args) {
+  if (toolName === "bash") {
+    const cmd = typeof args === "string" ? args : "";
+    const firstWord = cmd.match(/^"?(\w+)/);
+    return firstWord ? `${firstWord[1]}.*` : null;
+  }
+  if (toolName === "read_file" || toolName === "write_file" || toolName === "edit" || toolName === "grep" || toolName === "glob" || toolName === "list_files") {
+    const a = args;
+    const path = typeof a.path === "string" ? a.path : null;
+    if (!path) return null;
+    const lastSlash = path.lastIndexOf("/");
+    const dir = lastSlash >= 0 ? path.slice(0, lastSlash + 1) : "";
+    return dir ? `${dir}*` : null;
+  }
+  return null;
+}
+var init_fuzzy = __esm({
+  "src/permissions/fuzzy.ts"() {
+    "use strict";
+  }
+});
+
+// src/permissions/fuzzy-llm.ts
+import { complete } from "@mariozechner/pi-ai";
+function cacheKey(toolName, args) {
+  const argsStr = typeof args === "string" ? args.slice(0, 80) : JSON.stringify(args).slice(0, 80);
+  return `${toolName}:${argsStr}`;
+}
+function prefetchLlmSuggestions(model, toolName, args, preview) {
+  const key = cacheKey(toolName, args);
+  if (suggestionCache.has(key)) return;
+  if (!model) return;
+  const prompt = buildPrompt(toolName, args, preview);
+  complete(model, {
+    systemPrompt: "Respond with JSON only. No explanation.",
+    messages: [{ role: "user", content: prompt, timestamp: Date.now() }]
+  }).then((msg) => {
+    const suggestions = parseSuggestions(msg);
+    if (suggestions.length > 0) {
+      suggestionCache.set(key, suggestions);
+    }
+  }).catch(() => {
+  });
+}
+function getLlmSuggestions(toolName, args) {
+  return suggestionCache.get(cacheKey(toolName, args)) ?? [];
+}
+function buildPrompt(toolName, args, preview) {
+  return `The user is granting permission for this tool call. Suggest 1-2 fuzzy patterns that would match similar future calls.
+
+Tool: ${toolName}
+Args: ${JSON.stringify(args)}
+Preview: ${preview}
+
+Respond with ONLY a JSON array. Each item: {"label":"<human description>","toolPattern":"<glob or null>","argPattern":"<regex or null>"}.
+Example for "bash" with "git push origin main":
+[{"label":"All git push","toolPattern":null,"argPattern":"^\\"git push"},{"label":"All git commands","toolPattern":null,"argPattern":"^\\"git"}]
+
+Example for "read_file" with path "/src/components/Button.tsx":
+[{"label":"All .tsx in components","toolPattern":null,"argPattern":"/src/components/[^\\"]*\\\\.tsx"},{"label":"All files in components","toolPattern":null,"argPattern":"/src/components/"}]
+
+Rules:
+- toolPattern: null means same tool. Use "mcp__server__*" only for MCP tools.
+- argPattern: regex matching JSON-stringified args. null means no arg restriction.
+- Max 2 suggestions. Prefer specific over broad.`;
+}
+function parseSuggestions(msg) {
+  try {
+    const text = typeof msg.content === "string" ? msg.content : Array.isArray(msg.content) ? msg.content.filter((b) => b.type === "text").map((b) => b.text).join("") : "";
+    const match = text.match(/\[[\s\S]*\]/);
+    if (!match) return [];
+    const parsed = JSON.parse(match[0]);
+    if (!Array.isArray(parsed)) return [];
+    return parsed.filter((s) => typeof s.label === "string" && s.label.length > 0 && s.label.length < 60).slice(0, 2);
+  } catch {
+    return [];
+  }
+}
+var suggestionCache;
+var init_fuzzy_llm = __esm({
+  "src/permissions/fuzzy-llm.ts"() {
+    "use strict";
+    suggestionCache = /* @__PURE__ */ new Map();
+  }
+});
+
 // src/drivers/vision/reader.ts
 import { readFileSync as readFileSync14 } from "node:fs";
 import { exec, execSync as execSync3 } from "node:child_process";
@@ -3461,6 +3578,8 @@ var init_web_backend = __esm({
     init_models();
     init_config();
     init_commands();
+    init_fuzzy();
+    init_fuzzy_llm();
     init_mcp_browser();
     init_at_file_resolver();
     init_display();
@@ -3480,6 +3599,7 @@ var init_web_backend = __esm({
       // Pending permission state
       permissionResolve = null;
       currentPermissionTool = "";
+      currentPermissionArgs = null;
       // Image state
       pendingImages = [];
       // Message accumulation for the current assistant turn
@@ -3602,11 +3722,17 @@ var init_web_backend = __esm({
       }
       // ── UiBackend Permission ──
       getPromptPermission() {
-        return (toolName, preview, _args) => {
+        return (toolName, preview, args) => {
           return new Promise((resolve9) => {
             this.currentPermissionTool = toolName;
+            this.currentPermissionArgs = args;
             this.permissionResolve = resolve9;
-            this.broadcast({ type: "permission_prompt", toolName, preview });
+            const fuzzy = deriveFuzzyPattern(toolName);
+            const fuzzyArgDesc = describeFuzzyArgPattern(toolName, args);
+            const llmSuggestions = getLlmSuggestions(toolName, args);
+            this.broadcast({ type: "permission_prompt", toolName, preview, fuzzyPattern: fuzzy, fuzzyArgDesc, llmSuggestions: llmSuggestions.length > 0 ? llmSuggestions : void 0 });
+            const model = resolveModel(this.config.provider, this.config.modelId);
+            prefetchLlmSuggestions(model, toolName, args, preview);
           });
         };
       }
@@ -3760,10 +3886,34 @@ var init_web_backend = __esm({
               this.permissionResolve = null;
               const isAlways = cmd.decision === "always_allow" || cmd.decision === "always_allow_save";
               const isSave = cmd.decision === "always_allow_save";
+              const isSessionGrant = cmd.decision === "always_allow" && !isSave || cmd.decision === "allow" && !!cmd.sessionGrantPattern;
+              const sessionPattern = cmd.sessionGrantPattern;
               resolve9({
                 decision: isAlways ? "allow" : cmd.decision,
                 rememberForSession: isAlways,
-                persistRule: isSave ? { tool: this.currentPermissionTool, decision: "allow" } : void 0
+                sessionGrantPattern: isSessionGrant ? sessionPattern : void 0,
+                persistRule: isSave ? (() => {
+                  const mode = cmd.fuzzyMode ?? 0;
+                  if (mode === 2) {
+                    const fuzzyArg = deriveFuzzyArgPattern(this.currentPermissionTool, this.currentPermissionArgs);
+                    return fuzzyArg ? { tool: this.currentPermissionTool, argPattern: fuzzyArg, decision: "allow" } : { tool: this.currentPermissionTool, decision: "allow" };
+                  }
+                  if (mode >= 3) {
+                    try {
+                      const p = JSON.parse(cmd.toolNamePattern || "{}");
+                      return {
+                        tool: p.toolPattern ?? this.currentPermissionTool,
+                        argPattern: p.argPattern ?? void 0,
+                        decision: "allow"
+                      };
+                    } catch {
+                    }
+                  }
+                  if (mode === 1) {
+                    return { tool: cmd.toolNamePattern ?? this.currentPermissionTool, decision: "allow" };
+                  }
+                  return { tool: this.currentPermissionTool, decision: "allow" };
+                })() : void 0
               });
             }
             break;
@@ -7383,7 +7533,7 @@ var ToolRegistry = class {
     if (this.deferredToolNames.size === 0) return "";
     const grouped = /* @__PURE__ */ new Map();
     for (const name of this.deferredToolNames) {
-      const prefix = name.startsWith("mcp_") ? name.split("_").slice(0, 2).join("_") : "other";
+      const prefix = name.startsWith("mcp__") ? name.split("__").slice(0, 2).join("__") : "other";
       if (!grouped.has(prefix)) grouped.set(prefix, []);
       grouped.get(prefix).push(name);
     }
@@ -7834,6 +7984,7 @@ var PermissionManager = class {
   rules;
   denyRegexes;
   sessionGrants = /* @__PURE__ */ new Set();
+  sessionGrantPatterns = [];
   promptUser;
   defaultDecision;
   onBeforePrompt;
@@ -7873,6 +8024,11 @@ var PermissionManager = class {
     if (this.sessionGrants.has(toolName)) {
       return void 0;
     }
+    for (const grant of this.sessionGrantPatterns) {
+      if (this.matchesTool(grant.pattern, toolName)) {
+        return void 0;
+      }
+    }
     const decision = this.evaluate(toolName, argsStr);
     switch (decision.decision) {
       case "allow":
@@ -7895,7 +8051,14 @@ var PermissionManager = class {
           this.rules.sort((a, b) => b.priority - a.priority);
         }
         if (result.rememberForSession) {
-          this.sessionGrants.add(toolName);
+          if (result.sessionGrantPattern) {
+            this.sessionGrantPatterns.push({
+              pattern: result.sessionGrantPattern,
+              regex: result.sessionGrantPattern.includes("*") ? this.compileToolPattern(result.sessionGrantPattern) : null
+            });
+          } else {
+            this.sessionGrants.add(toolName);
+          }
         }
         if (result.decision === "deny") {
           return { block: true, reason: result.denyReason ?? "Denied by user" };
@@ -7909,17 +8072,23 @@ var PermissionManager = class {
   }
   revokeGrant(toolName) {
     this.sessionGrants.delete(toolName);
+    this.sessionGrantPatterns = this.sessionGrantPatterns.filter(
+      (g) => g.pattern !== toolName
+    );
   }
   getSessionGrants() {
-    return Array.from(this.sessionGrants);
+    const exact = Array.from(this.sessionGrants);
+    const patterns = this.sessionGrantPatterns.map((g) => g.pattern);
+    return [...exact, ...patterns];
   }
-  persistRule(rule) {
+  persistRule(rule, toolNamePattern) {
+    const toolName = toolNamePattern ?? rule.tool;
     const settings = loadScopedSettings(projectSettingsPath(this.projectPath));
     const permissions = settings.permissions ?? {};
     if (rule.decision === "allow") {
       const allow = Array.isArray(permissions.allow) ? [...permissions.allow] : [];
-      if (!allow.includes(rule.tool)) {
-        allow.push(rule.tool);
+      if (!allow.includes(toolName)) {
+        allow.push(toolName);
       }
       saveProjectSettings(this.projectPath, {
         ...settings,
@@ -7930,8 +8099,8 @@ var PermissionManager = class {
       });
     } else if (rule.decision === "deny") {
       const deny = Array.isArray(permissions.deny) ? [...permissions.deny] : [];
-      if (!deny.includes(rule.tool)) {
-        deny.push(rule.tool);
+      if (!deny.includes(toolName)) {
+        deny.push(toolName);
       }
       saveProjectSettings(this.projectPath, {
         ...settings,
@@ -8939,7 +9108,7 @@ var MCPManager = class {
       for (const def of client.getAllToolDefs()) {
         const visibility = def._meta?.ui?.visibility;
         if (visibility && visibility.length === 1 && visibility[0] === "app") {
-          names.push(`mcp_${serverName}_${def.name}`);
+          names.push(`mcp__${serverName}__${def.name}`);
         }
       }
     }
@@ -9023,7 +9192,7 @@ var MCPManager = class {
       this.clients.delete(name);
     }
     if (this.driverRegistry) {
-      this.driverRegistry.unregister(`mcp_${name}`);
+      this.driverRegistry.unregister(`mcp__${name}`);
     }
     state.status = "connecting";
     try {
@@ -9109,7 +9278,7 @@ var MCPManager = class {
       }
       this.clients.delete(name);
       if (this.driverRegistry) {
-        this.driverRegistry.unregister(`mcp_${name}`);
+        this.driverRegistry.unregister(`mcp__${name}`);
       }
     }
     const cfg = this.configs.find((c2) => c2.name === name);
@@ -9150,7 +9319,7 @@ var MCPManager = class {
     }
     this.clients.delete(name);
     if (this.driverRegistry) {
-      this.driverRegistry.unregister(`mcp_${name}`);
+      this.driverRegistry.unregister(`mcp__${name}`);
     }
     state.status = "disconnected";
     state.error = void 0;
@@ -9159,7 +9328,7 @@ var MCPManager = class {
     state.refreshError = void 0;
   }
   buildAgentTool(serverName, def, client) {
-    const toolName = `mcp_${serverName}_${def.name}`;
+    const toolName = `mcp__${serverName}__${def.name}`;
     if (def.alwaysLoad) {
       this.alwaysLoadToolNames.add(toolName);
     }
@@ -9239,7 +9408,7 @@ var MCPManager = class {
     const agentTools = tools.map((t) => this.buildAgentTool(serverName, t, client));
     const description = this.configs.find((c2) => c2.name === serverName)?.description ?? "";
     const driver = {
-      name: `mcp_${serverName}`,
+      name: `mcp__${serverName}`,
       description: `MCP: ${description || serverName}`,
       tools: agentTools,
       source: "mcp"
@@ -9667,6 +9836,8 @@ function escapeAttr(s) {
 // src/ui/tui-app.ts
 init_models();
 init_theme();
+init_fuzzy();
+init_fuzzy_llm();
 import {
   ProcessTerminal,
   TUI,
@@ -9742,8 +9913,13 @@ var ConversationView = class {
   renderedToolCount = 0;
   tui;
   draftBlocks = /* @__PURE__ */ new Map();
-  activePermission = null;
+  _activePermission = null;
   permSelected = 0;
+  permSubMode = false;
+  _permSubModeType = "save";
+  permSubSelected = 0;
+  lastSubNavAt = 0;
+  lastCancelSubAt = 0;
   imageTheme = {
     fallbackColor: c.dim
   };
@@ -9761,8 +9937,12 @@ var ConversationView = class {
     this.currentAssistantText = "";
     this.toolEntries = [];
     this.renderedToolCount = 0;
-    this.activePermission = null;
+    this._activePermission = null;
     this.permSelected = 0;
+    this.permSubMode = false;
+    this._permSubModeType = "save";
+    this.permSubSelected = 0;
+    this.lastSubNavAt = 0;
     this.draftBlocks.clear();
     while (this.box.children.length > 0) {
       this.box.removeChild(this.box.children[0]);
@@ -9967,9 +10147,12 @@ var ConversationView = class {
     }
     this.render();
   }
-  showPermissionPrompt(toolName, preview) {
-    this.activePermission = { toolName, preview };
+  showPermissionPrompt(toolName, preview, fuzzyPattern, fuzzyArgDesc) {
+    this._activePermission = { toolName, preview, fuzzyPattern: fuzzyPattern ?? null, fuzzyArgDesc: fuzzyArgDesc ?? null };
     this.permSelected = 0;
+    this.permSubMode = false;
+    this._permSubModeType = "save";
+    this.permSubSelected = 0;
     this.render();
   }
   permNavigate(direction) {
@@ -9977,11 +10160,52 @@ var ConversationView = class {
     this.render();
   }
   permSelect() {
-    return this.activePermission ? PERM_OPTIONS[this.permSelected] : null;
+    return this._activePermission ? PERM_OPTIONS[this.permSelected] : null;
+  }
+  isInSubMode() {
+    return this.permSubMode;
+  }
+  get activePermission() {
+    return this._activePermission;
+  }
+  get permSubModeType() {
+    return this._permSubModeType;
+  }
+  enterSubMode(type = "save", _fuzzy) {
+    this.permSubMode = true;
+    this._permSubModeType = type;
+    this.permSubSelected = 0;
+    this.lastSubNavAt = 0;
+    this.render();
+  }
+  cancelSubMode() {
+    this.permSubMode = false;
+    this.permSubSelected = 0;
+    this.lastCancelSubAt = Date.now();
+    this.render();
+  }
+  /** True if sub-mode was cancelled within the last 200ms — used to debounce double-firing Escape. */
+  get justCancelledSubMode() {
+    return Date.now() - this.lastCancelSubAt < 200;
+  }
+  permSubNavigate(direction) {
+    const now = Date.now();
+    if (now - this.lastSubNavAt < 120) return;
+    this.lastSubNavAt = now;
+    const fa = this._activePermission?.fuzzyArgDesc;
+    const llm = this._activePermission?.llmSuggestions;
+    const count = (fa ? 3 : 2) + (llm ? llm.length : 0);
+    this.permSubSelected = (this.permSubSelected + direction + count) % count;
+    this.render();
+  }
+  permSubSelect() {
+    return this.permSubSelected;
   }
   clearPermissionPrompt() {
-    this.activePermission = null;
+    this._activePermission = null;
     this.permSelected = 0;
+    this.permSubMode = false;
+    this.permSubSelected = 0;
   }
   pushText(content) {
     this.blocks.push({ type: "text", content });
@@ -9989,12 +10213,15 @@ var ConversationView = class {
   renderPermPrompt() {
     const lines = [];
     const maxLineLen = 60;
-    if (!this.activePermission) return lines;
+    if (!this._activePermission) return lines;
+    if (this.permSubMode) {
+      return this.renderPermSubOptions(lines);
+    }
     lines.push("");
     lines.push(c.yellow.bold(" Permissions \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-    lines.push(c.yellow(` Tool: ${this.activePermission.toolName}`));
-    if (this.activePermission.preview) {
-      for (const pl of this.activePermission.preview.split("\n").slice(0, 6)) {
+    lines.push(c.yellow(` Tool: ${this._activePermission.toolName}`));
+    if (this._activePermission.preview) {
+      for (const pl of this._activePermission.preview.split("\n").slice(0, 6)) {
         lines.push(c.dim(`   ${pl.slice(0, maxLineLen)}`));
       }
     }
@@ -10008,7 +10235,64 @@ var ConversationView = class {
       lines.push(`${prefix} ${label}  ${hint}`);
     }
     lines.push(c.dim(" \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
-    lines.push(c.dim(" \u2191\u2193 to navigate  Enter to confirm  A/I shortcuts  Esc to deny"));
+    lines.push(c.dim(" \u2191\u2193 to navigate  Enter to confirm  A/I/S shortcuts  Esc to deny"));
+    return lines;
+  }
+  renderPermSubOptions(lines) {
+    const fp = this._activePermission?.fuzzyPattern;
+    const tn = this._activePermission?.toolName ?? "";
+    const fa = this._activePermission?.fuzzyArgDesc;
+    const isMcp = tn.startsWith("mcp__");
+    const isSession = this._permSubModeType === "session" || this._permSubModeType === "allow";
+    if (isSession) {
+      const fuzzyLabel2 = isMcp ? `fuzzy: ${fp}` : `fuzzy: ${tn} (all calls)`;
+      const subOptions2 = [
+        { label: `exact: ${tn}`, key: "1" },
+        { label: fuzzyLabel2, key: "2" }
+      ];
+      lines.push("");
+      lines.push(c.yellow.bold(" Always Allow \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+      lines.push(c.dim(" Choose exact or fuzzy pattern:"));
+      lines.push("");
+      for (let i = 0; i < subOptions2.length; i++) {
+        const opt = subOptions2[i];
+        const selected = i === this.permSubSelected;
+        const prefix = selected ? c.cyan(" \u25B6") : "  ";
+        const label = selected ? c.bold(c.magenta(opt.label)) : c.dim(opt.label);
+        lines.push(`${prefix} ${label}`);
+      }
+      lines.push(c.dim(" \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+      lines.push(c.dim(" \u2191\u2193 to choose  Enter to confirm  Esc to cancel"));
+      return lines;
+    }
+    const exactLabel = isMcp ? `exact: ${tn}` : `exact: ${tn} (this call)`;
+    const fuzzyLabel = isMcp ? `fuzzy: ${fp ?? ""}` : `fuzzy: ${tn} (all calls)`;
+    const subOptions = [
+      { label: exactLabel, key: "1" },
+      { label: fuzzyLabel, key: "2" }
+    ];
+    if (fa) {
+      subOptions.push({ label: `fuzzy args: ${tn} ${fa}`, key: "3" });
+    }
+    const llm = this._activePermission?.llmSuggestions;
+    if (llm && llm.length > 0) {
+      for (let i = 0; i < llm.length; i++) {
+        subOptions.push({ label: `[AI] ${llm[i].label}`, key: `${3 + i}` });
+      }
+    }
+    lines.push("");
+    lines.push(c.yellow.bold(" Save Rule \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+    lines.push(c.dim(" Choose exact or fuzzy pattern:"));
+    lines.push("");
+    for (let i = 0; i < subOptions.length; i++) {
+      const opt = subOptions[i];
+      const selected = i === this.permSubSelected;
+      const prefix = selected ? c.cyan(" \u25B6") : "  ";
+      const label = selected ? c.bold(c.magenta(opt.label)) : c.dim(opt.label);
+      lines.push(`${prefix} ${label}`);
+    }
+    lines.push(c.dim(" \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+    lines.push(c.dim(" \u2191\u2193 to choose  Enter to confirm  Esc to cancel"));
     return lines;
   }
   render() {
@@ -10067,7 +10351,7 @@ var ConversationView = class {
       this.box.addChild(liveText);
       this.liveComponents.push(liveText);
     }
-    if (this.activePermission) {
+    if (this._activePermission) {
       const permText = new Text(this.renderPermPrompt().join("\n"));
       this.box.addChild(permText);
       this.liveComponents.push(permText);
@@ -10384,7 +10668,16 @@ var TuiApp = class {
   async showPermissionPrompt(toolName, preview, args) {
     this.pendingPermissionContext = { toolName, args };
     this.permissionExplainMode = false;
-    this.conversation.showPermissionPrompt(toolName, preview);
+    const fuzzy = deriveFuzzyPattern(toolName);
+    const fuzzyArgDesc = describeFuzzyArgPattern(toolName, args);
+    const llmSuggestions = getLlmSuggestions(toolName, args);
+    this.conversation.showPermissionPrompt(toolName, preview, fuzzy, fuzzyArgDesc);
+    if (llmSuggestions.length > 0) {
+      const ap = this.conversation.activePermission;
+      if (ap) ap.llmSuggestions = llmSuggestions;
+    }
+    const model = resolveModel(this.deps.config.provider, this.deps.config.modelId);
+    prefetchLlmSuggestions(model, toolName, args, preview);
     return new Promise((resolve9) => {
       this.resolvePermission = resolve9;
     });
@@ -10428,13 +10721,21 @@ var TuiApp = class {
       return;
     }
     if (option === "always_allow") {
-      this.resolvePermissionChoice({ decision: "allow", rememberForSession: true });
+      const fuzzy2 = deriveFuzzyPattern(this.pendingPermissionContext?.toolName ?? "");
+      if (fuzzy2 && fuzzy2 !== this.pendingPermissionContext?.toolName) {
+        this.conversation.enterSubMode("session", fuzzy2);
+      } else {
+        this.resolvePermissionChoice({ decision: "allow", rememberForSession: true });
+      }
       return;
     }
     if (option === "always_allow_save") {
-      const ctx = this.pendingPermissionContext;
-      const persistRule = ctx ? this.buildPersistedRule(ctx.toolName, ctx.args, "saved from permission prompt") : void 0;
-      this.resolvePermissionChoice({ decision: "allow", rememberForSession: true, persistRule });
+      const fuzzy2 = deriveFuzzyPattern(this.pendingPermissionContext?.toolName ?? "");
+      if (fuzzy2) {
+        this.conversation.enterSubMode("save", fuzzy2);
+      } else {
+        this.saveExactRule();
+      }
       return;
     }
     if (option === "explain") {
@@ -10445,7 +10746,65 @@ var TuiApp = class {
       this.tui.requestRender(true);
       return;
     }
-    this.resolvePermissionChoice({ decision: "allow" });
+    const fuzzy = deriveFuzzyPattern(this.pendingPermissionContext?.toolName ?? "");
+    if (fuzzy && fuzzy !== this.pendingPermissionContext?.toolName) {
+      this.conversation.enterSubMode("allow", fuzzy);
+    } else {
+      this.resolvePermissionChoice({ decision: "allow" });
+    }
+  }
+  saveExactRule() {
+    const ctx = this.pendingPermissionContext;
+    const persistRule = ctx ? this.buildPersistedRule(ctx.toolName, ctx.args, "saved from permission prompt") : void 0;
+    this.resolvePermissionChoice({ decision: "allow", rememberForSession: true, persistRule });
+  }
+  applyFuzzySaveOption(subIdx) {
+    const ctx = this.pendingPermissionContext;
+    if (!ctx) {
+      this.resolvePermissionChoice({ decision: "deny" });
+      return;
+    }
+    if (subIdx === 0) {
+      this.saveExactRule();
+    } else if (subIdx === 1) {
+      const fuzzy = deriveFuzzyPattern(ctx.toolName);
+      this.resolvePermissionChoice({ decision: "allow", rememberForSession: true, persistRule: fuzzy ? { tool: fuzzy, decision: "allow" } : void 0 });
+    } else if (subIdx === 2) {
+      const fuzzyArg = deriveFuzzyArgPattern(ctx.toolName, ctx.args);
+      this.resolvePermissionChoice({ decision: "allow", rememberForSession: true, persistRule: fuzzyArg ? { tool: ctx.toolName, argPattern: fuzzyArg, decision: "allow" } : void 0 });
+    } else {
+      const llm = this.conversation.activePermission?.llmSuggestions;
+      const s = llm ? llm[subIdx - 3] : null;
+      if (s) {
+        this.resolvePermissionChoice({
+          decision: "allow",
+          rememberForSession: true,
+          persistRule: {
+            tool: s.toolPattern ?? ctx.toolName,
+            argPattern: s.argPattern ?? void 0,
+            decision: "allow"
+          }
+        });
+      } else {
+        this.saveExactRule();
+      }
+    }
+  }
+  applySessionGrantOption(subIdx) {
+    if (subIdx === 0) {
+      this.resolvePermissionChoice({ decision: "allow", rememberForSession: true });
+    } else {
+      const fuzzy = deriveFuzzyPattern(this.pendingPermissionContext?.toolName ?? "");
+      this.resolvePermissionChoice({ decision: "allow", rememberForSession: true, sessionGrantPattern: fuzzy ?? void 0 });
+    }
+  }
+  applyAllowOption(subIdx) {
+    if (subIdx === 0) {
+      this.resolvePermissionChoice({ decision: "allow" });
+    } else {
+      const fuzzy = deriveFuzzyPattern(this.pendingPermissionContext?.toolName ?? "");
+      this.resolvePermissionChoice({ decision: "allow", rememberForSession: true, sessionGrantPattern: fuzzy ?? void 0 });
+    }
   }
   handleInput(data) {
     if (this.permissionExplainMode) {
@@ -10459,6 +10818,43 @@ var TuiApp = class {
       return false;
     }
     if (this.resolvePermission) {
+      if (this.conversation.isInSubMode()) {
+        if (matchesKey(data, Key.up)) {
+          this.conversation.permSubNavigate(-1);
+          return true;
+        }
+        if (matchesKey(data, Key.down)) {
+          this.conversation.permSubNavigate(1);
+          return true;
+        }
+        if (matchesKey(data, Key.enter) || matchesKey(data, Key.return)) {
+          const idx = this.conversation.permSubSelect();
+          const t = this.conversation.permSubModeType;
+          if (t === "session") this.applySessionGrantOption(idx);
+          else if (t === "allow") this.applyAllowOption(idx);
+          else this.applyFuzzySaveOption(idx);
+          return true;
+        }
+        if (matchesKey(data, Key.escape) || matchesKey(data, "ctrl+c") || data === "") {
+          this.conversation.cancelSubMode();
+          return true;
+        }
+        if (data === "1") {
+          const t = this.conversation.permSubModeType;
+          if (t === "session") this.applySessionGrantOption(0);
+          else if (t === "allow") this.applyAllowOption(0);
+          else this.applyFuzzySaveOption(0);
+          return true;
+        }
+        if (data === "2") {
+          const t = this.conversation.permSubModeType;
+          if (t === "session") this.applySessionGrantOption(1);
+          else if (t === "allow") this.applyAllowOption(1);
+          else this.applyFuzzySaveOption(1);
+          return true;
+        }
+        return true;
+      }
       if (matchesKey(data, Key.up)) {
         if (this.canNavigateMenu("up")) {
           this.conversation.permNavigate(-1);
@@ -10479,7 +10875,11 @@ var TuiApp = class {
         return true;
       }
       if (matchesKey(data, Key.escape) || matchesKey(data, "ctrl+c") || data === "") {
-        this.resolvePermissionChoice({ decision: "deny" });
+        if (this.conversation.isInSubMode()) {
+          this.conversation.cancelSubMode();
+        } else if (!this.conversation.justCancelledSubMode) {
+          this.resolvePermissionChoice({ decision: "deny" });
+        }
         return true;
       }
       const shortcut = findPermOptionByKey(data);