@ericrisco/rsc 2.0.16 → 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.16",
+  "version": "2.0.18",
   "counts": {
     "skills": 273,
     "agents": 33,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ericrisco/rsc",
-  "version": "2.0.16",
+  "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": {
@@ -93,6 +93,14 @@
     {
       "fixedIn": "2.0.16",
       "symptom": "Non-technical or mixed users in a non-software project had no guard against irreversible commands; repair wired guards the plan had declined"
+    },
+    {
+      "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/lib/onboarding-apply.js

@@ -83,18 +83,69 @@ function recoveryCommand(plan, planId) {
 }
 
 export function renderOnboardingDocuments(plan, planId) {
-  const profile = `---\ntechnical_level: ${plan.record.technicalLevel}\naccompaniment: ${plan.record.accompaniment}\nproject_kind: ${plan.record.projectKind}\n---\n\n# User profile\n\nGoal: ${plan.record.goal}\n`;
+  // `accompaniment_level`, never `accompaniment` (#276). It sits beside `technical_level` in the same
+  // block, and it is the name the nine skill files that read the dial — orient first among them —
+  // have always used. This was the only writer of the short form, which left the dial chosen at
+  // onboarding invisible to the compass.
+  const profile = `---\ntechnical_level: ${plan.record.technicalLevel}\naccompaniment_level: ${plan.record.accompaniment}\nproject_kind: ${plan.record.projectKind}\n---\n\n# User profile\n\nGoal: ${plan.record.goal}\n`;
   const rows = plan.decisions.map((d) => `| ${d.kind} | ${d.id} | ${d.state} | ${d.reason} | ${d.reevaluateWhen.join('; ') || '—'} |`).join('\n');
   const installation = `# Accepted harness plan\n\nPlan id: \`${planId}\`\n\n| Kind | Component | Decision | Reason | Reevaluate when |\n| --- | --- | --- | --- | --- |\n${rows}\n`;
   const decisions = `# Harness decisions\n\n- Accepted plan \`${planId}\`.\n- Project kind: ${plan.record.projectKind}.\n- SDD: ${plan.decisions.find((d) => d.id === 'sdd')?.state || 'selected through profile'}.\n`;
   return { profile, installation, decisions };
 }
 
-export function writeOnboardingDocuments(cwd, plan, planId) {
+const PROFILE_DIALS = [['technical_level', 'technicalLevel'], ['accompaniment_level', 'accompaniment']];
+
+/**
+ * The profile is the USER's file; accepting a plan seeds it, it does not own it (#278).
+ *
+ * `init` records there what it learns — the domain, the tools, what must not be touched — and `orient`
+ * rewrites the dial when someone asks for more or less explanation. Regenerating the file on every
+ * accept erased both, and re-accepting is routine: after an update, after a reassess.
+ *
+ * So: everything the plan does not own is kept byte for byte. `project_kind` and the goal are facts of
+ * the plan and are updated. The two dials are the subtle part — the plan carries them, but after first
+ * contact the user adjusts them — so an existing value stands when the plan did not CHANGE it relative
+ * to the previous receipt, and an explicit new value (a receipt that said L3, a plan that says L2) is
+ * applied. A profile written before the rename carries `accompaniment:`; it is migrated, never
+ * duplicated.
+ */
+export function mergeProfile(existing, plan, previousRecord) {
+  const fresh = renderOnboardingDocuments(plan, '').profile;
+  if (!existing || !existing.trim()) return fresh;
+  const text = existing.replace(/\r\n/g, '\n');
+  const block = /^---\n([\s\S]*?)\n---\n?/.exec(text);
+  let front = block ? block[1].split('\n') : [];
+  let body = block ? text.slice(block[0].length) : text;
+  const has = (key) => front.some((line) => line.startsWith(`${key}:`));
+  front = has('accompaniment_level')
+    ? front.filter((line) => !/^accompaniment:\s/.test(line))
+    : front.map((line) => line.replace(/^accompaniment:(\s)/, 'accompaniment_level:$1'));
+  const get = (key) => front.find((line) => line.startsWith(`${key}:`))?.slice(key.length + 1).trim() || null;
+  const set = (key, value) => {
+    const at = front.findIndex((line) => line.startsWith(`${key}:`));
+    if (at >= 0) front[at] = `${key}: ${value}`;
+    else front.push(`${key}: ${value}`);
+  };
+  for (const [key, field] of PROFILE_DIALS) {
+    const planned = plan.record[field];
+    const keptByUser = get(key) && previousRecord && previousRecord[field] === planned;
+    if (!keptByUser) set(key, planned);
+  }
+  set('project_kind', plan.record.projectKind);
+  const goal = `Goal: ${plan.record.goal}`;
+  if (/^Goal: .*$/m.test(body)) body = body.replace(/^Goal: .*$/m, () => goal);
+  else if (/^# User profile[ \t]*$/m.test(body)) body = body.replace(/^# User profile[ \t]*$/m, () => `# User profile\n\n${goal}`);
+  else body = `${body.replace(/\s*$/, '')}\n\n${goal}\n`;
+  return `---\n${front.join('\n')}\n---\n${body.startsWith('\n') ? '' : '\n'}${body}`;
+}
+
+export function writeOnboardingDocuments(cwd, plan, planId, previousRecord = null) {
   const dir = join(cwd, '02-DOCS', 'wiki', 'harness');
   mkdirSync(dir, { recursive: true });
   const docs = renderOnboardingDocuments(plan, planId);
-  writeFileSync(join(dir, 'user-profile.md'), docs.profile);
+  const profilePath = join(dir, 'user-profile.md');
+  writeFileSync(profilePath, mergeProfile(existsSync(profilePath) ? readFileSync(profilePath, 'utf8') : '', plan, previousRecord));
   writeFileSync(join(dir, 'installation-plan.md'), docs.installation);
   const decisionsPath = join(dir, 'decisions.md');
   if (!existsSync(decisionsPath)) writeFileSync(decisionsPath, docs.decisions);
@@ -134,12 +185,15 @@ export function verifyOnboarding(cwd, plan, planId) {
   }
   const docsDir = join(cwd, '02-DOCS', 'wiki', 'harness');
   const profile = existsSync(join(docsDir, 'user-profile.md')) ? readFileSync(join(docsDir, 'user-profile.md'), 'utf8') : '';
-  for (const line of [
-    `technical_level: ${plan.record.technicalLevel}`,
-    `accompaniment: ${plan.record.accompaniment}`,
-    `project_kind: ${plan.record.projectKind}`,
-    `Goal: ${plan.record.goal}`,
-  ]) if (!profile.split('\n').includes(line)) differences.push(`profile content differs: ${line.split(':')[0]}`);
+  // The plan's facts must be exactly there. The dials must be there under their one name with a valid
+  // value — not necessarily the plan's, because a dial the user adjusted and the plan did not change
+  // is theirs (see mergeProfile).
+  for (const line of [`project_kind: ${plan.record.projectKind}`, `Goal: ${plan.record.goal}`]) {
+    if (!profile.split('\n').includes(line)) differences.push(`profile content differs: ${line.split(':')[0]}`);
+  }
+  if (!/^technical_level: (non-technical|mixed|technical)$/m.test(profile)) differences.push('profile content differs: technical_level');
+  if (!/^accompaniment_level: L[0-3]$/m.test(profile)) differences.push('profile content differs: accompaniment_level');
+  if (/^accompaniment: /m.test(profile)) differences.push('profile carries the retired accompaniment key');
   const installation = existsSync(join(docsDir, 'installation-plan.md')) ? readFileSync(join(docsDir, 'installation-plan.md'), 'utf8') : '';
   if (!installation.includes(`Plan id: \`${planId}\``)) differences.push('installation plan identity differs');
   for (const decision of plan.decisions || []) {
@@ -148,7 +202,8 @@ export function verifyOnboarding(cwd, plan, planId) {
   }
   const decisions = existsSync(join(docsDir, 'decisions.md')) ? readFileSync(join(docsDir, 'decisions.md'), 'utf8') : '';
   if (!decisions.includes(`Accepted plan \`${planId}\``)) differences.push('decision ledger omits accepted plan');
-  if (!sameSet(manifest?.targets || [], plan.policy.targets)) differences.push('manifest targets differ from accepted policy');
+  // Every planned assistant is declared; an extra one added outside the plan may be too (#278).
+  if (!plan.policy.targets.every((t) => (manifest?.targets || []).includes(t))) differences.push('manifest targets differ from accepted policy');
   if (!sameSet(manifest?.skills || [], plan.policy.skills)) differences.push('manifest skills differ from accepted policy');
   if (!sameSet(manifest?.agents || [], plan.policy.agents || [])) differences.push('manifest agents differ from accepted policy');
   return differences;
@@ -200,7 +255,7 @@ export async function applyAcceptedOnboarding({ cwd = process.cwd(), plan, planI
       });
     }
     pruneSharedBases({ cwd, skillIds: plan.policy.skills });
-    writeOnboardingDocuments(cwd, plan, planId);
+    writeOnboardingDocuments(cwd, plan, planId, previousPlan?.record || null);
     receipt.provenance.paths = Object.fromEntries((plan.governedPaths || []).map((path) => [
       path,
       existed[path] ? (previousReceipt ? 'conserved' : 'preexisting') : 'installed',
@@ -209,7 +264,13 @@ export async function applyAcceptedOnboarding({ cwd = process.cwd(), plan, planI
     const manifest = readManifest(cwd);
     writeManifest(cwd, {
       ...manifest,
-      targets: [...plan.policy.targets],
+      // Union, with the distinction the removal loop above already makes (#278). An assistant that was
+      // in the previous PLAN and is not in this one was removed on purpose. One added OUTSIDE the plan
+      // — `sync --target codex` — is still installed, and dropping it from the declaration meant a
+      // clone would never build it again.
+      targets: [...plan.policy.targets, ...(previousManifest?.targets || []).filter((t) => !plan.policy.targets.includes(t)
+        && !(previousPlan?.policy?.targets || []).includes(t)
+        && existsSync(targetPaths(t, undefined, cwd).stateFile))],
       skills: [...plan.policy.skills],
       agents: [...(plan.policy.agents || [])],
       onboarding: receipt,

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);
 }
 

package/skills/init/references/accompaniment-and-profile.md

@@ -41,7 +41,7 @@ Defaults when the user gives no preference: `non-technical → L3`, `mixed → L
 
 ## How every skill adapts
 
-Both values combine. `accompaniment_level` controls **how much** is said and **how many questions** are asked; `technical_level` controls **the vocabulary**.
+Both values combine. `accompaniment_level` controls **how much** is said and **how many questions** are asked; `technical_level` controls **the vocabulary**. A profile written by an older `onboard` may carry `accompaniment:` instead — it is the same dial; read it, and write `accompaniment_level` the next time you touch the profile.
 
 | Level | Output verbosity | Questions before acting | On a decision |
 | --- | --- | --- | --- |

package/skills/orient/SKILL.md

@@ -38,7 +38,7 @@ Knowledge map or the repo before writing 📍 — an invented state is worse tha
 ## Calibrate to the dial
 
 Read `02-DOCS/wiki/harness/user-profile.md` before writing the block. Two fields combine:
-`accompaniment_level` sets the depth, `technical_level` sets the vocabulary.
+`accompaniment_level` sets the depth, `technical_level` sets the vocabulary. A profile written by an older `onboard` may carry `accompaniment:` instead — it is the same dial; read it, and write `accompaniment_level` the next time you touch the profile.
 
 | accompaniment_level | How the block behaves |
 |---------------------|-----------------------|

package/skills/orient/references/orientation-contract.md

@@ -19,7 +19,7 @@ could leave the user unsure closes with the brújula block.
 
 ## Calibration (the dial)
 
-Read `02-DOCS/wiki/harness/user-profile.md`. Two fields combine: `accompaniment_level` (L0 | L1 | L2 | L3) sets how deep the block goes; `technical_level` (non-technical | mixed | technical) sets the vocabulary.
+Read `02-DOCS/wiki/harness/user-profile.md`. Two fields combine: `accompaniment_level` (L0 | L1 | L2 | L3) sets how deep the block goes; `technical_level` (non-technical | mixed | technical) sets the vocabulary. A profile written by an older `onboard` may carry `accompaniment:` instead — it is the same dial; read it, and write `accompaniment_level` the next time you touch the profile.
 
 - **L0 — cavernícola:** only `✅` + `➡️`, one option, yes/no question.
 - **L1 — breve:** the four lines; one line of why.