Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS
JavaScript ai-agentsdashboarddeveloper-toolsdigital-twinquantified-selfsecond-brainself-hostedtailscale
fix: reject conflicting scrap provenance during catalog import
Adam Eivy90812c8f134d
diff --git a/server/routes/catalog.js b/server/routes/catalog.jsindex a9f2fc079b..3803aabb22 100644--- a/server/routes/catalog.js+++ b/server/routes/catalog.js@@ -2,6 +2,7 @@// the Catalog page, Ingest workflow, picker integrations, and peer sync.import { Router } from 'express';+import { isDeepStrictEqual } from 'node:util';import * as catalogDB from '../services/catalogDB.js';import * as catalogSync from '../services/catalogSync.js';import { resolveRefs, listDanglingRefs } from '../services/catalogRefResolver.js';@@ -687,7 +688,7 @@ router.post('/bulk-import', asyncHandler(async (req, res) => {if (!s.rawText.trim()) continue;const sourceKind = s.sourceKind || 'import';const existingScrap = s.id- ? (await client.query('SELECT id, deleted FROM catalog_scraps WHERE id = $1 FOR UPDATE', [s.id])).rows[0]+ ? (await client.query('SELECT id, deleted, raw_text, title, source_kind, metadata FROM catalog_scraps WHERE id = $1 FOR UPDATE', [s.id])).rows[0]: entry.id? (await client.query(`SELECT s.id, s.deleted FROM catalog_scraps s@@ -700,6 +701,16 @@ router.post('/bulk-import', asyncHandler(async (req, res) => {if (existingScrap?.deleted) {throw new ServerError('Imported scrap ID is deleted', { status: 409 });}+ // Scraps can be shared by several ingredients: importing one slice+ // must neither overwrite their provenance nor silently ignore edits.+ if (s.id && existingScrap && (+ existingScrap.raw_text !== s.rawText+ || (s.title !== undefined && existingScrap.title !== s.title)+ || (s.sourceKind !== undefined && existingScrap.source_kind !== s.sourceKind)+ || (s.metadata !== undefined && !isDeepStrictEqual(existingScrap.metadata, s.metadata))+ )) {+ throw new ServerError('Imported scrap ID has different content; use a new scrap ID for edited provenance', { status: 409 });+ }const scrap = existingScrap || await catalogDB.createScrap({...s, sourceKind,metadata: s.metadata || { importedVia: 'bulk-import', format },diff --git a/server/routes/catalog.test.js b/server/routes/catalog.test.jsindex 947625d306..706960e5f7 100644--- a/server/routes/catalog.test.js+++ b/server/routes/catalog.test.js@@ -311,6 +311,12 @@ describe.skipIf(!runDb)('catalog export identity round trip', () => {{ type: 'idea', name: 'Invalid media', media: [{ mediaKey: 'x', kind: 'invalid' }] },]) expect((await send([entry])).status).toBe(400);expect((await send([{ id: row.id, type: 'scene', name: 'Wrong type' }])).status).toBe(409);+ const scrap = await catalogDB.createScrap({ rawText: 'Keep provenance' });+ createdScrapIds.add(scrap.id);+ expect((await send([{ id: row.id, type: 'idea', name: 'Changed',+ scraps: [{ id: scrap.id, rawText: 'Conflicting provenance' }] }])).status).toBe(409);+ expect((await catalogDB.getIngredient(row.id)).name).toBe('Keep identity');+ expect((await catalogDB.getScrap(scrap.id)).rawText).toBe('Keep provenance');await catalogDB.deleteIngredient(row.id);expect((await send([{ id: row.id, type: 'idea', name: 'Deleted' }])).status).toBe(409);expect(await catalogDB.getIngredient(row.id)).toBeNull();