@myagentroam/node 0.10.37 → 0.10.39

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

@@ -20,6 +20,12 @@ import { MarAgentRuntimeModelFactory, sdkModelConfigurations, closeImageCredenti
 import { createImageGenerationExtensions } from './image-generation-extensions.js';
 import { createWebToolsExtensions } from './web-tools-extensions.js';
 import { combineExecutionExtensions } from './execution-extensions.js';
+const HOST_CONFIGURATION_CATEGORIES = [
+    'cwd',
+    'mcpServers',
+    'environment',
+    'guaranteedCommands'
+];
 export class MarAgentManagedRunController {
     runner;
     host;
@@ -592,7 +598,7 @@ export class MarAgentManagedRunController {
                     throw new Error('MAR_AGENT_SESSION_RUNTIME_ACTIVE');
                 if (!existing.released &&
                     existing.release === undefined &&
-                    existing.fingerprint === fingerprint) {
+                    existing.fingerprint.value === fingerprint.value) {
                     const configurations = compactRuntimeConfigurations(input.models, input.compact);
                     if (existing.modelFingerprint !== modelFingerprint ||
                         configurations.some((model) => model.credential?.type === 'RUNTIME_TICKET' ||
@@ -631,7 +637,7 @@ export class MarAgentManagedRunController {
                     });
                     return existing;
                 }
-                await this.#releaseRuntime(existing, 'host_configuration_changed');
+                await this.#releaseRuntime(existing, 'host_configuration_changed', HOST_CONFIGURATION_CATEGORIES.filter((category) => existing.fingerprint.categories[category] !== fingerprint.categories[category]));
             }
             const creation = this.#createRuntime(input, sessionKey, fingerprint, hostConfiguration);
             for (const key of creationKeys)
@@ -791,7 +797,7 @@ export class MarAgentManagedRunController {
             return;
         this.#scheduleRuntimeRelease(runtime);
     }
-    #releaseRuntime(runtime, reason) {
+    #releaseRuntime(runtime, reason, changedCategories = []) {
         if (runtime.release !== undefined)
             return runtime.release;
         runtime.release = (async () => {
@@ -800,6 +806,7 @@ export class MarAgentManagedRunController {
                 runtimeId: runtime.runtimeId,
                 sessionId: runtime.session.id,
                 reason,
+                ...(changedCategories.length === 0 ? {} : { changedCategories }),
                 ...(runtime.activeRunId === undefined ? {} : { runId: runtime.activeRunId })
             });
             if (runtime.idleTimer !== undefined) {
@@ -977,16 +984,25 @@ function isExecutionScopedMcp(server) {
         (server.transport === 'STDIO' && server.environment?.['MAR_CTL_USER_TOKEN'] !== undefined));
 }
 function sessionHostFingerprint(input, hostConfiguration) {
-    return createHash('sha256')
-        .update(canonicalJson({
+    const configuration = {
         cwd: input.cwd,
         mcpServers: input.mcpServers.filter((server) => !isExecutionScopedMcp(server)),
         environment: Object.entries(hostConfiguration.environment)
             .filter((entry) => entry[1] !== undefined)
             .sort(([left], [right]) => left.localeCompare(right)),
         guaranteedCommands: Object.entries(hostConfiguration.guaranteedCommands).sort(([left], [right]) => left.localeCompare(right))
-    }))
-        .digest('hex');
+    };
+    const digest = (value) => createHash('sha256').update(canonicalJson(value)).digest('hex');
+    return {
+        value: digest(configuration),
+        // Only fixed category names leave this comparison; never log these value fingerprints.
+        categories: {
+            cwd: digest(configuration.cwd),
+            mcpServers: digest(configuration.mcpServers),
+            environment: digest(configuration.environment),
+            guaranteedCommands: digest(configuration.guaranteedCommands)
+        }
+    };
 }
 function sessionModelFingerprint(input) {
     const compact = marAgentRuntimeCompactConfigurationSchema.safeParse(input.compact);

package/dist/service/continuous-run-coordinator.js

@@ -119,19 +119,12 @@ export class ContinuousRunCoordinator {
             active !== undefined &&
             active.id === input.activeRunId &&
             activeTurn?.id === input.steerTarget.turnId &&
-            (activeTurn === undefined
-                ? !this.isMessageRun(active)
-                : this.options.runtime.currentExecutionId(active.id) !== undefined &&
-                    !['SUCCEEDED', 'FAILED', 'INTERRUPTED'].includes(activeTurn.status)) &&
+            this.canSteer(active) &&
             (input.steerTarget.executionId === undefined ||
                 this.options.runtime.currentExecutionId(active.id) === input.steerTarget.executionId);
         const intent = input.steerTarget !== undefined && !steering ? 'SEND' : input.intent;
-        if (steering && prepared?.prepareSteerInput !== undefined && !prepared.steering)
-            this.preparedInputs.set(input.submissionId, {
-                ...prepared,
-                input: prepared.prepareSteerInput(),
-                steering: true
-            });
+        if (steering)
+            this.prepareSteering(input.submissionId);
         const executionEnded = active !== undefined &&
             this.options.runtime.currentExecutionId(active.id) === undefined &&
             activeTurn !== undefined &&
@@ -195,10 +188,12 @@ export class ContinuousRunCoordinator {
     }
     executeQueueItem(itemId) {
         const item = this.requirePreparedItem(itemId);
+        const active = this.options.runtime.activeSessionRun(item.sessionId);
+        if (active !== undefined && this.canSteer(active))
+            this.prepareSteering(item.id);
         this.immediateQueueItems.add(item.id);
         this.options.runtime.resumeSessionQueue(item.sessionId);
         this.options.runtime.prioritizeQueueItem(item.id);
-        const active = this.options.runtime.activeSessionRun(item.sessionId);
         if (active !== undefined) {
             if (this.options.runtime.currentExecutionId(active.id) !== undefined)
                 this.replace(item.id, active.id, false);
@@ -215,13 +210,28 @@ export class ContinuousRunCoordinator {
             throw new Error('RUN_NOT_FOUND');
         return { run: started, delivery: 'STARTED' };
     }
-    updatePreparedInput(itemId, input) {
+    canSteer(active) {
+        const turn = this.options.runtime.conversationTurnForRun(active.id);
+        return turn === undefined
+            ? !this.isMessageRun(active)
+            : this.options.runtime.currentExecutionId(active.id) !== undefined &&
+                !['SUCCEEDED', 'FAILED', 'INTERRUPTED'].includes(turn.status);
+    }
+    prepareSteering(itemId) {
+        const prepared = this.preparedInputs.get(itemId);
+        if (prepared?.prepareSteerInput === undefined || prepared.steering)
+            return;
+        const input = prepareComposerResourceInput(prepared.prepareSteerInput(), prepared.cwd, prepared.workspacePath ?? prepared.cwd);
+        this.preparedInputs.set(itemId, { ...prepared, input, steering: true });
+    }
+    updatePreparedInput(itemId, input, prepareSteerInput) {
         const pending = this.preparedInputs.get(itemId);
         if (pending === undefined)
             return;
         const resources = prepareComposerResourceInput(input, pending.cwd, pending.workspacePath ?? pending.cwd);
         this.preparedInputs.set(itemId, {
             ...pending,
+            ...(prepareSteerInput === undefined ? {} : { prepareSteerInput }),
             ...(pending.restartMessage === undefined
                 ? {}
                 : {
@@ -270,9 +280,12 @@ export class ContinuousRunCoordinator {
         if (!this.startedExecutions.has(executionId)) {
             const current = this.preparedInputs.get(executionId);
             const replacement = this.preparedInputs.get(item.id);
-            if (current !== undefined && replacement !== undefined)
+            if (current !== undefined &&
+                replacement !== undefined &&
+                replacement.precedingExecutionId !== executionId)
                 this.preparedInputs.set(item.id, {
                     ...replacement,
+                    precedingExecutionId: executionId,
                     precedingInput: current.input,
                     input: `${current.input}\n\n${replacement.input}`
                 });

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

@@ -161,17 +161,15 @@ export class SessionMessageService {
             if (internalSchedule && (active !== undefined || queueBeforeCreate.itemIds.length > 0))
                 throw new Error('SCHEDULE_SESSION_BUSY');
             const replaceCurrentRun = intent === 'REPLACE_CURRENT' ? active : undefined;
-            const userSteer = requestedIntent === 'REPLACE_CURRENT' &&
-                goalMessage?.activated !== true &&
-                !internalGoal &&
-                !internalSchedule &&
-                !internalRestore;
-            const steerTarget = userSteer
+            const userMessage = goalMessage?.activated !== true && !internalGoal && !internalSchedule && !internalRestore;
+            const steerTarget = userMessage && requestedIntent === 'REPLACE_CURRENT'
                 ? {
                     turnId: active === undefined
                         ? undefined
                         : this.options.runtime.conversationTurnForRun(active.id)?.id,
-                    executionId: active === undefined ? undefined : this.options.runtime.currentExecutionId(active.id)
+                    executionId: active === undefined
+                        ? undefined
+                        : this.options.runtime.currentExecutionId(active.id)
                 }
                 : undefined;
             const acceptedMessage = {
@@ -258,7 +256,7 @@ export class SessionMessageService {
                         workspaceId: currentSession.workspaceId,
                         runner: currentSession.runner,
                         input: runner.prepareMessageInput(runnerInput, planActive ? 'plan' : 'default'),
-                        ...(userSteer
+                        ...(userMessage
                             ? {
                                 prepareSteerInput: () => runner.prepareMessageInput(steerComposerMessage(runnerInput), planActive ? 'plan' : 'default')
                             }

package/dist/service/workspace-queue-workbench-service.js

@@ -120,12 +120,13 @@ export class WorkspaceQueueWorkbenchService {
         assertQueueItemOwner(item, input.__requestUserId);
         const content = input.content.trim();
         const prepared = this.options.coordinator.pending(item.id);
-        const runnerInput = prepared === undefined
+        const prepareRunnerInput = (steering) => prepared === undefined
             ? undefined
-            : this.options.prepareInput(prepared.runner, withNonImageAttachmentPrompt(prepared.steering ? steerComposerMessage(content) : content, prepared.attachmentPaths, prepared.attachmentFiles), prepared.collaborationMode);
+            : this.options.prepareInput(prepared.runner, withNonImageAttachmentPrompt(steering ? steerComposerMessage(content) : content, prepared.attachmentPaths, prepared.attachmentFiles), prepared.collaborationMode);
+        const runnerInput = prepareRunnerInput(prepared?.steering === true);
         this.options.runtime.updateQueueItem(item.id, content);
         if (runnerInput !== undefined)
-            this.options.coordinator.updatePreparedInput(item.id, runnerInput);
+            this.options.coordinator.updatePreparedInput(item.id, runnerInput, prepared?.prepareSteerInput === undefined ? undefined : () => prepareRunnerInput(true));
         this.options.emit(item.workspaceId, item.sessionId);
         return {
             queue: this.present(item.workspaceId, item.sessionId),

package/package.json

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