@nick848/sf-cli 1.0.20 → 1.0.22

package/dist/index.mjs

@@ -104,7 +104,10 @@ async function executeWorkflow(ctx) {
     if (activeSession.phase === "context") {
       lines.push(chalk9.cyan("\u2501\u2501\u2501 \u9636\u6BB5 1/9: \u9879\u76EE\u4E0A\u4E0B\u6587\u83B7\u53D6 \u2501\u2501\u2501"));
       lines.push("");
+      const loader = new LoadingIndicator2("\u8BFB\u53D6\u9879\u76EE\u914D\u7F6E");
+      loader.start();
       activeSession.context = await readProjectContext(ctx.options.workingDirectory);
+      loader.stop();
       lines.push(chalk9.gray(`  \u9879\u76EE: ${activeSession.context.name}`));
       lines.push(chalk9.gray(`  \u7C7B\u578B: ${activeSession.context.type}`));
       lines.push(chalk9.gray(`  \u6846\u67B6: ${activeSession.context.framework || "\u672A\u8BC6\u522B"}`));
@@ -194,7 +197,7 @@ ${resource.analysis}`;
       lines.push("");
       lines.push(chalk9.cyan("\u2501\u2501\u2501 \u9636\u6BB5 5/9: BDD \u573A\u666F\u62C6\u89E3 \u2501\u2501\u2501"));
       lines.push("");
-      const loader = new LoadingIndicator("AI \u6B63\u5728\u751F\u6210 BDD \u573A\u666F");
+      const loader = new LoadingIndicator2("AI \u6B63\u5728\u751F\u6210 BDD \u573A\u666F");
       loader.start();
       try {
         activeSession.bddScenarios = await generateBDDScenariosWithAI(
@@ -229,7 +232,7 @@ ${resource.analysis}`;
       lines.push("");
       lines.push(chalk9.cyan("\u2501\u2501\u2501 \u9636\u6BB5 6/9: OpenSpec \u89C4\u683C \u2501\u2501\u2501"));
       lines.push("");
-      const loader = new LoadingIndicator("AI \u6B63\u5728\u62C6\u5206\u89C4\u683C");
+      const loader = new LoadingIndicator2("AI \u6B63\u5728\u62C6\u5206\u89C4\u683C");
       loader.start();
       try {
         activeSession.specItems = await generateSpecItemsWithAI(
@@ -398,31 +401,85 @@ async function handleWorkflowInput(input, ctx) {
     activeSession.phase = "analysis";
     return executeWorkflow(ctx);
   }
-  if (activeSession.phase === "spec") {
+  if (activeSession.phase === "spec" || activeSession.specFeedbackState === "waiting_confirm") {
     if (trimmed === "y" || trimmed === "yes" || trimmed === "\u786E\u8BA4") {
+      activeSession.specFeedbackState = void 0;
       activeSession.phase = "tdd";
       return executeWorkflow(ctx);
     }
-    if (trimmed === "n" || trimmed === "no" || trimmed === "\u91CD\u65B0") {
-      activeSession.bddScenarios = generateBDDScenarios(
-        activeSession.refinedRequirement,
-        activeSession.context,
-        activeSession.clarificationQuestions,
-        activeSession.referenceResources
-      );
-      activeSession.specItems = generateSpecItems(
-        activeSession.refinedRequirement,
-        activeSession.context,
-        activeSession.bddScenarios,
-        activeSession.clarificationQuestions,
-        activeSession.referenceResources
-      );
+    if (trimmed === "n" || trimmed === "no" || trimmed === "\u4E0D\u6EE1\u610F" || trimmed === "\u91CD\u65B0") {
+      activeSession.specFeedbackState = "collecting_feedback";
+      if (!activeSession.specFeedbacks) {
+        activeSession.specFeedbacks = [];
+      }
+      return {
+        output: chalk9.yellow("\n\u{1F4DD} \u8BF7\u8F93\u5165\u60A8\u5BF9\u89C4\u683C\u4E0D\u6EE1\u610F\u7684\u5730\u65B9:") + chalk9.gray("\n  - \u9057\u6F0F\u7684\u529F\u80FD\u70B9") + chalk9.gray("\n  - \u4E0D\u5408\u7406\u7684\u62C6\u5206") + chalk9.gray("\n  - \u9700\u8981\u8865\u5145\u7684\u7EC6\u8282") + chalk9.gray("\n  - \u5176\u4ED6\u6539\u8FDB\u5EFA\u8BAE") + chalk9.cyan('\n\n\u8F93\u5165\u5B8C\u6210\u540E\uFF0C\u8F93\u5165\u7A7A\u884C\u6216 "done" \u7ED3\u675F\u8F93\u5165')
+      };
+    }
+  }
+  if (activeSession.specFeedbackState === "collecting_feedback") {
+    if (trimmed === "" || trimmed === "done" || trimmed === "\u5B8C\u6210") {
+      if (!activeSession.specFeedbacks || activeSession.specFeedbacks.length === 0) {
+        return {
+          output: chalk9.yellow('\u26A0\uFE0F \u8BF7\u81F3\u5C11\u8F93\u5165\u4E00\u6761\u53CD\u9988\u610F\u89C1\uFF0C\u6216\u8F93\u5165 "cancel" \u53D6\u6D88')
+        };
+      }
+      activeSession.specFeedbackState = "feedback_received";
+      const loader = new LoadingIndicator2("AI \u6B63\u5728\u6839\u636E\u53CD\u9988\u91CD\u65B0\u751F\u6210\u89C4\u683C");
+      loader.start();
+      try {
+        activeSession.specItems = await generateSpecItemsWithFeedback(
+          activeSession.refinedRequirement,
+          activeSession.context,
+          activeSession.bddScenarios,
+          activeSession.clarificationQuestions,
+          activeSession.referenceResources,
+          activeSession.specFeedbacks,
+          ctx
+        );
+        loader.stop(chalk9.green("  \u2713 \u89C4\u683C\u5DF2\u6839\u636E\u53CD\u9988\u91CD\u65B0\u751F\u6210"));
+      } catch (error) {
+        loader.stop(chalk9.yellow("  \u26A0 \u4F7F\u7528\u57FA\u7840\u65B9\u6CD5\u91CD\u65B0\u751F\u6210"));
+        activeSession.specItems = generateSpecItems(
+          activeSession.refinedRequirement,
+          activeSession.context,
+          activeSession.bddScenarios,
+          activeSession.clarificationQuestions,
+          activeSession.referenceResources
+        );
+      }
       const specPath = await saveSpecFile(ctx.options.workingDirectory, activeSession);
+      activeSession.specFeedbackState = "waiting_confirm";
+      const lines = [];
+      lines.push(chalk9.cyan("\n\u2501\u2501\u2501 \u66F4\u65B0\u540E\u7684\u4EFB\u52A1\u6982\u89C8 \u2501\u2501\u2501"));
+      for (const item of activeSession.specItems.slice(0, 8)) {
+        const icon = item.priority === "high" ? "\u{1F534}" : item.priority === "medium" ? "\u{1F7E1}" : "\u{1F7E2}";
+        lines.push(chalk9.gray(`  ${icon} [${item.id}] ${item.title}`));
+      }
+      if (activeSession.specItems.length > 8) {
+        lines.push(chalk9.gray(`  ... \u5171 ${activeSession.specItems.length} \u4E2A\u4EFB\u52A1`));
+      }
       return {
-        output: chalk9.cyan("\u{1F504} \u89C4\u683C\u5DF2\u91CD\u65B0\u751F\u6210") + chalk9.gray(`
-\u8DEF\u5F84: ${specPath}`) + chalk9.yellow("\n\n\u8BF7\u786E\u8BA4:") + chalk9.green("\n  y  - \u786E\u8BA4\u89C4\u683C") + chalk9.red("\n  n  - \u518D\u6B21\u91CD\u65B0\u751F\u6210")
+        output: lines.join("\n") + chalk9.green(`
+
+\u2713 \u89C4\u683C\u6587\u4EF6\u5DF2\u66F4\u65B0`) + chalk9.gray(`
+  \u8DEF\u5F84: ${specPath}`) + chalk9.yellow("\n\n\u8BF7\u786E\u8BA4:") + chalk9.green("\n  y  - \u786E\u8BA4\u89C4\u683C") + chalk9.red("\n  n  - \u4ECD\u6709\u95EE\u9898\uFF0C\u7EE7\u7EED\u53CD\u9988")
       };
     }
+    if (trimmed === "cancel" || trimmed === "\u53D6\u6D88") {
+      activeSession.specFeedbackState = "waiting_confirm";
+      activeSession.specFeedbacks = [];
+      return {
+        output: chalk9.gray("\u5DF2\u53D6\u6D88\u53CD\u9988\uFF0C\u8FD4\u56DE\u89C4\u683C\u786E\u8BA4") + chalk9.yellow("\n\n\u8BF7\u786E\u8BA4:") + chalk9.green("\n  y  - \u786E\u8BA4\u89C4\u683C") + chalk9.red("\n  n  - \u4E0D\u6EE1\u610F\uFF0C\u91CD\u65B0\u751F\u6210")
+      };
+    }
+    if (!activeSession.specFeedbacks) {
+      activeSession.specFeedbacks = [];
+    }
+    activeSession.specFeedbacks.push(trimmed);
+    return {
+      output: chalk9.gray(`\u5DF2\u8BB0\u5F55\u53CD\u9988 #${activeSession.specFeedbacks.length}: `) + chalk9.white(trimmed.slice(0, 50)) + chalk9.gray('\n\u7EE7\u7EED\u8F93\u5165\uFF0C\u6216\u8F93\u5165 "done" \u5B8C\u6210\u53CD\u9988')
+    };
   }
   if (activeSession.phase === "develop") {
     if (trimmed === "continue" || trimmed === "\u7EE7\u7EED" || trimmed === "done" || trimmed === "\u5B8C\u6210") {
@@ -574,107 +631,115 @@ function getCategoryLabel(category) {
 async function executeDevelopment(ctx, session) {
   const workingDir = ctx.options.workingDirectory;
   const files = [];
-  const loader = new LoadingIndicator("AI \u6B63\u5728\u751F\u6210\u4EE3\u7801");
-  loader.start();
-  try {
-    const systemPrompt = buildDevelopmentPrompt(session);
-    const messages = [
-      {
-        role: "system",
-        content: `\u4F60\u662F\u4E00\u4E2A\u4E13\u4E1A\u7684\u524D\u7AEF\u5F00\u53D1\u5DE5\u7A0B\u5E08\u3002\u8BF7\u6839\u636E\u9700\u6C42\u89C4\u683C\u751F\u6210\u4EE3\u7801\u5B9E\u73B0\u3002
+  console.log("");
+  for (let i = 0; i < session.specItems.length; i++) {
+    const item = session.specItems[i];
+    const prefix = `[${i + 1}/${session.specItems.length}]`;
+    if (item.title.includes("\u6D4B\u8BD5") || item.title.includes("test")) {
+      continue;
+    }
+    const loader = new LoadingIndicator2(`${prefix} \u751F\u6210: ${item.title.slice(0, 20)}...`);
+    loader.start();
+    try {
+      const taskPrompt = buildTaskPrompt(session, item, i);
+      const messages = [
+        {
+          role: "system",
+          content: `\u4F60\u662F\u4E00\u4E2A\u4E13\u4E1A\u7684\u524D\u7AEF\u5F00\u53D1\u5DE5\u7A0B\u5E08\u3002\u8BF7\u6839\u636E\u4EFB\u52A1\u63CF\u8FF0\u751F\u6210\u4EE3\u7801\u5B9E\u73B0\u3002
 
 \u26A0\uFE0F \u91CD\u8981\u89C4\u5219\uFF1A
-1. \u6280\u672F\u5B9E\u73B0\u5FC5\u987B\u4E25\u683C\u9075\u5FAA\u9879\u76EE\u73B0\u6709\u7684\u5F00\u53D1\u89C4\u8303
-2. \u53C2\u8003\u8D44\u6E90\uFF08\u5982\u679C\u6709\uFF09\u4EC5\u7528\u4E8E\u7406\u89E3\u4E1A\u52A1\u529F\u80FD\uFF0C\u4E0D\u8981\u590D\u5236\u5176\u6280\u672F\u5B9E\u73B0
-3. \u4F7F\u7528\u9879\u76EE\u6307\u5B9A\u7684\u6280\u672F\u6808\u548C\u6846\u67B6
-
-\u4EE3\u7801\u8981\u6C42\uFF1A
-1. \u751F\u6210\u5B8C\u6574\u3001\u53EF\u8FD0\u884C\u7684\u4EE3\u7801
-2. \u9075\u5FAA\u9879\u76EE\u73B0\u6709\u7684\u4EE3\u7801\u98CE\u683C\u548C\u89C4\u8303
-3. \u4F7F\u7528\u9879\u76EE\u6307\u5B9A\u7684\u6280\u672F\u6808
-4. \u4EE3\u7801\u8981\u6709\u9002\u5F53\u7684\u6CE8\u91CA
-5. \u8FD4\u56DE\u683C\u5F0F\uFF1A\u6BCF\u4E2A\u6587\u4EF6\u7528 \`\`\`filename \u4EE3\u7801 \`\`\` \u5305\u88F9
+1. \u53EA\u751F\u6210\u5F53\u524D\u4EFB\u52A1\u76F8\u5173\u7684\u4EE3\u7801\uFF0C\u4E0D\u8981\u751F\u6210\u5176\u4ED6\u4EFB\u52A1\u7684\u4EE3\u7801
+2. \u6280\u672F\u5B9E\u73B0\u5FC5\u987B\u4E25\u683C\u9075\u5FAA\u9879\u76EE\u73B0\u6709\u7684\u5F00\u53D1\u89C4\u8303
+3. \u751F\u6210\u5B8C\u6574\u3001\u53EF\u8FD0\u884C\u7684\u4EE3\u7801
+4. \u8FD4\u56DE\u683C\u5F0F\uFF1A\u6BCF\u4E2A\u6587\u4EF6\u7528 \`\`\`filename \u4EE3\u7801 \`\`\` \u5305\u88F9
 
 \u9879\u76EE\u4FE1\u606F\uFF1A
 - \u540D\u79F0: ${session.context?.name}
 - \u6846\u67B6: ${session.context?.framework || "\u672A\u6307\u5B9A"}
 - \u6280\u672F\u6808: ${session.context?.techStack.join(", ") || "\u672A\u6307\u5B9A"}
 
-${session.context?.devStandards ? `\u3010\u5FC5\u987B\u9075\u5FAA\u7684\u5F00\u53D1\u89C4\u8303\u3011
-${session.context.devStandards.slice(0, 2500)}` : ""}`
-      },
-      {
-        role: "user",
-        content: systemPrompt
+${session.context?.devStandards ? `\u3010\u5F00\u53D1\u89C4\u8303\u3011
+${session.context.devStandards.slice(0, 2e3)}` : ""}`
+        },
+        {
+          role: "user",
+          content: taskPrompt
+        }
+      ];
+      const response = await ctx.modelService.sendMessage(messages, {
+        temperature: 0.3,
+        maxTokens: 4e3,
+        // 单个任务减少 token
+        agent: "frontend-dev",
+        timeout: 3e5
+        // 5分钟超时，确保复杂代码有足够时间
+      });
+      const codeBlocks = parseCodeBlocks(response.content);
+      if (codeBlocks.length > 0) {
+        for (const block of codeBlocks) {
+          const filePath = path5.join(workingDir, block.filename);
+          const dir = path5.dirname(filePath);
+          await fs4.mkdir(dir, { recursive: true });
+          await fs4.writeFile(filePath, block.code, "utf-8");
+          files.push(block.filename);
+        }
+        loader.stop(chalk9.green(`${prefix} \u2713 ${item.title.slice(0, 25)} (${codeBlocks.length} \u4E2A\u6587\u4EF6)`));
+      } else {
+        const implDir = path5.join(workingDir, "src");
+        await fs4.mkdir(implDir, { recursive: true });
+        const fileName = `${item.title.replace(/[^a-zA-Z0-9\u4e00-\u9fa5]/g, "_")}.ts`;
+        const filePath = path5.join(implDir, fileName);
+        await fs4.writeFile(filePath, `// TODO: ${item.title}
+// ${item.description}
+`, "utf-8");
+        files.push(`src/${fileName}`);
+        loader.stop(chalk9.yellow(`${prefix} \u26A0 \u751F\u6210\u57FA\u7840\u6A21\u677F: ${item.title.slice(0, 20)}`));
+      }
+      if (i < session.specItems.length - 1) {
+        await new Promise((resolve4) => setTimeout(resolve4, 500));
       }
-    ];
-    loader.update("\u6B63\u5728\u8C03\u7528 AI \u6A21\u578B");
-    const response = await ctx.modelService.sendMessage(messages, {
-      temperature: 0.3,
-      maxTokens: 8e3,
-      agent: "frontend-dev",
-      timeout: 18e4
-      // 3 分钟超时
-    });
-    loader.update("\u6B63\u5728\u89E3\u6790\u4EE3\u7801");
-    const codeBlocks = parseCodeBlocks(response.content);
-    for (const block of codeBlocks) {
-      const filePath = path5.join(workingDir, block.filename);
-      const dir = path5.dirname(filePath);
-      await fs4.mkdir(dir, { recursive: true });
-      await fs4.writeFile(filePath, block.code, "utf-8");
-      files.push(block.filename);
-    }
-    if (files.length === 0) {
-      const implDir = path5.join(workingDir, "src", "features");
-      await fs4.mkdir(implDir, { recursive: true });
-      const featureName = session.specItems[0]?.title || "feature";
-      const fileName = `${featureName.replace(/[^a-zA-Z0-9]/g, "_")}.ts`;
-      const filePath = path5.join(implDir, fileName);
-      const stubCode = `/**
- * ${session.requirement}
- * 
- * TODO: \u6B64\u6587\u4EF6\u7531 AI \u81EA\u52A8\u751F\u6210\uFF0C\u8BF7\u6839\u636E\u9700\u6C42\u5B8C\u5584\u5B9E\u73B0
- */
-
-export function ${featureName.replace(/[^a-zA-Z0-9]/g, "")}() {
-  // TODO: \u5B9E\u73B0\u529F\u80FD
-  console.log('${featureName} - \u5F85\u5B9E\u73B0');
-}
-`;
-      await fs4.writeFile(filePath, stubCode, "utf-8");
-      files.push(`src/features/${fileName}`);
+    } catch (error) {
+      loader.stop(chalk9.red(`${prefix} \u2717 \u5931\u8D25: ${error.message.slice(0, 40)}`));
     }
-    loader.stop(chalk9.green(`  \u2713 \u5DF2\u751F\u6210 ${files.length} \u4E2A\u6587\u4EF6`));
+  }
+  if (files.length > 0) {
     return { success: true, files };
-  } catch (error) {
-    loader.stop();
+  } else {
     return {
       success: false,
       files: [],
-      error: error.message
+      error: "\u6240\u6709\u4EFB\u52A1\u4EE3\u7801\u751F\u6210\u5931\u8D25"
     };
   }
 }
-function buildDevelopmentPrompt(session) {
+function buildTaskPrompt(session, item, index) {
   const lines = [];
-  lines.push("## \u9700\u6C42\u63CF\u8FF0");
-  lines.push(session.refinedRequirement);
-  lines.push("");
-  lines.push("## BDD \u573A\u666F");
-  for (const scenario of session.bddScenarios) {
-    lines.push(`### ${scenario.feature}`);
-    for (const s of scenario.scenarios) {
-      lines.push(`- ${s.name}`);
+  lines.push(`## \u5F53\u524D\u4EFB\u52A1 (#${index + 1})`);
+  lines.push(`**\u6807\u9898**: ${item.title}`);
+  lines.push(`**\u63CF\u8FF0**: ${item.description}`);
+  lines.push(`**\u4F18\u5148\u7EA7**: ${item.priority}`);
+  if (item.tests && item.tests.length > 0) {
+    lines.push(`**\u9A8C\u6536\u6807\u51C6**:`);
+    for (const t of item.tests) {
+      lines.push(`- ${t}`);
     }
   }
   lines.push("");
-  lines.push("## \u4EFB\u52A1\u5217\u8868");
-  for (const item of session.specItems) {
-    lines.push(`- [${item.id}] ${item.title}: ${item.description}`);
+  lines.push(`## \u6574\u4F53\u9700\u6C42\u80CC\u666F`);
+  lines.push(session.requirement);
+  const relatedScenario = session.bddScenarios.find(
+    (s) => item.title.includes(s.feature) || s.feature.includes(item.title)
+  );
+  if (relatedScenario) {
+    lines.push("");
+    lines.push(`## \u76F8\u5173 BDD \u573A\u666F`);
+    lines.push(`Feature: ${relatedScenario.feature}`);
+    for (const s of relatedScenario.scenarios.slice(0, 2)) {
+      lines.push(`- ${s.name}`);
+    }
   }
   lines.push("");
-  lines.push("\u8BF7\u6839\u636E\u4EE5\u4E0A\u9700\u6C42\u89C4\u683C\u751F\u6210\u4EE3\u7801\u5B9E\u73B0\u3002");
+  lines.push("\u8BF7\u751F\u6210\u5B9E\u73B0\u6B64\u4EFB\u52A1\u7684\u4EE3\u7801\u3002\u53EA\u751F\u6210\u5F53\u524D\u4EFB\u52A1\u9700\u8981\u7684\u6587\u4EF6\u3002");
   return lines.join("\n");
 }
 function parseCodeBlocks(content) {
@@ -695,6 +760,8 @@ async function executeReview(ctx, session) {
   const workingDir = ctx.options.workingDirectory;
   const issues = [];
   const suggestions = [];
+  const loader = new LoadingIndicator2("AI \u6B63\u5728\u5BA1\u6838\u4EE3\u7801");
+  loader.start();
   try {
     const codeContents = [];
     for (const file of session.implFiles) {
@@ -757,7 +824,9 @@ ${testContents.join("\n\n") || "\uFF08\u65E0\u6D4B\u8BD5\u6587\u4EF6\uFF09"}
     const response = await ctx.modelService.sendMessage(messages, {
       temperature: 0.2,
       maxTokens: 2e3,
-      agent: "code-reviewer"
+      agent: "code-reviewer",
+      timeout: 18e4
+      // 3分钟超时
     });
     const result = response.content;
     const passed = result.includes("\u5BA1\u6838\u901A\u8FC7") || result.includes("\u901A\u8FC7") || !result.includes("\u4E0D\u901A\u8FC7");
@@ -779,8 +848,10 @@ ${testContents.join("\n\n") || "\uFF08\u65E0\u6D4B\u8BD5\u6587\u4EF6\uFF09"}
       const lines = result.split("\n").filter((l) => l.includes("\u5EFA\u8BAE") || l.includes("\u6539\u8FDB") || l.includes("\u4F18\u5316"));
       suggestions.push(...lines.map((l) => l.replace(/^[-*]\s*/, "").trim()).filter((l) => l));
     }
+    loader.stop(passed ? chalk9.green("  \u2713 \u5BA1\u6838\u901A\u8FC7") : chalk9.yellow("  \u26A0 \u53D1\u73B0\u95EE\u9898"));
     return { passed, issues, suggestions };
   } catch (error) {
+    loader.stop(chalk9.red("  \u2717 \u5BA1\u6838\u51FA\u9519"));
     suggestions.push(`\u5BA1\u6838\u8FC7\u7A0B\u51FA\u9519: ${error.message}`);
     return { passed: true, issues, suggestions };
   }
@@ -986,7 +1057,8 @@ ${r.analysis}`).join("\n\n") : "\u65E0"}
   ], {
     temperature: 0.3,
     maxTokens: 4e3,
-    timeout: 12e4
+    timeout: 3e5
+    // 5分钟超时
   });
   try {
     const jsonMatch = response.content.match(/```json\s*([\s\S]*?)```/);
@@ -1194,7 +1266,7 @@ ${questions.filter((q) => q.answered).map((q) => `- ${q.question}: ${q.answer}`)
 - \u96C6\u6210\u6D4B\u8BD5
 
 \u8BF7\u76F4\u63A5\u8F93\u51FA JSON \u6570\u7EC4\u3002`;
-  const loader = new LoadingIndicator("AI \u6B63\u5728\u62C6\u5206\u89C4\u683C");
+  const loader = new LoadingIndicator2("AI \u6B63\u5728\u62C6\u5206\u89C4\u683C");
   loader.start();
   try {
     const response = await ctx.modelService.sendMessage([
@@ -1202,25 +1274,131 @@ ${questions.filter((q) => q.answered).map((q) => `- ${q.question}: ${q.answer}`)
     ], {
       temperature: 0.3,
       maxTokens: 4e3,
-      timeout: 12e4
+      timeout: 3e5
+      // 5分钟超时
     });
     const jsonMatch = response.content.match(/```json\s*([\s\S]*?)```/);
     if (jsonMatch) {
-      const parsed = JSON.parse(jsonMatch[1].trim());
-      loader.stop(chalk9.green(`  \u2713 \u5DF2\u62C6\u5206 ${parsed.length} \u4E2A\u4EFB\u52A1`));
-      return parsed.map((item) => ({
-        id: item.id || `T${String(parsed.indexOf(item) + 1).padStart(3, "0")}`,
-        title: item.title,
-        description: item.description,
-        priority: item.priority || "medium",
-        files: [],
-        tests: item.acceptanceCriteria || []
-      }));
+      try {
+        const parsed = JSON.parse(jsonMatch[1].trim());
+        loader.stop(chalk9.green(`  \u2713 \u5DF2\u62C6\u5206 ${parsed.length} \u4E2A\u4EFB\u52A1`));
+        return parsed.map((item, index) => ({
+          id: item.id || `T${String(index + 1).padStart(3, "0")}`,
+          title: item.title,
+          description: item.description,
+          priority: item.priority || "medium",
+          files: [],
+          tests: item.acceptanceCriteria || []
+        }));
+      } catch (parseError) {
+        loader.stop(chalk9.yellow(`  \u26A0 JSON \u89E3\u6790\u5931\u8D25: ${parseError.message.slice(0, 50)}`));
+        return generateSpecItems(requirement, context, bddScenarios, questions, references);
+      }
     }
-    loader.stop(chalk9.yellow("  \u26A0 \u89E3\u6790\u5931\u8D25\uFF0C\u4F7F\u7528\u57FA\u7840\u62C6\u5206"));
+    try {
+      const parsed = JSON.parse(response.content);
+      if (Array.isArray(parsed)) {
+        loader.stop(chalk9.green(`  \u2713 \u5DF2\u62C6\u5206 ${parsed.length} \u4E2A\u4EFB\u52A1`));
+        return parsed.map((item, index) => ({
+          id: item.id || `T${String(index + 1).padStart(3, "0")}`,
+          title: item.title,
+          description: item.description,
+          priority: item.priority || "medium",
+          files: [],
+          tests: item.acceptanceCriteria || []
+        }));
+      }
+    } catch {
+    }
+    loader.stop(chalk9.yellow("  \u26A0 \u672A\u80FD\u89E3\u6790 AI \u54CD\u5E94\uFF0C\u4F7F\u7528\u57FA\u7840\u62C6\u5206"));
     return generateSpecItems(requirement, context, bddScenarios, questions, references);
   } catch (error) {
-    loader.stop(chalk9.yellow("  \u26A0 AI \u62C6\u5206\u5931\u8D25\uFF0C\u4F7F\u7528\u57FA\u7840\u62C6\u5206"));
+    const errMsg = error.message.slice(0, 80);
+    loader.stop(chalk9.yellow(`  \u26A0 AI \u8C03\u7528\u5931\u8D25: ${errMsg}`));
+    return generateSpecItems(requirement, context, bddScenarios, questions, references);
+  }
+}
+async function generateSpecItemsWithFeedback(requirement, context, bddScenarios, questions, references, feedbacks, ctx) {
+  const prompt2 = `\u4F60\u662F\u4E00\u4E2A\u4E13\u4E1A\u7684\u9879\u76EE\u7ECF\u7406\u548C\u6280\u672F\u67B6\u6784\u5E08\u3002\u8BF7\u6839\u636E\u7528\u6237\u53CD\u9988\uFF0C\u91CD\u65B0\u62C6\u5206\u9700\u6C42\u4EFB\u52A1\u3002
+
+## \u9700\u6C42\u63CF\u8FF0
+${requirement}
+
+## \u9879\u76EE\u4E0A\u4E0B\u6587
+- \u6280\u672F\u6808: ${context.techStack?.join(", ") || "TypeScript"}
+- \u6846\u67B6: ${context.framework || "\u672A\u6307\u5B9A"}
+${context.devStandards ? `
+## \u5F00\u53D1\u89C4\u8303\uFF08\u5FC5\u987B\u9075\u5FAA\uFF09
+${context.devStandards.slice(0, 2e3)}
+` : ""}
+
+## \u4E4B\u524D\u7684 BDD \u573A\u666F
+${bddScenarios.map((s) => `- Feature: ${s.feature}`).join("\n")}
+
+## \u7528\u6237\u53CD\u9988\uFF08\u5FC5\u987B\u89E3\u51B3\u8FD9\u4E9B\u95EE\u9898\uFF09
+${feedbacks.map((f, i) => `${i + 1}. ${f}`).join("\n")}
+
+## \u8981\u6C42
+1. **\u5FC5\u987B\u89E3\u51B3\u7528\u6237\u53CD\u9988\u4E2D\u7684\u6240\u6709\u95EE\u9898**
+2. \u5982\u679C\u7528\u6237\u6307\u51FA\u9057\u6F0F\u7684\u529F\u80FD\u70B9\uFF0C\u8BF7\u8865\u5145\u76F8\u5173\u4EFB\u52A1
+3. \u5982\u679C\u7528\u6237\u6307\u51FA\u62C6\u5206\u4E0D\u5408\u7406\uFF0C\u8BF7\u91CD\u65B0\u8C03\u6574\u7C92\u5EA6
+4. \u5982\u679C\u7528\u6237\u9700\u8981\u66F4\u591A\u7EC6\u8282\uFF0C\u8BF7\u62C6\u5206\u5F97\u66F4\u7EC6\u81F4
+5. \u6BCF\u4E2A\u4EFB\u52A1\u5E94\u8BE5\u5355\u4E00\u804C\u8D23\u30012-4\u5C0F\u65F6\u53EF\u5B8C\u6210
+
+## \u8F93\u51FA\u683C\u5F0F (JSON)
+\`\`\`json
+[
+  {
+    "id": "T001",
+    "title": "\u4EFB\u52A1\u6807\u9898\uFF08\u7B80\u77ED\u660E\u786E\uFF09",
+    "description": "\u8BE6\u7EC6\u63CF\u8FF0",
+    "priority": "high",
+    "acceptanceCriteria": ["\u9A8C\u6536\u6807\u51C61", "\u9A8C\u6536\u6807\u51C62"]
+  }
+]
+\`\`\`
+
+\u8BF7\u76F4\u63A5\u8F93\u51FA JSON \u6570\u7EC4\uFF0C\u786E\u4FDD\u89E3\u51B3\u4E86\u7528\u6237\u7684\u6240\u6709\u53CD\u9988\u3002`;
+  try {
+    const response = await ctx.modelService.sendMessage([
+      { role: "user", content: prompt2 }
+    ], {
+      temperature: 0.3,
+      maxTokens: 4e3,
+      timeout: 3e5
+      // 5分钟超时
+    });
+    const jsonMatch = response.content.match(/```json\s*([\s\S]*?)```/);
+    if (jsonMatch) {
+      try {
+        const parsed = JSON.parse(jsonMatch[1].trim());
+        return parsed.map((item, index) => ({
+          id: item.id || `T${String(index + 1).padStart(3, "0")}`,
+          title: item.title,
+          description: item.description,
+          priority: item.priority || "medium",
+          files: [],
+          tests: item.acceptanceCriteria || []
+        }));
+      } catch {
+      }
+    }
+    try {
+      const parsed = JSON.parse(response.content);
+      if (Array.isArray(parsed)) {
+        return parsed.map((item, index) => ({
+          id: item.id || `T${String(index + 1).padStart(3, "0")}`,
+          title: item.title,
+          description: item.description,
+          priority: item.priority || "medium",
+          files: [],
+          tests: item.acceptanceCriteria || []
+        }));
+      }
+    } catch {
+    }
+    return generateSpecItems(requirement, context, bddScenarios, questions, references);
+  } catch {
     return generateSpecItems(requirement, context, bddScenarios, questions, references);
   }
 }
@@ -1290,6 +1468,16 @@ function formatSpecFile(session) {
       lines.push("");
     }
   }
+  if (session.specFeedbacks && session.specFeedbacks.length > 0) {
+    lines.push("## \u89C4\u683C\u8FED\u4EE3\u53CD\u9988");
+    lines.push("");
+    for (let i = 0; i < session.specFeedbacks.length; i++) {
+      lines.push(`${i + 1}. ${session.specFeedbacks[i]}`);
+    }
+    lines.push("");
+    lines.push("---");
+    lines.push("");
+  }
   lines.push("## \u4EFB\u52A1\u5217\u8868");
   lines.push("");
   for (const item of session.specItems) {
@@ -1310,7 +1498,7 @@ async function generateTests(workingDir, session, ctx) {
     for (const scenario of session.bddScenarios) {
       const testName = scenario.feature.replace(/[^a-zA-Z0-9\u4e00-\u9fa5]/g, "_");
       const testPath = path5.join(testDir, `${testName}.test.ts`);
-      const loader = new LoadingIndicator(`\u751F\u6210\u6D4B\u8BD5: ${scenario.feature.slice(0, 20)}...`);
+      const loader = new LoadingIndicator2(`\u751F\u6210\u6D4B\u8BD5: ${scenario.feature.slice(0, 20)}...`);
       loader.start();
       try {
         const content = await generateTestFileWithAI(scenario, session, ctx);
@@ -1365,7 +1553,9 @@ ${scenario.scenarios.map((s) => `
     { role: "user", content: prompt2 }
   ], {
     temperature: 0.3,
-    maxTokens: 4e3
+    maxTokens: 4e3,
+    timeout: 18e4
+    // 3分钟超时
   });
   const codeMatch = response.content.match(/```(?:typescript|ts|javascript|js)?\n([\s\S]*?)```/);
   if (codeMatch) {
@@ -1464,7 +1654,10 @@ async function fetchAndAnalyzeReference(url, ctx, projectContext) {
   const type = detectResourceType(url);
   let content = "";
   let analysis = "";
+  const loader = new LoadingIndicator2(`\u83B7\u53D6 ${url.slice(0, 40)}...`);
+  loader.start();
   try {
+    loader.update("\u6B63\u5728\u83B7\u53D6\u7F51\u9875\u5185\u5BB9");
     const response = await fetch(url, {
       headers: {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
@@ -1475,11 +1668,14 @@ async function fetchAndAnalyzeReference(url, ctx, projectContext) {
     }
     content = await response.text();
     if (ctx.modelService.getCurrentModel()) {
+      loader.update("\u6B63\u5728\u5206\u6790\u5185\u5BB9");
       analysis = await analyzeReferenceContent(url, content, type, ctx, projectContext);
     } else {
       analysis = extractBasicInfo(content, type);
     }
+    loader.stop();
   } catch (error) {
+    loader.stop();
     throw new Error(`\u65E0\u6CD5\u83B7\u53D6\u53C2\u8003\u8D44\u6E90: ${error.message}`);
   }
   return { url, type, content: content.slice(0, 1e4), analysis };
@@ -1548,14 +1744,16 @@ ${content.slice(0, 8e3)}
 \u6CE8\u610F\uFF1A\u8BF7\u4EE5 Markdown \u683C\u5F0F\u8F93\u51FA\uFF0C\u91CD\u70B9\u7A81\u51FA**\u4E1A\u52A1\u903B\u8F91**\u548C**\u529F\u80FD\u7279\u6027**\u3002
 \u6280\u672F\u5B9E\u73B0\u65B9\u6848\u7531\u9879\u76EE\u89C4\u8303\u51B3\u5B9A\uFF0C\u6B64\u5904\u4E0D\u6D89\u53CA\u3002
 `;
-  const loader = new LoadingIndicator("AI \u6B63\u5728\u5206\u6790\u53C2\u8003\u8D44\u6E90");
+  const loader = new LoadingIndicator2("AI \u6B63\u5728\u5206\u6790\u53C2\u8003\u8D44\u6E90");
   loader.start();
   try {
     const response = await ctx.modelService.sendMessage([
       { role: "user", content: prompt2 }
     ], {
       temperature: 0.3,
-      maxTokens: 4e3
+      maxTokens: 4e3,
+      timeout: 18e4
+      // 3分钟超时
     });
     loader.stop(chalk9.green("  \u2713 \u5206\u6790\u5B8C\u6210"));
     return response.content;
@@ -1602,11 +1800,11 @@ function getActiveSession() {
 function clearActiveSession() {
   activeSession = null;
 }
-var LoadingIndicator, MAX_FILE_SIZE2, COMPLEXITY_THRESHOLD, CLARITY_THRESHOLD, activeSession, new_default;
+var LoadingIndicator2, MAX_FILE_SIZE2, COMPLEXITY_THRESHOLD, CLARITY_THRESHOLD, activeSession, new_default;
 var init_new = __esm({
   "src/commands/new.ts"() {
     init_esm_shims();
-    LoadingIndicator = class {
+    LoadingIndicator2 = class {
       frames = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
       frameIndex = 0;
       interval = null;
@@ -1971,9 +2169,10 @@ var BaseAdapter = class {
   }
   /**
    * 获取超时时间
+   * 默认 5 分钟，对于复杂的代码生成任务足够
    */
   getTimeout() {
-    return this.config?.timeout || 6e4;
+    return this.config?.timeout || 3e5;
   }
   /**
    * 获取重试次数
@@ -8163,6 +8362,36 @@ ${chalk9.yellow("\u793A\u4F8B:")}
 
 // src/commands/model.ts
 init_esm_shims();
+var LoadingIndicator = class {
+  frames = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+  frameIndex = 0;
+  interval = null;
+  message;
+  constructor(message) {
+    this.message = message;
+  }
+  start() {
+    process.stdout.write("\x1B[?25l");
+    this.interval = setInterval(() => {
+      const frame = this.frames[this.frameIndex];
+      process.stdout.write(`\r${chalk9.cyan(frame)} ${this.message}...`);
+      this.frameIndex = (this.frameIndex + 1) % this.frames.length;
+    }, 80);
+  }
+  stop(finalMessage) {
+    if (this.interval) {
+      clearInterval(this.interval);
+      this.interval = null;
+    }
+    process.stdout.write("\x1B[?25h");
+    if (finalMessage) {
+      process.stdout.write(`\r${finalMessage}
+`);
+    } else {
+      process.stdout.write("\r" + " ".repeat(60) + "\r");
+    }
+  }
+};
 async function handleModel(args, ctx) {
   const subCommand = args[0];
   const configManager = ctx.configManager;
@@ -8262,9 +8491,12 @@ async function verifyCurrentModel(configManager, modelService) {
       output: chalk9.red(`\u2717 \u672A\u77E5\u6A21\u578B: ${currentModel}`)
     };
   }
+  const loader = new LoadingIndicator(`\u9A8C\u8BC1 ${modelInfo.name} API Key`);
+  loader.start();
   try {
     const adapter = createAdapter(modelInfo.provider);
     const isValid = await adapter.validateApiKey(apiKey);
+    loader.stop();
     if (isValid) {
       return {
         output: chalk9.green(`\u2713 API Key \u9A8C\u8BC1\u6210\u529F
@@ -8276,6 +8508,7 @@ async function verifyCurrentModel(configManager, modelService) {
       };
     }
   } catch (error) {
+    loader.stop();
     return {
       output: chalk9.red(`\u2717 \u9A8C\u8BC1\u5931\u8D25: ${error.message}`)
     };
@@ -9487,6 +9720,36 @@ async function executeShell(command, ctx) {
 // src/commands/natural.ts
 init_esm_shims();
 init_new();
+var LoadingIndicator3 = class {
+  frames = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+  frameIndex = 0;
+  interval = null;
+  message;
+  constructor(message) {
+    this.message = message;
+  }
+  start() {
+    process.stdout.write("\x1B[?25l");
+    this.interval = setInterval(() => {
+      const frame = this.frames[this.frameIndex];
+      process.stdout.write(`\r${chalk9.cyan(frame)} ${this.message}...`);
+      this.frameIndex = (this.frameIndex + 1) % this.frames.length;
+    }, 80);
+  }
+  stop(finalMessage) {
+    if (this.interval) {
+      clearInterval(this.interval);
+      this.interval = null;
+    }
+    process.stdout.write("\x1B[?25h");
+    if (finalMessage) {
+      process.stdout.write(`\r${finalMessage}
+`);
+    } else {
+      process.stdout.write("\r" + " ".repeat(60) + "\r");
+    }
+  }
+};
 async function handleNaturalLanguage(input, ctx) {
   const trimmedInput = input.trim();
   const session = getActiveSession();
@@ -9506,6 +9769,8 @@ async function handleNaturalLanguage(input, ctx) {
       contextUsed: 0
     };
   }
+  const loader = new LoadingIndicator3("AI \u601D\u8003\u4E2D");
+  loader.start();
   try {
     const response = await ctx.modelService.sendMessage(
       [
@@ -9523,6 +9788,7 @@ async function handleNaturalLanguage(input, ctx) {
         maxTokens: 2e3
       }
     );
+    loader.stop();
     ctx.contextManager.addMessage({
       role: "user",
       content: trimmedInput
@@ -9536,6 +9802,7 @@ async function handleNaturalLanguage(input, ctx) {
       contextUsed: response.usage?.totalTokens || 0
     };
   } catch (error) {
+    loader.stop();
     const errorMessage = error.message;
     if (errorMessage.includes("\u672A\u914D\u7F6E") || errorMessage.includes("\u672A\u521D\u59CB\u5316")) {
       return {