agentic-retro 0.1.1 → 0.1.2

package/cli/lib/commands.js

@@ -1,5 +1,5 @@
 // Builds the command that starts the batch agent in each harness.
-import { readFileSync, existsSync } from 'node:fs';
+import { readFileSync, existsSync, statSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -37,7 +37,15 @@ function sessionsOf(batchDir) {
 }
 
 function workDirs(config, sessions) {
-  const paths = [...sessions.map((s) => s.repo), ...(config.editable ?? []).map(expandHome)];
+  const editable = (config.editable ?? []).map((path) => {
+    path = expandHome(path);
+    try {
+      return statSync(path).isFile() ? dirname(path) : path;
+    } catch {
+      return path;
+    }
+  });
+  const paths = [...sessions.flatMap((s) => [s.repo, s.cwd]), ...editable];
   return [...new Set(paths.filter(Boolean))];
 }
 

package/cli/lib/outcomes.js

@@ -39,7 +39,7 @@ export function syncOutcomes() {
     if (status !== 'open') setStatus(p, status);
   }
 
-  for (const p of open()) {
+  for (const p of open().filter((p) => !p.pr)) {
     if (ledger.batchCount - p.batch >= expireAfterBatches) setStatus(p, 'expired');
   }
   saveLedger(ledger);

package/cli/lib/queue.js

@@ -2,17 +2,21 @@
 import { execFileSync } from 'node:child_process';
 import { readdirSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { join, basename } from 'node:path';
+import { join, basename, resolve } from 'node:path';
 import { readJson, writeJson } from './paths.js';
 import { loadConfig } from './config.js';
 import { startBatch } from './runner.js';
 
-function repoOf(cwd) {
+function repoOf(cwd, fallback = cwd) {
   try {
-    return execFileSync('git', ['-C', cwd, 'rev-parse', '--show-toplevel'],
-      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+    const options = { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] };
+    const commonDir = execFileSync('git', ['-C', cwd, 'rev-parse', '--git-common-dir'], options).replace(/\n$/, '');
+    // Git lists the shared identity first: the main checkout or its separate metadata directory.
+    const worktrees = execFileSync('git', ['--git-dir', resolve(cwd, commonDir), 'worktree', 'list', '--porcelain', '-z'], options);
+    const main = worktrees.split('\0').find((field) => field.startsWith('worktree '));
+    return main ? main.slice('worktree '.length) : fallback;
   } catch {
-    return cwd;
+    return fallback;
   }
 }
 
@@ -43,8 +47,8 @@ export async function enqueue({ harness, sessionId, transcript, cwd }) {
   harness ||= harnessOf(transcript);
   if (!harness || !sessionId || !cwd) throw new Error('enqueue needs a harness, session, and cwd');
 
-  const queue = readJson('queue.json', []);
-  if (queue.some((s) => s.sessionId === sessionId)) return;
+  const queue = readJson('queue.json', []).map((s) => ({ ...s, repo: repoOf(s.cwd, s.repo) }));
+  if (queue.some((s) => s.sessionId === sessionId)) return writeJson('queue.json', queue);
   const entry = { harness, sessionId, transcript, cwd, repo: repoOf(cwd), endedAt: new Date().toISOString() };
   queue.push(entry);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentic-retro",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "agentic-retrospective: reviews finished agent coding sessions and proposes improvements",
   "type": "module",
   "bin": {

package/skills/run/SKILL.md

@@ -109,20 +109,25 @@ agentic-retro propose --repo <target repo path> --category <category> [--risk lo
 
 Do this once per target repo. Skip a target with no git remote, and put its proposals in a report file instead (5b).
 
+Before you branch, read the repo's PR rules in its `AGENTS.md`, `CLAUDE.md`, `CONTRIBUTING.md` and CI workflows, such as a `dev` base branch or a version bump.
+
 ```bash
 git -C "$repo" fetch origin
-base=$(git -C "$repo" symbolic-ref --short refs/remotes/origin/HEAD | sed 's@^origin/@@')
+base=$(git -C "$repo" symbolic-ref --short refs/remotes/origin/HEAD | sed 's@^origin/@@')  # override with the rules' base
 wt=$(mktemp -d)/wt
 git -C "$repo" worktree add -b "agentic-retro/batch-<n>" "$wt" "origin/$base"
 ```
 
 1. Apply each proposal in `$wt`, then commit it on its own: `git -C "$wt" add -A && git -C "$wt" commit -m "P12: <title>"`
-2. Push the branch: `git -C "$wt" push -u origin "agentic-retro/batch-<n>"`
-3. Write the body per `writing-proposals.md`, then open the PR from `$wt`: `gh pr create --base "$base" --title "<title>" --body-file <file>`
-4. Record the PR and commit on each proposal: `agentic-retro link P12 --pr <url> --commit <sha>`
-5. Remove the worktree: `git -C "$repo" worktree remove "$wt"`
-
-When `autoMergeLowRisk` is `true`, low-risk agent-setup proposals go on a second branch, `agentic-retro/batch-<n>-low-risk`, with their own PR. Merge that PR with `gh pr merge --merge` once it opens. Everything else waits for the user.
+2. Do the steps the rules require in one last commit without a proposal ID, so dropping a proposal keeps them. When a step needs a command you cannot run, say so at the top of the PR body
+3. Push the branch: `git -C "$wt" push -u origin "agentic-retro/batch-<n>"`
+4. Make sure the `agentic-retro` label exists from `$wt`: `(cd "$wt" && gh label create agentic-retro --force)`
+5. Write the body per `writing-proposals.md`, then open the PR from `$wt`: `(cd "$wt" && gh pr create --base "$base" --title "<title>" --body-file <file> --label agentic-retro)`
+6. Wait for CI with `gh pr checks <url> --watch`, then fix each failure in a new commit and push
+7. Record the PR and commit on each proposal: `agentic-retro link P12 --pr <url> --commit <sha>`
+8. Remove the worktree: `git -C "$repo" worktree remove "$wt"`
+
+When `autoMergeLowRisk` is `true`, low-risk agent-setup proposals go on a second branch, `agentic-retro/batch-<n>-low-risk`, with their own PR. Merge that PR with `gh pr merge --merge` once its checks pass. Everything else waits for the user.
 
 ## 5b. Report mode: one report file