@myagentroam/node 0.9.125 → 0.9.126

package/dist/codex-app-server.js

@@ -139,6 +139,36 @@ export class CodexAppServerClient {
         this.lifecycleRevision += 1;
         this.stopManaged();
     }
+    async stopAndWait() {
+        const child = this.child;
+        if (child === undefined) {
+            this.stop();
+            return;
+        }
+        const exited = new Promise((resolve, reject) => {
+            if (child.exitCode !== null || child.signalCode !== null)
+                resolve();
+            else {
+                let forcedTimeout;
+                const onExit = () => {
+                    clearTimeout(timeout);
+                    if (forcedTimeout !== undefined)
+                        clearTimeout(forcedTimeout);
+                    resolve();
+                };
+                const timeout = setTimeout(() => {
+                    child.kill('SIGKILL');
+                    forcedTimeout = setTimeout(() => {
+                        child.off('exit', onExit);
+                        reject(new Error('CODEX_APP_SERVER_STOP_TIMEOUT'));
+                    }, 2_000);
+                }, 2_000);
+                child.once('exit', onExit);
+            }
+        });
+        this.stop();
+        await exited;
+    }
     stopManaged() {
         this.transport?.destroy();
         this.transport = undefined;

package/dist/runner/codex-runner.js

@@ -3,7 +3,6 @@ import { AbstractRunner } from './abstract-runner.js';
 import { declaredRunnerProfiles } from '../runner-profiles.js';
 import { homedir } from 'node:os';
 import { resolve } from 'node:path';
-import { createHash } from 'node:crypto';
 import { discoverAllNativeSessions } from '../native-session-history.js';
 import { readCodexNativeContextUsage } from '../native-session-history.js';
 import { codexThreadCwd, deduplicateDirectSessions, extractCodexThreads, isWithinWorkspace, latestNativeActivity } from './codex/conversation-parser.js';
@@ -20,7 +19,6 @@ export class CodexRunner extends AbstractRunner {
     discoveryScope = 'ALL_WORKSPACES';
     execution = new CodexExecutionState();
     fastEnabled = false;
-    environmentClients = new Map();
     runClients = new Map();
     notificationListeners = new Set();
     clientNotificationDisposers = new Map();
@@ -318,13 +316,14 @@ export class CodexRunner extends AbstractRunner {
         return this.profileCache;
     }
     async resumeExternal(external, context) {
+        const threadId = external.externalSessionId;
         if (external.runner !== this.name ||
             external.nativeControl !== 'EXTERNAL' ||
-            external.externalSessionId === null ||
+            threadId === null ||
             !context.available)
             return { failureCode: 'RUNNER_UNAVAILABLE' };
         try {
-            await this.resumeThread(external.externalSessionId, external.cwd);
+            await this.withTemporaryClient((client) => client.resumeThread(threadId, external.cwd));
             const projection = context.projectionFor(external);
             if (projection !== undefined) {
                 const promoted = context.promote(projection.id);
@@ -437,7 +436,7 @@ export class CodexRunner extends AbstractRunner {
     onNotification(listener) {
         this.notificationListeners.add(listener);
         this.attachNotifications(this.client);
-        for (const { client } of this.environmentClients.values())
+        for (const client of this.runClients.values())
             this.attachNotifications(client);
         return () => this.notificationListeners.delete(listener);
     }
@@ -459,8 +458,7 @@ export class CodexRunner extends AbstractRunner {
         if (!isCodexRolloutMissingError(error))
             return false;
         const client = this.clientFor(runId);
-        const entry = [...this.environmentClients.values()].find((value) => value.client === client);
-        if (entry !== undefined && [...entry.runIds].some((activeRunId) => activeRunId !== runId))
+        if ([...this.runClients].some(([activeRunId, activeClient]) => activeRunId !== runId && activeClient === client))
             return false;
         if ([...this.execution.runs].some(([activeRunId]) => activeRunId !== runId && this.runClients.get(activeRunId) === client))
             return false;
@@ -469,20 +467,12 @@ export class CodexRunner extends AbstractRunner {
         return true;
     }
     prepareEnvironment(environment, runId) {
-        const fingerprint = createHash('sha256')
-            .update(JSON.stringify(Object.entries(environment).sort(([left], [right]) => left.localeCompare(right))))
-            .digest('base64url');
-        const existing = this.environmentClients.get(fingerprint);
-        if (existing !== undefined) {
-            existing.runIds.add(runId);
-            this.runClients.set(runId, existing.client);
+        if (this.runClients.has(runId))
             return;
-        }
         const client = this.runClientFactory();
         if (Object.keys(environment).length > 0)
             client.configureEnvironment(environment);
         this.attachNotifications(client);
-        this.environmentClients.set(fingerprint, { client, runIds: new Set([runId]) });
         this.runClients.set(runId, client);
     }
     releaseEnvironment(runId) {
@@ -490,19 +480,10 @@ export class CodexRunner extends AbstractRunner {
         if (client === undefined)
             return;
         this.runClients.delete(runId);
-        for (const [fingerprint, entry] of this.environmentClients) {
-            if (entry.client !== client)
-                continue;
-            entry.runIds.delete(runId);
-            if (entry.runIds.size === 0) {
-                this.environmentClients.delete(fingerprint);
-                if (client !== this.client) {
-                    this.detachNotifications(client);
-                    client.stop();
-                    client.clearEnvironment();
-                }
-            }
-            return;
+        if (client !== this.client && ![...this.runClients.values()].includes(client)) {
+            this.detachNotifications(client);
+            client.stop();
+            client.clearEnvironment();
         }
     }
     stop() {
@@ -510,13 +491,12 @@ export class CodexRunner extends AbstractRunner {
         for (const profileClient of this.profileClients)
             profileClient.stop();
         this.profileClients.clear();
-        for (const { client } of this.environmentClients.values())
+        for (const client of new Set(this.runClients.values()))
             if (client !== this.client) {
                 this.detachNotifications(client);
                 client.stop();
                 client.clearEnvironment();
             }
-        this.environmentClients.clear();
         this.runClients.clear();
         this.client.stop();
         if (this.profileCacheTimer !== undefined)
@@ -530,6 +510,17 @@ export class CodexRunner extends AbstractRunner {
     clientFor(runId) {
         return runId === undefined ? this.client : (this.runClients.get(runId) ?? this.client);
     }
+    async withTemporaryClient(operation) {
+        const client = this.runClientFactory();
+        try {
+            await client.start();
+            return await operation(client);
+        }
+        finally {
+            if (client !== this.client)
+                await client.stopAndWait();
+        }
+    }
     attachNotifications(client) {
         if (this.clientNotificationDisposers.has(client))
             return;
@@ -558,16 +549,18 @@ export class CodexRunner extends AbstractRunner {
         return this.client.forkThread(threadId, cwd, lastTurnId, configuration);
     }
     async forkNative(session, boundary, title) {
-        if (session.externalSessionId === null)
+        const threadId = session.externalSessionId;
+        if (threadId === null)
             throw new Error('SESSION_REWIND_UNAVAILABLE');
-        await this.start();
         const configuration = { model: session.model, effort: session.effort, access: session.access };
-        const result = boundary === null
-            ? await this.startThread(session.cwd, configuration)
-            : await this.forkThread(session.externalSessionId, session.cwd, boundary, configuration);
-        const threadId = extractId(result, 'thread');
-        await this.setThreadName(threadId, title);
-        return threadId;
+        return this.withTemporaryClient(async (client) => {
+            const result = boundary === null
+                ? await client.startThread(session.cwd, configuration)
+                : await client.forkThread(threadId, session.cwd, boundary, configuration);
+            const forkedThreadId = extractId(result, 'thread');
+            await client.setThreadName(forkedThreadId, title);
+            return forkedThreadId;
+        });
     }
     resumeThread(threadId, cwd, configuration, runId) {
         return this.clientFor(runId).resumeThread(threadId, cwd, configuration);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.9.125",
+  "version": "0.9.126",
   "description": "MyAgentRoam Node runtime CLI.",
   "license": "Apache-2.0 AND GPL-2.0-or-later",
   "type": "module",
@@ -30,9 +30,9 @@
     "npm": "11.12.1",
     "ws": "^8.21.3",
     "zod": "4.4.3",
-    "@myagentroam/agent": "0.9.125",
-    "@myagentroam/code-navigation": "0.9.125",
-    "@myagentroam/protocol": "0.9.125"
+    "@myagentroam/agent": "0.9.126",
+    "@myagentroam/protocol": "0.9.126",
+    "@myagentroam/code-navigation": "0.9.126"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"