sharkcode 0.3.6 → 0.3.8

package/dist/cli.mjs

@@ -204,6 +204,23 @@ import { exec } from "child_process";
 
 // src/permission.ts
 import chalk from "chalk";
+
+// src/spinnerState.ts
+var _stop = null;
+function registerToolSpinner(stop) {
+  _stop = stop;
+}
+function unregisterToolSpinner() {
+  _stop = null;
+}
+function stopToolSpinner() {
+  if (_stop) {
+    _stop();
+    _stop = null;
+  }
+}
+
+// src/permission.ts
 var PURPLE = chalk.hex("#a855f7");
 var GRAY = chalk.gray;
 var GREEN = chalk.green;
@@ -224,6 +241,7 @@ async function askPermission(command) {
     );
     return true;
   }
+  stopToolSpinner();
   const width = Math.min(72, process.stdout.columns ?? 80);
   const innerWidth = width - 4;
   const line = (s) => `  ${s}
@@ -315,28 +333,45 @@ function createProvider(config) {
 
 // src/agent.ts
 var PURPLE2 = chalk2.hex("#a855f7");
+var PURPLE_DIM = chalk2.hex("#7c3aed");
 var TOOL_LABELS = {
-  read_file: { icon: "\u{1F4D6}", verb: "reading file" },
-  write_file: { icon: "\u270D\uFE0F ", verb: "writing file" },
-  edit_file: { icon: "\u270F\uFE0F ", verb: "editing file" },
-  bash: { icon: "\u2699\uFE0F ", verb: "running command" }
+  read_file: { icon: "\u{1F4D6}", verb: "reading" },
+  write_file: { icon: "\u270D\uFE0F ", verb: "writing" },
+  edit_file: { icon: "\u270F\uFE0F ", verb: "editing" },
+  bash: { icon: "\u2699\uFE0F ", verb: "running" }
 };
+function playScanLine() {
+  return new Promise((resolve4) => {
+    const cols = Math.min(process.stdout.columns ?? 80, 72);
+    const steps = 12;
+    const chars = "\u258F\u258E\u258D\u258C\u258B\u258A\u2589\u2588\u2589\u258A\u258B\u258C\u258D\u258E\u258F";
+    let frame = 0;
+    const t = setInterval(() => {
+      const pos = Math.floor(frame / steps * cols);
+      const bar = PURPLE_DIM("\u2500".repeat(pos)) + PURPLE2(chars[frame % chars.length]) + chalk2.dim("\u2500".repeat(Math.max(0, cols - pos - 1)));
+      process.stdout.write(`\r${bar}`);
+      frame++;
+      if (frame >= steps) {
+        clearInterval(t);
+        process.stdout.write(`\r${PURPLE2("\u2500".repeat(cols))}
+`);
+        resolve4();
+      }
+    }, 30);
+  });
+}
 function createSpinner(label) {
   const frames = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
   let i = 0;
   let timer = null;
   return {
     start() {
-      process.stdout.write("\n");
       timer = setInterval(() => {
         process.stdout.write(
-          `\r${PURPLE2(frames[i++ % frames.length])} ${chalk2.gray(label)}`
+          `\r  ${PURPLE2(frames[i++ % frames.length])} ${chalk2.gray(label)}`
         );
       }, 80);
     },
-    update(newLabel) {
-      label = newLabel;
-    },
     stop() {
       if (timer) {
         clearInterval(timer);
@@ -378,9 +413,24 @@ async function runAgent(messages, config) {
   let currentStep = 0;
   const thinkingSpinner = createSpinner("thinking...");
   let thinkingDone = false;
+  let trailingNL = 0;
+  function writeOut(text) {
+    if (!text) return;
+    process.stdout.write(text);
+    for (const ch of text) {
+      if (ch === "\n") trailingNL++;
+      else trailingNL = 0;
+    }
+  }
+  function collapseNL(keep = 1) {
+    if (trailingNL > keep) {
+      const remove = trailingNL - keep;
+      process.stdout.write(`\x1B[${remove}A\x1B[J`);
+      trailingNL = keep;
+    }
+  }
   let toolSpinner = null;
   let currentToolName = "";
-  let currentToolArgs = null;
   thinkingSpinner.start();
   for await (const event of result.fullStream) {
     if (!thinkingDone && (event.type === "text-delta" || event.type === "tool-call" || event.type === "error")) {
@@ -389,43 +439,51 @@ async function runAgent(messages, config) {
     }
     switch (event.type) {
       case "text-delta":
-        process.stdout.write(event.text);
+        if (trailingNL > 1 && event.text.trim() !== "") collapseNL(1);
+        writeOut(event.text);
         break;
       case "tool-call": {
         const meta = TOOL_LABELS[event.toolName] ?? { icon: "\u{1F527}", verb: "running" };
         currentToolName = event.toolName;
-        currentToolArgs = event.input;
         const argHint = getArgHint(event.toolName, event.input);
-        const spinLabel = `${meta.verb}${argHint ? ` \u203A ${argHint}` : ""}`;
+        if (trailingNL === 0) writeOut("\n");
+        collapseNL(1);
+        await playScanLine();
         process.stdout.write(
-          "\n" + chalk2.cyan(`${meta.icon}  ${event.toolName}`) + chalk2.gray(argHint ? `  ${argHint}` : "") + "\n"
+          `  ${meta.icon} ${PURPLE2(meta.verb)}${argHint ? chalk2.dim(" \u203A ") + chalk2.white(argHint) : ""}
+`
         );
-        toolSpinner = createSpinner(spinLabel);
+        toolSpinner = createSpinner(`${meta.verb}...`);
+        registerToolSpinner(() => toolSpinner?.stop());
         toolSpinner.start();
+        trailingNL = 0;
         break;
       }
       case "tool-result": {
         if (toolSpinner) {
           toolSpinner.stop();
           toolSpinner = null;
+          unregisterToolSpinner();
         }
-        const meta = TOOL_LABELS[currentToolName] ?? { icon: "\u{1F527}", verb: "done" };
-        const summary = truncate(String(event.output), 100);
+        const summary = truncate(String(event.output), 80);
         process.stdout.write(
-          chalk2.green(`  \u2713 done`) + chalk2.gray(`  ${summary}`) + "\n\n"
+          `  ${chalk2.green("\u2713")} ${chalk2.dim(summary)}
+`
         );
+        trailingNL = 1;
         break;
       }
       case "tool-error":
         if (toolSpinner) {
           toolSpinner.stop();
           toolSpinner = null;
+          unregisterToolSpinner();
         }
         process.stderr.write(
-          chalk2.red(`
-  \u2717 Tool error [${event.toolName}]: ${String(event.error)}
+          chalk2.red(`  \u2717 [${event.toolName}] ${String(event.error)}
 `)
         );
+        trailingNL = 1;
         break;
       case "finish-step":
         currentStep++;
@@ -434,24 +492,27 @@ async function runAgent(messages, config) {
         if (toolSpinner) {
           toolSpinner.stop();
           toolSpinner = null;
+          unregisterToolSpinner();
         }
         thinkingSpinner.stop();
         process.stderr.write(chalk2.red(`
-\u274C Error: ${String(event.error)}
+\u274C ${String(event.error)}
 `));
+        trailingNL = 1;
         break;
     }
   }
   thinkingSpinner.stop();
-  if (toolSpinner) toolSpinner.stop();
-  process.stdout.write("\n");
+  if (toolSpinner) {
+    toolSpinner.stop();
+    unregisterToolSpinner();
+  }
+  if (trailingNL === 0) process.stdout.write("\n");
   const usage = await result.totalUsage;
   if (usage) {
     process.stderr.write(
-      chalk2.gray(
-        `\u{1F4CA} ${usage.inputTokens} in / ${usage.outputTokens} out | steps: ${currentStep}
-`
-      )
+      chalk2.dim(`  \u{1F4CA} ${usage.inputTokens}\u2191 ${usage.outputTokens}\u2193  steps:${currentStep}
+`)
     );
   }
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sharkcode",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "description": "Local First, open-source AI Coding Agent",
   "type": "module",
   "bin": {