@myagentroam/node 0.9.154 → 0.9.156

package/dist/connector.js

@@ -601,6 +601,7 @@ export class NodeConnector {
             }
         }, {
             modelFactory: this.marAgentRuntimeModels,
+            retainEnvironment: (environment) => this.gitExecution().retain(environment),
             computerUse: this.computerUseProvider
         });
         this.marAgentClient.setSessionResourceReleaser((sessionId) => this.marAgentRunController.releaseSession(sessionId));
@@ -717,8 +718,9 @@ export class NodeConnector {
         });
         this.runWorkbenchService = new RunWorkbenchService({
             runtime: this.runtime,
-            readImage: async (runId, imageIndex) => this.runAttachmentService.read(runId, imageIndex) ??
-                (await this.runAttachmentService.readNative(runId, imageIndex)),
+            readImage: async (runId, selector) => typeof selector === 'number'
+                ? this.runAttachmentService.read(runId, selector)
+                : this.runAttachmentService.readNative(runId, selector),
             respondUserInput: (runId, requestId, answers) => this.runnerInteractionService.respondUserInput(runId, requestId, answers),
             pauseQueue: (sessionId) => this.workspaceQueueWorkbenchService.pauseSessionQueue(sessionId),
             runInterrupted: (sessionId) => {
@@ -972,6 +974,7 @@ export class NodeConnector {
             projection: this.nativeSessionProjectionService,
             resolveForCommand: (sessionId) => this.externalSessionResumeService.resolveForMessage(sessionId),
             profiles: () => this.runnerService.profiles(),
+            mcps: (workspaceId) => this.database?.effectiveMcpInstallations(workspaceId) ?? [],
             present: (session) => this.sessionPresentationService.present(session),
             resumeQueueAfterCommandRun: (sessionId) => this.workspaceQueueWorkbenchService.resumeAfterCommandRun(sessionId),
             invalidateHistory: (sessionId) => this.nativeSessionWatchService.invalidate(sessionId),
@@ -1556,8 +1559,7 @@ export class NodeConnector {
                         emitWatchEvent: (payload) => this.send('watch.event', payload),
                         nextWorkbenchEvent: (payload) => this.workbenchEventService.next('hosted-conversation', payload),
                         emitWorkbenchEvent: (event) => this.workbenchEventService.publish(event),
-                        readImage: async (runId, imageIndex) => this.runAttachmentService.read(runId, imageIndex) ??
-                            (await this.runAttachmentService.readNative(runId, imageIndex)),
+                        readImage: (runId, imageRef) => this.runAttachmentService.readNative(runId, imageRef),
                         processExecutorFactory: (input) => new BubblewrapSandboxExecutor({
                             profile: hostedConversationSandboxProfile(input)
                         }),

package/dist/runner/abstract-runner.js

@@ -1,6 +1,7 @@
 import { createHash } from 'node:crypto';
 import { mcpRuntimeDescriptorSchema } from '@myagentroam/protocol';
 import { nodeExecutionEnvironment } from '../node-execution-environment.js';
+import { canonicalJson } from '../util/canonical-json.js';
 /**
  * Stable lifecycle boundary for every Node Runner implementation.
  *
@@ -238,7 +239,7 @@ function resolvedMcpServers(raw, secrets) {
             continue;
         const configuration = isRecord(record['configuration']) ? record['configuration'] : {};
         const sourceIdentity = createHash('sha256')
-            .update(JSON.stringify({
+            .update(canonicalJson({
             id: record['id'] ?? null,
             name: record['serverName'],
             runtime: runtime.data,

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

@@ -26,6 +26,7 @@ export function marAgentGeneratedImageSources(homeDirectory, sessionId, artifact
             {
                 name: artifact.name,
                 mime: artifact.mime,
+                sourceId: `${sessionId}:${artifact.fileName}`,
                 localPath: resolve(directory, artifact.fileName)
             }
         ]

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

@@ -9,6 +9,7 @@ import { LocalAgentHost, createMarAgent, generateSessionTitle } from '@myagentro
 import { marAgentReasoningEffortSchema, marAgentRuntimeModelConfigurationSchema } from '@myagentroam/protocol';
 import { boundedConversationItemId } from '../codex/conversation-parser.js';
 import { parseSecretEnvironment } from '../../util/secret-environment.js';
+import { canonicalJson } from '../../util/canonical-json.js';
 import { MarAgentMcpClientCache } from './mcp-client-pool.js';
 import { MarAgentConversationNormalizer } from './conversation-normalizer.js';
 import { parseRunnerImageAttachments } from '../../util/node-operation-parsers.js';
@@ -29,6 +30,7 @@ export class MarAgentManagedRunController {
     #questions = new Map();
     #normalizers = new Map();
     #resourceIdleTtlMs;
+    #retainEnvironment;
     #createAgent;
     #modelFactory;
     #computerUse;
@@ -39,6 +41,7 @@ export class MarAgentManagedRunController {
         this.runner = runner;
         this.host = host;
         this.#resourceIdleTtlMs = options.resourceIdleTtlMs ?? 10 * 60_000;
+        this.#retainEnvironment = options.retainEnvironment;
         this.#createAgent = options.createAgent ?? createMarAgent;
         this.#modelFactory =
             options.modelFactory ??
@@ -139,7 +142,7 @@ export class MarAgentManagedRunController {
             mode: command.id,
             secretEnvironment: context.secretEnvironment,
             externalSessionId: session.externalSessionId,
-            mcpServers: [],
+            mcpServers: this.#resolveMcpServers(context.mcpInstallations, context.secretEnvironment),
             images: [],
             ...(context.initiatedByUserId === undefined
                 ? {}
@@ -173,13 +176,11 @@ export class MarAgentManagedRunController {
         try {
             secretEnvironment = parseSecretEnvironment(payload.secretEnvironment);
             const mcpSecretEnvironment = parseSecretEnvironment(payload.mcpSecretEnvironment);
-            mcpServers = this.runner.mcpConfiguration(payload.mcpInstallations, {
+            mcpServers = this.#resolveMcpServers(payload.mcpInstallations, {
                 ...secretEnvironment,
                 ...mcpSecretEnvironment,
                 MAR_USERNAME: secretEnvironment['MAR_USERNAME'] ?? ''
             });
-            if (mcpServers.some((server) => server.name === 'computer'))
-                throw new Error('MAR_AGENT_MCP_RESERVED_NAMESPACE');
             images = parseRunnerImageAttachments(payload.attachments);
         }
         catch {
@@ -566,7 +567,8 @@ export class MarAgentManagedRunController {
                             throw error;
                         }
                     }
-                    const personalInstructions = input.personalInstructions ?? '';
+                    const personalInstructions = input.personalInstructions ??
+                        (input.mode === 'compact' ? existing.personalInstructions : '');
                     if (existing.personalInstructions !== personalInstructions) {
                         existing.agent.setSystemInstruction(personalInstructions || undefined);
                         existing.personalInstructions = personalInstructions;
@@ -608,7 +610,9 @@ export class MarAgentManagedRunController {
         let agent;
         let runtime;
         let models = [];
+        let releaseEnvironment;
         try {
+            releaseEnvironment = this.#retainEnvironment?.(input.secretEnvironment ?? {});
             const mcp = mcpLease.pool;
             const localHost = new LocalAgentHost({
                 mode: 'node',
@@ -646,6 +650,7 @@ export class MarAgentManagedRunController {
                 host: localHost,
                 normalizer: new MarAgentConversationNormalizer(),
                 mcpLease,
+                releaseEnvironment,
                 automaticTitleEnabled: input.externalSessionId === undefined,
                 models,
                 modelFingerprint: sessionModelFingerprint(input),
@@ -667,9 +672,16 @@ export class MarAgentManagedRunController {
             await agent?.dispose().catch(() => undefined);
             await closeModelCredentialProviders(models);
             await mcpLease.release().catch(() => undefined);
+            releaseEnvironment?.();
             throw error;
         }
     }
+    #resolveMcpServers(installations, environment) {
+        const servers = this.runner.mcpConfiguration(installations, environment);
+        if (servers.some((server) => server.name === 'computer'))
+            throw new Error('MAR_AGENT_MCP_RESERVED_NAMESPACE');
+        return servers;
+    }
     #runtimeInUse(runtime) {
         return (runtime.activeRunId !== undefined ||
             [...this.#runtimeAcquisitions.keys()].some((key) => this.#sessionRuntimes.get(key) === runtime));
@@ -737,6 +749,7 @@ export class MarAgentManagedRunController {
             }
             finally {
                 await runtime.mcpLease.release().catch(() => undefined);
+                runtime.releaseEnvironment?.();
                 for (const [sessionId, candidate] of this.#sessionRuntimes)
                     if (candidate === runtime)
                         this.#sessionRuntimes.delete(sessionId);
@@ -837,7 +850,7 @@ function isExecutionScopedMcp(server) {
 }
 function sessionHostFingerprint(input, hostConfiguration) {
     return createHash('sha256')
-        .update(JSON.stringify({
+        .update(canonicalJson({
         cwd: input.cwd,
         mcpServers: input.mcpServers.filter((server) => !isExecutionScopedMcp(server)),
         environment: Object.entries(hostConfiguration.environment)

package/dist/runner/mar-agent/mcp-client-pool.js

@@ -4,6 +4,7 @@ import { getDefaultEnvironment, StdioClientTransport } from '@modelcontextprotoc
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { ToolListChangedNotificationSchema } from '@modelcontextprotocol/sdk/types.js';
 import { assertMcpToolDefinition, assertMcpToolCatalog, MarAgentError } from '@myagentroam/agent';
+import { canonicalJson } from '../../util/canonical-json.js';
 import { ExecutorStdioClientTransport } from './executor-stdio-client-transport.js';
 export class MarAgentMcpClientCache {
     #entries = new Map();
@@ -444,9 +445,7 @@ export class MarAgentMcpClientPool {
     }
 }
 function fingerprint(value) {
-    return createHash('sha256')
-        .update(JSON.stringify(canonicalValue(value)))
-        .digest('hex');
+    return createHash('sha256').update(canonicalJson(value)).digest('hex');
 }
 function singleUseLease(pool) {
     let released = false;
@@ -462,23 +461,14 @@ function singleUseLease(pool) {
 }
 function mcpConfigurationFingerprint(servers, cwd, authorizationScope) {
     return createHash('sha256')
-        .update(JSON.stringify(canonicalValue({
+        .update(canonicalJson({
         cwd,
         authorizationScope,
         inheritedEnvironment: getDefaultEnvironment(),
         servers
-    })))
+    }))
         .digest('hex');
 }
-function canonicalValue(value) {
-    if (Array.isArray(value))
-        return value.map(canonicalValue);
-    if (value === null || typeof value !== 'object')
-        return value;
-    return Object.fromEntries(Object.entries(value)
-        .sort(([left], [right]) => left.localeCompare(right))
-        .map(([key, entry]) => [key, canonicalValue(entry)]));
-}
 function safeName(value) {
     return value.replace(/[^a-zA-Z0-9_-]/gu, '_').slice(0, 64);
 }

package/dist/service/git-execution-service.js

@@ -31,11 +31,13 @@ export class GitExecutionService {
         const parsed = personalGitRuntimeSchema.safeParse(configuration);
         if (!parsed.success)
             throw new Error('GIT_CONFIGURATION_INVALID');
+        // Execution credentials rotate independently of the user's stable Git capability.
+        const stableEnvironment = Object.fromEntries(Object.entries(baseEnvironment).filter(([name]) => name !== 'MAR_CTL_USER_TOKEN'));
         const key = createHash('sha256')
             .update(JSON.stringify([
             userId,
             parsed.data,
-            Object.entries(baseEnvironment).sort(([a], [b]) => a.localeCompare(b))
+            Object.entries(stableEnvironment).sort(([a], [b]) => a.localeCompare(b))
         ]))
             .digest('hex');
         const endpoint = await this.start();
@@ -44,10 +46,10 @@ export class GitExecutionService {
         let context = this.contexts.get(key);
         if (context === undefined) {
             const token = randomBytes(32).toString('hex');
-            const original = { ...process.env, ...baseEnvironment };
+            const original = { ...process.env, ...stableEnvironment };
             const binary = await gitExecutable(original);
             const environment = {
-                ...baseEnvironment,
+                ...stableEnvironment,
                 MAR_GIT_ENDPOINT: endpoint,
                 MAR_GIT_TOKEN: token
             };
@@ -77,9 +79,12 @@ export class GitExecutionService {
             environment[pathKey] =
                 `${await this.gitWrapper(binary)}${delimiter}${original[pathKey] ?? ''}`;
             const restore = Object.fromEntries(Object.keys(environment)
-                .filter((name) => environment[name] !== baseEnvironment[name] || name.startsWith('MAR_GIT_'))
+                .filter((name) => environment[name] !== stableEnvironment[name] || name.startsWith('MAR_GIT_'))
                 .map((name) => [name, name.startsWith('MAR_GIT_') ? null : (original[name] ?? null)]));
-            context = {
+            if (this.closed)
+                throw new Error('GIT_EXECUTION_CLOSED');
+            // Binary discovery and wrapper creation yield; another acquire may have published it.
+            context = this.contexts.get(key) ?? {
                 key,
                 token,
                 configuration: parsed.data,
@@ -89,9 +94,12 @@ export class GitExecutionService {
                 references: 0
             };
             this.contexts.set(key, context);
-            this.tokens.set(token, context);
+            this.tokens.set(context.token, context);
         }
-        return { environment: context.environment, release: this.reference(context) };
+        return {
+            environment: Object.freeze({ ...baseEnvironment, ...context.environment }),
+            release: this.reference(context)
+        };
     }
     retain(environment) {
         if (environment.MAR_GIT_TOKEN === undefined)
@@ -112,7 +120,7 @@ export class GitExecutionService {
             released = true;
             if (--context.references !== 0 || this.closed)
                 return;
-            // This outlives the existing 60-second warm Runner window.
+            // Warm runtimes retain their own reference; this grace period starts after the last owner.
             context.timer = setTimeout(() => this.retire(context), this.options.idleTimeoutMs ?? 70_000);
             context.timer.unref();
         };

package/dist/service/hosted-conversation-node-service.js

@@ -879,7 +879,7 @@ export class HostedConversationNodeService {
         this.options.store.requireConversation(payload.userId, input.conversationId);
         if (input.runId !== hostedConversationImageRunId(input.conversationId))
             throw new Error('HOSTED_CONVERSATION_NOT_AUTHORIZED');
-        const image = await this.options.readImage(input.runId, input.imageIndex);
+        const image = await this.options.readImage(input.runId, input.imageRef);
         if (image === undefined)
             throw new Error('RUN_IMAGE_NOT_FOUND');
         return { image };

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

@@ -1,10 +1,12 @@
+import { createHash } from 'node:crypto';
 import { tmpdir } from 'node:os';
 import { basename, dirname, isAbsolute, join, relative, resolve } from 'node:path';
 import { lstat, mkdir, mkdtemp, readFile, realpath, rm, writeFile } from 'node:fs/promises';
+import { imageRefSchema } from '@myagentroam/protocol';
 import { AttachmentDomainState } from './attachment-domain-state.js';
 const MAX_ATTACHMENT_BYTES = 5 * 1024 * 1024;
 const IMAGE_CACHE_TTL_MS = 60 * 60_000;
-const NATIVE_IMAGE_INDEX_TTL_MS = 60 * 60_000;
+const NATIVE_IMAGE_SOURCE_TTL_MS = 60 * 60_000;
 export class RunAttachmentService {
     nativeImageRoots;
     state = new AttachmentDomainState();
@@ -140,7 +142,7 @@ export class RunAttachmentService {
     }
     registerNativeImages(runId, nativeRoots, images, options = {}) {
         const roots = nativeRoots.map((root) => resolve(root));
-        const sources = this.state.nativeHistoryImages.get(runId) ?? [];
+        const sources = this.state.nativeHistoryImages.get(runId) ?? new Map();
         const attachments = [];
         for (const image of images) {
             const cached = options.reuseCachedRunImages === false || image.localPath === undefined
@@ -157,7 +159,11 @@ export class RunAttachmentService {
                     attachments.push({ name: image.name, mime: image.mime });
                     continue;
                 }
-                let imageIndex = sources.findIndex((source) => source.kind === 'reader' && source.sourceId === image.sourceId);
+                const imageRef = nativeImageReference('reader', image.sourceId);
+                if (imageRef === undefined) {
+                    attachments.push({ name: image.name, mime: image.mime });
+                    continue;
+                }
                 const source = {
                     kind: 'reader',
                     name: image.name,
@@ -166,18 +172,13 @@ export class RunAttachmentService {
                     sourceId: image.sourceId,
                     read: image.read
                 };
-                if (imageIndex < 0) {
-                    imageIndex = sources.length;
-                    sources.push(source);
-                }
-                else
-                    sources[imageIndex] = source;
+                sources.set(imageRef, source);
                 attachments.push({
                     name: image.name,
                     mime: image.mime,
                     ...(image.byteSize === undefined ? {} : { byteSize: image.byteSize }),
                     runId,
-                    imageIndex
+                    imageRef
                 });
                 continue;
             }
@@ -198,14 +199,24 @@ export class RunAttachmentService {
                 attachments.push({ name: image.name, mime: image.mime });
                 continue;
             }
-            let imageIndex = sources.findIndex((source) => source.kind === 'file' && source.path === path);
-            if (imageIndex < 0) {
-                imageIndex = sources.length;
-                sources.push({ kind: 'file', name: image.name, mime: image.mime, path, root });
+            // Derive identity from the original source, never its registration position.
+            // The path digest hides physical paths; it is not a content/version hash.
+            const imageRef = nativeImageReference('file', image.sourceId === undefined
+                ? createHash('sha256').update(path).digest('hex')
+                : image.sourceId);
+            if (imageRef === undefined) {
+                attachments.push({ name: image.name, mime: image.mime });
+                continue;
             }
-            attachments.push({ name: image.name, mime: image.mime, runId, imageIndex });
+            const previous = sources.get(imageRef);
+            if (previous !== undefined && (previous.kind !== 'file' || previous.path !== path)) {
+                attachments.push({ name: image.name, mime: image.mime });
+                continue;
+            }
+            sources.set(imageRef, { kind: 'file', name: image.name, mime: image.mime, path, root });
+            attachments.push({ name: image.name, mime: image.mime, runId, imageRef });
         }
-        if (sources.length > 0) {
+        if (sources.size > 0) {
             this.state.nativeHistoryImages.set(runId, sources);
             const previousTimer = this.state.nativeHistoryImageTimers.get(runId);
             if (previousTimer !== undefined)
@@ -213,7 +224,7 @@ export class RunAttachmentService {
             const timer = setTimeout(() => {
                 this.state.nativeHistoryImageTimers.delete(runId);
                 this.state.nativeHistoryImages.delete(runId);
-            }, NATIVE_IMAGE_INDEX_TTL_MS);
+            }, NATIVE_IMAGE_SOURCE_TTL_MS);
             timer.unref();
             this.state.nativeHistoryImageTimers.set(runId, timer);
         }
@@ -242,8 +253,8 @@ export class RunAttachmentService {
         }
         return undefined;
     }
-    async readNative(runId, imageIndex) {
-        const source = this.state.nativeHistoryImages.get(runId)?.[imageIndex];
+    async readNative(runId, imageRef) {
+        const source = this.state.nativeHistoryImages.get(runId)?.get(imageRef);
         if (source === undefined)
             return undefined;
         try {
@@ -308,6 +319,15 @@ export class RunAttachmentService {
         this.state.nativeHistoryImages.clear();
     }
 }
+function nativeImageReference(kind, identity) {
+    try {
+        const reference = `${kind}:${encodeURIComponent(identity)}`;
+        return imageRefSchema.safeParse(reference).success ? reference : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 function canonicalBase64(value) {
     if (value.length === 0)
         return false;

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

@@ -1,3 +1,5 @@
+import { runImageReadInputSchema } from '@myagentroam/protocol';
+import { nodeOperationData } from '../util/node-operation-data.js';
 import { isTerminalRunStatus } from '../util/node-operation-parsers.js';
 import { isPlainRecord } from '../runner/codex/conversation-parser.js';
 import { isHostedConversationImageRunId } from '../runner/mar-agent/generated-images.js';
@@ -22,14 +24,17 @@ export class RunWorkbenchService {
         return { run: this.requireRun(input.runId) };
     }
     async image(input) {
-        if (typeof input.runId !== 'string' ||
-            typeof input.imageIndex !== 'number' ||
-            !Number.isInteger(input.imageIndex) ||
-            input.imageIndex < 0)
+        const parsed = runImageReadInputSchema.safeParse(nodeOperationData(input));
+        if (!parsed.success)
+            throw new Error('RUN_IMAGE_INVALID');
+        const reference = parsed.data;
+        if (isHostedConversationImageRunId(reference.runId))
             throw new Error('RUN_IMAGE_INVALID');
-        if (isHostedConversationImageRunId(input.runId))
+        const native = reference.runId.startsWith('native-history:');
+        if (native !== 'imageRef' in reference)
             throw new Error('RUN_IMAGE_INVALID');
-        const image = await this.options.readImage(input.runId, input.imageIndex);
+        const selector = 'imageRef' in reference ? reference.imageRef : reference.imageIndex;
+        const image = await this.options.readImage(reference.runId, selector);
         if (image === undefined)
             throw new Error('RUN_IMAGE_NOT_FOUND');
         return { image };

package/dist/service/session-command-service.js

@@ -106,6 +106,7 @@ export class SessionCommandService {
         }
         const result = await runner.executeCommand(session, command, invocation.input, {
             secretEnvironment,
+            mcpInstallations: this.options.mcps(session.workspaceId),
             ...(input.marAgentModel === undefined ? {} : { marAgentModel: input.marAgentModel }),
             ...(input.marAgentModels === undefined ? {} : { marAgentModels: input.marAgentModels }),
             ...(input.marAgentRuntimeScopeId === undefined

package/dist/util/canonical-json.js

@@ -0,0 +1,13 @@
+/** Canonicalizes JSON dictionary keys without changing array order or values. */
+export function canonicalJson(value) {
+    return JSON.stringify(canonicalValue(value));
+}
+function canonicalValue(value) {
+    if (Array.isArray(value))
+        return value.map(canonicalValue);
+    if (value === null || typeof value !== 'object')
+        return value;
+    return Object.fromEntries(Object.entries(value)
+        .sort(([left], [right]) => left.localeCompare(right))
+        .map(([key, entry]) => [key, canonicalValue(entry)]));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.9.154",
+  "version": "0.9.156",
   "description": "MyAgentRoam Node runtime CLI.",
   "license": "Apache-2.0 AND GPL-2.0-or-later",
   "type": "module",
@@ -36,10 +36,10 @@
     "playwright": "1.62.1",
     "ws": "^8.21.3",
     "zod": "4.4.3",
-    "@myagentroam/agent": "0.9.154",
-    "@myagentroam/protocol": "0.9.154",
+    "@myagentroam/agent": "0.9.156",
     "@myagentroam/marctl": "0.9.120",
-    "@myagentroam/code-navigation": "0.9.129"
+    "@myagentroam/code-navigation": "0.9.129",
+    "@myagentroam/protocol": "0.9.156"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"