Voice-to-text dictation app with local (Nvidia Parakeet/Whisper) and cloud models (BYOK). Privacy-first and available cross-platform.
JavaScript aianthropiccross-platformgeminigroqlinuxmacosnvidiaopen-sourceopenaiparakeetspeech-to-texttranscribewhisperwindows
fix: Sync now handles revoked-team deletes, advances cursors past durable conflicts and IPC broadcasts folder moves and space updates
Chadpiha5fb01421ee31
diff --git a/main.js b/main.jsindex e795ba2e9..ff07b9065 100644--- a/main.js+++ b/main.js@@ -937,7 +937,7 @@ async function startApp() {if (initialProtocolUrl && process.platform !== "darwin") {if (initialProtocolUrl.includes("upgrade-success")) {handleUpgradeDeepLink();- } else if (initialProtocolUrl.includes("/invitations/")) {+ } else if (isInvitationDeepLink(initialProtocolUrl)) {handleInvitationDeepLink(initialProtocolUrl);} else {void handleOAuthDeepLink(initialProtocolUrl);diff --git a/src/helpers/database.js b/src/helpers/database.jsindex 9166551f8..c360a4280 100644--- a/src/helpers/database.js+++ b/src/helpers/database.js@@ -1857,14 +1857,36 @@ class DatabaseManager {}getNoteIdsInFolder(folderId) {+ return this.getNoteIdsInScope(null, folderId);+ }++ // Authoritative scope membership for semantic-search candidates. Qdrant+ // payload writes are asynchronous/best-effort, so its filters are only an+ // optimization and must not decide which space or folder a hit belongs to.+ getNoteIdsInScope(spaceId = null, folderId = null, candidateIds = null) {try {if (!this.db) throw new Error("Database not initialized");+ if (candidateIds && candidateIds.length === 0) return [];+ const conditions = ["deleted_at IS NULL"];+ const params = [];+ if (candidateIds) {+ conditions.push(`id IN (${candidateIds.map(() => "?").join(", ")})`);+ params.push(...candidateIds);+ }+ if (spaceId != null) {+ conditions.push("space_id = ?");+ params.push(spaceId);+ }+ if (folderId != null) {+ conditions.push("folder_id = ?");+ params.push(folderId);+ }return this.db- .prepare("SELECT id FROM notes WHERE folder_id = ? AND deleted_at IS NULL")- .all(folderId)+ .prepare(`SELECT id FROM notes WHERE ${conditions.join(" AND ")}`)+ .all(...params).map((row) => row.id);} catch (error) {- debugLogger.error("Error getting note ids in folder", { error: error.message }, "notes");+ debugLogger.error("Error getting scoped note ids", { error: error.message }, "notes");throw error;}}@@ -2156,29 +2178,15 @@ class DatabaseManager {}}- createSpace({ name, emoji = null, kind = "team" } = {}) {+ getSpace(id) {try {if (!this.db) throw new Error("Database not initialized");- if (kind !== "team") {- // The single private space is seeded by the migration; a second one- // would split default-folder resolution and purge relocation targets.- return { success: false, error: "Only team spaces can be created" };- }- const trimmed = (name || "").trim();- if (!trimmed) return { success: false, error: "Space name is required" };- const maxOrder = this.db.prepare("SELECT MAX(sort_order) as max_order FROM spaces").get();- const sortOrder = (maxOrder?.max_order ?? 0) + 1;- const result = this.db- .prepare(- "INSERT INTO spaces (client_space_id, kind, name, emoji, sort_order) VALUES (?, ?, ?, ?, ?)"- )- .run(randomUUID(), kind, trimmed, emoji, sortOrder);- const space = this._spaceRow(- this.db.prepare("SELECT * FROM spaces WHERE id = ?").get(result.lastInsertRowid)- );- return { success: true, space };+ const row = this.db+ .prepare("SELECT * FROM spaces WHERE id = ? AND deleted_at IS NULL")+ .get(id);+ return row ? this._spaceRow(row) : null;} catch (error) {- debugLogger.error("Error creating space", { error: error.message }, "spaces");+ debugLogger.error("Error getting space", { error: error.message }, "spaces");throw error;}}@@ -2219,9 +2227,10 @@ class DatabaseManager {try {if (!this.db) throw new Error("Database not initialized");const result = this.db- .prepare("UPDATE spaces SET sync_status = ? WHERE id = ?")+ .prepare("UPDATE spaces SET sync_status = ? WHERE id = ? AND deleted_at IS NULL").run(status, id);- return { success: result.changes > 0 };+ const success = result.changes > 0;+ return { success, space: success ? this.getSpace(id) : null };} catch (error) {debugLogger.error("Error setting space sync status", { error: error.message }, "spaces");throw error;diff --git a/src/helpers/ipcHandlers.js b/src/helpers/ipcHandlers.jsindex b8eb36bed..bffa50909 100644--- a/src/helpers/ipcHandlers.js+++ b/src/helpers/ipcHandlers.js@@ -601,14 +601,22 @@ class IPCHandlers {// Space vector purges are persisted (pending_vector_purges) so a purge that// lands while Qdrant is booting or down is retried once the index is ready.drainPendingVectorPurges() {- setImmediate(async () => {- const vectorIndex = require("./vectorIndex");- if (!vectorIndex.isReady()) return;- for (const { space_id } of this.databaseManager.getPendingVectorPurges()) {- if (await vectorIndex.deleteBySpace(space_id)) {- this.databaseManager.clearPendingVectorPurge(space_id);+ setImmediate(() => {+ void (async () => {+ const vectorIndex = require("./vectorIndex");+ if (!vectorIndex.isReady()) return;+ for (const { space_id } of this.databaseManager.getPendingVectorPurges()) {+ if (await vectorIndex.deleteBySpace(space_id)) {+ this.databaseManager.clearPendingVectorPurge(space_id);+ }}- }+ })().catch((error) => {+ debugLogger.error(+ "Pending vector purge drain failed",+ { error: error?.message || String(error) },+ "semantic-search"+ );+ });});}@@ -1371,60 +1379,72 @@ class IPCHandlers {return this.databaseManager.searchNotes(query, limit, spaceId, folderId);});- ipcMain.handle("db-semantic-search-notes", async (event, query, limit = 5, spaceId, folderId) => {- const vectorIndex = require("./vectorIndex");- if (!vectorIndex.isReady()) {- return this.databaseManager.searchNotes(query, limit, spaceId, folderId);- }-- try {- // Folder scoping post-filters the vector leg by note-id set (existing- // Qdrant payloads only carry space_id), so over-fetch harder to- // compensate for discarded out-of-folder hits.- const scopedIds =- folderId != null ? new Set(this.databaseManager.getNoteIdsInFolder(folderId)) : null;- const overFetch = folderId != null ? limit * 4 : limit * 2;- const vectorFilter =- spaceId != null ? { must: [{ key: "space_id", match: { value: spaceId } }] } : undefined;- const [ftsResults, vectorResults] = await Promise.all([- this.databaseManager.searchNotes(query, overFetch, spaceId, folderId),- vectorIndex.search(query, overFetch, vectorFilter),- ]);+ ipcMain.handle(+ "db-semantic-search-notes",+ async (event, query, limit = 5, spaceId, folderId) => {+ const vectorIndex = require("./vectorIndex");+ if (!vectorIndex.isReady()) {+ return this.databaseManager.searchNotes(query, limit, spaceId, folderId);+ }- // Filter low-confidence semantic matches before RRF- const filteredVectorResults = vectorResults.filter(- ({ noteId, score }) => score > 0.3 && (!scopedIds || scopedIds.has(noteId))- );+ try {+ // Qdrant payload updates are best-effort. Use its space filter to+ // reduce the candidate set, then validate every scoped vector hit+ // against SQLite before it can enter the fused ranking.+ const overFetch = folderId != null ? limit * 4 : limit * 2;+ const vectorFilter =+ spaceId != null+ ? { must: [{ key: "space_id", match: { value: spaceId } }] }+ : undefined;+ const [ftsResults, vectorResults] = await Promise.all([+ this.databaseManager.searchNotes(query, overFetch, spaceId, folderId),+ vectorIndex.search(query, overFetch, vectorFilter),+ ]);+ const scopedIds = new Set(+ this.databaseManager.getNoteIdsInScope(+ spaceId,+ folderId,+ vectorResults.map(({ noteId }) => noteId)+ )+ );- // Reciprocal Rank Fusion (K=60, matching cloud implementation)- const scores = new Map();- ftsResults.forEach((note, i) => {- scores.set(note.id, (scores.get(note.id) || 0) + 1 / (60 + i));- });- filteredVectorResults.forEach(({ noteId }, i) => {- scores.set(noteId, (scores.get(noteId) || 0) + 1 / (60 + i));- });+ // Filter low-confidence semantic matches before RRF+ const filteredVectorResults = vectorResults.filter(+ ({ noteId, score }) => score > 0.3 && scopedIds.has(noteId)+ );- const rankedIds = [...scores.entries()]- .sort((a, b) => b[1] - a[1])- .slice(0, limit)- .map(([id]) => id);+ // Reciprocal Rank Fusion (K=60, matching cloud implementation)+ const scores = new Map();+ ftsResults.forEach((note, i) => {+ scores.set(note.id, (scores.get(note.id) || 0) + 1 / (60 + i));+ });+ filteredVectorResults.forEach(({ noteId }, i) => {+ scores.set(noteId, (scores.get(noteId) || 0) + 1 / (60 + i));+ });- const noteMap = new Map();- ftsResults.forEach((n) => noteMap.set(n.id, n));- for (const id of rankedIds) {- if (!noteMap.has(id)) {- const note = this.databaseManager.getNote(id);- if (note) noteMap.set(id, note);+ const rankedIds = [...scores.entries()]+ .sort((a, b) => b[1] - a[1])+ .slice(0, limit)+ .map(([id]) => id);++ const noteMap = new Map();+ ftsResults.forEach((n) => noteMap.set(n.id, n));+ for (const id of rankedIds) {+ if (!noteMap.has(id)) {+ const note = this.databaseManager.getNote(id);+ if (note) noteMap.set(id, note);+ }}- }- return rankedIds.map((id) => noteMap.get(id)).filter(Boolean);- } catch (error) {- debugLogger.error("Semantic search failed, falling back to FTS5", { error: error.message });- return this.databaseManager.searchNotes(query, limit, spaceId, folderId);+ return rankedIds.map((id) => noteMap.get(id)).filter(Boolean);+ } catch (error) {+ debugLogger.error("Semantic search failed, falling back to FTS5", {+ error: error.message,+ });+ return this.databaseManager.searchNotes(query, limit, spaceId, folderId);+ }}- });+ );ipcMain.handle("db-semantic-reindex-all", async () => {const vectorIndex = require("./vectorIndex");@@ -1507,6 +1527,9 @@ class IPCHandlers {for (const note of result.notes ?? []) {this._asyncVectorUpsert(note);}+ if (result.folder) {+ setImmediate(() => this.broadcastToWindows("folder-synced", result.folder));+ }}return result;});@@ -1520,7 +1543,11 @@ class IPCHandlers {});ipcMain.handle("db-update-space", async (event, id, updates) => {- return this.databaseManager.updateSpace(id, updates);+ const result = this.databaseManager.updateSpace(id, updates);+ if (result?.success && result.space) {+ setImmediate(() => this.broadcastToWindows("space-synced", result.space));+ }+ return result;});ipcMain.handle("db-purge-space", async (event, id) => {@@ -1721,7 +1748,12 @@ class IPCHandlers {ipcMain.handle("db-mark-note-synced-if-unchanged",(_, id, cloudId, snapshotUpdatedAt, cloudUpdatedAt) =>- this.databaseManager.markNoteSyncedIfUnchanged(id, cloudId, snapshotUpdatedAt, cloudUpdatedAt)+ this.databaseManager.markNoteSyncedIfUnchanged(+ id,+ cloudId,+ snapshotUpdatedAt,+ cloudUpdatedAt+ ));ipcMain.handle("db-set-note-cloud-base", (_, id, cloudUpdatedAt) =>this.databaseManager.setNoteCloudBase(id, cloudUpdatedAt)@@ -1823,12 +1855,9 @@ class IPCHandlers {});ipcMain.handle("db-set-space-sync-status", (_, id, status) => {const result = this.databaseManager.setSpaceSyncStatus(id, status);- if (result?.success) {+ if (result?.success && result.space) {// Live skeleton toggling: the tree keys pending/synced off this flag.- const space = this.databaseManager._spaceRow(- this.databaseManager.db.prepare("SELECT * FROM spaces WHERE id = ?").get(id)- );- if (space) setImmediate(() => this.broadcastToWindows("space-synced", space));+ setImmediate(() => this.broadcastToWindows("space-synced", result.space));}return result;});diff --git a/src/services/SyncService.ts b/src/services/SyncService.tsindex a286d7404..42aac06c7 100644--- a/src/services/SyncService.ts+++ b/src/services/SyncService.ts@@ -449,7 +449,11 @@ class SyncService {}debouncedPush(entityType: string, entityId: number): void {- if (!this.canSync() && !(entityType === "note" && this.canSyncSharedNotes())) return;+ const canPushWithoutBackup =+ entityType === "note"+ ? this.canSyncSharedNotes()+ : entityType === "folder" && this.canSyncTeamSpaces();+ if (!this.canSync() && !canPushWithoutBackup) return;const key = `${entityType}:${entityId}`;const existing = this.pushTimers.get(key);if (existing) clearTimeout(existing);@@ -464,18 +468,34 @@ class SyncService {private async pushEntity(entityType: string, entityId: number): Promise<void> {if (!this.canSync()) {- // Only shared notes and team-space notes push without the backup toggle.- if (entityType !== "note" || !this.canSyncSharedNotes()) return;- const note = await window.electronAPI.getNote?.(entityId);- if (!note) return;- if (!note.is_shared) {+ // Shared notes and team-space notes/folders push without the backup+ // toggle. Personal folders still require backup consent.+ if (entityType === "folder") {+ if (!this.canSyncTeamSpaces()) return;+ const folders = (await window.electronAPI.getFolders?.()) ?? [];+ const folder = folders.find((candidate) => candidate.id === entityId);+ if (!folder) return;const ctx = await this.buildSpaceContext();- // A note that just left a team still owes its scope retraction (D6):+ // A folder that just left a team still owes its scope retraction (D6):// the server row stays visible to teammates until the PATCH lands.- const leftTeam = !!note.left_team && !!note.cloud_id;- if (ctx.byId.get(note.space_id)?.kind !== "team" && !leftTeam) return;+ const leftTeam = !!folder.left_team && !!folder.cloud_id;+ if (ctx.byId.get(folder.space_id)?.kind !== "team" && !leftTeam) return;+ return this.pushFolder(entityId);+ }+ if (entityType === "note") {+ if (!this.canSyncSharedNotes()) return;+ const note = await window.electronAPI.getNote?.(entityId);+ if (!note) return;+ if (!note.is_shared) {+ const ctx = await this.buildSpaceContext();+ // A note that just left a team still owes its scope retraction (D6):+ // the server row stays visible to teammates until the PATCH lands.+ const leftTeam = !!note.left_team && !!note.cloud_id;+ if (ctx.byId.get(note.space_id)?.kind !== "team" && !leftTeam) return;+ }+ return this.pushNote(entityId);}- return this.pushNote(entityId);+ return;}switch (entityType) {case "folder":@@ -554,7 +574,11 @@ class SyncService {// content-less PATCH would still bump the cloud row's updated_at and hand// the next pull a stale copy to elect). Scope fields ride along so local// moves between spaces propagate; the server no-ops them when unchanged.- private notePushPayload(note: NoteItem, cloudFolderId: string | null, scope: PushScopeFields) {+ private notePushPayload(+ note: NoteItem,+ cloudFolderId: string | null,+ scope: PushScopeFields+ ): ReturnType<typeof buildNoteUpdatePayload> & PushScopeFields {return { ...buildNoteUpdatePayload(note, cloudFolderId), ...scope };}@@ -820,10 +844,9 @@ class SyncService {private async handleRevokedNotePush(note: NoteItem, ctx: SpaceSyncContext): Promise<void> {const spaceName = ctx.byId.get(note.space_id)?.name ?? null;if (!ctx.privateSpace) {- if (note.cloud_id) {- await window.electronAPI.hardDeleteNote?.(note.id);- this.dispatchSpaceRevoked(spaceName, note.space_id);- }+ // The private space is a schema invariant. If a damaged database breaks+ // it, preserve the pending row rather than destroying unpushed edits.+ console.error(`Cannot relocate revoked note ${note.id}: private space is missing`);return;}await this.forkNoteToPrivate(note, ctx.privateSpace, "push", spaceName);@@ -943,9 +966,10 @@ class SyncService {await FoldersService.delete(f.cloud_id);await window.electronAPI.hardDeleteFolder?.(f.id);} catch (err) {- // 404 means the row is already gone server-side — clear the tombstone- // instead of retrying forever (matches the dictionary precedent).- if (isHttpStatus(err, 404)) {+ // An already-gone row or a team row we can no longer access can never+ // be deleted by this client. Clear the local tombstone instead of+ // retrying forever.+ if (isHttpStatus(err, 404) || isTeamAccessError(err)) {await window.electronAPI.hardDeleteFolder?.(f.id);} else {console.error("Folder delete sync failed:", err);@@ -1044,7 +1068,7 @@ class SyncService {const ctx = await this.buildSpaceContext();// Parked or failed rows must retry: they hold the cursor back (and fail// a backfill) so one bad row never drops the rest of the delta.- let dirtyRows = 0;+ let parkedRows = 0;for (const cloudFolder of cloudFolders) {try {@@ -1075,7 +1099,7 @@ class SyncService {}}} else {- dirtyRows++;+ parkedRows++;console.warn(`Could not relocate revoked folder ${local.id}:`, result?.error);}} else {@@ -1117,7 +1141,7 @@ class SyncService {const space = await this.resolveSpaceForCloudRow(cloudFolder.space_id, ctx);if (!space) {- dirtyRows++;+ parkedRows++;console.warn(`Parking folder ${cloudFolder.id}: unknown space ${cloudFolder.space_id}`);continue;}@@ -1169,21 +1193,21 @@ class SyncService {);}} catch (err) {- dirtyRows++;+ parkedRows++;console.error(`Folder pull failed for cloud folder ${cloudFolder.id}:`, err);}}const { advanceCursor, advanceTeamCursor } = resolvePullCursorAdvance({snapshot,- dirty: dirtyRows > 0,+ parked: parkedRows > 0,teamOnly,teamCapable,hasTeamSpaces: [...ctx.byId.values()].some((s) => s.kind === "team"),});if (advanceCursor) localStorage.setItem(cursorKey, syncStartedAt);if (advanceTeamCursor) localStorage.setItem("lastSyncedAt.folders.team", syncStartedAt);- return dirtyRows === 0;+ return parkedRows === 0;} catch (err) {console.error("Folder pull failed:", err);return false;@@ -1206,7 +1230,7 @@ class SyncService {if (!teamOnly && this.teamCursorLagging("notes")) {await this.pullNotes(true);}- // A dirty pull left its cursors in place, so the next pass re-sees the+ // A parked pull left its cursors in place, so the next pass re-sees the// parked rows — typically after syncSpaces has mirrored the missing team.await this.pullNotes(teamOnly);}@@ -1321,9 +1345,10 @@ class SyncService {await NotesService.delete(note.cloud_id!);await window.electronAPI.hardDeleteNote?.(note.id);} catch (err) {- // 404 means the row is already gone server-side — clear the tombstone- // instead of retrying forever (matches the dictionary precedent).- if (isHttpStatus(err, 404)) {+ // An already-gone row or a team row we can no longer access can never+ // be deleted by this client. Clear the local tombstone instead of+ // retrying forever.+ if (isHttpStatus(err, 404) || isTeamAccessError(err)) {await window.electronAPI.hardDeleteNote?.(note.id);} else {console.error("Note delete sync failed:", err);@@ -1346,7 +1371,10 @@ class SyncService {let cursor: string | undefined = since;let cursorId: string | undefined;- let dirtyRows = 0;+ // Only rows that still need to be applied hold the delta cursor back.+ // Conflicts are durable in the local registry and resolve directly from+ // their stored cloud copy, so they must not re-pull the whole delta.+ let parkedRows = 0;while (true) {const { notes: cloudNotes } = since? await NotesService.list(BATCH_SIZE, undefined, cursor, scope, cursorId)@@ -1387,14 +1415,11 @@ class SyncService {} else if (isCloudEntryNewer(cloudNote.updated_at, local.updated_at)) {// 'error' rows carry unpushed work just like 'pending' ones.if (local.sync_status !== "synced") {- // Snapshot pulls never advance cursors; don't let an existing- // conflict block an unrelated new-space backfill.- if (!snapshot) dirtyRows++;await this.surfaceNoteConflict(local.client_note_id, cloudNote);} else if (cloudNote.folder_id && !cloudToLocal.has(cloudNote.folder_id)) {// Filing to the fallback would stick (the advanced cursor// never re-pulls this row) — park until the folder arrives.- dirtyRows++;+ parkedRows++;console.warn(`Parking note ${cloudNote.id}: unknown folder ${cloudNote.folder_id}`);@@ -1422,7 +1447,7 @@ class SyncService {const space = await this.resolveSpaceForCloudRow(cloudNote.space_id, ctx);if (!space) {- dirtyRows++;+ parkedRows++;console.warn(`Parking note ${cloudNote.id}: unknown space ${cloudNote.space_id}`);continue;}@@ -1432,9 +1457,6 @@ class SyncService {// A newer cloud copy over unpushed local edits ('pending' or// 'error'): surface the conflict to the editor banner instead// of silently dropping the local edit (plan §7.3).- // Snapshots already keep their cursors and may be backfilling a- // different space, so only regular pulls need the dirty marker.- if (!snapshot) dirtyRows++;await this.surfaceNoteConflict(local.client_note_id, cloudNote);continue;}@@ -1443,7 +1465,7 @@ class SyncService {// ago, or its pull failed). Filing it to the fallback would// stick — the advanced cursor never re-pulls the row — so park// it like an unknown space until the folder arrives.- dirtyRows++;+ parkedRows++;console.warn(`Parking note ${cloudNote.id}: unknown folder ${cloudNote.folder_id}`);continue;}@@ -1472,14 +1494,14 @@ class SyncService {const { advanceCursor, advanceTeamCursor } = resolvePullCursorAdvance({snapshot,- dirty: dirtyRows > 0,+ parked: parkedRows > 0,teamOnly,teamCapable,hasTeamSpaces: [...ctx.byId.values()].some((s) => s.kind === "team"),});if (advanceCursor) localStorage.setItem(cursorKey, syncStartedAt);if (advanceTeamCursor) localStorage.setItem("lastSyncedAt.notes.team", syncStartedAt);- return dirtyRows === 0;+ return parkedRows === 0;} catch (err) {console.error("Note pull failed:", err);return false;diff --git a/src/services/syncPassPolicy.ts b/src/services/syncPassPolicy.tsindex 5c12b6292..6abcf0fb7 100644--- a/src/services/syncPassPolicy.ts+++ b/src/services/syncPassPolicy.ts@@ -9,8 +9,10 @@ export interface PullCursorAdvance {advanceTeamCursor: boolean;}-// A backfill snapshot never sees tombstones or stubs, and a dirty pass must-// re-see its parked/failed rows, so neither advances any cursor. A+// A backfill snapshot never sees tombstones or stubs, and a pass with+// parked/failed rows must re-see them, so neither advances any cursor. An+// unresolved note conflict is not parked: its cloud copy lives in the durable+// conflict registry and must not hold back unrelated deltas. A// team-capable pass (or one with no team spaces at all) fully covered its// scope: advance its own cursor, and after a full pull keep the team cursor// current too so a later backup-off pass doesn't re-pull from the distant@@ -19,12 +21,12 @@ export interface PullCursorAdvance {// recovery pull catch up on teammate edits made during the outage.export function resolvePullCursorAdvance(pass: {snapshot: boolean;- dirty: boolean;+ parked: boolean;teamOnly: boolean;teamCapable: boolean;hasTeamSpaces: boolean;}): PullCursorAdvance {- if (pass.snapshot || pass.dirty) {+ if (pass.snapshot || pass.parked) {return { advanceCursor: false, advanceTeamCursor: false };}if (pass.teamCapable || !pass.hasTeamSpaces) {diff --git a/src/types/electron.ts b/src/types/electron.tsindex a9d99fe46..6ef2cb2fb 100644--- a/src/types/electron.ts+++ b/src/types/electron.ts@@ -859,7 +859,7 @@ declare global {setSpaceSyncStatus?: (id: number,status: SpaceItem["sync_status"]- ) => Promise<{ success: boolean }>;+ ) => Promise<{ success: boolean; space?: SpaceItem | null }>;onSpacePurged?: (callback: (payload: { spaceId: number }) => void) => () => void;onSpaceSynced?: (callback: (space: SpaceItem) => void) => () => void;@@ -2238,7 +2238,11 @@ declare global {localFolderId: number | null,localSpaceId?: number | null) => Promise<NoteItem>;- markNoteSynced?: (id: number, cloudId: string, cloudUpdatedAt?: string | null) => Promise<void>;+ markNoteSynced?: (+ id: number,+ cloudId: string,+ cloudUpdatedAt?: string | null+ ) => Promise<void>;markNoteSyncedIfUnchanged?: (id: number,cloudId: string,diff --git a/test/helpers/containerConversationsDatabase.test.js b/test/helpers/containerConversationsDatabase.test.jsindex b6c1bf260..c31a92aa4 100644--- a/test/helpers/containerConversationsDatabase.test.js+++ b/test/helpers/containerConversationsDatabase.test.js@@ -59,6 +59,23 @@ function createDb(t) {}}+let nextTestTeamSpaceId = 0;++function createTestTeamSpace(db, { name, emoji = null } = {}) {+ const maxOrder = db.db.prepare("SELECT MAX(sort_order) AS max_order FROM spaces").get();+ const result = db.db+ .prepare(+ "INSERT INTO spaces (client_space_id, kind, name, emoji, sort_order) VALUES (?, 'team', ?, ?, ?)"+ )+ .run(+ `test-container-space-${++nextTestTeamSpaceId}`,+ name,+ emoji,+ (maxOrder?.max_order ?? 0) + 1+ );+ return { success: true, space: db.getSpace(result.lastInsertRowid) };+}+test("container scope migration is idempotent across launches", (t) => {const db = createDb(t);if (!db) return;@@ -85,7 +102,7 @@ test("container scope migration is idempotent across launches", (t) => {test("createAgentConversation stores container scope", (t) => {const db = createDb(t);if (!db) return;- const space = db.createSpace({ name: "Eng" }).space;+ const space = createTestTeamSpace(db, { name: "Eng" }).space;const folder = db.createFolder("Docs", space.id).folder;const folderConv = db.createAgentConversation("Docs", null, space.id, folder.id);@@ -105,7 +122,7 @@ test("createAgentConversation stores container scope", (t) => {test("getPendingConversations excludes scopes the cloud contract cannot preserve", (t) => {const db = createDb(t);if (!db) return;- const space = db.createSpace({ name: "Eng" }).space;+ const space = createTestTeamSpace(db, { name: "Eng" }).space;const folder = db.createFolder("Docs", space.id).folder;const global = db.createAgentConversation("Global");@@ -123,7 +140,7 @@ test("getPendingConversations excludes scopes the cloud contract cannot preservetest("getConversationsForContainer separates folder and space-root scopes", (t) => {const db = createDb(t);if (!db) return;- const space = db.createSpace({ name: "Eng" }).space;+ const space = createTestTeamSpace(db, { name: "Eng" }).space;const folder = db.createFolder("Docs", space.id).folder;const folderConv = db.createAgentConversation("Folder chat", null, space.id, folder.id);@@ -145,7 +162,7 @@ test("getConversationsForContainer separates folder and space-root scopes", (t)test("getConversationsForContainer excludes deleted conversations", (t) => {const db = createDb(t);if (!db) return;- const space = db.createSpace({ name: "Eng" }).space;+ const space = createTestTeamSpace(db, { name: "Eng" }).space;const conv = db.createAgentConversation("Doomed", null, space.id);db.db@@ -158,7 +175,7 @@ test("getConversationsForContainer excludes deleted conversations", (t) => {test("global conversation lists and search exclude space and folder chats", (t) => {const db = createDb(t);if (!db) return;- const space = db.createSpace({ name: "Eng" }).space;+ const space = createTestTeamSpace(db, { name: "Eng" }).space;const folder = db.createFolder("Docs", space.id).folder;const global = db.createAgentConversation("Roadmap global");@@ -195,7 +212,7 @@ test("global conversation lists and search exclude space and folder chats", (t)test("searchNotes filters by folder", (t) => {const db = createDb(t);if (!db) return;- const space = db.createSpace({ name: "Eng" }).space;+ const space = createTestTeamSpace(db, { name: "Eng" }).space;const folder = db.createFolder("Docs", space.id).folder;db.saveNote("Roadmap planning", "quarterly roadmap", "personal", null, null, folder.id, space.id);@@ -212,7 +229,7 @@ test("searchNotes filters by folder", (t) => {test("getNotesForSpace includes foldered notes, unlike the root-only getNotes", (t) => {const db = createDb(t);if (!db) return;- const space = db.createSpace({ name: "Eng" }).space;+ const space = createTestTeamSpace(db, { name: "Eng" }).space;const folder = db.createFolder("Docs", space.id).folder;const rootNote = db.saveNote("Root", "", "personal", null, null, null, space.id).note;@@ -233,7 +250,7 @@ test("getNotesForSpace includes foldered notes, unlike the root-only getNotes",test("getNoteIdsInFolder excludes deleted notes", (t) => {const db = createDb(t);if (!db) return;- const space = db.createSpace({ name: "Eng" }).space;+ const space = createTestTeamSpace(db, { name: "Eng" }).space;const folder = db.createFolder("Docs", space.id).folder;const kept = db.saveNote("Kept", "", "personal", null, null, folder.id, space.id).note;@@ -243,6 +260,30 @@ test("getNoteIdsInFolder excludes deleted notes", (t) => {assert.deepEqual(db.getNoteIdsInFolder(folder.id), [kept.id]);});+test("getNoteIdsInScope validates vector candidates against the current SQLite scope", (t) => {+ const db = createDb(t);+ if (!db) return;+ const eng = createTestTeamSpace(db, { name: "Eng" }).space;+ const design = createTestTeamSpace(db, { name: "Design" }).space;+ const engFolder = db.createFolder("Docs", eng.id).folder;++ const engRoot = db.saveNote("Eng root", "", "personal", null, null, null, eng.id).note;+ const engFiled = db.saveNote("Eng filed", "", "personal", null, null, engFolder.id, eng.id).note;+ const designRoot = db.saveNote("Design root", "", "personal", null, null, null, design.id).note;+ const deleted = db.saveNote("Deleted", "", "personal", null, null, null, eng.id).note;+ db.deleteNote(deleted.id);++ assert.deepEqual(new Set(db.getNoteIdsInScope(eng.id)), new Set([engRoot.id, engFiled.id]));+ assert.deepEqual(db.getNoteIdsInScope(eng.id, engFolder.id), [engFiled.id]);+ assert.deepEqual(db.getNoteIdsInScope(design.id, engFolder.id), []);+ assert.deepEqual(db.getNoteIdsInScope(design.id), [designRoot.id]);+ assert.deepEqual(+ db.getNoteIdsInScope(eng.id, null, [engRoot.id, designRoot.id, deleted.id]),+ [engRoot.id],+ "stale vector candidates are filtered by live local scope"+ );+});+test("upsertNoteFromCloud round-trips updated_by_user_id", (t) => {const db = createDb(t);if (!db) return;@@ -285,7 +326,7 @@ test("upsertNoteFromCloud round-trips updated_by_user_id", (t) => {test("purgeSpace retires the space's container conversations", (t) => {const db = createDb(t);if (!db) return;- const space = db.createSpace({ name: "Eng" }).space;+ const space = createTestTeamSpace(db, { name: "Eng" }).space;const folder = db.createFolder("Docs", space.id).folder;const syncedConv = db.createAgentConversation("Synced", null, space.id);@@ -320,7 +361,7 @@ test("purgeSpace retires the space's container conversations", (t) => {test("deleteFolder and hardDeleteFolder retire the folder's conversations", (t) => {const db = createDb(t);if (!db) return;- const space = db.createSpace({ name: "Eng" }).space;+ const space = createTestTeamSpace(db, { name: "Eng" }).space;const folder = db.createFolder("Docs", space.id).folder;const folderConv = db.createAgentConversation("Folder chat", null, space.id, folder.id);const spaceConv = db.createAgentConversation("Space chat", null, space.id);@@ -346,7 +387,7 @@ test("relocateRevokedFolder moves or retires the folder's conversations", (t) =>const db = createDb(t);if (!db) return;const privateId = db.getPrivateSpaceId();- const space = db.createSpace({ name: "Eng" }).space;+ const space = createTestTeamSpace(db, { name: "Eng" }).space;const kept = db.createFolder("Kept", space.id).folder;const keptConv = db.createAgentConversation("Kept chat", null, space.id, kept.id);diff --git a/test/helpers/spacesDatabase.test.js b/test/helpers/spacesDatabase.test.jsindex f316f278d..f12d39bee 100644--- a/test/helpers/spacesDatabase.test.js+++ b/test/helpers/spacesDatabase.test.js@@ -59,6 +59,18 @@ function createDb(t) {}}+let nextTestTeamSpaceId = 0;++function createTestTeamSpace(db, { name, emoji = null } = {}) {+ const maxOrder = db.db.prepare("SELECT MAX(sort_order) AS max_order FROM spaces").get();+ const result = db.db+ .prepare(+ "INSERT INTO spaces (client_space_id, kind, name, emoji, sort_order) VALUES (?, 'team', ?, ?, ?)"+ )+ .run(`test-team-space-${++nextTestTeamSpaceId}`, name, emoji, (maxOrder?.max_order ?? 0) + 1);+ return { success: true, space: db.getSpace(result.lastInsertRowid) };+}+test("spaces migration is idempotent across launches", (t) => {const db = createDb(t);if (!db) return;@@ -134,7 +146,7 @@ test("pre-migration rows are backfilled into the private space", (t) => {test("folder names are unique per space, not globally", (t) => {const db = createDb(t);if (!db) return;- const team = db.createSpace({ name: "Design" });+ const team = createTestTeamSpace(db, { name: "Design" });assert.ok(team.success);assert.equal(team.space.kind, "team");@@ -154,7 +166,7 @@ test("updateNote forces space_id to follow folder_id (D2)", (t) => {const db = createDb(t);if (!db) return;const privateId = db.getPrivateSpaceId();- const team = db.createSpace({ name: "Eng" }).space;+ const team = createTestTeamSpace(db, { name: "Eng" }).space;const teamFolder = db.createFolder("Docs", team.id).folder;const { note } = db.saveNote("Move me", "content");@@ -180,7 +192,7 @@ test("purgeSpace leaves zero residue for the space and spares the private space"const db = createDb(t);if (!db) return;const privateId = db.getPrivateSpaceId();- const team = db.createSpace({ name: "Secret" }).space;+ const team = createTestTeamSpace(db, { name: "Secret" }).space;const teamFolder = db.createFolder("Vault", team.id).folder;const teamNote = db.saveNote(@@ -269,7 +281,7 @@ test("saveNote resolves default folders within the target space", (t) => {const db = createDb(t);if (!db) return;const privateId = db.getPrivateSpaceId();- const team = db.createSpace({ name: "Ops" }).space;+ const team = createTestTeamSpace(db, { name: "Ops" }).space;db.db.prepare("INSERT INTO folders (name, is_default, sort_order, space_id, client_folder_id) VALUES ('Meetings', 1, 0, ?, 'team-meetings')"@@ -300,7 +312,7 @@ test("moveFolderToSpace moves the folder and its live notes in one transaction",const db = createDb(t);if (!db) return;const privateId = db.getPrivateSpaceId();- const team = db.createSpace({ name: "Growth" }).space;+ const team = createTestTeamSpace(db, { name: "Growth" }).space;const folder = db.createFolder("Campaigns").folder;const filed = db.saveNote("Plan", "body", "personal", null, null, folder.id).note;const loose = db.saveNote("Loose", "body").note;@@ -334,7 +346,7 @@ test("moveFolderToSpace moves the folder and its live notes in one transaction",test("getNotes with spaceId and no folderId lists only the space's root notes", (t) => {const db = createDb(t);if (!db) return;- const team = db.createSpace({ name: "Ops" }).space;+ const team = createTestTeamSpace(db, { name: "Ops" }).space;const folder = db.createFolder("Docs", team.id).folder;const rootNote = db.saveNote("Root", "body", "personal", null, null, null, team.id).note;db.saveNote("Filed", "body", "personal", null, null, folder.id);@@ -353,7 +365,7 @@ test("getNotes with spaceId and no folderId lists only the space's root notes",test("pending queues split by space kind", (t) => {const db = createDb(t);if (!db) return;- const team = db.createSpace({ name: "Sales" }).space;+ const team = createTestTeamSpace(db, { name: "Sales" }).space;const privateFolder = db.createFolder("Ideas").folder;const teamFolder = db.createFolder("Pipeline", team.id).folder;const privateNote = db.saveNote("Mine", "body").note;@@ -385,7 +397,7 @@ test("space-root notes keep folder_id NULL across relaunches", (t) => {const db = createDb(t);if (!db) return;const privateId = db.getPrivateSpaceId();- const team = db.createSpace({ name: "Team" }).space;+ const team = createTestTeamSpace(db, { name: "Team" }).space;const teamRoot = db.saveNote("Team root", "body", "personal", null, null, null, team.id).note;assert.equal(teamRoot.folder_id, null);const privateRoot = db.saveNote("Mine", "body").note;@@ -459,7 +471,7 @@ test("hard deletes clean speaker rows", (t) => {test("upsertFolderFromCloud converges on a same-space name collision", (t) => {const db = createDb(t);if (!db) return;- const team = db.createSpace({ name: "Shared" }).space;+ const team = createTestTeamSpace(db, { name: "Shared" }).space;const local = db.createFolder("Projects", team.id).folder;const cloud = {@@ -523,9 +535,12 @@ test("pending vector purges persist across relaunches until cleared", (t) => {test("setSpaceSyncStatus flips a space's sync_status", (t) => {const db = createDb(t);if (!db) return;- const team = db.createSpace({ name: "Docs" }).space;+ const team = createTestTeamSpace(db, { name: "Docs" }).space;- assert.ok(db.setSpaceSyncStatus(team.id, "synced").success);+ const settled = db.setSpaceSyncStatus(team.id, "synced");+ assert.ok(settled.success);+ assert.equal(settled.space.id, team.id);+ assert.equal(settled.space.sync_status, "synced");assert.equal(db.getSpaces().find((s) => s.id === team.id).sync_status, "synced");assert.ok(db.setSpaceSyncStatus(team.id, "pending").success);@@ -538,7 +553,7 @@ test("team→private moves set left_team so retractions stay in the team queue",const db = createDb(t);if (!db) return;const privateId = db.getPrivateSpaceId();- const team = db.createSpace({ name: "Sales" }).space;+ const team = createTestTeamSpace(db, { name: "Sales" }).space;const note = db.saveNote("Comp review", "body", "personal", null, null, null, team.id).note;db.markNoteSynced(note.id, "cloud-note-1");@@ -578,7 +593,7 @@ test("moveFolderToSpace team→private flags the folder and its cloud-backed notconst db = createDb(t);if (!db) return;const privateId = db.getPrivateSpaceId();- const team = db.createSpace({ name: "Growth" }).space;+ const team = createTestTeamSpace(db, { name: "Growth" }).space;const folder = db.createFolder("Campaigns", team.id).folder;db.markFolderSynced(folder.id, "cloud-folder-1");const cloudNote = db.saveNote("Plan", "body", "personal", null, null, folder.id).note;@@ -727,7 +742,7 @@ test("relocateRevokedFolder preserves dirty children and hard-deletes server-ownconst db = createDb(t);if (!db) return;const privateId = db.getPrivateSpaceId();- const team = db.createSpace({ name: "Ops" }).space;+ const team = createTestTeamSpace(db, { name: "Ops" }).space;const folder = db.createFolder("Q3 calls", team.id).folder;db.markFolderSynced(folder.id, "cloud-folder-1");@@ -774,7 +789,7 @@ test("relocateRevokedFolder preserves dirty children and hard-deletes server-own// Dirty folder: preserved in Personal with a forked identity, children keep// their folder link, and a name collision falls back to a suffixed rename.db.createFolder("Projects");- const team2 = db.createSpace({ name: "Design" }).space;+ const team2 = createTestTeamSpace(db, { name: "Design" }).space;const dirtyFolder = db.createFolder("Projects", team2.id).folder;db.markFolderSynced(dirtyFolder.id, "cloud-folder-2");db.renameFolder(dirtyFolder.id, "Projects");@@ -797,7 +812,7 @@ test("getFolderNoteCounts attributes space-root notes per space", (t) => {const db = createDb(t);if (!db) return;const privateId = db.getPrivateSpaceId();- const team = db.createSpace({ name: "Ops" }).space;+ const team = createTestTeamSpace(db, { name: "Ops" }).space;const folder = db.createFolder("Docs", team.id).folder;db.saveNote("Filed", "body", "personal", null, null, folder.id);db.saveNote("Root A", "body", "personal", null, null, null, team.id);@@ -906,7 +921,7 @@ test("purgeSpace preserves dirty cloud-backed notes with forked identities", (t)const db = createDb(t);if (!db) return;const privateId = db.getPrivateSpaceId();- const team = db.createSpace({ name: "Revoked" }).space;+ const team = createTestTeamSpace(db, { name: "Revoked" }).space;const folder = db.createFolder("Ops", team.id).folder;const dirty = db.saveNote(@@ -963,7 +978,7 @@ test("purgeSpace survives tombstones in other spaces referencing its folders", (const db = createDb(t);if (!db) return;const privateId = db.getPrivateSpaceId();- const team = db.createSpace({ name: "Movers" }).space;+ const team = createTestTeamSpace(db, { name: "Movers" }).space;// Deleting a note keeps folder_id on the tombstone; moving the folder into// the team afterwards leaves a cross-space reference that must not abort@@ -1011,18 +1026,6 @@ test("upsertSpaceFromCloud inserts as pending and never flips status on update",assert.equal(after.sync_status, "synced");});-test("createSpace refuses non-team kinds so the private space stays unique", (t) => {- const db = createDb(t);- if (!db) return;- const result = db.createSpace({ name: "Sneaky", kind: "private" });- assert.equal(result.success, false);-- const privateCount = db.db- .prepare("SELECT COUNT(*) as count FROM spaces WHERE kind = 'private'")- .get().count;- assert.equal(privateCount, 1);-});-test("upsertSpaceFromCloud round-trips the teams mirror as a parsed array", (t) => {const db = createDb(t);if (!db) return;diff --git a/test/services/syncPassPolicy.test.js b/test/services/syncPassPolicy.test.jsindex 7d3605af9..8f23704df 100644--- a/test/services/syncPassPolicy.test.js+++ b/test/services/syncPassPolicy.test.js@@ -9,18 +9,18 @@ const load = () => import("../../src/services/syncPassPolicy.ts");const base = {snapshot: false,- dirty: false,+ parked: false,teamOnly: false,teamCapable: true,hasTeamSpaces: true,};-test("cursor policy: snapshots and dirty passes never advance", async () => {+test("cursor policy: snapshots and passes with parked rows never advance", async () => {const { resolvePullCursorAdvance } = await load();for (const pass of [{ ...base, snapshot: true },- { ...base, dirty: true },- { ...base, snapshot: true, dirty: true, teamOnly: true },+ { ...base, parked: true },+ { ...base, snapshot: true, parked: true, teamOnly: true },]) {assert.deepEqual(resolvePullCursorAdvance(pass), {advanceCursor: false,