snow-ai 0.5.3 → 0.5.5

package/bundle/cli.mjs

@@ -47397,6 +47397,23 @@ var init_en = __esm({
         timeout: "Timeout:",
         customTimeout: "(custom)"
       },
+      fileRollback: {
+        title: "File Rollback Confirmation",
+        description: "This checkpoint has",
+        question: "Do you want to rollback the files as well?",
+        yesRollbackFiles: "Yes, rollback files and conversation",
+        noConversationOnly: "No, rollback conversation only",
+        moreAbove: "more above...",
+        moreBelow: "more below...",
+        andMoreFiles: "and",
+        viewAllHint: "Tab view all",
+        selectHint: "\u2191\u2193 select",
+        confirmHint: "Enter confirm",
+        cancelHint: "ESC cancel",
+        scrollHint: "\u2191\u2193 scroll",
+        backHint: "Tab back",
+        closeHint: "ESC close"
+      },
       usagePanel: {
         title: "Token Usage Statistics",
         granularity: {
@@ -48243,6 +48260,23 @@ var init_zh = __esm({
         timeout: "\u8D85\u65F6\u65F6\u95F4:",
         customTimeout: "(\u81EA\u5B9A\u4E49)"
       },
+      fileRollback: {
+        title: "\u6587\u4EF6\u56DE\u6EDA\u786E\u8BA4",
+        description: "\u6B64\u68C0\u67E5\u70B9\u5305\u542B",
+        question: "\u662F\u5426\u540C\u65F6\u56DE\u6EDA\u6587\u4EF6\uFF1F",
+        yesRollbackFiles: "\u662F\uFF0C\u56DE\u6EDA\u6587\u4EF6\u548C\u5BF9\u8BDD",
+        noConversationOnly: "\u5426\uFF0C\u4EC5\u56DE\u6EDA\u5BF9\u8BDD",
+        moreAbove: "\u66F4\u591A...",
+        moreBelow: "\u66F4\u591A...",
+        andMoreFiles: "\u4EE5\u53CA",
+        viewAllHint: "Tab \u67E5\u770B\u5168\u90E8",
+        selectHint: "\u2191\u2193 \u9009\u62E9",
+        confirmHint: "Enter \u786E\u8BA4",
+        cancelHint: "ESC \u53D6\u6D88",
+        scrollHint: "\u2191\u2193 \u6EDA\u52A8",
+        backHint: "Tab \u8FD4\u56DE",
+        closeHint: "ESC \u5173\u95ED"
+      },
       usagePanel: {
         title: "Token \u4F7F\u7528\u7EDF\u8BA1",
         granularity: {
@@ -49088,6 +49122,23 @@ var init_zh_TW = __esm({
         timeout: "\u903E\u6642\u6642\u9593:",
         customTimeout: "(\u81EA\u8A02)"
       },
+      fileRollback: {
+        title: "\u6A94\u6848\u56DE\u6EFE\u78BA\u8A8D",
+        description: "\u6B64\u6AA2\u67E5\u9EDE\u5305\u542B",
+        question: "\u662F\u5426\u540C\u6642\u56DE\u6EFE\u6A94\u6848\uFF1F",
+        yesRollbackFiles: "\u662F\uFF0C\u56DE\u6EFE\u6A94\u6848\u548C\u5C0D\u8A71",
+        noConversationOnly: "\u5426\uFF0C\u50C5\u56DE\u6EFE\u5C0D\u8A71",
+        moreAbove: "\u66F4\u591A...",
+        moreBelow: "\u66F4\u591A...",
+        andMoreFiles: "\u4EE5\u53CA",
+        viewAllHint: "Tab \u67E5\u770B\u5168\u90E8",
+        selectHint: "\u2191\u2193 \u9078\u64C7",
+        confirmHint: "Enter \u78BA\u8A8D",
+        cancelHint: "ESC \u53D6\u6D88",
+        scrollHint: "\u2191\u2193 \u6EFE\u52D5",
+        backHint: "Tab \u8FD4\u56DE",
+        closeHint: "ESC \u95DC\u9589"
+      },
       usagePanel: {
         title: "Token \u4F7F\u7528\u7D71\u8A08",
         granularity: {
@@ -49929,6 +49980,23 @@ var init_ja = __esm({
         timeout: "\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8:",
         customTimeout: "(\u30AB\u30B9\u30BF\u30E0)"
       },
+      fileRollback: {
+        title: "\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30EB\u30D0\u30C3\u30AF\u78BA\u8A8D",
+        description: "\u3053\u306E\u30C1\u30A7\u30C3\u30AF\u30DD\u30A4\u30F3\u30C8\u306B\u306F",
+        question: "\u30D5\u30A1\u30A4\u30EB\u3082\u30ED\u30FC\u30EB\u30D0\u30C3\u30AF\u3057\u307E\u3059\u304B\uFF1F",
+        yesRollbackFiles: "\u306F\u3044\u3001\u30D5\u30A1\u30A4\u30EB\u3068\u4F1A\u8A71\u3092\u30ED\u30FC\u30EB\u30D0\u30C3\u30AF",
+        noConversationOnly: "\u3044\u3044\u3048\u3001\u4F1A\u8A71\u306E\u307F\u30ED\u30FC\u30EB\u30D0\u30C3\u30AF",
+        moreAbove: "\u4E0A\u306B\u3082\u3063\u3068...",
+        moreBelow: "\u4E0B\u306B\u3082\u3063\u3068...",
+        andMoreFiles: "\u304A\u3088\u3073",
+        viewAllHint: "Tab \u3059\u3079\u3066\u8868\u793A",
+        selectHint: "\u2191\u2193 \u9078\u629E",
+        confirmHint: "Enter \u78BA\u8A8D",
+        cancelHint: "ESC \u30AD\u30E3\u30F3\u30BB\u30EB",
+        scrollHint: "\u2191\u2193 \u30B9\u30AF\u30ED\u30FC\u30EB",
+        backHint: "Tab \u623B\u308B",
+        closeHint: "ESC \u9589\u3058\u308B"
+      },
       usagePanel: {
         title: "\u30C8\u30FC\u30AF\u30F3\u4F7F\u7528\u7D71\u8A08",
         granularity: {
@@ -50770,6 +50838,23 @@ var init_ko = __esm({
         timeout: "\uD0C0\uC784\uC544\uC6C3:",
         customTimeout: "(\uC0AC\uC6A9\uC790 \uC9C0\uC815)"
       },
+      fileRollback: {
+        title: "\uD30C\uC77C \uB864\uBC31 \uD655\uC778",
+        description: "\uC774 \uCCB4\uD06C\uD3EC\uC778\uD2B8\uC5D0\uB294",
+        question: "\uD30C\uC77C\uB3C4 \uB864\uBC31\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?",
+        yesRollbackFiles: "\uC608, \uD30C\uC77C\uACFC \uB300\uD654 \uB864\uBC31",
+        noConversationOnly: "\uC544\uB2C8\uC694, \uB300\uD654\uB9CC \uB864\uBC31",
+        moreAbove: "\uC704\uC5D0 \uB354 \uB9CE\uC774...",
+        moreBelow: "\uC544\uB798\uC5D0 \uB354 \uB9CE\uC774...",
+        andMoreFiles: "\uBC0F",
+        viewAllHint: "Tab \uC804\uCCB4 \uBCF4\uAE30",
+        selectHint: "\u2191\u2193 \uC120\uD0DD",
+        confirmHint: "Enter \uD655\uC778",
+        cancelHint: "ESC \uCDE8\uC18C",
+        scrollHint: "\u2191\u2193 \uC2A4\uD06C\uB864",
+        backHint: "Tab \uB3CC\uC544\uAC00\uAE30",
+        closeHint: "ESC \uB2EB\uAE30"
+      },
       usagePanel: {
         title: "\uD1A0\uD070 \uC0AC\uC6A9 \uD1B5\uACC4",
         granularity: {
@@ -51611,6 +51696,23 @@ var init_es = __esm({
         timeout: "Tiempo l\xEDmite:",
         customTimeout: "(personalizado)"
       },
+      fileRollback: {
+        title: "Confirmaci\xF3n de Reversi\xF3n de Archivos",
+        description: "Este punto de control tiene",
+        question: "\xBFDesea revertir los archivos tambi\xE9n?",
+        yesRollbackFiles: "S\xED, revertir archivos y conversaci\xF3n",
+        noConversationOnly: "No, revertir solo conversaci\xF3n",
+        moreAbove: "m\xE1s arriba...",
+        moreBelow: "m\xE1s abajo...",
+        andMoreFiles: "y",
+        viewAllHint: "Tab ver todos",
+        selectHint: "\u2191\u2193 seleccionar",
+        confirmHint: "Enter confirmar",
+        cancelHint: "ESC cancelar",
+        scrollHint: "\u2191\u2193 desplazar",
+        backHint: "Tab volver",
+        closeHint: "ESC cerrar"
+      },
       usagePanel: {
         title: "Estad\xEDsticas de Uso de Tokens",
         granularity: {
@@ -425873,9 +425975,9 @@ var init_codebaseSearch = __esm({
         return dotProduct / (Math.sqrt(normA) * Math.sqrt(normB));
       }
       /**
-       * Search codebase using semantic similarity with retry logic
-       */
-      async search(query, topN = 10) {
+      * Search codebase using semantic similarity with retry logic
+      */
+      async search(query, topN = 10, abortSignal) {
         const config3 = loadCodebaseConfig();
         const enableAgentReview = config3.enableAgentReview;
         const { available, reason } = await this.isCodebaseIndexAvailable();
@@ -425943,7 +426045,7 @@ var init_codebaseSearch = __esm({
                 role: msg.role,
                 content: msg.content
               })).slice(-10)) || [];
-              const reviewResult = await codebaseReviewAgent.reviewResults(query, formattedResults, conversationContext.length > 0 ? conversationContext : void 0);
+              const reviewResult = await codebaseReviewAgent.reviewResults(query, formattedResults, conversationContext.length > 0 ? conversationContext : void 0, abortSignal);
               finalResults = reviewResult.filteredResults;
               reviewFailed = reviewResult.reviewFailed || false;
               removedCount = reviewResult.removedCount;
@@ -433746,7 +433848,7 @@ AI Tip: Provide searchContent (string) and replaceContent (string).`);
       const { codebaseSearchService: codebaseSearchService2 } = await Promise.resolve().then(() => (init_codebaseSearch(), codebaseSearch_exports));
       switch (actualToolName) {
         case "search":
-          result2 = await codebaseSearchService2.search(args2.query, args2.topN);
+          result2 = await codebaseSearchService2.search(args2.query, args2.topN, abortSignal);
           break;
         default:
           throw new Error(`Unknown codebase tool: ${actualToolName}`);
@@ -433839,9 +433941,13 @@ ${combinedOutput}`);
 async function executeOnExternalMCPService(serviceName, server, toolName, args2) {
   const client = await getPersistentClient(serviceName, server);
   logger.debug(`Using persistent MCP client for ${serviceName} tool ${toolName}`);
+  const timeout2 = server.timeout ?? 3e5;
   const result2 = await client.callTool({
     name: toolName,
     arguments: args2
+  }, void 0, {
+    timeout: timeout2,
+    resetTimeoutOnProgress: true
   });
   logger.debug(`result from ${serviceName} tool ${toolName}:`, result2);
   return result2.content;
@@ -440559,7 +440665,7 @@ function useKeyboardInput(options3) {
       }
       return;
     }
-    const isProfileSwitchShortcut = process.platform === "win32" ? key.meta && input2 === "p" : key.ctrl && input2 === "p";
+    const isProfileSwitchShortcut = process.platform === "darwin" ? key.ctrl && input2 === "p" : key.meta && input2 === "p";
     if (isProfileSwitchShortcut) {
       if (onSwitchProfile) {
         onSwitchProfile();
@@ -446372,12 +446478,13 @@ var init_BashCommandConfirmation = __esm({
 
 // dist/ui/components/tools/FileRollbackConfirmation.js
 function FileRollbackConfirmation({ fileCount, filePaths, onConfirm }) {
+  const { t } = useI18n();
   const [selectedIndex, setSelectedIndex] = (0, import_react98.useState)(0);
   const [showFullList, setShowFullList] = (0, import_react98.useState)(false);
   const [fileScrollIndex, setFileScrollIndex] = (0, import_react98.useState)(0);
   const options3 = [
-    { label: "Yes, rollback files and conversation", value: true },
-    { label: "No, rollback conversation only", value: false }
+    { label: t.fileRollback.yesRollbackFiles, value: true },
+    { label: t.fileRollback.noConversationOnly, value: false }
   ];
   use_input_default((_3, key) => {
     var _a21;
@@ -446433,7 +446540,12 @@ function FileRollbackConfirmation({ fileCount, filePaths, onConfirm }) {
     import_react98.default.createElement(
       Box_default,
       { marginBottom: 1 },
-      import_react98.default.createElement(Text, { color: "yellow", bold: true }, "\u26A0  File Rollback Confirmation")
+      import_react98.default.createElement(
+        Text,
+        { color: "yellow", bold: true },
+        "\u26A0 ",
+        t.fileRollback.title
+      )
     ),
     import_react98.default.createElement(
       Box_default,
@@ -446441,7 +446553,8 @@ function FileRollbackConfirmation({ fileCount, filePaths, onConfirm }) {
       import_react98.default.createElement(
         Text,
         { color: "white" },
-        "This checkpoint has ",
+        t.fileRollback.description,
+        " ",
         fileCount,
         " file",
         fileCount > 1 ? "s" : "",
@@ -446456,7 +446569,8 @@ function FileRollbackConfirmation({ fileCount, filePaths, onConfirm }) {
         { color: "gray", dimColor: true },
         "\u2191 ",
         fileScrollIndex,
-        " more above..."
+        " ",
+        t.fileRollback.moreAbove
       ),
       displayFiles.map((file, index) => import_react98.default.createElement(
         Text,
@@ -446469,12 +446583,15 @@ function FileRollbackConfirmation({ fileCount, filePaths, onConfirm }) {
         { color: "gray", dimColor: true },
         "\u2193 ",
         filePaths.length - (fileScrollIndex + maxFilesToShowFull),
-        " more below..."
+        " ",
+        t.fileRollback.moreBelow
       ),
       !showFullList && remainingCountCompact > 0 && import_react98.default.createElement(
         Text,
         { color: "gray", dimColor: true },
-        "... and ",
+        "... ",
+        t.fileRollback.andMoreFiles,
+        " ",
         remainingCountCompact,
         " more file",
         remainingCountCompact > 1 ? "s" : ""
@@ -446486,7 +446603,7 @@ function FileRollbackConfirmation({ fileCount, filePaths, onConfirm }) {
       import_react98.default.createElement(
         Box_default,
         { marginBottom: 1 },
-        import_react98.default.createElement(Text, { color: "gray", dimColor: true }, "Do you want to rollback the files as well?")
+        import_react98.default.createElement(Text, { color: "gray", dimColor: true }, t.fileRollback.question)
       ),
       import_react98.default.createElement(Box_default, { flexDirection: "column", marginBottom: 1 }, options3.map((option, index) => import_react98.default.createElement(
         Box_default,
@@ -446502,7 +446619,7 @@ function FileRollbackConfirmation({ fileCount, filePaths, onConfirm }) {
     import_react98.default.createElement(
       Box_default,
       null,
-      import_react98.default.createElement(Text, { color: "gray", dimColor: true }, showFullList ? "\u2191\u2193 scroll \xB7 Tab back \xB7 ESC close" : fileCount > maxFilesToShowCompact ? `\u2191\u2193 select \xB7 Tab view all (${fileCount} files) \xB7 Enter confirm \xB7 ESC cancel` : "\u2191\u2193 select \xB7 Enter confirm \xB7 ESC cancel")
+      import_react98.default.createElement(Text, { color: "gray", dimColor: true }, showFullList ? `${t.fileRollback.scrollHint} \xB7 ${t.fileRollback.backHint} \xB7 ${t.fileRollback.closeHint}` : fileCount > maxFilesToShowCompact ? `${t.fileRollback.selectHint} \xB7 ${t.fileRollback.viewAllHint} (${fileCount} files) \xB7 ${t.fileRollback.confirmHint} \xB7 ${t.fileRollback.cancelHint}` : `${t.fileRollback.selectHint} \xB7 ${t.fileRollback.confirmHint} \xB7 ${t.fileRollback.cancelHint}`)
     )
   );
 }
@@ -446512,6 +446629,7 @@ var init_FileRollbackConfirmation = __esm({
     "use strict";
     import_react98 = __toESM(require_react(), 1);
     await init_build2();
+    init_I18nContext();
   }
 });
 
@@ -522124,7 +522242,7 @@ var init_StatusLine = __esm({
     init_i18n();
     init_ThemeContext();
     init_themeConfig();
-    getProfileShortcut = () => process.platform === "win32" ? "Alt+P" : "Ctrl+P";
+    getProfileShortcut = () => process.platform === "darwin" ? "Ctrl+P" : "Alt+P";
   }
 });
 
@@ -523811,40 +523929,80 @@ function findPreserveStartIndex(messages) {
   return messages.length;
 }
 function cleanOrphanedToolCalls(messages) {
-  const toolResultIds = /* @__PURE__ */ new Set();
-  for (const msg of messages) {
-    if (msg.role === "tool" && msg.tool_call_id) {
-      toolResultIds.add(msg.tool_call_id);
-    }
-  }
-  const declaredToolCallIds = /* @__PURE__ */ new Set();
-  for (const msg of messages) {
-    if (msg.role === "assistant" && msg.tool_calls) {
-      for (const tc of msg.tool_calls) {
-        declaredToolCallIds.add(tc.id);
-      }
-    }
-  }
   const indicesToRemove = [];
-  for (let i = messages.length - 1; i >= 0; i--) {
+  for (let i = 0; i < messages.length; i++) {
     const msg = messages[i];
     if (!msg)
       continue;
-    if (msg.role === "assistant" && msg.tool_calls) {
-      const hasAllResults = msg.tool_calls.every((tc) => toolResultIds.has(tc.id));
-      if (!hasAllResults) {
-        const orphanedIds = msg.tool_calls.filter((tc) => !toolResultIds.has(tc.id)).map((tc) => tc.id);
-        console.warn("[contextCompressor:cleanOrphanedToolCalls] Removing assistant message with orphaned tool_calls", {
+    if (msg.role === "assistant" && msg.tool_calls && msg.tool_calls.length > 0) {
+      const nextMsg = messages[i + 1];
+      if (!nextMsg || nextMsg.role !== "tool") {
+        console.warn("[contextCompressor:cleanOrphanedToolCalls] Removing assistant message - next message is not tool result", {
           messageIndex: i,
           toolCallIds: msg.tool_calls.map((tc) => tc.id),
-          orphanedIds
+          nextMessageRole: (nextMsg == null ? void 0 : nextMsg.role) || "none"
+        });
+        indicesToRemove.push(i);
+        continue;
+      }
+      const expectedToolCallIds = new Set(msg.tool_calls.map((tc) => tc.id));
+      const foundToolCallIds = /* @__PURE__ */ new Set();
+      for (let j = i + 1; j < messages.length; j++) {
+        const followingMsg = messages[j];
+        if (!followingMsg)
+          continue;
+        if (followingMsg.role === "tool") {
+          if (followingMsg.tool_call_id) {
+            foundToolCallIds.add(followingMsg.tool_call_id);
+          }
+        } else {
+          break;
+        }
+      }
+      const missingIds = Array.from(expectedToolCallIds).filter((id) => !foundToolCallIds.has(id));
+      if (missingIds.length > 0) {
+        console.warn("[contextCompressor:cleanOrphanedToolCalls] Removing assistant message - missing immediate tool results", {
+          messageIndex: i,
+          toolCallIds: msg.tool_calls.map((tc) => tc.id),
+          missingIds
         });
         indicesToRemove.push(i);
       }
     }
     if (msg.role === "tool" && msg.tool_call_id) {
-      if (!declaredToolCallIds.has(msg.tool_call_id)) {
-        console.warn("[contextCompressor:cleanOrphanedToolCalls] Removing orphaned tool result", {
+      let foundCorrespondingAssistant = false;
+      for (let j = i - 1; j >= 0; j--) {
+        const prevMsg = messages[j];
+        if (!prevMsg)
+          continue;
+        if (prevMsg.role === "assistant" && prevMsg.tool_calls) {
+          const hasToolCall = prevMsg.tool_calls.some((tc) => tc.id === msg.tool_call_id);
+          if (hasToolCall) {
+            foundCorrespondingAssistant = true;
+            let isImmediatelyAfter = true;
+            for (let k = j + 1; k < i; k++) {
+              const betweenMsg = messages[k];
+              if (betweenMsg && betweenMsg.role !== "tool") {
+                isImmediatelyAfter = false;
+                break;
+              }
+            }
+            if (!isImmediatelyAfter) {
+              console.warn("[contextCompressor:cleanOrphanedToolCalls] Removing tool result - not immediately after assistant", {
+                messageIndex: i,
+                toolCallId: msg.tool_call_id,
+                assistantIndex: j
+              });
+              indicesToRemove.push(i);
+            }
+            break;
+          }
+        } else if (prevMsg.role !== "tool") {
+          break;
+        }
+      }
+      if (!foundCorrespondingAssistant) {
+        console.warn("[contextCompressor:cleanOrphanedToolCalls] Removing orphaned tool result - no corresponding assistant", {
           messageIndex: i,
           toolCallId: msg.tool_call_id
         });
@@ -523852,6 +524010,7 @@ function cleanOrphanedToolCalls(messages) {
       }
     }
   }
+  indicesToRemove.sort((a, b) => b - a);
   for (const idx2 of indicesToRemove) {
     messages.splice(idx2, 1);
   }
@@ -525604,14 +525763,6 @@ async function handleConversationWithTools(options3) {
         );
         if (controller.signal.aborted) {
           if (receivedToolCalls && receivedToolCalls.length > 0) {
-            const assistantMsgWithTools = conversationMessages.find((msg) => msg.role === "assistant" && msg.tool_calls && msg.tool_calls.some((tc) => receivedToolCalls.some((rtc) => rtc.id === tc.id)));
-            if (assistantMsgWithTools) {
-              try {
-                await saveMessage(assistantMsgWithTools);
-              } catch (error) {
-                console.error("Failed to save assistant message before abort:", error);
-              }
-            }
             for (const toolCall of receivedToolCalls) {
               const abortedResult = {
                 role: "tool",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "snow-ai",
-	"version": "0.5.3",
+	"version": "0.5.5",
 	"description": "Intelligent Command Line Assistant powered by AI",
 	"license": "MIT",
 	"bin": {