nightralph 0.0.37 → 0.0.40

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";
@@ -61,6 +61,17 @@ function writeManagedSection(filePath, content) {
   }
 }
 __name(writeManagedSection, "writeManagedSection");
+function ensureGitAttribute(filePath, line) {
+  if (!existsSync(filePath)) {
+    writeFileSync(filePath, line + "\n");
+    return;
+  }
+  const existing = readFileSync(filePath, "utf8");
+  if (existing.split("\n").includes(line)) return;
+  const sep = existing.endsWith("\n") ? "" : "\n";
+  writeFileSync(filePath, existing + sep + line + "\n");
+}
+__name(ensureGitAttribute, "ensureGitAttribute");
 function checkGhAuth() {
   try {
     execSync("gh auth status", { stdio: "ignore" });
@@ -171,6 +182,11 @@ function setup(opts) {
   const agentsPath = join(projectDir, "AGENTS.md");
   writeManagedSection(agentsPath, managedContent);
   console.log("\n  AGENTS.md (updated)");
+  ensureGitAttribute(
+    join(projectDir, ".gitattributes"),
+    "AGENTS.md merge=union"
+  );
+  console.log("  .gitattributes (AGENTS.md merge=union)");
   console.log(
     `
 Source: ${upstream.repo} @ ${upstream.commit}`
@@ -179,7 +195,7 @@ Source: ${upstream.repo} @ ${upstream.commit}`
 __name(setup, "setup");
 
 // src/orchestrator.ts
-import { spawn as spawn2 } from "node:child_process";
+import { spawn as spawn2, execFile as execFile4 } from "node:child_process";
 import {
   createWriteStream,
   mkdirSync as mkdirSync2,
@@ -189,13 +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() {
@@ -208,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() {
@@ -220,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(
@@ -233,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,
     "..",
@@ -1026,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,
@@ -1058,7 +1106,7 @@ function runTestCmd(opts) {
         opts.registry.delete(child.pid);
       }
       chunks.push(String(err));
-      resolve({
+      resolve2({
         exitCode: 1,
         output: chunks.join("")
       });
@@ -1070,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("")
       });
@@ -1080,6 +1128,7 @@ function runTestCmd(opts) {
 __name(runTestCmd, "runTestCmd");
 
 // src/orchestrator.ts
+var execFileAsync4 = promisify4(execFile4);
 function formatErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
 }
@@ -1094,6 +1143,48 @@ async function removeWorktreeQuietly(worktreePath, d) {
   }
 }
 __name(removeWorktreeQuietly, "removeWorktreeQuietly");
+async function commitTicketFiles(repoRoot, tickets, d) {
+  const paths = tickets.map((t) => t.filepath);
+  if (paths.length === 0) return;
+  try {
+    await execFileAsync4(
+      "git",
+      ["add", "--force", ...paths],
+      { cwd: repoRoot }
+    );
+    try {
+      await execFileAsync4(
+        "git",
+        [
+          "diff",
+          "--cached",
+          "--quiet",
+          "--",
+          ...paths
+        ],
+        { cwd: repoRoot }
+      );
+      return;
+    } catch {
+    }
+    await execFileAsync4(
+      "git",
+      [
+        "commit",
+        "-m",
+        "nightralph: update ticket checklists",
+        "--",
+        ...paths
+      ],
+      { cwd: repoRoot }
+    );
+  } catch (err) {
+    d.log(
+      "  Failed to commit ticket updates: " + formatErrorMessage(err)
+    );
+  }
+}
+__name(commitTicketFiles, "commitTicketFiles");
 var TICKET_RE = /^(\d+)-(.+)\.md$/;
 function parseTicketFilename(filename) {
   const m = filename.match(TICKET_RE);
@@ -1305,14 +1396,18 @@ function renderPrompt(specBody, ticket, opts) {
     "You are an autonomous coding agent. Implement the ticket using /tdd.",
     "",
     "Follow these rules:",
-    "- Read the files directly relevant to the ticket before writing code.",
+    "- Read the files directly relevant to the ticket before writing code. Also read any AGENTS.md in or above the directories you will touch, plus CONTEXT.md and the relevant docs/adr/ entries if they exist. If they do not exist, proceed silently.",
+    "- Work ONLY on this ticket. Do not fix unrelated problems you notice.",
     "- Do NOT research external APIs or services via web search. Use the spec and ticket body as your sole reference for API shapes.",
     "- Use /tdd for every checklist item. For each item, write a failing test at the seams named in the spec's Testing Decisions section, then write only enough code to make it pass, then refactor.",
-    `- Run \`${opts.testCmd}\` before committing. Do not commit with failing tests. The orchestrator runs the same command after you exit and rejects the ticket if it fails.`,
+    `- While iterating, run only the tests relevant to what you changed. Run \`${opts.testCmd}\` in full once, as the final gate before your last commit. Do not commit with failing tests. The orchestrator runs the same command after you exit and rejects the ticket if it fails.`,
+    "- If the project has a lint script, run it and fix what it reports.",
+    "- INTEGRITY: never delete, skip, weaken, or write tautological tests to force a green result. Only report a checklist item done when its real tests genuinely pass. If an item cannot be completed honestly, leave it unchecked and say what blocked you.",
     "- Do NOT read or modify files outside your current directory (the worktree).",
     "- Do NOT run git push.",
-    "- Commit your work when finished.",
+    "- Commit after each checklist item, and make sure everything is committed when finished.",
     "- After completing each checklist item in the ticket, print a line: [x] <item text> (matching the checklist text exactly).",
+    "- Before your final commit, record reusable learnings in the nearest AGENTS.md (in or above the directories you modified; prefer that over the repo root). Good additions: module conventions, gotchas, files that must change together, how to test that area, environment requirements. Do NOT add ticket-specific details or temporary debugging notes. Only write when you have knowledge that would help future work in that directory.",
     ""
   ].join("\n");
 }
@@ -1333,8 +1428,9 @@ function renderMergePrompt(specBody, ticket) {
     "",
     "Your task:",
     "1. Find and resolve all conflict markers (<<<<<<< / ======= / >>>>>>>).",
-    "2. Make sure the code compiles and tests pass.",
-    "3. Commit the resolved files.",
+    "2. When AGENTS.md or other docs conflict, keep both sides' additions rather than picking one.",
+    "3. Make sure the code compiles and tests pass.",
+    "4. Commit the resolved files.",
     "",
     "Do NOT re-implement the ticket from scratch.",
     "Do NOT read or modify files outside your current directory (the worktree).",
@@ -1748,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) {
@@ -1774,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) => {
@@ -1804,7 +1900,7 @@ function spawnAgent(opts) {
         "Agent process error:",
         formatErrorMessage(err)
       );
-      resolve({
+      resolve2({
         exitCode: 1,
         completedItems,
         timedOut
@@ -1855,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}`);
@@ -2022,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) {
@@ -2355,7 +2455,7 @@ async function runWavesIsolated(opts) {
     );
   }
   const progressPath = join4(
-    dirname(opts.logsDir),
+    dirname2(opts.logsDir),
     "progress.md"
   );
   const progress = mergeProgress(
@@ -2517,6 +2617,13 @@ async function runWavesIsolated(opts) {
       });
     }
     if (successfulBranches.length > 0) {
+      await commitTicketFiles(
+        repoRoot,
+        successfulBranches.map(
+          (sb) => ticketsByNum.get(sb.ticketNum)
+        ),
+        d
+      );
       const mergeResult = await mergeWave({
         repoRoot,
         baseBranch,
@@ -2683,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) {
@@ -2914,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()
@@ -2922,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,