@nick848/sf-cli 1.0.12 → 1.0.13

package/dist/index.js

@@ -8885,7 +8885,7 @@ async function executeShell(command, ctx) {
 init_cjs_shims();
 init_new();
 async function handleNaturalLanguage(input, ctx) {
-  input.trim().toLowerCase();
+  const trimmedInput = input.trim();
   const session = getActiveSession();
   if (session) {
     const result = await handleWorkflowInput(input, ctx);
@@ -8896,81 +8896,163 @@ async function handleNaturalLanguage(input, ctx) {
       };
     }
   }
-  ctx.contextManager.addMessage({
-    role: "user",
-    content: input
-  });
-  return {
-    output: chalk9__default.default.cyan("\u6B63\u5728\u601D\u8003...") + chalk9__default.default.yellow("\n\n\u81EA\u7136\u8BED\u8A00\u5904\u7406\u529F\u80FD\u5F00\u53D1\u4E2D...") + chalk9__default.default.gray(`
-\u8F93\u5165: ${input}`),
-    contextUsed: input.length
-  };
+  const apiKey = ctx.configManager.get("apiKey");
+  if (!apiKey) {
+    return {
+      output: chalk9__default.default.yellow("\u26A0\uFE0F  \u672A\u914D\u7F6E API Key\uFF0C\u65E0\u6CD5\u4F7F\u7528 AI \u529F\u80FD") + chalk9__default.default.gray("\n\n\u8BF7\u5148\u6267\u884C /model \u914D\u7F6E\u6A21\u578B") + chalk9__default.default.gray("\n\u652F\u6301: GLM-5, GPT-4o, Claude"),
+      contextUsed: 0
+    };
+  }
+  try {
+    const response = await ctx.modelService.sendMessage(
+      [
+        {
+          role: "system",
+          content: buildSystemPrompt(ctx)
+        },
+        {
+          role: "user",
+          content: trimmedInput
+        }
+      ],
+      {
+        temperature: 0.7,
+        maxTokens: 2e3
+      }
+    );
+    ctx.contextManager.addMessage({
+      role: "user",
+      content: trimmedInput
+    });
+    ctx.contextManager.addMessage({
+      role: "assistant",
+      content: response.content
+    });
+    return {
+      output: response.content,
+      contextUsed: response.usage?.totalTokens || 0
+    };
+  } catch (error) {
+    const errorMessage = error.message;
+    if (errorMessage.includes("\u672A\u914D\u7F6E") || errorMessage.includes("\u672A\u521D\u59CB\u5316")) {
+      return {
+        output: chalk9__default.default.yellow("\u26A0\uFE0F  \u6A21\u578B\u672A\u6B63\u786E\u914D\u7F6E") + chalk9__default.default.gray("\n\n\u8BF7\u6267\u884C /model \u91CD\u65B0\u914D\u7F6E"),
+        contextUsed: 0
+      };
+    }
+    if (errorMessage.includes("timeout") || errorMessage.includes("\u8D85\u65F6")) {
+      return {
+        output: chalk9__default.default.red("\u2717 \u8BF7\u6C42\u8D85\u65F6\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5"),
+        contextUsed: 0
+      };
+    }
+    return {
+      output: chalk9__default.default.red(`\u2717 \u5904\u7406\u5931\u8D25: ${errorMessage}`),
+      contextUsed: 0
+    };
+  }
+}
+function buildSystemPrompt(ctx) {
+  const parts = [
+    "\u4F60\u662F sf-cli \u7684 AI \u52A9\u624B\uFF0C\u4E00\u4E2A\u4E13\u4E1A\u7684\u8F6F\u4EF6\u5F00\u53D1\u52A9\u624B\u3002",
+    "",
+    "\u4F60\u53EF\u4EE5\u5E2E\u52A9\u7528\u6237\uFF1A",
+    "1. \u7406\u89E3\u548C\u5206\u6790\u9700\u6C42",
+    "2. \u63D0\u4F9B\u4EE3\u7801\u5EFA\u8BAE\u548C\u5B9E\u73B0\u65B9\u6848",
+    "3. \u56DE\u7B54\u6280\u672F\u95EE\u9898",
+    "4. \u8F85\u52A9\u8FDB\u884C\u4EE3\u7801\u5BA1\u67E5",
+    "",
+    "\u5F53\u524D\u9879\u76EE\u4FE1\u606F\uFF1A",
+    `- \u5DE5\u4F5C\u76EE\u5F55: ${ctx.options.workingDirectory}`,
+    `- \u6A21\u578B: ${ctx.modelService.getCurrentModel() || "\u672A\u6307\u5B9A"}`
+  ];
+  return parts.join("\n");
 }
 
 // src/cli/executor.ts
 init_new();
-var BASIC_COMMANDS = [
+var ALWAYS_ALLOWED = [
   "help",
   "h",
   "?",
-  "init",
-  "i",
   "model",
   "m",
-  "new",
-  "n",
   "exit",
   "e",
   "q",
   "quit",
   "clear",
   "c",
-  "update",
-  "u",
   "version",
   "v"
 ];
+var REQUIRES_API_KEY = [
+  "new",
+  "n",
+  "init",
+  "i",
+  "update",
+  "u"
+];
 var CommandExecutor = class {
   async execute(parseResult, ctx) {
     if (!parseResult.success || !parseResult.command) {
       return { output: chalk9__default.default.red(`\u9519\u8BEF: ${parseResult.error}`) };
     }
     const { command } = parseResult;
+    const hasApiKey = !!ctx.configManager.get("apiKey");
     const hasActiveWorkflow = getActiveSession() !== null;
-    if (!hasActiveWorkflow) {
-      if (command.type === "slash" /* SLASH */) {
-        const cmd = command.command?.toLowerCase() || "";
-        if (!BASIC_COMMANDS.includes(cmd)) {
+    if (command.type === "slash" /* SLASH */) {
+      const cmd = command.command?.toLowerCase() || "";
+      if (ALWAYS_ALLOWED.includes(cmd)) {
+        return this.executeSlashCommand(command, ctx);
+      }
+      if (REQUIRES_API_KEY.includes(cmd)) {
+        if (!hasApiKey) {
           return {
-            output: chalk9__default.default.yellow("\u5F53\u524D\u6CA1\u6709\u6D3B\u8DC3\u7684\u5DE5\u4F5C\u6D41") + chalk9__default.default.gray("\n\u8BF7\u5148\u4F7F\u7528 ") + chalk9__default.default.cyan("/new <\u9700\u6C42\u63CF\u8FF0>") + chalk9__default.default.gray(" \u542F\u52A8\u65B0\u5DE5\u4F5C\u6D41")
+            output: chalk9__default.default.yellow("\u26A0\uFE0F  \u8BF7\u5148\u914D\u7F6E API Key") + chalk9__default.default.gray("\n\n\u6267\u884C /model \u9009\u62E9\u6A21\u578B\u5E76\u914D\u7F6E API Key")
           };
         }
-      } else if (command.type === "dollar" /* DOLLAR */) {
+        return this.executeSlashCommand(command, ctx);
+      }
+      if (!hasActiveWorkflow) {
+        return {
+          output: chalk9__default.default.yellow("\u5F53\u524D\u6CA1\u6709\u6D3B\u8DC3\u7684\u5DE5\u4F5C\u6D41") + chalk9__default.default.gray("\n\u8BF7\u5148\u4F7F\u7528 ") + chalk9__default.default.cyan("/new <\u9700\u6C42\u63CF\u8FF0>") + chalk9__default.default.gray(" \u542F\u52A8\u65B0\u5DE5\u4F5C\u6D41")
+        };
+      }
+      return this.executeSlashCommand(command, ctx);
+    }
+    if (command.type === "dollar" /* DOLLAR */) {
+      if (!hasActiveWorkflow) {
         return {
           output: chalk9__default.default.yellow("\u5F53\u524D\u6CA1\u6709\u6D3B\u8DC3\u7684\u5DE5\u4F5C\u6D41\uFF0C\u65E0\u6CD5\u8C03\u7528 Agent") + chalk9__default.default.gray("\n\u8BF7\u5148\u4F7F\u7528 ") + chalk9__default.default.cyan("/new <\u9700\u6C42\u63CF\u8FF0>") + chalk9__default.default.gray(" \u542F\u52A8\u65B0\u5DE5\u4F5C\u6D41")
         };
-      } else if (command.type === "shell" /* SHELL */) {
+      }
+      if (!hasApiKey) {
+        return {
+          output: chalk9__default.default.yellow("\u26A0\uFE0F  \u8BF7\u5148\u914D\u7F6E API Key") + chalk9__default.default.gray("\n\n\u6267\u884C /model \u914D\u7F6E\u6A21\u578B")
+        };
+      }
+      return this.executeAgent(command, ctx);
+    }
+    if (command.type === "shell" /* SHELL */) {
+      if (!hasActiveWorkflow) {
         return {
           output: chalk9__default.default.yellow("\u5F53\u524D\u6CA1\u6709\u6D3B\u8DC3\u7684\u5DE5\u4F5C\u6D41\uFF0C\u65E0\u6CD5\u6267\u884C Shell \u547D\u4EE4") + chalk9__default.default.gray("\n\u8BF7\u5148\u4F7F\u7528 ") + chalk9__default.default.cyan("/new <\u9700\u6C42\u63CF\u8FF0>") + chalk9__default.default.gray(" \u542F\u52A8\u65B0\u5DE5\u4F5C\u6D41")
         };
       }
+      return this.executeShell(command, ctx);
     }
-    switch (command.type) {
-      case "slash" /* SLASH */:
-        return this.executeSlashCommand(command, ctx);
-      case "at" /* AT */:
-        return this.executeFileReference(command, ctx);
-      case "dollar" /* DOLLAR */:
-        return this.executeAgent(command, ctx);
-      case "shell" /* SHELL */:
-        return this.executeShell(command, ctx);
-      case "natural" /* NATURAL */:
-        return this.executeNaturalLanguage(command, ctx);
-      case "yolo" /* YOLO */:
-        return this.executeYolo(ctx);
-      default:
-        return { output: chalk9__default.default.red("\u672A\u77E5\u7684\u547D\u4EE4\u7C7B\u578B") };
+    if (command.type === "at" /* AT */) {
+      return this.executeFileReference(command, ctx);
+    }
+    if (command.type === "natural" /* NATURAL */) {
+      return this.executeNaturalLanguage(command, ctx);
+    }
+    if (command.type === "yolo" /* YOLO */) {
+      return this.executeYolo(ctx);
     }
+    return { output: chalk9__default.default.red("\u672A\u77E5\u7684\u547D\u4EE4\u7C7B\u578B") };
   }
   async executeSlashCommand(command, ctx) {
     const result = await runSlashCommand(