botmux 3.12.0 → 3.12.1

package/dist/dashboard.js

@@ -62,14 +62,17 @@ import { listTeamReports, readTeamBoard, setTeamBoardEntry } from './services/te
 import { createCliAdapterSync } from './adapters/cli/registry.js';
 import { hd2dAssetPath, hd2dStatus, startHd2dDownload } from './dashboard/hd2d-assets.js';
 import { buildSkillInstallAuditSummary, installLocalSkillLinks, readSkillRegistry, removeInstalledSkill, removeInstalledSkills, updateInstalledSkillAsync, } from './services/skill-registry-store.js';
+import { readSkillPackRegistry } from './services/skill-pack-store.js';
+import { cloneSkillPack, createSkillPack, deleteSkillPack, getSkillPack, listSkillPacks, updateSkillPack, SkillPackStoreError, } from './services/skill-pack-store.js';
 import { redactGitUrlCredentials } from './core/skills/sources.js';
+import { enrichPackForDashboard, enrichPacksForDashboard, sanitizeSkillForDashboard, } from './dashboard/skill-pack-response.js';
 import { effectiveDefaultWorkingDir, getBot, loadBotConfigs, parseBotConfigsFromText } from './bot-registry.js';
 import { addChatToFeedGroup, createFeedGroup, FEED_GROUP_SCOPES, FeedGroupApiError, listFeedGroups } from './dashboard/feed-groups.js';
 import { generateAuthUrl, handleCallbackUrl, isCallbackUrl } from './utils/user-token.js';
 import { findEntryIndex, readRawConfig, requireConfigPath, writeRawConfigAtomic } from './services/config-store.js';
 import { emitCodexNotifierOutboxItem, installCodexNotifierHook, isCodexNotifierWorkerStateFresh, isCodexNotifierHookInstalled, listCodexNotifierOutbox, readCodexNotifierWorkerState, resolveCodexNotifierConfig, runCodexSideConversationMonitor, runCodexNotifierWorkerSupervisor, } from './features/codex-notifier/index.js';
 import { discoverNativeCliSkillGroups } from './core/skills/discovery.js';
-import { analyzeSkillReferences } from './core/skills/references.js';
+import { analyzeSkillReferences, packsContainingSkill } from './core/skills/references.js';
 import { discoverDashboardSkills, installDashboardSkill, parseDashboardSkillInstallRequest, parseInstallLocalLinksSources, MAX_LOCAL_LINK_SOURCES } from './dashboard/skill-install-request.js';
 import { botDefaultsPayload, botSummaryPayload, brandMapByAppId } from './dashboard/bot-payload.js';
 import { handleVcMeetingConsumerProfilesGet, handleVcMeetingConsumerProfilesPut, } from './dashboard/vc-consumer-profiles-api.js';
@@ -106,6 +109,13 @@ import { inspectGatewayEntry } from './core/plugins/mcp/gateway-installer.js';
 import { fetchDaemonIpc } from './core/daemon-ipc-auth.js';
 import { buildDashboardSummary, parseDashboardSummaryRows, } from './dashboard/dashboard-summary.js';
 import { createDashboardSummaryEndpoint } from './dashboard/dashboard-summary-endpoint.js';
+import { scrubWorkflowWorkerEnv } from './utils/child-env.js';
+// The dashboard is an independent long-lived PM2 app and can be resurrected
+// from a stale dump.pm2 without passing through cli.ts pm2Env(). Its start/stop
+// and detached-restart children inherit process.env, so a leaked workflow
+// marker would make those CLI commands fail at the workflow safety gate before
+// they can reach their own cleanup boundary.
+scrubWorkflowWorkerEnv(process.env);
 const SECRET_PATH = dashboardSecretPath();
 const TOKEN_PATH = join(homedir(), '.botmux', '.dashboard-token');
 /** Per-daemon budget for the cross-daemon insight overview fan-out — bounds
@@ -2303,16 +2313,13 @@ function startSkillJob(type, run) {
     })());
     return job;
 }
-function sanitizeSkillForDashboard(skill) {
-    if (skill.source.type !== 'git')
-        return skill;
-    return {
-        ...skill,
-        source: { ...skill.source, url: redactGitUrlCredentials(skill.source.url) },
-    };
-}
 function dashboardSkillCliIds() {
     const ids = new Set();
+    // Always scan all known CLI skill dirs, not just configured bots — users may
+    // want to discover codex/trae/... skills even before creating a bot for them.
+    const allCliIds = ['claude-code', 'seed', 'relay', 'aiden', 'coco', 'codex', 'codex-app', 'cursor', 'gemini', 'genius', 'opencode', 'antigravity', 'mtr', 'hermes', 'mira', 'mir', 'traex', 'pi', 'copilot', 'oh-my-pi', 'kimi', 'grok', 'kiro-cli', 'riff'];
+    for (const cliId of allCliIds)
+        ids.add(cliId);
     try {
         for (const cliId of configuredCliIds().values())
             ids.add(cliId);
@@ -2342,6 +2349,76 @@ function dashboardSkillsPayload() {
         delivery: globalSkills.delivery ?? 'auto',
     };
 }
+// --- Skill pack dashboard helpers ------------------------------------------
+function loadBotConfigsSafe() {
+    try {
+        return loadBotConfigs();
+    }
+    catch {
+        return [];
+    }
+}
+function botsReferencingPack(packId, bots) {
+    const selector = `pack:${packId}`;
+    return bots
+        .filter((bot) => Array.isArray(bot.skills?.include) && bot.skills.include.includes(selector))
+        .map((bot) => ({ larkAppId: bot.larkAppId, botName: bot.name ?? bot.larkAppId }))
+        .sort((a, b) => a.botName.localeCompare(b.botName));
+}
+function parsePackInput(body) {
+    if (!body || typeof body !== 'object' || Array.isArray(body))
+        throw new SkillPackStoreError({ code: 'SKILL_PACK_INVALID', reason: 'body must be an object' });
+    const b = body;
+    return {
+        id: typeof b.id === 'string' ? b.id : '',
+        name: typeof b.name === 'string' ? b.name : '',
+        description: typeof b.description === 'string' ? b.description : undefined,
+        tags: Array.isArray(b.tags) ? b.tags : undefined,
+        include: Array.isArray(b.include) ? b.include : [],
+    };
+}
+function parsePackUpdate(body) {
+    if (!body || typeof body !== 'object' || Array.isArray(body))
+        throw new SkillPackStoreError({ code: 'SKILL_PACK_INVALID', reason: 'body must be an object' });
+    const b = body;
+    return {
+        name: typeof b.name === 'string' ? b.name : undefined,
+        description: b.description === null ? null : typeof b.description === 'string' ? b.description : undefined,
+        tags: b.tags === null ? null : Array.isArray(b.tags) ? b.tags : undefined,
+        include: Array.isArray(b.include) ? b.include : undefined,
+        expectedRevision: typeof b.expectedRevision === 'number' ? b.expectedRevision : undefined,
+    };
+}
+function packErrorStatus(err) {
+    if (err instanceof SkillPackStoreError) {
+        switch (err.detail.code) {
+            case 'SKILL_PACK_NOT_FOUND': return 404;
+            case 'SKILL_PACK_ID_CONFLICT': return 409;
+            case 'SKILL_PACK_REVISION_CONFLICT': return 409;
+            case 'SKILL_PACK_IN_USE': return 409;
+            default: return 400;
+        }
+    }
+    return 400;
+}
+function packErrorBody(err) {
+    if (err instanceof SkillPackStoreError) {
+        const d = err.detail;
+        const body = { ok: false, error: d.code };
+        if (d.code === 'SKILL_PACK_REVISION_CONFLICT')
+            body.current = d.current;
+        if (d.code === 'SKILL_PACK_INVALID')
+            body.reason = d.reason;
+        if (d.code === 'SKILL_PACK_INVALID_SELECTOR')
+            body.selector = d.selector;
+        return body;
+    }
+    return {
+        ok: false,
+        error: 'internal_error',
+        detail: redactGitUrlCredentials(err instanceof Error ? err.message : String(err)),
+    };
+}
 function mergeSkillReferenceBot(refs, ref) {
     const current = refs.get(ref.larkAppId);
     if (!current) {
@@ -2353,11 +2430,18 @@ function mergeSkillReferenceBot(refs, ref) {
 async function dashboardSkillReferencesMany(skillNames) {
     const uniqueNames = [...new Set(skillNames)];
     const refsBySkill = new Map(uniqueNames.map(name => [name, new Map()]));
+    let packs;
+    try {
+        packs = readSkillPackRegistry().packs;
+    }
+    catch {
+        // packs.json may be absent; fall back to direct-only analysis.
+    }
     try {
         const configuredBots = loadBotConfigs();
         for (const name of uniqueNames) {
             const refs = refsBySkill.get(name);
-            for (const ref of analyzeSkillReferences(name, { bots: configuredBots }).bots)
+            for (const ref of analyzeSkillReferences(name, { bots: configuredBots, packs }).bots)
                 mergeSkillReferenceBot(refs, ref);
         }
     }
@@ -2383,15 +2467,16 @@ async function dashboardSkillReferencesMany(skillNames) {
     const availableOnlineConfigs = onlineConfigs.filter(config => config !== null);
     for (const name of uniqueNames) {
         const refs = refsBySkill.get(name);
-        for (const ref of analyzeSkillReferences(name, { bots: availableOnlineConfigs }).bots)
+        for (const ref of analyzeSkillReferences(name, { bots: availableOnlineConfigs, packs }).bots)
             mergeSkillReferenceBot(refs, ref);
     }
     return new Map([...refsBySkill].map(([name, refs]) => [name, {
             bots: [...refs.values()].sort((a, b) => a.botName.localeCompare(b.botName)),
+            packs: packsContainingSkill(name, packs),
         }]));
 }
 async function dashboardSkillReferences(skillName) {
-    return (await dashboardSkillReferencesMany([skillName])).get(skillName) ?? { bots: [] };
+    return (await dashboardSkillReferencesMany([skillName])).get(skillName) ?? { bots: [], packs: [] };
 }
 /** Extract the sessionId from a terminal path `/s/<sessionId>[/...]`. Returns
  *  the first path segment after `/s/` (stops at the next `/`; query/hash are
@@ -3340,10 +3425,14 @@ const server = createServer(async (req, res) => {
             if (missing.length > 0)
                 return jsonRes(res, 400, { ok: false, error: 'skill_not_installed', missing });
             const referencesBySkill = await dashboardSkillReferencesMany(names);
-            const references = names.map(name => ({ name, refs: referencesBySkill.get(name) ?? { bots: [] } }));
+            const references = names.map(name => ({ name, refs: referencesBySkill.get(name) ?? { bots: [], packs: [] } }));
             const affectedSkills = references
-                .filter(item => item.refs.bots.length > 0)
-                .map(item => ({ name: item.name, affectedBots: item.refs.bots }));
+                .filter(item => item.refs.bots.length > 0 || item.refs.packs.length > 0)
+                .map(item => ({
+                name: item.name,
+                affectedBots: item.refs.bots,
+                affectedPacks: item.refs.packs,
+            }));
             if (body.force !== true && affectedSkills.length > 0) {
                 return jsonRes(res, 409, {
                     ok: false,
@@ -3474,11 +3563,12 @@ const server = createServer(async (req, res) => {
             if (!readSkillRegistry().skills[name])
                 return jsonRes(res, 400, { ok: false, error: 'skill_not_installed' });
             const refs = await dashboardSkillReferences(name);
-            if (!force && refs.bots.length > 0) {
+            if (!force && (refs.bots.length > 0 || refs.packs.length > 0)) {
                 return jsonRes(res, 409, {
                     ok: false,
                     error: 'skill_in_use',
                     affectedBots: refs.bots,
+                    affectedPacks: refs.packs,
                 });
             }
             const r = removeInstalledSkill(name);
@@ -3487,9 +3577,103 @@ const server = createServer(async (req, res) => {
             return jsonRes(res, 200, {
                 ok: true,
                 affectedBots: refs.bots,
+                affectedPacks: refs.packs,
                 ...dashboardSkillsPayload(),
             });
         }
+        // --- Skill pack CRUD ---------------------------------------------------
+        if (req.method === 'GET' && url.pathname === '/api/skill-packs') {
+            const registrySkills = readSkillRegistry().skills;
+            const bots = loadBotConfigsSafe();
+            const packs = enrichPacksForDashboard(listSkillPacks(), registrySkills, (packId) => botsReferencingPack(packId, bots));
+            return jsonRes(res, 200, { ok: true, packs });
+        }
+        if (req.method === 'POST' && url.pathname === '/api/skill-packs') {
+            let body;
+            try {
+                body = await readJsonBody(req);
+            }
+            catch {
+                return jsonRes(res, 400, { ok: false, error: 'bad_json' });
+            }
+            try {
+                const input = parsePackInput(body);
+                const pack = createSkillPack(input);
+                return jsonRes(res, 201, { ok: true, pack });
+            }
+            catch (err) {
+                return jsonRes(res, packErrorStatus(err), packErrorBody(err));
+            }
+        }
+        let mPack;
+        if (req.method === 'GET' && (mPack = url.pathname.match(/^\/api\/skill-packs\/([^/]+)$/))) {
+            const id = decodeURIComponent(mPack[1]);
+            const pack = getSkillPack(id);
+            if (!pack)
+                return jsonRes(res, 404, { ok: false, error: 'SKILL_PACK_NOT_FOUND' });
+            const registrySkills = readSkillRegistry().skills;
+            const bots = loadBotConfigsSafe();
+            return jsonRes(res, 200, {
+                ok: true,
+                pack: enrichPackForDashboard(pack, registrySkills, botsReferencingPack(pack.id, bots)),
+            });
+        }
+        if (req.method === 'PUT' && (mPack = url.pathname.match(/^\/api\/skill-packs\/([^/]+)$/))) {
+            const id = decodeURIComponent(mPack[1]);
+            let body;
+            try {
+                body = await readJsonBody(req);
+            }
+            catch {
+                return jsonRes(res, 400, { ok: false, error: 'bad_json' });
+            }
+            try {
+                const input = parsePackUpdate(body);
+                const pack = updateSkillPack(id, input);
+                return jsonRes(res, 200, { ok: true, pack });
+            }
+            catch (err) {
+                return jsonRes(res, packErrorStatus(err), packErrorBody(err));
+            }
+        }
+        if (req.method === 'DELETE' && (mPack = url.pathname.match(/^\/api\/skill-packs\/([^/]+)$/))) {
+            const id = decodeURIComponent(mPack[1]);
+            const force = url.searchParams.get('force') === '1';
+            const pack = getSkillPack(id);
+            if (!pack)
+                return jsonRes(res, 404, { ok: false, error: 'SKILL_PACK_NOT_FOUND' });
+            const refs = botsReferencingPack(id, loadBotConfigsSafe());
+            if (!force && refs.length > 0) {
+                return jsonRes(res, 409, { ok: false, error: 'SKILL_PACK_IN_USE', references: refs });
+            }
+            try {
+                deleteSkillPack(id);
+                return jsonRes(res, 200, { ok: true, references: refs });
+            }
+            catch (err) {
+                return jsonRes(res, packErrorStatus(err), packErrorBody(err));
+            }
+        }
+        if (req.method === 'POST' && (mPack = url.pathname.match(/^\/api\/skill-packs\/([^/]+)\/clone$/))) {
+            const id = decodeURIComponent(mPack[1]);
+            let body;
+            try {
+                body = await readJsonBody(req);
+            }
+            catch {
+                return jsonRes(res, 400, { ok: false, error: 'bad_json' });
+            }
+            const newId = typeof body?.id === 'string' ? body.id.trim() : '';
+            if (!newId)
+                return jsonRes(res, 400, { ok: false, error: 'id_required' });
+            try {
+                const pack = cloneSkillPack(id, newId);
+                return jsonRes(res, 201, { ok: true, pack });
+            }
+            catch (err) {
+                return jsonRes(res, packErrorStatus(err), packErrorBody(err));
+            }
+        }
         if (req.method === 'GET' && url.pathname === '/api/whiteboards') {
             return jsonRes(res, 200, { enabled: whiteboardEnabled(), whiteboards: listWhiteboards() });
         }