@ericrisco/rsc 4.0.0 → 4.0.2

package/targets/branch-guard.mjs

@@ -274,17 +274,26 @@ async function trunkDenial({ root, here, sessionId, self, trunk, policy }) {
   const branch = others.length
     ? '`git worktree add .worktrees/<branch> -b feat/<what>` and commit inside `.worktrees/<branch>/` (another session is working in this folder)'
     : '`git switch -c feat/<what>` in this same folder, no worktree';
-  return `This project keeps its default branch "${trunk}" closed for the agent (it looks complex or in production: ${policy.signals.join(', ')}), so this commit was not made. ` +
+  return `This project keeps its default branch "${trunk}" closed for the agent (it looks complex or in production: ${policy.signals.join(', ')}), so this change was not made. ` +
     `Do not choose for the person: ask them in one line whether to open a branch for this change or to unlock "${trunk}". ` +
     `Branch → ${branch}; it reaches "${trunk}" through a pull request. ` +
-    'Unlock → only on their explicit answer, `npx @ericrisco/rsc main unlock` (a project decision, saved in .rsc.json), then commit again.';
+    'Unlock → only on their explicit answer, `npx @ericrisco/rsc main unlock` (a project decision, saved in .rsc.json), then commit again. ' +
+    AUTOPILOT_LANDING;
 }
 
+// An autopilot run has nobody to ask, and the 4.0.1 test run read "ask them" as a reason to look for
+// another way in. Landing a finished branch is `ship`'s job, and with the trunk closed it has exactly
+// one legal path per case — this says which, so the denial ends the attempt instead of starting one.
+const AUTOPILOT_LANDING = 'In autopilot (nobody to ask) and landing a finished feature branch: do not merge another way — ' +
+  'with a remote, push the branch and open a pull request; without one, park it: write the exact merge command for the person ' +
+  'in `02-DOCS/wiki/sdd/progress/<slug>.md` and stop (the `ship` skill, "No remote").';
+
 function refDenial({ trunk, policy, how = '`git update-ref` and a forced `git branch`' }) {
   return `This project keeps its default branch "${trunk}" closed for the agent (it looks complex or in production: ${policy.signals.join(', ')}), so "${trunk}" was not moved — ` +
     `${how} land${how.includes(' and ') ? '' : 's'} work on it with no review. ` +
     `Work reaches "${trunk}" through a pull request: push the branch and open one (the \`ship\` skill). ` +
-    `Do not choose for the person: if they want "${trunk}" moved by hand, ask them in one line; only on their explicit answer, \`npx @ericrisco/rsc main unlock\` (a project decision, saved in .rsc.json).`;
+    `Do not choose for the person: if they want "${trunk}" moved by hand, ask them in one line; only on their explicit answer, \`npx @ericrisco/rsc main unlock\` (a project decision, saved in .rsc.json). ` +
+    AUTOPILOT_LANDING;
 }
 
 async function isolationDenial({ root, here, sessionId, self }) {

package/targets/sello.mjs

@@ -45,6 +45,11 @@ export const SELLO_STATE_PATHS = [
   '.rsc/automation-gaps.md', '.rsc/review-ledger.jsonl',
 ];
 
+// Worktrees nested inside the project (the assistant's native `.claude/worktrees/`, rsc's own
+// `.worktrees/`) are other checkouts, not part of this change. Untracked, they showed up as one
+// `.claude/…` path, scored as harness — tier 2 for every task of a run that used isolation.
+export const NESTED_WORKTREES = /^(?:\.claude\/worktrees|\.worktrees)(?:\/|$)/;
+
 export function selloPaths(root) {
   return {
     config: join(root, '.rsc', 'sello-config.json'),
@@ -241,7 +246,8 @@ export function computeCandidate(rawRoot, cfg = null) {
 
   const names = new Set();
   for (const n of nulList(git(root, 'diff', '--name-only', '-z', base))) names.add(n);
-  for (const n of nulList(git(root, 'ls-files', '--others', '--exclude-standard', '-z'))) names.add(n);
+  // Untracked nested worktrees are other checkouts; committed paths under them are part of the change.
+  for (const n of nulList(git(root, 'ls-files', '--others', '--exclude-standard', '-z'))) if (!NESTED_WORKTREES.test(n)) names.add(n);
   for (const p of SELLO_STATE_PATHS) names.delete(p);
 
   const files = {};
@@ -266,7 +272,7 @@ export function computeCandidate(rawRoot, cfg = null) {
   // Untracked files never appear in numstat, so a fix hidden in a new file would
   // cost zero budget. Count their lines.
   for (const n of nulList(git(root, 'ls-files', '--others', '--exclude-standard', '-z'))) {
-    if (SELLO_STATE_PATHS.includes(n) || numstat[n] !== undefined) continue;
+    if (SELLO_STATE_PATHS.includes(n) || NESTED_WORKTREES.test(n) || numstat[n] !== undefined) continue;
     try {
       const st = lstatSync(join(root, n));
       if (st.isFile()) numstat[n] = readFileSync(join(root, n), 'utf8').split('\n').length;