@yeaft/webchat-agent 1.0.555 → 1.0.557

package/local-runtime/server/handlers/agent-output.js

@@ -170,19 +170,33 @@ function hydrateInlinePreviewData(data) {
   return message === data.message ? data : { ...data, message };
 }
 
-function projectConfirmedAssetImages(messages, { ownerId, agentId, sessionId }) {
-  const turnIds = messages
-    .filter(message => message?.role === 'assistant' && message.imageAssetAnchor === true)
+export function projectConfirmedAssetImages(messages, { ownerId, agentId, sessionId }, assetStore = yeaftAssetStore) {
+  const turnIds = [...new Set(messages
+    .filter(message => message?.role === 'assistant')
     .map(message => message.turnId || message.threadId || null)
-    .filter(Boolean);
-  const imagesByTurn = yeaftAssetStore.describeTurns({ ownerId, agentId, sessionId, turnIds });
+    .filter(Boolean))];
+  const imagesByTurn = assetStore.describeTurns({ ownerId, agentId, sessionId, turnIds });
   return messages.map((message) => {
     if (!message || message.role !== 'assistant') return message;
     const { images: _pendingImages, ...rest } = message;
-    if (message.imageAssetAnchor !== true) return rest;
     const turnId = message.turnId || message.threadId || null;
     const images = turnId ? imagesByTurn.get(turnId) || [] : [];
-    return images.length > 0 ? { ...rest, images } : rest;
+    const toolCallIds = new Set((Array.isArray(message.toolCalls) ? message.toolCalls : [])
+      .map(toolCall => toolCall?.id)
+      .filter(Boolean));
+    const vpId = message.speakerVpId || message.vpId || null;
+    const projectedImages = images.filter(image => {
+      if (image.vpId && image.vpId !== vpId) return false;
+      return image.sourceToolCallId
+        ? toolCallIds.has(image.sourceToolCallId)
+        : message.imageAssetAnchor === true;
+    });
+    const toolOrder = [...toolCallIds];
+    projectedImages.sort((a, b) => (
+      toolOrder.indexOf(a.sourceToolCallId) - toolOrder.indexOf(b.sourceToolCallId)
+      || (a.sourceImageIndex ?? 0) - (b.sourceImageIndex ?? 0)
+    ));
+    return projectedImages.length > 0 ? { ...rest, images: projectedImages } : rest;
   });
 }
 
@@ -550,6 +564,8 @@ export async function handleAgentOutput(agentId, agent, msg) {
           width: msg.metadata?.width ?? msg.image.width,
           height: msg.metadata?.height ?? msg.image.height,
           turnId: msg.turnId || null,
+          sourceToolCallId: msg.sourceToolCallId || null,
+          sourceImageIndex: msg.sourceImageIndex,
           vpId: msg.vpId || null,
           threadId: msg.threadId || null,
         });
@@ -560,7 +576,11 @@ export async function handleAgentOutput(agentId, agent, msg) {
           ...(msg.vpId ? { vpId: msg.vpId } : {}),
           ...(msg.turnId ? { turnId: msg.turnId } : {}),
           ...(msg.threadId ? { threadId: msg.threadId } : {}),
-          image, _requestUserId: agent.ownerId,
+          image: msg.sourceToolCallId
+            ? { ...image, sourceToolCallId: msg.sourceToolCallId,
+              ...(Number.isInteger(msg.sourceImageIndex) && msg.sourceImageIndex >= 0 ? { sourceImageIndex: msg.sourceImageIndex } : {}) }
+            : image,
+          _requestUserId: agent.ownerId,
         });
         ok = true;
       } catch (err) {

package/local-runtime/server/yeaft-asset-store.js

@@ -196,7 +196,7 @@ export function createYeaftAssetStore({
   collectGarbage();
 
   return {
-    put({ ownerId, agentId, sessionId, assetId, data, mimeType, filename, width = null, height = null, turnId = null, vpId = null, threadId = null }) {
+    put({ ownerId, agentId, sessionId, assetId, data, mimeType, filename, width = null, height = null, turnId = null, vpId = null, threadId = null, sourceToolCallId = null, sourceImageIndex = null }) {
       if (!ownerId || !agentId || !sessionId) throw new Error('Asset owner, agent, and Session are required');
       const buffer = Buffer.isBuffer(data) ? data : Buffer.from(String(data || ''), 'base64');
       if (!buffer.length || buffer.length > MAX_ASSET_BYTES) throw new Error(`Image asset must be between 1 byte and ${MAX_ASSET_BYTES} bytes`);
@@ -222,6 +222,25 @@ export function createYeaftAssetStore({
       if (duplicate) {
         try { existing = JSON.parse(readFileSync(paths.meta, 'utf8')); } catch { /* rewrite below */ }
       }
+      // An asset is content-addressed, but each use owns its own turn/tool/VP
+      // anchor. Preserve old unanchored uses when the same pixels are uploaded again.
+      const turnAssociations = Array.isArray(existing?.turnAssociations)
+        ? existing.turnAssociations.filter(association => association
+          && typeof association.turnId === 'string' && association.turnId)
+        : [...new Set([existing?.turnId, ...(existing?.turnIds || [])].filter(Boolean))]
+          .map(legacyTurnId => ({ turnId: legacyTurnId }));
+      if (turnId) {
+        const association = {
+          turnId,
+          ...(typeof sourceToolCallId === 'string' && sourceToolCallId ? { sourceToolCallId } : {}),
+          ...(Number.isInteger(sourceImageIndex) && sourceImageIndex >= 0 ? { sourceImageIndex } : {}),
+          ...(vpId ? { vpId } : {}),
+        };
+        if (!turnAssociations.some(item => item.turnId === association.turnId
+          && item.sourceToolCallId === association.sourceToolCallId
+          && item.sourceImageIndex === association.sourceImageIndex
+          && item.vpId === association.vpId)) turnAssociations.push(association);
+      }
       const metadata = {
         assetId: computedAssetId,
         scopeId,
@@ -238,6 +257,7 @@ export function createYeaftAssetStore({
           ...(existing?.turnId ? [existing.turnId] : []),
           ...(turnId ? [turnId] : []),
         ])],
+        turnAssociations,
         vpId: vpId || existing?.vpId || null,
         threadId: threadId || existing?.threadId || null,
         createdAt: Number(existing?.createdAt) || now(),
@@ -305,12 +325,31 @@ export function createYeaftAssetStore({
         const associatedTurns = new Set([
           ...(row.metadata.turnId ? [row.metadata.turnId] : []),
           ...(Array.isArray(row.metadata.turnIds) ? row.metadata.turnIds : []),
+          ...(Array.isArray(row.metadata.turnAssociations)
+            ? row.metadata.turnAssociations.map(association => association?.turnId)
+            : []),
         ]);
         const matches = Array.from(associatedTurns).filter(turnId => requested.has(turnId));
         if (matches.length === 0) continue;
         const image = this.describe({ ownerId, agentId, sessionId, assetId: row.metadata.assetId });
         if (!image) continue;
-        for (const turnId of matches) result.get(turnId).push(image);
+        for (const turnId of matches) {
+          const associations = Array.isArray(row.metadata.turnAssociations)
+            ? row.metadata.turnAssociations.filter(association => association?.turnId === turnId)
+            : [];
+          if (associations.length > 0) {
+            for (const association of associations) {
+              result.get(turnId).push({
+                ...image,
+                ...(association.sourceToolCallId ? { sourceToolCallId: association.sourceToolCallId } : {}),
+                ...(Number.isInteger(association.sourceImageIndex) ? { sourceImageIndex: association.sourceImageIndex } : {}),
+                ...(association.vpId ? { vpId: association.vpId } : {}),
+              });
+            }
+          } else {
+            result.get(turnId).push(image);
+          }
+        }
       }
       return result;
     },

package/local-runtime/version.json

@@ -1 +1 @@
-{"version":"1.0.555"}
+{"version":"1.0.557"}