@ametyst/cli 0.3.4 → 0.3.5

package/dist/index.js

@@ -112197,7 +112197,7 @@ var init_version5 = __esm({
   "src/version.ts"() {
     "use strict";
     init_esm_shims();
-    CLI_VERSION = true ? "0.3.4" : "0.0.0-dev";
+    CLI_VERSION = true ? "0.3.5" : "0.0.0-dev";
   }
 });
 
@@ -115417,6 +115417,46 @@ var McpEventLogger = class {
   }
 };
 
+// src/mcp-server/newest-grant.ts
+init_esm_shims();
+function nonEmptyLowerCase(value2) {
+  return typeof value2 === "string" && value2.trim() !== "" ? value2.toLowerCase() : null;
+}
+function isNewerGrant(candidate, incumbent) {
+  const candidateId = Number(candidate?.id);
+  const incumbentId = Number(incumbent?.id);
+  const candidateIdUsable = Number.isFinite(candidateId);
+  const incumbentIdUsable = Number.isFinite(incumbentId);
+  if (candidateIdUsable && incumbentIdUsable && candidateId !== incumbentId) {
+    return candidateId > incumbentId;
+  }
+  const candidateAt = Date.parse(typeof candidate?.createdAt === "string" ? candidate.createdAt : "");
+  const incumbentAt = Date.parse(typeof incumbent?.createdAt === "string" ? incumbent.createdAt : "");
+  if (Number.isFinite(candidateAt) && Number.isFinite(incumbentAt) && candidateAt !== incumbentAt) {
+    return candidateAt > incumbentAt;
+  }
+  return candidateIdUsable && !incumbentIdUsable;
+}
+function selectNewestApprovedWallet(wallets, eoaAddress) {
+  if (!Array.isArray(wallets)) return void 0;
+  const eoa = nonEmptyLowerCase(eoaAddress);
+  if (!eoa) return void 0;
+  let newest;
+  for (const wallet of wallets) {
+    if (wallet?.status !== "approved") continue;
+    if (nonEmptyLowerCase(wallet?.address) !== eoa) continue;
+    if (newest === void 0 || isNewerGrant(wallet, newest)) newest = wallet;
+  }
+  return newest;
+}
+function findCurrentApprovedWallet(wallets, eoaAddress, pendingWalletId) {
+  if (!Array.isArray(wallets)) return void 0;
+  if (pendingWalletId) {
+    return wallets.find((w) => String(w?.id) === String(pendingWalletId) && w?.status === "approved");
+  }
+  return selectNewestApprovedWallet(wallets, eoaAddress);
+}
+
 // src/mcp-server/start-session.ts
 init_esm_shims();
 init_dist();
@@ -115551,38 +115591,57 @@ async function runStartSession(ctx, timing = new TimingCollector("start_session"
   let virtualWalletId = ctx.virtualWalletId;
   let paymentManagerAddress = ctx.paymentManagerAddress;
   let policyId = ctx.policyId;
-  if (!walletAddress || !virtualWalletId) {
-    try {
-      const approvedWallet = wallets.find(
-        (w) => w.address?.toLowerCase() === ctx.eoaAddress?.toLowerCase() && w.status === "approved"
-      );
-      if (approvedWallet) {
-        walletAddress = approvedWallet.walletAddress || approvedWallet.kernelAccountAddress;
-        virtualWalletId = String(approvedWallet.id);
-        paymentManagerAddress = approvedWallet.paymentManagerAddress;
-        policyId = String(approvedWallet.policyAssociated);
-        credentials.walletAddress = walletAddress;
-        credentials.virtualWalletId = virtualWalletId;
-        credentials.paymentManagerAddress = paymentManagerAddress;
-        credentials.policyId = policyId;
-        credentials.authorizationStatus = "approved";
-        if (approvedWallet.policyValidUntil != null) {
-          credentials.policyValidUntil = BigInt(approvedWallet.policyValidUntil);
-        }
-      }
-    } catch (backendError) {
+  let activeWallet;
+  let grantChanged = false;
+  try {
+    activeWallet = selectNewestApprovedWallet(wallets, ctx.eoaAddress);
+    if (activeWallet) {
+      const newestId = String(activeWallet.id);
+      const rowWalletAddress = activeWallet.walletAddress || activeWallet.kernelAccountAddress;
+      const rowPaymentManagerAddress = activeWallet.paymentManagerAddress;
+      const rowPolicyId = activeWallet.policyAssociated != null ? String(activeWallet.policyAssociated) : void 0;
+      grantChanged = !!virtualWalletId && virtualWalletId !== newestId;
+      if (grantChanged) {
+        console.error(
+          `[start_session] The active grant moved on \u2014 virtual wallet ${virtualWalletId} -> ${newestId}. Adopting the newest approved grant and dropping the session state derived from the old one.`
+        );
+        walletAddress = rowWalletAddress;
+        paymentManagerAddress = rowPaymentManagerAddress;
+        policyId = rowPolicyId;
+      } else {
+        walletAddress = rowWalletAddress || walletAddress;
+        paymentManagerAddress = rowPaymentManagerAddress || paymentManagerAddress;
+        policyId = rowPolicyId ?? policyId;
+      }
+      virtualWalletId = newestId;
+      credentials.walletAddress = walletAddress;
+      credentials.virtualWalletId = virtualWalletId;
+      credentials.paymentManagerAddress = paymentManagerAddress;
+      credentials.policyId = policyId;
+      credentials.authorizationStatus = "approved";
+      if (activeWallet.policyName != null) {
+        credentials.policyName = activeWallet.policyName;
+      }
+      if (activeWallet.policyValidUntil != null) {
+        credentials.policyValidUntil = BigInt(activeWallet.policyValidUntil);
+      }
+    } else if (walletsFetchFailed && virtualWalletId) {
       console.warn(
-        "[start_session] Could not check backend:",
-        backendError instanceof Error ? backendError.message : String(backendError)
+        `[start_session] \u26A0\uFE0F  could not verify the active grant \u2014 signing with the cached one (virtual wallet ${virtualWalletId}, policy ${policyId ?? "unknown"}). If a newer grant was approved since, spends are metered against the older one and may hit its spending limit.`
       );
     }
+  } catch (backendError) {
+    console.warn(
+      "[start_session] Could not check backend:",
+      backendError instanceof Error ? backendError.message : String(backendError)
+    );
   }
   const mergedAuth = credentials.authorizationStatus !== void 0 ? credentials.authorizationStatus : ctx.authorizationStatus;
   console.error(
     `[start_session] State check \u2014 walletAddress: ${walletAddress}, virtualWalletId: ${virtualWalletId}, paymentManagerAddress: ${paymentManagerAddress}, policyId: ${policyId}`
   );
   if (mergedAuth === "expired") {
-    return { responseKey: "unlocked_expired", credentials, timingReport: timing.report() };
+    return { responseKey: "unlocked_expired", credentials, timingReport: timing.report(), grantChanged };
   }
   if (walletAddress && virtualWalletId && paymentManagerAddress && policyId) {
     let privateKey = null;
@@ -115604,12 +115663,9 @@ async function runStartSession(ctx, timing = new TimingCollector("start_session"
       }
       credentials.walletAddress = walletAddress;
       credentials.paymentManagerAddress = paymentManagerAddress;
-      const approvedWallet = wallets.find(
-        (w) => w.address?.toLowerCase() === ctx.eoaAddress?.toLowerCase() && w.status === "approved"
-      );
-      const preloadedWalletData = approvedWallet != null && approvedWallet.policyValidAfter != null && approvedWallet.policyValidUntil != null ? {
-        policyValidAfter: Number(approvedWallet.policyValidAfter),
-        policyValidUntil: Number(approvedWallet.policyValidUntil)
+      const preloadedWalletData = activeWallet != null && activeWallet.policyValidAfter != null && activeWallet.policyValidUntil != null ? {
+        policyValidAfter: Number(activeWallet.policyValidAfter),
+        policyValidUntil: Number(activeWallet.policyValidUntil)
       } : void 0;
       if (ctx.readPolicyActiveOnchain) {
         const nowSeconds = Math.floor(Date.now() / 1e3);
@@ -115631,7 +115687,7 @@ async function runStartSession(ctx, timing = new TimingCollector("start_session"
           maxAttempts
         });
         if (bootAction === "reauthorize") {
-          return { responseKey: "unlocked_pending_authorization", credentials, timingReport: timing.report() };
+          return { responseKey: "unlocked_pending_authorization", credentials, timingReport: timing.report(), grantChanged };
         }
       }
       const { kernelClient: virtualWalletKernelAccountClient, permissionPlugin: virtualWalletPermissionPlugin, kernelDomain } = await virtualWalletsManagers2.configureVirtualWalletKernelAccount(
@@ -115661,13 +115717,14 @@ async function runStartSession(ctx, timing = new TimingCollector("start_session"
           console.warn("[start_session] \u26A0\uFE0F  Could not fetch credit token address (Path B routing disabled):", e);
         }
       }
-      return { responseKey: "unlocked_and_authorized", credentials, timingReport: timing.report() };
+      return { responseKey: "unlocked_and_authorized", credentials, timingReport: timing.report(), grantChanged };
     } catch (error) {
       console.error("\u274C [start_session] Kernel client creation failed:", error);
       return {
         responseKey: "unlocked_not_configured",
         credentials,
         timingReport: timing.report(),
+        grantChanged,
         kernelErrorMessage: error instanceof Error ? error.message : String(error)
       };
     } finally {
@@ -115675,9 +115732,9 @@ async function runStartSession(ctx, timing = new TimingCollector("start_session"
     }
   }
   if (!walletsFetchFailed && wallets.length === 0) {
-    return { responseKey: "unlocked_provisioning_pending", credentials, timingReport: timing.report() };
+    return { responseKey: "unlocked_provisioning_pending", credentials, timingReport: timing.report(), grantChanged };
   }
-  return { responseKey: "unlocked_pending_authorization", credentials, timingReport: timing.report() };
+  return { responseKey: "unlocked_pending_authorization", credentials, timingReport: timing.report(), grantChanged };
 }
 var WALLET_SCOPED_CREDENTIAL_KEYS = [
   "virtualWalletId",
@@ -115707,9 +115764,9 @@ function clearWalletScopedCredentials(target) {
 function sameAddress(a, b) {
   return String(a ?? "").toLowerCase() === String(b ?? "").toLowerCase();
 }
-function mergeStartSessionCredentials(target, patch, responseKey) {
+function mergeStartSessionCredentials(target, patch, responseKey, options = {}) {
   const walletChanged = patch.eoaAddress !== void 0 && !sameAddress(patch.eoaAddress, target.eoaAddress);
-  if (walletChanged) {
+  if (walletChanged || options.grantChanged) {
     clearWalletScopedCredentials(target);
   }
   if (patch.walletKeystoreJson !== void 0) {
@@ -122739,17 +122796,6 @@ var approvalWaitConfig = (() => {
     delay: (ms) => new Promise((resolve) => setTimeout(resolve, ms))
   };
 })();
-function findCurrentApprovedWallet(wallets, eoaAddress, pendingWalletId) {
-  if (!Array.isArray(wallets)) return void 0;
-  if (pendingWalletId) {
-    return wallets.find(
-      (w) => String(w?.id) === String(pendingWalletId) && w?.status === "approved"
-    );
-  }
-  return wallets.find(
-    (w) => w?.address?.toLowerCase() === eoaAddress?.toLowerCase() && w?.status === "approved"
-  );
-}
 async function tryResolvePendingApproval(probe) {
   if (currentCredentials.authorizationStatus === "approved") return true;
   if (currentCredentials.authorizationStatus !== "pending" || !currentCredentials.apiKey || !currentCredentials.eoaAddress) {
@@ -122887,11 +122933,20 @@ async function applyStartSessionUnlock(passphrase, resetRequested) {
       persistVault: persistVault2,
       wipeVault: wipeVault2,
       sdk,
-      fetchWallets: () => fetchVirtualWalletsFromBackend(currentCredentials.apiKey),
+      // FORCED REFRESH. `start_session` verifies the session's grant against the
+      // backend (see `runStartSession`), and a verification run against the cache
+      // this process loaded at boot verifies nothing: a grant approved since boot
+      // would be invisible to exactly the check that exists to find it.
+      fetchWallets: () => fetchVirtualWalletsFromBackend(currentCredentials.apiKey, true),
       readPolicyActiveOnchain: buildPolicyActiveOnchainReader(sdk)
     }
   );
-  const { walletChanged } = mergeStartSessionCredentials(currentCredentials, result.credentials, result.responseKey);
+  const { walletChanged } = mergeStartSessionCredentials(
+    currentCredentials,
+    result.credentials,
+    result.responseKey,
+    { grantChanged: result.grantChanged }
+  );
   refreshPlaintextVaultMode();
   if (walletChanged) {
     walletsCache = null;
@@ -123390,10 +123445,9 @@ server.tool(
             fetchVirtualWalletsFromBackend(currentCredentials.apiKey, !refreshedFromBackend),
             fetchPoliciesFromBackend(currentCredentials.apiKey, true)
           ]);
-          const freshWallet = freshWallets.find(
-            (w) => w.address?.toLowerCase() === currentCredentials.eoaAddress?.toLowerCase()
-          );
-          if (freshWallet && freshWallet.status === "approved") {
+          const freshWallet = selectNewestApprovedWallet(freshWallets, currentCredentials.eoaAddress);
+          const freshWalletIsActiveGrant = String(freshWallet?.id) === String(currentCredentials.virtualWalletId);
+          if (freshWallet && freshWalletIsActiveGrant) {
             if (freshWallet.policyAssociated != null) {
               currentCredentials.policyId = String(freshWallet.policyAssociated);
             }
@@ -123414,6 +123468,14 @@ server.tool(
         eoaAddress: currentCredentials.eoaAddress || null,
         walletAddress: currentCredentials.walletAddress || null,
         kernelClientActive: !!currentCredentials.virtualWalletKernelAccountClient,
+        // WHICH GRANT THIS SESSION SIGNS WITH. The 2026-09-01 incident — three
+        // approved rows for one EOA, every session silently signing with the oldest
+        // — was invisible in every payload: diagnosing it took a nonce-key autopsy.
+        // These two ids are the row `start_session` actually selected, so the next
+        // stale grant is a field to read rather than a forensic exercise. Null until
+        // a session has adopted one.
+        activeVirtualWalletId: currentCredentials.virtualWalletId != null ? String(currentCredentials.virtualWalletId) : null,
+        activePolicyId: currentCredentials.policyId != null ? String(currentCredentials.policyId) : null,
         // WHICH WORKSPACE THIS IS. The 2026-08-31 incident produced writes into
         // the wrong workspace with nothing in any payload naming one — an agent
         // reading wallet status could not have told, and neither could a human
@@ -123427,7 +123489,7 @@ server.tool(
         }
       }
       if (walletsCache && currentCredentials.eoaAddress) {
-        const wallet = walletsCache.find(
+        const wallet = selectNewestApprovedWallet(walletsCache, currentCredentials.eoaAddress) ?? walletsCache.find(
           (w) => w.address?.toLowerCase() === currentCredentials.eoaAddress?.toLowerCase()
         );
         if (wallet) {
@@ -125792,9 +125854,7 @@ async function reconcileApprovalStateOnConnect() {
   }
   try {
     const wallets = await fetchVirtualWalletsFromBackend(currentCredentials.apiKey, true);
-    const approved = wallets.find(
-      (w) => w.address?.toLowerCase() === currentCredentials.eoaAddress?.toLowerCase() && w.status === "approved"
-    );
+    const approved = selectNewestApprovedWallet(wallets, currentCredentials.eoaAddress);
     if (!approved) return;
     if (typeof approved.id === "number" && hasProcessedApprovalEventId(approved.id)) return;
     console.error(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ametyst/cli",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "private": false,
   "description": "Ametyst CLI — embedded MCP server, wallet ops, agent payments",
   "type": "module",
@@ -90,10 +90,10 @@
     "esbuild@>=0.27.3 <0.28.1": "0.28.1"
   },
   "optionalDependencies": {
-    "@ametyst/cli-darwin-arm64": "0.3.4",
-    "@ametyst/cli-darwin-x64": "0.3.4",
-    "@ametyst/cli-linux-x64-gnu": "0.3.4",
-    "@ametyst/cli-win32-x64-msvc": "0.3.4"
+    "@ametyst/cli-darwin-arm64": "0.3.5",
+    "@ametyst/cli-darwin-x64": "0.3.5",
+    "@ametyst/cli-linux-x64-gnu": "0.3.5",
+    "@ametyst/cli-win32-x64-msvc": "0.3.5"
   },
   "scripts": {
     "build:native": "cd native && cargo build --release && napi build --release",