@haposoft/cafekit 0.16.7 → 0.18.1

package/bin/__tests__/omp-hooks.test.js

@@ -117,25 +117,6 @@ test('an unevaluable access denies rather than allows', () => {
   }
 });
 
-test('a write to a scaffolded task path is guarded under omp lowercase names too', () => {
-  // The guard is no longer an overlay file, so this is a behaviour case on the tree an
-  // install produces: omp sends `write`, and the shared reader has to make it reach the
-  // rule that was authored against Claude's `Write`.
-  const root = fs.mkdtempSync(path.join(os.tmpdir(), 'cafekit-omp-guard-'));
-  try {
-    const target = path.join(root, 'specs', 'demo', 'tasks', 'task-R0-01-x.md');
-    fs.mkdirSync(path.dirname(target), { recursive: true });
-    fs.cpSync(path.join(PACKAGE_ROOT, 'src/claude/scripts'), path.join(INSTALLED_ROOT, '.omp', 'scripts'),
-      { recursive: true, force: true });
-    const r = verdict(path.join(INSTALLED, 'task-scaffold-guard.cjs'),
-      { tool_name: 'write', tool_input: { file_path: target }, cwd: root });
-    assert.equal(r.code, 2, "omp sends `write`; an exact 'Write' comparison would skip the guard entirely");
-    assert.equal(r.decision, 'deny');
-  } finally {
-    fs.rmSync(root, { recursive: true, force: true });
-  }
-});
-
 /** Every file under a directory, relative and sorted. */
 function walk(dir, prefix = '') {
   return fs.readdirSync(dir).flatMap((name) => {

package/bin/__tests__/optional-skill-inventory.test.js

@@ -50,7 +50,7 @@ function silentUi() {
 
 test('manifest separates core, optional documents, and retired skills', () => {
   const manifest = loadClaudeMigrationManifest();
-  assert.equal(manifest.skills.required.includes('route'), true);
+  assert.equal(manifest.skills.required.includes('route'), false);
   assert.deepEqual(manifest.skills.bundles.documentSkills, [
     'ai-multimodal', 'docs', 'docx', 'pdf', 'pptx', 'xlsx'
   ]);
@@ -59,7 +59,8 @@ test('manifest separates core, optional documents, and retired skills', () => {
   }
   assert.deepEqual(manifest.obsolete.skills, [
     'backend-development', 'frontend-development', 'frontend-design',
-    'mobile-development', 'devops', 'react-best-practices'
+    'mobile-development', 'devops', 'react-best-practices',
+    'inspect', 'hotfix', 'question', 'loop', 'route', 'delegate'
   ]);
 });
 
@@ -167,7 +168,7 @@ test('fresh combined install defaults optional bundle OFF', () => {
     for (const platformKey of ['claude', 'codex']) {
       const platform = PLATFORMS[platformKey];
       assert.equal(fs.existsSync(path.join(platform.skillsDir, 'docs')), false);
-      assert.equal(fs.existsSync(path.join(platform.skillsDir, 'route', 'SKILL.md')), true);
+      assert.equal(fs.existsSync(path.join(platform.skillsDir, 'route', 'SKILL.md')), false);
       const metadata = JSON.parse(fs.readFileSync(path.join(platform.folder, 'cafekit.json'), 'utf8'));
       assert.equal(metadata.schemaVersion, 2);
       assert.equal(metadata.documentSkills.enabled, false);
@@ -193,7 +194,7 @@ test('explicit opt-in installs all six optional skills on both runtimes', () =>
       ], { cwd: root, encoding: 'utf8' });
       assert.equal(catalog.status, 0, catalog.stderr);
       const catalogData = JSON.parse(catalog.stdout);
-      assert.equal(catalogData.skills.some((skill) => skill.public_id === 'cf:route'), true);
+      assert.equal(catalogData.skills.some((skill) => skill.public_id === 'cf:route'), false);
       assert.equal(catalogData.skills.some((skill) => skill.public_id === 'cf:docs'), true);
       const metadata = JSON.parse(fs.readFileSync(path.join(platform.folder, 'cafekit.json'), 'utf8'));
       assert.deepEqual(metadata.documentSkills, {
@@ -247,3 +248,110 @@ test('modified retired skill is preserved but excluded from automatic routing',
       item.directory === 'backend-development' && item.code === 'retired_skill'));
   });
 });
+
+for (const platformKey of ['claude', 'codex']) {
+  test(`${platformKey} upgrade retires the inspect, hotfix and question directories`, () => {
+    withTempProject((root) => {
+      const platform = PLATFORMS[platformKey];
+      const recordRoot = platform.ownership?.recordRoot || platform.folder;
+      const key = (file) => path.relative(recordRoot, file).replace(/\\/g, '/');
+      const ownership = { schemaVersion: 1, version: 'old', files: {} };
+      for (const old of ['inspect', 'hotfix', 'question']) {
+        const file = path.join(platform.skillsDir, old, 'SKILL.md');
+        fs.mkdirSync(path.dirname(file), { recursive: true });
+        fs.writeFileSync(file, `pristine ${old}\n`);
+        ownership.files[key(file)] = { sha256: manifestLib.hashFile(file), version: 'old' };
+      }
+      const ctx = {
+        manifest: loadClaudeMigrationManifest(),
+        documentSkills: { [platformKey]: { enabled: true, selectionSource: 'cli-opt-in' } },
+        ownership: { [platform.folder]: ownership },
+        trackers: { [platformKey]: manifestLib.createTracker(platform.folder, 'next', platform.ownership) },
+        dryRun: false,
+        ui: silentUi(),
+        results: { updated: 0, preserved: 0, preservedFiles: [] }
+      };
+      reconcileSkillInventory(ctx, platformKey);
+      for (const old of ['inspect', 'hotfix', 'question']) {
+        assert.equal(fs.existsSync(path.join(root, platform.skillsDir, old)), false, old);
+      }
+      assert.equal(ctx.results.updated, 3);
+
+      // A user-modified retired copy survives with a warning, and the catalog serves cf:fix from fix/
+      // while marking the old directory retired rather than reporting a folder mismatch.
+      const edited = path.join(root, platform.skillsDir, 'hotfix', 'SKILL.md');
+      fs.mkdirSync(path.dirname(edited), { recursive: true });
+      fs.writeFileSync(edited, [
+        '---', `name: ${platformKey === 'codex' ? 'cf-fix' : 'cf:fix'}`,
+        'description: "User-modified retired copy."', '---', '# Preserved', '',
+      ].join('\n'));
+      const result = spawnSync(process.execPath, [
+        installerPath, '--platform', platformKey, '--yes'
+      ], { cwd: root, encoding: 'utf8' });
+      assert.equal(result.status, 0, result.stderr || result.stdout);
+      assert.equal(fs.existsSync(edited), true);
+      assert.match(`${result.stdout}\n${result.stderr}`, /Preserved user-owned skill: .*hotfix/);
+      for (const renamed of ['scout', 'fix', 'ask']) {
+        assert.equal(fs.existsSync(path.join(root, platform.skillsDir, renamed, 'SKILL.md')), true, renamed);
+      }
+      const scriptRoot = platformKey === 'codex' ? '.codex' : '.claude';
+      const catalog = spawnSync(process.execPath, [
+        path.join(root, scriptRoot, 'scripts', 'generate-skill-catalog.cjs'), '--json'
+      ], { cwd: root, encoding: 'utf8' });
+      assert.equal(catalog.status, 0, catalog.stderr);
+      const parsed = JSON.parse(catalog.stdout);
+      for (const id of ['cf:scout', 'cf:fix', 'cf:ask']) {
+        assert.ok(parsed.skills.some((skill) => skill.public_id === id), id);
+      }
+      assert.equal(parsed.skills.find((skill) => skill.public_id === 'cf:fix').directory, 'fix');
+      assert.ok(parsed.diagnostics.some((item) => item.directory === 'hotfix' && item.code === 'retired_skill'));
+      assert.equal(parsed.diagnostics.some((item) => item.code === 'duplicate_public_name'), false);
+    });
+  });
+}
+
+for (const platformKey of ['claude', 'codex']) {
+  test(`${platformKey} upgrade retires the removed loop, route and delegate directories`, () => {
+    withTempProject((root) => {
+      const platform = PLATFORMS[platformKey];
+      const recordRoot = platform.ownership?.recordRoot || platform.folder;
+      const key = (file) => path.relative(recordRoot, file).replace(/\\/g, '/');
+      const ownership = { schemaVersion: 1, version: 'old', files: {} };
+      const removed = ['loop', 'route', 'delegate'];
+      for (const old of removed) {
+        const file = path.join(platform.skillsDir, old, 'SKILL.md');
+        fs.mkdirSync(path.dirname(file), { recursive: true });
+        fs.writeFileSync(file, `pristine ${old}\n`);
+        ownership.files[key(file)] = { sha256: manifestLib.hashFile(file), version: 'old' };
+      }
+      // A user-edited copy has no matching ownership hash, so it must survive the upgrade.
+      const edited = path.join(platform.skillsDir, 'route', 'references', 'my-notes.md');
+      fs.mkdirSync(path.dirname(edited), { recursive: true });
+      fs.writeFileSync(edited, 'user notes\n');
+      const ctx = {
+        manifest: loadClaudeMigrationManifest(),
+        documentSkills: { [platformKey]: { enabled: true, selectionSource: 'cli-opt-in' } },
+        ownership: { [platform.folder]: ownership },
+        trackers: { [platformKey]: manifestLib.createTracker(platform.folder, 'next', platform.ownership) },
+        dryRun: false,
+        ui: silentUi(),
+        results: { updated: 0, preserved: 0, preservedFiles: [] }
+      };
+      reconcileSkillInventory(ctx, platformKey);
+      assert.equal(fs.existsSync(path.join(root, platform.skillsDir, 'loop')), false, 'loop');
+      assert.equal(fs.existsSync(path.join(root, platform.skillsDir, 'delegate')), false, 'delegate');
+      assert.equal(fs.existsSync(path.join(root, edited)), true, 'user-edited route copy is preserved');
+      assert.equal(ctx.results.updated, 2);
+      assert.equal(ctx.results.preserved, 1);
+    });
+  });
+}
+
+test('the catalog retires exactly the directories the manifest retires', () => {
+  const source = fs.readFileSync(
+    path.resolve(__dirname, '..', '..', 'src', 'claude', 'scripts', 'generate-skill-catalog.cjs'), 'utf8');
+  const block = source.match(/const RETIRED_DIRECTORIES = new Set\(\[([\s\S]*?)\]\);/);
+  assert.ok(block, 'RETIRED_DIRECTORIES not found');
+  const retired = [...block[1].matchAll(/'([^']+)'/g)].map((match) => match[1]);
+  assert.deepEqual([...retired].sort(), [...loadClaudeMigrationManifest().obsolete.skills].sort());
+});

package/bin/__tests__/orca-session.test.js

@@ -145,8 +145,6 @@ function composeCodexHookTree(root) {
   const hooksDir = path.join(root, '.codex', 'hooks');
   fs.mkdirSync(path.join(hooksDir, 'lib'), { recursive: true });
   fs.copyFileSync(path.join(PACKAGE_ROOT, 'src/codex/hooks/session.cjs'), path.join(hooksDir, 'session.cjs'));
-  fs.copyFileSync(path.join(PACKAGE_ROOT, 'src/codex/hooks/completion-authority-state.cjs'),
-    path.join(hooksDir, 'completion-authority-state.cjs'));
   fs.copyFileSync(path.join(PACKAGE_ROOT, 'src/codex/hooks/lib/hook-context.cjs'),
     path.join(hooksDir, 'lib', 'hook-context.cjs'));
   fs.copyFileSync(path.join(PACKAGE_ROOT, 'src/codex/hooks/lib/privacy-state.cjs'),