shinjuku-shielded 0.3.10 → 0.3.11

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "28f33853062c9982283f59bef13a6bb33b6ce474ea62c0d30ae6e0d473e66da2",
-  "bytes": 10945718,
-  "sourceCommit": "981ee2d7a103a8e3934a5e13cf3e7dccbc09b6c0",
+  "sha256": "a9b9ea19ca82a7e4fe991f01050aae148bea45db0bb46be31c22df310e081969",
+  "bytes": 10949292,
+  "sourceCommit": "043825750e3f2f6138f265ad8b909764455bc24d",
   "sourceDirty": false,
   "installRecordMatchesLockfile": true,
   "releaseRule": "valid only when two fresh npm ci --ignore-scripts builds on different OSes give the same sha256; installRecordMatchesLockfile true means every entry npm installed equals its package-lock.json entry and every entry not marked optional, devOptional included, is installed: an optional entry (a package for another platform) may be absent",

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "shinjuku-shielded",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "mcpName": "io.github.ShinjukuStaition/shinjuku-mcp",
   "description": "Shinjuku Shielded, the private x402 facilitator on Solana: the self-custody wallet CLI and its MCP server. Shield, pay, and unshield USDC from any MCP agent, under caps you set.",
-  "shinjukuRelease": "28f33853",
-  "shinjukuSha256": "28f33853062c9982283f59bef13a6bb33b6ce474ea62c0d30ae6e0d473e66da2",
+  "shinjukuRelease": "a9b9ea19",
+  "shinjukuSha256": "a9b9ea19ca82a7e4fe991f01050aae148bea45db0bb46be31c22df310e081969",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -129591,7 +129591,8 @@ var COMMANDS = [
       "--add-to for Claude Desktop or Cursor: a host config whose mcpServers is not a JSON object, or that has a different shinjuku-shielded entry (without --force), is left alone. Otherwise the old file is copied to <file>.bak-<time> (mode 0600 on Linux and macOS; on Windows the folder's access list) and the new file replaces it in one rename.",
       "The provers are Linux programs. Linux: ready. Windows: the wallet runs them through WSL; setup checks that wsl.exe runs (wsl --install -d Ubuntu otherwise). macOS: not supported; setup says so and creates nothing.",
       "Run it again at any time: it never changes an existing wallet, keeps the recorded caps unless you pass new ones, checks every proof-tool file again, downloads what is missing or newer, and rewrites config.json.",
-      "Then mcp needs no flags: npx -y shinjuku-shielded mcp reads config.json (a flag on the command line still wins). Before setup, mcp in a terminal offers to run setup; started by an agent host, it serves shinjuku_setup, which runs this same setup after you confirm in the host."
+      "Then mcp needs no flags: npx -y shinjuku-shielded mcp reads config.json (a flag on the command line still wins). Before setup, mcp in a terminal offers to run setup; started by an agent host, it serves shinjuku_setup, which runs this same setup after you confirm in the host.",
+      "A command that takes --pool (balance, recover, deposit, add-funds, and others) takes it, and the passphrase of this home's wallet, from config.json when you leave them out: shinjuku-wallet balance needs no flags. A flag or SHIELDED_WALLET_PASSPHRASE still wins; init and restore never use config.json, and move reads it itself."
     ],
     next: `start it from your agent host with npx -y shinjuku-shielded mcp (or ${CLI2} mcp), then ask your agent "what is my balance"`,
     run: (args, values, deps, io) => deps.setupMain(values, { ...deps, io })
@@ -130257,6 +130258,55 @@ function checkValue(spec, value) {
   }
   return void 0;
 }
+var NO_CONFIG_DEFAULTS = /* @__PURE__ */ new Set(["mcp", "setup", "init", "restore", "move"]);
+function configDefaults(command, args, deps) {
+  const unchanged = { args, passphrase: void 0 };
+  if (NO_CONFIG_DEFAULTS.has(command.name) || command.beforeValidate) return unchanged;
+  const has2 = (name) => command.flags.some((spec) => spec.name === name);
+  const given = parseFlags(command, args);
+  const passphraseFileSpec = command.flags.find((spec) => spec.name === "--passphrase-file");
+  const envPassphrase = Boolean(deps.env[PASSPHRASE_ENV2]);
+  const wantPool = has2("--pool") && !given.has("--pool") && !given.has("--wallet");
+  const wantFile = Boolean(passphraseFileSpec) && !given.has("--passphrase-file") && (passphraseFileSpec.required || !envPassphrase);
+  const wantEnv = !passphraseFileSpec && command.env.includes(PASSPHRASE_ENV2) && !envPassphrase;
+  if (!wantPool && !wantFile && !wantEnv) return unchanged;
+  const home = setupHome(deps.env);
+  const config = setupConfigOf(home);
+  if (!config) return unchanged;
+  const added = wantPool ? ["--pool", config.pool] : [];
+  const pool = wantPool ? config.pool : given.get("--pool");
+  const homePools = [config.pool, ...(config.previousPools ?? []).map((entry) => entry.pool)];
+  const ownWallet = given.has("--wallet") ? homePools.some((entry) => resolve33(given.get("--wallet")) === resolve33(homeWalletPath(home, entry))) : homePools.includes(pool);
+  if (!ownWallet || !wantFile && !wantEnv) return { args: [...args, ...added], passphrase: void 0 };
+  const where = `config.json (${join32(home, "config.json")})`;
+  if (wantFile) {
+    if (!config.passphraseFile) {
+      throw new UsageError(`${command.name} needs the wallet passphrase: ${where} names no passphrase file; pass --passphrase-file <file>, or rerun ${CLI2} setup (it keeps the wallet)`, command);
+    }
+    return { args: [...args, ...added, "--passphrase-file", config.passphraseFile], passphrase: void 0 };
+  }
+  let text3;
+  try {
+    text3 = config.passphraseFile ? readSecretText(config.passphraseFile, "the passphrase file") : void 0;
+  } catch (error) {
+    if (error instanceof SecretFileEncodingError) throw new PublicFailure(error.message);
+    text3 = void 0;
+  }
+  if (!text3) {
+    throw new UsageError(`${PASSPHRASE_ENV2} is not set, and the passphrase file that ${where} names (${config.passphraseFile ?? "none"}) could not be read or is empty: export ${PASSPHRASE_ENV2}=<your wallet passphrase>, or rerun ${CLI2} setup (it keeps the wallet)`, command);
+  }
+  return { args: [...args, ...added], passphrase: text3 };
+}
+function lendPassphrase(passphrase2) {
+  if (passphrase2 === void 0) return () => {
+  };
+  const saved = process.env[PASSPHRASE_ENV2];
+  process.env[PASSPHRASE_ENV2] = passphrase2;
+  return () => {
+    if (saved === void 0) delete process.env[PASSPHRASE_ENV2];
+    else process.env[PASSPHRASE_ENV2] = saved;
+  };
+}
 function validate3(command, values, env) {
   const missing = command.flags.filter((spec) => (spec.required || spec.requiredUnless && !values.has(spec.requiredUnless)) && !values.has(spec.name));
   if (missing.length === 1) {
@@ -131331,17 +131381,24 @@ async function runShinjukuWallet(argv, overrides = {}) {
       io.out(commandHelp(command));
       return 0;
     }
-    const commandArgs = command.normalizeArgs ? command.normalizeArgs(command, args) : args;
+    const defaults = configDefaults(command, command.normalizeArgs ? command.normalizeArgs(command, args) : args, deps);
+    const commandArgs = defaults.args;
+    const runDeps = defaults.passphrase === void 0 ? deps : { ...deps, env: { ...deps.env, [PASSPHRASE_ENV2]: defaults.passphrase } };
     values = parseFlags(command, commandArgs);
-    const skip = command.beforeValidate?.(values, deps, commandArgs) === SKIP_VALIDATE;
-    if (!skip) validate3(command, values, deps.env);
+    const skip = command.beforeValidate?.(values, runDeps, commandArgs) === SKIP_VALIDATE;
+    if (!skip) validate3(command, values, runDeps.env);
     retiredPoolGuard(command, values, io);
-    const rpc2 = skip ? { args: commandArgs } : rpcFileArgs(command, commandArgs, values, deps, io);
+    const rpc2 = skip ? { args: commandArgs } : rpcFileArgs(command, commandArgs, values, runDeps, io);
     try {
-      applyStoredChannel({ home: setupHome(deps.env) });
+      applyStoredChannel({ home: setupHome(runDeps.env) });
     } catch {
     }
-    await command.run(rpc2.args, values, rpc2.url === void 0 ? deps : { ...deps, rpcUrlFromFile: rpc2.url }, io);
+    const restorePassphrase = lendPassphrase(defaults.passphrase);
+    try {
+      await command.run(rpc2.args, values, rpc2.url === void 0 ? runDeps : { ...runDeps, rpcUrlFromFile: rpc2.url }, io);
+    } finally {
+      restorePassphrase();
+    }
     if (!command.nextInOutput) io.err(`next: ${hintForThisRun(command.nextAfterRun?.(values, deps) ?? command.next, values)}
 `);
     writeRunResult(deps, command, 0);