mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-21 15:41:17 +00:00
328 lines
18 KiB
TypeScript
328 lines
18 KiB
TypeScript
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
|
|
import { mergeAiSessionLists, mergeSyncPayloads, stripAiSessionDeviceState, stripAiSessionPayloadForSync } from "./syncMerge.ts";
|
|
import type { SyncPayload } from "./sync.ts";
|
|
import { encodeSdkSessionIdentity } from "../infrastructure/ai/harness/sdkSessionIdentity.ts";
|
|
import { buildExternalAgentHistoryMessagesForBridge } from "../components/ai/externalAgentHistory.ts";
|
|
import { withSyncReliabilityMeta } from './syncReliability';
|
|
|
|
type Session = NonNullable<SyncPayload["aiSessions"]>[number];
|
|
|
|
function payload(overrides: Partial<SyncPayload> = {}): SyncPayload {
|
|
return {
|
|
hosts: [],
|
|
keys: [],
|
|
identities: [],
|
|
snippets: [],
|
|
customGroups: [],
|
|
snippetPackages: [],
|
|
notes: [],
|
|
noteGroups: [],
|
|
portForwardingRules: [],
|
|
groupConfigs: [],
|
|
aiSessions: [],
|
|
settings: undefined,
|
|
syncedAt: 0,
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
const msg = (id: string, timestamp: number) => ({ id, role: "user" as const, content: id, timestamp });
|
|
const session = (id: string, updatedAt: number, messages: Session['messages']) =>
|
|
({ id, title: id, agentId: "catty", scope: { type: "global" }, messages, createdAt: 0, updatedAt }) as Session;
|
|
|
|
test("ai sessions: union by session id", () => {
|
|
const base = payload({ aiSessions: [session("s1", 100, [msg("m1", 10)])] });
|
|
const local = payload({ aiSessions: [session("s1", 100, [msg("m1", 10)]), session("s-local", 120, [msg("l1", 20)])] });
|
|
const remote = payload({ aiSessions: [session("s1", 100, [msg("m1", 10)]), session("s-remote", 130, [msg("r1", 30)])] });
|
|
|
|
const merged = mergeSyncPayloads(base, local, remote);
|
|
const ids = new Set(merged.payload.aiSessions?.map((s) => s.id));
|
|
assert.deepEqual([...ids].sort(), ["s-local", "s-remote", "s1"]);
|
|
});
|
|
|
|
test("ai sessions: messages merge append-only — both devices' turns survive", () => {
|
|
const base = payload({ aiSessions: [session("s1", 100, [msg("m1", 10)])] });
|
|
// Local appended turn 2, remote appended turn 3 — a last-writer-wins merge would drop one.
|
|
const local = payload({ aiSessions: [session("s1", 200, [msg("m1", 10), msg("m2", 20)])] });
|
|
const remote = payload({ aiSessions: [session("s1", 300, [msg("m1", 10), msg("m3", 30)])] });
|
|
|
|
const merged = mergeSyncPayloads(base, local, remote);
|
|
const s1 = merged.payload.aiSessions?.find((s) => s.id === "s1");
|
|
assert.deepEqual((s1?.messages ?? []).map((m) => m.id), ["m1", "m2", "m3"]);
|
|
});
|
|
|
|
test("ai sessions: preserve each branch sequence despite a backwards device clock", () => {
|
|
const base = payload({ aiSessions: [session("s1", 100, [])] });
|
|
const local = payload({ aiSessions: [session("s1", 200, [msg("late", 90), msg("early", 5)])] });
|
|
const remote = payload({ aiSessions: [session("s1", 300, [msg("mid", 50)])] });
|
|
|
|
const merged = mergeSyncPayloads(base, local, remote);
|
|
const s1 = merged.payload.aiSessions?.find((s) => s.id === "s1");
|
|
assert.deepEqual((s1?.messages ?? []).map((m) => m.timestamp), [50, 90, 5]);
|
|
});
|
|
|
|
test('concurrent complete turns stay together after the shared prefix', () => {
|
|
const prefix = [msg('shared-user', 100), { ...msg('shared-reply', 110), role: 'assistant' as const }];
|
|
const a = session('s1', 300, [...prefix, msg('user-a', 200), { ...msg('reply-a', 240), role: 'assistant' as const }]);
|
|
const b = session('s1', 400, [...prefix, msg('user-b', 210), { ...msg('reply-b', 250), role: 'assistant' as const }]);
|
|
const expected = ['shared-user', 'shared-reply', 'user-a', 'reply-a', 'user-b', 'reply-b'];
|
|
for (const [local, remote] of [[a, b], [b, a]]) {
|
|
assert.deepEqual(mergeAiSessionLists([local], [remote])[0].messages.map(m => m.id), expected);
|
|
}
|
|
const skewed = { ...b, messages: [...prefix, msg('user-b', 1), { ...msg('reply-b', 2), role: 'assistant' as const }] };
|
|
assert.deepEqual(mergeAiSessionLists([a], [skewed])[0].messages.map(m => m.id),
|
|
['shared-user', 'shared-reply', 'user-b', 'reply-b', 'user-a', 'reply-a']);
|
|
});
|
|
|
|
test('different three-device merge histories converge instead of swapping order', () => {
|
|
const branch = (name: string, time: number) => session('s1', 100, [
|
|
msg('prefix', 0), msg(`user-${name}`, time), { ...msg(`reply-${name}`, time + 1), role: 'assistant' as const },
|
|
]);
|
|
const a = branch('A', 10), b = branch('B', 30), c = branch('C', 20);
|
|
let left = mergeAiSessionLists(mergeAiSessionLists([a], [b]), [c]);
|
|
let right = mergeAiSessionLists(mergeAiSessionLists([a], [c]), [b]);
|
|
const expected = mergeAiSessionLists(left, right);
|
|
for (let round = 0; round < 4; round++) {
|
|
const nextLeft = mergeAiSessionLists(left, right);
|
|
const nextRight = mergeAiSessionLists(right, left);
|
|
assert.deepEqual(nextLeft, nextRight);
|
|
assert.deepEqual(nextLeft, expected);
|
|
left = nextLeft; right = nextRight;
|
|
}
|
|
});
|
|
|
|
test('compaction is kept only while the summarized portable prefix stays unchanged', () => {
|
|
const compacted = { ...session('s1', 300, [msg('first', 1), msg('second', 3), msg('recent', 4)]),
|
|
contextCompaction: { summary: 'First two messages', compactedMessageCount: 2 } };
|
|
const inserted = session('s1', 100, [msg('first', 1), msg('added', 2), msg('second', 3)]);
|
|
const [changed] = mergeAiSessionLists<Session>([compacted], [inserted]);
|
|
assert.equal(changed.contextCompaction, undefined);
|
|
assert.ok(changed.messages.some(m => m.id === 'added'));
|
|
const appended = session('s1', 100, [...compacted.messages, msg('last', 5)]);
|
|
assert.deepEqual(mergeAiSessionLists<Session>([compacted], [appended])[0].contextCompaction, compacted.contextCompaction);
|
|
const withBody = { ...compacted, messages: [{ ...compacted.messages[0], attachments: [{ filename: 'a.png', mediaType: 'image/png', base64Data: 'LOCAL' }] }, ...compacted.messages.slice(1)] };
|
|
const [metadataOnly] = stripAiSessionPayloadForSync([{ ...withBody, updatedAt: 400 }]);
|
|
assert.deepEqual(mergeAiSessionLists<Session>([withBody], [metadataOnly])[0].contextCompaction, compacted.contextCompaction);
|
|
const zero = { ...compacted, contextCompaction: { summary: 'Earlier trimmed history', compactedMessageCount: 0 } };
|
|
assert.deepEqual(mergeAiSessionLists<Session>([zero], [inserted])[0].contextCompaction, zero.contextCompaction);
|
|
});
|
|
|
|
test('same-named local attachment bodies are matched once each', () => {
|
|
const attachments = ['FIRST', 'SECOND'].map(base64Data => ({ base64Data, filename: 'photo.png', mediaType: 'image/png' }));
|
|
const local = { ...session('s1', 100, [msg('m1', 1)]), messages: [{ ...msg('m1', 1), attachments }] };
|
|
const [incoming] = stripAiSessionPayloadForSync([{ ...local, updatedAt: 200 }]);
|
|
assert.deepEqual(mergeAiSessionLists([local], [incoming])[0].messages[0].attachments.map(a => a.base64Data), ['FIRST', 'SECOND']);
|
|
incoming.messages[0].attachments[0] = attachments[0];
|
|
assert.deepEqual(mergeAiSessionLists([local], [incoming])[0].messages[0].attachments.map(a => a.base64Data), ['FIRST', 'SECOND']);
|
|
});
|
|
|
|
test("ai sessions: title/metadata come from the newer side", () => {
|
|
const base = payload({ aiSessions: [session("s1", 100, [])] });
|
|
const older = { ...session("s1", 150, []), title: "older-title" } as Session;
|
|
const newer = { ...session("s1", 250, []), title: "newer-title" } as Session;
|
|
|
|
const merged = mergeSyncPayloads(base, payload({ aiSessions: [older] }), payload({ aiSessions: [newer] }));
|
|
assert.equal(merged.payload.aiSessions?.find((s) => s.id === "s1")?.title, "newer-title");
|
|
});
|
|
|
|
test("ai sessions: deletions follow the strategy (both-sides vs preserveDeletions)", () => {
|
|
const base = payload({ aiSessions: [session("s1", 100, []), session("s2", 100, [])] });
|
|
const local = payload({ aiSessions: [session("s1", 100, [])] });
|
|
const remote = base;
|
|
|
|
const destructive = mergeSyncPayloads(base, local, remote);
|
|
assert.deepEqual((destructive.payload.aiSessions ?? []).map((s) => s.id), ["s1"]);
|
|
|
|
const preserved = mergeSyncPayloads(base, local, remote, { preserveDeletions: true });
|
|
assert.deepEqual(((preserved.payload.aiSessions ?? []).map((s) => s.id)).sort(), ["s1", "s2"]);
|
|
});
|
|
|
|
test("ai sessions: missing field on one side falls back to the other", () => {
|
|
const base = payload();
|
|
const withSessions = payload({ aiSessions: [session("s1", 100, [msg("m1", 1)])] });
|
|
const withoutSessions = { ...payload() } as SyncPayload;
|
|
delete (withoutSessions as { aiSessions?: unknown }).aiSessions;
|
|
|
|
const merged = mergeSyncPayloads(base, withoutSessions, withSessions);
|
|
assert.deepEqual((merged.payload.aiSessions ?? []).map((s) => s.id), ["s1"]);
|
|
});
|
|
|
|
test("stripAiSessionPayloadForSync removes inline attachment blobs but keeps metadata", () => {
|
|
const [stripped] = stripAiSessionPayloadForSync([
|
|
{
|
|
id: "s1",
|
|
title: "t",
|
|
messages: [
|
|
{
|
|
id: "m1",
|
|
role: "user",
|
|
content: "look",
|
|
attachments: [{ base64Data: "AAAA", mediaType: "image/png", filename: "a.png", lineCount: 3 }],
|
|
},
|
|
],
|
|
} as unknown as Session,
|
|
]);
|
|
|
|
const attachment = (stripped.messages?.[0] as unknown as { attachments?: Array<Record<string, unknown>> }).attachments?.[0];
|
|
assert.ok(attachment, "attachment metadata should survive");
|
|
assert.equal(attachment?.base64Data, "", "inline blob must be stripped");
|
|
assert.equal(attachment?.contentUnavailable, true);
|
|
assert.equal(attachment?.filename, "a.png");
|
|
assert.equal(attachment?.lineCount, 3);
|
|
});
|
|
|
|
test("ai sessions: merge is idempotent", () => {
|
|
const base = payload({ aiSessions: [session("s1", 100, [msg("m1", 1)])] });
|
|
const local = payload({ aiSessions: [session("s1", 200, [msg("m1", 1), msg("m2", 2)])] });
|
|
const remote = payload({ aiSessions: [session("s1", 300, [msg("m1", 1), msg("m3", 3)])] });
|
|
|
|
const first = mergeSyncPayloads(base, local, remote);
|
|
const second = mergeSyncPayloads(base, first.payload, remote);
|
|
const s1 = second.payload.aiSessions?.find((s) => s.id === "s1");
|
|
assert.deepEqual((s1?.messages ?? []).map((m) => m.id), ["m1", "m2", "m3"]);
|
|
});
|
|
|
|
|
|
test("ai sessions: old or opted-out clients omit chats without deleting the known baseline", () => {
|
|
const base = payload({ aiSessions: [session("s1", 100, [msg("m1", 1)])] });
|
|
const oldClient = payload();
|
|
delete oldClient.aiSessions;
|
|
for (const [local, remote] of [[oldClient, base], [base, oldClient], [oldClient, oldClient]]) {
|
|
assert.deepEqual(mergeSyncPayloads(base, local, remote).payload.aiSessions, base.aiSessions);
|
|
}
|
|
assert.deepEqual(mergeSyncPayloads(base, payload(), base).payload.aiSessions, []);
|
|
assert.equal(Object.hasOwn(mergeSyncPayloads(null, oldClient, oldClient).payload, 'aiSessions'), false);
|
|
});
|
|
|
|
test("ai sessions: completed messages replace their streamed copy on the newer side", () => {
|
|
const partial = session("s1", 100, [{ ...msg("m1", 1), content: "Hel" }]);
|
|
const complete = session("s1", 200, [{ ...msg("m1", 1), content: "Hello world" }]);
|
|
for (const [local, remote] of [[partial, complete], [complete, partial]]) {
|
|
const result = mergeAiSessionLists([local], [remote]);
|
|
assert.equal(result[0].messages.length, 1);
|
|
assert.equal(result[0].messages[0].content, "Hello world");
|
|
}
|
|
});
|
|
|
|
test("ai sessions: a new turn survives deletion on the other device", () => {
|
|
const initial = session("s1", 100, [msg("m1", 1)]);
|
|
const edited = session("s1", 200, [msg("m1", 1), msg("m2", 2)]);
|
|
const base = payload({ aiSessions: [initial] });
|
|
const modified = payload({ aiSessions: [edited] });
|
|
for (const [local, remote] of [[modified, payload()], [payload(), modified]]) {
|
|
const result = mergeSyncPayloads(base, local, remote);
|
|
assert.deepEqual(result.payload.aiSessions, [edited]);
|
|
assert.equal(result.hadConflicts, true);
|
|
}
|
|
});
|
|
|
|
test('no-base chat deletion records suppress stale sessions unless preservation is selected', () => {
|
|
const stale = payload({ aiSessions: [session('removed', 100, [msg('m1', 1)])] });
|
|
const removed = withSyncReliabilityMeta(payload(), stale, { now: 200 });
|
|
assert.equal(removed.syncMeta?.deletions[0]?.entityType, 'aiSessions');
|
|
for (const [local, remote] of [[stale, removed], [removed, stale]]) {
|
|
const normal = mergeSyncPayloads(null, local, remote).payload;
|
|
assert.deepEqual(normal.aiSessions, []);
|
|
assert.ok(normal.syncMeta?.deletions.some(item => item.entityType === 'aiSessions' && item.id === 'removed'));
|
|
const preserved = mergeSyncPayloads(null, local, remote, { preserveDeletions: true }).payload;
|
|
assert.deepEqual(preserved.aiSessions, stale.aiSessions);
|
|
assert.equal(preserved.syncMeta?.deletions.some(item => item.id === 'removed') ?? false, false);
|
|
}
|
|
});
|
|
|
|
test("cloud attachment whitelist excludes previews, paths, data URLs and arbitrary body properties", () => {
|
|
const attachment = {
|
|
base64Data: "U0VDUkVU", mediaType: "text/plain", filename: "terminal.txt",
|
|
terminalSelection: true, vaultNoteId: "note-1", vaultNoteTitle: "My note", lineCount: 2,
|
|
previewText: "SECRET", filePath: "/private/file", dataUrl: "data:text/plain;base64,U0VDUkVU",
|
|
futureBody: "SECRET",
|
|
};
|
|
const original = [{ messages: [{ attachments: [attachment], images: [attachment] }] }];
|
|
const [stripped] = stripAiSessionPayloadForSync(original);
|
|
const expected = {
|
|
base64Data: "", contentUnavailable: true, mediaType: "text/plain", filename: "terminal.txt",
|
|
terminalSelection: true, vaultNoteId: "note-1", vaultNoteTitle: "My note", lineCount: 2,
|
|
};
|
|
assert.deepEqual(stripped.messages[0].attachments, [expected]);
|
|
assert.deepEqual(stripped.messages[0].images, [expected]);
|
|
assert.equal(original[0].messages[0].attachments[0].base64Data, "U0VDUkVU");
|
|
});
|
|
|
|
test("merging metadata-only history preserves available attachment bytes on this device", () => {
|
|
const attachment = {
|
|
base64Data: "U0VDUkVU", mediaType: "image/png", filename: "a.png",
|
|
previewText: "preview", filePath: "/private/a.png",
|
|
};
|
|
const local = { ...session("s1", 100, [msg("m1", 1)]), messages: [{ ...msg("m1", 1), attachments: [attachment], images: [attachment] }] };
|
|
const [incoming] = stripAiSessionPayloadForSync([{ ...local, updatedAt: 200, title: "remote title" }]);
|
|
const [merged] = mergeAiSessionLists([local], [incoming]);
|
|
assert.equal(merged.title, "remote title");
|
|
assert.deepEqual(merged.messages[0].attachments, [attachment]);
|
|
assert.deepEqual(merged.messages[0].images, [attachment]);
|
|
assert.equal(incoming.messages[0].attachments[0].base64Data, "");
|
|
});
|
|
|
|
|
|
test("new attachment representation keeps bytes from the legacy image list", () => {
|
|
const attachment = { base64Data: "SU1BR0U=", mediaType: "image/png", filename: "a.png" };
|
|
const local = { ...session("s1", 100, [msg("m1", 1)]), messages: [{ ...msg("m1", 1), images: [attachment] }] };
|
|
const incoming = { ...session("s1", 200, [msg("m1", 1)]), messages: [{ ...msg("m1", 1), attachments: [{ ...attachment, base64Data: "", contentUnavailable: true }] }] };
|
|
const [merged] = mergeAiSessionLists<Session>([local], [incoming]);
|
|
assert.equal(merged.messages[0].attachments?.[0].base64Data, "SU1BR0U=");
|
|
});
|
|
|
|
|
|
test("cloud copies start a fresh external SDK thread and replay the saved history", () => {
|
|
for (const [backend, runtime] of [["claude", "sdk"], ["codex", "sdk"], ["codex", "app-server"], ["cursor", "sdk"]]) {
|
|
const original: Session = {
|
|
...session("s1", 100, [msg("m1", 1)]),
|
|
externalSessionId: encodeSdkSessionIdentity("source-thread", backend, "/source/bin/agent", runtime),
|
|
};
|
|
const [cloud] = stripAiSessionPayloadForSync([original]);
|
|
assert.equal(Object.hasOwn(cloud, "externalSessionId"), false, `${backend}/${runtime}`);
|
|
assert.equal(original.externalSessionId?.includes("source-thread"), true);
|
|
const restored = mergeAiSessionLists<Session>([], [cloud])[0];
|
|
assert.equal(restored.externalSessionId, undefined);
|
|
assert.ok(buildExternalAgentHistoryMessagesForBridge(restored.messages, restored.externalSessionId)?.length);
|
|
}
|
|
});
|
|
|
|
test("cloud copies clear source-only work state while preserving portable replay metadata", () => {
|
|
const source: Session = {
|
|
...session("s1", 100, [msg("m1", 1)]),
|
|
messages: [{
|
|
id: "a1", role: "assistant", timestamp: 2, content: "Saved tool-output-source-123",
|
|
statusText: "Waiting for approval", executionStatus: "running",
|
|
pendingApproval: { approvalId: "source-approval", toolCallId: "call1", toolName: "exec", toolArgs: {}, status: "pending" },
|
|
providerContinuation: {
|
|
source: { providerConfigId: "provider-1", providerType: "anthropic", modelId: "claude" },
|
|
reasoningParts: [{ text: "checked", providerOptions: { anthropic: { signature: "signed-thinking" } } }],
|
|
},
|
|
}],
|
|
contextCompaction: { summary: "Earlier context", compactedMessageCount: 1 },
|
|
};
|
|
const [cloud] = stripAiSessionPayloadForSync([source]);
|
|
assert.equal(cloud.messages[0].pendingApproval, undefined);
|
|
assert.equal(cloud.messages[0].statusText, undefined);
|
|
assert.equal(cloud.messages[0].executionStatus, "cancelled");
|
|
assert.doesNotMatch(cloud.messages[0].content, /tool-output-source-123/);
|
|
assert.deepEqual(cloud.messages[0].providerContinuation, source.messages[0].providerContinuation);
|
|
assert.deepEqual(cloud.contextCompaction, source.contextCompaction);
|
|
assert.equal(source.messages[0].executionStatus, "running");
|
|
assert.equal(source.messages[0].pendingApproval?.approvalId, "source-approval");
|
|
});
|
|
|
|
|
|
test("cloud application device cleanup preserves attachment bytes for existing local storage", () => {
|
|
const source: Session = {
|
|
...session("s1", 100, [msg("m1", 1)]), externalSessionId: "source-thread",
|
|
messages: [{ ...msg("m1", 1), attachments: [{ mediaType: "image/png", base64Data: "SU1BR0U=", filename: "a.png", filePath: "/local/a.png" }] }],
|
|
};
|
|
const clean = stripAiSessionDeviceState(source);
|
|
assert.equal(clean.externalSessionId, undefined);
|
|
assert.deepEqual(clean.messages[0].attachments, source.messages[0].attachments);
|
|
assert.equal(source.externalSessionId, "source-thread");
|
|
});
|