nightralph 0.0.38 → 0.0.41

package/README.md

@@ -39,6 +39,7 @@ so they can't drift as long as you install the skills with this package.
     + [`pi` + OpenRouter model](#pi--openrouter-model)
     + [`codex` + Luna](#codex--luna)
     + [`codex` + Terra](#codex--terra)
+    + [Mercury](#mercury)
 
 <!-- tocstop -->
 
@@ -300,7 +301,7 @@ keep the machine awake, but the display can still go dark.
 #### Claude Opus 4.6
 
 ```sh
-caffeinate -i npx nightralph claude -m claude-opus-4-6 --effort high
+caffeinate -i npx nightralph claude -m claude-opus-4-6 --effort low
 ```
 
 #### Claude Sonnet 5
@@ -312,13 +313,9 @@ caffeinate -i npx nightralph claude -m claude-sonnet-5 --effort high
 #### `pi` + OpenRouter model
 
 ```sh
-caffeinate -i npx nightralph pi -m openrouter/z-ai/glm-5.3-flash --thinking high
+caffeinate -i npx nightralph pi -m openrouter/z-ai/glm-5.3-flash --effort high
 ```
 
-##### pi `--thinking` levels
-
-`off`, `minimal`, `low`, `medium`,`high`, and `xhigh`
-
 #### `codex` + Luna
 
 ```sh
@@ -328,5 +325,11 @@ caffeinate -i npx nightralph codex -m gpt-5.6-luna --effort high
 #### `codex` + Terra
 
 ```sh
-caffeinate -i npx nightralph codex -m gpt-5.6-luna --effort medium
+caffeinate -i npx nightralph codex -m gpt-5.6-terra --effort medium
+```
+
+#### Mercury
+
+```sh
+caffeinate -i npx nightralph pi -m openrouter/inception/mercury-2.5 --effort high
 ```

package/dist/index.js

@@ -4,7 +4,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 
 // src/index.ts
 import { existsSync as existsSync5, readFileSync as readFileSync5 } from "node:fs";
-import { dirname as dirname3, join as join6 } from "node:path";
+import { dirname as dirname4, join as join6 } from "node:path";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { select as select2 } from "@inquirer/prompts";
@@ -205,14 +205,14 @@ import {
   readdirSync as readdirSync2
 } from "node:fs";
 import { tmpdir } from "node:os";
-import { join as join4, dirname, basename as basename2 } from "node:path";
+import { join as join4, dirname as dirname2, basename as basename2 } from "node:path";
 import { createInterface } from "node:readline";
 import { promisify as promisify4 } from "node:util";
 
 // src/worktree.ts
 import { execFile, execFileSync } from "node:child_process";
 import { promisify } from "node:util";
-import { basename, join as join2 } from "node:path";
+import { basename, dirname, join as join2, resolve } from "node:path";
 import { existsSync as existsSync2 } from "node:fs";
 var execFileAsync = promisify(execFile);
 function getRepoRoot() {
@@ -225,7 +225,12 @@ function getRepoRoot() {
 }
 __name(getRepoRoot, "getRepoRoot");
 function getRepoName() {
-  return basename(getRepoRoot());
+  const commonDir = execFileSync(
+    "git",
+    ["rev-parse", "--git-common-dir"],
+    { encoding: "utf8" }
+  ).trim();
+  return basename(dirname(resolve(commonDir)));
 }
 __name(getRepoName, "getRepoName");
 function getCurrentBranch() {
@@ -237,6 +242,24 @@ function getCurrentBranch() {
   return stdout.trim();
 }
 __name(getCurrentBranch, "getCurrentBranch");
+function branchExistsSync(repoRoot, branchName) {
+  try {
+    execFileSync(
+      "git",
+      [
+        "show-ref",
+        "--verify",
+        "--quiet",
+        `refs/heads/${branchName}`
+      ],
+      { cwd: repoRoot }
+    );
+    return true;
+  } catch {
+    return false;
+  }
+}
+__name(branchExistsSync, "branchExistsSync");
 async function branchExists(repoRoot, branchName) {
   try {
     await execFileAsync(
@@ -250,11 +273,19 @@ async function branchExists(repoRoot, branchName) {
   }
 }
 __name(branchExists, "branchExists");
+function buildBranchName(repoRoot, repoName, ticket) {
+  const num = String(ticket.num).padStart(2, "0");
+  const sep = branchExistsSync(repoRoot, repoName) ? "--" : "/";
+  return `${repoName}${sep}${num}-${ticket.slug}`;
+}
+__name(buildBranchName, "buildBranchName");
 async function createWorktreeNow(opts) {
   const { repoRoot, repoName, baseBranch, ticket } = opts;
-  const branchName = `${repoName}/${String(
-    ticket.num
-  ).padStart(2, "0")}-${ticket.slug}`;
+  const branchName = buildBranchName(
+    repoRoot,
+    repoName,
+    ticket
+  );
   const worktreePath = join2(
     repoRoot,
     "..",
@@ -1043,7 +1074,7 @@ function detectTestCmd(projectDir) {
 }
 __name(detectTestCmd, "detectTestCmd");
 function runTestCmd(opts) {
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     let settled = false;
     const child = spawn("sh", ["-c", opts.cmd], {
       cwd: opts.cwd,
@@ -1075,7 +1106,7 @@ function runTestCmd(opts) {
         opts.registry.delete(child.pid);
       }
       chunks.push(String(err));
-      resolve({
+      resolve2({
         exitCode: 1,
         output: chunks.join("")
       });
@@ -1087,7 +1118,7 @@ function runTestCmd(opts) {
       if (child.pid !== void 0 && opts.registry) {
         opts.registry.delete(child.pid);
       }
-      resolve({
+      resolve2({
         exitCode: code ?? 1,
         output: chunks.join("")
       });
@@ -1813,7 +1844,7 @@ function spawnAgent(opts) {
     proc.stdin.write(opts.prompt);
   }
   proc.stdin.end();
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     let settled = false;
     let graceTimer;
     function finish(exitCode) {
@@ -1839,7 +1870,7 @@ function spawnAgent(opts) {
       rlErr.close();
       logStream.end();
       if (promptFile) cleanupPromptFile(promptFile);
-      resolve({ exitCode, completedItems, timedOut });
+      resolve2({ exitCode, completedItems, timedOut });
     }
     __name(finish, "finish");
     proc.on("exit", (code) => {
@@ -1869,7 +1900,7 @@ function spawnAgent(opts) {
         "Agent process error:",
         formatErrorMessage(err)
       );
-      resolve({
+      resolve2({
         exitCode: 1,
         completedItems,
         timedOut
@@ -1920,7 +1951,11 @@ function dryRunIsolated(opts) {
     );
     for (const t of ready) {
       const num = String(t.num).padStart(2, "0");
-      const branchName = `${opts.repoName}/${num}-${t.slug}`;
+      const branchName = buildBranchName(
+        opts.repoRoot,
+        opts.repoName,
+        t
+      );
       const worktreePath = `../${opts.repoName}.${num}-${t.slug}`;
       console.log(`    worktree: ${worktreePath}`);
       console.log(`    branch:   ${branchName}`);
@@ -2087,7 +2122,7 @@ function retryDelayFor(base, attempt) {
 }
 __name(retryDelayFor, "retryDelayFor");
 function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
+  return new Promise((resolve2) => setTimeout(resolve2, ms));
 }
 __name(sleep, "sleep");
 function attemptLogPath(logsDir, ticket, attempt, ext) {
@@ -2420,7 +2455,7 @@ async function runWavesIsolated(opts) {
     );
   }
   const progressPath = join4(
-    dirname(opts.logsDir),
+    dirname2(opts.logsDir),
     "progress.md"
   );
   const progress = mergeProgress(
@@ -2755,11 +2790,11 @@ __name(runWavesIsolated, "runWavesIsolated");
 
 // src/resolve.ts
 import { existsSync as existsSync4, readdirSync as readdirSync3 } from "node:fs";
-import { dirname as dirname2, join as join5 } from "node:path";
+import { dirname as dirname3, join as join5 } from "node:path";
 import { fileURLToPath } from "node:url";
 import { select } from "@inquirer/prompts";
 function getScriptDir(metaUrl) {
-  return dirname2(fileURLToPath(metaUrl));
+  return dirname3(fileURLToPath(metaUrl));
 }
 __name(getScriptDir, "getScriptDir");
 function findFeatureDirs(cwd) {
@@ -2986,7 +3021,7 @@ async function runExecute(argv) {
       (b) => knownNums.has(b)
     );
   }
-  const logsDir = join6(dirname3(dir), "logs");
+  const logsDir = join6(dirname4(dir), "logs");
   const timeout = argv.timeout ?? 900;
   const testCmd = argv.testCmd || detectTestCmd(
     isGitRepo() ? getRepoRoot() : process.cwd()
@@ -2994,15 +3029,17 @@ async function runExecute(argv) {
   const featureName = extractFeatureName(spec);
   const conflictStrategy = argv.stopOnConflict ? "stop" : "respawn";
   const progressPath = join6(
-    dirname3(dir),
+    dirname4(dir),
     "progress.md"
   );
   if (argv.dryRun) {
     if (isGitRepo()) {
+      const repoRoot = getRepoRoot();
       const repoName = getRepoName();
       dryRunIsolated({
         tickets,
         specBody,
+        repoRoot,
         repoName,
         conflictStrategy,
         progressPath,