test(cli): isolate skill removal cache fixtures

Author: christso

tests/unit/cli/skill-removal.test.ts

@@ -5,8 +5,12 @@ import { join } from 'node:path';
 import { load, dump } from 'js-yaml';
 import { removeInstalledSkill } from '../../../src/cli/skill-removal.js';
 import type { WorkspaceConfig } from '../../../src/models/workspace-config.js';
-import type { SkillInfo } from '../../../src/core/skills.js';
+import {
+  getAllSkillsFromPlugins,
+  type SkillInfo,
+} from '../../../src/core/skills.js';
 import { resetFetchCache } from '../../../src/core/plugin.js';
+import { stubHomeDir } from '../../helpers/env.js';
 
 describe('removeInstalledSkill', () => {
   let tmpDir: string;
@@ -164,8 +168,8 @@ describe('removeInstalledSkill', () => {
   });
 
   it('removes a single-skill GitHub source instead of leaving an empty allowlist', async () => {
-    const originalHome = process.env.HOME;
     const fakeHome = join(tmpDir, 'home');
+    const restoreHomeDir = stubHomeDir(fakeHome);
     const pluginDir = join(
       fakeHome,
       '.allagents/plugins/marketplaces/NousResearch-hermes-agent@main/skills/research/llm-wiki',
@@ -185,10 +189,16 @@ describe('removeInstalledSkill', () => {
     };
     await writeFile(join(tmpDir, '.allagents/workspace.yaml'), dump(config), 'utf-8');
 
-    process.env.HOME = fakeHome;
     resetFetchCache();
 
     try {
+      const discoveredSkills = await getAllSkillsFromPlugins(tmpDir);
+      expect(
+        discoveredSkills.map(({ name, pluginSource, path }) => ({ name, pluginSource, path })),
+      ).toEqual([
+        { name: 'llm-wiki', pluginSource: source, path: pluginDir },
+      ]);
+
       const result = await removeInstalledSkill({
         targetSkill: {
           name: 'llm-wiki',
@@ -206,7 +216,7 @@ describe('removeInstalledSkill', () => {
       const updated = load(content) as WorkspaceConfig;
       expect(updated.plugins).toEqual([]);
     } finally {
-      process.env.HOME = originalHome;
+      restoreHomeDir();
       resetFetchCache();
     }
   });

tests/unit/core/skills.test.ts

@@ -3,11 +3,13 @@ import { mkdtemp, rm, mkdir, writeFile, symlink } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { dump } from 'js-yaml';
+import { stubHomeDir } from '../../helpers/env.js';
 import {
   getAllSkillsFromPlugins,
   discoverNestedSkillEntries,
   type SkillInfo,
 } from '../../../src/core/skills.js';
+import { resetFetchCache } from '../../../src/core/plugin.js';
 import { getPluginCachePath } from '../../../src/utils/plugin-path.js';
 
 describe('getAllSkillsFromPlugins', () => {
@@ -224,23 +226,33 @@ describe('getAllSkillsFromPlugins', () => {
   });
 
   it('skips GitHub URL entries whose subpath no longer exists in cache', async () => {
-    const originalHome = process.env.HOME;
-    process.env.HOME = tmpDir;
+    const restoreHomeDir = stubHomeDir(tmpDir);
+    resetFetchCache();
     try {
       const cachePath = getPluginCachePath('owner', 'repo', 'main');
-      await mkdir(cachePath, { recursive: true });
+      const siblingPath = join(cachePath, 'available');
+      await mkdir(siblingPath, { recursive: true });
+      await writeFile(join(siblingPath, 'SKILL.md'), '# Cached sibling');
+
+      const missingSource = 'https://github.com/owner/repo/tree/main/missing/path';
+      const siblingSource = 'https://github.com/owner/repo/tree/main/available';
 
       const config = {
         repositories: [],
-        plugins: ['https://github.com/owner/repo/tree/main/missing/path'],
+        plugins: [missingSource, siblingSource],
         clients: ['claude'],
       };
       await writeFile(join(tmpDir, '.allagents/workspace.yaml'), dump(config));
 
       const skills = await getAllSkillsFromPlugins(tmpDir);
-      expect(skills).toEqual([]);
+      expect(
+        skills.map(({ name, pluginSource, path }) => ({ name, pluginSource, path })),
+      ).toEqual([
+        { name: 'available', pluginSource: siblingSource, path: siblingPath },
+      ]);
     } finally {
-      process.env.HOME = originalHome;
+      restoreHomeDir();
+      resetFetchCache();
     }
   });
 });