agent-switchboard 0.3.3 → 0.3.5

package/dist/index.js

@@ -22,7 +22,7 @@ import { distributeHooks } from './hooks/distribution.js';
 import { loadHookLibrary } from './hooks/library.js';
 import { copyDirRecursive, ensureLibraryDirectories, isDir, isFile, listFilesRecursively, writeFileSecure, } from './library/fs.js';
 import { addLocalSource, addRemoteSource, getSources, inferSourceName, isGitUrl, parseGitUrl, removeSource, updateRemoteSources, validateSourcePath, } from './library/sources.js';
-import { loadLibraryStateSection, loadMcpEnabledState, saveMcpEnabledState, } from './library/state.js';
+import { loadLibraryStateSection, loadMcpEnabledState, resetAgentSyncCache, saveMcpEnabledState, } from './library/state.js';
 import { readMarketplace } from './marketplace/reader.js';
 import { buildPluginIndex } from './plugins/index.js';
 import { composeActiveRules } from './rules/composer.js';
@@ -37,7 +37,7 @@ import { distributeSubagents } from './subagents/distribution.js';
 import { importSubagentFromFile } from './subagents/importer.js';
 import { buildSubagentInventory } from './subagents/inventory.js';
 import { initTargets } from './targets/init.js';
-import { filterInstalled, getTargetById, getTargetsForSection } from './targets/registry.js';
+import { filterInstalled, getTargetById, getTargetsForSection, registerConfigTargets, } from './targets/registry.js';
 import { showCommandSelector } from './ui/command-ui.js';
 import { showHookSelector } from './ui/hook-ui.js';
 import { showMcpServerUI } from './ui/mcp-ui.js';
@@ -73,9 +73,6 @@ program
     .action(async (options) => {
     try {
         const scope = resolveScope(options);
-        const loadOptions = scopeToLoadOptions(scope);
-        const { config, layers } = loadSwitchboardConfigWithLayers(loadOptions);
-        await initTargets(config);
         console.log(chalk.yellow('⚠ Sync overwrites agent config without diff.'));
         console.log();
         if (options.update !== false) {
@@ -92,195 +89,46 @@ program
                 }
             }
         }
-        // Config summary: show active layers on one line
-        const activeLayers = [];
-        if (layers.user.exists)
-            activeLayers.push(shortenPath(layers.user.path));
-        if (layers.profile?.exists)
-            activeLayers.push(shortenPath(layers.profile.path));
-        if (layers.project?.exists)
-            activeLayers.push(shortenPath(layers.project.path));
-        console.log(`${chalk.blue('Config:')} ${activeLayers.length > 0 ? chalk.dim(activeLayers.join(' + ')) : chalk.gray('no config files')}`);
-        const appsLabel = config.applications.active.length > 0
-            ? config.applications.active
-                .map((id) => {
-                const t = getTargetById(id);
-                if (t?.isInstalled?.() === false)
-                    return chalk.gray(`${id} (not installed)`);
-                return chalk.cyan(id);
-            })
-                .join(', ')
-            : chalk.gray('none configured');
-        console.log(`${chalk.blue('Apps:')}   ${appsLabel}`);
-        console.log();
-        const cursorSkillsDeduped = config.applications.active.includes('claude-code') &&
-            resolveEffectiveSectionConfig('skills', 'claude-code', scope).enabled.length > 0;
-        console.log(chalk.blue('Inventory:'));
-        {
-            const sections = ['mcp', 'rules', 'commands', 'agents', 'skills', 'hooks'];
-            const sectionPlatforms = {};
-            for (const s of sections) {
-                let ids = filterInstalled(getTargetsForSection(s)).map((t) => t.id);
-                if (s === 'skills' && cursorSkillsDeduped) {
-                    ids = ids.filter((id) => id !== 'cursor');
-                }
-                sectionPlatforms[s] = ids;
-            }
-            const termWidth = process.stdout.columns || 80;
-            const maxSectionLen = Math.max(...sections.map((s) => s.length));
-            const maxCountLen = Math.max(...sections.map((s) => `(${config[s].enabled.length})`.length));
-            const prefixPlainLen = 2 + maxSectionLen + 1 + maxCountLen + 2;
-            const fitPreview = (ids, maxWidth) => {
-                if (ids.length === 0)
-                    return chalk.gray('none');
-                const full = ids.join(', ');
-                if (full.length <= maxWidth)
-                    return full;
-                let text = '';
-                let shown = 0;
-                for (let i = 0; i < ids.length; i++) {
-                    const sep = shown > 0 ? ', ' : '';
-                    const candidate = text + sep + ids[i];
-                    const remaining = ids.length - (i + 1);
-                    if (remaining > 0) {
-                        const suffix = `, ... (+${remaining} more)`;
-                        if (candidate.length + suffix.length > maxWidth && shown > 0) {
-                            const left = ids.length - shown;
-                            return `${text}${chalk.gray(`, ... (+${left} more)`)}`;
-                        }
-                    }
-                    text = candidate;
-                    shown++;
-                }
-                return text;
-            };
-            for (const section of sections) {
-                const globalActive = config[section].enabled;
-                const globalCount = globalActive.length;
-                const supported = new Set(sectionPlatforms[section] ?? []);
-                const applicableApps = config.applications.active.filter((id) => supported.has(id));
-                const effectiveByApp = new Map();
-                for (const appId of applicableApps) {
-                    effectiveByApp.set(appId, resolveEffectiveSectionConfig(section, appId, scope).enabled);
-                }
-                const perAppParts = applicableApps.map((appId) => {
-                    const eff = effectiveByApp.get(appId) ?? [];
-                    const delta = eff.length - globalCount;
-                    const d = delta === 0 ? '' : delta > 0 ? `(+${delta})` : `(${delta})`;
-                    return `${appId}:${eff.length}${d}`;
-                });
-                const union = new Set();
-                for (const [, ids] of effectiveByApp) {
-                    for (const id of ids)
-                        union.add(id);
-                }
-                const previewIds = globalActive.length > 0 ? [...globalActive] : [...union];
-                const paddedSection = section.padEnd(maxSectionLen);
-                const countStr = `(${globalCount})`.padStart(maxCountLen);
-                const appsStr = perAppParts.join('  ');
-                console.log(`  ${chalk.cyan(paddedSection)} ${chalk.gray(countStr)}  ${appsStr}`);
-                if (previewIds.length > 0) {
-                    const indent = ' '.repeat(prefixPlainLen);
-                    const previewWidth = Math.max(20, termWidth - prefixPlainLen - 2);
-                    const preview = fitPreview(previewIds, previewWidth);
-                    console.log(`${indent}${chalk.gray('→')} ${preview}`);
-                }
-            }
-        }
-        // Show enabled plugins summary
-        {
-            const pluginIndex = buildPluginIndex();
-            const enabledPluginRefs = config.plugins.enabled;
-            if (enabledPluginRefs.length > 0) {
-                const names = enabledPluginRefs
-                    .map((pid) => {
-                    const p = pluginIndex.get(pid);
-                    return p ? pid : chalk.strikethrough(pid);
-                })
-                    .join(', ');
-                console.log(`  ${chalk.magenta('plugins')} ${chalk.gray(`(${enabledPluginRefs.length})`)}  ${names}`);
+        if (scope?.project) {
+            // Dual sync: global first, then project
+            const { config: globalConfig, layers: globalLayers } = loadSwitchboardConfigWithLayers(scopeToLoadOptions(undefined));
+            await initTargets(globalConfig);
+            console.log(chalk.blue.bold('── Global ──'));
+            const globalErrors = await runSyncPhase({
+                scope: undefined,
+                config: globalConfig,
+                layers: globalLayers,
+            });
+            console.log();
+            resetAgentSyncCache();
+            console.log(chalk.blue.bold(`── Project: ${shortenPath(scope.project)} ──`));
+            const { config: projectConfig, layers: projectLayers } = loadSwitchboardConfigWithLayers(scopeToLoadOptions(scope));
+            // Register any project-level [targets] not seen during initTargets (which only ran once)
+            const projectTargets = projectConfig.targets;
+            if (projectTargets && Object.keys(projectTargets).length > 0) {
+                registerConfigTargets(projectTargets);
             }
-            else if (pluginIndex.plugins.length > 0) {
-                console.log(`  ${chalk.magenta('plugins')} ${chalk.gray('(0)')}  ${chalk.gray(`${pluginIndex.plugins.length} available`)}`);
+            const projectErrors = await runSyncPhase({
+                scope,
+                config: projectConfig,
+                layers: projectLayers,
+            });
+            console.log();
+            if (globalErrors || projectErrors) {
+                console.log(chalk.red('✗ Sync completed with errors.'));
+                process.exit(1);
             }
-        }
-        console.log();
-        const notes = ['rules, skills also distribute to gemini'];
-        if (cursorSkillsDeduped)
-            notes.push('cursor reads skills via claude-code');
-        for (let i = 0; i < notes.length; i++) {
-            const prefix = i === 0 ? '  Note: ' : '        ';
-            const suffix = i === notes.length - 1 ? '.' : '.';
-            console.log(chalk.gray(`${prefix}${notes[i]}${suffix}`));
-        }
-        console.log();
-        const activeAppIds = config.applications.active;
-        const mcpDistribution = await applyToAgents(scope, undefined, { useSpinner: false });
-        const ruleDistribution = distributeRules(undefined, { activeAppIds }, scope);
-        const commandDistribution = distributeCommands(scope, activeAppIds);
-        const agentDistribution = distributeSubagents(scope, activeAppIds);
-        const skillDistribution = distributeSkills(scope, {
-            useAgentsDir: config.distribution.use_agents_dir,
-            activeAppIds,
-        });
-        const hookDistribution = distributeHooks(scope, activeAppIds);
-        const distSections = [
-            {
-                label: 'mcp',
-                results: mcpDistribution,
-                emptyMessage: 'no apps configured',
-                getTargetLabel: (r) => r.application,
-                getPath: (r) => r.filePath,
-            },
-            {
-                label: 'rules',
-                results: ruleDistribution.results,
-                emptyMessage: 'none',
-                getTargetLabel: (r) => r.agent,
-                getPath: (r) => r.filePath,
-            },
-            {
-                label: 'commands',
-                results: commandDistribution.results,
-                emptyMessage: 'none',
-                getTargetLabel: (r) => r.platform,
-                getPath: (r) => r.filePath,
-            },
-            {
-                label: 'agents',
-                results: agentDistribution.results,
-                emptyMessage: 'none',
-                getTargetLabel: (r) => r.platform,
-                getPath: (r) => r.filePath,
-            },
-            {
-                label: 'skills',
-                results: skillDistribution.results,
-                emptyMessage: 'none',
-                getTargetLabel: (r) => {
-                    const sr = r;
-                    return sr.platform === 'agents' ? 'codex+gemini+opencode' : sr.platform;
-                },
-                getPath: (r) => r.targetDir,
-            },
-            {
-                label: 'hooks',
-                results: hookDistribution.results,
-                emptyMessage: 'none',
-                getTargetLabel: (r) => r.platform,
-                getPath: (r) => {
-                    const hr = r;
-                    return 'filePath' in hr ? hr.filePath : hr.targetDir;
-                },
-            },
-        ];
-        const { hasErrors } = printCompactDistributions(distSections);
-        console.log();
-        if (hasErrors) {
-            console.log(chalk.red('✗ Sync completed with errors.'));
-            process.exit(1);
+            console.log(chalk.green('✓ Sync complete.'));
         }
         else {
+            const { config, layers } = loadSwitchboardConfigWithLayers(scopeToLoadOptions(scope));
+            await initTargets(config);
+            const hasErrors = await runSyncPhase({ scope, config, layers });
+            console.log();
+            if (hasErrors) {
+                console.log(chalk.red('✗ Sync completed with errors.'));
+                process.exit(1);
+            }
             console.log(chalk.green('✓ Sync complete.'));
         }
     }
@@ -291,6 +139,211 @@ program
         process.exit(1);
     }
 });
+async function runSyncPhase({ scope, config, layers }) {
+    // Config summary
+    const activeLayers = [];
+    if (layers.user.exists)
+        activeLayers.push(shortenPath(layers.user.path));
+    if (layers.profile?.exists)
+        activeLayers.push(shortenPath(layers.profile.path));
+    if (layers.project?.exists)
+        activeLayers.push(shortenPath(layers.project.path));
+    console.log(`${chalk.blue('Config:')} ${activeLayers.length > 0 ? chalk.dim(activeLayers.join(' + ')) : chalk.gray('no config files')}`);
+    const assumeInstalledSet = new Set(config.applications.assume_installed);
+    const appsLabel = config.applications.active.length > 0
+        ? config.applications.active
+            .map((id) => {
+            const t = getTargetById(id);
+            if (t?.isInstalled?.() === false) {
+                if (assumeInstalledSet.has(id))
+                    return chalk.yellow(`${id} (assumed installed)`);
+                return chalk.gray(`${id} (not installed)`);
+            }
+            return chalk.cyan(id);
+        })
+            .join(', ')
+        : chalk.gray('none configured');
+    console.log(`${chalk.blue('Apps:')}   ${appsLabel}`);
+    console.log();
+    const cursorSkillsDeduped = config.applications.active.includes('claude-code') &&
+        resolveEffectiveSectionConfig('skills', 'claude-code', scope).enabled.length > 0;
+    console.log(chalk.blue('Inventory:'));
+    {
+        const sections = ['mcp', 'rules', 'commands', 'agents', 'skills', 'hooks'];
+        const sectionPlatforms = {};
+        for (const s of sections) {
+            let ids = filterInstalled(getTargetsForSection(s), assumeInstalledSet).map((t) => t.id);
+            if (s === 'skills' && cursorSkillsDeduped) {
+                ids = ids.filter((id) => id !== 'cursor');
+            }
+            sectionPlatforms[s] = ids;
+        }
+        const termWidth = process.stdout.columns || 80;
+        const maxSectionLen = Math.max(...sections.map((s) => s.length));
+        const maxCountLen = Math.max(...sections.map((s) => `(${config[s].enabled.length})`.length));
+        const prefixPlainLen = 2 + maxSectionLen + 1 + maxCountLen + 2;
+        const fitPreview = (ids, maxWidth) => {
+            if (ids.length === 0)
+                return chalk.gray('none');
+            const full = ids.join(', ');
+            if (full.length <= maxWidth)
+                return full;
+            let text = '';
+            let shown = 0;
+            for (let i = 0; i < ids.length; i++) {
+                const sep = shown > 0 ? ', ' : '';
+                const candidate = text + sep + ids[i];
+                const remaining = ids.length - (i + 1);
+                if (remaining > 0) {
+                    const suffix = `, ... (+${remaining} more)`;
+                    if (candidate.length + suffix.length > maxWidth && shown > 0) {
+                        const left = ids.length - shown;
+                        return `${text}${chalk.gray(`, ... (+${left} more)`)}`;
+                    }
+                }
+                text = candidate;
+                shown++;
+            }
+            return text;
+        };
+        for (const section of sections) {
+            const globalActive = config[section].enabled;
+            const globalCount = globalActive.length;
+            const supported = new Set(sectionPlatforms[section] ?? []);
+            const applicableApps = config.applications.active.filter((id) => supported.has(id));
+            const effectiveByApp = new Map();
+            for (const appId of applicableApps) {
+                effectiveByApp.set(appId, resolveEffectiveSectionConfig(section, appId, scope).enabled);
+            }
+            const perAppParts = applicableApps.map((appId) => {
+                const eff = effectiveByApp.get(appId) ?? [];
+                const delta = eff.length - globalCount;
+                const d = delta === 0 ? '' : delta > 0 ? `(+${delta})` : `(${delta})`;
+                return `${appId}:${eff.length}${d}`;
+            });
+            const union = new Set();
+            for (const [, ids] of effectiveByApp) {
+                for (const id of ids)
+                    union.add(id);
+            }
+            const previewIds = globalActive.length > 0 ? [...globalActive] : [...union];
+            const paddedSection = section.padEnd(maxSectionLen);
+            const countStr = `(${globalCount})`.padStart(maxCountLen);
+            const appsStr = perAppParts.join('  ');
+            console.log(`  ${chalk.cyan(paddedSection)} ${chalk.gray(countStr)}  ${appsStr}`);
+            if (previewIds.length > 0) {
+                const indent = ' '.repeat(prefixPlainLen);
+                const previewWidth = Math.max(20, termWidth - prefixPlainLen - 2);
+                const preview = fitPreview(previewIds, previewWidth);
+                console.log(`${indent}${chalk.gray('→')} ${preview}`);
+            }
+        }
+    }
+    // Show enabled plugins summary
+    {
+        const pluginIndex = buildPluginIndex();
+        const enabledPluginRefs = config.plugins.enabled;
+        if (enabledPluginRefs.length > 0) {
+            const names = enabledPluginRefs
+                .map((pid) => {
+                const p = pluginIndex.get(pid);
+                return p ? pid : chalk.strikethrough(pid);
+            })
+                .join(', ');
+            console.log(`  ${chalk.magenta('plugins')} ${chalk.gray(`(${enabledPluginRefs.length})`)}  ${names}`);
+        }
+        else if (pluginIndex.plugins.length > 0) {
+            console.log(`  ${chalk.magenta('plugins')} ${chalk.gray('(0)')}  ${chalk.gray(`${pluginIndex.plugins.length} available`)}`);
+        }
+    }
+    console.log();
+    const notes = [];
+    if (cursorSkillsDeduped && config.applications.active.includes('cursor')) {
+        notes.push('cursor reads skills via claude-code');
+    }
+    if (config.distribution.use_agents_dir) {
+        const agentsMembers = ['codex', 'gemini', 'opencode'].filter((a) => config.applications.active.includes(a));
+        if (agentsMembers.length > 0) {
+            notes.push(`skills for ${agentsMembers.join(', ')} sync to shared .agents/skills`);
+        }
+    }
+    for (let i = 0; i < notes.length; i++) {
+        const prefix = i === 0 ? '  Note: ' : '        ';
+        console.log(chalk.gray(`${prefix}${notes[i]}.`));
+    }
+    if (notes.length > 0)
+        console.log();
+    const activeAppIds = config.applications.active;
+    const mcpDistribution = await applyToAgents(scope, undefined, {
+        useSpinner: false,
+        assumeInstalled: assumeInstalledSet,
+    });
+    const ruleDistribution = distributeRules(undefined, { activeAppIds, assumeInstalled: assumeInstalledSet }, scope);
+    const commandDistribution = distributeCommands(scope, activeAppIds, assumeInstalledSet);
+    const agentDistribution = distributeSubagents(scope, activeAppIds, assumeInstalledSet);
+    const skillDistribution = distributeSkills(scope, {
+        useAgentsDir: config.distribution.use_agents_dir,
+        activeAppIds,
+        assumeInstalled: assumeInstalledSet,
+    });
+    const hookDistribution = distributeHooks(scope, activeAppIds, assumeInstalledSet);
+    const distSections = [
+        {
+            label: 'mcp',
+            results: mcpDistribution,
+            emptyMessage: 'no apps configured',
+            getTargetLabel: (r) => r.application,
+            getPath: (r) => r.filePath,
+        },
+        {
+            label: 'rules',
+            results: ruleDistribution.results,
+            emptyMessage: 'none',
+            getTargetLabel: (r) => r.agent,
+            getPath: (r) => r.filePath,
+        },
+        {
+            label: 'commands',
+            results: commandDistribution.results,
+            emptyMessage: 'none',
+            getTargetLabel: (r) => r.platform,
+            getPath: (r) => r.filePath,
+        },
+        {
+            label: 'agents',
+            results: agentDistribution.results,
+            emptyMessage: 'none',
+            getTargetLabel: (r) => r.platform,
+            getPath: (r) => r.filePath,
+        },
+        {
+            label: 'skills',
+            results: skillDistribution.results,
+            emptyMessage: 'none',
+            getTargetLabel: (r) => {
+                const sr = r;
+                if (sr.platform === 'agents') {
+                    const members = ['codex', 'gemini', 'opencode'].filter((a) => activeAppIds.includes(a));
+                    return members.length > 0 ? members.join('+') : 'agents';
+                }
+                return sr.platform;
+            },
+            getPath: (r) => r.targetDir,
+        },
+        {
+            label: 'hooks',
+            results: hookDistribution.results,
+            emptyMessage: 'none',
+            getTargetLabel: (r) => r.platform,
+            getPath: (r) => {
+                const hr = r;
+                return 'filePath' in hr ? hr.filePath : hr.targetDir;
+            },
+        },
+    ];
+    const { hasErrors } = printCompactDistributions(distSections);
+    return hasErrors;
+}
 function resolveScope(input) {
     if (!input)
         return undefined;
@@ -670,7 +723,11 @@ ruleCommand.action(async (options) => {
                 }
             }
         }
-        const distribution = distributeRules(composeActiveRules(scope), { force: !selectionChanged, activeAppIds: config.applications.active }, scope);
+        const distribution = distributeRules(composeActiveRules(scope), {
+            force: !selectionChanged,
+            activeAppIds: config.applications.active,
+            assumeInstalled: new Set(config.applications.assume_installed),
+        }, scope);
         if (distribution.results.length > 0) {
             console.log();
             printDistributionResults({
@@ -721,7 +778,7 @@ commandRoot.action(async (options) => {
             return;
         console.log();
         printActiveSelection('commands', selection.enabled);
-        const out = distributeCommands(scope, config.applications.active);
+        const out = distributeCommands(scope, config.applications.active, new Set(config.applications.assume_installed));
         if (out.results.length > 0) {
             console.log();
             printDistributionResults({
@@ -871,7 +928,7 @@ agentRoot.action(async (options) => {
             return;
         console.log();
         printActiveSelection('agents', selection.enabled);
-        const out = distributeSubagents(scope, config.applications.active);
+        const out = distributeSubagents(scope, config.applications.active, new Set(config.applications.assume_installed));
         if (out.results.length > 0) {
             console.log();
             printDistributionResults({
@@ -1022,13 +1079,20 @@ skillRoot.action(async (options) => {
         const out = distributeSkills(scope, {
             useAgentsDir: config.distribution.use_agents_dir,
             activeAppIds: config.applications.active,
+            assumeInstalled: new Set(config.applications.assume_installed),
         });
         if (out.results.length > 0) {
             console.log();
             printDistributionResults({
                 title: 'Skill distribution',
                 results: out.results,
-                getTargetLabel: (result) => result.platform === 'agents' ? 'codex+gemini+opencode' : result.platform,
+                getTargetLabel: (result) => {
+                    if (result.platform === 'agents') {
+                        const members = ['codex', 'gemini', 'opencode'].filter((a) => config.applications.active.includes(a));
+                        return members.length > 0 ? members.join('+') : 'agents';
+                    }
+                    return result.platform;
+                },
                 getPath: (result) => result.targetDir,
             });
         }
@@ -1161,7 +1225,7 @@ hookRoot.action(async (options) => {
             return;
         console.log();
         printActiveSelection('hooks', selection.enabled);
-        const out = distributeHooks(scope, config.applications.active);
+        const out = distributeHooks(scope, config.applications.active, new Set(config.applications.assume_installed));
         if (out.results.length > 0) {
             console.log();
             printDistributionResults({
@@ -1314,10 +1378,11 @@ hookRoot
     }
 });
 async function applyToAgents(scope, enabledServerNames, options) {
-    const mcpConfig = loadMcpConfigWithPlugins();
+    const mcpConfig = loadMcpConfigWithPlugins(scope);
     const switchboardConfig = loadSwitchboardConfig(scopeToLoadOptions(scope));
     await initTargets(switchboardConfig);
     const useSpinner = options?.useSpinner ?? true;
+    const assumeInstalled = options?.assumeInstalled ?? new Set(switchboardConfig.applications.assume_installed);
     const results = [];
     if (switchboardConfig.applications.active.length === 0) {
         if (useSpinner) {
@@ -1348,7 +1413,7 @@ async function applyToAgents(scope, enabledServerNames, options) {
             const enabledServers = Object.fromEntries(Object.entries(mcpConfig.mcpServers).filter(([name]) => activeSet.has(name)));
             const configToApply = { mcpServers: enabledServers };
             const target = getTargetById(agentId);
-            if (target?.isInstalled?.() === false) {
+            if (!assumeInstalled.has(agentId) && target?.isInstalled?.() === false) {
                 persist(chalk.gray('○'), `${chalk.cyan(agentId)} ${chalk.gray('(not installed, skipped)')}`);
                 results.push({
                     application: agentId,