@open-tomato/rafa 0.12.0 → 0.15.0

package/dist/effort/store/index.js

@@ -4,10 +4,10 @@ import {
   openNdjsonStore,
   openSqliteStore,
   selectEffortStore
-} from "../../index-4g6vyznd.js";
+} from "../../index-1x5t4t9r.js";
 import {
   STORE_BACKENDS
-} from "../../index-96pz9023.js";
+} from "../../index-2256nwj0.js";
 export {
   selectEffortStore,
   openSqliteStore,

package/dist/{index-4g6vyznd.js → index-1x5t4t9r.js}

@@ -8,7 +8,7 @@ import {
   isMapping,
   messageOf,
   readRafaBlocks
-} from "./index-96pz9023.js";
+} from "./index-2256nwj0.js";
 
 // src/effort/store.ts
 import {
@@ -867,6 +867,14 @@ function runningCommand() {
   return running;
 }
 
+// src/utils/session-env.ts
+function sessionSpawnEnv(base) {
+  return {
+    ...base,
+    CLAUDE_CODE_ENTRYPOINT: "cli"
+  };
+}
+
 // src/utils/claude.ts
 async function getClaudeUsagePercent() {
   const envPct = process.env["CLAUDE_USAGE_PERCENT"];
@@ -912,12 +920,6 @@ function interruptClaudeSessions() {
     session.kill("SIGINT");
   return liveSessions.size;
 }
-function claudeSessionEnv() {
-  return {
-    ...process.env,
-    CLAUDE_CODE_ENTRYPOINT: "cli"
-  };
-}
 
 class UndeclaredSpendError extends Error {
   name = "UndeclaredSpendError";
@@ -962,7 +964,7 @@ async function spawnClaude(args, prompt) {
     stdin: new TextEncoder().encode(prompt),
     stdout: "inherit",
     stderr: "inherit",
-    env: claudeSessionEnv()
+    env: sessionSpawnEnv(process.env)
   });
   liveSessions.add(proc);
   try {
@@ -1015,7 +1017,7 @@ async function spawnCaptured(args, prompt, options = {}) {
     stdin: new TextEncoder().encode(prompt),
     stdout: "pipe",
     stderr: "inherit",
-    env: claudeSessionEnv(),
+    env: sessionSpawnEnv(process.env),
     ...options.cwd === undefined ? {} : { cwd: options.cwd }
   });
   liveSessions.add(proc);
@@ -1131,11 +1133,16 @@ var REST_STATES = {
   cancelled: "closed"
 };
 function createGhRunner(options) {
-  const { cwd, command = "gh" } = options;
+  const { cwd, command = "gh", env } = options;
   return async (args) => {
+    const executable = env === undefined ? command : Bun.which(command, { PATH: env.PATH ?? "", cwd });
+    if (executable === null) {
+      return { ok: false, stdout: "", stderr: notOnPath(command, cwd, env?.PATH) };
+    }
     try {
-      const proc = Bun.spawn([command, ...args], {
+      const proc = Bun.spawn([executable, ...args], {
         cwd,
+        ...env === undefined ? {} : { env: { ...env } },
         stdin: "ignore",
         stdout: "pipe",
         stderr: "pipe"
@@ -1151,6 +1158,10 @@ function createGhRunner(options) {
     }
   };
 }
+function notOnPath(command, cwd, path) {
+  const searched = path === undefined ? "an environment with no PATH" : `PATH ${JSON.stringify(path)}`;
+  return `could not run ${command} in ${cwd}: not found on ${searched} (ENOENT)`;
+}
 function isOneOf(members, value) {
   return typeof value === "string" && members.includes(value);
 }
@@ -1284,20 +1295,26 @@ function listedIssues(stdout) {
 function labelValue(labels, prefix) {
   return labels.find((label) => label.startsWith(prefix))?.slice(prefix.length);
 }
+function typeOfLabels(labels) {
+  const type = labelValue(labels, GITHUB_LABELS.typePrefix);
+  return isOneOf(ISSUE_TYPES, type) ? type : "code";
+}
+function moduleOfLabels(labels) {
+  return labelValue(labels, GITHUB_LABELS.modulePrefix) ?? "unassigned";
+}
 function stateOf(viewed) {
   if (viewed.state === "OPEN")
     return "todo";
   return viewed.stateReason === NOT_PLANNED ? "cancelled" : "done";
 }
 function issueOf(ref, viewed) {
-  const type = labelValue(viewed.labels, GITHUB_LABELS.typePrefix);
   const priority = labelValue(viewed.labels, GITHUB_LABELS.priorityPrefix);
   return {
     opt: ref.opt,
     title: viewed.title,
     body: viewed.body,
-    type: isOneOf(ISSUE_TYPES, type) ? type : "code",
-    module: labelValue(viewed.labels, GITHUB_LABELS.modulePrefix) ?? "unassigned",
+    type: typeOfLabels(viewed.labels),
+    module: moduleOfLabels(viewed.labels),
     priority: isOneOf(ISSUE_PRIORITIES, priority) ? priority : null,
     project: null,
     blockedBy: viewed.labels.map((label) => label.startsWith(GITHUB_LABELS.blockedByPrefix) ? label.slice(GITHUB_LABELS.blockedByPrefix.length) : "").filter(isIssueNumber).map(Number),

package/dist/{index-96pz9023.js → index-2256nwj0.js}

@@ -286,6 +286,7 @@ var usdAmount = (raw, at) => {
   return usd === null ? refused(at, raw, "a number of US dollars above zero, at most six digits either side of the point") : accepted(usd);
 };
 var issueNumber = (raw, at) => typeof raw === "number" && Number.isSafeInteger(raw) && raw > 0 ? accepted(raw) : refused(at, raw, "an issue number, a whole number above zero");
+var dayCount = (raw, at) => typeof raw === "number" && Number.isSafeInteger(raw) && raw > 0 ? accepted(raw) : refused(at, raw, "a number of days, a whole number above zero");
 var releaseEnabled = (raw, at) => typeof raw === "boolean" || raw === RELEASE_AUTO ? accepted(raw) : refused(at, raw, `true, false or ${RELEASE_AUTO}`);
 var GITHUB_LOGIN = /^[A-Za-z0-9][A-Za-z0-9-]*(?:\[bot\])?$/;
 function isGitHubLogin(value) {
@@ -421,7 +422,10 @@ var CONFIG_DEFAULTS = Object.freeze({
   releaseEnabled: RELEASE_AUTO,
   releaseVersionFile: "package.json",
   releaseChangelog: "CHANGELOG.md",
-  releaseHeading: "## {version} \u2014 {date}, {title}"
+  releaseHeading: "## {version} \u2014 {date}, {title}",
+  cleanupStaleDays: 30,
+  cleanupWorktreeIdleDays: 7,
+  cleanupKeep: Object.freeze([])
 });
 var directory = text("a directory path");
 var trackerKind = text("a tracker kind name");
@@ -496,6 +500,17 @@ var SETTINGS = {
     key: "release.heading",
     read: text("a changelog heading template"),
     cli: false
+  },
+  cleanupStaleDays: { key: "cleanup.staleDays", read: dayCount, cli: false },
+  cleanupWorktreeIdleDays: {
+    key: "cleanup.worktreeIdleDays",
+    read: dayCount,
+    cli: false
+  },
+  cleanupKeep: {
+    key: "cleanup.keep",
+    read: listOf(text("a glob pattern"), "glob patterns"),
+    cli: false
   }
 };
 var SETTING_NAMES = Object.keys(SETTINGS);
@@ -590,7 +605,10 @@ function readLayer(rawOf, atOf) {
     releaseEnabled: read("releaseEnabled"),
     releaseVersionFile: read("releaseVersionFile"),
     releaseChangelog: read("releaseChangelog"),
-    releaseHeading: read("releaseHeading")
+    releaseHeading: read("releaseHeading"),
+    cleanupStaleDays: read("cleanupStaleDays"),
+    cleanupWorktreeIdleDays: read("cleanupWorktreeIdleDays"),
+    cleanupKeep: read("cleanupKeep")
   };
   return { layer, problems, extras };
 }

package/dist/{index-p96zrptw.js → index-p572cxex.js}

@@ -4,7 +4,7 @@ import {
   messageOf,
   parseTaskDeclaration,
   readRafaBlocks
-} from "./index-96pz9023.js";
+} from "./index-2256nwj0.js";
 // src/preflight/prerequisites-md.ts
 import { basename, dirname, join } from "path";
 var SECTION_AUTO_RE = /\[auto\]/i;

package/dist/index.js

@@ -26,7 +26,7 @@ import {
   trackerPathFor,
   updateTrackerLine,
   writeTrackerBlocker
-} from "./index-p96zrptw.js";
+} from "./index-p572cxex.js";
 import {
   CORE_ADAPTER_REGISTRY,
   ClaudePlannerError,
@@ -50,7 +50,7 @@ import {
   sqliteStorePath,
   withSqliteStore,
   writeSqliteStore
-} from "./index-4g6vyznd.js";
+} from "./index-1x5t4t9r.js";
 import {
   BUDGET_FLAG,
   CLAUDE_SETTING_SOURCES,
@@ -86,7 +86,7 @@ import {
   resolveConfig,
   resolveDeclarationFlags,
   stripTaskDeclaration
-} from "./index-96pz9023.js";
+} from "./index-2256nwj0.js";
 // src/config-load.ts
 import { existsSync, readFileSync, realpathSync } from "fs";
 import { isAbsolute } from "path";
@@ -1902,7 +1902,7 @@ async function report(args, repoRoot) {
   }
 }
 // package.json
-var version = "0.12.0";
+var version = "0.15.0";
 
 // src/modules/manifest.ts
 var MANIFEST_VERSION = 1;
@@ -4191,6 +4191,7 @@ var BLOCKED_BY_FIELD = "Blocked by";
 var FENCE_LINE2 = /^ {0,3}(?:```|~~~)/u;
 var FIELD_LINE = /^ {0,3}(?:[-*+]\s+)?[*_]{0,2}blocked\s+by[*_]{0,2}\s*:(.*)$/iu;
 var ISSUE_ID = /#(\d+)/gu;
+var FOREIGN_ID = /[A-Za-z0-9][A-Za-z0-9-]*\/[A-Za-z0-9._-]+#\d+/gu;
 var REMEDY4 = `name them as "${BLOCKED_BY_FIELD}: #24 #26", or take the ${SPEC_BLOCKED_LABEL} label off`;
 function hasSpecBlockedLabel(labels) {
   return labels.some((label) => label.trim().toLowerCase() === SPEC_BLOCKED_LABEL);
@@ -4223,29 +4224,41 @@ function idsIn(text) {
   }
   return found;
 }
-function reading(kind, issue, found, blockers, unknown) {
+function foreignIn(text) {
+  const found = [];
+  for (const [token] of text.matchAll(FOREIGN_ID)) {
+    if (!found.includes(token))
+      found.push(token);
+  }
+  return found;
+}
+var NAMED_NOTHING = { ids: [], foreign: [] };
+function reading(kind, issue, found, named, unknown) {
   return {
     kind,
     issue,
     line: found?.number ?? null,
     text: found?.text ?? null,
-    blockers,
+    blockers: named.ids,
+    foreign: named.foreign,
     unknown
   };
 }
 function readBlockedBy(issue, body, known) {
   const found = findFieldLine(body);
   if (found === null)
-    return reading("no-line", issue, null, [], []);
-  const ids = idsIn(found.text);
+    return reading("no-line", issue, null, NAMED_NOTHING, []);
+  const foreign = foreignIn(found.text);
+  const ids = idsIn(found.text.replace(FOREIGN_ID, " "));
+  const named = { ids, foreign };
   if (ids.length === 0)
-    return reading("no-ids", issue, found, [], []);
+    return reading("no-ids", issue, found, named, []);
   const unknown = known === undefined ? [] : ids.filter((id) => id !== issue && !known.has(id));
   if (ids.includes(issue))
-    return reading("self-reference", issue, found, ids, unknown);
+    return reading("self-reference", issue, found, named, unknown);
   if (unknown.length > 0)
-    return reading("unknown-issue", issue, found, ids, unknown);
-  return reading("blocked", issue, found, ids, unknown);
+    return reading("unknown-issue", issue, found, named, unknown);
+  return reading("blocked", issue, found, named, unknown);
 }
 function nameIds(ids) {
   return ids.map((id) => `#${String(id)}`).join(" ");
@@ -4255,6 +4268,9 @@ function faultClause(read) {
   if (read.kind === "no-line") {
     return `is labelled ${SPEC_BLOCKED_LABEL} and its body carries no "${BLOCKED_BY_FIELD}:" line`;
   }
+  if (read.kind === "no-ids" && read.foreign.length > 0) {
+    return `has a "${BLOCKED_BY_FIELD}:" line ${at} naming only issues on other repositories: ${read.foreign.join(" ")}`;
+  }
   if (read.kind === "no-ids") {
     return `has a "${BLOCKED_BY_FIELD}:" line ${at} naming no issue: "${read.text ?? ""}"`;
   }
@@ -5001,8 +5017,10 @@ var REPO_PATH3 = "{owner}/{repo}";
 var SUMMARY_FIELDS = "author,baseRefName,headRefName,isCrossRepository,number,state,title,updatedAt,url";
 var DETAIL_FIELDS = `${SUMMARY_FIELDS},body,headRefOid,labels,mergeStateStatus,mergeable`;
 var CHECK_FIELDS = "name,state,link";
+var MERGED_FIELDS = "headRefName,headRefOid,mergedAt,number";
 var WORKFLOWS_PATH = `repos/${REPO_PATH3}/actions/workflows`;
 var LIST_LIMIT = 30;
+var MERGED_LIMIT = 100;
 var FIND_LIMIT = 1;
 var MISSING_PULL = "Could not resolve to a PullRequest";
 var NO_CHECKS = "no checks reported on the";
@@ -5111,6 +5129,15 @@ function readDetail(value, command, where) {
     labels: readLabels(pull["labels"], command, `${where}.labels`)
   };
 }
+function readMerged(value, command, where) {
+  const pull = readMapping(value, command, where);
+  return {
+    number: readWholeNumber(pull["number"], command, `${where}.number`),
+    headRefName: readString2(pull["headRefName"], command, `${where}.headRefName`),
+    headRefOid: readString2(pull["headRefOid"], command, `${where}.headRefOid`),
+    mergedAt: readString2(pull["mergedAt"], command, `${where}.mergedAt`)
+  };
+}
 function readComment2(value, command, where) {
   const comment = readMapping(value, command, where);
   const user = readMapping(comment["user"], command, `${where}.user`);
@@ -5191,6 +5218,12 @@ function createGhPullRequests(options) {
       const rows = readList(parseJson2(stdout, command), command, "its output");
       return rows.map((row, index) => readSummary(row, command, `row ${index}`));
     },
+    listMerged: async () => {
+      const command = "gh pr list --state merged";
+      const stdout = await succeed(["pr", "list", "--state", "merged", "--limit", String(MERGED_LIMIT), "--json", MERGED_FIELDS], command);
+      const rows = readList(parseJson2(stdout, command), command, "its output");
+      return rows.map((row, index) => readMerged(row, command, `row ${index}`));
+    },
     get: async (number) => {
       const target = pullNumber(number, "get");
       const command = `gh pr view ${target}`;

package/dist/plan/index.js

@@ -16,13 +16,13 @@ import {
   renderInjection,
   runPreflight,
   runShellProbe
-} from "../index-p96zrptw.js";
+} from "../index-p572cxex.js";
 import {
   INJECT_MODES,
   RAFA_BLOCK_KINDS,
   isRafaBlockKind,
   readRafaBlocks
-} from "../index-96pz9023.js";
+} from "../index-2256nwj0.js";
 export {
   runShellProbe,
   runPreflight,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-tomato/rafa",
-  "version": "0.12.0",
+  "version": "0.15.0",
   "description": "Alpha. Runs a plan through the ralph loop: one Claude Code session per task, one commit per task, then a pull request and a CI wait.",
   "private": false,
   "publishConfig": {