@intent-systems/nexus 2026.1.5-4 → 2026.1.5-8

package/dist/cli/skills-cli.js

@@ -1,39 +1,156 @@
 import path from "node:path";
 import chalk from "chalk";
-import { getSkillInfo, runSkill, verifySkill } from "../agents/skill-runner.js";
-import { getAggregateStats, getSkillStats } from "../agents/skill-usage.js";
-import { flattenManifest, readSkillManifest } from "../commands/skills-manifest.js";
-import { MANAGED_SKILLS_DIR, NEXUS_ROOT } from "../utils.js";
+import { getSkillInfo, verifySkill } from "../agents/skill-runner.js";
+import { getAggregateStats, getSkillStats, hasSkillUsage, recordSkillUsage, } from "../agents/skill-usage.js";
+import { getSkillMetadata, loadWorkspaceSkillEntries } from "../agents/skills.js";
+import { buildWorkspaceSkillStatus } from "../agents/skills-status.js";
+import { DEFAULT_AGENT_WORKSPACE_DIR } from "../agents/workspace.js";
+import { loadConfig } from "../config/config.js";
+import { NEXUS_ROOT, SKILLS_STATE_DIR, resolveUserPath } from "../utils.js";
+const STATUS_ICON = {
+    active: "✅",
+    ready: "⭐",
+    needs_setup: "🔧",
+    needs_install: "📥",
+    unavailable: "⛔",
+};
+function resolveSkillType(entry) {
+    const metadata = getSkillMetadata(entry);
+    if (metadata?.type)
+        return metadata.type;
+    const requires = metadata?.requires;
+    if (requires?.env?.length || requires?.config?.length)
+        return "connector";
+    if (requires?.bins?.length || requires?.anyBins?.length)
+        return "tool";
+    return "guide";
+}
+function resolveSkillStatus(statusEntry) {
+    if (statusEntry.disabled || statusEntry.blockedByAllowlist) {
+        return "unavailable";
+    }
+    if (statusEntry.missing.os.length > 0)
+        return "unavailable";
+    if (statusEntry.missing.bins.length > 0)
+        return "needs_install";
+    if (statusEntry.missing.env.length > 0 || statusEntry.missing.config.length > 0) {
+        return "needs_setup";
+    }
+    if (hasSkillUsage(statusEntry.name))
+        return "active";
+    return "ready";
+}
 export function registerSkillsCommand(program) {
     const skill = program.command("skill").description("Use and inspect skills");
     skill
         .command("list")
         .description("List all available skills")
         .option("--json", "Output as JSON")
+        .option("--type <type>", "Filter by type (guide|tool|connector)")
+        .option("--status <status>", "Filter by status (active|ready|needs-setup|needs-install|unavailable)")
+        .option("--active", "Only show active skills")
+        .option("--ready", "Only show ready skills")
+        .option("--needs-setup", "Only show skills needing setup")
+        .option("--needs-install", "Only show skills needing install")
+        .option("--unavailable", "Only show unavailable skills")
+        .option("--all", "Include unavailable skills")
         .action(async (opts) => {
-        const manifest = await readSkillManifest();
-        if (!manifest) {
-            console.error("No skills manifest found. Run 'nexus init' to initialize your workspace.");
-            process.exit(1);
+        const config = loadConfig();
+        const workspaceDir = resolveUserPath(config.agent?.workspace ?? DEFAULT_AGENT_WORKSPACE_DIR);
+        const managedSkillsDir = path.join(NEXUS_ROOT, "skills", "managed");
+        const entries = loadWorkspaceSkillEntries(workspaceDir, {
+            config,
+            managedSkillsDir,
+        });
+        const status = buildWorkspaceSkillStatus(workspaceDir, {
+            config,
+            managedSkillsDir,
+            entries,
+        });
+        const statusMap = new Map(status.skills.map((item) => [item.name.toLowerCase(), item]));
+        const items = entries.map((entry) => {
+            const statusEntry = statusMap.get(entry.skill.name.toLowerCase());
+            const statusValue = statusEntry
+                ? resolveSkillStatus(statusEntry)
+                : "unavailable";
+            return {
+                name: entry.skill.name,
+                description: entry.skill.description,
+                type: resolveSkillType(entry),
+                status: statusValue,
+                source: entry.skill.source,
+                filePath: entry.skill.filePath,
+            };
+        });
+        const typeFilter = opts.type
+            ? String(opts.type).toLowerCase()
+            : undefined;
+        const statusFilters = new Set();
+        if (opts.status) {
+            const raw = String(opts.status)
+                .split(",")
+                .map((entry) => entry.trim().toLowerCase())
+                .filter(Boolean);
+            for (const entry of raw) {
+                const normalized = entry.replace(/_/g, "-");
+                if (normalized === "needs-setup")
+                    statusFilters.add("needs_setup");
+                else if (normalized === "needs-install")
+                    statusFilters.add("needs_install");
+                else if (normalized === "active")
+                    statusFilters.add("active");
+                else if (normalized === "ready")
+                    statusFilters.add("ready");
+                else if (normalized === "unavailable")
+                    statusFilters.add("unavailable");
+            }
         }
+        if (opts.active)
+            statusFilters.add("active");
+        if (opts.ready)
+            statusFilters.add("ready");
+        if (opts.needsSetup)
+            statusFilters.add("needs_setup");
+        if (opts.needsInstall)
+            statusFilters.add("needs_install");
+        if (opts.unavailable)
+            statusFilters.add("unavailable");
+        const hasStatusFilter = statusFilters.size > 0;
+        const filtered = items.filter((item) => {
+            if (typeFilter && item.type !== typeFilter)
+                return false;
+            if (hasStatusFilter && !statusFilters.has(item.status))
+                return false;
+            if (!hasStatusFilter && !opts.all && item.status === "unavailable")
+                return false;
+            return true;
+        });
         if (opts.json) {
-            console.log(JSON.stringify(manifest, null, 2));
+            console.log(JSON.stringify({
+                workspace: workspaceDir,
+                total: items.length,
+                filtered: filtered.length,
+                skills: filtered,
+            }, null, 2));
             return;
         }
-        const allSkills = flattenManifest(manifest);
-        if (allSkills.length === 0) {
-            console.log("No skills installed.");
+        if (filtered.length === 0) {
+            console.log("No skills matched.");
             return;
         }
-        console.log(`\n📚 Nexus Skills (${allSkills.length} total)\n`);
-        for (const skillEntry of allSkills) {
-            const desc = skillEntry.description
-                ? ` - ${skillEntry.description.slice(0, 60)}${skillEntry.description.length > 60 ? "..." : ""}`
+        console.log(`\n📚 Nexus Skills (${filtered.length} shown)\n`);
+        for (const item of filtered) {
+            const desc = item.description
+                ? ` - ${item.description.slice(0, 60)}${item.description.length > 60 ? "..." : ""}`
                 : "";
-            console.log(`  • ${skillEntry.name}${desc}`);
+            const icon = STATUS_ICON[item.status] ?? "•";
+            console.log(`  ${icon} ${item.name}${desc}`);
         }
-        console.log(`\nSkills directory: ${MANAGED_SKILLS_DIR}`);
-        console.log(`User skills: ${path.join(NEXUS_ROOT, "home", "skills")}\n`);
+        const skillsRoot = path.join(NEXUS_ROOT, "skills");
+        console.log(`\nSkills directory: ${skillsRoot}`);
+        console.log(`Skill types: ${path.join(skillsRoot, "tools")}, ${path.join(skillsRoot, "connectors")}, ${path.join(skillsRoot, "guides")}`);
+        console.log(`Skill state: ${SKILLS_STATE_DIR}`);
+        console.log(`User skills: ${path.join(workspaceDir, "skills")}\n`);
     });
     skill
         .command("info <name>")
@@ -42,6 +159,7 @@ export function registerSkillsCommand(program) {
         .option("--prompt", "Include the full SKILL.md prompt")
         .action(async (name, opts) => {
         const info = getSkillInfo(name);
+        const stats = await getSkillStats(name);
         if (!info.exists) {
             console.error(`Skill not found: ${name}`);
             console.error(`\nRun 'nexus skill list' to see available skills.`);
@@ -49,7 +167,8 @@ export function registerSkillsCommand(program) {
         }
         if (opts.json) {
             const output = opts.prompt ? info : { ...info, prompt: undefined };
-            console.log(JSON.stringify(output, null, 2));
+            const payload = stats ? { ...output, usage: stats } : output;
+            console.log(JSON.stringify(payload, null, 2));
             return;
         }
         console.log(`\n${chalk.bold.cyan("Skill:")} ${info.name}`);
@@ -63,12 +182,16 @@ export function registerSkillsCommand(program) {
         const statusColor = info.configured ? chalk.green : chalk.yellow;
         const statusIcon = info.configured ? "✓" : "○";
         console.log(`${chalk.bold("Status:")} ${statusColor(`${statusIcon} ${info.configured ? "Configured" : "Not configured"}`)}`);
-        if (info.lastUsed) {
-            console.log(`${chalk.bold("Last used:")} ${info.lastUsed}`);
+        if (stats?.lastUsed ?? info.lastUsed) {
+            console.log(`${chalk.bold("Last used:")} ${stats?.lastUsed ?? info.lastUsed}`);
         }
         if (info.lastError) {
             console.log(`${chalk.bold("Last error:")} ${chalk.red(info.lastError)}`);
         }
+        if (stats) {
+            console.log(`${chalk.bold("Runs:")} ${stats.runs}`);
+            console.log(`${chalk.bold("Errors:")} ${stats.errors}`);
+        }
         if (opts.prompt && info.prompt) {
             console.log(`\n${chalk.bold.cyan("--- SKILL.md ---")}\n`);
             console.log(info.prompt);
@@ -76,15 +199,20 @@ export function registerSkillsCommand(program) {
     });
     skill
         .command("use <name>")
-        .description("Run a skill command with arguments")
-        .allowUnknownOption()
-        .action(async (name, _opts, command) => {
-        const args = command.args.slice(1);
-        const result = await runSkill(name, args);
-        if (!result.ok) {
-            console.error(result.error);
+        .description("Show the SKILL.md guide for a skill")
+        .action(async (name) => {
+        const info = getSkillInfo(name);
+        if (!info.exists) {
+            console.error(`Skill not found: ${name}`);
+            console.error(`\nRun 'nexus skill list' to see available skills.`);
             process.exit(1);
         }
+        if (!info.prompt) {
+            console.error(`No SKILL.md found for ${name}.`);
+            process.exit(1);
+        }
+        console.log(info.prompt.trimEnd());
+        recordSkillUsage(name, { ts: Date.now(), event: "use", ok: true });
     });
     skill
         .command("verify <name>")
@@ -126,7 +254,14 @@ export function registerSkillsCommand(program) {
         }
         console.log(`Total skill runs: ${stats.totalRuns}`);
         console.log(`Active skills: ${stats.activeSkills}`);
-        console.log(`Most used: ${stats.mostUsed?.name ?? "none"}`);
+        if (stats.topUsed && stats.topUsed.length > 0) {
+            console.log(`Most used: ${stats.topUsed
+                .map((item) => `${item.name} (${item.runs})`)
+                .join(", ")}`);
+        }
+        else {
+            console.log("Most used: none");
+        }
         console.log(`Ready but unused: ${stats.readyButUnused?.join(", ") || "none"}`);
     });
 }

package/dist/cli/skills-hub-cli.js

@@ -1,18 +1,18 @@
+import crypto from "node:crypto";
 import fs from "node:fs/promises";
-import path from "node:path";
 import os from "node:os";
-import crypto from "node:crypto";
+import path from "node:path";
 import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { fileTypeFromFile } from "file-type";
-import { buildWorkspaceSkillStatus } from "../agents/skills-status.js";
 import { getSkillMetadata, hasBinary, loadWorkspaceSkillEntries, } from "../agents/skills.js";
+import { buildWorkspaceSkillStatus } from "../agents/skills-status.js";
 import { DEFAULT_AGENT_WORKSPACE_DIR } from "../agents/workspace.js";
-import { generateSkillManifest, writeSkillManifest } from "../commands/skills-manifest.js";
+import { generateSkillManifest, writeSkillManifest, } from "../commands/skills-manifest.js";
 import { loadConfig } from "../config/config.js";
-import { runCommandWithTimeout } from "../process/exec.js";
 import { listCredentialEntries, resolveCredentialValue, } from "../credentials/store.js";
-import { MANAGED_SKILLS_DIR, resolveUserPath } from "../utils.js";
+import { runCommandWithTimeout } from "../process/exec.js";
+import { NEXUS_ROOT, resolveUserPath } from "../utils.js";
 function getHubBaseUrl() {
     return (process.env.NEXUS_HUB_URL ||
         process.env.NEXUS_WEBSITE_URL ||
@@ -41,7 +41,9 @@ function normalizeStringList(value) {
     return [];
 }
 function normalizeHubDependencies(value) {
-    const raw = value && typeof value === "object" ? value : {};
+    const raw = value && typeof value === "object"
+        ? value
+        : {};
     return {
         dependencies: normalizeStringList(raw.dependencies),
         tools: normalizeStringList(raw.tools),
@@ -142,16 +144,16 @@ function normalizeMetadata(value) {
     return {};
 }
 function resolveCapabilities(entry) {
+    const metadata = entry.metadata;
+    const metadataNexus = metadata && typeof metadata.nexus === "object"
+        ? metadata.nexus
+        : undefined;
     const candidates = [
         entry.capabilities,
         entry.provides,
-        entry.metadata?.nexus
-            ? entry.metadata.nexus.provides
-            : undefined,
-        entry.metadata?.nexus
-            ? entry.metadata.nexus.capabilities
-            : undefined,
-        entry.metadata?.capabilities,
+        metadataNexus?.provides,
+        metadataNexus?.capabilities,
+        metadata?.capabilities,
     ];
     for (const candidate of candidates) {
         const parsed = normalizeStringList(candidate);
@@ -282,9 +284,8 @@ function dirNameToSlug(dirName) {
 async function ensureDir(dir) {
     await fs.mkdir(dir, { recursive: true });
 }
-async function loadManagedSkillSlugs(managedSkillsDir) {
+async function loadManagedSkillSlugs(managedDir) {
     const slugs = new Set();
-    const managedDir = path.join(managedSkillsDir, "managed");
     let entries = [];
     try {
         entries = await fs.readdir(managedDir, { withFileTypes: true });
@@ -456,7 +457,7 @@ async function computeArtifactInfo(filePath) {
     return { sha256: hash, bytes: stats.size };
 }
 async function resolveHubToken(input) {
-    if (input && input.trim())
+    if (input?.trim())
         return input.trim();
     const envToken = process.env.NEXUS_HUB_TOKEN ||
         process.env.NEXUS_WEBSITE_TOKEN ||
@@ -483,7 +484,9 @@ function buildManifestPayload(input) {
         (typeof frontmatter.name === "string" ? frontmatter.name : "") ||
         "";
     const description = overrides.description ||
-        (typeof frontmatter.description === "string" ? frontmatter.description : "") ||
+        (typeof frontmatter.description === "string"
+            ? frontmatter.description
+            : "") ||
         "";
     const type = overrides.type ||
         (typeof frontmatter.type === "string" ? frontmatter.type : "") ||
@@ -496,7 +499,9 @@ function buildManifestPayload(input) {
         (typeof frontmatter.license === "string" ? frontmatter.license : "") ||
         "";
     const repository = overrides.repository ||
-        (typeof frontmatter.repository === "string" ? frontmatter.repository : "") ||
+        (typeof frontmatter.repository === "string"
+            ? frontmatter.repository
+            : "") ||
         (typeof frontmatter.repo === "string" ? frontmatter.repo : "") ||
         "";
     const homepage = overrides.homepage ||
@@ -530,11 +535,15 @@ function buildManifestPayload(input) {
     const capabilities = resolveCapabilities(capabilityCandidates);
     if (capabilities.length > 0) {
         manifestEntry.capabilities = capabilities;
-        const nexus = manifestEntry.metadata;
-        nexus.nexus = {
-            ...(nexus.nexus ?? {}),
+        const metadata = (manifestEntry.metadata ?? {});
+        const existingNexus = metadata.nexus && typeof metadata.nexus === "object"
+            ? metadata.nexus
+            : {};
+        metadata.nexus = {
+            ...existingNexus,
             provides: capabilities,
         };
+        manifestEntry.metadata = metadata;
     }
     const readmeExcerpt = extractExcerpt(body || description);
     return {
@@ -590,12 +599,15 @@ async function installHubSkill(params) {
     }
     await extractArchive(artifactPath, destDir);
     await normalizeSkillRoot(destDir);
-    const manifest = await generateSkillManifest(MANAGED_SKILLS_DIR, params.userSkillsDir);
+    const skillsRootDir = path.dirname(params.managedDir);
+    const manifest = await generateSkillManifest(skillsRootDir, params.userSkillsDir);
     await writeSkillManifest(manifest);
     return { installed: true, destDir };
 }
 export function registerSkillsHubCommand(program) {
-    const skills = program.command("skills").description("Search and install skills from the Nexus Hub");
+    const skills = program
+        .command("skills")
+        .description("Search and install skills from the Nexus Hub");
     skills
         .command("search <query>")
         .description("Search local skills and the Nexus Hub")
@@ -616,7 +628,8 @@ export function registerSkillsHubCommand(program) {
                 : 10;
         const cfg = loadConfig();
         const workspaceDir = resolveUserPath(cfg.agent?.workspace ?? DEFAULT_AGENT_WORKSPACE_DIR);
-        const managedSkillsDir = MANAGED_SKILLS_DIR;
+        const skillsRoot = path.join(NEXUS_ROOT, "skills");
+        const managedSkillsDir = path.join(skillsRoot, "managed");
         const status = buildWorkspaceSkillStatus(workspaceDir, {
             config: cfg,
             managedSkillsDir,
@@ -625,7 +638,10 @@ export function registerSkillsHubCommand(program) {
             config: cfg,
             managedSkillsDir,
         });
-        const metadataByName = new Map(metadataEntries.map((entry) => [entry.skill.name, getSkillMetadata(entry)]));
+        const metadataByName = new Map(metadataEntries.map((entry) => [
+            entry.skill.name,
+            getSkillMetadata(entry),
+        ]));
         const installedNames = new Set(metadataEntries.map((entry) => normalizeSkillKey(entry.skill.name)));
         const installedSlugs = await loadManagedSkillSlugs(managedSkillsDir);
         const installedIndex = {
@@ -666,7 +682,7 @@ export function registerSkillsHubCommand(program) {
         })
             .filter((skill) => skill.score > 0)
             .sort((a, b) => b.score - a.score)
-            .map(({ score, ...rest }) => rest);
+            .map(({ score: _score, ...rest }) => rest);
         let hubMatches = [];
         if (!opts.localOnly) {
             try {
@@ -801,7 +817,10 @@ export function registerSkillsHubCommand(program) {
                         console.log(`     Requires → ${deps.join(" | ")}`);
                     }
                     if (skill.install.length > 0) {
-                        console.log(`     Install → ${skill.install.map((i) => i.label).filter(Boolean).join(", ")}`);
+                        console.log(`     Install → ${skill.install
+                            .map((i) => i.label)
+                            .filter(Boolean)
+                            .join(", ")}`);
                     }
                 }
                 console.log("");
@@ -873,20 +892,32 @@ export function registerSkillsHubCommand(program) {
             const capOverrides = [
                 ...(Array.isArray(opts.capability) ? opts.capability : []),
                 ...normalizeStringList(opts.capabilities),
-            ].map((cap) => cap.trim()).filter(Boolean);
+            ]
+                .map((cap) => cap.trim())
+                .filter(Boolean);
             const overrides = {
                 path: skillDir,
                 slug: typeof opts.slug === "string" ? opts.slug.trim() : undefined,
                 name: typeof opts.name === "string" ? opts.name.trim() : undefined,
-                description: typeof opts.description === "string" ? opts.description.trim() : undefined,
+                description: typeof opts.description === "string"
+                    ? opts.description.trim()
+                    : undefined,
                 type: typeof opts.type === "string" ? opts.type.trim() : undefined,
                 version: typeof opts.version === "string" ? opts.version.trim() : undefined,
                 license: typeof opts.license === "string" ? opts.license.trim() : undefined,
-                repository: typeof opts.repository === "string" ? opts.repository.trim() : undefined,
-                homepage: typeof opts.homepage === "string" ? opts.homepage.trim() : undefined,
-                visibility: typeof opts.visibility === "string" ? opts.visibility.trim() : "public",
+                repository: typeof opts.repository === "string"
+                    ? opts.repository.trim()
+                    : undefined,
+                homepage: typeof opts.homepage === "string"
+                    ? opts.homepage.trim()
+                    : undefined,
+                visibility: typeof opts.visibility === "string"
+                    ? opts.visibility.trim()
+                    : "public",
                 capabilities: capOverrides.length > 0 ? capOverrides : undefined,
-                sourcePath: typeof opts.source === "string" ? resolveUserPath(opts.source) : undefined,
+                sourcePath: typeof opts.source === "string"
+                    ? resolveUserPath(opts.source)
+                    : undefined,
                 sourceCommit: typeof opts.sourceCommit === "string"
                     ? opts.sourceCommit.trim()
                     : undefined,
@@ -1019,8 +1050,9 @@ export function registerSkillsHubCommand(program) {
             const cfg = loadConfig();
             const workspaceDir = resolveUserPath(cfg.agent?.workspace ?? DEFAULT_AGENT_WORKSPACE_DIR);
             const userSkillsDir = path.join(workspaceDir, "skills");
-            const managedSkillsDir = MANAGED_SKILLS_DIR;
-            const managedDir = path.join(managedSkillsDir, "managed");
+            const skillsRoot = path.join(NEXUS_ROOT, "skills");
+            const managedSkillsDir = path.join(skillsRoot, "managed");
+            const managedDir = managedSkillsDir;
             const metadataEntries = loadWorkspaceSkillEntries(workspaceDir, {
                 config: cfg,
                 managedSkillsDir,

package/dist/cli/tool-connector-cli.js

@@ -1,8 +1,11 @@
 import fs from "node:fs";
 import path from "node:path";
 import { getSkillMetadata, hasBinary, loadWorkspaceSkillEntries, } from "../agents/skills.js";
-import { ensureCredentialIndexSync } from "../credentials/store.js";
-import { NEXUS_ROOT } from "../utils.js";
+import { DEFAULT_AGENT_WORKSPACE_DIR } from "../agents/workspace.js";
+import { loadConfig } from "../config/config.js";
+import { ensureCredentialIndexSync, } from "../credentials/store.js";
+import { verifyCredentials } from "../commands/credential.js";
+import { resolveUserPath } from "../utils.js";
 function resolveBinaryPath(bin) {
     const pathEnv = process.env.PATH ?? "";
     const parts = pathEnv.split(path.delimiter).filter(Boolean);
@@ -19,16 +22,29 @@ function resolveBinaryPath(bin) {
     return null;
 }
 export function registerToolConnectorCli(program) {
-    const tool = program.command("tool").description("Tool verification and paths");
-    const connector = program.command("connector").description("Connector verification and accounts");
+    const tool = program
+        .command("tool")
+        .description("Tool verification and paths");
+    const connector = program
+        .command("connector")
+        .description("Connector verification and accounts");
     tool
-        .command("verify")
+        .command("verify [name]")
         .description("Verify tool dependencies")
         .option("--json", "Output as JSON")
-        .action((opts) => {
-        const entries = loadWorkspaceSkillEntries(path.join(NEXUS_ROOT, "home"));
+        .action((name, opts) => {
+        const config = loadConfig();
+        const workspaceDir = resolveUserPath(config.agent?.workspace ?? DEFAULT_AGENT_WORKSPACE_DIR);
+        const entries = loadWorkspaceSkillEntries(workspaceDir);
         const tools = entries.filter((entry) => getSkillMetadata(entry)?.type === "tool");
-        const results = tools.map((entry) => {
+        const scoped = name?.trim() && name.trim().length > 0
+            ? tools.filter((entry) => entry.skill.name.toLowerCase() === name.toLowerCase())
+            : tools;
+        if (name && scoped.length === 0) {
+            console.error(`Tool skill not found: ${name}`);
+            process.exit(1);
+        }
+        const results = scoped.map((entry) => {
             const meta = getSkillMetadata(entry);
             const bins = meta?.requires?.bins ?? [];
             const missing = bins.filter((bin) => !hasBinary(bin));
@@ -53,38 +69,80 @@ export function registerToolConnectorCli(program) {
         }
     });
     tool
-        .command("path <bin>")
-        .description("Resolve binary path")
-        .action((bin) => {
-        const resolved = resolveBinaryPath(bin);
+        .command("path <name>")
+        .description("Resolve binary path for a tool skill or bin")
+        .action((name) => {
+        const config = loadConfig();
+        const workspaceDir = resolveUserPath(config.agent?.workspace ?? DEFAULT_AGENT_WORKSPACE_DIR);
+        const entries = loadWorkspaceSkillEntries(workspaceDir);
+        const match = entries.find((entry) => entry.skill.name.toLowerCase() === name.toLowerCase());
+        if (match) {
+            const meta = getSkillMetadata(match);
+            const bins = meta?.requires?.bins ?? [];
+            if (bins.length === 0) {
+                console.error(`No binaries listed for tool: ${match.skill.name}`);
+                process.exit(1);
+            }
+            const resolvedBins = bins.map((bin) => ({
+                bin,
+                path: resolveBinaryPath(bin),
+            }));
+            const missing = resolvedBins.filter((item) => !item.path);
+            if (missing.length > 0) {
+                console.error(`Missing binaries: ${missing.map((item) => item.bin).join(", ")}`);
+                process.exit(1);
+            }
+            for (const item of resolvedBins) {
+                if (item.path)
+                    console.log(item.path);
+            }
+            return;
+        }
+        const resolved = resolveBinaryPath(name);
         if (!resolved) {
-            console.error(`Binary not found: ${bin}`);
+            console.error(`Binary not found: ${name}`);
             process.exit(1);
         }
         console.log(resolved);
     });
     connector
-        .command("verify")
+        .command("verify [name]")
         .description("Verify connector credentials")
         .option("--json", "Output as JSON")
-        .action((opts) => {
-        const entries = loadWorkspaceSkillEntries(path.join(NEXUS_ROOT, "home"));
+        .action(async (name, opts) => {
+        const config = loadConfig();
+        const workspaceDir = resolveUserPath(config.agent?.workspace ?? DEFAULT_AGENT_WORKSPACE_DIR);
+        const entries = loadWorkspaceSkillEntries(workspaceDir);
         const connectors = entries.filter((entry) => getSkillMetadata(entry)?.type === "connector");
+        const scoped = name?.trim() && name.trim().length > 0
+            ? connectors.filter((entry) => entry.skill.name.toLowerCase() === name.toLowerCase())
+            : connectors;
+        if (name && scoped.length === 0) {
+            console.error(`Connector skill not found: ${name}`);
+            process.exit(1);
+        }
         const index = ensureCredentialIndexSync();
         const services = new Set(Object.keys(index.services ?? {}).map((id) => id.toLowerCase()));
-        const results = connectors.map((entry) => {
+        const results = await Promise.all(scoped.map(async (entry) => {
             const meta = getSkillMetadata(entry);
             const provides = meta?.provides ?? [];
             const requires = meta?.requires?.credentials ?? [];
             const hints = [...requires, entry.skill.name].map((value) => value.toLowerCase());
             const hasCredential = hints.some((hint) => services.has(hint));
+            const verified = hasCredential
+                ? await Promise.all(hints.map((hint) => verifyCredentials({ service: hint }).catch(() => null)))
+                : [];
+            const ok = hasCredential
+                ? verified.every((result) => result?.ok !== false)
+                : false;
             return {
                 skill: entry.skill.name,
                 provides,
                 requires,
-                ok: hasCredential,
+                ok,
+                verified,
             };
-        });
+        }));
         if (opts.json) {
             console.log(JSON.stringify(results, null, 2));
             return;
@@ -99,17 +157,34 @@ export function registerToolConnectorCli(program) {
         }
     });
     connector
-        .command("accounts")
+        .command("accounts [service]")
         .description("List credential accounts")
         .option("--json", "Output as JSON")
-        .action((opts) => {
+        .action((service, opts) => {
         const index = ensureCredentialIndexSync();
+        const filter = service?.trim();
         if (opts.json) {
-            console.log(JSON.stringify(index, null, 2));
+            if (!filter) {
+                console.log(JSON.stringify(index, null, 2));
+                return;
+            }
+            const entry = index.services?.[filter];
+            if (!entry) {
+                console.error(`Service not found: ${filter}`);
+                process.exit(1);
+            }
+            console.log(JSON.stringify({ [filter]: entry }, null, 2));
             return;
         }
-        for (const [service, info] of Object.entries(index.services ?? {})) {
-            console.log(service);
+        const entries = filter
+            ? index.services?.[filter]
+                ? [[filter, index.services[filter]]]
+                : []
+            : Object.entries(index.services ?? {});
+        for (const [serviceId, info] of entries) {
+            if (!info)
+                continue;
+            console.log(serviceId);
             for (const account of info.accounts ?? []) {
                 console.log(`  - ${account.id}`);
             }