shinjuku-shielded 0.3.154 → 0.3.156

package/README.md

@@ -6,19 +6,19 @@ 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.154. The npm packages `shinjuku-shield` and
+This is version 0.3.156. The npm packages `shinjuku-shield` and
 `shinjuku-shielded` hold the same files. The command is `shinjuku`.
 
 ## Set up
 
 ```sh
-npm install -g shinjuku@0.3.154
+npm install -g shinjuku@0.3.156
 shinjuku setup
 ```
 
 Type the two lines as they are. `npx install shinjuku` does not work: npx
 reads `install` as the name of another npm package. To set up without
-installing, type `npx shinjuku@0.3.154 setup`.
+installing, type `npx shinjuku@0.3.156 setup`.
 
 Setup makes the wallet on this machine, a private passphrase file, and the
 checked proof tools (about 191 MB), and writes `config.json`. It also writes
@@ -36,13 +36,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.154 mcp
+claude mcp add --scope user shinjuku -- npx -y --no-audit --no-fund shinjuku-shield@0.3.156 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.154", "mcp"] } } }
+{ "mcpServers": { "shinjuku": { "command": "npx", "args": ["-y", "--no-audit", "--no-fund", "shinjuku-shield@0.3.156", "mcp"] } } }
 ```
 
 On native Windows, if the host cannot find `npx`, use `"command": "cmd"` and
@@ -55,7 +55,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.154", "mcp"]
+args = ["-y", "--no-audit", "--no-fund", "shinjuku-shield@0.3.156", "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": "706b774ac8ab6d671a81f7aa269e2a1d1e222d60f545ddde48945fbfdc8b0bcd",
-  "bytes": 9052676,
-  "sourceCommit": "7b23397db24686bbab6bd45734cb9560c914981a",
+  "sha256": "003fb669ed2395e72fbedad6336c943c92c940fba878d03c4fa03245e2b5ae78",
+  "bytes": 9056153,
+  "sourceCommit": "41849a3c692d96c166971d1dd5e13ca84cbceb12",
   "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-03T05:31:30.536Z"
+  "publishedAt": "2026-11-03T06:19:18.430Z"
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "shinjuku-shielded",
-  "version": "0.3.154",
+  "version": "0.3.156",
   "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": "706b774a",
-  "shinjukuSha256": "706b774ac8ab6d671a81f7aa269e2a1d1e222d60f545ddde48945fbfdc8b0bcd",
+  "shinjukuRelease": "003fb669",
+  "shinjukuSha256": "003fb669ed2395e72fbedad6336c943c92c940fba878d03c4fa03245e2b5ae78",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "Shinjuku Shielded",
   "homepage": "https://github.com/ShinjukuStaition/shinjuku-shield#readme",

package/shinjuku-wallet.mjs

@@ -42618,6 +42618,15 @@ function markPhase(phase, outcome) {
   } catch {
   }
 }
+function boundMarkPhase() {
+  const write = scope.getStore();
+  return (phase, outcome) => {
+    try {
+      write?.(phase, outcome);
+    } catch {
+    }
+  };
+}
 function poolReadOutcome(slot3, moved) {
   let text3;
   try {
@@ -42917,6 +42926,9 @@ function tunnelRefused(statusCode) {
 }
 function optimisticConnect(params, { proxyHost, proxyPort, closedInRow }) {
   const target = String(params.path);
+  const mark = boundMarkPhase();
+  const startedAt = Date.now();
+  let dials = 0;
   const head = `CONNECT ${target} HTTP/1.1\r
 ${Object.entries(params.headers ?? {}).filter(([name, value2]) => value2 !== void 0 && !/[\r\n]/.test(`${name}${value2}`)).map(([name, value2]) => `${name}: ${value2}\r
 `).join("")}\r
@@ -42969,6 +42981,7 @@ ${Object.entries(params.headers ?? {}).filter(([name, value2]) => value2 !== voi
     if (first) pendingReject = reject;
     reply = Buffer.alloc(0);
     ready = false;
+    dials += 1;
     socket = net.connect(proxyPort, proxyHost);
     socket.setNoDelay(true);
     let connected = false;
@@ -42977,6 +42990,7 @@ ${Object.entries(params.headers ?? {}).filter(([name, value2]) => value2 !== voi
       socket.write(head);
       for (const chunk of sent) socket.write(chunk);
       ready = true;
+      mark("tunnel-sent", `dial${dials}`);
       if (first) pendingReject = void 0;
       resolve39();
     });
@@ -42990,9 +43004,11 @@ ${Object.entries(params.headers ?? {}).filter(([name, value2]) => value2 !== voi
       if (end < 0) return;
       const status = Number(/^HTTP\/1\.[01] (\d{3})/.exec(reply.subarray(0, reply.indexOf("\r\n")).toString("latin1"))?.[1] ?? 0);
       if (status !== 200) {
+        mark("tunnel-refused", `http${status}`);
         stream.destroy(tunnelRefused(status));
         return;
       }
+      mark("tunnel-200", `ms${Date.now() - startedAt}_dial${dials}`);
       open4 = true;
       sent.length = 0;
       closedInRow.delete(target);
@@ -43019,6 +43035,7 @@ ${Object.entries(params.headers ?? {}).filter(([name, value2]) => value2 !== voi
         return;
       }
       const closed = (closedInRow.get(target) ?? 0) + 1;
+      mark("tunnel-closed", `n${closed}`);
       if (closed < TUNNEL_CLOSED_TRIES) {
         closedInRow.set(target, closed);
         dial(false).catch((error) => stream.destroy(error));
@@ -43042,6 +43059,7 @@ var init_tunnelGuard = __esm({
   "wallet/src/net/tunnelGuard.mjs"() {
     "use strict";
     init_keepAlive();
+    init_phaseTiming();
     RUN_MARK = "SHINJUKU_WALLET_PROXIED";
     TUNNEL_CLOSED_TRIES = 3;
   }
@@ -59679,7 +59697,7 @@ async function readCompactP03HistoryNow({
   poolPreRead,
   // walletHistory.mjs, with poolPreRead: page 0 asked beside the same refresh (requestCompactFirstPage).
   // Used as this read's page 0 when this read asks page 0 at all; readPages checks it as any page.
-  // Ignored with knownSnapshot.
+  // Ignored with knownSnapshot, except in the read again after a refused tail hit (`tail` false).
   firstPreRead,
   // compactP03HistoryReport: run beside the spot checks once the initialization is verified
   // ({ snapshot, initialization, contexts }); its result comes back as `alongside`.
@@ -59693,7 +59711,7 @@ async function readCompactP03HistoryNow({
   // result and any throw are ignored.
   onList,
   // compactP03HistoryReport: the records of a compact cache that is not warm (cached.served). When the
-  // list is read (no knownSnapshot), these records (or `served`'s, when the pool outgrew them) that pass
+  // list is read (no page 0 handed over by a behind wait), these records (or `served`'s, when the pool outgrew them) that pass
   // the start of the pool's last grid page take that page instead of every page (3b, combineCompactTail);
   // page 0 still goes out and is read to its end.
   prefix,
@@ -59702,8 +59720,8 @@ async function readCompactP03HistoryNow({
   // false: no tail path (compactP03HistoryReport's read again after a refused tail hit; it sent its set already).
   tail = true,
   // compactP03HistoryReport's read again (with tail false): the set the refused tail hit sent at this same count
-  // (sendRestOfSet's { pages, tail }), so the read again takes its pages instead of asking them a second time.
-  // Ignored with knownSnapshot.
+  // (sendRestOfSet's { pages, tail }), so the read again takes its pages instead of asking them a second time,
+  // with knownSnapshot too.
   restPreRead,
   // compactP03HistoryReport: called on a tail hit with { first (page 0's answer promise), snapshot (the pool
   // account read), check, rest (the set sent at the count) }, so a refused list can be read again from that same
@@ -59728,7 +59746,7 @@ async function readCompactP03HistoryNow({
   const hintIndex = knownSnapshot?.currentIndex ?? knownIndex;
   const cachedReachesKnown = hintIndex !== void 0 && served !== void 0 && Array.isArray(served.records) && Boolean(served.initialization) && BigInt(served.records.length) * SUBTREE_LEAVES3 >= hintIndex;
   const reusedFirst = knownSnapshot !== void 0 && knownFirst !== void 0 ? knownFirst : void 0;
-  const preFirst = knownSnapshot === void 0 ? firstPreRead : void 0;
+  const preFirst = knownSnapshot === void 0 || !tail ? firstPreRead : void 0;
   const first = reusedFirst ?? (served === void 0 || hintIndex !== void 0 && !cachedReachesKnown ? preFirst ?? requestPage(source, poolString, 0, signal) : void 0);
   if (first !== void 0 && reusedFirst === void 0) markPhase(preFirst !== void 0 ? "compact-page0-handed-over" : "compact-page0-sent");
   let early = heldPicks.early;
@@ -59792,7 +59810,7 @@ async function readCompactP03HistoryNow({
   const count2 = Number(snapshot.currentIndex / SUBTREE_LEAVES3);
   if (!Number.isSafeInteger(count2)) throw refuse3("p03_compact_history_snapshot_invalid");
   const anchors = freezeFinalizedAnchors(snapshot);
-  const preRest = knownSnapshot === void 0 ? restPreRead : void 0;
+  const preRest = knownSnapshot === void 0 || !tail ? restPreRead : void 0;
   let rest;
   const restOfSet = () => rest ??= preRest ?? sendRestOfSet(source, poolString, count2, tailGrid, signal);
   let aheadHere;
@@ -59837,7 +59855,7 @@ async function readCompactP03HistoryNow({
   };
   let prefixCheck;
   const readTailOrPages = async () => {
-    if (knownSnapshot !== void 0 || !tail) return readServedPages();
+    if (reusedFirst !== void 0 || !tail) return readServedPages();
     const zero = first ?? preFirst ?? requestPage(source, poolString, 0, signal);
     if (first === void 0 && preFirst === void 0) markPhase("compact-page0-sent");
     const from = tailFrom(count2, tailGrid);
@@ -111049,9 +111067,9 @@ async function payTurn({ session, target, method, headers, body, maxPrice, polic
   if (session.closed) fail26("fetch_session_closed", "this payer session is closed; open a new one");
   const paymentStartedAt = Date.now();
   const timing = typeof opts?.timing === "function" ? opts.timing : session.timing();
-  const mark = (phase) => {
+  const mark = (phase, outcome) => {
     try {
-      timing?.(phase);
+      timing?.(phase, outcome);
     } catch {
     }
   };
@@ -111069,12 +111087,12 @@ async function payTurn({ session, target, method, headers, body, maxPrice, polic
         warmFloatConfig({ origin: new URL(session.memoServiceUrl).origin, timing: mark });
         startRecoveredPaymentTools(lazyProofTools(session));
       }
-      const response = await unpaidRequest(target, () => keepAliveInit({
+      const response = await withPhaseScope(mark, "fetch", () => unpaidRequest(target, () => keepAliveInit({
         method,
         headers,
         ...body ? { body } : {},
         redirect: "manual"
-      }), { timeoutMs: Number.isSafeInteger(opts?.unpaidTimeoutMs) && opts.unpaidTimeoutMs > 0 ? opts.unpaidTimeoutMs : void 0, onCut: opts?.onUnpaidCut });
+      }), { timeoutMs: Number.isSafeInteger(opts?.unpaidTimeoutMs) && opts.unpaidTimeoutMs > 0 ? opts.unpaidTimeoutMs : void 0, onCut: opts?.onUnpaidCut }));
       if (response.status !== 402) return response;
       const encoded = response.headers.get("PAYMENT-REQUIRED");
       void drainBody(response);
@@ -144691,13 +144709,30 @@ var init_homeScreen = __esm({
 
 // wallet/src/inference/brand.mjs
 function columnsOf(text3) {
+  const parts = GRAPHEMES ? Array.from(GRAPHEMES.segment(text3), (part) => part.segment) : Array.from(text3);
   let count2 = 0;
-  for (const ch of text3) {
-    const code2 = ch.codePointAt(0);
-    count2 += code2 >= 11904 && code2 <= 42191 || code2 >= 65280 && code2 <= 65376 ? 2 : 1;
+  for (const part of parts) {
+    if (/^[\p{M}\p{Cf}]+$/u.test(part)) continue;
+    count2 += new RegExp("\\p{Extended_Pictographic}|[\\u{1F1E6}-\\u{1F1FF}]|\u20E3", "u").test(part) || wideCode(part.codePointAt(0)) ? 2 : 1;
   }
   return count2;
 }
+function expandTabs(line, start = 0) {
+  if (!line.includes("	")) return line;
+  let out = "";
+  let column = start;
+  for (const piece of line.match(/\x1b\[[0-9;]*m|\t|[^\t\x1b]+|\x1b/g) ?? []) {
+    if (piece === "	") {
+      const spaces = 8 - column % 8;
+      out += " ".repeat(spaces);
+      column += spaces;
+    } else {
+      out += piece;
+      if (!piece.startsWith("\x1B[")) column += columnsOf(piece);
+    }
+  }
+  return out;
+}
 function brandColor(stream = process.stderr, env = process.env) {
   if (!stream?.isTTY || (env.CI ?? "") !== "" || env.TERM === "dumb") return 0;
   return screenColor(stream, env);
@@ -144772,10 +144807,57 @@ function brandLine({ model: model2, tor = true, color = 0 }) {
     ...tor ? [[" \xB7 ", "ash"], ["Tor on", "brass"]] : []
   ], color);
 }
+function fitColumns(text3, columns, { prefix = "" } = {}) {
+  const width = Math.floor(Number(columns));
+  if (!(width >= 1)) return `${prefix}${text3}`;
+  const visible = (part) => part.replace(/\x1b\[[0-9;]*m/g, "");
+  return String(text3).split("\n").map((raw, index) => {
+    const head = index === 0 ? prefix : "";
+    const headColumns = columnsOf(visible(head));
+    const line = expandTabs(raw, headColumns);
+    if (headColumns + columnsOf(visible(line)) <= width) return `${head}${raw}`;
+    const pad = " ".repeat(Math.min(visible(line).match(/^ */)[0].length, Math.max(0, width - 1)));
+    const out = [];
+    let current = head;
+    let used = headColumns;
+    let hasWord = false;
+    let spaces = "";
+    for (const piece of line.match(/ +|(?:\x1b\[[0-9;]*m|\x1b|[^ \x1b])+/g) ?? []) {
+      if (piece[0] === " ") {
+        if (hasWord) spaces += piece;
+        else {
+          const kept3 = Math.max(0, Math.min(piece.length, width - 1 - used));
+          current += " ".repeat(kept3);
+          used += kept3;
+        }
+        continue;
+      }
+      const seen = columnsOf(visible(piece));
+      if (seen === 0) {
+        current += piece;
+        continue;
+      }
+      if (hasWord && used + spaces.length + seen > width) {
+        out.push(current);
+        current = pad;
+        used = pad.length;
+      } else {
+        current += spaces;
+        used += spaces.length;
+      }
+      spaces = "";
+      current += piece;
+      used += seen;
+      hasWord = true;
+    }
+    out.push(current);
+    return out.join("\n");
+  }).join("\n");
+}
 function paidLine(atomic4, { color = 0, tail = "" } = {}) {
   return paint([["\u2713 ", "brass"], ["paid privately ", "dim"], [usdcWords(atomic4), "verm"], ...tail ? [[tail, "mute"]] : []], color);
 }
-var HEADER_COLUMNS, STATEMENTS, KATAKANA2, PRIVATE_AI, TONES, joinParts2;
+var HEADER_COLUMNS, STATEMENTS, KATAKANA2, GRAPHEMES, wideCode, PRIVATE_AI, TONES, joinParts2;
 var init_brand = __esm({
   "wallet/src/inference/brand.mjs"() {
     "use strict";
@@ -144785,6 +144867,8 @@ var init_brand = __esm({
     HEADER_COLUMNS = 80;
     STATEMENTS = "Shield once. Take it everywhere. Pay unseen.";
     KATAKANA2 = Array.from({ length: 65438 - 65382 }, (_, index) => String.fromCharCode(65382 + index));
+    GRAPHEMES = typeof Intl.Segmenter === "function" ? new Intl.Segmenter("en", { granularity: "grapheme" }) : void 0;
+    wideCode = (code2) => code2 >= 4352 && code2 <= 4447 || code2 >= 11904 && code2 <= 42191 || code2 >= 44032 && code2 <= 55203 || code2 >= 63744 && code2 <= 64255 || code2 >= 65072 && code2 <= 65103 || code2 >= 65280 && code2 <= 65376 || code2 >= 65504 && code2 <= 65510 || code2 >= 131072 && code2 <= 262141;
     PRIVATE_AI = [["Private ", "bone"], ["AI", "crim"]];
     TONES = { b: "brass", c: "crim", o: "crimdim" };
     joinParts2 = (cells) => cells.reduce((parts, [ch, cls]) => {
@@ -145079,7 +145163,8 @@ async function runChat({ io, values, deps = {} }) {
   servedNow();
   const color = brandColor(process.stderr, env);
   const answerColor = brandColor(process.stdout, env);
-  const say3 = (line) => io.err(`${line}
+  const fitErr = (text3) => fitColumns(text3, process.stderr.isTTY ? process.stderr.columns : 0);
+  const say3 = (line) => io.err(`${fitErr(line)}
 `);
   const modeName = () => state.mode === "each" ? "one question at a time" : "a conversation";
   const youPrompt = () => paint([
@@ -145614,7 +145699,7 @@ When it says ready, type your message here.`);
       lineAbove = (text3) => {
         lastLineAt = Date.now();
         clearStatus();
-        io.err(String(text3).endsWith("\n") ? String(text3) : `${text3}
+        io.err(`${fitErr(String(text3).replace(/\n$/, ""))}
 `);
         if (inPlace) status();
       };
@@ -145683,7 +145768,11 @@ When it says ready, type your message here.`);
       }
       state.answers += 1;
       if (state.mode === "talk") state.history = [...turn.messages, { role: "assistant", content }];
-      io.out(`${answerColor ? paint([["AI  ", "crim"], ["\u203A ", "ash"]], answerColor) : ""}${content}
+      io.out(`${fitColumns(
+        content,
+        process.stdout.isTTY ? process.stdout.columns : 0,
+        { prefix: answerColor ? paint([["AI  ", "crim"], ["\u203A ", "ash"]], answerColor) : "" }
+      )}
 `);
       const cut2 = result.finishReason === "length" ? `(the answer stopped at its ${turn.maxTokens}-token limit) ` : "";
       const plainPaid = paid !== void 0 && !replayed && !unpaid;