@opendatalabs/connect 0.11.4 → 0.11.6-canary.1807d4e

package/dist/cli/index.js

@@ -35,6 +35,7 @@ import { listAvailableSkills, installSkill, readInstalledSkills, } from "../skil
 import { queryStatus, querySources, queryDataList, queryDataShow, queryDoctor, } from "./queries.js";
 import { checkForUpdate, readUpdateCheck, isNewerVersion, } from "./update-check.js";
 import { loadCredentials, saveCredentials, clearCredentials, isExpired, formatAddress, formatExpiresIn, getAuthTarget, resolvePersonalServerUrl, runDeviceCodeFlow, runSelfHostedLoginFlow, } from "./auth.js";
+import { createCliTelemetrySession, flushTelemetryOutbox, getTelemetryStatus, setActiveTelemetrySession, setTelemetryEnabled, trackActiveTelemetryEvent, } from "./telemetry.js";
 function cleanDescription(desc) {
     return desc
         .replace(/ using Playwright browser automation\.?/i, ".")
@@ -53,9 +54,16 @@ export async function runCli(argv = process.argv) {
     const parsedOptions = extractGlobalOptions(normalizedArgv);
     const cliVersion = getCliVersion();
     const installMethod = getCliInstallMethod();
+    const telemetryBaseContext = {
+        cliVersion,
+        channel: getCliChannel(cliVersion),
+        installMethod,
+        options: parsedOptions,
+    };
     // Non-blocking update check — compute suppression flags early
     const shouldNotify = !parsedOptions.json &&
         process.stdout.isTTY &&
+        installMethod !== "development" &&
         !process.env.VANA_NO_UPDATE_NOTIFIER &&
         !process.env.CI &&
         !process.env.AGENT &&
@@ -107,17 +115,18 @@ More:
         .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;
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "version" }, async () => {
+            if (parsedOptions.json) {
+                process.stdout.write(`${JSON.stringify({
+                    cliVersion,
+                    channel: getCliChannel(cliVersion),
+                    installMethod: getCliInstallMethod(),
+                })}\n`);
+                return 0;
+            }
+            process.stdout.write(`${cliVersion} (${getCliChannel(cliVersion)}, ${formatInstallMethodLabel(getCliInstallMethod()).toLowerCase()})\n`);
+            return 0;
+        });
     });
     const connectCommand = program
         .command("connect [source]")
@@ -129,13 +138,14 @@ More:
         .option("--quiet", "Reduce non-essential output")
         .option("--detach", "Run in the background")
         .action(async (source) => {
-        if (parsedOptions.detach && source) {
-            process.exitCode = await runDetached("connect", source, parsedOptions);
-            return;
-        }
-        process.exitCode = source
-            ? await runConnect(source, parsedOptions)
-            : await runConnectEntry(parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "connect", source }, async () => {
+            if (parsedOptions.detach && source) {
+                return runDetached("connect", source, parsedOptions);
+            }
+            return source
+                ? runConnect(source, parsedOptions)
+                : runConnectEntry(parsedOptions);
+        });
     });
     connectCommand.addHelpText("after", `
 Examples:
@@ -149,9 +159,9 @@ Examples:
         .description("List supported sources, or show detail for one source")
         .option("--json", "Output machine-readable JSON")
         .action(async (source) => {
-        process.exitCode = source
-            ? await runSourceDetail(source, parsedOptions)
-            : await runList(parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "sources", source }, async () => source
+            ? runSourceDetail(source, parsedOptions)
+            : runList(parsedOptions));
     });
     sourcesCommand.addHelpText("after", `
 Examples:
@@ -170,13 +180,14 @@ Examples:
         .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);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "collect", source }, async () => {
+            if (parsedOptions.detach && source) {
+                return runDetached("collect", source, parsedOptions);
+            }
+            return source
+                ? runCollect(source, parsedOptions)
+                : runCollectAll(parsedOptions);
+        });
     });
     collectCommand.addHelpText("after", `
 Examples:
@@ -189,7 +200,7 @@ Examples:
         .description("Show runtime and Personal Server status")
         .option("--json", "Output machine-readable JSON")
         .action(async () => {
-        process.exitCode = await runStatus(parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "status" }, async () => runStatus(parsedOptions));
     });
     statusCommand.addHelpText("after", `
 Examples:
@@ -201,7 +212,7 @@ Examples:
         .description("Inspect local CLI, runtime, and install health")
         .option("--json", "Output machine-readable JSON")
         .action(async () => {
-        process.exitCode = await runDoctor(parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "doctor" }, async () => runDoctor(parsedOptions));
     });
     doctorCommand.addHelpText("after", `
 Examples:
@@ -214,7 +225,7 @@ Examples:
         .option("--json", "Output machine-readable JSON")
         .option("--yes", "Approve safe setup prompts automatically")
         .action(async () => {
-        process.exitCode = await runSetup(parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "setup" }, async () => runSetup(parsedOptions));
     });
     setupCommand.addHelpText("after", `
 Examples:
@@ -239,7 +250,7 @@ Examples:
         .description("List locally available collected datasets")
         .option("--json", "Output machine-readable JSON")
         .action(async () => {
-        process.exitCode = await runDataList(parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "data", subcommand: "list" }, async () => runDataList(parsedOptions));
     });
     dataListCommand.addHelpText("after", `
 Examples:
@@ -251,7 +262,12 @@ Examples:
         .description("Show a collected dataset")
         .option("--json", "Output machine-readable JSON")
         .action(async (source) => {
-        process.exitCode = await runDataShow(source, parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({
+            ...telemetryBaseContext,
+            command: "data",
+            subcommand: "show",
+            source,
+        }, async () => runDataShow(source, parsedOptions));
     });
     dataShowCommand.addHelpText("after", `
 Examples:
@@ -263,7 +279,12 @@ Examples:
         .description("Print the local path for a collected dataset")
         .option("--json", "Output machine-readable JSON")
         .action(async (source) => {
-        process.exitCode = await runDataPath(source, parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({
+            ...telemetryBaseContext,
+            command: "data",
+            subcommand: "path",
+            source,
+        }, async () => runDataPath(source, parsedOptions));
     });
     dataPathCommand.addHelpText("after", `
 Examples:
@@ -275,7 +296,7 @@ Examples:
         .description("Inspect stored connector run logs")
         .option("--json", "Output machine-readable JSON")
         .action(async (source) => {
-        process.exitCode = await runLogs(source, parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "logs", source }, async () => runLogs(source, parsedOptions));
     });
     logsCommand.addHelpText("after", `
 Examples:
@@ -295,62 +316,89 @@ Examples:
   vana server clear-url
 `);
     server.action(async () => {
-        process.exitCode = await runServerStatus(parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "server", subcommand: "status" }, async () => runServerStatus(parsedOptions));
     });
     server
         .command("status")
         .description("Show Personal Server status")
         .option("--json", "Output machine-readable JSON")
         .action(async () => {
-        process.exitCode = await runServerStatus(parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "server", subcommand: "status" }, async () => 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);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "server", subcommand: "set-url" }, async () => 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);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "server", subcommand: "clear-url" }, async () => 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);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "server", subcommand: "sync" }, async () => 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);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "server", subcommand: "data" }, async () => runServerData(scope, parsedOptions));
     });
     program
         .command("login")
         .description("Log in to your Vana account or a self-hosted Personal Server")
         .option("-s, --server <url>", "Self-hosted Personal Server URL")
         .action(async (loginOptions) => {
-        process.exitCode = await runLogin(parsedOptions, loginOptions.server);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "login" }, async () => runLogin(parsedOptions, loginOptions.server));
     });
     program
         .command("logout")
         .description("Log out and remove saved credentials")
         .action(async () => {
-        process.exitCode = await runLogout(parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "logout" }, async () => runLogout(parsedOptions));
+    });
+    const telemetry = program
+        .command("telemetry")
+        .description("Inspect and manage CLI telemetry");
+    telemetry.action(async () => {
+        process.exitCode = await runTelemetryStatus(parsedOptions);
+    });
+    telemetry
+        .command("status")
+        .description("Show telemetry state")
+        .option("--json", "Output machine-readable JSON")
+        .action(async () => {
+        process.exitCode = await runTelemetryStatus(parsedOptions);
+    });
+    telemetry
+        .command("enable")
+        .description("Enable telemetry")
+        .action(async () => {
+        process.exitCode = await runTelemetryEnable(parsedOptions);
+    });
+    telemetry
+        .command("disable")
+        .description("Disable telemetry")
+        .action(async () => {
+        process.exitCode = await runTelemetryDisable(parsedOptions);
     });
     program
         .command("mcp")
         .description("Start MCP server for agent integration")
         .action(async () => {
-        const { startMcpServer } = await import("./mcp-server.js");
-        await startMcpServer();
+        process.exitCode = await runLongRunningCommandWithTelemetry({ ...telemetryBaseContext, command: "mcp" }, async () => {
+            const { startMcpServer } = await import("./mcp-server.js");
+            await startMcpServer();
+        });
     });
     const skill = program
         .command("skills")
@@ -363,26 +411,26 @@ Examples:
   vana skills show connect-data
 `);
     skill.action(async () => {
-        process.exitCode = await runSkillsGuidedPicker(parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "skills" }, async () => runSkillsGuidedPicker(parsedOptions));
     });
     skill
         .command("list")
         .description("List available agent skills")
         .option("--json", "Output as JSON")
         .action(async () => {
-        process.exitCode = await runSkillList(parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "skills", subcommand: "list" }, async () => runSkillList(parsedOptions));
     });
     skill
         .command("install <name>")
         .description("Install a skill for your agent")
         .action(async (name) => {
-        process.exitCode = await runSkillInstall(name, parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "skills", subcommand: "install" }, async () => runSkillInstall(name, parsedOptions));
     });
     skill
         .command("show <name>")
         .description("Show skill details")
         .action(async (name) => {
-        process.exitCode = await runSkillShow(name, parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "skills", subcommand: "show" }, async () => runSkillShow(name, parsedOptions));
     });
     // --- Schedule commands ---
     const schedule = program
@@ -404,20 +452,20 @@ Examples:
         .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);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "schedule", subcommand: "add" }, async () => runScheduleAdd(opts.every, parsedOptions));
     });
     schedule
         .command("list")
         .description("Show scheduled tasks")
         .option("--json", "Output machine-readable JSON")
         .action(async () => {
-        process.exitCode = await runScheduleList(parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "schedule", subcommand: "list" }, async () => runScheduleList(parsedOptions));
     });
     schedule
         .command("remove")
         .description("Remove the scheduled collection")
         .action(async () => {
-        process.exitCode = await runScheduleRemove(parsedOptions);
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "schedule", subcommand: "remove" }, async () => runScheduleRemove(parsedOptions));
     });
     try {
         await program.parseAsync(normalizedArgv);
@@ -456,6 +504,139 @@ Examples:
     }
     return Number(process.exitCode ?? 0);
 }
+function classifyCommandFailure(error) {
+    if (error instanceof Error) {
+        const value = error.message.toLowerCase();
+        if (value.includes("auth"))
+            return "auth_failed";
+        if (value.includes("setup"))
+            return "setup_required";
+        if (value.includes("runtime"))
+            return "runtime_error";
+        if (value.includes("connector"))
+            return "connector_unavailable";
+        if (value.includes("ingest"))
+            return "ingest_failed";
+    }
+    return "unknown";
+}
+async function runCommandWithTelemetry(context, action) {
+    const session = await createCliTelemetrySession({
+        ...context,
+        options: {
+            json: Boolean(context.options.json),
+            noInput: Boolean(context.options.noInput),
+            quiet: Boolean(context.options.quiet),
+            detach: Boolean(context.options.detach),
+            ipc: Boolean(context.options.ipc),
+        },
+        localOnly: context.localOnly,
+    });
+    setActiveTelemetrySession(session);
+    await flushTelemetryOutbox();
+    try {
+        const exitCode = await action();
+        session.markCommandResult({ exitCode });
+        return exitCode;
+    }
+    catch (error) {
+        session.markCommandResult({
+            exitCode: 1,
+            errorClass: classifyCommandFailure(error),
+        });
+        throw error;
+    }
+    finally {
+        await session.persist();
+        await session.flush();
+        setActiveTelemetrySession(null);
+    }
+}
+async function runLongRunningCommandWithTelemetry(context, action) {
+    const session = await createCliTelemetrySession({
+        ...context,
+        options: {
+            json: Boolean(context.options.json),
+            noInput: Boolean(context.options.noInput),
+            quiet: Boolean(context.options.quiet),
+            detach: Boolean(context.options.detach),
+            ipc: Boolean(context.options.ipc),
+        },
+    });
+    setActiveTelemetrySession(session);
+    await flushTelemetryOutbox();
+    session.trackCustomEvent("mcp_started");
+    session.markCommandResult({ exitCode: 0, outcome: "started" });
+    await session.persist();
+    await session.flush();
+    try {
+        await action();
+        return 0;
+    }
+    finally {
+        setActiveTelemetrySession(null);
+    }
+}
+async function runTelemetryStatus(options) {
+    const status = await getTelemetryStatus();
+    const endpointHost = (() => {
+        try {
+            return new URL(status.endpoint).host;
+        }
+        catch {
+            return status.endpoint;
+        }
+    })();
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify(status)}\n`);
+        return 0;
+    }
+    const emit = createEmitter(options);
+    emit.title("Telemetry");
+    emit.blank();
+    emit.keyValue("Enabled", status.enabled ? "yes" : "no");
+    emit.keyValue("Mode", status.mode);
+    emit.keyValue("Reason", status.reason.replaceAll("_", " "));
+    emit.keyValue("Endpoint", endpointHost);
+    emit.keyValue("Queued", String(status.queuedBatches));
+    emit.detail("Collected data stays local. Remote telemetry only includes small operational events.");
+    if (status.enabled) {
+        emit.detail(`Disable with: ${emit.code("vana telemetry disable")}`);
+    }
+    else {
+        emit.detail(`Enable with: ${emit.code("vana telemetry enable")}`);
+    }
+    if (process.env.VANA_TELEMETRY_DEBUG === "1") {
+        emit.detail(`Debug mode is active via ${emit.code("VANA_TELEMETRY_DEBUG=1")}. Events print to stderr and are not uploaded.`);
+    }
+    if (process.env.VANA_TELEMETRY_DISABLED === "1") {
+        emit.detail(`Telemetry is currently overridden by ${emit.code("VANA_TELEMETRY_DISABLED=1")}.`);
+    }
+    return 0;
+}
+async function runTelemetryEnable(options) {
+    await setTelemetryEnabled(true);
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify({ enabled: true })}\n`);
+        return 0;
+    }
+    const emit = createEmitter(options);
+    emit.success("Telemetry enabled.");
+    if (process.env.VANA_TELEMETRY_DISABLED === "1") {
+        emit.detail(`The current shell still disables uploads via ${emit.code("VANA_TELEMETRY_DISABLED=1")}.`);
+    }
+    return 0;
+}
+async function runTelemetryDisable(options) {
+    await setTelemetryEnabled(false);
+    if (options.json) {
+        process.stdout.write(`${JSON.stringify({ enabled: false })}\n`);
+        return 0;
+    }
+    const emit = createEmitter(options);
+    emit.success("Telemetry disabled.");
+    return 0;
+}
 async function runConnect(rawSource, options) {
     const source = rawSource.toLowerCase();
     const runtime = new ManagedPlaywrightRuntime();
@@ -509,7 +690,18 @@ async function runConnect(rawSource, options) {
                 }
                 process.stderr.write("\n");
             }
-            const installResult = await runtime.ensureInstalled(Boolean(options.yes));
+            trackActiveTelemetryEvent("runtime_install_started", { source });
+            let installResult;
+            try {
+                installResult = await runtime.ensureInstalled(Boolean(options.yes));
+            }
+            catch (error) {
+                trackActiveTelemetryEvent("runtime_install_failed", {
+                    source,
+                    errorClass: classifyCommandFailure(error),
+                });
+                throw error;
+            }
             setupLogPath = installResult.logPath;
             emit.event({
                 type: "setup-complete",
@@ -598,6 +790,13 @@ async function runConnect(rawSource, options) {
             }
         }
         if (fetched.updated && fetched.previousVersion) {
+            trackActiveTelemetryEvent("connector_update_applied", {
+                source,
+                metadata: {
+                    previousVersion: fetched.previousVersion,
+                    connectorVersion: fetched.version,
+                },
+            });
             renderer?.detail(`Updated connector (${fetched.previousVersion} → ${fetched.version}).`);
         }
         fetchLogPath = fetched.logPath;
@@ -1217,7 +1416,7 @@ async function runStatus(options) {
     // Auth state
     const authCreds = loadCredentials();
     if (authCreds && !isExpired(authCreds)) {
-        emit.keyValue("Account", formatAddress(authCreds.account.address), "success");
+        emit.keyValue("Account", authCreds.account.address, "success");
         emit.keyValue("Auth", `Authenticated (expires in ${formatExpiresIn(authCreds.account.expires_at)})`, "success");
     }
     else {
@@ -2195,7 +2394,11 @@ async function runCollectAll(options) {
 async function runServerSync(options) {
     const emit = createEmitter(options);
     const target = await detectPersonalServerTarget();
+    trackActiveTelemetryEvent("server_sync_started");
     if (target.state !== "available") {
+        trackActiveTelemetryEvent("server_sync_failed", {
+            errorClass: "personal_server_unavailable",
+        });
         if (options.json) {
             process.stdout.write(`${JSON.stringify({
                 error: "personal_server_unavailable",
@@ -2208,7 +2411,16 @@ async function runServerSync(options) {
         return 1;
     }
     const syncResult = await syncPendingSources(target, "manual");
+    const storedScopeCount = syncResult.sourceResults.reduce((total, entry) => total +
+        (entry.scopeResults?.filter((scopeResult) => scopeResult.status === "stored").length ?? 0), 0);
+    const failedScopeCount = syncResult.sourceResults.reduce((total, entry) => total +
+        (entry.scopeResults?.filter((scopeResult) => scopeResult.status === "failed").length ?? 0), 0);
     if (syncResult.sourceResults.length === 0) {
+        trackActiveTelemetryEvent("server_sync_completed", {
+            storedScopeCount: 0,
+            failedScopeCount: 0,
+            metadata: { syncedSources: 0 },
+        });
         if (options.json) {
             process.stdout.write(`${JSON.stringify({ message: "No pending datasets to sync.", syncedCount: 0 })}\n`);
         }
@@ -2231,7 +2443,7 @@ async function runServerSync(options) {
                         emit.info(`  ${renderer.theme.success("\u2713")} ${sr.scope}`);
                     }
                     else {
-                        const errDetail = sr.error ?? "failed";
+                        const errDetail = sr.error ? humanizeIssue(sr.error) : "Failed";
                         emit.info(`  ${renderer.theme.error("\u2717")} ${sr.scope} ${renderer.theme.muted(`\u2014 ${errDetail}`)}`);
                     }
                 }
@@ -2249,6 +2461,11 @@ async function runServerSync(options) {
             emit.next("vana server sync");
         }
     }
+    trackActiveTelemetryEvent("server_sync_completed", {
+        storedScopeCount,
+        failedScopeCount,
+        metadata: { syncedSources: syncResult.syncedCount },
+    });
     return 0;
 }
 async function runServerData(scope, options) {
@@ -3559,6 +3776,7 @@ async function runDetached(command, source, options) {
         stdio: ["ignore", logFd, logFd],
         env: { ...process.env, VANA_DETACHED: "1" },
     });
+    trackActiveTelemetryEvent("detached_run_spawned", { source });
     child.unref();
     fs.closeSync(logFd);
     // Write session file
@@ -3763,6 +3981,9 @@ async function runScheduleAdd(interval, options) {
             emit.detail(`launchctl load "${LAUNCHD_PLIST_PATH}"`);
             return 1;
         }
+        trackActiveTelemetryEvent("schedule_added", {
+            metadata: { interval: intervalLabel, mechanism: "launchd" },
+        });
         if (options.json) {
             process.stdout.write(`${JSON.stringify({ ok: true, interval: intervalLabel, mechanism: "launchd", plistPath: LAUNCHD_PLIST_PATH })}\n`);
             return 0;
@@ -3803,6 +4024,9 @@ async function runScheduleAdd(interval, options) {
             emit.detail(entry);
             return 1;
         }
+        trackActiveTelemetryEvent("schedule_added", {
+            metadata: { interval: intervalLabel, mechanism: "cron" },
+        });
         if (options.json) {
             process.stdout.write(`${JSON.stringify({ ok: true, interval: intervalLabel, mechanism: "cron" })}\n`);
             return 0;
@@ -3844,6 +4068,9 @@ async function runScheduleAdd(interval, options) {
             emit.detail(`schtasks /Create /TN "${WINDOWS_TASK_NAME}" /TR "${trCmd}" /SC DAILY /ST 09:00 /F`);
             return 1;
         }
+        trackActiveTelemetryEvent("schedule_added", {
+            metadata: { interval: intervalLabel, mechanism: "schtasks" },
+        });
         if (options.json) {
             process.stdout.write(`${JSON.stringify({ ok: true, interval: intervalLabel, mechanism: "schtasks" })}\n`);
             return 0;
@@ -3961,6 +4188,9 @@ async function runScheduleRemove(options) {
                 // Already unloaded
             }
             await fsp.unlink(LAUNCHD_PLIST_PATH);
+            trackActiveTelemetryEvent("schedule_removed", {
+                metadata: { mechanism: "launchd" },
+            });
             if (options.json) {
                 process.stdout.write(`${JSON.stringify({ ok: true, removed: true })}\n`);
                 return 0;
@@ -3986,6 +4216,9 @@ async function runScheduleRemove(options) {
                     input: `${filtered.trimEnd()}\n`,
                     encoding: "utf8",
                 });
+                trackActiveTelemetryEvent("schedule_removed", {
+                    metadata: { mechanism: "cron" },
+                });
                 if (options.json) {
                     process.stdout.write(`${JSON.stringify({ ok: true, removed: true })}\n`);
                     return 0;
@@ -4003,6 +4236,9 @@ async function runScheduleRemove(options) {
             execSync(`schtasks /Delete /TN "${WINDOWS_TASK_NAME}" /F`, {
                 stdio: "ignore",
             });
+            trackActiveTelemetryEvent("schedule_removed", {
+                metadata: { mechanism: "schtasks" },
+            });
             if (options.json) {
                 process.stdout.write(`${JSON.stringify({ ok: true, removed: true })}\n`);
                 return 0;
@@ -4157,6 +4393,9 @@ async function runSkillInstall(name, options) {
     const emit = createEmitter(options);
     try {
         const { installedPath } = await installSkill(name);
+        trackActiveTelemetryEvent("skill_installed", {
+            metadata: { skillName: name },
+        });
         if (options.json) {
             process.stdout.write(`${JSON.stringify({ ok: true, id: name, installedPath })}\n`);
             return 0;
@@ -4233,11 +4472,14 @@ async function runLogin(options, serverUrl) {
     // If self-hosted, use /auth/device flow against the PS
     if (authTarget === "self-hosted" && psUrl) {
         const renderer = !options.json && !options.quiet ? createLoginRenderer() : null;
+        const humanRenderer = createHumanRenderer();
         renderer?.title(psUrl);
         try {
             const result = await runSelfHostedLoginFlow(psUrl, (url) => {
-                renderer?.note("Open this URL in your browser:");
-                renderer?.note(url);
+                if (!options.json && !options.quiet) {
+                    process.stderr.write(`  ${humanRenderer.theme.muted("Open this URL in your browser:")}\n`);
+                    process.stderr.write(`  ${humanRenderer.theme.muted(url)}\n`);
+                }
                 renderer?.scopeActive("Waiting for authorization");
                 // Try to open browser — use spawn with args array to prevent shell injection
                 // (a malicious self-hosted PS could return a URL with shell metacharacters)
@@ -4353,12 +4595,23 @@ async function runLogin(options, serverUrl) {
     }
     // Interactive mode
     const renderer = createLoginRenderer();
+    const humanRenderer = createHumanRenderer();
+    const writeStaticLoginNotes = (lines) => {
+        if (options.json || options.quiet) {
+            return;
+        }
+        for (const line of lines) {
+            process.stderr.write(`  ${humanRenderer.theme.muted(line)}\n`);
+        }
+    };
     renderer.title("Vana");
     const creds = await runDeviceCodeFlow({
         onCode: (code, uri) => {
-            renderer.note("Open this URL in your browser:");
-            renderer.note(uri);
-            renderer.note(`Enter this code: ${code}`);
+            writeStaticLoginNotes([
+                "Open this URL in your browser:",
+                uri,
+                `Enter this code: ${code}`,
+            ]);
         },
         onWaiting: () => {
             renderer.scopeActive("Waiting for authorization");