jinzd-ai-cli 0.4.276 → 0.4.278

package/dist/index.js

@@ -4,6 +4,7 @@ import {
   McpManager,
   SNAPSHOT_PROMPT,
   SkillManager,
+  applyPlanCommand,
   applyProfileCommand,
   applyThinkCommand,
   armDeferredSave,
@@ -14,21 +15,28 @@ import {
   costSourceNote,
   decideDeferredSave,
   decideModel,
+  describeRouting,
   estimateConversationTokens,
   evaluateContextPressure,
   filterMemoryEntries,
   loadDevState,
   parseMemoryShowFilters,
+  parseModelCommand,
+  parseRouteCommand,
   parseSimpleYaml,
   persistToolRound,
   readGitDiff,
+  resolveModelSwitch,
+  resolveProviderSwitch,
+  routeDecisionRows,
+  routingEmptyRulesNote,
   saveDevState,
   scanProject,
   sessionHasMeaningfulContent,
   setupProxy,
   snapshotFile,
   stripRoutingTags
-} from "./chunk-MCKUGWOY.js";
+} from "./chunk-JJCNNQTU.js";
 import {
   CostTracker,
   computeCost,
@@ -48,6 +56,7 @@ import {
   getRecentlyDeniedAutoActions,
   googleSearchContext,
   isInterrupted,
+  isToolCapableProvider,
   lastResponseStore,
   renderDiff,
   requestInterrupt,
@@ -57,7 +66,7 @@ import {
   setMaxOutputCap,
   spawnAgentContext,
   undoStack
-} from "./chunk-NXNXWM6H.js";
+} from "./chunk-WOXIKQRI.js";
 import {
   buildReviewPrompt,
   buildSecurityReviewPrompt
@@ -98,8 +107,8 @@ import {
   touchMemoryReferences,
   updateMemoryApproval,
   updateMemoryEntry
-} from "./chunk-KWSGSSWN.js";
-import "./chunk-GLSR2NR3.js";
+} from "./chunk-RFSKPCYC.js";
+import "./chunk-4DEMGCK4.js";
 import "./chunk-UUSRWSSX.js";
 import "./chunk-CKH4KQ4E.js";
 import "./chunk-BXP6YZ2P.js";
@@ -122,7 +131,7 @@ import {
   formatDoctorReport,
   loadContextFiles,
   writeCrashLog
-} from "./chunk-WYDP2WEQ.js";
+} from "./chunk-LTZFUYBT.js";
 import {
   describePlugin,
   getActivePluginAssets,
@@ -139,14 +148,14 @@ import {
   trustHook,
   trustPlugin,
   untrustHook
-} from "./chunk-AOISQVXS.js";
+} from "./chunk-L3CPM472.js";
 import {
   ProviderRegistry,
   listBuiltInProviderMetadata
-} from "./chunk-4KTK2OYU.js";
+} from "./chunk-UGY5SVNX.js";
 import {
   ConfigManager
-} from "./chunk-VF7DMSKF.js";
+} from "./chunk-2BYQP6JX.js";
 import {
   CONTENT_ONLY_STREAM_REMINDER,
   TEE_FINAL_USER_NUDGE,
@@ -184,7 +193,7 @@ import {
 import {
   fileCheckpoints
 } from "./chunk-4BKXL7SM.js";
-import "./chunk-OMBKLWLJ.js";
+import "./chunk-SB4XONS4.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   AUTHOR,
@@ -202,7 +211,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-FLDYAXJR.js";
+} from "./chunk-X3722RFA.js";
 
 // src/index.ts
 import { program } from "commander";
@@ -978,34 +987,41 @@ function createProviderCommands() {
         } else {
           targetId = args[0];
         }
-        if (!ctx.providers.has(targetId)) {
-          ctx.renderer.renderError(`Provider '${targetId}' is not configured. Run: aicli config`);
-          return;
-        }
-        const targetProvider = ctx.providers.get(targetId);
-        if (targetProvider.info.models.length === 0) {
-          const models = await targetProvider.listModels();
-          if (models.length === 0) {
-            ctx.renderer.renderError(
-              `Provider '${targetId}' has no available models. ` + (targetId === "ollama" ? "Make sure Ollama is running (`ollama serve`) and has models (`ollama pull <model>`)." : "Check provider configuration.")
-            );
-            return;
+        const configured = ctx.providers.has(targetId);
+        let availableModels = [];
+        let providerDefaultModel = "";
+        if (configured) {
+          const target = ctx.providers.get(targetId);
+          providerDefaultModel = target.info.defaultModel;
+          availableModels = target.info.models.map((m) => m.id);
+          if (availableModels.length === 0) {
+            availableModels = (await target.listModels()).map((m) => m.id);
           }
         }
-        if (targetId === ctx.getCurrentProvider()) {
-          ctx.renderer.printInfo(`Already using provider: ${targetId}`);
+        const session = ctx.sessions.current;
+        const outcome = resolveProviderSwitch({
+          targetId,
+          currentProvider: ctx.getCurrentProvider(),
+          configured,
+          availableModels,
+          configuredDefaultModel: ctx.config.get("defaultModels")[targetId],
+          providerDefaultModel,
+          messageCount: session?.messages.length ?? 0
+        });
+        if (outcome.status === "not-configured" || outcome.status === "no-models") {
+          ctx.renderer.renderError(outcome.message);
           return;
         }
-        const session = ctx.sessions.current;
-        const msgCount = session?.messages.length ?? 0;
-        ctx.setProvider(targetId);
+        if (outcome.status === "unchanged") {
+          ctx.renderer.printInfo(outcome.message);
+          return;
+        }
+        ctx.setProvider(outcome.providerId, outcome.model);
         if (session) {
-          session.updateProvider(targetId, ctx.getCurrentModel());
+          session.updateProvider(outcome.providerId, outcome.model);
           await ctx.sessions.save();
         }
-        ctx.renderer.printSuccess(
-          `Switched to provider: ${targetId}` + (msgCount > 0 ? ` (conversation preserved: ${msgCount} messages)` : "")
-        );
+        ctx.renderer.printSuccess(outcome.message);
       }
     },
     {
@@ -1013,29 +1029,29 @@ function createProviderCommands() {
       description: "Switch model, refresh live model list, or inspect model cache",
       usage: "/model [name|refresh [provider]|cache [clear [provider]]]",
       async execute(args, ctx) {
-        const sub = (args[0] ?? "").toLowerCase();
-        if (sub === "refresh") {
-          const providerId = args[1] ?? ctx.getCurrentProvider();
-          if (!ctx.providers.has(providerId)) {
-            ctx.renderer.printInfo(`Provider is not configured: ${providerId}`);
+        const intent = parseModelCommand(args, ctx.getCurrentProvider());
+        if (intent.kind === "refresh") {
+          if (!ctx.providers.has(intent.providerId)) {
+            ctx.renderer.printInfo(`Provider is not configured: ${intent.providerId}`);
             return;
           }
-          ctx.renderer.printInfo(`Refreshing models for ${providerId}...`);
+          ctx.renderer.printInfo(`Refreshing models for ${intent.providerId}...`);
           try {
-            const models = await ctx.providers.refreshModels(providerId);
-            ctx.renderer.printSuccess(`Refreshed ${models.length} model(s) for ${providerId}.`);
+            const models = await ctx.providers.refreshModels(intent.providerId);
+            ctx.renderer.printSuccess(`Refreshed ${models.length} model(s) for ${intent.providerId}.`);
           } catch (err) {
             ctx.renderer.printInfo(`Model refresh failed: ${err instanceof Error ? err.message : String(err)}`);
           }
           return;
         }
-        if (sub === "cache") {
-          if ((args[1] ?? "").toLowerCase() === "clear") {
-            const providerId = args[2];
-            ctx.providers.clearModelCache(providerId);
-            ctx.renderer.printSuccess(providerId ? `Cleared model cache for ${providerId}.` : "Cleared model cache.");
-            return;
-          }
+        if (intent.kind === "cache-clear") {
+          ctx.providers.clearModelCache(intent.providerId);
+          ctx.renderer.printSuccess(
+            intent.providerId ? `Cleared model cache for ${intent.providerId}.` : "Cleared model cache."
+          );
+          return;
+        }
+        if (intent.kind === "cache-show") {
           const rows = ctx.providers.getModelCacheStatus();
           if (rows.length === 0) {
             ctx.renderer.printInfo("Model cache is empty. Use /model refresh to populate it.");
@@ -1047,9 +1063,11 @@ function createProviderCommands() {
           );
           return;
         }
+        let knownModels = ctx.providers.has(ctx.getCurrentProvider()) ? ctx.providers.get(ctx.getCurrentProvider()).info.models.map((m) => m.id) : [];
         let targetModel;
-        if (!args[0]) {
+        if (intent.kind === "select") {
           const models = await ctx.providers.listModels(ctx.getCurrentProvider());
+          knownModels = models.map((m) => m.id);
           const currentModel = ctx.getCurrentModel();
           const items = models.map((m) => ({
             value: m.id,
@@ -1068,22 +1086,27 @@ function createProviderCommands() {
           if (!chosen) return;
           targetModel = chosen;
         } else {
-          targetModel = args[0];
+          targetModel = intent.modelId;
         }
-        if (targetModel === ctx.getCurrentModel()) {
-          ctx.renderer.printInfo(`Already using model: ${targetModel}`);
+        const session = ctx.sessions.current;
+        const outcome = resolveModelSwitch({
+          targetModel,
+          currentModel: ctx.getCurrentModel(),
+          provider: ctx.getCurrentProvider(),
+          knownModels,
+          messageCount: session?.messages.length ?? 0
+        });
+        if (outcome.status === "unchanged") {
+          ctx.renderer.printInfo(outcome.message);
           return;
         }
-        const session = ctx.sessions.current;
-        const msgCount = session?.messages.length ?? 0;
-        ctx.setProvider(ctx.getCurrentProvider(), targetModel);
+        ctx.setProvider(ctx.getCurrentProvider(), outcome.model);
         if (session) {
-          session.updateProvider(ctx.getCurrentProvider(), targetModel);
+          session.updateProvider(ctx.getCurrentProvider(), outcome.model);
           await ctx.sessions.save();
         }
-        ctx.renderer.printSuccess(
-          `Switched to model: ${targetModel}` + (msgCount > 0 ? ` (conversation preserved: ${msgCount} messages)` : "")
-        );
+        ctx.renderer.printSuccess(outcome.message);
+        if (outcome.warning) console.log(theme.warning(`  ${outcome.warning}`));
       }
     },
     {
@@ -1091,72 +1114,61 @@ function createProviderCommands() {
       description: "Smart model routing \u2014 enable/disable or inspect routing rules",
       usage: "/route [on|off|show|test <message>]",
       async execute(args, ctx) {
-        const sub = (args[0] ?? "show").toLowerCase();
+        const intent = parseRouteCommand(args);
         const routing = ctx.config.get("routing");
-        if (sub === "on" || sub === "enable") {
+        if (intent.kind === "enable") {
           ctx.config.setByPath("routing.enabled", "true");
           ctx.renderer.printSuccess("Smart model routing enabled.");
-          if (!routing || routing.rules.length === 0) {
-            ctx.renderer.printInfo(
-              'No rules configured yet. Add rules under `routing.rules` in ~/.aicli/config.json.\nExample: { match: { tag: "fast" }, model: "claude-haiku-4-5" }'
-            );
-          }
+          const note = routingEmptyRulesNote(routing);
+          if (note) ctx.renderer.printInfo(note);
           return;
         }
-        if (sub === "off" || sub === "disable") {
+        if (intent.kind === "disable") {
           ctx.config.setByPath("routing.enabled", "false");
           ctx.renderer.printSuccess("Smart model routing disabled.");
           return;
         }
-        if (sub === "test") {
-          const msg = args.slice(1).join(" ").trim();
-          if (!msg) {
-            console.log(theme.warning("  Usage: /route test <message>"));
-            return;
-          }
-          const decision = ctx.computeRoutingDecision(msg);
-          const marker = decision.overridden ? theme.accent("\u2192 ROUTED") : theme.dim("(unchanged)");
-          console.log();
-          console.log(`  Input:    ${theme.dim(msg)}`);
-          console.log(`  Current:  ${theme.info(ctx.getCurrentModel())}`);
-          console.log(`  Decision: ${theme.info(decision.model)}  ${marker}`);
-          console.log(`  Reason:   ${theme.dim(decision.reason)}`);
-          if (typeof decision.ruleIdx === "number") {
-            console.log(`  Rule:     #${decision.ruleIdx}`);
-          }
-          console.log();
+        if (intent.kind === "usage" || intent.kind === "unknown") {
+          console.log(theme.warning(`  ${intent.message}`));
           return;
         }
-        if (sub === "show" || sub === "status") {
-          console.log();
-          console.log(`  ${theme.heading("Smart Model Routing")}`);
-          console.log(`  Status:   ${routing?.enabled ? theme.success("enabled") : theme.dim("disabled")}`);
-          console.log(`  Provider: ${theme.info(ctx.getCurrentProvider())}`);
-          console.log(`  Current:  ${theme.info(ctx.getCurrentModel())}`);
-          if (routing?.fallback) {
-            console.log(`  Fallback: ${theme.info(routing.fallback)}`);
-          }
+        if (intent.kind === "test") {
+          const decision = ctx.computeRoutingDecision(intent.message);
           console.log();
-          if (!routing || routing.rules.length === 0) {
-            console.log(`  ${theme.dim("(no rules configured \u2014 edit ~/.aicli/config.json `routing.rules`)")}`);
-          } else {
-            console.log(`  ${theme.heading("Rules")} ${theme.dim(`(evaluated top-to-bottom)`)}:`);
-            routing.rules.forEach((r, i) => {
-              const parts = [];
-              if (r.match.tag) parts.push(`tag=#${r.match.tag}`);
-              if (r.match.contains && r.match.contains.length > 0) parts.push(`contains=[${r.match.contains.slice(0, 3).join(", ")}${r.match.contains.length > 3 ? ", \u2026" : ""}]`);
-              if (typeof r.match.maxLength === "number") parts.push(`maxLen=${r.match.maxLength}`);
-              if (typeof r.match.minLength === "number") parts.push(`minLen=${r.match.minLength}`);
-              const cond = parts.length > 0 ? parts.join(" & ") : theme.warning("(empty \u2014 never matches)");
-              console.log(`    ${theme.dim(`#${i}`)} ${r.name ? theme.accent(r.name) + " " : ""}${cond} ${theme.dim("\u2192")} ${theme.info(r.model)}`);
-            });
+          for (const row of routeDecisionRows(intent.message, ctx.getCurrentModel(), decision)) {
+            const pad = `${row.label}:`.padEnd(10);
+            const value = row.label === "Input" || row.label === "Reason" || row.label === "Rule" ? theme.dim(row.value) : theme.info(row.value);
+            console.log(`  ${pad}${value}`);
           }
           console.log();
-          console.log(`  ${theme.dim("Commands: /route on | off | test <msg> | show")}`);
-          console.log();
           return;
         }
-        console.log(theme.warning(`  Unknown subcommand: ${sub}. Usage: /route [on|off|show|test <message>]`));
+        const view = describeRouting({
+          routing,
+          provider: ctx.getCurrentProvider(),
+          currentModel: ctx.getCurrentModel()
+        });
+        console.log();
+        console.log(`  ${theme.heading("Smart Model Routing")}`);
+        console.log(`  Status:   ${view.enabled ? theme.success("enabled") : theme.dim("disabled")}`);
+        console.log(`  Provider: ${theme.info(view.provider)}`);
+        console.log(`  Current:  ${theme.info(view.currentModel)}`);
+        if (view.fallback) console.log(`  Fallback: ${theme.info(view.fallback)}`);
+        console.log();
+        if (view.noRulesNote) {
+          console.log(`  ${theme.dim(view.noRulesNote)}`);
+        } else {
+          console.log(`  ${theme.heading("Rules")} ${theme.dim(`(evaluated top-to-bottom)`)}:`);
+          for (const rule of view.rules) {
+            const cond = rule.empty ? theme.warning(rule.condition) : rule.condition;
+            console.log(
+              `    ${theme.dim(`#${rule.index}`)} ${rule.name ? theme.accent(rule.name) + " " : ""}${cond} ${theme.dim("\u2192")} ${theme.info(rule.model)}`
+            );
+          }
+        }
+        console.log();
+        console.log(`  ${theme.dim(view.hint)}`);
+        console.log();
       }
     },
     {
@@ -1190,56 +1202,33 @@ function createProviderCommands() {
       description: "Enter Plan Mode (read-only): AI can only read files and plan, not modify anything",
       usage: "/plan [execute|exit|status]",
       execute(args, ctx) {
-        const sub = args[0]?.toLowerCase();
-        if (!sub || sub === "enter") {
-          if (ctx.getPlanMode()) {
-            ctx.renderer.printInfo("Already in Plan Mode. Use /plan execute to start executing, or /plan exit to leave.");
+        const outcome = applyPlanCommand(args[0], ctx.getPlanMode());
+        if (outcome.changed) ctx.setPlanMode(outcome.planMode);
+        switch (outcome.status) {
+          case "entered":
+            console.log();
+            console.log(theme.warning(`  ${outcome.summary}`));
+            console.log(theme.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"));
+            for (const line of outcome.details) console.log(theme.dim(`  ${line}`));
+            console.log();
             return;
-          }
-          ctx.setPlanMode(true);
-          console.log();
-          console.log(theme.warning("  \u{1F4CB} Plan Mode activated"));
-          console.log(theme.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"));
-          console.log(theme.dim("  AI can now ONLY use read-only tools:"));
-          console.log(theme.dim("  read_file \xB7 list_dir \xB7 grep_files \xB7 glob_files"));
-          console.log(theme.dim("  web_fetch \xB7 google_search \xB7 ask_user \xB7 write_todos"));
-          console.log(theme.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"));
-          console.log(theme.dim("  Describe your task and the AI will analyze the codebase"));
-          console.log(theme.dim("  and create a detailed implementation plan."));
-          console.log(theme.dim("  When ready: /plan execute  |  To cancel: /plan exit"));
-          console.log();
-          return;
-        }
-        if (sub === "execute") {
-          if (!ctx.getPlanMode()) {
-            ctx.renderer.printInfo("Not in Plan Mode. Enter first with /plan");
+          case "executing":
+            ctx.renderer.printSuccess(outcome.summary);
             return;
-          }
-          ctx.setPlanMode(false);
-          ctx.renderer.printSuccess("Plan Mode ended \u2014 switching to execute mode. AI now has full tool access.");
-          return;
-        }
-        if (sub === "exit" || sub === "cancel") {
-          if (!ctx.getPlanMode()) {
-            ctx.renderer.printInfo("Not in Plan Mode.");
+          case "already-active":
+          case "not-active":
+          case "cancelled":
+            ctx.renderer.printInfo(outcome.summary);
             return;
-          }
-          ctx.setPlanMode(false);
-          ctx.renderer.printInfo("Plan Mode cancelled. Returning to normal mode.");
-          return;
-        }
-        if (sub === "status") {
-          const active = ctx.getPlanMode();
-          console.log();
-          console.log(`  Plan Mode: ${active ? theme.warning("ACTIVE \u{1F4CB}") : theme.dim("inactive")}`);
-          if (active) {
-            console.log(theme.dim("  Tools restricted to read-only set."));
-            console.log(theme.dim("  Use /plan execute to start executing, or /plan exit to cancel."));
-          }
-          console.log();
-          return;
+          case "status":
+            console.log();
+            console.log(`  ${outcome.planMode ? theme.warning(outcome.summary) : theme.dim(outcome.summary)}`);
+            for (const line of outcome.details) console.log(theme.dim(`  ${line}`));
+            console.log();
+            return;
+          default:
+            ctx.renderer.renderError(outcome.summary);
         }
-        ctx.renderer.renderError("Usage: /plan [execute|exit|status]");
       }
     }
   ];
@@ -1408,7 +1397,7 @@ No tools match "${filter}".
           const { join: join6 } = await import("path");
           const { existsSync: existsSync6 } = await import("fs");
           const { getGitRoot: getGitRoot2 } = await import("./git-context-EXOEHQSF.js");
-          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-WO7ERENL.js");
+          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-DC3TNLTL.js");
           const { approveProject, hashMcpFile } = await import("./project-trust-NKYHL3VZ.js");
           const cwd = process.cwd();
           const projectRoot = getGitRoot2(cwd) ?? cwd;
@@ -2328,7 +2317,7 @@ function createReviewCommands() {
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-JJ3KOY5E.js");
+          const { executeTests } = await import("./run-tests-R4IQS6IF.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -2590,7 +2579,7 @@ function createMemoryCommands() {
         const sub = (args[0] ?? "status").toLowerCase();
         const root = process.cwd();
         const { loadIndex, clearIndex } = await import("./store-MWNHVGJT.js");
-        const { indexProject } = await import("./indexer-VZETNE4H.js");
+        const { indexProject } = await import("./indexer-TNDWGFRI.js");
         const { loadVectorStore, clearVectorStore } = await import("./vector-store-BBDXB5IQ.js");
         if (sub === "status") {
           const idx = loadIndex(root);
@@ -4765,7 +4754,7 @@ function removePreviousGrapheme(line, cursor) {
   };
 }
 function installUnicodeBackspaceRepair(input, rl, shouldHandle = () => true) {
-  const editable = rl;
+  const editable = rlInternal(rl);
   let previous = { line: editable.line, cursor: editable.cursor };
   const onKeypress = (_character, key) => {
     const current = { line: editable.line, cursor: editable.cursor };
@@ -5543,8 +5532,7 @@ ${ctxLine}` : "")
   showPrompt() {
     this.firstPromptShown = true;
     this.refreshPrompt();
-    const rlInternal2 = this.rl;
-    rlInternal2.prevRows = 0;
+    rlInternal(this.rl).prevRows = 0;
     this.rl.prompt();
   }
   async start() {
@@ -5690,7 +5678,7 @@ Session '${this.resumeSessionId}' not found.
     }
     void (async () => {
       try {
-        const { indexProject } = await import("./indexer-VZETNE4H.js");
+        const { indexProject } = await import("./indexer-TNDWGFRI.js");
         const { loadIndex } = await import("./store-MWNHVGJT.js");
         const root = process.cwd();
         const existed = loadIndex(root);
@@ -5884,10 +5872,10 @@ Session '${this.resumeSessionId}' not found.
           processing = false;
           if (this.running) {
             rlAny.output = savedOutput;
-            const rlInternal2 = this.rl;
-            rlInternal2.line = "";
-            rlInternal2.cursor = 0;
-            rlInternal2.paused = false;
+            const internal = rlInternal(this.rl);
+            internal.line = "";
+            internal.cursor = 0;
+            internal.paused = false;
             process.stdin.resume();
             this.showPrompt();
           } else {
@@ -6012,8 +6000,7 @@ Session '${this.resumeSessionId}' not found.
     const t0 = Date.now();
     try {
       const provider = this.providers.get(this.currentProvider);
-      const supportsTools = "chatWithTools" in provider;
-      if (supportsTools) {
+      if (isToolCapableProvider(provider)) {
         await this.handleChatWithTools(
           provider,
           session.messages,
@@ -6675,11 +6662,10 @@ ${mcpBudgetNote}` : "");
                 this.providers,
                 fallbackOpts,
                 (p, m) => {
-                  const tc = p;
-                  if (typeof tc.chatWithToolsStream !== "function") {
+                  if (typeof p.chatWithToolsStream !== "function") {
                     throw new Error(`provider ${p.info.id} does not support streaming tool calls`);
                   }
-                  return tc.chatWithToolsStream({ ...chatRequest, model: m, signal: streamAc.signal }, toolDefs);
+                  return p.chatWithToolsStream({ ...chatRequest, model: m, signal: streamAc.signal }, toolDefs);
                 }
               );
               const streamResult = await this.consumeToolStream(streamGen, spinner);
@@ -6707,10 +6693,12 @@ ${mcpBudgetNote}` : "");
               effectiveModel,
               this.providers,
               fallbackOpts,
-              (p, m) => p.chatWithTools(
-                { ...chatRequest, model: m, signal },
-                toolDefs
-              )
+              (p, m) => {
+                if (!isToolCapableProvider(p)) {
+                  throw new Error(`provider ${p.info.id} does not support tool calls`);
+                }
+                return p.chatWithTools({ ...chatRequest, model: m, signal }, toolDefs);
+              }
             ),
             // 中断：以 host-stop 正常收尾，不为一次主动取消喷 provider 报错
             () => ({ toolCalls: [], content: "", stopLoop: true })
@@ -7278,9 +7266,9 @@ Tip: You can continue the conversation by asking the AI to proceed.`
       select: (prompt, items, initialIndex) => {
         this.selecting = true;
         return selectFromList(prompt, items, initialIndex).finally(() => {
-          const rlInternal2 = this.rl;
-          rlInternal2.line = "";
-          rlInternal2.cursor = 0;
+          const internal = rlInternal(this.rl);
+          internal.line = "";
+          internal.cursor = 0;
           process.stdin.pause();
           setImmediate(() => {
             this.selecting = false;
@@ -7400,9 +7388,8 @@ Tip: You can continue the conversation by asking the AI to proceed.`
         if (!session) return;
         session.addMessage({ role: "user", content: message, timestamp: /* @__PURE__ */ new Date() });
         const provider = this.providers.get(this.currentProvider);
-        const toolCapable = provider;
-        if (typeof toolCapable.chatWithTools === "function") {
-          await this.handleChatWithTools(toolCapable, session.messages);
+        if (isToolCapableProvider(provider)) {
+          await this.handleChatWithTools(provider, session.messages);
         } else {
           await this.handleChatSimple(provider, session.messages);
         }
@@ -7560,7 +7547,7 @@ program.command("web").description("Start Web UI server with browser-based chat
     console.error("Error: Invalid port number. Must be between 1 and 65535.");
     process.exit(1);
   }
-  const { startWebServer } = await import("./server-JMXC2N3F.js");
+  const { startWebServer } = await import("./server-KAURBKFI.js");
   await startWebServer({ port, host: options.host });
 });
 program.command("user [action] [username]").description("Manage Web UI users (list | create <name> | delete <name> | reset-password <name> | logout-all <name> | migrate <name>)").action(async (action, username) => {
@@ -7727,11 +7714,11 @@ program.command("sessions").description("List recent conversation sessions").opt
   console.log(footer + "\n");
 });
 program.command("usage").description("Show token + cost usage grouped by provider/model (cross-session)").option("--days <n>", "Only the last N days (inclusive of today)").option("--month <ym>", "Only a specific month, format YYYY-MM (e.g. 2026-06)").option("--json", "Output as JSON (for scripting)").action(async (options) => {
-  const { runUsageCli } = await import("./usage-HXJVDETY.js");
+  const { runUsageCli } = await import("./usage-V3R7DA7M.js");
   await runUsageCli(options);
 });
 program.command("doctor").description("Health check: API keys, config, MCP, recent crashes, tool usage, disk usage").option("--json", "Output as JSON (for scripting)").option("--reset-stats", "Reset accumulated tool usage statistics").action(async (options) => {
-  const { runDoctorCli } = await import("./doctor-cli-BGGILTHE.js");
+  const { runDoctorCli } = await import("./doctor-cli-CDDG5XOY.js");
   const argv = process.argv.slice(2);
   await runDoctorCli({
     json: !!options.json || argv.includes("--json"),
@@ -7740,7 +7727,7 @@ program.command("doctor").description("Health check: API keys, config, MCP, rece
 });
 program.command("batch <action> [arg] [arg2]").description("Anthropic Message Batches: submit | list | status <id> | results <id> [out] | cancel <id>").option("--dry-run", "Parse and validate input without submitting (submit only)").action(async (action, arg, arg2, options) => {
   try {
-    const batch = await import("./batch-F7SKIBI3.js");
+    const batch = await import("./batch-7Y4NAA6N.js");
     switch (action) {
       case "submit":
         if (!arg) {
@@ -7783,7 +7770,7 @@ program.command("batch <action> [arg] [arg2]").description("Anthropic Message Ba
   }
 });
 program.command("mcp-serve").description("Start an MCP server over STDIO, exposing aicli's built-in tools to Claude Desktop / Cursor / other MCP clients").option("--allow-destructive", "Allow bash / run_interactive / task_create (always destructive in MCP mode)").option("--allow-outside-cwd", "Allow tool path arguments to escape the sandbox root \u2014 disabled by default").option("--tools <list>", "Comma-separated whitelist of tools to expose (default: all eligible tools)").option("--cwd <path>", "Working directory AND sandbox root (default: current directory)").action(async (options) => {
-  const { startMcpServer } = await import("./server-QJHCJDA7.js");
+  const { startMcpServer } = await import("./server-WXLE53HG.js");
   await startMcpServer({
     allowDestructive: !!options.allowDestructive,
     allowOutsideCwd: !!options.allowOutsideCwd,
@@ -7796,7 +7783,7 @@ program.command("pr <action> [target]").description("PR review helpers: review |
     console.error(`Unknown pr action: ${action}. Use review | security-review | summarize.`);
     process.exit(1);
   }
-  const { runPrCli } = await import("./pr-24REDMGV.js");
+  const { runPrCli } = await import("./pr-GVSZYX6I.js");
   const result = await runPrCli({
     action,
     target,
@@ -7816,8 +7803,8 @@ program.command("pr <action> [target]").description("PR review helpers: review |
   process.exit(result.exitCode);
 });
 program.command("ci").description("Headless PR review (code + security) \u2014 reads git/gh diff, optionally posts to PR. Designed for GitHub Actions.").option("--pr <num>", "PR number or URL; diff fetched via gh pr diff <value>", (v) => /^#?\d+$/.test(v) ? parseInt(v.replace(/^#/, ""), 10) : v).option("--base <ref>", "Base ref for git diff <ref>...HEAD (ignored when --pr set)").option("--post", "Post review as a PR comment (requires gh CLI + GH_TOKEN, needs --pr)").option("--no-update", "Always create a new comment instead of updating the previous aicli review").option("--skip-code", "Skip the code review section").option("--skip-security", "Skip the security review section").option("--detailed", "Use the detailed code-review prompt").option("--max-diff <n>", "Max diff chars sent to the model (default 30000)", (v) => parseInt(v, 10)).option("--provider <id>", "Override provider (default: config.defaultProvider)").option("--model <id>", "Override model").option("--dry-run", "Print result to stdout instead of posting (overrides --post)").option("--json", "Output a structured JSON report").option("--markdown", "Output Markdown report (default)").option("--sarif", "Output SARIF 2.1.0 for code scanning artifacts").option("--fail-on-security-high", "Fail when the security review contains HIGH/CRITICAL findings (default)").option("--no-fail-on-security-high", "Do not fail on security HIGH/CRITICAL findings").option("--fail-on-test-failure", "Fail when the report mentions test failures (default)").option("--no-fail-on-test-failure", "Do not fail on test failure findings").option("--fail-on-lint-failure", "Fail when the report mentions lint/typecheck failures (default)").option("--no-fail-on-lint-failure", "Do not fail on lint/typecheck failure findings").action(async (options) => {
-  const { runCi } = await import("./ci-VURFRMWQ.js");
-  const { formatCiResult } = await import("./ci-format-AFJJIURF.js");
+  const { runCi } = await import("./ci-WDF2CYR4.js");
+  const { formatCiResult } = await import("./ci-format-7B5VAZGA.js");
   const formats = [options.json, options.markdown, options.sarif].filter(Boolean).length;
   if (formats > 1) {
     console.error("Choose only one output format: --json, --markdown, or --sarif.");
@@ -7975,7 +7962,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     config.get("customProviders"),
     config.getConfigDir()
   );
-  const { startHub } = await import("./hub-Z73RLNJI.js");
+  const { startHub } = await import("./hub-TO7ODOIA.js");
   await startHub(
     {
       topic: topic ?? "",