@intent-systems/nexus 2026.1.5-3 → 2026.1.5-5

package/dist/cli/credential-cli.js

@@ -1,5 +1,5 @@
 import { cancel, confirm, isCancel } from "@clack/prompts";
-import { addCredential, flagCredential, getCredential, getCredentialPaths, listCredentials, removeCredential, scanCredentialEnv, } from "../commands/credential.js";
+import { addCredential, flagCredential, getCredential, getCredentialPaths, getCredentialValue, importCliCredential, listCredentials, removeCredential, scanCredentialEnv, verifyCredentials, } from "../commands/credential.js";
 function parseFields(raw, fieldsArgs) {
     const out = {};
     if (raw) {
@@ -25,7 +25,9 @@ function parseFields(raw, fieldsArgs) {
     return out;
 }
 export function registerCredentialCli(program) {
-    const credential = program.command("credential").description("Manage credentials");
+    const credential = program
+        .command("credential")
+        .description("Manage credentials");
     credential
         .command("list")
         .description("List credentials from the index")
@@ -54,29 +56,72 @@ export function registerCredentialCli(program) {
         const paths = getCredentialPaths();
         console.log(`\nIndex: ${paths.indexPath}`);
     });
+    credential
+        .command("verify <service>")
+        .description("Verify credential status for a service")
+        .option("--json", "Output as JSON")
+        .action(async (service, opts) => {
+        const result = await verifyCredentials({ service });
+        if (!result) {
+            console.error("Credential service not found.");
+            process.exit(1);
+        }
+        if (opts.json) {
+            console.log(JSON.stringify(result, null, 2));
+            return;
+        }
+        const iconFor = (status) => status === "ok" ? "✅" : status === "skipped" ? "⚠️" : "❌";
+        console.log(`${result.ok ? "✅" : "❌"} ${result.service}: ${result.accounts} account(s) checked`);
+        for (const entry of result.checked) {
+            const err = entry.error ? ` - ${entry.error}` : "";
+            console.log(`  ${iconFor(entry.status)} ${entry.account} (${entry.authId})${err}`);
+        }
+        if (!result.ok) {
+            process.exit(1);
+        }
+    });
     credential
         .command("get")
-        .description("Get a credential record")
+        .description("Get a credential value")
         .requiredOption("--service <id>", "Service id")
         .requiredOption("--account <id>", "Account id")
         .requiredOption("--auth <id>", "Auth id")
         .option("--json", "Output as JSON")
+        .option("--record", "Show credential record instead of value")
         .action(async (opts) => {
-        const result = await getCredential({
+        const params = {
             service: opts.service,
             account: opts.account,
             authId: opts.auth,
-        });
-        if (!result) {
-            console.error("Credential not found.");
+        };
+        if (opts.record) {
+            const result = await getCredential(params);
+            if (!result) {
+                console.error("Credential not found.");
+                process.exit(1);
+            }
+            if (opts.json) {
+                console.log(JSON.stringify(result, null, 2));
+                return;
+            }
+            console.log(`\n${result.filePath}`);
+            console.log(JSON.stringify(result.record, null, 2));
+            return;
+        }
+        const valueResult = await getCredentialValue(params);
+        if (!valueResult) {
+            console.error("Credential value not found.");
             process.exit(1);
         }
         if (opts.json) {
-            console.log(JSON.stringify(result, null, 2));
+            console.log(JSON.stringify({
+                filePath: valueResult.filePath,
+                field: valueResult.field,
+                value: valueResult.value,
+            }, null, 2));
             return;
         }
-        console.log(`\n${result.filePath}`);
-        console.log(JSON.stringify(result.record, null, 2));
+        console.log(valueResult.value);
     });
     credential
         .command("add")
@@ -86,23 +131,55 @@ export function registerCredentialCli(program) {
         .requiredOption("--type <type>", "api_key | token | oauth | config")
         .option("--auth <id>", "Auth id (defaults to type)")
         .option("--owner <owner>", "shared | user | agent:<id>", "user")
-        .option("--storage <provider>", "plaintext | keychain | 1password | external", "plaintext")
-        .option("--value <value>", "Secret value for plaintext/keychain")
+        .option("--storage <provider>", "keychain | 1password | env | external")
+        .option("--value <value>", "Secret value for keychain")
         .option("--refresh-token <token>", "OAuth refresh token")
         .option("--expires-at <ts>", "Expiration (unix ms or ISO string)")
         .option("--vault <name>", "1Password vault")
         .option("--item <name>", "1Password item")
         .option("--fields <json>", "1Password field map as JSON")
         .option("--field <pair...>", "1Password field map: key=value")
-        .option("--sync-command <cmd>", "External sync command")
+        .option("--env-var <name>", "Env var name for env storage")
+        .option("--command <cmd>", "External command to fetch secret")
+        .option("--sync-command <cmd>", "External sync command (deprecated)")
+        .option("--format <format>", "External command output format: raw|json")
+        .option("--json-path <path>", "JSON path for external output")
         .action(async (opts) => {
         const type = String(opts.type).trim();
         if (!["api_key", "token", "oauth", "config"].includes(type)) {
             console.error("Invalid --type");
             process.exit(1);
         }
-        const storage = String(opts.storage).trim();
+        const storageRaw = opts.storage ? String(opts.storage).trim() : "";
+        const storage = storageRaw || (process.platform === "darwin" ? "keychain" : "");
+        if (!storage) {
+            console.error("Missing --storage. Use keychain (macOS), 1password, env, or external.");
+            process.exit(1);
+        }
+        if (storage === "keychain" && !opts.value) {
+            console.error("Missing --value for keychain storage.");
+            process.exit(1);
+        }
+        if (storage === "env" && !opts.envVar) {
+            console.error("Missing --env-var for env storage.");
+            process.exit(1);
+        }
+        if (storage === "external" && !opts.command && !opts.syncCommand) {
+            console.error("Missing --command for external storage.");
+            process.exit(1);
+        }
+        if (opts.format && !["raw", "json"].includes(String(opts.format))) {
+            console.error("Invalid --format. Use raw or json.");
+            process.exit(1);
+        }
+        if (!["keychain", "1password", "env", "external"].includes(storage)) {
+            console.error("Invalid --storage. Use keychain, 1password, env, external.");
+            process.exit(1);
+        }
         const fields = parseFields(opts.fields, opts.field);
+        const format = opts.format === "raw" || opts.format === "json"
+            ? opts.format
+            : undefined;
         const expiresAt = opts.expiresAt && /^\d+$/.test(String(opts.expiresAt).trim())
             ? Number.parseInt(String(opts.expiresAt).trim(), 10)
             : opts.expiresAt;
@@ -121,14 +198,59 @@ export function registerCredentialCli(program) {
                         item: String(opts.item ?? ""),
                         fields,
                     }
-                    : storage === "external"
-                        ? { provider: "external", syncCommand: String(opts.syncCommand ?? "") }
-                        : { provider: "plaintext", value: opts.value },
+                    : storage === "env"
+                        ? { provider: "env", var: String(opts.envVar ?? "") }
+                        : storage === "external"
+                            ? {
+                                provider: "external",
+                                command: opts.command ? String(opts.command) : undefined,
+                                syncCommand: opts.syncCommand
+                                    ? String(opts.syncCommand)
+                                    : undefined,
+                                ...(format ? { format } : {}),
+                                jsonPath: opts.jsonPath
+                                    ? String(opts.jsonPath)
+                                    : undefined,
+                            }
+                            : { provider: "env", var: String(opts.envVar ?? "") },
             refreshToken: opts.refreshToken,
             expiresAt,
         });
         console.log(`Added credential at ${record.filePath}`);
     });
+    credential
+        .command("import <source>")
+        .description("Import external CLI credentials")
+        .option("--account <id>", "Account id override")
+        .option("--owner <owner>", "shared | user | agent:<id>", "user")
+        .option("--force", "Overwrite existing record")
+        .option("--json", "Output as JSON")
+        .option("--no-keychain-prompt", "Skip keychain prompts")
+        .action(async (source, opts) => {
+        const normalized = String(source ?? "").trim();
+        if (!["claude-cli", "codex-cli"].includes(normalized)) {
+            console.error("Invalid source. Use claude-cli or codex-cli.");
+            process.exit(1);
+        }
+        try {
+            const result = await importCliCredential({
+                source: normalized,
+                account: opts.account,
+                owner: opts.owner,
+                force: Boolean(opts.force),
+                allowKeychainPrompt: opts.keychainPrompt !== false,
+            });
+            if (opts.json) {
+                console.log(JSON.stringify(result, null, 2));
+                return;
+            }
+            console.log(`Imported ${result.source} credentials into ${result.profileId} (${result.filePath})`);
+        }
+        catch (err) {
+            console.error(err instanceof Error ? err.message : String(err));
+            process.exit(1);
+        }
+    });
     credential
         .command("remove")
         .description("Remove a credential record")

package/dist/cli/gateway-cli.js

@@ -1,5 +1,5 @@
 import fs from "node:fs";
-import { CONFIG_PATH_NEXUS, loadConfig, resolveGatewayPort } from "../config/config.js";
+import { CONFIG_PATH_NEXUS, loadConfig, resolveGatewayPort, } from "../config/config.js";
 import { GATEWAY_LAUNCH_AGENT_LABEL, GATEWAY_SYSTEMD_SERVICE_NAME, GATEWAY_WINDOWS_TASK_NAME, } from "../daemon/constants.js";
 import { resolveGatewayService } from "../daemon/service.js";
 import { callGateway, randomIdempotencyKey } from "../gateway/call.js";

package/dist/cli/log-cli.js

@@ -0,0 +1,25 @@
+import { logCommand } from "../commands/log.js";
+import { defaultRuntime } from "../runtime.js";
+export function registerLogCli(program) {
+    program
+        .command("log")
+        .description("Show Nexus event or skill usage logs")
+        .option("--json", "Output as JSON")
+        .option("--errors", "Only include error events")
+        .option("--since <time>", "Only include events after time (e.g. 24h)")
+        .option("--limit <n>", "Limit entries", (value) => Number.parseInt(value, 10))
+        .option("--skill <name>", "Show usage log for a skill")
+        .option("--source <source>", "Filter by event source")
+        .option("--command <path>", "Filter by command path")
+        .action(async (opts) => {
+        await logCommand({
+            json: Boolean(opts.json),
+            errors: Boolean(opts.errors),
+            since: typeof opts.since === "string" ? opts.since : undefined,
+            limit: Number.isFinite(opts.limit) ? opts.limit : undefined,
+            skill: typeof opts.skill === "string" ? opts.skill : undefined,
+            source: typeof opts.source === "string" ? opts.source : undefined,
+            command: typeof opts.command === "string" ? opts.command : undefined,
+        }, defaultRuntime);
+    });
+}

package/dist/cli/pairing-cli.js

@@ -15,7 +15,7 @@ const PROVIDERS = [
     "whatsapp",
 ];
 function parseProvider(raw) {
-    const value = String(raw ?? "")
+    const value = (typeof raw === "string" || typeof raw === "number" ? String(raw) : "")
         .trim()
         .toLowerCase();
     if (PROVIDERS.includes(value))

package/dist/cli/program.js

@@ -4,22 +4,24 @@ import { configViewCommand } from "../commands/config-view.js";
 import { identityCommand } from "../commands/identity.js";
 import { initCommand } from "../commands/init.js";
 import { questCommand } from "../commands/quest.js";
-import { suggestionsCommand } from "../commands/suggestions.js";
 import { statusCommand } from "../commands/status.js";
+import { suggestionsCommand } from "../commands/suggestions.js";
 import { updateCommand } from "../commands/update.js";
 import { isNixMode, migrateLegacyConfig, readConfigFileSnapshot, writeConfigFile, } from "../config/config.js";
 import { danger } from "../globals.js";
+import { recordCliCommandFinish, recordCliCommandStart, } from "../infra/event-log.js";
 import { defaultRuntime } from "../runtime.js";
 import { VERSION } from "../version.js";
-import { recordCliCommandFinish, recordCliCommandStart } from "../infra/event-log.js";
 import { registerCloudCommand } from "./cloud-cli.js";
 import { registerCredentialCli } from "./credential-cli.js";
 import { registerDnsCli } from "./dns-cli.js";
 import { registerGatewayCli } from "./gateway-cli.js";
+import { registerLogCli } from "./log-cli.js";
 import { registerSkillsCommand } from "./skills-cli.js";
 import { registerSkillsHubCommand } from "./skills-hub-cli.js";
 import { registerToolConnectorCli } from "./tool-connector-cli.js";
 import { registerUsageCli } from "./usage-cli.js";
+import { resolveIdentitySnapshot } from "../agents/identity-state.js";
 function buildCommandPath(cmd) {
     const parts = [];
     let current = cmd;
@@ -51,6 +53,19 @@ export function buildProgram() {
         });
         if (actionCommand.name() === "init")
             return;
+        const skipIdentityCheck = process.env.NODE_ENV === "test" || Boolean(process.env.VITEST);
+        if (!skipIdentityCheck && actionCommand.name() !== "status") {
+            const identity = resolveIdentitySnapshot();
+            if (!identity.ok) {
+                defaultRuntime.error("Multiple agents detected in state/agents.");
+                defaultRuntime.error(`Set NEXUS_AGENT_ID to one of: ${identity.agentOptions.join(", ")}`);
+                process.exit(2);
+            }
+            if (!identity.snapshot.hasIdentity) {
+                await statusCommand({ brief: true }, defaultRuntime);
+                process.exit(2);
+            }
+        }
         const snapshot = await readConfigFileSnapshot();
         if (snapshot.legacyIssues.length === 0)
             return;
@@ -79,41 +94,77 @@ export function buildProgram() {
         .option("--brief", "Compact output")
         .option("--capabilities", "Focus on capabilities")
         .option("--credentials", "Focus on credentials")
+        .option("--usage", "Focus on usage statistics")
+        .option("--quiet", "Minimal output, exit codes only")
         .action(async (opts) => {
         await statusCommand({
             json: Boolean(opts.json),
             brief: Boolean(opts.brief),
             capabilities: Boolean(opts.capabilities),
             credentials: Boolean(opts.credentials),
+            usage: Boolean(opts.usage),
+            quiet: Boolean(opts.quiet),
         }, defaultRuntime);
     });
     program
         .command("capabilities")
         .description("Show full capabilities map")
         .option("--json", "Output as JSON")
+        .option("--category <name>", "Filter to a category")
+        .option("--status <status>", "Filter by status")
+        .option("--compact", "Compact output")
         .action(async (opts) => {
-        await capabilitiesCommand({ json: Boolean(opts.json) }, defaultRuntime);
+        await capabilitiesCommand({
+            json: Boolean(opts.json),
+            category: opts.category ? String(opts.category) : undefined,
+            status: opts.status ? String(opts.status) : undefined,
+            compact: Boolean(opts.compact),
+        }, defaultRuntime);
     });
     program
         .command("map")
         .description("Alias for capabilities")
         .option("--json", "Output as JSON")
+        .option("--category <name>", "Filter to a category")
+        .option("--status <status>", "Filter by status")
+        .option("--compact", "Compact output")
         .action(async (opts) => {
-        await capabilitiesCommand({ json: Boolean(opts.json) }, defaultRuntime);
+        await capabilitiesCommand({
+            json: Boolean(opts.json),
+            category: opts.category ? String(opts.category) : undefined,
+            status: opts.status ? String(opts.status) : undefined,
+            compact: Boolean(opts.compact),
+        }, defaultRuntime);
     });
     program
         .command("quest")
         .description("Show onboarding quests")
         .option("--json", "Output as JSON")
+        .option("--list", "List all quests")
+        .option("--progress", "Show quest progress summary")
+        .option("--start <quest>", "Mark a quest as started")
+        .option("--secrets", "Include secret quests")
+        .option("--power-path", "Only show power-path quests")
+        .option("--quick-wins", "Only show quick wins")
         .action(async (opts) => {
-        await questCommand({ json: Boolean(opts.json) }, defaultRuntime);
+        await questCommand({
+            json: Boolean(opts.json),
+            list: Boolean(opts.list),
+            progress: Boolean(opts.progress),
+            start: opts.start ? String(opts.start) : undefined,
+            secrets: Boolean(opts.secrets),
+            powerPath: Boolean(opts.powerPath),
+            quickWins: Boolean(opts.quickWins),
+        }, defaultRuntime);
     });
     program
         .command("identity [target]")
         .description("Show identity files")
         .option("--json", "Output as JSON")
         .action(async (target, opts) => {
-        const normalized = target && (target === "user" || target === "agent") ? target : undefined;
+        const normalized = target && (target === "user" || target === "agent")
+            ? target
+            : undefined;
         await identityCommand({ target: normalized, json: Boolean(opts.json) }, defaultRuntime);
     });
     program
@@ -156,6 +207,7 @@ export function buildProgram() {
     registerCredentialCli(program);
     registerDnsCli(program);
     registerGatewayCli(program);
+    registerLogCli(program);
     registerToolConnectorCli(program);
     registerUsageCli(program);
     return program;

package/dist/cli/run-main.js

@@ -2,10 +2,10 @@ import process from "node:process";
 import { fileURLToPath } from "node:url";
 import { loadDotEnv } from "../infra/dotenv.js";
 import { normalizeEnv } from "../infra/env.js";
+import { initCliEventLogSession, recordCliCommandFailure, recordCliSessionEnd, registerAgentEventLogListener, } from "../infra/event-log.js";
 import { isMainModule } from "../infra/is-main.js";
 import { ensureNexusCliOnPath } from "../infra/path-env.js";
 import { assertSupportedRuntime } from "../infra/runtime-guard.js";
-import { initCliEventLogSession, recordCliCommandFailure, recordCliSessionEnd, registerAgentEventLogListener, } from "../infra/event-log.js";
 import { enableConsoleCapture } from "../logging.js";
 export async function runCli(argv = process.argv) {
     loadDotEnv({ quiet: true });

package/dist/cli/skills-cli.js

@@ -1,36 +1,129 @@
 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 { 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 { MANAGED_SKILLS_DIR, NEXUS_ROOT, 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("--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 entries = loadWorkspaceSkillEntries(workspaceDir, {
+            config,
+            managedSkillsDir: MANAGED_SKILLS_DIR,
+        });
+        const status = buildWorkspaceSkillStatus(workspaceDir, {
+            config,
+            managedSkillsDir: MANAGED_SKILLS_DIR,
+            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.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`);
@@ -42,6 +135,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 +143,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 +158,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,6 +175,23 @@ export function registerSkillsCommand(program) {
     });
     skill
         .command("use <name>")
+        .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("run <name>")
         .description("Run a skill command with arguments")
         .allowUnknownOption()
         .action(async (name, _opts, command) => {
@@ -126,7 +242,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"}`);
     });
 }