amalgm 0.1.155 → 0.1.156

package/runtime/scripts/amalgm-mcp/state/events.js

@@ -69,6 +69,8 @@ function normalizeEventRow(row) {
   };
   if (row.id != null) event.id = row.id;
   if (row.client_mutation_id != null) event.clientMutationId = row.client_mutation_id;
+  if (row.mutation_id != null) event.mutationId = row.mutation_id;
+  if (row.shared_resource_id != null) event.sharedResourceId = row.shared_resource_id;
   if (row.source != null) event.source = row.source;
   if (row.resource_version != null) event.version = Number(row.resource_version);
   const value = safeJsonParse(row.value_json);
@@ -93,6 +95,8 @@ function insertStateEvent(database, input) {
   const valueJson = input.valueJson !== undefined ? input.valueJson : safeJsonStringify(input.value);
   const id = input.id ?? null;
   const clientMutationId = input.clientMutationId ?? input.client_mutation_id ?? null;
+  const mutationId = input.mutationId ?? input.mutation_id ?? null;
+  const sharedResourceId = input.sharedResourceId ?? input.shared_resource_id ?? null;
   const source = input.source ?? null;
   const version = input.version ?? input.resourceVersion ?? null;
 
@@ -105,10 +109,12 @@ function insertStateEvent(database, input) {
       value_json,
       patch_json,
       client_mutation_id,
+      mutation_id,
+      shared_resource_id,
       source,
       resource_version
     )
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
   `).run(
     ts,
     input.resource,
@@ -117,6 +123,8 @@ function insertStateEvent(database, input) {
     valueJson,
     safeJsonStringify(input.patch),
     clientMutationId,
+    mutationId,
+    sharedResourceId,
     source,
     version,
   );
@@ -133,6 +141,8 @@ function insertStateEvent(database, input) {
   };
   if (id != null) event.id = String(id);
   if (clientMutationId != null) event.clientMutationId = String(clientMutationId);
+  if (mutationId != null) event.mutationId = String(mutationId);
+  if (sharedResourceId != null) event.sharedResourceId = String(sharedResourceId);
   if (source != null) event.source = String(source);
   if (version != null) event.version = Number(version);
   if (input.value !== undefined) event.value = input.value;
@@ -239,7 +249,15 @@ function maybePruneEventLog(options = {}) {
   }
   lastPruneAttemptAt = now;
   try {
-    return pruneEventLog(options);
+    const result = pruneEventLog(options);
+    // The journal uses the same retention cadence but a stricter eligibility
+    // rule: only locally complete rows (local-only saved rows or cloud-synced
+    // rows) may age out. Pending/rejected/conflicted work is never time-pruned.
+    const journal = require('./mutations').pruneMutationJournal({
+      ...options,
+      cutoffIso: result.cutoffIso,
+    });
+    return { ...result, journalDeleted: journal.deleted || 0 };
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     console.warn('[LocalLive] Event log retention failed:', message);