executant 1.10.1 → 1.11.0

package/dist/index.js

@@ -70,7 +70,9 @@ function stripPromptHeader(raw) {
   return raw.replace(/^(#[^\n]*\n)+\n?/, "").trim();
 }
 function loadPrompt(name) {
-  return stripPromptHeader(readFileSync(join(PROMPTS_DIR, `${name}.txt`), "utf8"));
+  return stripPromptHeader(
+    readFileSync(join(PROMPTS_DIR, `${name}.txt`), "utf8")
+  );
 }
 function findOutermostBraces(text) {
   const start = text.indexOf("{");
@@ -110,6 +112,29 @@ function formatTimestamp(d) {
 function timestamp() {
   return formatTimestamp(/* @__PURE__ */ new Date());
 }
+var ANSI_RE = /\x1B(?:\[[0-9;?]*[A-Za-z]|\][^\x07]*\x07)|[\r]/g;
+function stripAnsi(s) {
+  return s.replace(ANSI_RE, "");
+}
+var TOOL_ARG = {
+  Read: (i) => String(i["file_path"] ?? i["path"] ?? ""),
+  Edit: (i) => String(i["file_path"] ?? ""),
+  Write: (i) => String(i["file_path"] ?? ""),
+  Bash: (i) => String(i["command"] ?? ""),
+  Glob: (i) => String(i["pattern"] ?? ""),
+  Grep: (i) => String(i["pattern"] ?? "")
+};
+function getToolArg(tool, input) {
+  const fn = TOOL_ARG[tool];
+  return fn ? fn(input) : JSON.stringify(input);
+}
+function formatToolCall(tool, input) {
+  const fn = TOOL_ARG[tool];
+  return fn ? `${tool}(${fn(input)})` : JSON.stringify({ tool, ...input });
+}
+function normalizeError(err) {
+  return err instanceof Error ? err : new Error(String(err));
+}
 
 // src/load-workflow.ts
 import { z } from "zod";
@@ -487,10 +512,6 @@ function buildExitError(code, plainLines) {
 ${plainLines.join("\n")}` : "";
   return new Error(`claude exited with code ${code}${detail}`);
 }
-var ANSI_RE = /\x1B\[[0-9;]*[A-Za-z]|\x1B\][^\x07]*\x07|\r/g;
-function stripAnsi(s) {
-  return s.replace(ANSI_RE, "");
-}
 function isObject(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
@@ -539,7 +560,7 @@ function shouldSkipStep(stepNumber, name, options2) {
     const matchByIndex = /^\d+$/.test(options2.stepFilter) && parseInt(options2.stepFilter, 10) === stepNumber;
     return !matchByIndex && name !== options2.stepFilter;
   }
-  return options2.fromStep !== void 0 && stepNumber < options2.fromStep;
+  return options2.fromStep !== void 0 && stepNumber < options2.fromStep[0];
 }
 async function* runWorkflow(workflow2, options2 = {}) {
   const workflowStart = Date.now();
@@ -552,8 +573,9 @@ async function* runWorkflow(workflow2, options2 = {}) {
     }
     const stepStart = Date.now();
     yield { type: "step:start", index: i, name: task.name };
+    const from = options2.fromStep && options2.fromStep[0] === stepNumber ? options2.fromStep.slice(1) : void 0;
     try {
-      for await (const event of runStep(task)) {
+      for await (const event of runStep(task, from)) {
         if (event.type === "step:iteration" || event.type === "step:inner" || event.type === "output:text" || event.type === "output:tool") {
           yield { ...event, index: i };
         } else {
@@ -567,7 +589,7 @@ async function* runWorkflow(workflow2, options2 = {}) {
         durationMs: Date.now() - stepStart
       };
     } catch (err) {
-      const error = err instanceof Error ? err : new Error(String(err));
+      const error = normalizeError(err);
       yield { type: "step:error", index: i, name: task.name, error };
       if (!task.continueOnError) throw error;
     }
@@ -578,7 +600,7 @@ async function* runWorkflow(workflow2, options2 = {}) {
     durationMs: Date.now() - workflowStart
   };
 }
-async function* runStep(task) {
+async function* runStep(task, from) {
   switch (task.type) {
     case "log":
       yield* runLog(task);
@@ -601,7 +623,7 @@ async function* runStep(task) {
       break;
     }
     case "forEach":
-      yield* runForEach(task);
+      yield* runForEach(task, from);
       break;
     default: {
       const _ = task;
@@ -612,32 +634,40 @@ async function* runStep(task) {
 async function* runLog(task) {
   yield { type: "output:text", index: -1, text: task.message };
 }
-async function* runForEach(task) {
+async function* runForEach(task, from) {
   const items = await resolveItems(task.forEach);
   const total = items.length;
   const innerTotal = task.inner.length;
+  const startIteration = from?.[0] ?? 1;
   for (const [i, item] of items.entries()) {
-    yield { type: "step:iteration", index: -1, item, iteration: i + 1, total };
+    const iteration = i + 1;
+    if (iteration < startIteration) continue;
+    yield { type: "step:iteration", index: -1, item, iteration, total };
+    const iterFrom = iteration === startIteration ? from?.slice(1) : void 0;
+    const startChild = iterFrom?.[0] ?? 1;
     for (const [j, innerTask] of task.inner.entries()) {
+      const childIdx = j + 1;
+      if (childIdx < startChild) continue;
       const substituted = substituteItem(innerTask, item);
       if (innerTotal > 1) {
         yield {
           type: "step:inner",
           index: -1,
-          iteration: i + 1,
+          iteration,
           innerIndex: j,
           innerTotal,
           name: substituted.name
         };
       }
+      const childFrom = childIdx === startChild ? iterFrom?.slice(1) : void 0;
       try {
-        for await (const event of runStep(substituted)) {
+        for await (const event of runStep(substituted, childFrom)) {
           if (event.type !== "step:iteration" && event.type !== "step:inner") {
             yield event;
           }
         }
       } catch (err) {
-        const error = err instanceof Error ? err : new Error(String(err));
+        const error = normalizeError(err);
         if (!substituted.continueOnError) {
           yield {
             type: "log",
@@ -860,12 +890,6 @@ function buildJudgePrompt(stepName, instructions, output) {
     OUTPUT: output
   });
 }
-function formatToolCall(tool, input) {
-  if (tool === "Edit" || tool === "Write")
-    return `${tool}(${String(input["file_path"] ?? "")})`;
-  if (tool === "Bash") return `Bash(${String(input["command"] ?? "")})`;
-  return tool;
-}
 function buildFixSummary(toolCalls, claudeLines) {
   if (toolCalls.length > 0) return toolCalls.join(", ");
   return claudeLines.join(" ").trim() || "No changes made";
@@ -956,10 +980,10 @@ function reducer(state, event) {
         startTime: Date.now()
       });
     case "step:complete": {
-      const prev = state.tasks[event.index]?.iterationHistory;
-      const iterationHistory = prev?.length ? prev.map(
-        (r) => r.status === "running" ? { ...r, status: "complete", endTime: Date.now() } : r
-      ) : void 0;
+      const iterationHistory = finalizeIterations(
+        state.tasks[event.index]?.iterationHistory,
+        "complete"
+      );
       return {
         ...updateTask(state, event.index, {
           status: "complete",
@@ -970,10 +994,10 @@ function reducer(state, event) {
       };
     }
     case "step:error": {
-      const prev = state.tasks[event.index]?.iterationHistory;
-      const iterationHistory = prev?.length ? prev.map(
-        (r) => r.status === "running" ? { ...r, status: "error", endTime: Date.now() } : r
-      ) : void 0;
+      const iterationHistory = finalizeIterations(
+        state.tasks[event.index]?.iterationHistory,
+        "error"
+      );
       return {
         ...updateTask(state, event.index, {
           status: "error",
@@ -990,9 +1014,10 @@ function reducer(state, event) {
         currentIndex: event.index + 1
       };
     case "step:iteration": {
-      const prev = (state.tasks[event.index]?.iterationHistory ?? []).map(
-        (r) => r.status === "running" ? { ...r, status: "complete", endTime: Date.now() } : r
-      );
+      const prev = finalizeIterations(
+        state.tasks[event.index]?.iterationHistory,
+        "complete"
+      ) ?? [];
       return updateTask(state, event.index, {
         iterationHistory: [
           ...prev,
@@ -1028,7 +1053,7 @@ function reducer(state, event) {
       const idx = event.index;
       if (idx >= state.tasks.length) return state;
       const formatted = formatToolCall2(event.tool, event.input);
-      const next = formatted ? appendLine(state, idx, formatted) : state;
+      const next = formatted ? appendLines(state, idx, formatted) : state;
       if (event.tool === "Write" && typeof event.input["file_path"] === "string") {
         return {
           ...next,
@@ -1055,10 +1080,15 @@ function reducer(state, event) {
     }
   }
 }
-var ANSI_RE2 = /\x1B(?:\[[0-9;?]*[A-Za-z]|\][^\x07]*\x07)|[\r]/g;
 var MAX_LOG_LINES = 300;
 function normalizeLines(text) {
-  return text.replace(ANSI_RE2, "").split("\n");
+  return stripAnsi(text).split("\n");
+}
+function finalizeIterations(prev, status) {
+  if (!prev?.length) return void 0;
+  return prev.map(
+    (r) => r.status === "running" ? { ...r, status, endTime: Date.now() } : r
+  );
 }
 function updateTask(state, index, patch) {
   const tasks = state.tasks.map(
@@ -1066,9 +1096,6 @@ function updateTask(state, index, patch) {
   );
   return { ...state, tasks };
 }
-function appendLine(state, index, line) {
-  return appendLines(state, index, line);
-}
 function appendLines(state, index, text) {
   const newLines = normalizeLines(text);
   const tasks = state.tasks.map((t, i) => {
@@ -1124,6 +1151,9 @@ var STATUS_COLOR = {
   error: theme.error,
   pending: theme.muted
 };
+function statusIcon(status, tick) {
+  return status === "running" ? SPINNER[tick % SPINNER.length] : STATUS_ICON[status] ?? "\xB7";
+}
 var EXIT_DELAY_MS = 300;
 function formatHeaderElapsed(start, end) {
   const ms = (end ?? Date.now()) - start;
@@ -1158,9 +1188,6 @@ function TaskRow({ taskState, isActive, index, tick }) {
     ] })
   ] });
 }
-function statusIcon(status, tick) {
-  return status === "running" ? SPINNER[tick % SPINNER.length] : STATUS_ICON[status] ?? "\xB7";
-}
 function statusColor(status, isActive) {
   if (isActive && status === "running") return theme.primary;
   return STATUS_COLOR[status] ?? theme.foreground;
@@ -1177,7 +1204,7 @@ function formatIterCount(history) {
 import { Box as Box2, Text as Text2 } from "ink";
 import { Fragment, jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 function IterationRow({ record, tick }) {
-  const icon = record.status === "running" ? SPINNER[tick % SPINNER.length] : STATUS_ICON[record.status] ?? "\xB7";
+  const icon = statusIcon(record.status, tick);
   const color = STATUS_COLOR[record.status] ?? theme.primary;
   const innerText = record.inner ? ` \u2014 ${stripItem(record.inner.name, record.item)} [${record.inner.index + 1}/${record.inner.total}]` : "";
   const ms = (record.endTime ?? Date.now()) - record.startTime;
@@ -2056,17 +2083,6 @@ var INIT_STATE = {
   judgeAttempt: 0,
   recentOutput: []
 };
-var TOOL_SUMMARY = {
-  Read: (i) => String(i["file_path"] ?? i["path"] ?? ""),
-  Edit: (i) => String(i["file_path"] ?? ""),
-  Write: (i) => String(i["file_path"] ?? ""),
-  Bash: (i) => String(i["command"] ?? ""),
-  Glob: (i) => String(i["pattern"] ?? ""),
-  Grep: (i) => String(i["pattern"] ?? "")
-};
-function toolSummary(tool, input) {
-  return (TOOL_SUMMARY[tool] ?? ((i) => JSON.stringify(i)))(input);
-}
 function appendLog(logFile, text) {
   if (logFile) appendFileSync(logFile, text + "\n");
 }
@@ -2138,21 +2154,21 @@ Step failed: ${error.message}
   finalizeComplexSequence(s);
   return s;
 }
-function complexSequenceHeader(ctx, s) {
+function buildHighlightHeader(ctx, s, title, extra = []) {
   return [
-    "# Complex Tool Sequence",
+    `# ${title}`,
     "",
     `**Task:** ${ctx.slug}`,
     `**Step:** ${s.stepName}`,
+    ...extra,
     `**Timestamp:** ${(/* @__PURE__ */ new Date()).toISOString()}`,
     "",
     "---",
-    "",
-    "## Claude's Tool Orchestration",
-    "",
-    "Claude used multiple tools to complete this step:",
     ""
-  ].join("\n");
+  ].join("\n") + "\n";
+}
+function complexSequenceHeader(ctx, s) {
+  return buildHighlightHeader(ctx, s, "Complex Tool Sequence") + "## Claude's Tool Orchestration\n\nClaude used multiple tools to complete this step:\n\n";
 }
 function createComplexSequenceFile(ctx, s) {
   const path = highlightPath(ctx, s.stepIndex, "complex_sequence");
@@ -2160,7 +2176,7 @@ function createComplexSequenceFile(ctx, s) {
   return path;
 }
 function onTool(ctx, s, tool, input) {
-  const desc = toolSummary(tool, input);
+  const desc = getToolArg(tool, input);
   appendLog(s.logFile, `   [${tool}] ${desc}`);
   const toolCount = s.toolCount + 1;
   const complexSequenceFile = toolCount === 3 ? createComplexSequenceFile(ctx, s) : s.complexSequenceFile;
@@ -2176,23 +2192,9 @@ function onTool(ctx, s, tool, input) {
 function saveJudgeHighlight(ctx, s, verdict, text) {
   writeFileSync3(
     highlightPath(ctx, s.stepIndex, `judge_${verdict}`),
-    [
-      `# Judge Verdict: ${verdict}`,
-      "",
-      `**Task:** ${ctx.slug}`,
-      `**Step:** ${s.stepName}`,
-      `**Attempt:** ${s.judgeAttempt}`,
-      `**Timestamp:** ${(/* @__PURE__ */ new Date()).toISOString()}`,
-      "",
-      "---",
-      "",
-      text,
-      "",
-      "---",
-      "",
-      "*Auto-captured*",
-      ""
-    ].join("\n")
+    buildHighlightHeader(ctx, s, `Judge Verdict: ${verdict}`, [
+      `**Attempt:** ${s.judgeAttempt}`
+    ]) + [text, "", "---", "", "*Auto-captured*", ""].join("\n")
   );
 }
 var LOG_MATCHERS = [
@@ -2207,19 +2209,11 @@ var LOG_MATCHERS = [
   },
   {
     pattern: /\[self-healing\].*failed.*exit\s+(\d+)/i,
-    apply: (ctx, s, text, match) => {
+    apply: (ctx, s, _text, match) => {
       const selfHealingFile = highlightPath(ctx, s.stepIndex, "self_healing");
       writeFileSync3(
         selfHealingFile,
-        [
-          "# Self-Healing Activation",
-          "",
-          `**Task:** ${ctx.slug}`,
-          `**Step:** ${s.stepName}`,
-          `**Timestamp:** ${(/* @__PURE__ */ new Date()).toISOString()}`,
-          "",
-          "---",
-          "",
+        buildHighlightHeader(ctx, s, "Self-Healing Activation") + [
           "## \u274C Failure Detected",
           "",
           `**Exit Code:** ${match[1]}`,
@@ -2266,14 +2260,15 @@ var LOG_MATCHERS = [
 ];
 function onLogMessage(ctx, s, level, text) {
   appendLog(s.logFile, `[${level}] ${text}`);
-  return LOG_MATCHERS.reduce(
-    ({ matched, state }, { pattern, apply }) => {
-      if (matched) return { matched, state };
-      const m = pattern.exec(text);
-      return m ? { matched: true, state: apply(ctx, state, text, m) } : { matched, state };
-    },
-    { matched: false, state: s }
-  ).state;
+  let state = s;
+  for (const { pattern, apply } of LOG_MATCHERS) {
+    const m = pattern.exec(text);
+    if (m) {
+      state = apply(ctx, state, text, m);
+      break;
+    }
+  }
+  return state;
 }
 function onWorkflowComplete(ctx, s) {
   appendLog(
@@ -2596,7 +2591,7 @@ Version: ${CURRENT_VERSION}
 Options:
   --ci                  Headless mode \u2014 print events as NDJSON, no TUI
   --step <name|index>   Run only the named step or step at 1-based index
-  --from-step <n>       Skip steps before n and run from there (1-based)
+  --from-step <n>       Resume from step n (e.g. 3, 3.2, 2.5.4.3 \u2014 1-based path)
   --help, -h            Show this help
 
 Commands:
@@ -2678,11 +2673,15 @@ for (let i = 0; i < rawArgs.length; i++) {
       console.error("--from-step requires a value");
       process.exit(1);
     }
-    fromStep = parseInt(rawArgs[++i], 10);
-    if (isNaN(fromStep)) {
-      console.error("--from-step must be a number");
+    const raw = rawArgs[++i];
+    const parts = raw.split(".").map(Number);
+    if (parts.some(Number.isNaN) || parts.some((p) => p < 1)) {
+      console.error(
+        "--from-step must be N or N.M.K... (all 1-based, e.g. 3 or 3.2 or 2.5.4.3)"
+      );
       process.exit(1);
     }
+    fromStep = parts;
   } else {
     positional.push(a);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "executant",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "description": "Harness for YAML-defined workflows that enables stepping through Claude sessions and bash commands",
   "repository": {
     "type": "git",