@mycelish/cli 0.2.8 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +65 -0
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/health-checks/runner.d.ts.map +1 -1
- package/dist/commands/health-checks/runner.js +23 -1
- package/dist/commands/health-checks/runner.js.map +1 -1
- package/dist/commands/marketplace.d.ts.map +1 -1
- package/dist/commands/marketplace.js +34 -1
- package/dist/commands/marketplace.js.map +1 -1
- package/dist/commands/remote.d.ts.map +1 -1
- package/dist/commands/remote.js +17 -0
- package/dist/commands/remote.js.map +1 -1
- package/dist/commands/remove.d.ts +16 -8
- package/dist/commands/remove.d.ts.map +1 -1
- package/dist/commands/remove.js +163 -42
- package/dist/commands/remove.js.map +1 -1
- package/dist/commands/remove.test.js +4 -4
- package/dist/commands/remove.test.js.map +1 -1
- package/dist/commands/sync.d.ts.map +1 -1
- package/dist/commands/sync.js +20 -1
- package/dist/commands/sync.js.map +1 -1
- package/dist/core/auto-adapter.d.ts.map +1 -1
- package/dist/core/auto-adapter.js +2 -0
- package/dist/core/auto-adapter.js.map +1 -1
- package/dist/core/content-hash.d.ts +3 -0
- package/dist/core/content-hash.d.ts.map +1 -0
- package/dist/core/content-hash.js +11 -0
- package/dist/core/content-hash.js.map +1 -0
- package/dist/core/env-template.d.ts +8 -0
- package/dist/core/env-template.d.ts.map +1 -1
- package/dist/core/env-template.js +67 -1
- package/dist/core/env-template.js.map +1 -1
- package/dist/core/env-template.test.js +100 -1
- package/dist/core/env-template.test.js.map +1 -1
- package/dist/core/manifest-migrator.d.ts +0 -1
- package/dist/core/manifest-migrator.d.ts.map +1 -1
- package/dist/core/manifest-migrator.js +1 -1
- package/dist/core/manifest-migrator.js.map +1 -1
- package/dist/core/manifest-state.d.ts +2 -1
- package/dist/core/manifest-state.d.ts.map +1 -1
- package/dist/core/manifest-state.js.map +1 -1
- package/dist/core/marketplace-cache.d.ts +12 -0
- package/dist/core/marketplace-cache.d.ts.map +1 -0
- package/dist/core/marketplace-cache.js +127 -0
- package/dist/core/marketplace-cache.js.map +1 -0
- package/dist/core/marketplace-cache.test.d.ts +2 -0
- package/dist/core/marketplace-cache.test.d.ts.map +1 -0
- package/dist/core/marketplace-cache.test.js +122 -0
- package/dist/core/marketplace-cache.test.js.map +1 -0
- package/dist/core/marketplace-constants.d.ts +14 -0
- package/dist/core/marketplace-constants.d.ts.map +1 -0
- package/dist/core/marketplace-constants.js +14 -0
- package/dist/core/marketplace-constants.js.map +1 -0
- package/dist/core/marketplace-deduplicator.d.ts +13 -0
- package/dist/core/marketplace-deduplicator.d.ts.map +1 -0
- package/dist/core/marketplace-deduplicator.js +84 -0
- package/dist/core/marketplace-deduplicator.js.map +1 -0
- package/dist/core/marketplace-deduplicator.test.d.ts +2 -0
- package/dist/core/marketplace-deduplicator.test.d.ts.map +1 -0
- package/dist/core/marketplace-deduplicator.test.js +70 -0
- package/dist/core/marketplace-deduplicator.test.js.map +1 -0
- package/dist/core/marketplace-registry.d.ts.map +1 -1
- package/dist/core/marketplace-registry.js +10 -16
- package/dist/core/marketplace-registry.js.map +1 -1
- package/dist/core/marketplace-registry.test.js +5 -4
- package/dist/core/marketplace-registry.test.js.map +1 -1
- package/dist/core/marketplace-sources.d.ts +47 -25
- package/dist/core/marketplace-sources.d.ts.map +1 -1
- package/dist/core/marketplace-sources.js +331 -106
- package/dist/core/marketplace-sources.js.map +1 -1
- package/dist/core/marketplace-sources.test.js +158 -5
- package/dist/core/marketplace-sources.test.js.map +1 -1
- package/dist/core/marketplace.d.ts +22 -5
- package/dist/core/marketplace.d.ts.map +1 -1
- package/dist/core/marketplace.js +280 -127
- package/dist/core/marketplace.js.map +1 -1
- package/dist/core/marketplace.test.js +20 -58
- package/dist/core/marketplace.test.js.map +1 -1
- package/dist/core/migrator/executor.d.ts.map +1 -1
- package/dist/core/migrator/executor.js +11 -2
- package/dist/core/migrator/executor.js.map +1 -1
- package/dist/core/migrator/manifest.d.ts +10 -1
- package/dist/core/migrator/manifest.d.ts.map +1 -1
- package/dist/core/migrator/manifest.js +12 -2
- package/dist/core/migrator/manifest.js.map +1 -1
- package/dist/core/plugin-scanner.test.js +0 -4
- package/dist/core/plugin-scanner.test.js.map +1 -1
- package/dist/core/plugin-state.d.ts.map +1 -1
- package/dist/core/plugin-state.js +50 -18
- package/dist/core/plugin-state.js.map +1 -1
- package/dist/core/plugin-takeover.d.ts +15 -0
- package/dist/core/plugin-takeover.d.ts.map +1 -1
- package/dist/core/plugin-takeover.js +163 -3
- package/dist/core/plugin-takeover.js.map +1 -1
- package/dist/core/presets.test.js +0 -3
- package/dist/core/presets.test.js.map +1 -1
- package/dist/core/secret-detector.d.ts +20 -0
- package/dist/core/secret-detector.d.ts.map +1 -0
- package/dist/core/secret-detector.js +83 -0
- package/dist/core/secret-detector.js.map +1 -0
- package/dist/core/secret-detector.test.d.ts +2 -0
- package/dist/core/secret-detector.test.d.ts.map +1 -0
- package/dist/core/secret-detector.test.js +91 -0
- package/dist/core/secret-detector.test.js.map +1 -0
- package/dist/core/security-scanner.d.ts +24 -0
- package/dist/core/security-scanner.d.ts.map +1 -0
- package/dist/core/security-scanner.js +182 -0
- package/dist/core/security-scanner.js.map +1 -0
- package/dist/core/security-scanner.test.d.ts +2 -0
- package/dist/core/security-scanner.test.d.ts.map +1 -0
- package/dist/core/security-scanner.test.js +120 -0
- package/dist/core/security-scanner.test.js.map +1 -0
- package/dist/core/snapshot.d.ts.map +1 -1
- package/dist/core/snapshot.js +0 -6
- package/dist/core/snapshot.js.map +1 -1
- package/dist/core/snapshot.test.js +0 -4
- package/dist/core/snapshot.test.js.map +1 -1
- package/dist/dashboard/assets/_baseUniq-CaVE7eUV.js +1 -0
- package/dist/dashboard/assets/arc-CR894Erh.js +1 -0
- package/dist/dashboard/assets/architectureDiagram-VXUJARFQ-vuLSFK92.js +36 -0
- package/dist/dashboard/assets/blockDiagram-VD42YOAC-CjXwNwFV.js +122 -0
- package/dist/dashboard/assets/c4Diagram-YG6GDRKO-BUk0KT3V.js +10 -0
- package/dist/dashboard/assets/channel-BzUEK7Iv.js +1 -0
- package/dist/dashboard/assets/chunk-4BX2VUAB-BCCD1RD0.js +1 -0
- package/dist/dashboard/assets/chunk-55IACEB6-7M5H4j_M.js +1 -0
- package/dist/dashboard/assets/chunk-B4BG7PRW-CkuZp9sw.js +165 -0
- package/dist/dashboard/assets/chunk-DI55MBZ5-aoWuqaxJ.js +220 -0
- package/dist/dashboard/assets/chunk-FMBD7UC4-zGR2QW6c.js +15 -0
- package/dist/dashboard/assets/chunk-QN33PNHL-Lj8Zu7hm.js +1 -0
- package/dist/dashboard/assets/chunk-QZHKN3VN-JLEIDbAK.js +1 -0
- package/dist/dashboard/assets/chunk-TZMSLE5B-BB4GoxaV.js +1 -0
- package/dist/dashboard/assets/classDiagram-2ON5EDUG-CMpOlMXG.js +1 -0
- package/dist/dashboard/assets/classDiagram-v2-WZHVMYZB-CMpOlMXG.js +1 -0
- package/dist/dashboard/assets/clone-CHi7kZ5h.js +1 -0
- package/dist/dashboard/assets/cose-bilkent-S5V4N54A-DLEOmN1S.js +1 -0
- package/dist/dashboard/assets/cytoscape.esm-5J0xJHOV.js +321 -0
- package/dist/dashboard/assets/dagre-6UL2VRFP-BKeNwVe7.js +4 -0
- package/dist/dashboard/assets/defaultLocale-DX6XiGOO.js +1 -0
- package/dist/dashboard/assets/diagram-PSM6KHXK-BwTCZWHJ.js +24 -0
- package/dist/dashboard/assets/diagram-QEK2KX5R-Bg109hRA.js +43 -0
- package/dist/dashboard/assets/diagram-S2PKOQOG-CjzZEN97.js +24 -0
- package/dist/dashboard/assets/erDiagram-Q2GNP2WA-C_o1kY7B.js +60 -0
- package/dist/dashboard/assets/flowDiagram-NV44I4VS-CGcmMJTD.js +162 -0
- package/dist/dashboard/assets/ganttDiagram-JELNMOA3-Dh1Atgfm.js +267 -0
- package/dist/dashboard/assets/gitGraphDiagram-NY62KEGX-BkHRiPWO.js +65 -0
- package/dist/dashboard/assets/graph-gTAnu0gr.js +1 -0
- package/dist/dashboard/assets/index-DFP3ko3G.css +1 -0
- package/dist/dashboard/assets/index-Dr2pvJml.js +189 -0
- package/dist/dashboard/assets/infoDiagram-WHAUD3N6-CdqkT51i.js +2 -0
- package/dist/dashboard/assets/init-Gi6I4Gst.js +1 -0
- package/dist/dashboard/assets/journeyDiagram-XKPGCS4Q-D6H-T7IF.js +139 -0
- package/dist/dashboard/assets/kanban-definition-3W4ZIXB7-CdtlB9dE.js +89 -0
- package/dist/dashboard/assets/katex-DhXJpUyf.js +261 -0
- package/dist/dashboard/assets/layout-5P3G0oCF.js +1 -0
- package/dist/dashboard/assets/linear-BEr0iAwY.js +1 -0
- package/dist/dashboard/assets/mermaid.core-DY8Lk9ir.js +250 -0
- package/dist/dashboard/assets/min-rFBMICyx.js +1 -0
- package/dist/dashboard/assets/mindmap-definition-VGOIOE7T-BBgtd54T.js +68 -0
- package/dist/dashboard/assets/ordinal-Cboi1Yqb.js +1 -0
- package/dist/dashboard/assets/pieDiagram-ADFJNKIX-fgAzUnCv.js +30 -0
- package/dist/dashboard/assets/quadrantDiagram-AYHSOK5B-BtBFRMty.js +7 -0
- package/dist/dashboard/assets/requirementDiagram-UZGBJVZJ-Dsb2J8qM.js +64 -0
- package/dist/dashboard/assets/sankeyDiagram-TZEHDZUN-DgeXoGZy.js +10 -0
- package/dist/dashboard/assets/sequenceDiagram-WL72ISMW-CW8ApGYu.js +145 -0
- package/dist/dashboard/assets/stateDiagram-FKZM4ZOC-CFKNRDGr.js +1 -0
- package/dist/dashboard/assets/stateDiagram-v2-4FDKWEC3-B3pJgIRu.js +1 -0
- package/dist/dashboard/assets/timeline-definition-IT6M3QCI-DeE7K_Tn.js +61 -0
- package/dist/dashboard/assets/treemap-KMMF4GRG-DgksShPO.js +128 -0
- package/dist/dashboard/assets/xychartDiagram-PRI3JC2R-C8fn_Zm6.js +7 -0
- package/dist/dashboard/index.html +2 -2
- package/dist/routes/marketplace.d.ts.map +1 -1
- package/dist/routes/marketplace.js +179 -1
- package/dist/routes/marketplace.js.map +1 -1
- package/dist/routes/remove.js +4 -4
- package/dist/routes/remove.js.map +1 -1
- package/dist/routes/state.d.ts.map +1 -1
- package/dist/routes/state.js +56 -9
- package/dist/routes/state.js.map +1 -1
- package/package.json +2 -2
- package/dist/dashboard/assets/index-CAenUQES.css +0 -1
- package/dist/dashboard/assets/index-DDo3xcmE.js +0 -150
|
@@ -12,7 +12,7 @@ import { expandPath } from "@mycelish/core";
|
|
|
12
12
|
import { scanPluginComponents } from "./plugin-scanner.js";
|
|
13
13
|
import { createSkillSymlink, removeSkillSymlink } from "./symlink-manager.js";
|
|
14
14
|
import { readFileIfExists } from "./fs-helpers.js";
|
|
15
|
-
import { getDisabledItems, loadStateManifest } from "./manifest-state.js";
|
|
15
|
+
import { getDisabledItems, loadStateManifest, saveStateManifest, ITEM_SECTIONS } from "./manifest-state.js";
|
|
16
16
|
import { getTracer } from "./global-tracer.js";
|
|
17
17
|
// ============================================================================
|
|
18
18
|
// Constants
|
|
@@ -52,7 +52,7 @@ function getSourcePath(cachePath, type, name, componentPath) {
|
|
|
52
52
|
// Helpers
|
|
53
53
|
// ============================================================================
|
|
54
54
|
/** Parse pluginId "{plugin}@{marketplace}" */
|
|
55
|
-
function parsePluginId(pluginId) {
|
|
55
|
+
export function parsePluginId(pluginId) {
|
|
56
56
|
const atIdx = pluginId.lastIndexOf("@");
|
|
57
57
|
if (atIdx <= 0)
|
|
58
58
|
throw new Error(`Invalid plugin ID format: ${pluginId}`);
|
|
@@ -61,6 +61,10 @@ function parsePluginId(pluginId) {
|
|
|
61
61
|
marketplace: pluginId.slice(atIdx + 1),
|
|
62
62
|
};
|
|
63
63
|
}
|
|
64
|
+
/** Build a pluginId from name and marketplace. */
|
|
65
|
+
export function buildPluginId(name, marketplace) {
|
|
66
|
+
return `${name}@${marketplace}`;
|
|
67
|
+
}
|
|
64
68
|
/** Find the latest version directory for a plugin in the cache. */
|
|
65
69
|
async function findLatestVersion(pluginDir) {
|
|
66
70
|
try {
|
|
@@ -141,7 +145,7 @@ async function findPluginsWithComponent(componentName) {
|
|
|
141
145
|
const version = await findLatestVersion(plDir);
|
|
142
146
|
if (!version)
|
|
143
147
|
continue;
|
|
144
|
-
const pluginId =
|
|
148
|
+
const pluginId = buildPluginId(pl.name, mp.name);
|
|
145
149
|
if (enabledPlugins[pluginId] === false)
|
|
146
150
|
continue;
|
|
147
151
|
const versionRoot = path.join(plDir, version);
|
|
@@ -260,4 +264,160 @@ export async function syncPluginSymlinks(manifestDir) {
|
|
|
260
264
|
}
|
|
261
265
|
return { created, removed };
|
|
262
266
|
}
|
|
267
|
+
/**
|
|
268
|
+
* Detect and clean up orphaned plugin takeovers — plugins in takenOverPlugins
|
|
269
|
+
* whose cache no longer exists (e.g. plugin was uninstalled from Claude Code).
|
|
270
|
+
*
|
|
271
|
+
* Cleans: manifest entries (skills/agents/commands with pluginOrigin),
|
|
272
|
+
* takenOverPlugins, enabledPlugins in settings.json, and source files in ~/.mycelium/global/.
|
|
273
|
+
*/
|
|
274
|
+
export async function cleanOrphanedTakeovers(manifestDir) {
|
|
275
|
+
const dir = manifestDir ?? expandPath("~/.mycelium");
|
|
276
|
+
const manifest = await loadStateManifest(dir);
|
|
277
|
+
if (!manifest?.takenOverPlugins || Object.keys(manifest.takenOverPlugins).length === 0) {
|
|
278
|
+
return [];
|
|
279
|
+
}
|
|
280
|
+
const log = getTracer().createTrace("plugin-cleanup");
|
|
281
|
+
const cleaned = [];
|
|
282
|
+
let manifestDirty = false;
|
|
283
|
+
for (const [pluginId, pluginInfo] of Object.entries(manifest.takenOverPlugins)) {
|
|
284
|
+
// Check if cache still exists
|
|
285
|
+
let cacheExists = false;
|
|
286
|
+
try {
|
|
287
|
+
await fs.access(pluginInfo.cachePath);
|
|
288
|
+
cacheExists = true;
|
|
289
|
+
}
|
|
290
|
+
catch {
|
|
291
|
+
// Cache missing
|
|
292
|
+
}
|
|
293
|
+
// Also check if plugin is still installed in Claude Code
|
|
294
|
+
let installedInClaude = false;
|
|
295
|
+
if (cacheExists) {
|
|
296
|
+
try {
|
|
297
|
+
const ipPath = path.join(os.homedir(), ".claude", "plugins", "installed_plugins.json");
|
|
298
|
+
const raw = await readFileIfExists(ipPath);
|
|
299
|
+
if (raw) {
|
|
300
|
+
const data = JSON.parse(raw);
|
|
301
|
+
if (data.version === 2 && data.plugins) {
|
|
302
|
+
installedInClaude = pluginId in data.plugins;
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
catch { /* no file */ }
|
|
307
|
+
}
|
|
308
|
+
if (cacheExists && installedInClaude)
|
|
309
|
+
continue;
|
|
310
|
+
// Orphaned takeover — clean everything
|
|
311
|
+
log.warn({ scope: "plugin", op: "cleanup", msg: `Cleaning orphaned takeover: ${pluginId} (cache=${cacheExists ? "exists" : "missing"}, installed=${installedInClaude})`, item: pluginId });
|
|
312
|
+
// 1. Remove all manifest entries with this pluginOrigin
|
|
313
|
+
for (const { key: section } of ITEM_SECTIONS) {
|
|
314
|
+
const sectionData = manifest[section];
|
|
315
|
+
if (!sectionData)
|
|
316
|
+
continue;
|
|
317
|
+
for (const [name, cfg] of Object.entries(sectionData)) {
|
|
318
|
+
if (cfg.pluginOrigin?.pluginId === pluginId) {
|
|
319
|
+
delete sectionData[name];
|
|
320
|
+
manifestDirty = true;
|
|
321
|
+
log.info({ scope: "plugin", op: "cleanup", msg: `Removed manifest entry: ${section}/${name}`, item: name });
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
// 2. Remove from takenOverPlugins
|
|
326
|
+
delete manifest.takenOverPlugins[pluginId];
|
|
327
|
+
manifestDirty = true;
|
|
328
|
+
// 3. Clean enabledPlugins in settings.json
|
|
329
|
+
try {
|
|
330
|
+
const settings = await readSettings();
|
|
331
|
+
const ep = settings.enabledPlugins;
|
|
332
|
+
if (ep && pluginId in ep) {
|
|
333
|
+
delete ep[pluginId];
|
|
334
|
+
settings.enabledPlugins = ep;
|
|
335
|
+
await writeSettings(settings);
|
|
336
|
+
log.info({ scope: "plugin", op: "cleanup", msg: `Removed ${pluginId} from enabledPlugins`, item: pluginId });
|
|
337
|
+
}
|
|
338
|
+
}
|
|
339
|
+
catch { /* best effort */ }
|
|
340
|
+
// 4. Delete source files from ~/.mycelium/global/ for all plugin components
|
|
341
|
+
const allComponents = [...(pluginInfo.allSkills ?? []), ...(pluginInfo.allComponents ?? [])];
|
|
342
|
+
const uniqueComponents = [...new Set(allComponents)];
|
|
343
|
+
for (const name of uniqueComponents) {
|
|
344
|
+
// Try skills dir (directory), agents/commands (file)
|
|
345
|
+
for (const [, info] of Object.entries(PLUGIN_COMPONENT_DIRS)) {
|
|
346
|
+
const globalDir = path.join(dir, "global", info.subdir, name);
|
|
347
|
+
try {
|
|
348
|
+
await fs.rm(globalDir, { recursive: true, force: true });
|
|
349
|
+
}
|
|
350
|
+
catch { /* noop */ }
|
|
351
|
+
if (info.ext) {
|
|
352
|
+
const globalFile = path.join(dir, "global", info.subdir, name + info.ext);
|
|
353
|
+
try {
|
|
354
|
+
await fs.unlink(globalFile);
|
|
355
|
+
}
|
|
356
|
+
catch { /* noop */ }
|
|
357
|
+
}
|
|
358
|
+
}
|
|
359
|
+
}
|
|
360
|
+
cleaned.push(pluginId);
|
|
361
|
+
}
|
|
362
|
+
// Clean up empty takenOverPlugins
|
|
363
|
+
if (manifest.takenOverPlugins && Object.keys(manifest.takenOverPlugins).length === 0) {
|
|
364
|
+
delete manifest.takenOverPlugins;
|
|
365
|
+
manifestDirty = true;
|
|
366
|
+
}
|
|
367
|
+
// Also clean orphaned manifest entries with pluginOrigin but no matching takenOverPlugins
|
|
368
|
+
const activePluginIds = new Set(Object.keys(manifest.takenOverPlugins ?? {}));
|
|
369
|
+
for (const { key: section } of ITEM_SECTIONS) {
|
|
370
|
+
const sectionData = manifest[section];
|
|
371
|
+
if (!sectionData)
|
|
372
|
+
continue;
|
|
373
|
+
for (const [name, cfg] of Object.entries(sectionData)) {
|
|
374
|
+
if (cfg.pluginOrigin?.pluginId && !activePluginIds.has(cfg.pluginOrigin.pluginId)) {
|
|
375
|
+
delete sectionData[name];
|
|
376
|
+
manifestDirty = true;
|
|
377
|
+
log.info({ scope: "plugin", op: "cleanup", msg: `Removed orphaned manifest entry: ${section}/${name} (plugin ${cfg.pluginOrigin.pluginId} not in takenOverPlugins)`, item: name });
|
|
378
|
+
}
|
|
379
|
+
}
|
|
380
|
+
}
|
|
381
|
+
// Clean stale symlinks in ~/.mycelium/global/skills/ that point to plugin cache
|
|
382
|
+
const globalSkillsDir = path.join(dir, "global", "skills");
|
|
383
|
+
try {
|
|
384
|
+
const entries = await fs.readdir(globalSkillsDir, { withFileTypes: true });
|
|
385
|
+
for (const entry of entries) {
|
|
386
|
+
if (!entry.isSymbolicLink())
|
|
387
|
+
continue;
|
|
388
|
+
const fullPath = path.join(globalSkillsDir, entry.name);
|
|
389
|
+
try {
|
|
390
|
+
const target = await fs.readlink(fullPath);
|
|
391
|
+
// Remove symlinks pointing to plugin cache, tool dirs, or broken symlinks
|
|
392
|
+
const isStale = target.includes("plugins/cache") || target.includes(".codex/") || target.includes(".config/opencode/") || target.includes(".claude/skills/");
|
|
393
|
+
// Also check if symlink target actually exists
|
|
394
|
+
let targetExists = true;
|
|
395
|
+
if (!isStale) {
|
|
396
|
+
try {
|
|
397
|
+
await fs.access(fullPath);
|
|
398
|
+
}
|
|
399
|
+
catch {
|
|
400
|
+
targetExists = false;
|
|
401
|
+
}
|
|
402
|
+
}
|
|
403
|
+
if (isStale || !targetExists) {
|
|
404
|
+
await fs.unlink(fullPath);
|
|
405
|
+
manifestDirty = true;
|
|
406
|
+
log.info({ scope: "plugin", op: "cleanup", msg: `Removed stale symlink from global/skills: ${entry.name} → ${target}`, item: entry.name });
|
|
407
|
+
}
|
|
408
|
+
}
|
|
409
|
+
catch { /* broken symlink */ }
|
|
410
|
+
}
|
|
411
|
+
}
|
|
412
|
+
catch { /* dir doesn't exist */ }
|
|
413
|
+
if (manifestDirty) {
|
|
414
|
+
await saveStateManifest(dir, manifest);
|
|
415
|
+
}
|
|
416
|
+
// Run symlink sync to remove any orphaned symlinks
|
|
417
|
+
if (cleaned.length > 0) {
|
|
418
|
+
await syncPluginSymlinks(dir);
|
|
419
|
+
log.info({ scope: "plugin", op: "cleanup", msg: `Cleaned ${cleaned.length} orphaned takeover(s): ${cleaned.join(", ")}` });
|
|
420
|
+
}
|
|
421
|
+
return cleaned;
|
|
422
|
+
}
|
|
263
423
|
//# sourceMappingURL=plugin-takeover.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-takeover.js","sourceRoot":"","sources":["../../src/core/plugin-takeover.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"plugin-takeover.js","sourceRoot":"","sources":["../../src/core/plugin-takeover.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ describe("presets", () => {
|
|
|
5
5
|
const config = {
|
|
6
6
|
skills: ["tdd", "debugging"],
|
|
7
7
|
mcps: ["git-mcp", "postgres-mcp"],
|
|
8
|
-
memory: { scopes: ["shared", "coding"] },
|
|
9
8
|
};
|
|
10
9
|
const preset = createPreset("python-backend", config);
|
|
11
10
|
expect(preset.name).toBe("python-backend");
|
|
@@ -16,7 +15,6 @@ describe("presets", () => {
|
|
|
16
15
|
name: "python-backend",
|
|
17
16
|
skills: ["tdd"],
|
|
18
17
|
mcps: ["git-mcp"],
|
|
19
|
-
memory: { scopes: ["shared"] },
|
|
20
18
|
};
|
|
21
19
|
const actions = applyPreset(preset, {
|
|
22
20
|
allSkills: ["tdd", "debugging", "frontend"],
|
|
@@ -30,7 +28,6 @@ describe("presets", () => {
|
|
|
30
28
|
name: "test",
|
|
31
29
|
skills: ["a"],
|
|
32
30
|
mcps: ["b"],
|
|
33
|
-
memory: { scopes: ["shared"] },
|
|
34
31
|
};
|
|
35
32
|
const yaml = exportPreset(preset);
|
|
36
33
|
expect(yaml).toContain("name: test");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presets.test.js","sourceRoot":"","sources":["../../src/core/presets.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEvE,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,MAAM,GAAG;YACb,MAAM,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC;YAC5B,IAAI,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"presets.test.js","sourceRoot":"","sources":["../../src/core/presets.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEvE,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,MAAM,GAAG;YACb,MAAM,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC;YAC5B,IAAI,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC;SAClC,CAAC;QACF,MAAM,MAAM,GAAG,YAAY,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,MAAM,GAAG;YACb,IAAI,EAAE,gBAAgB;YACtB,MAAM,EAAE,CAAC,KAAK,CAAC;YACf,IAAI,EAAE,CAAC,SAAS,CAAC;SAClB,CAAC;QACF,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE;YAClC,SAAS,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,UAAU,CAAC;YAC3C,OAAO,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,cAAc,CAAC;SACjD,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,MAAM,GAAG;YACb,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,CAAC,GAAG,CAAC;YACb,IAAI,EAAE,CAAC,GAAG,CAAC;SACZ,CAAC;QACF,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACrC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Detects hardcoded secrets in MCP env values.
|
|
3
|
+
* Used by migration (auto-extract), sync (guard), and `env extract` command.
|
|
4
|
+
*/
|
|
5
|
+
export interface SecretFinding {
|
|
6
|
+
mcpName: string;
|
|
7
|
+
key: string;
|
|
8
|
+
value: string;
|
|
9
|
+
}
|
|
10
|
+
/**
|
|
11
|
+
* Returns true if the key/value pair looks like a hardcoded secret.
|
|
12
|
+
*/
|
|
13
|
+
export declare function isLikelySecret(key: string, value: string): boolean;
|
|
14
|
+
/**
|
|
15
|
+
* Scan MCP configs for hardcoded secrets in env values.
|
|
16
|
+
*/
|
|
17
|
+
export declare function detectSecretsInMcps(mcps: Record<string, {
|
|
18
|
+
env?: Record<string, string>;
|
|
19
|
+
}>): SecretFinding[];
|
|
20
|
+
//# sourceMappingURL=secret-detector.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"secret-detector.d.ts","sourceRoot":"","sources":["../../src/core/secret-detector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AA0CD;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAkBlE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC,GACrD,aAAa,EAAE,CAWjB"}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Detects hardcoded secrets in MCP env values.
|
|
3
|
+
* Used by migration (auto-extract), sync (guard), and `env extract` command.
|
|
4
|
+
*/
|
|
5
|
+
/** Known secret key name patterns (case-insensitive) */
|
|
6
|
+
const SECRET_KEY_PATTERNS = /(?:key|secret|token|password|credential|auth)/i;
|
|
7
|
+
/** Known secret value prefixes */
|
|
8
|
+
const SECRET_VALUE_PREFIXES = [
|
|
9
|
+
"sk-",
|
|
10
|
+
"pk-",
|
|
11
|
+
"ghp_",
|
|
12
|
+
"gho_",
|
|
13
|
+
"ghs_",
|
|
14
|
+
"xox",
|
|
15
|
+
"ctx7sk-",
|
|
16
|
+
"dapi",
|
|
17
|
+
"AKIA",
|
|
18
|
+
"sk_live_",
|
|
19
|
+
"sk_test_",
|
|
20
|
+
"rk_live_",
|
|
21
|
+
"rk_test_",
|
|
22
|
+
"whsec_",
|
|
23
|
+
"shpat_",
|
|
24
|
+
"shpss_",
|
|
25
|
+
"shppa_",
|
|
26
|
+
"pypi-",
|
|
27
|
+
"npm_",
|
|
28
|
+
"glpat-",
|
|
29
|
+
];
|
|
30
|
+
/**
|
|
31
|
+
* Heuristic: high-entropy string (≥20 chars, mostly alphanumeric/special).
|
|
32
|
+
* Excludes paths and common non-secret patterns.
|
|
33
|
+
*/
|
|
34
|
+
function looksHighEntropy(value) {
|
|
35
|
+
if (value.length < 20)
|
|
36
|
+
return false;
|
|
37
|
+
// Skip obvious paths and URLs
|
|
38
|
+
if (value.startsWith("/") || value.startsWith("~") || value.includes("://"))
|
|
39
|
+
return false;
|
|
40
|
+
// Must be mostly alphanumeric + common secret chars (-, _, .)
|
|
41
|
+
const alphaCount = (value.match(/[A-Za-z0-9\-_./+=]/g) || []).length;
|
|
42
|
+
return alphaCount / value.length > 0.85;
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Returns true if the key/value pair looks like a hardcoded secret.
|
|
46
|
+
*/
|
|
47
|
+
export function isLikelySecret(key, value) {
|
|
48
|
+
// Skip ${VAR}, ${env:VAR}, ${VAR:-default} references — already extracted
|
|
49
|
+
if (/^\$\{(env:)?[A-Z_][A-Z0-9_]*(:-[^}]*)?\}$/.test(value))
|
|
50
|
+
return false;
|
|
51
|
+
// Skip empty or very short values
|
|
52
|
+
if (!value || value.length < 8)
|
|
53
|
+
return false;
|
|
54
|
+
// Check key name
|
|
55
|
+
if (SECRET_KEY_PATTERNS.test(key))
|
|
56
|
+
return true;
|
|
57
|
+
// Check value prefixes
|
|
58
|
+
for (const prefix of SECRET_VALUE_PREFIXES) {
|
|
59
|
+
if (value.startsWith(prefix))
|
|
60
|
+
return true;
|
|
61
|
+
}
|
|
62
|
+
// Check high entropy
|
|
63
|
+
if (looksHighEntropy(value))
|
|
64
|
+
return true;
|
|
65
|
+
return false;
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* Scan MCP configs for hardcoded secrets in env values.
|
|
69
|
+
*/
|
|
70
|
+
export function detectSecretsInMcps(mcps) {
|
|
71
|
+
const findings = [];
|
|
72
|
+
for (const [mcpName, config] of Object.entries(mcps)) {
|
|
73
|
+
if (!config.env)
|
|
74
|
+
continue;
|
|
75
|
+
for (const [key, value] of Object.entries(config.env)) {
|
|
76
|
+
if (isLikelySecret(key, value)) {
|
|
77
|
+
findings.push({ mcpName, key, value });
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
return findings;
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=secret-detector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"secret-detector.js","sourceRoot":"","sources":["../../src/core/secret-detector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH,wDAAwD;AACxD,MAAM,mBAAmB,GAAG,gDAAgD,CAAC;AAE7E,kCAAkC;AAClC,MAAM,qBAAqB,GAAG;IAC5B,KAAK;IACL,KAAK;IACL,MAAM;IACN,MAAM;IACN,MAAM;IACN,KAAK;IACL,SAAS;IACT,MAAM;IACN,MAAM;IACN,UAAU;IACV,UAAU;IACV,UAAU;IACV,UAAU;IACV,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,OAAO;IACP,MAAM;IACN,QAAQ;CACT,CAAC;AAEF;;;GAGG;AACH,SAAS,gBAAgB,CAAC,KAAa;IACrC,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE;QAAE,OAAO,KAAK,CAAC;IACpC,8BAA8B;IAC9B,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1F,8DAA8D;IAC9D,MAAM,UAAU,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;IACrE,OAAO,UAAU,GAAG,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;AAC1C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,GAAW,EAAE,KAAa;IACvD,0EAA0E;IAC1E,IAAI,2CAA2C,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1E,kCAAkC;IAClC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAE7C,iBAAiB;IACjB,IAAI,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAE/C,uBAAuB;IACvB,KAAK,MAAM,MAAM,IAAI,qBAAqB,EAAE,CAAC;QAC3C,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAC;IAC5C,CAAC;IAED,qBAAqB;IACrB,IAAI,gBAAgB,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEzC,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mBAAmB,CACjC,IAAsD;IAEtD,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,KAAK,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,GAAG;YAAE,SAAS;QAC1B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YACtD,IAAI,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC;gBAC/B,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"secret-detector.test.d.ts","sourceRoot":"","sources":["../../src/core/secret-detector.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import { describe, it, expect } from "vitest";
|
|
2
|
+
import { isLikelySecret, detectSecretsInMcps } from "./secret-detector.js";
|
|
3
|
+
describe("isLikelySecret", () => {
|
|
4
|
+
it("detects secrets by key name", () => {
|
|
5
|
+
expect(isLikelySecret("API_KEY", "somevalue12345678")).toBe(true);
|
|
6
|
+
expect(isLikelySecret("CONTEXT7_API_KEY", "ctx7sk-abc123def456")).toBe(true);
|
|
7
|
+
expect(isLikelySecret("DB_PASSWORD", "supersecretpassword")).toBe(true);
|
|
8
|
+
expect(isLikelySecret("AUTH_TOKEN", "tok_1234567890abcdef")).toBe(true);
|
|
9
|
+
expect(isLikelySecret("CLIENT_SECRET", "abcdefgh12345678")).toBe(true);
|
|
10
|
+
});
|
|
11
|
+
it("detects secrets by value prefix", () => {
|
|
12
|
+
expect(isLikelySecret("OPENAI", "sk-proj-abcdef1234567890")).toBe(true);
|
|
13
|
+
expect(isLikelySecret("GITHUB_PAT", "ghp_abcdef1234567890")).toBe(true);
|
|
14
|
+
expect(isLikelySecret("SLACK", "xoxb-1234567890-abc")).toBe(true);
|
|
15
|
+
expect(isLikelySecret("AWS_ID", "AKIAIOSFODNN7EXAMPLE")).toBe(true);
|
|
16
|
+
expect(isLikelySecret("CTX7", "ctx7sk-abcdefghijk1234")).toBe(true);
|
|
17
|
+
});
|
|
18
|
+
it("detects high-entropy values", () => {
|
|
19
|
+
expect(isLikelySecret("MASSIVE", "aB3dE5fG7hI9jK1lM3nO5pQ7")).toBe(true);
|
|
20
|
+
});
|
|
21
|
+
it("ignores ${VAR} references", () => {
|
|
22
|
+
expect(isLikelySecret("API_KEY", "${API_KEY}")).toBe(false);
|
|
23
|
+
expect(isLikelySecret("SECRET", "${MY_SECRET}")).toBe(false);
|
|
24
|
+
});
|
|
25
|
+
it("ignores ${env:VAR} references (Cursor/Windsurf syntax)", () => {
|
|
26
|
+
expect(isLikelySecret("API_KEY", "${env:API_KEY}")).toBe(false);
|
|
27
|
+
expect(isLikelySecret("TOKEN", "${env:MY_TOKEN}")).toBe(false);
|
|
28
|
+
});
|
|
29
|
+
it("ignores ${VAR:-default} references", () => {
|
|
30
|
+
expect(isLikelySecret("API_KEY", "${API_KEY:-fallback}")).toBe(false);
|
|
31
|
+
});
|
|
32
|
+
it("ignores short values", () => {
|
|
33
|
+
expect(isLikelySecret("MODE", "debug")).toBe(false);
|
|
34
|
+
expect(isLikelySecret("FLAG", "true")).toBe(false);
|
|
35
|
+
});
|
|
36
|
+
it("ignores paths and URLs", () => {
|
|
37
|
+
expect(isLikelySecret("PATH", "/usr/local/bin/node-server-app")).toBe(false);
|
|
38
|
+
expect(isLikelySecret("URL", "https://api.example.com/v1/endpoint")).toBe(false);
|
|
39
|
+
});
|
|
40
|
+
it("ignores non-secret env vars", () => {
|
|
41
|
+
expect(isLikelySecret("NODE_ENV", "production")).toBe(false);
|
|
42
|
+
expect(isLikelySecret("PORT", "3000")).toBe(false);
|
|
43
|
+
expect(isLikelySecret("DEBUG", "mycelium:*")).toBe(false);
|
|
44
|
+
});
|
|
45
|
+
});
|
|
46
|
+
describe("detectSecretsInMcps", () => {
|
|
47
|
+
it("finds secrets across multiple MCPs", () => {
|
|
48
|
+
const mcps = {
|
|
49
|
+
context7: {
|
|
50
|
+
env: {
|
|
51
|
+
CONTEXT7_API_KEY: "ctx7sk-realkey123456",
|
|
52
|
+
MODE: "default",
|
|
53
|
+
},
|
|
54
|
+
},
|
|
55
|
+
massive: {
|
|
56
|
+
env: {
|
|
57
|
+
MASSIVE_API_KEY: "sk-massivekey12345678",
|
|
58
|
+
},
|
|
59
|
+
},
|
|
60
|
+
safe: {
|
|
61
|
+
env: {
|
|
62
|
+
NODE_ENV: "production",
|
|
63
|
+
},
|
|
64
|
+
},
|
|
65
|
+
};
|
|
66
|
+
const findings = detectSecretsInMcps(mcps);
|
|
67
|
+
expect(findings).toHaveLength(2);
|
|
68
|
+
expect(findings[0].mcpName).toBe("context7");
|
|
69
|
+
expect(findings[0].key).toBe("CONTEXT7_API_KEY");
|
|
70
|
+
expect(findings[1].mcpName).toBe("massive");
|
|
71
|
+
expect(findings[1].key).toBe("MASSIVE_API_KEY");
|
|
72
|
+
});
|
|
73
|
+
it("returns empty for clean config", () => {
|
|
74
|
+
const mcps = {
|
|
75
|
+
server: {
|
|
76
|
+
env: {
|
|
77
|
+
API_KEY: "${API_KEY}",
|
|
78
|
+
PORT: "3000",
|
|
79
|
+
},
|
|
80
|
+
},
|
|
81
|
+
};
|
|
82
|
+
expect(detectSecretsInMcps(mcps)).toHaveLength(0);
|
|
83
|
+
});
|
|
84
|
+
it("handles MCPs without env", () => {
|
|
85
|
+
const mcps = {
|
|
86
|
+
server: { command: "node" },
|
|
87
|
+
};
|
|
88
|
+
expect(detectSecretsInMcps(mcps)).toHaveLength(0);
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
//# sourceMappingURL=secret-detector.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"secret-detector.test.js","sourceRoot":"","sources":["../../src/core/secret-detector.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Security scanner for AI agent skills and MCP configs.
|
|
3
|
+
* Detection rules adapted from Cisco AI Defense skill-scanner (Apache 2.0)
|
|
4
|
+
* https://github.com/cisco-ai-defense/skill-scanner
|
|
5
|
+
*/
|
|
6
|
+
export interface SecurityFinding {
|
|
7
|
+
ruleId: string;
|
|
8
|
+
category: string;
|
|
9
|
+
severity: "critical" | "high" | "medium" | "low";
|
|
10
|
+
message: string;
|
|
11
|
+
file?: string;
|
|
12
|
+
line?: number;
|
|
13
|
+
match: string;
|
|
14
|
+
remediation: string;
|
|
15
|
+
}
|
|
16
|
+
export interface ScanResult {
|
|
17
|
+
safe: boolean;
|
|
18
|
+
findings: SecurityFinding[];
|
|
19
|
+
scannedFiles: number;
|
|
20
|
+
duration: number;
|
|
21
|
+
}
|
|
22
|
+
export declare function scanContent(content: string, fileName: string): ScanResult;
|
|
23
|
+
export declare function scanSkill(skillPath: string): Promise<ScanResult>;
|
|
24
|
+
//# sourceMappingURL=security-scanner.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"security-scanner.d.ts","sourceRoot":"","sources":["../../src/core/security-scanner.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC;IACjD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CAClB;AA0ID,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,UAAU,CA+BzE;AAgBD,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAuBtE"}
|