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: validate provenance when reusing ID-less import scraps
Adam Eivy5763edb97893
diff --git a/server/routes/catalog.js b/server/routes/catalog.jsindex 3803aabb22..f8b1531165 100644--- a/server/routes/catalog.js+++ b/server/routes/catalog.js@@ -691,7 +691,7 @@ router.post('/bulk-import', asyncHandler(async (req, res) => {? (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+ `SELECT s.id, s.deleted, s.raw_text, s.title, s.source_kind, s.metadata FROM catalog_scraps sJOIN catalog_ingredient_sources src ON src.scrap_id = s.idWHERE src.ingredient_id = $1 AND s.raw_text = $2AND s.source_kind = $3 AND s.deleted = false LIMIT 1`,@@ -703,7 +703,7 @@ router.post('/bulk-import', asyncHandler(async (req, res) => {}// Scraps can be shared by several ingredients: importing one slice// must neither overwrite their provenance nor silently ignore edits.- if (s.id && existingScrap && (+ if (existingScrap && (existingScrap.raw_text !== s.rawText|| (s.title !== undefined && existingScrap.title !== s.title)|| (s.sourceKind !== undefined && existingScrap.source_kind !== s.sourceKind)diff --git a/server/routes/catalog.test.js b/server/routes/catalog.test.jsindex 706960e5f7..7fc58e3e3c 100644--- a/server/routes/catalog.test.js+++ b/server/routes/catalog.test.js@@ -317,6 +317,10 @@ describe.skipIf(!runDb)('catalog export identity round trip', () => {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.linkIngredientToSource(row.id, scrap.id);+ expect((await send([{ id: row.id, type: 'idea', name: 'Changed',+ scraps: [{ rawText: scrap.rawText, sourceKind: scrap.sourceKind, metadata: { different: true } }] }])).status).toBe(409);+ expect((await catalogDB.getScrap(scrap.id)).metadata).toEqual({});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();