@cccarv82/freya 1.0.7 → 1.0.9

package/cli/web.js

@@ -6,11 +6,18 @@ const path = require('path');
 const { spawn } = require('child_process');
 
 function guessNpmCmd() {
-  return process.platform === 'win32' ? 'npm.cmd' : 'npm';
+  // We'll execute via cmd.exe on Windows for reliability.
+  return process.platform === 'win32' ? 'npm' : 'npm';
 }
 
 function guessNpxCmd() {
-  return process.platform === 'win32' ? 'npx.cmd' : 'npx';
+  // We'll execute via cmd.exe on Windows for reliability.
+  return process.platform === 'win32' ? 'npx' : 'npx';
+}
+
+function guessNpxYesFlag() {
+  // npx supports --yes/-y on modern npm; use -y for broad compatibility
+  return '-y';
 }
 
 function guessOpenCmd() {
@@ -62,6 +69,26 @@ function safeJson(res, code, obj) {
   res.end(body);
 }
 
+function looksLikeFreyaWorkspace(dir) {
+  // minimal check: has scripts/validate-data.js and data/
+  return (
+    exists(path.join(dir, 'package.json')) &&
+    exists(path.join(dir, 'scripts')) &&
+    exists(path.join(dir, 'data'))
+  );
+}
+
+function normalizeWorkspaceDir(inputDir) {
+  const d = path.resolve(process.cwd(), inputDir);
+  if (looksLikeFreyaWorkspace(d)) return d;
+
+  // Common case: user picked parent folder that contains ./freya
+  const child = path.join(d, 'freya');
+  if (looksLikeFreyaWorkspace(child)) return child;
+
+  return d;
+}
+
 function readBody(req) {
   return new Promise((resolve, reject) => {
     const chunks = [];
@@ -74,8 +101,15 @@ function readBody(req) {
 function run(cmd, args, cwd) {
   return new Promise((resolve) => {
     let child;
+
     try {
-      child = spawn(cmd, args, { cwd, shell: false, env: process.env });
+      // On Windows, reliably execute CLI tools through cmd.exe.
+      if (process.platform === 'win32' && (cmd === 'npx' || cmd === 'npm')) {
+        const comspec = process.env.ComSpec || 'cmd.exe';
+        child = spawn(comspec, ['/d', '/s', '/c', cmd, ...args], { cwd, shell: false, env: process.env });
+      } else {
+        child = spawn(cmd, args, { cwd, shell: false, env: process.env });
+      }
     } catch (e) {
       return resolve({ code: 1, stdout: '', stderr: e.message || String(e) });
     }
@@ -90,7 +124,7 @@ function run(cmd, args, cwd) {
       stderr += d.toString();
     });
 
-    // Prevent unhandled error event (e.g., ENOENT on Windows when cmd not found)
+    // Prevent unhandled error event (e.g., ENOENT/EINVAL)
     child.on('error', (e) => {
       stderr += `\n${e.message || String(e)}`;
       resolve({ code: 1, stdout, stderr });
@@ -1007,7 +1041,8 @@ async function cmdWeb({ port, dir, open, dev }) {
         const raw = await readBody(req);
         const payload = raw ? JSON.parse(raw) : {};
 
-        const workspaceDir = path.resolve(process.cwd(), payload.dir || dir || './freya');
+        const requestedDir = payload.dir || dir || './freya';
+        const workspaceDir = normalizeWorkspaceDir(requestedDir);
 
         if (req.url === '/api/pick-dir') {
           const picked = await pickDirectoryNative();
@@ -1016,27 +1051,31 @@ async function cmdWeb({ port, dir, open, dev }) {
 
         if (req.url === '/api/init') {
           const pkg = '@cccarv82/freya';
-          const r = await run(guessNpxCmd(), [pkg, 'init', workspaceDir], process.cwd());
-          return safeJson(res, r.code === 0 ? 200 : 400, { output: (r.stdout + r.stderr).trim() });
+          const r = await run(guessNpxCmd(), [guessNpxYesFlag(), pkg, 'init', workspaceDir], process.cwd());
+          const output = (r.stdout + r.stderr).trim();
+          return safeJson(res, r.code === 0 ? 200 : 400, r.code === 0 ? { output } : { error: output || 'init failed', output });
         }
 
         if (req.url === '/api/update') {
           const pkg = '@cccarv82/freya';
           fs.mkdirSync(workspaceDir, { recursive: true });
-          const r = await run(guessNpxCmd(), [pkg, 'init', '--here'], workspaceDir);
-          return safeJson(res, r.code === 0 ? 200 : 400, { output: (r.stdout + r.stderr).trim() });
+          const r = await run(guessNpxCmd(), [guessNpxYesFlag(), pkg, 'init', '--here'], workspaceDir);
+          const output = (r.stdout + r.stderr).trim();
+          return safeJson(res, r.code === 0 ? 200 : 400, r.code === 0 ? { output } : { error: output || 'update failed', output });
         }
 
         const npmCmd = guessNpmCmd();
 
         if (req.url === '/api/health') {
           const r = await run(npmCmd, ['run', 'health'], workspaceDir);
-          return safeJson(res, r.code === 0 ? 200 : 400, { output: (r.stdout + r.stderr).trim() });
+          const output = (r.stdout + r.stderr).trim();
+          return safeJson(res, r.code === 0 ? 200 : 400, r.code === 0 ? { output } : { error: output || 'health failed', output });
         }
 
         if (req.url === '/api/migrate') {
           const r = await run(npmCmd, ['run', 'migrate'], workspaceDir);
-          return safeJson(res, r.code === 0 ? 200 : 400, { output: (r.stdout + r.stderr).trim() });
+          const output = (r.stdout + r.stderr).trim();
+          return safeJson(res, r.code === 0 ? 200 : 400, r.code === 0 ? { output } : { error: output || 'migrate failed', output });
         }
 
         if (req.url === '/api/report') {
@@ -1060,7 +1099,7 @@ async function cmdWeb({ port, dir, open, dev }) {
           // Prefer showing the actual report content when available.
           const output = reportText ? reportText : out;
 
-          return safeJson(res, r.code === 0 ? 200 : 400, { output, reportPath, reportText });
+          return safeJson(res, r.code === 0 ? 200 : 400, r.code === 0 ? { output, reportPath, reportText } : { error: output || 'report failed', output, reportPath, reportText });
         }
 
         if (req.url === '/api/publish') {

package/package.json

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