@myagentroam/node 0.9.155 → 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));
@@ -973,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),

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/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/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.155",
+  "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.155",
-    "@myagentroam/code-navigation": "0.9.129",
+    "@myagentroam/agent": "0.9.156",
     "@myagentroam/marctl": "0.9.120",
-    "@myagentroam/protocol": "0.9.155"
+    "@myagentroam/code-navigation": "0.9.129",
+    "@myagentroam/protocol": "0.9.156"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"