fix: normalize plugin metadata across shared launch flows

tests/unit/instance-manager-mcp-sync.test.ts

@@ -7,14 +7,35 @@ import SharedManager from '../../src/management/shared-manager';
 
 describe('InstanceManager MCP sync', () => {
   let tempRoot = '';
+  let originalHome: string | undefined;
   let originalCcsHome: string | undefined;
   let originalCcsDir: string | undefined;
 
+  function writeMarketplaceRegistry(registryPath: string, installLocation: string): void {
+    fs.mkdirSync(path.dirname(registryPath), { recursive: true });
+    fs.writeFileSync(
+      registryPath,
+      JSON.stringify(
+        {
+          'claude-code-plugins': {
+            installLocation,
+          },
+        },
+        null,
+        2
+      ),
+      'utf8'
+    );
+  }
+
   beforeEach(() => {
     tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'ccs-instance-mcp-test-'));
+    originalHome = process.env.HOME;
     originalCcsHome = process.env.CCS_HOME;
     originalCcsDir = process.env.CCS_DIR;
 
+    spyOn(os, 'homedir').mockReturnValue(tempRoot);
+    process.env.HOME = tempRoot;
     process.env.CCS_HOME = tempRoot;
     delete process.env.CCS_DIR;
   });
@@ -22,6 +43,9 @@ describe('InstanceManager MCP sync', () => {
   afterEach(() => {
     mock.restore();
 
+    if (originalHome !== undefined) process.env.HOME = originalHome;
+    else delete process.env.HOME;
+
     if (originalCcsHome !== undefined) process.env.CCS_HOME = originalCcsHome;
     else delete process.env.CCS_HOME;
 
@@ -71,7 +95,9 @@ describe('InstanceManager MCP sync', () => {
     const synced = manager.syncMcpServers(instancePath);
     expect(synced).toBe(true);
 
-    const instanceContent = JSON.parse(fs.readFileSync(path.join(instancePath, '.claude.json'), 'utf8'));
+    const instanceContent = JSON.parse(
+      fs.readFileSync(path.join(instancePath, '.claude.json'), 'utf8')
+    );
     expect(instanceContent.otherKey).toBe('keep-me');
     expect(instanceContent.mcpServers).toEqual({
       globalOnly: { command: 'global-cmd' },
@@ -96,45 +122,118 @@ describe('InstanceManager MCP sync', () => {
   });
 
   it('skips shared symlinks and MCP sync for bare instance creation', async () => {
-    const linkSharedSpy = spyOn(SharedManager.prototype, 'linkSharedDirectories').mockImplementation(
-      () => {}
-    );
+    const linkSharedSpy = spyOn(
+      SharedManager.prototype,
+      'linkSharedDirectories'
+    ).mockImplementation(() => {});
     spyOn(SharedManager.prototype, 'syncProjectContext').mockResolvedValue(undefined);
     spyOn(SharedManager.prototype, 'syncAdvancedContinuityArtifacts').mockResolvedValue(undefined);
-    const normalizeSharedPluginMetadataSpy = spyOn(
-      SharedManager.prototype,
-      'normalizeSharedPluginMetadataPaths'
-    ).mockImplementation(() => {});
     const syncMcpSpy = spyOn(InstanceManager.prototype, 'syncMcpServers').mockImplementation(
       () => false
     );
 
     const manager = new InstanceManager();
+    const instancePath = manager.getInstancePath('sandbox');
+    const sharedRegistryPath = path.join(tempRoot, '.claude', 'plugins', 'known_marketplaces.json');
+    writeMarketplaceRegistry(
+      sharedRegistryPath,
+      path.join(
+        tempRoot,
+        '.ccs',
+        'instances',
+        'work',
+        'plugins',
+        'marketplaces',
+        'claude-code-plugins'
+      )
+    );
+
     await manager.ensureInstance('sandbox', { mode: 'isolated' }, { bare: true });
 
+    const normalized = JSON.parse(fs.readFileSync(sharedRegistryPath, 'utf8'));
+
     expect(linkSharedSpy).not.toHaveBeenCalled();
-    expect(normalizeSharedPluginMetadataSpy).not.toHaveBeenCalled();
+    expect(fs.existsSync(instancePath)).toBe(true);
+    expect(normalized['claude-code-plugins'].installLocation).toBe(
+      path.join(tempRoot, '.claude', 'plugins', 'marketplaces', 'claude-code-plugins')
+    );
+    expect(fs.existsSync(path.join(instancePath, 'plugins', 'known_marketplaces.json'))).toBe(
+      false
+    );
     expect(syncMcpSpy).not.toHaveBeenCalled();
   });
 
   it('normalizes shared plugin metadata for existing non-bare instances', async () => {
     spyOn(SharedManager.prototype, 'syncProjectContext').mockResolvedValue(undefined);
     spyOn(SharedManager.prototype, 'syncAdvancedContinuityArtifacts').mockResolvedValue(undefined);
-    const normalizeSharedPluginMetadataSpy = spyOn(
-      SharedManager.prototype,
-      'normalizeSharedPluginMetadataPaths'
-    ).mockImplementation(() => {});
     const syncMcpSpy = spyOn(InstanceManager.prototype, 'syncMcpServers').mockImplementation(
       () => false
     );
 
     const manager = new InstanceManager();
     const instancePath = manager.getInstancePath('work');
-    fs.mkdirSync(instancePath, { recursive: true });
+    writeMarketplaceRegistry(
+      path.join(instancePath, 'plugins', 'known_marketplaces.json'),
+      path.join(
+        tempRoot,
+        '.ccs',
+        'instances',
+        'work',
+        'plugins',
+        'marketplaces',
+        'claude-code-plugins'
+      )
+    );
 
     await manager.ensureInstance('work', { mode: 'isolated' });
 
-    expect(normalizeSharedPluginMetadataSpy).toHaveBeenCalledTimes(1);
+    const normalized = JSON.parse(
+      fs.readFileSync(path.join(instancePath, 'plugins', 'known_marketplaces.json'), 'utf8')
+    );
+    expect(normalized['claude-code-plugins'].installLocation).toBe(
+      path.join(tempRoot, '.claude', 'plugins', 'marketplaces', 'claude-code-plugins')
+    );
+    expect(syncMcpSpy).toHaveBeenCalledWith(instancePath);
+  });
+
+  it('normalizes shared plugin metadata during new non-bare instance creation', async () => {
+    spyOn(SharedManager.prototype, 'syncProjectContext').mockResolvedValue(undefined);
+    spyOn(SharedManager.prototype, 'syncAdvancedContinuityArtifacts').mockResolvedValue(undefined);
+    const syncMcpSpy = spyOn(InstanceManager.prototype, 'syncMcpServers').mockImplementation(
+      () => false
+    );
+
+    const registryPath = path.join(tempRoot, '.claude', 'plugins', 'known_marketplaces.json');
+    writeMarketplaceRegistry(
+      registryPath,
+      path.join(
+        tempRoot,
+        '.ccs',
+        'instances',
+        'work',
+        'plugins',
+        'marketplaces',
+        'claude-code-plugins'
+      )
+    );
+
+    const manager = new InstanceManager();
+    const instancePath = await manager.ensureInstance('work', { mode: 'isolated' });
+
+    const expected = path.join(
+      tempRoot,
+      '.claude',
+      'plugins',
+      'marketplaces',
+      'claude-code-plugins'
+    );
+    const normalizedShared = JSON.parse(fs.readFileSync(registryPath, 'utf8'));
+    const normalizedInstance = JSON.parse(
+      fs.readFileSync(path.join(instancePath, 'plugins', 'known_marketplaces.json'), 'utf8')
+    );
+
+    expect(normalizedShared['claude-code-plugins'].installLocation).toBe(expected);
+    expect(normalizedInstance['claude-code-plugins'].installLocation).toBe(expected);
     expect(syncMcpSpy).toHaveBeenCalledWith(instancePath);
   });
 });