@cccarv82/freya 3.7.4 → 3.7.6

package/cli/web.js

@@ -970,8 +970,21 @@ function run(cmd, args, cwd, extraEnv, stdinData) {
     const env = extraEnv ? { ...process.env, ...extraEnv } : process.env;
 
     try {
-      // Use shell: true on all platforms — ensures .cmd/.bat shims (npm globals) are found on Windows
-      child = spawn(cmd, args, { cwd, shell: true, env, windowsHide: true });
+      if (process.platform === 'win32') {
+        // Use PowerShell — fnm/nvm set PATH only in PowerShell profile,
+        // so cmd.exe (shell:true) can't find npm global .cmd shims like copilot.
+        // Do NOT use -NoProfile: the profile is what loads fnm/nvm PATH entries.
+        const escapedArgs = args.map(a => {
+          const escaped = String(a).replace(/'/g, "''");
+          return `'${escaped}'`;
+        });
+        const psCommand = `& '${cmd}' ${escapedArgs.join(' ')}`;
+        child = spawn('powershell.exe', [
+          '-NoLogo', '-Command', psCommand
+        ], { cwd, env, windowsHide: true });
+      } else {
+        child = spawn(cmd, args, { cwd, shell: true, env });
+      }
     } catch (e) {
       return resolve({ code: 1, stdout: '', stderr: e.message || String(e) });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cccarv82/freya",
-  "version": "3.7.4",
+  "version": "3.7.6",
   "description": "Personal AI Assistant with local-first persistence",
   "scripts": {
     "health": "node scripts/validate-data.js && node scripts/validate-structure.js",

package/templates/base/scripts/retroactive-ingest.js

@@ -21,7 +21,7 @@
 const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
-const { spawn } = require('child_process');
+const { spawn, execSync } = require('child_process');
 const os = require('os');
 
 // Parse args
@@ -58,10 +58,19 @@ function run(cmd, args, cwd, extraEnv) {
     const env = extraEnv ? { ...process.env, ...extraEnv } : process.env;
     try {
       if (process.platform === 'win32') {
-        const comspec = process.env.ComSpec || 'cmd.exe';
-        child = spawn(comspec, ['/d', '/s', '/c', cmd, ...args], { cwd, shell: false, env });
+        // Use PowerShell — fnm/nvm set PATH only in PS profile,
+        // cmd.exe cannot find npm global .cmd shims like copilot.
+        // Do NOT use -NoProfile: profile is what loads fnm PATH entries.
+        const escapedArgs = args.map(a => {
+          const escaped = String(a).replace(/'/g, "''");
+          return `'${escaped}'`;
+        });
+        const psCommand = `& '${cmd}' ${escapedArgs.join(' ')}`;
+        child = spawn('powershell.exe', [
+          '-NoLogo', '-Command', psCommand
+        ], { cwd, env, windowsHide: true });
       } else {
-        child = spawn(cmd, args, { cwd, shell: false, env });
+        child = spawn(cmd, args, { cwd, shell: true, env });
       }
     } catch (e) {
       return resolve({ code: 1, stdout: '', stderr: e.message || String(e) });
@@ -189,28 +198,35 @@ async function main() {
   // Step 3: Extract tasks/blockers from each daily log via planner
   console.log('── Step 3: Extracting tasks & blockers via planner ──');
 
-  // Detect copilot command: try user override, then 'copilot', then 'gh copilot'
+  // Detect copilot command (now uses PowerShell on Windows, so fnm PATH works)
   let cmd = process.env.COPILOT_CMD || '';
+  let useGhCopilot = false;
   if (!cmd) {
-    // Quick test: try 'copilot --version'
+    console.log('  ℹ Detecting copilot CLI...');
     const testCopilot = await run('copilot', ['--version'], workspaceDir);
     if (testCopilot.code === 0) {
       cmd = 'copilot';
+      console.log(`  ✓ Found: ${(testCopilot.stdout || '').trim().split(/\r?\n/)[0]}`);
     } else {
-      // Try 'gh copilot' via 'gh'
       const testGh = await run('gh', ['copilot', '--version'], workspaceDir);
       if (testGh.code === 0) {
         cmd = 'gh';
-        console.log('  ℹ Using "gh copilot" as planner command');
+        useGhCopilot = true;
+        console.log('  ✓ Using gh copilot');
       } else {
-        cmd = 'copilot'; // default, will fail with clear error
-        console.log('  ⚠ Could not detect copilot CLI. Set COPILOT_CMD env var if needed.');
-        console.log(`    copilot test: code=${testCopilot.code} stderr=${(testCopilot.stderr || '').slice(0, 200)}`);
-        console.log(`    gh copilot test: code=${testGh.code} stderr=${(testGh.stderr || '').slice(0, 200)}`);
+        console.log('  ❌ Could not find copilot CLI.');
+        console.log(`     copilot stderr: ${(testCopilot.stderr || '').slice(0, 200)}`);
+        console.log(`     gh stderr: ${(testGh.stderr || '').slice(0, 200)}`);
+        console.log('     Skipping task/blocker extraction.');
+        dl.db.save();
+        console.log('\n✅ Retroactive ingestion complete (embeddings only)!');
+        return;
       }
     }
+  } else {
+    console.log(`  ℹ Using COPILOT_CMD: ${cmd}`);
+    useGhCopilot = cmd.toLowerCase().includes('gh') && !cmd.toLowerCase().includes('copilot');
   }
-  const useGhCopilot = cmd === 'gh';
   const agentEnv = { FREYA_WORKSPACE_DIR: workspaceDir };
   const slugMap = readProjectSlugMap(workspaceDir);
   const validTaskCats = new Set(['DO_NOW', 'SCHEDULE', 'DELEGATE', 'IGNORE']);