@myagentroam/node 0.9.139 → 0.9.140

package/dist/connector.js

@@ -316,7 +316,7 @@ export class NodeConnector {
             waitMs
         })
     });
-    workspaceFileService = new WorkspaceFileService(this.workspaceState, () => this.config?.allowedRoots ?? [], (workspaceId) => {
+    workspaceFileService = new WorkspaceFileService(this.workspaceState, (workspaceId) => {
         this.workspaceWorkbenchService?.invalidateWorkspaceFiles(workspaceId);
         this.workspaceCoordinator.invalidate(workspaceId);
     });
@@ -462,6 +462,7 @@ export class NodeConnector {
                 sequence: this.workbenchEventService.snapshotSequence(),
                 session: this.sessionPresentationService.present(session),
                 runs: this.runtime.listRunsForSession(session.id),
+                performance: this.runtime.sessionPerformance(session.id),
                 queue: this.workspaceQueueWorkbenchService.snapshot(session.id),
                 context,
                 conversation: this.conversationSegmentService.projectInitial(session, page, limit)

package/dist/{marmgr.js → marctl.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 // Keep the CLI implementation in its own package; the Node install exposes the same entrypoint.
-const entrypoint = '@myagentroam/marmgr/bin/marmgr.mjs';
+const entrypoint = '@myagentroam/marctl/bin/marctl.mjs';
 await import(entrypoint);
 export {};

package/dist/marnodes.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-const entrypoint = '@myagentroam/marmgr/bin/marnodes.mjs';
+const entrypoint = '@myagentroam/marctl/bin/marnodes.mjs';
 await import(entrypoint);
 export {};

package/dist/marscp.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-const entrypoint = '@myagentroam/marmgr/bin/marscp.mjs';
+const entrypoint = '@myagentroam/marctl/bin/marscp.mjs';
 await import(entrypoint);
 export {};

package/dist/marssh.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-const entrypoint = '@myagentroam/marmgr/bin/marssh.mjs';
+const entrypoint = '@myagentroam/marctl/bin/marssh.mjs';
 await import(entrypoint);
 export {};

package/dist/runner/abstract-runner.js

@@ -172,17 +172,17 @@ export class AbstractRunner {
 function resolvedMcpServers(raw, secrets) {
     if (!Array.isArray(raw))
         return [];
-    const marmgrEnvironment = {
+    const marctlEnvironment = {
         MAR_USERNAME: secrets['MAR_USERNAME'] ?? '',
-        ...(secrets['MAR_MGR_SERVER_URL'] === undefined
+        ...(secrets['MAR_CTL_SERVER_URL'] === undefined
             ? {}
-            : { MAR_MGR_SERVER_URL: secrets['MAR_MGR_SERVER_URL'] }),
-        ...(secrets['MAR_MGR_USER_TOKEN'] === undefined
+            : { MAR_CTL_SERVER_URL: secrets['MAR_CTL_SERVER_URL'] }),
+        ...(secrets['MAR_CTL_USER_TOKEN'] === undefined
             ? {}
-            : { MAR_MGR_USER_TOKEN: secrets['MAR_MGR_USER_TOKEN'] }),
-        MAR_MGR_CONTEXT_REQUIRED: '1'
+            : { MAR_CTL_USER_TOKEN: secrets['MAR_CTL_USER_TOKEN'] }),
+        MAR_CTL_CONTEXT_REQUIRED: '1'
     };
-    const mcpEnvironment = (provided) => nodeExecutionEnvironment({ ...provided, ...marmgrEnvironment }, { PATH: process.env['PATH'], Path: process.env['Path'] });
+    const mcpEnvironment = (provided) => nodeExecutionEnvironment({ ...provided, ...marctlEnvironment }, { PATH: process.env['PATH'], Path: process.env['Path'] });
     const result = [];
     for (const value of raw) {
         if (value === null || typeof value !== 'object' || Array.isArray(value))

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

@@ -173,7 +173,7 @@ export class ClaudeManagedRunController {
                 ...(typeof payload.access === 'string' ? { access: payload.access } : {}),
                 environment: nodeExecutionEnvironment({
                     ...secretEnvironment,
-                    MAR_MGR_CONTEXT_REQUIRED: '1'
+                    MAR_CTL_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

@@ -66,7 +66,7 @@ export class CodexManagedRunController {
             throw new Error('RUNNER_COMMAND_UNAVAILABLE');
         if (command.id === 'compact') {
             const runId = crypto.randomUUID();
-            this.runner.prepareEnvironment(nodeExecutionEnvironment({ ...context.secretEnvironment, MAR_MGR_CONTEXT_REQUIRED: '1' }, { PATH: process.env['PATH'], Path: process.env['Path'] }), runId);
+            this.runner.prepareEnvironment(nodeExecutionEnvironment({ ...context.secretEnvironment, MAR_CTL_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);
@@ -386,7 +386,7 @@ export class CodexManagedRunController {
             return;
         }
         try {
-            this.runner.prepareEnvironment(nodeExecutionEnvironment({ ...secretEnvironment, MAR_MGR_CONTEXT_REQUIRED: '1' }, { PATH: process.env['PATH'], Path: process.env['Path'] }), runId);
+            this.runner.prepareEnvironment(nodeExecutionEnvironment({ ...secretEnvironment, MAR_CTL_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/conversation-normalizer.js

@@ -141,9 +141,14 @@ export class MarAgentConversationNormalizer {
     }
     #toolStarted(event) {
         const ownItemId = itemId('tool', event.callId);
-        if (event.toolName === 'exec') {
+        if (event.toolName === 'exec' || event.toolName === 'exec_wait') {
             const input = record(event.input) ?? {};
-            const action = input.action == null && typeof input.command === 'string' ? 'start' : input.action;
+            const action = input.action ??
+                (event.toolName === 'exec_wait'
+                    ? 'poll'
+                    : typeof input.command === 'string'
+                        ? 'start'
+                        : undefined);
             if (action === 'start' && typeof input.command === 'string') {
                 const command = {
                     itemId: ownItemId,
@@ -227,7 +232,8 @@ export class MarAgentConversationNormalizer {
     }
     #toolCompleted(event) {
         const state = this.#tools.get(event.callId);
-        if (event.toolName === 'exec' && state?.commandOrigin !== undefined) {
+        if ((event.toolName === 'exec' || event.toolName === 'exec_wait') &&
+            state?.commandOrigin !== undefined) {
             const command = this.#commands.get(state.commandOrigin);
             const result = execResult(event.data, event.summary, event.truncated === true);
             if (command !== undefined && result !== undefined) {
@@ -293,7 +299,8 @@ export class MarAgentConversationNormalizer {
     }
     #toolFailed(event) {
         const state = this.#tools.get(event.callId);
-        if (event.toolName === 'exec' && state?.commandOrigin !== undefined) {
+        if ((event.toolName === 'exec' || event.toolName === 'exec_wait') &&
+            state?.commandOrigin !== undefined) {
             const command = this.#commands.get(state.commandOrigin);
             const input = record(state.input);
             if (command !== undefined &&

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

@@ -273,7 +273,9 @@ export class MarAgentManagedRunController {
                 throw new Error('MAR_AGENT_SESSION_RUNTIME_ACTIVE');
             runtime.activeRunId = input.runId;
             await runtime.mcpLease.pool.refreshForExecution();
-            const executionMcpServers = input.mcpServers.filter((server) => server.lifecycle === 'EXECUTION');
+            const executionMcpServers = input.mcpServers
+                .filter(isExecutionScopedMcp)
+                .map((server) => ({ ...server, lifecycle: 'EXECUTION' }));
             computerUseBinding = await this.#computerUse?.bind({
                 runId: input.runId,
                 sessionId: runtime.session.id,
@@ -311,6 +313,9 @@ export class MarAgentManagedRunController {
             });
             executionMcpBinding = runtime.host.bindExecutionExtensions({
                 ...imageExtensions,
+                environment: input.secretEnvironment?.['MAR_CTL_USER_TOKEN'] === undefined
+                    ? {}
+                    : { MAR_CTL_USER_TOKEN: input.secretEnvironment['MAR_CTL_USER_TOKEN'] },
                 skills: [...(imageExtensions.skills ?? []), computerUseHostSkill]
             }, {
                 tools: [...nodeTools, ...userTools],
@@ -500,7 +505,7 @@ export class MarAgentManagedRunController {
     async #createRuntime(input, sessionKey, fingerprint, hostConfiguration) {
         const dynamicCredentials = input.models.some((model) => model.credential?.type === 'RUNTIME_TICKET' ||
             model.imageGeneration?.credential?.type === 'RUNTIME_TICKET');
-        const sharedMcpServers = input.mcpServers.filter((server) => server.lifecycle !== 'EXECUTION');
+        const sharedMcpServers = input.mcpServers.filter((server) => !isExecutionScopedMcp(server));
         const mcpLease = await this.#mcpClients.acquire(sharedMcpServers, input.cwd, {
             // Native Session IDs are assigned after the first lease; do not let that promotion
             // change a confirmed actor's discovery identity when its warm runtime is recreated.
@@ -706,6 +711,10 @@ function contextUsageChanged(event) {
         (event.type === 'usage.updated' &&
             (event.contextInputTokens !== undefined || event.inputTokens !== undefined)));
 }
+function isExecutionScopedMcp(server) {
+    return (server.lifecycle === 'EXECUTION' ||
+        (server.transport === 'STDIO' && server.environment?.['MAR_CTL_USER_TOKEN'] !== undefined));
+}
 function sessionRuntimeFingerprint(input, hostConfiguration) {
     return createHash('sha256')
         .update(JSON.stringify({
@@ -713,7 +722,7 @@ function sessionRuntimeFingerprint(input, hostConfiguration) {
         defaultModelId: input.model.id,
         models: input.models.map(runtimeModelFingerprint),
         personalInstructions: input.personalInstructions ?? '',
-        mcpServers: input.mcpServers.filter((server) => server.lifecycle !== 'EXECUTION'),
+        mcpServers: input.mcpServers.filter((server) => !isExecutionScopedMcp(server)),
         environment: Object.entries(hostConfiguration.environment)
             .filter((entry) => entry[1] !== undefined)
             .sort(([left], [right]) => left.localeCompare(right)),
@@ -727,8 +736,10 @@ export function allowsUntrustedWebFetchTls(environment) {
 async function resolveMarAgentHostRuntimeConfiguration(secretEnvironment = {}) {
     const environment = nodeExecutionEnvironment({
         ...secretEnvironment,
-        MAR_MGR_CONTEXT_REQUIRED: '1'
+        MAR_CTL_CONTEXT_REQUIRED: '1'
     });
+    // CLI credentials are bound to each execution, never retained as Host configuration.
+    delete environment['MAR_CTL_USER_TOKEN'];
     const ripgrep = await availableBundledRipgrep();
     return {
         environment: ripgrep === undefined ? environment : prependBundledRipgrepToPath(environment, ripgrep),

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

@@ -50,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(nodeExecutionEnvironment({ ...environment, MAR_MGR_CONTEXT_REQUIRED: '1' }, { PATH: process.env['PATH'], Path: process.env['Path'] }));
+        const client = this.runner.managedClient(nodeExecutionEnvironment({ ...environment, MAR_CTL_CONTEXT_REQUIRED: '1' }, { PATH: process.env['PATH'], Path: process.env['Path'] }));
         this.host.adopt({
             runId,
             sessionId: session.id,
@@ -111,7 +111,7 @@ export class OpenCodeManagedRunController {
         try {
             environment = nodeExecutionEnvironment({
                 ...parseSecretEnvironment(payload.secretEnvironment),
-                MAR_MGR_CONTEXT_REQUIRED: '1'
+                MAR_CTL_CONTEXT_REQUIRED: '1'
             }, { PATH: process.env['PATH'], Path: process.env['Path'] });
             mcpSecretEnvironment = parseSecretEnvironment(payload.mcpSecretEnvironment);
             mcp = this.runner.mcpConfiguration(payload.mcpInstallations, {

package/dist/runtime-state.js

@@ -13,6 +13,7 @@ export class NodeRuntimeState {
     static MAX_COMPLETED_TURNS_PER_SESSION = 10;
     sessions = new Map();
     runs = new Map();
+    runPerformance = new Map();
     recentUserMessages = new Map();
     messageSubmissions = new Map();
     failedMessageSubmissions = new Map();
@@ -553,6 +554,21 @@ export class NodeRuntimeState {
         const canonical = this.executions.get(id)?.runId ?? id;
         return this.runs.get(canonical);
     }
+    /** Only the current execution may replace an active Run's ephemeral metrics. */
+    updateRunPerformance(id, performance) {
+        const run = this.getRun(id);
+        if (run === undefined || terminal(run.status) || performance.runId !== run.id)
+            return false;
+        if (id !== run.id && this.currentExecutionId(run.id) !== id)
+            return false;
+        this.runPerformance.set(run.id, { ...performance });
+        return true;
+    }
+    sessionPerformance(sessionId) {
+        const run = this.activeSessionRun(sessionId);
+        const performance = run === undefined ? undefined : this.runPerformance.get(run.id);
+        return performance === undefined ? undefined : { ...performance };
+    }
     findMessageRun(sessionId, clientMessageId) {
         const submission = this.messageSubmissions.get(`${sessionId}\u0000${clientMessageId}`);
         return submission?.kind === 'run' ? this.runs.get(submission.id) : undefined;
@@ -599,6 +615,8 @@ export class NodeRuntimeState {
             updatedAt: now
         };
         this.runs.set(runId, value);
+        if (terminal(next))
+            this.runPerformance.delete(runId);
         this.emitRunChanged(value, this.requireSession(value.sessionId));
         if (terminal(next) && this.leases.get(value.sessionId) === value.id)
             this.leases.delete(value.sessionId);
@@ -894,6 +912,7 @@ export class NodeRuntimeState {
         }
         this.pruneRetainedExecutionTurns(run.sessionId, retainedTurnIds);
         this.runs.delete(runId);
+        this.runPerformance.delete(runId);
         this.recentUserMessages.delete(runId);
         this.runSequences.delete(runId);
         for (const [key, candidate] of this.messageSubmissions)
@@ -931,6 +950,7 @@ export class NodeRuntimeState {
         this.leases.delete(sessionId);
         for (const runId of runIds) {
             this.runs.delete(runId);
+            this.runPerformance.delete(runId);
             this.recentUserMessages.delete(runId);
             this.runSequences.delete(runId);
         }
@@ -994,6 +1014,7 @@ export class NodeRuntimeState {
         }
         for (const runId of runIds) {
             this.runs.delete(runId);
+            this.runPerformance.delete(runId);
             this.recentUserMessages.delete(runId);
             this.runSequences.delete(runId);
         }

package/dist/service/run-event-service.js

@@ -15,7 +15,7 @@ export class RunEventService {
             if (run === undefined || !isPlainRecord(payload))
                 return;
             const parsed = runPerformanceSchema.safeParse({ ...payload, runId: run.id });
-            if (parsed.success) {
+            if (parsed.success && this.options.runtime.updateRunPerformance(runId, parsed.data)) {
                 this.flushText(runId);
                 this.options.emitWorkbench('conversation', {
                     sessionId: run.sessionId,

package/dist/service/terminal-service.js

@@ -61,7 +61,7 @@ export class TerminalService {
             const options = {
                 ...input,
                 workspaceId: typeof input.workspaceId === 'string' ? input.workspaceId : null,
-                environment: { ...secretEnvironment, MAR_MGR_CONTEXT_REQUIRED: '1' },
+                environment: { ...secretEnvironment, MAR_CTL_CONTEXT_REQUIRED: '1' },
                 ...(cwd === undefined ? {} : { cwd })
             };
             const terminal = commandMode

package/dist/service/workspace-file-service.js

@@ -1,16 +1,13 @@
-import { tmpdir } from 'node:os';
 import { isAbsolute, relative, resolve, win32 } from 'node:path';
 import { realpath } from 'node:fs/promises';
-import { listWorkspaceFiles, mutateWorkspaceFile, normalizeFilePreviewPath, readAllowedFileContentRange, readWorkspaceFileContentRange, readAllowedTextFile, readWorkspaceTextFile, writeWorkspaceTextFile, WorkspaceFileIndex } from '../workspace.js';
+import { listWorkspaceFiles, mutateWorkspaceFile, normalizeFilePreviewPath, readAbsoluteFileContentRange, readWorkspaceFileContentRange, readAbsoluteTextFile, readWorkspaceTextFile, writeWorkspaceTextFile, WorkspaceFileIndex } from '../workspace.js';
 const INDEX_CACHE_LIMIT = 32;
 export class WorkspaceFileService {
     state;
-    allowedRoots;
     onInvalidated;
     mutationTails = new Map();
-    constructor(state, allowedRoots, onInvalidated) {
+    constructor(state, onInvalidated) {
         this.state = state;
-        this.allowedRoots = allowedRoots;
         this.onInvalidated = onInvalidated;
     }
     async list(workspace, input) {
@@ -38,7 +35,7 @@ export class WorkspaceFileService {
         if (workspacePath !== workspace.path && isFilePreviewAbsolutePath(path))
             throw new Error('FILE_PATH_ESCAPE');
         return isFilePreviewAbsolutePath(path)
-            ? readAllowedTextFile(path, this.previewRoots(), offset, limit)
+            ? readAbsoluteTextFile(path, offset, limit)
             : readWorkspaceTextFile(workspacePath, path, offset, limit);
     }
     async readContent(workspace, input, workspacePath = workspace.path) {
@@ -69,7 +66,7 @@ export class WorkspaceFileService {
         const offset = typeof input.offset === 'number' ? input.offset : 0;
         const limit = typeof input.limit === 'number' ? input.limit : 512 * 1024;
         return isFilePreviewAbsolutePath(path)
-            ? readAllowedFileContentRange(path, this.previewRoots(), offset, limit)
+            ? readAbsoluteFileContentRange(path, offset, limit)
             : readWorkspaceFileContentRange(workspacePath, path, offset, limit);
     }
     readDirect(workspace, input, workspacePath = workspace.path) {
@@ -218,9 +215,6 @@ export class WorkspaceFileService {
             index.dispose();
         this.state.fileIndexes.clear();
     }
-    previewRoots() {
-        return [...new Set([...this.allowedRoots(), tmpdir()])];
-    }
 }
 function isFilePreviewAbsolutePath(path) {
     return isAbsolute(path) || win32.isAbsolute(path);

package/dist/workspace.js

@@ -757,15 +757,15 @@ export async function readWorkspaceFileContentRange(workspaceRoot, requestedPath
         await handle.close();
     }
 }
-/** Reads one absolute file range only when the resolved target remains within a preview root. */
-export async function readAllowedFileContentRange(requestedPath, allowedRoots, offset = 0, limit = FILE_READ_LIMIT) {
+/** Reads one regular absolute file range using the Node account's filesystem permissions. */
+export async function readAbsoluteFileContentRange(requestedPath, offset = 0, limit = FILE_READ_LIMIT) {
     if (!Number.isSafeInteger(offset) ||
         offset < 0 ||
         !Number.isSafeInteger(limit) ||
         limit < 1 ||
         limit > FILE_READ_LIMIT)
         throw new Error('FILE_RANGE_INVALID');
-    const { file, metadata } = await resolveAllowedFile(requestedPath, allowedRoots);
+    const { file, metadata } = await resolveAbsoluteFile(requestedPath);
     if (offset > metadata.size)
         throw new Error('FILE_RANGE_INVALID');
     const length = Math.min(limit, metadata.size - offset);
@@ -792,9 +792,9 @@ function fileSourceRevision(metadata) {
         .update([metadata.dev, metadata.ino, metadata.size, metadata.mtimeMs, metadata.ctimeMs].join(':'))
         .digest('hex');
 }
-/** Reads one absolute file only when the resolved target remains within a preview root. */
-export async function readAllowedTextFile(requestedPath, allowedRoots, offset = 0, limit = FILE_READ_LIMIT) {
-    const { file, metadata } = await resolveAllowedFile(requestedPath, allowedRoots);
+/** Reads one regular absolute file using the Node account's filesystem permissions. */
+export async function readAbsoluteTextFile(requestedPath, offset = 0, limit = FILE_READ_LIMIT) {
+    const { file, metadata } = await resolveAbsoluteFile(requestedPath);
     if (metadata.size > FILE_READ_LIMIT * 16)
         throw new Error('FILE_TOO_LARGE');
     if (!Number.isSafeInteger(offset) ||
@@ -859,7 +859,7 @@ export function normalizeFilePreviewPath(requestedPath) {
         throw new Error('FILE_PATH_ESCAPE');
     return normalized;
 }
-async function resolveAllowedFile(requestedPath, allowedRoots) {
+async function resolveAbsoluteFile(requestedPath) {
     if (!isAbsolute(requestedPath))
         throw new Error('FILE_PATH_ESCAPE');
     const file = await realpath(requestedPath).catch((error) => {
@@ -867,9 +867,6 @@ async function resolveAllowedFile(requestedPath, allowedRoots) {
             throw new Error('FILE_NOT_FOUND');
         throw error;
     });
-    const roots = await Promise.all(allowedRoots.map((root) => realpath(root)));
-    if (!isWithinAllowedRoot(file, roots))
-        throw new Error('FILE_PATH_ESCAPE');
     const metadata = await lstat(file);
     if (!metadata.isFile())
         throw new Error('FILE_NOT_REGULAR');
@@ -1019,7 +1016,9 @@ export function normalizeWorkspacePath(input, platform = hostPlatform()) {
         if (!win32.isAbsolute(normalized)) {
             throw new Error('WORKSPACE_PATH_NOT_ABSOLUTE');
         }
-        return normalized.replace(/\\+$/, '').toLowerCase();
+        // A drive root must remain absolute instead of becoming drive-relative.
+        const root = win32.parse(normalized).root;
+        return (normalized === root ? root : normalized.replace(/\\+$/, '')).toLowerCase();
     }
     if (platform !== 'linux' && platform !== 'darwin') {
         throw new Error('WORKSPACE_PLATFORM_UNSUPPORTED');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.9.139",
+  "version": "0.9.140",
   "description": "MyAgentRoam Node runtime CLI.",
   "license": "Apache-2.0 AND GPL-2.0-or-later",
   "type": "module",
@@ -13,7 +13,7 @@
   ],
   "bin": {
     "mar-node": "./dist/main.js",
-    "marmgr": "./dist/marmgr.js",
+    "marctl": "./dist/marctl.js",
     "marnodes": "./dist/marnodes.js",
     "marssh": "./dist/marssh.js",
     "marscp": "./dist/marscp.js"
@@ -34,10 +34,10 @@
     "npm": "11.12.1",
     "ws": "^8.21.3",
     "zod": "4.4.3",
-    "@myagentroam/marmgr": "0.9.119",
-    "@myagentroam/agent": "0.9.139",
+    "@myagentroam/marctl": "0.9.120",
+    "@myagentroam/protocol": "0.9.140",
     "@myagentroam/code-navigation": "0.9.129",
-    "@myagentroam/protocol": "0.9.139"
+    "@myagentroam/agent": "0.9.140"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"