@tritard/waterbrother 0.8.15 → 0.8.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tritard/waterbrother",
-  "version": "0.8.15",
+  "version": "0.8.17",
   "description": "Waterbrother: Grok-powered coding CLI with local tools, sessions, operator modes, and approval controls",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -673,6 +673,13 @@ function createProgressSpinner(initialLabel = "thinking...") {
   let label = initialLabel;
   let frameIndex = 0;
   let stopped = false;
+  const renderLabel = () => {
+    if (typeof label === "function") {
+      const next = label();
+      return String(next || "");
+    }
+    return String(label || "");
+  };
   const clearLine = () => {
     process.stdout.write("\r\x1b[2K");
   };
@@ -686,7 +693,7 @@ function createProgressSpinner(initialLabel = "thinking...") {
     const bar = renderFlowingBar(frameIndex, 14);
     frameIndex += 1;
     clearLine();
-    process.stdout.write(`${styleAssistantPrefix()} ${bar} ${label}`);
+    process.stdout.write(`${styleAssistantPrefix()} ${bar} ${renderLabel()}`);
   }, 70);
 
   let activeInterval = interval;
@@ -714,7 +721,7 @@ function createProgressSpinner(initialLabel = "thinking...") {
         const bar = renderFlowingBar(frameIndex, 14);
         frameIndex += 1;
         clearLine();
-        process.stdout.write(`${styleAssistantPrefix()} ${bar} ${label}`);
+        process.stdout.write(`${styleAssistantPrefix()} ${bar} ${renderLabel()}`);
       }, 70);
       activeSpinnerController = controller;
     }
@@ -724,6 +731,17 @@ function createProgressSpinner(initialLabel = "thinking...") {
   return controller;
 }
 
+function formatElapsedShort(ms) {
+  const totalSeconds = Math.max(0, Math.floor(Number(ms || 0) / 1000));
+  if (totalSeconds < 60) return `${totalSeconds}s`;
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  if (minutes < 60) return seconds > 0 ? `${minutes}m ${seconds}s` : `${minutes}m`;
+  const hours = Math.floor(minutes / 60);
+  const remMinutes = minutes % 60;
+  return remMinutes > 0 ? `${hours}h ${remMinutes}m` : `${hours}h`;
+}
+
 function parseToolResultShape(resultText) {
   try {
     const parsed = JSON.parse(String(resultText || ""));
@@ -3409,14 +3427,12 @@ async function runTextTurnInteractive({
     const idleMs = Date.now() - lastProgressAt;
     if (!heartbeatFired && idleMs >= 2000) {
       heartbeatFired = true;
+      spinner.setLabel(() => `Working (${formatElapsedShort(Date.now() - turnSummary.startedAt)} • esc to interrupt)`);
       printLiveTrace(`state=${currentState}...`, context.runtime.traceMode, { verboseOnly: true });
     }
     if (!stalledNotified && idleMs >= 8000) {
       stalledNotified = true;
-      if (activeSpinnerController?.clear) {
-        activeSpinnerController.clear();
-      }
-      console.log(`${styleSystemPrefix()} ${yellow(`still working (${currentState}) — press Ctrl+C to interrupt`)}`);
+      spinner.setLabel(() => `Working (${formatElapsedShort(Date.now() - turnSummary.startedAt)} • esc to interrupt)`);
     }
   }, 500);
 
@@ -5272,8 +5288,7 @@ async function promptLoop(agent, session, context) {
         const idleMs = Date.now() - lastProgressAt;
         if (!stalledNotified && idleMs >= 8000) {
           stalledNotified = true;
-          if (activeSpinnerController?.clear) activeSpinnerController.clear();
-          console.log(`${styleSystemPrefix()} ${yellow(`still working (${currentState}) — press Ctrl+C to interrupt`)}`);
+          spinner.setLabel(() => `Working (${formatElapsedShort(Date.now() - turnSummary.startedAt)} • esc to interrupt)`);
         }
       }, 500);