@heyamiko/amiko-cli 0.5.7 → 0.5.9

package/dist/index.js

@@ -74135,6 +74135,117 @@ function registerMarketplaceCommand(program2) {
 import { createServer } from "node:http";
 import { randomBytes as randomBytes2 } from "node:crypto";
 import { execFileSync as execFileSync4 } from "node:child_process";
+
+// src/lib/agent-config.ts
+import { existsSync as existsSync3, readFileSync as readFileSync2 } from "node:fs";
+import { join as join3, resolve } from "node:path";
+function loadAgentConfig() {
+  const knownPaths = [
+    process.env.OPENCLAW_WORKSPACE_DIR ? join3(process.env.OPENCLAW_WORKSPACE_DIR, ".amiko.json") : "",
+    process.env.OPENCLAW_HOME ? join3(process.env.OPENCLAW_HOME, ".openclaw", "workspace", ".amiko.json") : "",
+    "/data/.openclaw/workspace/.amiko.json",
+    "/data/.amiko.json"
+  ].filter(Boolean);
+  for (const p13 of knownPaths) {
+    const result = tryLoadConfig(p13);
+    if (result)
+      return result;
+  }
+  let dir = process.cwd();
+  const root2 = resolve("/");
+  while (dir !== root2) {
+    const result = tryLoadConfig(join3(dir, ".amiko.json"));
+    if (result)
+      return result;
+    dir = resolve(dir, "..");
+  }
+  return null;
+}
+function tryLoadConfig(filePath) {
+  if (!existsSync3(filePath))
+    return null;
+  try {
+    const raw = readFileSync2(filePath, "utf-8");
+    const parsed = JSON.parse(raw);
+    const config = {};
+    config.twinToken = parsed.amikoTwinToken || parsed.AMIKO_TWIN_TOKEN || parsed.AMIKO_USER_TOKEN;
+    config.twinId = parsed.amikoTwinId || parsed.AMIKO_TWIN_ID;
+    config.userId = parsed.amikoUserId || parsed.AMIKO_USER_ID;
+    config.platformUrl = parsed.amikoPlatformUrl || parsed.AMIKO_PLATFORM_URL;
+    if (parsed.billingBase)
+      config.billingBase = parsed.billingBase;
+    if (parsed.platformKey)
+      config.platformKey = parsed.platformKey;
+    if (Array.isArray(parsed.agentWallets))
+      config.agentWallets = parsed.agentWallets;
+    return Object.keys(config).length > 0 ? config : null;
+  } catch {
+    return null;
+  }
+}
+function resolveAuth(cliConfig) {
+  if (cliConfig.agentWallets?.length) {
+    return {
+      mode: "connected",
+      platformUrl: cliConfig.platformUrl,
+      billingBase: cliConfig.billingBase,
+      twinId: cliConfig.twinId,
+      twinToken: cliConfig.twinToken,
+      platformKey: cliConfig.apiKey,
+      privyToken: cliConfig.privyToken,
+      connectedKeyId: cliConfig.connectedKeyId,
+      userId: cliConfig.userId,
+      agentWallets: cliConfig.agentWallets
+    };
+  }
+  if (cliConfig.privyToken && cliConfig.connectedKeyId) {
+    return {
+      mode: "connected",
+      billingBase: cliConfig.billingBase,
+      platformKey: cliConfig.privyToken,
+      privyToken: cliConfig.privyToken,
+      connectedKeyId: cliConfig.connectedKeyId,
+      userId: cliConfig.userId
+    };
+  }
+  if (cliConfig.apiKey) {
+    return {
+      mode: "connected",
+      billingBase: cliConfig.billingBase,
+      platformKey: cliConfig.apiKey,
+      userId: cliConfig.userId,
+      twinId: cliConfig.twinId,
+      twinToken: cliConfig.twinToken
+    };
+  }
+  const envToken = process.env.AMIKO_USER_TOKEN;
+  if (envToken) {
+    return {
+      mode: "agent",
+      twinId: process.env.AMIKO_TWIN_ID,
+      twinToken: envToken,
+      userId: process.env.AMIKO_USER_ID,
+      billingBase: process.env.API_SERVICE_URL || process.env.BILLING_BASE,
+      platformUrl: process.env.AMIKO_PLATFORM_URL
+    };
+  }
+  const agentConfig = loadAgentConfig();
+  if (agentConfig?.twinToken) {
+    return {
+      mode: "agent",
+      platformUrl: agentConfig.platformUrl,
+      billingBase: agentConfig.billingBase,
+      twinId: agentConfig.twinId,
+      twinToken: agentConfig.twinToken,
+      platformKey: agentConfig.platformKey,
+      userId: agentConfig.userId,
+      agentWallets: agentConfig.agentWallets
+    };
+  }
+  return { mode: "none" };
+}
+
+// src/commands/login.ts
 function buildVerifiedAuthConfig(token, bootstrap) {
   return {
     privyToken: token,
@@ -74169,8 +74280,8 @@ function startCallbackServer(expectedState, timeoutMs = 120000, acknowledgementT
   return new Promise((resolveServer) => {
     let resolveToken;
     let rejectToken;
-    const tokenPromise = new Promise((resolve, reject) => {
-      resolveToken = resolve;
+    const tokenPromise = new Promise((resolve2, reject) => {
+      resolveToken = resolve2;
       rejectToken = reject;
     });
     const server = createServer((req, res) => {
@@ -74200,8 +74311,8 @@ function startCallbackServer(expectedState, timeoutMs = 120000, acknowledgementT
             }
             let acknowledged = false;
             let resolveAcknowledgement;
-            const acknowledgementPromise = new Promise((resolve) => {
-              resolveAcknowledgement = resolve;
+            const acknowledgementPromise = new Promise((resolve2) => {
+              resolveAcknowledgement = resolve2;
             });
             const acknowledgementTimeout = setTimeout(() => {
               if (acknowledged)
@@ -74364,32 +74475,45 @@ Run "amiko login" again to re-authenticate, or "amiko logout" to sign out.
   });
   program2.command("whoami").description("Show current authentication status").action(() => {
     const config = loadConfig();
-    const privyToken = getPrivyToken(config);
+    const auth = resolveAuth(config);
     console.log(heading(`Amiko Identity
 `));
-    if (privyToken) {
-      console.log(label("Auth", source_default.green("signed in via Privy")));
+    if (auth.mode === "agent") {
+      console.log(label("Auth", source_default.green("agent (auto-detected .amiko.json)")));
+    } else if (auth.mode === "connected") {
+      console.log(label("Auth", source_default.green("connected")));
     } else {
       console.log(label("Auth", dim("not signed in")));
     }
-    if (config.userId) {
-      console.log(label("User ID", dim(config.userId)));
+    const userId = auth.userId || config.userId;
+    if (userId) {
+      console.log(label("User ID", dim(userId)));
+    }
+    if (auth.twinId) {
+      console.log(label("Twin ID", dim(auth.twinId)));
     }
     if (config.connectedKeyPreview) {
       const connectedKeyLabel = config.connectedKeyName ? `${config.connectedKeyName} (${config.connectedKeyPreview})` : config.connectedKeyPreview;
       console.log(label("Connected Key", connectedKeyLabel));
     }
-    if (config.wallet) {
+    if (auth.agentWallets?.length) {
+      console.log(label("Wallets", `${auth.agentWallets.length}`));
+      for (const w5 of auth.agentWallets) {
+        const short = w5.address.length > 14 ? `${w5.address.slice(0, 8)}...${w5.address.slice(-6)}` : w5.address;
+        console.log(dim(`  ${w5.chain}: ${short}`));
+      }
+    } else if (config.wallet) {
       console.log(label("Wallet", config.wallet));
     }
     if (config.apiKey) {
       const masked = config.apiKey.slice(0, 6) + "..." + config.apiKey.slice(-4);
       console.log(label("API Key", masked));
     }
+    const billingBase2 = auth.billingBase || config.billingBase;
     console.log(label("MPP", config.apiBase));
-    console.log(label("Billing", config.billingBase));
+    console.log(label("Billing", billingBase2));
     console.log(label("Site", config.siteBase));
-    if (!privyToken && !config.apiKey) {
+    if (auth.mode === "none") {
       console.log("");
       console.log(dim('Run "amiko login" to authenticate, or'));
       console.log(dim('     "amiko config set apiKey <key>" for API key auth.'));
@@ -75057,115 +75181,6 @@ Tip: you can also generate a connect link from your Amiko settings`));
   });
 }
 
-// src/lib/agent-config.ts
-import { existsSync as existsSync3, readFileSync as readFileSync2 } from "node:fs";
-import { join as join3, resolve } from "node:path";
-function loadAgentConfig() {
-  const knownPaths = [
-    process.env.OPENCLAW_WORKSPACE_DIR ? join3(process.env.OPENCLAW_WORKSPACE_DIR, ".amiko.json") : "",
-    process.env.OPENCLAW_HOME ? join3(process.env.OPENCLAW_HOME, ".openclaw", "workspace", ".amiko.json") : "",
-    "/data/.openclaw/workspace/.amiko.json",
-    "/data/.amiko.json"
-  ].filter(Boolean);
-  for (const p13 of knownPaths) {
-    const result = tryLoadConfig(p13);
-    if (result)
-      return result;
-  }
-  let dir = process.cwd();
-  const root2 = resolve("/");
-  while (dir !== root2) {
-    const result = tryLoadConfig(join3(dir, ".amiko.json"));
-    if (result)
-      return result;
-    dir = resolve(dir, "..");
-  }
-  return null;
-}
-function tryLoadConfig(filePath) {
-  if (!existsSync3(filePath))
-    return null;
-  try {
-    const raw = readFileSync2(filePath, "utf-8");
-    const parsed = JSON.parse(raw);
-    const config = {};
-    config.twinToken = parsed.amikoTwinToken || parsed.AMIKO_TWIN_TOKEN || parsed.AMIKO_USER_TOKEN;
-    config.twinId = parsed.amikoTwinId || parsed.AMIKO_TWIN_ID;
-    config.userId = parsed.amikoUserId || parsed.AMIKO_USER_ID;
-    config.platformUrl = parsed.amikoPlatformUrl || parsed.AMIKO_PLATFORM_URL;
-    if (parsed.billingBase)
-      config.billingBase = parsed.billingBase;
-    if (parsed.platformKey)
-      config.platformKey = parsed.platformKey;
-    if (Array.isArray(parsed.agentWallets))
-      config.agentWallets = parsed.agentWallets;
-    return Object.keys(config).length > 0 ? config : null;
-  } catch {
-    return null;
-  }
-}
-function resolveAuth(cliConfig) {
-  if (cliConfig.agentWallets?.length) {
-    return {
-      mode: "connected",
-      platformUrl: cliConfig.platformUrl,
-      billingBase: cliConfig.billingBase,
-      twinId: cliConfig.twinId,
-      twinToken: cliConfig.twinToken,
-      platformKey: cliConfig.apiKey,
-      privyToken: cliConfig.privyToken,
-      connectedKeyId: cliConfig.connectedKeyId,
-      userId: cliConfig.userId,
-      agentWallets: cliConfig.agentWallets
-    };
-  }
-  if (cliConfig.privyToken && cliConfig.connectedKeyId) {
-    return {
-      mode: "connected",
-      billingBase: cliConfig.billingBase,
-      platformKey: cliConfig.privyToken,
-      privyToken: cliConfig.privyToken,
-      connectedKeyId: cliConfig.connectedKeyId,
-      userId: cliConfig.userId
-    };
-  }
-  if (cliConfig.apiKey) {
-    return {
-      mode: "connected",
-      billingBase: cliConfig.billingBase,
-      platformKey: cliConfig.apiKey,
-      userId: cliConfig.userId,
-      twinId: cliConfig.twinId,
-      twinToken: cliConfig.twinToken
-    };
-  }
-  const envToken = process.env.AMIKO_USER_TOKEN;
-  if (envToken) {
-    return {
-      mode: "agent",
-      twinId: process.env.AMIKO_TWIN_ID,
-      twinToken: envToken,
-      userId: process.env.AMIKO_USER_ID,
-      billingBase: process.env.API_SERVICE_URL || process.env.BILLING_BASE,
-      platformUrl: process.env.AMIKO_PLATFORM_URL
-    };
-  }
-  const agentConfig = loadAgentConfig();
-  if (agentConfig?.twinToken) {
-    return {
-      mode: "agent",
-      platformUrl: agentConfig.platformUrl,
-      billingBase: agentConfig.billingBase,
-      twinId: agentConfig.twinId,
-      twinToken: agentConfig.twinToken,
-      platformKey: agentConfig.platformKey,
-      userId: agentConfig.userId,
-      agentWallets: agentConfig.agentWallets
-    };
-  }
-  return { mode: "none" };
-}
-
 // src/lib/mpp-topup.ts
 async function mppCreditsTopup(params) {
   const config2 = loadConfig();
@@ -75468,9 +75483,20 @@ function registerCreditsCommand(program2) {
         process.exit(1);
       }
       console.log(label("Tx Hash", dim(txHash.slice(0, 16) + "...")));
-      const keyId = auth.connectedKeyId;
+      let keyId = auth.connectedKeyId;
+      if (!keyId && authToken) {
+        try {
+          const keysRes = await fetch(`${auth.billingBase || "https://billing.heyamiko.com"}/api/user/keys`, { headers: { Authorization: `Bearer ${authToken}` } });
+          if (keysRes.ok) {
+            const keysData = await keysRes.json();
+            const active = keysData.keys?.find((k6) => k6.isActive !== false);
+            if (active)
+              keyId = active.id;
+          }
+        } catch {}
+      }
       if (!keyId) {
-        console.log(warn("No connected API key — transfer sent but credits not verified."));
+        console.log(warn("No API key found — transfer sent but credits not verified."));
         console.log(dim(`Tx: ${txHash}`));
         process.exit(0);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heyamiko/amiko-cli",
-  "version": "0.5.7",
+  "version": "0.5.9",
   "description": "Amiko CLI — swap tokens, manage credits, bridge cross-chain, and call marketplace agents",
   "type": "module",
   "bin": {