@runeya/runeya 2.0.145 → 2.0.147

package/agent/index.js

@@ -5927,7 +5927,8 @@ function pickEnv(env2) {
     ...env2.RUNEYA_BASE_URL ? { RUNEYA_BASE_URL: env2.RUNEYA_BASE_URL } : {},
     ...env2.RUNEYA_API_TOKEN ? { RUNEYA_API_TOKEN: env2.RUNEYA_API_TOKEN } : {},
     ...env2.RUNEYA_PROJECT_ID ? { RUNEYA_PROJECT_ID: env2.RUNEYA_PROJECT_ID } : {},
-    ...env2.RUNEYA_ORG_ID ? { RUNEYA_ORG_ID: env2.RUNEYA_ORG_ID } : {}
+    ...env2.RUNEYA_ORG_ID ? { RUNEYA_ORG_ID: env2.RUNEYA_ORG_ID } : {},
+    ...env2.RUNEYA_MCP_READY_ID ? { RUNEYA_MCP_READY_ID: env2.RUNEYA_MCP_READY_ID } : {}
   };
 }
 function runeyaMcpConfig(env2) {
@@ -5956,6 +5957,24 @@ function codexMcpArgs(env2) {
   }
   return ["-c", `mcp_servers.runeya={${fields.join(",")}}`];
 }
+function claudeRuneyaMcpArgs(env2, build = claudeMcpArgs, warn = console.warn) {
+  try {
+    return build(env2);
+  } catch (err) {
+    warn(`[claude] Failed to resolve MCP server path: ${err.message}`);
+    return ["--settings", JSON.stringify({ permissions: { deny: ["mcp__runeya"] } })];
+  }
+}
+function codexRuneyaMcpArgs(env2, build = codexMcpArgs, warn = console.warn) {
+  const disabled = ["-c", "mcp_servers.runeya.enabled=false"];
+  if (!env2.RUNEYA_API_TOKEN) return disabled;
+  try {
+    return build(env2);
+  } catch (err) {
+    warn(`[codex] Failed to resolve MCP server path: ${err.message}`);
+    return disabled;
+  }
+}
 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}"`;
@@ -5973,7 +5992,8 @@ function resolveSpawnEnvAndArgs(opts) {
     ...opts.mcpApiBaseUrl ? { RUNEYA_BASE_URL: opts.mcpApiBaseUrl } : {},
     ...opts.mcpApiToken ? { RUNEYA_API_TOKEN: opts.mcpApiToken } : {},
     ...opts.mcpProjectId ? { RUNEYA_PROJECT_ID: opts.mcpProjectId } : {},
-    ...opts.mcpOrgId ? { RUNEYA_ORG_ID: opts.mcpOrgId } : {}
+    ...opts.mcpOrgId ? { RUNEYA_ORG_ID: opts.mcpOrgId } : {},
+    ...opts.mcpReadyId ? { RUNEYA_MCP_READY_ID: opts.mcpReadyId } : {}
   };
   const env2 = { ...process.env, ...opts.env, ...runeyaEnv };
   let args = [...opts.args];
@@ -5982,16 +6002,13 @@ function resolveSpawnEnvAndArgs(opts) {
       RUNEYA_BASE_URL: env2.RUNEYA_BASE_URL,
       RUNEYA_API_TOKEN: env2.RUNEYA_API_TOKEN,
       RUNEYA_PROJECT_ID: env2.RUNEYA_PROJECT_ID,
-      RUNEYA_ORG_ID: env2.RUNEYA_ORG_ID
+      RUNEYA_ORG_ID: env2.RUNEYA_ORG_ID,
+      RUNEYA_MCP_READY_ID: env2.RUNEYA_MCP_READY_ID
     };
-    try {
-      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);
+    if (opts.cli === "claude") {
+      args.push(...claudeRuneyaMcpArgs(mcpEnv));
+    } else if (opts.cli === "codex") {
+      args = [...codexRuneyaMcpArgs(mcpEnv), ...args];
     }
   }
   return { env: env2, args };
@@ -6295,18 +6312,6 @@ 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;
@@ -6332,7 +6337,10 @@ var CodexAppServerManager = class extends EventEmitter10 {
   }
   async doConnect() {
     const env2 = { ...process.env, ...this.extraEnv };
-    const invocation = resolveCliInvocation("codex", [...resolveMcpArgs(env2), "app-server"]);
+    const invocation = resolveCliInvocation("codex", [
+      ...codexRuneyaMcpArgs({ RUNEYA_BASE_URL: env2["RUNEYA_BASE_URL"], RUNEYA_API_TOKEN: env2["RUNEYA_API_TOKEN"] }),
+      "app-server"
+    ]);
     this.proc = spawn6(invocation.command, invocation.args, {
       windowsHide: true,
       stdio: ["pipe", "pipe", "pipe"],
@@ -6627,7 +6635,10 @@ var aiRouter = router({
     mcpApiBaseUrl: z28.string().max(512).optional(),
     mcpApiToken: z28.string().max(8192).optional(),
     mcpProjectId: z28.string().max(128).optional(),
-    mcpOrgId: z28.string().max(128).optional()
+    mcpOrgId: z28.string().max(128).optional(),
+    // Identifiant du lancement, transmis au serveur MCP qui le renvoie au
+    // serveur Runeya une fois initialisé (voir `mcp-ready.ts` côté serveur).
+    mcpReadyId: z28.string().max(128).optional()
   })).mutation(({ input }) => {
     const spawnId = aiSpawnManager.spawnPty(input);
     return { spawnId };