@bash0816/claude-code 2.1.220 → 2.1.223

package/README.md

@@ -37,7 +37,7 @@ npm が `claude` bin link を管理する状態になれば、通常の `npm ins
 Latest audited version / 最新監査済み版:
 
 ```sh
-npm install -g @bash0816/claude-code@2.1.219
+npm install -g @bash0816/claude-code@2.1.222
 ```
 
 ## Update / 更新

package/config/claude-native-audited-versions.json

@@ -580,6 +580,60 @@
       "entry_end_offset": 265457701,
       "tarball_integrity": "sha512-VHFI8mKruIntKn7eq81sbyS19/KWmQcmJQsS/C+j9M/E+w0s4UytgsL7DADPjBE/GByNiKoRtLYDMntCjRlOdA==",
       "tarball_sha256": "e38454d73576a08a2e707f26539d73fc9ef33e890228ca5c58a2bbe810ac884d",
+      "status": "termux_verified"
+    },
+    "2.1.220-1": {
+      "wrapper_spec": "@anthropic-ai/claude-code@2.1.220",
+      "native_spec": "@anthropic-ai/claude-code-linux-arm64@2.1.220",
+      "entry_js_offset": 243831156,
+      "entry_end_offset": 265457701,
+      "tarball_integrity": "sha512-VHFI8mKruIntKn7eq81sbyS19/KWmQcmJQsS/C+j9M/E+w0s4UytgsL7DADPjBE/GByNiKoRtLYDMntCjRlOdA==",
+      "tarball_sha256": "e38454d73576a08a2e707f26539d73fc9ef33e890228ca5c58a2bbe810ac884d",
+      "status": "offset_discovered"
+    },
+    "2.1.220-2": {
+      "wrapper_spec": "@anthropic-ai/claude-code@2.1.220",
+      "native_spec": "@anthropic-ai/claude-code-linux-arm64@2.1.220",
+      "entry_js_offset": 243831156,
+      "entry_end_offset": 265457701,
+      "tarball_integrity": "sha512-VHFI8mKruIntKn7eq81sbyS19/KWmQcmJQsS/C+j9M/E+w0s4UytgsL7DADPjBE/GByNiKoRtLYDMntCjRlOdA==",
+      "tarball_sha256": "e38454d73576a08a2e707f26539d73fc9ef33e890228ca5c58a2bbe810ac884d",
+      "status": "termux_verified"
+    },
+    "2.1.220-3": {
+      "wrapper_spec": "@anthropic-ai/claude-code@2.1.220",
+      "native_spec": "@anthropic-ai/claude-code-linux-arm64@2.1.220",
+      "entry_js_offset": 243831156,
+      "entry_end_offset": 265457701,
+      "tarball_integrity": "sha512-VHFI8mKruIntKn7eq81sbyS19/KWmQcmJQsS/C+j9M/E+w0s4UytgsL7DADPjBE/GByNiKoRtLYDMntCjRlOdA==",
+      "tarball_sha256": "e38454d73576a08a2e707f26539d73fc9ef33e890228ca5c58a2bbe810ac884d",
+      "status": "offset_discovered"
+    },
+    "2.1.222": {
+      "wrapper_spec": "@anthropic-ai/claude-code@2.1.222",
+      "native_spec": "@anthropic-ai/claude-code-linux-arm64@2.1.222",
+      "entry_js_offset": 256895476,
+      "entry_end_offset": 279849039,
+      "tarball_integrity": "sha512-EXSediF1ujcqQeElbXdCEe+uW3NUQAOjn1xHHAgvwzY08nzJeePjagn9+YS6bmhHxBgDKwlGu7pL8Kv7EpiFtg==",
+      "tarball_sha256": "1bb3c8364d652dd08a15856ee27c6600ecd1e45360243154fa846f240ce7a1df",
+      "status": "termux_verified"
+    },
+    "2.1.222-1": {
+      "wrapper_spec": "@anthropic-ai/claude-code@2.1.222",
+      "native_spec": "@anthropic-ai/claude-code-linux-arm64@2.1.222",
+      "entry_js_offset": 256895476,
+      "entry_end_offset": 279849039,
+      "tarball_integrity": "sha512-EXSediF1ujcqQeElbXdCEe+uW3NUQAOjn1xHHAgvwzY08nzJeePjagn9+YS6bmhHxBgDKwlGu7pL8Kv7EpiFtg==",
+      "tarball_sha256": "1bb3c8364d652dd08a15856ee27c6600ecd1e45360243154fa846f240ce7a1df",
+      "status": "offset_discovered"
+    },
+    "2.1.223": {
+      "wrapper_spec": "@anthropic-ai/claude-code@2.1.223",
+      "native_spec": "@anthropic-ai/claude-code-linux-arm64@2.1.223",
+      "entry_js_offset": 257987828,
+      "entry_end_offset": 281109040,
+      "tarball_integrity": "sha512-gh0n3fvUgzsrjeTqZraOhDKOzS7afB9U/qFvRY0FBpccogbJCk8otTYavPfdhAA2xESAoA0BaoVdzO4k4VkphA==",
+      "tarball_sha256": "29c49ec62bfbe995e5b1354a4c32d17101065d2c7722d5d0285cfa6a08d8c441",
       "status": "offset_discovered"
     }
   }

package/config/claude-termux-release-manifest.json

@@ -1,9 +1,9 @@
 {
   "manifest_version": 1,
   "package_name": "@bash0816/claude-code",
-  "latest_audited_version": "2.1.219",
-  "latest_candidate_version": "2.1.220",
-  "previous_stable_version": "2.1.218",
+  "latest_audited_version": "2.1.222",
+  "latest_candidate_version": "2.1.223",
+  "previous_stable_version": "2.1.220-2",
   "stable_pinned_version": "2.1.193",
   "manifest_url": "https://raw.githubusercontent.com/bash0816/ClaudeCode-Termux/main/config/claude-termux-release-manifest.json"
 }

package/lib/termux-run-claude-native.sh

@@ -79,6 +79,22 @@ const entryJsOffset = Number(process.env.ENTRY_JS_OFFSET);
 const entryEndOffset = Number(process.env.ENTRY_END_OFFSET);
 const argv = process.argv.slice(2);
 
+function isStreamJsonPrintMode(argv) {
+  const dashDashIndex = argv.indexOf('--');
+  const ownArgs = dashDashIndex === -1 ? argv : argv.slice(0, dashDashIndex);
+  const hasPrintFlag = ownArgs.includes('-p') || ownArgs.includes('--print');
+  let hasStreamJsonFormat = false;
+  for (let i = 0; i < ownArgs.length; i++) {
+    const tok = ownArgs[i];
+    if (tok === '--output-format=stream-json') { hasStreamJsonFormat = true; break; }
+    if (tok === '--output-format' && ownArgs[i + 1] === 'stream-json') {
+      hasStreamJsonFormat = true;
+      break;
+    }
+  }
+  return hasPrintFlag && hasStreamJsonFormat;
+}
+
 class RequestedExit extends Error {
   constructor(code) {
     super(`process.exit ${code}`);
@@ -583,6 +599,7 @@ function rewriteNativeChunkSource(source) {
   const _bunPropertyAccessExpected = (() => {
     const _ver = String(process.env.CURRENT_CLAUDE_VERSION || '');
     const _m = _ver.match(/^(\d+)\.(\d+)\.(\d+)/);
+    if (_m && (Number(_m[1]) > 2 || Number(_m[2]) > 1 || Number(_m[3]) >= 223)) return 43;
     if (_m && (Number(_m[1]) > 2 || Number(_m[2]) > 1 || Number(_m[3]) >= 219)) return 42;
     if (_m && (Number(_m[1]) > 2 || Number(_m[2]) > 1 || Number(_m[3]) >= 216)) return 40;
     if (_m && (Number(_m[1]) > 2 || Number(_m[2]) > 1 || Number(_m[3]) >= 214)) return 39;
@@ -611,6 +628,13 @@ function rewriteNativeChunkSource(source) {
     'npmInstallDeprecated flag',
     _npmInstallDeprecatedExpected,
   );
+  patched = replaceRequired(
+    patched,
+    /function ([A-Za-z_$][\w$]*)\(\)\{(return\([A-Za-z_$][\w$]*,[A-Za-z_$][\w$]*,[A-Za-z_$][\w$]*\)=>\{let\{cmd:([A-Za-z_$][\w$]*),prefixArgs:([A-Za-z_$][\w$]*)\}=[A-Za-z_$][\w$]*\(\{pinToCurrentBinary:!0\}\),[A-Za-z_$][\w$]*=\[\3,\.\.\.\4,"--bg-pty-host")/g,
+    'function $1(){return undefined;$2',
+    'bg-pty-host factory disable',
+    1,
+  );
   return patched;
 }
 
@@ -623,10 +647,12 @@ async function main() {
 
   const originalArgv = process.argv.slice();
   const originalExit = process.exit;
+  const originalKill = process.kill;
   const originalBun = process.versions.bun;
   const hadGlobalBun = Object.prototype.hasOwnProperty.call(globalThis, 'Bun');
   const originalGlobalBun = globalThis.Bun;
   const asyncErrors = [];
+  let streamJsonWatcher = null;
 
   globalThis.__claudeYaml = createYamlShim();
   if (!globalThis.__claudeBunShim || typeof globalThis.__claudeBunShim !== 'object') {
@@ -636,6 +662,100 @@ async function main() {
   function onAsyncError(error) {
     asyncErrors.push(error);
   }
+  const printWaitMs = Number(process.env.CLAUDE_TERMUX_PRINT_WAIT_MS || 5000);
+
+  function installStreamJsonTerminalWatcher() {
+    const hadOwnWrite = Object.prototype.hasOwnProperty.call(process.stdout, 'write');
+    const originalWriteDescriptor = hadOwnWrite ? Object.getOwnPropertyDescriptor(process.stdout, 'write') : undefined;
+    const originalWrite = process.stdout.write.bind(process.stdout);
+    const { StringDecoder } = require('string_decoder');
+    const decoder = new StringDecoder('utf8');
+    let lineBuffer = '';
+    let resultPromiseResolve = null;
+    let foundResult = false;
+    let restored = false;
+
+    process.stdout.write = function wrappedWrite(chunk, encoding, callback) {
+      let cb = callback;
+      let enc = encoding;
+      if (typeof encoding === 'function') {
+        cb = encoding;
+        enc = undefined;
+      }
+      const combinedCallback = (err) => {
+        if (!err && !foundResult) {
+          const chunkStr = typeof chunk === 'string'
+            ? decoder.write(Buffer.from(chunk, typeof enc === 'string' ? enc : 'utf8'))
+            : decoder.write(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+          lineBuffer += chunkStr;
+          const lines = lineBuffer.split('\n');
+          lineBuffer = lines[lines.length - 1];
+          for (let i = 0; i < lines.length - 1; i++) {
+            try {
+              const parsed = JSON.parse(lines[i]);
+              if (parsed && parsed.type === 'result') {
+                foundResult = true;
+                if (typeof resultPromiseResolve === 'function') resultPromiseResolve();
+              }
+            } catch {}
+          }
+        }
+        if (typeof cb === 'function') cb(err);
+      };
+      return originalWrite(chunk, enc, combinedCallback);
+    };
+
+    return {
+      waitForResult() {
+        if (foundResult) return Promise.resolve();
+        return new Promise((resolve, reject) => {
+          resultPromiseResolve = resolve;
+        });
+      },
+      restore() {
+        if (restored) return;
+        restored = true;
+        if (hadOwnWrite) {
+          Object.defineProperty(process.stdout, 'write', originalWriteDescriptor);
+        } else {
+          delete process.stdout.write;
+        }
+      },
+    };
+  }
+
+  function forceTimeoutExit(exitCode) {
+    try { if (streamJsonWatcher) streamJsonWatcher.restore(); } catch {}
+    if (extractedFile) {
+      try { fs.rmSync(extractedFile, { force: true }); } catch {}
+    }
+    originalExit(exitCode);
+  }
+
+  async function waitForPrintFlush() {
+    if (isStreamJsonPrintMode(argv) && streamJsonWatcher) {
+      let timedOut = false;
+      const rawResultTimeoutMs = Number(process.env.CLAUDE_TERMUX_PRINT_RESULT_TIMEOUT_MS);
+      const resultTimeoutMs = (Number.isFinite(rawResultTimeoutMs) && rawResultTimeoutMs > 0) ? rawResultTimeoutMs : 300000;
+      let timeoutHandle;
+      const timeoutPromise = new Promise(resolve => {
+        timeoutHandle = setTimeout(() => { timedOut = true; resolve(); }, resultTimeoutMs);
+      });
+      try {
+        await Promise.race([streamJsonWatcher.waitForResult(), timeoutPromise]);
+      } finally {
+        clearTimeout(timeoutHandle);
+      }
+      if (timedOut) {
+        forceTimeoutExit(1);
+        return;
+      }
+      return;
+    }
+    if (Number.isFinite(printWaitMs) && printWaitMs > 0) {
+      await new Promise(resolve => setTimeout(resolve, printWaitMs));
+    }
+  }
 
   try {
     process.once('uncaughtException', onAsyncError);
@@ -683,9 +803,47 @@ async function main() {
           gte: (a, b) => _cmp(a, b) >= 0,
           lt: (a, b) => _cmp(a, b) < 0,
           lte: (a, b) => _cmp(a, b) <= 0,
-          };
+        };
         })(),
         YAML: globalThis.__claudeYaml,
+        spawn: (cmd, options) => {
+          const opts = options || {};
+          const stdioArrayRaw = opts.stdio;
+          const cmdArray = Array.isArray(cmd) ? cmd : [cmd];
+          const normalizeStdio = (v) => {
+            if (typeof v === 'number' && Number.isInteger(v) && v >= 0) return v;
+            return (v === 'ignore' || v === 'pipe' || v === 'inherit') ? v : 'pipe';
+          };
+          const stdioMapped = Array.isArray(stdioArrayRaw)
+            ? stdioArrayRaw.map(normalizeStdio)
+            : [normalizeStdio(opts.stdin), normalizeStdio(opts.stdout), normalizeStdio(opts.stderr)];
+          const child = _realChild.spawn(cmdArray[0], cmdArray.slice(1), {
+            stdio: stdioMapped,
+            cwd: opts.cwd,
+            env: opts.env,
+            detached: !!opts.detached,
+            argv0: opts.argv0,
+          });
+          const stdoutChunks = [];
+          if (child.stdout) child.stdout.on('data', d => stdoutChunks.push(d));
+          let resolveExited;
+          const exited = new Promise(resolve => { resolveExited = resolve; });
+          child.on('exit', (code, signal) => resolveExited(code !== null ? code : (signal ? 128 : 0)));
+          child.on('error', () => resolveExited(1));
+          return {
+            pid: child.pid,
+            exited,
+            stdout: { text: async () => { await exited; return Buffer.concat(stdoutChunks).toString('utf8'); } },
+            unref: () => { try { child.unref(); } catch {} },
+            kill: (signal) => { try { child.kill(signal); } catch {} },
+          };
+        },
+        file: (path) => {
+          const err = new Error(`ENOENT: Bun.file(${String(path)}) is not supported by the Termux compatibility shim`);
+          err.code = 'ENOENT';
+          err.errno = -2;
+          throw err;
+        },
     };
     Object.assign(globalThis.__claudeBunShim, globalThis.Bun);
     if (typeof globalThis.__claudeBunShim.gc !== 'function') {
@@ -694,21 +852,31 @@ async function main() {
     globalThis.__claudeBun = globalThis.__claudeBunShim;
     globalThis.Bun = globalThis.__claudeBunShim;
     process.argv = ['node', extractedFile, ...argv];
+    let lastExitAttemptCode = 0;
     process.exit = code => {
-      throw new RequestedExit(code);
+      lastExitAttemptCode = code ?? 0;
+      throw new RequestedExit(lastExitAttemptCode);
+    };
+    process.kill = (pid, signal) => {
+      if (pid === process.pid && (signal === 'SIGKILL' || signal === 9)) {
+        throw new RequestedExit(lastExitAttemptCode);
+      }
+      return originalKill.call(process, pid, signal);
     };
 
-    const printWaitMs = Number(process.env.CLAUDE_TERMUX_PRINT_WAIT_MS || 5000);
+    if (isStreamJsonPrintMode(argv)) {
+      streamJsonWatcher = installStreamJsonTerminalWatcher();
+    }
+
     const moduleLike = { exports: {} };
     const maybePromise = fn(moduleLike.exports, fakeRequire, moduleLike, extractedFile, workdir);
     if (maybePromise && typeof maybePromise.then === 'function') await maybePromise;
-    if (Number.isFinite(printWaitMs) && printWaitMs > 0) {
-      await new Promise(resolve => setTimeout(resolve, printWaitMs));
-    }
+    await waitForPrintFlush();
     if (asyncErrors.length > 0) throw asyncErrors[0];
   } catch (error) {
     if (error instanceof RequestedExit) {
       process.exitCode = error.code;
+      await waitForPrintFlush();
       return;
     }
     throw error;
@@ -722,6 +890,10 @@ async function main() {
     }
     process.argv = originalArgv;
     process.exit = originalExit;
+    process.kill = originalKill;
+    if (streamJsonWatcher) {
+      try { streamJsonWatcher.restore(); } catch {}
+    }
     try {
       if (originalBun === undefined) {
         delete process.versions.bun;
@@ -758,6 +930,7 @@ else
   _bootstrap=$(mktemp "${TERMUX_TMPDIR}/claude-bootstrap.XXXXXX.js")
   trap 'rm -f "$_bootstrap"' EXIT HUP INT TERM
   export CLAUDE_TERMUX_TUI="${_tui}"
+  export CLAUDE_TERMUX_PRINT_MODE="${_pf}"
   cat <<'NODE' > "$_bootstrap"
 const fs = require('fs');
 const path = require('path');
@@ -772,6 +945,22 @@ const entryJsOffset = Number(process.env.ENTRY_JS_OFFSET);
 const entryEndOffset = Number(process.env.ENTRY_END_OFFSET);
 const argv = process.argv.slice(2);
 
+function isStreamJsonPrintMode(argv) {
+  const dashDashIndex = argv.indexOf('--');
+  const ownArgs = dashDashIndex === -1 ? argv : argv.slice(0, dashDashIndex);
+  const hasPrintFlag = ownArgs.includes('-p') || ownArgs.includes('--print');
+  let hasStreamJsonFormat = false;
+  for (let i = 0; i < ownArgs.length; i++) {
+    const tok = ownArgs[i];
+    if (tok === '--output-format=stream-json') { hasStreamJsonFormat = true; break; }
+    if (tok === '--output-format' && ownArgs[i + 1] === 'stream-json') {
+      hasStreamJsonFormat = true;
+      break;
+    }
+  }
+  return hasPrintFlag && hasStreamJsonFormat;
+}
+
 class RequestedExit extends Error {
   constructor(code) {
     super(`process.exit ${code}`);
@@ -1276,6 +1465,7 @@ function rewriteNativeChunkSource(source) {
   const _bunPropertyAccessExpected = (() => {
     const _ver = String(process.env.CURRENT_CLAUDE_VERSION || '');
     const _m = _ver.match(/^(\d+)\.(\d+)\.(\d+)/);
+    if (_m && (Number(_m[1]) > 2 || Number(_m[2]) > 1 || Number(_m[3]) >= 223)) return 43;
     if (_m && (Number(_m[1]) > 2 || Number(_m[2]) > 1 || Number(_m[3]) >= 219)) return 42;
     if (_m && (Number(_m[1]) > 2 || Number(_m[2]) > 1 || Number(_m[3]) >= 216)) return 40;
     if (_m && (Number(_m[1]) > 2 || Number(_m[2]) > 1 || Number(_m[3]) >= 214)) return 39;
@@ -1304,6 +1494,13 @@ function rewriteNativeChunkSource(source) {
     'npmInstallDeprecated flag',
     _npmInstallDeprecatedExpected,
   );
+  patched = replaceRequired(
+    patched,
+    /function ([A-Za-z_$][\w$]*)\(\)\{(return\([A-Za-z_$][\w$]*,[A-Za-z_$][\w$]*,[A-Za-z_$][\w$]*\)=>\{let\{cmd:([A-Za-z_$][\w$]*),prefixArgs:([A-Za-z_$][\w$]*)\}=[A-Za-z_$][\w$]*\(\{pinToCurrentBinary:!0\}\),[A-Za-z_$][\w$]*=\[\3,\.\.\.\4,"--bg-pty-host")/g,
+    'function $1(){return undefined;$2',
+    'bg-pty-host factory disable',
+    1,
+  );
   return patched;
 }
 
@@ -1316,10 +1513,12 @@ async function main() {
 
   const originalArgv = process.argv.slice();
   const originalExit = process.exit;
+  const originalKill = process.kill;
   const originalBun = process.versions.bun;
   const hadGlobalBun = Object.prototype.hasOwnProperty.call(globalThis, 'Bun');
   const originalGlobalBun = globalThis.Bun;
   const asyncErrors = [];
+  let streamJsonWatcher = null;
 
   globalThis.__claudeYaml = createYamlShim();
   if (!globalThis.__claudeBunShim || typeof globalThis.__claudeBunShim !== 'object') {
@@ -1330,6 +1529,101 @@ async function main() {
     asyncErrors.push(error);
   }
 
+  function installStreamJsonTerminalWatcher() {
+    const hadOwnWrite = Object.prototype.hasOwnProperty.call(process.stdout, 'write');
+    const originalWriteDescriptor = hadOwnWrite ? Object.getOwnPropertyDescriptor(process.stdout, 'write') : undefined;
+    const originalWrite = process.stdout.write.bind(process.stdout);
+    const { StringDecoder } = require('string_decoder');
+    const decoder = new StringDecoder('utf8');
+    let lineBuffer = '';
+    let resultPromiseResolve = null;
+    let foundResult = false;
+    let restored = false;
+
+    process.stdout.write = function wrappedWrite(chunk, encoding, callback) {
+      let cb = callback;
+      let enc = encoding;
+      if (typeof encoding === 'function') {
+        cb = encoding;
+        enc = undefined;
+      }
+      const combinedCallback = (err) => {
+        if (!err && !foundResult) {
+          const chunkStr = typeof chunk === 'string'
+            ? decoder.write(Buffer.from(chunk, typeof enc === 'string' ? enc : 'utf8'))
+            : decoder.write(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+          lineBuffer += chunkStr;
+          const lines = lineBuffer.split('\n');
+          lineBuffer = lines[lines.length - 1];
+          for (let i = 0; i < lines.length - 1; i++) {
+            try {
+              const parsed = JSON.parse(lines[i]);
+              if (parsed && parsed.type === 'result') {
+                foundResult = true;
+                if (typeof resultPromiseResolve === 'function') resultPromiseResolve();
+              }
+            } catch {}
+          }
+        }
+        if (typeof cb === 'function') cb(err);
+      };
+      return originalWrite(chunk, enc, combinedCallback);
+    };
+
+    return {
+      waitForResult() {
+        if (foundResult) return Promise.resolve();
+        return new Promise((resolve, reject) => {
+          resultPromiseResolve = resolve;
+        });
+      },
+      restore() {
+        if (restored) return;
+        restored = true;
+        if (hadOwnWrite) {
+          Object.defineProperty(process.stdout, 'write', originalWriteDescriptor);
+        } else {
+          delete process.stdout.write;
+        }
+      },
+    };
+  }
+
+  function forceTimeoutExit(exitCode) {
+    try { if (streamJsonWatcher) streamJsonWatcher.restore(); } catch {}
+    if (extractedFile) {
+      try { fs.rmSync(extractedFile, { force: true }); } catch {}
+    }
+    originalExit(exitCode);
+  }
+
+  async function waitForPrintFlushIfNeeded() {
+    if (process.env.CLAUDE_TERMUX_PRINT_MODE !== '1') return;
+    if (isStreamJsonPrintMode(argv) && streamJsonWatcher) {
+      let timedOut = false;
+      const rawResultTimeoutMs = Number(process.env.CLAUDE_TERMUX_PRINT_RESULT_TIMEOUT_MS);
+      const resultTimeoutMs = (Number.isFinite(rawResultTimeoutMs) && rawResultTimeoutMs > 0) ? rawResultTimeoutMs : 300000;
+      let timeoutHandle;
+      const timeoutPromise = new Promise(resolve => {
+        timeoutHandle = setTimeout(() => { timedOut = true; resolve(); }, resultTimeoutMs);
+      });
+      try {
+        await Promise.race([streamJsonWatcher.waitForResult(), timeoutPromise]);
+      } finally {
+        clearTimeout(timeoutHandle);
+      }
+      if (timedOut) {
+        forceTimeoutExit(1);
+        return;
+      }
+      return;
+    }
+    const printWaitMs = Number(process.env.CLAUDE_TERMUX_PRINT_WAIT_MS || 5000);
+    if (Number.isFinite(printWaitMs) && printWaitMs > 0) {
+      await new Promise(resolve => setTimeout(resolve, printWaitMs));
+    }
+  }
+
   try {
     process.once('uncaughtException', onAsyncError);
     process.once('unhandledRejection', onAsyncError);
@@ -1379,6 +1673,44 @@ async function main() {
         };
         })(),
         YAML: globalThis.__claudeYaml,
+        spawn: (cmd, options) => {
+          const opts = options || {};
+          const stdioArrayRaw = opts.stdio;
+          const cmdArray = Array.isArray(cmd) ? cmd : [cmd];
+          const normalizeStdio = (v) => {
+            if (typeof v === 'number' && Number.isInteger(v) && v >= 0) return v;
+            return (v === 'ignore' || v === 'pipe' || v === 'inherit') ? v : 'pipe';
+          };
+          const stdioMapped = Array.isArray(stdioArrayRaw)
+            ? stdioArrayRaw.map(normalizeStdio)
+            : [normalizeStdio(opts.stdin), normalizeStdio(opts.stdout), normalizeStdio(opts.stderr)];
+          const child = _realChild.spawn(cmdArray[0], cmdArray.slice(1), {
+            stdio: stdioMapped,
+            cwd: opts.cwd,
+            env: opts.env,
+            detached: !!opts.detached,
+            argv0: opts.argv0,
+          });
+          const stdoutChunks = [];
+          if (child.stdout) child.stdout.on('data', d => stdoutChunks.push(d));
+          let resolveExited;
+          const exited = new Promise(resolve => { resolveExited = resolve; });
+          child.on('exit', (code, signal) => resolveExited(code !== null ? code : (signal ? 128 : 0)));
+          child.on('error', () => resolveExited(1));
+          return {
+            pid: child.pid,
+            exited,
+            stdout: { text: async () => { await exited; return Buffer.concat(stdoutChunks).toString('utf8'); } },
+            unref: () => { try { child.unref(); } catch {} },
+            kill: (signal) => { try { child.kill(signal); } catch {} },
+          };
+        },
+        file: (path) => {
+          const err = new Error(`ENOENT: Bun.file(${String(path)}) is not supported by the Termux compatibility shim`);
+          err.code = 'ENOENT';
+          err.errno = -2;
+          throw err;
+        },
     };
     Object.assign(globalThis.__claudeBunShim, globalThis.Bun);
     if (typeof globalThis.__claudeBunShim.gc !== 'function') {
@@ -1387,17 +1719,31 @@ async function main() {
     globalThis.__claudeBun = globalThis.__claudeBunShim;
     globalThis.Bun = globalThis.__claudeBunShim;
     process.argv = ['node', extractedFile, ...argv];
+    let lastExitAttemptCode = 0;
     process.exit = code => {
-      throw new RequestedExit(code);
+      lastExitAttemptCode = code ?? 0;
+      throw new RequestedExit(lastExitAttemptCode);
+    };
+    process.kill = (pid, signal) => {
+      if (pid === process.pid && (signal === 'SIGKILL' || signal === 9)) {
+        throw new RequestedExit(lastExitAttemptCode);
+      }
+      return originalKill.call(process, pid, signal);
     };
 
+    if (isStreamJsonPrintMode(argv)) {
+      streamJsonWatcher = installStreamJsonTerminalWatcher();
+    }
+
     const moduleLike = { exports: {} };
     const maybePromise = fn(moduleLike.exports, fakeRequire, moduleLike, extractedFile, workdir);
     if (maybePromise && typeof maybePromise.then === 'function') await maybePromise;
+    await waitForPrintFlushIfNeeded();
     if (asyncErrors.length > 0) throw asyncErrors[0];
   } catch (error) {
     if (error instanceof RequestedExit) {
       process.exitCode = error.code;
+      await waitForPrintFlushIfNeeded();
       return;
     }
     throw error;
@@ -1406,6 +1752,10 @@ async function main() {
     process.removeListener('unhandledRejection', onAsyncError);
     process.argv = originalArgv;
     process.exit = originalExit;
+    process.kill = originalKill;
+    if (streamJsonWatcher) {
+      try { streamJsonWatcher.restore(); } catch {}
+    }
     process.once('exit', () => {
       if (extractedFile) {
         try {