Repository navigation
Expand file tree
/
Copy pathmerge.ts
More file actions
224 lines (189 loc) · 7.37 KB
/
Copy pathmerge.ts
File metadata and controls
224 lines (189 loc) · 7.37 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
import type { ConversationReference, FolderData } from '@/core/types/folder';
import type { PromptItem } from '@/core/types/sync';
import type { ForkNode, ForkNodesData } from '@/pages/content/fork/forkTypes';
import type { StarredMessage, StarredMessagesData } from '@/pages/content/timeline/starredTypes';
/**
* Merges two lists of items based on ID and updatedAt timestamp.
* Prefers the item with the later updatedAt timestamp.
*/
function mergeItems<T extends { id: string; updatedAt?: number; createdAt?: number }>(
localItems: T[],
cloudItems: T[],
): T[] {
const itemMap = new Map<string, T>();
// Add all local items first
localItems.forEach((item) => {
itemMap.set(item.id, item);
});
// Merge cloud items
cloudItems.forEach((cloudItem) => {
const localItem = itemMap.get(cloudItem.id);
if (!localItem) {
// New item from cloud
itemMap.set(cloudItem.id, cloudItem);
} else {
// Conflict: compare timestamps
// Use createdAt as fallback for updatedAt
const cloudTime = cloudItem.updatedAt || cloudItem.createdAt || 0;
const localTime = localItem.updatedAt || localItem.createdAt || 0;
if (cloudTime > localTime) {
itemMap.set(cloudItem.id, cloudItem);
}
// If local is newer or equal, keep local
}
});
return Array.from(itemMap.values());
}
/**
* Merges local and cloud folder data.
*/
export function mergeFolderData(local: FolderData, cloud: FolderData): FolderData {
// 1. Merge Folders list
const mergedFolders = mergeItems(local.folders, cloud.folders);
// 2. Merge Folder Contents
const mergedContents: Record<string, ConversationReference[]> = { ...local.folderContents };
// Iterate over cloud folders to ensure we capture all content
// (Even for folders we might have just added)
const allFolderIds = new Set([
...Object.keys(local.folderContents),
...Object.keys(cloud.folderContents),
]);
allFolderIds.forEach((folderId) => {
const localConvos = local.folderContents[folderId] || [];
const cloudConvos = cloud.folderContents[folderId] || [];
// Merge conversation references: Cloud-first strategy
// This ensures renamed titles from cloud sync are applied to local
// - If user renamed title locally and uploaded, cloud has the new title
// - If user downloads on another device, cloud title should override local
// - If conversation only exists locally, keep it (new local addition)
const convoMap = new Map<string, ConversationReference>();
// Add local conversations first
localConvos.forEach((c) => convoMap.set(c.conversationId, c));
// Cloud conversations override local (this is the key change)
cloudConvos.forEach((c) => {
const existing = convoMap.get(c.conversationId);
if (!existing) {
// New from cloud
convoMap.set(c.conversationId, c);
} else {
// Merge: cloud properties override, but keep local-only properties
convoMap.set(c.conversationId, {
...existing, // Keep any local-only properties
...c, // Cloud overrides (title, customTitle, etc.)
// Preserve starred if set locally but not in cloud
starred: c.starred ?? existing.starred,
});
}
});
mergedContents[folderId] = Array.from(convoMap.values());
});
return {
folders: mergedFolders,
folderContents: mergedContents,
};
}
/**
* Merges local and cloud prompts.
*/
export function mergePrompts(local: PromptItem[], cloud: PromptItem[]): PromptItem[] {
return mergeItems(local, cloud);
}
/**
* Merges local and cloud starred messages.
* Uses turnId as the unique key within each conversation.
* Prefers the message with the newer starredAt timestamp when duplicates exist.
*/
export function mergeStarredMessages(
local: StarredMessagesData,
cloud: StarredMessagesData,
): StarredMessagesData {
// Ensure we have valid input structures
const localMessages = local?.messages || {};
const cloudMessages = cloud?.messages || {};
// Get all conversation IDs from both sources
const allConversationIds = new Set([
...Object.keys(localMessages),
...Object.keys(cloudMessages),
]);
const mergedMessages: Record<string, StarredMessage[]> = {};
allConversationIds.forEach((conversationId) => {
const localConvoMessages = localMessages[conversationId] || [];
const cloudConvoMessages = cloudMessages[conversationId] || [];
// Use Map with turnId as key for deduplication
const messageMap = new Map<string, StarredMessage>();
// Add cloud messages first (so local can overwrite if newer)
cloudConvoMessages.forEach((msg) => {
messageMap.set(msg.turnId, msg);
});
// Merge local messages - prefer newer starredAt
localConvoMessages.forEach((localMsg) => {
const existingMsg = messageMap.get(localMsg.turnId);
if (!existingMsg) {
// New message from local
messageMap.set(localMsg.turnId, localMsg);
} else {
// Conflict: compare starredAt timestamps
if (localMsg.starredAt >= existingMsg.starredAt) {
messageMap.set(localMsg.turnId, localMsg);
}
// If cloud is newer, keep cloud (already in map)
}
});
// Only add non-empty arrays
const mergedArray = Array.from(messageMap.values());
if (mergedArray.length > 0) {
mergedMessages[conversationId] = mergedArray;
}
});
return { messages: mergedMessages };
}
/**
* Merges local and cloud fork nodes.
* Uses forkGroupId + turnId as the unique key within each conversation.
* Prefers the node with the newer createdAt timestamp when duplicates exist.
*/
export function mergeForkNodes(local: ForkNodesData, cloud: ForkNodesData): ForkNodesData {
const localNodes = local?.nodes || {};
const cloudNodes = cloud?.nodes || {};
const allConversationIds = new Set([...Object.keys(localNodes), ...Object.keys(cloudNodes)]);
const mergedNodes: Record<string, ForkNode[]> = {};
allConversationIds.forEach((conversationId) => {
const localConvoNodes = localNodes[conversationId] || [];
const cloudConvoNodes = cloudNodes[conversationId] || [];
// Use "forkGroupId:turnId" as unique key
const nodeMap = new Map<string, ForkNode>();
// Add cloud nodes first
cloudConvoNodes.forEach((node) => {
const key = `${node.forkGroupId}:${node.turnId}`;
nodeMap.set(key, node);
});
// Merge local nodes - prefer newer createdAt
localConvoNodes.forEach((localNode) => {
const key = `${localNode.forkGroupId}:${localNode.turnId}`;
const existing = nodeMap.get(key);
if (!existing) {
nodeMap.set(key, localNode);
} else if (localNode.createdAt >= existing.createdAt) {
nodeMap.set(key, localNode);
}
});
const mergedArray = Array.from(nodeMap.values());
if (mergedArray.length > 0) {
mergedNodes[conversationId] = mergedArray;
}
});
// Rebuild groups index from merged nodes
const mergedGroups: Record<string, string[]> = {};
for (const [conversationId, nodes] of Object.entries(mergedNodes)) {
for (const node of nodes) {
if (!mergedGroups[node.forkGroupId]) {
mergedGroups[node.forkGroupId] = [];
}
const groupKey = `${conversationId}:${node.turnId}`;
if (!mergedGroups[node.forkGroupId].includes(groupKey)) {
mergedGroups[node.forkGroupId].push(groupKey);
}
}
}
return { nodes: mergedNodes, groups: mergedGroups };
}