@bash0816/copilot-termux 1.0.69 → 1.0.70

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

@@ -1,15 +1,15 @@
 {
   "manifest_version": 1,
   "package_name": "@bash0816/copilot-termux",
-  "copilot_version": "1.0.69",
-  "latest_audited_version": "1.0.68-1",
+  "copilot_version": "1.0.70",
+  "latest_audited_version": "1.0.69",
   "latest_candidate_version": null,
-  "previous_stable_version": "1.0.68",
+  "previous_stable_version": "1.0.68-1",
   "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-07-07",
+  "last_updated": "2026-07-10",
   "manifest_url": "https://raw.githubusercontent.com/bash0816/Github-Copilot-Termux/main/packages/copilot-termux/config/copilot-termux-release-manifest.json"
 }

package/config/manifest.json

@@ -2,8 +2,8 @@
   "wrapperVersion": "2.0.0",
   "copilot": {
     "package": "@github/copilot-linuxmusl-arm64",
-    "version": "1.0.69",
-    "integrity": "sha512-Y6DY9RkyWV6l+S0cNz4d+AkUa38goNV5StQH3j8OoVrndK3+RgQeUjG1XpJ//PzXEXi4vQ0cZuc9XzFj/TY7tw=="
+    "version": "1.0.70",
+    "integrity": "sha512-Xy3tDjIMmMkZZzJjCrK5aDCLLV5+pyOfIcT1lWLmqVWJG0erpHXL6KU82nGW+0nc0TPqGZFHvOyQeLuXl+s3ZA=="
   },
   "glibcNode": {
     "version": "26.2.0",

package/lib/platform-patch.js

@@ -18,6 +18,33 @@ if (process.report) {
 const Module = require('module');
 const fs = require('fs');
 const path = require('path');
+const { execFile } = require('child_process');
+const { promisify } = require('util');
+const execFileAsync = promisify(execFile);
+
+// git CLIを配列引数で呼ぶ（shell経由なし、インジェクション対策）。失敗時は例外を投げず安全な既定値を返す。
+async function runGit(cwd, args) {
+  try {
+    const { stdout } = await execFileAsync('git', args, { cwd, encoding: 'utf8', maxBuffer: 16 * 1024 * 1024 });
+    return stdout;
+  } catch (_) {
+    return null;
+  }
+}
+
+// backupFile() は戻り値を `${r.substring(9,25)}-${Date.now()}` としてバックアップファイル名に使う。
+// substring(9,25) は "git-sha1:" (9文字) プレフィックスを除いた先頭16文字を取る計算であり、
+// ネイティブ実装の実際の戻り値フォーマットが "git-sha1:<40hex>" であることを示している。
+// 互換性のため git hash-object 相当（blob SHA1）を "git-sha1:" プレフィックス付きで返す。
+async function hashFileContent(gitRoot, filePath) {
+  try {
+    const out = await runGit(gitRoot, ['hash-object', '--', filePath]);
+    if (!out) return null;
+    return `git-sha1:${out.trim()}`;
+  } catch (_) {
+    return null;
+  }
+}
 
 const _pkgVersion = (() => {
   try { return require(path.join(__dirname, '..', 'package.json')).version; } catch (_) { return '1.0.65'; }
@@ -76,6 +103,7 @@ Module._load = function (request, parent, isMain) {
       path.basename(request) === 'runtime.node') {
     if (result.__copilotTermuxPatched) return result;
     result.__copilotTermuxPatched = true;
+    let _nfIdSeq = 3e6;
     const isGlibcMode = !!process.env.COPILOT_TERMUX_GLIBC_MODE;
     if (!isGlibcMode) {
       // Rust tokio を使う関数群を no-op に差し替え。
@@ -84,12 +112,29 @@ Module._load = function (request, parent, isMain) {
       // jsonrpcServer* は拡張 JSON-RPC サーバー (ThreadsafeFunction)、
       // lspClient* は LSP クライアント (ThreadsafeFunction)。
       // featureFlagService* は同期 Rust のため除外（no-op にすると .handle クラッシュ）。
-      const TOKIO_PATTERN = /^(ahpRelay|ahpRelayAuthenticate|ahpRelayCancelTurn|ahpRelayCompleteInput|ahpRelayCompletions|ahpRelayConfirmToolCall|ahpRelayConnect|ahpRelayCreate|ahpRelayCreateSession|ahpRelayDispose|ahpRelayGetPlan|ahpRelayListCheckpoints|ahpRelayListWorkspaceFiles|ahpRelayPendingRequiredResourcesJson|ahpRelayReadCheckpoint|ahpRelayRefreshSessions|ahpRelayReleaseSession|ahpRelayRemovePendingMessage|ahpRelaySelectAgent|ahpRelaySessionDiff|ahpRelaySetMode|ahpRelaySetModel|ahpRelaySetPendingMessage|ahpRelaySetSessionApproveAll|ahpRelaySetTitle|ahpRelayStartTurn|ahpRelayStateJson|ahpRelaySubscribeSession|ahpRelayTerminalDispose|ahpRelayTerminalEnsure|ahpRelayTerminalWrite|jsonrpcServer|jsonrpcServerAddConnection|jsonrpcServerBeginShutdown|jsonrpcServerConnectionClose|jsonrpcServerConnectionNotify|jsonrpcServerConnectionNotifyAfterResponse|jsonrpcServerConnectionRequest|jsonrpcServerConnectionWrite|jsonrpcServerCreate|jsonrpcServerDispatchComplete|jsonrpcServerRegisterSession|jsonrpcServerRemove|jsonrpcServerRemoveSession|jsonrpcServerStartTcpListener|jsonrpcServerStopTcpListener|lspClient|lspClientCloseDocument|lspClientCreateOwned|lspClientCreateOwnedSandboxed|lspClientDispose|lspClientEnhanceStartupErrorMessage|lspClientFindSourceFile|lspClientInitialize|lspClientInitialized|lspClientOpenDocument|lspClientOwnedShutdown|lspClientRequest|lspClientTakeExitInfo|lspClientWaitForDiagnostics|lspClientWaitForProjectLoad|modelHttp|modelHttpCancelRequest|modelHttpRegisterCancellation|modelHttpResetNetworking|networkFetch|networkFetchNextRequestId|networkFetchResetClients|sessionSqlite|sessionSqliteClose|sessionSqliteExec|sessionStore|sessionStoreBeginForgeSkillProposalGeneration|sessionStoreClose|sessionStoreCompleteForgeSkillProposalGeneration|sessionStoreDefaultPath|sessionStoreDeleteDynamicContextItem|sessionStoreEnsureSession|sessionStoreExec|sessionStoreExecuteReadOnly|sessionStoreExecuteReadOnlyAsync|sessionStoreFailStaleGeneratingForgeSkillProposals|sessionStoreGetCheckpoints|sessionStoreGetDynamicContextBoard|sessionStoreGetDynamicContextItem|sessionStoreGetFiles|sessionStoreGetForgeSkillProposalByFingerprint|sessionStoreGetForgeSkillProposalById|sessionStoreGetForgeSkillProposalWorkspaceBefore|sessionStoreGetForgeTrajectoryEvents|sessionStoreGetForgeTrajectoryEventsForScope|sessionStoreGetMaxTurnIndex|sessionStoreGetRefs|sessionStoreGetSession|sessionStoreGetStats|sessionStoreGetTurns|sessionStoreIncrementDynamicContextCount|sessionStoreIncrementDynamicContextReadCount|sessionStoreIndexWorkspaceArtifact|sessionStoreInsertAssistantUsageEventWithRuntimeDefaults|sessionStoreInsertCheckpointWithRuntimeDefaults|sessionStoreInsertDynamicContextItem|sessionStoreInsertFileWithRuntimeDefaults|sessionStoreInsertForgeTrajectoryEventWithRuntimeDefaults|sessionStoreInsertRefWithRuntimeDefaults|sessionStoreInsertTurnWithRuntimeDefaults|sessionStoreListForgeSkillProposals|sessionStoreOpen|sessionStoreSearch|sessionStoreTrackingEventOperations|sessionStoreTrackingExtractFilePath|sessionStoreTrackingExtractForgeTrajectoryEvents|sessionStoreTrackingExtractRefsFromBash|sessionStoreTrackingExtractRefsFromMcpTool|sessionStoreTrackingExtractRepoFromMcpTool|sessionStoreTrackingFlushOperations|sessionStoreTrackingInitialState|sessionStoreTransitionForgeSkillProposalStatus|sessionStoreUpsertDynamicContextItem|sessionStoreUpsertSessionWithRuntimeDefaults|websocketResponses)/;
+      const TOKIO_PATTERN = /^(ahpRelay|ahpRelayAuthenticate|ahpRelayCancelTurn|ahpRelayCompleteInput|ahpRelayCompletions|ahpRelayConfirmToolCall|ahpRelayConnect|ahpRelayCreate|ahpRelayCreateSession|ahpRelayDispose|ahpRelayGetPlan|ahpRelayListCheckpoints|ahpRelayListWorkspaceFiles|ahpRelayPendingRequiredResourcesJson|ahpRelayReadCheckpoint|ahpRelayRefreshSessions|ahpRelayReleaseSession|ahpRelayRemovePendingMessage|ahpRelaySelectAgent|ahpRelaySessionDiff|ahpRelaySetMode|ahpRelaySetModel|ahpRelaySetPendingMessage|ahpRelaySetSessionApproveAll|ahpRelaySetTitle|ahpRelayStartTurn|ahpRelayStateJson|ahpRelaySubscribeSession|ahpRelayTerminalDispose|ahpRelayTerminalEnsure|ahpRelayTerminalWrite|jsonrpcServer|jsonrpcServerAddConnection|jsonrpcServerBeginShutdown|jsonrpcServerConnectionClose|jsonrpcServerConnectionNotify|jsonrpcServerConnectionNotifyAfterResponse|jsonrpcServerConnectionRequest|jsonrpcServerConnectionWrite|jsonrpcServerCreate|jsonrpcServerDispatchComplete|jsonrpcServerRegisterSession|jsonrpcServerRemove|jsonrpcServerRemoveSession|jsonrpcServerStartTcpListener|jsonrpcServerStopTcpListener|lspClient|lspClientCloseDocument|lspClientCreateOwned|lspClientCreateOwnedSandboxed|lspClientDispose|lspClientEnhanceStartupErrorMessage|lspClientFindSourceFile|lspClientInitialize|lspClientInitialized|lspClientOpenDocument|lspClientOwnedShutdown|lspClientRequest|lspClientTakeExitInfo|lspClientWaitForDiagnostics|lspClientWaitForProjectLoad|modelHttp|modelHttpCancelRequest|modelHttpRegisterCancellation|modelHttpResetNetworking|networkFetch|networkFetchNextRequestId|networkFetchResetClients|sessionSqlite|sessionSqliteClose|sessionSqliteExec|sessionStore|sessionStoreBeginForgeSkillProposalGeneration|sessionStoreClose|sessionStoreCompleteForgeSkillProposalGeneration|sessionStoreDefaultPath|sessionStoreDeleteDynamicContextItem|sessionStoreEnsureSession|sessionStoreExec|sessionStoreExecuteReadOnly|sessionStoreExecuteReadOnlyAsync|sessionStoreExecuteReadOnlyWithCap|sessionStoreFailStaleGeneratingForgeSkillProposals|sessionStoreGetCheckpoints|sessionStoreGetDynamicContextBoard|sessionStoreGetDynamicContextItem|sessionStoreGetFiles|sessionStoreGetForgeSkillProposalByFingerprint|sessionStoreGetForgeSkillProposalById|sessionStoreGetForgeSkillProposalWorkspaceBefore|sessionStoreGetForgeTrajectoryEvents|sessionStoreGetForgeTrajectoryEventsForScope|sessionStoreGetMaxTurnIndex|sessionStoreGetRefs|sessionStoreGetSession|sessionStoreGetStats|sessionStoreGetTurns|sessionStoreIncrementDynamicContextCount|sessionStoreIncrementDynamicContextReadCount|sessionStoreIndexWorkspaceArtifact|sessionStoreInsertAssistantUsageEventWithRuntimeDefaults|sessionStoreInsertCheckpointWithRuntimeDefaults|sessionStoreInsertDynamicContextItem|sessionStoreInsertFileWithRuntimeDefaults|sessionStoreInsertForgeTrajectoryEventWithRuntimeDefaults|sessionStoreInsertRefWithRuntimeDefaults|sessionStoreInsertTurnWithRuntimeDefaults|sessionStoreListForgeSkillProposals|sessionStoreOpen|sessionStoreSearch|sessionStoreTrackingEventOperations|sessionStoreTrackingExtractFilePath|sessionStoreTrackingExtractForgeTrajectoryEvents|sessionStoreTrackingExtractRefsFromBash|sessionStoreTrackingExtractRefsFromMcpTool|sessionStoreTrackingExtractRepoFromMcpTool|sessionStoreTrackingFlushOperations|sessionStoreTrackingInitialState|sessionStoreTransitionForgeSkillProposalStatus|sessionStoreUpsertDynamicContextItem|sessionStoreUpsertSessionWithRuntimeDefaults|websocketResponses)/;
       for (const key of Object.keys(result)) {
         if (TOKIO_PATTERN.test(key) && typeof result[key] === 'function') {
           result[key] = () => undefined;
         }
       }
+      // networkFetchNextRequestId は networkFetchStreamStart/RequestCancel の相関キーとして
+      // 実際に使われるため、no-opのままにはできない。TOKIO_PATTERNの一括no-op化で
+      // 潰された直後にJSの単調増加ID生成で上書きする。
+      result.networkFetchNextRequestId = () => 'nf-' + (++_nfIdSeq);
+      // MCP-BIONIC-001: 実機でSIGSEGV確認済みの2関数を、bionicモード限定でクリーンエラー化する。
+      // 対象外の残り10関数はdocs/KNOWN-BUGS.mdのMCP-BIONIC-001セクションに未検証事項として個別記録済み。
+      const BIONIC_SIGSEGV_STUBS = [
+        'capiClientRetrieveAvailableModels',
+        'mcpClientConnectStreamableHttpWithHandlersAndOnclose',
+      ];
+      for (const _key of BIONIC_SIGSEGV_STUBS) {
+        if (typeof result[_key] === 'function') {
+          result[_key] = () => {
+            throw new Error(`${_key} unsupported on Android bionic (native tokio disabled to avoid SIGSEGV)`);
+          };
+        }
+      }
       // git*Async: Rust tokio async functions — type-safe stubs to prevent SIGSEGV.
       // Returns empty/null values matching what app.js callers expect.
       const GIT_ASYNC_STUBS = {
@@ -112,6 +157,58 @@ Module._load = function (request, parent, isMain) {
         gitStatusPorcelainAllAsync: async () => null,
         gitCurrentBranchRemoteAsync: async () => null,
         gitWorkingTreeDiffStatsAsync: async () => ({ linesAdded: 0, linesRemoved: 0 }),
+        gitFindRootWithOptionalWorktreeResolutionAsync: async (cwd) => {
+          const out = await runGit(cwd || process.cwd(), ['rev-parse', '--show-toplevel']);
+          const root = out ? out.trim() : null;
+          return root ? { found: true, gitRoot: root } : { found: false };
+        },
+        gitCommitShaAsync: async (gitRoot) => {
+          const out = await runGit(gitRoot, ['rev-parse', 'HEAD']);
+          return out ? out.trim() : null;
+        },
+        gitStatusFilesAsync: async (gitRoot) => {
+          // --untracked-files=all: 未追跡ディレクトリを "?? dir/" に畳まず、配下ファイルを個別に列挙させる。
+          // SnapshotManager.backupFile はディレクトリを保存できないため、ディレクトリ単位の畳み込みだと
+          // 未追跡ディレクトリ配下のファイルが rollback 対象から漏れる。
+          const out = await runGit(gitRoot, ['status', '--porcelain=v1', '-z', '--untracked-files=all']);
+          if (!out) return [];
+          const entries = out.split('\0').filter(Boolean);
+          const results = [];
+          for (let i = 0; i < entries.length; i++) {
+            const entry = entries[i];
+            const status = entry.slice(0, 2);
+            const relPath = entry.slice(3);
+            // rename/copy: X or Y can be 'R'/'C' (index or worktree side); -z format is "to\0from\0"
+            const isRenameOrCopy = status[0] === 'R' || status[0] === 'C' || status[1] === 'R' || status[1] === 'C';
+            if (isRenameOrCopy && entries[i + 1] !== undefined) {
+              i++; // skip the old path field
+            }
+            // 削除(D)されたファイルは lstat/hash 対象が存在しないため除外する。
+            if (status[0] === 'D' || status[1] === 'D') continue;
+            results.push({ path: path.join(gitRoot, relPath), status });
+          }
+          return results;
+        },
+        gitHashFilesPrefixedAsync: async (gitRoot, files) => {
+          const list = Array.isArray(files) ? files : [];
+          const out = [];
+          for (const p of list) {
+            const hash = await hashFileContent(gitRoot, p);
+            if (hash) out.push({ path: p, hash });
+          }
+          return out;
+        },
+        gitHashSingleFileAsync: async (gitRoot, filePath) => {
+          const hash = await hashFileContent(gitRoot, filePath);
+          return hash || '';
+        },
+        gitUntrackedPathsWithOptionalDirectoryAsync: async (gitRoot, opts) => {
+          const args = ['ls-files', '--others', '--exclude-standard'];
+          if (opts && opts.directory) args.push('--directory');
+          const out = await runGit(gitRoot, args);
+          if (!out) return [];
+          return out.split('\n').filter(Boolean);
+        },
       };
       for (const [key, stub] of Object.entries(GIT_ASYNC_STUBS)) {
         if (typeof result[key] === 'function') result[key] = stub;
@@ -283,15 +380,17 @@ Module._load = function (request, parent, isMain) {
     }
     // --- JS networkFetch* implementation (bionic: tokio networkFetch* are no-op'd) ---
     // B7 が QXe() から直接呼ばれる MCP 専用パスでクラッシュするため JS で代替。
-    // networkFetchStreamStart → { requestId, response: Promise<{handle,url,status,statusText,headers}> }
+    // networkFetchStreamStart(requestId, req) → Promise<{handle,url,status,statusText,headers}>
+    //   （2026-07-12修正: 実際のCLI本体は requestId を第1引数、req を第2引数として渡し、
+    //     戻り値を直接thenableとして扱う。旧実装は1引数・{requestId,response}のラップ返却で
+    //     この規約と不一致だったため s.then is not a function / Failed to parse URL from undefined
+    //     エラーの原因になっていた。詳細は docs/KNOWN-BUGS.md AGENT-001参照）
     // networkFetchStreamRead   → Promise<{ done, body?: Uint8Array }>
     // networkFetchStreamClose  → void
     // networkFetchRequestCancel → void
     const _nfMap = new Map();
-    let _nfIdSeq = 3e6;
 
-    result.networkFetchStreamStart = function(req) {
-      const requestId = 'nf-' + (++_nfIdSeq);
+    result.networkFetchStreamStart = function(requestId, req) {
       const abortCtrl = new AbortController();
       const entry = { abort: () => abortCtrl.abort(), reader: null };
       _nfMap.set(requestId, entry);
@@ -342,7 +441,7 @@ Module._load = function (request, parent, isMain) {
         return { handle, url: res.url, status: res.status, statusText: res.statusText, headers: respHeaders };
       })();
 
-      return { requestId, response };
+      return response;
     };
 
     result.networkFetchStreamRead = function(handle) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bash0816/copilot-termux",
-  "version": "1.0.69",
+  "version": "1.0.70",
   "description": "GitHub Copilot CLI for Termux (Android aarch64)",
   "license": "GPL-3.0-only",
   "readme": "README.md",