evolcore 0.0.26 → 0.0.28

package/dist/agents/codex/app-server-client.js

@@ -210,8 +210,8 @@ export class CodexAppServerClient {
         }
         return undefined;
     }
-    async threadRead(threadId, includeTurns = true) {
-        return this.request('thread/read', { threadId, includeTurns });
+    async threadRead(threadId, includeTurns = true, timeoutMs) {
+        return this.request('thread/read', { threadId, includeTurns }, timeoutMs);
     }
     async threadRollback(threadId, numTurns) {
         return this.request('thread/rollback', { threadId, numTurns });
@@ -481,6 +481,12 @@ export class CodexAppServerClient {
         const launchCommand = resolveCodexLaunchCommand(args);
         if (!launchCommand)
             throw new Error('Codex CLI not found');
+        logger.info(`[CodexAppServer] launch ${JSON.stringify({
+            resolvedPath: launchCommand.resolvedPath,
+            launcherKind: launchCommand.launcherKind,
+            launcherPath: launchCommand.launcherPath,
+            codexVersion: this.options.codexVersion ?? null,
+        })}`);
         try {
             let command = launchCommand.command;
             let commandArgs = launchCommand.args;
@@ -509,6 +515,7 @@ export class CodexAppServerClient {
                 env,
                 stdio: ['pipe', 'pipe', 'pipe'],
                 windowsHide: process.platform === 'win32',
+                windowsVerbatimArguments: launchCommand.windowsVerbatimArguments,
             });
             try {
                 this.processRegistrationPath = registerCodexAppServerProcess(this.proc.pid);
@@ -622,7 +629,7 @@ export class CodexAppServerClient {
         env.TMPDIR = managedTmpDir;
         delete env.EVOLCORE_RUNTIME_LOCK_DIR;
         if (managedTmpDir) {
-            const runtimeLockDir = path.join(managedTmpDir, 'evolcore-locks');
+            const runtimeLockDir = path.join(managedTmpDir, 'locks');
             try {
                 // The parent is the already-validated process root, so only create
                 // and validate the final component. Never follow a pre-existing
@@ -768,30 +775,63 @@ export class CodexAppServerClient {
         }
         return args;
     }
-    async request(method, params) {
-        await this.ensureReadyFor(method);
-        const proc = this.proc;
-        if (!proc)
-            throw new Error('Codex app-server is not running');
-        const id = String(this.nextId++);
-        const payload = { id, method };
-        if (params !== undefined && params !== null)
-            payload.params = params;
-        return new Promise((resolve, reject) => {
-            this.pending.set(id, {
-                resolve,
-                reject,
-                method,
-                params,
-                stderrStartSequence: this.stderrSequence,
-            });
-            proc.stdin.write(`${JSON.stringify(payload)}\n`, error => {
-                if (!error)
-                    return;
-                this.pending.delete(id);
-                reject(error);
+    async request(method, params, timeoutMs) {
+        // Only lifecycle RPCs get short deadlines. Model work has its own policy.
+        const deadline = timeoutMs ?? (method === 'turn/interrupt' ? 5_000 : undefined);
+        let timer;
+        let requestId;
+        let expired = false;
+        const operation = (async () => {
+            await this.ensureReadyFor(method);
+            if (expired)
+                throw new Error(`Codex ${method} expired before dispatch`);
+            const proc = this.proc;
+            if (!proc)
+                throw new Error('Codex app-server is not running');
+            const id = String(this.nextId++);
+            requestId = id;
+            const payload = { id, method };
+            if (params !== undefined && params !== null)
+                payload.params = params;
+            return new Promise((resolve, reject) => {
+                this.pending.set(id, {
+                    resolve,
+                    reject,
+                    method,
+                    params,
+                    stderrStartSequence: this.stderrSequence,
+                });
+                proc.stdin.write(`${JSON.stringify(payload)}\n`, error => {
+                    if (!error)
+                        return;
+                    this.pending.delete(id);
+                    reject(error);
+                });
             });
-        });
+        })();
+        if (deadline === undefined)
+            return operation;
+        try {
+            return await Promise.race([
+                operation,
+                new Promise((_, reject) => {
+                    timer = setTimeout(() => {
+                        expired = true;
+                        reject(new Error(`Codex ${method} deadline exceeded`));
+                    }, deadline);
+                    timer.unref?.();
+                }),
+            ]);
+        }
+        finally {
+            if (timer)
+                clearTimeout(timer);
+            if (requestId && expired) {
+                const pending = this.pending.get(requestId);
+                this.pending.delete(requestId);
+                pending?.reject(new Error(`Codex ${method} deadline exceeded`));
+            }
+        }
     }
     respond(id, result) {
         if (!this.proc)
@@ -870,6 +910,10 @@ export class CodexAppServerClient {
             else if (/already has an active writer/i.test(detail)) {
                 error.code = CODEX_THREAD_ACTIVE_WRITER;
             }
+            else if (pending.method === 'turn/steer' && /\bno active turn\b/i.test(detail)) {
+                // Explicit server rejection proves the input was not accepted. Transport errors do not.
+                error.code = 'CODEX_NO_ACTIVE_TURN';
+            }
             pending.reject(error);
             return;
         }

package/dist/agents/codex/catalog.js

@@ -7,7 +7,13 @@ async function cliModels() {
     if (!launch)
         return null;
     return new Promise(resolve => {
-        execFile(launch.command, launch.args, { timeout: 3000, windowsHide: true, maxBuffer: 16 * 1024 * 1024, encoding: 'utf8' }, (error, stdout) => {
+        execFile(launch.command, launch.args, {
+            timeout: 3000,
+            windowsHide: true,
+            windowsVerbatimArguments: launch.windowsVerbatimArguments,
+            maxBuffer: 16 * 1024 * 1024,
+            encoding: 'utf8',
+        }, (error, stdout) => {
             try {
                 if (error)
                     return resolve(null);