claudish 6.13.0 → 6.13.1

package/dist/index.js

@@ -22367,7 +22367,7 @@ var init_profile_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "6.13.0";
+var VERSION = "6.13.1";
 
 // src/telemetry.ts
 var exports_telemetry = {};
@@ -107726,14 +107726,14 @@ __export(exports_team_grid, {
 import { spawn as spawn5 } from "child_process";
 import {
   existsSync as existsSync29,
-  mkdirSync as mkdirSync16,
   readFileSync as readFileSync24,
-  unlinkSync as unlinkSync11,
   writeFileSync as writeFileSync18
 } from "fs";
 import { dirname as dirname6, join as join30 } from "path";
 import { fileURLToPath as fileURLToPath6 } from "url";
 import { execSync as execSync2 } from "child_process";
+import { connect as netConnect } from "net";
+import { setTimeout as wait } from "timers/promises";
 function resolveRouteInfo(modelId) {
   const parsed = parseModelSpec(modelId);
   if (parsed.isExplicitProvider) {
@@ -107787,21 +107787,22 @@ function resolveRouteInfo(modelId) {
     source: "auto"
   };
 }
-function buildPaneHeader(model, prompt) {
-  const route = resolveRouteInfo(model);
-  const esc2 = (s) => s.replace(/'/g, "'\\''");
-  const bgColors = [
-    "48;2;40;90;180",
-    "48;2;140;60;160",
-    "48;2;30;130;100",
-    "48;2;160;80;40",
-    "48;2;60;120;60",
-    "48;2;160;50;70"
-  ];
+function pickBannerColor(model, used) {
   let hash = 0;
   for (let i = 0;i < model.length; i++)
     hash = (hash << 5) - hash + model.charCodeAt(i) | 0;
-  const bg2 = bgColors[Math.abs(hash) % bgColors.length];
+  const start = Math.abs(hash) % BANNER_BG_COLORS.length;
+  let idx = start;
+  if (used.size < BANNER_BG_COLORS.length) {
+    while (used.has(idx))
+      idx = (idx + 1) % BANNER_BG_COLORS.length;
+  }
+  used.add(idx);
+  return BANNER_BG_COLORS[idx];
+}
+function buildPaneHeader(model, prompt, bg2) {
+  const route = resolveRouteInfo(model);
+  const esc2 = (s) => s.replace(/'/g, "'\\''");
   const chainStr = route.chain.join(" \u2192 ");
   const sourceLabel = route.sourceDetail ? `${route.source}: ${route.sourceDetail}` : route.source;
   const lines = [];
@@ -107843,133 +107844,113 @@ function findMagmuxBinary() {
   throw new Error(`magmux not found. Install it:
   brew install MadAppGang/tap/magmux`);
 }
-function finalizeStatus(statusPath, sessionPath, anonIds, mode) {
-  const statusCache = JSON.parse(readFileSync24(statusPath, "utf-8"));
-  for (const anonId of anonIds) {
-    const current = statusCache.models[anonId];
-    if (current.state === "COMPLETED" || current.state === "FAILED")
-      continue;
-    const exitCodePath = join30(sessionPath, "work", anonId, ".exit-code");
-    if (existsSync29(exitCodePath)) {
-      const code = parseInt(readFileSync24(exitCodePath, "utf-8").trim(), 10);
-      statusCache.models[anonId] = {
-        ...current,
-        state: code === 0 ? "COMPLETED" : "FAILED",
-        exitCode: code,
-        startedAt: current.startedAt ?? statusCache.startedAt,
-        completedAt: new Date().toISOString()
-      };
-    } else if (mode === "interactive") {
-      statusCache.models[anonId] = {
-        ...current,
-        state: "COMPLETED",
-        exitCode: 0,
-        startedAt: current.startedAt ?? statusCache.startedAt,
-        completedAt: new Date().toISOString()
+async function subscribeToMagmux(sockPath, onEvent) {
+  let client = null;
+  for (let attempt = 0;attempt < 40; attempt++) {
+    if (existsSync29(sockPath)) {
+      try {
+        client = await new Promise((resolve4, reject) => {
+          const s = netConnect(sockPath);
+          s.once("connect", () => resolve4(s));
+          s.once("error", reject);
+        });
+        break;
+      } catch {}
+    }
+    await wait(50);
+  }
+  if (!client) {
+    return { results: null, client: null };
+  }
+  return await new Promise((resolve4) => {
+    let buf = "";
+    let finalResults = null;
+    client.on("data", (chunk) => {
+      buf += chunk.toString("utf-8");
+      let nl = buf.indexOf(`
+`);
+      while (nl >= 0) {
+        const line = buf.slice(0, nl).trim();
+        buf = buf.slice(nl + 1);
+        nl = buf.indexOf(`
+`);
+        if (!line)
+          continue;
+        try {
+          const evt = JSON.parse(line);
+          onEvent?.(evt);
+          if (evt.type === "results") {
+            finalResults = evt;
+          }
+        } catch {}
+      }
+    });
+    const done = () => resolve4({ results: finalResults, client });
+    client.once("end", done);
+    client.once("close", done);
+    client.once("error", done);
+  });
+}
+function buildTeamStatus(manifest, startedAt, results) {
+  const anonIds = Object.keys(manifest.models);
+  const models = {};
+  for (let i = 0;i < anonIds.length; i++) {
+    const anonId = anonIds[i];
+    const result = results?.find((r) => r.pane === i);
+    if (!result) {
+      models[anonId] = {
+        state: "TIMEOUT",
+        exitCode: null,
+        startedAt,
+        completedAt: null,
+        outputSize: 0
       };
-    } else {
-      statusCache.models[anonId] = { ...current, state: "TIMEOUT" };
+      continue;
     }
+    let state;
+    switch (result.state) {
+      case "completed":
+      case "awaiting_input":
+        state = "COMPLETED";
+        break;
+      case "failed":
+        state = "FAILED";
+        break;
+      default:
+        state = "TIMEOUT";
+    }
+    models[anonId] = {
+      state,
+      exitCode: result.exitCode,
+      startedAt: result.startedAt ?? startedAt,
+      completedAt: result.completedAt ?? new Date().toISOString(),
+      outputSize: result.response?.length ?? 0
+    };
   }
-  writeFileSync18(statusPath, JSON.stringify(statusCache, null, 2), "utf-8");
+  return { startedAt, models };
 }
 async function runWithGrid(sessionPath, models, input, opts) {
   const mode = opts?.mode ?? "default";
   const keep = opts?.keep ?? false;
   const manifest = setupSession(sessionPath, models, input);
-  mkdirSync16(join30(sessionPath, "errors"), { recursive: true });
-  for (const anonId of Object.keys(manifest.models)) {
-    const stale = join30(sessionPath, "work", anonId, ".exit-code");
-    try {
-      unlinkSync11(stale);
-    } catch {}
-  }
+  const startedAt = new Date().toISOString();
   const gridfilePath = join30(sessionPath, "gridfile.txt");
   const prompt = readFileSync24(join30(sessionPath, "input.md"), "utf-8").replace(/'/g, "'\\''").replace(/\n/g, " ");
-  const totalPanes = Object.keys(manifest.models).length;
-  const workDir = join30(sessionPath, "work");
-  const statusJsonAllDone = JSON.stringify({
-    cmd: "status",
-    text: `C: claudish team	G: ${totalPanes} done	G: complete	D: __TS__	D: ctrl-g q to quit`
-  });
-  const statusJsonWithFails = JSON.stringify({
-    cmd: "status",
-    text: `C: claudish team	G: __D__ done	R: __F__ failed	D: __TS__	D: ctrl-g q to quit`
-  });
-  const statusJsonRunning = JSON.stringify({
-    cmd: "status",
-    text: `C: claudish team	G: __D__ done	C: __R__ running	R: __F__ failed	D: __TS__`
-  });
-  const tplDir = join30(sessionPath, "status-tpl");
-  mkdirSync16(tplDir, { recursive: true });
-  writeFileSync18(join30(tplDir, "all-done.json"), statusJsonAllDone);
-  writeFileSync18(join30(tplDir, "with-fails.json"), statusJsonWithFails);
-  writeFileSync18(join30(tplDir, "running.json"), statusJsonRunning);
-  const statusFunc = [
-    `_update_bar() {`,
-    `_d=0; _f=0;`,
-    `for _ecf in $(find ${workDir} -name .exit-code 2>/dev/null); do`,
-    `_c=$(cat "$_ecf" 2>/dev/null);`,
-    `if [ "$_c" = "0" ]; then _d=$((_d+1)); else _f=$((_f+1)); fi;`,
-    `done;`,
-    `_r=$((${totalPanes}-_d-_f));`,
-    `_e=$SECONDS;`,
-    `if [ $_e -ge 60 ]; then _ts="$((_e/60))m $((_e%60))s"; else _ts="\${_e}s"; fi;`,
-    `if [ $_r -eq 0 ] && [ $_f -eq 0 ]; then`,
-    `sed "s/__TS__/\${_ts}/" ${tplDir}/all-done.json | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null;`,
-    `elif [ $_r -eq 0 ] && [ $_f -gt 0 ]; then`,
-    `sed -e "s/__D__/\${_d}/" -e "s/__F__/\${_f}/" -e "s/__TS__/\${_ts}/" ${tplDir}/with-fails.json | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null;`,
-    `else`,
-    `sed -e "s/__D__/\${_d}/" -e "s/__R__/\${_r}/" -e "s/__F__/\${_f}/" -e "s/__TS__/\${_ts}/" ${tplDir}/running.json | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null;`,
-    `fi;`,
-    `};`
-  ].join(" ");
   const rawPrompt = readFileSync24(join30(sessionPath, "input.md"), "utf-8");
+  const usedBannerColors = new Set;
   const gridLines = Object.entries(manifest.models).map(([anonId]) => {
-    const errorLog = join30(sessionPath, "errors", `${anonId}.log`);
-    const exitCodeFile = join30(sessionPath, "work", anonId, ".exit-code");
     const model = manifest.models[anonId].model;
-    const paneIndex = Object.keys(manifest.models).indexOf(anonId);
     if (mode === "interactive") {
-      const modelList = Object.values(manifest.models).map((m2) => m2.model).join(", ");
-      const interactiveJson = JSON.stringify({
-        cmd: "status",
-        text: `C: claudish team	W: ${modelList}	D: ctrl-g Tab switch	D: ctrl-g q quit`
-      });
-      const interactiveJsonFile = join30(tplDir, "interactive.json");
-      writeFileSync18(interactiveJsonFile, interactiveJson);
-      return [
-        `if [ -n "$MAGMUX_SOCK" ]; then cat ${interactiveJsonFile} | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null; fi;`,
-        `claudish --model ${model} -i --dangerously-skip-permissions '${prompt}' 2>${errorLog};`,
-        `_ec=$?; echo $_ec > ${exitCodeFile}`
-      ].join(" ");
+      return `claudish --model ${model} -i --dangerously-skip-permissions '${prompt}'`;
     }
-    const header = buildPaneHeader(model, rawPrompt);
-    return [
-      `${statusFunc}`,
-      `if [ -n "$MAGMUX_SOCK" ]; then _update_bar; fi;`,
-      `${header}`,
-      `claudish --model ${model} -y --quiet '${prompt}' 2>${errorLog};`,
-      `_ec=$?; echo $_ec > ${exitCodeFile};`,
-      `if [ -n "$MAGMUX_SOCK" ]; then`,
-      `  _update_bar;`,
-      `  if [ $_ec -eq 0 ]; then`,
-      `    echo '{"cmd":"tint","pane":${paneIndex},"color":"green"}' | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null;`,
-      `    echo '{"cmd":"overlay","pane":${paneIndex},"text":"DONE","color":"green"}' | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null;`,
-      `  else`,
-      `    echo '{"cmd":"tint","pane":${paneIndex},"color":"red"}' | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null;`,
-      `    echo '{"cmd":"overlay","pane":${paneIndex},"text":"FAIL","color":"red"}' | nc -U "$MAGMUX_SOCK" -w 1 2>/dev/null;`,
-      `  fi;`,
-      `fi;`,
-      `exec sleep 86400`
-    ].join(" ");
+    const bg2 = pickBannerColor(model, usedBannerColors);
+    const header = buildPaneHeader(model, rawPrompt, bg2);
+    return `${header} claudish --model ${model} -y --quiet '${prompt}'`;
   });
   writeFileSync18(gridfilePath, gridLines.join(`
 `) + `
 `, "utf-8");
   const magmuxPath = findMagmuxBinary();
-  const statusPath = join30(sessionPath, "status.json");
-  const anonIds = Object.keys(manifest.models);
   const spawnArgs = ["-g", gridfilePath];
   if (!keep && mode === "default") {
     spawnArgs.push("-w");
@@ -107978,19 +107959,33 @@ async function runWithGrid(sessionPath, models, input, opts) {
     stdio: "inherit",
     env: { ...process.env }
   });
-  await new Promise((resolve4) => {
+  const sockPath = `/tmp/magmux-${proc.pid}.sock`;
+  const subscription = subscribeToMagmux(sockPath);
+  const procExit = new Promise((resolve4) => {
     proc.on("exit", () => resolve4());
     proc.on("error", () => resolve4());
   });
-  finalizeStatus(statusPath, sessionPath, anonIds, mode);
-  return JSON.parse(readFileSync24(statusPath, "utf-8"));
+  const [{ results }] = await Promise.all([subscription, procExit]);
+  const status = buildTeamStatus(manifest, startedAt, results?.panes ?? null);
+  const statusPath = join30(sessionPath, "status.json");
+  writeFileSync18(statusPath, JSON.stringify(status, null, 2), "utf-8");
+  return status;
 }
+var BANNER_BG_COLORS;
 var init_team_grid = __esm(() => {
   init_team_orchestrator();
   init_model_parser();
   init_routing_rules();
   init_auto_route();
   init_profile_config();
+  BANNER_BG_COLORS = [
+    "48;2;40;90;180",
+    "48;2;140;60;160",
+    "48;2;30;130;100",
+    "48;2;160;80;40",
+    "48;2;60;120;60",
+    "48;2;160;50;70"
+  ];
 });
 
 // src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "6.13.0",
+  "version": "6.13.1",
   "description": "Run Claude Code with any model - OpenRouter, Ollama, LM Studio & local models",
   "type": "module",
   "main": "./dist/index.js",
@@ -59,10 +59,10 @@
     "ai"
   ],
   "optionalDependencies": {
-    "@claudish/magmux-darwin-arm64": "6.13.0",
-    "@claudish/magmux-darwin-x64": "6.13.0",
-    "@claudish/magmux-linux-arm64": "6.13.0",
-    "@claudish/magmux-linux-x64": "6.13.0"
+    "@claudish/magmux-darwin-arm64": "6.13.1",
+    "@claudish/magmux-darwin-x64": "6.13.1",
+    "@claudish/magmux-linux-arm64": "6.13.1",
+    "@claudish/magmux-linux-x64": "6.13.1"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",