codeharness 0.31.0 → 0.31.2

package/dist/{chunk-ITPLJVAB.js → chunk-RC2CEPIY.js}

@@ -2895,7 +2895,7 @@ function generateDockerfileTemplate(projectDir, stackOrDetections) {
 }
 
 // src/modules/infra/init-project.ts
-var HARNESS_VERSION = true ? "0.31.0" : "0.0.0-dev";
+var HARNESS_VERSION = true ? "0.31.2" : "0.0.0-dev";
 function failResult(opts, error) {
   return {
     status: "fail",

package/dist/{docker-TANMGEDO.js → docker-D5IYCSH3.js}

@@ -16,7 +16,7 @@ import {
   stopCollectorOnly,
   stopSharedStack,
   stopStack
-} from "./chunk-ITPLJVAB.js";
+} from "./chunk-RC2CEPIY.js";
 export {
   checkRemoteEndpoint,
   cleanupOrphanedContainers,

package/dist/index.js

@@ -40,7 +40,7 @@ import {
   validateDockerfile,
   warn,
   writeState
-} from "./chunk-ITPLJVAB.js";
+} from "./chunk-RC2CEPIY.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -5105,12 +5105,24 @@ var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834"
 function isLoopBlock2(step) {
   return typeof step === "object" && step !== null && "loop" in step;
 }
-function TaskNode({ name, status, spinnerFrame }) {
+function driverLabel(driver) {
+  if (!driver) return "";
+  if (driver.includes("opus")) return "opus";
+  if (driver.includes("sonnet")) return "snnt";
+  if (driver.includes("haiku")) return "haiku";
+  if (driver === "codex" || driver === "codex-mini") return "cdx";
+  if (driver === "claude-code") return "cc";
+  if (driver === "opencode") return "oc";
+  return driver.slice(0, 4);
+}
+function TaskNode({ name, status, spinnerFrame, driver }) {
   const s = status ?? "pending";
+  const tag = driver ? ` [${driverLabel(driver)}]` : "";
   switch (s) {
     case "done":
       return /* @__PURE__ */ jsxs2(Text2, { color: "green", children: [
         name,
+        /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: tag }),
         " \u2713"
       ] });
     case "active": {
@@ -5118,17 +5130,22 @@ function TaskNode({ name, status, spinnerFrame }) {
       return /* @__PURE__ */ jsxs2(Text2, { color: "cyan", children: [
         frame,
         " ",
-        name
+        name,
+        /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: tag })
       ] });
     }
     case "failed":
       return /* @__PURE__ */ jsxs2(Text2, { color: "red", children: [
         name,
+        /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: tag }),
         " \u2717"
       ] });
     case "pending":
     default:
-      return /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: name });
+      return /* @__PURE__ */ jsxs2(Text2, { dimColor: true, children: [
+        name,
+        tag
+      ] });
   }
 }
 function loopIteration(tasks, taskStates) {
@@ -5138,49 +5155,74 @@ function loopIteration(tasks, taskStates) {
   });
   return anyStarted ? 1 : 0;
 }
-function hasMetaData(taskMeta) {
-  if (!taskMeta) return false;
-  return Object.keys(taskMeta).length > 0;
-}
 function WorkflowGraph({ flow, currentTask, taskStates, taskMeta }) {
   if (flow.length === 0 || Object.keys(taskStates).length === 0) {
     return null;
   }
   const meta = taskMeta ?? {};
-  const showMeta = hasMetaData(taskMeta);
   const spinnerFrame = Math.floor(Date.now() / 80);
-  const elements = [];
-  for (let i = 0; i < flow.length; i++) {
-    const step = flow[i];
-    if (i > 0) {
-      elements.push(/* @__PURE__ */ jsx2(Text2, { children: " \u2192 " }, `arrow-${i}`));
-    }
+  let inLoop = false;
+  let loopBlock = null;
+  let loopItCount = 0;
+  for (const step of flow) {
     if (isLoopBlock2(step)) {
-      const iteration = loopIteration(step.loop, taskStates);
-      const loopNodes = [];
-      for (let j = 0; j < step.loop.length; j++) {
-        if (j > 0) {
-          loopNodes.push(/* @__PURE__ */ jsx2(Text2, { children: " \u2192 " }, `loop-arrow-${i}-${j}`));
-        }
-        loopNodes.push(
-          /* @__PURE__ */ jsx2(TaskNode, { name: step.loop[j], status: taskStates[step.loop[j]], spinnerFrame }, `loop-task-${i}-${j}`)
+      loopBlock = step;
+      loopItCount = loopIteration(step.loop, taskStates);
+      inLoop = loopItCount > 0;
+      break;
+    }
+  }
+  if (inLoop && loopBlock) {
+    const elements2 = [];
+    for (const step of flow) {
+      if (isLoopBlock2(step)) break;
+      if (typeof step === "string") {
+        if (elements2.length > 0) elements2.push(/* @__PURE__ */ jsx2(Text2, { children: " \u2192 " }, `a-${step}`));
+        elements2.push(
+          /* @__PURE__ */ jsx2(TaskNode, { name: step, status: taskStates[step], spinnerFrame, driver: meta[step]?.driver }, `t-${step}`)
         );
       }
-      elements.push(
-        /* @__PURE__ */ jsxs2(Text2, { children: [
-          /* @__PURE__ */ jsxs2(Text2, { children: [
-            "loop(",
-            iteration,
-            ")[ "
-          ] }),
-          loopNodes,
-          /* @__PURE__ */ jsx2(Text2, { children: " ]" })
-        ] }, `loop-${i}`)
+    }
+    if (elements2.length > 0) elements2.push(/* @__PURE__ */ jsx2(Text2, { children: " \u2192 " }, "loop-arrow"));
+    elements2.push(/* @__PURE__ */ jsx2(Text2, { children: /* @__PURE__ */ jsx2(Text2, { bold: true, children: `Loop ${loopItCount}: ` }) }, "loop-label"));
+    for (let j = 0; j < loopBlock.loop.length; j++) {
+      if (j > 0) elements2.push(/* @__PURE__ */ jsx2(Text2, { children: " \u2192 " }, `la-${j}`));
+      const tn = loopBlock.loop[j];
+      elements2.push(
+        /* @__PURE__ */ jsx2(TaskNode, { name: tn, status: taskStates[tn], spinnerFrame, driver: meta[tn]?.driver }, `lt-${j}`)
       );
-    } else {
+    }
+    const loopDone = loopBlock.loop.every((t) => taskStates[t] === "done");
+    if (loopDone) {
+      let afterLoop = false;
+      for (const step of flow) {
+        if (afterLoop && typeof step === "string") {
+          elements2.push(/* @__PURE__ */ jsx2(Text2, { children: " \u2192 " }, `post-a-${step}`));
+          elements2.push(
+            /* @__PURE__ */ jsx2(TaskNode, { name: step, status: taskStates[step], spinnerFrame, driver: meta[step]?.driver }, `post-${step}`)
+          );
+        }
+        if (isLoopBlock2(step)) afterLoop = true;
+      }
+    }
+    return /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", children: /* @__PURE__ */ jsxs2(Text2, { children: [
+      "  ",
+      elements2
+    ] }) });
+  }
+  const elements = [];
+  let passedCurrent = false;
+  for (const step of flow) {
+    if (isLoopBlock2(step)) break;
+    if (typeof step === "string") {
+      if (elements.length > 0) {
+        elements.push(/* @__PURE__ */ jsx2(Text2, { children: " \u2192 " }, `a-${step}`));
+      }
       elements.push(
-        /* @__PURE__ */ jsx2(TaskNode, { name: step, status: taskStates[step], spinnerFrame }, `task-${i}`)
+        /* @__PURE__ */ jsx2(TaskNode, { name: step, status: taskStates[step], spinnerFrame, driver: meta[step]?.driver }, `t-${step}`)
       );
+      if (step === currentTask) passedCurrent = true;
+      if (passedCurrent && step !== currentTask) break;
     }
   }
   return /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", children: /* @__PURE__ */ jsxs2(Text2, { children: [
@@ -5523,10 +5565,6 @@ function Separator() {
   const width = process.stdout.columns || 60;
   return /* @__PURE__ */ jsx8(Text8, { children: "\u2501".repeat(width) });
 }
-function shortKey(key) {
-  const m = key.match(/^(\d+-\d+)/);
-  return m ? m[1] : key;
-}
 function formatCost2(cost) {
   return `$${cost.toFixed(2)}`;
 }
@@ -5571,9 +5609,9 @@ function EpicInfo({ info: info3 }) {
 function StoryContext({ entries }) {
   if (entries.length === 0) return null;
   return /* @__PURE__ */ jsx8(Box8, { flexDirection: "column", children: entries.map((e, i) => {
-    if (e.role === "prev") return /* @__PURE__ */ jsx8(Text8, { children: /* @__PURE__ */ jsx8(Text8, { color: "green", children: `  Prev: ${shortKey(e.key)} \u2713` }) }, i);
-    if (e.role === "current") return /* @__PURE__ */ jsx8(Text8, { children: /* @__PURE__ */ jsx8(Text8, { color: "cyan", children: `  This: ${shortKey(e.key)} \u25C6 ${e.task ?? ""}` }) }, i);
-    return /* @__PURE__ */ jsx8(Text8, { children: /* @__PURE__ */ jsx8(Text8, { dimColor: true, children: `  Next: ${shortKey(e.key)}` }) }, i);
+    if (e.role === "prev") return /* @__PURE__ */ jsx8(Text8, { children: /* @__PURE__ */ jsx8(Text8, { color: "green", children: `  Prev: ${e.key} \u2713` }) }, i);
+    if (e.role === "current") return /* @__PURE__ */ jsx8(Text8, { children: /* @__PURE__ */ jsx8(Text8, { color: "cyan", children: `  This: ${e.key} \u25C6 ${e.task ?? ""}` }) }, i);
+    return /* @__PURE__ */ jsx8(Text8, { children: /* @__PURE__ */ jsx8(Text8, { dimColor: true, children: `  Next: ${e.key}` }) }, i);
   }) });
 }
 
@@ -6217,7 +6255,7 @@ function registerRunCommand(program) {
     const taskMeta = {};
     for (const [tn, task] of Object.entries(parsedWorkflow.tasks)) {
       taskStates[tn] = "pending";
-      taskMeta[tn] = { driver: task.driver ?? "claude-code" };
+      taskMeta[tn] = { driver: task.model ?? task.driver ?? "claude-code" };
     }
     const storyEntries = [];
     for (const [key, status] of Object.entries(statuses)) {
@@ -11173,7 +11211,7 @@ function registerTeardownCommand(program) {
     } else if (otlpMode === "remote-routed") {
       if (!options.keepDocker) {
         try {
-          const { stopCollectorOnly: stopCollectorOnly2 } = await import("./docker-TANMGEDO.js");
+          const { stopCollectorOnly: stopCollectorOnly2 } = await import("./docker-D5IYCSH3.js");
           stopCollectorOnly2();
           result.docker.stopped = true;
           if (!isJson) {
@@ -11205,7 +11243,7 @@ function registerTeardownCommand(program) {
         info("Shared stack: kept running (other projects may use it)");
       }
     } else if (isLegacyStack) {
-      const { isStackRunning: isStackRunning2, stopStack } = await import("./docker-TANMGEDO.js");
+      const { isStackRunning: isStackRunning2, stopStack } = await import("./docker-D5IYCSH3.js");
       let stackRunning = false;
       try {
         stackRunning = isStackRunning2(composeFile);
@@ -13658,6 +13696,36 @@ function parseLine(line) {
     return null;
   }
   const type = parsed.type;
+  const item = parsed.item;
+  if (type === "item.started" && item) {
+    const itemType = item.type;
+    if (itemType === "command_execution") {
+      const cmd = item.command;
+      return { type: "tool-start", name: "Bash", id: item.id ?? "" };
+    }
+    if (itemType === "file_edit") {
+      return { type: "tool-start", name: "Edit", id: item.id ?? "" };
+    }
+    if (itemType === "file_read") {
+      return { type: "tool-start", name: "Read", id: item.id ?? "" };
+    }
+    return null;
+  }
+  if (type === "item.completed" && item) {
+    const itemType = item.type;
+    if (itemType === "command_execution") {
+      const cmd = item.command;
+      return { type: "tool-complete" };
+    }
+    if (itemType === "agent_message") {
+      const text = item.text;
+      if (text) return { type: "text", text };
+    }
+    if (itemType === "file_edit" || itemType === "file_read") {
+      return { type: "tool-complete" };
+    }
+    return null;
+  }
   if (type === "tool_call") {
     const name = parsed.name;
     const callId = parsed.call_id;
@@ -13746,9 +13814,10 @@ var CodexDriver = class {
         opts.plugins
       );
     }
-    const args = ["exec"];
-    if (opts.model) {
-      args.push("--model", opts.model);
+    const args = ["exec", "--json"];
+    const model = opts.model && !opts.model.startsWith("claude-") ? opts.model : void 0;
+    if (model) {
+      args.push("--model", model);
     }
     if (opts.cwd) {
       args.push("--cd", opts.cwd);
@@ -14101,7 +14170,7 @@ function registerDriversCommand(program) {
 }
 
 // src/index.ts
-var VERSION = true ? "0.31.0" : "0.0.0-dev";
+var VERSION = true ? "0.31.2" : "0.0.0-dev";
 function createProgram() {
   const program = new Command();
   program.name("codeharness").description("Makes autonomous coding agents produce software that actually works").version(VERSION).option("--json", "Output in machine-readable JSON format");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeharness",
-  "version": "0.31.0",
+  "version": "0.31.2",
   "type": "module",
   "description": "CLI for codeharness — makes autonomous coding agents produce software that actually works",
   "bin": {