nightralph 0.0.37 → 0.0.38

package/dist/index.js

@@ -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,
@@ -191,6 +207,7 @@ import {
 import { tmpdir } from "node:os";
 import { join as join4, dirname, 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";
@@ -1080,6 +1097,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 +1112,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 +1365,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 +1397,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).",
@@ -2517,6 +2582,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,