zelari-code 1.7.0 → 1.7.1

package/dist/cli/main.bundled.js

@@ -16576,6 +16576,28 @@ var init_filesystem = __esm({
 // packages/core/dist/core/tools/builtin/shellResolver.js
 import { existsSync as existsSync4 } from "node:fs";
 import { spawnSync } from "node:child_process";
+function isWslBashPath(p3) {
+  if (!p3 || typeof p3 !== "string")
+    return false;
+  const n = p3.replace(/\//g, "\\").toLowerCase();
+  if (n.includes("\\windows\\system32\\bash.exe"))
+    return true;
+  if (n.includes("\\windows\\syswow64\\bash.exe"))
+    return true;
+  if (n.includes("\\windowsapps\\bash.exe"))
+    return true;
+  return false;
+}
+function acceptBashPath(p3) {
+  if (!p3 || p3.trim().length === 0)
+    return null;
+  const trimmed = p3.trim();
+  if (isWslBashPath(trimmed))
+    return null;
+  if (!existsSyncSafe(trimmed))
+    return null;
+  return trimmed;
+}
 function resolveShell(forceReResolve = false) {
   if (memoized && !forceReResolve)
     return memoized;
@@ -16596,24 +16618,25 @@ function resolveShell(forceReResolve = false) {
   return memoized;
 }
 function resolveBashWindows() {
-  const envShell = process.env.ZELARI_SHELL;
-  if (envShell && envShell.trim().length > 0 && existsSyncSafe(envShell)) {
-    return envShell;
-  }
-  const sessionShell = process.env.SHELL;
-  if (sessionShell && sessionShell.trim().length > 0 && existsSyncSafe(sessionShell)) {
-    return sessionShell;
-  }
+  const fromEnv = acceptBashPath(process.env.ZELARI_SHELL);
+  if (fromEnv)
+    return fromEnv;
+  const fromSession = acceptBashPath(process.env.SHELL);
+  if (fromSession)
+    return fromSession;
   for (const p3 of STANDARD_BASH_PATHS) {
-    if (existsSyncSafe(p3))
-      return p3;
+    const accepted = acceptBashPath(p3);
+    if (accepted)
+      return accepted;
   }
   try {
     const result = spawnSync("where", ["bash"], { encoding: "utf-8", windowsHide: true });
     if (result.status === 0 && result.stdout) {
-      const first = result.stdout.split(/\r?\n/).find((l) => l.trim().length > 0);
-      if (first && existsSyncSafe(first))
-        return first.trim();
+      for (const line of result.stdout.split(/\r?\n/)) {
+        const accepted = acceptBashPath(line);
+        if (accepted)
+          return accepted;
+      }
     }
   } catch {
   }
@@ -16643,6 +16666,24 @@ var init_shellResolver = __esm({
 
 // packages/core/dist/core/tools/builtin/shell.js
 import { spawn } from "node:child_process";
+import { dirname } from "node:path";
+function withNodeDirOnPath(base) {
+  const env = { ...base };
+  try {
+    const nodeDir = dirname(process.execPath);
+    if (!nodeDir)
+      return env;
+    const sep = process.platform === "win32" ? ";" : ":";
+    const current = env.PATH ?? env.Path ?? "";
+    const parts = current.split(sep).filter((p3) => p3.length > 0);
+    const has = parts.some((p3) => p3.toLowerCase() === nodeDir.toLowerCase());
+    if (!has) {
+      env.PATH = `${nodeDir}${sep}${current}`;
+    }
+  } catch {
+  }
+  return env;
+}
 var BashArgsSchema, INTERACTIVE_CANCEL_RE, INTERACTIVE_HINT, bashTool;
 var init_shell = __esm({
   "packages/core/dist/core/tools/builtin/shell.js"() {
@@ -16669,7 +16710,10 @@ var init_shell = __esm({
           const cwd = args.cwd ?? ctx.cwd;
           const resolved = resolveShell();
           let child;
-          const baseEnv = { ...process.env, CI: process.env.CI ?? "1" };
+          const baseEnv = withNodeDirOnPath({
+            ...process.env,
+            CI: process.env.CI ?? "1"
+          });
           const env = resolved.isBash ? { ...baseEnv, MSYSTEM: process.env.MSYSTEM ?? "MINGW64" } : baseEnv;
           if (resolved.isBash) {
             child = spawn(resolved.shell, ["-c", args.command], {
@@ -26210,7 +26254,7 @@ import {
   readdirSync as readdirSync2,
   renameSync as renameSync2
 } from "node:fs";
-import { dirname, join as join13 } from "node:path";
+import { dirname as dirname2, join as join13 } from "node:path";
 function parseFrontmatter(md) {
   const m = FRONTMATTER_RE.exec(md);
   if (!m) return { meta: {}, body: md };
@@ -26481,7 +26525,7 @@ var init_storage = __esm({
        * The meta object is serialized as YAML frontmatter; body as Markdown.
        */
       write(path34, meta3, body) {
-        mkdirSync7(dirname(path34), { recursive: true });
+        mkdirSync7(dirname2(path34), { recursive: true });
         const tmp = path34 + ".tmp-" + process.pid;
         const md = serializeFrontmatter(meta3, body);
         writeFileSync11(tmp, md, "utf8");
@@ -26536,7 +26580,7 @@ import {
   mkdirSync as mkdirSync8,
   renameSync as renameSync3
 } from "node:fs";
-import { join as join14, basename as basename2, dirname as dirname2, relative as relative2 } from "node:path";
+import { join as join14, basename as basename2, dirname as dirname3, relative as relative2 } from "node:path";
 function createWorkspaceContext(projectRoot = process.cwd()) {
   const rootDir = resolveWorkspaceRoot(projectRoot);
   return {
@@ -26575,7 +26619,7 @@ function readPlan(ctx) {
 }
 function writePlan(ctx, summary) {
   const jsonPath = planJsonPath(ctx);
-  mkdirSync8(dirname2(jsonPath), { recursive: true });
+  mkdirSync8(dirname3(jsonPath), { recursive: true });
   const tmp = jsonPath + ".tmp-" + process.pid;
   writeFileSync12(tmp, JSON.stringify(summary, null, 2), "utf8");
   renameSync3(tmp, jsonPath);
@@ -29154,29 +29198,47 @@ __export(prereqChecks_exports, {
   checkAgentGit: () => checkAgentGit,
   checkAgentNode: () => checkAgentNode,
   checkMainNode: () => checkMainNode,
+  isWslBashPath: () => isWslBashPath2,
   runPrereqChecks: () => runPrereqChecks
 });
 import { execSync, spawnSync as spawnSync2 } from "node:child_process";
 import { existsSync as existsSync25 } from "node:fs";
+import { dirname as dirname4 } from "node:path";
+function isWslBashPath2(p3) {
+  if (!p3 || typeof p3 !== "string") return false;
+  const n = p3.replace(/\//g, "\\").toLowerCase();
+  if (n.includes("\\windows\\system32\\bash.exe")) return true;
+  if (n.includes("\\windows\\syswow64\\bash.exe")) return true;
+  if (n.includes("\\windowsapps\\bash.exe")) return true;
+  return false;
+}
+function acceptBashPath2(p3) {
+  if (!p3 || p3.trim().length === 0) return null;
+  const trimmed = p3.trim();
+  if (isWslBashPath2(trimmed)) return null;
+  if (!existsSyncSafe2(trimmed)) return null;
+  return trimmed;
+}
 function resolveAgentShellSync() {
   if (process.platform !== "win32") {
     return { bashPath: null, isBash: true, via: "/bin/sh" };
   }
-  const envShell = process.env.ZELARI_SHELL;
-  if (envShell && envShell.trim().length > 0 && existsSyncSafe2(envShell)) {
-    return { bashPath: envShell, isBash: true, via: `bash (${envShell})` };
+  const fromEnv = acceptBashPath2(process.env.ZELARI_SHELL);
+  if (fromEnv) {
+    return { bashPath: fromEnv, isBash: true, via: `bash (${fromEnv})` };
   }
-  const sessionShell = process.env.SHELL;
-  if (sessionShell && sessionShell.trim().length > 0 && existsSyncSafe2(sessionShell)) {
+  const fromSession = acceptBashPath2(process.env.SHELL);
+  if (fromSession) {
     return {
-      bashPath: sessionShell,
+      bashPath: fromSession,
       isBash: true,
-      via: `bash (${sessionShell})`
+      via: `bash (${fromSession})`
     };
   }
   for (const p3 of STANDARD_BASH_PATHS2) {
-    if (existsSyncSafe2(p3)) {
-      return { bashPath: p3, isBash: true, via: `bash (${p3})` };
+    const accepted = acceptBashPath2(p3);
+    if (accepted) {
+      return { bashPath: accepted, isBash: true, via: `bash (${accepted})` };
     }
   }
   try {
@@ -29185,16 +29247,39 @@ function resolveAgentShellSync() {
       windowsHide: true
     });
     if (result.status === 0 && result.stdout) {
-      const first = result.stdout.split(/\r?\n/).find((l) => l.trim().length > 0);
-      if (first && existsSyncSafe2(first)) {
-        const trimmed = first.trim();
-        return { bashPath: trimmed, isBash: true, via: `bash (${trimmed})` };
+      for (const line of result.stdout.split(/\r?\n/)) {
+        const accepted = acceptBashPath2(line);
+        if (accepted) {
+          return {
+            bashPath: accepted,
+            isBash: true,
+            via: `bash (${accepted})`
+          };
+        }
       }
     }
   } catch {
   }
   return { bashPath: null, isBash: false, via: "cmd.exe" };
 }
+function agentProbeEnv() {
+  const env = { ...process.env };
+  try {
+    const nodeDir = dirname4(process.execPath);
+    if (!nodeDir) return env;
+    const sep = process.platform === "win32" ? ";" : ":";
+    const current = env.PATH ?? env.Path ?? "";
+    const parts = current.split(sep).filter((p3) => p3.length > 0);
+    const has = parts.some(
+      (p3) => p3.toLowerCase() === nodeDir.toLowerCase()
+    );
+    if (!has) {
+      env.PATH = `${nodeDir}${sep}${current}`;
+    }
+  } catch {
+  }
+  return env;
+}
 function existsSyncSafe2(p3) {
   try {
     return existsSync25(p3);
@@ -29205,12 +29290,14 @@ function existsSyncSafe2(p3) {
 function probeTool(tool) {
   const shell = resolveAgentShellSync();
   let stdout = "";
+  const env = agentProbeEnv();
   if (shell.bashPath) {
     try {
       const r = spawnSync2(shell.bashPath, ["-c", `${tool} --version`], {
         encoding: "utf8",
         stdio: ["ignore", "pipe", "ignore"],
-        windowsHide: true
+        windowsHide: true,
+        env
       });
       if (r.status === 0) stdout = (r.stdout || "").trim();
     } catch {
@@ -29219,7 +29306,8 @@ function probeTool(tool) {
     try {
       stdout = execSync(`${tool} --version`, {
         encoding: "utf8",
-        stdio: ["ignore", "pipe", "ignore"]
+        stdio: ["ignore", "pipe", "ignore"],
+        env
       }).trim();
     } catch {
     }
@@ -29227,7 +29315,8 @@ function probeTool(tool) {
     try {
       stdout = execSync(`${tool} --version`, {
         encoding: "utf8",
-        stdio: ["ignore", "pipe", "ignore"]
+        stdio: ["ignore", "pipe", "ignore"],
+        env
       }).trim();
     } catch {
     }
@@ -29242,14 +29331,21 @@ function probeTool(tool) {
 function nodeMissingHint() {
   const shell = resolveAgentShellSync();
   if (process.platform === "win32") {
+    if (!shell.isBash) {
+      return `node is not reachable from the agent's shell (${shell.via}).
+         Install Node >= ${MIN_NODE_MAJOR} (https://nodejs.org) and ensure it is
+         on PATH, then open a NEW terminal. Optional: install Git for
+         Windows so the agent can use real bash (https://git-scm.com/download/win).`;
+    }
     return `node is not reachable from the agent's shell (${shell.via}).
          This usually means Node was installed for "current user" only,
-         while Git Bash inherits the SYSTEM Path. Fix (pick one):
+         while Git Bash sees a different Path. Fix (pick one):
            - Reinstall Node (https://nodejs.org) and choose
              "Add to PATH for all users", OR
-           - Add C:\\Program Files\\nodejs\\ to the SYSTEM Path
-             (System Properties \u2192 Environment Variables \u2192 Path), OR
-           - Set ZELARI_SHELL to a bash that already sees node.`;
+           - Add your nodejs folder to the User or System Path, OR
+           - Set ZELARI_SHELL to a bash that already sees node.
+         Note: WSL's C:\\Windows\\System32\\bash.exe is NOT a valid agent
+         shell \u2014 install Git for Windows instead.`;
   }
   return `node is not on the agent's shell PATH.
          Install Node >= ${MIN_NODE_MAJOR} (https://nodejs.org) or, if you use