shinjuku-shielded 0.3.57 → 0.3.58

package/manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "carbon-shielded-wallet/bundle-manifest/v1",
   "file": "shinjuku-wallet.mjs",
-  "sha256": "a5a9b7ddd7aa96aa7feb6470868cd662c20f0f412df665093e768c07c4cda23c",
-  "bytes": 12153017,
-  "sourceCommit": "114e9aff996b18aae17a35d0a2f7dd46b9dfc9d2",
+  "sha256": "780f6896d6051a0d49b5a716d0ed36d9ea1487342f5582b7f2bc1c91280342e7",
+  "bytes": 12157954,
+  "sourceCommit": "75d7b5eaa20812776382cf5920a08ccb39b16c57",
   "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",
@@ -1282,5 +1282,5 @@
       "version": "1.8.0"
     }
   ],
-  "publishedAt": "2026-10-22T01:10:14.358Z"
+  "publishedAt": "2026-10-22T02:17:53.397Z"
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "shinjuku-shielded",
-  "version": "0.3.57",
+  "version": "0.3.58",
   "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": "a5a9b7dd",
-  "shinjukuSha256": "a5a9b7ddd7aa96aa7feb6470868cd662c20f0f412df665093e768c07c4cda23c",
+  "shinjukuRelease": "780f6896",
+  "shinjukuSha256": "780f6896d6051a0d49b5a716d0ed36d9ea1487342f5582b7f2bc1c91280342e7",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-mcp#readme",

package/shinjuku-wallet.mjs

@@ -42691,7 +42691,8 @@ function untilAborted(promise, signal) {
 async function routeFacilitatorsOverOnion(argv2, {
   fetchImpl = globalThis.fetch,
   err = (text3) => process.stderr.write(text3),
-  raceTimeoutMs = RACE_TIMEOUT_MS
+  raceTimeoutMs = RACE_TIMEOUT_MS,
+  routeWaitMs = ROUTE_WAIT_MS
 } = {}) {
   const routes = /* @__PURE__ */ new Map();
   const groups = /* @__PURE__ */ new Map();
@@ -42701,7 +42702,10 @@ async function routeFacilitatorsOverOnion(argv2, {
     const onions = (pinned ?? [await publishedOnion(origin, fetchImpl)]).filter((onion) => onion && V3_ONION.test(onion));
     if (onions.length > 0) {
       const key = onions.join(" ");
-      if (!groups.has(key)) groups.set(key, { onions });
+      if (!groups.has(key)) {
+        groups.set(key, { onions, waitMs: routeWaitMs, onNone: () => err(`tor: no onion of ${origin} answered its start probe (${onions.length} tried); its requests go to its onions in turn and wait for them (Tor may still be building circuits)
+`) });
+      }
       routes.set(origin, groups.get(key));
       routes.set(payHostOf(origin), groups.get(key));
       const hosts = onions.map((onion) => `${new URL(onion).host.slice(0, 8)}...`).join(", ");
@@ -42756,10 +42760,19 @@ async function routeFacilitatorsOverOnion(argv2, {
     const group = url && routes.get(url.origin);
     if (!group) return original(input, init);
     const send3 = (onion) => {
+      if (onion === void 0) onion = group.onions[(group.sent = (group.sent ?? 0) + 1) % group.onions.length];
       const target = `${onion}${url.pathname}${url.search}`;
       return original(input instanceof Request ? new Request(target, input) : target, onionInit(init));
     };
-    return group.winner ? send3(group.winner) : untilAborted(group.pending, init?.signal ?? (input instanceof Request ? input.signal : void 0)).then(send3);
+    if (group.winner) return send3(group.winner);
+    const signal = init?.signal ?? (input instanceof Request ? input.signal : void 0);
+    if (!group.waitMs) return untilAborted(group.pending, signal).then(send3);
+    let timer;
+    const bound = new Promise((resolve38) => {
+      timer = setTimeout(resolve38, group.waitMs);
+      timer.unref?.();
+    });
+    return untilAborted(Promise.race([group.pending, bound]), signal).finally(() => clearTimeout(timer)).then(send3);
   };
   return {
     routes: new Map([...routes].map(([origin, group]) => [origin, group.onions])),
@@ -42769,7 +42782,7 @@ async function routeFacilitatorsOverOnion(argv2, {
     }
   };
 }
-var SITE_ONIONS, PINNED_FACILITATOR_ONIONS, HISTORY_ONIONS, PINNED_HISTORY_ONIONS, HISTORY_PROBE_PATH, FACILITATOR_FLAGS, V3_ONION, DISCOVERY_TIMEOUT_MS, WARM_TIMEOUT_MS, RACE_TIMEOUT_MS, routedGroups, routedOnions, routedOrigins, onionsOfOrigin, routesOverOnion, GLOBAL_DISPATCHER, onionDispatchers;
+var SITE_ONIONS, PINNED_FACILITATOR_ONIONS, HISTORY_ONIONS, PINNED_HISTORY_ONIONS, HISTORY_PROBE_PATH, FACILITATOR_FLAGS, V3_ONION, DISCOVERY_TIMEOUT_MS, WARM_TIMEOUT_MS, RACE_TIMEOUT_MS, ROUTE_WAIT_MS, routedGroups, routedOnions, routedOrigins, onionsOfOrigin, routesOverOnion, GLOBAL_DISPATCHER, onionDispatchers;
 var init_facilitatorOnion = __esm({
   "wallet/src/net/facilitatorOnion.mjs"() {
     "use strict";
@@ -42796,6 +42809,7 @@ var init_facilitatorOnion = __esm({
     DISCOVERY_TIMEOUT_MS = 2e4;
     WARM_TIMEOUT_MS = 3e4;
     RACE_TIMEOUT_MS = 9e4;
+    ROUTE_WAIT_MS = 15e3;
     routedGroups = [];
     routedOnions = () => [...new Set(routedGroups.flatMap((group) => group.winner ? [group.winner] : group.onions))];
     routedOrigins = /* @__PURE__ */ new Map();
@@ -60944,8 +60958,18 @@ function settleFunder(transaction, id, intent) {
   }
   return void 0;
 }
-async function landedReceipt({ connection, id, record, intent, loadHistory }) {
-  const context = landedDepositContext(await loadHistory(), record);
+async function landedReceipt({ connection, id, record, intent, loadHistory, walkMs = LANDED_WALK_MS }) {
+  const walking = Promise.resolve().then(loadHistory);
+  walking.catch(() => {
+  });
+  let timer;
+  const slow = new Promise((resolve38) => {
+    timer = setTimeout(() => resolve38(SLOW_WALK), walkMs);
+    timer.unref?.();
+  });
+  const history = await Promise.race([walking, slow]).finally(() => clearTimeout(timer));
+  if (history === SLOW_WALK) fail11("landed_history_walk_slow_retry_later");
+  const context = landedDepositContext(history, record);
   const signature2 = context?.provenance?.signature;
   if (!signature2) fail11("landed_history_pending_retry_later");
   const transaction = await retryRpc2(() => connection.getTransaction(signature2, {
@@ -61652,7 +61676,15 @@ async function submitRelayedDepositLeased({ store, connection, programId, proofT
     };
     const intent = await readIntent(connection, id, record);
     if (intent.landed) {
-      const receipt = await relayReceipt({ connection, id, record, intent, loadHistory, transaction: reads.settle });
+      const receipt = await relayReceipt({
+        connection,
+        id,
+        record,
+        intent,
+        loadHistory,
+        transaction: reads.settle,
+        ...deps.landedWalkMs !== void 0 ? { walkMs: deps.landedWalkMs } : {}
+      });
       if (receipt.source !== source.toBase58()) {
         record.state = "foreign_funded";
         record.foreignFunding = receipt;
@@ -61781,7 +61813,7 @@ function settleTransaction(connection, signature2) {
     maxSupportedTransactionVersion: 1
   }));
 }
-async function relayReceipt({ connection, id, record, intent, loadHistory, transaction: read }) {
+async function relayReceipt({ connection, id, record, intent, loadHistory, transaction: read, walkMs }) {
   const signature2 = record.relay.result?.signature;
   if (signature2) {
     const transaction = (read ? await read : void 0) ?? await settleTransaction(connection, signature2);
@@ -61798,7 +61830,7 @@ async function relayReceipt({ connection, id, record, intent, loadHistory, trans
       };
     }
   }
-  return landedReceipt({ connection, id, record, intent, loadHistory });
+  return landedReceipt({ connection, id, record, intent, loadHistory, ...walkMs !== void 0 ? { walkMs } : {} });
 }
 async function reclaimRelayedDeposit(input) {
   return withWalletLease(input.store, input.deps ?? {}, () => reclaimRelayedDepositLeased(input));
@@ -62178,7 +62210,7 @@ async function publishDepositMemo({ serviceUrl: serviceUrl2, record, fetchImpl =
   const stored = await fetchMemoFromService(serviceUrl2, record.memoDigest, { fetchImpl });
   if (!stored || !Buffer.from(stored).equals(bytes2)) fail11("memo_publish_readback_mismatch");
 }
-var import_web3101, DEPOSIT_WAL_SCHEMA, P03_BINDING, BUFFER_SIZE, DEPOSIT_INTENT_LEN, DEPOSIT_RECORD_LEN, CLOSE_BUFFER, COMPACT_DEPOSIT_INTENT, BUFFER_LIFETIME_SLOTS, BUFFER_MIN_REMAINING_SLOTS, FEE_MARGIN_LAMPORTS, RESOLVED_STATES, LANDED_STATES, hex, field32, walName, delay, DEPOSIT_RELAY_SCHEMA, DEPOSIT_RECLAIM_SCHEMA, DEPOSIT_RELAY_CONFIG_SCHEMA, APPROVE_COMPUTE_UNITS, RECLAIM_COMPUTE_UNITS, RELAY_ROUNDS, RELAY_KEY_PROBES, MAX_SCAN_COUNT, RELAY_REQUEST_TIMEOUT_MS, RELAY_MAX_WAIT_SECONDS, RELAY_REFUSALS, RECLAIM_REFUSALS, relayHex, SPLIT_MAX, DEFAULT_SPLIT_PARTS, SPLIT_UNIT_ATOMIC, FUNDS_PLAN_SCHEMA, FUNDS_PLAN_PREFIX, relayKeyPool, __test;
+var import_web3101, DEPOSIT_WAL_SCHEMA, P03_BINDING, BUFFER_SIZE, DEPOSIT_INTENT_LEN, DEPOSIT_RECORD_LEN, CLOSE_BUFFER, COMPACT_DEPOSIT_INTENT, BUFFER_LIFETIME_SLOTS, BUFFER_MIN_REMAINING_SLOTS, FEE_MARGIN_LAMPORTS, RESOLVED_STATES, LANDED_STATES, hex, field32, walName, LANDED_WALK_MS, SLOW_WALK, delay, DEPOSIT_RELAY_SCHEMA, DEPOSIT_RECLAIM_SCHEMA, DEPOSIT_RELAY_CONFIG_SCHEMA, APPROVE_COMPUTE_UNITS, RECLAIM_COMPUTE_UNITS, RELAY_ROUNDS, RELAY_KEY_PROBES, MAX_SCAN_COUNT, RELAY_REQUEST_TIMEOUT_MS, RELAY_MAX_WAIT_SECONDS, RELAY_REFUSALS, RECLAIM_REFUSALS, relayHex, SPLIT_MAX, DEFAULT_SPLIT_PARTS, SPLIT_UNIT_ATOMIC, FUNDS_PLAN_SCHEMA, FUNDS_PLAN_PREFIX, relayKeyPool, __test;
 var init_deposit = __esm({
   "wallet/src/deposit/deposit.mjs"() {
     "use strict";
@@ -62213,6 +62245,8 @@ var init_deposit = __esm({
     hex = (value) => Buffer.from(String(value).replace(/^0x/, ""), "hex");
     field32 = (value) => Buffer.from(BigInt(value).toString(16).padStart(64, "0"), "hex");
     walName = (depositId) => `deposit-${depositId}`;
+    LANDED_WALK_MS = 12e4;
+    SLOW_WALK = /* @__PURE__ */ Symbol("slow landed walk");
     delay = (ms) => new Promise((resolve38) => setTimeout(resolve38, ms));
     DEPOSIT_RELAY_SCHEMA = "carbon-shielded-x402/p03-deposit-relay/v1";
     DEPOSIT_RECLAIM_SCHEMA = "carbon-shielded-x402/p03-deposit-reclaim/v1";
@@ -63832,6 +63866,7 @@ var init_errorCodes = __esm({
       "key_index_invalid",
       "key_probe_exhausted",
       "landed_history_pending_retry_later",
+      "landed_history_walk_slow_retry_later",
       "leaf_range",
       "lock_missing",
       "mainnet_ack_invalid",
@@ -103035,6 +103070,17 @@ function checkConfig(value) {
   }
   if (BigInt(caps.maxSession) < BigInt(caps.maxPayment)) throw invalid3("caps.maxSession is below caps.maxPayment");
   if (value.tor !== void 0 && typeof value.tor !== "boolean") throw invalid3("tor is not true or false");
+  if (value.torTunnel !== void 0) {
+    let tunnel;
+    try {
+      tunnel = new URL(value.torTunnel);
+    } catch {
+      tunnel = void 0;
+    }
+    if (!tunnel || tunnel.protocol !== "http:" || !["127.0.0.1", "localhost", "[::1]"].includes(tunnel.hostname) || !tunnel.port || tunnel.pathname !== "/" || tunnel.search || tunnel.username || value.torTunnel !== tunnel.origin) {
+      throw invalid3("torTunnel is not a local http://127.0.0.1:<port> Tor tunnel");
+    }
+  }
   if (value.previousPools !== void 0) {
     if (!Array.isArray(value.previousPools) || value.previousPools.length > 8) throw invalid3("previousPools is not a short list");
     for (const entry of value.previousPools) {
@@ -104650,33 +104696,54 @@ async function getBytes(fetchImpl, url, timeoutMs, label, maxBytes, budget, { la
   if (over) throw tooLarge();
   return Buffer.concat(chunks, total);
 }
-function getSmall(fetchImpl, url, label, maxBytes) {
+function getSmall(fetchImpl, url, label, maxBytes, { patientMs = 0, progressLine, progressEveryMs = PROGRESS_EVERY_MS, laneMs = RELEASE_TIMEOUT_MS } = {}) {
   const stop3 = new AbortController();
   const timers = [];
+  const startedAt = Date.now();
   let started = 0;
   let running = 0;
   let settled = false;
   let firstError;
+  const mayRelaunch = () => patientMs > 0 && Date.now() - startedAt + laneMs <= patientMs;
   return new Promise((resolve38, reject) => {
     const done = (finish, value) => {
       if (settled) return;
       settled = true;
-      for (const timer of timers) clearTimeout(timer);
+      for (const timer of timers) {
+        clearTimeout(timer);
+        clearInterval(timer);
+      }
       stop3.abort();
+      if (finish === reject && patientMs > 0 && LOST.test(String(value?.message))) {
+        const seconds2 = Math.round((Date.now() - startedAt) / 1e3);
+        value = fail26("setup_download_failed", inTorRun() ? `${label} could not be fetched from the facilitator over Tor (no answer in ${seconds2} s on ${started} Tor circuits). Tor runs but reached no path to the facilitator's onion service yet; a Tor that has just started can need a few minutes for that. Wait 1 minute and rerun setup: it keeps what it already checked` : `${label} could not be fetched from the facilitator (no answer in ${seconds2} s); check the network and rerun setup: it keeps what it already checked`);
+      }
       finish(value);
     };
+    if (progressLine) {
+      const tick = setInterval(() => {
+        const seconds2 = Math.round((Date.now() - startedAt) / 1e3);
+        try {
+          progressLine(`still waiting for ${label}: no answer after ${seconds2} s${inTorRun() ? " (over Tor the first onion connection can take a minute after Tor starts)" : ""}
+`);
+        } catch {
+        }
+      }, progressEveryMs);
+      tick.unref?.();
+      timers.push(tick);
+    }
     const launch = () => {
-      if (settled || started >= SMALL_LANES) return;
+      if (settled || started >= SMALL_LANES && !mayRelaunch()) return;
       const lane = started;
       started += 1;
       running += 1;
-      getBytes(fetchImpl, url, RELEASE_TIMEOUT_MS, label, maxBytes, void 0, { lane, stop: stop3.signal }).then(
+      getBytes(fetchImpl, url, laneMs, label, maxBytes, void 0, { lane, stop: stop3.signal }).then(
         (bytes2) => done(resolve38, bytes2),
         (error) => {
           running -= 1;
           firstError ??= error;
           if (!LOST.test(String(error?.message))) done(reject, error);
-          else if (started < SMALL_LANES) launch();
+          else if (started < SMALL_LANES || mayRelaunch()) launch();
           else if (running === 0) done(reject, firstError);
         }
       );
@@ -104878,10 +104945,10 @@ async function downloadSet({ fetchImpl, base, entries, budget, onFile, onBytes =
   if (firstError) throw firstError;
   if (filesLeft > 0) throw fail26("setup_download_failed", "the proof-tool download stopped before every file arrived; rerun setup: it keeps what it already checked");
 }
-async function fetchRelease(facilitator, { fetchImpl = fetch } = {}) {
+async function fetchRelease(facilitator, { fetchImpl = fetch, patientMs = 0, progressLine, progressEveryMs, laneMs } = {}) {
   const url = new URL("/api/wallet/release", facilitator).href;
   const label = "the release document (/api/wallet/release)";
-  const bytes2 = await getSmall(fetchImpl, url, label, LIMITS.release);
+  const bytes2 = await getSmall(fetchImpl, url, label, LIMITS.release, { patientMs, ...progressLine ? { progressLine } : {}, ...progressEveryMs ? { progressEveryMs } : {}, ...laneMs ? { laneMs } : {} });
   let release;
   try {
     release = JSON.parse(bytes2.toString("utf8"));
@@ -105123,7 +105190,7 @@ async function refreshTrustedProofTools({ home, facilitator, pool: pool2, fetchI
   });
   return Object.freeze({ changed: true, dir: tools.dir, sumsSha256: tools.sumsSha256, downloaded: tools.downloaded });
 }
-var PINNED_PROOF_TOOLS, UPDATE_NEXT, HEX643, DIR2, SUMS_LINE, MAX_FILES, LIMITS, RELEASE_TIMEOUT_MS, FILE_TIMEOUT_MS, DOWNLOAD_LANES, RANGE_BYTES, RANGE_TIMEOUT_MS, RANGE_STALL_MS, RANGE_FLOOR_BYTES, RANGE_ATTEMPTS, HEDGE_AFTER_MS, CONTENT_RANGE, PROGRESS_EVERY_MS, releasedBytes, megabytes, REQUIRED_FILES, sha2569, fail26, SMALL_HEDGE_MS, SMALL_LANES, LOST, passing, localPath, executable, toolPaths;
+var PINNED_PROOF_TOOLS, UPDATE_NEXT, HEX643, DIR2, SUMS_LINE, MAX_FILES, LIMITS, RELEASE_TIMEOUT_MS, FILE_TIMEOUT_MS, DOWNLOAD_LANES, RANGE_BYTES, RANGE_TIMEOUT_MS, RANGE_STALL_MS, RANGE_FLOOR_BYTES, RANGE_ATTEMPTS, HEDGE_AFTER_MS, CONTENT_RANGE, PROGRESS_EVERY_MS, releasedBytes, megabytes, REQUIRED_FILES, sha2569, fail26, SMALL_HEDGE_MS, SMALL_LANES, LOST, SETUP_RELEASE_PATIENCE_MS, passing, localPath, executable, toolPaths;
 var init_proofTools = __esm({
   "wallet/src/setup/proofTools.mjs"() {
     "use strict";
@@ -105163,6 +105230,7 @@ var init_proofTools = __esm({
     SMALL_HEDGE_MS = 1e4;
     SMALL_LANES = 3;
     LOST = /\(no answer\)|stopped before its end/;
+    SETUP_RELEASE_PATIENCE_MS = 11e4;
     passing = (error) => Object.assign(error, { passing: true });
     localPath = (folder, path) => join21(folder, ...path.split("/"));
     executable = (path) => path.startsWith("bin/") || path.startsWith("house/bin/");
@@ -116315,7 +116383,8 @@ async function runShield({ session, depositId, amountAtomic, onStage, steps = {}
     programId: session.programId,
     proofTools: session.proofTools,
     depositId,
-    serviceUrl: session.memoServiceUrl
+    serviceUrl: session.memoServiceUrl,
+    deps: { walkHistory: () => walkWalletHistory(session, store) }
   };
   if (!existing || existing.state === "awaiting_funds") {
     onStage("proving");
@@ -116370,7 +116439,8 @@ async function runShieldFromElsewhere({ session, depositId, amountAtomic, onStag
     programId: session.programId,
     proofTools: session.proofTools,
     depositId,
-    serviceUrl: session.memoServiceUrl
+    serviceUrl: session.memoServiceUrl,
+    deps: { walkHistory: () => walkWalletHistory(session, store) }
   };
   const before = store.readWal(`deposit-${depositId}`);
   if (!before || before.state === "awaiting_funds") {
@@ -121326,13 +121396,17 @@ ${canonical5}`;
       `call the same tool again with the same request_id in ${POLL_SECONDS3} s. If the same code repeats, tell your owner: ${code2}`
     );
   };
-  const payMeRun = () => ({
-    store: session.openStore(),
-    connection: session.connection,
-    programId: session.programId,
-    proofTools: session.proofTools,
-    serviceUrl: session.memoServiceUrl
-  });
+  const payMeRun = () => {
+    const store = session.openStore();
+    return {
+      store,
+      connection: session.connection,
+      programId: session.programId,
+      proofTools: session.proofTools,
+      serviceUrl: session.memoServiceUrl,
+      deps: { walkHistory: () => walkWalletHistory(session, store) }
+    };
+  };
   const payMeRoundMax = () => {
     const max = capOf2(money.maxShieldAtomic);
     return max !== void 0 && max < MAX_SHIELDED_BALANCE_ATOMIC ? max : MAX_SHIELDED_BALANCE_ATOMIC;
@@ -145635,7 +145709,7 @@ init_walk();
 init_cli();
 init_floatPay();
 import { randomBytes as randomBytes33 } from "node:crypto";
-import { join as join36, resolve as resolve37 } from "node:path";
+import { dirname as dirname29, join as join36, resolve as resolve37 } from "node:path";
 import { spawn as spawn6 } from "node:child_process";
 import { fileURLToPath as fileURLToPath22 } from "node:url";
 
@@ -145658,6 +145732,7 @@ init_secretFile();
 init_recoveryFile();
 init_config2();
 init_proofTools();
+init_proxy();
 init_migration();
 init_successions();
 init_chain2();
@@ -145803,7 +145878,10 @@ async function runSetup(options, deps = {}) {
   let movedFrom;
   let releasePools;
   try {
-    release = await fetchRelease(facilitator, { fetchImpl: deps.fetchImpl });
+    release = await fetchRelease(facilitator, {
+      fetchImpl: deps.fetchImpl,
+      ...inTorRun() ? { patientMs: deps.releasePatienceMs ?? SETUP_RELEASE_PATIENCE_MS, progressLine: deps.progressLine ?? ((text3) => process.stderr.write(text3)) } : {}
+    });
   } catch (error) {
     releaseError = error;
   }
@@ -145951,6 +146029,7 @@ async function runSetup(options, deps = {}) {
   let previousPools = movedFrom ? withPreviousPool(old) : old?.pool === identity.pool ? old.previousPools : void 0;
   const drainingHere = (releasePools?.migration?.from ?? []).filter((entry) => entry.pool !== identity.pool && existsSync(homeWalletPath(home, entry.pool)) && !(previousPools ?? []).some((known) => known.pool === entry.pool));
   if (drainingHere.length) previousPools = [...previousPools ?? [], ...drainingHere.map((entry) => ({ pool: entry.pool, program: entry.programId }))].slice(-8);
+  const torTunnel = tor ? options.torTunnel ?? old?.torTunnel : void 0;
   const base = {
     schema: CONFIG_SCHEMA,
     ...identity,
@@ -145958,6 +146037,7 @@ async function runSetup(options, deps = {}) {
     passphraseFile,
     caps,
     tor,
+    ...torTunnel ? { torTunnel } : {},
     ...wallet.recoveryFile ? { recoveryFile: wallet.recoveryFile } : {},
     ...previousPools?.length ? { previousPools } : {}
   };
@@ -150913,7 +150993,15 @@ function withProofToolsRefresh(options, fromConfig) {
 var inProxiedRun = (env) => childRunProxy(env).args.length > 0;
 var TOR_RUN_STARTED_ENV2 = "SHINJUKU_WALLET_TOR_RUN_STARTED_FILE";
 var TOR_DOWN_DETAIL = "Your private connection (Tor) is not running, so no payment was made. Start Tor, then restart this MCP server in your agent host and try again.";
-var torDownNext = (configPath2) => `Tell the user: start Tor (its torrc needs HTTPTunnelPort 127.0.0.1:9080), then restart this MCP server in the agent host (or restart the host app); the wallet tools start behind Tor then. Setup recorded Tor in ${configPath2}; a setup rerun keeps it. Nothing falls back to a direct connection. If Tor is not installed: ${torInstallText()}`;
+var recordedTunnelHost = (configPath2) => {
+  try {
+    const tunnel = readSetupConfig(dirname29(configPath2))?.torTunnel;
+    return tunnel ? new URL(tunnel).host : "127.0.0.1:9080";
+  } catch {
+    return "127.0.0.1:9080";
+  }
+};
+var torDownNext = (configPath2) => `Tell the user: start Tor (its torrc needs HTTPTunnelPort ${recordedTunnelHost(configPath2)}), then restart this MCP server in the agent host (or restart the host app); the wallet tools start behind Tor then. Setup recorded Tor in ${configPath2}; a setup rerun keeps it. Nothing falls back to a direct connection. If Tor is not installed: ${torInstallText()}`;
 async function runMcpTorDown({ exitCode, configPath: configPath2, input = process.stdin, output: output2 = process.stdout, errorOutput = process.stderr }) {
   const log = (line) => errorOutput.write(`${line}
 `);
@@ -150965,7 +151053,8 @@ var mcpServerEndedHere = () => mcpServerEnded;
 async function runMcp(values, deps) {
   const torHome = mcpTorAheadHome(values, deps);
   if (torHome !== void 0) {
-    const { code: code2, started } = await torRunOf(["mcp", ...values.get(MCP_RAW_ARGS)], deps);
+    const tunnel = setupConfigOf(torHome)?.torTunnel;
+    const { code: code2, started } = await torRunOf(["mcp", ...values.get(MCP_RAW_ARGS), ...tunnel ? ["--proxy", tunnel] : []], deps);
     if (code2 === 0) return void 0;
     if (started) {
       throw new PublicFailure(`wallet_command_failed: the MCP server ran behind Tor and then ended with exit code ${code2}; its own message is above. Tor was running when it started, so this is not a Tor failure, and nothing fell back to a direct connection. Fix what that message says, then start mcp again`);
@@ -151345,6 +151434,8 @@ async function runSetupCommand(values, deps) {
     ...values.has("--max-shield") ? { maxShield: values.get("--max-shield") } : {},
     ...values.has("--max-unshield") ? { maxUnshield: values.get("--max-unshield") } : {},
     ...values.has("--prefer-tor") || torRunRecords ? { tor: true } : {},
+    // This --tor run's own local tunnel when it is not 127.0.0.1:9080 (setup --tor --proxy http://127.0.0.1:9150): mcp uses it.
+    ...torRunRecords && childRunProxy(deps.env).args[1] === "--proxy" ? { torTunnel: childRunProxy(deps.env).args[2] } : {},
     ...values.has("--passphrase-file") ? { passphraseFile: values.get("--passphrase-file") } : {},
     ...values.has("--facilitator") ? { facilitator: values.get("--facilitator") } : {},
     ...values.has("--trust-proof-tools") ? { trustProofTools: values.get("--trust-proof-tools") } : {}
@@ -151368,7 +151459,9 @@ async function runSetupCommand(values, deps) {
   if (privateInference === true && (options.tor !== true || torRunRecords) && old?.tor !== true) {
     io.out('Private inference needs Tor, so setup records Tor for mcp (Tor must run with HTTPTunnelPort 127.0.0.1:9080), and the commands below use --tor. To turn both off later: set "tor": false and "inference": { "enabled": false } in config.json (mcp --no-tor skips Tor for one run).\n\n');
   } else if (torRunRecords && old?.tor !== true) {
-    io.out('Tor is recorded for mcp: this setup runs with --tor, so config.json gets "tor": true and the MCP runs behind Tor too (Tor must run with HTTPTunnelPort 127.0.0.1:9080; mcp --no-tor skips it for one run).\n\n');
+    io.out(`Tor is recorded for mcp: this setup runs with --tor, so config.json gets "tor": true and the MCP runs behind Tor too (Tor must run with HTTPTunnelPort ${options.torTunnel ? `${new URL(options.torTunnel).host}; config.json records it as "torTunnel", so mcp uses that port` : "127.0.0.1:9080"}; mcp --no-tor skips it for one run).
+
+`);
   }
   if (behindTor(options.tor === true || privateInference === true || options.tor === void 0 && old?.tor === true)) {
     io.out("Setup continues behind Tor: the release, the proof tools, and the RPC requests go over Tor.\n");