@tritard/waterbrother 0.9.6 → 0.9.7

package/package.json

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

package/src/cli.js

@@ -6217,15 +6217,25 @@ async function promptLoop(agent, session, context) {
         continue;
       }
 
-      // Extract flags
-      const metricMatch = rawArgs.match(/--metric\s+"([^"]+)"|--metric\s+(\S+)/);
+      // Extract flags — parse --metric value (everything until next -- flag or end)
       const attemptsMatch = rawArgs.match(/--attempts\s+(\d+)/);
       const timeMatch = rawArgs.match(/--time\s+(\d+)/);
-      const goalArg = rawArgs
-        .replace(/--metric\s+"[^"]+"|--metric\s+\S+/g, "")
-        .replace(/--attempts\s+\d+/g, "")
-        .replace(/--time\s+\d+/g, "")
-        .trim();
+      // Remove --attempts and --time first so --metric can grab the rest
+      let cleaned = rawArgs.replace(/--attempts\s+\d+/g, "").replace(/--time\s+\d+/g, "");
+      let metricCmd = "";
+      const metricIdx = cleaned.indexOf("--metric");
+      if (metricIdx !== -1) {
+        const afterMetric = cleaned.slice(metricIdx + 8).trim();
+        // If quoted, take the quoted content; otherwise take everything until end
+        if (afterMetric.startsWith('"')) {
+          const endQuote = afterMetric.indexOf('"', 1);
+          metricCmd = endQuote > 0 ? afterMetric.slice(1, endQuote) : afterMetric.slice(1);
+        } else {
+          metricCmd = afterMetric;
+        }
+        cleaned = cleaned.slice(0, metricIdx).trim();
+      }
+      const goalArg = cleaned.trim();
 
       if (!goalArg) {
         console.log("experiment needs a goal");
@@ -6234,8 +6244,8 @@ async function promptLoop(agent, session, context) {
 
       const charter = parseCharterFromGoal(goalArg);
 
-      if (metricMatch) {
-        charter.metric.command = (metricMatch[1] || metricMatch[2]).trim();
+      if (metricCmd) {
+        charter.metric.command = metricCmd.trim();
       }
       if (attemptsMatch) {
         charter.budget.maxAttempts = parseInt(attemptsMatch[1], 10);

package/src/experiment.js

@@ -63,12 +63,12 @@ export async function runMetric({ command, extract, cwd }) {
     let stdout, stderr;
 
     if (isWin) {
-      const result = await execFileAsync(command, [], { ...execOpts, shell: true });
+      // Use PowerShell on Windows for access to proper commands
+      const result = await execFileAsync("powershell.exe", ["-NoProfile", "-Command", command], execOpts);
       stdout = String(result.stdout || "");
       stderr = String(result.stderr || "");
     } else {
-      const parts = command.split(/\s+/);
-      const result = await execFileAsync(parts[0], parts.slice(1), execOpts);
+      const result = await execFileAsync("/bin/sh", ["-c", command], execOpts);
       stdout = String(result.stdout || "");
       stderr = String(result.stderr || "");
     }