@ericrisco/rsc 2.0.17 → 2.0.18

package/README.md

@@ -71,6 +71,9 @@ accompaniment, project kind and goal **before it writes anything**, reads only t
 root, and shows every selected or deferred skill, agent and hook with its reason. Relay those
 questions to the user; never invent or default their answers. The first pass writes nothing and
 prints a SHA-256 plan id. Only rerun with `--accept-plan <id>` after the user accepts that exact plan.
+If the project already has a skill of its own with a catalog name, the plan lists it under
+**Your own skills this plan replaces** — tell the user before accepting; renaming their folder and
+regenerating the plan keeps theirs.
 
 For a non-interactive agent, collect the answers and preview the same plan explicitly:
 

package/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.17",
+  "version": "2.0.18",
   "counts": {
     "skills": 273,
     "agents": 33,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ericrisco/rsc",
-  "version": "2.0.17",
+  "version": "2.0.18",
   "description": "A guided harness builder that turns your goal into a minimal, verified AI-agent setup using strict best practices.",
   "type": "module",
   "bin": {
@@ -97,6 +97,10 @@
     {
       "fixedIn": "2.0.17",
       "symptom": "Re-accepting an onboarding plan erased what init had learned about you, reset your explanation level, or dropped an assistant you added later"
+    },
+    {
+      "fixedIn": "2.0.18",
+      "symptom": "Onboarding silently replaced a skill you wrote yourself that had the same name as one of rsc's (review, plan, debug…)"
     }
   ]
 }

package/scripts/install-apply.js

@@ -422,6 +422,14 @@ export function collisions({ cwd = process.cwd(), target, home, skillIds = [] })
   return skillIds.filter((id) => !managed.has(id) && existsSync(paths.skillDir(id)));
 }
 
+// The same test as `collisions`, across every target of a plan, as the paths the user would recognise.
+// `onboard` puts these in the plan itself, so the id the user accepts is an id that names them.
+export function ownSkillPaths({ cwd = process.cwd(), targets = [], skillIds = [], home }) {
+  const found = targets.flatMap((target) => collisions({ cwd, target, home, skillIds })
+    .map((id) => relative(cwd, targetPaths(target, home, cwd).skillDir(id)).split(sep).join('/')));
+  return [...new Set(found)].sort();
+}
+
 export function listInstalled({ target, home, cwd = process.cwd() }) {
   const paths = targetPaths(target, home, cwd);
   return Object.keys(readState(paths.stateFile).skills);

package/scripts/lib/backups.js

@@ -40,6 +40,19 @@ export function createBackup({ cwd = process.cwd(), operation, target, paths, cl
   return manifest;
 }
 
+// Where the newest snapshot kept a path, relative to the project — what to tell someone whose own work
+// was just replaced, so recovering it is a copy they can find rather than a restore they never heard of.
+// A transaction snapshot is the fallback: it is the install's rollback, not the user's copy.
+export function whereKept({ cwd = process.cwd(), relPath }) {
+  const backups = listBackups({ cwd });
+  const ordered = [...backups.filter((b) => !/transaction/.test(b.operation)), ...backups.filter((b) => /transaction/.test(b.operation))];
+  for (const b of ordered) {
+    const kept = join(backupsDir(cwd), b.id, 'files', relPath);
+    if (existsSync(kept)) return relative(cwd, kept).split(sep).join('/');
+  }
+  return null;
+}
+
 export function listBackups({ cwd = process.cwd() } = {}) {
   const dir = backupsDir(cwd);
   if (!existsSync(dir)) return [];

package/scripts/rsc.js

@@ -4,14 +4,14 @@ import { detectTarget, installedTargets, resolveTargets, TARGETS } from '../targ
 import { detectRepo } from './detect-repo.js';
 import { rank } from './consult.js';
 import { expandRecommends, toOutcomes, hasOutcome } from './lib/recommend.js';
-import { applyInstall, listInstalled, listInstalledAgents, listInstalledCommands, uninstall, syncInstalled, purge, collisions } from './install-apply.js';
+import { applyInstall, listInstalled, listInstalledAgents, listInstalledCommands, uninstall, syncInstalled, purge, collisions, ownSkillPaths } from './install-apply.js';
 import { stackAgentNames } from '../targets/agents.js';
 import { doctor } from './doctor.js';
 import { ask, say, select, pickFrom, banner, confirm, isInteractive } from './lib/ui.js';
 import { refreshRegistry, registryStatus } from './lib/registry.js';
 import { audit, writeAuditReport } from './audit.js';
 import { DOMAINS } from './lib/domains.js';
-import { listBackups, restoreBackup } from './lib/backups.js';
+import { listBackups, restoreBackup, whereKept } from './lib/backups.js';
 import { runUpgrade } from './lib/upgrade.js';
 import { diagnose, repair } from './lib/repair.js';
 import { DEFAULT_SKILL_FLOOR, withDefaultSkillFloor } from './lib/default-skill-floor.js';
@@ -142,6 +142,12 @@ function renderPlan(plan, planId) {
   for (const decision of plan.decisions.filter((d) => d.state === 'excluded')) say(`  × ${decision.kind}/${decision.id} — ${decision.reason}`);
   say('Managed paths:');
   for (const path of plan.governedPaths) say(`  ${path}`);
+  if (plan.replacesUserSkills?.length) {
+    say('Your own skills this plan replaces:');
+    for (const path of plan.replacesUserSkills) say(`  ! ${path} — already here and not put by rsc; the catalog skill of the same name takes its place, and yours is kept in .rsc/backups/`);
+    say('  To keep yours, rename its folder (for example review → review-own) and generate the plan again.');
+    say('  AGENT: name each of these to the user before accepting, and ask whether to replace or rename.');
+  }
   if (plan.evidence.parentHarness) say(`Parent harness detected at ${plan.evidence.parentHarness}; it is not inherited by this plan.`);
   const pieces = [
     'npx @ericrisco/rsc@latest onboard',
@@ -201,6 +207,11 @@ async function runOnboarding(targets) {
     return;
   }
   const plan = buildOnboardingPlan(record, scanProject(process.cwd()));
+  // #275 — a folder where a catalog skill goes that rsc did not put is the user's own work. It goes
+  // INTO the plan, so the id they accept names it: an id made before that folder existed no longer
+  // applies, and accepting is never consent to something the plan did not show.
+  const replacesUserSkills = ownSkillPaths({ cwd: process.cwd(), targets: plan.policy.targets, skillIds: plan.policy.skills });
+  if (replacesUserSkills.length) plan.replacesUserSkills = replacesUserSkills;
   const planId = identifyPlan(plan);
   const accepted = flag('accept-plan');
   if (!accepted) {
@@ -229,6 +240,10 @@ async function runOnboarding(targets) {
   } catch (error) {
     say(`RSC_SKELETON_FAILED ${error.message}`);
   }
+  for (const path of plan.replacesUserSkills || []) {
+    const kept = whereKept({ cwd: process.cwd(), relPath: path });
+    if (kept) say(`Your previous ${path} is kept in ${kept}`);
+  }
   emitHarnessReadiness(plan, planId);
 }