fix(uninstall): provenance-gate the shape-2 and cursor sweeps; document the alias-name coupling

Three ways gstack-uninstall could touch a user's own skills:

- Shape 2 (real dir + symlinked SKILL.md) matched the link target against a
  bare *gstack* substring, so a skill symlinked from ~/tools/gstack-fork/ was
  wiped on uninstall. The gate now requires "gstack" as an anchored path
  segment (gstack/*|*/gstack/*, same pattern as shape 1) AND the dir name in
  gstack's skill inventory (parity with shape 3); anything else is listed to
  stderr, never deleted.
- The new Cursor removals (~/.cursor/skills/gstack* and repo-local
  .cursor/skills/gstack*) rm -rf'd any glob match with no provenance check,
  so a hand-written ~/.cursor/skills/gstack-fork-notes was swept. Real dirs
  now require the AUTO-GENERATED banner in SKILL.md; non-matching dirs are
  kept and listed. Legacy codex/factory/kiro globs are untouched (tracked in
  TODOS as a follow-up).
- The _INVENTORY seed list hardcodes alias names created by setup's
  _install_alias_skill_md; both sites now carry mirrored keep-in-sync
  comments so a renamed alias can't silently strand its dir.

The skipped-entry report moves to the end of the run so cursor skips are
listed alongside the Claude ones.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

test/uninstall-windows-copies.test.ts

@@ -148,9 +148,56 @@ describe.skipIf(process.platform === 'win32')(
       expect(fs.existsSync(dir)).toBe(false);
     });
 
+    test('SKILL.md symlink into a gstack-SUBSTRING path (gstack-fork) → kept and listed', () => {
+      // DM5: the shape-2 gate must match "gstack" as an anchored path
+      // segment, not a substring — a user's own skill whose SKILL.md links
+      // into ~/tools/gstack-fork/ is NOT ours, even when the dir name
+      // collides with a real gstack skill (here: review, in the inventory).
+      // The anchored gate only matches a literal /gstack/ path segment, so
+      // the tmpdir must not carry one (shared-process shard runs can leave
+      // $TMPDIR pointing into a gstack worktree — same hazard as the
+      // "pointing elsewhere" test below). Fall back to a fixed neutral root
+      // and ASSERT the precondition.
+      let neutralRoot = os.tmpdir();
+      if (neutralRoot.split(path.sep).includes('gstack')) neutralRoot = '/private' + path.sep + 'tmp';
+      const forkRoot = fs.mkdtempSync(path.join(neutralRoot, 'tools-'));
+      expect(forkRoot.split(path.sep).includes('gstack')).toBe(false);
+      const forkSrc = path.join(forkRoot, 'gstack-fork', 'review');
+      fs.mkdirSync(forkSrc, { recursive: true });
+      fs.writeFileSync(path.join(forkSrc, 'SKILL.md'), skillMd('review'));
+      const dir = path.join(skillsDir, 'review');
+      fs.mkdirSync(dir, { recursive: true });
+      fs.symlinkSync(path.join(forkSrc, 'SKILL.md'), path.join(dir, 'SKILL.md'));
+
+      try {
+        const r = runUninstall();
+        expect(r.status).toBe(0);
+        expect(fs.existsSync(dir)).toBe(true);
+        expect(r.stderr).toContain('left in place');
+        expect(r.stderr).toContain(path.join('skills', 'review'));
+      } finally {
+        fs.rmSync(forkRoot, { recursive: true, force: true });
+      }
+    });
+
+    test('SKILL.md symlink into gstack but name NOT in inventory → kept and listed', () => {
+      // Shape 2 now carries the same inventory gate as shape 3: a dir whose
+      // name setup could never have created is skipped even when its
+      // SKILL.md target resolves into the install root.
+      const dir = path.join(skillsDir, 'my-custom-wrapper');
+      fs.mkdirSync(dir, { recursive: true });
+      fs.symlinkSync(path.join(installRoot, 'qa', 'SKILL.md'), path.join(dir, 'SKILL.md'));
+
+      const r = runUninstall();
+      expect(r.status).toBe(0);
+      expect(fs.existsSync(dir)).toBe(true);
+      expect(r.stderr).toContain('my-custom-wrapper');
+    });
+
     test('SKILL.md symlink pointing elsewhere → kept and listed', () => {
-      // Target path must not contain "gstack" anywhere (the provenance match
-      // is a substring check, mirroring setup's cleanup helpers) — the suite
+      // Target path must not contain a gstack path segment (the provenance
+      // match is anchored: gstack/*|*/gstack/*; keeping the stricter
+      // no-substring precondition costs nothing) — the suite
       // tmpdir prefix does, so use a separate neutral tmpdir. os.tmpdir()
       // reads $TMPDIR at CALL time, and in shared-process shard runs a
       // neighboring test can leave it pointing at a gstack-containing path —

test/uninstall.test.ts

@@ -163,15 +163,18 @@ describe('gstack-uninstall', () => {
     });
 
     test('--force removes Cursor gstack skills and leaves other Cursor skills', () => {
+      // Cursor installs are rendered real dirs, so removal is gated on the
+      // generated banner in SKILL.md (S5) — the managed fixtures carry it.
+      const banner = '<!-- AUTO-GENERATED from SKILL.md.tmpl - DO NOT EDIT DIRECTLY -->\n# x\n';
       fs.mkdirSync(path.join(mockHome, '.cursor', 'skills', 'gstack'), { recursive: true });
-      fs.writeFileSync(path.join(mockHome, '.cursor', 'skills', 'gstack', 'SKILL.md'), 'test');
+      fs.writeFileSync(path.join(mockHome, '.cursor', 'skills', 'gstack', 'SKILL.md'), banner);
       fs.mkdirSync(path.join(mockHome, '.cursor', 'skills', 'gstack-review'), { recursive: true });
-      fs.writeFileSync(path.join(mockHome, '.cursor', 'skills', 'gstack-review', 'SKILL.md'), 'test');
+      fs.writeFileSync(path.join(mockHome, '.cursor', 'skills', 'gstack-review', 'SKILL.md'), banner);
       fs.mkdirSync(path.join(mockHome, '.cursor', 'skills', 'frontend-design'), { recursive: true });
       fs.writeFileSync(path.join(mockHome, '.cursor', 'skills', 'frontend-design', 'SKILL.md'), 'keep');
 
       fs.mkdirSync(path.join(mockGitRoot, '.cursor', 'skills', 'gstack-ship'), { recursive: true });
-      fs.writeFileSync(path.join(mockGitRoot, '.cursor', 'skills', 'gstack-ship', 'SKILL.md'), 'test');
+      fs.writeFileSync(path.join(mockGitRoot, '.cursor', 'skills', 'gstack-ship', 'SKILL.md'), banner);
       fs.mkdirSync(path.join(mockGitRoot, '.cursor', 'rules'), { recursive: true });
       fs.writeFileSync(path.join(mockGitRoot, '.cursor', 'rules', 'keep.md'), 'keep');
 
@@ -194,5 +197,37 @@ describe('gstack-uninstall', () => {
       expect(fs.existsSync(path.join(mockGitRoot, '.cursor', 'skills', 'gstack-ship'))).toBe(false);
       expect(fs.existsSync(path.join(mockGitRoot, '.cursor', 'rules', 'keep.md'))).toBe(true);
     });
+
+    test("a user's own gstack-prefixed Cursor dir (no banner) survives and is listed", () => {
+      // S5: the bare gstack* glob must not sweep a dir that merely starts
+      // with "gstack" — provenance comes from the generated banner, and a
+      // hand-written SKILL.md never carries it.
+      const foreign = path.join(mockHome, '.cursor', 'skills', 'gstack-fork-notes');
+      fs.mkdirSync(foreign, { recursive: true });
+      fs.writeFileSync(path.join(foreign, 'SKILL.md'), '# my own notes\n');
+
+      const foreignLocal = path.join(mockGitRoot, '.cursor', 'skills', 'gstack-my-rules');
+      fs.mkdirSync(foreignLocal, { recursive: true });
+      fs.writeFileSync(path.join(foreignLocal, 'SKILL.md'), '# hand-written\n');
+
+      const result = spawnSync('bash', [UNINSTALL, '--force'], {
+        stdio: 'pipe',
+        env: {
+          ...process.env,
+          HOME: mockHome,
+          GSTACK_DIR: path.join(mockHome, '.claude', 'skills', 'gstack'),
+          GSTACK_STATE_DIR: path.join(mockHome, '.gstack'),
+        },
+        cwd: mockGitRoot,
+      });
+
+      expect(result.status).toBe(0);
+      expect(fs.existsSync(foreign)).toBe(true);
+      expect(fs.existsSync(foreignLocal)).toBe(true);
+      const stderr = result.stderr.toString();
+      expect(stderr).toContain('left in place');
+      expect(stderr).toContain('gstack-fork-notes');
+      expect(stderr).toContain('gstack-my-rules');
+    });
   });
 });