@ametyst/cli 0.2.2 → 0.2.34

package/native/index.d.ts

@@ -5,5 +5,12 @@
 
 export declare function hardenProcess(): void
 export declare function createWallet(passphrase: string): string
+/**
+ * Import an externally-provided raw private key (e.g. an Option-A session key
+ * generated + passkey-approved in the web app and pasted into the CLI) into
+ * the SAME passphrase-encrypted keystore format `create_wallet` emits. The key
+ * never leaves the machine — Ametyst never receives it (ADR-001 non-custodial).
+ */
+export declare function importWallet(privateKey: string, passphrase: string): string
 export declare function decryptWallet(keystoreJson: string, passphrase: string): string
 export declare function getWalletAddress(keystoreJson: string): string

package/native/src/lib.rs

@@ -1,6 +1,7 @@
 use aes_gcm::aead::{Aead, KeyInit};
 use aes_gcm::{Aes256Gcm, Nonce};
 use k256::ecdsa::SigningKey;
+#[cfg(unix)]
 use libc::{c_void, mlock, munlock, rlimit, setrlimit, RLIMIT_CORE};
 use napi_derive::napi;
 use rand::rngs::OsRng;
@@ -24,9 +25,10 @@ struct SecretBytes {
 impl SecretBytes {
   fn new(bytes: Vec<u8>) -> Self {
     let secret = Self { bytes };
-    let ptr = secret.bytes.as_ptr() as *const c_void;
-    let len = secret.bytes.len();
+    #[cfg(unix)]
     unsafe {
+      let ptr = secret.bytes.as_ptr() as *const c_void;
+      let len = secret.bytes.len();
       let _ = mlock(ptr, len);
     }
     secret
@@ -43,10 +45,11 @@ impl SecretBytes {
 
 impl Drop for SecretBytes {
   fn drop(&mut self) {
-    let ptr = self.bytes.as_ptr() as *const c_void;
-    let len = self.bytes.len();
     self.bytes.zeroize();
+    #[cfg(unix)]
     unsafe {
+      let ptr = self.bytes.as_ptr() as *const c_void;
+      let len = self.bytes.len();
       let _ = munlock(ptr, len);
     }
   }
@@ -110,24 +113,49 @@ pub fn harden_process() -> napi::Result<()> {
     libc::prctl(libc::PR_SET_DUMPABLE, 0, 0, 0, 0);
   }
 
-  let lim = rlimit {
-    rlim_cur: 0,
-    rlim_max: 0,
-  };
-  unsafe {
-    setrlimit(RLIMIT_CORE, &lim);
+  // Windows writes no core dump to cwd; setrlimit is Unix-only.
+  // Memory-lock (VirtualLock) parity on Windows is a backlog item.
+  #[cfg(unix)]
+  {
+    let lim = rlimit {
+      rlim_cur: 0,
+      rlim_max: 0,
+    };
+    unsafe {
+      setrlimit(RLIMIT_CORE, &lim);
+    }
   }
 
   Ok(())
 }
 
-#[napi(js_name = "createWallet")]
-pub fn create_wallet(passphrase: String) -> napi::Result<String> {
-  let mut private_key = [0u8; 32];
-  OsRng.fill_bytes(&mut private_key);
-  let secret_private_key = SecretBytes::new(private_key.to_vec());
-  private_key.zeroize();
+/// Parse a raw secp256k1 private key from a hex string (with or without a
+/// leading `0x`) into exactly 32 bytes. Rejects anything that is not a valid
+/// 32-byte key so a bad paste fails loudly instead of producing a keystore for
+/// the wrong address.
+fn parse_private_key_hex(private_key: &str) -> napi::Result<Vec<u8>> {
+  let trimmed = private_key.trim();
+  let stripped = trimmed.strip_prefix("0x").unwrap_or(trimmed);
+  let bytes = hex::decode(stripped)
+    .map_err(|e| napi::Error::from_reason(format!("invalid private key hex: {e}")))?;
+  if bytes.len() != 32 {
+    return Err(napi::Error::from_reason(format!(
+      "invalid private key length: expected 32 bytes, got {}",
+      bytes.len()
+    )));
+  }
+  Ok(bytes)
+}
 
+/// Encrypt an in-memory private key into the version-3 keystore JSON that
+/// `createWallet` produces (scrypt KDF + AES-256-GCM). Shared by `create_wallet`
+/// (fresh random key) and `import_wallet` (externally-provided key) so both
+/// emit byte-for-byte the same keystore shape that `decrypt_wallet` /
+/// `get_wallet_address` read back.
+fn encrypt_private_key_to_keystore(
+  secret_private_key: &SecretBytes,
+  passphrase: &str,
+) -> napi::Result<String> {
   let address = derive_address_from_private_key(secret_private_key.as_slice())?;
 
   let mut salt = [0u8; 32];
@@ -181,6 +209,27 @@ pub fn create_wallet(passphrase: String) -> napi::Result<String> {
     .map_err(|e| napi::Error::from_reason(format!("keystore serialization failed: {e}")))
 }
 
+#[napi(js_name = "createWallet")]
+pub fn create_wallet(passphrase: String) -> napi::Result<String> {
+  let mut private_key = [0u8; 32];
+  OsRng.fill_bytes(&mut private_key);
+  let secret_private_key = SecretBytes::new(private_key.to_vec());
+  private_key.zeroize();
+
+  encrypt_private_key_to_keystore(&secret_private_key, &passphrase)
+}
+
+/// Import an externally-provided raw private key (e.g. an Option-A session key
+/// generated + passkey-approved in the web app and pasted into the CLI) into
+/// the SAME passphrase-encrypted keystore format `create_wallet` emits. The key
+/// never leaves the machine — Ametyst never receives it (ADR-001 non-custodial).
+#[napi(js_name = "importWallet")]
+pub fn import_wallet(private_key: String, passphrase: String) -> napi::Result<String> {
+  let key_bytes = parse_private_key_hex(&private_key)?;
+  let secret_private_key = SecretBytes::new(key_bytes);
+  encrypt_private_key_to_keystore(&secret_private_key, &passphrase)
+}
+
 #[napi(js_name = "decryptWallet")]
 pub fn decrypt_wallet(keystore_json: String, passphrase: String) -> napi::Result<String> {
   let keystore: Keystore = serde_json::from_str(&keystore_json)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ametyst/cli",
-  "version": "0.2.2",
+  "version": "0.2.34",
   "private": false,
   "description": "Ametyst CLI — embedded MCP server, wallet ops, agent payments",
   "type": "module",
@@ -31,18 +31,20 @@
       "additional": [
         "aarch64-apple-darwin",
         "x86_64-apple-darwin",
-        "x86_64-unknown-linux-gnu"
+        "x86_64-unknown-linux-gnu",
+        "x86_64-pc-windows-msvc"
       ]
     }
   },
   "dependencies": {
+    "@ametyst-dev/sdk-prod": "^0.8.29",
     "@modelcontextprotocol/sdk": "1.29.0",
     "@napi-rs/keyring": "1.1.7",
     "mcp-use": "1.24.2"
   },
   "_comment_optionalDependencies": "Injected at publish-time by publish-staging.yml / publish-prod.yml via `npm pkg set` with the version being published. Not committed here so pnpm install (locally + CI) doesn't try to resolve sub-package versions that may not exist on the registry between releases.",
   "devDependencies": {
-    "@ametyst-dev/sdk-prod": "^0.2.0",
+    "@ametyst-dev/sdk-prod": "^0.8.29",
     "@napi-rs/cli": "2.18.4",
     "@types/node": "20.19.39",
     "@types/prompts": "2.4.9",
@@ -54,15 +56,32 @@
     "tsx": "4.19.2",
     "typescript": "5.2.2",
     "viem": "2.38.6",
-    "vitest": "2.1.9"
+    "vitest": "3.2.6"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
+  "_comment_overrides": "Security overrides: pin transitive deps to their first patched version to clear npm/pnpm audit advisories (bn.js infinite-loop, ws memory-disclosure/DoS, plus the rest of the flagged transitive tree). All within-major to avoid breaking changes. The npm `overrides` block below mirrors `pnpm.overrides` so a GLOBAL npm install of the published package (where the cli is the install root) inherits the same patched resolution; note a project that installs the cli as a *dependency* will NOT inherit these — the consuming project must add its own overrides.",
+  "overrides": {
+    "bn.js@<4.12.3": "4.12.4",
+    "ws@>=8.0.0 <8.21.0": "8.21.0",
+    "protobufjs@<7.6.3": "7.6.4",
+    "form-data@<4.0.6": "4.0.6",
+    "tar@<7.5.16": "7.5.19",
+    "dompurify@<3.4.11": "3.4.11",
+    "@opentelemetry/core@<2.8.0": "2.8.0",
+    "hono@<4.12.25": "4.12.27",
+    "vite@>=8.0.0 <8.0.16": "8.1.2",
+    "vite@>=5.0.0 <6.4.3": "6.4.3",
+    "vitest@<3.2.6": "3.2.6",
+    "esbuild@<0.25.0": "0.25.12",
+    "esbuild@>=0.27.3 <0.28.1": "0.28.1"
+  },
   "optionalDependencies": {
-    "@ametyst/cli-darwin-arm64": "0.2.2",
-    "@ametyst/cli-darwin-x64": "0.2.2",
-    "@ametyst/cli-linux-x64-gnu": "0.2.2"
+    "@ametyst/cli-darwin-arm64": "0.2.34",
+    "@ametyst/cli-darwin-x64": "0.2.34",
+    "@ametyst/cli-linux-x64-gnu": "0.2.34",
+    "@ametyst/cli-win32-x64-msvc": "0.2.34"
   },
   "scripts": {
     "build:native": "cd native && cargo build --release && napi build --release",