codeharness 0.29.3 → 0.30.0

package/dist/{chunk-4QLSEKNP.js → chunk-S3RKDJMC.js}

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

package/dist/{docker-XNAP7B5H.js → docker-7QONH2B5.js}

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

package/dist/index.js

@@ -40,7 +40,7 @@ import {
   validateDockerfile,
   warn,
   writeState
-} from "./chunk-4QLSEKNP.js";
+} from "./chunk-S3RKDJMC.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -3882,75 +3882,165 @@ async function executeWorkflow(config) {
   let halted = false;
   let lastOutputContract = null;
   let accumulatedCostUsd = 0;
-  for (const step of config.workflow.storyFlow) {
-    if (halted) break;
-    if (config.abortSignal?.aborted) {
-      info("Execution interrupted \u2014 saving state");
-      state = { ...state, phase: "interrupted" };
-      writeWorkflowState(state, projectDir);
-      halted = true;
-      break;
-    }
-    if (isLoopBlock(step)) {
-      const loopResult = await executeLoopBlock(step, state, config, workItems, lastOutputContract);
-      state = loopResult.state;
-      errors.push(...loopResult.errors);
-      tasksCompleted += loopResult.tasksCompleted;
-      lastOutputContract = loopResult.lastContract;
-      for (const item of workItems) {
-        processedStories.add(item.key);
+  if (config.storyPipeline) {
+    const preTasks = [];
+    let loopIdx = -1;
+    for (let i = 0; i < config.workflow.storyFlow.length; i++) {
+      const s = config.workflow.storyFlow[i];
+      if (isLoopBlock(s)) {
+        loopIdx = i;
+        break;
       }
-      if (loopResult.halted) {
+      if (typeof s === "string") preTasks.push(s);
+    }
+    for (const item of workItems) {
+      if (halted || config.abortSignal?.aborted) {
+        if (config.abortSignal?.aborted) {
+          info("Execution interrupted \u2014 saving state");
+          state = { ...state, phase: "interrupted" };
+          writeWorkflowState(state, projectDir);
+        }
         halted = true;
+        break;
       }
-      if (state.phase === "max-iterations" || state.phase === "circuit-breaker") {
-        halted = true;
+      processedStories.add(item.key);
+      for (const taskName of preTasks) {
+        if (halted || config.abortSignal?.aborted) {
+          halted = true;
+          break;
+        }
+        const task = config.workflow.tasks[taskName];
+        if (!task || task.agent === null) continue;
+        const definition = config.agents[task.agent];
+        if (!definition) {
+          warn(`workflow-engine: agent "${task.agent}" not found for "${taskName}"`);
+          continue;
+        }
+        if (isTaskCompleted(state, taskName, item.key)) continue;
+        try {
+          const dr = await dispatchTaskWithResult(task, taskName, item.key, definition, state, config, void 0, lastOutputContract ?? void 0);
+          state = dr.updatedState;
+          lastOutputContract = dr.contract;
+          propagateVerifyFlags(taskName, dr.contract, projectDir);
+          accumulatedCostUsd += dr.contract?.cost_usd ?? 0;
+          tasksCompleted++;
+        } catch (err) {
+          const engineError = handleDispatchError(err, taskName, item.key);
+          errors.push(engineError);
+          if (config.onEvent) {
+            config.onEvent({ type: "dispatch-error", taskName, storyKey: item.key, error: { code: engineError.code, message: engineError.message } });
+          } else {
+            warn(`[${taskName}] ${item.key} \u2014 ERROR: [${engineError.code}] ${engineError.message}`);
+          }
+          state = recordErrorInState(state, taskName, item.key, engineError);
+          writeWorkflowState(state, projectDir);
+          if (err instanceof DispatchError && HALT_ERROR_CODES.has(err.code)) {
+            halted = true;
+          }
+          break;
+        }
       }
-      continue;
     }
-    const taskName = step;
-    const task = config.workflow.tasks[taskName];
-    if (!task) {
-      warn(`workflow-engine: task "${taskName}" not found in workflow tasks, skipping`);
-      continue;
-    }
-    if (task.agent === null) {
-      if (task.scope === "per-run") {
-        if (isTaskCompleted(state, taskName, PER_RUN_SENTINEL)) {
-          warn(`workflow-engine: skipping completed task ${taskName} for ${PER_RUN_SENTINEL}`);
-          continue;
+    const remaining = loopIdx >= 0 ? config.workflow.storyFlow.slice(loopIdx) : [];
+    for (const step of remaining) {
+      if (halted || config.abortSignal?.aborted) {
+        halted = true;
+        break;
+      }
+      if (isLoopBlock(step)) {
+        const loopResult = await executeLoopBlock(step, state, config, workItems, lastOutputContract);
+        state = loopResult.state;
+        errors.push(...loopResult.errors);
+        tasksCompleted += loopResult.tasksCompleted;
+        lastOutputContract = loopResult.lastContract;
+        for (const item of workItems) processedStories.add(item.key);
+        if (loopResult.halted || state.phase === "max-iterations" || state.phase === "circuit-breaker") {
+          halted = true;
         }
+        continue;
+      }
+      const taskName = step;
+      const task = config.workflow.tasks[taskName];
+      if (!task) continue;
+      if (task.agent === null) continue;
+      const definition = config.agents[task.agent];
+      if (!definition) continue;
+      if (task.scope === "per-run" || task.scope === "per-epic") {
+        if (isTaskCompleted(state, taskName, PER_RUN_SENTINEL)) continue;
         try {
-          const nullResult = await executeNullTask(
-            task,
-            taskName,
-            PER_RUN_SENTINEL,
-            state,
-            config,
-            lastOutputContract ?? void 0,
-            accumulatedCostUsd
-          );
-          state = nullResult.updatedState;
-          lastOutputContract = nullResult.contract;
+          const dr = await dispatchTaskWithResult(task, taskName, PER_RUN_SENTINEL, definition, state, config, void 0, lastOutputContract ?? void 0);
+          state = dr.updatedState;
+          lastOutputContract = dr.contract;
           tasksCompleted++;
         } catch (err) {
-          const engineError = isEngineError(err) ? err : handleDispatchError(err, taskName, PER_RUN_SENTINEL);
+          const engineError = handleDispatchError(err, taskName, PER_RUN_SENTINEL);
           errors.push(engineError);
           state = recordErrorInState(state, taskName, PER_RUN_SENTINEL, engineError);
           writeWorkflowState(state, projectDir);
         }
       } else {
+        for (const item of workItems) {
+          if (halted || config.abortSignal?.aborted) break;
+          if (isTaskCompleted(state, taskName, item.key)) continue;
+          try {
+            const dr = await dispatchTaskWithResult(task, taskName, item.key, definition, state, config, void 0, lastOutputContract ?? void 0);
+            state = dr.updatedState;
+            lastOutputContract = dr.contract;
+            tasksCompleted++;
+          } catch (err) {
+            const engineError = handleDispatchError(err, taskName, item.key);
+            errors.push(engineError);
+            state = recordErrorInState(state, taskName, item.key, engineError);
+            writeWorkflowState(state, projectDir);
+          }
+        }
+      }
+    }
+  }
+  if (!config.storyPipeline)
+    for (const step of config.workflow.storyFlow) {
+      if (halted) break;
+      if (config.abortSignal?.aborted) {
+        info("Execution interrupted \u2014 saving state");
+        state = { ...state, phase: "interrupted" };
+        writeWorkflowState(state, projectDir);
+        halted = true;
+        break;
+      }
+      if (isLoopBlock(step)) {
+        const loopResult = await executeLoopBlock(step, state, config, workItems, lastOutputContract);
+        state = loopResult.state;
+        errors.push(...loopResult.errors);
+        tasksCompleted += loopResult.tasksCompleted;
+        lastOutputContract = loopResult.lastContract;
         for (const item of workItems) {
           processedStories.add(item.key);
-          if (isTaskCompleted(state, taskName, item.key)) {
-            warn(`workflow-engine: skipping completed task ${taskName} for ${item.key}`);
+        }
+        if (loopResult.halted) {
+          halted = true;
+        }
+        if (state.phase === "max-iterations" || state.phase === "circuit-breaker") {
+          halted = true;
+        }
+        continue;
+      }
+      const taskName = step;
+      const task = config.workflow.tasks[taskName];
+      if (!task) {
+        warn(`workflow-engine: task "${taskName}" not found in workflow tasks, skipping`);
+        continue;
+      }
+      if (task.agent === null) {
+        if (task.scope === "per-run") {
+          if (isTaskCompleted(state, taskName, PER_RUN_SENTINEL)) {
+            warn(`workflow-engine: skipping completed task ${taskName} for ${PER_RUN_SENTINEL}`);
             continue;
           }
           try {
             const nullResult = await executeNullTask(
               task,
               taskName,
-              item.key,
+              PER_RUN_SENTINEL,
               state,
               config,
               lastOutputContract ?? void 0,
@@ -3960,71 +4050,56 @@ async function executeWorkflow(config) {
             lastOutputContract = nullResult.contract;
             tasksCompleted++;
           } catch (err) {
-            const engineError = isEngineError(err) ? err : handleDispatchError(err, taskName, item.key);
+            const engineError = isEngineError(err) ? err : handleDispatchError(err, taskName, PER_RUN_SENTINEL);
             errors.push(engineError);
-            state = recordErrorInState(state, taskName, item.key, engineError);
+            state = recordErrorInState(state, taskName, PER_RUN_SENTINEL, engineError);
             writeWorkflowState(state, projectDir);
           }
+        } else {
+          for (const item of workItems) {
+            processedStories.add(item.key);
+            if (isTaskCompleted(state, taskName, item.key)) {
+              warn(`workflow-engine: skipping completed task ${taskName} for ${item.key}`);
+              continue;
+            }
+            try {
+              const nullResult = await executeNullTask(
+                task,
+                taskName,
+                item.key,
+                state,
+                config,
+                lastOutputContract ?? void 0,
+                accumulatedCostUsd
+              );
+              state = nullResult.updatedState;
+              lastOutputContract = nullResult.contract;
+              tasksCompleted++;
+            } catch (err) {
+              const engineError = isEngineError(err) ? err : handleDispatchError(err, taskName, item.key);
+              errors.push(engineError);
+              state = recordErrorInState(state, taskName, item.key, engineError);
+              writeWorkflowState(state, projectDir);
+            }
+          }
         }
-      }
-      continue;
-    }
-    const definition = config.agents[task.agent];
-    if (!definition) {
-      warn(`workflow-engine: agent "${task.agent}" not found for task "${taskName}", skipping`);
-      continue;
-    }
-    if (task.scope === "per-run") {
-      if (isTaskCompleted(state, taskName, PER_RUN_SENTINEL)) {
-        warn(`workflow-engine: skipping completed task ${taskName} for ${PER_RUN_SENTINEL}`);
         continue;
       }
-      try {
-        const dispatchResult = await dispatchTaskWithResult(
-          task,
-          taskName,
-          PER_RUN_SENTINEL,
-          definition,
-          state,
-          config,
-          void 0,
-          lastOutputContract ?? void 0
-        );
-        state = dispatchResult.updatedState;
-        lastOutputContract = dispatchResult.contract;
-        propagateVerifyFlags(taskName, dispatchResult.contract, projectDir);
-        accumulatedCostUsd += dispatchResult.contract?.cost_usd ?? 0;
-        tasksCompleted++;
-      } catch (err) {
-        const engineError = handleDispatchError(err, taskName, PER_RUN_SENTINEL);
-        errors.push(engineError);
-        if (config.onEvent) {
-          config.onEvent({ type: "dispatch-error", taskName, storyKey: PER_RUN_SENTINEL, error: { code: engineError.code, message: engineError.message } });
-        } else {
-          warn(`[${taskName}] ${PER_RUN_SENTINEL} \u2014 ERROR: [${engineError.code}] ${engineError.message}`);
-        }
-        state = recordErrorInState(state, taskName, PER_RUN_SENTINEL, engineError);
-        writeWorkflowState(state, projectDir);
-        if (err instanceof DispatchError && HALT_ERROR_CODES.has(err.code)) {
-          halted = true;
-        }
+      const definition = config.agents[task.agent];
+      if (!definition) {
+        warn(`workflow-engine: agent "${task.agent}" not found for task "${taskName}", skipping`);
+        continue;
       }
-    } else {
-      for (const item of workItems) {
-        if (config.abortSignal?.aborted) {
-          halted = true;
-          break;
-        }
-        processedStories.add(item.key);
-        if (isTaskCompleted(state, taskName, item.key)) {
-          warn(`workflow-engine: skipping completed task ${taskName} for ${item.key}`);
+      if (task.scope === "per-run") {
+        if (isTaskCompleted(state, taskName, PER_RUN_SENTINEL)) {
+          warn(`workflow-engine: skipping completed task ${taskName} for ${PER_RUN_SENTINEL}`);
           continue;
         }
         try {
           const dispatchResult = await dispatchTaskWithResult(
             task,
             taskName,
-            item.key,
+            PER_RUN_SENTINEL,
             definition,
             state,
             config,
@@ -4037,24 +4112,65 @@ async function executeWorkflow(config) {
           accumulatedCostUsd += dispatchResult.contract?.cost_usd ?? 0;
           tasksCompleted++;
         } catch (err) {
-          const engineError = handleDispatchError(err, taskName, item.key);
+          const engineError = handleDispatchError(err, taskName, PER_RUN_SENTINEL);
           errors.push(engineError);
           if (config.onEvent) {
-            config.onEvent({ type: "dispatch-error", taskName, storyKey: item.key, error: { code: engineError.code, message: engineError.message } });
+            config.onEvent({ type: "dispatch-error", taskName, storyKey: PER_RUN_SENTINEL, error: { code: engineError.code, message: engineError.message } });
           } else {
-            warn(`[${taskName}] ${item.key} \u2014 ERROR: [${engineError.code}] ${engineError.message}`);
+            warn(`[${taskName}] ${PER_RUN_SENTINEL} \u2014 ERROR: [${engineError.code}] ${engineError.message}`);
           }
-          state = recordErrorInState(state, taskName, item.key, engineError);
+          state = recordErrorInState(state, taskName, PER_RUN_SENTINEL, engineError);
           writeWorkflowState(state, projectDir);
           if (err instanceof DispatchError && HALT_ERROR_CODES.has(err.code)) {
             halted = true;
+          }
+        }
+      } else {
+        for (const item of workItems) {
+          if (config.abortSignal?.aborted) {
+            halted = true;
             break;
           }
-          continue;
+          processedStories.add(item.key);
+          if (isTaskCompleted(state, taskName, item.key)) {
+            warn(`workflow-engine: skipping completed task ${taskName} for ${item.key}`);
+            continue;
+          }
+          try {
+            const dispatchResult = await dispatchTaskWithResult(
+              task,
+              taskName,
+              item.key,
+              definition,
+              state,
+              config,
+              void 0,
+              lastOutputContract ?? void 0
+            );
+            state = dispatchResult.updatedState;
+            lastOutputContract = dispatchResult.contract;
+            propagateVerifyFlags(taskName, dispatchResult.contract, projectDir);
+            accumulatedCostUsd += dispatchResult.contract?.cost_usd ?? 0;
+            tasksCompleted++;
+          } catch (err) {
+            const engineError = handleDispatchError(err, taskName, item.key);
+            errors.push(engineError);
+            if (config.onEvent) {
+              config.onEvent({ type: "dispatch-error", taskName, storyKey: item.key, error: { code: engineError.code, message: engineError.message } });
+            } else {
+              warn(`[${taskName}] ${item.key} \u2014 ERROR: [${engineError.code}] ${engineError.message}`);
+            }
+            state = recordErrorInState(state, taskName, item.key, engineError);
+            writeWorkflowState(state, projectDir);
+            if (err instanceof DispatchError && HALT_ERROR_CODES.has(err.code)) {
+              halted = true;
+              break;
+            }
+            continue;
+          }
         }
       }
     }
-  }
   if (state.phase === "interrupted") {
   } else if (errors.length === 0 && state.phase !== "max-iterations" && state.phase !== "circuit-breaker") {
     state = { ...state, phase: "completed" };
@@ -5430,14 +5546,17 @@ function LaneActivityHeader({ activeLaneId, laneCount }) {
   if (laneCount <= 1 || !activeLaneId) return null;
   return /* @__PURE__ */ jsx7(Text7, { children: /* @__PURE__ */ jsx7(Text7, { color: "cyan", children: `[Lane ${activeLaneId} \u25B8]` }) });
 }
-function App({ state, onCycleLane }) {
+function App({ state, onCycleLane, onQuit }) {
   const lanes = state.lanes;
   const laneCount = lanes?.length ?? 0;
   const terminalWidth = process.stdout.columns || 80;
-  useInput((_input, key) => {
-    if (key.ctrl && _input === "l" && onCycleLane && laneCount > 1) {
+  useInput((input, key) => {
+    if (key.ctrl && input === "l" && onCycleLane && laneCount > 1) {
       onCycleLane();
     }
+    if (input === "q" && onQuit) {
+      onQuit();
+    }
   }, { isActive: typeof process.stdin.setRawMode === "function" });
   const activeLaneCount = state.laneCount ?? 0;
   return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
@@ -5661,7 +5780,8 @@ function startRenderer(options) {
   let lastStoryKey = state.sprintInfo?.storyKey ?? null;
   const pendingStoryCosts = /* @__PURE__ */ new Map();
   let cleaned = false;
-  const inkInstance = inkRender(/* @__PURE__ */ jsx9(App, { state, onCycleLane: () => cycleLane() }), {
+  const onQuit = options?.onQuit;
+  const inkInstance = inkRender(/* @__PURE__ */ jsx9(App, { state, onCycleLane: () => cycleLane(), onQuit: onQuit ? () => onQuit() : void 0 }), {
     exitOnCtrlC: false,
     patchConsole: !options?._forceTTY,
     maxFps: 15
@@ -5669,16 +5789,17 @@ function startRenderer(options) {
   function rerender() {
     if (!cleaned) {
       state = { ...state };
-      inkInstance.rerender(/* @__PURE__ */ jsx9(App, { state, onCycleLane: () => cycleLane() }));
+      inkInstance.rerender(/* @__PURE__ */ jsx9(App, { state, onCycleLane: () => cycleLane(), onQuit: onQuit ? () => onQuit() : void 0 }));
     }
   }
+  const heartbeat = setInterval(() => {
+    if (!cleaned) rerender();
+  }, 200);
   function onSigint() {
     cleanupFull();
-    process.kill(process.pid, "SIGINT");
   }
   function onSigterm() {
     cleanupFull();
-    process.kill(process.pid, "SIGTERM");
   }
   process.on("SIGINT", onSigint);
   process.on("SIGTERM", onSigterm);
@@ -5940,6 +6061,7 @@ function startRenderer(options) {
   function cleanupFull() {
     if (cleaned) return;
     cleaned = true;
+    clearInterval(heartbeat);
     try {
       inkInstance.unmount();
     } catch {
@@ -6173,29 +6295,46 @@ function registerRunCommand(program) {
       }
     }
     const abortController = new AbortController();
-    const renderer = startRenderer({
-      quiet: !!options.quiet || isJson,
-      sprintState: {
-        storyKey: "",
-        phase: "executing",
-        done: counts.done,
-        total: counts.total,
-        totalCost: 0
-      }
-    });
     let interrupted = false;
+    let renderer;
     const onInterrupt = () => {
       if (interrupted) {
-        renderer.cleanup();
         process.exit(1);
       }
       interrupted = true;
+      renderer.cleanup();
       abortController.abort();
+      info("Interrupted \u2014 waiting for current task to finish...", outputOpts);
     };
+    renderer = startRenderer({
+      quiet: !!options.quiet || isJson,
+      sprintState: {
+        storyKey: "",
+        phase: "executing",
+        done: counts.done,
+        total: counts.total,
+        totalCost: 0
+      },
+      onQuit: () => onInterrupt()
+    });
     process.on("SIGINT", onInterrupt);
     process.on("SIGTERM", onInterrupt);
+    const sessionStartMs = Date.now();
     let totalCostUsd = 0;
     let storiesDone = counts.done;
+    let currentStoryKey = "";
+    let currentTaskName = "";
+    const headerRefresh = setInterval(() => {
+      if (interrupted) return;
+      renderer.updateSprintState({
+        storyKey: currentStoryKey,
+        phase: currentTaskName,
+        done: storiesDone,
+        total: counts.total,
+        totalCost: totalCostUsd,
+        elapsed: formatElapsed(Date.now() - sessionStartMs)
+      });
+    }, 2e3);
     const taskStates = {};
     const taskMeta = {};
     for (const [tn, task] of Object.entries(parsedWorkflow.tasks)) {
@@ -6216,12 +6355,15 @@ function registerRunCommand(program) {
         renderer.update(event.streamEvent, event.driverName);
       }
       if (event.type === "dispatch-start") {
+        currentStoryKey = event.storyKey;
+        currentTaskName = event.taskName;
         renderer.updateSprintState({
           storyKey: event.storyKey,
           phase: event.taskName,
           done: storiesDone,
           total: counts.total,
-          totalCost: totalCostUsd
+          totalCost: totalCostUsd,
+          elapsed: formatElapsed(Date.now() - sessionStartMs)
         });
         taskStates[event.taskName] = "active";
         renderer.updateWorkflowState(parsedWorkflow.flow, event.taskName, { ...taskStates }, { ...taskMeta });
@@ -6266,6 +6408,7 @@ function registerRunCommand(program) {
       runId: `run-${Date.now()}`,
       projectDir,
       abortSignal: abortController.signal,
+      storyPipeline: true,
       maxIterations,
       onEvent
     };
@@ -6345,6 +6488,7 @@ function registerRunCommand(program) {
     } else {
       try {
         const result = await executeWorkflow(config);
+        clearInterval(headerRefresh);
         process.removeListener("SIGINT", onInterrupt);
         process.removeListener("SIGTERM", onInterrupt);
         renderer.cleanup();
@@ -6361,6 +6505,7 @@ function registerRunCommand(program) {
           process.exitCode = 1;
         }
       } catch (err) {
+        clearInterval(headerRefresh);
         renderer.cleanup();
         const msg = err instanceof Error ? err.message : String(err);
         fail(`Workflow engine error: ${msg}`, outputOpts);
@@ -11145,7 +11290,7 @@ function registerTeardownCommand(program) {
     } else if (otlpMode === "remote-routed") {
       if (!options.keepDocker) {
         try {
-          const { stopCollectorOnly: stopCollectorOnly2 } = await import("./docker-XNAP7B5H.js");
+          const { stopCollectorOnly: stopCollectorOnly2 } = await import("./docker-7QONH2B5.js");
           stopCollectorOnly2();
           result.docker.stopped = true;
           if (!isJson) {
@@ -11177,7 +11322,7 @@ function registerTeardownCommand(program) {
         info("Shared stack: kept running (other projects may use it)");
       }
     } else if (isLegacyStack) {
-      const { isStackRunning: isStackRunning2, stopStack } = await import("./docker-XNAP7B5H.js");
+      const { isStackRunning: isStackRunning2, stopStack } = await import("./docker-7QONH2B5.js");
       let stackRunning = false;
       try {
         stackRunning = isStackRunning2(composeFile);
@@ -13408,11 +13553,38 @@ function classifyError(err) {
   }
   return "UNKNOWN";
 }
-function mapSdkMessage(message) {
+function mapSdkMessages(message) {
   const type = message.type;
+  const events = [];
+  if (type === "assistant") {
+    const msg = message.message;
+    if (!msg) return events;
+    const content = msg.content;
+    if (!Array.isArray(content)) return events;
+    for (const block of content) {
+      if (block.type === "tool_use") {
+        const name = block.name;
+        const id = block.id;
+        const input = block.input;
+        if (typeof name === "string") {
+          events.push({ type: "tool-start", name, id: typeof id === "string" ? id : "" });
+          if (input != null) {
+            events.push({ type: "tool-input", partial: typeof input === "string" ? input : JSON.stringify(input) });
+          }
+          events.push({ type: "tool-complete" });
+        }
+      } else if (block.type === "text") {
+        const text = block.text;
+        if (typeof text === "string" && text.length > 0) {
+          events.push({ type: "text", text });
+        }
+      }
+    }
+    return events;
+  }
   if (type === "stream_event") {
     const event = message.event;
-    if (!event || typeof event !== "object") return null;
+    if (!event || typeof event !== "object") return events;
     const eventType = event.type;
     if (eventType === "content_block_start") {
       const contentBlock = event.content_block;
@@ -13420,34 +13592,26 @@ function mapSdkMessage(message) {
         const name = contentBlock.name;
         const id = contentBlock.id;
         if (typeof name === "string" && typeof id === "string") {
-          return { type: "tool-start", name, id };
+          events.push({ type: "tool-start", name, id });
         }
       }
-      return null;
+      return events;
     }
     if (eventType === "content_block_delta") {
       const delta = event.delta;
-      if (!delta) return null;
-      if (delta.type === "input_json_delta") {
-        const partialJson = delta.partial_json;
-        if (typeof partialJson === "string") {
-          return { type: "tool-input", partial: partialJson };
-        }
-        return null;
+      if (!delta) return events;
+      if (delta.type === "input_json_delta" && typeof delta.partial_json === "string") {
+        events.push({ type: "tool-input", partial: delta.partial_json });
+      } else if (delta.type === "text_delta" && typeof delta.text === "string") {
+        events.push({ type: "text", text: delta.text });
       }
-      if (delta.type === "text_delta") {
-        const text = delta.text;
-        if (typeof text === "string") {
-          return { type: "text", text };
-        }
-        return null;
-      }
-      return null;
+      return events;
     }
     if (eventType === "content_block_stop") {
-      return { type: "tool-complete" };
+      events.push({ type: "tool-complete" });
+      return events;
     }
-    return null;
+    return events;
   }
   if (type === "system") {
     const subtype = message.subtype;
@@ -13455,12 +13619,12 @@ function mapSdkMessage(message) {
       const attempt = message.attempt;
       const delay = message.retry_delay_ms;
       if (typeof attempt === "number" && typeof delay === "number") {
-        return { type: "retry", attempt, delay };
+        events.push({ type: "retry", attempt, delay });
       }
     }
-    return null;
+    return events;
   }
-  return null;
+  return events;
 }
 var ClaudeCodeDriver = class {
   name = "claude-code";
@@ -13521,8 +13685,7 @@ var ClaudeCodeDriver = class {
           yieldedResult = true;
           continue;
         }
-        const streamEvent = mapSdkMessage(msg);
-        if (streamEvent) {
+        for (const streamEvent of mapSdkMessages(msg)) {
           yield streamEvent;
         }
       }
@@ -14055,7 +14218,7 @@ function registerDriversCommand(program) {
 }
 
 // src/index.ts
-var VERSION = true ? "0.29.3" : "0.0.0-dev";
+var VERSION = true ? "0.30.0" : "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.29.3",
+  "version": "0.30.0",
   "type": "module",
   "description": "CLI for codeharness — makes autonomous coding agents produce software that actually works",
   "bin": {