executant 1.4.3 → 1.4.5

package/dist/index.js

@@ -1295,17 +1295,81 @@ async function runPass3Judge(description, workflow2) {
 function isNumericSequence(arr) {
   return arr.every((item, i) => item === String(i + 1));
 }
+function isLabeledSequence(arr) {
+  if (arr.length < 2) return null;
+  const m = arr[0].match(/^(.+\s)(\d+)$/);
+  if (!m) return null;
+  const prefix = m[1];
+  return arr.every((item, i) => item === `${prefix}${i + 1}`) ? arr.length : null;
+}
+function parseSeqCommand(cmd) {
+  const t = cmd.trim();
+  const shorthand = t.match(/^seq\s+(\d+)$/);
+  if (shorthand) return parseInt(shorthand[1], 10);
+  const explicit = t.match(/^seq\s+1\s+(\d+)$/);
+  if (explicit) return parseInt(explicit[1], 10);
+  return null;
+}
+function extractCountFromName(name) {
+  const m = name.match(/_of_(\d+)/);
+  return m ? parseInt(m[1], 10) : null;
+}
 function normalizeWorkflow(workflow2) {
-  return {
-    ...workflow2,
-    steps: workflow2.steps.map((step) => {
-      if (Array.isArray(step.forEach) && isNumericSequence(step.forEach)) {
+  const steps = workflow2.steps.map((step) => {
+    if (Array.isArray(step.forEach)) {
+      const arr = step.forEach;
+      const isNumeric = isNumericSequence(arr);
+      const labeledN = !isNumeric ? isLabeledSequence(arr) : null;
+      if (isNumeric || labeledN !== null) {
         const { forEach, ...rest } = step;
-        return { ...rest, repeat: forEach.length };
+        return { ...rest, repeat: isNumeric ? arr.length : labeledN };
       }
-      return step;
-    })
-  };
+    }
+    if (typeof step.forEach === "string") {
+      const n = parseSeqCommand(step.forEach);
+      if (n !== null) {
+        const { forEach, ...rest } = step;
+        return { ...rest, repeat: n };
+      }
+    }
+    const prompt = typeof step.prompt === "string" ? step.prompt : "";
+    if (prompt.includes("{{item}}") && step.forEach === void 0 && step.repeat === void 0) {
+      const n = extractCountFromName(step.name);
+      if (n !== null) return { ...step, repeat: n };
+    }
+    return step;
+  });
+  return { ...workflow2, steps: collapseSequentialSteps(steps) };
+}
+function collapseSequentialSteps(steps) {
+  const result = [];
+  let i = 0;
+  while (i < steps.length) {
+    const step = steps[i];
+    if (step.forEach !== void 0 || step.repeat !== void 0) {
+      result.push(step);
+      i++;
+      continue;
+    }
+    const m = step.name.match(/^(.+?)_1$/);
+    if (!m) {
+      result.push(step);
+      i++;
+      continue;
+    }
+    const prefix = m[1];
+    let n = 1;
+    while (i + n < steps.length && steps[i + n].name === `${prefix}_${n + 1}`) n++;
+    if (n < 2) {
+      result.push(step);
+      i++;
+      continue;
+    }
+    const { name, ...rest } = step;
+    result.push({ ...rest, name: `${prefix}_{{item}}`, repeat: n });
+    i += n;
+  }
+  return result;
 }
 async function* streamPlan(args) {
   const { description, taskFile } = args;
@@ -1371,7 +1435,7 @@ async function* streamPlan(args) {
 ${basePrompt}` : basePrompt,
       allowedTools: [],
       permissionMode: "bypassPermissions",
-      model: "opus",
+      model: skipResearch ? "sonnet" : "opus",
       appendSystemPrompt: PLAN_SYSTEM_RULES,
       jsonSchema: WORKFLOW_JSON_SCHEMA
     };

package/dist/prompts/plan-judge.txt

@@ -65,6 +65,8 @@ If the user's goal mentions "N times", "repeat N", "N iterations", or "N passes"
 - Does any step use `forEach` with a sequential numeric array like `["1","2","3","4","5"]`?
 - This is always wrong — `repeat: N` must be used instead of a numeric forEach array
 - Reject and require the offending step be converted to `repeat: N`
+- Does any single step's `prompt` describe doing something "N times" or "across N passes" inline, instead of using `repeat: N`? A step that says "do this 10 times" or "perform N passes" inside its prompt text rather than setting `repeat: N` is wrong — reject it and require it to be restructured as a single-pass prompt with `repeat: N` on the step
+- Are there N consecutive steps with names like `step_1`, `step_2`, `step_3`? Sequential named steps are always wrong when they do the same thing — reject and require a single step with `repeat: N`
 
 ## Output Format
 

package/package.json

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