@tritard/waterbrother 0.6.2 → 0.6.4

package/package.json

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

package/src/cli.js

@@ -5780,31 +5780,103 @@ async function promptLoop(agent, session, context) {
       continue;
     }
     if (naturalResult && typeof naturalResult === "object" && naturalResult.rewrittenLine) {
-      // Rewritten to a slash command — execute it directly as if typed
-      const rewritten = naturalResult.rewrittenLine;
-      if (rewritten === "/build" || rewritten.startsWith("/build ")) {
-        // Trigger the /build handler with the rewritten prompt
-        line = rewritten;
-        // Fall through — the /build handler above already ran or line is now /build
-        // We need to re-trigger, so just run build inline
+      // Rewritten to a slash command — re-process through the command dispatch
+      line = naturalResult.rewrittenLine;
+      // Don't continue — fall through so the rewritten line hits the slash handlers above
+      // But we're past them, so we need to handle inline
+      // Extract the actual /build handler's logic by calling runBuildWorkflow directly
+      if (line === "/build" || line.startsWith("/build ")) {
         const task = context.runtime.activeTask;
         if (task) {
-          const buildArg = rewritten.replace("/build", "").trim();
+          const buildArg = line.replace("/build", "").trim();
           const buildPrompt = buildArg || (task.chosenOption ? `Execute the chosen approach: ${task.chosenOption}` : `Build: ${task.name}`);
+
+          await maybeAutoCompactConversation({ agent, currentSession, context, pendingInput: buildPrompt });
+
+          const spinner = createProgressSpinner("building...");
+          const railStates = new Set();
+          let currentState = "planning";
+
+          function toolToPhaseRewritten(toolName) {
+            if (toolName === "run_shell") return "running";
+            if (toolName === "write_file" || toolName === "replace_in_file" || toolName === "apply_patch") return "editing";
+            if (toolName === "read_file" || toolName === "search_text" || toolName === "list_files" || toolName === "glob_files" || toolName === "read_many_files") return "reading";
+            if (toolName === "declare_contract") return "planning";
+            return "reading";
+          }
+
+          function printRailRewritten(phase) {
+            if (railStates.has(phase)) return;
+            railStates.add(phase);
+            console.log(`${dim("  ▸")} ${phase}`);
+          }
+
+          printRailRewritten("planning");
+
+          const abortController = typeof AbortController === "function" ? new AbortController() : null;
+          let interrupted = false;
+          const detachInterruptListener = createInterruptListener(() => {
+            if (interrupted) return;
+            interrupted = true;
+            spinner.setLabel("interrupting...");
+            if (abortController) abortController.abort();
+          }, { enableEsc: process.stdin.isTTY, shouldIgnoreEsc: () => approvalPromptActive });
+
           try {
-            await runTextTurnInteractive({
-              agent,
-              currentSession,
-              context,
+            const buildResult = await runBuildWorkflow({
+              agent, context, task,
               promptText: buildPrompt,
-              pendingInput: buildPrompt,
-              spinnerLabel: "building..."
+              handlers: {
+                signal: abortController?.signal,
+                onStateChange(state) { currentState = state; },
+                onAssistantDelta() {},
+                onToolStart(toolCall) {
+                  const toolName = toolCall?.function?.name || "tool";
+                  printRailRewritten(toolToPhaseRewritten(toolName));
+                  spinner.setLabel(`${toolName}...`);
+                },
+                onToolEnd(toolCall, result) {
+                  const toolName = toolCall?.function?.name || "tool";
+                  const status = parseToolResultShape(result);
+                  if (status !== "ok") {
+                    console.log(`${dim("  ▸")} ${toolName}: ${status === "blocked" ? yellow("blocked") : red(status)}`);
+                  }
+                  spinner.setLabel("thinking...");
+                },
+                onAssistant() {}
+              }
             });
+
+            detachInterruptListener();
+            spinner.stop();
+            printRailRewritten("done");
+
+            if (buildResult) {
+              const { receipt, review, impactSummary } = buildResult;
+              if (receipt) {
+                task.latestReceiptId = receipt.id;
+                task.lastVerdict = review?.verdict || null;
+                task.state = "review-ready";
+                await saveTask({ cwd: context.cwd, task });
+                context.runtime.activeTask = task;
+                context.runtime.lastReceipt = receipt;
+              }
+              console.log(`────────────────────────────────────────────────────────────────────────`);
+              console.log(`task: ${task.name} → ${task.state}`);
+              console.log(`────────────────────────────────────────────────────────────────────────`);
+              if (review) {
+                renderReviewCockpit(task, receipt);
+              } else {
+                updatePanel();
+              }
+            }
           } catch (error) {
+            detachInterruptListener();
+            spinner.stop();
             console.log(`build failed: ${error instanceof Error ? error.message : String(error)}`);
           }
         }
-      } else if (rewritten === "/challenge") {
+      } else if (line === "/challenge") {
         const task = context.runtime.activeTask;
         const receipt = context.runtime.lastReceipt || (task && await agent.toolRuntime.readReceipt(task?.latestReceiptId || "last"));
         if (receipt) {

package/src/router.js

@@ -14,9 +14,9 @@ function looksLikeWorkRequest(text) {
   if (/^(hi|hello|thanks|thank you|help|what can you do)\b/.test(l)) return false;
   if (/^(build it|go|check it|ship it|fix these|ignore|challenge harder|think deeper)\b/.test(l)) return false;
   if (/^[1-9]\d*$/.test(l)) return false;
-  const verbStart = /^(add|build|implement|create|fix|refactor|remove|update|wire|support|migrate|improve|audit|review|debug|investigate|clean up|set up|setup|rewrite|port|optimize)\b/;
+  const verbStart = /^(add|build|implement|create|fix|refactor|remove|update|wire|support|migrate|improve|audit|review|debug|investigate|clean up|set up|setup|rewrite|port|optimize|write|make|deploy|install|configure|connect|test|run|generate|scaffold|move|rename|delete|extract|split|merge)\b/;
   const suffixHint = /( to the | for the | in the | across | using | with | without )/;
-  return verbStart.test(l) || suffixHint.test(l) || (!l.endsWith("?") && raw.split(/\s+/).length >= 3);
+  return verbStart.test(l) || (suffixHint.test(l) && verbStart.test(l));
 }
 
 function inferPassFromText(text) {