@opendatalabs/connect 0.8.1-canary.ff55fb0 → 0.9.0

package/dist/cli/index.js

@@ -1,41 +1,222 @@
 import fs from "node:fs";
 import fsp from "node:fs/promises";
 import path from "node:path";
+import { createRequire } from "node:module";
+import { spawn, execSync } from "node:child_process";
+import os from "node:os";
 import { confirm, input, password } from "@inquirer/prompts";
-import { Command } from "commander";
-import { CliOutcomeStatus, getBrowserProfilesDir, getConnectorCacheDir, getLastResultPath, readCliState, updateSourceState, } from "../core/index.js";
-import { listAvailableSources } from "../connectors/registry.js";
+import { searchSelect } from "./search-select.js";
+import { Command, CommanderError } from "commander";
+// Vana-branded theme for inquirer prompts — matches brand palette
+const VANA_BLUE = "\x1b[38;2;65;65;252m";
+const VANA_GREEN = "\x1b[38;2;0;213;11m";
+const VANA_MUTED = "\x1b[38;2;112;112;112m";
+const RESET = "\x1b[0m";
+const BOLD = "\x1b[1m";
+const BOLD_RESET = "\x1b[22m";
+const vanaPromptTheme = {
+    theme: {
+        prefix: { idle: `${VANA_BLUE}?${RESET}`, done: `${VANA_GREEN}✓${RESET}` },
+        style: {
+            answer: (text) => `${BOLD}${text}${BOLD_RESET}`,
+            message: (text, status) => status === "done" ? `${VANA_MUTED}${text}${RESET}` : text,
+            highlight: (text) => `${VANA_BLUE}${text}${RESET}`,
+            help: (text) => `${VANA_MUTED}${text}${RESET}`,
+            error: (text) => `\x1b[38;2;231;0;11m${text}${RESET}`,
+        },
+    },
+};
+import { createConnectRenderer, createHumanRenderer, formatDisplayPath, formatRelativeTime, } from "./render/index.js";
+import { CliOutcomeStatus, migrateLegacyDataHome, getBrowserProfilesDir, getConnectorCacheDir, getLogsDir, getSessionsDir, getSourceResultPath, readCliState, readCliConfig, updateCliConfig, updateSourceState, } from "../core/index.js";
+import { fetchConnectorToCache, listAvailableSources, readCachedConnectorMetadata, } from "../connectors/registry.js";
 import { detectPersonalServerTarget, ingestResult, } from "../personal-server/index.js";
 import { findDataConnectorsDir, ManagedPlaywrightRuntime, } from "../runtime/index.js";
+import { listAvailableSkills, installSkill, readInstalledSkills, } from "../skills/index.js";
+import { queryStatus, querySources, queryDataList, queryDataShow, queryDoctor, } from "./queries.js";
+import { readUpdateCheck, isNewerVersion, spawnUpdateCheck, } from "./update-check.js";
+function cleanDescription(desc) {
+    return desc
+        .replace(/ using Playwright browser automation\.?/i, ".")
+        .replace(/^Exports\b\s*(your\s+)?/i, "Your ");
+}
+const require = createRequire(import.meta.url);
 export async function runCli(argv = process.argv) {
+    // Migrate ~/.dataconnect → ~/.vana, symlink old path for DataConnect compat
+    if (migrateLegacyDataHome()) {
+        process.stderr.write("Moved your data to ~/.vana.\n\n");
+    }
     const normalizedArgv = normalizeArgv(argv);
+    if (normalizedArgv.length <= 2) {
+        normalizedArgv.push("--help");
+    }
     const parsedOptions = extractGlobalOptions(normalizedArgv);
+    const cliVersion = getCliVersion();
+    // Non-blocking update check — compute suppression flags early
+    const shouldNotify = !parsedOptions.json &&
+        process.stdout.isTTY &&
+        !process.env.VANA_NO_UPDATE_NOTIFIER &&
+        !process.env.CI &&
+        !process.env.AGENT &&
+        !process.env.VANA_DETACHED;
+    let updateNotice;
+    if (shouldNotify) {
+        try {
+            const cached = await readUpdateCheck();
+            if (cached && isNewerVersion(cliVersion, cached.latestVersion)) {
+                const lifecycle = getLifecycleCommands(getCliInstallMethod(), getCliChannel());
+                updateNotice = `\nUpdate available: ${cliVersion} → ${cached.latestVersion}\nRun: ${lifecycle.upgrade}\n`;
+            }
+            else if (!cached) {
+                // Cache missing or expired — spawn background check
+                spawnUpdateCheck(cliVersion, getCliInstallMethod());
+            }
+        }
+        catch {
+            // Suppress all errors — update check is purely informational
+        }
+    }
     const program = new Command();
-    program.name("vana").description("Vana Connect CLI");
     program
-        .command("connect <source>")
+        .name("vana")
+        .description("Connect sources, collect data, and inspect it locally.")
+        .version(cliVersion, "-v, --version", "Print CLI version")
+        .showSuggestionAfterError(true)
+        .addHelpText("after", `
+Quick start:
+  vana connect           Connect a source and collect data
+  vana sources           Browse available sources
+  vana status            Check system health
+
+Data:
+  vana data list         List collected datasets
+  vana data show <src>   Inspect a dataset
+
+Server:
+  vana server            Personal Server status and management
+
+Agent:
+  vana mcp               Start MCP server (for Claude Code, Cursor, etc.)
+  vana skills list         List available agent skills
+  vana skills install      Install a skill for your agent
+
+Background:
+  vana connect <src> --detach   Connect in the background
+  vana schedule add             Schedule daily collection
+  vana schedule list            Show scheduled tasks
+
+More:
+  vana doctor            Detailed diagnostics
+  vana logs [source]     View run logs
+  vana setup             Install or repair runtime
+`);
+    program.exitOverride();
+    program
+        .command("version")
+        .description("Print CLI version")
+        .option("--json", "Output machine-readable JSON")
+        .action(async () => {
+        if (parsedOptions.json) {
+            process.stdout.write(`${JSON.stringify({
+                cliVersion,
+                channel: getCliChannel(cliVersion),
+                installMethod: getCliInstallMethod(),
+            })}\n`);
+            process.exitCode = 0;
+            return;
+        }
+        process.stdout.write(`${cliVersion} (${getCliChannel(cliVersion)}, ${formatInstallMethodLabel(getCliInstallMethod()).toLowerCase()})\n`);
+        process.exitCode = 0;
+    });
+    const connectCommand = program
+        .command("connect [source]")
+        .description("Connect a source and collect data")
         .option("--json", "Output machine-readable JSON")
         .option("--no-input", "Fail instead of prompting for input")
+        .option("--ipc", "Use file-based IPC for credential prompts (for agents)")
         .option("--yes", "Approve safe setup prompts automatically")
         .option("--quiet", "Reduce non-essential output")
+        .option("--detach", "Run in the background")
         .action(async (source) => {
-        process.exitCode = await runConnect(source, parsedOptions);
+        if (parsedOptions.detach && source) {
+            process.exitCode = await runDetached("connect", source, parsedOptions);
+            return;
+        }
+        process.exitCode = source
+            ? await runConnect(source, parsedOptions)
+            : await runConnectEntry(parsedOptions);
     });
-    program
-        .command("sources")
-        .description("List supported sources")
+    connectCommand.addHelpText("after", `
+Examples:
+  vana connect
+  vana connect github
+  vana connect github --json --no-input
+  vana connect github --json --ipc
+`);
+    const sourcesCommand = program
+        .command("sources [source]")
+        .description("List supported sources, or show detail for one source")
         .option("--json", "Output machine-readable JSON")
-        .action(async () => {
-        process.exitCode = await runList(parsedOptions);
+        .action(async (source) => {
+        process.exitCode = source
+            ? await runSourceDetail(source, parsedOptions)
+            : await runList(parsedOptions);
     });
-    program
+    sourcesCommand.addHelpText("after", `
+Examples:
+  vana sources
+  vana sources github
+  vana sources --json | jq '.sources'
+`);
+    const collectCommand = program
+        .command("collect [source]")
+        .description("Re-collect data from a previously connected source")
+        .option("--json", "Output machine-readable JSON")
+        .option("--no-input", "Fail instead of prompting for input")
+        .option("--ipc", "Use file-based IPC for credential prompts (for agents)")
+        .option("--yes", "Approve safe setup prompts automatically")
+        .option("--quiet", "Reduce non-essential output")
+        .option("--detach", "Run in the background")
+        .option("--all", "Collect from all connected sources")
+        .action(async (source) => {
+        if (parsedOptions.detach && source) {
+            process.exitCode = await runDetached("collect", source, parsedOptions);
+            return;
+        }
+        process.exitCode = source
+            ? await runCollect(source, parsedOptions)
+            : await runCollectAll(parsedOptions);
+    });
+    collectCommand.addHelpText("after", `
+Examples:
+  vana collect github
+  vana collect
+  vana collect --json
+`);
+    const statusCommand = program
         .command("status")
         .description("Show runtime and Personal Server status")
         .option("--json", "Output machine-readable JSON")
         .action(async () => {
         process.exitCode = await runStatus(parsedOptions);
     });
-    program
+    statusCommand.addHelpText("after", `
+Examples:
+  vana status
+  vana status --json | jq
+`);
+    const doctorCommand = program
+        .command("doctor")
+        .description("Inspect local CLI, runtime, and install health")
+        .option("--json", "Output machine-readable JSON")
+        .action(async () => {
+        process.exitCode = await runDoctor(parsedOptions);
+    });
+    doctorCommand.addHelpText("after", `
+Examples:
+  vana doctor
+  vana doctor --json | jq
+`);
+    const setupCommand = program
         .command("setup")
         .description("Install or repair the local runtime")
         .option("--json", "Output machine-readable JSON")
@@ -43,43 +224,264 @@ export async function runCli(argv = process.argv) {
         .action(async () => {
         process.exitCode = await runSetup(parsedOptions);
     });
-    await program.parseAsync(normalizedArgv);
-    return Number(process.exitCode ?? 0);
+    setupCommand.addHelpText("after", `
+Examples:
+  vana setup
+  vana setup --yes
+`);
+    const data = program
+        .command("data")
+        .description("Inspect collected datasets, paths, and summaries");
+    data.addHelpText("after", `
+Examples:
+  vana data list
+  vana data show github
+  vana data path github --json
+`);
+    data.action(() => {
+        data.outputHelp();
+        process.exitCode = 0;
+    });
+    const dataListCommand = data
+        .command("list")
+        .description("List locally available collected datasets")
+        .option("--json", "Output machine-readable JSON")
+        .action(async () => {
+        process.exitCode = await runDataList(parsedOptions);
+    });
+    dataListCommand.addHelpText("after", `
+Examples:
+  vana data list
+  vana data list --json | jq '.datasets'
+`);
+    const dataShowCommand = data
+        .command("show <source>")
+        .description("Show a collected dataset")
+        .option("--json", "Output machine-readable JSON")
+        .action(async (source) => {
+        process.exitCode = await runDataShow(source, parsedOptions);
+    });
+    dataShowCommand.addHelpText("after", `
+Examples:
+  vana data show github
+  vana data show github --json | jq '.summary'
+`);
+    const dataPathCommand = data
+        .command("path <source>")
+        .description("Print the local path for a collected dataset")
+        .option("--json", "Output machine-readable JSON")
+        .action(async (source) => {
+        process.exitCode = await runDataPath(source, parsedOptions);
+    });
+    dataPathCommand.addHelpText("after", `
+Examples:
+  vana data path github
+  vana data path github --json | jq -r '.path'
+`);
+    const logsCommand = program
+        .command("logs [source]")
+        .description("Inspect stored connector run logs")
+        .option("--json", "Output machine-readable JSON")
+        .action(async (source) => {
+        process.exitCode = await runLogs(source, parsedOptions);
+    });
+    logsCommand.addHelpText("after", `
+Examples:
+  vana logs
+  vana logs github
+  vana logs github --json | jq
+`);
+    const server = program
+        .command("server")
+        .description("Manage Personal Server connection")
+        .option("--json", "Output machine-readable JSON");
+    server.addHelpText("after", `
+Examples:
+  vana server
+  vana server set-url http://localhost:8080
+  vana server set-url https://ps-abc123.server.vana.org
+  vana server clear-url
+`);
+    server.action(async () => {
+        process.exitCode = await runServerStatus(parsedOptions);
+    });
+    server
+        .command("status")
+        .description("Show Personal Server status")
+        .option("--json", "Output machine-readable JSON")
+        .action(async () => {
+        process.exitCode = await runServerStatus(parsedOptions);
+    });
+    server
+        .command("set-url <url>")
+        .description("Save a Personal Server URL")
+        .option("--json", "Output machine-readable JSON")
+        .action(async (url) => {
+        process.exitCode = await runServerSetUrl(url, parsedOptions);
+    });
+    server
+        .command("clear-url")
+        .description("Remove the saved Personal Server URL")
+        .option("--json", "Output machine-readable JSON")
+        .action(async () => {
+        process.exitCode = await runServerClearUrl(parsedOptions);
+    });
+    server
+        .command("sync")
+        .description("Sync all local-only datasets to your Personal Server")
+        .option("--json", "Output machine-readable JSON")
+        .action(async () => {
+        process.exitCode = await runServerSync(parsedOptions);
+    });
+    server
+        .command("data [scope]")
+        .description("List scopes stored in your Personal Server")
+        .option("--json", "Output machine-readable JSON")
+        .action(async (scope) => {
+        process.exitCode = await runServerData(scope, parsedOptions);
+    });
+    program
+        .command("mcp")
+        .description("Start MCP server for agent integration")
+        .action(async () => {
+        const { startMcpServer } = await import("./mcp-server.js");
+        await startMcpServer();
+    });
+    const skill = program
+        .command("skills")
+        .description("Manage agent skills")
+        .option("--json", "Output as JSON");
+    skill.addHelpText("after", `
+Examples:
+  vana skills list
+  vana skills install connect-data
+  vana skills show connect-data
+`);
+    skill.action(async () => {
+        process.exitCode = await runSkillsGuidedPicker(parsedOptions);
+    });
+    skill
+        .command("list")
+        .description("List available agent skills")
+        .option("--json", "Output as JSON")
+        .action(async () => {
+        process.exitCode = await runSkillList(parsedOptions);
+    });
+    skill
+        .command("install <name>")
+        .description("Install a skill for your agent")
+        .action(async (name) => {
+        process.exitCode = await runSkillInstall(name, parsedOptions);
+    });
+    skill
+        .command("show <name>")
+        .description("Show skill details")
+        .action(async (name) => {
+        process.exitCode = await runSkillShow(name, parsedOptions);
+    });
+    // --- Schedule commands ---
+    const schedule = program
+        .command("schedule")
+        .description("Manage scheduled data collection");
+    schedule.addHelpText("after", `
+Examples:
+  vana schedule add
+  vana schedule add --every 12h
+  vana schedule list
+  vana schedule remove
+`);
+    schedule.action(() => {
+        schedule.outputHelp();
+        process.exitCode = 0;
+    });
+    schedule
+        .command("add")
+        .description("Add a scheduled collection")
+        .option("--every <interval>", "Collection interval (e.g. 24h, 12h, 1h)", "24h")
+        .action(async (opts) => {
+        process.exitCode = await runScheduleAdd(opts.every, parsedOptions);
+    });
+    schedule
+        .command("list")
+        .description("Show scheduled tasks")
+        .option("--json", "Output machine-readable JSON")
+        .action(async () => {
+        process.exitCode = await runScheduleList(parsedOptions);
+    });
+    schedule
+        .command("remove")
+        .description("Remove the scheduled collection")
+        .action(async () => {
+        process.exitCode = await runScheduleRemove(parsedOptions);
+    });
+    try {
+        try {
+            await program.parseAsync(normalizedArgv);
+        }
+        catch (error) {
+            if (error instanceof CommanderError) {
+                if (error.code === "commander.help" ||
+                    error.code === "commander.helpDisplayed" ||
+                    error.code === "commander.version") {
+                    process.exitCode = error.exitCode;
+                    return Number(process.exitCode ?? 0);
+                }
+                // Commander already printed to stderr; just set exit code.
+                process.exitCode = error.exitCode;
+                return Number(process.exitCode ?? 1);
+            }
+            throw error;
+        }
+        return Number(process.exitCode ?? 0);
+    }
+    finally {
+        if (updateNotice)
+            process.stderr.write(updateNotice);
+    }
 }
-async function runConnect(source, options) {
+async function runConnect(rawSource, options) {
+    const source = rawSource.toLowerCase();
     const runtime = new ManagedPlaywrightRuntime();
     const emit = createEmitter(options);
+    const renderer = !options.json && !options.quiet ? createConnectRenderer() : null;
     const registrySources = await loadRegistrySources();
     const sourceLabels = createSourceLabelMap(registrySources);
+    const displayName = displaySource(source, sourceLabels);
     let setupLogPath;
     let fetchLogPath;
     let runLogPath;
+    let terminalExitCode = null;
     try {
-        emit.info(`Finding a connector for ${displaySource(source, sourceLabels)}...`);
+        // Title
+        renderer?.title(displayName);
         const target = await detectPersonalServerTarget();
+        // --- Phase 1: Runtime check (silent if installed) ---
         if (runtime.state !== "installed") {
-            emit.info(`Vana Connect needs a local browser runtime before it can connect ${displaySource(source, sourceLabels)}.`);
-            emit.info("");
-            emit.info("This will install:");
-            emit.info("- the connector runner");
-            emit.info("- a Chromium browser engine");
-            emit.info("- local runtime files under ~/.dataconnect/");
-            emit.info("");
-            emit.info("Your credentials stay on this machine. Nothing is sent anywhere except the platform you’re connecting to.");
+            if (options.noInput) {
+                emit.event({
+                    type: "outcome",
+                    status: CliOutcomeStatus.SETUP_REQUIRED,
+                    source,
+                });
+                renderer?.fail(`${displayName} needs a local browser runtime. Run without --no-input to install.`);
+                return 1;
+            }
             if (!options.yes) {
-                if (options.noInput) {
-                    emit.event({
-                        type: "outcome",
-                        status: CliOutcomeStatus.SETUP_REQUIRED,
-                        source,
-                    });
-                    return 1;
-                }
+                renderer?.cleanup();
+                process.stderr.write("\n");
+                process.stderr.write("Vana Connect needs a local browser runtime.\n\n");
+                process.stderr.write("This will install:\n");
+                process.stderr.write("  \u2022 Connector runner\n");
+                process.stderr.write("  \u2022 Chromium browser engine\n");
+                process.stderr.write("  \u2022 Local files under ~/.vana/\n\n");
+                process.stderr.write("Your credentials stay on this machine.\n\n");
                 const shouldContinue = await confirm({
                     message: "Continue?",
                     default: true,
+                    ...vanaPromptTheme,
                 });
                 if (!shouldContinue) {
+                    renderer?.fail("Cancelled.");
                     emit.event({
                         type: "outcome",
                         status: CliOutcomeStatus.SETUP_REQUIRED,
@@ -88,6 +490,7 @@ async function runConnect(source, options) {
                     });
                     return 1;
                 }
+                process.stderr.write("\n");
             }
             const installResult = await runtime.ensureInstalled(Boolean(options.yes));
             setupLogPath = installResult.logPath;
@@ -96,10 +499,7 @@ async function runConnect(source, options) {
                 runtime: installResult.runtime,
                 logPath: installResult.logPath,
             });
-            emit.info("Runtime ready.");
-            if (installResult.logPath) {
-                emit.info(`Setup log: ${installResult.logPath}`);
-            }
+            renderer?.scopeDone("Runtime ready");
         }
         else {
             emit.event({
@@ -107,7 +507,82 @@ async function runConnect(source, options) {
                 runtime: runtime.state,
             });
         }
-        const fetched = await runtime.fetchConnector(source);
+        // --- Phase 2: Connector fetch (silent if cached/fast) ---
+        const preState = await readCliState();
+        const currentVersion = preState.sources[source]?.connectorVersion;
+        let fetched;
+        try {
+            fetched = await runtime.fetchConnector(source, currentVersion);
+        }
+        catch (firstError) {
+            const firstMessage = firstError instanceof Error ? firstError.message : "";
+            const isChecksumError = firstMessage.toLowerCase().includes("checksum") ||
+                firstMessage.toLowerCase().includes("mismatch");
+            // Auto-retry on stale cache: clear cached connector and re-fetch
+            // from remote (skip local data-connectors dir which may be stale).
+            if (isChecksumError) {
+                try {
+                    const cacheDir = getConnectorCacheDir();
+                    const sourceCacheDir = path.join(cacheDir, source);
+                    await fsp.rm(sourceCacheDir, { recursive: true, force: true });
+                    const resolution = await fetchConnectorToCache(source, cacheDir, undefined);
+                    fetched = {
+                        connectorPath: resolution.connectorPath,
+                        logPath: "",
+                        version: resolution.version,
+                    };
+                }
+                catch (retryError) {
+                    const retryMessage = retryError instanceof Error
+                        ? retryError.message
+                        : `Could not fetch ${displayName} connector.`;
+                    const message = formatHumanSourceMessage(retryMessage, source, displayName);
+                    await updateSourceState(source, {
+                        connectorInstalled: false,
+                        lastRunAt: new Date().toISOString(),
+                        lastRunOutcome: CliOutcomeStatus.CONNECTOR_UNAVAILABLE,
+                        dataState: "none",
+                        lastError: message,
+                        lastResultPath: null,
+                        lastLogPath: getErrorLogPath(retryError),
+                    });
+                    renderer?.fail(`${displayName} connector could not be verified.`);
+                    renderer?.detail(`Try again later, or report: https://github.com/vana-com/data-connectors/issues`);
+                    emit.event({
+                        type: "outcome",
+                        status: CliOutcomeStatus.CONNECTOR_UNAVAILABLE,
+                        source,
+                        reason: message,
+                    });
+                    return 1;
+                }
+            }
+            else {
+                const message = formatHumanSourceMessage(firstMessage ||
+                    `No connector is available for ${displayName} right now.`, source, displayName);
+                await updateSourceState(source, {
+                    connectorInstalled: false,
+                    lastRunAt: new Date().toISOString(),
+                    lastRunOutcome: CliOutcomeStatus.CONNECTOR_UNAVAILABLE,
+                    dataState: "none",
+                    lastError: message,
+                    lastResultPath: null,
+                    lastLogPath: getErrorLogPath(firstError),
+                });
+                renderer?.fail(`${displayName} is not available.`);
+                renderer?.detail(`See what’s ready: vana sources`);
+                emit.event({
+                    type: "outcome",
+                    status: CliOutcomeStatus.CONNECTOR_UNAVAILABLE,
+                    source,
+                    reason: message,
+                });
+                return 1;
+            }
+        }
+        if (fetched.updated && fetched.previousVersion) {
+            emit.detail(`Updated connector (${fetched.previousVersion} → ${fetched.version}).`);
+        }
         fetchLogPath = fetched.logPath;
         const sourceDetails = registrySources.find((item) => item.id === source);
         const resolution = {
@@ -120,84 +595,161 @@ async function runConnect(source, options) {
             connectorPath: resolution.connectorPath,
             logPath: fetched.logPath,
         });
-        emit.info("Connector ready.");
-        if (sourceDetails?.description) {
-            emit.info(sourceDetails.description);
-        }
+        // --- Phase 3: Pre-connection validation (silent) ---
         const profilePath = path.join(getBrowserProfilesDir(), `${path.basename(resolution.connectorPath, path.extname(resolution.connectorPath))}`);
-        if (fs.existsSync(profilePath)) {
-            emit.info(`Found an existing ${displaySource(source, sourceLabels)} session. Trying that first...`);
+        if (sourceDetails?.authMode === "legacy" &&
+            !options.noInput &&
+            process.platform === "linux" &&
+            !process.env.DISPLAY &&
+            !process.env.WAYLAND_DISPLAY) {
+            const message = "This source needs a manual browser step, but no local display server is available.";
+            await updateSourceState(resolution.source, {
+                connectorInstalled: true,
+                sessionPresent: fs.existsSync(profilePath),
+                lastRunAt: new Date().toISOString(),
+                lastRunOutcome: CliOutcomeStatus.LEGACY_AUTH,
+                dataState: "none",
+                lastError: message,
+                lastResultPath: null,
+                lastLogPath: fetchLogPath ?? null,
+            });
+            renderer?.fail(`${displayName} requires a browser window, but no display is available.`);
+            renderer?.detail("Run this command in a desktop terminal.");
+            emit.event({
+                type: "outcome",
+                status: CliOutcomeStatus.LEGACY_AUTH,
+                source: resolution.source,
+                reason: "display_server_unavailable",
+            });
+            return 1;
         }
         await updateSourceState(resolution.source, {
             connectorInstalled: true,
             sessionPresent: fs.existsSync(profilePath),
             lastError: null,
+            lastLogPath: fetchLogPath ?? null,
         });
-        emit.info(`Connecting to ${displaySource(source, sourceLabels)}...`);
-        emit.info("Collecting your data...");
+        // --- Phase 4-5: Authentication + Collection ---
         let finalStatus = CliOutcomeStatus.UNEXPECTED_INTERNAL_ERROR;
-        let resultPath = getLastResultPath();
+        let finalDataState = "none";
+        let ingestFailureMessage = null;
+        let resultPath = getSourceResultPath(source);
         let collectedResult = false;
-        for await (const event of runtime.runConnector({
-            connectorPath: resolution.connectorPath,
-            source: resolution.source,
-            noInput: options.noInput,
-            onNeedInput: async (needInput) => {
-                emit.info("");
-                emit.info(`To connect ${displaySource(source, sourceLabels)}, Vana Connect will open a local browser session on this machine.`);
-                emit.info("Your credentials stay local.");
-                emit.info("");
-                emit.info(needInput.message ??
-                    `${displaySource(source, sourceLabels)} needs additional details to continue.`);
+        let ingestScopeResults;
+        // In IPC mode (--ipc), don’t provide an interactive callback.
+        // The runtime will write a pending-input file and poll for the
+        // response, letting an external agent handle credential collection.
+        const interactiveCallback = options.ipc
+            ? undefined
+            : async (needInput) => {
+                renderer?.pauseForPrompt();
+                // Show connector’s prompt message
+                if (renderer) {
+                    const promptMessage = needInput.message ?? `${displayName} needs your login.`;
+                    process.stderr.write(`\n${promptMessage}\n\n`);
+                }
                 const values = {};
-                for (const field of needInput.fields) {
-                    if (field.toLowerCase().includes("password")) {
-                        values[field] = await password({ message: humanizeField(field) });
+                try {
+                    for (const field of needInput.fields) {
+                        const isPasswordField = field.toLowerCase().includes("password");
+                        if (isPasswordField) {
+                            values[field] = await password({
+                                message: humanizeField(field),
+                                ...vanaPromptTheme,
+                            });
+                        }
+                        else {
+                            values[field] = await input({
+                                message: humanizeField(field),
+                                ...vanaPromptTheme,
+                            });
+                        }
                     }
-                    else {
-                        values[field] = await input({ message: humanizeField(field) });
+                }
+                catch (error) {
+                    if (isPromptCancelled(error)) {
+                        throw new Error("__vana_prompt_cancelled__");
                     }
+                    throw error;
+                }
+                if (renderer) {
+                    process.stderr.write("\n");
                 }
+                renderer?.resumeAfterPrompt();
                 return values;
-            },
+            };
+        for await (const event of runtime.runConnector({
+            connectorPath: resolution.connectorPath,
+            source: resolution.source,
+            noInput: options.ipc ? false : options.noInput,
+            onNeedInput: interactiveCallback,
         })) {
             emit.event(event);
             if (event.logPath) {
                 runLogPath = event.logPath;
             }
+            if (terminalExitCode !== null) {
+                continue;
+            }
             if (event.type === "needs-input") {
                 await updateSourceState(resolution.source, {
                     lastRunAt: new Date().toISOString(),
                     lastRunOutcome: CliOutcomeStatus.NEEDS_INPUT,
                     lastError: event.message ?? "Input required.",
+                    lastLogPath: event.logPath,
+                    connectionHealth: "needs_reauth",
                 });
                 emit.event({
                     type: "outcome",
                     status: CliOutcomeStatus.NEEDS_INPUT,
                     source: resolution.source,
                 });
-                if (!options.json) {
-                    emit.info(`${displaySource(source, sourceLabels)} needs additional input before it can connect.`);
-                    emit.info(`Next: run \`vana connect ${source}\` without \`--no-input\`.`);
+                renderer?.fail(`${displayName} needs credentials. Run without --no-input to authenticate.`);
+                terminalExitCode = 1;
+                continue;
+            }
+            if (event.type === "progress-update") {
+                // Drive the renderer with scope information from the event
+                const scopeName = extractScopeName(event);
+                if (scopeName && renderer) {
+                    const isComplete = typeof event.message === "string" &&
+                        /^complete\b/i.test(event.message.trim());
+                    if (isComplete) {
+                        const detail = formatScopeDetail(event);
+                        renderer.scopeDone(scopeName, detail);
+                    }
+                    else {
+                        renderer.scopeActive(scopeName);
+                    }
                 }
-                return 1;
+                continue;
+            }
+            if (event.type === "status-update") {
+                // Status updates are silent in the new design
+                continue;
             }
             if (event.type === "runtime-error") {
                 await updateSourceState(resolution.source, {
                     lastRunAt: new Date().toISOString(),
                     lastRunOutcome: CliOutcomeStatus.RUNTIME_ERROR,
                     lastError: event.message ?? "Connector run failed.",
+                    lastLogPath: event.logPath,
+                    connectionHealth: "error",
                 });
-                emit.info(event.message ?? "Connector run failed.");
+                renderer?.fail(`Problem connecting ${displayName}.`);
+                renderer?.detail(event.message ?? "Connector run failed.");
+                renderer?.detail(`Retry: vana connect ${source}`);
                 emit.event({
                     type: "outcome",
                     status: CliOutcomeStatus.RUNTIME_ERROR,
                     source: resolution.source,
                 });
-                if (event.logPath) {
-                    emit.info(`Run log: ${event.logPath}`);
-                }
-                return 1;
+                terminalExitCode = 1;
+                continue;
+            }
+            if (event.type === "headed-required") {
+                // Silent — the browser opens automatically
+                continue;
             }
             if (event.type === "legacy-auth") {
                 await updateSourceState(resolution.source, {
@@ -205,33 +757,97 @@ async function runConnect(source, options) {
                     lastRunOutcome: CliOutcomeStatus.LEGACY_AUTH,
                     lastError: event.message ?? "Legacy authentication is required.",
                     dataState: "none",
+                    lastResultPath: null,
+                    lastLogPath: event.logPath,
+                    connectionHealth: "needs_reauth",
                 });
-                emit.info(event.message ??
-                    "This connector requires legacy headed authentication that is not available in batch mode.");
-                emit.info(`Next: establish a reusable ${displaySource(source, sourceLabels)} session manually, or migrate this connector to requestInput.`);
-                if (event.logPath) {
-                    emit.info(`Run log: ${event.logPath}`);
-                }
+                renderer?.fail(`Manual step required for ${displayName}.`);
+                renderer?.detail(`Complete the browser step locally, then rerun vana connect ${source}.`);
                 emit.event({
                     type: "outcome",
                     status: CliOutcomeStatus.LEGACY_AUTH,
                     source: resolution.source,
                 });
-                return 1;
+                terminalExitCode = 1;
+                continue;
             }
             if (event.type === "collection-complete" && event.resultPath) {
+                // Check if the result is actually an error object
+                try {
+                    const raw = await fsp.readFile(event.resultPath, "utf8");
+                    const parsed = JSON.parse(raw);
+                    if (parsed &&
+                        typeof parsed === "object" &&
+                        "error" in parsed &&
+                        Object.keys(parsed).length <= 2) {
+                        // Connector returned an error, not real data
+                        await updateSourceState(source, {
+                            lastRunAt: new Date().toISOString(),
+                            lastRunOutcome: CliOutcomeStatus.RUNTIME_ERROR,
+                            connectionHealth: "error",
+                            lastError: typeof parsed.error === "string"
+                                ? parsed.error
+                                : "Collection returned an error",
+                            lastLogPath: runLogPath ?? fetchLogPath,
+                        });
+                        renderer?.fail(`Problem connecting ${displayName}.`);
+                        renderer?.detail(typeof parsed.error === "string"
+                            ? parsed.error
+                            : "The connector returned an error instead of data.");
+                        emit.event({
+                            type: "outcome",
+                            status: CliOutcomeStatus.RUNTIME_ERROR,
+                            source,
+                        });
+                        terminalExitCode = 1;
+                        continue;
+                    }
+                }
+                catch {
+                    // Can't read/parse result — proceed normally, let downstream handle it
+                }
                 collectedResult = true;
                 resultPath = event.resultPath;
                 const ingestEvents = await ingestResult(resolution.source, resultPath, target);
                 for (const ingestEvent of ingestEvents) {
                     emit.event(ingestEvent);
                 }
+                const scopeResults = ingestEvents.find((e) => e.type === "ingest-complete" ||
+                    e.type === "ingest-partial" ||
+                    e.type === "ingest-failed")?.scopeResults;
                 const ingestCompleted = ingestEvents.some((ingestEvent) => ingestEvent.type === "ingest-complete");
-                finalStatus = ingestCompleted
-                    ? CliOutcomeStatus.CONNECTED_AND_INGESTED
-                    : CliOutcomeStatus.CONNECTED_LOCAL_ONLY;
+                const ingestPartial = ingestEvents.some((ingestEvent) => ingestEvent.type === "ingest-partial");
+                const ingestFailedEvent = ingestEvents.find((ingestEvent) => ingestEvent.type === "ingest-failed");
+                if (ingestCompleted) {
+                    finalStatus = CliOutcomeStatus.CONNECTED_AND_INGESTED;
+                    finalDataState = "ingested_personal_server";
+                }
+                else if (ingestPartial) {
+                    finalStatus = CliOutcomeStatus.CONNECTED_AND_INGESTED;
+                    finalDataState = "ingested_personal_server";
+                }
+                else if (ingestFailedEvent?.type === "ingest-failed") {
+                    finalStatus = CliOutcomeStatus.INGEST_FAILED;
+                    finalDataState = "ingest_failed";
+                    ingestFailureMessage =
+                        ingestFailedEvent.message ?? "Personal Server sync failed.";
+                }
+                else {
+                    finalStatus = CliOutcomeStatus.CONNECTED_LOCAL_ONLY;
+                    finalDataState = "collected_local";
+                }
+                // Store per-scope results in state
+                ingestScopeResults = scopeResults?.map((r) => ({
+                    scope: r.scope,
+                    status: r.status,
+                    syncedAt: r.status === "stored" ? new Date().toISOString() : undefined,
+                    error: r.error,
+                }));
             }
         }
+        if (terminalExitCode !== null) {
+            return terminalExitCode;
+        }
         if (!collectedResult) {
             await updateSourceState(resolution.source, {
                 connectorInstalled: true,
@@ -240,51 +856,87 @@ async function runConnect(source, options) {
                 lastRunOutcome: CliOutcomeStatus.UNEXPECTED_INTERNAL_ERROR,
                 dataState: "none",
                 lastError: "Connector run ended without a result.",
+                lastResultPath: null,
+                lastLogPath: runLogPath ?? fetchLogPath ?? null,
             });
+            renderer?.fail(`Problem connecting ${displayName}.`);
+            renderer?.detail("Connector run ended without a result.");
             emit.event({
                 type: "outcome",
                 status: CliOutcomeStatus.UNEXPECTED_INTERNAL_ERROR,
                 source: resolution.source,
                 reason: "Connector run ended without a result.",
             });
-            if (runLogPath) {
-                emit.info(`Run log: ${runLogPath}`);
-            }
             return 1;
         }
-        const dataState = finalStatus === CliOutcomeStatus.CONNECTED_AND_INGESTED
-            ? "ingested_personal_server"
-            : "collected_local";
         await updateSourceState(resolution.source, {
             connectorInstalled: true,
+            connectorVersion: fetched.version,
+            exportFrequency: fetched.exportFrequency,
             sessionPresent: true,
             lastRunAt: new Date().toISOString(),
+            lastCollectedAt: new Date().toISOString(),
             lastRunOutcome: finalStatus,
-            dataState,
-            lastError: null,
+            dataState: finalDataState,
+            lastError: ingestFailureMessage,
+            lastResultPath: resultPath,
+            lastLogPath: runLogPath ?? fetchLogPath ?? setupLogPath ?? null,
+            connectionHealth: "healthy",
+            ingestScopes: ingestScopeResults,
         });
-        if (finalStatus === CliOutcomeStatus.CONNECTED_AND_INGESTED) {
-            emit.info(`Connected ${displaySource(source, sourceLabels)}.`);
-            emit.info(`Collected your ${displaySource(source, sourceLabels)} data and synced it to your Personal Server.`);
+        // Build scope-aware success summary
+        const storedCount = ingestScopeResults?.filter((r) => r.status === "stored").length ?? 0;
+        const failedCount = ingestScopeResults?.filter((r) => r.status === "failed").length ?? 0;
+        const totalScopes = ingestScopeResults?.length ?? 0;
+        let successSummary;
+        if (finalStatus === CliOutcomeStatus.CONNECTED_AND_INGESTED &&
+            totalScopes > 0) {
+            if (failedCount === 0) {
+                successSummary = `Collected your ${displayName} data and synced it to your Personal Server.`;
+            }
+            else {
+                successSummary = `Collected your ${displayName} data. ${storedCount}/${totalScopes} scopes synced, ${failedCount} failed.`;
+            }
+        }
+        else if (finalStatus === CliOutcomeStatus.CONNECTED_AND_INGESTED) {
+            successSummary = `Collected your ${displayName} data and synced it to your Personal Server.`;
         }
         else {
-            if (target.state !== "available") {
-                emit.info(`No Personal Server is available right now, so your ${displaySource(source, sourceLabels)} data was saved locally.`);
-            }
-            emit.info(`Connected ${displaySource(source, sourceLabels)}.`);
-            emit.info(`Collected your ${displaySource(source, sourceLabels)} data and saved it locally.`);
-            emit.info(`Local result: ${resultPath}`);
+            successSummary = `Collected your ${displayName} data and saved it locally.`;
+        }
+        // Auto-schedule collection if no schedule exists (non-blocking)
+        await maybeAutoSchedule(fetched.exportFrequency ?? sourceDetails?.exportFrequency, emit, options).catch(() => { });
+        // --- Phase 7: Success summary ---
+        renderer?.success(`Connected ${displayName}.`);
+        renderer?.detail(successSummary);
+        // Partial sync guidance
+        if (failedCount > 0 && storedCount > 0) {
+            renderer?.detail(`Retry: vana server sync`);
         }
-        if (runLogPath) {
-            emit.info(`Run log: ${runLogPath}`);
+        // Journey-aware next step
+        const state = await readCliState();
+        const connectedSourceCount = Object.values(state.sources ?? {}).filter((s) => hasCollectedData(s?.dataState)).length;
+        renderer?.detail("");
+        if (connectedSourceCount > 1) {
+            renderer?.next("vana sources");
         }
-        else if (fetchLogPath) {
-            emit.info(`Fetch log: ${fetchLogPath}`);
+        else {
+            renderer?.next(`vana data show ${source}`);
+        }
+        // Suggest skills if not yet installed
+        const installedSkills = await readInstalledSkills();
+        if (installedSkills.length === 0) {
+            renderer?.detail("Your coding agent can use this data — run `vana skills` to see how.");
         }
-        else if (setupLogPath) {
-            emit.info(`Setup log: ${setupLogPath}`);
+        renderer?.bell();
+        // Offer skill install on first successful connect (ask once)
+        if (!state.config?.skillsPromptCompleted &&
+            !options.json &&
+            !options.noInput &&
+            process.stdin.isTTY) {
+            await maybePromptSkillInstall(emit);
         }
-        emit.info("Next: run `vana status` to inspect your current connection state.");
+        // Emit for --json consumers (unchanged)
         emit.event({
             type: "outcome",
             status: finalStatus,
@@ -294,95 +946,529 @@ async function runConnect(source, options) {
         return 0;
     }
     catch (error) {
+        if (error instanceof Error &&
+            error.message === "__vana_prompt_cancelled__") {
+            await updateSourceState(source, {
+                lastRunAt: new Date().toISOString(),
+                lastRunOutcome: CliOutcomeStatus.NEEDS_INPUT,
+                lastError: "Cancelled before input was completed.",
+                lastLogPath: runLogPath ?? null,
+            });
+            renderer?.fail("Cancelled.");
+            emit.event({
+                type: "outcome",
+                status: CliOutcomeStatus.NEEDS_INPUT,
+                source,
+                reason: "prompt_cancelled",
+            });
+            return 1;
+        }
         const message = error instanceof Error ? error.message : "Unexpected error.";
-        emit.info(message);
+        renderer?.fail(`Problem connecting ${displayName}.`);
+        renderer?.detail(message);
+        renderer?.detail(`Retry: vana connect ${source}`);
         emit.event({
             type: "outcome",
             status: CliOutcomeStatus.UNEXPECTED_INTERNAL_ERROR,
             source,
             reason: message,
         });
-        if (runLogPath) {
-            emit.info(`Run log: ${runLogPath}`);
-        }
-        else if (fetchLogPath) {
-            emit.info(`Fetch log: ${fetchLogPath}`);
-        }
-        else if (setupLogPath) {
-            emit.info(`Setup log: ${setupLogPath}`);
-        }
         return 1;
     }
+    finally {
+        renderer?.cleanup();
+    }
 }
-async function runList(options) {
+async function runConnectEntry(options) {
+    const emit = createEmitter(options);
     const sources = await loadRegistrySources();
-    const installedSourceIds = new Set((await listInstalledConnectorFiles()).map((source) => source.source));
-    const enrichedSources = sources.map((source) => ({
-        ...source,
-        installed: installedSourceIds.has(source.id),
-    }));
+    const state = await readCliState();
+    const sourceMetadata = createSourceMetadataMap(sources);
+    const statuses = await gatherSourceStatuses(state.sources, sourceMetadata);
+    const statusMap = new Map(statuses.map((source) => [source.source, source]));
+    const enrichedSources = sources.map((source) => {
+        const status = statusMap.get(source.id);
+        return {
+            ...source,
+            dataState: status?.dataState,
+            lastRunOutcome: status?.lastRunOutcome ?? null,
+            sessionPresent: status?.sessionPresent ?? false,
+        };
+    });
+    const suggestedSource = enrichedSources.find((source) => source.authMode !== "legacy" && !hasCollectedData(source.dataState)) ??
+        enrichedSources.find((source) => source.authMode !== "legacy") ??
+        enrichedSources[0];
+    const missingSourceMessage = formatMissingConnectSourceMessage(suggestedSource);
     if (options.json) {
-        process.stdout.write(`${JSON.stringify({ sources: enrichedSources })}\n`);
+        process.stdout.write(`${JSON.stringify({
+            error: "source_required",
+            message: missingSourceMessage,
+            suggestedSource: suggestedSource
+                ? {
+                    id: suggestedSource.id,
+                    name: suggestedSource.name,
+                    authMode: suggestedSource.authMode,
+                }
+                : null,
+        })}\n`);
+        return 1;
+    }
+    if (options.noInput) {
+        emit.info(missingSourceMessage);
+        return 1;
+    }
+    if (!process.stdin.isTTY || !process.stdout.isTTY) {
+        emit.info(missingSourceMessage);
+        return 1;
+    }
+    if (enrichedSources.length === 0) {
+        emit.info("No sources are available right now.");
+        emit.info("Run `vana sources` to verify the local connector registry.");
+        return 1;
+    }
+    // Build inquirer-compatible choices from enriched sources
+    const choices = enrichedSources.map((item) => {
+        const connected = hasCollectedData(item.dataState);
+        const hint = connected
+            ? "connected"
+            : item.authMode === "legacy"
+                ? "browser login"
+                : undefined;
+        return {
+            value: item.id,
+            name: item.name,
+            description: hint,
+        };
+    });
+    try {
+        const source = await searchSelect({
+            message: "Choose a source to connect.",
+            choices,
+            ...vanaPromptTheme,
+        });
+        return runConnect(source, options);
+    }
+    catch (error) {
+        if (isPromptCancelled(error)) {
+            emit.info("Cancelled.");
+            return 1;
+        }
+        throw error;
+    }
+}
+async function runList(options) {
+    const result = await querySources();
+    const { sources: enrichedSources, recommendedSource } = result;
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify(result)}\n`);
         return 0;
     }
     const emit = createEmitter(options);
-    for (const source of enrichedSources) {
-        const description = source.description ? ` - ${source.description}` : "";
-        const installed = source.installed ? " [installed]" : "";
-        emit.info(`${source.name}${installed}${description}`);
+    emit.title("Available sources");
+    emit.blank();
+    if (enrichedSources.length === 0) {
+        emit.info("No sources are available right now.");
+    }
+    else {
+        const connectedSources = enrichedSources.filter((source) => hasCollectedData(source.dataState));
+        const unconnectedSources = enrichedSources.filter((source) => !hasCollectedData(source.dataState));
+        // Connected sources are always shown expanded
+        if (connectedSources.length > 0) {
+            emit.section("Connected");
+            for (const source of connectedSources) {
+                const badges = [];
+                if (source.dataState === "ingested_personal_server") {
+                    badges.push({ text: "synced", tone: "success" });
+                }
+                else if (source.dataState === "ingest_failed") {
+                    badges.push({ text: "sync failed", tone: "warning" });
+                }
+                else {
+                    badges.push({ text: "local", tone: "muted" });
+                }
+                emit.sourceTitle(source.name, badges);
+                emit.detail(`Inspect with ${emit.code(`vana data show ${source.id}`)}.`);
+            }
+            emit.blank();
+            emit.section("Available");
+        }
+        for (const source of unconnectedSources) {
+            const badges = [];
+            if (recommendedSource?.id === source.id &&
+                recommendedSource.authMode !== "legacy") {
+                badges.push({ text: "recommended", tone: "accent" });
+            }
+            emit.sourceTitle(source.name, badges);
+            if (source.description) {
+                emit.detail(cleanDescription(source.description));
+            }
+        }
+        if (recommendedSource) {
+            emit.blank();
+            emit.next(`vana connect ${recommendedSource.id}`);
+        }
     }
     return 0;
 }
 async function runStatus(options) {
-    const emit = createEmitter(options);
-    const runtime = new ManagedPlaywrightRuntime();
-    const personalServer = await detectPersonalServerTarget();
+    const { status, nextSteps } = await queryStatus();
     const state = await readCliState();
-    const registrySources = await loadRegistrySources();
-    const sourceLabels = createSourceLabelMap(registrySources);
-    const sourceMetadata = createSourceMetadataMap(registrySources);
-    const sources = await gatherSourceStatuses(state.sources, sourceMetadata);
-    const status = {
-        runtime: runtime.state,
-        runtimePath: runtime.state === "installed" ? runtime.runnerDir : null,
-        personalServer: personalServer.state,
-        personalServerUrl: personalServer.url,
-        sources,
-    };
+    // Build per-source health map from stored state
+    const sourceHealthMap = {};
+    for (const [sourceId, stored] of Object.entries(state.sources)) {
+        if (stored) {
+            sourceHealthMap[sourceId] = {
+                connectionHealth: stored.connectionHealth,
+                lastCollectedAt: stored.lastCollectedAt,
+            };
+        }
+    }
     if (options.json) {
-        process.stdout.write(`${JSON.stringify(status)}\n`);
+        const compactJson = {
+            runtime: status.runtime,
+            personalServer: status.personalServer,
+            personalServerUrl: status.personalServerUrl,
+            sources: {
+                connected: status.summary?.connectedCount ?? 0,
+                needsAttention: status.summary?.needsAttentionCount ?? 0,
+            },
+            sourceHealth: sourceHealthMap,
+            next: nextSteps[0] ?? null,
+        };
+        process.stdout.write(`${JSON.stringify(compactJson)}\n`);
         return 0;
     }
-    emit.info("Vana Connect status");
-    emit.info("");
-    emit.info(`Runtime: ${status.runtime}`);
-    emit.info(`Personal Server: ${status.personalServer}`);
-    emit.info("");
-    for (const source of status.sources) {
-        emit.info(formatSourceStatus(source, sourceLabels));
-        const details = formatSourceStatusDetail(source);
-        if (details) {
-            emit.info(`  ${details}`);
+    const emit = createEmitter(options);
+    const registrySources = await loadRegistrySources();
+    const sourceLabels = createSourceLabelMap(registrySources);
+    emit.title("Vana Connect");
+    emit.blank();
+    emit.keyValue("Runtime", status.runtime, toneForRuntime(status.runtime));
+    if (status.personalServer === "available") {
+        emit.keyValue("Personal Server", status.personalServerUrl ?? "connected", "success");
+    }
+    else {
+        emit.keyValue("Personal Server", "not connected", "warning");
+    }
+    const connectedCount = status.summary?.connectedCount ?? 0;
+    const attentionCount = status.summary?.needsAttentionCount ?? 0;
+    const sourceParts = [
+        connectedCount > 0 ? `${connectedCount} connected` : "none connected",
+        ...(connectedCount > 0 && attentionCount > 0
+            ? [`${attentionCount} need${attentionCount === 1 ? "s" : ""} attention`]
+            : []),
+    ];
+    emit.keyValue("Sources", sourceParts.join(", "), attentionCount > 0 && connectedCount > 0
+        ? "warning"
+        : connectedCount > 0
+            ? "success"
+            : "muted");
+    // Show per-source health when sources are connected
+    const connectedSources = Object.entries(state.sources).filter(([, stored]) => stored?.connectorInstalled &&
+        (stored.dataState === "collected_local" ||
+            stored.dataState === "ingested_personal_server" ||
+            stored.dataState === "ingest_failed" ||
+            stored.connectionHealth));
+    if (connectedSources.length > 0) {
+        emit.blank();
+        let needsReauthSource = null;
+        for (const [sourceId, stored] of connectedSources) {
+            const health = stored?.connectionHealth ?? "healthy";
+            const displayName = displaySource(sourceId, sourceLabels);
+            const sourceStatus = status.sources.find((s) => s.source === sourceId);
+            const sourceOverdue = sourceStatus?.isOverdue ?? false;
+            const healthTone = sourceOverdue ? "warning" : toneForHealth(health);
+            const healthLabel = health === "needs_reauth" ? "needs login" : health;
+            const staleTag = sourceOverdue
+                ? ` ${emit.badge("stale", "warning")}`
+                : "";
+            const collectedAgo = stored?.lastCollectedAt
+                ? `collected ${formatRelativeTime(stored.lastCollectedAt)}`
+                : "";
+            emit.keyValue(`  ${displayName}`, `${healthLabel}${staleTag}     ${collectedAgo}`, healthTone);
+            if (health === "needs_reauth" && !needsReauthSource) {
+                needsReauthSource = sourceId;
+            }
+        }
+        if (needsReauthSource) {
+            emit.blank();
+            emit.next(`vana connect ${needsReauthSource}`);
+            return 0;
+        }
+    }
+    if (nextSteps.length > 0) {
+        emit.blank();
+        const command = extractCommand(nextSteps[0]);
+        if (command) {
+            emit.next(command);
+        }
+        else {
+            emit.detail(`Next: ${nextSteps[0]}`);
         }
     }
     return 0;
 }
-async function runSetup(options) {
-    const emit = createEmitter(options);
-    const runtime = new ManagedPlaywrightRuntime();
-    if (runtime.state === "installed") {
-        emit.info("Vana Connect runtime is already installed.");
-        emit.event({ type: "setup-check", runtime: runtime.state });
+async function runDoctor(options) {
+    const payload = await queryDoctor();
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify(payload)}\n`);
         return 0;
     }
-    try {
-        const result = await runtime.ensureInstalled(Boolean(options.yes));
-        emit.info("Runtime ready.");
-        if (result.logPath) {
-            emit.info(`Setup log: ${result.logPath}`);
-        }
-        emit.event({
-            type: "setup-complete",
+    const sourceLabels = createSourceLabelMap(await loadRegistrySources());
+    const { recentSources } = payload;
+    const attentionSources = recentSources.filter((source) => rankSourceStatus(source) <= 4);
+    const emit = createEmitter(options);
+    emit.title("Vana Connect doctor");
+    emit.section("Summary");
+    emit.keyValue("CLI", payload.cliVersion, "muted");
+    emit.keyValue("Channel", payload.channel, "muted");
+    emit.keyValue("Install", formatInstallMethodLabel(payload.installMethod), "muted");
+    emit.keyValue("Runtime", payload.runtime, toneForRuntime(payload.runtime));
+    emit.keyValue("Personal Server", payload.personalServer, payload.personalServer === "available" ? "success" : "warning");
+    emit.keyValue("Tracked sources", String(payload.summary.trackedSourceCount), "muted");
+    emit.keyValue("Attention", String(payload.summary.attentionCount), payload.summary.attentionCount > 0 ? "warning" : "muted");
+    emit.keyValue("Connected", String(payload.summary.connectedCount), payload.summary.connectedCount > 0 ? "success" : "muted");
+    emit.blank();
+    emit.section("Checks");
+    for (const check of payload.checks) {
+        const tone = check.status === "ok"
+            ? "success"
+            : check.status === "warn"
+                ? "warning"
+                : "error";
+        emit.keyValue(check.label, check.detail, tone);
+    }
+    if (recentSources.length > 0) {
+        emit.blank();
+        emit.section(attentionSources.length > 0
+            ? "Needs attention"
+            : "Recent source activity");
+        for (const source of attentionSources.length > 0
+            ? attentionSources
+            : recentSources) {
+            const status = getSourceStatusPresentation(source);
+            const badges = [];
+            badges.push({ text: status.label, tone: status.tone });
+            emit.sourceTitle(displaySource(source.source, sourceLabels), badges);
+            const details = formatSourceStatusDetails(source);
+            for (const detail of details) {
+                if (detail.kind === "row") {
+                    emit.keyValue(detail.label, detail.value, detail.tone ?? "muted");
+                }
+                else {
+                    emit.detail(humanizeIssue(detail.message));
+                }
+            }
+        }
+    }
+    emit.blank();
+    emit.section("Paths");
+    emit.keyValue("Executable", formatDisplayPath(payload.paths.executable), "muted");
+    if (payload.paths.appRoot) {
+        emit.keyValue("App root", formatDisplayPath(payload.paths.appRoot), "muted");
+    }
+    emit.keyValue("Data home", formatDisplayPath(payload.paths.dataHome), "muted");
+    emit.keyValue("State file", formatDisplayPath(payload.paths.stateFile), "muted");
+    emit.keyValue("Connector cache", formatDisplayPath(payload.paths.connectorCache), "muted");
+    emit.keyValue("Browser profiles", formatDisplayPath(payload.paths.browserProfiles), "muted");
+    emit.keyValue("Logs", formatDisplayPath(payload.paths.logs), "muted");
+    emit.blank();
+    emit.section("Lifecycle");
+    emit.keyValue("Upgrade", payload.lifecycle.upgrade, "muted");
+    emit.keyValue("Uninstall", payload.lifecycle.uninstall, "muted");
+    if (payload.nextSteps.length > 0) {
+        emit.blank();
+        const command = extractCommand(payload.nextSteps[0]);
+        if (command) {
+            emit.next(command);
+        }
+        else {
+            emit.detail(`Next: ${payload.nextSteps[0]}`);
+        }
+    }
+    return 0;
+}
+async function runServerStatus(options) {
+    const emit = createEmitter(options);
+    const target = await detectPersonalServerTarget();
+    const state = await readCliState();
+    // Count scopes from state
+    let totalScopeCount = 0;
+    for (const stored of Object.values(state.sources)) {
+        if (stored?.ingestScopes) {
+            totalScopeCount += stored.ingestScopes.filter((s) => s.status === "stored").length;
+        }
+    }
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify({
+            state: target.state,
+            url: target.url,
+            source: target.source,
+            health: target.health,
+            scopeCount: totalScopeCount,
+        })}\n`);
+        return 0;
+    }
+    emit.title("Personal Server");
+    emit.blank();
+    if (target.url) {
+        const urlSuffix = target.source === "scan"
+            ? "(auto-detected)"
+            : target.source === "config"
+                ? "(saved)"
+                : target.source === "env"
+                    ? "(from VANA_PERSONAL_SERVER_URL)"
+                    : `(${target.source ?? "unknown"})`;
+        emit.keyValue("URL", `${target.url} ${urlSuffix}`, "muted");
+    }
+    const stateLabel = target.state === "available" ? "healthy" : "Not connected";
+    emit.keyValue("Status", stateLabel, target.state === "available" ? "success" : "warning");
+    if (target.health) {
+        emit.keyValue("Version", target.health.version, "muted");
+    }
+    if (totalScopeCount > 0) {
+        emit.keyValue("Scopes", `${totalScopeCount} stored`, "muted");
+    }
+    if (target.source && !target.url) {
+        const sourceLabel = {
+            config: "Saved config",
+            env: "VANA_PERSONAL_SERVER_URL",
+            scan: "Localhost scan",
+        };
+        emit.keyValue("Resolved via", sourceLabel[target.source] ?? target.source, "muted");
+    }
+    if (target.health) {
+        emit.keyValue("Uptime", formatUptime(target.health.uptime), "muted");
+        if (target.health.owner) {
+            emit.keyValue("Owner", target.health.owner, "muted");
+        }
+    }
+    if (target.source === "scan" && target.url) {
+        emit.blank();
+        emit.detail(`Save with ${emit.code(`vana server set-url ${target.url}`)}.`);
+    }
+    if (target.state !== "available") {
+        emit.blank();
+        emit.next("vana server set-url <url>");
+    }
+    emit.blank();
+    emit.detail(`More: ${emit.code("vana server sync")} | ${emit.code("vana server data")} | ${emit.code("vana server --help")}`);
+    return 0;
+}
+async function runServerSetUrl(url, options) {
+    const emit = createEmitter(options);
+    try {
+        new URL(url);
+    }
+    catch {
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({ ok: false, error: "Invalid URL" })}\n`);
+        }
+        else {
+            emit.info(`Invalid URL: ${url}`);
+        }
+        return 1;
+    }
+    await updateCliConfig({ personalServerUrl: url });
+    const target = await detectPersonalServerTarget();
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify({
+            ok: true,
+            url,
+            reachable: target.state === "available",
+            health: target.health,
+        })}\n`);
+        return 0;
+    }
+    emit.info(`Saved Personal Server URL: ${url}`);
+    if (target.state === "available") {
+        emit.info(`Server is reachable (${target.health?.version ?? "unknown version"}).`);
+    }
+    else {
+        emit.info("Server is not reachable yet. It will be used when available.");
+    }
+    return 0;
+}
+async function runServerClearUrl(options) {
+    const emit = createEmitter(options);
+    const config = await readCliConfig();
+    if (!config.personalServerUrl) {
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({ ok: true, cleared: false })}\n`);
+        }
+        else {
+            const target = await detectPersonalServerTarget();
+            if (target.source === "scan" && target.url) {
+                emit.info("No saved URL to clear. Current connection is auto-detected on localhost.");
+                emit.info(`Run ${emit.code("vana server set-url <url>")} to save a specific URL.`);
+            }
+            else {
+                emit.info("No saved Personal Server URL to clear.");
+            }
+        }
+        return 0;
+    }
+    await updateCliConfig({ personalServerUrl: undefined });
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify({ ok: true, cleared: true })}\n`);
+    }
+    else {
+        emit.info("Cleared saved Personal Server URL.");
+    }
+    return 0;
+}
+export function formatUptime(seconds) {
+    if (seconds < 60)
+        return `${Math.round(seconds)}s`;
+    if (seconds < 3600)
+        return `${Math.floor(seconds / 60)}m`;
+    if (seconds < 86400) {
+        const hours = Math.floor(seconds / 3600);
+        const minutes = Math.floor((seconds % 3600) / 60);
+        return minutes > 0 ? `${hours}h ${minutes}m` : `${hours}h`;
+    }
+    const days = Math.floor(seconds / 86400);
+    const hours = Math.floor((seconds % 86400) / 3600);
+    return hours > 0 ? `${days}d ${hours}h` : `${days}d`;
+}
+async function runSetup(options) {
+    const emit = createEmitter(options);
+    const runtime = new ManagedPlaywrightRuntime();
+    const registrySources = await loadRegistrySources();
+    const suggestedSource = registrySources.find((source) => source.authMode !== "legacy") ??
+        registrySources[0];
+    emit.title("Vana Connect setup");
+    emit.section("Runtime");
+    if (runtime.state === "installed") {
+        emit.info("The local runtime is already installed.");
+        if (runtime.runtimePath) {
+            emit.keyValue("Browser", formatDisplayPath(runtime.runtimePath), "muted");
+        }
+        emit.blank();
+        if (suggestedSource) {
+            emit.next(`vana connect ${suggestedSource.id}`);
+        }
+        else {
+            emit.next("vana connect");
+        }
+        emit.event({ type: "setup-check", runtime: runtime.state });
+        return 0;
+    }
+    try {
+        const result = await runtime.ensureInstalled(Boolean(options.yes));
+        emit.success("Runtime ready.");
+        if (result.logPath) {
+            emit.detail(`Setup log: ${formatDisplayPath(result.logPath)}`);
+        }
+        emit.blank();
+        if (suggestedSource) {
+            emit.next(`vana connect ${suggestedSource.id}`);
+        }
+        else {
+            emit.next("vana connect");
+        }
+        emit.event({
+            type: "setup-complete",
             runtime: result.runtime,
             logPath: result.logPath,
         });
@@ -401,167 +1487,2358 @@ async function runSetup(options) {
         return 1;
     }
 }
-function createEmitter(options) {
-    return {
-        event(event) {
-            if (options.json) {
-                process.stdout.write(`${JSON.stringify(event)}\n`);
-            }
-        },
-        info(message) {
-            if (options.json || options.quiet) {
-                return;
+async function runDataList(options) {
+    const result = await queryDataList();
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify(result)}\n`);
+        return 0;
+    }
+    const { datasets: datasetRecords } = result;
+    const registrySources = await loadRegistrySources();
+    const emit = createEmitter(options);
+    if (datasetRecords.length === 0) {
+        const suggestedSource = registrySources.find((source) => source.authMode !== "legacy") ??
+            registrySources[0];
+        emit.title("Collected data");
+        emit.blank();
+        emit.info("  No datasets yet.");
+        emit.blank();
+        if (suggestedSource) {
+            emit.next(`vana connect ${suggestedSource.id}`);
+        }
+        else {
+            emit.next("vana connect");
+        }
+        return 0;
+    }
+    emit.title(datasetRecords.length > 0
+        ? `Collected data (${datasetRecords.length})`
+        : "Collected data");
+    emit.blank();
+    emit.info(joinOverviewParts([
+        formatCountLabel("dataset", datasetRecords.length),
+        formatCountLabel("local only", datasetRecords.filter((dataset) => dataset.dataState !== "ingested_personal_server").length),
+        formatCountLabel("synced", datasetRecords.filter((dataset) => dataset.dataState === "ingested_personal_server").length),
+        datasetRecords.some((dataset) => dataset.dataState === "ingest_failed")
+            ? formatCountLabel("sync failed", datasetRecords.filter((dataset) => dataset.dataState === "ingest_failed").length)
+            : "",
+    ]));
+    emit.blank();
+    datasetRecords.forEach((dataset, index) => {
+        if (index > 0) {
+            emit.blank();
+        }
+        const badges = dataset.dataState === "ingested_personal_server"
+            ? [{ text: "synced", tone: "success" }]
+            : dataset.dataState === "ingest_failed"
+                ? [{ text: "sync failed", tone: "warning" }]
+                : [{ text: "local", tone: "muted" }];
+        emit.sourceTitle(dataset.name ?? displaySource(dataset.source), badges);
+        if (dataset.summary) {
+            for (const line of dataset.summary.lines) {
+                emit.detail(line);
             }
-            process.stdout.write(`${message}\n`);
-        },
-    };
-}
-function displaySource(source, labels = {}) {
-    return labels[source] ?? source.charAt(0).toUpperCase() + source.slice(1);
-}
-function humanizeField(value) {
-    return value
-        .replace(/([a-z])([A-Z])/g, "$1 $2")
-        .replace(/[_-]/g, " ")
-        .replace(/^\w/, (match) => match.toUpperCase());
-}
-async function gatherSourceStatuses(storedSources, metadata = {}) {
-    const installedFiles = await listInstalledConnectorFiles();
-    const sourceNames = new Set([
-        ...Object.keys(storedSources),
-        ...installedFiles.map((file) => file.source),
-    ]);
-    return [...sourceNames]
-        .sort((left, right) => left.localeCompare(right))
-        .map((source) => {
-        const stored = storedSources[source] ?? {};
-        const installed = installedFiles.some((file) => file.source === source);
-        const details = metadata[source];
-        return {
-            source,
-            name: details?.name,
-            company: details?.company,
-            description: details?.description,
-            installed,
-            sessionPresent: stored.sessionPresent ?? false,
-            lastRunAt: stored.lastRunAt ?? null,
-            lastRunOutcome: stored.lastRunOutcome ?? null,
-            dataState: stored.dataState === "ingested_personal_server"
-                ? "ingested_personal_server"
-                : stored.dataState === "collected_local"
-                    ? "collected_local"
-                    : "none",
-            lastError: stored.lastError ?? null,
-        };
+        }
+        if (dataset.dataState === "ingested_personal_server") {
+            emit.keyValue("State", "Synced to Personal Server", "success");
+        }
+        else if (dataset.dataState === "ingest_failed") {
+            emit.keyValue("State", "Saved locally, sync failed", "warning");
+        }
+        else {
+            emit.keyValue("State", "Saved locally", "muted");
+        }
+        if (dataset.lastRunAt) {
+            emit.keyValue("Updated", formatTimestamp(dataset.lastRunAt), "muted");
+        }
+        if (dataset.path) {
+            emit.keyValue("Path", formatDisplayPath(dataset.path), "muted");
+        }
     });
+    emit.blank();
+    if (datasetRecords.length > 0) {
+        emit.next(`vana data show ${datasetRecords[0].source}`);
+    }
+    return 0;
 }
-async function listInstalledConnectorFiles() {
-    const connectorsDir = getConnectorCacheDir();
-    try {
-        const results = [];
-        const entries = await fsp.readdir(connectorsDir, { withFileTypes: true });
-        for (const entry of entries) {
-            if (!entry.isDirectory()) {
-                continue;
+async function runDataShow(source, options) {
+    const result = await queryDataShow(source);
+    if (!result.ok) {
+        if (result.error === "dataset_not_found") {
+            if (options.json) {
+                process.stdout.write(`${JSON.stringify({
+                    error: result.error,
+                    source: result.source,
+                    message: result.message,
+                    nextSteps: result.nextSteps,
+                })}\n`);
             }
-            const companyDir = path.join(connectorsDir, entry.name);
-            const files = await fsp.readdir(companyDir);
-            for (const file of files) {
-                if (!file.endsWith("-playwright.js")) {
-                    continue;
-                }
-                results.push({
-                    source: file.replace(/-playwright\.js$/, ""),
-                    path: path.join(companyDir, file),
-                });
+            else {
+                const emit = createEmitter(options);
+                emit.info(result.message);
+                emit.blank();
+                emit.next(`vana connect ${source}`);
             }
+            return 1;
         }
-        return results;
+        // dataset_read_failed
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({ error: result.error, source: result.source, path: result.path, message: result.message })}\n`);
+        }
+        else {
+            createEmitter(options).info(result.message);
+        }
+        return 1;
     }
-    catch {
-        return [];
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify({
+            source: result.source,
+            name: result.name,
+            path: result.path,
+            summary: result.summary,
+            lastRunAt: result.lastRunAt,
+            dataState: result.dataState,
+            nextSteps: result.nextSteps,
+            data: result.data,
+        })}\n`);
+        return 0;
     }
-}
-function formatSourceStatus(source, labels = {}) {
-    if (!source.installed) {
-        return `${displaySource(source.source, labels)}: not connected`;
+    const emit = createEmitter(options);
+    const state = await readCliState();
+    const record = state.sources[source];
+    emit.title(`${result.name} data`);
+    emit.blank();
+    if (result.summary) {
+        for (const line of result.summary.lines) {
+            emit.detail(line);
+        }
+        emit.blank();
     }
-    if (!source.lastRunOutcome) {
-        return `${displaySource(source.source, labels)}: installed`;
+    emit.keyValue("Path", formatDisplayPath(result.path), "muted");
+    if (record?.lastRunAt) {
+        emit.keyValue("Updated", formatTimestamp(record.lastRunAt), "muted");
     }
-    if (source.lastRunOutcome === CliOutcomeStatus.NEEDS_INPUT) {
-        return `${displaySource(source.source, labels)}: needs input`;
+    if (record?.dataState === "ingested_personal_server") {
+        emit.keyValue("State", "Synced to Personal Server", "success");
     }
-    if (source.lastRunOutcome === CliOutcomeStatus.RUNTIME_ERROR) {
-        return `${displaySource(source.source, labels)}: error`;
+    else if (record?.dataState === "ingest_failed") {
+        emit.keyValue("State", "Saved locally, sync failed", "warning");
     }
-    if (source.lastRunOutcome === CliOutcomeStatus.LEGACY_AUTH) {
-        return `${displaySource(source.source, labels)}: legacy auth required`;
+    else {
+        emit.keyValue("State", "Saved locally", "muted");
     }
-    if (source.dataState === "ingested_personal_server") {
-        return `${displaySource(source.source, labels)}: connected, synced`;
+    emit.blank();
+    if (result.datasetCount > 1) {
+        emit.next("vana data list");
     }
-    if (source.dataState === "collected_local") {
-        return `${displaySource(source.source, labels)}: connected, local only`;
+    else {
+        emit.next(`vana connect ${source}`);
     }
-    return `${displaySource(source.source, labels)}: connected`;
+    return 0;
 }
-function formatSourceStatusDetail(source) {
-    if (source.lastRunOutcome === CliOutcomeStatus.NEEDS_INPUT) {
-        return source.lastError
-            ? `${source.lastError}. Run \`vana connect ${source.source}\` interactively.`
-            : `Run \`vana connect ${source.source}\` interactively.`;
-    }
-    if (source.lastRunOutcome === CliOutcomeStatus.LEGACY_AUTH) {
-        return "This source still uses legacy headed auth and cannot complete in batch mode.";
-    }
-    if (source.lastRunOutcome === CliOutcomeStatus.RUNTIME_ERROR) {
-        return source.lastError ?? "The last connector run failed.";
+async function runDataPath(source, options) {
+    const sourceLabels = createSourceLabelMap(await loadRegistrySources());
+    const state = await readCliState();
+    const resultPath = state.sources[source]?.lastResultPath;
+    if (!resultPath) {
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({
+                error: "dataset_not_found",
+                source,
+                name: displaySource(source, sourceLabels),
+                message: `No collected dataset found for ${displaySource(source, sourceLabels)}. Run \`vana connect ${source}\` first.`,
+            })}\n`);
+        }
+        else {
+            createEmitter(options).info(`No collected dataset found for ${displaySource(source, sourceLabels)}. Run \`vana connect ${source}\` first.`);
+        }
+        return 1;
     }
-    if (!source.lastRunOutcome && source.installed) {
-        return `Run \`vana connect ${source.source}\` to collect data.`;
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify({
+            source,
+            name: displaySource(source, sourceLabels),
+            path: resultPath,
+            lastRunAt: state.sources[source]?.lastRunAt ?? null,
+            dataState: state.sources[source]?.dataState ?? null,
+            nextSteps: [
+                `Inspect the dataset with \`vana data show ${source}\`.`,
+                `Reconnect ${displaySource(source, sourceLabels)} with \`vana connect ${source}\`.`,
+            ],
+        })}\n`);
     }
-    return null;
-}
-function normalizeArgv(argv) {
-    if (argv[2] === "connect" &&
-        ["list", "status", "setup"].includes(argv[3] ?? "")) {
-        const mapping = {
-            list: "sources",
-            status: "status",
-            setup: "setup",
-        };
-        return [argv[0], argv[1], mapping[argv[3]], ...argv.slice(4)];
+    else {
+        process.stdout.write(`${formatDisplayPath(resultPath)}\n`);
     }
-    return argv;
+    return 0;
 }
-function extractGlobalOptions(argv) {
-    return {
-        json: argv.includes("--json"),
-        noInput: argv.includes("--no-input"),
-        yes: argv.includes("--yes"),
-        quiet: argv.includes("--quiet"),
+async function runLogs(source, options) {
+    const sourceLabels = createSourceLabelMap(await loadRegistrySources());
+    const state = await readCliState();
+    const records = Object.entries(state.sources)
+        .filter(([, entry]) => Boolean(entry?.lastLogPath))
+        .map(([sourceId, entry]) => ({
+        source: sourceId,
+        name: displaySource(sourceId, sourceLabels),
+        path: entry?.lastLogPath ?? "",
+        lastRunAt: entry?.lastRunAt ?? null,
+        lastRunOutcome: entry?.lastRunOutcome ?? null,
+        dataState: (entry?.dataState === "collected_local" ||
+            entry?.dataState === "ingested_personal_server" ||
+            entry?.dataState === "ingest_failed"
+            ? entry.dataState
+            : null),
+    }))
+        .sort(compareLogRecordOrder);
+    const logSummary = {
+        attentionCount: records.filter((record) => isAttentionLog(record.lastRunOutcome, record.dataState)).length,
+        successfulCount: records.filter((record) => record.dataState === "collected_local" ||
+            record.dataState === "ingested_personal_server").length,
+        localCount: records.filter((record) => record.dataState === "collected_local").length,
+        syncedCount: records.filter((record) => record.dataState === "ingested_personal_server").length,
     };
-}
-function createSourceLabelMap(sources) {
-    return Object.fromEntries(sources.map((source) => [source.id, source.name]));
-}
-function createSourceMetadataMap(sources) {
-    return Object.fromEntries(sources.map((source) => [
-        source.id,
+    if (source) {
+        const match = records.find((record) => record.source === source);
+        if (!match) {
+            const payload = {
+                error: "log_not_found",
+                source,
+                message: `No stored run log found for ${displaySource(source, sourceLabels)}.`,
+                nextSteps: [
+                    `Run \`vana connect ${source}\` to create a new log.`,
+                    ...(records.length > 0
+                        ? ["Run `vana logs` to inspect other logs."]
+                        : []),
+                ],
+            };
+            if (options.json) {
+                process.stdout.write(`${JSON.stringify(payload)}\n`);
+            }
+            else {
+                const emit = createEmitter(options);
+                emit.info(payload.message);
+                emit.blank();
+                emit.next(`vana connect ${source}`);
+            }
+            return 1;
+        }
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify(match)}\n`);
+        }
+        else {
+            process.stdout.write(`${formatDisplayPath(match.path)}\n`);
+        }
+        return 0;
+    }
+    const nextSteps = buildLogsNextSteps(records);
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify({
+            count: records.length,
+            latestLog: records[0] ?? null,
+            nextSteps,
+            summary: logSummary,
+            logs: records,
+        })}\n`);
+        return 0;
+    }
+    const emit = createEmitter(options);
+    emit.title(records.length > 0 ? `Run logs (${records.length})` : "Run logs");
+    emit.blank();
+    if (records.length === 0) {
+        emit.info("No stored run logs yet.");
+        emit.blank();
+        emit.next("vana connect");
+        return 0;
+    }
+    emit.info(joinOverviewParts([
+        logSummary.attentionCount > 0
+            ? formatCountLabel("need attention", logSummary.attentionCount)
+            : "",
+        logSummary.successfulCount > 0
+            ? formatCountLabel("successful", logSummary.successfulCount)
+            : "",
+        logSummary.localCount > 0
+            ? formatCountLabel("local", logSummary.localCount)
+            : "",
+        logSummary.syncedCount > 0
+            ? formatCountLabel("synced", logSummary.syncedCount)
+            : "",
+    ]));
+    emit.blank();
+    const groups = [
         {
-            name: source.name,
-            company: source.company,
-            description: source.description,
+            title: "Needs attention",
+            items: records.filter((record) => isAttentionLog(record.lastRunOutcome, record.dataState)),
         },
-    ]));
-}
-async function loadRegistrySources() {
-    try {
-        return ((await listAvailableSources(findDataConnectorsDir() ?? undefined)) ?? []);
-    }
-    catch {
-        return [];
+        {
+            title: "Successful runs",
+            items: records.filter((record) => !isAttentionLog(record.lastRunOutcome, record.dataState)),
+        },
+    ].filter((group) => group.items.length > 0);
+    groups.forEach((group, groupIndex) => {
+        if (groupIndex > 0) {
+            emit.blank();
+        }
+        emit.section(formatCountLabel(group.title, group.items.length));
+        for (const record of group.items) {
+            emit.sourceTitle(record.name, [
+                {
+                    text: formatLogOutcomeLabel(record.lastRunOutcome, record.dataState),
+                    tone: toneForLogOutcome(record.lastRunOutcome, record.dataState),
+                },
+            ]);
+            emit.keyValue("Path", formatDisplayPath(record.path), "muted");
+            if (record.lastRunAt) {
+                emit.keyValue("Updated", formatTimestamp(record.lastRunAt), "muted");
+            }
+        }
+    });
+    emit.blank();
+    if (nextSteps.length > 0) {
+        const command = extractCommand(nextSteps[0]);
+        if (command) {
+            emit.next(command);
+        }
+        else {
+            emit.detail(`Next: ${nextSteps[0]}`);
+        }
+    }
+    return 0;
+}
+async function runSourceDetail(source, options) {
+    const emit = createEmitter(options);
+    const registrySources = await loadRegistrySources();
+    const state = await readCliState();
+    const match = registrySources.find((s) => s.id === source || s.name.toLowerCase() === source.toLowerCase());
+    if (!match) {
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({ error: "unknown_source", source, message: `Unknown source: ${source}. Run \`vana sources\` to see available options.` })}\n`);
+        }
+        else {
+            emit.info(`Unknown source: ${source}. Run \`vana sources\` to see available options.`);
+        }
+        return 1;
+    }
+    const stored = state.sources[match.id];
+    const metadata = await readCachedConnectorMetadata(match.id, getConnectorCacheDir());
+    const scopes = metadata?.scopes ?? [];
+    const sourceStatus = stored
+        ? {
+            source: match.id,
+            installed: Boolean(stored.connectorInstalled),
+            sessionPresent: stored.sessionPresent ?? false,
+            lastRunOutcome: stored.lastRunOutcome ?? null,
+            dataState: stored.dataState,
+        }
+        : undefined;
+    const badge = sourceStatus ? getSourceBadge(sourceStatus) : undefined;
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify({
+            id: match.id,
+            name: match.name,
+            company: match.company,
+            description: match.description,
+            version: match.version ?? stored?.connectorVersion,
+            exportFrequency: match.exportFrequency ?? stored?.exportFrequency,
+            authMode: match.authMode,
+            scopes,
+            scopeLabels: scopes.map((s) => s.label),
+            connectorVersion: stored?.connectorVersion,
+            lastCollectedAt: stored?.lastCollectedAt,
+            dataState: stored?.dataState,
+        })}\n`);
+        return 0;
+    }
+    const iconPrefix = await renderIconInline(match.id);
+    const badgeList = [];
+    if (badge && badge.label !== "new") {
+        badgeList.push({ text: badge.label, tone: badge.style });
+    }
+    emit.sourceTitle(`${iconPrefix}${match.name}`, badgeList);
+    emit.blank();
+    if (match.description) {
+        emit.info(cleanDescription(match.description));
+        emit.blank();
+    }
+    if (scopes.length > 0) {
+        emit.section("Collects");
+        for (const scope of scopes) {
+            if (scope.description) {
+                emit.keyValue(scope.label, cleanDescription(scope.description), "muted");
+            }
+            else {
+                emit.bullet(scope.label);
+            }
+        }
+    }
+    if (stored?.connectorVersion &&
+        match.version &&
+        stored.connectorVersion !== match.version) {
+        emit.blank();
+        emit.detail(`A newer connector version is available (${match.version}). Reconnect to update.`);
+    }
+    emit.blank();
+    emit.next(`vana connect ${match.id}`);
+    return 0;
+}
+async function runCollect(source, options) {
+    const emit = createEmitter(options);
+    const state = await readCliState();
+    const stored = state.sources[source];
+    if (!stored || !stored.connectorInstalled) {
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({
+                error: "not_previously_connected",
+                source,
+                message: `Source "${source}" has not been connected yet. Run \`vana connect ${source}\` first.`,
+            })}\n`);
+        }
+        else {
+            emit.info(`Source "${source}" has not been connected yet. Run \`vana connect ${source}\` first.`);
+        }
+        return 1;
+    }
+    return runConnect(source, options);
+}
+async function runCollectAll(options) {
+    const emit = createEmitter(options);
+    const state = await readCliState();
+    const dueSources = Object.entries(state.sources)
+        .filter(([, stored]) => stored?.connectorInstalled &&
+        isCollectionDue(stored.exportFrequency, stored.lastCollectedAt))
+        .map(([id]) => id);
+    if (dueSources.length === 0) {
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({ message: "No sources are due for collection.", count: 0 })}\n`);
+        }
+        else {
+            emit.info("No sources are due for collection.");
+        }
+        return 0;
+    }
+    let exitCode = 0;
+    for (const source of dueSources) {
+        const result = await runConnect(source, options);
+        if (result !== 0) {
+            exitCode = result;
+        }
+    }
+    return exitCode;
+}
+async function runServerSync(options) {
+    const emit = createEmitter(options);
+    const target = await detectPersonalServerTarget();
+    if (target.state !== "available") {
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({
+                error: "personal_server_unavailable",
+                message: "Personal Server is not available. Run `vana server set-url <url>` to configure.",
+            })}\n`);
+        }
+        else {
+            emit.info("Personal Server is not available. Run `vana server set-url <url>` to configure.");
+        }
+        return 1;
+    }
+    const state = await readCliState();
+    // Find sources that are local-only OR have failed ingest scopes
+    const pendingSources = Object.entries(state.sources).filter(([, stored]) => stored?.lastResultPath &&
+        (stored.dataState === "collected_local" ||
+            stored.dataState === "ingest_failed" ||
+            stored?.ingestScopes?.some((s) => s.status === "failed")));
+    if (pendingSources.length === 0) {
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({ message: "No pending datasets to sync.", syncedCount: 0 })}\n`);
+        }
+        else {
+            emit.info("No pending datasets to sync.");
+        }
+        return 0;
+    }
+    let syncedCount = 0;
+    const allScopeResults = [];
+    for (const [source, stored] of pendingSources) {
+        if (!stored?.lastResultPath) {
+            continue;
+        }
+        const ingestEvents = await ingestResult(source, stored.lastResultPath, target);
+        const resultEvent = ingestEvents.find((e) => e.type === "ingest-complete" ||
+            e.type === "ingest-partial" ||
+            e.type === "ingest-failed");
+        const scopeResults = resultEvent?.scopeResults;
+        const ingestCompleted = ingestEvents.some((e) => e.type === "ingest-complete");
+        const ingestPartial = ingestEvents.some((e) => e.type === "ingest-partial");
+        if (ingestCompleted || ingestPartial) {
+            syncedCount++;
+            const dataState = ingestCompleted || ingestPartial
+                ? "ingested_personal_server"
+                : stored.dataState;
+            await updateSourceState(source, {
+                dataState,
+                ingestScopes: scopeResults?.map((r) => ({
+                    scope: r.scope,
+                    status: r.status,
+                    syncedAt: r.status === "stored" ? new Date().toISOString() : undefined,
+                    error: r.error,
+                })),
+            });
+        }
+        allScopeResults.push({ source, scopeResults });
+        for (const event of ingestEvents) {
+            emit.event(event);
+        }
+    }
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify({ message: `Synced ${syncedCount} dataset(s).`, syncedCount })}\n`);
+    }
+    else {
+        // Show per-scope results with scope manifest style
+        const renderer = createHumanRenderer();
+        for (const entry of allScopeResults) {
+            if (entry.scopeResults && entry.scopeResults.length > 0) {
+                emit.info(`${entry.source}:`);
+                for (const sr of entry.scopeResults) {
+                    if (sr.status === "stored") {
+                        emit.info(`  ${renderer.theme.success("\u2713")} ${sr.scope}`);
+                    }
+                    else {
+                        const errDetail = sr.error ?? "failed";
+                        emit.info(`  ${renderer.theme.error("\u2717")} ${sr.scope} ${renderer.theme.muted(`\u2014 ${errDetail}`)}`);
+                    }
+                }
+            }
+        }
+        emit.blank();
+        const allStored = allScopeResults.every((entry) => !entry.scopeResults ||
+            entry.scopeResults.every((sr) => sr.status === "stored"));
+        emit.success(`Synced ${syncedCount} dataset(s).`);
+        emit.blank();
+        if (allStored) {
+            emit.next("vana data list");
+        }
+        else {
+            emit.next("vana server sync");
+        }
+    }
+    return 0;
+}
+async function runServerData(scope, options) {
+    const emit = createEmitter(options);
+    const target = await detectPersonalServerTarget();
+    const state = await readCliState();
+    // Gather locally-known scopes from state
+    const localScopes = [];
+    for (const [src, stored] of Object.entries(state.sources)) {
+        if (stored?.ingestScopes) {
+            for (const is of stored.ingestScopes) {
+                localScopes.push({ scope: is.scope, source: src, status: is.status });
+            }
+        }
+    }
+    // If PS is available, try to list remote scopes via client
+    let remoteScopes = [];
+    if (target.state === "available" && target.url) {
+        try {
+            const { createPersonalServerClient: createClient } = await import("../personal-server/client.js");
+            const client = createClient({ url: target.url });
+            remoteScopes = await client.listScopes(scope);
+        }
+        catch {
+            // Auth required or PS unavailable — fall back to local
+        }
+    }
+    // Use remote scopes if available, otherwise fall back to local
+    const scopeList = remoteScopes.length > 0
+        ? remoteScopes.map((s) => ({
+            scope: s.scope,
+            detail: `${s.count} version${s.count !== 1 ? "s" : ""}`,
+        }))
+        : localScopes
+            .filter((s) => s.status === "stored")
+            .filter((s) => !scope || s.scope.startsWith(scope))
+            .map((s) => ({ scope: s.scope, detail: "1 version" }));
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify({
+            count: scopeList.length,
+            scopes: scopeList,
+            source: remoteScopes.length > 0 ? "remote" : "local",
+        })}\n`);
+        return 0;
+    }
+    if (scopeList.length === 0) {
+        emit.info("No scopes found.");
+        if (target.state !== "available") {
+            emit.detail("Personal Server is not available. Showing locally-known scopes only.");
+        }
+        return 0;
+    }
+    for (const entry of scopeList) {
+        emit.keyValue(entry.scope, entry.detail, "muted");
+    }
+    if (remoteScopes.length === 0 && localScopes.length > 0) {
+        emit.blank();
+        emit.detail("Showing locally-known scopes. Connect your Personal Server for live data.");
+    }
+    return 0;
+}
+function getSourceBadge(source) {
+    if (source.dataState === "collected_local" ||
+        source.dataState === "ingested_personal_server" ||
+        source.dataState === "ingest_failed") {
+        return { label: "connected", style: "success" };
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.NEEDS_INPUT ||
+        source.lastRunOutcome === CliOutcomeStatus.LEGACY_AUTH) {
+        return { label: "needs login", style: "warning" };
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.RUNTIME_ERROR ||
+        source.lastRunOutcome === CliOutcomeStatus.UNEXPECTED_INTERNAL_ERROR) {
+        return { label: "error", style: "error" };
+    }
+    return { label: "new", style: "muted" };
+}
+function isCollectionDue(frequency, lastCollectedAt) {
+    if (!frequency || !lastCollectedAt) {
+        return true;
+    }
+    const lastMs = new Date(lastCollectedAt).getTime();
+    if (Number.isNaN(lastMs)) {
+        return true;
+    }
+    const now = Date.now();
+    const elapsed = now - lastMs;
+    const intervalMs = parseFrequencyToMs(frequency);
+    return elapsed >= intervalMs;
+}
+function parseFrequencyToMs(frequency) {
+    const lower = frequency.toLowerCase().trim();
+    if (lower === "daily") {
+        return 24 * 60 * 60 * 1000;
+    }
+    if (lower === "weekly") {
+        return 7 * 24 * 60 * 60 * 1000;
+    }
+    if (lower === "monthly") {
+        return 30 * 24 * 60 * 60 * 1000;
+    }
+    const match = /^(\d+)\s*(h|d|m|w)$/i.exec(lower);
+    if (match) {
+        const value = parseInt(match[1], 10);
+        const unit = match[2].toLowerCase();
+        if (unit === "h")
+            return value * 60 * 60 * 1000;
+        if (unit === "d")
+            return value * 24 * 60 * 60 * 1000;
+        if (unit === "w")
+            return value * 7 * 24 * 60 * 60 * 1000;
+        if (unit === "m")
+            return value * 30 * 24 * 60 * 60 * 1000;
+    }
+    // Default to daily if unparseable.
+    return 24 * 60 * 60 * 1000;
+}
+async function renderIconInline(source) {
+    const iconPath = findCachedIconPath(source);
+    if (!iconPath) {
+        return "";
+    }
+    try {
+        // terminal-image is optional — not in package.json dependencies.
+        // The `as string` cast prevents TypeScript from resolving the module at compile time.
+        const terminalImage = (await import("terminal-image"));
+        const imageBuffer = await fsp.readFile(iconPath);
+        return await terminalImage.default.buffer(imageBuffer, {
+            width: 2,
+            height: 1,
+        });
+    }
+    catch {
+        return "";
+    }
+}
+function findCachedIconPath(source) {
+    const cacheDir = getConnectorCacheDir();
+    const extensions = [".png", ".svg", ".jpg", ".jpeg", ".webp"];
+    for (const ext of extensions) {
+        const candidate = path.join(cacheDir, `${source}.icon${ext}`);
+        if (fs.existsSync(candidate)) {
+            return candidate;
+        }
+    }
+    return null;
+}
+function createEmitter(options) {
+    const renderer = createHumanRenderer();
+    return {
+        event(event) {
+            if (options.json) {
+                process.stdout.write(`${JSON.stringify(event)}\n`);
+            }
+        },
+        info(message) {
+            if (options.json || options.quiet) {
+                return;
+            }
+            process.stdout.write(`${message}\n`);
+        },
+        blank() {
+            if (options.json || options.quiet) {
+                return;
+            }
+            process.stdout.write("\n");
+        },
+        title(message) {
+            if (options.json || options.quiet) {
+                return;
+            }
+            process.stdout.write(`${renderer.title(message)}\n`);
+        },
+        success(message) {
+            if (options.json || options.quiet) {
+                return;
+            }
+            process.stdout.write(`${renderer.success(message)}\n`);
+        },
+        section(message) {
+            if (options.json || options.quiet) {
+                return;
+            }
+            process.stdout.write(`${renderer.section(message)}\n`);
+        },
+        keyValue(label, value, tone = "muted") {
+            if (options.json || options.quiet) {
+                return;
+            }
+            process.stdout.write(`${renderer.keyValue(label, value, tone)}\n`);
+        },
+        detail(message) {
+            if (options.json || options.quiet) {
+                return;
+            }
+            process.stdout.write(`${renderer.detail(message)}\n`);
+        },
+        next(command) {
+            if (options.json || options.quiet) {
+                return;
+            }
+            process.stdout.write(`  ${renderer.theme.muted("Next:")} ${renderer.theme.code(command)}\n`);
+        },
+        bullet(message) {
+            if (options.json || options.quiet) {
+                return;
+            }
+            process.stdout.write(`${renderer.bullet(message)}\n`);
+        },
+        sourceTitle(name, badges = []) {
+            if (options.json || options.quiet) {
+                return;
+            }
+            process.stdout.write(`${renderer.sourceTitle(name, badges.map((badge) => renderer.badge(badge.text, badge.tone)))}\n`);
+        },
+        badge(text, tone = "muted") {
+            return renderer.badge(text, tone);
+        },
+        code(text) {
+            return renderer.theme.code(text);
+        },
+    };
+}
+export function displaySource(source, labels = {}) {
+    return labels[source] ?? source.charAt(0).toUpperCase() + source.slice(1);
+}
+function formatCountLabel(label, count) {
+    const normalizedLabel = label.charAt(0).toUpperCase() + label.slice(1);
+    return `${normalizedLabel} (${count})`;
+}
+function joinOverviewParts(parts) {
+    return parts.filter(Boolean).join(" · ");
+}
+function humanizeField(value) {
+    return value
+        .replace(/([a-z])([A-Z])/g, "$1 $2")
+        .replace(/[_-]/g, " ")
+        .replace(/^\w/, (match) => match.toUpperCase());
+}
+export function humanizeIssue(message) {
+    if (/checksum|mismatch/i.test(message)) {
+        return "Connector is out of date. Will auto-update on next connect.";
+    }
+    return message;
+}
+function formatHumanSourceMessage(message, source, displayName) {
+    if (!message || source === displayName) {
+        return message;
+    }
+    return message.replace(new RegExp(`\\b${escapeRegExp(source)}\\b`, "gi"), displayName);
+}
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function getErrorLogPath(error) {
+    if (error &&
+        typeof error === "object" &&
+        "logPath" in error &&
+        typeof error.logPath === "string") {
+        return error.logPath;
+    }
+    return null;
+}
+export async function gatherSourceStatuses(storedSources, metadata = {}) {
+    const installedFiles = await listInstalledConnectorFiles();
+    const sourceNames = new Set([
+        ...Object.keys(storedSources),
+        ...installedFiles.map((file) => file.source),
+    ]);
+    return [...sourceNames]
+        .map((source) => {
+        const stored = storedSources[source] ?? {};
+        const installed = installedFiles.some((file) => file.source === source);
+        const details = metadata[source];
+        const dataState = stored.dataState === "ingested_personal_server"
+            ? "ingested_personal_server"
+            : stored.dataState === "ingest_failed"
+                ? "ingest_failed"
+                : stored.dataState === "collected_local"
+                    ? "collected_local"
+                    : "none";
+        const ingestScopes = stored.ingestScopes;
+        const syncedScopeCount = ingestScopes?.filter((s) => s.status === "stored").length ?? 0;
+        const failedScopeCount = ingestScopes?.filter((s) => s.status === "failed").length ?? 0;
+        const isOverdue = stored.lastCollectedAt && stored.exportFrequency
+            ? isCollectionDue(stored.exportFrequency, stored.lastCollectedAt)
+            : undefined;
+        const suggestedNextCollectionAt = stored.lastCollectedAt && stored.exportFrequency
+            ? new Date(new Date(stored.lastCollectedAt).getTime() +
+                parseFrequencyToMs(stored.exportFrequency)).toISOString()
+            : undefined;
+        return {
+            source,
+            name: details?.name,
+            company: details?.company,
+            description: details?.description,
+            authMode: details?.authMode ?? inferInstalledAuthMode(installedFiles, source),
+            connectorVersion: stored.connectorVersion,
+            exportFrequency: stored.exportFrequency,
+            lastCollectedAt: stored.lastCollectedAt,
+            installed,
+            sessionPresent: stored.sessionPresent ?? false,
+            lastRunAt: stored.lastRunAt ?? null,
+            lastRunOutcome: stored.lastRunOutcome ?? null,
+            dataState,
+            lastError: stored.lastError ?? null,
+            lastResultPath: stored.lastResultPath ?? null,
+            lastLogPath: stored.lastLogPath ?? null,
+            ingestScopes,
+            syncedScopeCount: syncedScopeCount > 0 ? syncedScopeCount : undefined,
+            failedScopeCount: failedScopeCount > 0 ? failedScopeCount : undefined,
+            suggestedNextCollectionAt,
+            isOverdue,
+        };
+    })
+        .sort(compareSourceStatusOrder);
+}
+export async function listInstalledConnectorFiles() {
+    const connectorsDir = getConnectorCacheDir();
+    try {
+        const results = [];
+        const entries = await fsp.readdir(connectorsDir, { withFileTypes: true });
+        for (const entry of entries) {
+            if (!entry.isDirectory()) {
+                continue;
+            }
+            const companyDir = path.join(connectorsDir, entry.name);
+            const files = await fsp.readdir(companyDir);
+            for (const file of files) {
+                if (!file.endsWith("-playwright.js")) {
+                    continue;
+                }
+                results.push({
+                    source: file.replace(/-playwright\.js$/, ""),
+                    path: path.join(companyDir, file),
+                });
+            }
+        }
+        return results;
+    }
+    catch {
+        return [];
+    }
+}
+function formatSourceStatusDetails(source) {
+    const details = [];
+    const displayName = source.name ?? displaySource(source.source);
+    if (source.lastRunOutcome === CliOutcomeStatus.NEEDS_INPUT) {
+        details.push(source.lastError
+            ? {
+                kind: "text",
+                message: `${source.lastError}. Run \`vana connect ${source.source}\` interactively.`,
+            }
+            : {
+                kind: "text",
+                message: `Run \`vana connect ${source.source}\` interactively.`,
+            });
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.LEGACY_AUTH) {
+        details.push({
+            kind: "text",
+            message: `Run \`vana connect ${source.source}\` without \`--no-input\` to complete the manual browser step.`,
+        });
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.RUNTIME_ERROR) {
+        details.push(source.lastError
+            ? {
+                kind: "text",
+                message: formatHumanSourceMessage(source.lastError, source.source, displayName),
+            }
+            : {
+                kind: "text",
+                message: "The last connector run failed.",
+            });
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.CONNECTOR_UNAVAILABLE) {
+        details.push(source.lastError
+            ? {
+                kind: "text",
+                message: formatHumanSourceMessage(source.lastError, source.source, displayName),
+            }
+            : {
+                kind: "text",
+                message: "No connector is available for this source.",
+            });
+    }
+    if (!source.lastRunOutcome && source.installed) {
+        details.push({
+            kind: "text",
+            message: `Run \`vana connect ${source.source}\` to collect data.`,
+        });
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.CONNECTED_LOCAL_ONLY &&
+        source.lastResultPath) {
+        details.push({
+            kind: "text",
+            message: `Inspect the latest local dataset with \`vana data show ${source.source}\`.`,
+        });
+    }
+    if (source.sessionPresent &&
+        (source.lastRunOutcome === CliOutcomeStatus.CONNECTED_LOCAL_ONLY ||
+            source.lastRunOutcome === CliOutcomeStatus.CONNECTED_AND_INGESTED ||
+            source.lastRunOutcome === CliOutcomeStatus.INGEST_FAILED)) {
+        details.push({
+            kind: "row",
+            label: "Session",
+            value: "Session cached.",
+            tone: "muted",
+        });
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.CONNECTED_AND_INGESTED) {
+        details.push({
+            kind: "text",
+            message: `Inspect the latest local dataset with \`vana data show ${source.source}\` or use your Personal Server copy.`,
+        });
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.INGEST_FAILED) {
+        details.push(source.lastError
+            ? {
+                kind: "text",
+                message: `${source.lastError} Inspect the local dataset with \`vana data show ${source.source}\`.`,
+            }
+            : {
+                kind: "text",
+                message: `Personal Server sync failed. Inspect the local dataset with \`vana data show ${source.source}\`.`,
+            });
+    }
+    if (source.dataState === "ingested_personal_server") {
+        details.push({
+            kind: "row",
+            label: "State",
+            value: "Synced to Personal Server",
+            tone: "success",
+        });
+    }
+    else if (source.dataState === "ingest_failed") {
+        details.push({
+            kind: "row",
+            label: "State",
+            value: "Saved locally, sync failed",
+            tone: "warning",
+        });
+    }
+    else if (source.dataState === "collected_local") {
+        details.push({
+            kind: "row",
+            label: "State",
+            value: "Saved locally",
+            tone: "muted",
+        });
+    }
+    if (source.lastRunAt) {
+        details.push({
+            kind: "row",
+            label: "Updated",
+            value: `${formatTimestamp(source.lastRunAt)} (${formatRelativeTime(source.lastRunAt)})`,
+            tone: "muted",
+        });
+    }
+    if (source.lastResultPath && source.dataState !== "none") {
+        details.push({
+            kind: "row",
+            label: "Path",
+            value: formatDisplayPath(source.lastResultPath),
+            tone: "muted",
+        });
+    }
+    if (source.lastLogPath &&
+        source.lastRunOutcome &&
+        source.lastRunOutcome !== CliOutcomeStatus.CONNECTED_LOCAL_ONLY &&
+        source.lastRunOutcome !== CliOutcomeStatus.CONNECTED_AND_INGESTED) {
+        details.push({
+            kind: "row",
+            label: "Run log",
+            value: formatDisplayPath(source.lastLogPath),
+            tone: "muted",
+        });
+    }
+    return details;
+}
+export function buildStatusNextSteps(sources, sourceLabels = {}, runtime = "unhealthy", availableSources = []) {
+    const nextSteps = [];
+    const highestPriority = [...sources].sort(compareSourceStatusOrder)[0];
+    const connectedSources = sources.filter((source) => source.dataState === "collected_local" ||
+        source.dataState === "ingested_personal_server" ||
+        source.dataState === "ingest_failed");
+    const needsAttention = sources.some((source) => rankSourceStatus(source) <= 4);
+    const highestPriorityLabel = highestPriority
+        ? displaySource(highestPriority.source, sourceLabels)
+        : null;
+    const suggestedSource = availableSources.find((source) => source.authMode !== "legacy") ??
+        availableSources[0];
+    if (!highestPriority) {
+        if (runtime === "installed") {
+            if (suggestedSource) {
+                nextSteps.push(`Connect ${suggestedSource.name} with \`vana connect ${suggestedSource.id}\`.`);
+            }
+            else {
+                nextSteps.push("Connect your first source with `vana connect`.");
+            }
+        }
+        else if (runtime === "missing") {
+            nextSteps.push("Install the local runtime with `vana setup`.");
+            nextSteps.push("Inspect install health with `vana doctor`.");
+        }
+        else if (runtime === "unhealthy") {
+            nextSteps.push("Inspect install health with `vana doctor`.");
+        }
+    }
+    else if (highestPriority.lastRunOutcome === CliOutcomeStatus.NEEDS_INPUT) {
+        nextSteps.push(`Continue ${highestPriorityLabel} with \`vana connect ${highestPriority.source}\`.`);
+        if (highestPriority.lastLogPath) {
+            nextSteps.push(`Inspect the latest run log with \`vana logs ${highestPriority.source}\`.`);
+        }
+    }
+    else if (highestPriority.lastRunOutcome === CliOutcomeStatus.LEGACY_AUTH) {
+        nextSteps.push(`Complete the manual browser step for ${highestPriorityLabel} with \`vana connect ${highestPriority.source}\`.`);
+        if (highestPriority.lastLogPath) {
+            nextSteps.push(`Inspect the latest run log with \`vana logs ${highestPriority.source}\`.`);
+        }
+    }
+    else if (highestPriority.lastRunOutcome === CliOutcomeStatus.CONNECTOR_UNAVAILABLE) {
+        nextSteps.push("Browse available sources with `vana sources`.");
+        if (highestPriority.lastLogPath) {
+            nextSteps.push(`Inspect the latest run log with \`vana logs ${highestPriority.source}\`.`);
+        }
+    }
+    else if (highestPriority.dataState === "collected_local" ||
+        highestPriority.dataState === "ingested_personal_server" ||
+        highestPriority.dataState === "ingest_failed") {
+        if (connectedSources.length > 1) {
+            nextSteps.push("Review your collected data with `vana data list`.");
+        }
+        else {
+            nextSteps.push(`Inspect the latest dataset with \`vana data show ${highestPriority.source}\`.`);
+        }
+    }
+    if (connectedSources.length > 0 && needsAttention) {
+        nextSteps.push(connectedSources.length > 1
+            ? "Review the data you already collected with `vana data list`."
+            : `Inspect the data you already collected with \`vana data show ${connectedSources[0].source}\`.`);
+    }
+    if (sources.some((source) => source.installed || source.lastRunOutcome) &&
+        (!needsAttention || connectedSources.length === 0)) {
+        nextSteps.push("Connect another source with `vana sources`.");
+    }
+    if (runtime !== "installed" ||
+        sources.some((source) => source.lastRunOutcome === CliOutcomeStatus.RUNTIME_ERROR ||
+            source.lastRunOutcome === CliOutcomeStatus.UNEXPECTED_INTERNAL_ERROR)) {
+        nextSteps.push("Inspect install health with `vana doctor`.");
+    }
+    return [...new Set(nextSteps)];
+}
+export function buildSourcesNextSteps(recommendedSource, connectedCount) {
+    const nextSteps = [];
+    if (connectedCount > 0) {
+        nextSteps.push("Inspect what you already collected with `vana data list`.");
+    }
+    if (recommendedSource) {
+        nextSteps.push(`${recommendedSource.authMode === "legacy" ? "Complete" : "Connect"} ${recommendedSource.name} with \`vana connect ${recommendedSource.id}\`.`);
+    }
+    nextSteps.push("Or browse the guided picker with `vana connect`.");
+    return [...new Set(nextSteps)];
+}
+export function buildDataListNextSteps(datasetRecords, registrySources) {
+    if (datasetRecords.length === 0) {
+        const suggestedSource = registrySources.find((source) => source.authMode !== "legacy") ??
+            registrySources[0];
+        return [
+            suggestedSource
+                ? `Collect your first dataset with \`vana connect ${suggestedSource.id}\`.`
+                : "Collect your first dataset with `vana connect`.",
+            "Check overall status with `vana status`.",
+        ];
+    }
+    return [
+        `Inspect ${datasetRecords[0].name ?? displaySource(datasetRecords[0].source)} with \`vana data show ${datasetRecords[0].source}\`.`,
+        `Or print its path with \`vana data path ${datasetRecords[0].source}\`.`,
+        "Connect another source with `vana sources`.",
+    ];
+}
+export function buildDataShowNextSteps(source, datasetCount, sourceLabels = {}) {
+    return [
+        `Print the path with \`vana data path ${source}\`.`,
+        `Reconnect ${displaySource(source, sourceLabels)} with \`vana connect ${source}\`.`,
+        ...(datasetCount > 1
+            ? ["See all datasets with `vana data list`."]
+            : ["Connect another source with `vana sources`."]),
+    ];
+}
+function buildLogsNextSteps(records) {
+    if (records.length === 0) {
+        return [
+            "Run `vana connect <source>` to create a connector run log.",
+            "Check overall status with `vana status`.",
+        ];
+    }
+    const attentionRecord = records.find((record) => isAttentionLog(record.lastRunOutcome, record.dataState));
+    const successfulRecord = records.find((record) => !isAttentionLog(record.lastRunOutcome, record.dataState));
+    return [
+        attentionRecord
+            ? `Inspect the latest issue log with \`vana logs ${attentionRecord.source}\`.`
+            : `Print the latest log path with \`vana logs ${records[0].source}\`.`,
+        ...(successfulRecord
+            ? [
+                `Inspect a successful run with \`vana logs ${successfulRecord.source}\`.`,
+            ]
+            : []),
+        "Check overall status with `vana status`.",
+    ];
+}
+/** Extract a `vana ...` command from a next-step sentence wrapped in backticks. */
+function extractCommand(sentence) {
+    const match = sentence.match(/`(vana\s[^`]+)`/);
+    return match ? match[1] : null;
+}
+// describeConnectTrust and buildConnectChoices removed — replaced by clack-based picker
+function formatMissingConnectSourceMessage(source) {
+    if (source) {
+        return `Specify a source. Start with \`vana connect ${source.id}\`, or run \`vana sources\` to see available options.`;
+    }
+    return "Specify a source. Run `vana sources` to see available options.";
+}
+// formatSourcePickerDescription removed — replaced by clack-based picker with hints
+function normalizeArgv(argv) {
+    if (argv[2] === "connect" &&
+        ["list", "status", "setup"].includes(argv[3] ?? "")) {
+        const mapping = {
+            list: "sources",
+            status: "status",
+            setup: "setup",
+        };
+        return [argv[0], argv[1], mapping[argv[3]], ...argv.slice(4)];
+    }
+    return argv;
+}
+export function getCliVersion() {
+    if (process.env.VANA_APP_ROOT) {
+        try {
+            const packageJson = JSON.parse(fs.readFileSync(path.join(process.env.VANA_APP_ROOT, "package.json"), "utf8"));
+            if (packageJson.version) {
+                return packageJson.version;
+            }
+        }
+        catch {
+            // Fall through to the repo/dev package metadata.
+        }
+    }
+    try {
+        const packageJson = require("../../package.json");
+        if (packageJson.version) {
+            return packageJson.version;
+        }
+    }
+    catch {
+        // Fall through to the hard default.
+    }
+    return "0.0.0";
+}
+export function getCliChannel(version = getCliVersion()) {
+    if (version.includes("canary")) {
+        return "canary";
+    }
+    const candidates = [process.env.VANA_APP_ROOT ?? "", process.execPath].map((value) => value.replace(/\\/g, "/").toLowerCase());
+    return candidates.some((normalizedPath) => /\/releases\/canary-[^/]+(?:\/app)?$/.test(normalizedPath))
+        ? "canary"
+        : "stable";
+}
+export function getCliInstallMethod(execPath = process.execPath) {
+    const candidates = [process.env.VANA_APP_ROOT ?? "", execPath].map((value) => value.replace(/\\/g, "/").toLowerCase());
+    for (const normalizedPath of candidates) {
+        if (!normalizedPath) {
+            continue;
+        }
+        if (normalizedPath.includes("/cellar/vana/")) {
+            return "homebrew";
+        }
+        if (normalizedPath.includes("/.local/share/vana/") ||
+            normalizedPath.includes("/appdata/local/vana/") ||
+            normalizedPath.endsWith("/current/app") ||
+            /\/releases\/[^/]+\/app$/.test(normalizedPath)) {
+            return "installer";
+        }
+        if (normalizedPath.endsWith("/node") ||
+            normalizedPath.endsWith("/node.exe") ||
+            normalizedPath.includes("/.nvm/") ||
+            normalizedPath.includes("/volta/") ||
+            normalizedPath.includes("/pnpm/")) {
+            return "development";
+        }
+    }
+    return "unknown";
+}
+function getCliAppRoot(execPath = process.execPath) {
+    return process.env.VANA_APP_ROOT ?? path.join(path.dirname(execPath), "app");
+}
+export function getDoctorAppRootPath(installMethod, execPath = process.execPath) {
+    if (process.env.VANA_APP_ROOT) {
+        return process.env.VANA_APP_ROOT;
+    }
+    if (installMethod === "homebrew" || installMethod === "installer") {
+        return getCliAppRoot(execPath);
+    }
+    return null;
+}
+export function formatInstallMethodLabel(method) {
+    switch (method) {
+        case "homebrew":
+            return "Homebrew";
+        case "installer":
+            return "Hosted installer";
+        case "development":
+            return "Development checkout";
+        default:
+            return "Unknown";
+    }
+}
+export function getLifecycleCommands(installMethod, channel) {
+    switch (installMethod) {
+        case "homebrew":
+            return {
+                upgrade: "brew update && brew upgrade vana",
+                uninstall: "brew uninstall vana",
+            };
+        case "installer":
+            if (process.platform === "win32") {
+                return {
+                    upgrade: 'powershell -Command "irm https://raw.githubusercontent.com/vana-com/vana-connect/main/install/install.ps1 | iex"',
+                    uninstall: 'powershell -Command "Remove-Item $env:LOCALAPPDATA\\Vana -Recurse -Force; Remove-Item $env:USERPROFILE\\.vana -Recurse -Force"',
+                };
+            }
+            return {
+                upgrade: channel === "canary"
+                    ? "curl -fsSL https://raw.githubusercontent.com/vana-com/vana-connect/feat/connect-cli-v1/install/install.sh | sh -s -- --version canary-feat-connect-cli-v1"
+                    : "curl -fsSL https://raw.githubusercontent.com/vana-com/vana-connect/main/install/install.sh | sh",
+                uninstall: "rm -f ~/.local/bin/vana && rm -rf ~/.local/share/vana ~/.vana",
+            };
+        case "development":
+            return {
+                upgrade: "git pull && pnpm install && pnpm build",
+                uninstall: "Remove the local checkout and any generated ~/.vana state.",
+            };
+        default:
+            return {
+                upgrade: "Reinstall vana using Homebrew or the hosted installer.",
+                uninstall: "Remove the installed vana binary and any ~/.vana state you no longer need.",
+            };
+    }
+}
+function extractGlobalOptions(argv) {
+    return {
+        json: argv.includes("--json"),
+        noInput: argv.includes("--no-input"),
+        ipc: argv.includes("--ipc"),
+        yes: argv.includes("--yes"),
+        quiet: argv.includes("--quiet"),
+        detach: argv.includes("--detach"),
+    };
+}
+export function createSourceLabelMap(sources) {
+    return Object.fromEntries(sources.map((source) => [source.id, source.name]));
+}
+export function createSourceMetadataMap(sources) {
+    return Object.fromEntries(sources.map((source) => [
+        source.id,
+        {
+            name: source.name,
+            company: source.company,
+            description: source.description,
+            authMode: source.authMode,
+        },
+    ]));
+}
+// formatAuthModeBadge removed — replaced by clack-based picker with hints
+export function getSourceStatusPresentation(source) {
+    if (!source.installed && !source.lastRunOutcome) {
+        return { label: "not connected", tone: "muted" };
+    }
+    if (!source.lastRunOutcome) {
+        return { label: "installed", tone: "success" };
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.NEEDS_INPUT) {
+        return { label: "needs input", tone: "warning" };
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.RUNTIME_ERROR) {
+        return { label: "error", tone: "error" };
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.CONNECTOR_UNAVAILABLE) {
+        return { label: "unavailable", tone: "warning" };
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.LEGACY_AUTH) {
+        return { label: "manual step", tone: "warning" };
+    }
+    if (source.dataState === "ingested_personal_server") {
+        // Check per-scope state for more granular badges
+        if (source.ingestScopes && source.ingestScopes.length > 0) {
+            const storedCount = source.ingestScopes.filter((s) => s.status === "stored").length;
+            const failedCount = source.ingestScopes.filter((s) => s.status === "failed").length;
+            if (failedCount > 0 && storedCount > 0) {
+                return { label: "partial sync", tone: "warning" };
+            }
+            if (failedCount > 0 && storedCount === 0) {
+                return { label: "sync failed", tone: "error" };
+            }
+        }
+        return { label: "synced", tone: "success" };
+    }
+    if (source.dataState === "collected_local") {
+        return { label: "local", tone: "muted" };
+    }
+    if (source.dataState === "ingest_failed") {
+        return { label: "sync failed", tone: "error" };
+    }
+    return { label: "connected", tone: "success" };
+}
+export function toneForRuntime(runtime) {
+    if (runtime === "installed") {
+        return "success";
+    }
+    if (runtime === "missing") {
+        return "warning";
+    }
+    return "muted";
+}
+// formatProgressUpdate removed — replaced by ConnectRenderer scope methods
+/**
+ * Extract a human-readable scope name from a progress-update event.
+ * The scope name comes from `phase.label` when `phase` is a structured object.
+ */
+function extractScopeName(event) {
+    if (event.phase &&
+        typeof event.phase === "object" &&
+        "label" in event.phase &&
+        typeof event.phase.label === "string") {
+        return event.phase.label;
+    }
+    return null;
+}
+/**
+ * Format detail text for a completed scope (e.g. "8 found").
+ * Extracts count from event.count or parses it from the message.
+ */
+function formatScopeDetail(event) {
+    if (typeof event.count === "number") {
+        return `${event.count} found`;
+    }
+    // Try to extract a count from the completion message (e.g. "Complete! 8 repositories collected.")
+    if (typeof event.message === "string") {
+        const match = event.message.match(/(\d+)\s+\w+/);
+        if (match) {
+            return match[0];
+        }
+    }
+    return undefined;
+}
+// shouldRenderStatusUpdate removed — status updates are silent in the new design
+function inferInstalledAuthMode(installedFiles, source) {
+    const match = installedFiles.find((file) => file.source === source);
+    if (!match) {
+        return undefined;
+    }
+    try {
+        const script = fs.readFileSync(match.path, "utf8");
+        if (/page\.requestInput\(/.test(script)) {
+            return "interactive";
+        }
+        if (/page\.(showBrowser|promptUser)\(/.test(script)) {
+            return "legacy";
+        }
+        return "automated";
+    }
+    catch {
+        return undefined;
+    }
+}
+export async function loadRegistrySources() {
+    try {
+        return ((await listAvailableSources(findDataConnectorsDir() ?? undefined)) ?? []).sort(compareRegistrySourceOrder);
+    }
+    catch {
+        return [];
+    }
+}
+function compareRegistrySourceOrder(left, right) {
+    return (rankAuthMode(left.authMode) - rankAuthMode(right.authMode) ||
+        left.name.localeCompare(right.name, undefined, { sensitivity: "base" }));
+}
+export function compareSourceStatusOrder(left, right) {
+    return (rankSourceStatus(left) - rankSourceStatus(right) ||
+        compareRegistrySourceOrder({
+            id: left.source,
+            name: left.name ?? displaySource(left.source),
+            authMode: left.authMode,
+        }, {
+            id: right.source,
+            name: right.name ?? displaySource(right.source),
+            authMode: right.authMode,
+        }));
+}
+export function rankSourceStatus(source) {
+    if (source.lastRunOutcome === CliOutcomeStatus.NEEDS_INPUT) {
+        return 0;
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.LEGACY_AUTH) {
+        return 1;
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.INGEST_FAILED) {
+        return 2;
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.RUNTIME_ERROR) {
+        return 3;
+    }
+    if (source.lastRunOutcome === CliOutcomeStatus.CONNECTOR_UNAVAILABLE) {
+        return 4;
+    }
+    if (source.dataState === "ingested_personal_server") {
+        return 5;
+    }
+    if (source.dataState === "collected_local") {
+        return 6;
+    }
+    if (source.installed) {
+        return 7;
+    }
+    return 8;
+}
+function rankAuthMode(authMode) {
+    if (authMode === "interactive") {
+        return 0;
+    }
+    if (authMode === "automated") {
+        return 1;
+    }
+    if (authMode === "legacy") {
+        return 2;
+    }
+    return 3;
+}
+export async function readResultSummary(resultPath) {
+    try {
+        const raw = await fsp.readFile(resultPath, "utf8");
+        return summarizeResultData(JSON.parse(raw));
+    }
+    catch {
+        return null;
+    }
+}
+export function summarizeResultData(data) {
+    const lines = [];
+    const exportSummary = typeof data.exportSummary === "object" && data.exportSummary
+        ? data.exportSummary
+        : null;
+    const profile = typeof data.profile === "object" && data.profile
+        ? data.profile
+        : null;
+    if (profile?.username && typeof profile.username === "string") {
+        lines.push(`Profile: ${profile.username}`);
+    }
+    if (Array.isArray(data.repositories)) {
+        lines.push(`Repositories: ${data.repositories.length}`);
+        const preview = summarizeNamedItems(data.repositories, "Latest repos");
+        if (preview) {
+            lines.push(preview);
+        }
+    }
+    if (Array.isArray(data.starred)) {
+        lines.push(`Starred: ${data.starred.length}`);
+    }
+    if (Array.isArray(data.orders)) {
+        lines.push(`Orders: ${data.orders.length}`);
+    }
+    if (Array.isArray(data.playlists)) {
+        lines.push(`Playlists: ${data.playlists.length}`);
+        const preview = summarizeNamedItems(data.playlists, "Playlists");
+        if (preview) {
+            lines.push(preview);
+        }
+    }
+    if (exportSummary?.details &&
+        typeof exportSummary.details === "string" &&
+        !lines.includes(exportSummary.details) &&
+        !Array.isArray(data.repositories) &&
+        !Array.isArray(data.starred) &&
+        !Array.isArray(data.orders) &&
+        !Array.isArray(data.playlists)) {
+        lines.push(exportSummary.details);
+    }
+    return lines.length > 0 ? { lines } : null;
+}
+function summarizeNamedItems(items, label, maxItems = 2) {
+    const names = items
+        .map((item) => {
+        if (typeof item === "object" &&
+            item &&
+            "name" in item &&
+            typeof item.name === "string") {
+            return item.name;
+        }
+        return null;
+    })
+        .filter((value) => Boolean(value))
+        .slice(0, maxItems);
+    if (names.length === 0) {
+        return null;
+    }
+    return `${label}: ${names.join(", ")}`;
+}
+export function formatTimestamp(value) {
+    const date = new Date(value);
+    if (Number.isNaN(date.getTime())) {
+        return value;
+    }
+    return new Intl.DateTimeFormat(undefined, {
+        dateStyle: "medium",
+        timeStyle: "short",
+    }).format(date);
+}
+export function compareDatasetOrder(left, right) {
+    const leftTime = left.lastRunAt ? Date.parse(left.lastRunAt) : 0;
+    const rightTime = right.lastRunAt ? Date.parse(right.lastRunAt) : 0;
+    return (rightTime - leftTime ||
+        (left.name ?? left.source).localeCompare(right.name ?? right.source, undefined, {
+            sensitivity: "base",
+        }));
+}
+function compareLogRecordOrder(left, right) {
+    const leftTimestamp = left.lastRunAt ? Date.parse(left.lastRunAt) : 0;
+    const rightTimestamp = right.lastRunAt ? Date.parse(right.lastRunAt) : 0;
+    return (rightTimestamp - leftTimestamp ||
+        left.source.localeCompare(right.source, undefined, {
+            sensitivity: "base",
+        }));
+}
+export function hasCollectedData(dataState) {
+    return (dataState === "collected_local" ||
+        dataState === "ingested_personal_server" ||
+        dataState === "ingest_failed");
+}
+function formatLogOutcomeLabel(lastRunOutcome, dataState) {
+    if (lastRunOutcome === CliOutcomeStatus.CONNECTOR_UNAVAILABLE) {
+        return "unavailable";
+    }
+    if (lastRunOutcome === CliOutcomeStatus.LEGACY_AUTH) {
+        return "manual step";
+    }
+    if (lastRunOutcome === CliOutcomeStatus.RUNTIME_ERROR) {
+        return "error";
+    }
+    if (lastRunOutcome === CliOutcomeStatus.NEEDS_INPUT) {
+        return "needs input";
+    }
+    if (dataState === "ingested_personal_server") {
+        return "synced";
+    }
+    if (dataState === "ingest_failed") {
+        return "sync failed";
+    }
+    if (dataState === "collected_local") {
+        return "local";
+    }
+    return "recent";
+}
+function isAttentionLog(lastRunOutcome, dataState) {
+    return !(dataState === "collected_local" ||
+        dataState === "ingested_personal_server" ||
+        lastRunOutcome === CliOutcomeStatus.CONNECTED_LOCAL_ONLY ||
+        lastRunOutcome === CliOutcomeStatus.CONNECTED_AND_INGESTED);
+}
+function toneForLogOutcome(lastRunOutcome, dataState) {
+    if (lastRunOutcome === CliOutcomeStatus.RUNTIME_ERROR) {
+        return "error";
+    }
+    if (lastRunOutcome === CliOutcomeStatus.CONNECTOR_UNAVAILABLE ||
+        lastRunOutcome === CliOutcomeStatus.LEGACY_AUTH ||
+        lastRunOutcome === CliOutcomeStatus.NEEDS_INPUT ||
+        dataState === "ingest_failed") {
+        return "warning";
+    }
+    if (dataState === "ingested_personal_server") {
+        return "success";
+    }
+    if (dataState === "collected_local") {
+        return "muted";
+    }
+    return "muted";
+}
+function toneForHealth(health) {
+    switch (health) {
+        case "healthy":
+            return "accent";
+        case "needs_reauth":
+            return "warning";
+        case "error":
+            return "error";
+        case "stale":
+            return "muted";
+        default:
+            return "muted";
+    }
+}
+// ---------------------------------------------------------------------------
+// Detach (background process)
+// ---------------------------------------------------------------------------
+async function runDetached(command, source, options) {
+    const emit = createEmitter(options);
+    const registrySources = await loadRegistrySources();
+    const sourceLabels = createSourceLabelMap(registrySources);
+    const displayName = displaySource(source, sourceLabels);
+    // Check if source has been previously connected (has a session to reuse).
+    // Detach is for re-collection with existing sessions, not first-time auth.
+    const state = await readCliState();
+    const sourceState = state.sources[source];
+    if (!sourceState?.lastResultPath && !sourceState?.sessionPresent) {
+        emit.info(`Run ${emit.code(`vana connect ${source}`)} first to authenticate.`);
+        emit.detail("Use --detach for background re-collection after the first connect.");
+        return 1;
+    }
+    const sessionsDir = getSessionsDir();
+    const logsDir = getLogsDir();
+    await fsp.mkdir(sessionsDir, { recursive: true });
+    await fsp.mkdir(logsDir, { recursive: true });
+    const logPath = path.join(logsDir, `${source}-detach.log`);
+    const sessionPath = path.join(sessionsDir, `${source}.json`);
+    const logFd = fs.openSync(logPath, "a");
+    // --no-input: if auth is needed, fail fast and record needs_reauth.
+    // Don't use --ipc: nobody is watching a detached process.
+    const childArgs = [
+        process.argv[1],
+        command,
+        source,
+        "--json",
+        "--quiet",
+        "--no-input",
+    ];
+    const child = spawn(process.execPath, childArgs, {
+        detached: true,
+        stdio: ["ignore", logFd, logFd],
+        env: { ...process.env, VANA_DETACHED: "1" },
+    });
+    child.unref();
+    fs.closeSync(logFd);
+    // Write session file
+    const session = {
+        source,
+        command,
+        pid: child.pid,
+        startedAt: new Date().toISOString(),
+        status: "running",
+        logPath,
+    };
+    await fsp.writeFile(sessionPath, `${JSON.stringify(session, null, 2)}\n`);
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify(session)}\n`);
+        return 0;
+    }
+    const verb = command === "connect" ? "Connecting" : "Collecting";
+    emit.info(`${verb} ${displayName} in the background.`);
+    emit.detail(`Check progress: ${emit.code("vana status")}`);
+    return 0;
+}
+// ---------------------------------------------------------------------------
+// Schedule commands
+// ---------------------------------------------------------------------------
+const LAUNCHD_LABEL = "com.vana.collect";
+const LAUNCHD_PLIST_PATH = path.join(os.homedir(), "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
+const CRONTAB_MARKER = "# vana-scheduled-collection";
+const WINDOWS_TASK_NAME = "VanaScheduledCollection";
+function parseIntervalSeconds(interval) {
+    const lower = interval.toLowerCase().trim();
+    const match = /^(\d+)\s*(h|d|m|w)$/i.exec(lower);
+    if (match) {
+        const value = parseInt(match[1], 10);
+        const unit = match[2].toLowerCase();
+        if (unit === "h")
+            return value * 3600;
+        if (unit === "d")
+            return value * 86400;
+        if (unit === "w")
+            return value * 7 * 86400;
+        if (unit === "m")
+            return value * 30 * 86400;
+    }
+    if (lower === "daily")
+        return 86400;
+    if (lower === "weekly")
+        return 7 * 86400;
+    // Default to 24h
+    return 86400;
+}
+function formatIntervalHuman(seconds) {
+    if (seconds < 3600)
+        return `${Math.round(seconds / 60)}m`;
+    if (seconds < 86400)
+        return `${Math.round(seconds / 3600)}h`;
+    return `${Math.round(seconds / 86400)}d`;
+}
+function resolveVanaBinaryPath() {
+    // For SEA binaries, process.execPath is the binary itself
+    const installMethod = getCliInstallMethod();
+    if (installMethod === "homebrew" || installMethod === "installer") {
+        return process.execPath;
+    }
+    // For development, try to find the vana binary via which/where
+    try {
+        const cmd = process.platform === "win32" ? "where vana" : "which vana";
+        const result = execSync(cmd, { encoding: "utf8" }).trim();
+        // `where` on Windows may return multiple lines; take the first
+        return result.split("\n")[0].trim();
+    }
+    catch {
+        // Fall back to process.execPath + argv[1]
+        return `${process.execPath} ${process.argv[1]}`;
+    }
+}
+async function getExistingScheduleInterval() {
+    if (process.platform === "darwin") {
+        try {
+            const content = await fsp.readFile(LAUNCHD_PLIST_PATH, "utf8");
+            const match = content.match(/<key>StartInterval<\/key>\s*<integer>(\d+)<\/integer>/);
+            return match ? parseInt(match[1], 10) : null;
+        }
+        catch {
+            return null;
+        }
+    }
+    if (process.platform === "linux") {
+        try {
+            const crontab = execSync("crontab -l 2>/dev/null", { encoding: "utf8" });
+            const vanaLine = crontab
+                .split("\n")
+                .find((line) => line.includes(CRONTAB_MARKER));
+            if (!vanaLine)
+                return null;
+            // Parse hour interval from crontab: look for */N pattern
+            const hourMatch = /\*\/(\d+)/.exec(vanaLine);
+            if (hourMatch)
+                return parseInt(hourMatch[1], 10) * 3600;
+            // Daily (0 0 * * *)
+            return 86400;
+        }
+        catch {
+            return null;
+        }
+    }
+    if (process.platform === "win32") {
+        try {
+            execSync(`schtasks /Query /TN "${WINDOWS_TASK_NAME}" /FO LIST`, {
+                encoding: "utf8",
+            });
+            // Task exists but we can't easily parse the interval; return a
+            // sentinel value (86400) to indicate "schedule present".
+            return 86400;
+        }
+        catch {
+            return null;
+        }
+    }
+    return null;
+}
+async function maybeAutoSchedule(exportFrequency, emit, options) {
+    // Skip if --no-input (detached/agent context shouldn't create schedules)
+    if (options.noInput)
+        return;
+    // Skip unsupported platforms
+    if (!["darwin", "linux", "win32"].includes(process.platform))
+        return;
+    const newInterval = exportFrequency
+        ? parseIntervalSeconds(exportFrequency)
+        : 86400;
+    const existing = await getExistingScheduleInterval();
+    if (existing === null) {
+        // No schedule → create one
+        await runScheduleAdd(exportFrequency ?? "daily", {
+            json: false,
+            quiet: true,
+        });
+        emit.detail(`Auto-scheduled collection every ${formatIntervalHuman(newInterval)}.`);
+    }
+    else if (newInterval < existing) {
+        // New source has shorter frequency → adjust down
+        await runScheduleAdd(exportFrequency ?? "daily", {
+            json: false,
+            quiet: true,
+        });
+        emit.detail(`Adjusted schedule to every ${formatIntervalHuman(newInterval)} (was ${formatIntervalHuman(existing)}).`);
+    }
+    // else: existing schedule is already at or below needed frequency, no-op
+}
+function generateLaunchdPlist(vanaBinary, intervalSeconds) {
+    const logsPath = path.join(getLogsDir(), "schedule.log");
+    // Handle the case where vanaBinary might contain a space (node + script)
+    const programArgs = vanaBinary.includes(" ")
+        ? vanaBinary
+            .split(" ")
+            .map((arg) => `    <string>${arg}</string>`)
+            .join("\n")
+        : `    <string>${vanaBinary}</string>`;
+    return `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>${LAUNCHD_LABEL}</string>
+  <key>ProgramArguments</key>
+  <array>
+${programArgs}
+    <string>collect</string>
+    <string>--all</string>
+    <string>--quiet</string>
+    <string>--no-input</string>
+  </array>
+  <key>StartInterval</key>
+  <integer>${intervalSeconds}</integer>
+  <key>StandardOutPath</key>
+  <string>${logsPath}</string>
+  <key>StandardErrorPath</key>
+  <string>${logsPath}</string>
+  <key>RunAtLoad</key>
+  <true/>
+</dict>
+</plist>
+`;
+}
+function generateCrontabEntry(vanaBinary, intervalHours) {
+    const logsPath = path.join(getLogsDir(), "schedule.log");
+    const hourExpr = intervalHours >= 24 ? "0" : `0`;
+    const dayExpr = "*";
+    const hourInterval = intervalHours >= 24 ? "0" : intervalHours >= 1 ? `*/${intervalHours}` : "*";
+    return `${hourExpr} ${hourInterval} ${dayExpr} * * ${vanaBinary} collect --all --quiet --no-input >> ${logsPath} 2>&1 ${CRONTAB_MARKER}`;
+}
+async function runScheduleAdd(interval, options) {
+    const emit = createEmitter(options);
+    const intervalSeconds = parseIntervalSeconds(interval);
+    const intervalLabel = formatIntervalHuman(intervalSeconds);
+    const vanaBinary = resolveVanaBinaryPath();
+    await fsp.mkdir(getLogsDir(), { recursive: true });
+    if (process.platform === "darwin") {
+        // macOS: launchd
+        const plist = generateLaunchdPlist(vanaBinary, intervalSeconds);
+        const plistDir = path.dirname(LAUNCHD_PLIST_PATH);
+        await fsp.mkdir(plistDir, { recursive: true });
+        // Unload existing if present
+        try {
+            execSync(`launchctl unload "${LAUNCHD_PLIST_PATH}" 2>/dev/null`, {
+                stdio: "ignore",
+            });
+        }
+        catch {
+            // Not loaded, that's fine
+        }
+        await fsp.writeFile(LAUNCHD_PLIST_PATH, plist);
+        try {
+            execSync(`launchctl load "${LAUNCHD_PLIST_PATH}"`, { stdio: "ignore" });
+        }
+        catch {
+            emit.info("Could not load the launchd plist. Load it manually:");
+            emit.detail(`launchctl load "${LAUNCHD_PLIST_PATH}"`);
+            return 1;
+        }
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({ ok: true, interval: intervalLabel, mechanism: "launchd", plistPath: LAUNCHD_PLIST_PATH })}\n`);
+            return 0;
+        }
+        emit.info(`Added ${intervalLabel === "1d" ? "daily" : `every ${intervalLabel}`} collection schedule.`);
+        emit.detail(`Runs: ${emit.code("vana collect --all --quiet")}`);
+        emit.detail(`Managed by: launchd`);
+        return 0;
+    }
+    if (process.platform === "linux") {
+        // Linux: cron doesn't defer missed jobs (unlike launchd), so we run
+        // hourly and let isCollectionDue() filter per-source. This way a
+        // missed 2am tick self-heals at 3am instead of waiting 24h.
+        const entry = generateCrontabEntry(vanaBinary, 1);
+        try {
+            // Read existing crontab, filter out old vana entries, add new one
+            let existing = "";
+            try {
+                existing = execSync("crontab -l 2>/dev/null", {
+                    encoding: "utf8",
+                });
+            }
+            catch {
+                // No existing crontab
+            }
+            const filtered = existing
+                .split("\n")
+                .filter((line) => !line.includes(CRONTAB_MARKER))
+                .join("\n");
+            const newCrontab = `${filtered.trimEnd()}\n${entry}\n`;
+            execSync("crontab -", {
+                input: newCrontab,
+                encoding: "utf8",
+            });
+        }
+        catch {
+            emit.info("Could not update crontab. Add this entry manually:");
+            emit.detail(entry);
+            return 1;
+        }
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({ ok: true, interval: intervalLabel, mechanism: "cron" })}\n`);
+            return 0;
+        }
+        emit.info(`Added ${intervalLabel === "1d" ? "daily" : `every ${intervalLabel}`} collection schedule.`);
+        emit.detail(`Runs: ${emit.code("vana collect --all --quiet")}`);
+        emit.detail(`Managed by: cron`);
+        return 0;
+    }
+    if (process.platform === "win32") {
+        // Windows: Task Scheduler
+        const intervalMinutes = Math.max(1, Math.round(intervalSeconds / 60));
+        const trCmd = `\\"${vanaBinary}\\" collect --all --quiet --no-input`;
+        try {
+            try {
+                execSync(`schtasks /Delete /TN "${WINDOWS_TASK_NAME}" /F 2>nul`, {
+                    stdio: "ignore",
+                });
+            }
+            catch {
+                // Not present, that's fine
+            }
+            if (intervalSeconds >= 86400) {
+                execSync(`schtasks /Create /TN "${WINDOWS_TASK_NAME}" /TR "${trCmd}" /SC DAILY /ST 09:00 /F`, { stdio: "ignore" });
+            }
+            else {
+                execSync(`schtasks /Create /TN "${WINDOWS_TASK_NAME}" /TR "${trCmd}" /SC MINUTE /MO ${intervalMinutes} /F`, { stdio: "ignore" });
+            }
+            // Enable StartWhenAvailable for deferred execution
+            try {
+                execSync(`powershell -Command "$t = Get-ScheduledTask '${WINDOWS_TASK_NAME}'; $t.Settings.StartWhenAvailable = $true; Set-ScheduledTask -InputObject $t"`, { stdio: "ignore" });
+            }
+            catch {
+                // Non-fatal if PowerShell cmdlet fails
+            }
+        }
+        catch {
+            emit.info("Could not create scheduled task. Create it manually:");
+            emit.detail(`schtasks /Create /TN "${WINDOWS_TASK_NAME}" /TR "${trCmd}" /SC DAILY /ST 09:00 /F`);
+            return 1;
+        }
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({ ok: true, interval: intervalLabel, mechanism: "schtasks" })}\n`);
+            return 0;
+        }
+        emit.info(`Added ${intervalLabel === "1d" ? "daily" : `every ${intervalLabel}`} collection schedule.`);
+        emit.detail(`Runs: ${emit.code("vana collect --all --quiet")}`);
+        emit.detail(`Managed by: Task Scheduler`);
+        return 0;
+    }
+    // Unsupported platform
+    emit.info("Scheduled collection is not supported on this platform. Run `vana collect --all` manually.");
+    return 1;
+}
+async function runScheduleList(options) {
+    const emit = createEmitter(options);
+    if (process.platform === "darwin") {
+        // Check launchd plist
+        try {
+            await fsp.access(LAUNCHD_PLIST_PATH);
+            const content = await fsp.readFile(LAUNCHD_PLIST_PATH, "utf8");
+            const intervalMatch = content.match(/<key>StartInterval<\/key>\s*<integer>(\d+)<\/integer>/);
+            const intervalSeconds = intervalMatch
+                ? parseInt(intervalMatch[1], 10)
+                : 86400;
+            const intervalLabel = formatIntervalHuman(intervalSeconds);
+            const nextInSeconds = intervalSeconds; // Approximate; launchd doesn't expose exact next-run
+            const nextLabel = `~${formatIntervalHuman(nextInSeconds)}`;
+            if (options.json) {
+                process.stdout.write(`${JSON.stringify({
+                    scheduled: true,
+                    interval: intervalLabel,
+                    intervalSeconds,
+                    mechanism: "launchd",
+                    plistPath: LAUNCHD_PLIST_PATH,
+                })}\n`);
+                return 0;
+            }
+            emit.keyValue("Daily collection", `every ${intervalLabel}    next: ${nextLabel}`, "muted");
+            emit.detail(`Managed by: ${LAUNCHD_PLIST_PATH}`);
+            return 0;
+        }
+        catch {
+            // No plist found
+        }
+    }
+    if (process.platform === "linux") {
+        // Check crontab
+        try {
+            const crontab = execSync("crontab -l 2>/dev/null", {
+                encoding: "utf8",
+            });
+            const vanaLine = crontab
+                .split("\n")
+                .find((line) => line.includes(CRONTAB_MARKER));
+            if (vanaLine) {
+                if (options.json) {
+                    process.stdout.write(`${JSON.stringify({
+                        scheduled: true,
+                        mechanism: "cron",
+                        entry: vanaLine,
+                    })}\n`);
+                    return 0;
+                }
+                emit.keyValue("Daily collection", "cron", "muted");
+                emit.detail(`Entry: ${vanaLine.replace(CRONTAB_MARKER, "").trim()}`);
+                return 0;
+            }
+        }
+        catch {
+            // No crontab available
+        }
+    }
+    if (process.platform === "win32") {
+        try {
+            const output = execSync(`schtasks /Query /TN "${WINDOWS_TASK_NAME}" /FO LIST`, { encoding: "utf8" });
+            if (options.json) {
+                process.stdout.write(`${JSON.stringify({
+                    scheduled: true,
+                    mechanism: "schtasks",
+                    taskName: WINDOWS_TASK_NAME,
+                })}\n`);
+                return 0;
+            }
+            emit.keyValue("Daily collection", "Task Scheduler", "muted");
+            // Extract schedule info from output
+            const statusLine = output.split("\n").find((l) => l.includes("Status:"));
+            if (statusLine) {
+                emit.detail(statusLine.trim());
+            }
+            return 0;
+        }
+        catch {
+            // Task not found
+        }
+    }
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify({ scheduled: false })}\n`);
+        return 0;
+    }
+    emit.info("No scheduled collection found.");
+    emit.detail(`Add one with ${emit.code("vana schedule add")}.`);
+    return 0;
+}
+async function runScheduleRemove(options) {
+    const emit = createEmitter(options);
+    if (process.platform === "darwin") {
+        try {
+            await fsp.access(LAUNCHD_PLIST_PATH);
+            try {
+                execSync(`launchctl unload "${LAUNCHD_PLIST_PATH}"`, {
+                    stdio: "ignore",
+                });
+            }
+            catch {
+                // Already unloaded
+            }
+            await fsp.unlink(LAUNCHD_PLIST_PATH);
+            if (options.json) {
+                process.stdout.write(`${JSON.stringify({ ok: true, removed: true })}\n`);
+                return 0;
+            }
+            emit.info("Removed daily collection schedule.");
+            return 0;
+        }
+        catch {
+            // No plist found, fall through
+        }
+    }
+    if (process.platform === "linux") {
+        try {
+            const existing = execSync("crontab -l 2>/dev/null", {
+                encoding: "utf8",
+            });
+            if (existing.includes(CRONTAB_MARKER)) {
+                const filtered = existing
+                    .split("\n")
+                    .filter((line) => !line.includes(CRONTAB_MARKER))
+                    .join("\n");
+                execSync("crontab -", {
+                    input: `${filtered.trimEnd()}\n`,
+                    encoding: "utf8",
+                });
+                if (options.json) {
+                    process.stdout.write(`${JSON.stringify({ ok: true, removed: true })}\n`);
+                    return 0;
+                }
+                emit.info("Removed daily collection schedule.");
+                return 0;
+            }
+        }
+        catch {
+            // No crontab available
+        }
+    }
+    if (process.platform === "win32") {
+        try {
+            execSync(`schtasks /Delete /TN "${WINDOWS_TASK_NAME}" /F`, {
+                stdio: "ignore",
+            });
+            if (options.json) {
+                process.stdout.write(`${JSON.stringify({ ok: true, removed: true })}\n`);
+                return 0;
+            }
+            emit.info("Removed daily collection schedule.");
+            return 0;
+        }
+        catch {
+            // Task not found
+        }
+    }
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify({ ok: true, removed: false })}\n`);
+        return 0;
+    }
+    emit.info("No scheduled collection found to remove.");
+    return 0;
+}
+function isPromptCancelled(error) {
+    return (error instanceof Error &&
+        (error.name === "ExitPromptError" || error.message.includes("SIGINT")));
+}
+// ---------------------------------------------------------------------------
+// Skill commands
+// ---------------------------------------------------------------------------
+const BASE_SKILL_ID = "connect-data";
+async function maybePromptSkillInstall(emit) {
+    try {
+        const skills = await listAvailableSkills();
+        const baseSkill = skills.find((s) => s.id === BASE_SKILL_ID);
+        if (!baseSkill)
+            return;
+        const installed = await readInstalledSkills();
+        if (installed.some((s) => s.id === BASE_SKILL_ID)) {
+            await updateCliConfig({ skillsPromptCompleted: true });
+            return;
+        }
+        emit.blank();
+        const shouldInstall = await confirm({
+            message: "Install a skill so your coding agent knows how to use your connected data?",
+            default: true,
+            ...vanaPromptTheme,
+        });
+        if (shouldInstall) {
+            try {
+                await installSkill(BASE_SKILL_ID);
+                emit.success(`Installed skill: ${baseSkill.name}`);
+            }
+            catch {
+                // Non-fatal.
+            }
+            const remaining = skills.filter((s) => s.id !== BASE_SKILL_ID);
+            if (remaining.length > 0) {
+                emit.next("vana skills");
+            }
+        }
+        await updateCliConfig({ skillsPromptCompleted: true });
+    }
+    catch {
+        // Prompt cancelled or error — mark as completed to avoid re-asking.
+        await updateCliConfig({ skillsPromptCompleted: true });
+    }
+}
+async function runSkillsGuidedPicker(options) {
+    const emit = createEmitter(options);
+    if (options.json) {
+        // In JSON mode, fall back to list behavior
+        return runSkillList(options);
+    }
+    if (!process.stdin.isTTY || !process.stdout.isTTY) {
+        return runSkillList(options);
+    }
+    try {
+        const skills = await listAvailableSkills();
+        const installed = await readInstalledSkills();
+        const installedIds = new Set(installed.map((s) => s.id));
+        if (skills.length === 0) {
+            emit.info("No skills are available right now.");
+            return 0;
+        }
+        const choices = skills.map((skill) => {
+            const isInstalled = installedIds.has(skill.id);
+            return {
+                value: skill.id,
+                name: `${skill.name}${isInstalled ? " (installed)" : ""}`,
+                description: skill.description,
+            };
+        });
+        const selectedId = await searchSelect({
+            message: "Select a skill.",
+            choices,
+            ...vanaPromptTheme,
+        });
+        if (installedIds.has(selectedId)) {
+            return runSkillShow(selectedId, options);
+        }
+        return runSkillInstall(selectedId, options);
+    }
+    catch (error) {
+        if (isPromptCancelled(error)) {
+            emit.info("Cancelled.");
+            return 1;
+        }
+        throw error;
+    }
+}
+async function runSkillList(options) {
+    const emit = createEmitter(options);
+    try {
+        const skills = await listAvailableSkills();
+        const installed = await readInstalledSkills();
+        const installedIds = new Set(installed.map((s) => s.id));
+        const enriched = skills.map((skill) => ({
+            ...skill,
+            installed: installedIds.has(skill.id),
+        }));
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({ count: enriched.length, skills: enriched })}\n`);
+            return 0;
+        }
+        emit.title("Available skills");
+        emit.blank();
+        if (enriched.length === 0) {
+            emit.info("No skills are available right now.");
+            return 0;
+        }
+        for (const skill of enriched) {
+            const tag = skill.installed
+                ? ` ${emit.badge("installed", "accent")}`
+                : "";
+            emit.info(`  ${skill.name}${tag}`);
+            emit.detail(`  ${skill.description}`);
+        }
+        const uninstalled = enriched.find((s) => !s.installed);
+        if (uninstalled) {
+            emit.blank();
+            emit.next(`vana skills install ${uninstalled.id}`);
+        }
+        return 0;
+    }
+    catch (error) {
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({ error: error instanceof Error ? error.message : String(error) })}\n`);
+        }
+        else {
+            emit.info(error instanceof Error ? error.message : String(error));
+        }
+        return 1;
+    }
+}
+async function runSkillInstall(name, options) {
+    const emit = createEmitter(options);
+    try {
+        const { installedPath } = await installSkill(name);
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({ ok: true, id: name, installedPath })}\n`);
+            return 0;
+        }
+        emit.success(`Installed ${name}.`);
+        emit.blank();
+        const skills = await listAvailableSkills();
+        const installed = await readInstalledSkills();
+        const installedIds = new Set([...installed.map((s) => s.id), name]);
+        const nextSkill = skills.find((s) => !installedIds.has(s.id));
+        emit.next(nextSkill ? `vana skills install ${nextSkill.id}` : "vana skills list");
+        return 0;
+    }
+    catch (error) {
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({ ok: false, error: error instanceof Error ? error.message : String(error) })}\n`);
+        }
+        else {
+            emit.info(error instanceof Error ? error.message : String(error));
+        }
+        return 1;
+    }
+}
+async function runSkillShow(name, options) {
+    const emit = createEmitter(options);
+    try {
+        const skills = await listAvailableSkills();
+        const match = skills.find((s) => s.id.toLowerCase() === name.toLowerCase());
+        if (!match) {
+            if (options.json) {
+                process.stdout.write(`${JSON.stringify({ error: `No skill found with id "${name}".` })}\n`);
+            }
+            else {
+                emit.info(`No skill found with id "${name}".`);
+                emit.blank();
+                emit.next("vana skills list");
+            }
+            return 1;
+        }
+        const installed = await readInstalledSkills();
+        const isInstalled = installed.some((s) => s.id === match.id);
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({ ...match, installed: isInstalled })}\n`);
+            return 0;
+        }
+        const badges = [];
+        if (isInstalled) {
+            badges.push({ text: "installed", tone: "success" });
+        }
+        emit.sourceTitle(match.name, badges);
+        emit.detail(match.description);
+        emit.keyValue("Version", match.version);
+        if (!isInstalled) {
+            emit.blank();
+            emit.next(`vana skills install ${match.id}`);
+        }
+        return 0;
+    }
+    catch (error) {
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify({ error: error instanceof Error ? error.message : String(error) })}\n`);
+        }
+        else {
+            emit.info(error instanceof Error ? error.message : String(error));
+        }
+        return 1;
     }
 }
 //# sourceMappingURL=index.js.map