fix(canvas): deduplicate archived image result replays
This commit is contained in:
parent
a2b65b426c
commit
53e565045a
@ -314,6 +314,11 @@ import {
|
|||||||
stripCanvasModelRoutingLines,
|
stripCanvasModelRoutingLines,
|
||||||
stripMediaMarkup,
|
stripMediaMarkup,
|
||||||
} from "@/components/canvas/chat-panel/canvas-chat-media";
|
} from "@/components/canvas/chat-panel/canvas-chat-media";
|
||||||
|
import {
|
||||||
|
commitCanvasImageResultIfMissing,
|
||||||
|
getCanvasImageResultUrlKeys,
|
||||||
|
resolveCanvasImageResultAliases,
|
||||||
|
} from "@/components/canvas/chat-panel/canvas-image-result-sync";
|
||||||
import {
|
import {
|
||||||
clearClawdRequestState,
|
clearClawdRequestState,
|
||||||
startClawdRequestState,
|
startClawdRequestState,
|
||||||
@ -7630,6 +7635,18 @@ export function CanvasChatPanel({
|
|||||||
};
|
};
|
||||||
}, [activeChatId, clearStreamImageGenerationStateForChat, deleteNode]);
|
}, [activeChatId, clearStreamImageGenerationStateForChat, deleteNode]);
|
||||||
|
|
||||||
|
const resolveImageArchiveAliases = useCallback(async (urls: string[]) => {
|
||||||
|
const response = await fetch(`/api/canvas/${encodeURIComponent(canvasId)}/image-archives`, {
|
||||||
|
method: "POST",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify({ urls }),
|
||||||
|
signal: AbortSignal.timeout(12_000),
|
||||||
|
});
|
||||||
|
if (!response.ok) throw new Error("Failed to resolve canvas image result aliases");
|
||||||
|
const result = await response.json();
|
||||||
|
return result.replacements || {};
|
||||||
|
}, [canvasId]);
|
||||||
|
|
||||||
const appendStreamMediaToCanvas = useCallback(
|
const appendStreamMediaToCanvas = useCallback(
|
||||||
async (payload: CanvasMediaStreamPayload) => {
|
async (payload: CanvasMediaStreamPayload) => {
|
||||||
const imageUrls = Array.isArray(payload.imageUrls)
|
const imageUrls = Array.isArray(payload.imageUrls)
|
||||||
@ -7642,6 +7659,20 @@ export function CanvasChatPanel({
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let imageAliases;
|
||||||
|
try {
|
||||||
|
imageAliases = await resolveCanvasImageResultAliases({
|
||||||
|
nodes: useCanvasStore.getState().nodes,
|
||||||
|
messageId: payload.messageId,
|
||||||
|
imageUrls,
|
||||||
|
resolveAliases: resolveImageArchiveAliases,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
// Preserve the existing result until aliases can be checked again.
|
||||||
|
console.warn("[CanvasChat] Deferred image replay during archive lookup:", error);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (useCanvasStore.getState().projectId !== canvasId || activeChatIdRef.current !== activeChatId) return;
|
||||||
const latestNodes = useCanvasStore.getState().nodes;
|
const latestNodes = useCanvasStore.getState().nodes;
|
||||||
const placeholderNodes = latestNodes.filter((node) => {
|
const placeholderNodes = latestNodes.filter((node) => {
|
||||||
if (node.type !== "image") return false;
|
if (node.type !== "image") return false;
|
||||||
@ -7656,12 +7687,7 @@ export function CanvasChatPanel({
|
|||||||
.map((item) => String(item || "").trim())
|
.map((item) => String(item || "").trim())
|
||||||
.filter(Boolean)
|
.filter(Boolean)
|
||||||
);
|
);
|
||||||
const existingImageUrlKeys = new Set(
|
const existingImageUrlKeys = getCanvasImageResultUrlKeys(latestNodes, imageAliases);
|
||||||
latestNodes
|
|
||||||
.filter((node) => node.type === "image" && (node.data as any)?.src)
|
|
||||||
.map((node) => normalizeImageIdentityUrl(String((node.data as any)?.src || "")))
|
|
||||||
.filter(Boolean)
|
|
||||||
);
|
|
||||||
const existingMessageImageKeys = new Set(
|
const existingMessageImageKeys = new Set(
|
||||||
latestNodes
|
latestNodes
|
||||||
.filter((node) => node.type === "image")
|
.filter((node) => node.type === "image")
|
||||||
@ -7723,6 +7749,7 @@ export function CanvasChatPanel({
|
|||||||
}
|
}
|
||||||
|
|
||||||
const dimensions = await getImageDimensions(url);
|
const dimensions = await getImageDimensions(url);
|
||||||
|
if (useCanvasStore.getState().projectId !== canvasId || activeChatIdRef.current !== activeChatId) return;
|
||||||
const compareSourceUrlRaw =
|
const compareSourceUrlRaw =
|
||||||
sourceImageUrls[Math.min(index, Math.max(0, sourceImageUrls.length - 1))] ||
|
sourceImageUrls[Math.min(index, Math.max(0, sourceImageUrls.length - 1))] ||
|
||||||
sourceImageUrls[0] ||
|
sourceImageUrls[0] ||
|
||||||
@ -7789,23 +7816,32 @@ export function CanvasChatPanel({
|
|||||||
latestGeneratedHighlight: true,
|
latestGeneratedHighlight: true,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
const nodeId = placeholderNode
|
const nodeId = commitCanvasImageResultIfMissing({
|
||||||
? placeholderNode.id
|
getNodes: () => useCanvasStore.getState().nodes,
|
||||||
: addNode({
|
url,
|
||||||
type: "image",
|
aliases: imageAliases,
|
||||||
position,
|
commit: () => {
|
||||||
size,
|
const nodeId = placeholderNode
|
||||||
data,
|
? placeholderNode.id
|
||||||
connections: sourceNodeId ? [sourceNodeId] : anchorNode?.id ? [anchorNode.id] : [],
|
: addNode({
|
||||||
});
|
type: "image",
|
||||||
if (placeholderNode) {
|
position,
|
||||||
updateNode(nodeId, {
|
size,
|
||||||
position,
|
data,
|
||||||
size,
|
connections: sourceNodeId ? [sourceNodeId] : anchorNode?.id ? [anchorNode.id] : [],
|
||||||
data,
|
});
|
||||||
connections: sourceNodeId ? [sourceNodeId] : anchorNode?.id ? [anchorNode.id] : [],
|
if (placeholderNode) {
|
||||||
});
|
updateNode(nodeId, {
|
||||||
}
|
position,
|
||||||
|
size,
|
||||||
|
data,
|
||||||
|
connections: sourceNodeId ? [sourceNodeId] : anchorNode?.id ? [anchorNode.id] : [],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return nodeId;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (!nodeId) continue;
|
||||||
insertedNodeIds.push(nodeId);
|
insertedNodeIds.push(nodeId);
|
||||||
void autoNameGeneratedImageNode(nodeId, url);
|
void autoNameGeneratedImageNode(nodeId, url);
|
||||||
addedImageCount += 1;
|
addedImageCount += 1;
|
||||||
@ -7862,6 +7898,8 @@ export function CanvasChatPanel({
|
|||||||
},
|
},
|
||||||
[
|
[
|
||||||
activeChatId,
|
activeChatId,
|
||||||
|
canvasId,
|
||||||
|
resolveImageArchiveAliases,
|
||||||
addNode,
|
addNode,
|
||||||
autoNameGeneratedImageNode,
|
autoNameGeneratedImageNode,
|
||||||
deleteNode,
|
deleteNode,
|
||||||
@ -9192,12 +9230,7 @@ export function CanvasChatPanel({
|
|||||||
.map((item) => String(item || "").trim())
|
.map((item) => String(item || "").trim())
|
||||||
.filter(Boolean)
|
.filter(Boolean)
|
||||||
);
|
);
|
||||||
const existingImageUrlKeys = new Set(
|
const existingImageUrlKeys = getCanvasImageResultUrlKeys(useCanvasStore.getState().nodes);
|
||||||
nodes
|
|
||||||
.filter((n) => n.type === "image" && (n.data as any)?.src)
|
|
||||||
.map((n) => normalizeImageIdentityUrl((n.data as any).src))
|
|
||||||
.filter(Boolean)
|
|
||||||
);
|
|
||||||
const existingMessageImageKeys = new Set(
|
const existingMessageImageKeys = new Set(
|
||||||
nodes
|
nodes
|
||||||
.filter((n) => n.type === "image")
|
.filter((n) => n.type === "image")
|
||||||
@ -9304,7 +9337,21 @@ export function CanvasChatPanel({
|
|||||||
const videoUrls = Array.from(videoUrlSet);
|
const videoUrls = Array.from(videoUrlSet);
|
||||||
if (imageUrls.length === 0 && videoUrls.length === 0) continue;
|
if (imageUrls.length === 0 && videoUrls.length === 0) continue;
|
||||||
|
|
||||||
processedMessageIds.current.add(message.id);
|
let imageAliases;
|
||||||
|
try {
|
||||||
|
imageAliases = await resolveCanvasImageResultAliases({
|
||||||
|
nodes: useCanvasStore.getState().nodes,
|
||||||
|
messageId: message.id,
|
||||||
|
imageUrls,
|
||||||
|
resolveAliases: resolveImageArchiveAliases,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.warn("[CanvasChat] Deferred history image replay during archive lookup:", error);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (cancelled) return;
|
||||||
|
getCanvasImageResultUrlKeys(useCanvasStore.getState().nodes, imageAliases)
|
||||||
|
.forEach((key) => existingImageUrlKeys.add(key));
|
||||||
const generationPrompt = findNearestUserPrompt(messages, messageIndex);
|
const generationPrompt = findNearestUserPrompt(messages, messageIndex);
|
||||||
|
|
||||||
let addedImageCount = 0;
|
let addedImageCount = 0;
|
||||||
@ -9378,6 +9425,7 @@ export function CanvasChatPanel({
|
|||||||
}
|
}
|
||||||
|
|
||||||
const dimensions = await getImageDimensions(url);
|
const dimensions = await getImageDimensions(url);
|
||||||
|
if (cancelled) return;
|
||||||
const compareSourceUrlRaw =
|
const compareSourceUrlRaw =
|
||||||
nearestUserImageUrls[Math.min(index, Math.max(0, nearestUserImageUrls.length - 1))] ||
|
nearestUserImageUrls[Math.min(index, Math.max(0, nearestUserImageUrls.length - 1))] ||
|
||||||
nearestUserImageUrls[0] ||
|
nearestUserImageUrls[0] ||
|
||||||
@ -9458,23 +9506,32 @@ export function CanvasChatPanel({
|
|||||||
: anchorNode?.id
|
: anchorNode?.id
|
||||||
? [anchorNode.id]
|
? [anchorNode.id]
|
||||||
: [];
|
: [];
|
||||||
const nodeId = placeholderNode
|
const nodeId = commitCanvasImageResultIfMissing({
|
||||||
? placeholderNode.id
|
getNodes: () => useCanvasStore.getState().nodes,
|
||||||
: addNode({
|
url,
|
||||||
type: "image",
|
aliases: imageAliases,
|
||||||
position,
|
commit: () => {
|
||||||
size,
|
const nodeId = placeholderNode
|
||||||
data,
|
? placeholderNode.id
|
||||||
connections,
|
: addNode({
|
||||||
});
|
type: "image",
|
||||||
if (placeholderNode) {
|
position,
|
||||||
updateNode(nodeId, {
|
size,
|
||||||
position,
|
data,
|
||||||
size,
|
connections,
|
||||||
data,
|
});
|
||||||
connections,
|
if (placeholderNode) {
|
||||||
});
|
updateNode(nodeId, {
|
||||||
}
|
position,
|
||||||
|
size,
|
||||||
|
data,
|
||||||
|
connections,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return nodeId;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (!nodeId) continue;
|
||||||
insertedNodeIds.push(nodeId);
|
insertedNodeIds.push(nodeId);
|
||||||
void autoNameGeneratedImageNode(nodeId, url);
|
void autoNameGeneratedImageNode(nodeId, url);
|
||||||
addedImageCount += 1;
|
addedImageCount += 1;
|
||||||
@ -9519,6 +9576,7 @@ export function CanvasChatPanel({
|
|||||||
addedVideoCount += 1;
|
addedVideoCount += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
processedMessageIds.current.add(message.id);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -9529,6 +9587,7 @@ export function CanvasChatPanel({
|
|||||||
}, [
|
}, [
|
||||||
activeChatId,
|
activeChatId,
|
||||||
activeChatSessionMode,
|
activeChatSessionMode,
|
||||||
|
resolveImageArchiveAliases,
|
||||||
messages,
|
messages,
|
||||||
addNode,
|
addNode,
|
||||||
nodes,
|
nodes,
|
||||||
|
|||||||
70
components/canvas/chat-panel/canvas-image-result-sync.ts
Normal file
70
components/canvas/chat-panel/canvas-image-result-sync.ts
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
import { normalizeImageIdentityUrl } from "./canvas-chat-media";
|
||||||
|
import type { ArchivedImageUrlMap } from "@/lib/storage/image-archive-urls";
|
||||||
|
|
||||||
|
type ImageResultNode = {
|
||||||
|
type: string;
|
||||||
|
data?: unknown;
|
||||||
|
};
|
||||||
|
|
||||||
|
function imageUrls(node: ImageResultNode): string[] {
|
||||||
|
if (node.type !== "image") return [];
|
||||||
|
const data = node.data as { src?: string; metadata?: { sourceImageKey?: string } } | undefined;
|
||||||
|
return [data?.src, data?.metadata?.sourceImageKey].filter(
|
||||||
|
(url): url is string => typeof url === "string" && Boolean(url.trim()),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getCanvasImageResultUrlKeys(
|
||||||
|
nodes: readonly ImageResultNode[],
|
||||||
|
aliases: ArchivedImageUrlMap = {},
|
||||||
|
) {
|
||||||
|
const keys = new Set<string>();
|
||||||
|
for (const node of nodes) {
|
||||||
|
for (const url of imageUrls(node)) {
|
||||||
|
keys.add(normalizeImageIdentityUrl(url));
|
||||||
|
if (aliases[url]) keys.add(normalizeImageIdentityUrl(aliases[url]));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
keys.delete("");
|
||||||
|
return keys;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A history refresh may already contain bucket URLs while this tab still shows
|
||||||
|
// provider previews. Resolve aliases only for an existing result of this message;
|
||||||
|
// a new generation never waits for storage before appearing on the canvas.
|
||||||
|
export async function resolveCanvasImageResultAliases(params: {
|
||||||
|
nodes: readonly ImageResultNode[];
|
||||||
|
messageId?: string;
|
||||||
|
imageUrls: string[];
|
||||||
|
resolveAliases: (urls: string[]) => Promise<ArchivedImageUrlMap>;
|
||||||
|
}): Promise<ArchivedImageUrlMap> {
|
||||||
|
const keys = getCanvasImageResultUrlKeys(params.nodes);
|
||||||
|
if (!params.messageId || params.imageUrls.every((url) => keys.has(normalizeImageIdentityUrl(url)))) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
const urls = [...new Set(params.nodes.flatMap((node) => {
|
||||||
|
const data = node.data as { metadata?: { sourceMessageId?: string } } | undefined;
|
||||||
|
return data?.metadata?.sourceMessageId === params.messageId ? imageUrls(node) : [];
|
||||||
|
}))].filter((url) => /^https?:\/\//i.test(url));
|
||||||
|
if (!urls.length) return {};
|
||||||
|
const aliases: ArchivedImageUrlMap = {};
|
||||||
|
for (let index = 0; index < urls.length; index += 100) {
|
||||||
|
Object.assign(aliases, await params.resolveAliases(urls.slice(index, index + 100)));
|
||||||
|
}
|
||||||
|
return aliases;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Call synchronously immediately before changing the store, after all image
|
||||||
|
// loading/network awaits. Both stream and history writers share this check.
|
||||||
|
export function commitCanvasImageResultIfMissing<T>(params: {
|
||||||
|
getNodes: () => readonly ImageResultNode[];
|
||||||
|
url: string;
|
||||||
|
aliases: ArchivedImageUrlMap;
|
||||||
|
commit: () => T;
|
||||||
|
}): T | undefined {
|
||||||
|
const key = normalizeImageIdentityUrl(params.url);
|
||||||
|
if (!key || getCanvasImageResultUrlKeys(params.getNodes(), params.aliases).has(key)) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
return params.commit();
|
||||||
|
}
|
||||||
101
tests/integration/canvas-image-result-sync.test.ts
Normal file
101
tests/integration/canvas-image-result-sync.test.ts
Normal file
@ -0,0 +1,101 @@
|
|||||||
|
import assert from "node:assert/strict";
|
||||||
|
import { test } from "node:test";
|
||||||
|
import {
|
||||||
|
commitCanvasImageResultIfMissing,
|
||||||
|
getCanvasImageResultUrlKeys,
|
||||||
|
resolveCanvasImageResultAliases,
|
||||||
|
} from "@/components/canvas/chat-panel/canvas-image-result-sync";
|
||||||
|
|
||||||
|
const preview = "https://provider.example/result.png";
|
||||||
|
const archived = "https://bucket.example/archived.png";
|
||||||
|
const other = "https://bucket.example/second.png";
|
||||||
|
const image = (src: string, sourceImageKey = src, sourceMessageId = "message-1") => ({
|
||||||
|
type: "image",
|
||||||
|
data: { src, metadata: { sourceImageKey, sourceMessageId } },
|
||||||
|
});
|
||||||
|
|
||||||
|
test("archived history replay recognizes the provider preview already on canvas", async () => {
|
||||||
|
const nodes = [image(preview)];
|
||||||
|
const aliases = await resolveCanvasImageResultAliases({
|
||||||
|
nodes, messageId: "message-1", imageUrls: [archived],
|
||||||
|
resolveAliases: async (urls) => {
|
||||||
|
assert.deepEqual(urls, [preview]);
|
||||||
|
return { [preview]: archived };
|
||||||
|
},
|
||||||
|
});
|
||||||
|
let writes = 0;
|
||||||
|
const result = commitCanvasImageResultIfMissing({ getNodes: () => nodes, url: archived, aliases, commit: () => ++writes });
|
||||||
|
assert.equal(result, undefined);
|
||||||
|
assert.equal(writes, 0);
|
||||||
|
assert.equal(nodes.length, 1);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("current src and previous source identity both prevent replay", () => {
|
||||||
|
const keys = getCanvasImageResultUrlKeys([image(archived, preview)]);
|
||||||
|
assert(keys.has(preview));
|
||||||
|
assert(keys.has(archived));
|
||||||
|
});
|
||||||
|
|
||||||
|
test("simultaneous stream and history image loads commit a single node", async () => {
|
||||||
|
const nodes: ReturnType<typeof image>[] = [];
|
||||||
|
let release!: () => void;
|
||||||
|
const loading = new Promise<void>((resolve) => { release = resolve; });
|
||||||
|
const insert = async () => {
|
||||||
|
// Both paths have already observed an empty canvas before image loading.
|
||||||
|
assert.equal(nodes.length, 0);
|
||||||
|
await loading;
|
||||||
|
return commitCanvasImageResultIfMissing({
|
||||||
|
getNodes: () => nodes, url: preview, aliases: {},
|
||||||
|
commit: () => { nodes.push(image(preview)); return "inserted"; },
|
||||||
|
});
|
||||||
|
};
|
||||||
|
const stream = insert();
|
||||||
|
const history = insert();
|
||||||
|
release();
|
||||||
|
assert.deepEqual(await Promise.all([stream, history]), ["inserted", undefined]);
|
||||||
|
assert.equal(nodes.length, 1);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("multiple distinct results in one message remain distinct", async () => {
|
||||||
|
const nodes = [image(preview)];
|
||||||
|
const aliases = await resolveCanvasImageResultAliases({
|
||||||
|
nodes, messageId: "message-1", imageUrls: [archived, other],
|
||||||
|
resolveAliases: async () => ({ [preview]: archived }),
|
||||||
|
});
|
||||||
|
for (const url of [archived, other]) {
|
||||||
|
commitCanvasImageResultIfMissing({ getNodes: () => nodes, url, aliases, commit: () => nodes.push(image(url)) });
|
||||||
|
}
|
||||||
|
assert.equal(nodes.length, 2);
|
||||||
|
assert.equal(nodes[1].data.src, other);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("new generations display immediately without an archive lookup", async () => {
|
||||||
|
const aliases = await resolveCanvasImageResultAliases({
|
||||||
|
nodes: [image(preview, preview, "previous-message")], messageId: "message-2", imageUrls: [other],
|
||||||
|
resolveAliases: async () => { throw new Error("Must not wait for archiving"); },
|
||||||
|
});
|
||||||
|
assert.deepEqual(aliases, {});
|
||||||
|
});
|
||||||
|
|
||||||
|
test("an archive lookup failure never treats the URL change as a new result", async () => {
|
||||||
|
await assert.rejects(resolveCanvasImageResultAliases({
|
||||||
|
nodes: [image(preview)], messageId: "message-1", imageUrls: [archived],
|
||||||
|
resolveAliases: async () => { throw new Error("Temporary network failure"); },
|
||||||
|
}), /Temporary network failure/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("same-message image batches respect the archive endpoint limit", async () => {
|
||||||
|
const nodes = Array.from({ length: 205 }, (_, i) => image(`https://provider.example/${i}.png`));
|
||||||
|
const batches: number[] = [];
|
||||||
|
await resolveCanvasImageResultAliases({
|
||||||
|
nodes, messageId: "message-1", imageUrls: [archived],
|
||||||
|
resolveAliases: async (urls) => { batches.push(urls.length); return {}; },
|
||||||
|
});
|
||||||
|
assert.deepEqual(batches, [100, 100, 5]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("synchronization leaves existing manual copies untouched", () => {
|
||||||
|
const nodes = [image(archived, preview), image(archived, preview)];
|
||||||
|
commitCanvasImageResultIfMissing({ getNodes: () => nodes, url: archived, aliases: {}, commit: () => { throw new Error("Unexpected insertion"); } });
|
||||||
|
assert.equal(nodes.length, 2);
|
||||||
|
});
|
||||||
Loading…
x
Reference in New Issue
Block a user