shortcutxl 0.2.6 → 0.2.8

package/dist/custom/preflight.js

@@ -14,6 +14,35 @@ import { resetShellConfig } from '../utils/shell.js';
 import { EXCEL_HTTP_URL } from './constants.js';
 import { fetchExcelConfig } from './excel-config.js';
 import { getStableXllDir } from './sync-xll.js';
+// ── PATH refresh ────────────────────────────────────────────────────────
+/**
+ * Re-read the Windows PATH from the registry and merge it into process.env.PATH.
+ * After winget installs a program (Git, Python, etc.) the system/user PATH is
+ * updated, but the running Node process still has the old value. This reads the
+ * current registry entries and splices in any new directories.
+ */
+function refreshPath() {
+    try {
+        const user = spawnSync('reg', ['query', 'HKCU\\Environment', '/v', 'Path'], { encoding: 'utf-8', timeout: 5_000 });
+        const system = spawnSync('reg', ['query', 'HKLM\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment', '/v', 'Path'], { encoding: 'utf-8', timeout: 5_000 });
+        const extract = (out) => (out.match(/REG_(?:EXPAND_)?SZ\s+(.+)/i)?.[1] ?? '')
+            .split(';')
+            .map((p) => p.trim())
+            .filter(Boolean);
+        const fresh = new Set([...extract(system.stdout ?? ''), ...extract(user.stdout ?? '')]);
+        const current = (process.env.PATH ?? '').split(';').filter(Boolean);
+        const currentSet = new Set(current.map((p) => p.toLowerCase()));
+        for (const dir of fresh) {
+            if (!currentSet.has(dir.toLowerCase())) {
+                current.push(dir);
+            }
+        }
+        process.env.PATH = current.join(';');
+    }
+    catch {
+        // Best-effort — if registry read fails, continue with stale PATH
+    }
+}
 /** Accumulated log entries, exposed to callers via runPreflight(). */
 const preflightLog = [];
 let currentStep = 'setup';
@@ -135,7 +164,9 @@ function runWithProgress(cmd, options) {
 // ── Step implementations ─────────────────────────────────────────────────
 async function ensureGitBash() {
     header('Git');
-    const bashCheck = run('bash --version');
+    // Use git's bundled bash directly — plain `bash` can hang on Windows
+    // when WSL is installed but not configured.
+    const bashCheck = run('git --version', { timeout: 5_000 });
     if (bashCheck.ok) {
         ok('Installed.');
         return;
@@ -158,12 +189,13 @@ async function ensureGitBash() {
         }
     }
     log('Installing Git (you may see a permissions prompt — click Yes)...');
-    const result = await runWithProgress('winget install --id Git.Git -e -h --accept-source-agreements --accept-package-agreements', { timeout: 120_000, label: 'Installing Git' });
+    const result = await runWithProgress('winget install --id Git.Git -e -h --accept-source-agreements --accept-package-agreements', { timeout: 300_000, label: 'Installing Git' });
     if (!result.ok && !result.stdout.includes('already installed')) {
         warn('Install failed — the setup agent will help.');
         return;
     }
-    // Reset shell cache so it re-detects bash
+    // Refresh PATH so the newly installed git is visible to this process
+    refreshPath();
     resetShellConfig();
     const gitCheck = run('git --version');
     if (!gitCheck.ok) {
@@ -196,12 +228,13 @@ async function ensurePython() {
             return;
         }
         log('Installing Python 3.12...');
-        const result = await runWithProgress('winget install --id Python.Python.3.12 -e -h --accept-source-agreements --accept-package-agreements', { timeout: 120_000, label: 'Installing Python 3.12' });
+        const result = await runWithProgress('winget install --id Python.Python.3.12 -e -h --accept-source-agreements --accept-package-agreements', { timeout: 600_000, label: 'Installing Python 3.12' });
         if (!result.ok && !result.stdout.includes('already installed')) {
             warn('Install failed — the setup agent will help.');
             return;
         }
         freshInstall = true;
+        refreshPath();
         detected = detectPython312();
         if (!detected) {
             warn('Installed but not detected yet — try restarting your terminal.');
@@ -231,7 +264,7 @@ async function ensurePython() {
     }
     // Install pywin32 + openpyxl + playwright + httpx
     log('Installing required packages...');
-    const pipResult = await runWithProgress(`${pythonCmd} -m pip install pywin32 openpyxl playwright httpx`, { timeout: 120_000, label: 'Installing packages' });
+    const pipResult = await runWithProgress(`${pythonCmd} -m pip install pywin32 openpyxl playwright httpx`, { timeout: 300_000, label: 'Installing packages' });
     if (pipResult.ok) {
         ok('Packages installed.');
     }
@@ -253,7 +286,7 @@ async function ensurePython() {
         if (installChrome) {
             log('Installing Chrome for PDF conversion...');
             const pwResult = await runWithProgress(`${pythonCmd} -m playwright install chrome`, {
-                timeout: 120_000,
+                timeout: 300_000,
                 label: 'Installing Chrome'
             });
             if (pwResult.ok) {

package/dist/custom/prompts/installation.js

@@ -140,6 +140,7 @@ End-to-end verification: agent → HTTP → XLL → Python → COM → Excel.
 
 Run via excel_exec:
 \`\`\`python
+from shortcut_xl import xl_app
 print(f"Excel {xl_app().Version}")
 \`\`\`
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shortcutxl",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "type": "module",
   "files": [
     "dist/",