@bash0816/claude-code 2.1.159-3 → 2.1.159-9

package/README.md

@@ -1,78 +1,31 @@
-# @bash0816/claude-code
+# @bash0816/cluade-code
 
-Termux-native Claude Code wrapper package.
+> **This package has been renamed.**
+> Please migrate to the canonical package: [@bash0816/claude-code](https://www.npmjs.com/package/@bash0816/claude-code)
 
-Termux 向け Claude Code native wrapper package です。
+## Migration / 移行
 
-This package is the current Termux wrapper package line.
+Run the following command to migrate:
 
-この package は現行の Termux wrapper package 系です。
-
-## Install / インストール
+移行するには以下を実行してください:
 
 ```sh
+npm uninstall -g @bash0816/cluade-code
 npm install -g @bash0816/claude-code@latest
 ```
 
-If an older audited launcher from this repository already exists at `$PREFIX/bin/claude`, migrate through the updated launcher.
-
-この repository の古い監査済み launcher が `$PREFIX/bin/claude` にある場合は、更新済み launcher 経由で移行します。
-
-```sh
-claude update
-```
-
-If npm reports `EEXIST` before package scripts run, use a one-time forced migration.
-
-package script 実行前に npm が `EEXIST` を返す場合は、初回だけ forced migration を使います。
-
-```sh
-npm install -g --force @bash0816/claude-code@latest
-```
-
-After npm owns the `claude` bin link, normal `npm install -g` updates work.
-
-npm が `claude` bin link を管理する状態になれば、通常の `npm install -g` 更新が使えます。
+Or use the built-in migration:
 
-Specific audited versions:
-
-監査済みの固定 version:
-
-Current quick examples:
-
-現在の quick example:
-
-```sh
-npm install -g @bash0816/claude-code@2.1.157
-```
-
-## Update / 更新
+内蔵の migration を使う場合:
 
 ```sh
 claude update
 ```
 
-`claude update` installs the latest audited package version.
-
-`claude update` は最新の監査済み package version を install します。
-
-```sh
-npm install -g @bash0816/claude-code@<latest_audited_version>
-```
-
-Normal launch also checks the same manifest with a short timeout and prints a notice when a newer audited version is available.
-
-通常起動時も、同じ manifest を短い timeout で確認し、新しい監査済み version があれば通知します。
+## Note
 
-## Policy / 方針
+This is a legacy compatibility package with a typo in the package name.
+All new releases are published under [@bash0816/claude-code](https://www.npmjs.com/package/@bash0816/claude-code).
 
-- Only audited versions in `config/claude-native-audited-versions.json` can run.
-- `config/claude-native-audited-versions.json` にある監査済み version だけを実行できます。
-- `2.1.118`, `2.1.119`, `2.1.121`, `2.1.122`, `2.1.123`, `2.1.126`, `2.1.128`, `2.1.136`, `2.1.137`, `2.1.138`, `2.1.139`, `2.1.140`, `2.1.141`, `2.1.142`, `2.1.143`, `2.1.144`, `2.1.150`, `2.1.150-1`, `2.1.150-2`, `2.1.150-3`, `2.1.153`, `2.1.153-1`, `2.1.153-2`, `2.1.153-3`, `2.1.153-4`, `2.1.157` are included in the package metadata.
-- `2.1.118`、`2.1.119`、`2.1.121`、`2.1.122`、`2.1.123`、`2.1.126`、`2.1.128`、`2.1.136`、`2.1.137`、`2.1.138`、`2.1.139`、`2.1.140`、`2.1.141`、`2.1.142`、`2.1.143`、`2.1.144`、`2.1.150`、`2.1.150-1`、`2.1.150-2`、`2.1.150-3`、`2.1.153`、`2.1.153-1`、`2.1.153-2`、`2.1.153-3`、`2.1.153-4`、`2.1.157` を package metadata に含めています。
-- The metadata file is the source of truth for the currently audited set.
-- 現在の監査済み version 集合の source of truth は metadata file です。
-- Native artifacts are cached under `${HOME}/.claude-termux-native-package`.
-- native artifact は `${HOME}/.claude-termux-native-package` に cache します。
-- If native preparation fails, the command exits with an error.
-- native preparation に失敗した場合、command は error で終了します。
+このパッケージはパッケージ名に typo がある legacy 互換パッケージです。
+新しいリリースはすべて [@bash0816/claude-code](https://www.npmjs.com/package/@bash0816/claude-code) で公開されています。

package/bin/claude

@@ -14,7 +14,8 @@ done
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "${SELF}")/.." && pwd)
 CONFIG_FILE="${PACKAGE_DIR}/config/claude-native-audited-versions.json"
 PACKAGE_VERSION=$(node -e 'const fs=require("fs"); const path=require("path"); const p=JSON.parse(fs.readFileSync(path.join(process.argv[1],"package.json"),"utf8")); process.stdout.write(p.version)' "${PACKAGE_DIR}")
-CLAUDE_VERSION="${CLAUDE_TERMUX_CLAUDE_VERSION:-${PACKAGE_VERSION}}"
+DEFAULT_NATIVE_VERSION=$(node -e 'const fs=require("fs"); const path=require("path"); const p=JSON.parse(fs.readFileSync(path.join(process.argv[1],"config","claude-termux-release-manifest.json"),"utf8")); process.stdout.write(String(p.default_native_version || p.latest_audited_version || ""))' "${PACKAGE_DIR}")
+CLAUDE_VERSION="${CLAUDE_TERMUX_CLAUDE_VERSION:-${DEFAULT_NATIVE_VERSION:-${PACKAGE_VERSION}}}"
 UPDATE_HELPER="${PACKAGE_DIR}/lib/check-updates.js"
 
 if [ "${1:-}" = "update" ]; then
@@ -57,6 +58,5 @@ WORKDIR="${CACHE_DIR}/launcher-workdir" \
 ENTRY_JS_OFFSET="${ENTRY_JS_OFFSET}" \
 ENTRY_END_OFFSET="${ENTRY_END_OFFSET}" \
 CURRENT_CLAUDE_VERSION="${CLAUDE_VERSION}" \
-CLAUDE_TERMUX_PACKAGE_DIR="${PACKAGE_DIR}" \
 CLAUDE_NATIVE_UPDATE_CHECK=0 \
 exec sh "${PACKAGE_DIR}/lib/termux-run-claude-native.sh" "$@"

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

@@ -175,6 +175,20 @@
       "entry_end_offset": 237958345,
       "status": "termux_verified"
     },
+    "2.1.154": {
+      "wrapper_spec": "@anthropic-ai/claude-code@2.1.154",
+      "native_spec": "@anthropic-ai/claude-code-linux-arm64@2.1.154",
+      "entry_js_offset": 222957396,
+      "entry_end_offset": 238482842,
+      "status": "termux_verified"
+    },
+    "2.1.156": {
+      "wrapper_spec": "@anthropic-ai/claude-code@2.1.156",
+      "native_spec": "@anthropic-ai/claude-code-linux-arm64@2.1.156",
+      "entry_js_offset": 222957812,
+      "entry_end_offset": 238483519,
+      "status": "termux_verified"
+    },
     "2.1.157": {
       "wrapper_spec": "@anthropic-ai/claude-code@2.1.157",
       "native_spec": "@anthropic-ai/claude-code-linux-arm64@2.1.157",
@@ -182,23 +196,21 @@
       "entry_end_offset": 238725072,
       "status": "termux_verified"
     },
-    "2.1.159-2": {
+    "2.1.159-9": {
       "wrapper_spec": "@anthropic-ai/claude-code@2.1.159",
       "native_spec": "@anthropic-ai/claude-code-linux-arm64@2.1.159",
       "entry_js_offset": 223232708,
       "entry_end_offset": 238749397,
       "tarball_integrity": "sha512-c8dXbuQdrotGWll46GlnXm5IPpORK2VrBSosCmI6f8t7Snc/3F58fX0MbIjJ/ycXpY0aaKuOnufCuxf7wi1Xqw==",
       "tarball_sha256": "0b551634f11742310ba3b6344fb7912ba1ed8ee0ef4702eab0099d31b4eeb070",
-      "status": "offset_discovered"
+      "status": "candidate"
     },
-    "2.1.159-3": {
-      "wrapper_spec": "@anthropic-ai/claude-code@2.1.159",
-      "native_spec": "@anthropic-ai/claude-code-linux-arm64@2.1.159",
-      "entry_js_offset": 223232708,
-      "entry_end_offset": 238749397,
-      "tarball_integrity": "sha512-c8dXbuQdrotGWll46GlnXm5IPpORK2VrBSosCmI6f8t7Snc/3F58fX0MbIjJ/ycXpY0aaKuOnufCuxf7wi1Xqw==",
-      "tarball_sha256": "0b551634f11742310ba3b6344fb7912ba1ed8ee0ef4702eab0099d31b4eeb070",
-      "status": "offset_discovered"
+    "2.1.157-1": {
+      "wrapper_spec": "@anthropic-ai/claude-code@2.1.157",
+      "native_spec": "@anthropic-ai/claude-code-linux-arm64@2.1.157",
+      "entry_js_offset": 223210916,
+      "entry_end_offset": 238725072,
+      "status": "candidate"
     }
   }
 }

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

@@ -1,8 +1,13 @@
 {
   "manifest_version": 1,
   "package_name": "@bash0816/claude-code",
+  "canonical_package_name": "@bash0816/claude-code",
+  "canonical_manifest_url": "https://raw.githubusercontent.com/bash0816/ClaudeCode-Termux/main/config/claude-termux-release-manifest.json",
+  "canonical_repository_url": "https://github.com/bash0816/ClaudeCode-Termux",
+  "bridge_package_version": "2.1.159-9",
+  "default_native_version": "2.1.159-9",
   "latest_audited_version": "2.1.157",
-  "latest_candidate_version": "2.1.159-3",
-  "previous_stable_version": "2.1.153-4",
+  "latest_candidate_version": "2.1.159-9",
+  "previous_stable_version": "2.1.157-1",
   "manifest_url": "https://raw.githubusercontent.com/bash0816/ClaudeCode-Termux/main/config/claude-termux-release-manifest.json"
 }

package/lib/check-updates.js

@@ -10,7 +10,6 @@ const path = require('path');
 const packageDir = path.resolve(__dirname, '..');
 const pkg = require(path.join(packageDir, 'package.json'));
 const localManifest = require(path.join(packageDir, 'config', 'claude-termux-release-manifest.json'));
-const { compareVersions } = require('./version-utils');
 const mode = process.argv[2] || 'notify';
 const currentVersion = process.argv[3] || pkg.version;
 const dryRun = process.argv.includes('--dry-run');
@@ -20,6 +19,26 @@ const timeoutMs = Number(process.env.CLAUDE_TERMUX_UPDATE_TIMEOUT_MS || '1200');
 const ttlMs = Number(process.env.CLAUDE_TERMUX_UPDATE_CACHE_TTL_MS || String(24 * 60 * 60 * 1000));
 const skipCheck = process.env.CLAUDE_TERMUX_SKIP_UPDATE_CHECK === '1';
 const manifestUrl = process.env.CLAUDE_TERMUX_MANIFEST_URL || localManifest.manifest_url;
+const canonicalManifestUrl = process.env.CLAUDE_TERMUX_CANONICAL_MANIFEST_URL || localManifest.canonical_manifest_url || '';
+const canonicalPackageName = process.env.CLAUDE_TERMUX_CANONICAL_PACKAGE_NAME || localManifest.canonical_package_name || '';
+const canonicalRepositoryUrl = process.env.CLAUDE_TERMUX_CANONICAL_REPOSITORY_URL || localManifest.canonical_repository_url || '';
+
+function compareVersions(a, b) {
+  const parse = v => {
+    const [main, patch] = String(v).split('-');
+    const parts = main.split('.').map(Number);
+    parts.push(patch !== undefined ? Number(patch) : 0);
+    return parts;
+  };
+  const aParts = parse(a);
+  const bParts = parse(b);
+  const len = Math.max(aParts.length, bParts.length);
+  for (let index = 0; index < len; index += 1) {
+    const diff = (aParts[index] || 0) - (bParts[index] || 0);
+    if (diff !== 0) return diff;
+  }
+  return 0;
+}
 
 function readCache() {
   try {
@@ -92,10 +111,64 @@ async function resolveManifest(forceRefresh) {
   }
 }
 
-function updateNoticeCache(cache, latestVersion) {
+async function resolveCanonicalManifest() {
+  if (!canonicalManifestUrl || !canonicalPackageName || canonicalPackageName === pkg.name) {
+    return null;
+  }
+
+  if (skipCheck) {
+    return {
+      packageName: canonicalPackageName,
+      latestVersion: localManifest.latest_audited_version || pkg.version,
+      repositoryUrl: canonicalRepositoryUrl,
+    };
+  }
+
+  try {
+    const manifest = await fetchManifest(canonicalManifestUrl);
+    return {
+      packageName: manifest.package_name || canonicalPackageName,
+      latestVersion: manifest.latest_audited_version || localManifest.latest_audited_version || pkg.version,
+      repositoryUrl: canonicalRepositoryUrl,
+    };
+  } catch {
+    return {
+      packageName: canonicalPackageName,
+      latestVersion: localManifest.latest_audited_version || pkg.version,
+      repositoryUrl: canonicalRepositoryUrl,
+    };
+  }
+}
+
+async function resolveTarget(forceRefresh) {
+  const base = await resolveManifest(forceRefresh);
+  const canonical = await resolveCanonicalManifest();
+  if (!canonical) {
+    return {
+      manifest: base.manifest,
+      cache: base.cache,
+      packageName: base.manifest.package_name || pkg.name,
+      targetVersion: base.manifest.latest_audited_version || localManifest.latest_audited_version || pkg.version,
+      repositoryUrl: '',
+      migration: false,
+    };
+  }
+
+  return {
+    manifest: base.manifest,
+    cache: base.cache,
+    packageName: canonical.packageName,
+    targetVersion: canonical.latestVersion,
+    repositoryUrl: canonical.repositoryUrl,
+    migration: canonical.packageName !== pkg.name,
+  };
+}
+
+function updateNoticeCache(cache, packageName, latestVersion) {
   const nextCache = {
     ...cache,
     last_notice: {
+      package_name: packageName,
       current_version: currentVersion,
       latest_audited_version: latestVersion,
       notified_at: Date.now(),
@@ -104,9 +177,10 @@ function updateNoticeCache(cache, latestVersion) {
   writeCache(nextCache);
 }
 
-function shouldNotify(cache, latestVersion) {
+function shouldNotify(cache, packageName, latestVersion) {
   const lastNotice = cache.last_notice;
   if (!lastNotice) return true;
+  if (lastNotice.package_name !== packageName) return true;
   if (lastNotice.current_version !== currentVersion) return true;
   if (lastNotice.latest_audited_version !== latestVersion) return true;
   return Date.now() - Number(lastNotice.notified_at || 0) >= ttlMs;
@@ -130,26 +204,62 @@ function installTarget(packageName, targetVersion) {
 }
 
 async function runNotify() {
-  const { manifest, cache } = await resolveManifest(false);
-  const latest = manifest.latest_audited_version || localManifest.latest_audited_version || pkg.version;
-  if (compareVersions(currentVersion, latest) >= 0) return 0;
-  if (!shouldNotify(cache, latest)) return 0;
+  const target = await resolveTarget(false);
+  const latest = target.targetVersion;
+  const packageName = target.packageName;
+  const migration = target.migration;
+  if (!migration && compareVersions(currentVersion, latest) >= 0) return 0;
+  if (!shouldNotify(target.cache, packageName, latest)) return 0;
+
+  if (migration) {
+    console.error(`Legacy package detected: ${pkg.name}`);
+    console.error(`Canonical package available: ${packageName}@${latest}`);
+    if (target.repositoryUrl) {
+      console.error(`Canonical repository: ${target.repositoryUrl}`);
+    }
+    console.error('Run: claude update');
+    updateNoticeCache(target.cache, packageName, latest);
+    return 0;
+  }
 
   console.error(`Audited update available: ${currentVersion} -> ${latest}`);
   console.error('Run: claude update');
-  updateNoticeCache(cache, latest);
+  updateNoticeCache(target.cache, packageName, latest);
   return 0;
 }
 
 async function runUpdate() {
-  const { manifest } = await resolveManifest(true);
-  const packageName = manifest.package_name || localManifest.package_name;
-  const target = manifest.latest_audited_version || localManifest.latest_audited_version || pkg.version;
-  if (compareVersions(currentVersion, target) >= 0) {
+  const target = await resolveTarget(true);
+  if (!target.migration && compareVersions(currentVersion, target.targetVersion) >= 0) {
     console.error(`Already on latest audited version: ${currentVersion}`);
     return 0;
   }
-  return installTarget(packageName, target);
+  if (target.migration) {
+    console.error(`Migrating from ${pkg.name} to ${target.packageName}@${target.targetVersion}`);
+    if (dryRun) {
+      console.log(`npm uninstall -g ${pkg.name}`);
+      console.log(`npm install -g ${target.packageName}@${target.targetVersion}`);
+      return 0;
+    }
+    console.error(`Step 1: Uninstalling ${pkg.name}...`);
+    const uninstall = cp.spawnSync('npm', ['uninstall', '-g', pkg.name], { stdio: 'inherit', env: process.env });
+    if (uninstall.status !== 0) {
+      console.error(`Uninstall failed (exit ${uninstall.status}). Cannot safely continue migration.`);
+      console.error(`Run manually:`);
+      console.error(`  npm uninstall -g ${pkg.name}`);
+      console.error(`  npm install -g ${target.packageName}@${target.targetVersion}`);
+      return 1;
+    }
+    console.error(`Step 2: Installing ${target.packageName}@${target.targetVersion}...`);
+    const result = cp.spawnSync('npm', ['install', '-g', `${target.packageName}@${target.targetVersion}`], { stdio: 'inherit', env: process.env });
+    if (result.status !== 0) {
+      console.error(`Install failed. To restore, run:`);
+      console.error(`  npm install -g ${target.packageName}@${target.targetVersion}`);
+      console.error(`  # or to restore legacy: npm install -g ${pkg.name}@${pkg.version}`);
+    }
+    return result.status === null ? 1 : result.status;
+  }
+  return installTarget(target.packageName, target.targetVersion);
 }
 
 async function main() {

package/lib/postinstall.js

@@ -10,8 +10,9 @@ if (process.env.CLAUDE_TERMUX_SKIP_POSTINSTALL === '1') {
 
 const packageDir = path.resolve(__dirname, '..');
 const pkg = require(path.join(packageDir, 'package.json'));
+const manifest = require(path.join(packageDir, 'config', 'claude-termux-release-manifest.json'));
 const script = path.join(__dirname, 'prepare-native.js');
-const version = process.env.CLAUDE_TERMUX_CLAUDE_VERSION || pkg.version;
+const version = process.env.CLAUDE_TERMUX_CLAUDE_VERSION || manifest.default_native_version || manifest.latest_audited_version || pkg.version;
 
 const result = cp.spawnSync(process.execPath, [script, version], {
   stdio: 'inherit',

package/lib/preinstall.js

@@ -1,6 +1,12 @@
 #!/usr/bin/env node
 'use strict';
 
+const [_nodeMajor] = process.versions.node.split('.').map(Number);
+if (_nodeMajor < 20) {
+  process.stderr.write('@bash0816/claude-code requires Node.js v20 or later. Found: v' + process.versions.node + '\n');
+  process.exit(1);
+}
+
 const cp = require('child_process');
 const fs = require('fs');
 const os = require('os');

package/lib/prepare-native.js

@@ -9,11 +9,9 @@ const path = require('path');
 const packageDir = path.resolve(__dirname, '..');
 const config = require(path.join(packageDir, 'config', 'claude-native-audited-versions.json'));
 const pkg = require(path.join(packageDir, 'package.json'));
-const version = process.argv[2] || pkg.version;
+const manifest = require(path.join(packageDir, 'config', 'claude-termux-release-manifest.json'));
+const version = process.argv[2] || manifest.default_native_version || manifest.latest_audited_version || pkg.version;
 const item = config.versions[version];
-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';
 
 if (!item) {
   console.error(`Unsupported audited Claude Code version: ${version}`);
@@ -31,14 +29,18 @@ if (fs.existsSync(sourceBin)) {
 }
 
 fs.mkdirSync(versionDir, { recursive: true });
-const packDir = fs.mkdtempSync(path.join(os.tmpdir(), `claude-code-${version}-`));
+const packDir = fs.mkdtempSync(path.join(os.tmpdir(), `cluade-code-${version}-`));
 
 try {
-  const tgzPath = fetchNativeTarball(item.native_spec, packDir);
+  run('npm', ['pack', item.native_spec, '--pack-destination', packDir]);
+  const tgz = fs.readdirSync(packDir).find(name => name.endsWith('.tgz'));
+  if (!tgz) {
+    throw new Error('npm pack did not produce a tgz');
+  }
 
   const extractDir = path.join(packDir, 'native');
   fs.mkdirSync(extractDir, { recursive: true });
-  run('tar', ['-xzf', tgzPath, '-C', extractDir]);
+  run('tar', ['-xzf', path.join(packDir, tgz), '-C', extractDir]);
 
   fs.rmSync(nativeDest, { recursive: true, force: true });
   fs.mkdirSync(path.dirname(nativeDest), { recursive: true });
@@ -55,50 +57,6 @@ function run(command, args) {
   }
 }
 
-function runCapture(command, args) {
-  const result = cp.spawnSync(command, args, {
-    stdio: ['ignore', 'pipe', 'inherit'],
-    encoding: 'utf8',
-  });
-  if (result.status !== 0) {
-    throw new Error(`${command} ${args.join(' ')} failed`);
-  }
-  return result.stdout.trim();
-}
-
-function fetchNativeTarball(spec, packDir) {
-  const directTarball = path.join(packDir, 'native-package.tgz');
-
-  try {
-    const tarballUrl = runCapture('npm', ['view', spec, 'dist.tarball', '--json']).replace(/^"|"$/g, '');
-    if (!tarballUrl) {
-      throw new Error(`npm view did not return dist.tarball for ${spec}`);
-    }
-    run('curl', [
-      '--fail',
-      '--location',
-      '--retry', String(curlRetries),
-      '--connect-timeout', String(curlConnectTimeout),
-      '--max-time', String(curlMaxTime),
-      '--output', directTarball,
-      tarballUrl,
-    ]);
-    if (fs.existsSync(directTarball)) {
-      return directTarball;
-    }
-  } catch (error) {
-    console.error(`Direct tarball fetch failed for ${spec}; falling back to npm pack.`);
-    console.error(error && error.message ? error.message : String(error));
-  }
-
-  run('npm', ['pack', spec, '--pack-destination', packDir]);
-  const tgz = fs.readdirSync(packDir).find(name => name.endsWith('.tgz'));
-  if (!tgz) {
-    throw new Error('npm pack did not produce a tgz');
-  }
-  return path.join(packDir, tgz);
-}
-
 function validateOffsets(file, audited) {
   const buf = fs.readFileSync(file);
   const start = Number(audited.entry_js_offset);