@rtorcato/repo-tooling 3.39.0 → 3.41.0

package/AGENTS.md

@@ -27,6 +27,7 @@ Every command supports `--json` and a non-interactive mode. Combine with `--yes`
 | `list --json` | ✅ | ✅ | Enumerate the library's surface area. Each entry has `{ name, description, exports, fixTarget }`. |
 | `copy <name>` | ✅ | text only | Copy a single preset (`biome`, `tsconfig`) into the current directory. |
 | `loop guard --root <path>` | ✅ | ✅ | Guard an `ai-issue-loop` tick: repair a wrongly-bare main checkout, gate the `node_modules` rebuild (`--removed`), and assert `gh` authenticates as the declared `rules.aiLoop.agentUser`. Exit `0` continue, `1` repair failed, `2` root is not a repairable checkout or the agent identity is wrong — both non-zero halt the tick. |
+| `loop env` | ✅ | ✅ | Resolve an `ai-issue-loop` tick's variables once: `root` (main checkout, correct from inside a worktree), `worktreeRoot`, `ownerRepo`, `agentUser` (empty unless an assignable collaborator), `humanUser` (empty for org repos), `me`. Without `--json`, prints `KEY='value'` lines for `eval`. Exit `1` when the checkout or its GitHub repo cannot be resolved. |
 
 ## Recommended workflows
 
@@ -117,6 +118,7 @@ A fixer may also **refuse** — the target file holds something the generator ca
 - `src/cli/commands/fix.ts` — `Fixer` interface, fixer registry, `fixCommand`
 - `src/cli/commands/fix-targets.ts` — shared check → fix target map (used by both doctor's footer and fix's lookup)
 - `src/cli/commands/loop-guard.ts` — `loop guard`: the `--is-inside-work-tree` / `.git` invariant table and the `node_modules` rebuild gate, drained out of the ai-issue-loop skill's prose (#519)
+- `src/cli/commands/loop-env.ts` — `loop env`: the skill's Pass 0 variables resolved in one call (#615)
 - `src/cli/generators/` — one file per concern (linting, testing, build, git, github-actions, security, misc)
 - `tooling/` — every shipped preset, mirrored 1:1 with `package.json` `exports`
 

package/dist/base/git-identity.js

@@ -92,7 +92,7 @@ function repoScopedEnv() {
     return env;
 }
 /** Never rejects; a missing or failing git resolves to null. */
-export const realGitExec = (args, cwd) => new Promise((resolve) => {
+export const realGitExec = (args, cwd, timeoutMs = GIT_TIMEOUT_MS) => new Promise((resolve) => {
     let settled = false;
     const done = (v) => {
         if (settled)
@@ -112,7 +112,7 @@ export const realGitExec = (args, cwd) => new Promise((resolve) => {
     const timer = setTimeout(() => {
         child.kill();
         done(null);
-    }, GIT_TIMEOUT_MS);
+    }, timeoutMs);
     child.stdout?.on('data', (d) => {
         stdout += d;
     });

package/dist/cli/commands/loop-cleanup.js

@@ -0,0 +1,100 @@
+import path from 'node:path';
+import chalk from 'chalk';
+import { realGitExec } from '../../base/git-identity.js';
+import { realGhExec } from '../../base/github-settings.js';
+import { defaultWorktreeRoot, findLive } from './loop-guard.js';
+/** How far back to look for the squash subject. */
+const SQUASH_WINDOW = 200;
+async function findPr(gh, heads) {
+    for (const head of heads) {
+        const r = await gh(['pr', 'list', '--head', head, '--state', 'all', '--json', 'number,state']);
+        if (!r.ok)
+            continue;
+        const [pr] = JSON.parse(r.stdout || '[]');
+        if (pr)
+            return pr;
+    }
+    return null;
+}
+export async function runLoopCleanup(options = {}) {
+    const root = path.resolve(options.root ?? process.cwd());
+    const worktreeRoot = options.worktreeRoot
+        ? path.resolve(options.worktreeRoot)
+        : defaultWorktreeRoot(root);
+    // Fetch and `worktree remove` outlast the 5s probe timeout on a real repo.
+    const git = options.git ?? ((args) => realGitExec(args, root, 120_000));
+    const gh = options.gh ?? ((args, stdin) => realGhExec(args, stdin, root));
+    const dirs = await findLive([worktreeRoot, path.join(root, '.claude', 'worktrees')]);
+    let subjects = null;
+    const worktrees = [];
+    for (const dir of dirs) {
+        const slug = path.basename(dir);
+        const issue = Number(slug.match(/^ai-(\d+)-/)?.[1]) || null;
+        // `worktree-` is the prefix EnterWorktree once gave branches — legacy.
+        const heads = [slug, `worktree-${slug}`];
+        const branch = (await git(['branch', '--list', ...heads, '--format=%(refname:short)']))
+            ?.split('\n')[0]
+            ?.trim() || null;
+        const pr = await findPr(gh, heads);
+        const entry = {
+            path: dir,
+            issue,
+            branch,
+            pr: pr?.number ?? null,
+            prState: pr?.state ?? null,
+            action: 'kept',
+            reason: '',
+        };
+        worktrees.push(entry);
+        if (!pr || pr.state === 'OPEN') {
+            entry.reason = pr ? 'PR still open' : 'no PR';
+            continue;
+        }
+        if (pr.state === 'MERGED') {
+            if (subjects === null) {
+                // Best-effort: a failed fetch leaves origin/main stale, which can
+                // only keep a worktree, never remove one wrongly.
+                await git(['fetch', '--prune', 'origin']);
+                const log = await git(['log', 'origin/main', `-n${SQUASH_WINDOW}`, '--format=%s']);
+                subjects = log ? log.split('\n') : [];
+            }
+            if (!subjects.some((s) => s.trimEnd().endsWith(`(#${pr.number})`))) {
+                entry.reason = `squash for #${pr.number} not on origin/main`;
+                continue;
+            }
+        }
+        if ((await git(['worktree', 'remove', '--force', dir])) === null) {
+            entry.action = 'remove-failed';
+            entry.reason = 'git worktree remove failed';
+            continue;
+        }
+        if (branch)
+            await git(['branch', '-D', branch]);
+        entry.action = 'removed';
+        entry.reason = pr.state === 'MERGED' ? `#${pr.number} landed on main` : `#${pr.number} closed`;
+    }
+    return {
+        root,
+        worktreeRoot,
+        removed: worktrees.some((w) => w.action === 'removed'),
+        worktrees,
+        exitCode: worktrees.some((w) => w.action === 'remove-failed') ? 1 : 0,
+    };
+}
+export async function loopCleanupCommand(options) {
+    const result = await runLoopCleanup(options);
+    if (options.json) {
+        console.log(JSON.stringify(result, null, 2));
+    }
+    else {
+        console.log();
+        if (result.worktrees.length === 0)
+            console.log(chalk.gray('  no ai-* worktrees'));
+        for (const w of result.worktrees) {
+            const line = `${w.action.padEnd(13)} ${path.basename(w.path)} — ${w.reason}`;
+            console.log(`  ${w.action === 'remove-failed' ? chalk.yellow(line) : chalk.gray(line)}`);
+        }
+        console.log();
+    }
+    process.exitCode = result.exitCode;
+}

package/dist/cli/commands/loop-env.js

@@ -0,0 +1,76 @@
+import path from 'node:path';
+import { LOGIN } from '../../base/agent-user.js';
+import { realGitExec } from '../../base/git-identity.js';
+import { realGhExec } from '../../base/github-settings.js';
+import { configuredAgentUser, defaultWorktreeRoot } from './loop-guard.js';
+async function ghOut(gh, args) {
+    const r = await gh(args);
+    return r.ok ? r.stdout.trim() : '';
+}
+export async function resolveLoopEnv(options = {}) {
+    const dir = path.resolve(options.dir ?? process.cwd());
+    const git = options.git ?? ((args) => realGitExec(args, dir));
+    const gh = options.gh ?? ((args, stdin) => realGhExec(args, stdin, dir));
+    const env = options.env ?? process.env;
+    const warnings = [];
+    // Absolute, so the common dir is `<main checkout>/.git` from anywhere.
+    const common = (await git(['rev-parse', '--path-format=absolute', '--git-common-dir']))?.trim();
+    const root = common ? path.resolve(common, '..') : '';
+    if (!root)
+        warnings.push('not a git repository');
+    const worktreeRoot = root ? defaultWorktreeRoot(root) : '';
+    const ownerRepo = await ghOut(gh, [
+        'repo',
+        'view',
+        '--json',
+        'nameWithOwner',
+        '--jq',
+        '.nameWithOwner',
+    ]);
+    if (!ownerRepo)
+        warnings.push('could not resolve the GitHub repo from the working directory');
+    let agentUser = env.AI_LOOP_AGENT?.trim() || (root ? await configuredAgentUser(root) : '') || '';
+    // LOGIN is the injection boundary — the login goes into an API path.
+    if (agentUser &&
+        (!ownerRepo ||
+            !LOGIN.test(agentUser) ||
+            !(await gh(['api', `repos/${ownerRepo}/assignees/${agentUser}`, '--silent'])).ok)) {
+        warnings.push(`agentUser '${agentUser}' is not an assignable collaborator — assigning nothing`);
+        agentUser = '';
+    }
+    const humanUser = ownerRepo
+        ? await ghOut(gh, [
+            'api',
+            `repos/${ownerRepo}`,
+            '--jq',
+            'if .owner.type == "User" then .owner.login else "" end',
+        ])
+        : '';
+    const me = await ghOut(gh, ['api', 'user', '--jq', '.login']);
+    return { root, worktreeRoot, ownerRepo, agentUser, humanUser, me, warnings };
+}
+const VARS = [
+    ['ROOT', 'root'],
+    ['WT_ROOT', 'worktreeRoot'],
+    ['OWNER_REPO', 'ownerRepo'],
+    ['AGENT_USER', 'agentUser'],
+    ['HUMAN_USER', 'humanUser'],
+    ['ME', 'me'],
+];
+/** `KEY='value'` lines, single-quoted so `eval "$(… loop env)"` is safe. */
+export function toShell(env) {
+    return VARS.map(([name, key]) => `${name}='${env[key].replaceAll("'", `'\\''`)}'`).join('\n');
+}
+export async function loopEnvCommand(options) {
+    const env = await resolveLoopEnv(options);
+    if (options.json) {
+        console.log(JSON.stringify(env, null, 2));
+    }
+    else {
+        for (const w of env.warnings)
+            console.error(`⚠ ${w}`);
+        console.log(toShell(env));
+    }
+    // Nothing downstream works without both — the skill bails on either.
+    process.exitCode = env.root && env.ownerRepo ? 0 : 1;
+}

package/dist/cli/commands/loop-guard.js

@@ -107,7 +107,7 @@ async function gitEntryKind(root) {
     }
 }
 /** `ai-*` directories one level down, in either place worktrees are kept. */
-async function findLive(dirs) {
+export async function findLive(dirs) {
     const live = [];
     for (const dir of dirs) {
         // A missing worktree root is the normal case, not an error.

package/dist/cli/index.js

@@ -5,6 +5,8 @@ import { Command } from 'commander';
 import fs from 'fs-extra';
 import { doctorCommand } from './commands/doctor.js';
 import { fixCommand } from './commands/fix.js';
+import { loopCleanupCommand } from './commands/loop-cleanup.js';
+import { loopEnvCommand } from './commands/loop-env.js';
 import { loopGuardCommand } from './commands/loop-guard.js';
 import { setupProject } from './commands/setup.js';
 import { copyPreset, PRESETS } from './utils/copy-preset.js';
@@ -370,6 +372,23 @@ loop
     '  1  repair was attempted and failed; the root is still bare — halt the tick\n' +
     '  2  root is not a repairable main checkout (bare clone, linked worktree, or not a repo) — halt the tick\n')
     .action(loopGuardCommand);
+loop
+    .command('env')
+    .description('🧭 Resolve ROOT, WT_ROOT, OWNER_REPO, AGENT_USER, HUMAN_USER and ME once')
+    .option('-d, --dir <path>', 'Directory to resolve from — main checkout or any worktree', process.cwd())
+    .option('--json', 'Emit machine-readable JSON output')
+    .addHelpText('after', "\nWithout --json, prints KEY='value' lines for eval. Empty means none.\n" +
+    'Exits 1 when the checkout or its GitHub repo cannot be resolved.\n')
+    .action(loopEnvCommand);
+loop
+    .command('cleanup')
+    .description('🧹 Remove ai-* worktrees whose PR landed on main or was closed')
+    .option('--root <path>', 'Main checkout the loop branches worktrees from', process.cwd())
+    .option('--worktree-root <path>', 'Where ai-* worktrees live (default: <root>-worktrees)')
+    .option('--json', 'Emit machine-readable JSON output')
+    .addHelpText('after', '\nPass `removed` from --json to `loop guard --removed`.\n' +
+    'Exits 1 when a worktree removal failed.\n')
+    .action(loopCleanupCommand);
 program.hook('preAction', async (_, actionCommand) => {
     const name = actionCommand.name();
     if (name === 'setup' || name === 'doctor' || name === 'fix') {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rtorcato/repo-tooling",
-	"version": "3.39.0",
+	"version": "3.41.0",
 	"description": "One CLI to scaffold, audit and fix your repo's whole toolchain — linting, tests, commits, releases & CI.",
 	"type": "module",
 	"keywords": [