@semiont/make-meaning 0.5.30 → 0.5.31

package/dist/weaver-main.js

@@ -1,11 +1,11 @@
 import { replyChannelsFor, createTomlConfigLoader, accessToken, baseUrl as baseUrl$1, retryWithBackoff, isTransientFetchError, STARTUP_FETCH_RETRY, errField, burstBuffer, busRequest, resourceId, didToAgent, annotationId, findBodyItem } from '@semiont/core';
+import { getGraphDatabase, intendedGraphAnnotation } from '@semiont/graph';
 import { existsSync, readFileSync, promises } from 'fs';
 import * as path from 'path';
 import { join } from 'path';
 import '@semiont/observability';
 import '@semiont/ontology';
 import '@semiont/content';
-import { getGraphDatabase } from '@semiont/graph';
 import '@semiont/vectors';
 import '@semiont/event-sourcing';
 import { HttpTransport } from '@semiont/http-transport';
@@ -10081,6 +10081,7 @@ var Weaver = class _Weaver {
     let divergent = 0;
     let healed = 0;
     let healFailures = 0;
+    let orphaned = 0;
     for (const resource of resources) {
       const rid = resource["@id"];
       if (!rid) continue;
@@ -10089,11 +10090,17 @@ var Weaver = class _Weaver {
       divergent++;
       this.logger.warn("Reconcile divergence \u2014 healing from the log", { resourceId: String(rid), reason });
       const result = await this.rebuildResource(resourceId(String(rid)));
-      if (result.eventsFailed === 0) healed++;
+      if (result.eventCount === 0) {
+        orphaned++;
+        this.logger.warn(
+          "Reconcile found an orphaned view \u2014 the log has no events for this resource, so healing wrote nothing",
+          { resourceId: String(rid), reason, remedy: "semiont stop && semiont clean --store state && semiont start" }
+        );
+      } else if (result.eventsFailed === 0) healed++;
       else healFailures++;
     }
-    const summary = { resourcesChecked: resources.length, divergent, healed, healFailures };
-    if (divergent > 0 || healFailures > 0) {
+    const summary = { resourcesChecked: resources.length, divergent, healed, healFailures, orphaned };
+    if (divergent > 0 || healFailures > 0 || orphaned > 0) {
       this.logger.warn("Weaver reconcile found divergence", summary);
     } else {
       this.logger.info("Weaver reconcile complete \u2014 projection matches the catalog", summary);
@@ -10135,13 +10142,13 @@ var Weaver = class _Weaver {
     for (const id of viewIds) {
       if (!graphIds.has(id)) return "annotation-set-mismatch";
     }
-    const bodyKey = (a) => _Weaver.canonicalJson(a.body ?? []);
     const viewById = new Map(annotations.map((a) => [String(a.id), a]));
     for (const graphAnnotation of graphAnnotations) {
       const viewAnnotation = viewById.get(String(graphAnnotation.id));
       if (!viewAnnotation) continue;
-      if (bodyKey(graphAnnotation) !== bodyKey(viewAnnotation)) {
-        return "annotation-body-mismatch";
+      const intended = intendedGraphAnnotation({ ...viewAnnotation, creator: graphAnnotation.creator });
+      if (_Weaver.canonicalJson(graphAnnotation) !== _Weaver.canonicalJson(intended)) {
+        return "annotation-content-mismatch";
       }
     }
     return null;
@@ -10494,7 +10501,7 @@ var Weaver = class _Weaver {
       });
     }
     this.logger.info("Resource rebuild complete", { resourceId: resourceId6, eventCount: events.length, eventsFailed });
-    return { eventsApplied: events.length - eventsFailed, eventsFailed };
+    return { eventCount: events.length, eventsApplied: events.length - eventsFailed, eventsFailed };
   }
   /**
    * Rebuild entire GraphDB from all events.
@@ -10651,7 +10658,6 @@ var STOWER_CHANNELS = [
 var BROWSER_CHANNELS = [
   "browse:resource-requested",
   "browse:anchored-text-requested",
-  "browse:anchored-text-by-checksum-requested",
   "browse:resources-requested",
   "browse:annotations-requested",
   "browse:annotation-requested",
@@ -10711,6 +10717,19 @@ var ARCHIVIST_OUTBOUND_STRAYS = [
   ...ARCHIVIST_OUTBOUND_STRAYS,
   ...replyChannelsFor(ARCHIVIST_INBOUND_CHANNELS)
 ];
+async function runBootPass(pass, run, logger2, onState) {
+  onState?.({ phase: "running" });
+  try {
+    const summary = await run();
+    onState?.({ phase: "done", summary });
+  } catch (error) {
+    onState?.({ phase: "failed", error: error instanceof Error ? error.message : String(error) });
+    logger2.error(`Boot pass '${pass}' failed \u2014 continuing with a store that may be behind`, {
+      pass,
+      error: errField(error)
+    });
+  }
+}
 var configPath = join(homedir(), ".semiontconfig");
 var tomlReader = {
   readIfExists: (p) => existsSync(p) ? readFileSync(p, "utf-8") : null
@@ -10857,22 +10876,12 @@ async function main() {
   };
   process.on("SIGTERM", shutdown);
   process.on("SIGINT", shutdown);
-  catchUpState = { phase: "running" };
-  try {
-    const summary = await weaver.catchUp();
-    catchUpState = { phase: "done", summary };
-  } catch (error) {
-    catchUpState = { phase: "failed", error: error instanceof Error ? error.message : String(error) };
-    throw error;
-  }
-  reconcileState = { phase: "running" };
-  try {
-    const summary = await weaver.reconcile();
-    reconcileState = { phase: "done", summary };
-  } catch (error) {
-    reconcileState = { phase: "failed", error: error instanceof Error ? error.message : String(error) };
-    throw error;
-  }
+  await runBootPass("catch-up", () => weaver.catchUp(), logger, (s) => {
+    catchUpState = s;
+  });
+  await runBootPass("reconcile", () => weaver.reconcile(), logger, (s) => {
+    reconcileState = s;
+  });
 }
 main().catch((error) => {
   logger.error("Fatal", { error: error instanceof Error ? error.message : String(error), stack: error instanceof Error ? error.stack : void 0 });