@bash0816/claude-code 2.1.241 → 2.1.248

package/lib/native-validators.js

@@ -0,0 +1,90 @@
+'use strict';
+
+const crypto = require('crypto');
+const fs = require('fs');
+const path = require('path');
+
+const packageDir = path.resolve(__dirname, '..');
+
+function verifyTarball(file, audited, version) {
+  const buf = fs.readFileSync(file);
+  if (audited.tarball_sha256) {
+    const sha256 = crypto.createHash('sha256').update(buf).digest('hex');
+    if (sha256 !== audited.tarball_sha256) {
+      throw new Error(`tarball sha256 mismatch for ${version}`);
+    }
+  }
+  if (audited.tarball_integrity) {
+    const sha512 = `sha512-${crypto.createHash('sha512').update(buf).digest('base64')}`;
+    if (sha512 !== audited.tarball_integrity) {
+      throw new Error(`tarball integrity mismatch for ${version}`);
+    }
+  }
+  if (audited.tarball_size !== undefined && Number(audited.tarball_size) !== buf.length) {
+    throw new Error(`tarball size mismatch for ${version}`);
+  }
+}
+
+function validateOffsets(file, audited, version) {
+  if (audited.entry_format === 'esm-chunked') {
+    validateEsmChunkedOffsets(file, audited, version);
+    return;
+  }
+  validateLegacyCjsOffsets(file, audited, version);
+}
+
+function validateLegacyCjsOffsets(file, audited, version) {
+  const buf = fs.readFileSync(file);
+  const start = Number(audited.entry_js_offset);
+  const end = Number(audited.entry_end_offset);
+  const startMarker = Buffer.from('function(exports, require, module, __filename, __dirname) {// Claude Code is a Beta product');
+  const endMarker = Buffer.from('/$bunfs/root/image-processor.js');
+
+  if (!(start > 0 && end > start && end <= buf.length)) {
+    throw new Error(`invalid audited offsets for ${version}`);
+  }
+  if (!buf.subarray(start, start + startMarker.length).equals(startMarker)) {
+    throw new Error(`audited start offset validation failed for ${version}`);
+  }
+  if (!buf.subarray(end, end + endMarker.length).equals(endMarker)) {
+    throw new Error(`audited end offset validation failed for ${version}`);
+  }
+}
+
+function validateEsmChunkedOffsets(file, audited, version) {
+  // 371MB超のバイナリ全体をreadFileSyncしない(実機でOOM確認済み)。
+  // discoverModuleGraphは範囲readSyncのみでトレイラー・モジュールテーブルを検証する。
+  const { discoverModuleGraph, readEntryContentPrefix } = require(path.join(packageDir, 'lib', 'bunfs-extract.js'));
+  const graph = discoverModuleGraph(file);
+  try {
+    if (!(graph.numModules > 0)) {
+      throw new Error(`esm-chunked module graph is empty for ${version}`);
+    }
+    if (graph.entryName !== '/$bunfs/root/cli') {
+      throw new Error(`esm-chunked entry module name mismatch for ${version}: ${graph.entryName}`);
+    }
+    if (!Object.prototype.hasOwnProperty.call(audited, 'cycle_hoists')) {
+      throw new Error(`esm-chunked audited metadata for ${version} is missing cycle_hoists field`);
+    }
+    if (audited.num_modules !== undefined && graph.numModules !== audited.num_modules) {
+      throw new Error(`esm-chunked num_modules mismatch for ${version}: expected ${audited.num_modules}, got ${graph.numModules}`);
+    }
+    if (audited.byte_count !== undefined && graph.byteCount !== audited.byte_count) {
+      throw new Error(`esm-chunked byte_count mismatch for ${version}: expected ${audited.byte_count}, got ${graph.byteCount}`);
+    }
+    const prefix = readEntryContentPrefix(graph.fd, graph.entryModule, 256).toString('utf8');
+    const codeStart = prefix.replace(/^(\s*\/\/[^\n]*\n)+/, '').replace(/^\(/, '');
+    if (codeStart.startsWith('function(exports, require, module, __filename, __dirname) {')) {
+      throw new Error(`entry module for ${version} is legacy-cjs wrapped, but audited entry_format is esm-chunked`);
+    }
+  } finally {
+    fs.closeSync(graph.fd);
+  }
+}
+
+module.exports = {
+  validateEsmChunkedOffsets,
+  validateLegacyCjsOffsets,
+  validateOffsets,
+  verifyTarball,
+};

package/lib/native-validators.test.js

@@ -0,0 +1,160 @@
+'use strict';
+
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
+
+const {
+  validateEsmChunkedOffsets,
+} = require('./native-validators.js');
+
+const {
+  discoverModuleGraph,
+} = require('./bunfs-extract.js');
+
+const TRAILER = '\n---- Bun! ----\n';
+
+// StandaloneModuleGraphの最小合成バイナリを構築する。
+// レイアウト: [preamble padding][module contents][module table][Offsets(32byte)][trailer]
+function buildSyntheticBinary({ modules, entryPointId, corruptTrailer = false, preamblePadding = 64 }) {
+  const nameBuffers = modules.map((m) => Buffer.from(m.name, 'utf8'));
+  const contentBuffers = modules.map((m) => Buffer.from(m.content ?? '', 'utf8'));
+
+  const dataParts = [];
+  const nameOffsets = [];
+  const contOffsets = [];
+  let cursor = 0;
+  for (let i = 0; i < modules.length; i += 1) {
+    nameOffsets.push(cursor);
+    dataParts.push(nameBuffers[i]);
+    cursor += nameBuffers[i].length;
+  }
+  for (let i = 0; i < modules.length; i += 1) {
+    contOffsets.push(cursor);
+    dataParts.push(contentBuffers[i]);
+    cursor += contentBuffers[i].length;
+  }
+  const byteCountBeforeTable = cursor;
+
+  const MODULE_TABLE_ENTRY_SIZE = 52;
+  const modTable = Buffer.alloc(MODULE_TABLE_ENTRY_SIZE * modules.length);
+  for (let i = 0; i < modules.length; i += 1) {
+    const base = i * MODULE_TABLE_ENTRY_SIZE;
+    modTable.writeUInt32LE(nameOffsets[i], base);
+    modTable.writeUInt32LE(nameBuffers[i].length, base + 4);
+    modTable.writeUInt32LE(contOffsets[i], base + 8);
+    modTable.writeUInt32LE(contentBuffers[i].length, base + 12);
+    modTable[base + 49] = modules[i].loader ?? 1; // 1 = js
+  }
+  const modulesOffset = byteCountBeforeTable;
+  const modulesLength = modTable.length;
+  const byteCount = byteCountBeforeTable + modulesLength;
+
+  const offsetsBuf = Buffer.alloc(32);
+  offsetsBuf.writeBigUInt64LE(BigInt(byteCount), 0);
+  offsetsBuf.writeUInt32LE(modulesOffset, 8);
+  offsetsBuf.writeUInt32LE(modulesLength, 12);
+  offsetsBuf.writeUInt32LE(entryPointId, 16);
+
+  const trailerBuf = Buffer.from(corruptTrailer ? '\n---- NOT BUN ----\n' : TRAILER, 'utf8');
+
+  return Buffer.concat([
+    Buffer.alloc(preamblePadding),
+    ...dataParts,
+    modTable,
+    offsetsBuf,
+    trailerBuf,
+  ]);
+}
+
+function writeTempBinary(buf) {
+  const file = path.join(os.tmpdir(), `native-validators-test-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}.bin`);
+  fs.writeFileSync(file, buf);
+  return file;
+}
+
+test('validateEsmChunkedOffsets accepts matching num_modules and byte_count', () => {
+  const buf = buildSyntheticBinary({
+    modules: [
+      { name: '/$bunfs/root/cli', content: 'export default 1;' },
+    ],
+    entryPointId: 0,
+  });
+  const file = writeTempBinary(buf);
+  try {
+    const graph = discoverModuleGraph(file);
+    try {
+      const audited = {
+        num_modules: graph.numModules,
+        byte_count: graph.byteCount,
+        entry_format: 'esm-chunked',
+        cycle_hoists: [],
+      };
+      assert.doesNotThrow(() => validateEsmChunkedOffsets(file, audited, '9.9.9'));
+    } finally {
+      fs.closeSync(graph.fd);
+    }
+  } finally {
+    fs.rmSync(file, { force: true });
+  }
+});
+
+test('validateEsmChunkedOffsets rejects mismatched num_modules', () => {
+  const buf = buildSyntheticBinary({
+    modules: [
+      { name: '/$bunfs/root/cli', content: 'export default 1;' },
+    ],
+    entryPointId: 0,
+  });
+  const file = writeTempBinary(buf);
+  try {
+    const graph = discoverModuleGraph(file);
+    try {
+      const audited = {
+        num_modules: graph.numModules + 1, // intentionally wrong
+        byte_count: graph.byteCount,
+        entry_format: 'esm-chunked',
+        cycle_hoists: [],
+      };
+      assert.throws(
+        () => validateEsmChunkedOffsets(file, audited, '9.9.9'),
+        /num_modules mismatch/,
+      );
+    } finally {
+      fs.closeSync(graph.fd);
+    }
+  } finally {
+    fs.rmSync(file, { force: true });
+  }
+});
+
+test('validateEsmChunkedOffsets rejects mismatched byte_count', () => {
+  const buf = buildSyntheticBinary({
+    modules: [
+      { name: '/$bunfs/root/cli', content: 'export default 1;' },
+    ],
+    entryPointId: 0,
+  });
+  const file = writeTempBinary(buf);
+  try {
+    const graph = discoverModuleGraph(file);
+    try {
+      const audited = {
+        num_modules: graph.numModules,
+        byte_count: graph.byteCount + 1, // intentionally wrong
+        entry_format: 'esm-chunked',
+        cycle_hoists: [],
+      };
+      assert.throws(
+        () => validateEsmChunkedOffsets(file, audited, '9.9.9'),
+        /byte_count mismatch/,
+      );
+    } finally {
+      fs.closeSync(graph.fd);
+    }
+  } finally {
+    fs.rmSync(file, { force: true });
+  }
+});

package/lib/prepare-native.js

@@ -2,7 +2,6 @@
 'use strict';
 
 const cp = require('child_process');
-const crypto = require('crypto');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
@@ -16,6 +15,8 @@ const curlRetries = process.env.CLAUDE_TERMUX_FETCH_RETRIES || '4';
 const curlConnectTimeout = process.env.CLAUDE_TERMUX_FETCH_CONNECT_TIMEOUT || '20';
 const curlMaxTime = process.env.CLAUDE_TERMUX_FETCH_MAX_TIME || '300';
 
+const { validateOffsets, verifyTarball } = require(path.join(packageDir, 'lib', 'native-validators.js'));
+
 if (!item) {
   console.error(`Unsupported audited Claude Code version: ${version}`);
   process.exit(1);
@@ -27,7 +28,7 @@ const nativeDest = path.join(versionDir, 'app', 'node_modules', '@anthropic-ai',
 const sourceBin = path.join(nativeDest, 'claude');
 
 if (fs.existsSync(sourceBin)) {
-  validateOffsets(sourceBin, item);
+  validateOffsets(sourceBin, item, version);
   process.exit(0);
 }
 
@@ -36,7 +37,7 @@ const packDir = fs.mkdtempSync(path.join(os.tmpdir(), `claude-code-${version}-`)
 
 try {
   const tgzPath = fetchNativeTarball(item.native_spec, packDir);
-  verifyTarball(tgzPath, item);
+  verifyTarball(tgzPath, item, version);
 
   const extractDir = path.join(packDir, 'native');
   fs.mkdirSync(extractDir, { recursive: true });
@@ -45,7 +46,7 @@ try {
   fs.rmSync(nativeDest, { recursive: true, force: true });
   fs.mkdirSync(path.dirname(nativeDest), { recursive: true });
   fs.cpSync(path.join(extractDir, 'package'), nativeDest, { recursive: true });
-  validateOffsets(sourceBin, item);
+  validateOffsets(sourceBin, item, version);
 } finally {
   fs.rmSync(packDir, { recursive: true, force: true });
 }
@@ -107,40 +108,3 @@ function fetchNativeTarball(spec, packDir) {
   }
   return path.join(packDir, packEntry.filename);
 }
-
-function verifyTarball(file, audited) {
-  const buf = fs.readFileSync(file);
-  if (audited.tarball_sha256) {
-    const sha256 = crypto.createHash('sha256').update(buf).digest('hex');
-    if (sha256 !== audited.tarball_sha256) {
-      throw new Error(`tarball sha256 mismatch for ${version}`);
-    }
-  }
-  if (audited.tarball_integrity) {
-    const sha512 = `sha512-${crypto.createHash('sha512').update(buf).digest('base64')}`;
-    if (sha512 !== audited.tarball_integrity) {
-      throw new Error(`tarball integrity mismatch for ${version}`);
-    }
-  }
-  if (audited.tarball_size !== undefined && Number(audited.tarball_size) !== buf.length) {
-    throw new Error(`tarball size mismatch for ${version}`);
-  }
-}
-
-function validateOffsets(file, audited) {
-  const buf = fs.readFileSync(file);
-  const start = Number(audited.entry_js_offset);
-  const end = Number(audited.entry_end_offset);
-  const startMarker = Buffer.from('function(exports, require, module, __filename, __dirname) {// Claude Code is a Beta product');
-  const endMarker = Buffer.from('/$bunfs/root/image-processor.js');
-
-  if (!(start > 0 && end > start && end <= buf.length)) {
-    throw new Error(`invalid audited offsets for ${version}`);
-  }
-  if (!buf.subarray(start, start + startMarker.length).equals(startMarker)) {
-    throw new Error(`audited start offset validation failed for ${version}`);
-  }
-  if (!buf.subarray(end, end + endMarker.length).equals(endMarker)) {
-    throw new Error(`audited end offset validation failed for ${version}`);
-  }
-}

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

@@ -3,8 +3,14 @@ set -eu
 
 SOURCE_BIN="${SOURCE_BIN:?SOURCE_BIN is required}"
 WORKDIR="${WORKDIR:-${HOME}/.claude-termux-native-package/launcher-workdir}"
-ENTRY_JS_OFFSET="${ENTRY_JS_OFFSET:?ENTRY_JS_OFFSET is required}"
-ENTRY_END_OFFSET="${ENTRY_END_OFFSET:?ENTRY_END_OFFSET is required}"
+ENTRY_FORMAT="${ENTRY_FORMAT:-legacy-cjs}"
+if [ "${ENTRY_FORMAT}" = "esm-chunked" ]; then
+  ENTRY_JS_OFFSET="${ENTRY_JS_OFFSET:-0}"
+  ENTRY_END_OFFSET="${ENTRY_END_OFFSET:-0}"
+else
+  ENTRY_JS_OFFSET="${ENTRY_JS_OFFSET:?ENTRY_JS_OFFSET is required}"
+  ENTRY_END_OFFSET="${ENTRY_END_OFFSET:?ENTRY_END_OFFSET is required}"
+fi
 CURRENT_CLAUDE_VERSION="${CURRENT_CLAUDE_VERSION:?CURRENT_CLAUDE_VERSION is required}"
 CLAUDE_TERMUX_PACKAGE_DIR="${CLAUDE_TERMUX_PACKAGE_DIR:?CLAUDE_TERMUX_PACKAGE_DIR is required}"
 TERMUX_TMPDIR="${TMPDIR:-/data/data/com.termux/files/usr/tmp}"
@@ -45,6 +51,7 @@ export SSL_CERT_FILE
 export DISABLE_AUTOUPDATER
 export SOURCE_BIN
 export WORKDIR
+export ENTRY_FORMAT
 export ENTRY_JS_OFFSET
 export ENTRY_END_OFFSET
 export CURRENT_CLAUDE_VERSION
@@ -656,7 +663,71 @@ function rewriteNativeChunkSource(source) {
   return patched;
 }
 
-async function main() {
+async function esmChunkedMain() {
+  const { prepareProcessOwnedDir } = require(path.join(process.env.CLAUDE_TERMUX_PACKAGE_DIR, 'lib', 'bunfs-extract.js'));
+  const { registerHooks } = require('node:module');
+  const { pathToFileURL } = require('node:url');
+
+  const { ownedDir, entryRelPath } = prepareProcessOwnedDir(sourceBin, workdir);
+  const libDir = path.join(process.env.CLAUDE_TERMUX_PACKAGE_DIR, 'lib');
+
+  globalThis.__claudeYaml = createYamlShim();
+  globalThis.Bun = {
+    version: '1.1.8',
+    stringWidth,
+    wrapAnsi,
+    stripANSI,
+    hash: stableHash,
+    which: (cmd) => {
+      try {
+        return require('child_process').execFileSync('which', [String(cmd)], { encoding: 'utf8' }).trim() || null;
+      } catch { return null; }
+    },
+    gc: () => {},
+    YAML: globalThis.__claudeYaml,
+  };
+  Object.defineProperty(process.versions, 'bun', { value: '1.1.8', configurable: true });
+  globalThis.__claudeBunShim = globalThis.Bun;
+  globalThis.__claudeBun = globalThis.Bun;
+
+  let cycleHoists = [];
+  try {
+    const auditedVersions = require(path.join(process.env.CLAUDE_TERMUX_PACKAGE_DIR, 'config', 'claude-native-audited-versions.json'));
+    const entry = auditedVersions.versions?.[process.env.CURRENT_CLAUDE_VERSION];
+    if (entry && Array.isArray(entry.cycle_hoists)) {
+      cycleHoists = entry.cycle_hoists;
+    }
+  } catch {
+    // 読み込み失敗時は空配列のまま(fail-closed、既存の同期require経路にフォールバック)
+  }
+
+  const loaderMod = require(path.join(libDir, 'bunfs-esm-loader.mjs'));
+  loaderMod.initialize({
+    processOwnedDir: ownedDir,
+    sourceBin,
+    childProcessGuardPath: path.join(libDir, 'bunfs-child-process-guard.mjs'),
+    vmGuardPath: path.join(libDir, 'bunfs-vm-guard.mjs'),
+    wsStubPath: path.join(libDir, 'bunfs-ws-stub.mjs'),
+    cycleHoists,
+  });
+  registerHooks({ resolve: loaderMod.resolve, load: loaderMod.load });
+
+  const entryUrl = pathToFileURL(path.join(ownedDir, entryRelPath)).href;
+
+  // 2.1.245実チャンクのエントリは、内部のmain相当処理をトップレベルでawaitせず
+  // fire-and-forgetで起動する(Bunランタイム前提の実装)。そのためawait import()は
+  // 内部の非同期処理が完了する前に解決してしまい、legacy-cjs経路のような
+  // process.exitパッチ+ここでの強制exit呼び出しを行うと、まだ実行中の内部処理を
+  // 強制終了させ出力が失われる(実機で確認済み)。process.exit/killは一切パッチせず、
+  // 実際のCLIコードが自ら呼ぶprocess.exit()に任せてNodeの自然なイベントループ終了を
+  // 待つ(この関数はawait import()完了後、何もせずreturnするだけでよい)。
+  // 同じ理由で、ここでglobalThis.Bun/__claudeYamlを削除するcleanupも行わない
+  // (fire-and-forgetの内部処理がimport()解決後も継続してBunを参照するため、
+  // 早期に消すと実機で"Bun is not defined"を引き起こす。プロセス終了まで残す)。
+  await import(entryUrl);
+}
+
+async function legacyCjsMain() {
   let extractedFile;
   extractedFile = ensureEntryFile();
   const code = fs.readFileSync(extractedFile, 'utf8');
@@ -1000,6 +1071,10 @@ async function main() {
   }
 }
 
+function main() {
+  return process.env.ENTRY_FORMAT === 'esm-chunked' ? esmChunkedMain() : legacyCjsMain();
+}
+
 main().catch(error => {
   if (error && error.code === 'CLAUDE_TERMUX_OFFICIAL_UPDATE_BLOCKED') {
     console.error(BLOCK_MESSAGE);
@@ -1613,7 +1688,71 @@ function rewriteNativeChunkSource(source) {
   return patched;
 }
 
-async function main() {
+async function esmChunkedMain() {
+  const { prepareProcessOwnedDir } = require(path.join(process.env.CLAUDE_TERMUX_PACKAGE_DIR, 'lib', 'bunfs-extract.js'));
+  const { registerHooks } = require('node:module');
+  const { pathToFileURL } = require('node:url');
+
+  const { ownedDir, entryRelPath } = prepareProcessOwnedDir(sourceBin, workdir);
+  const libDir = path.join(process.env.CLAUDE_TERMUX_PACKAGE_DIR, 'lib');
+
+  globalThis.__claudeYaml = createYamlShim();
+  globalThis.Bun = {
+    version: '1.1.8',
+    stringWidth,
+    wrapAnsi,
+    stripANSI,
+    hash: stableHash,
+    which: (cmd) => {
+      try {
+        return require('child_process').execFileSync('which', [String(cmd)], { encoding: 'utf8' }).trim() || null;
+      } catch { return null; }
+    },
+    gc: () => {},
+    YAML: globalThis.__claudeYaml,
+  };
+  Object.defineProperty(process.versions, 'bun', { value: '1.1.8', configurable: true });
+  globalThis.__claudeBunShim = globalThis.Bun;
+  globalThis.__claudeBun = globalThis.Bun;
+
+  let cycleHoists = [];
+  try {
+    const auditedVersions = require(path.join(process.env.CLAUDE_TERMUX_PACKAGE_DIR, 'config', 'claude-native-audited-versions.json'));
+    const entry = auditedVersions.versions?.[process.env.CURRENT_CLAUDE_VERSION];
+    if (entry && Array.isArray(entry.cycle_hoists)) {
+      cycleHoists = entry.cycle_hoists;
+    }
+  } catch {
+    // 読み込み失敗時は空配列のまま(fail-closed、既存の同期require経路にフォールバック)
+  }
+
+  const loaderMod = require(path.join(libDir, 'bunfs-esm-loader.mjs'));
+  loaderMod.initialize({
+    processOwnedDir: ownedDir,
+    sourceBin,
+    childProcessGuardPath: path.join(libDir, 'bunfs-child-process-guard.mjs'),
+    vmGuardPath: path.join(libDir, 'bunfs-vm-guard.mjs'),
+    wsStubPath: path.join(libDir, 'bunfs-ws-stub.mjs'),
+    cycleHoists,
+  });
+  registerHooks({ resolve: loaderMod.resolve, load: loaderMod.load });
+
+  const entryUrl = pathToFileURL(path.join(ownedDir, entryRelPath)).href;
+
+  // 2.1.245実チャンクのエントリは、内部のmain相当処理をトップレベルでawaitせず
+  // fire-and-forgetで起動する(Bunランタイム前提の実装)。そのためawait import()は
+  // 内部の非同期処理が完了する前に解決してしまい、legacy-cjs経路のような
+  // process.exitパッチ+ここでの強制exit呼び出しを行うと、まだ実行中の内部処理を
+  // 強制終了させ出力が失われる(実機で確認済み)。process.exit/killは一切パッチせず、
+  // 実際のCLIコードが自ら呼ぶprocess.exit()に任せてNodeの自然なイベントループ終了を
+  // 待つ(この関数はawait import()完了後、何もせずreturnするだけでよい)。
+  // 同じ理由で、ここでglobalThis.Bun/__claudeYamlを削除するcleanupも行わない
+  // (fire-and-forgetの内部処理がimport()解決後も継続してBunを参照するため、
+  // 早期に消すと実機で"Bun is not defined"を引き起こす。プロセス終了まで残す)。
+  await import(entryUrl);
+}
+
+async function legacyCjsMain() {
   let extractedFile;
   extractedFile = ensureEntryFile();
   const code = fs.readFileSync(extractedFile, 'utf8');
@@ -1961,8 +2100,19 @@ async function main() {
   }
 }
 
+function main() {
+  return process.env.ENTRY_FORMAT === 'esm-chunked' ? esmChunkedMain() : legacyCjsMain();
+}
+
 main()
   .then(() => {
+    // esm-chunked経路は内部のfire-and-forget非同期処理が実際のprocess.exit()を
+    // 自ら呼ぶまでNodeのイベントループを生かしておく必要があるため、TUIモードと
+    // 同様にここでは強制exitしない(実機で確認済み: 強制exitすると--helpの出力等が
+    // 完了前に打ち切られる)。
+    if (process.env.ENTRY_FORMAT === 'esm-chunked') {
+      return;
+    }
     if (process.env.CLAUDE_TERMUX_TUI === '1' && process.exitCode === undefined) {
       return;
     }

package/lib/termux-run-claude-native.test.js

@@ -81,7 +81,7 @@ function loadHelperApi() {
   const rewriteSource = extractFunction(
     helperBlock,
     'function rewriteNativeChunkSource(source) {',
-    '\n\nasync function main() {',
+    '\n\nasync function esmChunkedMain() {',
   );
 
   const context = vm.createContext({ module: { exports: {} }, exports: {}, fs, path, process });
@@ -113,12 +113,12 @@ test('helper and bootstrap rewrite helpers stay identical', () => {
   const helperRewrite = extractFunction(
     helperBlock,
     'function rewriteNativeChunkSource(source) {',
-    '\n\nasync function main() {',
+    '\n\nasync function esmChunkedMain() {',
   );
   const bootstrapRewrite = extractFunction(
     bootstrapBlock,
     'function rewriteNativeChunkSource(source) {',
-    '\n\nasync function main() {',
+    '\n\nasync function esmChunkedMain() {',
   );
   const helperWrapAnsi = extractFunction(
     helperBlock,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash0816/claude-code",
-  "version": "2.1.241",
+  "version": "2.1.248",
   "description": "Unofficial Termux-native Claude Code wrapper with audited native replay",
   "license": "GPL-3.0-only",
   "bin": {
@@ -15,7 +15,7 @@
     "LICENSE"
   ],
   "engines": {
-    "node": ">=18"
+    "node": ">=22.15.0 <23.0.0 || >=23.5.0"
   },
   "keywords": [
     "claude-code",