shenxiang-ai-cli 0.5.5 → 0.5.7

package/dist/index.js

@@ -4,7 +4,7 @@
 import { Command } from "commander";
 
 // src/commands/chat.ts
-import inquirer from "inquirer";
+import inquirer2 from "inquirer";
 import fs5 from "fs/promises";
 import path5 from "path";
 import { glob as glob4 } from "glob";
@@ -1289,6 +1289,9 @@ var gitLogTool = {
   requiresConfirmation: false
 };
 
+// src/core/tools/index.ts
+import inquirer from "inquirer";
+
 // src/i18n/zh.ts
 var zh = {
   welcome: "\u6B22\u8FCE\u4F7F\u7528\u6C88\u7FD4\u7684AI\u52A9\u624B \u2014 \u4F60\u7684AI\u5168\u6808\u5F00\u53D1\u642D\u6863",
@@ -1440,25 +1443,6 @@ function t(key, params) {
   return value.replace(/\{(\w+)\}/g, (_, k) => params[k] ?? `{${k}}`);
 }
 
-// src/utils/input.ts
-var _questionFn = null;
-function registerQuestionFn(fn) {
-  _questionFn = fn;
-}
-async function askQuestion(prompt) {
-  if (_questionFn) {
-    return _questionFn(prompt);
-  }
-  return new Promise((resolve) => {
-    process.stdout.write(prompt);
-    const onData = (data) => {
-      process.stdin.removeListener("data", onData);
-      resolve(data.toString().trim());
-    };
-    process.stdin.once("data", onData);
-  });
-}
-
 // src/core/tools/index.ts
 var toolRegistry = /* @__PURE__ */ new Map();
 var _yoloMode = false;
@@ -1496,10 +1480,18 @@ async function confirmExecution(toolName, args) {
   else if (toolName === "edit_file") description = `\u7F16\u8F91\u6587\u4EF6: ${args.path}`;
   else if (toolName === "delete_file") description = `\u5220\u9664\u6587\u4EF6: ${args.path}`;
   else if (toolName === "git_commit") description = `Git\u63D0\u4EA4: ${args.message}`;
-  const answer = await askQuestion(`  \u26A1 ${description}
-  \u5141\u8BB8\u6267\u884C\uFF1F(Y/n) `);
-  const a = answer.toLowerCase().trim();
-  return a === "" || a === "y" || a === "yes";
+  console.log(theme.warning(`  \u26A1 ${description}`));
+  const { confirmation } = await inquirer.prompt([{
+    type: "list",
+    name: "confirmation",
+    message: "\u662F\u5426\u5141\u8BB8\u6267\u884C?",
+    choices: [
+      { name: "\u540C\u610F\u6267\u884C (Yes)", value: true },
+      { name: "\u62D2\u7EDD\u6267\u884C (No)", value: false }
+    ],
+    default: true
+  }]);
+  return confirmation;
 }
 async function executeTool(name, args, autoConfirm = false) {
   const tool = toolRegistry.get(name);
@@ -1869,10 +1861,10 @@ var Agent = class {
             process.stdout.write("\n" + theme.dim("  \u2514\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") + "\n");
           }
           if (!spinner.isSpinning && spinnerStopped) {
-            spinner.text = "AI \u6B63\u5728\u751F\u6210\u4EE3\u7801...";
+            spinner.text = "AI \u6B63\u5728\u601D\u8003...";
             spinner.start();
           }
-        }, 1500);
+        }, 800);
       };
       const clearIdleTimer = () => {
         if (idleTimer) {
@@ -1928,7 +1920,7 @@ var Agent = class {
               }
               if (!toolSpinnerStarted) {
                 if (hasTextOutput) process.stdout.write("\n");
-                spinner.text = "\u6B63\u5728\u51C6\u5907\u64CD\u4F5C...";
+                spinner.text = "\u6B63\u5728\u89C4\u5212\u64CD\u4F5C...";
                 spinner.start();
                 toolSpinnerStarted = true;
               }
@@ -1937,7 +1929,6 @@ var Agent = class {
               if (chunk.toolCallInfo) {
                 const fnName = chunk.toolCallInfo.functionName || "";
                 const delta = chunk.toolCallInfo.argumentsDelta || "";
-                const size = chunk.toolCallInfo.argumentsLength || 0;
                 if (!toolSpinnerStarted || spinner.isSpinning && delta) {
                   if (spinner.isSpinning) spinner.stop();
                   if (!toolSpinnerStarted) {
@@ -1948,7 +1939,7 @@ var Agent = class {
                     process.stdout.write(theme.tool(`
   \u25B8 ${name}
 `));
-                    this._codeStreamState = { inContent: false, buffer: "", escaping: false };
+                    this._codeStreamState = { inContent: false, buffer: "", escaping: false, keyBuffer: "", inKey: false, afterColon: false };
                   }
                 }
                 if (delta && this._codeStreamState) {
@@ -2226,7 +2217,7 @@ function showBanner() {
   console.clear();
   const p = chalk3.hex("#A78BFA");
   const w = chalk3.white;
-  const version = "v0.5.5";
+  const version = "v0.5.7";
   const avatarLines = [
     `      ${p("\u2584\u2580\u2580\u2580\u2584")}`,
     `     ${p("\u2588")} ${w("\u2580")} ${w("\u2580")} ${p("\u2588")}`,
@@ -2277,11 +2268,16 @@ function showBanner() {
     ...wrappedQuote.map((l) => theme.dim(l)),
     ""
   ];
+  const getVisualWidth = (str) => {
+    return stripAnsi(str).split("").reduce((width, char) => {
+      return width + (char.codePointAt(0) > 255 ? 2 : 1);
+    }, 0);
+  };
   const maxLines = Math.max(leftContent.length, rightContent.length);
   const lines = [];
   for (let i = 0; i < maxLines; i++) {
     const left = leftContent[i] || "";
-    const leftVisible = stripAnsi(left).length;
+    const leftVisible = getVisualWidth(left);
     const leftPadding = " ".repeat(Math.max(0, leftColWidth - leftVisible));
     const right = rightContent[i] || "";
     lines.push(`${left}${leftPadding} ${theme.dim("\u2502")} ${right}`);
@@ -2298,6 +2294,12 @@ function showBanner() {
   }));
 }
 
+// src/utils/input.ts
+var _questionFn = null;
+function registerQuestionFn(fn) {
+  _questionFn = fn;
+}
+
 // src/commands/chat.ts
 async function chatCommand(options = {}) {
   const config3 = getConfig();
@@ -2335,7 +2337,7 @@ async function chatCommand(options = {}) {
     console.log();
   }
   registerQuestionFn(async (prompt) => {
-    const { answer } = await inquirer.prompt([{
+    const { answer } = await inquirer2.prompt([{
       type: "input",
       name: "answer",
       message: prompt,
@@ -2385,7 +2387,7 @@ async function chatCommand(options = {}) {
   while (true) {
     let input;
     try {
-      const result = await inquirer.prompt([{
+      const result = await inquirer2.prompt([{
         type: "input",
         name: "input",
         message: theme.user("\u4F60:"),
@@ -2420,20 +2422,20 @@ async function chatCommand(options = {}) {
 }
 async function doInlineRegister() {
   const config3 = getConfig();
-  const { email } = await inquirer.prompt([{
+  const { email } = await inquirer2.prompt([{
     type: "input",
     name: "email",
     message: "\u90AE\u7BB1:",
     validate: (v) => v.includes("@") ? true : "\u8BF7\u8F93\u5165\u6709\u6548\u7684\u90AE\u7BB1"
   }]);
-  const { password } = await inquirer.prompt([{
+  const { password } = await inquirer2.prompt([{
     type: "password",
     name: "password",
     message: "\u8BBE\u7F6E\u5BC6\u7801 (\u81F3\u5C116\u4F4D):",
     mask: "*",
     validate: (v) => v.length >= 6 ? true : "\u5BC6\u7801\u81F3\u5C116\u4F4D"
   }]);
-  const { name } = await inquirer.prompt([{
+  const { name } = await inquirer2.prompt([{
     type: "input",
     name: "name",
     message: "\u6635\u79F0:",
@@ -2685,19 +2687,19 @@ function fmtTokens(n) {
 }
 
 // src/commands/config.ts
-import inquirer2 from "inquirer";
+import inquirer3 from "inquirer";
 async function configCommand() {
   const config3 = getConfig();
   console.log(`
 \u914D\u7F6E\u6587\u4EF6: ${theme.dim(getConfigPath())}
 `);
-  const { action } = await inquirer2.prompt([{
+  const { action } = await inquirer3.prompt([{
     type: "list",
     name: "action",
     message: "\u9009\u62E9\u8981\u914D\u7F6E\u7684\u9879\u76EE:",
     choices: [
       { name: "\u{1F916} \u8BBE\u7F6EAI\u6A21\u578B", value: "model" },
-      new inquirer2.Separator("\u2500\u2500 API Key \u8BBE\u7F6E \u2500\u2500"),
+      new inquirer3.Separator("\u2500\u2500 API Key \u8BBE\u7F6E \u2500\u2500"),
       { name: "\u{1F319} Kimi \u6708\u4E4B\u6697\u9762", value: "key_kimi" },
       { name: "\u{1F9E0} OpenAI", value: "key_openai" },
       { name: "\u{1F3AD} Anthropic Claude", value: "key_anthropic" },
@@ -2710,7 +2712,7 @@ async function configCommand() {
       { name: "\u26A1 Groq", value: "key_groq" },
       { name: "\u{1F3D4}\uFE0F  \u767E\u5DDD Baichuan", value: "key_baichuan" },
       { name: "\u{1F31F} \u96F6\u4E00\u4E07\u7269 Yi", value: "key_lingyiwanwu" },
-      new inquirer2.Separator("\u2500\u2500 \u5176\u4ED6\u8BBE\u7F6E \u2500\u2500"),
+      new inquirer3.Separator("\u2500\u2500 \u5176\u4ED6\u8BBE\u7F6E \u2500\u2500"),
       { name: "\u{1F310} \u8BBE\u7F6E\u540E\u7AEF\u670D\u52A1\u5730\u5740", value: "apiBaseUrl" },
       { name: "\u{1F30D} \u8BBE\u7F6E\u754C\u9762\u8BED\u8A00", value: "locale" },
       { name: "\u{1F4CB} \u67E5\u770B\u5F53\u524D\u914D\u7F6E", value: "show" },
@@ -2725,7 +2727,7 @@ async function configCommand() {
     if (currentKey) {
       printInfo(`\u5F53\u524D\u5DF2\u914D\u7F6E ${displayName} Key`);
     }
-    const { key } = await inquirer2.prompt([{
+    const { key } = await inquirer3.prompt([{
       type: "password",
       name: "key",
       message: `\u8F93\u5165 ${displayName} API Key:`,
@@ -2747,7 +2749,7 @@ async function configCommand() {
       }
       const choices = [];
       for (const [group, groupModels] of groups) {
-        choices.push(new inquirer2.Separator(`\u2500\u2500 ${group} \u2500\u2500`));
+        choices.push(new inquirer3.Separator(`\u2500\u2500 ${group} \u2500\u2500`));
         for (const m of groupModels) {
           choices.push({
             name: `${m.name} (${m.id})`,
@@ -2755,7 +2757,7 @@ async function configCommand() {
           });
         }
       }
-      const { model } = await inquirer2.prompt([{
+      const { model } = await inquirer3.prompt([{
         type: "list",
         name: "model",
         message: "\u9009\u62E9AI\u6A21\u578B:",
@@ -2768,7 +2770,7 @@ async function configCommand() {
       break;
     }
     case "apiBaseUrl": {
-      const { url } = await inquirer2.prompt([{
+      const { url } = await inquirer3.prompt([{
         type: "input",
         name: "url",
         message: "\u8F93\u5165\u540E\u7AEF\u670D\u52A1\u5730\u5740:",
@@ -2779,7 +2781,7 @@ async function configCommand() {
       break;
     }
     case "locale": {
-      const { locale } = await inquirer2.prompt([{
+      const { locale } = await inquirer3.prompt([{
         type: "list",
         name: "locale",
         message: "\u9009\u62E9\u754C\u9762\u8BED\u8A00:",
@@ -2815,12 +2817,12 @@ async function configCommand() {
 }
 
 // src/commands/login.ts
-import inquirer3 from "inquirer";
+import inquirer4 from "inquirer";
 async function loginCommand() {
   const config3 = getConfig();
   if (config3.authToken && config3.userEmail) {
     printInfo(`\u5F53\u524D\u5DF2\u767B\u5F55: ${config3.userEmail}`);
-    const { relogin } = await inquirer3.prompt([{
+    const { relogin } = await inquirer4.prompt([{
       type: "confirm",
       name: "relogin",
       message: "\u662F\u5426\u91CD\u65B0\u767B\u5F55\uFF1F",
@@ -2829,7 +2831,7 @@ async function loginCommand() {
     if (!relogin) return;
   }
   console.log(theme.brandBold("\n\u{1F511} \u767B\u5F55\u6C88\u7FD4\u7684AI\u52A9\u624B\n"));
-  const { email } = await inquirer3.prompt([{
+  const { email } = await inquirer4.prompt([{
     type: "input",
     name: "email",
     message: "\u90AE\u7BB1:",
@@ -2838,7 +2840,7 @@ async function loginCommand() {
       return true;
     }
   }]);
-  const { password } = await inquirer3.prompt([{
+  const { password } = await inquirer4.prompt([{
     type: "password",
     name: "password",
     message: "\u5BC6\u7801:",
@@ -2864,7 +2866,7 @@ async function loginCommand() {
       console.log();
     } else if (response.status === 404) {
       printInfo("\u8BE5\u90AE\u7BB1\u5C1A\u672A\u6CE8\u518C");
-      const { register } = await inquirer3.prompt([{
+      const { register } = await inquirer4.prompt([{
         type: "confirm",
         name: "register",
         message: "\u662F\u5426\u7ACB\u5373\u6CE8\u518C\uFF1F",
@@ -2898,12 +2900,12 @@ async function loginCommand() {
 }
 
 // src/commands/register.ts
-import inquirer4 from "inquirer";
+import inquirer5 from "inquirer";
 async function registerCommand() {
   const config3 = getConfig();
   if (config3.authToken && config3.userEmail) {
     printInfo(`\u5F53\u524D\u5DF2\u767B\u5F55: ${config3.userEmail}`);
-    const { proceed } = await inquirer4.prompt([{
+    const { proceed } = await inquirer5.prompt([{
       type: "confirm",
       name: "proceed",
       message: "\u662F\u5426\u6CE8\u518C\u65B0\u8D26\u6237\uFF1F\uFF08\u5C06\u8986\u76D6\u5F53\u524D\u767B\u5F55\u72B6\u6001\uFF09",
@@ -2912,7 +2914,7 @@ async function registerCommand() {
     if (!proceed) return;
   }
   console.log(theme.brandBold("\n\u{1F4DD} \u6CE8\u518C\u6C88\u7FD4\u7684AI\u52A9\u624B\u8D26\u6237\n"));
-  const { email } = await inquirer4.prompt([{
+  const { email } = await inquirer5.prompt([{
     type: "input",
     name: "email",
     message: "\u90AE\u7BB1:",
@@ -2921,13 +2923,13 @@ async function registerCommand() {
       return true;
     }
   }]);
-  const { name } = await inquirer4.prompt([{
+  const { name } = await inquirer5.prompt([{
     type: "input",
     name: "name",
     message: "\u6635\u79F0 (\u53EF\u9009):",
     default: email.split("@")[0]
   }]);
-  const { password } = await inquirer4.prompt([{
+  const { password } = await inquirer5.prompt([{
     type: "password",
     name: "password",
     message: "\u5BC6\u7801 (\u81F3\u5C116\u4F4D):",
@@ -2937,7 +2939,7 @@ async function registerCommand() {
       return true;
     }
   }]);
-  const { confirmPassword } = await inquirer4.prompt([{
+  const { confirmPassword } = await inquirer5.prompt([{
     type: "password",
     name: "confirmPassword",
     message: "\u786E\u8BA4\u5BC6\u7801:",
@@ -3070,7 +3072,7 @@ function progressBar(used, limit, width = 16) {
 }
 
 // src/commands/admin.ts
-import inquirer5 from "inquirer";
+import inquirer6 from "inquirer";
 async function adminCommand() {
   const config3 = getConfig();
   if (!config3.authToken) {
@@ -3078,7 +3080,7 @@ async function adminCommand() {
     return;
   }
   console.log(theme.brandBold("\n\u2699\uFE0F  \u7BA1\u7406\u5458\u63A7\u5236\u53F0\n"));
-  const { action } = await inquirer5.prompt([{
+  const { action } = await inquirer6.prompt([{
     type: "list",
     name: "action",
     message: "\u9009\u62E9\u64CD\u4F5C:",
@@ -3165,7 +3167,7 @@ async function listUsers(config3) {
 async function setUserQuota(config3) {
   const users = await fetchUserList(config3);
   if (!users) return;
-  const { userId } = await inquirer5.prompt([{
+  const { userId } = await inquirer6.prompt([{
     type: "list",
     name: "userId",
     message: "\u9009\u62E9\u7528\u6237:",
@@ -3175,19 +3177,19 @@ async function setUserQuota(config3) {
   console.log(theme.dim(`
   \u5F53\u524D\u989D\u5EA6: \u65E5\u9650=${selectedUser.dailyLimit}\u6B21  \u6708Token=${fmtTokens3(selectedUser.monthlyTokenLimit)}  \u514D\u8D39\u603B\u989D=${fmtTokens3(selectedUser.totalFreeTokens)}
 `));
-  const { dailyLimit } = await inquirer5.prompt([{
+  const { dailyLimit } = await inquirer6.prompt([{
     type: "number",
     name: "dailyLimit",
     message: "\u6BCF\u65E5\u8BF7\u6C42\u4E0A\u9650:",
     default: selectedUser.dailyLimit
   }]);
-  const { monthlyTokenLimit } = await inquirer5.prompt([{
+  const { monthlyTokenLimit } = await inquirer6.prompt([{
     type: "number",
     name: "monthlyTokenLimit",
     message: "\u6BCF\u6708Token\u4E0A\u9650:",
     default: selectedUser.monthlyTokenLimit
   }]);
-  const { totalFreeTokens } = await inquirer5.prompt([{
+  const { totalFreeTokens } = await inquirer6.prompt([{
     type: "number",
     name: "totalFreeTokens",
     message: "\u514D\u8D39Token\u603B\u989D:",
@@ -3213,13 +3215,13 @@ async function setUserQuota(config3) {
 async function setUserPlan(config3) {
   const users = await fetchUserList(config3);
   if (!users) return;
-  const { userId } = await inquirer5.prompt([{
+  const { userId } = await inquirer6.prompt([{
     type: "list",
     name: "userId",
     message: "\u9009\u62E9\u7528\u6237:",
     choices: users.map((u) => ({ name: `${u.email} (\u5F53\u524D: ${u.plan})`, value: u.id }))
   }]);
-  const { plan } = await inquirer5.prompt([{
+  const { plan } = await inquirer6.prompt([{
     type: "list",
     name: "plan",
     message: "\u9009\u62E9\u8BA1\u5212:",
@@ -3249,7 +3251,7 @@ async function setUserPlan(config3) {
 async function setUserRole(config3) {
   const users = await fetchUserList(config3);
   if (!users) return;
-  const { userId } = await inquirer5.prompt([{
+  const { userId } = await inquirer6.prompt([{
     type: "list",
     name: "userId",
     message: "\u9009\u62E9\u7528\u6237:",
@@ -3258,7 +3260,7 @@ async function setUserRole(config3) {
       value: u.id
     }))
   }]);
-  const { role } = await inquirer5.prompt([{
+  const { role } = await inquirer6.prompt([{
     type: "list",
     name: "role",
     message: "\u8BBE\u7F6E\u89D2\u8272:",
@@ -3287,7 +3289,7 @@ async function setUserRole(config3) {
 async function resetUsage(config3) {
   const users = await fetchUserList(config3);
   if (!users) return;
-  const { userId } = await inquirer5.prompt([{
+  const { userId } = await inquirer6.prompt([{
     type: "list",
     name: "userId",
     message: "\u9009\u62E9\u7528\u6237:",
@@ -3296,7 +3298,7 @@ async function resetUsage(config3) {
       value: u.id
     }))
   }]);
-  const { confirm } = await inquirer5.prompt([{
+  const { confirm } = await inquirer6.prompt([{
     type: "confirm",
     name: "confirm",
     message: "\u786E\u5B9A\u8981\u91CD\u7F6E\u8BE5\u7528\u6237\u7684\u7D2F\u8BA1\u7528\u91CF\u5417\uFF1F",
@@ -3321,7 +3323,7 @@ async function resetUsage(config3) {
 async function toggleUserStatus(config3) {
   const users = await fetchUserList(config3);
   if (!users) return;
-  const { userId } = await inquirer5.prompt([{
+  const { userId } = await inquirer6.prompt([{
     type: "list",
     name: "userId",
     message: "\u9009\u62E9\u7528\u6237:",
@@ -3390,7 +3392,7 @@ function fmtTokens3(n) {
 var program = new Command();
 var config2 = getConfig();
 setLocale(config2.locale);
-program.name("sxai").description(t("description")).version("0.5.5");
+program.name("sxai").description(t("description")).version("0.5.7");
 program.command("chat", { isDefault: true }).description("\u542F\u52A8\u4EA4\u4E92\u5F0FAI\u5BF9\u8BDD\uFF08\u9ED8\u8BA4\u547D\u4EE4\uFF09").option("-m, --model <model>", "\u6307\u5B9AAI\u6A21\u578B", config2.model).option("-y, --yolo", "\u81EA\u52A8\u6A21\u5F0F\uFF1A\u8DF3\u8FC7\u6240\u6709\u786E\u8BA4\uFF0C\u8BA9AI\u81EA\u4E3B\u6267\u884C").action(async (options) => {
   if (options.model && options.model !== config2.model) {
     setConfig("model", options.model);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shenxiang-ai-cli",
-  "version": "0.5.5",
+  "version": "0.5.7",
   "description": "沈翔的AI助手 - 终端里的AI全栈开发搭档",
   "type": "module",
   "bin": {