@bash0816/copilot-termux 1.0.83 → 1.0.88

package/LICENSE

@@ -1,6 +1,5 @@
 This license (GPL-3.0-only) applies to the wrapper code in this package:
-  bin/copilot, lib/platform-patch.js, lib/bionic-compat.so,
-  and all other files not listed in THIRD-PARTY-NOTICES.md.
+  bin/copilot and all other files not listed in THIRD-PARTY-NOTICES.md.
 
 Bundled third-party software is covered by separate licenses.
 See THIRD-PARTY-NOTICES.md for details.

package/THIRD-PARTY-NOTICES.md

@@ -7,25 +7,15 @@ This package includes third-party software with the following licenses.
 ## GitHub Copilot CLI
 
 - Source: https://github.com/github/copilot-cli (private)
-- Version: 1.0.63
+- Package: @github/copilot-linux-arm64
 - License: GitHub Copilot CLI License
 - License text: THIRD-PARTY-LICENSES/COPILOT-LICENSE.md
 
-Redistributed in unmodified form as part of this package, in accordance with
-Section 2 of the GitHub Copilot CLI License.
-
-Files: lib/copilot/
-
----
-
-## Node.js
-
-- Source: https://nodejs.org/
-- License: MIT (main), with bundled components under various licenses
-  (see THIRD-PARTY-LICENSES/NODE-LICENSE.txt for full attribution)
-- License text: THIRD-PARTY-LICENSES/NODE-LICENSE.txt
-
-Files: lib/node
+Not bundled in this npm package. Downloaded in unmodified form at
+`copilot-termux setup` time from the npm registry, in accordance with
+Section 2 of the GitHub Copilot CLI License. The exact version fetched is
+pinned in `config/manifest.json` (`copilot.version`), and the downloaded
+binary is cached under `~/.copilot-termux/<version>/copilot`.
 
 ---
 
@@ -35,10 +25,11 @@ Files: lib/node
 - License: LGPL-2.1+
 - License text: THIRD-PARTY-LICENSES/LGPL-2.1.txt
 
-Files:
-  lib/glibc/ld-linux-aarch64.so.1
-  lib/glibc/libc.so.6
-  lib/glibc/libm.so.6
+Not bundled in this npm package. Copied at `copilot-termux setup` time from
+the system `glibc-repo` package (`pkg install glibc-repo && pkg install
+glibc`) into `~/.copilot-termux/glibc-wrap-libs/`:
+  ld-linux-aarch64.so.1
+  libc.so.6
 
 ---
 
@@ -49,18 +40,6 @@ Files:
 - Exception text: THIRD-PARTY-LICENSES/GCC-RUNTIME-EXCEPTION.txt
 - Base license text: THIRD-PARTY-LICENSES/GPL-3.0.txt
 
-Files:
-  lib/glibc/libgcc_s.so.1
-  lib/glibc/libstdc++.so.6
-
----
-
-## node-pty
-
-- Source: https://github.com/microsoft/node-pty
-- Version: 1.1.0
-- License: MIT
-- License text: THIRD-PARTY-LICENSES/NODE-PTY-LICENSE.txt
-
-Compiled natively for Android aarch64 (bionic) and bundled as `lib/native/pty.node`.
-Used to provide pseudo-terminal support for the interactive TUI mode of @github/copilot.
+Not bundled in this npm package. Copied at `copilot-termux setup` time from
+the system `glibc-repo` package into `~/.copilot-termux/glibc-wrap-libs/`:
+  libgcc_s.so.1

package/bin/copilot

@@ -7,9 +7,6 @@ while [ -L "${SELF}" ]; do
   case "${SELF}" in /*) ;; *) SELF="${DIR}/${SELF}" ;; esac
 done
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "${SELF}")/.." && pwd)
-_COMPAT="${PACKAGE_DIR}/lib/bionic-compat.so"
-[ -f "${_COMPAT}" ] || { echo '[copilot-termux] ERROR: lib/bionic-compat.so missing. Reinstall package.' >&2; exit 1; }
-PRELOAD="${_COMPAT}${LD_PRELOAD:+:${LD_PRELOAD}}"
 
 if [ "${1:-}" = "update" ]; then
   shift
@@ -25,75 +22,32 @@ if [ ! -d "${CURRENT}" ]; then
   exit 1
 fi
 
-COPILOT_INDEX="${CURRENT}/index.js"
-if [ ! -f "${COPILOT_INDEX}" ]; then
+COPILOT_BIN="${CURRENT}/copilot"
+if [ ! -f "${COPILOT_BIN}" ]; then
   echo "[copilot-termux] Installation broken. Run: copilot-termux setup" >&2
   exit 1
 fi
 
-MXC_WRAP="${CACHE_DIR}/mxc-wrap"
-if [ -d "${MXC_WRAP}/arm64" ] && [ -x "${MXC_WRAP}/arm64/lxc-exec" ]; then
-  export MXC_BIN_DIR="${MXC_WRAP}"
-fi
-
-# glibc mode: glibc Node.js + glibc runtime.node + platform-patch.js (authManager* stubs still needed)
 _GLIBC_LD="${PREFIX}/glibc/lib/ld-linux-aarch64.so.1"
 _GLIBC_LIBS="${PREFIX}/glibc/lib"
-_GLIBC_RUNTIME="${CURRENT}/prebuilds/linux-arm64/runtime.node"
-_GLIBC_CLI_NATIVE="${CURRENT}/prebuilds/linux-arm64/cli-native.node"
-_GLIBC_NODE_AUTO="${CACHE_DIR}/glibc-node/node"
 
-_USE_GLIBC_NODE=""
-if [ -n "${MAGI_NODE:-}" ] && [ -x "${MAGI_NODE}" ]; then
-  _USE_GLIBC_NODE="${MAGI_NODE}"
-elif [ -x "${_GLIBC_NODE_AUTO}" ]; then
-  _USE_GLIBC_NODE="${_GLIBC_NODE_AUTO}"
+if [ ! -f "${_GLIBC_LD}" ]; then
+  echo "[copilot-termux] ERROR: glibc not found. Please install: pkg install glibc-repo && pkg install glibc" >&2
+  exit 1
 fi
 
-_GLIBC_READY=1
-[ -n "${_USE_GLIBC_NODE}" ] || _GLIBC_READY=0
-[ -f "${_GLIBC_RUNTIME}" ] || _GLIBC_READY=0
-[ -f "${_GLIBC_CLI_NATIVE}" ] || _GLIBC_READY=0
-[ -f "${_GLIBC_LD}" ] || _GLIBC_READY=0
-
-_GLIBC_ANY=0
-[ -n "${_USE_GLIBC_NODE}" ] && _GLIBC_ANY=1
-[ -f "${_GLIBC_RUNTIME}" ] && _GLIBC_ANY=1
-[ -f "${_GLIBC_CLI_NATIVE}" ] && _GLIBC_ANY=1
-[ -f "${_GLIBC_LD}" ] && _GLIBC_ANY=1
-
-if [ "${_GLIBC_READY}" = "1" ]; then
-  _SSL_CERT="${PREFIX}/etc/tls/cert.pem"
-  _SSL_CERT_DIR="${PREFIX}/etc/tls"
-  if [ ! -r "${_SSL_CERT}" ]; then
-    echo "[copilot-termux] ERROR: CA bundle not readable: ${_SSL_CERT}" >&2
-    echo "[copilot-termux] Run: pkg install ca-certificates" >&2
-    exit 1
-  fi
-  exec env LD_PRELOAD="" COPILOT_TERMUX_GLIBC_MODE=1 \
-    SSL_CERT_FILE="${_SSL_CERT}" \
-    SSL_CERT_DIR="${_SSL_CERT_DIR}" \
-    "${_GLIBC_LD}" --library-path "${_GLIBC_LIBS}" \
-    "${_USE_GLIBC_NODE}" \
-    --require "${PACKAGE_DIR}/lib/platform-patch.js" \
-    "${COPILOT_INDEX}" \
-    "$@"
-elif [ "${_GLIBC_ANY}" = "1" ]; then
-  # 注: システムの glibc-repo パッケージ（_GLIBC_LD）を別目的で入れているだけで
-  # copilot-termux 自身の glibc mode セットアップ（setup.js の setupGlibcRuntime/setupGlibcNode）が
-  # 未完の場合も、ここでは「glibc mode 設定が部分的」としてエラー扱いにする。
-  # これは意図的な判断（Free auto mode の既知の壊れた bionic 経路への黙示的フォールバックを防ぐため）。
-  echo "[copilot-termux] ERROR: glibc mode partially configured. Missing:" >&2
-  [ -n "${_USE_GLIBC_NODE}" ] || echo "  - glibc node (${_GLIBC_NODE_AUTO})" >&2
-  [ -f "${_GLIBC_RUNTIME}" ] || echo "  - glibc runtime.node (${_GLIBC_RUNTIME})" >&2
-  [ -f "${_GLIBC_CLI_NATIVE}" ] || echo "  - glibc cli-native.node (${_GLIBC_CLI_NATIVE})" >&2
-  [ -f "${_GLIBC_LD}" ] || echo "  - glibc loader (${_GLIBC_LD})" >&2
-  echo "[copilot-termux] Run: copilot-termux setup" >&2
+_SSL_CERT="${PREFIX}/etc/tls/cert.pem"
+_SSL_CERT_DIR="${PREFIX}/etc/tls"
+if [ ! -r "${_SSL_CERT}" ]; then
+  echo "[copilot-termux] ERROR: CA bundle not readable: ${_SSL_CERT}" >&2
+  echo "[copilot-termux] Run: pkg install ca-certificates" >&2
   exit 1
 fi
 
-# bionic fallback（glibc関連ファイルが一つも無い場合のみ。意図的なbionic-onlyの正当な状態）
-LD_PRELOAD="${PRELOAD}" exec node \
-  --require "${PACKAGE_DIR}/lib/platform-patch.js" \
-  "${COPILOT_INDEX}" \
+exec env -u LD_PRELOAD \
+  SSL_CERT_FILE="${_SSL_CERT}" \
+  SSL_CERT_DIR="${_SSL_CERT_DIR}" \
+  COPILOT_TERMUX_GLIBC_MODE=1 \
+  "${_GLIBC_LD}" --library-path "${_GLIBC_LIBS}" \
+  "${COPILOT_BIN}" \
   "$@"

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

@@ -1,15 +1,15 @@
 {
   "manifest_version": 1,
   "package_name": "@bash0816/copilot-termux",
-  "copilot_version": "1.0.83",
-  "latest_audited_version": "1.0.82",
+  "copilot_version": "1.0.88",
+  "latest_audited_version": "1.0.83",
   "latest_candidate_version": null,
-  "previous_stable_version": "1.0.81",
+  "previous_stable_version": "1.0.82",
   "candidate_state": "none",
   "canonical_package_status": "not_published",
   "public_distribution_status": "staged",
   "nodejs_glibc_version": "node-glibc-v24.15.0",
   "build_run_id": null,
-  "last_updated": "2026-09-04",
+  "last_updated": "2026-09-19",
   "manifest_url": "https://raw.githubusercontent.com/bash0816/Github-Copilot-Termux/main/packages/copilot-termux/config/copilot-termux-release-manifest.json"
 }

package/config/manifest.json

@@ -1,12 +1,8 @@
 {
   "wrapperVersion": "2.0.0",
   "copilot": {
-    "package": "@github/copilot-linuxmusl-arm64",
-    "version": "1.0.83",
-    "integrity": "sha512-CkRdANpMLQUIw+qqhg4wtoxeAUDYtdxS3kMuDc23L/tl4zdTYSVPtzDAjXouXNTJTTsjzDeR6k4tP6cIyymPzQ=="
-  },
-  "glibcNode": {
-    "version": "26.2.0",
-    "sha256": "bf52461d25017479cdc549642c4e7a2303ac5c5395d7c3d026d5d8b3fa283c05"
+    "package": "@github/copilot-linux-arm64",
+    "version": "1.0.88",
+    "integrity": "sha512-aqtfMpA0B2cdKWydFXnlXawaqNRjG4gC5Dpe+sO/qVXQllSEi8moqiYzkUaVo4W5VEPwIXDLxCbDzsRw7Jt66w=="
   }
 }

package/lib/setup.js

@@ -48,11 +48,11 @@ async function fetchWithIntegrity(url, expectedIntegrity) {
 }
 
 async function setup() {
-  const { package: pkg = '@github/copilot-linuxmusl-arm64', version, integrity } = manifest.copilot;
+  const { package: pkg = '@github/copilot-linux-arm64', version, integrity } = manifest.copilot;
   const versionDir = path.join(CACHE_DIR, version);
   const stagingDir = `${versionDir}.staging`;
 
-  if (fs.existsSync(path.join(versionDir, 'index.js'))) {
+  if (fs.existsSync(path.join(versionDir, 'copilot'))) {
     fs.rmSync(stagingDir, { recursive: true, force: true });
     console.log(`${pkg}@${version} already installed, refreshing symlink...`);
   } else {
@@ -75,8 +75,8 @@ async function setup() {
       fs.mkdirSync(stagingDir, { recursive: true });
       execFileSync('tar', ['-xzf', tarballPath, '-C', stagingDir, '--strip-components=1']);
 
-      if (!fs.existsSync(path.join(stagingDir, 'index.js'))) {
-        throw new Error(`installation incomplete: missing ${path.join(stagingDir, 'index.js')}`);
+      if (!fs.existsSync(path.join(stagingDir, 'copilot'))) {
+        throw new Error(`installation incomplete: missing ${path.join(stagingDir, 'copilot')}`);
       }
 
       if (fs.existsSync(versionDir)) {
@@ -92,8 +92,6 @@ 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}`);
@@ -113,11 +111,9 @@ async function setupGlibcWrap() {
   }
 
   const wrapLibsDir = path.join(CACHE_DIR, 'glibc-wrap-libs');
-  const mxcWrapDir = path.join(CACHE_DIR, 'mxc-wrap', 'arm64');
 
   fs.rmSync(wrapLibsDir, { recursive: true, force: true });
   fs.mkdirSync(wrapLibsDir, { recursive: true });
-  fs.mkdirSync(mxcWrapDir, { recursive: true });
 
   for (const lib of ['ld-linux-aarch64.so.1', 'libc.so.6', 'libgcc_s.so.1']) {
     const src = path.join(glibcDir, lib);
@@ -129,155 +125,7 @@ async function setupGlibcWrap() {
   try { fs.unlinkSync(libcSo); } catch (_) {}
   fs.symlinkSync('libc.so.6', libcSo);
 
-  const wrapperPath = path.join(mxcWrapDir, 'lxc-exec');
-  const wrapperContent = [
-    '#!/bin/sh',
-    '_CACHE="${HOME}/.copilot-termux"',
-    '_LIBS="${_CACHE}/glibc-wrap-libs"',
-    '_LD="${_LIBS}/ld-linux-aarch64.so.1"',
-    '_LXC="${_CACHE}/current/mxc-bin/arm64/lxc-exec"',
-    'exec env -u LD_PRELOAD "$_LD" --library-path "$_LIBS" "$_LXC" "$@"',
-  ].join('\n') + '\n';
-  fs.writeFileSync(wrapperPath, wrapperContent, { mode: 0o755 });
-
-  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');
+  console.log('✓ glibc wrap ready');
 }
 
 module.exports = { setup };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash0816/copilot-termux",
-  "version": "1.0.83",
+  "version": "1.0.88",
   "description": "GitHub Copilot CLI for Termux (Android aarch64)",
   "license": "GPL-3.0-only",
   "readme": "README.md",
@@ -23,12 +23,8 @@
   "scripts": {},
   "files": [
     "bin",
-    "lib/platform-patch.js",
     "lib/setup.js",
     "lib/check-updates.js",
-    "lib/bionic-compat.so",
-    "lib/native/pty.node",
-    "scripts/bionic-compat.c",
     "config",
     "LICENSE",
     "THIRD-PARTY-NOTICES.md",