@runeya/runeya 2.0.65 → 2.0.67

package/agent/index.js

@@ -5172,11 +5172,14 @@ import { TRPCError as TRPCError5 } from "@trpc/server";
 import { spawn as spawn4, execFileSync } from "child_process";
 import { EventEmitter as EventEmitter9 } from "events";
 import { randomUUID as randomUUID5 } from "crypto";
-import { fileURLToPath } from "url";
-import { createRequire } from "module";
-import { existsSync as existsSync2, readFileSync } from "fs";
+import { existsSync as existsSync3, readFileSync } from "fs";
 import { dirname, resolve as resolvePath2 } from "path";
 import * as pty2 from "@lydell/node-pty";
+
+// ../../packages/mcp-server/src/launch.ts
+import { fileURLToPath } from "url";
+import { createRequire } from "module";
+import { existsSync as existsSync2 } from "fs";
 function resolveMcpServerPath() {
   try {
     const req = createRequire(import.meta.url);
@@ -5184,9 +5187,13 @@ function resolveMcpServerPath() {
   } catch {
   }
   const candidates = [
+    // Build packagé du CLI : dist/agent/index.js et dist/index.js côtoient
+    // dist/mcp-server/, copié là par le post-build.
+    new URL("../mcp-server/index.js", import.meta.url),
+    new URL("./mcp-server/index.js", import.meta.url),
+    // Monorepo, depuis un dist d'app.
     new URL("../../../packages/mcp-server/dist/index.js", import.meta.url),
-    new URL("../../../../packages/mcp-server/dist/index.js", import.meta.url),
-    new URL("../mcp-server/index.js", import.meta.url)
+    new URL("../../../../packages/mcp-server/dist/index.js", import.meta.url)
   ];
   for (const c of candidates) {
     const p = fileURLToPath(c);
@@ -5194,6 +5201,42 @@ function resolveMcpServerPath() {
   }
   throw new Error("Could not locate @runeya/packages-mcp-server (built dist not found)");
 }
+function pickEnv(env2) {
+  return {
+    ...env2.RUNEYA_BASE_URL ? { RUNEYA_BASE_URL: env2.RUNEYA_BASE_URL } : {},
+    ...env2.RUNEYA_API_TOKEN ? { RUNEYA_API_TOKEN: env2.RUNEYA_API_TOKEN } : {}
+  };
+}
+function claudeMcpArgs(env2) {
+  const config = JSON.stringify({
+    mcpServers: {
+      runeya: {
+        command: "node",
+        args: [resolveMcpServerPath()],
+        env: pickEnv(env2)
+      }
+    }
+  });
+  return ["--mcp-config", config];
+}
+function codexMcpArgs(env2) {
+  const fields = [
+    `command=${tomlString("node")}`,
+    `args=[${tomlString(resolveMcpServerPath())}]`
+  ];
+  const entries = Object.entries(pickEnv(env2));
+  if (entries.length > 0) {
+    const inline = entries.map(([k, v]) => `${k}=${tomlString(v)}`).join(",");
+    fields.push(`env={${inline}}`);
+  }
+  return ["-c", `mcp_servers.runeya={${fields.join(",")}}`];
+}
+function tomlString(value) {
+  const escaped = value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/[\u0000-\u001f\u007f]/g, (c) => `\\u${c.charCodeAt(0).toString(16).padStart(4, "0")}`);
+  return `"${escaped}"`;
+}
+
+// src/services/ai-spawn-manager.ts
 function resolveCliInvocation(cli, args) {
   if (process.platform !== "win32") return { command: cli, args };
   if (/\.exe$/i.test(cli)) return { command: cli, args };
@@ -5209,13 +5252,13 @@ function resolveCliInvocation(cli, args) {
     shim = found.find((f) => /\.cmd$/i.test(f)) ?? found[0] ?? cli;
   }
   if (/\.exe$/i.test(shim)) return { command: shim, args };
-  if (/\.cmd$/i.test(shim) && existsSync2(shim)) {
+  if (/\.cmd$/i.test(shim) && existsSync3(shim)) {
     try {
       const content = readFileSync(shim, "utf-8");
       const m = content.match(/%~?dp0%\\?([^"\s]+\.js)/i);
       if (m?.[1]) {
         const entry = resolvePath2(dirname(shim), m[1].replace(/^\\+/, ""));
-        if (existsSync2(entry)) return { command: process.execPath, args: [entry, ...args] };
+        if (existsSync3(entry)) return { command: process.execPath, args: [entry, ...args] };
       }
     } catch {
     }
@@ -5235,23 +5278,18 @@ function resolveSpawnEnvAndArgs(opts) {
     ...opts.mcpApiToken ? { RUNEYA_API_TOKEN: opts.mcpApiToken } : {}
   };
   const env2 = { ...process.env, ...opts.env, ...runeyaEnv };
-  const args = [...opts.args];
-  if (opts.enableMcp && opts.cli === "claude") {
+  let args = [...opts.args];
+  if (opts.enableMcp) {
+    const mcpEnv = {
+      RUNEYA_BASE_URL: env2.RUNEYA_BASE_URL,
+      RUNEYA_API_TOKEN: env2.RUNEYA_API_TOKEN
+    };
     try {
-      const mcpServerPath = resolveMcpServerPath();
-      const mcpConfig = JSON.stringify({
-        mcpServers: {
-          runeya: {
-            command: "node",
-            args: [mcpServerPath],
-            env: {
-              ...env2.RUNEYA_BASE_URL ? { RUNEYA_BASE_URL: env2.RUNEYA_BASE_URL } : {},
-              ...env2.RUNEYA_API_TOKEN ? { RUNEYA_API_TOKEN: env2.RUNEYA_API_TOKEN } : {}
-            }
-          }
-        }
-      });
-      args.push("--mcp-config", mcpConfig);
+      if (opts.cli === "claude") {
+        args.push(...claudeMcpArgs(mcpEnv));
+      } else if (opts.cli === "codex") {
+        args = [...codexMcpArgs(mcpEnv), ...args];
+      }
     } catch (err) {
       console.warn("[ai-spawn-manager] Failed to resolve MCP server path:", err.message);
     }
@@ -5556,6 +5594,18 @@ import { spawn as spawn6 } from "child_process";
 import { createInterface as createInterface2 } from "readline";
 import { EventEmitter as EventEmitter10 } from "events";
 var REQUEST_TIMEOUT_MS = 3e5;
+function resolveMcpArgs(env2) {
+  if (!env2["RUNEYA_API_TOKEN"]) return [];
+  try {
+    return codexMcpArgs({
+      RUNEYA_BASE_URL: env2["RUNEYA_BASE_URL"],
+      RUNEYA_API_TOKEN: env2["RUNEYA_API_TOKEN"]
+    });
+  } catch (err) {
+    console.warn("[codex-app-server-mgr] Failed to resolve MCP server path:", err.message);
+    return [];
+  }
+}
 var CodexAppServerManager = class extends EventEmitter10 {
   proc = null;
   rl = null;
@@ -5580,9 +5630,10 @@ var CodexAppServerManager = class extends EventEmitter10 {
     }
   }
   async doConnect() {
-    this.proc = spawn6("codex", ["app-server"], {
+    const env2 = { ...process.env, ...this.extraEnv };
+    this.proc = spawn6("codex", [...resolveMcpArgs(env2), "app-server"], {
       stdio: ["pipe", "pipe", "pipe"],
-      env: { ...process.env, ...this.extraEnv }
+      env: env2
     });
     this.rl = createInterface2({ input: this.proc.stdout });
     this.rl.on("line", (line) => this.handleLine(line));
@@ -6301,14 +6352,76 @@ function createAgent(opts) {
   return { app, server, trpcWss, healthWss, passphraseHex, shutdown };
 }
 
-// src/config/node-path.ts
+// ../../packages/shared/src/node/node-path.ts
 import { dirname as dirname3, delimiter } from "path";
 function ensureNodeBinOnPath(environment = process.env) {
-  const nodeBin = dirname3(process.execPath);
+  appendToPath(dirname3(process.execPath), environment);
+}
+function appendToPath(dir, environment = process.env) {
+  if (!dir) return;
   const current = environment["PATH"] ?? "";
   const entries = current.split(delimiter).filter(Boolean);
-  if (entries.includes(nodeBin)) return;
-  environment["PATH"] = entries.length > 0 ? `${current}${delimiter}${nodeBin}` : nodeBin;
+  if (entries.includes(dir)) return;
+  environment["PATH"] = entries.length > 0 ? `${current}${delimiter}${dir}` : dir;
+}
+
+// ../../packages/shared/src/node/user-path.ts
+import { execFile as execFile5 } from "child_process";
+import { promisify as promisify3 } from "util";
+import { homedir as homedir5 } from "os";
+import { existsSync as existsSync4, statSync } from "fs";
+import { join as join6, delimiter as delimiter2 } from "path";
+var execFileAsync3 = promisify3(execFile5);
+var MARKER = "__RUNEYA_PATH__";
+var SHELL_TIMEOUT_MS = 3e3;
+function commonUserBins(home) {
+  return [
+    join6(home, ".local", "bin"),
+    join6(home, "bin"),
+    join6(home, ".npm-global", "bin"),
+    join6(home, ".bun", "bin"),
+    join6(home, ".cargo", "bin"),
+    "/opt/homebrew/bin",
+    "/usr/local/bin"
+  ];
+}
+async function readLoginShellPath() {
+  if (process.platform === "win32") return null;
+  const shell = process.env["SHELL"];
+  if (!shell || !existsSync4(shell)) return null;
+  try {
+    const { stdout } = await execFileAsync3(shell, ["-l", "-i", "-c", `echo "${MARKER}$PATH"`], {
+      timeout: SHELL_TIMEOUT_MS,
+      shell: false,
+      encoding: "utf8",
+      maxBuffer: 1024 * 1024,
+      env: { ...process.env, TERM: "dumb" }
+    });
+    const line = stdout.split("\n").find((l) => l.includes(MARKER));
+    if (!line) return null;
+    const value = line.slice(line.indexOf(MARKER) + MARKER.length).trim();
+    return value.length > 0 ? value : null;
+  } catch {
+    return null;
+  }
+}
+async function ensureUserBinsOnPath(environment = process.env, home = homedir5()) {
+  const shellPath = await readLoginShellPath();
+  if (shellPath) {
+    for (const entry of shellPath.split(delimiter2).filter(Boolean)) {
+      appendToPath(entry, environment);
+    }
+  }
+  for (const dir of commonUserBins(home)) {
+    if (isDirectory(dir)) appendToPath(dir, environment);
+  }
+}
+function isDirectory(path3) {
+  try {
+    return statSync(path3).isDirectory();
+  } catch {
+    return false;
+  }
 }
 
 // src/index.ts
@@ -6345,6 +6458,7 @@ process.on("uncaughtException", (err) => {
 });
 async function main() {
   ensureNodeBinOnPath();
+  await ensureUserBinsOnPath();
   const { server, shutdown, passphraseHex } = createAgent({
     passphraseHex: env.PASSPHRASE_OVERRIDE
   });