vana-cli 0.15.0 → 0.23.3

package/dist/personal-server/registered.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Lookup of the owner's registered Personal Server URLs at the gateway.
+ *
+ * The local transport URL (how this CLI reaches the server, often
+ * localhost) and the registered public URL (what builders resolve through
+ * the gateway) are two names for the same server. Display surfaces show
+ * both; this module supplies the second, best-effort and offline-tolerant.
+ */
+import { createGatewayClient } from "@opendatalabs/vana-sdk";
+import { type VanaNetworkName } from "../core/network.js";
+export interface RegisteredServer {
+    network: VanaNetworkName;
+    url: string;
+    serverAddress: string;
+    status: string;
+}
+/**
+ * Active registrations for an owner across both networks, newest first per
+ * network. Failures and timeouts yield an empty list, never an error - a
+ * display concern must not break a status command.
+ */
+export declare function lookupRegisteredServers(owner: string, deps?: {
+    createClient?: typeof createGatewayClient;
+}): Promise<RegisteredServer[]>;
+//# sourceMappingURL=registered.d.ts.map

package/dist/personal-server/registered.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registered.d.ts","sourceRoot":"","sources":["../../src/personal-server/registered.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,eAAe,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB;AAaD;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,MAAM,EACb,IAAI,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,mBAAmB,CAAA;CAAO,GACvD,OAAO,CAAC,gBAAgB,EAAE,CAAC,CA6B7B"}

package/dist/personal-server/registered.js

@@ -0,0 +1,49 @@
+/**
+ * Lookup of the owner's registered Personal Server URLs at the gateway.
+ *
+ * The local transport URL (how this CLI reaches the server, often
+ * localhost) and the registered public URL (what builders resolve through
+ * the gateway) are two names for the same server. Display surfaces show
+ * both; this module supplies the second, best-effort and offline-tolerant.
+ */
+import { createGatewayClient } from "@opendatalabs/vana-sdk";
+import { VANA_NETWORKS, resolveNetwork, } from "../core/network.js";
+const LOOKUP_TIMEOUT_MS = 5_000;
+function withTimeout(promise, fallback) {
+    return Promise.race([
+        promise,
+        new Promise((resolve) => setTimeout(() => resolve(fallback), LOOKUP_TIMEOUT_MS).unref?.()),
+    ]).catch(() => fallback);
+}
+/**
+ * Active registrations for an owner across both networks, newest first per
+ * network. Failures and timeouts yield an empty list, never an error - a
+ * display concern must not break a status command.
+ */
+export async function lookupRegisteredServers(owner, deps = {}) {
+    const createClient = deps.createClient ?? createGatewayClient;
+    const perNetwork = await Promise.all(VANA_NETWORKS.map(async (name) => {
+        try {
+            // Note: VANA_ENV=dev refuses mainnet host resolution; that network
+            // simply contributes nothing rather than failing the lookup.
+            const network = resolveNetwork(name, process.env);
+            const result = await withTimeout(createClient(network.gatewayUrl).listServersByOwner(owner), null);
+            if (!result?.active?.length) {
+                return [];
+            }
+            return result.active
+                .filter((record) => Boolean(record.serverUrl))
+                .map((record) => ({
+                network: name,
+                url: record.serverUrl,
+                serverAddress: record.serverAddress,
+                status: record.status ?? "unknown",
+            }));
+        }
+        catch {
+            return [];
+        }
+    }));
+    return perNetwork.flat();
+}
+//# sourceMappingURL=registered.js.map

package/dist/personal-server/registered.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"registered.js","sourceRoot":"","sources":["../../src/personal-server/registered.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EACL,aAAa,EACb,cAAc,GAEf,MAAM,oBAAoB,CAAC;AAS5B,MAAM,iBAAiB,GAAG,KAAK,CAAC;AAEhC,SAAS,WAAW,CAAI,OAAmB,EAAE,QAAW;IACtD,OAAO,OAAO,CAAC,IAAI,CAAC;QAClB,OAAO;QACP,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,EAAE,CACzB,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC,CAAC,KAAK,EAAE,EAAE,CACjE;KACF,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;AAC3B,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,KAAa,EACb,OAAsD,EAAE;IAExD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,mBAAmB,CAAC;IAC9D,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAClC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAA+B,EAAE;QAC5D,IAAI,CAAC;YACH,mEAAmE;YACnE,6DAA6D;YAC7D,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;YAClD,MAAM,MAAM,GAAG,MAAM,WAAW,CAC9B,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAC1D,IAAI,CACL,CAAC;YACF,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;gBAC5B,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,OAAO,MAAM,CAAC,MAAM;iBACjB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;iBAC7C,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBAChB,OAAO,EAAE,IAAI;gBACb,GAAG,EAAE,MAAM,CAAC,SAAS;gBACrB,aAAa,EAAE,MAAM,CAAC,aAAa;gBACnC,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,SAAS;aACnC,CAAC,CAAC,CAAC;QACR,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC,CAAC,CACH,CAAC;IACF,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;AAC3B,CAAC"}

package/dist/server/request-signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-signer.d.ts","sourceRoot":"","sources":["../../src/server/request-signer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAuC5D;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,WAAW,CAAC,MAAM,EAAE;QAClB,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,uDAAuD;IACvD,QAAQ,CAAC,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;CACjC;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,mBAAmB,GAC1B,aAAa,CAuCf"}
+{"version":3,"file":"request-signer.d.ts","sourceRoot":"","sources":["../../src/server/request-signer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AA+B5D;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,WAAW,CAAC,MAAM,EAAE;QAClB,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,uDAAuD;IACvD,QAAQ,CAAC,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;CACjC;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,mBAAmB,GAC1B,aAAa,CAuBf"}

package/dist/server/request-signer.js

@@ -1,13 +1,7 @@
 import { createHash } from "node:crypto";
+import { buildWeb3SignedHeader } from "@opendatalabs/vana-sdk/auth/web3-signed-builder";
 import { privateKeyToAccount } from "viem/accounts";
 const EMPTY_BODY_HASH = "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855";
-function base64urlEncode(input) {
-    return Buffer.from(input, "utf-8")
-        .toString("base64")
-        .replace(/\+/g, "-")
-        .replace(/\//g, "_")
-        .replace(/=+$/, "");
-}
 function canonicalizeJson(obj) {
     if (obj === null || typeof obj !== "object")
         return obj;
@@ -44,28 +38,17 @@ export function createRequestSigner(config) {
         address: account.address,
         async signRequest(params) {
             const now = Math.floor(Date.now() / 1000);
-            const payload = {
+            const bodyHash = computeBodyHash(params.body, bodyHashFormat);
+            return buildWeb3SignedHeader({
                 aud: params.aud,
-                bodyHash: computeBodyHash(params.body, bodyHashFormat),
                 exp: now + 300,
+                grantId: params.grantId,
                 iat: now,
                 method: params.method,
                 uri: params.uri,
-            };
-            if (params.grantId !== undefined) {
-                payload["grantId"] = params.grantId;
-            }
-            // Sort keys for deterministic serialization
-            const sortedPayload = Object.keys(payload)
-                .sort()
-                .reduce((acc, key) => {
-                acc[key] = payload[key];
-                return acc;
-            }, {});
-            const payloadJson = JSON.stringify(sortedPayload);
-            const payloadBase64 = base64urlEncode(payloadJson);
-            const signature = await account.signMessage({ message: payloadBase64 });
-            return `Web3Signed ${payloadBase64}.${signature}`;
+                bodyHash,
+                signMessage: (message) => account.signMessage({ message }),
+            });
         },
     };
 }

package/dist/server/request-signer.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-signer.js","sourceRoot":"","sources":["../../src/server/request-signer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request-signer.js","sourceRoot":"","sources":["../../src/server/request-signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAC;AACxF,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAGpD,MAAM,eAAe,GACnB,yEAAyE,CAAC;AAG5E,SAAS,gBAAgB,CAAC,GAAY;IACpC,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,GAAG,CAAC;IACxD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACzD,MAAM,MAAM,GAA4B,EAAE,CAAC;IAC3C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAA8B,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACrE,IAAI,GAAG,KAAK,WAAW;YAAE,SAAS;QAClC,MAAM,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAE,GAA+B,CAAC,GAAG,CAAC,CAAC,CAAC;IACxE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,eAAe,CACtB,IAAwB,EACxB,MAAsB;IAEtB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;IACtD,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACrE,OAAO,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACzD,CAAC;AAyBD;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CACjC,MAA2B;IAE3B,MAAM,OAAO,GAAG,mBAAmB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,QAAQ,CAAC;IAEzD,OAAO;QACL,OAAO,EAAE,OAAO,CAAC,OAAO;QAExB,KAAK,CAAC,WAAW,CAAC,MAAM;YACtB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;YAC1C,MAAM,QAAQ,GAAG,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YAE9D,OAAO,qBAAqB,CAAC;gBAC3B,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,GAAG,EAAE,GAAG,GAAG,GAAG;gBACd,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,QAAQ;gBACR,WAAW,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC;aACnE,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/server/session-relay.d.ts

@@ -1,13 +1,14 @@
+import { type SessionRelayInitResult as SdkRelaySessionInitResult } from "@opendatalabs/vana-sdk/session-relay";
 import type { SessionRelayConfig, SessionInitParams, SessionPollResult } from "../core/types.js";
 /** Raw response from the Session Relay init endpoint. */
-export interface RelaySessionInitResult {
-    sessionId: string;
-    deepLinkUrl: string;
-    expiresAt: string;
-}
+export type RelaySessionInitResult = SdkRelaySessionInitResult;
 /**
  * Low-level client for the Session Relay service.
  *
+ * This is a CLI adapter over the Vana SDK Session Relay integration. Session
+ * Relay is a Vana-operated service integration for app handoff flows, not a
+ * protocol-core primitive.
+ *
  * @see {@link createSessionRelay} to create an instance.
  */
 export interface SessionRelay {

package/dist/server/session-relay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-relay.d.ts","sourceRoot":"","sources":["../../src/server/session-relay.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAG1B,yDAAyD;AACzD,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,oGAAoG;IACpG,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACxE,qCAAqC;IACrC,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC3D;;;;;;OAMG;IACH,iBAAiB,CACf,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAC7C,OAAO,CAAC,iBAAiB,CAAC,CAAC;CAC/B;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,kBAAkB,GAAG,YAAY,CA8F3E"}
+{"version":3,"file":"session-relay.d.ts","sourceRoot":"","sources":["../../src/server/session-relay.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,sBAAsB,IAAI,yBAAyB,EACzD,MAAM,sCAAsC,CAAC;AAG9C,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAE1B,yDAAyD;AACzD,MAAM,MAAM,sBAAsB,GAAG,yBAAyB,CAAC;AA0C/D;;;;;;;;GAQG;AACH,MAAM,WAAW,YAAY;IAC3B,oGAAoG;IACpG,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACxE,qCAAqC;IACrC,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC3D;;;;;;OAMG;IACH,iBAAiB,CACf,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAC7C,OAAO,CAAC,iBAAiB,CAAC,CAAC;CAC/B;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,kBAAkB,GAAG,YAAY,CAyC3E"}

package/dist/server/session-relay.js

@@ -1,5 +1,28 @@
+import { createSessionRelayBuilderClient, } from "@opendatalabs/vana-sdk/session-relay";
+import { privateKeyToAccount } from "viem/accounts";
 import { ConnectError, ConnectErrorCode } from "../core/errors.js";
-import { createRequestSigner } from "./request-signer.js";
+function isRelayErrorLike(err) {
+    return (err instanceof Error &&
+        "details" in err &&
+        err.details !== null &&
+        typeof err.details === "object");
+}
+function mapRelayError(err, fallbackCode) {
+    if (err instanceof ConnectError) {
+        return err;
+    }
+    if (isRelayErrorLike(err)) {
+        const relayCode = err.details.relayErrorCode;
+        const code = relayCode === "SESSION_RELAY_POLL_TIMEOUT"
+            ? ConnectErrorCode.POLL_TIMEOUT
+            : (relayCode ?? fallbackCode);
+        return new ConnectError(err.message, code, err.details.status);
+    }
+    if (err instanceof Error) {
+        return new ConnectError(err.message, fallbackCode);
+    }
+    return new ConnectError(String(err), fallbackCode);
+}
 /**
  * Creates a low-level Session Relay client.
  *
@@ -9,65 +32,39 @@ import { createRequestSigner } from "./request-signer.js";
  * @returns A {@link SessionRelay} instance.
  */
 export function createSessionRelay(config) {
-    const baseUrl = config.sessionRelayUrl.replace(/\/+$/, "");
-    const signer = createRequestSigner({ privateKey: config.privateKey });
+    const account = privateKeyToAccount(config.privateKey);
+    const relay = createSessionRelayBuilderClient({
+        baseUrl: config.sessionRelayUrl,
+        granteeAddress: config.granteeAddress,
+        signMessage: (message) => account.signMessage({ message }),
+    });
     return {
         async initSession(params) {
-            const body = JSON.stringify({
-                granteeAddress: config.granteeAddress,
-                scopes: params.scopes,
-                ...(params.webhookUrl && { webhookUrl: params.webhookUrl }),
-                ...(params.appUserId && { app_user_id: params.appUserId }),
-            });
-            const authHeader = await signer.signRequest({
-                aud: baseUrl,
-                method: "POST",
-                uri: "/v1/session/init",
-                body,
-            });
-            const res = await fetch(`${baseUrl}/v1/session/init`, {
-                method: "POST",
-                headers: {
-                    "Content-Type": "application/json",
-                    Authorization: authHeader,
-                },
-                body,
-            });
-            if (!res.ok) {
-                const errorBody = await res.json().catch(() => ({}));
-                const errorMsg = errorBody.error &&
-                    typeof errorBody.error === "object"
-                    ? errorBody.error
-                        .message
-                    : `Session init failed: ${res.status}`;
-                throw new ConnectError(errorMsg, errorBody.error
-                    ?.errorCode ?? ConnectErrorCode.SESSION_INIT_FAILED, res.status);
+            try {
+                return await relay.initSession(params);
+            }
+            catch (err) {
+                throw mapRelayError(err, ConnectErrorCode.SESSION_INIT_FAILED);
             }
-            return (await res.json());
         },
         async pollSession(sessionId) {
-            const res = await fetch(`${baseUrl}/v1/session/${sessionId}/poll`);
-            if (!res.ok) {
-                const errorBody = await res.json().catch(() => ({}));
-                throw new ConnectError(`Poll failed: ${res.status}`, errorBody.error
-                    ?.errorCode ?? ConnectErrorCode.POLL_FAILED, res.status);
+            try {
+                return await relay.pollSession(sessionId);
+            }
+            catch (err) {
+                throw mapRelayError(err, ConnectErrorCode.POLL_FAILED);
             }
-            return (await res.json());
         },
         async pollUntilComplete(sessionId, opts) {
-            const interval = opts?.interval ?? 2000;
-            const timeout = opts?.timeout ?? 900_000; // 15 minutes
-            const deadline = Date.now() + timeout;
-            while (Date.now() < deadline) {
-                const result = await this.pollSession(sessionId);
-                if (result.status === "approved" ||
-                    result.status === "denied" ||
-                    result.status === "expired") {
-                    return result;
-                }
-                await new Promise((resolve) => setTimeout(resolve, interval));
+            try {
+                return await relay.pollUntilComplete(sessionId, {
+                    intervalMs: opts?.interval,
+                    timeoutMs: opts?.timeout,
+                });
+            }
+            catch (err) {
+                throw mapRelayError(err, ConnectErrorCode.POLL_FAILED);
             }
-            throw new ConnectError("Polling timed out", ConnectErrorCode.POLL_TIMEOUT);
         },
     };
 }

package/dist/server/session-relay.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-relay.js","sourceRoot":"","sources":["../../src/server/session-relay.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-relay.js","sourceRoot":"","sources":["../../src/server/session-relay.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,GAEhC,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAiBnE,SAAS,gBAAgB,CAAC,GAAY;IACpC,OAAO,CACL,GAAG,YAAY,KAAK;QACpB,SAAS,IAAI,GAAG;QAChB,GAAG,CAAC,OAAO,KAAK,IAAI;QACpB,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,CAChC,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CACpB,GAAY,EACZ,YAA8B;IAE9B,IAAI,GAAG,YAAY,YAAY,EAAE,CAAC;QAChC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAI,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC;QAC7C,MAAM,IAAI,GACR,SAAS,KAAK,4BAA4B;YACxC,CAAC,CAAC,gBAAgB,CAAC,YAAY;YAC/B,CAAC,CAAC,CAAC,SAAS,IAAI,YAAY,CAAC,CAAC;QAClC,OAAO,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;QACzB,OAAO,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACrD,CAAC;IAED,OAAO,IAAI,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,CAAC;AACrD,CAAC;AA6BD;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAA0B;IAC3D,MAAM,OAAO,GAAG,mBAAmB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACvD,MAAM,KAAK,GAAG,+BAA+B,CAAC;QAC5C,OAAO,EAAE,MAAM,CAAC,eAAe;QAC/B,cAAc,EAAE,MAAM,CAAC,cAAc;QACrC,WAAW,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC;KACnE,CAAC,CAAC;IAEH,OAAO;QACL,KAAK,CAAC,WAAW,CACf,MAAyB;YAEzB,IAAI,CAAC;gBACH,OAAO,MAAM,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACzC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,aAAa,CAAC,GAAG,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;QAED,KAAK,CAAC,WAAW,CAAC,SAAiB;YACjC,IAAI,CAAC;gBACH,OAAO,MAAM,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,aAAa,CAAC,GAAG,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;QAED,KAAK,CAAC,iBAAiB,CACrB,SAAiB,EACjB,IAA8C;YAE9C,IAAI,CAAC;gBACH,OAAO,MAAM,KAAK,CAAC,iBAAiB,CAAC,SAAS,EAAE;oBAC9C,UAAU,EAAE,IAAI,EAAE,QAAQ;oBAC1B,SAAS,EAAE,IAAI,EAAE,OAAO;iBACzB,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,aAAa,CAAC,GAAG,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vana-cli",
-  "version": "0.15.0",
+  "version": "0.23.3",
   "description": "Vana data-portability CLI",
   "license": "MIT",
   "repository": {
@@ -102,6 +102,7 @@
     "@inquirer/prompts": "8.3.0",
     "@inquirer/search": "^4.1.6",
     "@modelcontextprotocol/sdk": "^1.27.1",
+    "@opendatalabs/vana-sdk": "^4.0.0",
     "chromium-bidi": "15.0.0",
     "commander": "14.0.3",
     "fuse.js": "^7.1.0",