@myagentroam/node 0.9.154 → 0.9.155

package/dist/connector.js

@@ -717,8 +717,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) => {
@@ -1556,8 +1557,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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/node",
-  "version": "0.9.154",
+  "version": "0.9.155",
   "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.155",
+    "@myagentroam/code-navigation": "0.9.129",
     "@myagentroam/marctl": "0.9.120",
-    "@myagentroam/code-navigation": "0.9.129"
+    "@myagentroam/protocol": "0.9.155"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1"