@runeya/runeya 2.0.57 → 2.0.58

package/agent/index.js

@@ -67,7 +67,7 @@ import { TRPCError as TRPCError2 } from "@trpc/server";
 import { EventEmitter as EventEmitter7 } from "events";
 import { randomUUID as randomUUID3 } from "crypto";
 import { networkInterfaces } from "os";
-import { join as join3, isAbsolute } from "path";
+import { join as join3, isAbsolute, resolve } from "path";
 
 // ../../packages/runner-native/src/native-runner.ts
 import { execa } from "execa";
@@ -212,15 +212,15 @@ var NativeRunner = class {
         // Don't accumulate stdout/stderr in memory — we stream via readline
       });
     }
-    const exitPromise = new Promise((resolve) => {
+    const exitPromise = new Promise((resolve2) => {
       subprocess.then((result) => {
-        resolve({
+        resolve2({
           exitCode: result.exitCode ?? null,
           signal: result.signal ?? null,
           error: result.failed && result.shortMessage ? result.shortMessage : void 0
         });
       }).catch((err) => {
-        resolve({ exitCode: 1, signal: null, error: err.message ?? "Unknown error" });
+        resolve2({ exitCode: 1, signal: null, error: err.message ?? "Unknown error" });
       });
     });
     return {
@@ -312,7 +312,7 @@ var DockerRunner = class {
     const containerName = sanitizeDockerName(config.cmdId ? `runeya-${config.serviceId}-${config.cmdId}` : `runeya-${config.serviceId}`);
     let killed = false;
     const exitPromise = new Promise(
-      (resolve) => {
+      (resolve2) => {
         void (async () => {
           try {
             await execa2("docker", ["rm", "-f", containerName], { reject: false });
@@ -365,7 +365,7 @@ var DockerRunner = class {
               }
             }
             if (killed) {
-              resolve({ exitCode: null, signal: "SIGTERM" });
+              resolve2({ exitCode: null, signal: "SIGTERM" });
               return;
             }
             if (lastCardId) {
@@ -376,7 +376,7 @@ var DockerRunner = class {
             const bootstrapCmds = config.skipBootstrap ? [] : (dc.bootstrapCommands ?? []).filter((c) => c.command.trim());
             for (const bsCmd of bootstrapCmds) {
               if (killed) {
-                resolve({ exitCode: null, signal: "SIGTERM" });
+                resolve2({ exitCode: null, signal: "SIGTERM" });
                 return;
               }
               const bsCardId = randomUUID();
@@ -389,12 +389,12 @@ var DockerRunner = class {
               if (exitCode !== 0) {
                 stderr.write(`Bootstrap command "${bsCmdName}" failed with exit code ${exitCode}
 `);
-                resolve({ exitCode, signal: null, error: `Bootstrap "${bsCmdName}" failed (exit ${exitCode})` });
+                resolve2({ exitCode, signal: null, error: `Bootstrap "${bsCmdName}" failed (exit ${exitCode})` });
                 return;
               }
             }
             if (killed) {
-              resolve({ exitCode: null, signal: "SIGTERM" });
+              resolve2({ exitCode: null, signal: "SIGTERM" });
               return;
             }
             const networkFlags = dc.networkMode === "host" ? ["--network", "host"] : (dc.ports ?? []).flatMap((p) => ["-p", p]);
@@ -436,12 +436,12 @@ var DockerRunner = class {
             runProc.stdout?.pipe(stdout, { end: false });
             runProc.stderr?.pipe(stderr, { end: false });
             const result = await runProc;
-            resolve({ exitCode: result.exitCode ?? null, signal: result.signal ?? null });
+            resolve2({ exitCode: result.exitCode ?? null, signal: result.signal ?? null });
           } catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
             stderr.write(`Docker infrastructure error: ${msg}
 `);
-            resolve({ exitCode: 1, signal: null });
+            resolve2({ exitCode: 1, signal: null });
           } finally {
             stdout.end();
             stderr.end();
@@ -480,8 +480,8 @@ var DockerRunner = class {
     });
     let exitResolve;
     const exitPromise = new Promise(
-      (resolve) => {
-        exitResolve = resolve;
+      (resolve2) => {
+        exitResolve = resolve2;
       }
     );
     void (async () => {
@@ -600,7 +600,7 @@ var DockerRunner = class {
     const stderr = new PassThrough();
     let dockerProc = null;
     const exitPromise = new Promise(
-      (resolve) => {
+      (resolve2) => {
         void (async () => {
           try {
             const envFlags = Object.entries(envVars).flatMap(([k, v]) => ["-e", `${k}=${v}`]);
@@ -613,12 +613,12 @@ var DockerRunner = class {
             dockerProc.stdout?.pipe(stdout, { end: false });
             dockerProc.stderr?.pipe(stderr, { end: false });
             const result = await dockerProc;
-            resolve({ exitCode: result.exitCode ?? null, signal: result.signal ?? null });
+            resolve2({ exitCode: result.exitCode ?? null, signal: result.signal ?? null });
           } catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
             stderr.write(`docker execInContainer error: ${msg}
 `);
-            resolve({ exitCode: 1, signal: null });
+            resolve2({ exitCode: 1, signal: null });
           } finally {
             stdout.end();
             stderr.end();
@@ -647,7 +647,7 @@ var DockerRunner = class {
     let innerProcess = null;
     let dockerProc = null;
     const exitPromise = new Promise(
-      (resolve) => {
+      (resolve2) => {
         void (async () => {
           try {
             const psResult = await execa2(
@@ -671,7 +671,7 @@ var DockerRunner = class {
               dockerProc.stdout?.pipe(stdout, { end: false });
               dockerProc.stderr?.pipe(stderr, { end: false });
               const result = await dockerProc;
-              resolve({ exitCode: result.exitCode ?? null, signal: result.signal ?? null });
+              resolve2({ exitCode: result.exitCode ?? null, signal: result.signal ?? null });
             } else {
               innerProcess = this.start({
                 ...config,
@@ -684,13 +684,13 @@ var DockerRunner = class {
               innerProcess.stdout?.pipe(stdout, { end: false });
               innerProcess.stderr?.pipe(stderr, { end: false });
               const result = await innerProcess.exitPromise;
-              resolve(result);
+              resolve2(result);
             }
           } catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
             stderr.write(`docker shortcut error: ${msg}
 `);
-            resolve({ exitCode: 1, signal: null });
+            resolve2({ exitCode: 1, signal: null });
           } finally {
             stdout.end();
             stderr.end();
@@ -1227,7 +1227,17 @@ var ProcessStatusSchema = z8.object({
   startedAt: z8.coerce.date().nullable().optional(),
   restartCount: z8.number().int().nonnegative().default(0),
   uptime: z8.number().nonnegative().default(0),
-  healthStatus: HealthStatusSchema.default("unknown")
+  healthStatus: HealthStatusSchema.default("unknown"),
+  /**
+   * Le répertoire où le processus s'exécute VRAIMENT, absolutisé par l'agent.
+   *
+   * Rapporté par l'agent plutôt que déduit de la config : entre le `cwd` de la
+   * commande, celui du service, l'ancrage sur le projet et les variables que
+   * l'agent étend lui-même, la valeur affichée n'aurait rien prouvé. Ce qui
+   * intéresse quand un service tourne contre le mauvais dépôt, c'est le chemin
+   * final — y compris quand il retombe sur le répertoire de l'agent.
+   */
+  cwd: z8.string().max(4096).nullable().optional()
 });
 
 // ../../packages/shared/src/schemas/log.schema.ts
@@ -2706,7 +2716,7 @@ var MySQLLogSource = class extends EventEmitter4 {
     } catch {
     }
     this.connection = null;
-    await new Promise((resolve) => setTimeout(resolve, delayMs));
+    await new Promise((resolve2) => setTimeout(resolve2, delayMs));
     if (this.stopped) return;
     try {
       await this.connect();
@@ -2754,14 +2764,14 @@ import pidusage from "pidusage";
 import { execFile } from "child_process";
 import { EventEmitter as EventEmitter5 } from "events";
 async function getDockerStats(containerName) {
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     execFile(
       "docker",
       ["stats", "--no-stream", "--format", "{{json .}}", containerName],
       { timeout: 5e3 },
       (err, stdout) => {
         if (err || !stdout.trim()) {
-          resolve(null);
+          resolve2(null);
           return;
         }
         try {
@@ -2769,9 +2779,9 @@ async function getDockerStats(containerName) {
           const cpu = Number.parseFloat(data.CPUPerc);
           const memStr = data.MemUsage.split("/")[0].trim();
           const memory = parseMemBytes(memStr);
-          resolve({ cpu: Number.isNaN(cpu) ? 0 : cpu, memory });
+          resolve2({ cpu: Number.isNaN(cpu) ? 0 : cpu, memory });
         } catch {
-          resolve(null);
+          resolve2(null);
         }
       }
     );
@@ -3120,10 +3130,10 @@ var TraefikManager = class {
       clearTimeout(this.debounceTimer);
       this.debounceTimer = null;
     }
-    await new Promise((resolve) => {
-      execFile2("docker", ["rm", "-f", "runeya-traefik"], { timeout: 1e4 }, () => resolve());
+    await new Promise((resolve2) => {
+      execFile2("docker", ["rm", "-f", "runeya-traefik"], { timeout: 1e4 }, () => resolve2());
     });
-    await new Promise((resolve) => setTimeout(resolve, 500));
+    await new Promise((resolve2) => setTimeout(resolve2, 500));
   }
   async getConfigFiles() {
     const [staticContent, dynamicContent] = await Promise.all([
@@ -3162,13 +3172,13 @@ var TraefikManager = class {
     return result;
   }
   async getLogs(lines = 100) {
-    return new Promise((resolve) => {
+    return new Promise((resolve2) => {
       execFile2("docker", ["logs", "--tail", String(lines), "runeya-traefik"], { timeout: 1e4 }, (err, stdout, stderr) => {
         if (err) {
-          resolve("");
+          resolve2("");
           return;
         }
-        resolve((stdout + stderr).trim());
+        resolve2((stdout + stderr).trim());
       });
     });
   }
@@ -3213,10 +3223,10 @@ var TraefikManager = class {
   async getStatus() {
     let dockerAvailable = false;
     try {
-      await new Promise((resolve, reject) => {
+      await new Promise((resolve2, reject) => {
         execFile2("docker", ["info", "--format", "{{.ServerVersion}}"], { timeout: 5e3 }, (err) => {
           if (err) reject(err instanceof Error ? err : new Error("docker info failed"));
-          else resolve();
+          else resolve2();
         });
       });
       dockerAvailable = true;
@@ -3233,10 +3243,10 @@ var TraefikManager = class {
     let containerRunning = false;
     if (dockerAvailable) {
       try {
-        const output = await new Promise((resolve, reject) => {
+        const output = await new Promise((resolve2, reject) => {
           execFile2("docker", ["inspect", "--format", "{{.State.Running}}", "runeya-traefik"], { timeout: 5e3 }, (err, stdout) => {
             if (err) reject(err instanceof Error ? err : new Error("docker inspect failed"));
-            else resolve(stdout.trim());
+            else resolve2(stdout.trim());
           });
         });
         containerRunning = output === "true";
@@ -3514,6 +3524,19 @@ var EnvSchema = z21.object({
 var env = EnvSchema.parse(process.env);
 
 // src/services/process-manager.ts
+function anchorCommandCwd(cwd, serviceConfig) {
+  const base = serviceConfig.resolvedCwd ?? serviceConfig.cwd;
+  const raw = (cwd ?? "").trim();
+  if (!raw || raw === ".") return base ?? void 0;
+  if (!base || !isAbsolute(base)) return raw;
+  if (isAbsolute(raw) || raw.startsWith("~") || raw.startsWith("$")) return raw;
+  return join3(base, raw);
+}
+function effectiveProcessCwd(serviceConfig) {
+  const first = serviceConfig.commands?.[0];
+  const anchored = anchorCommandCwd(first?.cwd, serviceConfig);
+  return resolve(resolveCwd(anchored, resolveEnv(serviceConfig.env)));
+}
 function getLanIp() {
   const nets = networkInterfaces();
   for (const name of Object.keys(nets)) {
@@ -3779,7 +3802,7 @@ var ProcessManager = class extends EventEmitter7 {
       const runnerConfig = {
         command: cmd.command,
         shell: cmd.shell ?? false,
-        cwd: cmd.cwd || proc.serviceConfig.cwd,
+        cwd: anchorCommandCwd(cmd.cwd, proc.serviceConfig),
         env: mergedServiceEnv
       };
       let runnerProcess;
@@ -3965,7 +3988,7 @@ var ProcessManager = class extends EventEmitter7 {
    *  Centralises runner selection so executeShortcut / executeAdHocCommand share the logic. */
   launchOneOffCommand(proc, command, cwd, env2) {
     const serviceConfig = proc.serviceConfig;
-    const effectiveCwd = cwd || serviceConfig.resolvedCwd || serviceConfig.cwd;
+    const effectiveCwd = anchorCommandCwd(cwd, serviceConfig);
     if (serviceConfig.runner === "docker" && serviceConfig.dockerConfig) {
       const dockerRunner = this.runners.get("docker");
       if (!dockerRunner) throw new Error("Docker runner not available");
@@ -4011,7 +4034,7 @@ var ProcessManager = class extends EventEmitter7 {
       proc.kill("SIGTERM");
       void Promise.race([
         proc.exitPromise,
-        new Promise((resolve) => setTimeout(resolve, 3e3))
+        new Promise((resolve2) => setTimeout(resolve2, 3e3))
       ]).then((result) => {
         if (result === void 0) proc.kill("SIGKILL");
       });
@@ -4027,7 +4050,7 @@ var ProcessManager = class extends EventEmitter7 {
     this.consoleLogSource.addSystemLog(processId, `[shortcut] Running "${shortcutName}": ${shortcut.command}`, "info");
     const serviceConfig = proc.serviceConfig;
     const env2 = resolveEnv(serviceConfig.env);
-    const effectiveCwd = shortcut.cwd || serviceConfig.cwd;
+    const effectiveCwd = anchorCommandCwd(shortcut.cwd, serviceConfig);
     if (this.warnUnresolvedVars(processId, env2, { "shortcut cwd": effectiveCwd })) {
       this.consoleLogSource.addSystemLog(processId, `Cannot run shortcut "${shortcutName}": unresolved variables (see above)`, "error", { id: randomUUID3(), type: "command-fail", header: shortcutName, state: "self" });
       return { exitCode: 1 };
@@ -4062,7 +4085,7 @@ var ProcessManager = class extends EventEmitter7 {
     this.consoleLogSource.setJSParsers(processId, jsParsers);
     const serviceConfig = proc.serviceConfig;
     const env2 = resolveEnv(serviceConfig.env);
-    const effectiveCwd = cwd || serviceConfig.cwd;
+    const effectiveCwd = anchorCommandCwd(cwd, serviceConfig);
     if (this.warnUnresolvedVars(processId, env2, { cwd: effectiveCwd })) {
       this.consoleLogSource.addSystemLog(processId, `Cannot run command: unresolved variables (see above)`, "error", { id: randomUUID3(), type: "command-fail", header: command, state: "self" });
       return { exitCode: 1 };
@@ -4129,14 +4152,14 @@ var ProcessManager = class extends EventEmitter7 {
       sharedProc.kill("SIGTERM");
       await Promise.race([
         sharedProc.exitPromise,
-        new Promise((resolve) => setTimeout(resolve, graceMs))
+        new Promise((resolve2) => setTimeout(resolve2, graceMs))
       ]);
       const activeExecs = proc.commandProcesses.filter((cp) => cp.runnerProcess);
       await Promise.all(
         activeExecs.map(async (cp) => {
           await Promise.race([
             cp.runnerProcess.exitPromise,
-            new Promise((resolve) => setTimeout(resolve, 2e3))
+            new Promise((resolve2) => setTimeout(resolve2, 2e3))
           ]);
           cp.runnerProcess = null;
         })
@@ -4151,7 +4174,7 @@ var ProcessManager = class extends EventEmitter7 {
       activeProcesses.map(async (cp) => {
         const exited = await Promise.race([
           cp.runnerProcess.exitPromise.then(() => true),
-          new Promise((resolve) => setTimeout(() => resolve(false), graceMs))
+          new Promise((resolve2) => setTimeout(() => resolve2(false), graceMs))
         ]);
         if (!exited && cp.runnerProcess) {
           cp.runnerProcess.kill("SIGKILL");
@@ -4247,7 +4270,8 @@ var ProcessManager = class extends EventEmitter7 {
       startedAt: proc.startedAt,
       restartCount: proc.restartCount,
       uptime,
-      healthStatus
+      healthStatus,
+      cwd: effectiveProcessCwd(proc.serviceConfig)
     };
   }
   emitStatus(processId) {
@@ -4356,15 +4380,15 @@ var processRouter = router({
   /** Subscribe to real-time log stream (yields batches of ParsedLog[]) */
   onLog: protectedProcedure.input(z22.object({ processId: z22.string().max(128).optional() }).optional()).subscription(async function* ({ input }) {
     const queue = [];
-    let resolve = null;
+    let resolve2 = null;
     const handler = (batch) => {
       const filtered = input?.processId ? batch.filter((log) => log.processId === input.processId) : batch;
       if (filtered.length === 0) return;
       if (queue.length >= SUBSCRIPTION_QUEUE_MAX) queue.shift();
       queue.push(filtered);
-      if (resolve) {
-        resolve();
-        resolve = null;
+      if (resolve2) {
+        resolve2();
+        resolve2 = null;
       }
     };
     processManager.on("logs", handler);
@@ -4374,7 +4398,7 @@ var processRouter = router({
           yield queue.shift();
         } else {
           await new Promise((r) => {
-            resolve = r;
+            resolve2 = r;
           });
         }
       }
@@ -4386,15 +4410,15 @@ var processRouter = router({
   onStatus: protectedProcedure.input(z22.object({ processId: z22.string().max(128).optional() }).optional()).subscription(async function* ({ input }) {
     console.debug("[agent] onStatus subscription started", input?.processId ? `for process ${input.processId}` : "(all processes)");
     const queue = [];
-    let resolve = null;
+    let resolve2 = null;
     const handler = (status) => {
       const entry = status;
       if (!input?.processId || entry.id === input.processId) {
         if (queue.length >= SUBSCRIPTION_QUEUE_MAX) queue.shift();
         queue.push(status);
-        if (resolve) {
-          resolve();
-          resolve = null;
+        if (resolve2) {
+          resolve2();
+          resolve2 = null;
         }
       }
     };
@@ -4405,7 +4429,7 @@ var processRouter = router({
           yield queue.shift();
         } else {
           await new Promise((r) => {
-            resolve = r;
+            resolve2 = r;
           });
         }
       }
@@ -4417,15 +4441,15 @@ var processRouter = router({
   /** Subscribe to real-time health status changes */
   onHealth: protectedProcedure.input(z22.object({ processId: z22.string().max(128).optional() }).optional()).subscription(async function* ({ input }) {
     const queue = [];
-    let resolve = null;
+    let resolve2 = null;
     const handler = (healthData) => {
       const entry = healthData;
       if (!input?.processId || entry.processId === input.processId) {
         if (queue.length >= SUBSCRIPTION_QUEUE_MAX) queue.shift();
         queue.push(healthData);
-        if (resolve) {
-          resolve();
-          resolve = null;
+        if (resolve2) {
+          resolve2();
+          resolve2 = null;
         }
       }
     };
@@ -4436,7 +4460,7 @@ var processRouter = router({
           yield queue.shift();
         } else {
           await new Promise((r) => {
-            resolve = r;
+            resolve2 = r;
           });
         }
       }
@@ -4447,15 +4471,15 @@ var processRouter = router({
   /** Subscribe to real-time metrics */
   onMetrics: protectedProcedure.input(z22.object({ processId: z22.string().max(128).optional() }).optional()).subscription(async function* ({ input }) {
     const queue = [];
-    let resolve = null;
+    let resolve2 = null;
     const handler = (metrics) => {
       const entry = metrics;
       if (!input?.processId || entry.processId === input.processId) {
         if (queue.length >= SUBSCRIPTION_QUEUE_MAX) queue.shift();
         queue.push(metrics);
-        if (resolve) {
-          resolve();
-          resolve = null;
+        if (resolve2) {
+          resolve2();
+          resolve2 = null;
         }
       }
     };
@@ -4466,7 +4490,7 @@ var processRouter = router({
           yield queue.shift();
         } else {
           await new Promise((r) => {
-            resolve = r;
+            resolve2 = r;
           });
         }
       }
@@ -4607,20 +4631,20 @@ var terminalRouter = router({
       throw new TRPCError3({ code: "NOT_FOUND", message: `Terminal session ${input.sessionId} not found` });
     }
     const queue = [];
-    let resolve = null;
+    let resolve2 = null;
     let done = false;
     const onData = (data) => {
       queue.push(data);
-      if (resolve) {
-        resolve();
-        resolve = null;
+      if (resolve2) {
+        resolve2();
+        resolve2 = null;
       }
     };
     const onExit = () => {
       done = true;
-      if (resolve) {
-        resolve();
-        resolve = null;
+      if (resolve2) {
+        resolve2();
+        resolve2 = null;
       }
     };
     emitter.on("data", onData);
@@ -4631,7 +4655,7 @@ var terminalRouter = router({
           yield queue.shift();
         } else {
           await new Promise((r) => {
-            resolve = r;
+            resolve2 = r;
           });
         }
       }
@@ -4834,15 +4858,15 @@ var gitRouter = router({
     const gitDir = (await git(["rev-parse", "--git-dir"], cwd, true)).trim();
     const absGitDir = resolvePath(cwd, gitDir);
     const queue = [];
-    let resolve = null;
+    let resolve2 = null;
     let debounceTimer = null;
     const onFsChange = () => {
       if (debounceTimer) clearTimeout(debounceTimer);
       debounceTimer = setTimeout(() => {
         queue.push("changed");
-        if (resolve) {
-          resolve();
-          resolve = null;
+        if (resolve2) {
+          resolve2();
+          resolve2 = null;
         }
       }, 500);
     };
@@ -4868,7 +4892,7 @@ var gitRouter = router({
           }
         } else {
           await new Promise((r) => {
-            resolve = r;
+            resolve2 = r;
           });
         }
       }
@@ -5303,19 +5327,19 @@ var AiSpawnManager = class {
     const entry = this.spawns.get(spawnId);
     if (!entry) throw new Error(`AI spawn ${spawnId} not found`);
     let offset = fromOffset;
-    let resolve = null;
+    let resolve2 = null;
     let done = false;
     const onChunk = () => {
-      if (resolve) {
-        resolve();
-        resolve = null;
+      if (resolve2) {
+        resolve2();
+        resolve2 = null;
       }
     };
     const onDone = () => {
       done = true;
-      if (resolve) {
-        resolve();
-        resolve = null;
+      if (resolve2) {
+        resolve2();
+        resolve2 = null;
       }
     };
     entry.emitter.on("chunk", onChunk);
@@ -5334,7 +5358,7 @@ var AiSpawnManager = class {
         }
         if (done && offset >= entry.buffer.length) break;
         await new Promise((r) => {
-          resolve = r;
+          resolve2 = r;
         });
       }
     } finally {
@@ -5593,12 +5617,12 @@ var CodexAppServerManager = class extends EventEmitter10 {
       throw new Error("codex app-server not connected");
     }
     const id = this.nextId++;
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       const timer = setTimeout(() => {
         this.pending.delete(id);
         reject(new Error(`Request ${method} (id=${id}) timed out`));
       }, REQUEST_TIMEOUT_MS);
-      this.pending.set(id, { resolve, reject, timer });
+      this.pending.set(id, { resolve: resolve2, reject, timer });
       this.writeLine({ jsonrpc: "2.0", method, id, params });
     });
   }
@@ -5722,12 +5746,12 @@ function extForMime(mime) {
   return MIME_TO_EXT[mime.toLowerCase()] ?? "png";
 }
 function runCmd(cmd, args, stdin, timeoutMs = 5e3) {
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     let settled = false;
     const settle = (code, stderr) => {
       if (settled) return;
       settled = true;
-      resolve({ code, stderr });
+      resolve2({ code, stderr });
     };
     try {
       const child = spawn7(cmd, args, { stdio: ["pipe", "ignore", "pipe"] });
@@ -5929,16 +5953,16 @@ var aiRouter = router({
   }).default({})).subscription(async function* ({ input, signal }) {
     await codexAppServerManager.ensureConnected();
     const queue = [];
-    let resolve = null;
+    let resolve2 = null;
     const unsub = codexAppServerManager.onNotification((method, params) => {
       if (input.threadId) {
         const notifThreadId = params["threadId"] ?? params["turn"]?.["threadId"];
         if (notifThreadId && notifThreadId !== input.threadId) return;
       }
       queue.push({ method, params });
-      if (resolve) {
-        resolve();
-        resolve = null;
+      if (resolve2) {
+        resolve2();
+        resolve2 = null;
       }
     });
     try {
@@ -5947,7 +5971,7 @@ var aiRouter = router({
           yield queue.shift();
         }
         await new Promise((r) => {
-          resolve = r;
+          resolve2 = r;
         });
       }
     } finally {
@@ -6262,24 +6286,34 @@ function createAgent(opts) {
     await traefikManager.stop();
     await processManager.shutdownAll();
     await Promise.race([
-      new Promise((resolve) => healthWss.close(() => resolve())),
-      new Promise((resolve) => setTimeout(resolve, 5e3))
+      new Promise((resolve2) => healthWss.close(() => resolve2())),
+      new Promise((resolve2) => setTimeout(resolve2, 5e3))
     ]);
     await Promise.race([
-      new Promise((resolve) => trpcWss.close(() => resolve())),
-      new Promise((resolve) => setTimeout(resolve, 5e3))
+      new Promise((resolve2) => trpcWss.close(() => resolve2())),
+      new Promise((resolve2) => setTimeout(resolve2, 5e3))
     ]);
     await Promise.race([
-      new Promise((resolve) => server.close(() => resolve())),
-      new Promise((resolve) => setTimeout(resolve, 5e3))
+      new Promise((resolve2) => server.close(() => resolve2())),
+      new Promise((resolve2) => setTimeout(resolve2, 5e3))
     ]);
   };
   return { app, server, trpcWss, healthWss, passphraseHex, shutdown };
 }
 
+// src/config/node-path.ts
+import { dirname as dirname3, delimiter } from "path";
+function ensureNodeBinOnPath(environment = process.env) {
+  const nodeBin = dirname3(process.execPath);
+  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;
+}
+
 // src/index.ts
 function listenWithRetry(server, port, host, maxRetries = 20, delay = 500) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     let attempts = 0;
     const tryListen = () => {
       const onError = (err) => {
@@ -6295,7 +6329,7 @@ function listenWithRetry(server, port, host, maxRetries = 20, delay = 500) {
       server.once("error", onError);
       server.listen(port, host, () => {
         server.removeListener("error", onError);
-        resolve();
+        resolve2();
       });
     };
     tryListen();
@@ -6310,6 +6344,7 @@ process.on("uncaughtException", (err) => {
   process.exit(1);
 });
 async function main() {
+  ensureNodeBinOnPath();
   const { server, shutdown, passphraseHex } = createAgent({
     passphraseHex: env.PASSPHRASE_OVERRIDE
   });