@myagentroam/node 0.9.132 → 0.9.133

package/dist/native-session-history.js

@@ -433,6 +433,7 @@ async function readTranscript(path, runner, byteLimit, page, targetLines = Numbe
     const toolIndexes = new Map();
     const metaRecordIds = new Set();
     const claudeCompactCommandIds = new Set();
+    let codexTurnId;
     forEachJsonlRecord(content, (value) => {
         if (derivedTranscriptRecord(runner, value))
             derivedSession = true;
@@ -444,6 +445,13 @@ async function readTranscript(path, runner, byteLimit, page, targetLines = Numbe
             claudeCompactCommandIds.add(value['uuid']);
     });
     forEachJsonlRecord(truncated ? window.pageContent : content, (value) => {
+        if (runner === 'codex' && value['type'] === 'event_msg' && isRecord(value['payload'])) {
+            const payload = value['payload'];
+            if (payload['type'] === 'task_started')
+                codexTurnId = typeof payload['turn_id'] === 'string' ? payload['turn_id'] : undefined;
+            else if (payload['type'] === 'task_complete')
+                codexTurnId = undefined;
+        }
         const recordId = typeof value['uuid'] === 'string' ? value['uuid'] : undefined;
         const parentId = typeof value['parentUuid'] === 'string' ? value['parentUuid'] : undefined;
         if (value['isMeta'] === true && recordId !== undefined)
@@ -469,7 +477,16 @@ async function readTranscript(path, runner, byteLimit, page, targetLines = Numbe
         if (generatedImage !== undefined)
             items.push(generatedImage);
         for (const parsedItem of transcriptItems(runner, value)) {
-            const item = recordId === undefined ? parsedItem : { ...parsedItem, nativeId: recordId };
+            const item = {
+                ...parsedItem,
+                ...(recordId === undefined ? {} : { nativeId: recordId }),
+                ...(runner === 'codex' &&
+                    parsedItem.kind === 'message' &&
+                    parsedItem.role === 'USER' &&
+                    codexTurnId !== undefined
+                    ? { nativeTurnId: codexTurnId }
+                    : {})
+            };
             if (item.kind === 'tool_result') {
                 const toolIndex = toolIndexes.get(item.toolUseId);
                 if (toolIndex !== undefined)

package/dist/node-execution-environment.js

@@ -0,0 +1,34 @@
+import { existsSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+/** Environment for processes started by this Node, not for the Node service itself. */
+export function nodeExecutionEnvironment(provided = {}, inherited = process.env, options = {}) {
+    const environment = Object.fromEntries(Object.entries(inherited).filter((entry) => typeof entry[1] === 'string'));
+    Object.assign(environment, provided);
+    environment['MAR_NODE_CONTEXT'] = '1';
+    const platform = options.platform ?? process.platform;
+    const packageRoot = options.packageRoot ?? resolve(dirname(fileURLToPath(import.meta.url)), '..');
+    const cliBin = join(packageRoot, 'node_modules', '.bin');
+    if (!existsSync(join(cliBin, platform === 'win32' ? 'marnodes.cmd' : 'marnodes')))
+        return environment;
+    const separator = platform === 'win32' ? ';' : ':';
+    const existingKeys = Object.keys(environment).filter((key) => key.toLowerCase() === 'path');
+    const key = platform === 'win32'
+        ? (Object.keys(provided).find((name) => name.toLowerCase() === 'path') ??
+            existingKeys[0] ??
+            'Path')
+        : 'PATH';
+    const current = environment[key] ?? environment[existingKeys[0] ?? key] ?? '';
+    if (platform === 'win32')
+        for (const other of existingKeys)
+            if (other !== key)
+                delete environment[other];
+    const samePath = (entry) => platform === 'win32'
+        ? entry.replaceAll('/', '\\').toLowerCase() === cliBin.replaceAll('/', '\\').toLowerCase()
+        : entry === cliBin;
+    environment[key] = [
+        cliBin,
+        ...current.split(separator).filter((entry) => entry && !samePath(entry))
+    ].join(separator);
+    return environment;
+}

package/dist/runner/abstract-runner.js

@@ -1,4 +1,5 @@
 import { mcpRuntimeDescriptorSchema } from '@myagentroam/protocol';
+import { nodeExecutionEnvironment } from '../node-execution-environment.js';
 /**
  * Stable lifecycle boundary for every Node Runner implementation.
  *
@@ -175,6 +176,7 @@ function resolvedMcpServers(raw, secrets) {
             : { MAR_MGR_USER_TOKEN: secrets['MAR_MGR_USER_TOKEN'] }),
         MAR_MGR_CONTEXT_REQUIRED: '1'
     };
+    const mcpEnvironment = (provided) => nodeExecutionEnvironment({ ...provided, ...marmgrEnvironment }, { PATH: process.env['PATH'], Path: process.env['Path'] });
     const result = [];
     for (const value of raw) {
         if (value === null || typeof value !== 'object' || Array.isArray(value))
@@ -197,24 +199,21 @@ function resolvedMcpServers(raw, secrets) {
                 transport: 'STDIO',
                 command: record['command'],
                 args: record['args'],
-                environment: record['__marGoal'] === true
+                environment: mcpEnvironment(record['__marGoal'] === true
                     ? {
                         MAR_GOAL_MCP_ENDPOINT: record['endpoint'],
-                        MAR_GOAL_MCP_TOKEN: secrets[record['secretName']],
-                        ...marmgrEnvironment
+                        MAR_GOAL_MCP_TOKEN: secrets[record['secretName']]
                     }
                     : record['__marScheduled'] === true
                         ? {
                             MAR_SCHEDULE_MCP_ENDPOINT: record['endpoint'],
                             MAR_SCHEDULE_MCP_TOKEN: secrets[record['secretName']],
-                            MAR_SCHEDULE_MCP_READ_ONLY: record['readOnly'] === true ? '1' : '0',
-                            ...marmgrEnvironment
+                            MAR_SCHEDULE_MCP_READ_ONLY: record['readOnly'] === true ? '1' : '0'
                         }
                         : {
                             MAR_MAIL_MCP_ENDPOINT: record['endpoint'],
-                            MAR_MAIL_MCP_TOKEN: secrets[record['secretName']],
-                            ...marmgrEnvironment
-                        }
+                            MAR_MAIL_MCP_TOKEN: secrets[record['secretName']]
+                        })
             });
             continue;
         }
@@ -251,11 +250,10 @@ function resolvedMcpServers(raw, secrets) {
                         ? configuration['arguments'].filter((item) => typeof item === 'string')
                         : [])
                 ],
-                environment: {
+                environment: mcpEnvironment({
                     ...runtimeEnvironment,
-                    ...configuredEnvironment,
-                    ...marmgrEnvironment
-                }
+                    ...configuredEnvironment
+                })
             });
         }
         else {

package/dist/runner/claude/managed-run-controller.js

@@ -1,5 +1,6 @@
 import { createEnvelope } from '@myagentroam/protocol';
 import { ClaudeChannelGate } from '../../claude-channel.js';
+import { nodeExecutionEnvironment } from '../../node-execution-environment.js';
 import { boundedConversationItemId, claudePlanText, compactRunnerText, extractClaudeText, extractClaudeThinkingSummaries, extractClaudeToolResults, extractClaudeToolUses } from '../codex/conversation-parser.js';
 import { normalizeClaudeTool } from './tool-normalizer.js';
 import { claudeContentBlocks } from '../../util/node-operation-parsers.js';
@@ -170,7 +171,10 @@ export class ClaudeManagedRunController {
                 ...(typeof payload.model === 'string' ? { model: payload.model } : {}),
                 ...(typeof payload.effort === 'string' ? { effort: payload.effort } : {}),
                 ...(typeof payload.access === 'string' ? { access: payload.access } : {}),
-                environment: { ...secretEnvironment, MAR_MGR_CONTEXT_REQUIRED: '1' },
+                environment: nodeExecutionEnvironment({
+                    ...secretEnvironment,
+                    MAR_MGR_CONTEXT_REQUIRED: '1'
+                }, { PATH: process.env['PATH'], Path: process.env['Path'] }),
                 ...(typeof payload.personalInstructions === 'string'
                     ? { personalInstructions: payload.personalInstructions }
                     : {}),

package/dist/runner/codex/managed-run-controller.js

@@ -1,3 +1,4 @@
+import { nodeExecutionEnvironment } from '../../node-execution-environment.js';
 import { extractId } from '../../util/runner-native-session-parsers.js';
 import { parseSecretEnvironment } from '../../util/secret-environment.js';
 import { safeErrorCode } from '../../util/safe-error.js';
@@ -65,7 +66,7 @@ export class CodexManagedRunController {
             throw new Error('RUNNER_COMMAND_UNAVAILABLE');
         if (command.id === 'compact') {
             const runId = crypto.randomUUID();
-            this.runner.prepareEnvironment(context.secretEnvironment, runId);
+            this.runner.prepareEnvironment(nodeExecutionEnvironment({ ...context.secretEnvironment, MAR_MGR_CONTEXT_REQUIRED: '1' }, { PATH: process.env['PATH'], Path: process.env['Path'] }), runId);
             try {
                 await this.runner.start(runId);
                 return await this.compact(session, threadId, runId, context.initiatedByUserId);
@@ -385,7 +386,7 @@ export class CodexManagedRunController {
             return;
         }
         try {
-            this.runner.prepareEnvironment({ ...secretEnvironment, MAR_MGR_CONTEXT_REQUIRED: '1' }, runId);
+            this.runner.prepareEnvironment(nodeExecutionEnvironment({ ...secretEnvironment, MAR_MGR_CONTEXT_REQUIRED: '1' }, { PATH: process.env['PATH'], Path: process.env['Path'] }), runId);
         }
         catch (error) {
             this.host.emit(runId, 'run.rejected', { code: safeErrorCode(error, 'SECRET_ENVIRONMENT_INVALID') }, 'FAILED');

package/dist/runner/mar-agent/managed-run-controller.js

@@ -2,6 +2,7 @@ import { computerUseHostSkill } from './computer-use-skill.js';
 import { createHash, randomUUID } from 'node:crypto';
 import { homedir } from 'node:os';
 import { access, constants } from 'node:fs/promises';
+import { nodeExecutionEnvironment } from '../../node-execution-environment.js';
 import { BUNDLED_RIPGREP_VERSION, bundledRipgrepPath, prependBundledRipgrepToPath } from '../../ripgrep-binary.js';
 import { LocalAgentHost, createMarAgent } from '@myagentroam/agent';
 import { marAgentReasoningEffortSchema, marAgentRuntimeModelConfigurationSchema } from '@myagentroam/protocol';
@@ -686,7 +687,10 @@ export function allowsUntrustedWebFetchTls(environment) {
     return environment['MAR_AGENT_WEB_FETCH_ALLOW_UNTRUSTED_TLS'] !== '0';
 }
 async function resolveMarAgentHostRuntimeConfiguration(secretEnvironment = {}) {
-    const environment = { ...process.env, ...secretEnvironment, MAR_MGR_CONTEXT_REQUIRED: '1' };
+    const environment = nodeExecutionEnvironment({
+        ...secretEnvironment,
+        MAR_MGR_CONTEXT_REQUIRED: '1'
+    });
     const ripgrep = await availableBundledRipgrep();
     return {
         environment: ripgrep === undefined ? environment : prependBundledRipgrepToPath(environment, ripgrep),

package/dist/runner/mar-agent-runner.js

@@ -221,24 +221,36 @@ export class MarAgentRunner extends AbstractRunner {
         let catalog;
         try {
             catalog = await openMarAgentSessionCatalog({ homeDirectory: this.homeDirectory });
-            const listed = await catalog.list({ limit: 200 });
+            const activeCatalog = catalog;
+            const listed = await activeCatalog.list({ limit: 200 });
             const workspaces = workspace ? [workspace] : context.workspaces;
-            return listed.sessions.flatMap((session) => {
+            return (await Promise.all(listed.sessions.map(async (session) => {
                 const target = workspaces.find((candidate) => resolve(candidate.path) === resolve(session.workspace));
                 if (!target)
                     return [];
+                const executionConfiguration = session.modelId === undefined
+                    ? await activeCatalog.executionConfiguration(session.id)
+                    : session;
                 return [
-                    context.createProjection({
-                        workspace: target,
-                        runner: this.name,
-                        externalSessionId: session.id,
-                        cwd: session.workspace,
-                        title: session.title,
-                        titleOrigin: 'NATIVE',
-                        lastActivityAt: Date.parse(session.lastActivityAt)
-                    })
+                    {
+                        ...context.createProjection({
+                            workspace: target,
+                            runner: this.name,
+                            externalSessionId: session.id,
+                            cwd: session.workspace,
+                            title: session.title,
+                            titleOrigin: 'NATIVE',
+                            lastActivityAt: Date.parse(session.lastActivityAt)
+                        }),
+                        ...(executionConfiguration?.modelId === undefined
+                            ? {}
+                            : { model: executionConfiguration.modelId }),
+                        ...(executionConfiguration?.reasoningEffort === undefined
+                            ? {}
+                            : { effort: executionConfiguration.reasoningEffort })
+                    }
                 ];
-            });
+            }))).flat();
         }
         catch {
             return [];

package/dist/runner/opencode/managed-run-controller.js

@@ -1,3 +1,4 @@
+import { nodeExecutionEnvironment } from '../../node-execution-environment.js';
 import { parseSecretEnvironment } from '../../util/secret-environment.js';
 import { runnerErrorProjection } from '../../util/runner-error.js';
 import { boundedConversationItemId, compactRunnerText } from '../codex/conversation-parser.js';
@@ -49,7 +50,7 @@ export class OpenCodeManagedRunController {
             this.host.hasActiveSessionLease(session.id))
             throw new Error('RUNNER_COMMAND_UNAVAILABLE');
         const runId = crypto.randomUUID();
-        const client = this.runner.managedClient(environment);
+        const client = this.runner.managedClient(nodeExecutionEnvironment({ ...environment, MAR_MGR_CONTEXT_REQUIRED: '1' }, { PATH: process.env['PATH'], Path: process.env['Path'] }));
         this.host.adopt({
             runId,
             sessionId: session.id,
@@ -108,10 +109,10 @@ export class OpenCodeManagedRunController {
         let mcp;
         let attachments;
         try {
-            environment = {
+            environment = nodeExecutionEnvironment({
                 ...parseSecretEnvironment(payload.secretEnvironment),
                 MAR_MGR_CONTEXT_REQUIRED: '1'
-            };
+            }, { PATH: process.env['PATH'], Path: process.env['Path'] });
             mcpSecretEnvironment = parseSecretEnvironment(payload.mcpSecretEnvironment);
             mcp = this.runner.mcpConfiguration(payload.mcpInstallations, {
                 ...environment,

package/dist/service/conversation-history-service.js

@@ -369,20 +369,22 @@ export class ConversationHistoryService {
     }
     async readManagedRuntime(session, input, cursor, snapshotSequence, readAt) {
         const page = await this.readManagedActive(session, input, cursor, snapshotSequence, readAt);
+        const codexActive = session.runner === 'codex' && this.options.hasManagedActiveRun(session);
         if (input.cursor !== undefined ||
             session.externalSessionId === null ||
-            this.options.hasManagedActiveRun(session) ||
-            !this.hasManagedRuntimeHistory(session) ||
+            (!codexActive &&
+                (this.options.hasManagedActiveRun(session) || !this.hasManagedRuntimeHistory(session))) ||
             !page.turns.some((turn) => turn.rewind === undefined &&
                 terminalConversationTurn(turn.status) &&
                 conversationClientMessageId(turn) !== null))
             return page;
         // A completed managed Turn keeps its live items and Run identity until Runtime cleanup.
-        // Only the SDK's matched native Turn may supply a destructive history boundary.
-        const official = await this.readOfficial(session, {
-            limit: Math.min(500, Math.max(30, page.turns.length + 1))
-        }).catch(() => undefined);
-        if (official === undefined)
+        // Only its matched native Turn may supply a Rewind boundary.
+        const historyInput = { limit: Math.min(500, Math.max(30, page.turns.length + 1)) };
+        const authoritative = codexActive
+            ? (await this.readRunnerHistory(session, historyInput).catch(() => undefined))?.page
+            : await this.readOfficial(session, historyInput).catch(() => undefined);
+        if (authoritative === undefined)
             return page;
         return {
             ...page,
@@ -392,7 +394,7 @@ export class ConversationHistoryService {
                 const messageId = conversationClientMessageId(turn);
                 if (messageId === null)
                     return turn;
-                const native = official.turns.find((candidate) => candidate.rewind !== undefined &&
+                const native = authoritative.turns.find((candidate) => candidate.rewind !== undefined &&
                     candidate.userItemId !== null &&
                     conversationClientMessageId(candidate) === messageId);
                 return native?.rewind === undefined ? turn : { ...turn, rewind: native.rewind };

package/dist/terminal.js

@@ -5,6 +5,7 @@ import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { spawn } from 'node-pty';
 import { terminalDataFrameSchema } from '@myagentroam/protocol';
+import { nodeExecutionEnvironment } from './node-execution-environment.js';
 import { terminateProcessTree } from './process-tree.js';
 const MAX_FRAME_CHARACTERS = 65_536;
 const TERMINAL_COMMAND_MAX_BYTES = 64 * 1024;
@@ -138,7 +139,7 @@ export class TerminalManager {
             cols,
             rows,
             cwd: typeof input.cwd === 'string' ? input.cwd : this.cwd,
-            env: { ...process.env, ...input.environment }
+            env: nodeExecutionEnvironment(input.environment, process.env, { platform: this.platform })
         };
         const commandArgs = command === undefined
             ? undefined

package/dist/util/runner-native-session-parsers.js

@@ -182,6 +182,11 @@ export function nativeConversationPage(session, history, input, runtimeTurns = [
         const startedAt = items[0]?.startedAt ?? null;
         const completedAt = items.at(-1)?.completedAt ?? startedAt;
         const after = lastNativeItemId(entries);
+        const nativeIndex = start + relativeIndex;
+        const turnBoundaryAfter = nativeUser?.kind === 'message' ? nativeUser.nativeTurnId : undefined;
+        const previousNativeUser = nativeTurns[nativeIndex - 1]?.find(({ entry }) => entry.kind === 'message' && entry.role === 'USER')?.entry;
+        const turnBoundaryBefore = previousNativeUser?.kind === 'message' ? previousNativeUser.nativeTurnId : undefined;
+        const firstNativeTurn = nativeIndex === 0 && history.truncated !== true;
         return {
             id: turnId,
             sessionId: session.id,
@@ -199,6 +204,10 @@ export function nativeConversationPage(session, history, input, runtimeTurns = [
                         after
                     }
                 }),
+            ...(turnBoundaryAfter === undefined ||
+                (!firstNativeTurn && turnBoundaryBefore === undefined)
+                ? {}
+                : { rewind: { before: turnBoundaryBefore ?? null, after: turnBoundaryAfter } }),
             items,
             startedAt,
             completedAt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.9.132",
+  "version": "0.9.133",
   "description": "MyAgentRoam Node runtime CLI.",
   "license": "Apache-2.0 AND GPL-2.0-or-later",
   "type": "module",
@@ -34,9 +34,9 @@
     "npm": "11.12.1",
     "ws": "^8.21.3",
     "zod": "4.4.3",
-    "@myagentroam/marmgr": "0.9.115",
-    "@myagentroam/agent": "0.9.132",
-    "@myagentroam/protocol": "0.9.132",
+    "@myagentroam/marmgr": "0.9.116",
+    "@myagentroam/agent": "0.9.133",
+    "@myagentroam/protocol": "0.9.133",
     "@myagentroam/code-navigation": "0.9.129"
   },
   "devDependencies": {