shinjuku-shielded 0.3.184 → 0.3.185

package/README.md

@@ -6,13 +6,13 @@ answers privately, in a terminal chat or for your agent app. Its `mcp`
 command runs a local MCP server (stdio) for your agent. Your keys never
 leave your machine.
 
-This is version 0.3.184. The npm packages `shinjuku-shield` and
+This is version 0.3.185. The npm packages `shinjuku-shield` and
 `shinjuku-shielded` hold the same files. The command is `shinjuku`.
 
 ## Set up
 
 ```sh
-npx -y shinjuku@0.3.184 setup
+npx -y shinjuku@0.3.185 setup
 ```
 
 Setup offers to install the `shinjuku` command and, on Windows, adds npm's
@@ -35,13 +35,13 @@ Every wallet command works after `shinjuku`, for example `shinjuku balance`,
 Claude Code:
 
 ```sh
-claude mcp add --scope user shinjuku -- npx -y --no-audit --no-fund shinjuku-shield@0.3.184 mcp
+claude mcp add --scope user shinjuku -- npx -y --no-audit --no-fund shinjuku-shield@0.3.185 mcp
 ```
 
 Claude Desktop (`claude_desktop_config.json`) or Cursor (`~/.cursor/mcp.json`):
 
 ```json
-{ "mcpServers": { "shinjuku": { "command": "npx", "args": ["-y", "--no-audit", "--no-fund", "shinjuku-shield@0.3.184", "mcp"] } } }
+{ "mcpServers": { "shinjuku": { "command": "npx", "args": ["-y", "--no-audit", "--no-fund", "shinjuku-shield@0.3.185", "mcp"] } } }
 ```
 
 On native Windows, if the host cannot find `npx`, use `"command": "cmd"` and
@@ -54,7 +54,7 @@ Codex (the Codex app and Codex CLI read the same file, `~/.codex/config.toml`):
 ```toml
 [mcp_servers.shinjuku]
 command = "npx"
-args = ["-y", "--no-audit", "--no-fund", "shinjuku-shield@0.3.184", "mcp"]
+args = ["-y", "--no-audit", "--no-fund", "shinjuku-shield@0.3.185", "mcp"]
 startup_timeout_sec = 120
 tool_timeout_sec = 300
 ```

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "fed76293d7f682c50f249284a7f4bbf14d2d6c7d8926c052c6ef1f683419b8dd",
-  "bytes": 9349716,
-  "sourceCommit": "37820c4cf40bdbd57dece9d1b739e1c541f534ed",
+  "sha256": "cab378d1d911f907711de448e5c6525febcd0e73ff8988efcb4ae7d1fa82e961",
+  "bytes": 9351549,
+  "sourceCommit": "0e77401ed1e90cd6fa9035028ac5098ae6abbb6e",
   "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",
@@ -1038,5 +1038,5 @@
       "version": "1.8.0"
     }
   ],
-  "publishedAt": "2026-11-06T16:14:51.926Z"
+  "publishedAt": "2026-11-06T17:17:10.158Z"
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "shinjuku-shielded",
-  "version": "0.3.184",
+  "version": "0.3.185",
   "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": "fed76293",
-  "shinjukuSha256": "fed76293d7f682c50f249284a7f4bbf14d2d6c7d8926c052c6ef1f683419b8dd",
+  "shinjukuRelease": "cab378d1",
+  "shinjukuSha256": "cab378d1d911f907711de448e5c6525febcd0e73ff8988efcb4ae7d1fa82e961",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-shield#readme",

package/shinjuku-wallet.mjs

@@ -588,6 +588,16 @@ function processLockAddress(name, platform = process.platform) {
   if (platform === "linux") return `\0shinjuku-lock-${hash12}`;
   return join2(tmpdir2(), `shinjuku-lock-${hash12.slice(0, 32)}.sock`);
 }
+async function processLockFree(name) {
+  const address4 = processLockAddress(name);
+  try {
+    (await listen(address4)).close();
+    return true;
+  } catch (error) {
+    if (!["EADDRINUSE", "EACCES"].includes(error?.code)) throw error;
+  }
+  return process.platform === "darwin" ? deadSocketFile(address4) : false;
+}
 async function takeProcessLock(name, {
   onWait = () => {
   },
@@ -83641,7 +83651,7 @@ var init_p03LoopLag = __esm({
 });
 
 // src/server/payments/shielded/p03IndexedReplay.ts
-var import_web3110, ERROR_KINDS, P03_E1_MOVE_INPUTS, MOVE_VALUE_INDICES, MOVE_HEAD_BYTES3, UPGRADEABLE_LOADER, TOKEN_PROGRAM, E1_CHANGELOG_BYTES2, P03_E1_TREE_READ_BYTES, rpcHttpFetch;
+var import_web3110, P03_E1_BEHIND_RETRY_MS, P03_E1_BEHIND_RETRIES, P03_E1_BEHIND_POLL_MS, P03_E1_BEHIND_KEEPS, ERROR_KINDS, P03_E1_MOVE_INPUTS, MOVE_VALUE_INDICES, MOVE_HEAD_BYTES3, UPGRADEABLE_LOADER, TOKEN_PROGRAM, E1_CHANGELOG_BYTES2, P03_E1_TREE_READ_BYTES, rpcHttpFetch;
 var init_p03IndexedReplay = __esm({
   "src/server/payments/shielded/p03IndexedReplay.ts"() {
     "use strict";
@@ -83653,6 +83663,10 @@ var init_p03IndexedReplay = __esm({
     init_p03MinContextSlotRetry();
     init_p03LoopLag();
     init_ShieldedSolanaP03Types();
+    P03_E1_BEHIND_RETRY_MS = 1e3;
+    P03_E1_BEHIND_RETRIES = 2;
+    P03_E1_BEHIND_POLL_MS = 200;
+    P03_E1_BEHIND_KEEPS = P03_E1_BEHIND_RETRIES * (1 + Math.floor((P03_E1_BEHIND_RETRY_MS - 1) / P03_E1_BEHIND_POLL_MS));
     ERROR_KINDS = /* @__PURE__ */ new Map([
       [E1_ERROR_CODES2.E1NotInGap, "not-in-gap"],
       [E1_ERROR_CODES2.E1LeafModified, "leaf-modified"],
@@ -156463,15 +156477,18 @@ function freePort() {
 var failure2 = (plain, detail, extra = {}) => Object.assign(new Error(detail ?? plain), { plain, ...extra });
 var sleep4 = (ms) => new Promise((resolvePromise) => setTimeout(resolvePromise, ms));
 var tunnelOf = (port) => `http://127.0.0.1:${port}`;
-function takeLock(home, say2) {
-  mkdirSync(managedTorDir(home), { recursive: true, mode: 448 });
+function lockName(home) {
   let real = home;
   try {
     real = realpathSync.native(home);
   } catch {
   }
   if (process.platform === "win32" || process.platform === "darwin") real = real.toLowerCase();
-  return takeProcessLock(`tor-start ${real}`, {
+  return `tor-start ${real}`;
+}
+function takeLock(home, say2) {
+  mkdirSync(managedTorDir(home), { recursive: true, mode: 448 });
+  return takeProcessLock(lockName(home), {
     waitEveryMs: Infinity,
     onWait: () => say2("Waiting for Tor, which is starting in the background."),
     lostError: () => failure2("another start took over. Ask again", "the start lock was taken over")
@@ -156532,6 +156549,13 @@ async function installBundle(home, say2) {
 `);
   renameSync(unpacking, target);
 }
+function bootstrappedSince(home, from) {
+  try {
+    return /Bootstrapped 100%/.test(readFileSync(logFile(home), "utf8").slice(Number.isInteger(from) ? from : 0));
+  } catch {
+    return false;
+  }
+}
 async function waitBootstrapped(home, alive2, from) {
   const until = Date.now() + BOOTSTRAP_TIMEOUT_MS;
   for (; ; ) {
@@ -156611,9 +156635,27 @@ async function startTor(home, port, say2, assertHeld = () => {
   child.once("exit", () => {
     ended2 = true;
   });
+  let stopped = false;
+  const endStart = () => {
+    if (!ended2) child.kill();
+    try {
+      rmSync(stateFile(home), { force: true });
+    } catch {
+    }
+  };
+  const onStop = (signal) => {
+    stopped = true;
+    if (!bootstrappedSince(home, from)) endStart();
+    if (process.listenerCount(signal) === 1) process.exit(signal === "SIGINT" ? 130 : 143);
+  };
+  const stopSignals = ["SIGINT", "SIGTERM"];
+  for (const signal of stopSignals) process.on(signal, onStop);
   await new Promise((resolvePromise, reject) => {
     child.once("error", (error) => reject(blocked(error)));
     child.once("spawn", resolvePromise);
+  }).catch((error) => {
+    for (const signal of stopSignals) process.off(signal, onStop);
+    throw error;
   });
   child.unref();
   try {
@@ -156628,14 +156670,13 @@ async function startTor(home, port, say2, assertHeld = () => {
       );
     }
     say2("Starting Tor in the background (a few seconds; up to a minute the first time).");
-    await waitBootstrapped(home, () => !ended2, from);
+    await waitBootstrapped(home, () => !ended2 && !stopped, from);
   } catch (error) {
-    if (!ended2) child.kill();
-    try {
-      rmSync(stateFile(home), { force: true });
-    } catch {
-    }
+    if (!stopped || !bootstrappedSince(home, from)) endStart();
+    if (stopped) throw failure2("you stopped the start with Ctrl+C, so Tor was stopped too. Ask again to start it", "the Tor start was stopped (Ctrl+C)");
     throw error;
+  } finally {
+    for (const signal of stopSignals) process.off(signal, onStop);
   }
 }
 async function recordTunnel(home, tunnel) {
@@ -156644,7 +156685,7 @@ async function recordTunnel(home, tunnel) {
   } catch {
   }
 }
-async function ownTorReady(home, state2) {
+async function ownTorReady(home, state2, { wait: wait2 = true } = {}) {
   if (!state2 || !pidAlive4(state2.pid)) return void 0;
   let now;
   try {
@@ -156656,6 +156697,7 @@ async function ownTorReady(home, state2) {
   let own = await controlCheck(home, state2);
   if (own?.tunnelPort !== state2.port) return void 0;
   if (own.progress < 100) {
+    if (!wait2) return void 0;
     await waitBootstrapped(home, () => pidAlive4(state2.pid), Number.isInteger(state2.logFrom) ? state2.logFrom : 0);
     own = await controlCheck(home, state2);
     if (own?.tunnelPort !== state2.port || own.progress < 100) return void 0;
@@ -156719,8 +156761,9 @@ async function ensureWalletTor(proxy, { env = process.env, platform = process.pl
   const ownPort = ownPortOf(home);
   if (explicit && Number(url.port) !== ownPort) return proxy;
   try {
-    const ready = await ownTorReady(home, managedTorState(home));
-    if (ready) {
+    const known = managedTorState(home);
+    const ready = await ownTorReady(home, known, { wait: false });
+    if (ready && await processLockFree(lockName(home)) && pidAlive4(known.pid)) {
       await recordTunnel(home, ready);
       return ready;
     }