@bash0816/copilot-termux 1.0.65 → 1.0.68-1

package/lib/setup.js

@@ -91,13 +91,16 @@ async function setup() {
     }
   }
 
+  await setupGlibcWrap();
+  await setupGlibcRuntime(versionDir, version);
+  await setupGlibcNode();
+
   const currentLink = path.join(CACHE_DIR, 'current');
   const tmp = path.join(CACHE_DIR, `current.tmp.${process.pid}`);
   try { fs.unlinkSync(tmp); } catch (_) {}
   fs.symlinkSync(versionDir, tmp);
   fs.renameSync(tmp, currentLink);
 
-  await setupGlibcWrap();
   console.log(`✓ copilot ${version} ready`);
 }
 
@@ -140,4 +143,141 @@ async function setupGlibcWrap() {
   console.log('✓ glibc wrap for lxc-exec ready');
 }
 
+async function setupGlibcRuntime(versionDir, version) {
+  const linux64Dir = path.join(versionDir, 'prebuilds', 'linux-arm64');
+  const runtimeNode = path.join(linux64Dir, 'runtime.node');
+  const cliNativeNode = path.join(linux64Dir, 'cli-native.node');
+  if (fs.existsSync(runtimeNode) && fs.existsSync(cliNativeNode)) {
+    return;
+  }
+
+  const glibcPkg = '@github/copilot-linux-arm64';
+  console.log(`Fetching ${glibcPkg}@${version} metadata...`);
+  const metaBuf = await httpsGet(`${REGISTRY}/${glibcPkg}/${version}`, { Accept: 'application/json' });
+  const meta = JSON.parse(metaBuf.toString());
+  const tarballUrl = meta.dist.tarball;
+  const integrity = meta.dist.integrity;
+
+  console.log(`Downloading ${glibcPkg}@${version} (glibc runtime)...`);
+  const tarball = await fetchWithIntegrity(tarballUrl, integrity);
+
+  const tarballPath = path.join(CACHE_DIR, `copilot-glibc-${version}.tgz`);
+  try {
+    fs.writeFileSync(tarballPath, tarball);
+    fs.mkdirSync(linux64Dir, { recursive: true });
+
+    console.log('Extracting glibc runtime.node...');
+    execFileSync('tar', [
+      '-xzf', tarballPath,
+      '-C', path.join(versionDir, 'prebuilds'),
+      '--strip-components=2',
+      'package/prebuilds/linux-arm64/runtime.node',
+      'package/prebuilds/linux-arm64/cli-native.node',
+    ]);
+  } finally {
+    fs.rmSync(tarballPath, { force: true });
+  }
+  console.log('✓ glibc runtime.node ready');
+}
+
+async function setupGlibcNode() {
+  const { version, sha256: expectedSha256 } = manifest.glibcNode;
+  const nodeVersionDir = path.join(CACHE_DIR, `glibc-node-${version}`);
+  const nodeBin = path.join(nodeVersionDir, 'node');
+  const currentLink = path.join(CACHE_DIR, 'glibc-node');
+
+  const PREFIX = process.env.PREFIX || '/data/data/com.termux/files/usr';
+  const glibcLd = path.join(PREFIX, 'glibc', 'lib', 'ld-linux-aarch64.so.1');
+  const glibcLibs = path.join(PREFIX, 'glibc', 'lib');
+
+  // glibc動的リンカ経由でないとTermux(bionic)上ではglibc Nodeバイナリを実行できないため、
+  // ld-linux 経由で `node -v` を実行しバージョン文字列を確認する。
+  function verifyNodeBinary(binPath) {
+    // bin/copilot と同様、Termux由来の LD_PRELOAD (bionic向けexecフック) を明示的にクリアしないと
+    // glibc loaderがロードするlibc.soがinvalid ELF headerエラーになる（2026-07-06実機確認）。
+    const out = execFileSync(glibcLd, ['--library-path', glibcLibs, binPath, '-v'], {
+      encoding: 'utf8',
+      env: { ...process.env, LD_PRELOAD: '' },
+    }).trim();
+    return out === `v${version}`;
+  }
+
+  let needsDownload = true;
+  if (fs.existsSync(nodeBin)) {
+    try {
+      if (verifyNodeBinary(nodeBin)) {
+        needsDownload = false;
+      } else {
+        console.log(`glibc node at ${nodeVersionDir} failed version check, re-downloading...`);
+        fs.rmSync(nodeVersionDir, { recursive: true, force: true });
+      }
+    } catch (e) {
+      // 破損バイナリ・実行不可などpartial stateからの自己修復
+      console.log(`glibc node at ${nodeVersionDir} failed to execute (${e.message}), re-downloading...`);
+      fs.rmSync(nodeVersionDir, { recursive: true, force: true });
+    }
+  }
+
+  if (needsDownload) {
+    const tarballUrl = `https://nodejs.org/dist/v${version}/node-v${version}-linux-arm64.tar.gz`;
+    console.log(`Downloading Node.js v${version} (glibc)...`);
+    const tarball = await httpsGet(tarballUrl);
+
+    const actualSha256 = crypto.createHash('sha256').update(tarball).digest('hex');
+    if (actualSha256 !== expectedSha256) {
+      throw new Error(`Node.js integrity check failed: expected ${expectedSha256}, got ${actualSha256}`);
+    }
+
+    const stagingDir = `${nodeVersionDir}.staging.${process.pid}`;
+    const tarballPath = path.join(CACHE_DIR, `node-glibc-${version}.tgz`);
+    try {
+      fs.rmSync(stagingDir, { recursive: true, force: true });
+      fs.writeFileSync(tarballPath, tarball);
+      fs.mkdirSync(stagingDir, { recursive: true });
+
+      console.log('Extracting node binary...');
+      execFileSync('tar', [
+        '-xzf', tarballPath,
+        '-C', stagingDir,
+        '--strip-components=2',
+        `node-v${version}-linux-arm64/bin/node`,
+      ]);
+      const stagingBin = path.join(stagingDir, 'node');
+      fs.chmodSync(stagingBin, 0o755);
+
+      // staging側で実行検証（glibcローダー経由）。失敗すれば例外がそのまま
+      // 呼び出し元に伝播し、stagingはcatchで削除、nodeVersionDirには一切触れない。
+      if (!verifyNodeBinary(stagingBin)) {
+        throw new Error(`Downloaded glibc node binary failed version check (expected v${version})`);
+      }
+
+      // 既存の nodeVersionDir が壊れた状態で残っている場合に備え、rename前にクリア
+      // （ここまで到達した時点で staging 側の検証は完了済みなので安全）
+      fs.rmSync(nodeVersionDir, { recursive: true, force: true });
+      fs.renameSync(stagingDir, nodeVersionDir);
+    } catch (err) {
+      fs.rmSync(stagingDir, { recursive: true, force: true });
+      throw err;
+    } finally {
+      fs.rmSync(tarballPath, { force: true });
+    }
+  }
+
+  // Migration: 1.0.68以前の glibc-node は実ディレクトリだった。
+  // 新バージョンの用意（既存流用 or 新規ダウンロード、どちらもverifyNodeBinary通過済み）が
+  // 完全に成功した後（ここまで到達した時点）でのみ、旧実ディレクトリを削除する。
+  let currentLinkStat = null;
+  try { currentLinkStat = fs.lstatSync(currentLink); } catch (_) {}
+  if (currentLinkStat && currentLinkStat.isDirectory() && !currentLinkStat.isSymbolicLink()) {
+    fs.rmSync(currentLink, { recursive: true, force: true });
+  }
+
+  const tmpLink = path.join(CACHE_DIR, `glibc-node.tmp.${process.pid}`);
+  try { fs.unlinkSync(tmpLink); } catch (_) {}
+  fs.symlinkSync(nodeVersionDir, tmpLink);
+  fs.renameSync(tmpLink, currentLink);
+
+  console.log('✓ glibc node ready');
+}
+
 module.exports = { setup };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash0816/copilot-termux",
-  "version": "1.0.65",
+  "version": "1.0.68-1",
   "description": "GitHub Copilot CLI for Termux (Android aarch64)",
   "license": "GPL-3.0-only",
   "readme": "README.md",
@@ -25,6 +25,7 @@
     "bin",
     "lib/platform-patch.js",
     "lib/setup.js",
+    "lib/check-updates.js",
     "lib/bionic-compat.so",
     "lib/native/pty.node",
     "scripts/bionic-compat.c",