@bash0816/claude-code 2.1.248 → 2.1.251

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.245
+npm install -g @bash0816/claude-code@2.1.248
 ```
 
 ## Update / 更新
@@ -95,6 +95,51 @@ like `disable` or `Y` will silently turn protection off. Use exactly `0` to be s
 `1`/`true`/`yes`/`on`(大文字小文字を区別しません)以外の値は全て機能を再有効化してしまうため、
 `disable` や `Y` のような typo でも保護が黙って外れます。安全のため厳密に `0` を指定してください。
 
+### Tool Search Disabled by Default / Tool Search は既定で無効化
+
+This Termux wrapper disables the upstream's automatic tool discovery feature (`ENABLE_TOOL_SEARCH=false`
+by default) to prevent unnecessary dynamic tool loading in normal conversations. Without this setting,
+the model may spontaneously activate `ToolSearch` and trigger `WebSearch`/`WebFetch` calls, consuming
+your conversation turn limit (`--max-turns`).
+
+この Termux wrapper は、upstream の自動 tool discovery 機能を既定で無効化しています
+(`ENABLE_TOOL_SEARCH=false`)。この設定がないと、モデルが通常の会話で自発的に `ToolSearch` を活動化させ、
+`WebSearch`/`WebFetch` を呼び出し、会話の turn 上限(`--max-turns`)を消費するおそれがあります。
+
+If you want to re-enable tool search (for example, if you explicitly use `--tools` and want the model
+to load additional tools dynamically), set the variable before launching:
+
+tool search を再有効化したい場合（例えば `--tools` を明示的に指定して、モデルが追加の tool を
+動的にロードしてほしい場合）、起動前に環境変数を設定してください：
+
+```sh
+ENABLE_TOOL_SEARCH=true claude
+```
+
+or:
+
+または：
+
+```sh
+ENABLE_TOOL_SEARCH=auto claude
+```
+
+**Note on `settings.json`:** If you want to configure this in `settings.json`, place `ENABLE_TOOL_SEARCH` in
+the `env` block with the value `force`. The environment variable default (`false`) takes precedence over `true`,
+so use the `env` block to force-enable it:
+
+```json
+{ "env": { "ENABLE_TOOL_SEARCH": "force" } }
+```
+
+**`settings.json` を使う場合の注意:** `settings.json` で設定する場合、`env` ブロック内に `ENABLE_TOOL_SEARCH`
+を置いて、値を `force` にしてください。環境変数の既定値(`false`)が `true` より優先されるため、
+force-enable するには `env` ブロックを使う必要があります：
+
+```json
+{ "env": { "ENABLE_TOOL_SEARCH": "force" } }
+```
+
 ## Policy / 方針
 
 - Only audited versions in `config/claude-native-audited-versions.json` can run.

package/bin/claude

@@ -19,10 +19,10 @@ fi
 
 if ! "$NODE" -e '
 const [major, minor] = process.versions.node.split(".").map(Number);
-const ok = major > 23 || (major === 23 && minor >= 5) || (major === 22 && minor >= 15);
+const ok = major > 23 || (major === 23 && minor >= 8) || (major === 22 && minor >= 15);
 process.exit(ok ? 0 : 1);
 '; then
-  echo "Error: claude-code requires Node.js >=22.15.0 <23.0.0 or >=23.5.0 (module.registerHooks() API). Detected: $("$NODE" --version)" >&2
+  echo "Error: claude-code requires Node.js >=22.15.0 <23.0.0 or >=23.8.0 (module.registerHooks() API + zlib zstd support). Detected: $("$NODE" --version)" >&2
   exit 1
 fi
 

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

@@ -786,19 +786,163 @@
       "entry_format": "esm-chunked",
       "tarball_integrity": "sha512-2qwjgGuzlVfkJC7UWUjl86hiv5Ok5vtVxAZ/5fpdhzQKuBLlxrJJu3z5tVI+VrO/x/hcqx5kJuy9/O9K4eT+Kg==",
       "tarball_sha256": "bd2e2b6ebace34039b073b0f586d521ec09c895fa2a39de8d1c86423ae5884ca",
-      "status": "offset_discovered",
+      "status": "termux_verified",
       "num_modules": 1946,
       "byte_count": 136124175,
       "cycle_hoists": [
-        { "file": "chunk-vmw9kxhv.js", "targetModule": "chunk-y0jj307t.js", "expectedOccurrences": 1, "assertProperties": [] },
-        { "file": "chunk-9n7t2tbt.js", "targetModule": "chunk-ppd18hq1.js", "expectedOccurrences": 1, "assertProperties": ["MonitorTool"] },
-        { "file": "chunk-9n7t2tbt.js", "targetModule": "chunk-830s9480.js", "expectedOccurrences": 1, "assertProperties": ["EndConversationTool"] },
-        { "file": "chunk-9n7t2tbt.js", "targetModule": "chunk-m4hx5z9g.js", "expectedOccurrences": 1, "assertProperties": ["ArtifactTool"] },
-        { "file": "chunk-9n7t2tbt.js", "targetModule": "chunk-eg121wbt.js", "expectedOccurrences": 1, "assertProperties": ["WorkflowTool"] },
-        { "file": "chunk-9n7t2tbt.js", "targetModule": "chunk-prrm838s.js", "expectedOccurrences": 1, "assertProperties": [] },
-        { "file": "chunk-9n7t2tbt.js", "targetModule": "chunk-exvwsc2a.js", "expectedOccurrences": 2, "assertProperties": [] },
-        { "file": "chunk-9n7t2tbt.js", "targetModule": "chunk-s61yn21a.js", "expectedOccurrences": 1, "assertProperties": ["default"] },
-        { "file": "chunk-9n7t2tbt.js", "targetModule": "chunk-040m9a9s.js", "expectedOccurrences": 3, "assertProperties": ["getWorkflowCommands", "invalidateWorkflowCache", "warmWorkflows"] }
+        {
+          "file": "chunk-vmw9kxhv.js",
+          "targetModule": "chunk-y0jj307t.js",
+          "expectedOccurrences": 1,
+          "assertProperties": []
+        },
+        {
+          "file": "chunk-9n7t2tbt.js",
+          "targetModule": "chunk-ppd18hq1.js",
+          "expectedOccurrences": 1,
+          "assertProperties": [
+            "MonitorTool"
+          ]
+        },
+        {
+          "file": "chunk-9n7t2tbt.js",
+          "targetModule": "chunk-830s9480.js",
+          "expectedOccurrences": 1,
+          "assertProperties": [
+            "EndConversationTool"
+          ]
+        },
+        {
+          "file": "chunk-9n7t2tbt.js",
+          "targetModule": "chunk-m4hx5z9g.js",
+          "expectedOccurrences": 1,
+          "assertProperties": [
+            "ArtifactTool"
+          ]
+        },
+        {
+          "file": "chunk-9n7t2tbt.js",
+          "targetModule": "chunk-eg121wbt.js",
+          "expectedOccurrences": 1,
+          "assertProperties": [
+            "WorkflowTool"
+          ]
+        },
+        {
+          "file": "chunk-9n7t2tbt.js",
+          "targetModule": "chunk-prrm838s.js",
+          "expectedOccurrences": 1,
+          "assertProperties": []
+        },
+        {
+          "file": "chunk-9n7t2tbt.js",
+          "targetModule": "chunk-exvwsc2a.js",
+          "expectedOccurrences": 2,
+          "assertProperties": []
+        },
+        {
+          "file": "chunk-9n7t2tbt.js",
+          "targetModule": "chunk-s61yn21a.js",
+          "expectedOccurrences": 1,
+          "assertProperties": [
+            "default"
+          ]
+        },
+        {
+          "file": "chunk-9n7t2tbt.js",
+          "targetModule": "chunk-040m9a9s.js",
+          "expectedOccurrences": 3,
+          "assertProperties": [
+            "getWorkflowCommands",
+            "invalidateWorkflowCache",
+            "warmWorkflows"
+          ]
+        }
+      ]
+    },
+    "2.1.251": {
+      "wrapper_spec": "@anthropic-ai/claude-code@2.1.251",
+      "native_spec": "@anthropic-ai/claude-code-linux-arm64@2.1.251",
+      "entry_format": "esm-chunked",
+      "tarball_integrity": "sha512-h4EXRyV25yJfez40cTIoBlJptJqccP8nIDPdDMO9TDPUzZ6e5Y3OO9AgrfdMRAgccaTRsKfJenh7lA2D40nzdw==",
+      "tarball_sha256": "50760f283bf289a8bfb6f25ab86276808fd038b8f724ba5eaffb9b195483846d",
+      "status": "offset_discovered",
+      "num_modules": 1971,
+      "byte_count": 126850982,
+      "cycle_hoists": [
+        {
+          "file": "chunk-5yrgn0qs.js",
+          "targetModule": "chunk-j108xzrz.js",
+          "expectedOccurrences": 1,
+          "assertProperties": []
+        },
+        {
+          "file": "chunk-82xr73g2.js",
+          "targetModule": "chunk-kqaa82qj.js",
+          "expectedOccurrences": 1,
+          "assertProperties": [
+            "MonitorTool"
+          ]
+        },
+        {
+          "file": "chunk-82xr73g2.js",
+          "targetModule": "chunk-q6fxy93d.js",
+          "expectedOccurrences": 1,
+          "assertProperties": [
+            "EndConversationTool"
+          ]
+        },
+        {
+          "file": "chunk-82xr73g2.js",
+          "targetModule": "chunk-dxpcqxe7.js",
+          "expectedOccurrences": 1,
+          "assertProperties": [
+            "ArtifactTool"
+          ]
+        },
+        {
+          "file": "chunk-82xr73g2.js",
+          "targetModule": "chunk-be1dqpgt.js",
+          "expectedOccurrences": 1,
+          "assertProperties": [
+            "WorkflowTool"
+          ]
+        },
+        {
+          "file": "chunk-82xr73g2.js",
+          "targetModule": "chunk-er5txax0.js",
+          "expectedOccurrences": 1,
+          "assertProperties": []
+        },
+        {
+          "file": "chunk-82xr73g2.js",
+          "targetModule": "chunk-nh8esxyc.js",
+          "expectedOccurrences": 2,
+          "assertProperties": []
+        },
+        {
+          "file": "chunk-82xr73g2.js",
+          "targetModule": "chunk-4agvbmxr.js",
+          "expectedOccurrences": 1,
+          "assertProperties": [
+            "default"
+          ]
+        },
+        {
+          "file": "chunk-82xr73g2.js",
+          "targetModule": "chunk-4sfywf4e.js",
+          "expectedOccurrences": 3,
+          "assertProperties": [
+            "getWorkflowCommands",
+            "invalidateWorkflowCache",
+            "warmWorkflows"
+          ]
+        }
+      ],
+      "cycle_hoists_skipped_assets": [
+        "chart.umd.min.js",
+        "hljsBundle.generated.min.js",
+        "mermaid.min.js"
       ]
     }
   }

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

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

package/lib/bunfs-esm-loader.mjs

@@ -1,8 +1,10 @@
 import { pathToFileURL, fileURLToPath } from 'node:url';
 import { existsSync, readFileSync } from 'node:fs';
-import { createRequire } from 'node:module';
+import { createRequire, syncBuiltinESMExports } from 'node:module';
 import path from 'node:path';
 
+const require = createRequire(import.meta.url);
+
 let PROCESS_OWNED_DIR = null;
 let SOURCE_BIN = null;
 let CHILD_PROCESS_GUARD_PATH = null;
@@ -11,6 +13,45 @@ let WS_STUB_PATH = null;
 
 let CYCLE_HOISTS = [];
 
+let REEXTRACT = null;
+let reExtractConsecFailures = 0;
+let lastReExtractMs = 0;
+const MAX_CONSEC_FAILURES = 3;
+const REEXTRACT_THROTTLE_MS = 3000;
+
+function recoverMissing(realPath, now = Date.now()) {
+  if (existsSync(realPath)) return true;
+  if (!REEXTRACT || !SOURCE_BIN) return false;
+  if (reExtractConsecFailures >= MAX_CONSEC_FAILURES) return false;
+  if (now - lastReExtractMs < REEXTRACT_THROTTLE_MS) return existsSync(realPath);
+  lastReExtractMs = now;
+  try {
+    if (!existsSync(SOURCE_BIN)) { reExtractConsecFailures += 1; return false; }
+    REEXTRACT(SOURCE_BIN, PROCESS_OWNED_DIR);
+    console.error('[claude-code] recovered missing extracted module(s) by re-extracting from the native binary');
+  } catch (e) {
+    reExtractConsecFailures += 1;
+    console.error('[claude-code] re-extraction failed: ' + (e && e.message ? e.message : String(e)));
+    return false;
+  }
+  const ok = existsSync(realPath);
+  reExtractConsecFailures = ok ? 0 : reExtractConsecFailures + 1;
+  return ok;
+}
+
+function resolveBunfsPath(id) {
+  if (typeof id !== 'string' || !id.startsWith('/$bunfs/root/')) return null;
+  const rel = id.slice('/$bunfs/root/'.length);
+  if (rel.includes('..') || path.isAbsolute(rel)) {
+    throw new Error(`bunfs: rejected specifier ${id}`);
+  }
+  const real = path.resolve(PROCESS_OWNED_DIR, rel);
+  if (path.relative(PROCESS_OWNED_DIR, real).startsWith('..')) {
+    throw new Error(`bunfs: path escapes process-owned dir: ${id}`);
+  }
+  return real;
+}
+
 export function initialize(data) {
   PROCESS_OWNED_DIR = data.processOwnedDir;
   SOURCE_BIN = data.sourceBin;
@@ -18,6 +59,12 @@ export function initialize(data) {
   VM_GUARD_PATH = data.vmGuardPath;
   WS_STUB_PATH = data.wsStubPath;
   CYCLE_HOISTS = Array.isArray(data.cycleHoists) ? data.cycleHoists : [];
+  REEXTRACT = typeof data.reExtract === 'function' ? data.reExtract : null;
+  globalThis.__bunfsRecoverMissing = recoverMissing;
+  globalThis.__bunfsResolvePath = resolveBunfsPath;
+  // 回復状態のリセット (テスト隔離・再 initialize 対応)
+  reExtractConsecFailures = 0;
+  lastReExtractMs = 0;
 }
 
 function tryHoistCycleBreakingImports(filePath, source) {
@@ -37,7 +84,7 @@ function tryHoistCycleBreakingImports(filePath, source) {
 
     const real = path.resolve(PROCESS_OWNED_DIR, record.targetModule);
     if (path.relative(PROCESS_OWNED_DIR, real).startsWith('..')) continue;
-    if (!existsSync(real)) continue;
+    if (!existsSync(real) && !recoverMissing(real)) continue;
 
     let varName = targetToVar.get(record.targetModule);
     if (!varName) {
@@ -85,22 +132,34 @@ function buildImportMetaRequirePolyfillPrelude(anchorUrl) {
     `  if (id === "child_process" || id === "node:child_process") return __bunfsGuardedChildProcess;\n` +
     `  if (id === "vm" || id === "node:vm") return __bunfsGuardedVm;\n` +
     `  if (typeof id === "string" && id.startsWith("/$bunfs/root/")) {\n` +
-    `    const rel = id.slice("/$bunfs/root/".length);\n` +
-    `    if (rel.includes("..") || __bunfsMetaRequirePath.isAbsolute(rel)) {\n` +
-    `      throw new Error("bunfs meta-require: rejected specifier " + id);\n` +
-    `    }\n` +
-    `    const real = __bunfsMetaRequirePath.resolve(__bunfsOwnedDir, rel);\n` +
-    `    if (__bunfsMetaRequirePath.relative(__bunfsOwnedDir, real).startsWith("..")) {\n` +
-    `      throw new Error("bunfs meta-require: path escapes process-owned dir: " + id);\n` +
+    `    let real;\n` +
+    `    try {\n` +
+    `      real = globalThis.__bunfsResolvePath(id);\n` +
+    `    } catch (_eResolve) {\n` +
+    `      throw new Error("bunfs meta-require: " + _eResolve.message);\n` +
     `    }\n` +
     `    if (!__bunfsMetaRequireExistsSync(real)) {\n` +
-    `      throw new Error("bunfs meta-require: missing extracted module " + id + " -> " + real);\n` +
+    `      const _rec = (typeof globalThis.__bunfsRecoverMissing === "function") && globalThis.__bunfsRecoverMissing(real);\n` +
+    `      if (!_rec) throw new Error("bunfs meta-require: missing extracted module " + id + " -> " + real);\n` +
     `    }\n` +
     `    const ext = __bunfsMetaRequirePath.extname(real);\n` +
     `    if (ext === ".md" || ext === ".txt") {\n` +
-    `      return __bunfsMetaRequireReadFileSync(real, "utf8");\n` +
+    `      try { return __bunfsMetaRequireReadFileSync(real, "utf8"); }\n` +
+    `      catch (_e2) {\n` +
+    `        if (_e2 && _e2.code === "ENOENT" && !__bunfsMetaRequireExistsSync(real) && typeof globalThis.__bunfsRecoverMissing === "function" && globalThis.__bunfsRecoverMissing(real)) {\n` +
+    `          return __bunfsMetaRequireReadFileSync(real, "utf8");\n` +
+    `        }\n` +
+    `        throw _e2;\n` +
+    `      }\n` +
+    `    }\n` +
+    `    try {\n` +
+    `      return __bunfsRealRequire(real);\n` +
+    `    } catch (_e) {\n` +
+    `      if (!__bunfsMetaRequireExistsSync(real) && typeof globalThis.__bunfsRecoverMissing === "function" && globalThis.__bunfsRecoverMissing(real)) {\n` +
+    `        return __bunfsRealRequire(real);\n` +
+    `      }\n` +
+    `      throw _e;\n` +
     `    }\n` +
-    `    return __bunfsRealRequire(real);\n` +
     `  }\n` +
     `  return __bunfsRealRequire(id);\n` +
     `};\n`
@@ -124,15 +183,13 @@ export function resolve(specifier, context, nextResolve) {
     }
   }
   if (specifier.startsWith('/$bunfs/root/')) {
-    const rel = specifier.slice('/$bunfs/root/'.length);
-    if (rel.includes('..') || path.isAbsolute(rel)) {
-      throw new Error(`bunfs resolve: rejected specifier ${specifier}`);
+    let real;
+    try {
+      real = resolveBunfsPath(specifier);
+    } catch (e) {
+      throw new Error(`bunfs resolve: ${e.message}`);
     }
-    const real = path.resolve(PROCESS_OWNED_DIR, rel);
-    if (path.relative(PROCESS_OWNED_DIR, real).startsWith('..')) {
-      throw new Error(`bunfs resolve: path escapes process-owned dir: ${specifier}`);
-    }
-    if (!existsSync(real)) {
+    if (!existsSync(real) && !recoverMissing(real)) {
       throw new Error(`bunfs resolve: missing extracted module ${specifier} -> ${real}`);
     }
     return { url: pathToFileURL(real).href, shortCircuit: true, format: 'module' };
@@ -146,7 +203,17 @@ export function load(url, context, nextLoad) {
     return nextLoad(url, context);
   }
   const filePath = fileURLToPath(url);
-  let source = readFileSync(filePath, 'utf8');
+  let source;
+  try {
+    source = readFileSync(filePath, 'utf8');
+  } catch (e) {
+    // filePath 自身が消えている場合のみ回復 (エラーコードだけに依存しない)
+    if (e && e.code === 'ENOENT' && !existsSync(filePath) && recoverMissing(filePath)) {
+      source = readFileSync(filePath, 'utf8');
+    } else {
+      throw e;
+    }
+  }
 
   let hoistedImportLine = '';
   const hoistResult = tryHoistCycleBreakingImports(filePath, source);
@@ -165,3 +232,56 @@ export function load(url, context, nextLoad) {
   }
   return { format: 'module', source, shortCircuit: true };
 }
+
+let FS_PATCHED = false;
+function installFsBunfsInterception() {
+  if (FS_PATCHED) return;
+  const fsMod = require('node:fs');
+  const zlib = require('node:zlib');
+  if (typeof zlib.zstdDecompressSync !== 'function' || typeof zlib.zstdDecompress !== 'function') {
+    throw new Error('bunfs: Node.js zlib zstd support not found. Please upgrade to Node.js >=23.8.0 or >=22.15.0 (LTS).');
+  }
+  const origReadFileSync = fsMod.readFileSync;
+  const origReadFile = fsMod.readFile;
+  const origPromisesReadFile = fsMod.promises.readFile;
+
+  function resolveOrRecover(p) {
+    const real = resolveBunfsPath(p);
+    if (real === null) return null;
+    if (!existsSync(real)) {
+      const recovered = (typeof globalThis.__bunfsRecoverMissing === 'function') && globalThis.__bunfsRecoverMissing(real);
+      if (!recovered) throw new Error(`bunfs fs-intercept: missing extracted asset ${p} -> ${real}`);
+    }
+    const realOwned = fsMod.realpathSync(PROCESS_OWNED_DIR);
+    const realTarget = fsMod.realpathSync(real);
+    if (path.relative(realOwned, realTarget).startsWith('..')) {
+      throw new Error(`bunfs fs-intercept: resolved path escapes owned dir via symlink: ${p}`);
+    }
+    return real;
+  }
+
+  try {
+    fsMod.readFileSync = function (p, ...rest) {
+      const real = typeof p === 'string' ? resolveOrRecover(p) : null;
+      return Reflect.apply(origReadFileSync, this, [real !== null ? real : p, ...rest]);
+    };
+    fsMod.readFile = function (p, ...rest) {
+      const real = typeof p === 'string' ? resolveOrRecover(p) : null;
+      return Reflect.apply(origReadFile, this, [real !== null ? real : p, ...rest]);
+    };
+    fsMod.promises.readFile = function (p, ...rest) {
+      const real = typeof p === 'string' ? resolveOrRecover(p) : null;
+      return Reflect.apply(origPromisesReadFile, this, [real !== null ? real : p, ...rest]);
+    };
+    syncBuiltinESMExports();
+  } catch (e) {
+    fsMod.readFileSync = origReadFileSync;
+    fsMod.readFile = origReadFile;
+    fsMod.promises.readFile = origPromisesReadFile;
+    try { syncBuiltinESMExports(); } catch { /* 復元目的、失敗しても re-throw を優先 */ }
+    throw e;
+  }
+  FS_PATCHED = true;
+}
+
+export { recoverMissing, resolveBunfsPath, installFsBunfsInterception };