@vellumai/assistant 0.7.3 → 0.8.1

package/src/cli/commands/skills.ts

@@ -1,57 +1,45 @@
-import { existsSync } from "node:fs";
-import { join } from "node:path";
-
 import type { Command } from "commander";
 
-import { getConfig } from "../../config/loader.js";
-import { resolveSkillStates } from "../../config/skill-state.js";
-import { loadSkillCatalog } from "../../config/skills.js";
-import type { CatalogSkill } from "../../skills/catalog-install.js";
-import {
-  fetchCatalog,
-  getRepoSkillsDir,
-  installSkillLocally,
-  readLocalCatalog,
-  uninstallSkillLocally,
-} from "../../skills/catalog-install.js";
-import { filterByQuery } from "../../skills/catalog-search.js";
-import { clawhubSearch } from "../../skills/clawhub.js";
-import { readInstallMeta } from "../../skills/install-meta.js";
-import type {
-  AuditResponse,
-  SkillsShSearchResult,
-} from "../../skills/skillssh-registry.js";
-import {
-  fetchSkillAudits,
-  formatAuditBadges,
-  installExternalSkill,
-  resolveSkillSource,
-  searchSkillsRegistry,
-} from "../../skills/skillssh-registry.js";
-import { getWorkspaceSkillsDir } from "../../util/platform.js";
+import { cliIpcCall, exitFromIpcResult } from "../../ipc/cli-client.js";
+import { registerCommand } from "../lib/register-command.js";
 import { log } from "../logger.js";
 
 // ---------------------------------------------------------------------------
-// Helpers
+// Internal helpers
 // ---------------------------------------------------------------------------
 
-function formatDate(iso: string): string {
-  try {
-    const d = new Date(iso);
-    const date = d.toLocaleDateString("en-US", {
-      year: "numeric",
-      month: "short",
-      day: "numeric",
-    });
-    const time = d.toLocaleTimeString("en-US", {
-      hour: "numeric",
-      minute: "2-digit",
-      hour12: true,
-    });
-    return `${date} ${time}`;
-  } catch {
-    return iso;
+/**
+ * Map an IPC failure to a CLI exit code, mirroring `exitFromIpcResult`'s
+ * status→exit table without calling `process.exit` (so callers can flush
+ * stdout before the process tears down).
+ */
+function exitCodeFromStatus(statusCode: number | undefined): number {
+  if (statusCode === undefined) return 10;
+  if (statusCode >= 500) return 3;
+  if (statusCode >= 400) return 2;
+  return 1;
+}
+
+/**
+ * Surface an IPC failure on a CLI command that supports `--json`. When `json`
+ * is true, emit a `{ok:false,error}` document to stdout and set `exitCode`
+ * without writing to stderr — so machine readers can parse output uniformly
+ * across success and failure paths. When `json` is false, fall back to
+ * `exitFromIpcResult` for the existing stderr-write + `process.exit`
+ * behaviour, preserving the human-mode UX.
+ */
+function exitFromCliResult(
+  r: { ok: false; error?: string; statusCode?: number },
+  json: boolean,
+): void {
+  if (json) {
+    console.log(
+      JSON.stringify({ ok: false, error: r.error ?? "Unknown error" }),
+    );
+    process.exitCode = exitCodeFromStatus(r.statusCode);
+    return;
   }
+  exitFromIpcResult(r);
 }
 
 // ---------------------------------------------------------------------------
@@ -59,13 +47,14 @@ function formatDate(iso: string): string {
 // ---------------------------------------------------------------------------
 
 export function registerSkillsCommand(program: Command): void {
-  const skills = program
-    .command("skills")
-    .description("Browse and install skills from the Vellum catalog");
-
-  skills.addHelpText(
-    "after",
-    `
+  registerCommand(program, {
+    name: "skills",
+    transport: "ipc",
+    description: "Browse and install skills from the Vellum catalog",
+    build: (skills) => {
+      skills.addHelpText(
+        "after",
+        `
 Manage skills from the Vellum catalog. Skills extend the assistant's
 capabilities with pre-built workflows and tools.
 
@@ -81,15 +70,15 @@ Examples:
   $ assistant skills uninstall weather
   $ assistant skills add vercel-labs/skills@find-skills
   $ assistant skills add vercel-labs/skills/find-skills --overwrite`,
-  );
-
-  skills
-    .command("list")
-    .description("List bundled and installed skills")
-    .option("--json", "Machine-readable JSON output")
-    .addHelpText(
-      "after",
-      `
+      );
+
+      skills
+        .command("list")
+        .description("List bundled and installed skills")
+        .option("--json", "Machine-readable JSON output")
+        .addHelpText(
+          "after",
+          `
 Lists all bundled and installed skills with their source, state, and
 description. Use 'assistant skills inspect <id>' for detailed metadata
 or 'assistant skills search' to discover catalog skills.
@@ -97,70 +86,61 @@ or 'assistant skills search' to discover catalog skills.
 Examples:
   $ assistant skills list
   $ assistant skills list --json`,
-    )
-    .action(async (opts: { json?: boolean }) => {
-      try {
-        const localCatalog = loadSkillCatalog();
-        const config = getConfig();
-        const resolved = resolveSkillStates(localCatalog, config);
-
-        // Flat alphabetical list — source is a property, not a section
-        const allSkills = resolved
-          .map((r) => {
-            const s = r.summary;
-            const source =
-              s.source === "bundled" || s.source === "plugin"
-                ? "bundled"
-                : s.source; // managed, workspace, extra
-            return {
+        )
+        .action(async (opts: { json?: boolean }, _cmd) => {
+          const r = await cliIpcCall<{
+            skills: Array<{
+              id: string;
+              name: string;
+              description: string;
+              emoji?: string;
+              origin: string;
+              kind: string;
+              status: string;
+            }>;
+          }>("listSkills", { queryParams: {} });
+          if (!r.ok)
+            return exitFromCliResult(
+              { ok: false, error: r.error, statusCode: r.statusCode },
+              opts.json ?? false,
+            );
+          const allSkills = r
+            .result!.skills.map((s) => ({
               id: s.id,
-              name: s.displayName,
+              name: s.name,
               description: s.description,
               emoji: s.emoji,
-              source,
-              state: r.state,
-            };
-          })
-          .sort((a, b) => a.id.localeCompare(b.id));
-
-        if (opts.json) {
-          console.log(JSON.stringify({ ok: true, skills: allSkills }));
-          return;
-        }
-
-        if (allSkills.length === 0) {
-          log.info("No skills available.");
-          return;
-        }
-
-        log.info(`Skills (${allSkills.length}):\n`);
-        for (const s of allSkills) {
-          const emoji = s.emoji ? `${s.emoji} ` : "";
-          const tags = [
-            s.source,
-            ...(s.state === "disabled" ? ["disabled"] : []),
-          ];
-          log.info(`  ${emoji}${s.id} [${tags.join(", ")}]`);
-          log.info(`    ${s.name} — ${s.description}`);
-        }
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        if (opts.json) {
-          console.log(JSON.stringify({ ok: false, error: msg }));
-        } else {
-          log.error(`Error: ${msg}`);
-        }
-        process.exitCode = 1;
-      }
-    });
-
-  skills
-    .command("inspect <skill-id>")
-    .description("Show detailed information about a skill")
-    .option("--json", "Machine-readable JSON output")
-    .addHelpText(
-      "after",
-      `
+              source:
+                s.origin === "vellum" && s.kind === "bundled"
+                  ? "bundled"
+                  : s.origin,
+              state: s.status,
+            }))
+            .sort((a, b) => a.id.localeCompare(b.id));
+          if (opts.json) {
+            console.log(JSON.stringify({ ok: true, skills: allSkills }));
+            return;
+          }
+          if (allSkills.length === 0) {
+            log.info("No skills available.");
+            return;
+          }
+          log.info(`Skills (${allSkills.length}):\n`);
+          for (const s of allSkills) {
+            const emoji = s.emoji ? `${s.emoji} ` : "";
+            const tags = [s.source, ...(s.state === "disabled" ? ["disabled"] : [])];
+            log.info(`  ${emoji}${s.id} [${tags.join(", ")}]`);
+            log.info(`    ${s.name} — ${s.description}`);
+          }
+        });
+
+      skills
+        .command("inspect <skill-id>")
+        .description("Show detailed information about a skill")
+        .option("--json", "Machine-readable JSON output")
+        .addHelpText(
+          "after",
+          `
 Arguments:
   skill-id   Skill identifier. Run 'assistant skills list' to see available IDs.
 
@@ -171,154 +151,103 @@ entries, tool manifest, activation hints, and feature flags.
 Examples:
   $ assistant skills inspect slack
   $ assistant skills inspect resend-setup --json`,
-    )
-    .action(async (skillId: string, opts: { json?: boolean }) => {
-      try {
-        const localCatalog = loadSkillCatalog();
-        const config = getConfig();
-        const resolved = resolveSkillStates(localCatalog, config);
-
-        const match = resolved.find((r) => r.summary.id === skillId);
-        if (!match) {
-          throw new Error(
-            `Skill "${skillId}" not found. Run 'assistant skills list' to see available skills.`,
-          );
-        }
-
-        const { summary, state, configEntry } = match;
-        const installMeta = readInstallMeta(summary.directoryPath);
-
-        const detail: Record<string, unknown> = {
-          id: summary.id,
-          name: summary.displayName,
-          description: summary.description,
-          emoji: summary.emoji ?? null,
-          source: summary.source,
-          state,
-          directoryPath: summary.directoryPath,
-          featureFlag: summary.featureFlag ?? null,
-          activationHints: summary.activationHints ?? null,
-          avoidWhen: summary.avoidWhen ?? null,
-          includes: summary.includes ?? null,
-          toolManifest: summary.toolManifest
-            ? {
-                valid: summary.toolManifest.valid,
-                toolCount: summary.toolManifest.toolCount,
-                toolNames: summary.toolManifest.toolNames,
-              }
-            : null,
-          installMeta: installMeta ?? null,
-          config: configEntry
-            ? {
-                enabled: configEntry.enabled !== false,
-                envKeys: configEntry.env
-                  ? Object.keys(configEntry.env)
-                  : [],
-                configKeys: configEntry.config
-                  ? Object.keys(configEntry.config)
-                  : [],
-              }
-            : null,
-        };
-
-        if (opts.json) {
-          console.log(JSON.stringify({ ok: true, skill: detail }));
-          return;
-        }
-
-        const emoji = summary.emoji ? `${summary.emoji} ` : "";
-        log.info(`${emoji}${summary.displayName} (${summary.id})`);
-        log.info(`  ${summary.description}\n`);
-        log.info(`  Source:    ${summary.source}`);
-        log.info(`  State:     ${state}`);
-        log.info(`  Path:      ${summary.directoryPath}`);
-        if (summary.featureFlag) {
-          log.info(`  Flag:      ${summary.featureFlag}`);
-        }
-        if (summary.includes?.length) {
-          log.info(`  Includes:  ${summary.includes.join(", ")}`);
-        }
-        if (summary.activationHints?.length) {
-          log.info(`  Hints:     ${summary.activationHints.join("; ")}`);
-        }
-        if (summary.avoidWhen?.length) {
-          log.info(`  Avoid:     ${summary.avoidWhen.join("; ")}`);
-        }
-
-        if (summary.toolManifest) {
-          const tm = summary.toolManifest;
-          log.info(
-            `\n  Tools:     ${tm.valid ? `${tm.toolCount} tool(s)` : "invalid manifest"}`,
-          );
-          if (tm.toolNames.length > 0) {
-            for (const name of tm.toolNames) {
-              log.info(`    - ${name}`);
-            }
-          }
-        }
-
-        if (installMeta) {
-          log.info(`\n  Install metadata:`);
-          log.info(`    Origin:      ${installMeta.origin}`);
-          log.info(`    Installed:   ${installMeta.installedAt}`);
-          if (installMeta.installedBy) {
-            log.info(`    Installed by: ${installMeta.installedBy}`);
-          }
-          if (installMeta.version) {
-            log.info(`    Version:     ${installMeta.version}`);
-          }
-          if (installMeta.slug) {
-            log.info(`    Slug:        ${installMeta.slug}`);
-          }
-          if (installMeta.sourceRepo) {
-            log.info(`    Source repo:  ${installMeta.sourceRepo}`);
-          }
-          if (installMeta.contentHash) {
-            log.info(`    Hash:        ${installMeta.contentHash}`);
-          }
-          if (installMeta.backfilledBy) {
-            log.info(`    Backfilled:  ${installMeta.backfilledBy}`);
-          }
-        }
-
-        if (configEntry) {
-          log.info(`\n  Config:`);
-          log.info(
-            `    Enabled:     ${configEntry.enabled !== false ? "yes" : "no"}`,
-          );
-          if (configEntry.env && Object.keys(configEntry.env).length > 0) {
-            log.info(`    Env vars:    ${Object.keys(configEntry.env).join(", ")}`);
+        )
+        .action(async (skillId: string, opts: { json?: boolean }, _cmd) => {
+          const r = await cliIpcCall<{
+            id: string;
+            name: string;
+            description: string;
+            emoji: string | null;
+            source: string;
+            state: string;
+            directoryPath: string;
+            featureFlag: string | null;
+            includes: string[] | null;
+            activationHints: string[] | null;
+            avoidWhen: string[] | null;
+            toolManifest: {
+              valid: boolean;
+              toolCount: number;
+              toolNames: string[];
+            } | null;
+            installMeta: Record<string, unknown> | null;
+            config: {
+              enabled: boolean;
+              envKeys: string[];
+              configKeys: string[];
+            } | null;
+          }>("skillsLocalInspect", { pathParams: { id: skillId } });
+          if (!r.ok)
+            return exitFromCliResult(
+              { ok: false, error: r.error, statusCode: r.statusCode },
+              opts.json ?? false,
+            );
+          const detail = r.result!;
+          if (opts.json) {
+            console.log(JSON.stringify({ ok: true, skill: detail }));
+            return;
           }
-          if (
-            configEntry.config &&
-            Object.keys(configEntry.config).length > 0
-          ) {
+          const emoji = detail.emoji ? `${detail.emoji} ` : "";
+          log.info(`${emoji}${detail.name} (${detail.id})`);
+          log.info(`  ${detail.description}\n`);
+          log.info(`  Source:    ${detail.source}`);
+          log.info(`  State:     ${detail.state}`);
+          log.info(`  Path:      ${detail.directoryPath}`);
+          if (detail.featureFlag) log.info(`  Flag:      ${detail.featureFlag}`);
+          if (detail.includes?.length)
+            log.info(`  Includes:  ${detail.includes.join(", ")}`);
+          if (detail.activationHints?.length)
+            log.info(`  Hints:     ${detail.activationHints.join("; ")}`);
+          if (detail.avoidWhen?.length)
+            log.info(`  Avoid:     ${detail.avoidWhen.join("; ")}`);
+          if (detail.toolManifest) {
+            const tm = detail.toolManifest;
             log.info(
-              `    Config keys: ${Object.keys(configEntry.config).join(", ")}`,
+              `\n  Tools:     ${tm.valid ? `${tm.toolCount} tool(s)` : "invalid manifest"}`,
             );
+            for (const name of tm.toolNames) log.info(`    - ${name}`);
+          }
+          if (detail.installMeta) {
+            log.info(`\n  Install metadata:`);
+            if (detail.installMeta.origin)
+              log.info(`    Origin:      ${detail.installMeta.origin}`);
+            if (detail.installMeta.installedAt)
+              log.info(`    Installed:   ${detail.installMeta.installedAt}`);
+            if (detail.installMeta.installedBy)
+              log.info(`    Installed by: ${detail.installMeta.installedBy}`);
+            if (detail.installMeta.version)
+              log.info(`    Version:     ${detail.installMeta.version}`);
+            if (detail.installMeta.slug)
+              log.info(`    Slug:        ${detail.installMeta.slug}`);
+            if (detail.installMeta.sourceRepo)
+              log.info(`    Source repo:  ${detail.installMeta.sourceRepo}`);
+            if (detail.installMeta.contentHash)
+              log.info(`    Hash:        ${detail.installMeta.contentHash}`);
+            if (detail.installMeta.backfilledBy)
+              log.info(`    Backfilled:  ${detail.installMeta.backfilledBy}`);
+          }
+          if (detail.config) {
+            log.info(`\n  Config:`);
+            log.info(`    Enabled:     ${detail.config.enabled ? "yes" : "no"}`);
+            if (detail.config.envKeys.length)
+              log.info(`    Env vars:    ${detail.config.envKeys.join(", ")}`);
+            if (detail.config.configKeys.length)
+              log.info(
+                `    Config keys: ${detail.config.configKeys.join(", ")}`,
+              );
           }
-        }
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        if (opts.json) {
-          console.log(JSON.stringify({ ok: false, error: msg }));
-        } else {
-          log.error(`Error: ${msg}`);
-        }
-        process.exitCode = 1;
-      }
-    });
-
-  skills
-    .command("search <query>")
-    .description(
-      "Search the Vellum catalog, skills.sh, and clawhub community registries",
-    )
-    .option("--limit <n>", "Maximum number of community results", "10")
-    .option("--json", "Machine-readable JSON output")
-    .addHelpText(
-      "after",
-      `
+        });
+
+      skills
+        .command("search <query>")
+        .description(
+          "Search the Vellum catalog, skills.sh, and clawhub community registries",
+        )
+        .option("--limit <n>", "Maximum number of community results", "10")
+        .option("--json", "Machine-readable JSON output")
+        .addHelpText(
+          "after",
+          `
 Arguments:
   query    Free-text search term matched against skill names, descriptions,
            and tags. Searches the Vellum catalog, the skills.sh community
@@ -332,302 +261,157 @@ Examples:
   $ assistant skills search react
   $ assistant skills search "file management" --limit 3
   $ assistant skills search deploy --json`,
-    )
-    .action(async (query: string, opts: { limit: string; json?: boolean }) => {
-      const json = opts.json ?? false;
-      const limit = parseInt(opts.limit, 10) || 10;
-
-      try {
-        // ── Bundled + installed skill search ─────────────────────────
-        const localCatalog = loadSkillCatalog();
-        const bundledMatches = filterByQuery(localCatalog, query, [
-          (s) => s.id,
-          (s) => s.displayName,
-          (s) => s.description,
-        ]);
-
-        // ── Vellum catalog search ────────────────────────────────────
-        const repoSkillsDir = getRepoSkillsDir();
-        let catalog: CatalogSkill[];
-        if (repoSkillsDir) {
-          catalog = readLocalCatalog(repoSkillsDir);
-        } else {
-          try {
-            catalog = await fetchCatalog();
-          } catch {
-            catalog = [];
-          }
-        }
-        const localIds = new Set(localCatalog.map((s) => s.id));
-
-        const catalogMatches = filterByQuery(catalog, query, [
-          (s) => s.id,
-          (s) => s.name,
-          (s) => s.description,
-        ]);
-
-        // ── Community registry searches (non-fatal on failure) ────────
-        // Run skills.sh and clawhub searches in parallel.
-        let registryResults: SkillsShSearchResult[] = [];
-        let registryError: string | undefined;
-        let clawhubResults: Awaited<
-          ReturnType<typeof clawhubSearch>
-        >["skills"] = [];
-        let clawhubError: string | undefined;
-
-        const [skillsShResult, clawhubResult] = await Promise.allSettled([
-          searchSkillsRegistry(query, limit),
-          clawhubSearch(query, { limit }),
-        ]);
-
-        if (skillsShResult.status === "fulfilled") {
-          registryResults = skillsShResult.value;
-        } else {
-          registryError =
-            skillsShResult.reason instanceof Error
-              ? skillsShResult.reason.message
-              : String(skillsShResult.reason);
-        }
-
-        if (clawhubResult.status === "fulfilled") {
-          clawhubResults = clawhubResult.value.skills;
-        } else {
-          clawhubError =
-            clawhubResult.reason instanceof Error
-              ? clawhubResult.reason.message
-              : String(clawhubResult.reason);
-        }
-
-        if (
-          bundledMatches.length === 0 &&
-          catalogMatches.length === 0 &&
-          registryResults.length === 0 &&
-          clawhubResults.length === 0
-        ) {
+        )
+        .action(async (query: string, opts: { limit: string; json?: boolean }) => {
+          const json = opts.json ?? false;
+          const limit = parseInt(opts.limit, 10) || 10;
+
+          // Step 1: Vellum catalog (installed + remote available)
+          const catalogR = await cliIpcCall<{
+            skills: Array<{
+              id: string;
+              name: string;
+              description: string;
+              emoji?: string;
+              origin: string;
+              kind: string;
+              status: string;
+              updatedAt?: string;
+            }>;
+          }>("listSkills", { queryParams: { include: "catalog", q: query } });
+          const vellumSkills = catalogR.ok
+            ? catalogR.result!.skills.filter((s) => s.origin === "vellum")
+            : [];
+
+          // Step 2: community (skills.sh with audits + clawhub) + local bundled/installed
+          const communityR = await cliIpcCall<{
+            skills: Array<{
+              id: string;
+              name: string;
+              description: string;
+              emoji?: string;
+              origin: string;
+              kind: string;
+              status: string;
+              slug?: string;
+              author?: string;
+              stars?: number;
+              installs?: number;
+              publishedAt?: string;
+              version?: string;
+              sourceRepo?: string;
+            }>;
+          }>("searchSkills", { queryParams: { q: query, limit: String(limit) } });
+          const communitySkills = communityR.ok
+            ? communityR.result!.skills.filter((s) => s.origin !== "vellum")
+            : [];
+
+          // Deduplicate by id — vellum wins
+          const seen = new Set(vellumSkills.map((s) => s.id));
+          const dedupedCommunity = communitySkills.filter((s) => {
+            if (seen.has(s.id)) return false;
+            seen.add(s.id);
+            return true;
+          });
+          const clawhubResults = dedupedCommunity
+            .filter((s) => s.origin === "clawhub")
+            .slice(0, limit);
+          const skillsshResults = dedupedCommunity
+            .filter((s) => s.origin === "skillssh")
+            .slice(0, limit);
+
+          const hasResults =
+            vellumSkills.length > 0 ||
+            clawhubResults.length > 0 ||
+            skillsshResults.length > 0;
+
           if (json) {
             console.log(
               JSON.stringify({
                 ok: true,
-                bundled: [],
-                catalog: [],
-                community: [],
-                clawhub: [],
-                audits: {},
-                ...(registryError ? { registryError } : {}),
-                ...(clawhubError ? { clawhubError } : {}),
+                catalog: vellumSkills,
+                community: skillsshResults,
+                clawhub: clawhubResults,
+                ...(catalogR.ok ? {} : { catalogError: catalogR.error }),
+                ...(communityR.ok ? {} : { communityError: communityR.error }),
               }),
             );
-          } else {
-            log.info(`No skills found for "${query}".`);
-            if (registryError) {
-              log.warn(`(skills.sh registry unavailable: ${registryError})`);
-            }
-            if (clawhubError) {
-              log.warn(`(clawhub registry unavailable: ${clawhubError})`);
-            }
-          }
-          return;
-        }
-
-        // ── Fetch audits for community results ───────────────────────
-        const allAudits: AuditResponse = {};
-        if (registryResults.length > 0) {
-          const sourceToSlugs = new Map<string, string[]>();
-          for (const r of registryResults) {
-            const slugs = sourceToSlugs.get(r.source) ?? [];
-            slugs.push(r.skillId);
-            sourceToSlugs.set(r.source, slugs);
+            return;
           }
-          for (const [source, slugs] of sourceToSlugs) {
-            try {
-              const audits = await fetchSkillAudits(source, slugs);
-              for (const [skillId, auditData] of Object.entries(audits)) {
-                allAudits[`${source}/${skillId}`] = auditData;
-              }
-            } catch {
-              // Audit fetch failures are non-fatal
-            }
+
+          if (!hasResults) {
+            log.info(`No skills found for "${query}".`);
+            if (!catalogR.ok)
+              log.warn(`(Vellum catalog unavailable: ${catalogR.error})`);
+            if (!communityR.ok)
+              log.warn(`(Community registry unavailable: ${communityR.error})`);
+            return;
           }
-        }
-
-        if (json) {
-          console.log(
-            JSON.stringify({
-              ok: true,
-              bundled: bundledMatches.map((s) => ({
-                id: s.id,
-                name: s.displayName,
-                description: s.description,
-                emoji: s.emoji,
-                source: s.source,
-              })),
-              catalog: catalogMatches,
-              community: registryResults,
-              clawhub: clawhubResults,
-              audits: allAudits,
-              ...(registryError ? { registryError } : {}),
-              ...(clawhubError ? { clawhubError } : {}),
-            }),
-          );
-          return;
-        }
-
-        // ── Installed-state detection ─────────────────────────────────
-        const skillsDir = getWorkspaceSkillsDir();
-        const isInstalled = (id: string) =>
-          existsSync(join(skillsDir, id, "SKILL.md"));
-        const getInstalledDate = (id: string): string | undefined => {
-          const meta = readInstallMeta(join(skillsDir, id));
-          return meta?.installedAt;
-        };
-
-        // ── Display installed results ─────────────────────────────────
-        if (bundledMatches.length > 0) {
-          log.info(`Installed skills (${bundledMatches.length}):\n`);
-          for (const s of bundledMatches) {
-            const emoji = s.emoji ? `${s.emoji} ` : "";
-            const tag =
-              s.source === "bundled" || s.source === "plugin"
-                ? " [bundled]"
-                : "";
-            log.info(`  ${emoji}${s.displayName}${tag}`);
-            if (s.displayName !== s.id) {
-              log.info(`    ID: ${s.id}`);
-            }
-            log.info(`    ${s.description}`);
-            if (s.source !== "bundled" && s.source !== "plugin") {
-              const meta = readInstallMeta(s.directoryPath);
-              if (meta?.installedAt) {
-                log.info(`    Installed: ${formatDate(meta.installedAt)}`);
-              }
+
+          if (vellumSkills.length > 0) {
+            log.info(`Vellum catalog (${vellumSkills.length}):\n`);
+            for (const s of vellumSkills) {
+              const emoji = s.emoji ? `${s.emoji} ` : "";
+              const badge = s.kind === "installed" ? " [installed]" : "";
+              log.info(`  ${emoji}${s.name}${badge}`);
+              if (s.name !== s.id) log.info(`    ID: ${s.id}`);
+              log.info(`    ${s.description}`);
+              if (s.updatedAt) log.info(`    Updated: ${s.updatedAt}`);
+              if (s.kind !== "installed")
+                log.info(`    Install: assistant skills install ${s.id}`);
+              log.info("");
             }
-            log.info("");
           }
-        }
 
-        // ── Display catalog results ──────────────────────────────────
-        if (catalogMatches.length > 0) {
-          log.info(`Vellum catalog (${catalogMatches.length}):\n`);
-          for (const s of catalogMatches) {
-            const emoji = s.emoji ? `${s.emoji} ` : "";
-            const installed = isInstalled(s.id);
-            const badge = installed ? " [installed]" : "";
-            log.info(`  ${emoji}${s.name}${badge}`);
-            if (s.name !== s.id) {
-              log.info(`    ID: ${s.id}`);
+          if (skillsshResults.length > 0) {
+            log.info(`Community — skills.sh (${skillsshResults.length}):\n`);
+            for (const r of skillsshResults) {
+              const badge = r.kind === "installed" ? " [installed]" : "";
+              log.info(`  ${r.name}${badge}`);
+              if (r.name !== r.id) log.info(`    ID: ${r.id}`);
+              if (r.sourceRepo) log.info(`    Source: ${r.sourceRepo}`);
+              if (r.installs !== undefined)
+                log.info(`    Installs: ${r.installs}`);
+              if (r.kind !== "installed")
+                // Use the fully-qualified 3-segment id (owner/repo/skill) — this
+                // matches the `owner/repo/skill-name` form accepted by
+                // `resolveSkillSource()`. Building `sourceRepo@slug` fails for
+                // skills.sh because the registry returns `slug` as the full id,
+                // producing `owner/repo@owner/repo/skill` which the parser rejects.
+                log.info(`    Install: assistant skills add ${r.id}`);
+              log.info("");
             }
-            log.info(`    ${s.description}`);
-            if (s.updatedAt) {
-              log.info(`    Updated: ${formatDate(s.updatedAt)}`);
-            }
-            if (installed) {
-              const installedDate = getInstalledDate(s.id);
-              if (installedDate) {
-                log.info(`    Installed: ${formatDate(installedDate)}`);
-              }
-            } else {
-              log.info(`    Install: assistant skills install ${s.id}`);
-            }
-
-            log.info("");
+          } else if (!communityR.ok) {
+            log.warn(
+              `\n(skills.sh registry unavailable: ${communityR.error})`,
+            );
           }
-        }
-
-        // ── Display community results ────────────────────────────────
-        if (registryResults.length > 0) {
-          log.info(`Community — skills.sh (${registryResults.length}):\n`);
-          for (const r of registryResults) {
-            const installed = isInstalled(r.skillId);
-            const installedFromVellum = localIds.has(r.skillId);
-            const badge = installedFromVellum
-              ? " [installed from catalog]"
-              : installed
-                ? " [installed]"
-                : "";
-            log.info(`  ${r.name}${badge}`);
-            if (r.name !== r.skillId) {
-              log.info(`    ID: ${r.skillId}`);
-            }
-            log.info(`    Source: ${r.source}`);
-            log.info(`    Installs: ${r.installs}`);
-            const auditData = allAudits[`${r.source}/${r.skillId}`];
-            if (auditData) {
-              log.info(`    ${formatAuditBadges(auditData)}`);
-            } else {
-              log.info("    Security: no audit data");
-            }
-            if (!installed) {
-              log.info(
-                `    Install: assistant skills add ${r.source}@${r.skillId}`,
-              );
-            }
 
-            log.info("");
-          }
-        } else if (registryError) {
-          log.warn(`\n(skills.sh registry unavailable: ${registryError})`);
-        }
-
-        // ── Display clawhub results ─────────────────────────────────
-        if (clawhubResults.length > 0) {
-          log.info(`Community — Clawhub (${clawhubResults.length}):\n`);
-          for (const r of clawhubResults) {
-            const installed = isInstalled(r.slug);
-            const installedFromVellum = localIds.has(r.slug);
-            const badge = installedFromVellum
-              ? " [installed from catalog]"
-              : installed
-                ? " [installed]"
-                : "";
-            log.info(`  ${r.name}${badge}`);
-            if (r.name !== r.slug) {
-              log.info(`    ID: ${r.slug}`);
-            }
-            if (r.author) {
-              log.info(`    Author: ${r.author}`);
-            }
-            if (r.description) {
-              log.info(`    ${r.description}`);
-            }
-            if (r.createdAt > 0) {
-              log.info(
-                `    Updated: ${formatDate(new Date(r.createdAt).toISOString())}`,
-              );
+          if (clawhubResults.length > 0) {
+            log.info(`Community — Clawhub (${clawhubResults.length}):\n`);
+            for (const r of clawhubResults) {
+              const badge = r.kind === "installed" ? " [installed]" : "";
+              log.info(`  ${r.name}${badge}`);
+              if (r.name !== r.id) log.info(`    ID: ${r.id}`);
+              if (r.author) log.info(`    Author: ${r.author}`);
+              if (r.description) log.info(`    ${r.description}`);
+              if (r.stars) log.info(`    Stars: ${r.stars}`);
+              if (r.installs) log.info(`    Installs: ${r.installs}`);
+              if (r.kind !== "installed")
+                log.info(`    Install: npx clawhub install ${r.slug ?? r.id}`);
+              log.info("");
             }
-            if (r.stars > 0) {
-              log.info(`    Stars: ${r.stars}`);
-            }
-            if (r.installs > 0) {
-              log.info(`    Installs: ${r.installs}`);
-            }
-            if (!installed) {
-              log.info(`    Install: npx clawhub install ${r.slug}`);
-            }
-
-            log.info("");
           }
-        } else if (clawhubError) {
-          log.warn(`\n(clawhub registry unavailable: ${clawhubError})`);
-        }
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        if (json) {
-          console.log(JSON.stringify({ ok: false, error: msg }));
-        } else {
-          log.error(`Error: ${msg}`);
-        }
-        process.exitCode = 1;
-      }
-    });
-
-  skills
-    .command("install <skill-id>")
-    .description("Install a skill from the catalog")
-    .option("--overwrite", "Replace an already installed skill")
-    .option("--json", "Machine-readable JSON output")
-    .addHelpText(
-      "after",
-      `
+        });
+
+      skills
+        .command("install <skill-id>")
+        .description("Install a skill from the catalog")
+        .option("--overwrite", "Replace an already installed skill")
+        .option("--json", "Machine-readable JSON output")
+        .addHelpText(
+          "after",
+          `
 Arguments:
   skill-id   Skill identifier from the Vellum catalog. Run 'assistant skills list'
              to see available IDs. For community skills, use 'assistant skills add'.
@@ -639,62 +423,54 @@ Examples:
   $ assistant skills install weather
   $ assistant skills install weather --overwrite
   $ assistant skills install weather --json`,
-    )
-    .action(
-      async (
-        skillId: string,
-        opts: { overwrite?: boolean; json?: boolean },
-      ) => {
-        const json = opts.json ?? false;
-
-        try {
-          // In dev mode, also check the repo-local skills/ directory
-          const repoSkillsDir = getRepoSkillsDir();
-          let localSkills: CatalogSkill[] = [];
-          if (repoSkillsDir) {
-            localSkills = readLocalCatalog(repoSkillsDir);
-          }
-
-          // Check local catalog first, then fall back to remote
-          let entry = localSkills.find((s) => s.id === skillId);
-          if (!entry) {
-            const catalog = await fetchCatalog();
-            entry = catalog.find((s) => s.id === skillId);
-          }
-
-          if (!entry) {
-            throw new Error(
-              `Skill "${skillId}" not found in the Vellum catalog`,
+        )
+        .action(
+          async (
+            skillId: string,
+            opts: { overwrite?: boolean; json?: boolean },
+            _cmd,
+          ) => {
+            const json = opts.json ?? false;
+
+            // Restrict to catalog-only; community installs use `skills add`.
+            const installR = await cliIpcCall<{ ok: boolean; skillId?: string }>(
+              "installSkill",
+              { body: { slug: skillId, overwrite: opts.overwrite ?? false, catalogOnly: true } },
             );
-          }
-
-          // Fetch, extract, and install
-          await installSkillLocally(skillId, entry, opts.overwrite ?? false);
-
-          if (json) {
-            console.log(JSON.stringify({ ok: true, skillId }));
-          } else {
-            log.info(`Installed skill "${skillId}".`);
-          }
-        } catch (err) {
-          const msg = err instanceof Error ? err.message : String(err);
-          if (json) {
-            console.log(JSON.stringify({ ok: false, error: msg }));
-          } else {
-            log.error(`Error: ${msg}`);
-          }
-          process.exitCode = 1;
-        }
-      },
-    );
+            if (!installR.ok) {
+              if (json) {
+                console.log(
+                  JSON.stringify({
+                    ok: false,
+                    error: installR.error,
+                  }),
+                );
+                process.exitCode = 1;
+                return;
+              }
+              log.error(installR.error);
+              log.error(
+                `Run 'assistant skills search ${skillId}' to check available skills.`,
+              );
+              process.exitCode = 1;
+              return;
+            }
 
-  skills
-    .command("uninstall <skill-id>")
-    .description("Uninstall a previously installed skill")
-    .option("--json", "Machine-readable JSON output")
-    .addHelpText(
-      "after",
-      `
+            if (json) {
+              console.log(JSON.stringify({ ok: true, skillId }));
+            } else {
+              log.info(`Installed skill "${skillId}".`);
+            }
+          },
+        );
+
+      skills
+        .command("uninstall <skill-id>")
+        .description("Uninstall a previously installed skill")
+        .option("--json", "Machine-readable JSON output")
+        .addHelpText(
+          "after",
+          `
 Arguments:
   skill-id   Skill identifier to remove. Run 'assistant skills list' to see
              installed skills.
@@ -704,39 +480,33 @@ Removes the skill directory from the workspace. This action cannot be undone.
 Examples:
   $ assistant skills uninstall weather
   $ assistant skills uninstall weather --json`,
-    )
-    .action(async (skillId: string, opts: { json?: boolean }) => {
-      const json = opts.json ?? false;
-
-      try {
-        uninstallSkillLocally(skillId);
-
-        if (json) {
-          console.log(JSON.stringify({ ok: true, skillId }));
-        } else {
-          log.info(`Uninstalled skill "${skillId}".`);
-        }
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        if (json) {
-          console.log(JSON.stringify({ ok: false, error: msg }));
-        } else {
-          log.error(`Error: ${msg}`);
-        }
-        process.exitCode = 1;
-      }
-    });
-
-  skills
-    .command("add <source>")
-    .description(
-      "Install a community skill from the skills.sh registry (GitHub)",
-    )
-    .option("--overwrite", "Replace an already installed skill")
-    .option("--json", "Machine-readable JSON output")
-    .addHelpText(
-      "after",
-      `
+        )
+        .action(async (skillId: string, opts: { json?: boolean }, _cmd) => {
+          const r = await cliIpcCall<null>("deleteSkill", {
+            pathParams: { id: skillId },
+          });
+          if (!r.ok)
+            return exitFromCliResult(
+              { ok: false, error: r.error, statusCode: r.statusCode },
+              opts.json ?? false,
+            );
+          if (opts.json) {
+            console.log(JSON.stringify({ ok: true, skillId }));
+          } else {
+            log.info(`Uninstalled skill "${skillId}".`);
+          }
+        });
+
+      skills
+        .command("add <source>")
+        .description(
+          "Install a community skill from the skills.sh registry (GitHub)",
+        )
+        .option("--overwrite", "Replace an already installed skill")
+        .option("--json", "Machine-readable JSON output")
+        .addHelpText(
+          "after",
+          `
 Arguments:
   source   Skill source in one of these formats:
              owner/repo@skill-name
@@ -752,42 +522,50 @@ Examples:
   $ assistant skills add vercel-labs/skills@find-skills
   $ assistant skills add vercel-labs/skills/find-skills
   $ assistant skills add vercel-labs/skills@find-skills --overwrite`,
-    )
-    .action(
-      async (source: string, opts: { overwrite?: boolean; json?: boolean }) => {
-        const json = opts.json ?? false;
-
-        try {
-          const { owner, repo, skillSlug, ref } = resolveSkillSource(source);
-
-          await installExternalSkill(
-            owner,
-            repo,
-            skillSlug,
-            opts.overwrite ?? false,
-            ref,
-          );
-
-          if (json) {
-            console.log(
-              JSON.stringify({
-                ok: true,
-                skillSlug,
-                source: `${owner}/${repo}`,
-              }),
+        )
+        .action(
+          async (
+            source: string,
+            opts: { overwrite?: boolean; json?: boolean },
+            _cmd,
+          ) => {
+            const json = opts.json ?? false;
+
+            // `add` is the community-install entry point (skills.sh-flavoured
+            // sources: `owner/repo@skill`, `owner/repo/skill`, or full GitHub
+            // URL). Pass `origin: "skillssh"` so the daemon routes via
+            // `resolveSkillSource()` + `installExternalSkill()` regardless of
+            // slug shape — the auto-detect (`looksLikeSkillsShSlug`) only
+            // recognises 3-segment `/`-delimited slugs, so the `@`-format
+            // documented in the help text otherwise misroutes to clawhub.
+            const r = await cliIpcCall<{ ok: boolean; skillId?: string }>(
+              "installSkill",
+              {
+                body: {
+                  slug: source,
+                  origin: "skillssh",
+                  overwrite: opts.overwrite ?? false,
+                },
+              },
             );
-          } else {
-            log.info(`Installed skill "${skillSlug}" from ${owner}/${repo}.`);
-          }
-        } catch (err) {
-          const msg = err instanceof Error ? err.message : String(err);
-          if (json) {
-            console.log(JSON.stringify({ ok: false, error: msg }));
-          } else {
-            log.error(`Error: ${msg}`);
-          }
-          process.exitCode = 1;
-        }
-      },
-    );
+            if (!r.ok)
+              return exitFromCliResult(
+                { ok: false, error: r.error, statusCode: r.statusCode },
+                json,
+              );
+
+            if (json) {
+              console.log(
+                JSON.stringify({
+                  ok: true,
+                  skillId: r.result?.skillId ?? source,
+                }),
+              );
+            } else {
+              log.info(`Installed skill from ${source}.`);
+            }
+          },
+        );
+    },
+  });
 }