jinzd-ai-cli 0.4.66 → 0.4.68

package/dist/{chunk-NIJZBQ6I.js → chunk-3LCVJ4AF.js}

@@ -8,7 +8,7 @@ import { platform } from "os";
 import chalk from "chalk";
 
 // src/core/constants.ts
-var VERSION = "0.4.66";
+var VERSION = "0.4.68";
 var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";

package/dist/{chunk-HOBLE365.js → chunk-G5AISHJE.js}

@@ -8,7 +8,7 @@ import {
   RateLimitError,
   schemaToJsonSchema,
   truncateForPersist
-} from "./chunk-X5RX2VGQ.js";
+} from "./chunk-Q5QSCO5D.js";
 import {
   APP_NAME,
   CONFIG_DIR_NAME,
@@ -21,7 +21,7 @@ import {
   MCP_TOOL_PREFIX,
   PLUGINS_DIR_NAME,
   VERSION
-} from "./chunk-NIJZBQ6I.js";
+} from "./chunk-3LCVJ4AF.js";
 
 // src/config/config-manager.ts
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "fs";
@@ -191,7 +191,27 @@ var ConfigSchema = z.object({
   // 插件以完整 Node.js 权限在主进程中执行（可读写文件、访问网络、执行命令），
   // 必须确认插件来源可信后，再设为 true 启用。
   // 可通过 /config 命令或直接编辑 ~/.aicli/config.json 开启。
-  allowPlugins: z.boolean().default(false)
+  allowPlugins: z.boolean().default(false),
+  // 智能模型路由（v0.4.68+）
+  // 按用户每轮输入的内容/标签/长度动态选择模型，在同一 provider 内切换，
+  // 例：短问题走 haiku（省钱），planning 走 opus（质量）。
+  // enabled=false 时永远返回当前模型。rules 按顺序匹配，首个命中的规则生效。
+  // 每个 rule 的 match 必须至少有一个条件（tag/contains/maxLength/minLength）。
+  // 详见 src/core/model-router.ts。
+  routing: z.object({
+    enabled: z.boolean().default(false),
+    rules: z.array(z.object({
+      match: z.object({
+        contains: z.array(z.string()).optional(),
+        maxLength: z.number().int().positive().optional(),
+        minLength: z.number().int().positive().optional(),
+        tag: z.string().optional()
+      }),
+      model: z.string(),
+      name: z.string().optional()
+    })).default([]),
+    fallback: z.string().optional()
+  }).default({ enabled: false, rules: [] })
 });
 
 // src/config/config-manager.ts

package/dist/{chunk-X5RX2VGQ.js → chunk-Q5QSCO5D.js}

@@ -10,7 +10,7 @@ import {
   SUBAGENT_DEFAULT_MAX_ROUNDS,
   SUBAGENT_MAX_ROUNDS_LIMIT,
   runTestsTool
-} from "./chunk-NIJZBQ6I.js";
+} from "./chunk-3LCVJ4AF.js";
 
 // src/tools/builtin/bash.ts
 import { execSync } from "child_process";
@@ -793,6 +793,11 @@ import { dirname as dirname2 } from "path";
 import chalk3 from "chalk";
 import { existsSync as existsSync4, readFileSync as readFileSync3 } from "fs";
 
+// src/core/readline-internal.ts
+function rlInternal(rl) {
+  return rl;
+}
+
 // src/tools/types.ts
 function isFileWriteTool(name) {
   return name === "write_file" || name === "edit_file" || name === "notebook_edit";
@@ -842,6 +847,51 @@ function schemaToJsonSchema(schema) {
   return result;
 }
 
+// src/tools/executor-phases.ts
+function groupCallsByPhase(calls) {
+  const safeParallel = [];
+  const safeBash = [];
+  const fileWriteCalls = [];
+  const otherCalls = [];
+  for (let i = 0; i < calls.length; i++) {
+    const call = calls[i];
+    const level = getDangerLevel(call.name, call.arguments);
+    if (level === "safe") {
+      if (call.name === "bash") {
+        safeBash.push({ idx: i, call });
+      } else {
+        safeParallel.push({ idx: i, call });
+      }
+    } else if (isFileWriteTool(call.name) && level === "write") {
+      fileWriteCalls.push({ idx: i, call });
+    } else {
+      otherCalls.push({ idx: i, call });
+    }
+  }
+  return { safeParallel, safeBash, fileWriteCalls, otherCalls };
+}
+async function runSafePhases(phase, execute, results, logTag = "executor") {
+  const t0 = Date.now();
+  const { safeParallel, safeBash } = phase;
+  const wrapExec = async (idx, call) => {
+    try {
+      results[idx] = await execute(call);
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      console.error(`[${logTag}] Unexpected error in tool "${call.name}":`, err);
+      results[idx] = { callId: call.id, content: `Tool execution failed: ${msg}`, isError: true };
+    }
+  };
+  const parallelPhase = safeParallel.length > 0 ? Promise.all(safeParallel.map(({ idx, call }) => wrapExec(idx, call))) : Promise.resolve();
+  const bashPhase = (async () => {
+    for (const { idx, call } of safeBash) {
+      await wrapExec(idx, call);
+    }
+  })();
+  await Promise.all([parallelPhase, bashPhase]);
+  return Date.now() - t0;
+}
+
 // src/tools/diff-utils.ts
 import chalk from "chalk";
 function renderDiff(oldText, newText, opts = {}) {
@@ -1365,57 +1415,22 @@ var ToolExecutor = class {
     }
   }
   async executeAll(calls) {
-    const safeParallel = [];
-    const safeBash = [];
-    const fileWriteCalls = [];
-    const otherCalls = [];
-    for (let i = 0; i < calls.length; i++) {
-      const call = calls[i];
-      const level = getDangerLevel(call.name, call.arguments);
-      if (level === "safe") {
-        if (call.name === "bash") {
-          safeBash.push({ idx: i, call });
-        } else {
-          safeParallel.push({ idx: i, call });
-        }
-      } else if (isFileWriteTool(call.name) && level === "write") {
-        fileWriteCalls.push({ idx: i, call });
-      } else {
-        otherCalls.push({ idx: i, call });
-      }
-    }
+    const phase = groupCallsByPhase(calls);
     const results = new Array(calls.length);
-    const t0 = Date.now();
-    const wrapExec = async (idx, call) => {
-      try {
-        results[idx] = await this.execute(call);
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        console.error(`[executor] Unexpected error in tool "${call.name}":`, err);
-        results[idx] = { callId: call.id, content: `Tool execution failed: ${msg}`, isError: true };
-      }
-    };
-    const parallelPhase = safeParallel.length > 0 ? Promise.all(safeParallel.map(({ idx, call }) => wrapExec(idx, call))) : Promise.resolve();
-    const bashPhase = (async () => {
-      for (const { idx, call } of safeBash) {
-        await wrapExec(idx, call);
-      }
-    })();
-    await Promise.all([parallelPhase, bashPhase]);
-    if (safeParallel.length >= 2) {
-      const elapsed = Date.now() - t0;
-      console.log(theme.dim(`  \u26A1 ${safeParallel.length} tools executed in parallel (${elapsed}ms)`));
-    }
-    if (fileWriteCalls.length === 1) {
-      const { idx, call } = fileWriteCalls[0];
+    const elapsed = await runSafePhases(phase, (c) => this.execute(c), results, "executor");
+    if (phase.safeParallel.length >= 2) {
+      console.log(theme.dim(`  \u26A1 ${phase.safeParallel.length} tools executed in parallel (${elapsed}ms)`));
+    }
+    if (phase.fileWriteCalls.length === 1) {
+      const { idx, call } = phase.fileWriteCalls[0];
       results[idx] = await this.execute(call);
-    } else if (fileWriteCalls.length >= 2) {
-      const batchResults = await this.executeBatchFileWrites(fileWriteCalls.map((f) => f.call));
-      for (let i = 0; i < fileWriteCalls.length; i++) {
-        results[fileWriteCalls[i].idx] = batchResults[i];
+    } else if (phase.fileWriteCalls.length >= 2) {
+      const batchResults = await this.executeBatchFileWrites(phase.fileWriteCalls.map((f) => f.call));
+      for (let i = 0; i < phase.fileWriteCalls.length; i++) {
+        results[phase.fileWriteCalls[i].idx] = batchResults[i];
       }
     }
-    for (const { idx, call } of otherCalls) {
+    for (const { idx, call } of phase.otherCalls) {
       results[idx] = await this.execute(call);
     }
     return results;
@@ -1450,6 +1465,10 @@ var ToolExecutor = class {
         results[i] = { callId: calls[i].id, content: `[User rejected] The user rejected this ${calls[i].name} operation. Do not retry without asking.`, isError: true };
       }
     }
+    if (approvedIndices.length >= 2) {
+      const labels = approvedIndices.map((i) => `[${i + 1}]`).join(" ");
+      console.log(theme.dim(`  \u26A1 Writing ${labels} in parallel (results may interleave)`));
+    }
     const t0 = Date.now();
     await Promise.all(
       approvedIndices.map(async (i) => {
@@ -1488,7 +1507,7 @@ var ToolExecutor = class {
       return Promise.resolve("none");
     }
     const rl = this.rl;
-    const rlAny = rl;
+    const rlAny = rlInternal(rl);
     const savedOutput = rlAny.output;
     rlAny.output = process.stdout;
     rl.resume();
@@ -1668,7 +1687,7 @@ var ToolExecutor = class {
       return Promise.resolve(false);
     }
     const rl = this.rl;
-    const rlAny = rl;
+    const rlAny = rlInternal(rl);
     const savedOutput = rlAny.output;
     rlAny.output = process.stdout;
     rl.resume();
@@ -2930,7 +2949,7 @@ var askUserTool = {
   }
 };
 function promptUser(rl, question) {
-  const rlAny = rl;
+  const rlAny = rlInternal(rl);
   const savedOutput = rlAny.output;
   rlAny.output = process.stdout;
   rl.resume();
@@ -4332,13 +4351,15 @@ export {
   RateLimitError,
   ConfigError,
   ProviderNotFoundError,
-  isFileWriteTool,
   getDangerLevel,
   schemaToJsonSchema,
   initTheme,
   theme,
   undoStack,
   renderDiff,
+  rlInternal,
+  groupCallsByPhase,
+  runSafePhases,
   runHook,
   checkPermission,
   setMaxOutputCap,

package/dist/{chunk-UIFW7G4A.js → chunk-VO5IZN2C.js}

@@ -6,7 +6,7 @@ import { platform } from "os";
 import chalk from "chalk";
 
 // src/core/constants.ts
-var VERSION = "0.4.66";
+var VERSION = "0.4.68";
 var APP_NAME = "ai-cli";
 var CONFIG_DIR_NAME = ".aicli";
 var CONFIG_FILE_NAME = "config.json";

package/dist/{hub-JA7HH44N.js → hub-4VPTOMBP.js}

@@ -385,7 +385,7 @@ ${content}`);
   }
 }
 async function runTaskMode(config, providers, configManager, topic) {
-  const { TaskOrchestrator } = await import("./task-orchestrator-KOCFBDPK.js");
+  const { TaskOrchestrator } = await import("./task-orchestrator-WDRXASIC.js");
   const orchestrator = new TaskOrchestrator(config, providers, configManager);
   let interrupted = false;
   const onSigint = () => {

package/dist/index.js

@@ -31,7 +31,7 @@ import {
   saveDevState,
   sessionHasMeaningfulContent,
   setupProxy
-} from "./chunk-HOBLE365.js";
+} from "./chunk-G5AISHJE.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -41,12 +41,13 @@ import {
   initTheme,
   lastResponseStore,
   renderDiff,
+  rlInternal,
   setContextWindow,
   setMaxOutputCap,
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-X5RX2VGQ.js";
+} from "./chunk-Q5QSCO5D.js";
 import {
   fileCheckpoints
 } from "./chunk-4BKXL7SM.js";
@@ -71,7 +72,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-NIJZBQ6I.js";
+} from "./chunk-3LCVJ4AF.js";
 
 // src/index.ts
 import { program } from "commander";
@@ -1074,6 +1075,79 @@ function createDefaultCommands() {
         );
       }
     },
+    {
+      name: "route",
+      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 routing = ctx.config.get("routing");
+        if (sub === "on" || sub === "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" }'
+            );
+          }
+          return;
+        }
+        if (sub === "off" || sub === "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();
+          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)}`);
+          }
+          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)}`);
+            });
+          }
+          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>]`));
+      }
+    },
     {
       name: "clear",
       description: "Clear conversation history",
@@ -1123,18 +1197,18 @@ function createDefaultCommands() {
             return;
           }
           const sessions = ctx.sessions.listSessions();
-          const matches = sessions.filter((s) => s.id.startsWith(id));
-          if (matches.length === 0) {
+          const matches2 = sessions.filter((s) => s.id.startsWith(id));
+          if (matches2.length === 0) {
             ctx.renderer.renderError(`Session '${id}' not found.`);
             return;
           }
-          if (matches.length > 1) {
-            console.log(theme.warning(`  \u26A0 Ambiguous prefix '${id}' matches ${matches.length} sessions \u2014 loading most recent:`));
-            for (const m of matches.slice(0, 5)) {
+          if (matches2.length > 1) {
+            console.log(theme.warning(`  \u26A0 Ambiguous prefix '${id}' matches ${matches2.length} sessions \u2014 loading most recent:`));
+            for (const m of matches2.slice(0, 5)) {
               console.log(theme.dim(`    ${m.id.slice(0, 12)}  ${m.title ?? "(untitled)"}`));
             }
           }
-          const match = matches[0];
+          const match = matches2[0];
           ctx.sessions.loadSession(match.id);
           ctx.setProvider(match.provider, match.model);
           ctx.resetSessionTokenUsage();
@@ -1372,13 +1446,13 @@ ${text}
   ${theme.heading(`Found ${results.length} session(s) containing "${query}"`)}
 `);
         for (const r of results) {
-          const { sessionMeta, matches } = r;
+          const { sessionMeta, matches: matches2 } = r;
           const dateStr = sessionMeta.updated.toLocaleDateString();
           console.log(
             `  ${theme.accent(sessionMeta.id.slice(0, 8))}` + theme.dim(`  [${dateStr}]  ${sessionMeta.provider} / ${sessionMeta.model}`) + (sessionMeta.title ? `
   ${theme.dim("  " + sessionMeta.title)}` : "")
           );
-          for (const m of matches) {
+          for (const m of matches2) {
             const icon = m.role === "user" ? "\u{1F464}" : "\u{1F916}";
             console.log(`    ${icon} ${theme.warning(m.snippet)}`);
           }
@@ -2193,7 +2267,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-47TTKJTB.js");
+          const { executeTests } = await import("./run-tests-WD53PYVA.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -3273,7 +3347,7 @@ var CostTracker = class {
       if (existsSync4(this.filePath)) {
         const data = JSON.parse(readFileSync3(this.filePath, "utf-8"));
         if (data.version === 1 && Array.isArray(data.records)) {
-          this.records = data.records;
+          this.records = [...data.records].sort((a, b) => a.date.localeCompare(b.date));
         }
       }
     } catch {
@@ -3393,6 +3467,74 @@ var CostTracker = class {
   }
 };
 
+// src/core/model-router.ts
+var TAG_REGEX = /(?:^|\s)#([a-zA-Z][\w-]{0,31})\b/g;
+function extractTags(message) {
+  const tags = /* @__PURE__ */ new Set();
+  let m;
+  TAG_REGEX.lastIndex = 0;
+  while ((m = TAG_REGEX.exec(message)) !== null) {
+    tags.add(m[1].toLowerCase());
+  }
+  return tags;
+}
+function matches(message, matcher) {
+  const trimmed = message.trim();
+  const lower = trimmed.toLowerCase();
+  if (matcher.tag) {
+    const tags = extractTags(trimmed);
+    if (!tags.has(matcher.tag.toLowerCase())) return false;
+  }
+  if (matcher.contains && matcher.contains.length > 0) {
+    const hit = matcher.contains.some((kw) => lower.includes(kw.toLowerCase()));
+    if (!hit) return false;
+  }
+  if (typeof matcher.maxLength === "number") {
+    if (trimmed.length > matcher.maxLength) return false;
+  }
+  if (typeof matcher.minLength === "number") {
+    if (trimmed.length < matcher.minLength) return false;
+  }
+  const hasAnyCondition = !!matcher.tag || matcher.contains && matcher.contains.length > 0 || typeof matcher.maxLength === "number" || typeof matcher.minLength === "number";
+  return !!hasAnyCondition;
+}
+function pickModel(message, currentModel, config, availableModels = []) {
+  if (!config.enabled || config.rules.length === 0) {
+    return { model: currentModel, reason: "routing disabled", overridden: false };
+  }
+  const isAvailable = (m) => availableModels.length === 0 || availableModels.includes(m);
+  for (let i = 0; i < config.rules.length; i++) {
+    const rule = config.rules[i];
+    if (!matches(message, rule.match)) continue;
+    if (!isAvailable(rule.model)) continue;
+    if (rule.model === currentModel) {
+      return {
+        model: currentModel,
+        reason: `rule "${rule.name ?? `#${i}`}" matched (same as current)`,
+        overridden: false,
+        ruleIdx: i
+      };
+    }
+    return {
+      model: rule.model,
+      reason: `rule "${rule.name ?? `#${i}`}" matched`,
+      overridden: true,
+      ruleIdx: i
+    };
+  }
+  if (config.fallback && config.fallback !== currentModel && isAvailable(config.fallback)) {
+    return {
+      model: config.fallback,
+      reason: "fallback",
+      overridden: true
+    };
+  }
+  return { model: currentModel, reason: "no rule matched", overridden: false };
+}
+function stripRoutingTags(message) {
+  return message.replace(/(?:^|\s)#(fast|deep|default)\b/gi, " ").replace(/\s{2,}/g, " ").trim();
+}
+
 // src/repl/notify.ts
 import { spawn } from "child_process";
 import { platform as platform2 } from "os";
@@ -3569,13 +3711,15 @@ var Repl = class {
   contextLayers = [];
   /** 本次会话累计 token 用量 */
   sessionTokenUsage = { inputTokens: 0, outputTokens: 0, cacheCreationTokens: 0, cacheReadTokens: 0 };
-  /** Fold a single-request TokenUsage (with optional cache fields) into sessionTokenUsage + cost tracker. */
-  addSessionUsage(u) {
+  /** Fold a single-request TokenUsage (with optional cache fields) into sessionTokenUsage + cost tracker.
+   *  modelOverride lets the smart router attribute cost to the actually-used model
+   *  when it differs from the UI-selected currentModel. */
+  addSessionUsage(u, modelOverride) {
     this.sessionTokenUsage.inputTokens += u.inputTokens;
     this.sessionTokenUsage.outputTokens += u.outputTokens;
     this.sessionTokenUsage.cacheCreationTokens += u.cacheCreationTokens ?? 0;
     this.sessionTokenUsage.cacheReadTokens += u.cacheReadTokens ?? 0;
-    this.costTracker.addCost(this.currentProvider, this.currentModel, u);
+    this.costTracker.addCost(this.currentProvider, modelOverride ?? this.currentModel, u);
   }
   /** 启动时检测到的 Git 分支（无 git 仓库时为 null） */
   gitBranch = null;
@@ -4388,7 +4532,7 @@ Session '${this.resumeSessionId}' not found.
         }
         processing = true;
         this.rl.pause();
-        const rlAny = this.rl;
+        const rlAny = rlInternal(this.rl);
         const savedOutput = rlAny.output;
         rlAny.output = null;
         try {
@@ -4403,10 +4547,10 @@ Session '${this.resumeSessionId}' not found.
           processing = false;
           if (this.running) {
             rlAny.output = savedOutput;
-            const rlInternal = this.rl;
-            rlInternal.line = "";
-            rlInternal.cursor = 0;
-            rlInternal.paused = false;
+            const rlInternal2 = this.rl;
+            rlInternal2.line = "";
+            rlInternal2.cursor = 0;
+            rlInternal2.paused = false;
             process.stdin.resume();
             this.showPrompt();
           } else {
@@ -4467,7 +4611,16 @@ Session '${this.resumeSessionId}' not found.
 `));
       }
     }
-    const messageContent = parts.length > 0 ? parts.length === 1 && parts[0].type === "text" ? parts[0].text : parts : userInput;
+    const routingDecision = this.computeRoutingDecision(userInput);
+    const cleanInput = stripRoutingTags(userInput);
+    let effectiveParts = parts;
+    if (cleanInput !== userInput && parts.length > 0 && parts[0].type === "text") {
+      effectiveParts = [
+        { type: "text", text: stripRoutingTags(parts[0].text ?? "") },
+        ...parts.slice(1)
+      ];
+    }
+    const messageContent = effectiveParts.length > 0 ? effectiveParts.length === 1 && effectiveParts[0].type === "text" ? effectiveParts[0].text : effectiveParts : cleanInput;
     if (hasImage) {
       const visionHint = this.getVisionModelHint();
       if (visionHint) {
@@ -4488,6 +4641,12 @@ Session '${this.resumeSessionId}' not found.
       timestamp: /* @__PURE__ */ new Date()
     });
     this.events.emit("message.before", { input: userInput });
+    if (routingDecision.overridden) {
+      process.stdout.write(
+        theme.dim(`  \u2192 Routed to ${routingDecision.model} (${routingDecision.reason})
+`)
+      );
+    }
     const t0 = Date.now();
     try {
       const provider = this.providers.get(this.currentProvider);
@@ -4495,10 +4654,11 @@ Session '${this.resumeSessionId}' not found.
       if (supportsTools) {
         await this.handleChatWithTools(
           provider,
-          session.messages
+          session.messages,
+          routingDecision.model
         );
       } else {
-        await this.handleChatSimple(provider, session.messages);
+        await this.handleChatSimple(provider, session.messages, routingDecision.model);
       }
       if (this.config.get("session").autoSave) {
         if (autoTrimSessionIfNeeded(session)) {
@@ -4576,9 +4736,10 @@ Session '${this.resumeSessionId}' not found.
    */
   /** 运行时 thinking 模式覆盖：null=使用配置值，true/false=运行时覆盖 */
   runtimeThinking = null;
-  getModelParams() {
+  getModelParams(modelOverride) {
     const allParams = this.config.get("modelParams");
-    const params = allParams[this.currentModel] ?? {};
+    const modelId = modelOverride ?? this.currentModel;
+    const params = allParams[modelId] ?? {};
     return {
       ...params,
       maxTokens: params.maxTokens ?? DEFAULT_MAX_TOKENS,
@@ -4586,6 +4747,25 @@ Session '${this.resumeSessionId}' not found.
       thinkingBudget: params.thinkingBudget
     };
   }
+  /**
+   * Compute smart-routing decision for this user turn.
+   * Only considers models available for the current provider (rule skipped otherwise).
+   * When routing is disabled or no rule matches, returns the current model unchanged.
+   */
+  computeRoutingDecision(userInput) {
+    const routingConfig = this.config.get("routing");
+    if (!routingConfig || !routingConfig.enabled) {
+      return { model: this.currentModel, reason: "routing disabled", overridden: false };
+    }
+    let availableModels = [];
+    try {
+      const provider = this.providers.get(this.currentProvider);
+      availableModels = provider.info.models.map((m) => m.id);
+    } catch {
+      availableModels = [];
+    }
+    return pickModel(userInput, this.currentModel, routingConfig, availableModels);
+  }
   // ─── Context 自动管理 ───────────────────────────────────────────────────
   /**
    * 估算文本的 token 数。
@@ -4638,12 +4818,15 @@ Session '${this.resumeSessionId}' not found.
     return total;
   }
   /**
-   * 获取当前模型的 context window 大小。
+   * 获取指定模型的 context window 大小（默认当前模型）。
+   * 智能路由可能在 handleChatWithTools 内把 effectiveModel 暂时切到别的模型，
+   * 故此处接受可选的 modelOverride 以保持计算一致性。
    */
-  getContextWindowSize() {
+  getContextWindowSize(modelOverride) {
     try {
       const provider = this.providers.get(this.currentProvider);
-      const modelInfo = provider.info.models.find((m) => m.id === this.currentModel);
+      const modelId = modelOverride ?? this.currentModel;
+      const modelInfo = provider.info.models.find((m) => m.id === modelId);
       return modelInfo?.contextWindow ?? 0;
     } catch {
       return 0;
@@ -4880,16 +5063,17 @@ Session '${this.resumeSessionId}' not found.
       }
     });
   }
-  async handleChatSimple(provider, messages) {
+  async handleChatSimple(provider, messages, modelOverride) {
     const session = this.sessions.current;
     const useStreaming = this.config.get("ui").streaming;
-    const modelParams = this.getModelParams();
+    const effectiveModel = modelOverride ?? this.currentModel;
+    const modelParams = this.getModelParams(effectiveModel);
     if (useStreaming) {
       const ac = this.setupStreamInterrupt();
       try {
         const stream = provider.chatStream({
           messages,
-          model: this.currentModel,
+          model: effectiveModel,
           systemPrompt: this.buildCurrentSystemPrompt(),
           stream: true,
           temperature: modelParams.temperature,
@@ -4909,7 +5093,7 @@ Session '${this.resumeSessionId}' not found.
         session.addMessage({ role: "assistant", content, timestamp: /* @__PURE__ */ new Date() });
         this.events.emit("message.after", { content });
         if (usage) {
-          this.addSessionUsage(usage);
+          this.addSessionUsage(usage, effectiveModel);
           session.addTokenUsage(usage);
           if (showTokens && !tokensShown) {
             this.renderer.renderUsage(usage, this.sessionTokenUsage);
@@ -4923,7 +5107,7 @@ Session '${this.resumeSessionId}' not found.
       try {
         const response = await provider.chat({
           messages,
-          model: this.currentModel,
+          model: effectiveModel,
           systemPrompt: this.buildCurrentSystemPrompt(),
           stream: false,
           temperature: modelParams.temperature,
@@ -4938,7 +5122,7 @@ Session '${this.resumeSessionId}' not found.
         session.addMessage({ role: "assistant", content: response.content, timestamp: /* @__PURE__ */ new Date() });
         this.events.emit("message.after", { content: response.content });
         if (response.usage) {
-          this.addSessionUsage(response.usage);
+          this.addSessionUsage(response.usage, effectiveModel);
           session.addTokenUsage(response.usage);
           if (this.shouldShowTokens()) {
             this.renderer.renderUsage(response.usage, this.sessionTokenUsage);
@@ -5051,8 +5235,9 @@ Session '${this.resumeSessionId}' not found.
       rawContent
     };
   }
-  async handleChatWithTools(provider, messages) {
+  async handleChatWithTools(provider, messages, modelOverride) {
     const session = this.sessions.current;
+    const effectiveModel = modelOverride ?? this.currentModel;
     let toolDefs;
     let mcpBudgetNote = null;
     const usedMcpToolNames = /* @__PURE__ */ new Set();
@@ -5063,7 +5248,7 @@ Session '${this.resumeSessionId}' not found.
       if (skillFilter) {
         toolDefs = this.toolRegistry.getDefinitions().filter((t) => skillFilter.has(t.name));
       } else {
-        const contextWindow = this.getContextWindowSize();
+        const contextWindow = this.getContextWindowSize(effectiveModel);
         if (contextWindow > 0) {
           const toolBudget = Math.floor(contextWindow * 0.2);
           const { definitions, trimmedCount, systemNote } = this.toolRegistry.getDefinitionsWithBudget(toolBudget, usedMcpToolNames);
@@ -5113,7 +5298,7 @@ You have a maximum of ${maxToolRounds} tool call rounds for this task. Plan effi
     const systemPrompt = baseSystemPrompt + roundBudgetHint + (mcpBudgetNote ? `
 
 ${mcpBudgetNote}` : "");
-    const modelParams = this.getModelParams();
+    const modelParams = this.getModelParams(effectiveModel);
     const useStreaming = this.config.get("ui").streaming;
     const spinner = this.renderer.showSpinner("Thinking...");
     const roundUsage = { inputTokens: 0, outputTokens: 0, cacheCreationTokens: 0, cacheReadTokens: 0 };
@@ -5203,7 +5388,7 @@ ${mcpBudgetNote}` : "");
               )
             );
             if (roundUsage.inputTokens > 0 || roundUsage.outputTokens > 0) {
-              this.addSessionUsage(roundUsage);
+              this.addSessionUsage(roundUsage, effectiveModel);
               session.addTokenUsage(roundUsage);
               if (this.shouldShowTokens()) {
                 this.renderer.renderUsage(roundUsage, this.sessionTokenUsage);
@@ -5231,7 +5416,7 @@ ${mcpBudgetNote}` : "");
         let alreadyRendered = false;
         const chatRequest = {
           messages: apiMessages,
-          model: this.currentModel,
+          model: effectiveModel,
           systemPrompt,
           stream: false,
           temperature: modelParams.temperature,
@@ -5333,7 +5518,7 @@ ${mcpBudgetNote}` : "");
               )
             );
             if (roundUsage.inputTokens > 0 || roundUsage.outputTokens > 0) {
-              this.addSessionUsage(roundUsage);
+              this.addSessionUsage(roundUsage, effectiveModel);
               session.addTokenUsage(roundUsage);
               if (this.shouldShowTokens()) {
                 this.renderer.renderUsage(roundUsage, this.sessionTokenUsage);
@@ -5368,7 +5553,7 @@ ${mcpBudgetNote}` : "");
           });
           this.events.emit("message.after", { content: finalContent });
           if (roundUsage.inputTokens > 0 || roundUsage.outputTokens > 0) {
-            this.addSessionUsage(roundUsage);
+            this.addSessionUsage(roundUsage, effectiveModel);
             session.addTokenUsage(roundUsage);
             if (this.shouldShowTokens()) {
               this.renderer.renderUsage(roundUsage, this.sessionTokenUsage);
@@ -5386,7 +5571,7 @@ ${mcpBudgetNote}` : "");
             try {
               const genStream = provider.chatStream({
                 messages: apiMessages,
-                model: this.currentModel,
+                model: effectiveModel,
                 systemPrompt,
                 stream: true,
                 temperature: modelParams.temperature,
@@ -5422,7 +5607,7 @@ ${mcpBudgetNote}` : "");
               const newMsgs2 = provider.buildToolResultMessages(result.toolCalls, syntheticResults, reasoningContent2);
               extraMessages.push(...newMsgs2);
               if (roundUsage.inputTokens > 0 || roundUsage.outputTokens > 0) {
-                this.addSessionUsage(roundUsage);
+                this.addSessionUsage(roundUsage, effectiveModel);
                 session.addTokenUsage(roundUsage);
                 if (teeShowTokens && !teeTokShown) {
                   this.renderer.renderUsage(roundUsage, this.sessionTokenUsage);
@@ -5437,14 +5622,14 @@ ${mcpBudgetNote}` : "");
         askUserContext.rl = this.rl;
         googleSearchContext.configManager = this.config;
         streamToFileContext.provider = provider;
-        streamToFileContext.model = this.currentModel;
+        streamToFileContext.model = effectiveModel;
         streamToFileContext.systemPrompt = systemPrompt;
         streamToFileContext.messages = apiMessages;
         streamToFileContext.extraMessages = extraMessages;
         streamToFileContext.temperature = modelParams.temperature;
         streamToFileContext.timeout = modelParams.timeout;
         spawnAgentContext.provider = provider;
-        spawnAgentContext.model = this.currentModel;
+        spawnAgentContext.model = effectiveModel;
         spawnAgentContext.systemPrompt = systemPrompt;
         spawnAgentContext.modelParams = modelParams;
         spawnAgentContext.configManager = this.config;
@@ -5559,7 +5744,7 @@ ${mcpBudgetNote}` : "");
           process.stdout.write(theme.dim("  (Press ") + theme.info("n") + theme.dim(" or ") + theme.info("Esc") + theme.dim(" to stop)\n"));
           this.teardownInterjectionListener();
           const pauseResponse = await new Promise((resolve3) => {
-            const rlWithOutput = this.rl;
+            const rlWithOutput = rlInternal(this.rl);
             const savedOutput = rlWithOutput.output;
             rlWithOutput.output = process.stdout;
             this.rl.question(theme.warning("  \u25B8 "), (answer) => {
@@ -5604,7 +5789,7 @@ ${mcpBudgetNote}` : "");
         const summaryResult = await provider.chatWithTools(
           {
             messages: apiMessages,
-            model: this.currentModel,
+            model: effectiveModel,
             systemPrompt,
             stream: false,
             temperature: modelParams.temperature,
@@ -5642,7 +5827,7 @@ Tip: You can continue the conversation by asking the AI to proceed.`
         );
       }
       if (roundUsage.inputTokens > 0 || roundUsage.outputTokens > 0) {
-        this.addSessionUsage(roundUsage);
+        this.addSessionUsage(roundUsage, effectiveModel);
         session.addTokenUsage(roundUsage);
         if (this.shouldShowTokens()) {
           this.renderer.renderUsage(roundUsage, this.sessionTokenUsage);
@@ -5702,9 +5887,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 rlInternal = this.rl;
-          rlInternal.line = "";
-          rlInternal.cursor = 0;
+          const rlInternal2 = this.rl;
+          rlInternal2.line = "";
+          rlInternal2.cursor = 0;
           process.stdin.pause();
           setImmediate(() => {
             this.selecting = false;
@@ -5749,7 +5934,7 @@ Tip: You can continue the conversation by asking the AI to proceed.`
       getGitBranch: () => this.gitBranch,
       getLastResponse: () => lastResponseStore.content,
       runSetupWizard: async () => {
-        const rlAny = this.rl;
+        const rlAny = rlInternal(this.rl);
         rlAny.output = process.stdout;
         process.stdin.resume();
         try {
@@ -5818,6 +6003,7 @@ Tip: You can continue the conversation by asking the AI to proceed.`
       forkSession: (messageCount, title) => this.sessions.forkSession(messageCount, title),
       getToolExecutor: () => this.toolExecutor,
       getCostTracker: () => this.costTracker,
+      computeRoutingDecision: (userInput) => this.computeRoutingDecision(userInput),
       exit: () => this.handleExit()
     };
     await cmd.execute(args, ctx);
@@ -5922,7 +6108,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-A3SB52SS.js");
+  const { startWebServer } = await import("./server-MDBQX5UZ.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> | migrate <name>)").action(async (action, username) => {
@@ -6155,7 +6341,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-JA7HH44N.js");
+  const { startHub } = await import("./hub-4VPTOMBP.js");
   await startHub(
     {
       topic: topic ?? "",

package/dist/{run-tests-E55HLJDD.js → run-tests-OZ3OEOOB.js}

@@ -1,7 +1,7 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-UIFW7G4A.js";
+} from "./chunk-VO5IZN2C.js";
 export {
   executeTests,
   runTestsTool

package/dist/{run-tests-47TTKJTB.js → run-tests-WD53PYVA.js}

@@ -2,7 +2,7 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-NIJZBQ6I.js";
+} from "./chunk-3LCVJ4AF.js";
 export {
   executeTests,
   runTestsTool

package/dist/{server-A3SB52SS.js → server-MDBQX5UZ.js}

@@ -21,7 +21,7 @@ import {
   persistToolRound,
   rebuildExtraMessages,
   setupProxy
-} from "./chunk-HOBLE365.js";
+} from "./chunk-G5AISHJE.js";
 import {
   AuthManager
 } from "./chunk-BYNY5JPB.js";
@@ -33,15 +33,16 @@ import {
   estimateTokens,
   getDangerLevel,
   googleSearchContext,
-  isFileWriteTool,
+  groupCallsByPhase,
   renderDiff,
   runHook,
+  runSafePhases,
   setContextWindow,
   setMaxOutputCap,
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-X5RX2VGQ.js";
+} from "./chunk-Q5QSCO5D.js";
 import "./chunk-4BKXL7SM.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
@@ -61,7 +62,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-NIJZBQ6I.js";
+} from "./chunk-3LCVJ4AF.js";
 
 // src/web/server.ts
 import express from "express";
@@ -325,52 +326,19 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
     }
   }
   async executeAll(calls) {
-    const safeParallel = [];
-    const safeBash = [];
-    const fileWriteCalls = [];
-    const otherCalls = [];
-    for (let i = 0; i < calls.length; i++) {
-      const call = calls[i];
-      const level = getDangerLevel(call.name, call.arguments);
-      if (level === "safe") {
-        if (call.name === "bash") {
-          safeBash.push({ idx: i, call });
-        } else {
-          safeParallel.push({ idx: i, call });
-        }
-      } else if (isFileWriteTool(call.name) && level === "write") {
-        fileWriteCalls.push({ idx: i, call });
-      } else {
-        otherCalls.push({ idx: i, call });
-      }
-    }
+    const phase = groupCallsByPhase(calls);
     const results = new Array(calls.length);
-    const wrapExec = async (idx, call) => {
-      try {
-        results[idx] = await this.execute(call);
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        console.error(`[tool-executor-web] Unexpected error in tool "${call.name}":`, err);
-        results[idx] = { callId: call.id, content: `Tool execution failed: ${msg}`, isError: true };
-      }
-    };
-    const parallelPhase = safeParallel.length > 0 ? Promise.all(safeParallel.map(({ idx, call }) => wrapExec(idx, call))) : Promise.resolve();
-    const bashPhase = (async () => {
-      for (const { idx, call } of safeBash) {
-        await wrapExec(idx, call);
-      }
-    })();
-    await Promise.all([parallelPhase, bashPhase]);
-    if (fileWriteCalls.length === 1) {
-      const { idx, call } = fileWriteCalls[0];
+    await runSafePhases(phase, (c) => this.execute(c), results, "tool-executor-web");
+    if (phase.fileWriteCalls.length === 1) {
+      const { idx, call } = phase.fileWriteCalls[0];
       results[idx] = await this.execute(call);
-    } else if (fileWriteCalls.length >= 2) {
-      const batchResult = await this.executeBatchFileWrites(fileWriteCalls);
-      for (let i = 0; i < fileWriteCalls.length; i++) {
-        results[fileWriteCalls[i].idx] = batchResult[i];
+    } else if (phase.fileWriteCalls.length >= 2) {
+      const batchResult = await this.executeBatchFileWrites(phase.fileWriteCalls);
+      for (let i = 0; i < phase.fileWriteCalls.length; i++) {
+        results[phase.fileWriteCalls[i].idx] = batchResult[i];
       }
     }
-    for (const { idx, call } of otherCalls) {
+    for (const { idx, call } of phase.otherCalls) {
       results[idx] = await this.execute(call);
     }
     return results;
@@ -391,6 +359,13 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
         };
       }
     }
+    if (approvedIndices.length >= 2) {
+      const labels = approvedIndices.map((i) => `[${i + 1}]`).join(" ");
+      this.send({
+        type: "info",
+        message: `\u26A1 Writing ${labels} in parallel (results may interleave)`
+      });
+    }
     await Promise.all(
       approvedIndices.map(async (i) => {
         const call = calls[i];
@@ -1971,7 +1946,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
       case "test": {
         this.send({ type: "info", message: "\u{1F9EA} Running tests..." });
         try {
-          const { executeTests } = await import("./run-tests-47TTKJTB.js");
+          const { executeTests } = await import("./run-tests-WD53PYVA.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {

package/dist/{task-orchestrator-KOCFBDPK.js → task-orchestrator-WDRXASIC.js}

@@ -4,11 +4,11 @@ import {
   getDangerLevel,
   googleSearchContext,
   truncateOutput
-} from "./chunk-X5RX2VGQ.js";
+} from "./chunk-Q5QSCO5D.js";
 import "./chunk-4BKXL7SM.js";
 import {
   SUBAGENT_ALLOWED_TOOLS
-} from "./chunk-NIJZBQ6I.js";
+} from "./chunk-3LCVJ4AF.js";
 
 // src/hub/task-orchestrator.ts
 import { createInterface } from "readline";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jinzd-ai-cli",
-  "version": "0.4.66",
+  "version": "0.4.68",
   "description": "Cross-platform REPL-style AI CLI with multi-provider support",
   "type": "module",
   "main": "./dist/index.js",