@ametyst/cli 0.3.6 → 0.3.7

package/dist/index.js

@@ -112026,6 +112026,7 @@ var init_core = __esm({
 var grant_keystore_exports = {};
 __export(grant_keystore_exports, {
   GRANT_ENTRY_FORMAT: () => GRANT_ENTRY_FORMAT,
+  MissingGrantKeyError: () => MissingGrantKeyError,
   buildGrantVault: () => buildGrantVault,
   createGrantKeyIssuer: () => createGrantKeyIssuer,
   deleteGrantEntry: () => deleteGrantEntry,
@@ -112033,6 +112034,8 @@ __export(grant_keystore_exports, {
   generateGrantKey: () => generateGrantKey,
   grantEntryPath: () => grantEntryPath,
   grantsDir: () => grantsDir,
+  hasGrantSigningKey: () => hasGrantSigningKey,
+  isMissingGrantKeyError: () => isMissingGrantKeyError,
   listGrantAddresses: () => listGrantAddresses,
   listGrantEntries: () => listGrantEntries,
   missingGrantKeyMessage: () => missingGrantKeyMessage,
@@ -112180,6 +112183,19 @@ function deleteGrantEntry(address, dir) {
 function missingGrantKeyMessage(address) {
   return `no local key for grant address ${address} \u2014 this machine cannot sign for that grant. Run requestAccess again to mint a fresh session key and have your admin approve it.`;
 }
+function isMissingGrantKeyError(err) {
+  return err instanceof MissingGrantKeyError;
+}
+function hasGrantSigningKey(params) {
+  let address;
+  try {
+    address = normalizeGrantAddress(params.address);
+  } catch {
+    return false;
+  }
+  if (readGrantEntry(address, params.dir)) return true;
+  return typeof params.vaultAddress === "string" && params.vaultAddress.toLowerCase() === address;
+}
 function resolveGrantSigningKey(params) {
   const address = normalizeGrantAddress(params.address);
   const entry = readGrantEntry(address, params.dir);
@@ -112190,7 +112206,7 @@ function resolveGrantSigningKey(params) {
   if (params.vaultJson && typeof vaultAddress === "string" && vaultAddress.toLowerCase() === address) {
     return readVaultPrivateKey(params.vaultJson, params.passphrase);
   }
-  throw new Error(missingGrantKeyMessage(address));
+  throw new MissingGrantKeyError(address);
 }
 function createGrantKeyIssuer(options) {
   return {
@@ -112214,7 +112230,7 @@ function createGrantKeyIssuer(options) {
     }
   };
 }
-var GRANT_ENTRY_FORMAT, ADDRESS_RE2;
+var GRANT_ENTRY_FORMAT, ADDRESS_RE2, MissingGrantKeyError;
 var init_grant_keystore = __esm({
   "src/wallet/grant-keystore.ts"() {
     "use strict";
@@ -112225,6 +112241,14 @@ var init_grant_keystore = __esm({
     init_plaintext_vault();
     GRANT_ENTRY_FORMAT = "grant-key-v1";
     ADDRESS_RE2 = /^0x[0-9a-fA-F]{40}$/;
+    MissingGrantKeyError = class extends Error {
+      grantAddress;
+      constructor(address) {
+        super(missingGrantKeyMessage(address));
+        this.name = "MissingGrantKeyError";
+        this.grantAddress = address;
+      }
+    };
   }
 });
 
@@ -112412,7 +112436,7 @@ var init_version5 = __esm({
   "src/version.ts"() {
     "use strict";
     init_esm_shims();
-    CLI_VERSION = true ? "0.3.6" : "0.0.0-dev";
+    CLI_VERSION = true ? "0.3.7" : "0.0.0-dev";
   }
 });
 
@@ -115738,6 +115762,56 @@ function findCurrentApprovedWallet(wallets, eoaAddress, pendingWalletId) {
   );
 }
 
+// src/mcp-server/signer-binding.ts
+init_esm_shims();
+var BINDING_DERIVED_KEYS = [
+  "virtualWalletKernelAccountClient",
+  "permissionPlugin",
+  "kernelDomain",
+  "policyPrecheckPassed"
+];
+function nonEmpty(value2) {
+  return typeof value2 === "string" && value2.trim() !== "" ? value2 : void 0;
+}
+function sameAddress(a, b) {
+  return String(a ?? "").toLowerCase() === String(b ?? "").toLowerCase();
+}
+function signerBindingMoved(state, row) {
+  const rowId = row?.id != null ? String(row.id) : void 0;
+  const rowAddress = nonEmpty(row?.address);
+  if (state.virtualWalletId && rowId && state.virtualWalletId !== rowId) return true;
+  if (state.signerAddress && rowAddress && !sameAddress(state.signerAddress, rowAddress)) return true;
+  return false;
+}
+function bindSignerToGrantRow(state, row) {
+  const changed = signerBindingMoved(state, row);
+  if (changed) {
+    for (const key of BINDING_DERIVED_KEYS) delete state[key];
+  }
+  const rowAddress = nonEmpty(row?.address);
+  if (rowAddress) state.signerAddress = rowAddress;
+  const rowWalletAddress = nonEmpty(row?.walletAddress) ?? nonEmpty(row?.kernelAccountAddress);
+  const rowPaymentManagerAddress = nonEmpty(row?.paymentManagerAddress);
+  const rowPolicyId = row?.policyAssociated != null ? String(row.policyAssociated) : void 0;
+  const rowId = row?.id != null ? String(row.id) : void 0;
+  if (changed) {
+    state.walletAddress = rowWalletAddress;
+    state.paymentManagerAddress = rowPaymentManagerAddress;
+    state.policyId = rowPolicyId;
+    state.policyOnchainPermissions = nonEmpty(row?.policyOnchainPermissions);
+  } else {
+    state.walletAddress = rowWalletAddress ?? state.walletAddress;
+    state.paymentManagerAddress = rowPaymentManagerAddress ?? state.paymentManagerAddress;
+    state.policyId = rowPolicyId ?? state.policyId;
+    state.policyOnchainPermissions = nonEmpty(row?.policyOnchainPermissions) ?? state.policyOnchainPermissions;
+  }
+  if (rowId) state.virtualWalletId = rowId;
+  if (row?.policyName != null) state.policyName = String(row.policyName);
+  if (row?.policyValidUntil != null) state.policyValidUntil = BigInt(row.policyValidUntil);
+  state.authorizationStatus = "approved";
+  return { changed, signerAddress: state.signerAddress };
+}
+
 // src/mcp-server/start-session.ts
 init_esm_shims();
 init_dist();
@@ -116049,11 +116123,11 @@ function clearWalletScopedCredentials(target) {
     delete target[key];
   }
 }
-function sameAddress(a, b) {
+function sameAddress2(a, b) {
   return String(a ?? "").toLowerCase() === String(b ?? "").toLowerCase();
 }
 function mergeStartSessionCredentials(target, patch, responseKey, options = {}) {
-  const walletChanged = patch.eoaAddress !== void 0 && !sameAddress(patch.eoaAddress, target.eoaAddress);
+  const walletChanged = patch.eoaAddress !== void 0 && !sameAddress2(patch.eoaAddress, target.eoaAddress);
   if (walletChanged || options.grantChanged) {
     clearWalletScopedCredentials(target);
   }
@@ -121919,6 +121993,49 @@ function signingKeyForAddress(address, passphrase) {
     passphrase: passphrase ?? currentCredentials.passphrase
   });
 }
+async function refreshSignerBinding() {
+  if (!currentCredentials.apiKey) return { changed: false, address: currentCredentials.signerAddress };
+  let wallets;
+  try {
+    wallets = await fetchVirtualWalletsFromBackend(currentCredentials.apiKey, true);
+  } catch (err) {
+    console.error(
+      `\u26A0\uFE0F  [signer-binding] could not re-read the grants \u2014 signing with the cached binding (${currentCredentials.signerAddress ?? "none"}): ${err instanceof Error ? err.message : String(err)}`
+    );
+    wallets = walletsCache || [];
+  }
+  const row = currentCredentials.pendingWalletId ? findCurrentApprovedWallet(wallets, ownedSigningAddresses(), currentCredentials.pendingWalletId) : selectNewestApprovedWalletAmong(
+    wallets,
+    (Array.isArray(wallets) ? wallets : []).map((w) => w?.address)
+  );
+  if (!row) return { changed: false, address: currentCredentials.signerAddress };
+  const previousSigner = currentCredentials.signerAddress;
+  const { changed, signerAddress } = bindSignerToGrantRow(currentCredentials, row);
+  if (changed) {
+    console.error(
+      `\u{1F501} [signer-binding] the active grant moved \u2014 signer ${previousSigner ?? "none"} -> ${signerAddress ?? "none"} (virtual wallet ${currentCredentials.virtualWalletId}, policy ${currentCredentials.policyId ?? "unknown"}). Dropping the signer state derived from the old grant.`
+    );
+  }
+  return { changed, address: signerAddress };
+}
+async function resolveSignerForMaterialization(passphrase) {
+  await refreshSignerBinding();
+  const address = currentCredentials.signerAddress || currentCredentials.eoaAddress || "";
+  if (!address) {
+    throw new Error(
+      "no signer address for this session \u2014 no approved grant and no install wallet. Run requestAccess first."
+    );
+  }
+  return { address, privateKey: signingKeyForAddress(address, passphrase) };
+}
+function hasSigningKeyForAddress(address) {
+  if (!address) return false;
+  try {
+    return hasGrantSigningKey({ address, vaultAddress: currentCredentials.eoaAddress });
+  } catch {
+    return false;
+  }
+}
 var plaintextVaultMode = false;
 function refreshPlaintextVaultMode() {
   const vault = currentCredentials.walletKeystoreJson;
@@ -122983,12 +123100,15 @@ async function initializeCredentials(walletKeystoreJson, eoaAddress, config) {
       const wallets = walletsCache || [];
       const approvedWallet = findCurrentApprovedWallet(
         wallets,
-        eoaAddress,
+        ownedSigningAddresses(),
         currentCredentials.pendingWalletId
       );
       if (approvedWallet) {
         console.error("\u2705 Found approved wallet from backend \u2014 authorization data stored");
         currentCredentials.authorizationStatus = "approved";
+        if (typeof approvedWallet.address === "string" && approvedWallet.address.trim() !== "") {
+          currentCredentials.signerAddress = approvedWallet.address;
+        }
         currentCredentials.virtualWalletStatus = approvedWallet.status;
         currentCredentials.walletAddress = approvedWallet.walletAddress || approvedWallet.kernelAccountAddress;
         currentCredentials.virtualWalletId = String(approvedWallet.id);
@@ -123035,10 +123155,9 @@ async function createKernelClientFromVault() {
     throw new Error("No passphrase or keystore available");
   }
   if (!cliConfig) throw new Error("CLI config not initialized");
-  let privateKey = signingKeyForAddress(
-    currentCredentials.signerAddress || currentCredentials.eoaAddress || ""
-  );
-  console.error(`${ts()} Wallet key loaded`);
+  const signer = await resolveSignerForMaterialization();
+  let privateKey = signer.privateKey;
+  console.error(`${ts()} Wallet key loaded \u2014 signing as ${signer.address}`);
   try {
     const { virtualWalletsManagers: virtualWalletsManagers2, financialAccounts: financialAccounts2 } = await getSDK();
     console.error(`${ts()} Fetching wallet data by API key...`);
@@ -123799,7 +123918,7 @@ server.tool(
 server.tool(
   {
     name: "getWalletStatus",
-    description: "Get wallet status: auth, balance, policy, allowlist, WHICH GRANT AND KEY THIS SESSION SIGNS WITH, WHICH WORKSPACE this server is acting in, and the last 10 transactions (amount, merchant, timestamp, status). `signerAddress` is the address of the approved grant this session signs with \u2014 since every access request now mints its OWN ephemeral session key, it is NOT the same as `eoaAddress` (the install wallet) except for a grant approved before rotation; `activeVirtualWalletId` / `activePolicyId` name that grant's row. `workspace` is `{companyName, employeeName}` \u2014 the Ametyst workspace every task, memory document and payment from this server lands in; both fields are null when the profile could not be read, which means UNKNOWN, never 'no workspace'. A transaction `amount` is a EUR display string like `\u20AC0.0126`, or the em dash `\u2014` when the row carries no usable amount (none recorded, or a value that is not a base-units integer) \u2014 `\u2014` means UNKNOWN, never zero. The unformatted base-units value is on `amountRaw`, which is null for exactly those rows.",
+    description: "Get wallet status: auth, balance, policy, allowlist, WHICH GRANT AND KEY THIS SESSION SIGNS WITH, WHICH WORKSPACE this server is acting in, and the last 10 transactions (amount, merchant, timestamp, status). `signerAddress` is the address of the approved grant this session signs with \u2014 since every access request now mints its OWN ephemeral session key, it is NOT the same as `eoaAddress` (the install wallet) except for a grant approved before rotation; `activeVirtualWalletId` / `activePolicyId` name that grant's row, and `signerKeyPresent` says whether this machine still holds the private key for `signerAddress` \u2014 `false` means no spend can be signed until `requestAccess` mints a fresh session key and an admin approves it. `workspace` is `{companyName, employeeName}` \u2014 the Ametyst workspace every task, memory document and payment from this server lands in; both fields are null when the profile could not be read, which means UNKNOWN, never 'no workspace'. A transaction `amount` is a EUR display string like `\u20AC0.0126`, or the em dash `\u2014` when the row carries no usable amount (none recorded, or a value that is not a base-units integer) \u2014 `\u2014` means UNKNOWN, never zero. The unformatted base-units value is on `amountRaw`, which is null for exactly those rows.",
     inputs: []
   },
   async () => {
@@ -123834,6 +123953,9 @@ server.tool(
           const freshWallet = selectNewestApprovedWalletAmong(freshWallets, ownedSigningAddresses());
           const freshWalletIsActiveGrant = String(freshWallet?.id) === String(currentCredentials.virtualWalletId);
           if (freshWallet && freshWalletIsActiveGrant) {
+            if (typeof freshWallet.address === "string" && freshWallet.address.trim() !== "") {
+              currentCredentials.signerAddress = freshWallet.address;
+            }
             if (freshWallet.policyAssociated != null) {
               currentCredentials.policyId = String(freshWallet.policyAssociated);
             }
@@ -123860,6 +123982,16 @@ server.tool(
         // "which key signed this" readable from a payload instead of from a
         // nonce-key autopsy — the same lesson as `activeVirtualWalletId` below.
         signerAddress: currentCredentials.signerAddress || currentCredentials.eoaAddress || null,
+        // CAN THIS MACHINE ACTUALLY SIGN FOR THAT GRANT? A rotated grant is
+        // signable only from the per-grant keystore entry minted with it, and a
+        // machine that lost it (a re-install, a restored home, a grant approved
+        // on another laptop) is bound to a signer it cannot produce. Presence
+        // only — no decryption, so an encrypted vault with no cached passphrase
+        // still reports `true` here and bounces at spend time on the passphrase,
+        // which is a different and recoverable problem.
+        signerKeyPresent: hasSigningKeyForAddress(
+          currentCredentials.signerAddress || currentCredentials.eoaAddress
+        ),
         walletAddress: currentCredentials.walletAddress || null,
         kernelClientActive: !!currentCredentials.virtualWalletKernelAccountClient,
         // WHICH GRANT THIS SESSION SIGNS WITH. The 2026-09-01 incident — three
@@ -125336,11 +125468,13 @@ server.tool(
         };
       }
       touchWalletActivity();
+      let missingSignerKey;
       if (!currentCredentials.virtualWalletKernelAccountClient && currentCredentials.authorizationStatus === "approved" && isWalletUnlocked()) {
         try {
           console.error("\u{1F504} [spend] Auto-creating kernel client...");
           await createKernelClientFromVault();
         } catch (kcErr) {
+          if (isMissingGrantKeyError(kcErr)) missingSignerKey = kcErr;
           console.error("\u274C [spend] Auto kernel client creation failed:", kcErr instanceof Error ? kcErr.message : String(kcErr));
         }
       }
@@ -125396,6 +125530,28 @@ server.tool(
       const apiKey = currentCredentials.apiKey;
       if (!kernelClient || !apiKey) {
         console.error("\u26A0\uFE0F [spend] Missing kernel client or API key in state");
+        if (missingSignerKey) {
+          logSpendTelemetryEarlyErr();
+          return {
+            content: [
+              {
+                type: "text",
+                text: JSON.stringify({
+                  success: false,
+                  ...disclosePayment(),
+                  // PRE-PAYMENT
+                  error: "signer_key_missing",
+                  detail: missingSignerKey.message,
+                  guidance: {
+                    say_to_user: "This machine can't sign for your approved access any more \u2014 the session key it was issued to isn't here. I need to request access again so a fresh key can be approved.",
+                    next_action: "Call getAvailablePolicies(), let the user pick a policy, then call requestAccess with it. Once the admin approves the new request, retry this spend.",
+                    stop: true
+                  }
+                })
+              }
+            ]
+          };
+        }
         if (currentCredentials.authorizationStatus === "pending") {
           logSpendTelemetryEarlyErr();
           return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ametyst/cli",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "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.6",
-    "@ametyst/cli-darwin-x64": "0.3.6",
-    "@ametyst/cli-linux-x64-gnu": "0.3.6",
-    "@ametyst/cli-win32-x64-msvc": "0.3.6"
+    "@ametyst/cli-darwin-arm64": "0.3.7",
+    "@ametyst/cli-darwin-x64": "0.3.7",
+    "@ametyst/cli-linux-x64-gnu": "0.3.7",
+    "@ametyst/cli-win32-x64-msvc": "0.3.7"
   },
   "scripts": {
     "build:native": "cd native && cargo build --release && napi build --release",