nightralph 0.0.27 → 0.0.29

package/dist/index.js

@@ -1359,7 +1359,32 @@ function getProviderArgs(cmd) {
   return PROVIDER_ARGS[name] ?? [];
 }
 __name(getProviderArgs, "getProviderArgs");
-var THINKING_LEVELS = [
+var EFFORT_LADDERS = {
+  pi: [
+    "off",
+    "minimal",
+    "low",
+    "medium",
+    "high",
+    "xhigh",
+    "max"
+  ],
+  claude: [
+    "low",
+    "medium",
+    "high",
+    "xhigh",
+    "max"
+  ],
+  codex: [
+    "minimal",
+    "low",
+    "medium",
+    "high",
+    "xhigh"
+  ]
+};
+var ALL_EFFORT_LEVELS = [
   "off",
   "minimal",
   "low",
@@ -1368,12 +1393,14 @@ var 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 {
@@ -1515,8 +1542,21 @@ function spawnAgent(opts) {
   const providerName = basename2(opts.agentCmd);
   const isClaude = providerName === "claude";
   const isPi = providerName === "pi";
-  if (isPi && opts.thinking) {
-    args.push("--thinking", opts.thinking);
+  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("-e", opts.effort);
+    }
   }
   const prefix = opts.label ? `  [${opts.label}] ` : "  ";
   let promptFile = null;
@@ -1747,7 +1787,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}`
@@ -1876,7 +1916,7 @@ async function respawnAndRetryMerge(opts) {
   return mergeResult.success;
 }
 __name(respawnAndRetryMerge, "respawnAndRetryMerge");
-var DEFAULT_RETRIES = 2;
+var DEFAULT_RETRIES = 3;
 var DEFAULT_RETRY_DELAY = 30;
 function retryDelayFor(base, attempt) {
   return base * 2 ** (attempt - 2);
@@ -1924,7 +1964,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) {
@@ -2003,8 +2043,9 @@ __name(runTicketAttempt, "runTicketAttempt");
 async function runTicketAttempts(opts) {
   const { ticket, d } = opts;
   const maxAttempts = opts.retries + 1;
-  const isPi = basename2(opts.agentCmd) === "pi";
-  let thinking = opts.thinking;
+  const providerName = basename2(opts.agentCmd);
+  const isKnown = providerName in EFFORT_LADDERS;
+  let effort = opts.effort;
   let outcome = {
     kind: "no-commits",
     worktreePath: "",
@@ -2014,10 +2055,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);
     }
@@ -2025,7 +2071,7 @@ async function runTicketAttempts(opts) {
       outcome = await runTicketAttempt({
         ...opts,
         attempt,
-        thinking
+        effort
       });
     } catch (error) {
       d.log(
@@ -2058,12 +2104,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) {
   mkdirSync2(logsDir, { recursive: true });
   const d = display ?? createDisplay();
   const maxAttempts = (retries ?? DEFAULT_RETRIES) + 1;
   const delayBase = retryDelay ?? 0;
-  const isPi = basename2(agentCmd) === "pi";
+  const providerName = basename2(agentCmd);
+  const isKnown = providerName in EFFORT_LADDERS;
   let totalWaves = 0;
   for (const _ of simulateWaves(tickets)) totalWaves++;
   let totalCompleted = 0;
@@ -2101,7 +2148,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,
@@ -2110,14 +2157,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({
@@ -2133,7 +2185,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")
           });
         }
@@ -2251,7 +2303,7 @@ async function runWavesIsolated(opts) {
         logsDir: opts.logsDir,
         testCmd: opts.testCmd,
         maxTurns: opts.maxTurns,
-        thinking: opts.thinking,
+        effort: opts.effort,
         retries,
         retryDelay,
         d
@@ -2662,14 +2714,14 @@ yargs(hideBin(process.argv)).scriptName("nightralph").usage("$0 <command>").comm
   }).option("max-turns", {
     type: "number",
     describe: "Max agentic turns per ticket (forwarded to the agent CLI)"
-  }).option("thinking", {
+  }).option("effort", {
     type: "string",
-    choices: THINKING_LEVELS,
-    describe: "Starting thinking level for the pi provider. Omitted = pi's default. Retries step up from here."
+    choices: ALL_EFFORT_LEVELS,
+    describe: "Starting effort level. Omitted = provider default. Retries step up from here."
   }).option("retries", {
     type: "number",
     default: DEFAULT_RETRIES,
-    describe: "Extra attempts per ticket after a failed run, each with a higher thinking level (pi). 0 disables retries."
+    describe: "Extra attempts per ticket after a failed run, each with a higher effort level. 0 disables retries."
   }).option("retry-delay", {
     type: "number",
     default: DEFAULT_RETRY_DELAY,
@@ -2685,7 +2737,7 @@ yargs(hideBin(process.argv)).scriptName("nightralph").usage("$0 <command>").comm
       testCmd: argv.testCmd,
       stopOnConflict: argv.X,
       maxTurns: argv.maxTurns ?? argv.turns,
-      thinking: argv.thinking,
+      effort: argv.effort,
       retries: argv.retries,
       retryDelay: argv.retryDelay
     });
@@ -2768,7 +2820,7 @@ async function runExecute(argv) {
         conflictStrategy,
         progressPath,
         testCmd,
-        thinking: argv.thinking,
+        effort: argv.effort,
         retries: argv.retries,
         retryDelay: argv.retryDelay
       });
@@ -2800,7 +2852,7 @@ async function runExecute(argv) {
       display,
       testCmd,
       maxTurns: argv.maxTurns,
-      thinking: argv.thinking,
+      effort: argv.effort,
       retries: argv.retries,
       retryDelay: argv.retryDelay
     });
@@ -2814,7 +2866,7 @@ async function runExecute(argv) {
       logsDir,
       display,
       argv.maxTurns,
-      argv.thinking,
+      argv.effort,
       argv.retries,
       argv.retryDelay
     );