@cccarv82/freya 3.7.5 → 3.7.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cccarv82/freya",
-  "version": "3.7.5",
+  "version": "3.7.7",
   "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,75 @@ 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'
-  let cmd = process.env.COPILOT_CMD || '';
-  if (!cmd) {
-    // Quick test: try 'copilot --version'
-    const testCopilot = await run('copilot', ['--version'], workspaceDir);
-    if (testCopilot.code === 0) {
-      cmd = 'copilot';
+  // Detect copilot — use same approach as web.js (resolve full path)
+  let copilotResolved = process.env.COPILOT_CMD || '';
+  if (!copilotResolved) {
+    console.log('  ℹ Detecting copilot CLI...');
+    if (process.platform === 'win32') {
+      // Try 'where' first (system PATH)
+      try {
+        const p = execSync('where copilot 2>nul', { encoding: 'utf8', timeout: 5000 }).trim().split(/\r?\n/)[0];
+        if (p && fs.existsSync(p)) copilotResolved = p;
+      } catch { }
+      // Use PowerShell to resolve (works with fnm, nvm-windows, etc.)
+      if (!copilotResolved) {
+        try {
+          const p = execSync(
+            'powershell.exe -NoProfile -Command "(Get-Command copilot -ErrorAction SilentlyContinue).Source"',
+            { encoding: 'utf8', timeout: 10000 }
+          ).trim();
+          if (p && fs.existsSync(p)) copilotResolved = p;
+        } catch { }
+      }
+      // Try gh copilot
+      if (!copilotResolved) {
+        try {
+          const p = execSync(
+            'powershell.exe -NoProfile -Command "(Get-Command gh -ErrorAction SilentlyContinue).Source"',
+            { encoding: 'utf8', timeout: 10000 }
+          ).trim();
+          if (p && fs.existsSync(p)) copilotResolved = `gh-copilot:${p}`;
+        } catch { }
+      }
     } 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');
-      } 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)}`);
+      try {
+        const p = execSync('which copilot 2>/dev/null', { encoding: 'utf8', timeout: 5000 }).trim();
+        if (p) copilotResolved = p;
+      } catch { }
+      if (!copilotResolved) {
+        try {
+          const p = execSync('which gh 2>/dev/null', { encoding: 'utf8', timeout: 5000 }).trim();
+          if (p) copilotResolved = `gh-copilot:${p}`;
+        } catch { }
       }
     }
+    if (!copilotResolved) {
+      copilotResolved = 'copilot'; // last resort fallback
+    }
+  }
+  // Verify it works
+  const testArgs = copilotResolved.startsWith('gh-copilot:')
+    ? { cmd: copilotResolved.slice('gh-copilot:'.length), args: ['copilot', '--version'] }
+    : { cmd: copilotResolved, args: ['--version'] };
+  const testResult = await run(testArgs.cmd, testArgs.args, workspaceDir);
+  if (testResult.code === 0) {
+    console.log(`  ✓ Found: ${(testResult.stdout || '').trim().split(/\r?\n/)[0]}`);
+  } else {
+    console.log('  ❌ Could not find copilot CLI.');
+    console.log(`     stderr: ${(testResult.stderr || '').slice(0, 200)}`);
+    console.log('     Skipping task/blocker extraction.');
+    dl.db.save();
+    console.log('\n✅ Retroactive ingestion complete (embeddings only)!');
+    return;
+  }
+  // Helper to build spawn args (same as copilotSpawnArgs in web.js)
+  function buildCopilotArgs(extraArgs) {
+    if (copilotResolved.startsWith('gh-copilot:')) {
+      const ghPath = copilotResolved.slice('gh-copilot:'.length);
+      return { cmd: ghPath, args: ['copilot', ...extraArgs] };
+    }
+    return { cmd: copilotResolved, args: extraArgs };
   }
-  const useGhCopilot = cmd === 'gh';
   const agentEnv = { FREYA_WORKSPACE_DIR: workspaceDir };
   const slugMap = readProjectSlugMap(workspaceDir);
   const validTaskCats = new Set(['DO_NOW', 'SCHEDULE', 'DELEGATE', 'IGNORE']);
@@ -263,18 +319,18 @@ IMPORTANTE: Extraia APENAS informações explícitas do log. NÃO invente dados.
 
     try {
       let r;
-      const baseArgs = useGhCopilot
-        ? ['copilot', '-s', '--no-color', '--stream', 'off']
-        : ['-s', '--no-color', '--stream', 'off'];
+      const copilotExtra = ['-s', '--no-color', '--stream', 'off'];
 
       if (fullPrompt.length > SAFE_ARG_LEN) {
         const tmpFile = path.join(os.tmpdir(), `freya-retro-${Date.now()}.txt`);
         fs.writeFileSync(tmpFile, fullPrompt, 'utf8');
         const filePrompt = `Leia o arquivo abaixo e extraia tasks/blockers conforme as instruções contidas nele.\nARQUIVO: ${tmpFile}`;
-        r = await run(cmd, [...baseArgs, '--add-dir', os.tmpdir(), '--allow-all-tools', '-p', filePrompt], workspaceDir, agentEnv);
+        const { cmd: sc, args: sa } = buildCopilotArgs([...copilotExtra, '--add-dir', os.tmpdir(), '--allow-all-tools', '-p', filePrompt]);
+        r = await run(sc, sa, workspaceDir, agentEnv);
         try { fs.unlinkSync(tmpFile); } catch { }
       } else {
-        r = await run(cmd, [...baseArgs, '-p', fullPrompt], workspaceDir, agentEnv);
+        const { cmd: sc, args: sa } = buildCopilotArgs([...copilotExtra, '-p', fullPrompt]);
+        r = await run(sc, sa, workspaceDir, agentEnv);
       }
 
       const out = (r.stdout + r.stderr).trim();
@@ -283,7 +339,7 @@ IMPORTANTE: Extraia APENAS informações explícitas do log. NÃO invente dados.
         // On first error, show verbose diagnostic
         if (totalErrors === 1) {
           console.log(`\n  ⚠ Planner diagnostic for ${date}:`);
-          console.log(`    Command: ${cmd} ${(useGhCopilot ? baseArgs : ['-s', '--no-color', '--stream', 'off', '-p', '...']).join(' ')}`);
+          console.log(`    Command: ${copilotResolved} -s --no-color --stream off -p ...`);
           console.log(`    Exit code: ${r.code}`);
           console.log(`    stdout: ${(r.stdout || '').slice(0, 300)}`);
           console.log(`    stderr: ${(r.stderr || '').slice(0, 300)}`);