@rbbtsn0w/adg 0.3.0-beta.3 → 0.3.0-beta.4

package/dist/bin/adg.js

@@ -1,9 +1,7 @@
 #!/usr/bin/env node
 import { parseArgs } from "node:util";
-import pc from "picocolors";
 import { spawnSync } from "node:child_process";
 import { readFileSync, realpathSync } from "node:fs";
-import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { checkForUpdate, formatUpdateNotice } from "../src/update-check.js";
@@ -23,24 +21,11 @@ import { selectTargetsInteractive } from "../src/commands/select-agents.js";
 import { selectPluginsInteractive } from "../src/commands/select-plugins.js";
 import { selectScopeInteractive } from "../src/commands/select-scope.js";
 import { confirmFullInstall, selectComponentsInteractive } from "../src/commands/select-components.js";
-import { globalPluginsDir, installedPluginDir, projectPluginsDir } from "../src/paths.js";
+import { globalPluginsDir, projectPluginsDir } from "../src/paths.js";
 import { COMPONENT_TYPES } from "../src/types.js";
-import { agentsForComponents, getAgent } from "../src/agents/index.js";
-// ---------------------------------------------------------------------------
-// Semantic colors, mirroring `adg skills list` so output reads the same across
-// commands: cyan = primary identifiers (plugins, agents, sources), dim =
-// secondary metadata (paths, hashes, sub-details), green = success, yellow =
-// notes/warnings, red = errors, bold = section titles. picocolors auto-disables
-// on non-TTY / NO_COLOR, so piped output and tests stay plain.
-// ---------------------------------------------------------------------------
-const ui = {
-    title: (s) => pc.bold(s),
-    name: (s) => pc.cyan(s),
-    meta: (s) => pc.dim(s),
-    ok: (s) => pc.green(s),
-    warn: (s) => pc.yellow(s),
-    err: (s) => pc.red(s),
-};
+import { getAgent } from "../src/agents/index.js";
+import { ui } from "../src/render/ui.js";
+import { renderAgentReport, renderMarketplaceList, renderPluginList, } from "../src/render/plugins.js";
 const FLAGS = {
     // Short flags are first-letter aliases. Where several long flags share a
     // first letter, the highest-frequency one wins the short and the rest stay
@@ -243,16 +228,6 @@ function scopeInfo(values) {
 function scopeOf(values) {
     return values.global ? "user" : "project";
 }
-/** Print per-agent sync outcomes (enabled/disabled/re-synced) generically. */
-function reportAgents(agents, verb) {
-    for (const r of agents ?? []) {
-        const name = getAgent(r.agent)?.displayName ?? r.agent;
-        if (r.affected.length > 0)
-            console.log(`${ui.ok(verb)} in ${ui.name(name)}: ${r.affected.join(", ")}`);
-        else if (r.skipped)
-            console.log(ui.warn(`note: \`${r.agent}\` CLI not found — run \`adg plugins link --target ${r.agent}\` after installing it.`));
-    }
-}
 /** Friendly `--target` aliases mapped onto canonical adapter target ids. */
 const TARGET_ALIASES = {
     anthropic: "claude",
@@ -294,45 +269,6 @@ function parseVerb(name, flags, rest) {
         process.exit(1);
     }
 }
-/**
- * Lay items out in aligned columns sized to the terminal width (row-major).
- * Items longer than `maxColWidth` are truncated with an ellipsis. Falls back to
- * a single column on narrow terminals. Returns the block as a string.
- */
-function formatColumns(items, opts = {}) {
-    const indent = opts.indent ?? 2;
-    const gutter = opts.gutter ?? 2;
-    const maxColWidth = opts.maxColWidth ?? 24;
-    const termWidth = opts.width ?? process.stdout.columns ?? 80;
-    const cells = items.map((s) => (s.length > maxColWidth ? s.slice(0, maxColWidth - 1) + "…" : s));
-    const colWidth = Math.min(Math.max(1, ...cells.map((c) => c.length)), maxColWidth);
-    const cols = Math.max(1, Math.floor((termWidth - indent + gutter) / (colWidth + gutter)));
-    const lines = [];
-    for (let i = 0; i < cells.length; i += cols) {
-        const row = cells.slice(i, i + cols);
-        const padded = row.map((c, j) => (j === row.length - 1 ? c : c.padEnd(colWidth)));
-        lines.push(" ".repeat(indent) + padded.join(" ".repeat(gutter)));
-    }
-    return lines.join("\n");
-}
-/** Abbreviate the home-directory prefix of an absolute path to `~` (POSIX `/` or Windows `\`). */
-function abbrevHome(p) {
-    const home = homedir();
-    if (p === home)
-        return "~";
-    if (p.startsWith(home + "/") || p.startsWith(home + "\\"))
-        return "~" + p.slice(home.length);
-    return p;
-}
-/** Print a plugin's components, each expanded to its member names (verbose view). */
-function printContents(contents, headerIndent) {
-    const entries = Object.entries(contents ?? {}).filter(([, names]) => names.length > 0);
-    for (const [type, names] of entries) {
-        const maxColWidth = Math.max(1, ...names.map((n) => n.length));
-        console.log(`${" ".repeat(headerIndent)}${ui.name(type)} ${ui.meta(`(${names.length}):`)}`);
-        console.log(formatColumns(names, { indent: headerIndent + 2, maxColWidth }));
-    }
-}
 async function runPlugins(rawVerb, rest) {
     // `adg plugins` (no verb) or an explicit help request → the L1 overview.
     if (rawVerb === undefined || rawVerb === "-h" || rawVerb === "--help" || rawVerb === "help") {
@@ -447,7 +383,8 @@ async function runPlugins(rawVerb, rest) {
                 for (const f of res.adapted)
                     console.log(ui.meta(`  adapted: ${f}`));
             }
-            reportAgents(agents, "enabled");
+            for (const line of renderAgentReport(agents, "enabled"))
+                console.log(line);
             return;
         }
         case "import-skills": {
@@ -494,7 +431,8 @@ async function runPlugins(rawVerb, rest) {
                 console.log(`${r.changed ? ui.ok("updated") : ui.meta("unchanged")} ${ui.name(`${r.name}@${r.version}`)}`);
             for (const m of missing)
                 console.error(ui.warn(`  ! missing directory for locked plugin: ${m}`));
-            reportAgents(agents, "re-synced");
+            for (const line of renderAgentReport(agents, "re-synced"))
+                console.log(line);
             return;
         }
         case "remove": {
@@ -528,43 +466,8 @@ async function runPlugins(rawVerb, rest) {
             const { values } = parseVerb(verb, cmd.flags, rest);
             const pluginsDir = resolveScopeDir(values);
             const plugins = listPlugins(pluginsDir);
-            if (plugins.length === 0) {
-                console.log(ui.meta(`no plugins recorded in ${pluginsDir}`));
-                return;
-            }
-            // Pre-compute each plugin's display row so the name/path columns can be
-            // aligned across rows (à la `adg skills list`). The `Agents:` column is
-            // derived from the exposed component types — which agents can adapt it.
-            const PATH_MAX = 44;
-            const rows = plugins.map((p) => {
-                const exposed = Object.entries(p.contents ?? {}).filter(([, names]) => names.length > 0);
-                const types = exposed.map(([type]) => type);
-                const agents = agentsForComponents(types).map((a) => a.displayName);
-                return {
-                    p,
-                    label: `${p.name}@${p.version}`,
-                    path: abbrevHome(installedPluginDir(pluginsDir, p.name, p.origin)),
-                    agents: agents.length > 0 ? agents.join(", ") : "—",
-                    counts: exposed.map(([type, names]) => `${type}: ${names.length}`),
-                };
-            });
-            const nameW = Math.max(...rows.map((r) => r.label.length));
-            const pathW = Math.min(PATH_MAX, Math.max(...rows.map((r) => r.path.length)));
-            const ellip = (s, w) => (s.length > w ? "…" + s.slice(s.length - w + 1) : s);
-            // Color mirrors `adg skills list`: cyan name, dim path / dim "Agents:"
-            // label with the agent names left bright, and the provenance/counts line
-            // fully dimmed as secondary metadata. Widths are measured on the uncolored
-            // strings (above), so wrapping the padded text keeps columns aligned.
-            // picocolors auto-disables on non-TTY / NO_COLOR, so pipes stay plain.
-            for (const r of rows) {
-                const partial = r.p.selection ? "  (partial)" : "";
-                const name = ui.name(r.label.padEnd(nameW));
-                const path = ui.meta(ellip(r.path, pathW).padEnd(pathW));
-                console.log(`${name}  ${path}  ${ui.meta("Agents:")} ${r.agents}`);
-                const provenance = `[${r.p.origin.type}] ${r.p.folderHash.slice(0, 19)}${partial}`;
-                console.log(ui.meta(`  ${[provenance, ...r.counts].join("   ")}`));
-                if (values.verbose)
-                    printContents(r.p.contents, 4);
+            for (const line of renderPluginList(plugins, pluginsDir, { verbose: values.verbose })) {
+                console.log(line);
             }
             return;
         }
@@ -618,28 +521,10 @@ async function runMarketplace(args) {
             const { values } = parseVerb("marketplace", ["verbose", ...SCOPE], rest);
             const dir = resolveScopeDir(values);
             const groups = marketplaceList({ pluginsDir: dir });
-            if (groups.length === 0) {
-                console.log(ui.meta("No plugins installed."));
-                return;
-            }
             // Verbose: drill each plugin down to its components (reuses `plugins list -v`).
             const byName = values.verbose ? new Map(listPlugins(dir).map((p) => [p.name, p])) : undefined;
-            for (const g of groups) {
-                const ref = g.ref ? `@${g.ref}` : "";
-                const n = g.installed.length;
-                const tag = g.remote ? "" : ui.warn("  (local — re-run add to update)");
-                console.log(`${ui.name(`${g.source}${ref}`)}  ${ui.meta(`(${n} plugin${n !== 1 ? "s" : ""})`)}${tag}`);
-                if (byName) {
-                    for (const name of g.installed) {
-                        const p = byName.get(name);
-                        console.log(`  ${ui.name(name)}${p?.selection ? ui.meta("  (partial)") : ""}`);
-                        printContents(p?.contents, 4);
-                    }
-                }
-                else {
-                    console.log(formatColumns(g.installed));
-                }
-            }
+            for (const line of renderMarketplaceList(groups, byName))
+                console.log(line);
             return;
         }
         case "upgrade": {

package/dist/src/render/plugins.js

@@ -0,0 +1,100 @@
+import { ui, formatColumns, abbrevHome, ellipsizeStart } from "./ui.js";
+import { installedPluginDir } from "../paths.js";
+import { agentsForComponents, getAgent } from "../agents/index.js";
+// ---------------------------------------------------------------------------
+// Presentation layer for `adg plugins`. Each function turns command-layer data
+// into terminal-ready lines (returned as string[]), so bin/adg.ts only parses
+// args, calls a command, prints the lines — and the formatting is unit-testable
+// without spawning the CLI. Color mirrors `adg skills list` throughout.
+// ---------------------------------------------------------------------------
+/** A plugin's components, each expanded to its member names (verbose view). */
+export function renderContents(contents, headerIndent) {
+    const out = [];
+    const entries = Object.entries(contents ?? {}).filter(([, names]) => names.length > 0);
+    for (const [type, names] of entries) {
+        const maxColWidth = Math.max(1, ...names.map((n) => n.length));
+        out.push(`${" ".repeat(headerIndent)}${ui.name(type)} ${ui.meta(`(${names.length}):`)}`);
+        // formatColumns returns one string with embedded newlines; split so `out`
+        // stays a flat list of single lines.
+        out.push(...formatColumns(names, { indent: headerIndent + 2, maxColWidth }).split("\n"));
+    }
+    return out;
+}
+/** Per-agent sync outcomes (enabled/disabled/re-synced), printed generically. */
+export function renderAgentReport(agents, verb) {
+    const out = [];
+    for (const r of agents ?? []) {
+        const name = getAgent(r.agent)?.displayName ?? r.agent;
+        if (r.affected.length > 0)
+            out.push(`${ui.ok(verb)} in ${ui.name(name)}: ${r.affected.join(", ")}`);
+        else if (r.skipped)
+            out.push(ui.warn(`note: \`${r.agent}\` CLI not found — run \`adg plugins link --target ${r.agent}\` after installing it.`));
+    }
+    return out;
+}
+const PATH_MAX = 44;
+/** `adg plugins list` — aligned name/path/agents rows, with optional verbose contents. */
+export function renderPluginList(plugins, pluginsDir, opts = {}) {
+    if (plugins.length === 0)
+        return [ui.meta(`no plugins recorded in ${pluginsDir}`)];
+    // Pre-compute each plugin's display row so the name/path columns can be
+    // aligned across rows (à la `adg skills list`). The `Agents:` column is
+    // derived from the exposed component types — which agents can adapt it.
+    const rows = plugins.map((p) => {
+        const exposed = Object.entries(p.contents ?? {}).filter(([, names]) => names.length > 0);
+        const types = exposed.map(([type]) => type);
+        const agents = agentsForComponents(types).map((a) => a.displayName);
+        return {
+            p,
+            label: `${p.name}@${p.version}`,
+            path: abbrevHome(installedPluginDir(pluginsDir, p.name, p.origin)),
+            agents: agents.length > 0 ? agents.join(", ") : "—",
+            counts: exposed.map(([type, names]) => `${type}: ${names.length}`),
+        };
+    });
+    const nameW = Math.max(...rows.map((r) => r.label.length));
+    const pathW = Math.min(PATH_MAX, Math.max(...rows.map((r) => r.path.length)));
+    // Color mirrors `adg skills list`: cyan name, dim path / dim "Agents:" label
+    // with the agent names left bright, and the provenance/counts line fully
+    // dimmed as secondary metadata. Widths are measured on the uncolored strings
+    // (above), so wrapping the padded text keeps columns aligned.
+    const out = [];
+    for (const r of rows) {
+        const partial = r.p.selection ? "  (partial)" : "";
+        const name = ui.name(r.label.padEnd(nameW));
+        const path = ui.meta(ellipsizeStart(r.path, pathW).padEnd(pathW));
+        out.push(`${name}  ${path}  ${ui.meta("Agents:")} ${r.agents}`);
+        const provenance = `[${r.p.origin.type}] ${(r.p.folderHash ?? "").slice(0, 19)}${partial}`;
+        out.push(ui.meta(`  ${[provenance, ...r.counts].join("   ")}`));
+        if (opts.verbose)
+            out.push(...renderContents(r.p.contents, 4));
+    }
+    return out;
+}
+/**
+ * `adg plugins marketplace list` — installed plugins grouped by source.
+ * `details` (name → ListedPlugin) enables the verbose per-plugin component drill;
+ * pass it only when --verbose is set.
+ */
+export function renderMarketplaceList(groups, details) {
+    if (groups.length === 0)
+        return [ui.meta("No plugins installed.")];
+    const out = [];
+    for (const g of groups) {
+        const ref = g.ref ? `@${g.ref}` : "";
+        const n = g.installed.length;
+        const tag = g.remote ? "" : ui.warn("  (local — re-run add to update)");
+        out.push(`${ui.name(`${g.source}${ref}`)}  ${ui.meta(`(${n} plugin${n !== 1 ? "s" : ""})`)}${tag}`);
+        if (details) {
+            for (const name of g.installed) {
+                const p = details.get(name);
+                out.push(`  ${ui.name(name)}${p?.selection ? ui.meta("  (partial)") : ""}`);
+                out.push(...renderContents(p?.contents, 4));
+            }
+        }
+        else {
+            out.push(...formatColumns(g.installed).split("\n"));
+        }
+    }
+    return out;
+}

package/dist/src/render/ui.js

@@ -0,0 +1,51 @@
+import pc from "picocolors";
+import { homedir } from "node:os";
+// ---------------------------------------------------------------------------
+// Semantic colors, mirroring `adg skills list` so output reads the same across
+// commands: cyan = primary identifiers (plugins, agents, sources), dim =
+// secondary metadata (paths, hashes, sub-details), green = success, yellow =
+// notes/warnings, red = errors, bold = section titles. picocolors auto-disables
+// on non-TTY / NO_COLOR, so piped output and tests stay plain.
+// ---------------------------------------------------------------------------
+export const ui = {
+    title: (s) => pc.bold(s),
+    name: (s) => pc.cyan(s),
+    meta: (s) => pc.dim(s),
+    ok: (s) => pc.green(s),
+    warn: (s) => pc.yellow(s),
+    err: (s) => pc.red(s),
+};
+/**
+ * Lay items out in aligned columns sized to the terminal width (row-major).
+ * Items longer than `maxColWidth` are truncated with an ellipsis. Falls back to
+ * a single column on narrow terminals. Returns the block as a string.
+ */
+export function formatColumns(items, opts = {}) {
+    const indent = opts.indent ?? 2;
+    const gutter = opts.gutter ?? 2;
+    const maxColWidth = opts.maxColWidth ?? 24;
+    const termWidth = opts.width ?? process.stdout.columns ?? 80;
+    const cells = items.map((s) => (s.length > maxColWidth ? s.slice(0, maxColWidth - 1) + "…" : s));
+    const colWidth = Math.min(Math.max(1, ...cells.map((c) => c.length)), maxColWidth);
+    const cols = Math.max(1, Math.floor((termWidth - indent + gutter) / (colWidth + gutter)));
+    const lines = [];
+    for (let i = 0; i < cells.length; i += cols) {
+        const row = cells.slice(i, i + cols);
+        const padded = row.map((c, j) => (j === row.length - 1 ? c : c.padEnd(colWidth)));
+        lines.push(" ".repeat(indent) + padded.join(" ".repeat(gutter)));
+    }
+    return lines.join("\n");
+}
+/** Abbreviate the home-directory prefix of an absolute path to `~` (POSIX `/` or Windows `\`). */
+export function abbrevHome(p) {
+    const home = homedir();
+    if (p === home)
+        return "~";
+    if (p.startsWith(home + "/") || p.startsWith(home + "\\"))
+        return "~" + p.slice(home.length);
+    return p;
+}
+/** Tail-truncate a string to width `w`, prefixing an ellipsis when it overflows. */
+export function ellipsizeStart(s, w) {
+    return s.length > w ? "…" + s.slice(s.length - w + 1) : s;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rbbtsn0w/adg",
-  "version": "0.3.0-beta.3",
+  "version": "0.3.0-beta.4",
   "description": "Agent Directory Group (ADG) toolkit — two domains: plugins and skills.",
   "type": "module",
   "license": "MIT",
@@ -25,6 +25,7 @@
     "adg": "node ./bin/adg.ts",
     "build": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && tsc -p tsconfig.build.json --noCheck && node -e \"require('fs').chmodSync('dist/bin/adg.js',0o755)\"",
     "test": "node --test 'test/**/*.test.ts'",
+    "check:vendor-deps": "node scripts/check-vendor-deps.mjs",
     "typecheck": "tsc --noEmit",
     "prepare": "npm run typecheck",
     "prepack": "npm run build"
@@ -35,12 +36,12 @@
     "vendor",
     "docs"
   ],
-  "comment:dependencies": "Runtime deps below are required only by the vendored skills CLI (vendor/skills). ADG's own plugins code has zero runtime deps.",
+  "comment:dependencies": "Runtime deps below are required only by the vendored skills CLI (vendor/skills); ADG's own plugins code has zero runtime deps. Root is the single source of truth: each range MUST be >= the floor declared in vendor/skills/package.json, since that is the version the vendored source was authored against. `npm run check:vendor-deps` enforces this and fails on drift.",
   "dependencies": {
-    "@clack/prompts": "^0.7.0",
+    "@clack/prompts": "^0.11.0",
     "@vercel/detect-agent": "^1.2.3",
-    "picocolors": "^1.0.0",
-    "simple-git": "^3.0.0",
+    "picocolors": "^1.1.1",
+    "simple-git": "^3.36.0",
     "xdg-basedir": "^5.1.0",
     "yaml": "^2.8.3"
   },