vana-cli 0.28.2 → 0.29.0

package/dist/cli/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAwCA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAQL,YAAY,EAIb,MAAM,kBAAkB,CAAC;AAgB1B,OAAO,KAAK,EACV,UAAU,EAEV,gBAAgB,EAEhB,SAAS,EACT,YAAY,EACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAwKjE,UAAU,cAAc;IACtB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1B;AAED,UAAU,iBAAiB;IACzB,CAAC,MAAM,EAAE,MAAM,GAAG;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,CAAC,EAAE,WAAW,GAAG,aAAa,GAAG,QAAQ,CAAC;QAClD,OAAO,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;KAC7B,CAAC;CACH;AA2BD,KAAK,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;AAehF,wBAAsB,MAAM,CAAC,IAAI,WAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CA+vBjE;AA+OD,wBAAsB,iBAAiB,CAAC,CAAC,EACvC,QAAQ,EAAE,eAAe,GAAG,IAAI,EAChC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACtB,OAAO,SAA0B,GAChC,OAAO,CAAC,CAAC,CAAC,CAUZ;AAqsDD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAWpD;AAuvCD,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,cAAmB,GAC1B,MAAM,CAER;AAkBD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CASrD;AAuGD,wBAAsB,oBAAoB,CACxC,aAAa,EAAE,MAAM,CACnB,MAAM,EACN,OAAO,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAC5D,EACD,QAAQ,GAAE,iBAAsB,GAC/B,OAAO,CAAC,YAAY,EAAE,CAAC,CA0EzB;AAED,wBAAsB,2BAA2B,IAAI,OAAO,CAC1D,KAAK,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CACxC,CAyBA;AA6LD,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,YAAY,EAAE,EACvB,YAAY,GAAE,cAAmB,EACjC,OAAO,GAAE,SAAS,CAAC,SAAS,CAAe,EAC3C,gBAAgB,GAAE,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAM,GAC5E,MAAM,EAAE,CA+HV;AAED,wBAAgB,qBAAqB,CACnC,iBAAiB,EACb;IACE,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,WAAW,GAAG,aAAa,GAAG,QAAQ,CAAC;CACnD,GACD,IAAI,GACJ,SAAS,EACb,cAAc,EAAE,MAAM,GACrB,MAAM,EAAE,CAgBV;AAED,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,KAAK,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC,EACF,eAAe,EAAE,KAAK,CAAC;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,WAAW,GAAG,aAAa,GAAG,QAAQ,CAAC;CACnD,CAAC,GACD,MAAM,EAAE,CAmBV;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,YAAY,GAAE,cAAmB,GAChC,MAAM,EAAE,CAQV;AAmCD,8EAA8E;AAC9E,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAqB7E;AA2CD,wBAAgB,aAAa,IAAI,MAAM,CA2BtC;AAED,wBAAgB,aAAa,CAAC,OAAO,SAAkB,GAAG,QAAQ,GAAG,QAAQ,CAc5E;AAuBD,wBAAgB,mBAAmB,CACjC,QAAQ,SAAmB,EAC3B,UAAU,SAAqB,GAC9B,gBAAgB,CA+ClB;AAMD,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,gBAAgB,EAC/B,QAAQ,SAAmB,GAC1B,MAAM,GAAG,IAAI,CAQf;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAazE;AAED,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,gBAAgB,EAC/B,OAAO,EAAE,UAAU,EACnB,UAAU,SAAqB,GAC9B;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAiDxC;AAoCD,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GAC3C,cAAc,CAEhB;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,KAAK,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,WAAW,GAAG,aAAa,GAAG,QAAQ,CAAC;IAClD,OAAO,CAAC,EAAE,QAAQ,GAAG,MAAM,CAAC;CAC7B,CAAC,GACD,iBAAiB,CAanB;AAID,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,YAAY,GAAG;IACjE,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,UAAU,CAAC;CAClB,CA2DA;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG,UAAU,CAQxE;AAqED,wBAAsB,mBAAmB,+BAQxC;AAYD,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,YAAY,GAClB,MAAM,CAgBR;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAiB/D;AAqCD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CA6B7D;AAeD,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,IAAI,CAAC,CAOrC;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B;IAAE,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,IAAI,CAoD5B;AA6BD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAUrD;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE;IACJ,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB,EACD,KAAK,EAAE;IACL,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CAChB,GACA,MAAM,CAaR;AAsBD,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,YAAY,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,SAAS,GACtD,OAAO,CAOT;AAqMD,qBAAa,2BAA4B,SAAQ,KAAK;CAAG;AAEzD;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,aAAa,GAAE,gBAAwC,EACvD,QAAQ,SAAmB,EAC3B,WAAW,SAAkB,GAC5B,MAAM,EAAE,CAkBV;AAgDD,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EAAE,EACrB,eAAe,EAAE,MAAM,GACtB,MAAM,CA+BR"}

package/dist/cli/index.js

@@ -29,17 +29,19 @@ const vanaPromptTheme = {
 };
 import { createConnectRenderer, createHumanRenderer, createLoginRenderer, formatDisplayPath, formatRelativeTime, } from "./render/index.js";
 import { CliOutcomeStatus, migrateLegacyDataHome, getBrowserProfilesDir, getConnectorCacheDir, getLogsDir, getSessionsDir, getSourceResultPath, readCliState, readCliConfig, updateCliConfig, updateSourceState, } from "../core/index.js";
+import { getVanaHome } from "../core/paths.js";
 import { UnknownNetworkError, VANA_NETWORKS, isVanaNetworkName, resolveNetwork, } from "../core/network.js";
 import { CliExitCode } from "../core/exit-codes.js";
 import { registerAppCommands } from "./app/index.js";
-import { lookupRegisteredServers } from "../personal-server/registered.js";
+import { checkRegisteredServers, lookupRegisteredServers, } from "../personal-server/registered.js";
 import { fetchConnectorToCache, listAvailableSources, readCachedConnectorMetadata, } from "../connectors/registry.js";
-import { detectPersonalServerTarget, ingestResult, personalServerOwnerMismatch, resolvePersonalServerAuthConfig, } from "../personal-server/index.js";
+import { detectPersonalServerTarget, ingestResult, personalServerOwnerMismatch, urlsMatch, resolvePersonalServerAuthConfig, } from "../personal-server/index.js";
 import { findDataConnectorsDir, ManagedPlaywrightRuntime, } from "../runtime/index.js";
 import { getPdppProfileRoot } from "../pdpp/host.js";
 import { runServerStart } from "./server-start.js";
 import { findRunningServers } from "../personal-server/local/server.js";
-import { stopLocalServer } from "../personal-server/local/detach.js";
+import { runningServerPid, stopLocalServer, } from "../personal-server/local/detach.js";
+import { localServerDataDir } from "../personal-server/local/config.js";
 import { isPdppSource, PdppRuntime } from "../pdpp/runtime.js";
 import { listAvailableSkills, installSkill, readInstalledSkills, } from "../skills/index.js";
 import { queryStatus, querySources, queryDataList, queryDataShow, queryDoctor, } from "./queries.js";
@@ -424,10 +426,11 @@ Examples:
     });
     server
         .command("status")
-        .description("Show Personal Server status")
+        .description("Where your data is served from, where it is stored, and old registrations")
+        .option("--all", "List every old registration, not just the count")
         .option("--json", "Output machine-readable JSON")
-        .action(async () => {
-        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "server", subcommand: "status" }, async () => runServerStatus(parsedOptions));
+        .action(async (statusOptions) => {
+        process.exitCode = await runCommandWithTelemetry({ ...telemetryBaseContext, command: "server", subcommand: "status" }, async () => runServerStatus(parsedOptions, statusOptions));
     });
     server
         .command("set-url <url>")
@@ -2021,14 +2024,48 @@ async function runDoctor(options) {
     }
     return 0;
 }
-async function runServerStatus(options) {
+/** Which network a server serves, from the gateway it reports. */
+function networkOfGateway(gatewayUrl) {
+    if (typeof gatewayUrl !== "string")
+        return null;
+    return /dp-rpc\.vana\.org/.test(gatewayUrl) ? "mainnet" : "moksha";
+}
+/** Where the running server keeps its data on this machine, when known. */
+function localDataDir(target, network) {
+    if (!target.url || !network)
+        return null;
+    const saved = loadCredentials()?.personal_server;
+    if (saved?.started_by === "vana-server-start" &&
+        urlsMatch(saved.url, target.url) &&
+        runningServerPid(network)) {
+        return { path: localServerDataDir(network), runBy: "cli" };
+    }
+    const desktop = path.join(getVanaHome(), "desktop", "personal-server");
+    const perNetwork = path.join(desktop, network);
+    if (fs.existsSync(perNetwork))
+        return { path: perNetwork, runBy: "desktop" };
+    if (fs.existsSync(desktop))
+        return { path: desktop, runBy: "desktop" };
+    return null;
+}
+async function runServerStatus(options, statusOptions = {}) {
     const emit = createEmitter(options);
     const target = await detectPersonalServerTarget();
-    // The local transport URL and the gateway-registered public URL are two
-    // names for the same server; show both when the owner is known.
-    const registeredServers = target.health?.owner
-        ? await lookupRegisteredServers(target.health.owner)
+    const account = loadCredentials()?.account.address;
+    const owner = target.health?.owner ?? (account && account !== "env" ? account : null);
+    // Every registration this owner has, checked from outside: the live one is
+    // where apps actually reach the data; the rest are old server identities.
+    const registrations = owner
+        ? await checkRegisteredServers(await lookupRegisteredServers(owner), owner)
         : [];
+    const localIdentity = target.health?.identity?.toLowerCase();
+    const live = registrations.find((server) => server.reachable &&
+        server.serverAddress.toLowerCase() === localIdentity) ??
+        registrations.find((server) => server.reachable) ??
+        null;
+    const stale = registrations.filter((server) => !server.reachable);
+    const network = networkOfGateway(target.health?.gatewayUrl) ?? live?.network ?? null;
+    const dataDir = localDataDir(target, network);
     const state = await readCliState();
     // Count scopes from state
     let totalScopeCount = 0;
@@ -2042,7 +2079,12 @@ async function runServerStatus(options) {
             state: target.state,
             url: target.url,
             source: target.source,
-            registeredServers,
+            owner,
+            publicUrl: live?.url ?? null,
+            publicNetwork: live?.network ?? null,
+            dataDir: dataDir?.path ?? null,
+            runBy: dataDir?.runBy ?? null,
+            registeredServers: registrations,
             health: target.health,
             scopeCount: totalScopeCount,
         })}\n`);
@@ -2050,50 +2092,58 @@ async function runServerStatus(options) {
     }
     emit.title("Personal Server");
     emit.blank();
+    if (live) {
+        emit.keyValue("Public URL", `${live.url} (${live.network}, reachable)`, "success");
+    }
+    else if (target.state === "available") {
+        emit.keyValue("Public URL", "none: apps cannot reach your data", "warning");
+    }
+    else {
+        emit.keyValue("Public URL", "none: no server of yours is answering", "warning");
+    }
     if (target.url) {
-        const urlSuffix = target.source === "scan"
-            ? "(auto-detected)"
-            : target.source === "config"
-                ? "(saved)"
-                : target.source === "auth"
-                    ? "(from vana login)"
+        const runBy = dataDir?.runBy === "cli"
+            ? "vana server start"
+            : dataDir?.runBy === "desktop"
+                ? "Vana Desktop"
+                : target.source === "scan"
+                    ? "found running"
                     : target.source === "env"
-                        ? "(from VANA_PERSONAL_SERVER_URL)"
-                        : `(${target.source ?? "unknown"})`;
-        emit.keyValue("URL", `${target.url} ${urlSuffix}`, "muted");
+                        ? "from VANA_PERSONAL_SERVER_URL"
+                        : "saved";
+        emit.keyValue("Local URL", `${target.url} (${runBy})`, "muted");
+    }
+    else {
+        emit.keyValue("Local URL", "no server running on this machine", "muted");
     }
-    for (const server of registeredServers) {
-        emit.keyValue("Registered", `${server.url} (${server.network})`, "muted");
+    if (dataDir) {
+        emit.keyValue("Data on disk", formatDisplayPath(dataDir.path), "muted");
+    }
+    if (live) {
+        emit.keyValue("Backup", "encrypted in Vana storage, follows your account", "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");
+        emit.keyValue("Uptime", formatUptime(target.health.uptime), "muted");
     }
+    if (owner)
+        emit.keyValue("Owner", owner, "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 (stale.length > 0) {
+        if (statusOptions.all) {
+            for (const server of stale) {
+                emit.keyValue("Old server", `${server.url} (${server.network}, not answering)`, "muted");
+            }
+        }
+        else {
+            emit.keyValue("Old servers", `${stale.length} not answering (${emit.code("vana server status --all")})`, "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.next("vana server start --detach");
     }
     emit.blank();
     emit.detail(`More: ${emit.code("vana server sync")} | ${emit.code("vana server data")} | ${emit.code("vana server --help")}`);
@@ -5100,15 +5150,6 @@ async function runLogin(options, serverUrl, clientId) {
             const emit = createEmitter(options);
             emit.success(`Already logged in as ${formatAddress(existing.account.address)}`);
             const server = await describeLoginPersonalServer(existing.personal_server);
-            // A live account session says nothing about the Personal Server, and a
-            // server with no session is exactly what `connect` fails to sync to.
-            // Finish that job here rather than printing this same command back.
-            if (server &&
-                !server.authenticated &&
-                !options.noInput &&
-                getAuthTarget(server.url) === "self-hosted") {
-                return loginToPersonalServer(server.url, options);
-            }
             if (server) {
                 emit.keyValue("Personal Server", server.authenticated
                     ? server.url
@@ -5117,7 +5158,7 @@ async function runLogin(options, serverUrl, clientId) {
             emit.info(`  Auth expires in ${formatExpiresIn(existing.account.expires_at)}`);
             emit.blank();
             emit.info("  Run `vana logout` to sign in as someone else.");
-            await offerServerStart(existing.account.address, options);
+            return (await finishServerSetup(existing.account.address, options)) ?? 0;
         }
         return 0;
     }
@@ -5219,9 +5260,15 @@ async function runLogin(options, serverUrl, clientId) {
                 renderer.detail(`Personal Server: ${authedCreds.personal_server.url}`);
             }
             else {
-                renderer.detail("No Personal Server found for this account yet.");
-                renderer.next("vana server start --detach");
-                renderer.detail("Or point at one you already run: vana server set-url <url>");
+                const running = await findOwnRunningServer(authedCreds.account.address);
+                if (running) {
+                    renderer.detail(`Personal Server: ${running} (running)`);
+                }
+                else {
+                    renderer.detail("No Personal Server found for this account yet.");
+                    renderer.next("vana server start --detach");
+                    renderer.detail("Or point at one you already run: vana server set-url <url>");
+                }
             }
             renderer.detail("Credentials saved to ~/.vana/auth.json");
         },
@@ -5239,9 +5286,9 @@ async function runLogin(options, serverUrl, clientId) {
         openBrowser: Boolean(process.stdout.isTTY) && !options.noInput,
     });
     renderer.cleanup();
-    if (creds)
-        await offerServerStart(creds.account.address, options);
-    return creds ? 0 : 1;
+    if (!creds)
+        return 1;
+    return (await finishServerSetup(creds.account.address, options)) ?? 0;
 }
 function serverStartIo(options) {
     return {
@@ -5256,6 +5303,47 @@ function serverStartIo(options) {
         confirm: (message) => confirm({ message, default: true, ...vanaPromptTheme }),
     };
 }
+/** The URL of a running Personal Server this account owns, if any. */
+async function findOwnRunningServer(address) {
+    try {
+        const target = await detectPersonalServerTarget();
+        return target.state === "available" &&
+            target.url &&
+            target.health?.owner &&
+            !personalServerOwnerMismatch(target.health.owner, address)
+            ? target.url
+            : null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * The last step of a login at a terminal: make this account's Personal
+ * Server ready to take `connect` writes. A running server of this account
+ * that has not approved the CLI yet (Vana Desktop's, typically) gets that
+ * one-time approval now; with none running, offer to start one. Returns an
+ * exit code when it ran the server approval, else null.
+ */
+async function finishServerSetup(address, options) {
+    if (options.json ||
+        options.noInput ||
+        !process.stdin.isTTY ||
+        !process.stdout.isTTY) {
+        return null;
+    }
+    const running = await findOwnRunningServer(address);
+    if (running) {
+        const saved = loadCredentials()?.personal_server;
+        const approved = Boolean(saved?.session_token && urlsMatch(saved.url, running));
+        if (approved || getAuthTarget(running) !== "self-hosted")
+            return null;
+        process.stderr.write(`\n  Your Personal Server at ${running} needs to approve this CLI once.\n`);
+        return loginToPersonalServer(running, options);
+    }
+    await offerServerStart(address, options);
+    return null;
+}
 /**
  * After a login at a terminal: offer to start this account's Personal Server
  * in the background when none of its servers is running. Asked, never done