noslopui 0.1.0 → 0.3.0

package/dist/commands/catalog.js

@@ -0,0 +1,214 @@
+// The catalog from the terminal: search, get, prompt, design-system,
+// design-systems, collections, collection.
+//
+// Every command is one call to the MCP server's own tools with the CLI's key,
+// so the terminal and an agent always see the same thing, and every gate —
+// plan, trial, fair use — stays on the server where it belongs.
+//
+// Output rule: the thing asked for goes to stdout, everything about it goes to
+// stderr. `npx noslopui get hero-aurora > Hero.tsx` has to produce a file with
+// nothing in it but the component.
+import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+import { callTool } from '../lib/api.js';
+import { readSession } from '../lib/session.js';
+import { color } from '../lib/ui.js';
+// The catalog's two component sections, as search_components names them.
+// Hyphens are accepted too, since that's how they read in URLs.
+const SECTIONS = {
+    ui_blocks: 'ui_blocks',
+    'ui-blocks': 'ui_blocks',
+    blocks: 'ui_blocks',
+    motion_lab: 'motion_lab',
+    'motion-lab': 'motion_lab',
+    effects: 'motion_lab',
+};
+/** search_components arguments for these options; throws on a section it doesn't know. */
+export function searchArguments(options) {
+    let section;
+    if (options.section !== undefined) {
+        section = SECTIONS[options.section.toLowerCase()];
+        if (!section)
+            throw new Error(`--section takes ui-blocks or motion-lab, not "${options.section}".`);
+    }
+    return {
+        ...(options.args.length ? { query: options.args.join(' ') } : {}),
+        ...(section ? { section } : {}),
+        ...(options.tags.length ? { tags: options.tags } : {}),
+        ...(options.framework ? { framework: options.framework } : {}),
+        ...(options.limit ? { limit: options.limit } : {}),
+    };
+}
+const out = (s = '') => process.stdout.write(`${s}\n`);
+const note = (s = '') => process.stderr.write(`${s}\n`);
+function requireKey() {
+    const session = readSession();
+    if (!session)
+        throw new Error('Not signed in. Run "npx noslopui login" first — it takes one approval in the browser.');
+    return session.key;
+}
+function requireArg(options, what) {
+    const value = options.args.join(' ').trim();
+    if (!value)
+        throw new Error(`Say which ${what}.`);
+    return value;
+}
+/** A tool error is the server telling the user something; print it as-is and fail. */
+function check(result) {
+    if (result.isError)
+        throw new Error(result.text);
+    return result;
+}
+/** Notices the server attaches to a result (the trial just started, and so on). */
+function notices(data) {
+    if (typeof data?.trial === 'string')
+        note(color.yellow(`! ${data.trial}`));
+}
+function writeOut(path, text, force) {
+    const target = resolve(path);
+    if (existsSync(target) && !force)
+        throw new Error(`${target} already exists. Pass --force to overwrite it.`);
+    mkdirSync(dirname(target), { recursive: true });
+    writeFileSync(target, text.endsWith('\n') ? text : `${text}\n`, 'utf8');
+    note(`${color.green('✔')} wrote ${target}`);
+}
+const truncate = (s, n) => (s && s.length > n ? `${s.slice(0, n - 1)}…` : s ?? '');
+export async function search(options) {
+    const args = searchArguments(options);
+    const key = requireKey();
+    const r = check(await callTool(key, 'search_components', args));
+    if (options.json)
+        return out(JSON.stringify(r.data, null, 2)), 0;
+    const results = r.data?.results ?? [];
+    if (!results.length) {
+        note('Nothing matched. Try fewer words, or no tags.');
+        return 1;
+    }
+    for (const item of results) {
+        const kind = item.kind === 'motion_lab' ? `  ${color.cyan('Motion Lab')}` : '';
+        out(`${color.bold(item.name)}  ${color.dim(item.id)}${kind}`);
+        if (item.description)
+            out(`  ${truncate(item.description, 110)}`);
+        out(`  ${color.cyan(item.url)}`);
+        out();
+    }
+    note(color.dim(`Get one with "npx noslopui get <id>".`));
+    return 0;
+}
+export async function designSystems(options) {
+    const key = requireKey();
+    const r = check(await callTool(key, 'search_design_systems', {
+        ...(options.args.length ? { query: options.args.join(' ') } : {}),
+        ...(options.tags.length ? { tags: options.tags } : {}),
+        ...(options.limit ? { limit: options.limit } : {}),
+    }));
+    if (options.json)
+        return out(JSON.stringify(r.data, null, 2)), 0;
+    const results = r.data?.results ?? [];
+    if (!results.length) {
+        note('Nothing matched.');
+        return 1;
+    }
+    for (const ds of results) {
+        const inspired = ds.inspiredBy ? color.dim(` · inspired by ${ds.inspiredBy}`) : '';
+        out(`${color.bold(ds.name)}  ${color.dim(ds.id)}${inspired}`);
+        if (ds.description)
+            out(`  ${truncate(ds.description, 110)}`);
+        if (ds.tags?.length)
+            out(`  ${color.dim(ds.tags.join(' · '))}`);
+        out(`  ${color.cyan(ds.previewUrl)}`);
+        out();
+    }
+    note(color.dim(`Get its DESIGN.md with "npx noslopui design-system <id> --write DESIGN.md".`));
+    return 0;
+}
+export async function get(options) {
+    const key = requireKey();
+    const id = requireArg(options, 'component (its id, from "npx noslopui search")');
+    const r = check(await callTool(key, 'get_component_code', { id }));
+    notices(r.data);
+    if (options.json)
+        return out(JSON.stringify(r.data, null, 2)), 0;
+    const snippets = r.data?.snippets ?? [];
+    if (!snippets.length)
+        throw new Error('This item has no published code.');
+    const chosen = options.format ? snippets.filter((s) => s.language === options.format) : snippets;
+    if (!chosen.length) {
+        throw new Error(`No ${options.format} version. Available: ${snippets.map((s) => s.language).join(', ')}.`);
+    }
+    if (options.write) {
+        if (chosen.length > 1)
+            throw new Error(`Several formats (${chosen.map((s) => s.language).join(', ')}) — pick one with --format.`);
+        writeOut(options.write, chosen[0].code, options.force);
+        return 0;
+    }
+    if (chosen.length === 1) {
+        out(chosen[0].code);
+        return 0;
+    }
+    for (const s of chosen) {
+        note(color.dim(`── ${s.language} ──`));
+        out(s.code);
+    }
+    return 0;
+}
+export async function prompt(options) {
+    const key = requireKey();
+    const id = requireArg(options, 'component');
+    const r = check(await callTool(key, 'get_component_prompt', { id }));
+    notices(r.data);
+    if (options.json)
+        return out(JSON.stringify(r.data, null, 2)), 0;
+    if (options.write)
+        writeOut(options.write, r.data?.promptText ?? '', options.force);
+    else
+        out(r.data?.promptText ?? '');
+    return 0;
+}
+export async function designSystem(options) {
+    const key = requireKey();
+    const id = requireArg(options, 'design system (its id, from "npx noslopui design-systems")');
+    const r = check(await callTool(key, 'get_design_system_file', { id }));
+    notices(r.data);
+    if (options.json)
+        return out(JSON.stringify(r.data, null, 2)), 0;
+    if (options.write)
+        writeOut(options.write, r.data?.designMd ?? '', options.force);
+    else
+        out(r.data?.designMd ?? '');
+    return 0;
+}
+export async function collections(options) {
+    const key = requireKey();
+    const r = check(await callTool(key, 'list_collections'));
+    if (options.json)
+        return out(JSON.stringify(r.data, null, 2)), 0;
+    const list = r.data?.collections ?? [];
+    if (!list.length) {
+        note('No collections yet. Save items on noslopui.com to make one.');
+        return 0;
+    }
+    for (const c of list)
+        out(`${color.bold(c.name)}  ${color.dim(`${c.itemCount} ${c.itemCount === 1 ? 'item' : 'items'} · ${c.id}`)}`);
+    return 0;
+}
+export async function collection(options) {
+    const key = requireKey();
+    const which = requireArg(options, 'collection (a name or an id)');
+    // Ids are opaque; try the name first, since that's what people type.
+    let r = await callTool(key, 'get_collection', { name: which });
+    if (r.isError)
+        r = await callTool(key, 'get_collection', { listId: which });
+    check(r);
+    if (options.json)
+        return out(JSON.stringify(r.data, null, 2)), 0;
+    out(color.bold(r.data?.collection ?? which));
+    const systems = r.data?.designSystems ?? [];
+    if (systems.length)
+        out(`${color.dim('design system:')} ${systems.map((d) => `${d.name} (${d.id})`).join(', ')}`);
+    out();
+    for (const item of r.data?.items ?? []) {
+        out(`${item.name}  ${color.dim(`${item.kind === 'design_systems' ? 'design system' : 'block'} · ${item.id}`)}`);
+    }
+    return 0;
+}

package/dist/commands/doctor.js

@@ -4,25 +4,11 @@
 // fixes it. A diagnostic that only reports a state leaves the user exactly
 // where they started.
 import { existsSync, readFileSync } from 'node:fs';
-import { checkServer, mcpUrl, origin } from '../lib/api.js';
+import { checkServer, mcpUrl, origin, whoami } from '../lib/api.js';
 import { ADAPTERS } from '../adapters/index.js';
-import { ConfigUnreadableError, readJsonFile } from '../lib/json-file.js';
-import { SERVER_NAME } from '../adapters/claude-code.js';
+import { ConfigUnreadableError } from '../lib/json-file.js';
+import { readSession } from '../lib/session.js';
 import { color, fail, hint, ok, say, warn } from '../lib/ui.js';
-/** Read back the configured key so we can ask the server whether it still works. */
-function configuredKey(configPath) {
-    try {
-        const config = readJsonFile(configPath);
-        const entry = config?.mcpServers?.[SERVER_NAME];
-        const headers = (entry?.headers ?? {});
-        const auth = typeof headers.Authorization === 'string' ? headers.Authorization : '';
-        const match = auth.match(/^Bearer\s+(\S+)$/i);
-        return match?.[1] ?? null;
-    }
-    catch {
-        return null;
-    }
-}
 export async function doctor() {
     let problems = 0;
     say();
@@ -37,13 +23,30 @@ export async function doctor() {
         hint('If you are behind a proxy or VPN, that is the usual cause.');
         problems++;
     }
+    say();
+    say(color.bold('This CLI'));
+    const session = readSession();
+    if (!session) {
+        say(`${color.dim('–')} ${color.dim('not signed in (only needed for "noslopui search" and "get"; run "npx noslopui login")')}`);
+    }
+    else {
+        try {
+            const account = await whoami(session.key);
+            ok(`Signed in as ${account.email ?? 'your account'} (${account.plan})`);
+        }
+        catch (err) {
+            fail(err.message);
+            hint('Run "npx noslopui login" to sign in again.');
+            problems++;
+        }
+    }
+    let anyAgent = false;
     for (const adapter of ADAPTERS) {
+        if (!(await adapter.detect()))
+            continue;
+        anyAgent = true;
         say();
         say(color.bold(adapter.label));
-        if (!(await adapter.detect())) {
-            say(`${color.dim('–')} ${color.dim('not installed on this machine')}`);
-            continue;
-        }
         let status;
         try {
             status = await adapter.status();
@@ -59,22 +62,22 @@ export async function doctor() {
         }
         if (!status.installed) {
             warn('noslopUI is not set up here.');
-            hint('Run "npx noslopui init".');
+            hint(`Run "npx noslopui init --agent ${adapter.id}".`);
             problems++;
         }
         else {
             ok(`Configured in ${status.configPath}`);
             if (status.url !== mcpUrl()) {
                 warn(`The configured url is ${status.url}, but this CLI expects ${mcpUrl()}.`);
-                hint('Run "npx noslopui init" to update it.');
+                hint(`Run "npx noslopui init --agent ${adapter.id}" to update it.`);
                 problems++;
             }
             if (status.problem) {
                 warn(status.problem);
-                hint('Run "npx noslopui init" to repair the entry.');
+                hint(`Run "npx noslopui init --agent ${adapter.id}" to repair the entry.`);
                 problems++;
             }
-            const key = configuredKey(status.configPath);
+            const key = await adapter.configuredKey();
             if (key) {
                 const probe = await checkServer(key);
                 if (probe.keyState === 'ok') {
@@ -82,13 +85,16 @@ export async function doctor() {
                 }
                 else if (probe.keyState === 'rejected') {
                     fail(probe.keyDetail ?? 'The configured key was refused.');
-                    hint(`Create a new key at ${origin()}/account?tab=mcp, or run "npx noslopui login".`);
+                    hint(`Run "npx noslopui login --agent ${adapter.id}" for a fresh key.`);
                     problems++;
                 }
             }
         }
         const skillPath = adapter.skillPath();
-        if (existsSync(skillPath)) {
+        if (!skillPath) {
+            say(`${color.dim('–')} ${color.dim('no skills folder; the rules reach it through the server')}`);
+        }
+        else if (existsSync(skillPath)) {
             let current = '';
             try {
                 current = readFileSync(skillPath, 'utf8');
@@ -103,9 +109,14 @@ export async function doctor() {
         }
         else {
             warn('The skill is not installed.');
-            hint('Optional, but it is what makes "build me a website" use noslopUI at all. Run "npx noslopui init".');
+            hint('Optional, but it is what makes "build me a website" use noslopUI at all. Run "npx noslopui update".');
         }
     }
+    if (!anyAgent) {
+        say();
+        warn(`None of the agents this CLI sets up were found (${ADAPTERS.map((a) => a.label).join(', ')}).`);
+        hint(`Any other MCP client can be connected by hand: ${origin()}/mcp`);
+    }
     say();
     if (problems === 0) {
         ok('Everything checks out.');

package/dist/commands/init.js

@@ -1,18 +1,22 @@
 // `noslopui init` — the whole setup, in one command.
 //
-//   detect the agent → sign in in the browser → write the MCP entry →
-//   install the skill → say what to do next
+//   find the agents → one sign-in in the browser → write each agent's MCP
+//   entry → install the skill → say what to do next
 //
 // Nothing here is silent: every file that gets written is named on screen,
 // with its backup, because this command edits configuration the user didn't
 // ask us to know about.
+//
+// The same approval also gives the CLI itself a key (agent id `cli`), saved
+// for `noslopui search`, `get` and `whoami` — unless it already has one.
 import { spawn } from 'node:child_process';
 import { ApiError, mcpUrl, origin, startSignIn, waitForApproval, fetchSkill } from '../lib/api.js';
-import { adapterById, detectAdapters } from '../adapters/index.js';
+import { ADAPTERS, adapterById, detectAdapters } from '../adapters/index.js';
 import { color, confirm, hint, interactive, machineLabel, maskKey, ok, say, step, warn } from '../lib/ui.js';
 import { ConfigUnreadableError } from '../lib/json-file.js';
+import { readSession, saveSession } from '../lib/session.js';
 /** Best-effort: if it doesn't open, the URL is on screen anyway. */
-function openBrowser(url) {
+export function openBrowser(url) {
     const [command, args] = process.platform === 'win32'
         ? ['cmd', ['/c', 'start', '', url]]
         : process.platform === 'darwin'
@@ -27,29 +31,57 @@ function openBrowser(url) {
         // Headless, locked down, or no desktop — the printed URL covers it.
     }
 }
+/**
+ * The browser half: open a request for these agent ids, show the code, wait
+ * for the user to approve it, and hand back one key per id.
+ */
+export async function signIn(agentIds, browser) {
+    const machine = machineLabel();
+    const started = await startSignIn(machine, agentIds);
+    say();
+    step('Approve this in your browser, signed in to noslopUI:');
+    say();
+    say(`    ${color.bold(color.cyan(started.verificationUriComplete))}`);
+    say();
+    say(`    code ${color.bold(started.userCode)} · this machine is shown as "${machine}" · expires in ${Math.round(started.expiresIn / 60)} minutes`);
+    say();
+    if (browser)
+        openBrowser(started.verificationUriComplete);
+    step('Waiting for approval…');
+    const keys = await waitForApproval(started);
+    ok(`Approved. ${keys.length === 1 ? 'One key issued' : `${keys.length} keys issued`}.`);
+    return keys;
+}
+const supportedList = () => ADAPTERS.map((a) => a.id).join(', ');
 async function chooseAdapters(options) {
     if (options.agents?.length) {
         const chosen = [];
         for (const id of options.agents) {
             const adapter = adapterById(id);
             if (!adapter)
-                throw new Error(`Unknown agent "${id}". Supported: ${(await detectAdapters()).map((a) => a.id).join(', ') || 'claude-code'}.`);
+                throw new Error(`Unknown agent "${id}". Supported: ${supportedList()}.`);
             chosen.push(adapter);
         }
         return chosen;
     }
     const detected = await detectAdapters();
     if (!detected.length) {
-        throw new Error('No supported agent found on this machine. noslopUI sets up Claude Code today; install it first, or add the server by hand from https://noslopui.com/mcp.');
+        throw new Error(`No supported agent found on this machine. noslopUI sets up ${ADAPTERS.map((a) => a.label).join(', ')}.\n  For anything else, add the server by hand: ${origin()}/mcp`);
     }
+    say(`Found ${detected.map((a) => color.bold(a.label)).join(', ')}.`);
+    if (options.yes || !interactive() || detected.length === 1) {
+        if (detected.length === 1 && interactive() && !options.yes) {
+            if (!(await confirm(`Set up ${color.bold(detected[0].label)}?`, true)))
+                throw new Error('Nothing selected, so nothing was changed.');
+        }
+        return detected;
+    }
+    if (await confirm(`Set up all ${detected.length}?`, true))
+        return detected;
     const chosen = [];
     for (const adapter of detected) {
-        if (options.yes || !interactive()) {
-            chosen.push(adapter);
-        }
-        else if (await confirm(`Set up ${color.bold(adapter.label)}?`, true)) {
+        if (await confirm(`Set up ${color.bold(adapter.label)}?`, true))
             chosen.push(adapter);
-        }
     }
     if (!chosen.length)
         throw new Error('Nothing selected, so nothing was changed.');
@@ -60,8 +92,6 @@ export async function init(options) {
     say(`${color.bold('noslopUI')} ${color.dim('— hand-crafted components and design systems for your agent')}`);
     say();
     const adapters = await chooseAdapters(options);
-    for (const adapter of adapters)
-        ok(`Found ${adapter.label}`);
     // Either a key the user already has, or one issued through the browser.
     let keys;
     if (options.key) {
@@ -69,25 +99,20 @@ export async function init(options) {
         step('Using the key you passed with --key.');
     }
     else {
-        const machine = machineLabel();
-        const started = await startSignIn(machine, adapters.map((a) => a.id));
-        say();
-        step(`Approve this in your browser, signed in to noslopUI:`);
-        say();
-        say(`    ${color.bold(color.cyan(started.verificationUriComplete))}`);
-        say();
-        say(`    code ${color.bold(started.userCode)} · this machine is shown as "${machine}" · expires in ${Math.round(started.expiresIn / 60)} minutes`);
-        say();
-        if (options.browser !== false)
-            openBrowser(started.verificationUriComplete);
-        step('Waiting for approval…');
-        keys = await waitForApproval(started);
-        ok(`Approved. ${keys.length === 1 ? 'One key issued' : `${keys.length} keys issued`}.`);
+        const wantSession = !readSession();
+        keys = await signIn([...adapters.map((a) => a.id), ...(wantSession ? ['cli'] : [])], options.browser !== false);
+        const session = keys.find((k) => k.agent === 'cli');
+        if (session) {
+            const path = saveSession(session.key);
+            hint(`CLI signed in too, for "noslopui search" and "get" — ${path}`);
+        }
     }
     say();
     const restartNeeded = [];
+    const skillsWritten = new Map();
+    let skillText = null;
     for (const adapter of adapters) {
-        const issued = keys.find((k) => k.agent === adapter.id) ?? keys[0];
+        const issued = keys.find((k) => k.agent === adapter.id);
         if (!issued)
             throw new Error(`No key was issued for ${adapter.label}.`);
         const result = await adapter.install({ url: mcpUrl(), key: issued.key });
@@ -97,19 +122,28 @@ export async function init(options) {
             hint(`backup ${result.backupPath}`);
         hint(`key    ${maskKey(issued.key)} — named "${issued.name}" on your account`);
         restartNeeded.push(adapter.label);
-        if (options.skill) {
-            const download = await fetchSkill();
-            const skill = await adapter.installSkill(download.markdown);
-            ok(`${adapter.label}: ${skill.changed ? 'installed' : 'already had'} the noslopUI skill`);
-            hint(`skill  ${skill.path}`);
-            if (download.source === 'bundled') {
+        if (!options.skill)
+            continue;
+        const path = adapter.skillPath();
+        if (!path) {
+            hint(`skill  ${adapter.label} has no skills folder; the rules reach it through the server`);
+            continue;
+        }
+        // Several agents read one folder (~/.agents/skills); write it once.
+        if (!skillsWritten.has(path)) {
+            skillText ??= await fetchSkill();
+            const skill = await adapter.installSkill(skillText.markdown);
+            skillsWritten.set(path, skill?.changed ?? false);
+            if (skillText.source === 'bundled') {
                 warn('That skill came from this package, not the site — it may be behind. Run "npx noslopui update" when you are back online.');
             }
         }
+        ok(`${adapter.label}: ${skillsWritten.get(path) ? 'installed' : 'already had'} the noslopUI skill`);
+        hint(`skill  ${path}`);
     }
     say();
     say(color.bold('Done. Two things:'));
-    say(`  1. Restart ${restartNeeded.join(' and ')} so it picks up the new server.`);
+    say(`  1. Restart ${restartNeeded.join(', ')} so ${restartNeeded.length === 1 ? 'it picks' : 'they pick'} up the new server.`);
     say(`  2. Try it: ${color.cyan('"build me a landing page for a coffee roastery"')}`);
     say();
     hint(`Revoke a key any time at ${origin()}/account?tab=mcp · check the setup with "npx noslopui doctor"`);

package/dist/commands/login.js

@@ -1,26 +1,36 @@
-// `noslopui login` — a fresh key for an agent that's already set up.
+// `noslopui login` — sign the CLI itself in, like `21st login`.
 //
-// The case this exists for: the key was revoked, or it belongs to the wrong
-// account. It swaps the key in place and leaves everything else — the skill,
-// the server entry's other fields, every other configured server — alone.
-import { init } from './init.js';
-import { ADAPTERS } from '../adapters/index.js';
-import { say, warn, hint } from '../lib/ui.js';
+// Saves a key for the agent id `cli` to this machine's config folder, which is
+// what `search`, `get`, `design-system`, `collections` and `whoami` use. It
+// doesn't touch any agent's config: `init` does that.
+//
+// `login --agent <id>` is the other job: a fresh key for an agent that's
+// already set up (its key was revoked, or belongs to the wrong account). It
+// swaps the key in place and leaves the skill and every other server alone.
+import { init, signIn } from './init.js';
+import { whoami } from '../lib/api.js';
+import { saveSession } from '../lib/session.js';
+import { hint, ok, say } from '../lib/ui.js';
 export async function login(options) {
-    const configured = [];
-    for (const adapter of ADAPTERS) {
-        if (!(await adapter.detect()))
-            continue;
-        if ((await adapter.status()).installed)
-            configured.push(adapter.id);
+    if (options.agents?.length) {
+        return init({ ...options, skill: false });
+    }
+    say();
+    let key;
+    if (options.key) {
+        key = options.key;
     }
-    if (!configured.length) {
-        say();
-        warn('No agent here has noslopUI set up yet.');
-        hint('Run "npx noslopui init" — it does the sign-in and the setup together.');
-        say();
-        return 1;
+    else {
+        const keys = await signIn(['cli'], options.browser);
+        key = keys.find((k) => k.agent === 'cli')?.key ?? '';
+        if (!key)
+            throw new Error('No key was issued for the CLI.');
     }
-    // Same path as init, minus the skill: this is only about the key.
-    return init({ ...options, agents: options.agents?.length ? options.agents : configured, skill: false });
+    const account = await whoami(key);
+    const path = saveSession(key);
+    ok(`Signed in as ${account.email ?? 'your account'}.`);
+    hint(`saved to ${path}`);
+    hint('Set up an agent with "npx noslopui init", or search with "npx noslopui search <query>".');
+    say();
+    return 0;
 }

package/dist/commands/remove.js

@@ -3,14 +3,26 @@
 // Removing the config entry does NOT revoke the key: the key belongs to the
 // account, not to this machine, and someone removing a local config hasn't
 // asked us to change their account. We say where to revoke it instead.
-import { ADAPTERS } from '../adapters/index.js';
+//
+// Several agents share a skills folder (~/.agents/skills), so a skill is only
+// removed once no agent that's still set up reads it.
+import { ADAPTERS, adapterById } from '../adapters/index.js';
 import { origin } from '../lib/api.js';
 import { color, confirm, hint, ok, say, warn } from '../lib/ui.js';
 export async function remove(options) {
     say();
     let removedAnything = false;
-    for (const adapter of ADAPTERS) {
-        if (!(await adapter.detect()))
+    const targets = options.agents?.length
+        ? options.agents.map((id) => {
+            const a = adapterById(id);
+            if (!a)
+                throw new Error(`Unknown agent "${id}". Supported: ${ADAPTERS.map((x) => x.id).join(', ')}.`);
+            return a;
+        })
+        : ADAPTERS;
+    const removed = [];
+    for (const adapter of targets) {
+        if (!options.agents?.length && !(await adapter.detect()))
             continue;
         const status = await adapter.status();
         if (!status.installed) {
@@ -24,9 +36,32 @@ export async function remove(options) {
         if (await adapter.uninstall()) {
             ok(`${adapter.label}: removed the noslopui server (other servers untouched)`);
             removedAnything = true;
+            removed.push(adapter);
         }
-        if (options.skill && (await adapter.removeSkill())) {
-            ok(`${adapter.label}: removed the skill`);
+    }
+    if (options.skill) {
+        const stillUsing = async (path) => {
+            for (const other of ADAPTERS) {
+                if (removed.includes(other) || other.skillPath() !== path)
+                    continue;
+                if ((await other.status().catch(() => ({ installed: false }))).installed)
+                    return other;
+            }
+            return null;
+        };
+        const done = new Set();
+        for (const adapter of removed) {
+            const path = adapter.skillPath();
+            if (!path || done.has(path))
+                continue;
+            done.add(path);
+            const user = await stillUsing(path);
+            if (user) {
+                say(`${color.dim('–')} kept the skill at ${path}: ${user.label} still uses it`);
+            }
+            else if (await adapter.removeSkill()) {
+                ok(`removed the skill at ${path}`);
+            }
         }
     }
     say();