@freesyntax/notch-cli 0.5.16 → 0.5.17

package/dist/index.js

@@ -2450,16 +2450,6 @@ async function updateIndex() {
 }
 
 // src/agent/loop.ts
-var MAX_RETRIES = 3;
-var RETRY_DELAYS = [1e3, 3e3, 8e3];
-function isRetryableError(err) {
-  if (!(err instanceof Error)) return false;
-  const msg = err.message.toLowerCase();
-  return msg.includes("502") || msg.includes("503") || msg.includes("429") || msg.includes("rate limit") || msg.includes("timeout") || msg.includes("econnreset") || msg.includes("econnrefused") || msg.includes("fetch failed") || msg.includes("network") || msg.includes("aborted");
-}
-async function sleep(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
-}
 function getErrorSignature(toolName, result) {
   return {
     toolName,
@@ -2500,81 +2490,44 @@ async function runAgentLoop(messages, config) {
     const toolCalls = [];
     const toolResults = [];
     let streamUsage = null;
-    let lastError = null;
-    for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
-      if (attempt > 0) {
-        const delay = RETRY_DELAYS[Math.min(attempt - 1, RETRY_DELAYS.length - 1)];
-        config.onRetry?.(attempt, lastError instanceof Error ? lastError.message : "unknown");
-        await sleep(delay);
-      }
-      try {
-        fullText = "";
-        toolCalls.length = 0;
-        toolResults.length = 0;
-        const result = streamText({
-          model: config.model,
-          system: config.systemPrompt,
-          messages: history,
-          tools,
-          maxSteps: 1
+    const result = streamText({
+      model: config.model,
+      system: config.systemPrompt,
+      messages: history,
+      tools,
+      maxSteps: 1
+    });
+    for await (const event of result.fullStream) {
+      if (event.type === "text-delta") {
+        fullText += event.textDelta;
+        config.onTextChunk?.(event.textDelta);
+      } else if (event.type === "tool-call") {
+        toolCalls.push({
+          toolCallId: event.toolCallId,
+          toolName: event.toolName,
+          args: event.args
         });
-        for await (const event of result.fullStream) {
-          if (event.type === "text-delta") {
-            fullText += event.textDelta;
-            config.onTextChunk?.(event.textDelta);
-          } else if (event.type === "tool-call") {
-            toolCalls.push({
-              toolCallId: event.toolCallId,
-              toolName: event.toolName,
-              args: event.args
-            });
-            config.onToolCall?.(event.toolName, event.args);
-          }
-          const evt = event;
-          if (evt.type === "tool-result") {
-            const res = evt.result;
-            toolResults.push({
-              toolCallId: evt.toolCallId,
-              result: evt.result
-            });
-            config.onToolResult?.(
-              toolCalls.find((tc) => tc.toolCallId === evt.toolCallId)?.toolName ?? "unknown",
-              res?.content ?? String(evt.result),
-              res?.isError ?? false
-            );
-          }
-        }
-        try {
-          const u = await result.usage;
-          if (u) streamUsage = u;
-        } catch {
-        }
-        lastError = null;
-        break;
-      } catch (err) {
-        lastError = err;
-        if (attempt < MAX_RETRIES && isRetryableError(err)) {
-          continue;
-        }
-        const errMsg = err instanceof Error ? err.message : String(err);
-        history.push({
-          role: "assistant",
-          content: `[Error: ${errMsg}. The model endpoint may be unavailable. Try again or switch models with /model.]`
+        config.onToolCall?.(event.toolName, event.args);
+      }
+      const evt = event;
+      if (evt.type === "tool-result") {
+        const res = evt.result;
+        toolResults.push({
+          toolCallId: evt.toolCallId,
+          result: evt.result
         });
-        return {
-          text: `[Error: ${errMsg}]`,
-          messages: history,
-          iterations,
-          toolCallCount: totalToolCalls,
-          compressed: wasCompressed,
-          usage: {
-            promptTokens: totalPromptTokens,
-            completionTokens: totalCompletionTokens,
-            totalTokens: totalPromptTokens + totalCompletionTokens
-          }
-        };
+        config.onToolResult?.(
+          toolCalls.find((tc) => tc.toolCallId === evt.toolCallId)?.toolName ?? "unknown",
+          res?.content ?? String(evt.result),
+          res?.isError ?? false
+        );
       }
     }
+    try {
+      const u = await result.usage;
+      if (u) streamUsage = u;
+    } catch {
+    }
     if (streamUsage) {
       totalPromptTokens += streamUsage.promptTokens ?? 0;
       totalCompletionTokens += streamUsage.completionTokens ?? 0;
@@ -2881,12 +2834,12 @@ async function withRetry(fn, options = {}) {
         delay += Math.random() * delay * 0.5;
       }
       options.onRetry?.(attempt, err, delay);
-      await sleep2(delay);
+      await sleep(delay);
     }
   }
   throw lastError;
 }
-function sleep2(ms) {
+function sleep(ms) {
   return new Promise((resolve2) => setTimeout(resolve2, ms));
 }
 
@@ -3340,16 +3293,45 @@ async function buildRepoMap(root) {
       "**/.git/**",
       "**/dist/**",
       "**/build/**",
+      "**/out/**",
+      "**/.next/**",
+      "**/.nuxt/**",
+      "**/.output/**",
       "**/__pycache__/**",
       "**/target/**",
+      "**/.venv/**",
+      "**/venv/**",
       "**/*.test.*",
       "**/*.spec.*",
-      "**/*.d.ts"
+      "**/*.d.ts",
+      "**/*.config.*",
+      // vite.config, tailwind.config, etc.
+      "**/*.setup.*",
+      // vitest.setup, jest.setup
+      "**/postcss.config.*",
+      "**/tsconfig.*",
+      "**/.eslintrc.*",
+      "**/.prettierrc.*",
+      "**/env.d.ts",
+      "**/vite-env.d.ts",
+      "**/global.d.ts",
+      "**/globals.d.ts",
+      "**/next-env.d.ts",
+      "**/migrations/**",
+      "**/generated/**",
+      "**/*.min.*",
+      "**/vendor/**",
+      "**/public/**",
+      "**/coverage/**",
+      "**/.cache/**",
+      "**/lock.*",
+      "**/*-lock.*"
     ],
     nodir: true
   });
   const entries = [];
-  for (const file of files.slice(0, 500)) {
+  files.sort((a, b) => a.split("/").length - b.split("/").length || a.localeCompare(b));
+  for (const file of files.slice(0, 300)) {
     const fullPath = path15.resolve(root, file);
     try {
       const content = await fs12.readFile(fullPath, "utf-8");
@@ -7698,6 +7680,19 @@ Analyze the above input.`;
     }
     messages.push({ role: "user", content: finalPrompt });
     const spinner = ora4("Thinking...").start();
+    const spinnerStart = Date.now();
+    const spinnerTimer = setInterval(() => {
+      if (!spinner.isSpinning) {
+        clearInterval(spinnerTimer);
+        return;
+      }
+      const elapsed = Math.floor((Date.now() - spinnerStart) / 1e3);
+      if (elapsed >= 30) {
+        spinner.text = `Waiting for model... (${elapsed}s \u2014 endpoint may be cold-starting)`;
+      } else if (elapsed >= 10) {
+        spinner.text = `Thinking... (${elapsed}s)`;
+      }
+    }, 2e3);
     try {
       const response = await withRetry(
         () => runAgentLoop(messages, {
@@ -7707,10 +7702,12 @@ Analyze the above input.`;
           maxIterations: config.maxIterations,
           contextWindow: MODEL_CATALOG[activeModelId].contextWindow,
           onTextChunk: (chunk) => {
+            clearInterval(spinnerTimer);
             if (spinner.isSpinning) spinner.stop();
             process.stdout.write(chunk);
           },
           onToolCall: (name, args) => {
+            clearInterval(spinnerTimer);
             if (spinner.isSpinning) spinner.stop();
             if ((name === "write" || name === "edit") && typeof args.path === "string") {
               const filePath = nodePath.isAbsolute(args.path) ? args.path : nodePath.resolve(toolCtx.cwd, args.path);
@@ -7772,6 +7769,7 @@ Analyze the above input.`;
         }
       }
     } catch (err) {
+      clearInterval(spinnerTimer);
       spinner.fail(`Error: ${err.message}`);
       checkpoints.discard();
       const msg = err.message?.toLowerCase() ?? "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freesyntax/notch-cli",
-  "version": "0.5.16",
+  "version": "0.5.17",
   "description": "Notch CLI — AI-powered coding assistant by Driftrail",
   "type": "module",
   "bin": {