agent-switchboard 0.4.2 → 0.4.4

package/dist/index.js

@@ -13,8 +13,8 @@ import ora from 'ora';
 import { distributeCommands } from './commands/distribution.js';
 import { importCommandFromFile } from './commands/importer.js';
 import { buildCommandInventory } from './commands/inventory.js';
-import { updateConfigLayer } from './config/layered-config.js';
-import { loadMcpConfig, stripLegacyEnabledFlagsFromMcpJson } from './config/mcp-config.js';
+import { loadWritableConfigLayer, updateConfigLayer } from './config/layered-config.js';
+import { loadMcpConfig, loadMcpConfigWithPlugins, stripLegacyEnabledFlagsFromMcpJson, } from './config/mcp-config.js';
 import { getAgentsDir, getAgentsHome, getClaudeDir, getCodexDir, getCommandsDir, getCursorDir, getGeminiDir, getHooksDir, getOpencodePath, getSkillsDir, getSourceCacheDir, } from './config/paths.js';
 import { scopeToLayerOptions } from './config/scope.js';
 import { loadSwitchboardConfig, loadSwitchboardConfigWithLayers, } from './config/switchboard-config.js';
@@ -23,6 +23,7 @@ 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, saveMcpEnabledState } from './library/state.js';
+import { loadManifest, saveManifest } from './manifest/store.js';
 import { readMarketplace } from './marketplace/reader.js';
 import { distributeMcp } from './mcp/distribution.js';
 import { buildPluginIndex } from './plugins/index.js';
@@ -106,6 +107,29 @@ function resolveScope(input) {
         project: project,
     };
 }
+function getScopedProjectMode(scope, config) {
+    return scope?.project ? config.distribution.project.mode : undefined;
+}
+function shouldSkipProjectDistribution(scope, config) {
+    return getScopedProjectMode(scope, config) === 'none';
+}
+function printProjectDistributionDisabledMessage() {
+    console.log(chalk.gray('Project distribution is disabled by `[distribution.project].mode = "none"`.'));
+}
+function loadManagedProjectManifest(scope, projectMode) {
+    if (!scope?.project || projectMode !== 'managed')
+        return undefined;
+    const result = loadManifest(scope.project);
+    if (result.corrupt) {
+        throw new Error(`Corrupt managed manifest in ${scope.project}. Fix or remove it before retrying.`);
+    }
+    return result.manifest;
+}
+function saveManagedProjectManifest(scope, projectMode, manifest) {
+    if (!scope?.project || projectMode !== 'managed' || !manifest)
+        return;
+    saveManifest(scope.project, manifest);
+}
 function defaultCommandSourceDir(platform) {
     switch (platform) {
         case 'claude-code':
@@ -280,6 +304,7 @@ program
         const scope = resolveScope(options);
         const { config, layers } = loadSwitchboardConfigWithLayers(scopeToLayerOptions(scope));
         const mcpConfig = loadMcpConfig();
+        const pluginIndex = buildPluginIndex(scope);
         // Determine initial selection:
         // - If writing to project/profile scope, only use that layer's explicit [mcp].enabled (no fallback).
         // - If writing to user scope and [mcp].enabled is missing, fall back to legacy mcp.json enabled flags.
@@ -304,10 +329,22 @@ program
                     .map(([name]) => name);
             }
         }
+        const scopedPluginRefs = scope?.project
+            ? (layers.project?.config?.plugins?.enabled ?? [])
+            : scope?.profile
+                ? (layers.profile?.config?.plugins?.enabled ?? [])
+                : (layers.user.config?.plugins?.enabled ?? []);
+        const pluginMcpServers = pluginIndex.expand(scopedPluginRefs).mcp;
+        const currentActiveSet = new Set(currentActive);
+        for (const serverName of pluginMcpServers) {
+            currentActiveSet.add(serverName);
+        }
+        currentActive = [...currentActiveSet];
         // Step 1: Show UI and get selected servers
         const selectedServers = await showMcpServerUI({
             pageSize: config.ui.page_size,
             enabled: currentActive,
+            scope,
         });
         // Step 2: Save active state to config.toml (appropriate layer based on scope)
         const spinner = ora('Updating MCP configuration...').start();
@@ -326,7 +363,18 @@ program
             }
         }
         // Step 3: Apply to registered agents
-        await distributeMcp(scope, selectedServers);
+        const projectMode = getScopedProjectMode(scope, config);
+        const manifest = loadManagedProjectManifest(scope, projectMode);
+        try {
+            await distributeMcp(scope, selectedServers, { manifest, projectMode });
+        }
+        finally {
+            saveManagedProjectManifest(scope, projectMode, manifest);
+        }
+        if (shouldSkipProjectDistribution(scope, config)) {
+            console.log();
+            printProjectDistributionDisabledMessage();
+        }
         // Step 4: Show summary
         showSummary(selectedServers, scope);
     }
@@ -425,13 +473,12 @@ ruleCommand.action(async (options) => {
         if (!selection) {
             return;
         }
-        const { rules, writableState: previousState, effectiveState } = loadRuleRuntimeContext(scope);
+        const { rules, writableState: previousState, activeState } = loadRuleRuntimeContext(scope);
         const ruleMap = new Map(rules.map((rule) => [rule.id, rule]));
         const desiredEnabled = selection.enabled;
         const selectionChanged = selection.explicitEmpty ||
             shouldPersistSelection({
-                currentEnabled: previousState.enabled,
-                effectiveEnabled: effectiveState.enabled,
+                effectiveEnabled: activeState.enabled,
                 selectedEnabled: desiredEnabled,
             });
         const updatedState = selectionChanged
@@ -460,11 +507,21 @@ ruleCommand.action(async (options) => {
                 }
             }
         }
-        const distribution = distributeRules({
-            force: !selectionChanged,
-            activeAppIds: config.applications.enabled,
-            assumeInstalled: new Set(config.applications.assume_installed),
-        }, scope);
+        const projectMode = getScopedProjectMode(scope, config);
+        const manifest = loadManagedProjectManifest(scope, projectMode);
+        let distribution;
+        try {
+            distribution = distributeRules({
+                force: !selectionChanged,
+                activeAppIds: config.applications.enabled,
+                assumeInstalled: new Set(config.applications.assume_installed),
+                manifest,
+                projectMode,
+            }, scope);
+        }
+        finally {
+            saveManagedProjectManifest(scope, projectMode, manifest);
+        }
         if (distribution.results.length > 0) {
             console.log();
             printDistributionResults({
@@ -474,6 +531,10 @@ ruleCommand.action(async (options) => {
                 getPath: (result) => result.filePath,
             });
         }
+        if (shouldSkipProjectDistribution(scope, config)) {
+            console.log();
+            printProjectDistributionDisabledMessage();
+        }
         const distributionErrors = distribution.results.filter((r) => r.status === 'error');
         if (distributionErrors.length > 0) {
             process.exit(1);
@@ -515,7 +576,18 @@ commandRoot.action(async (options) => {
             return;
         console.log();
         printActiveSelection('commands', selection.enabled);
-        const out = distributeCommands(scope, config.applications.enabled, new Set(config.applications.assume_installed));
+        const projectMode = getScopedProjectMode(scope, config);
+        const manifest = loadManagedProjectManifest(scope, projectMode);
+        let out;
+        try {
+            out = distributeCommands(scope, config.applications.enabled, new Set(config.applications.assume_installed), {
+                manifest,
+                projectMode,
+            });
+        }
+        finally {
+            saveManagedProjectManifest(scope, projectMode, manifest);
+        }
         if (out.results.length > 0) {
             console.log();
             printDistributionResults({
@@ -525,6 +597,10 @@ commandRoot.action(async (options) => {
                 getPath: (result) => result.filePath,
             });
         }
+        if (shouldSkipProjectDistribution(scope, config)) {
+            console.log();
+            printProjectDistributionDisabledMessage();
+        }
         // Guidance: unsupported platforms for commands
         console.log();
         console.log(chalk.gray('Unsupported platforms (manual steps required): Claude Desktop'));
@@ -665,7 +741,18 @@ agentRoot.action(async (options) => {
             return;
         console.log();
         printActiveSelection('agents', selection.enabled);
-        const out = distributeSubagents(scope, config.applications.enabled, new Set(config.applications.assume_installed));
+        const projectMode = getScopedProjectMode(scope, config);
+        const manifest = loadManagedProjectManifest(scope, projectMode);
+        let out;
+        try {
+            out = distributeSubagents(scope, config.applications.enabled, new Set(config.applications.assume_installed), {
+                manifest,
+                projectMode,
+            });
+        }
+        finally {
+            saveManagedProjectManifest(scope, projectMode, manifest);
+        }
         if (out.results.length > 0) {
             console.log();
             printDistributionResults({
@@ -675,6 +762,10 @@ agentRoot.action(async (options) => {
                 getPath: (result) => result.filePath,
             });
         }
+        if (shouldSkipProjectDistribution(scope, config)) {
+            console.log();
+            printProjectDistributionDisabledMessage();
+        }
         console.log();
         console.log(chalk.gray('Unsupported platforms (manual steps required): Codex, Gemini'));
     }
@@ -813,11 +904,21 @@ skillRoot.action(async (options) => {
             return;
         console.log();
         printActiveSelection('skills', selection.enabled);
-        const out = distributeSkills(scope, {
-            useAgentsDir: config.distribution.use_agents_dir,
-            activeAppIds: config.applications.enabled,
-            assumeInstalled: new Set(config.applications.assume_installed),
-        });
+        const projectMode = getScopedProjectMode(scope, config);
+        const manifest = loadManagedProjectManifest(scope, projectMode);
+        let out;
+        try {
+            out = distributeSkills(scope, {
+                useAgentsDir: config.distribution.use_agents_dir,
+                activeAppIds: config.applications.enabled,
+                assumeInstalled: new Set(config.applications.assume_installed),
+                manifest,
+                projectMode,
+            });
+        }
+        finally {
+            saveManagedProjectManifest(scope, projectMode, manifest);
+        }
         if (out.results.length > 0) {
             console.log();
             printDistributionResults({
@@ -833,6 +934,10 @@ skillRoot.action(async (options) => {
                 getPath: (result) => result.targetDir,
             });
         }
+        if (shouldSkipProjectDistribution(scope, config)) {
+            console.log();
+            printProjectDistributionDisabledMessage();
+        }
     }
     catch (error) {
         if (error instanceof Error) {
@@ -962,7 +1067,9 @@ hookRoot.action(async (options) => {
             return;
         console.log();
         printActiveSelection('hooks', selection.enabled);
-        const out = distributeHooks(scope, config.applications.enabled, new Set(config.applications.assume_installed));
+        const out = distributeHooks(scope, config.applications.enabled, new Set(config.applications.assume_installed), {
+            projectMode: getScopedProjectMode(scope, config),
+        });
         if (out.results.length > 0) {
             console.log();
             printDistributionResults({
@@ -972,6 +1079,10 @@ hookRoot.action(async (options) => {
                 getPath: (result) => 'filePath' in result ? result.filePath : result.targetDir,
             });
         }
+        if (shouldSkipProjectDistribution(scope, config)) {
+            console.log();
+            printProjectDistributionDisabledMessage();
+        }
     }
     catch (error) {
         if (error instanceof Error) {
@@ -1118,7 +1229,7 @@ hookRoot
  * Show summary of enabled/disabled servers and applied agents
  */
 function showSummary(selectedServers, scope) {
-    const mcpConfig = loadMcpConfig();
+    const mcpConfig = loadMcpConfigWithPlugins(scope);
     const allServers = Object.keys(mcpConfig.mcpServers);
     const enabledServers = selectedServers;
     const disabledServers = allServers.filter((s) => !selectedServers.includes(s));
@@ -1235,9 +1346,10 @@ pluginRoot
 function pluginEnableAction(id, options) {
     try {
         const scope = resolveScope(options);
-        const config = loadSwitchboardConfig(scopeToLayerOptions(scope));
-        if (config.plugins.enabled.includes(id)) {
-            console.log(chalk.yellow(`⚠ Plugin "${id}" is already enabled.`));
+        const layerOpts = scopeToLayerOptions(scope);
+        const layer = loadWritableConfigLayer(layerOpts);
+        if (layer.config.plugins?.enabled?.includes(id)) {
+            console.log(chalk.yellow(`⚠ Plugin "${id}" is already enabled in this config layer.`));
             return;
         }
         const index = buildPluginIndex(scope);
@@ -1246,13 +1358,13 @@ function pluginEnableAction(id, options) {
             console.log(chalk.dim('  Run `asb plugin list` to see available plugins.'));
             process.exit(1);
         }
-        updateConfigLayer((layer) => ({
-            ...layer,
+        updateConfigLayer((l) => ({
+            ...l,
             plugins: {
-                ...(layer.plugins ?? {}),
-                enabled: [...(layer.plugins?.enabled ?? []), id],
+                ...(l.plugins ?? {}),
+                enabled: [...(l.plugins?.enabled ?? []), id],
             },
-        }), scopeToLayerOptions(scope));
+        }), layerOpts);
         console.log(chalk.green(`✓ Plugin "${id}" enabled.`));
     }
     catch (error) {
@@ -1265,18 +1377,19 @@ function pluginEnableAction(id, options) {
 function pluginRemoveAction(id, options, verb) {
     try {
         const scope = resolveScope(options);
-        const config = loadSwitchboardConfig(scopeToLayerOptions(scope));
-        if (!config.plugins.enabled.includes(id)) {
-            console.log(chalk.yellow(`⚠ Plugin "${id}" is not enabled.`));
+        const layerOpts = scopeToLayerOptions(scope);
+        const layer = loadWritableConfigLayer(layerOpts);
+        if (!layer.config.plugins?.enabled?.includes(id)) {
+            console.log(chalk.yellow(`⚠ Plugin "${id}" is not enabled in this config layer.`));
             return;
         }
-        updateConfigLayer((layer) => ({
-            ...layer,
+        updateConfigLayer((l) => ({
+            ...l,
             plugins: {
-                ...(layer.plugins ?? {}),
-                enabled: (layer.plugins?.enabled ?? []).filter((x) => x !== id),
+                ...(l.plugins ?? {}),
+                enabled: (l.plugins?.enabled ?? []).filter((x) => x !== id),
             },
-        }), scopeToLayerOptions(scope));
+        }), layerOpts);
         console.log(chalk.green(`✓ Plugin "${id}" ${verb}.`));
     }
     catch (error) {
@@ -1532,7 +1645,7 @@ mktRoot
     }
 });
 mktRoot.action(() => {
-    mktRoot.commands.find((c) => c.name() === 'list')?.parse(process.argv);
+    mktRoot.outputHelp();
 });
 // ── Removed: `asb source` ──────────────────────────────────────────
 program