nightralph 0.0.27 → 0.0.31

package/dist/meta.json

@@ -142,7 +142,7 @@
       "format": "esm"
     },
     "src/orchestrator.ts": {
-      "bytes": 57999,
+      "bytes": 59897,
       "imports": [
         {
           "path": "node:child_process",
@@ -234,7 +234,7 @@
       "format": "esm"
     },
     "src/index.ts": {
-      "bytes": 10283,
+      "bytes": 10237,
       "imports": [
         {
           "path": "node:fs",
@@ -305,7 +305,7 @@
       "imports": [],
       "exports": [],
       "inputs": {},
-      "bytes": 165317
+      "bytes": 168087
     },
     "dist/index.js": {
       "imports": [
@@ -462,13 +462,13 @@
       "entryPoint": "src/index.ts",
       "inputs": {
         "src/index.ts": {
-          "bytesInOutput": 6890
+          "bytesInOutput": 6851
         },
         "src/setup.ts": {
           "bytesInOutput": 4265
         },
         "src/orchestrator.ts": {
-          "bytesInOutput": 40993
+          "bytesInOutput": 42217
         },
         "src/worktree.ts": {
           "bytesInOutput": 3788
@@ -489,7 +489,7 @@
           "bytesInOutput": 1937
         }
       },
-      "bytes": 77575
+      "bytes": 78760
     }
   }
 }

package/dist/orchestrator.js

@@ -318,7 +318,26 @@ function getProviderArgs(cmd) {
   return PROVIDER_ARGS[name] ?? [];
 }
 __name(getProviderArgs, "getProviderArgs");
-const THINKING_LEVELS = [
+const EFFORT_LADDERS = {
+  pi: [
+    "off",
+    "minimal",
+    "low",
+    "medium",
+    "high",
+    "xhigh",
+    "max"
+  ],
+  claude: [
+    "low",
+    "medium",
+    "high",
+    "xhigh",
+    "max"
+  ],
+  codex: ["low", "medium", "high"]
+};
+const ALL_EFFORT_LEVELS = [
   "off",
   "minimal",
   "low",
@@ -327,12 +346,14 @@ const THINKING_LEVELS = [
   "xhigh",
   "max"
 ];
-function escalateThinking(level) {
+function escalateEffort(provider, level) {
   if (!level) return "high";
-  const i = THINKING_LEVELS.indexOf(level);
-  return THINKING_LEVELS[Math.min(i + 1, THINKING_LEVELS.length - 1)];
+  const ladder = EFFORT_LADDERS[provider];
+  const i = ladder.indexOf(level);
+  if (i === -1) return level;
+  return ladder[Math.min(i + 1, ladder.length - 1)];
 }
-__name(escalateThinking, "escalateThinking");
+__name(escalateEffort, "escalateEffort");
 function formatStreamLine(line) {
   let obj;
   try {
@@ -468,14 +489,39 @@ function spawnAgent(opts) {
   if (opts.model) {
     args.push("--model", opts.model);
   }
-  if (opts.maxTurns) {
-    args.push("--max-turns", String(opts.maxTurns));
-  }
   const providerName = basename(opts.agentCmd);
   const isClaude = providerName === "claude";
   const isPi = providerName === "pi";
-  if (isPi && opts.thinking) {
-    args.push("--thinking", opts.thinking);
+  if (opts.maxTurns) {
+    if (isClaude) {
+      args.push(
+        "--max-turns",
+        String(opts.maxTurns)
+      );
+    } else if (opts.onLine) {
+      opts.onLine(
+        `Warning: --max-turns not supported by ${providerName}, skipping`
+      );
+    }
+  }
+  if (opts.effort && providerName in EFFORT_LADDERS) {
+    const ladder = EFFORT_LADDERS[providerName];
+    if (!ladder.includes(opts.effort)) {
+      if (opts.onLine) {
+        opts.onLine(
+          `Warning: effort '${opts.effort}' not supported by ${providerName}, skipping`
+        );
+      }
+    } else if (isPi) {
+      args.push("--thinking", opts.effort);
+    } else if (isClaude) {
+      args.push("--effort", opts.effort);
+    } else if (providerName === "codex") {
+      args.push(
+        "-c",
+        `model_reasoning_effort=${opts.effort}`
+      );
+    }
   }
   const prefix = opts.label ? `  [${opts.label}] ` : "  ";
   let promptFile = null;
@@ -706,7 +752,7 @@ Prompt for first ready ticket (${firstReady[0].filename}):
 Test command: ${opts.testCmd ?? "(none)"}`
   );
   console.log(
-    `Thinking:     ${opts.thinking ?? "(provider default)"}`
+    `Effort:       ${opts.effort ?? "(provider default)"}`
   );
   console.log(
     `Retries:      ${opts.retries ?? DEFAULT_RETRIES}`
@@ -835,7 +881,7 @@ async function respawnAndRetryMerge(opts) {
   return mergeResult.success;
 }
 __name(respawnAndRetryMerge, "respawnAndRetryMerge");
-const DEFAULT_RETRIES = 2;
+const DEFAULT_RETRIES = 3;
 const DEFAULT_RETRY_DELAY = 30;
 function retryDelayFor(base, attempt) {
   return base * 2 ** (attempt - 2);
@@ -883,7 +929,7 @@ async function runTicketAttempt(opts) {
     cwd: worktree.worktreePath,
     label: ticket.filename.replace(/\.md$/, ""),
     maxTurns: opts.maxTurns,
-    thinking: opts.thinking,
+    effort: opts.effort,
     onLine: /* @__PURE__ */ __name((line) => d.log(line), "onLine")
   });
   if (agentResult.timedOut) {
@@ -962,8 +1008,9 @@ __name(runTicketAttempt, "runTicketAttempt");
 async function runTicketAttempts(opts) {
   const { ticket, d } = opts;
   const maxAttempts = opts.retries + 1;
-  const isPi = basename(opts.agentCmd) === "pi";
-  let thinking = opts.thinking;
+  const providerName = basename(opts.agentCmd);
+  const isKnown = providerName in EFFORT_LADDERS;
+  let effort = opts.effort;
   let outcome = {
     kind: "no-commits",
     worktreePath: "",
@@ -973,10 +1020,15 @@ async function runTicketAttempts(opts) {
     if (attempt === 1) {
       d.log(`  Starting ${ticket.filename}`);
     } else {
-      thinking = escalateThinking(thinking);
+      if (isKnown) {
+        effort = escalateEffort(
+          providerName,
+          effort
+        );
+      }
       const delay = retryDelayFor(opts.retryDelay, attempt);
       d.log(
-        `  ${ticket.filename}: retrying (attempt ${attempt}/${maxAttempts}` + (isPi ? `, thinking ${thinking}` : "") + (delay > 0 ? `, waiting ${delay}s` : "") + ")"
+        `  ${ticket.filename}: retrying (attempt ${attempt}/${maxAttempts}` + (isKnown && effort ? `, effort ${effort}` : "") + (delay > 0 ? `, waiting ${delay}s` : "") + ")"
       );
       if (delay > 0) await sleep(delay * 1e3);
     }
@@ -984,7 +1036,7 @@ async function runTicketAttempts(opts) {
       outcome = await runTicketAttempt({
         ...opts,
         attempt,
-        thinking
+        effort
       });
     } catch (error) {
       d.log(
@@ -1017,12 +1069,13 @@ function runProgress(tickets) {
   };
 }
 __name(runProgress, "runProgress");
-async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, display, maxTurns, thinking, retries, retryDelay) {
+async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, display, maxTurns, effort, retries, retryDelay) {
   mkdirSync(logsDir, { recursive: true });
   const d = display ?? createDisplay();
   const maxAttempts = (retries ?? DEFAULT_RETRIES) + 1;
   const delayBase = retryDelay ?? 0;
-  const isPi = basename(agentCmd) === "pi";
+  const providerName = basename(agentCmd);
+  const isKnown = providerName in EFFORT_LADDERS;
   let totalWaves = 0;
   for (const _ of simulateWaves(tickets)) totalWaves++;
   let totalCompleted = 0;
@@ -1060,7 +1113,7 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, di
         );
         d.setTicketStatus(t.num, "in-progress");
         d.log(`  Starting ${t.filename}`);
-        let level = thinking;
+        let level = effort;
         let result = await spawnAgent({
           prompt,
           agentCmd,
@@ -1069,14 +1122,19 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, di
           logPath: attemptLogPath(logsDir, t, 1, ".log"),
           label,
           maxTurns,
-          thinking: level,
+          effort: level,
           onLine: /* @__PURE__ */ __name((line) => d.log(line), "onLine")
         });
         for (let attempt = 2; result.exitCode !== 0 && !result.timedOut && attempt <= maxAttempts; attempt++) {
-          level = escalateThinking(level);
+          if (isKnown) {
+            level = escalateEffort(
+              providerName,
+              level
+            );
+          }
           const delay = retryDelayFor(delayBase, attempt);
           d.log(
-            `  ${t.filename}: agent exited ${result.exitCode}; retrying (attempt ${attempt}/${maxAttempts}` + (isPi ? `, thinking ${level}` : "") + (delay > 0 ? `, waiting ${delay}s` : "") + ")"
+            `  ${t.filename}: agent exited ${result.exitCode}; retrying (attempt ${attempt}/${maxAttempts}` + (isKnown && level ? `, effort ${level}` : "") + (delay > 0 ? `, waiting ${delay}s` : "") + ")"
           );
           if (delay > 0) await sleep(delay * 1e3);
           result = await spawnAgent({
@@ -1092,7 +1150,7 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, di
             ),
             label,
             maxTurns,
-            thinking: level,
+            effort: level,
             onLine: /* @__PURE__ */ __name((line) => d.log(line), "onLine")
           });
         }
@@ -1210,7 +1268,7 @@ async function runWavesIsolated(opts) {
         logsDir: opts.logsDir,
         testCmd: opts.testCmd,
         maxTurns: opts.maxTurns,
-        thinking: opts.thinking,
+        effort: opts.effort,
         retries,
         retryDelay,
         d
@@ -1473,17 +1531,18 @@ Finished: ${totalCompleted} completed` + (remaining.length > 0 ? `, ${remaining.
 }
 __name(runWavesIsolated, "runWavesIsolated");
 export {
+  ALL_EFFORT_LEVELS,
   COMPLETED_RE,
   DEFAULT_RETRIES,
   DEFAULT_RETRY_DELAY,
-  THINKING_LEVELS,
+  EFFORT_LADDERS,
   TICKET_RE,
   TOOL_USE_RE,
   checkItems,
   createPiStreamFormatter,
   dryRun,
   dryRunIsolated,
-  escalateThinking,
+  escalateEffort,
   findReadyTickets,
   formatErrorMessage,
   formatStreamLine,