@jojonax/codex-copilot 1.5.5 → 1.6.0

package/src/utils/shell-bootstrap.js

@@ -0,0 +1,404 @@
+/**
+ * Shell Bootstrap — ensures `sh` (POSIX shell) is available on Windows.
+ * 
+ * Strategy (one-time check at CLI startup):
+ *   1. Try `sh --version` — if works, done.
+ *   2. Scan known Git-for-Windows paths for sh.exe.
+ *   3. If found, prepend its directory to process.env.PATH.
+ *   4. If not found, AUTO-INSTALL Git for Windows:
+ *      a) Try winget (built into Windows 10/11)
+ *      b) Fallback: download installer via PowerShell + silent install
+ *   5. After install, re-scan and configure PATH.
+ * 
+ * On non-Windows platforms this module is a no-op.
+ */
+
+import { execSync } from 'child_process';
+import { existsSync } from 'fs';
+import { dirname } from 'path';
+import { createInterface } from 'readline';
+import { log } from './logger.js';
+
+// ──────────────────────────────────────────────
+// Known Git-for-Windows sh.exe locations
+// ──────────────────────────────────────────────
+
+const GIT_SH_CANDIDATES = [
+  // 64-bit default
+  'C:\\Program Files\\Git\\bin\\sh.exe',
+  'C:\\Program Files\\Git\\usr\\bin\\sh.exe',
+  // 32-bit
+  'C:\\Program Files (x86)\\Git\\bin\\sh.exe',
+  'C:\\Program Files (x86)\\Git\\usr\\bin\\sh.exe',
+  // Scoop
+  `${process.env.USERPROFILE}\\scoop\\apps\\git\\current\\bin\\sh.exe`,
+  `${process.env.USERPROFILE}\\scoop\\apps\\git\\current\\usr\\bin\\sh.exe`,
+  // Chocolatey
+  'C:\\ProgramData\\chocolatey\\lib\\git\\tools\\bin\\sh.exe',
+  // Custom common paths
+  'C:\\Git\\bin\\sh.exe',
+  'D:\\Git\\bin\\sh.exe',
+  'D:\\Program Files\\Git\\bin\\sh.exe',
+];
+
+// ──────────────────────────────────────────────
+// Detection helpers
+// ──────────────────────────────────────────────
+
+/**
+ * Check if `sh` is callable from the current PATH.
+ */
+function isShAvailable() {
+  try {
+    execSync('sh --version', {
+      stdio: ['pipe', 'pipe', 'pipe'],
+      timeout: 5000,
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Scan well-known paths for sh.exe.
+ * Also checks GIT_INSTALL_ROOT env var and `where git` output.
+ * @returns {string|null} Full path to sh.exe, or null
+ */
+function findShExe() {
+  // Check GIT_INSTALL_ROOT env var first
+  const gitRoot = process.env.GIT_INSTALL_ROOT;
+  if (gitRoot) {
+    for (const sub of ['\\bin\\sh.exe', '\\usr\\bin\\sh.exe']) {
+      const p = gitRoot + sub;
+      if (existsSync(p)) return p;
+    }
+  }
+
+  // Discover via `where git` command
+  try {
+    const gitPath = execSync('where git', {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+      timeout: 5000,
+    }).trim().split('\n')[0].trim();
+    if (gitPath) {
+      const gitDir = dirname(dirname(gitPath)); // up from cmd/git.exe
+      for (const sub of ['\\bin\\sh.exe', '\\usr\\bin\\sh.exe']) {
+        const p = gitDir + sub;
+        if (existsSync(p)) return p;
+      }
+    }
+  } catch {
+    // `git` not in PATH either
+  }
+
+  // Scan hardcoded candidate paths
+  for (const p of GIT_SH_CANDIDATES) {
+    if (existsSync(p)) return p;
+  }
+
+  return null;
+}
+
+/**
+ * Add sh.exe's directory (and usr/bin) to process.env.PATH.
+ * @param {string} shPath - Full path to sh.exe
+ * @returns {boolean} true if sh is now callable
+ */
+function addShToPath(shPath) {
+  const shDir = dirname(shPath);
+  process.env.PATH = `${shDir};${process.env.PATH}`;
+
+  // Also add usr/bin for other Unix tools (cat, grep, find, tail, etc.)
+  const usrBinDir = shDir.replace(/\\bin$/, '\\usr\\bin');
+  if (existsSync(usrBinDir) && usrBinDir !== shDir) {
+    process.env.PATH = `${usrBinDir};${process.env.PATH}`;
+  }
+
+  return isShAvailable();
+}
+
+// ──────────────────────────────────────────────
+// Auto-install
+// ──────────────────────────────────────────────
+
+/**
+ * Simple sync-style Y/n prompt (standalone, no dependency on prompt.js
+ * which creates a persistent readline that interferes with later prompts).
+ */
+function askYesNo(question) {
+  return new Promise((resolve) => {
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    rl.question(`  ${question} (Y/n): `, (answer) => {
+      rl.close();
+      const a = answer.trim().toLowerCase();
+      resolve(a === '' || a === 'y' || a === 'yes');
+    });
+  });
+}
+
+/**
+ * Check if winget is available.
+ */
+function hasWinget() {
+  try {
+    execSync('winget --version', {
+      stdio: ['pipe', 'pipe', 'pipe'],
+      timeout: 10000,
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Install Git for Windows via winget (built into Windows 10/11).
+ * @returns {boolean} true if installation succeeded
+ */
+function installViaWinget() {
+  log.info('📦 Installing Git for Windows via winget...');
+  log.dim('  (This may trigger a UAC elevation prompt)');
+  try {
+    execSync(
+      'winget install Git.Git --silent --accept-source-agreements --accept-package-agreements',
+      {
+        stdio: 'inherit',  // Show progress to user
+        timeout: 300000,   // 5 minute timeout
+      }
+    );
+    log.info('✅ Git for Windows installed via winget');
+    return true;
+  } catch (err) {
+    log.warn(`winget install failed: ${(err.message || '').substring(0, 100)}`);
+    return false;
+  }
+}
+
+/**
+ * Install Git for Windows by downloading the installer directly.
+ * Uses PowerShell to download and run the installer silently.
+ * @returns {boolean} true if installation succeeded
+ */
+function installViaDownload() {
+  log.info('📦 Downloading Git for Windows installer...');
+
+  // Step 1: Query GitHub API for the latest Git for Windows release URL
+  const apiUrl = 'https://api.github.com/repos/git-for-windows/git/releases/latest';
+  let downloadUrl;
+
+  try {
+    const releaseJson = execSync(
+      `powershell -NoProfile -Command "(Invoke-RestMethod -Uri '${apiUrl}').assets | Where-Object { $_.name -match '64-bit\\.exe$' } | Select-Object -First 1 -ExpandProperty browser_download_url"`,
+      {
+        encoding: 'utf-8',
+        stdio: ['pipe', 'pipe', 'pipe'],
+        timeout: 30000,
+      }
+    ).trim();
+
+    if (releaseJson && releaseJson.startsWith('http')) {
+      downloadUrl = releaseJson;
+    }
+  } catch {
+    // Fallback to a known stable URL pattern
+  }
+
+  // Fallback URL if API query failed
+  if (!downloadUrl) {
+    downloadUrl = 'https://github.com/git-for-windows/git/releases/latest/download/Git-2.47.1-64-bit.exe';
+    log.dim('  Using fallback download URL');
+  }
+
+  const installerPath = `${process.env.TEMP}\\git-installer.exe`;
+
+  try {
+    // Step 2: Download
+    log.dim(`  ↓ ${downloadUrl.substring(0, 80)}...`);
+    execSync(
+      `powershell -NoProfile -Command "` +
+      `[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; ` +
+      `$ProgressPreference = 'SilentlyContinue'; ` +
+      `Invoke-WebRequest -Uri '${downloadUrl}' -OutFile '${installerPath}' -UseBasicParsing"`,
+      {
+        stdio: 'inherit',  // Show progress
+        timeout: 300000,   // 5 min for download
+      }
+    );
+
+    if (!existsSync(installerPath)) {
+      log.warn('Download failed — installer file not found');
+      return false;
+    }
+
+    // Step 3: Run silent install
+    log.info('⚙️  Running installer (silent mode)...');
+    log.dim('  (This may trigger a UAC elevation prompt)');
+    execSync(
+      `"${installerPath}" /VERYSILENT /NORESTART /NOCANCEL /SP- /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS /COMPONENTS="icons,ext\\shellhere,ext\\guihere,gitlfs,assoc,assoc_sh,autoupdate"`,
+      {
+        stdio: 'inherit',
+        timeout: 300000,  // 5 min for install
+      }
+    );
+
+    log.info('✅ Git for Windows installed');
+    return true;
+  } catch (err) {
+    log.warn(`Direct install failed: ${(err.message || '').substring(0, 100)}`);
+    return false;
+  } finally {
+    // Cleanup installer
+    try {
+      if (existsSync(installerPath)) {
+        execSync(`del "${installerPath}"`, { stdio: 'pipe' });
+      }
+    } catch { /* ignore */ }
+  }
+}
+
+/**
+ * Refresh PATH from the Windows registry after a new installation.
+ * New installs add to the system/user PATH in the registry,
+ * but the current process still has the old PATH.
+ */
+function refreshPathFromRegistry() {
+  try {
+    // Read both Machine and User PATH from registry and merge
+    const newPath = execSync(
+      `powershell -NoProfile -Command "` +
+      `$machine = [Environment]::GetEnvironmentVariable('Path', 'Machine'); ` +
+      `$user = [Environment]::GetEnvironmentVariable('Path', 'User'); ` +
+      `Write-Output ($machine + ';' + $user)"`,
+      {
+        encoding: 'utf-8',
+        stdio: ['pipe', 'pipe', 'pipe'],
+        timeout: 10000,
+      }
+    ).trim();
+
+    if (newPath) {
+      process.env.PATH = newPath;
+      log.dim('  PATH refreshed from registry');
+    }
+  } catch {
+    // Non-fatal — we'll still try to find sh.exe by scanning
+  }
+}
+
+/**
+ * Attempt to auto-install Git for Windows.
+ * Tries winget first, then falls back to direct download.
+ * @returns {boolean} true if sh is now available
+ */
+async function autoInstallGit() {
+  log.blank();
+  log.info('╔══════════════════════════════════════════════════╗');
+  log.info('║  POSIX shell (sh) not found on this system.     ║');
+  log.info('║  codex-copilot needs sh for Unix commands.      ║');
+  log.info('║                                                  ║');
+  log.info('║  Git for Windows includes sh.exe + cat, grep,   ║');
+  log.info('║  find, tail, and other required tools.           ║');
+  log.info('╚══════════════════════════════════════════════════╝');
+  log.blank();
+
+  const yes = await askYesNo('Auto-install Git for Windows now?');
+  if (!yes) {
+    log.dim('  Skipped. Install manually: https://git-scm.com/download/win');
+    return false;
+  }
+
+  log.blank();
+
+  // Strategy 1: winget (cleanest, built into modern Windows)
+  let installed = false;
+  if (hasWinget()) {
+    log.dim('  winget detected — using package manager');
+    installed = installViaWinget();
+  }
+
+  // Strategy 2: Direct download + silent install
+  if (!installed) {
+    if (hasWinget()) {
+      log.dim('  winget failed — trying direct download...');
+    } else {
+      log.dim('  winget not available — trying direct download...');
+    }
+    installed = installViaDownload();
+  }
+
+  if (!installed) {
+    log.error('❌ Auto-install failed. Please install manually:');
+    log.error('   → https://git-scm.com/download/win');
+    return false;
+  }
+
+  // Refresh PATH from registry (picks up the new Git installation)
+  refreshPathFromRegistry();
+
+  // Re-scan for sh.exe
+  const shPath = findShExe();
+  if (shPath) {
+    addShToPath(shPath);
+    if (isShAvailable()) {
+      log.info(`✅ sh available at ${shPath}`);
+      return true;
+    }
+  }
+
+  // Last resort: try common post-install paths directly
+  const postInstallPaths = [
+    'C:\\Program Files\\Git\\bin\\sh.exe',
+    'C:\\Program Files\\Git\\usr\\bin\\sh.exe',
+  ];
+  for (const p of postInstallPaths) {
+    if (existsSync(p)) {
+      addShToPath(p);
+      if (isShAvailable()) {
+        log.info(`✅ sh available at ${p}`);
+        return true;
+      }
+    }
+  }
+
+  log.warn('Git installed but sh.exe not found — please restart your terminal');
+  return false;
+}
+
+// ──────────────────────────────────────────────
+// Public API
+// ──────────────────────────────────────────────
+
+/**
+ * Bootstrap shell environment on Windows.
+ * 
+ * Call this ONCE at CLI startup. It either:
+ *   - Does nothing (sh already available, or not Windows)
+ *   - Finds sh.exe and adds it to PATH for this process
+ *   - Auto-installs Git for Windows and configures PATH
+ *   - Returns false only if everything failed
+ * 
+ * @returns {Promise<boolean>} true if sh is available after bootstrap
+ */
+export async function bootstrapShell() {
+  // Non-Windows — sh is always available
+  if (process.platform !== 'win32') return true;
+
+  // Already in PATH — great, nothing to do
+  if (isShAvailable()) return true;
+
+  log.dim('  sh not found in PATH — scanning for Git for Windows...');
+
+  // Try to find existing sh.exe installation
+  const shPath = findShExe();
+  if (shPath) {
+    if (addShToPath(shPath)) {
+      log.info(`✅ Found sh at ${shPath} — added to PATH`);
+      return true;
+    }
+  }
+
+  // Not found anywhere — offer to auto-install
+  return await autoInstallGit();
+}

package/src/utils/update-check.js

@@ -1,103 +1,103 @@
-/**
- * Version update checker
- * 
- * - Checks npm registry for latest version on startup
- * - 24h cache to avoid frequent network requests
- * - Prints update prompt if a newer version is available
- */
-
-import { execSync } from 'child_process';
-import { readFileSync, writeFileSync, mkdirSync } from 'fs';
-import { resolve } from 'path';
-import { homedir } from 'os';
-import { log } from './logger.js';
-
-const PACKAGE_NAME = '@jojonax/codex-copilot';
-const CACHE_FILE = resolve(homedir(), '.codex-copilot-update-cache.json');
-const CACHE_TTL = 24 * 60 * 60 * 1000; // 24 hours
-
-/**
- * Read cached version info
- */
-function readCache() {
-  try {
-    const data = JSON.parse(readFileSync(CACHE_FILE, 'utf-8'));
-    if (Date.now() - data.timestamp < CACHE_TTL) {
-      return data.latestVersion;
-    }
-  } catch {
-    // Cache miss or corrupt — ignore
-  }
-  return null;
-}
-
-/**
- * Write version info to cache
- */
-function writeCache(latestVersion) {
-  try {
-    writeFileSync(CACHE_FILE, JSON.stringify({
-      latestVersion,
-      timestamp: Date.now(),
-    }));
-  } catch {
-    // Permission error — ignore silently
-  }
-}
-
-/**
- * Fetch latest version from npm registry
- */
-function fetchLatestVersion() {
-  try {
-    const output = execSync(`npm view ${PACKAGE_NAME} version`, {
-      encoding: 'utf-8',
-      stdio: ['pipe', 'pipe', 'pipe'],
-      timeout: 5000, // 5s timeout
-    }).trim();
-    return output || null;
-  } catch {
-    // Network error, npm not available — ignore
-    return null;
-  }
-}
-
-/**
- * Compare semantic version strings
- * @returns {boolean} true if latest > current
- */
-function isNewer(current, latest) {
-  if (!current || !latest) return false;
-  const c = current.split('.').map(Number);
-  const l = latest.split('.').map(Number);
-  for (let i = 0; i < 3; i++) {
-    if ((l[i] || 0) > (c[i] || 0)) return true;
-    if ((l[i] || 0) < (c[i] || 0)) return false;
-  }
-  return false;
-}
-
-/**
- * Check for updates and print notification
- * @param {string} currentVersion - Current installed version
- */
-export function checkForUpdates(currentVersion) {
-  // 1. Check cache first
-  let latest = readCache();
-
-  // 2. Cache miss → fetch from npm
-  if (!latest) {
-    latest = fetchLatestVersion();
-    if (latest) {
-      writeCache(latest);
-    }
-  }
-
-  // 3. Compare and notify
-  if (latest && isNewer(currentVersion, latest)) {
-    log.blank();
-    log.warn(`Update available: v${currentVersion} → v${latest}`);
-    log.dim(`  Run the following command to update:`);
-    log.dim(`  npm install -g ${PACKAGE_NAME}@${latest}`);
-  }
-}
+/**
+ * Version update checker
+ * 
+ * - Checks npm registry for latest version on startup
+ * - 24h cache to avoid frequent network requests
+ * - Prints update prompt if a newer version is available
+ */
+
+import { execSync } from 'child_process';
+import { readFileSync, writeFileSync, mkdirSync } from 'fs';
+import { resolve } from 'path';
+import { homedir } from 'os';
+import { log } from './logger.js';
+
+const PACKAGE_NAME = '@jojonax/codex-copilot';
+const CACHE_FILE = resolve(homedir(), '.codex-copilot-update-cache.json');
+const CACHE_TTL = 24 * 60 * 60 * 1000; // 24 hours
+
+/**
+ * Read cached version info
+ */
+function readCache() {
+  try {
+    const data = JSON.parse(readFileSync(CACHE_FILE, 'utf-8'));
+    if (Date.now() - data.timestamp < CACHE_TTL) {
+      return data.latestVersion;
+    }
+  } catch {
+    // Cache miss or corrupt — ignore
+  }
+  return null;
+}
+
+/**
+ * Write version info to cache
+ */
+function writeCache(latestVersion) {
+  try {
+    writeFileSync(CACHE_FILE, JSON.stringify({
+      latestVersion,
+      timestamp: Date.now(),
+    }));
+  } catch {
+    // Permission error — ignore silently
+  }
+}
+
+/**
+ * Fetch latest version from npm registry
+ */
+function fetchLatestVersion() {
+  try {
+    const output = execSync(`npm view ${PACKAGE_NAME} version`, {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+      timeout: 5000, // 5s timeout
+    }).trim();
+    return output || null;
+  } catch {
+    // Network error, npm not available — ignore
+    return null;
+  }
+}
+
+/**
+ * Compare semantic version strings
+ * @returns {boolean} true if latest > current
+ */
+function isNewer(current, latest) {
+  if (!current || !latest) return false;
+  const c = current.split('.').map(Number);
+  const l = latest.split('.').map(Number);
+  for (let i = 0; i < 3; i++) {
+    if ((l[i] || 0) > (c[i] || 0)) return true;
+    if ((l[i] || 0) < (c[i] || 0)) return false;
+  }
+  return false;
+}
+
+/**
+ * Check for updates and print notification
+ * @param {string} currentVersion - Current installed version
+ */
+export function checkForUpdates(currentVersion) {
+  // 1. Check cache first
+  let latest = readCache();
+
+  // 2. Cache miss → fetch from npm
+  if (!latest) {
+    latest = fetchLatestVersion();
+    if (latest) {
+      writeCache(latest);
+    }
+  }
+
+  // 3. Compare and notify
+  if (latest && isNewer(currentVersion, latest)) {
+    log.blank();
+    log.warn(`Update available: v${currentVersion} → v${latest}`);
+    log.dim(`  Run the following command to update:`);
+    log.dim(`  npm install -g ${PACKAGE_NAME}@${latest}`);
+  }
+}