fast-cxt-mcp 1.1.2 → 1.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-cxt-mcp",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "AI-driven semantic code search MCP server (Node.js)",
   "type": "module",
   "main": "src/server.mjs",

package/src/core.mjs

@@ -1014,8 +1014,9 @@ export async function search({
 
   // Total API calls = maxTurns + 1 (last round for answer)
   const totalApiCalls = maxTurns + 1;
+  let compensatedTurns = 0;
 
-  for (let turn = 0; turn < totalApiCalls; turn++) {
+  for (let turn = 0; turn < totalApiCalls + compensatedTurns; turn++) {
     log(`Turn ${turn + 1}/${totalApiCalls}`);
 
     const proto = _buildRequest(apiKey, jwt, messages, toolDefs);
@@ -1077,6 +1078,16 @@ export async function search({
       const cmds = Object.keys(toolArgs).filter((k) => k.startsWith("command"));
       log(`Executing ${cmds.length} local commands`);
 
+      // Check for valid commands (those with a type field)
+      const validCommands = cmds.filter((k) => {
+        const cmd = toolArgs[k];
+        return cmd && typeof cmd === "object" && cmd.type;
+      });
+      if (validCommands.length === 0) {
+        compensatedTurns++;
+        log("Turn compensation: no valid commands, extending search by 1 turn");
+      }
+
       const results = await executor.execToolCallAsync(toolArgs);
 
       messages.push({

package/src/executor.mjs

@@ -409,6 +409,9 @@ export class ToolExecutor {
    * @returns {Promise<string>}
    */
   async execCommandAsync(cmd) {
+    if (!cmd || typeof cmd !== "object") {
+      return "Error: missing or invalid command";
+    }
     const t = cmd.type || "";
     switch (t) {
       case "rg":
@@ -432,6 +435,9 @@ export class ToolExecutor {
    * @returns {string}
    */
   execCommand(cmd) {
+    if (!cmd || typeof cmd !== "object") {
+      return "Error: missing or invalid command";
+    }
     const t = cmd.type || "";
     switch (t) {
       case "rg":
@@ -455,13 +461,14 @@ export class ToolExecutor {
    * @returns {Promise<string>}
    */
   async execToolCallAsync(args) {
+    if (!args || typeof args !== "object") {
+      return "Error: missing or invalid tool args";
+    }
     const keys = Object.keys(args).filter((k) => k.startsWith("command")).sort();
-    const tasks = keys
-      .filter((key) => typeof args[key] === "object")
-      .map(async (key) => {
-        const output = await this.execCommandAsync(args[key]);
-        return `<${key}_result>\n${output}\n</${key}_result>`;
-      });
+    const tasks = keys.map(async (key) => {
+      const output = await this.execCommandAsync(args[key]);
+      return `<${key}_result>\n${output}\n</${key}_result>`;
+    });
     const results = await Promise.all(tasks);
     return results.join("");
   }
@@ -473,12 +480,13 @@ export class ToolExecutor {
    */
   execToolCall(args) {
     const parts = [];
+    if (!args || typeof args !== "object") {
+      return "Error: missing or invalid tool args";
+    }
     const keys = Object.keys(args).filter((k) => k.startsWith("command")).sort();
     for (const key of keys) {
-      if (typeof args[key] === "object") {
-        const output = this.execCommand(args[key]);
-        parts.push(`<${key}_result>\n${output}\n</${key}_result>`);
-      }
+      const output = this.execCommand(args[key]);
+      parts.push(`<${key}_result>\n${output}\n</${key}_result>`);
     }
     return parts.join("");
   }