@corbat-tech/coco 1.5.0 → 1.7.0

package/dist/index.js

@@ -18,6 +18,7 @@ import { z } from 'zod';
 import { Logger } from 'tslog';
 import Anthropic from '@anthropic-ai/sdk';
 import OpenAI from 'openai';
+import { jsonrepair } from 'jsonrepair';
 import 'http';
 import { GoogleGenerativeAI, FunctionCallingMode } from '@google/generative-ai';
 import JSON5 from 'json5';
@@ -255,6 +256,71 @@ var init_allowed_paths = __esm({
   }
 });
 
+// src/tools/utils/heartbeat.ts
+var heartbeat_exports = {};
+__export(heartbeat_exports, {
+  CommandHeartbeat: () => CommandHeartbeat
+});
+var CommandHeartbeat;
+var init_heartbeat = __esm({
+  "src/tools/utils/heartbeat.ts"() {
+    CommandHeartbeat = class {
+      startTime = 0;
+      lastActivityTime = 0;
+      updateInterval = null;
+      warnThreshold = 30;
+      // seconds
+      updateIntervalSeconds = 10;
+      // seconds
+      callbacks;
+      constructor(callbacks = {}) {
+        this.callbacks = callbacks;
+      }
+      /**
+       * Start monitoring - begins periodic updates and silence warnings
+       */
+      start() {
+        this.startTime = Date.now();
+        this.lastActivityTime = Date.now();
+        this.updateInterval = setInterval(() => {
+          const stats = this.getStats();
+          this.callbacks.onUpdate?.(stats);
+          if (stats.silentSeconds >= this.warnThreshold) {
+            this.callbacks.onWarn?.(`\u26A0\uFE0F  Command silent for ${stats.silentSeconds}s`);
+          }
+        }, this.updateIntervalSeconds * 1e3);
+      }
+      /**
+       * Register activity - call this when command produces output
+       * Resets the silence timer
+       */
+      activity() {
+        this.lastActivityTime = Date.now();
+      }
+      /**
+       * Stop monitoring - clears periodic interval
+       * Should be called in finally{} block to ensure cleanup
+       */
+      stop() {
+        if (this.updateInterval) {
+          clearInterval(this.updateInterval);
+          this.updateInterval = null;
+        }
+      }
+      /**
+       * Get current heartbeat statistics
+       */
+      getStats() {
+        const now = Date.now();
+        return {
+          elapsedSeconds: Math.floor((now - this.startTime) / 1e3),
+          silentSeconds: Math.floor((now - this.lastActivityTime) / 1e3)
+        };
+      }
+    };
+  }
+});
+
 // src/cli/repl/allow-path-prompt.ts
 var allow_path_prompt_exports = {};
 __export(allow_path_prompt_exports, {
@@ -10616,8 +10682,10 @@ var OpenAIProvider = class {
       const timeoutInterval = setInterval(checkTimeout, 5e3);
       try {
         for await (const chunk of stream) {
-          lastActivityTime = Date.now();
           const delta = chunk.choices[0]?.delta;
+          if (delta?.content || delta?.tool_calls) {
+            lastActivityTime = Date.now();
+          }
           if (delta?.content) {
             yield { type: "text", text: delta.content };
           }
@@ -10663,10 +10731,22 @@ var OpenAIProvider = class {
           let input = {};
           try {
             input = builder.arguments ? JSON.parse(builder.arguments) : {};
-          } catch {
+          } catch (error) {
             console.warn(
-              `[OpenAI] Failed to parse tool call arguments: ${builder.arguments?.slice(0, 100)}`
+              `[${this.name}] Failed to parse tool call arguments for ${builder.name}: ${builder.arguments?.slice(0, 100)}`
             );
+            try {
+              if (builder.arguments) {
+                const repaired = jsonrepair(builder.arguments);
+                input = JSON.parse(repaired);
+                console.log(`[${this.name}] \u2713 Successfully repaired JSON for ${builder.name}`);
+              }
+            } catch (repairError) {
+              console.error(
+                `[${this.name}] Cannot repair JSON for ${builder.name}, using empty object`
+              );
+              console.error(`[${this.name}] Original error:`, error);
+            }
           }
           yield {
             type: "tool_use_end",
@@ -10960,7 +11040,7 @@ var OpenAIProvider = class {
           return JSON.parse(tc.function.arguments || "{}");
         } catch {
           console.warn(
-            `[OpenAI] Failed to parse tool call arguments: ${tc.function.arguments?.slice(0, 100)}`
+            `[${this.name}] Failed to parse tool call arguments: ${tc.function.arguments?.slice(0, 100)}`
           );
           return {};
         }
@@ -11898,12 +11978,12 @@ async function createProvider(type, config = {}) {
       await provider.initialize(mergedConfig);
       return provider;
     case "lmstudio":
-      provider = new OpenAIProvider();
+      provider = new OpenAIProvider("lmstudio", "LM Studio");
       mergedConfig.baseUrl = mergedConfig.baseUrl ?? "http://localhost:1234/v1";
       mergedConfig.apiKey = mergedConfig.apiKey ?? "lm-studio";
       break;
     case "ollama":
-      provider = new OpenAIProvider();
+      provider = new OpenAIProvider("ollama", "Ollama");
       mergedConfig.baseUrl = mergedConfig.baseUrl ?? "http://localhost:11434/v1";
       mergedConfig.apiKey = mergedConfig.apiKey ?? "ollama";
       break;
@@ -13394,23 +13474,50 @@ Examples:
     }
     const startTime = performance.now();
     const timeoutMs = timeout ?? DEFAULT_TIMEOUT_MS;
+    const { CommandHeartbeat: CommandHeartbeat2 } = await Promise.resolve().then(() => (init_heartbeat(), heartbeat_exports));
+    const heartbeat = new CommandHeartbeat2({
+      onUpdate: (stats) => {
+        if (stats.elapsedSeconds > 10) {
+          process.stderr.write(`\r\u23F1\uFE0F  ${stats.elapsedSeconds}s elapsed`);
+        }
+      },
+      onWarn: (message) => {
+        process.stderr.write(`
+${message}
+`);
+      }
+    });
     try {
+      heartbeat.start();
       const options = {
         cwd: cwd ?? process.cwd(),
         timeout: timeoutMs,
         env: { ...process.env, ...env2 },
         shell: true,
         reject: false,
+        buffer: false,
+        // Enable streaming
         maxBuffer: MAX_OUTPUT_SIZE
       };
-      const result = await execa(command, options);
+      const subprocess = execa(command, options);
+      let stdoutBuffer = "";
+      let stderrBuffer = "";
+      subprocess.stdout?.on("data", (chunk) => {
+        const text = chunk.toString();
+        stdoutBuffer += text;
+        process.stdout.write(text);
+        heartbeat.activity();
+      });
+      subprocess.stderr?.on("data", (chunk) => {
+        const text = chunk.toString();
+        stderrBuffer += text;
+        process.stderr.write(text);
+        heartbeat.activity();
+      });
+      const result = await subprocess;
       return {
-        stdout: truncateOutput(
-          typeof result.stdout === "string" ? result.stdout : String(result.stdout ?? "")
-        ),
-        stderr: truncateOutput(
-          typeof result.stderr === "string" ? result.stderr : String(result.stderr ?? "")
-        ),
+        stdout: truncateOutput(stdoutBuffer),
+        stderr: truncateOutput(stderrBuffer),
         exitCode: result.exitCode ?? 0,
         duration: performance.now() - startTime
       };
@@ -13425,6 +13532,9 @@ Examples:
         `Command execution failed: ${error instanceof Error ? error.message : String(error)}`,
         { tool: "bash_exec", cause: error instanceof Error ? error : void 0 }
       );
+    } finally {
+      heartbeat.stop();
+      process.stderr.write("\r                                        \r");
     }
   }
 });
@@ -15051,7 +15161,21 @@ Examples:
     const projectDir = cwd ?? process.cwd();
     const startTime = performance.now();
     const timeoutMs = timeout ?? DEFAULT_TIMEOUT_MS3;
+    const { CommandHeartbeat: CommandHeartbeat2 } = await Promise.resolve().then(() => (init_heartbeat(), heartbeat_exports));
+    const heartbeat = new CommandHeartbeat2({
+      onUpdate: (stats) => {
+        if (stats.elapsedSeconds > 10) {
+          process.stderr.write(`\r\u23F1\uFE0F  ${stats.elapsedSeconds}s elapsed`);
+        }
+      },
+      onWarn: (message) => {
+        process.stderr.write(`
+${message}
+`);
+      }
+    });
     try {
+      heartbeat.start();
       const pm = packageManager ?? await detectPackageManager(projectDir);
       const cmdArgs = ["run", script];
       if (args && args.length > 0) {
@@ -15062,13 +15186,30 @@ Examples:
         timeout: timeoutMs,
         env: { ...process.env, ...env2 },
         reject: false,
+        buffer: false,
+        // Enable streaming
         maxBuffer: MAX_OUTPUT_SIZE2
       };
-      const result = await execa(pm, cmdArgs, options);
+      const subprocess = execa(pm, cmdArgs, options);
+      let stdoutBuffer = "";
+      let stderrBuffer = "";
+      subprocess.stdout?.on("data", (chunk) => {
+        const text = chunk.toString();
+        stdoutBuffer += text;
+        process.stdout.write(text);
+        heartbeat.activity();
+      });
+      subprocess.stderr?.on("data", (chunk) => {
+        const text = chunk.toString();
+        stderrBuffer += text;
+        process.stderr.write(text);
+        heartbeat.activity();
+      });
+      const result = await subprocess;
       return {
         success: result.exitCode === 0,
-        stdout: truncateOutput2(String(result.stdout ?? "")),
-        stderr: truncateOutput2(String(result.stderr ?? "")),
+        stdout: truncateOutput2(stdoutBuffer),
+        stderr: truncateOutput2(stderrBuffer),
         exitCode: result.exitCode ?? 0,
         duration: performance.now() - startTime,
         packageManager: pm
@@ -15084,6 +15225,9 @@ Examples:
         `Failed to run script '${script}': ${error instanceof Error ? error.message : String(error)}`,
         { tool: "run_script", cause: error instanceof Error ? error : void 0 }
       );
+    } finally {
+      heartbeat.stop();
+      process.stderr.write("\r                                        \r");
     }
   }
 });
@@ -15109,7 +15253,21 @@ Examples:
     const projectDir = cwd ?? process.cwd();
     const startTime = performance.now();
     const timeoutMs = timeout ?? DEFAULT_TIMEOUT_MS3;
+    const { CommandHeartbeat: CommandHeartbeat2 } = await Promise.resolve().then(() => (init_heartbeat(), heartbeat_exports));
+    const heartbeat = new CommandHeartbeat2({
+      onUpdate: (stats) => {
+        if (stats.elapsedSeconds > 10) {
+          process.stderr.write(`\r\u23F1\uFE0F  ${stats.elapsedSeconds}s elapsed`);
+        }
+      },
+      onWarn: (message) => {
+        process.stderr.write(`
+${message}
+`);
+      }
+    });
     try {
+      heartbeat.start();
       const pm = packageManager ?? await detectPackageManager(projectDir);
       let cmdArgs;
       if (packages && packages.length > 0) {
@@ -15149,13 +15307,30 @@ Examples:
         cwd: projectDir,
         timeout: timeoutMs,
         reject: false,
+        buffer: false,
+        // Enable streaming
         maxBuffer: MAX_OUTPUT_SIZE2
       };
-      const result = await execa(pm, cmdArgs, options);
+      const subprocess = execa(pm, cmdArgs, options);
+      let stdoutBuffer = "";
+      let stderrBuffer = "";
+      subprocess.stdout?.on("data", (chunk) => {
+        const text = chunk.toString();
+        stdoutBuffer += text;
+        process.stdout.write(text);
+        heartbeat.activity();
+      });
+      subprocess.stderr?.on("data", (chunk) => {
+        const text = chunk.toString();
+        stderrBuffer += text;
+        process.stderr.write(text);
+        heartbeat.activity();
+      });
+      const result = await subprocess;
       return {
         success: result.exitCode === 0,
-        stdout: truncateOutput2(String(result.stdout ?? "")),
-        stderr: truncateOutput2(String(result.stderr ?? "")),
+        stdout: truncateOutput2(stdoutBuffer),
+        stderr: truncateOutput2(stderrBuffer),
         exitCode: result.exitCode ?? 0,
         duration: performance.now() - startTime,
         packageManager: pm
@@ -15171,6 +15346,9 @@ Examples:
         `Failed to install dependencies: ${error instanceof Error ? error.message : String(error)}`,
         { tool: "install_deps", cause: error instanceof Error ? error : void 0 }
       );
+    } finally {
+      heartbeat.stop();
+      process.stderr.write("\r                                        \r");
     }
   }
 });
@@ -15195,12 +15373,26 @@ Examples:
     const projectDir = cwd ?? process.cwd();
     const startTime = performance.now();
     const timeoutMs = timeout ?? DEFAULT_TIMEOUT_MS3;
+    const { CommandHeartbeat: CommandHeartbeat2 } = await Promise.resolve().then(() => (init_heartbeat(), heartbeat_exports));
+    const heartbeat = new CommandHeartbeat2({
+      onUpdate: (stats) => {
+        if (stats.elapsedSeconds > 10) {
+          process.stderr.write(`\r\u23F1\uFE0F  ${stats.elapsedSeconds}s elapsed`);
+        }
+      },
+      onWarn: (message) => {
+        process.stderr.write(`
+${message}
+`);
+      }
+    });
     try {
       try {
         await fs14__default.access(path14__default.join(projectDir, "Makefile"));
       } catch {
         throw new ToolError("No Makefile found in directory", { tool: "make" });
       }
+      heartbeat.start();
       const cmdArgs = [];
       if (target) {
         cmdArgs.push(...target.split(/\s+/));
@@ -15213,13 +15405,30 @@ Examples:
         timeout: timeoutMs,
         env: { ...process.env, ...env2 },
         reject: false,
+        buffer: false,
+        // Enable streaming
         maxBuffer: MAX_OUTPUT_SIZE2
       };
-      const result = await execa("make", cmdArgs, options);
+      const subprocess = execa("make", cmdArgs, options);
+      let stdoutBuffer = "";
+      let stderrBuffer = "";
+      subprocess.stdout?.on("data", (chunk) => {
+        const text = chunk.toString();
+        stdoutBuffer += text;
+        process.stdout.write(text);
+        heartbeat.activity();
+      });
+      subprocess.stderr?.on("data", (chunk) => {
+        const text = chunk.toString();
+        stderrBuffer += text;
+        process.stderr.write(text);
+        heartbeat.activity();
+      });
+      const result = await subprocess;
       return {
         success: result.exitCode === 0,
-        stdout: truncateOutput2(String(result.stdout ?? "")),
-        stderr: truncateOutput2(String(result.stderr ?? "")),
+        stdout: truncateOutput2(stdoutBuffer),
+        stderr: truncateOutput2(stderrBuffer),
         exitCode: result.exitCode ?? 0,
         duration: performance.now() - startTime
       };
@@ -15235,6 +15444,9 @@ Examples:
         `Make failed: ${error instanceof Error ? error.message : String(error)}`,
         { tool: "make", cause: error instanceof Error ? error : void 0 }
       );
+    } finally {
+      heartbeat.stop();
+      process.stderr.write("\r                                        \r");
     }
   }
 });
@@ -15260,7 +15472,21 @@ Examples:
     const projectDir = cwd ?? process.cwd();
     const startTime = performance.now();
     const timeoutMs = timeout ?? DEFAULT_TIMEOUT_MS3;
+    const { CommandHeartbeat: CommandHeartbeat2 } = await Promise.resolve().then(() => (init_heartbeat(), heartbeat_exports));
+    const heartbeat = new CommandHeartbeat2({
+      onUpdate: (stats) => {
+        if (stats.elapsedSeconds > 10) {
+          process.stderr.write(`\r\u23F1\uFE0F  ${stats.elapsedSeconds}s elapsed`);
+        }
+      },
+      onWarn: (message) => {
+        process.stderr.write(`
+${message}
+`);
+      }
+    });
     try {
+      heartbeat.start();
       const cmdArgs = [];
       if (project) {
         cmdArgs.push("--project", project);
@@ -15278,13 +15504,30 @@ Examples:
         cwd: projectDir,
         timeout: timeoutMs,
         reject: false,
+        buffer: false,
+        // Enable streaming
         maxBuffer: MAX_OUTPUT_SIZE2
       };
-      const result = await execa("npx", ["tsc", ...cmdArgs], options);
+      const subprocess = execa("npx", ["tsc", ...cmdArgs], options);
+      let stdoutBuffer = "";
+      let stderrBuffer = "";
+      subprocess.stdout?.on("data", (chunk) => {
+        const text = chunk.toString();
+        stdoutBuffer += text;
+        process.stdout.write(text);
+        heartbeat.activity();
+      });
+      subprocess.stderr?.on("data", (chunk) => {
+        const text = chunk.toString();
+        stderrBuffer += text;
+        process.stderr.write(text);
+        heartbeat.activity();
+      });
+      const result = await subprocess;
       return {
         success: result.exitCode === 0,
-        stdout: truncateOutput2(String(result.stdout ?? "")),
-        stderr: truncateOutput2(String(result.stderr ?? "")),
+        stdout: truncateOutput2(stdoutBuffer),
+        stderr: truncateOutput2(stderrBuffer),
         exitCode: result.exitCode ?? 0,
         duration: performance.now() - startTime
       };
@@ -15299,6 +15542,9 @@ Examples:
         `TypeScript compile failed: ${error instanceof Error ? error.message : String(error)}`,
         { tool: "tsc", cause: error instanceof Error ? error : void 0 }
       );
+    } finally {
+      heartbeat.stop();
+      process.stderr.write("\r                                        \r");
     }
   }
 });