skillrepo 4.9.2 → 4.11.0

package/src/lib/mergers/gitignore.mjs

@@ -1,8 +1,8 @@
 /**
- * Merger for .gitignore — adds the paths `skillrepo init` writes that
- * must not be committed.
+ * Merger for .gitignore — the init-facing entry point over the CLI's
+ * single marked section (core writer: `../gitignore-section.mjs`).
  *
- * Always added:
+ * Always added by `skillrepo init`:
  *   - `.env.local` — contains SKILLREPO_ACCESS_KEY, a live credential
  *   - `.claude/settings.local.json` — Claude Code per-user settings
  *
@@ -10,16 +10,20 @@
  *   - `.claude/skills/` — when any vendor maps to `claudeProject`
  *   - `.agents/skills/` — when any vendor maps to `agentsProject`
  *
- * Idempotent: entries already present are skipped. A single call
- * either adds all missing entries in one grouped section or exits
- * without writing if they're all already present.
+ * The sync-time pre-flight (`file-write.mjs`) manages the managed-root
+ * entries through the same core, so every CLI-authored gitignore line
+ * lives in the one marked section the uninstall remover strips (#2361).
+ *
+ * Idempotent: entries already present are skipped; a legacy sync-time
+ * section is healed into the marked section as a side effect.
  */
 
-import { readFileSafe, writeFileSafe } from "../fs-utils.mjs";
-import { gitignorePath } from "../paths.mjs";
 import { placementTargetsFor } from "../file-write.mjs";
+import {
+  ensureGitignoreEntries,
+  MANAGED_ROOT_ENTRIES,
+} from "../gitignore-section.mjs";
 
-const SECTION_HEADER = "# SkillRepo CLI (added by `skillrepo init`)";
 const ALWAYS_ENTRIES = Object.freeze([
   ".env.local",
   ".claude/settings.local.json",
@@ -38,7 +42,7 @@ const ALWAYS_ENTRIES = Object.freeze([
 function entriesFor(options) {
   const entries = [...ALWAYS_ENTRIES];
   if (!Array.isArray(options.vendors) || options.vendors.length === 0) {
-    entries.push(".claude/skills/");
+    entries.push(MANAGED_ROOT_ENTRIES.claudeProject);
     return entries;
   }
   let targets;
@@ -50,72 +54,25 @@ function entriesFor(options) {
   } catch {
     // Caller passed an unknown vendor; fall back to the always-set
     // entries plus `.claude/skills/` so we never under-protect.
-    entries.push(".claude/skills/");
+    entries.push(MANAGED_ROOT_ENTRIES.claudeProject);
     return entries;
   }
-  if (targets.includes("claudeProject")) entries.push(".claude/skills/");
-  if (targets.includes("agentsProject")) entries.push(".agents/skills/");
+  for (const [target, entry] of Object.entries(MANAGED_ROOT_ENTRIES)) {
+    if (targets.includes(target)) entries.push(entry);
+  }
   return entries;
 }
 
 /**
  * Ensure the init-required paths are in .gitignore. Creates the file
  * if it doesn't exist. Idempotent — returns `"skipped"` if every
- * required entry is already present, `"created"` if the file didn't
- * exist, `"updated"` if it did and at least one entry was missing.
+ * required entry is already present and no legacy section needed
+ * healing, `"created"` if the file didn't exist, `"updated"` if it did
+ * and at least one entry was missing (or a legacy section was healed).
  *
  * @param {{ vendors?: string[], global?: boolean }} [options]
  * @returns {{ path: string; action: "created" | "updated" | "skipped"; added: string[] }}
  */
 export function mergeGitignore(options = {}) {
-  const requiredEntries = entriesFor(options);
-  const filePath = gitignorePath();
-  const existing = readFileSafe(filePath);
-
-  if (existing === null) {
-    // Fresh .gitignore — write all required entries as one section.
-    const content = renderSection(requiredEntries);
-    writeFileSafe(filePath, content);
-    return {
-      path: ".gitignore",
-      action: "created",
-      added: [...requiredEntries],
-    };
-  }
-
-  // Line-exact match check. `.env.local` as a line is distinct from
-  // `.env.local.backup` or a comment `# .env.local` — split on
-  // newlines and trim so we match the entry literally.
-  const lines = existing.split(/\r?\n/).map((l) => l.trim());
-  const missing = requiredEntries.filter((entry) => !lines.includes(entry));
-
-  if (missing.length === 0) {
-    return {
-      path: ".gitignore",
-      action: "skipped",
-      added: [],
-    };
-  }
-
-  // Append only the missing entries as a new section. Preserve the
-  // original line-ending style.
-  const lineEnding = existing.includes("\r\n") ? "\r\n" : "\n";
-  const separator = existing.endsWith("\n") ? "" : lineEnding;
-  const block = renderSection(missing, lineEnding);
-  writeFileSafe(filePath, existing + separator + lineEnding + block);
-
-  return {
-    path: ".gitignore",
-    action: "updated",
-    added: missing,
-  };
-}
-
-/**
- * Render the SkillRepo section with the given entries. The leading
- * blank line separates the section from whatever precedes it when
- * appending, and the trailing newline keeps the file POSIX-clean.
- */
-function renderSection(entries, lineEnding = "\n") {
-  return SECTION_HEADER + lineEnding + entries.join(lineEnding) + lineEnding;
+  return ensureGitignoreEntries(entriesFor(options));
 }

package/src/lib/paths.mjs

@@ -38,6 +38,17 @@ export const globalLastSyncPath = () => join(homedir(), ".claude", "skillrepo",
 export const globalNpmVersionCheckPath = () =>
   join(homedir(), ".claude", "skillrepo", ".npm-version-check");
 
+/**
+ * Governance warn-on-new state (#2361 owner directive): which unmanaged
+ * dirs (per placement root) and gitignored declarations (per repo) the
+ * CLI has already warned about. Separate file from `.last-sync` —
+ * different concern (what the USER was told vs. library content state)
+ * and a schema bump in one must not gate the other. Same parent dir so
+ * uninstall's whole-directory removal covers it.
+ */
+export const globalGovernanceSeenPath = () =>
+  join(homedir(), ".claude", "skillrepo", ".governance-seen");
+
 // ── Skill placement targets ────────────────────────────────────────────
 //
 // Per-vendor placement decisions live in `agent-registry.mjs`. This

package/src/lib/removers/gitignore.mjs

@@ -22,7 +22,10 @@
 
 import { existsSync, readFileSync } from "node:fs";
 import { writeFileAtomic } from "../fs-utils.mjs";
-import { GITIGNORE_SECTION_HEADER } from "../artifact-registry.mjs";
+import {
+  GITIGNORE_SECTION_HEADER,
+  LEGACY_GITIGNORE_SECTION_HEADER,
+} from "../artifact-registry.mjs";
 import { gitignorePath } from "../paths.mjs";
 
 /**
@@ -50,10 +53,41 @@ export function removeGitignore({ dryRun = false } = {}) {
   // stays CRLF. `split(/\r?\n/)` discards the line-ending bytes, so
   // we detect them explicitly and rebuild on that basis.
   const lineEnding = original.includes("\r\n") ? "\r\n" : "\n";
-  const lines = original.split(/\r?\n/);
+  let lines = original.split(/\r?\n/);
+
+  // Legacy sync-time section (#2361): pre-4.10.0 syncs wrote
+  // `.agents/skills/` under its own header, outside the marked
+  // section. If the merger's heal never ran (user uninstalls without
+  // syncing on 4.10.0+), strip the attributable shape here: the
+  // header line plus a directly-following `.agents/skills/` line.
+  // Any other line under the legacy header is user content and
+  // survives.
+  let legacyRemoved = 0;
+  const legacyIdx = lines.findIndex(
+    (l) => l === LEGACY_GITIGNORE_SECTION_HEADER,
+  );
+  if (legacyIdx !== -1) {
+    let legacyEnd = legacyIdx + 1;
+    if (legacyEnd < lines.length && lines[legacyEnd] === ".agents/skills/") {
+      legacyEnd += 1;
+    }
+    legacyRemoved = legacyEnd - legacyIdx;
+    lines = [...lines.slice(0, legacyIdx), ...lines.slice(legacyEnd)];
+  }
 
   const headerIdx = lines.findIndex((l) => l === GITIGNORE_SECTION_HEADER);
   if (headerIdx === -1) {
+    if (legacyRemoved > 0) {
+      if (dryRun) {
+        return {
+          path: ".gitignore",
+          action: "would-remove",
+          removed: legacyRemoved,
+        };
+      }
+      writeFileAtomic(filePath, lines.join(lineEnding));
+      return { path: ".gitignore", action: "removed", removed: legacyRemoved };
+    }
     return { path: ".gitignore", action: "skipped", removed: 0 };
   }
 
@@ -89,7 +123,8 @@ export function removeGitignore({ dryRun = false } = {}) {
   // ? 1 : 0)` gives the SkillRepo-line count.
   const consumedTrailingBlank =
     end > headerIdx + 1 && lines[end - 1] === "";
-  const reportedRemoved = removedLines - (consumedTrailingBlank ? 1 : 0);
+  const reportedRemoved =
+    removedLines - (consumedTrailingBlank ? 1 : 0) + legacyRemoved;
 
   if (dryRun) {
     return {