@semiont/make-meaning 0.4.14 → 0.4.15

package/dist/index.js

@@ -9945,6 +9945,7 @@ var require_operators = __commonJS({
 // src/service.ts
 import { JobQueue } from "@semiont/jobs";
 import { createEventStore as createEventStoreCore } from "@semiont/event-sourcing";
+import { jobId } from "@semiont/core";
 
 // src/config.ts
 function resolveActorInference(config, actor) {
@@ -10007,7 +10008,7 @@ function partitionByType(events) {
   const runs = [];
   let currentRun = [];
   for (const event of events) {
-    if (currentRun.length > 0 && currentRun[0].event.type !== event.event.type) {
+    if (currentRun.length > 0 && currentRun[0].type !== event.type) {
       runs.push(currentRun);
       currentRun = [];
     }
@@ -10019,28 +10020,29 @@ function partitionByType(events) {
 
 // src/graph/consumer.ts
 var GraphDBConsumer = class _GraphDBConsumer {
-  constructor(eventStore, graphDb, logger) {
+  constructor(eventStore, graphDb, coreEventBus, logger) {
     this.eventStore = eventStore;
     this.graphDb = graphDb;
+    this.coreEventBus = coreEventBus;
     this.logger = logger;
   }
   // Event types that produce GraphDB mutations — filter everything else
   static GRAPH_RELEVANT_EVENTS = /* @__PURE__ */ new Set([
-    "resource.created",
-    "resource.archived",
-    "resource.unarchived",
-    "annotation.added",
-    "annotation.removed",
-    "annotation.body.updated",
-    "entitytag.added",
-    "entitytag.removed",
-    "entitytype.added"
+    "yield:created",
+    "mark:archived",
+    "mark:unarchived",
+    "mark:added",
+    "mark:removed",
+    "mark:body-updated",
+    "mark:entity-tag-added",
+    "mark:entity-tag-removed",
+    "mark:entity-type-added"
   ]);
   // Burst buffer thresholds — see class doc and BATCH-GRAPH-CONSUMER-RX.md
   static BURST_WINDOW_MS = 50;
   static MAX_BATCH_SIZE = 500;
   static IDLE_TIMEOUT_MS = 200;
-  _globalSubscription = null;
+  _globalSubscriptions = [];
   eventSubject = new import_rxjs.Subject();
   pipelineSubscription = null;
   lastProcessed = /* @__PURE__ */ new Map();
@@ -10054,15 +10056,16 @@ var GraphDBConsumer = class _GraphDBConsumer {
    * and wire through the RxJS burst-buffered pipeline.
    */
   async subscribeToGlobalEvents() {
-    this._globalSubscription = this.eventStore.bus.subscriptions.subscribeGlobal(
-      (storedEvent) => {
-        if (!_GraphDBConsumer.GRAPH_RELEVANT_EVENTS.has(storedEvent.event.type)) return;
-        this.eventSubject.next(storedEvent);
-      }
-    );
+    for (const eventType of _GraphDBConsumer.GRAPH_RELEVANT_EVENTS) {
+      this._globalSubscriptions.push(
+        this.coreEventBus.getDomainEvent(eventType).subscribe(
+          (storedEvent) => this.eventSubject.next(storedEvent)
+        )
+      );
+    }
     this.pipelineSubscription = this.eventSubject.pipe(
       // Split into one inner Observable per resource (system events grouped under '__system__')
-      (0, import_operators.groupBy)((se) => se.event.resourceId ?? "__system__"),
+      (0, import_operators.groupBy)((se) => se.resourceId ?? "__system__"),
       (0, import_operators.mergeMap)((group) => {
         if (group.key === "__system__") {
           return group.pipe(
@@ -10081,7 +10084,7 @@ var GraphDBConsumer = class _GraphDBConsumer {
             }
             return (0, import_rxjs.from)(this.safeApplyEvent(eventOrBatch).then(() => {
               this.lastProcessed.set(
-                eventOrBatch.event.resourceId,
+                eventOrBatch.resourceId,
                 eventOrBatch.metadata.sequenceNumber
               );
             }));
@@ -10099,12 +10102,13 @@ var GraphDBConsumer = class _GraphDBConsumer {
    * Wrap applyEventToGraph in try/catch so one failed event doesn't kill the pipeline.
    */
   async safeApplyEvent(storedEvent) {
+    await new Promise((resolve2) => setTimeout(resolve2, 0));
     try {
       await this.applyEventToGraph(storedEvent);
     } catch (error) {
       this.logger.error("Failed to apply event to graph", {
-        eventType: storedEvent.event.type,
-        resourceId: storedEvent.event.resourceId,
+        eventType: storedEvent.type,
+        resourceId: storedEvent.resourceId,
         error
       });
     }
@@ -10117,10 +10121,8 @@ var GraphDBConsumer = class _GraphDBConsumer {
    */
   async stop() {
     this.logger.info("Stopping GraphDB consumer");
-    if (this._globalSubscription && typeof this._globalSubscription.unsubscribe === "function") {
-      this._globalSubscription.unsubscribe();
-    }
-    this._globalSubscription = null;
+    for (const sub of this._globalSubscriptions) sub.unsubscribe();
+    this._globalSubscriptions = [];
     this.eventSubject.complete();
     if (this.pipelineSubscription) {
       this.pipelineSubscription.unsubscribe();
@@ -10144,18 +10146,18 @@ var GraphDBConsumer = class _GraphDBConsumer {
         }
       } catch (error) {
         this.logger.error("Failed to process batch run", {
-          eventType: run[0].event.type,
+          eventType: run[0].type,
           runSize: run.length,
           error
         });
       }
       const last = run[run.length - 1];
-      if (last.event.resourceId) {
-        this.lastProcessed.set(last.event.resourceId, last.metadata.sequenceNumber);
+      if (last.resourceId) {
+        this.lastProcessed.set(last.resourceId, last.metadata.sequenceNumber);
       }
     }
     this.logger.debug("Processed batch", {
-      resourceId: events[0]?.event.resourceId,
+      resourceId: events[0]?.resourceId,
       batchSize: events.length
     });
   }
@@ -10165,17 +10167,17 @@ var GraphDBConsumer = class _GraphDBConsumer {
    */
   async applyBatchByType(events) {
     const graphDb = this.ensureInitialized();
-    const type = events[0].event.type;
+    const type = events[0].type;
     switch (type) {
-      case "resource.created": {
+      case "yield:created": {
         const resources = events.map((e) => this.buildResourceDescriptor(e));
         await graphDb.batchCreateResources(resources);
         this.logger.info("Batch created resources in graph", { count: events.length });
         break;
       }
-      case "annotation.added": {
+      case "mark:added": {
         const inputs = events.map((e) => {
-          const event = e.event;
+          const event = e;
           return {
             ...event.payload.annotation,
             creator: didToAgent(event.userId)
@@ -10196,12 +10198,12 @@ var GraphDBConsumer = class _GraphDBConsumer {
    * Extracted for reuse by both applyEventToGraph and applyBatchByType.
    */
   buildResourceDescriptor(storedEvent) {
-    const event = storedEvent.event;
-    if (event.type !== "resource.created") {
+    const event = storedEvent;
+    if (event.type !== "yield:created") {
       throw new Error("Expected resource.created event");
     }
     if (!event.resourceId) {
-      throw new Error("resource.created requires resourceId");
+      throw new Error("yield:created requires resourceId");
     }
     return {
       "@context": "https://schema.org/",
@@ -10224,32 +10226,32 @@ var GraphDBConsumer = class _GraphDBConsumer {
    */
   async applyEventToGraph(storedEvent) {
     const graphDb = this.ensureInitialized();
-    const event = storedEvent.event;
+    const event = storedEvent;
     this.logger.debug("Applying event to GraphDB", {
       eventType: event.type,
       sequenceNumber: storedEvent.metadata.sequenceNumber
     });
     switch (event.type) {
-      case "resource.created": {
+      case "yield:created": {
         const resource = this.buildResourceDescriptor(storedEvent);
         this.logger.debug("Creating resource in graph", { resourceUri: resource["@id"] });
         await graphDb.createResource(resource);
         this.logger.info("Resource created in graph", { resourceUri: resource["@id"] });
         break;
       }
-      case "resource.archived":
-        if (!event.resourceId) throw new Error("resource.archived requires resourceId");
+      case "mark:archived":
+        if (!event.resourceId) throw new Error("mark:archived requires resourceId");
         await graphDb.updateResource(makeResourceId(event.resourceId), {
           archived: true
         });
         break;
-      case "resource.unarchived":
-        if (!event.resourceId) throw new Error("resource.unarchived requires resourceId");
+      case "mark:unarchived":
+        if (!event.resourceId) throw new Error("mark:unarchived requires resourceId");
         await graphDb.updateResource(makeResourceId(event.resourceId), {
           archived: false
         });
         break;
-      case "annotation.added":
+      case "mark:added":
         this.logger.debug("Processing annotation.added event", {
           annotationId: event.payload.annotation.id
         });
@@ -10261,10 +10263,10 @@ var GraphDBConsumer = class _GraphDBConsumer {
           annotationId: event.payload.annotation.id
         });
         break;
-      case "annotation.removed":
+      case "mark:removed":
         await graphDb.deleteAnnotation(makeAnnotationId(event.payload.annotationId));
         break;
-      case "annotation.body.updated":
+      case "mark:body-updated":
         this.logger.debug("Processing annotation.body.updated event", {
           annotationId: event.payload.annotationId,
           payload: event.payload
@@ -10307,8 +10309,8 @@ var GraphDBConsumer = class _GraphDBConsumer {
           });
         }
         break;
-      case "entitytag.added":
-        if (!event.resourceId) throw new Error("entitytag.added requires resourceId");
+      case "mark:entity-tag-added":
+        if (!event.resourceId) throw new Error("mark:entity-tag-added requires resourceId");
         {
           const rid = makeResourceId(event.resourceId);
           const doc = await graphDb.getResource(rid);
@@ -10319,8 +10321,8 @@ var GraphDBConsumer = class _GraphDBConsumer {
           }
         }
         break;
-      case "entitytag.removed":
-        if (!event.resourceId) throw new Error("entitytag.removed requires resourceId");
+      case "mark:entity-tag-removed":
+        if (!event.resourceId) throw new Error("mark:entity-tag-removed requires resourceId");
         {
           const rid = makeResourceId(event.resourceId);
           const doc = await graphDb.getResource(rid);
@@ -10331,7 +10333,7 @@ var GraphDBConsumer = class _GraphDBConsumer {
           }
         }
         break;
-      case "entitytype.added":
+      case "mark:entity-type-added":
         await graphDb.addEntityType(event.payload.entityType);
         break;
       default:
@@ -10342,20 +10344,20 @@ var GraphDBConsumer = class _GraphDBConsumer {
    * Rebuild entire resource from events.
    * Bypasses the live pipeline — reads directly from event store.
    */
-  async rebuildResource(resourceId4) {
+  async rebuildResource(resourceId7) {
     const graphDb = this.ensureInitialized();
-    this.logger.info("Rebuilding resource from events", { resourceId: resourceId4 });
+    this.logger.info("Rebuilding resource from events", { resourceId: resourceId7 });
     try {
-      await graphDb.deleteResource(resourceId4);
+      await graphDb.deleteResource(resourceId7);
     } catch (error) {
-      this.logger.debug("No existing resource to delete", { resourceId: resourceId4 });
+      this.logger.debug("No existing resource to delete", { resourceId: resourceId7 });
     }
     const query = new EventQuery(this.eventStore.log.storage);
-    const events = await query.getResourceEvents(resourceId4);
+    const events = await query.getResourceEvents(resourceId7);
     for (const storedEvent of events) {
       await this.applyEventToGraph(storedEvent);
     }
-    this.logger.info("Resource rebuild complete", { resourceId: resourceId4, eventCount: events.length });
+    this.logger.info("Resource rebuild complete", { resourceId: resourceId7, eventCount: events.length });
   }
   /**
    * Rebuild entire GraphDB from all events.
@@ -10371,10 +10373,10 @@ var GraphDBConsumer = class _GraphDBConsumer {
     const allResourceIds = await this.eventStore.log.getAllResourceIds();
     this.logger.info("Found resources to rebuild", { count: allResourceIds.length });
     this.logger.info("PASS 1: Creating all nodes (resources + annotations)");
-    for (const resourceId4 of allResourceIds) {
-      const events = await query.getResourceEvents(makeResourceId(resourceId4));
+    for (const resourceId7 of allResourceIds) {
+      const events = await query.getResourceEvents(makeResourceId(resourceId7));
       for (const storedEvent of events) {
-        if (storedEvent.event.type === "annotation.body.updated") {
+        if (storedEvent.type === "mark:body-updated") {
           continue;
         }
         await this.applyEventToGraph(storedEvent);
@@ -10382,10 +10384,10 @@ var GraphDBConsumer = class _GraphDBConsumer {
     }
     this.logger.info("Pass 1 complete - all nodes created");
     this.logger.info("PASS 2: Creating all REFERENCES edges");
-    for (const resourceId4 of allResourceIds) {
-      const events = await query.getResourceEvents(makeResourceId(resourceId4));
+    for (const resourceId7 of allResourceIds) {
+      const events = await query.getResourceEvents(makeResourceId(resourceId7));
       for (const storedEvent of events) {
-        if (storedEvent.event.type === "annotation.body.updated") {
+        if (storedEvent.type === "mark:body-updated") {
           await this.applyEventToGraph(storedEvent);
         }
       }
@@ -10398,7 +10400,7 @@ var GraphDBConsumer = class _GraphDBConsumer {
    */
   getHealthMetrics() {
     return {
-      subscriptions: this._globalSubscription ? 1 : 0,
+      subscriptions: this._globalSubscriptions.length,
       lastProcessed: Object.fromEntries(this.lastProcessed),
       pipelineActive: !!this.pipelineSubscription
     };
@@ -10431,29 +10433,30 @@ var Smelter = class _Smelter {
     this.chunkingConfig = chunkingConfig ?? DEFAULT_CHUNKING_CONFIG;
   }
   static SMELTER_RELEVANT_EVENTS = /* @__PURE__ */ new Set([
-    "resource.created",
-    "resource.archived",
-    "annotation.added",
-    "annotation.removed"
+    "yield:created",
+    "mark:archived",
+    "mark:added",
+    "mark:removed"
   ]);
   static BURST_WINDOW_MS = 50;
   static MAX_BATCH_SIZE = 100;
   static IDLE_TIMEOUT_MS = 200;
-  _globalSubscription = null;
+  _globalSubscriptions = [];
   eventSubject = new import_rxjs2.Subject();
   pipelineSubscription = null;
   logger;
   chunkingConfig;
   async initialize() {
     this.logger.info("Smelter actor initializing");
-    this._globalSubscription = this.eventStore.bus.subscriptions.subscribeGlobal(
-      (storedEvent) => {
-        if (!_Smelter.SMELTER_RELEVANT_EVENTS.has(storedEvent.event.type)) return;
-        this.eventSubject.next(storedEvent);
-      }
-    );
+    for (const eventType of _Smelter.SMELTER_RELEVANT_EVENTS) {
+      this._globalSubscriptions.push(
+        this.eventBus.getDomainEvent(eventType).subscribe(
+          (storedEvent) => this.eventSubject.next(storedEvent)
+        )
+      );
+    }
     this.pipelineSubscription = this.eventSubject.pipe(
-      (0, import_operators2.groupBy)((se) => se.event.resourceId ?? "__unknown__"),
+      (0, import_operators2.groupBy)((se) => se.resourceId ?? "__unknown__"),
       (0, import_operators2.mergeMap)(
         (group) => group.pipe(
           burstBuffer2({
@@ -10475,17 +10478,15 @@ var Smelter = class _Smelter {
     this.logger.info("Smelter actor initialized");
   }
   async stop() {
-    if (this._globalSubscription && typeof this._globalSubscription.unsubscribe === "function") {
-      this._globalSubscription.unsubscribe();
-    }
-    this._globalSubscription = null;
+    for (const sub of this._globalSubscriptions) sub.unsubscribe();
+    this._globalSubscriptions = [];
     this.pipelineSubscription?.unsubscribe();
     this.eventSubject.complete();
     this.logger.info("Smelter actor stopped");
   }
   /**
    * Rebuild the vector store from persisted embedding events in the event log.
-   * Reads all embedding.computed / embedding.deleted events and replays them.
+   * Reads all embedding:computed / embedding:deleted events and replays them.
    * Bypasses the live pipeline — reads directly from the event store.
    */
   async rebuildAll() {
@@ -10498,24 +10499,24 @@ var Smelter = class _Smelter {
     for (const rid of allResourceIds) {
       const events = await query.getResourceEvents(makeResourceId2(rid));
       const embeddingEvents = events.filter(
-        (e) => e.event.type === "embedding.computed" || e.event.type === "embedding.deleted"
+        (e) => e.type === "embedding:computed" || e.type === "embedding:deleted"
       );
       if (embeddingEvents.length === 0) continue;
       const lastEvent = embeddingEvents[embeddingEvents.length - 1];
-      if (lastEvent.event.type === "embedding.deleted" && !lastEvent.event.payload.annotationId) {
+      if (lastEvent.type === "embedding:deleted" && !lastEvent.payload.annotationId) {
         continue;
       }
       const deletedAnnotations = /* @__PURE__ */ new Set();
       for (const e of embeddingEvents) {
-        if (e.event.type === "embedding.deleted") {
-          const payload = e.event.payload;
+        if (e.type === "embedding:deleted") {
+          const payload = e.payload;
           if (payload.annotationId) deletedAnnotations.add(String(payload.annotationId));
         }
       }
       const resourceChunks = [];
       for (const e of embeddingEvents) {
-        if (e.event.type !== "embedding.computed") continue;
-        const payload = e.event.payload;
+        if (e.type !== "embedding:computed") continue;
+        const payload = e.payload;
         if (payload.annotationId) {
           if (deletedAnnotations.has(String(payload.annotationId))) continue;
           await this.vectorStore.upsertAnnotationVector(
@@ -10523,7 +10524,7 @@ var Smelter = class _Smelter {
             payload.embedding,
             {
               annotationId: makeAnnotationId2(String(payload.annotationId)),
-              resourceId: makeResourceId2(e.event.resourceId),
+              resourceId: makeResourceId2(e.resourceId),
               motivation: "",
               entityTypes: [],
               exactText: payload.chunkText
@@ -10558,7 +10559,7 @@ var Smelter = class _Smelter {
         }
       } catch (error) {
         this.logger.error("Smelter failed to process batch run", {
-          eventType: run[0].event.type,
+          eventType: run[0].type,
           runSize: run.length,
           error
         });
@@ -10571,12 +10572,12 @@ var Smelter = class _Smelter {
    * then distributes results back to their respective resources/annotations.
    */
   async applyBatchByType(events) {
-    const type = events[0].event.type;
+    const type = events[0].type;
     switch (type) {
-      case "resource.created":
+      case "yield:created":
         await this.batchResourceCreated(events);
         break;
-      case "annotation.added":
+      case "mark:added":
         await this.batchAnnotationAdded(events);
         break;
       default:
@@ -10593,7 +10594,7 @@ var Smelter = class _Smelter {
     const resourceData = [];
     const allChunks = [];
     for (const storedEvent of events) {
-      const event = storedEvent.event;
+      const event = storedEvent;
       const rid = makeResourceId2(event.resourceId);
       const storageUri = event.payload.storageUri;
       if (!storageUri) continue;
@@ -10614,7 +10615,7 @@ var Smelter = class _Smelter {
     for (const { rid, chunks } of resourceData) {
       const embeddingChunks = chunks.map((text, i) => {
         const embedding = allEmbeddings[offset + i];
-        this.eventBus.get("embedding:computed").next({
+        this.eventBus.get("embedding:compute").next({
           resourceId: rid,
           chunkIndex: i,
           chunkText: text,
@@ -10639,7 +10640,7 @@ var Smelter = class _Smelter {
   async batchAnnotationAdded(events) {
     const annotationData = [];
     for (const storedEvent of events) {
-      const event = storedEvent.event;
+      const event = storedEvent;
       const annotation = event.payload.annotation;
       if (!annotation?.id) continue;
       const selector = getTargetSelector(annotation.target);
@@ -10659,7 +10660,7 @@ var Smelter = class _Smelter {
     for (let i = 0; i < annotationData.length; i++) {
       const { rid, aid, exactText, annotation } = annotationData[i];
       const embedding = allEmbeddings[i];
-      this.eventBus.get("embedding:computed").next({
+      this.eventBus.get("embedding:compute").next({
         resourceId: rid,
         annotationId: aid,
         chunkIndex: 0,
@@ -10687,26 +10688,26 @@ var Smelter = class _Smelter {
       await this.processEvent(storedEvent);
     } catch (err) {
       this.logger.error("Smelter failed to process event", {
-        type: storedEvent.event.type,
-        resourceId: storedEvent.event.resourceId,
+        type: storedEvent.type,
+        resourceId: storedEvent.resourceId,
         error: err instanceof Error ? err.message : String(err),
         stack: err instanceof Error ? err.stack : void 0
       });
     }
   }
   async processEvent(storedEvent) {
-    const event = storedEvent.event;
+    const event = storedEvent;
     switch (event.type) {
-      case "resource.created":
+      case "yield:created":
         await this.handleResourceCreated(event);
         break;
-      case "resource.archived":
+      case "mark:archived":
         await this.handleResourceArchived(event);
         break;
-      case "annotation.added":
+      case "mark:added":
         await this.handleAnnotationAdded(event);
         break;
-      case "annotation.removed":
+      case "mark:removed":
         await this.handleAnnotationRemoved(event);
         break;
     }
@@ -10743,7 +10744,7 @@ var Smelter = class _Smelter {
       heapMB: Math.round(process.memoryUsage().heapUsed / 1024 / 1024)
     });
     const embeddingChunks = chunks.map((text2, i) => {
-      this.eventBus.get("embedding:computed").next({
+      this.eventBus.get("embedding:compute").next({
         resourceId: rid,
         chunkIndex: i,
         chunkText: text2,
@@ -10768,7 +10769,7 @@ var Smelter = class _Smelter {
   async handleResourceArchived(event) {
     const rid = makeResourceId2(event.resourceId);
     await this.vectorStore.deleteResourceVectors(rid);
-    this.eventBus.get("embedding:deleted").next({ resourceId: rid });
+    this.eventBus.get("embedding:delete").next({ resourceId: rid });
     this.logger.debug("Smelter deleted resource vectors", {
       resourceId: String(rid)
     });
@@ -10789,7 +10790,7 @@ var Smelter = class _Smelter {
       heapMB: Math.round(process.memoryUsage().heapUsed / 1024 / 1024)
     });
     const embedding = await this.embeddingProvider.embed(exactText);
-    this.eventBus.get("embedding:computed").next({
+    this.eventBus.get("embedding:compute").next({
       resourceId: rid,
       annotationId: aid,
       chunkIndex: 0,
@@ -10812,12 +10813,12 @@ var Smelter = class _Smelter {
     });
   }
   async handleAnnotationRemoved(event) {
-    const annotationId2 = String(event.payload.annotationId);
-    if (!annotationId2) return;
+    const annotationId3 = String(event.payload.annotationId);
+    if (!annotationId3) return;
     const rid = makeResourceId2(event.resourceId);
-    const aid = makeAnnotationId2(annotationId2);
+    const aid = makeAnnotationId2(annotationId3);
     await this.vectorStore.deleteAnnotationVector(aid);
-    this.eventBus.get("embedding:deleted").next({
+    this.eventBus.get("embedding:delete").next({
       resourceId: rid,
       annotationId: aid
     });
@@ -10828,7 +10829,7 @@ var Smelter = class _Smelter {
 };
 
 // src/knowledge-base.ts
-async function createKnowledgeBase(eventStore, project, graphDb, logger, options) {
+async function createKnowledgeBase(eventStore, project, graphDb, eventBus, logger, options) {
   const views = new FilesystemViewStorage(project);
   const content = new WorkingTreeStore(
     project,
@@ -10837,10 +10838,12 @@ async function createKnowledgeBase(eventStore, project, graphDb, logger, options
   const graphConsumer = new GraphDBConsumer(
     eventStore,
     graphDb,
+    eventBus,
     logger.child({ component: "graph-consumer" })
   );
   await graphConsumer.initialize();
   if (!options?.skipRebuild) {
+    await eventStore.views.rebuildAll(eventStore.log);
     await graphConsumer.rebuildAll();
   }
   const kb = {
@@ -10851,11 +10854,11 @@ async function createKnowledgeBase(eventStore, project, graphDb, logger, options
     graphConsumer,
     projectionsDir: project.projectionsDir
   };
-  if (options?.vectorStore && options?.embeddingProvider && options?.eventBus) {
+  if (options?.vectorStore && options?.embeddingProvider) {
     kb.vectors = options.vectorStore;
     kb.smelter = new Smelter(
       eventStore,
-      options.eventBus,
+      eventBus,
       options.vectorStore,
       options.embeddingProvider,
       content,
@@ -10873,7 +10876,7 @@ async function createKnowledgeBase(eventStore, project, graphDb, logger, options
 // src/gatherer.ts
 var import_rxjs3 = __toESM(require_cjs(), 1);
 var import_operators3 = __toESM(require_operators(), 1);
-import { annotationId as makeAnnotationId3 } from "@semiont/core";
+import { annotationId as makeAnnotationId3, resourceId } from "@semiont/core";
 
 // src/generation/resource-generation.ts
 async function generateResourceSummary(resourceName, content, entityTypes, client) {
@@ -10918,8 +10921,8 @@ var ResourceContext = class {
   /**
    * Get resource metadata from view storage
    */
-  static async getResourceMetadata(resourceId4, kb) {
-    const view = await kb.views.get(resourceId4);
+  static async getResourceMetadata(resourceId7, kb) {
+    const view = await kb.views.get(resourceId7);
     if (!view) {
       return null;
     }
@@ -10999,7 +11002,7 @@ var AnnotationContext = class {
    * @returns Rich context for LLM processing
    * @throws Error if annotation or resource not found
    */
-  static async buildLLMContext(annotationId2, resourceId4, kb, options = {}, inferenceClient, logger, embeddingProvider) {
+  static async buildLLMContext(annotationId3, resourceId7, kb, options = {}, inferenceClient, logger, embeddingProvider) {
     const {
       includeSourceContext = true,
       includeTargetContext = true,
@@ -11008,34 +11011,34 @@ var AnnotationContext = class {
     if (contextWindow < 100 || contextWindow > 5e3) {
       throw new Error("contextWindow must be between 100 and 5000");
     }
-    logger?.debug("Building LLM context", { annotationId: annotationId2, resourceId: resourceId4 });
-    logger?.debug("Getting view for resource", { resourceId: resourceId4 });
+    logger?.debug("Building LLM context", { annotationId: annotationId3, resourceId: resourceId7 });
+    logger?.debug("Getting view for resource", { resourceId: resourceId7 });
     let sourceView;
     try {
-      sourceView = await kb.views.get(resourceId4);
+      sourceView = await kb.views.get(resourceId7);
       logger?.debug("Retrieved view", { hasView: !!sourceView });
       if (!sourceView) {
         throw new Error("Source resource not found");
       }
     } catch (error) {
-      logger?.error("Error getting view", { resourceId: resourceId4, error });
+      logger?.error("Error getting view", { resourceId: resourceId7, error });
       throw error;
     }
     logger?.debug("Looking for annotation in resource", {
-      annotationId: annotationId2,
-      resourceId: resourceId4,
+      annotationId: annotationId3,
+      resourceId: resourceId7,
       totalAnnotations: sourceView.annotations.annotations.length,
       firstFiveIds: sourceView.annotations.annotations.slice(0, 5).map((a) => a.id)
     });
-    const annotation = sourceView.annotations.annotations.find((a) => a.id === annotationId2);
+    const annotation = sourceView.annotations.annotations.find((a) => a.id === annotationId3);
     logger?.debug("Annotation search result", { found: !!annotation });
     if (!annotation) {
       throw new Error("Annotation not found in view");
     }
     const targetSource = getTargetSource(annotation.target);
-    logger?.debug("Validating target resource", { targetSource, expectedResourceId: resourceId4 });
-    if (targetSource !== String(resourceId4)) {
-      throw new Error(`Annotation target resource ID (${targetSource}) does not match expected resource ID (${resourceId4})`);
+    logger?.debug("Validating target resource", { targetSource, expectedResourceId: resourceId7 });
+    if (targetSource !== String(resourceId7)) {
+      throw new Error(`Annotation target resource ID (${targetSource}) does not match expected resource ID (${resourceId7})`);
     }
     const sourceDoc = sourceView.resource;
     const bodySource = getBodySource(annotation.body);
@@ -11099,16 +11102,16 @@ var AnnotationContext = class {
       }
     }
     const suggestedResolution = void 0;
-    logger?.debug("Building graph context", { resourceId: resourceId4 });
+    logger?.debug("Building graph context", { resourceId: resourceId7 });
     const [connections, referencedByAnnotations, entityTypeStats] = await Promise.all([
-      kb.graph.getResourceConnections(resourceId4),
-      kb.graph.getResourceReferencedBy(resourceId4),
+      kb.graph.getResourceConnections(resourceId7),
+      kb.graph.getResourceReferencedBy(resourceId7),
       kb.graph.getEntityTypeStats()
     ]);
     const citedByMap = /* @__PURE__ */ new Map();
     for (const ann of referencedByAnnotations) {
       const source = getTargetSource(ann.target);
-      if (source && source !== String(resourceId4)) {
+      if (source && source !== String(resourceId7)) {
         const sourceResId = createResourceId(source);
         const sourceView2 = await kb.views.get(sourceResId);
         if (sourceView2?.resource) {
@@ -11119,7 +11122,7 @@ var AnnotationContext = class {
     const annotationEntityTypes = getEntityTypes(annotation);
     const siblingEntityTypes = /* @__PURE__ */ new Set();
     for (const ann of sourceView.annotations.annotations) {
-      if (ann.id !== annotationId2) {
+      if (ann.id !== annotationId3) {
         for (const et of getEntityTypes(ann)) {
           siblingEntityTypes.add(et);
         }
@@ -11180,7 +11183,7 @@ Summary:`;
         const results = await kb.vectors.searchAnnotations(focalEmbedding, {
           limit: 10,
           scoreThreshold: 0.5,
-          filter: { excludeResourceId: resourceId4 }
+          filter: { excludeResourceId: resourceId7 }
         });
         if (results.length > 0) {
           semanticContext = {
@@ -11232,10 +11235,10 @@ Summary:`;
    * Get resource annotations from view storage (fast path)
    * Throws if view missing
    */
-  static async getResourceAnnotations(resourceId4, kb) {
-    const view = await kb.views.get(resourceId4);
+  static async getResourceAnnotations(resourceId7, kb) {
+    const view = await kb.views.get(resourceId7);
     if (!view) {
-      throw new Error(`Resource ${resourceId4} not found in view storage`);
+      throw new Error(`Resource ${resourceId7} not found in view storage`);
     }
     return view.annotations;
   }
@@ -11243,8 +11246,8 @@ Summary:`;
    * Get all annotations
    * @returns Array of all annotation objects
    */
-  static async getAllAnnotations(resourceId4, kb) {
-    const annotations = await this.getResourceAnnotations(resourceId4, kb);
+  static async getAllAnnotations(resourceId7, kb) {
+    const annotations = await this.getResourceAnnotations(resourceId7, kb);
     return await this.enrichResolvedReferences(annotations.annotations, kb);
   }
   /**
@@ -11313,8 +11316,8 @@ Summary:`;
    * Get resource stats (version info)
    * @returns Version and timestamp info for the annotations
    */
-  static async getResourceStats(resourceId4, kb) {
-    const annotations = await this.getResourceAnnotations(resourceId4, kb);
+  static async getResourceStats(resourceId7, kb) {
+    const annotations = await this.getResourceAnnotations(resourceId7, kb);
     return {
       resourceId: annotations.resourceId,
       version: annotations.version,
@@ -11324,16 +11327,16 @@ Summary:`;
   /**
    * Check if resource exists in view storage
    */
-  static async resourceExists(resourceId4, kb) {
-    return await kb.views.exists(resourceId4);
+  static async resourceExists(resourceId7, kb) {
+    return await kb.views.exists(resourceId7);
   }
   /**
    * Get a single annotation by ID
    * O(1) lookup using resource ID to access view storage
    */
-  static async getAnnotation(annotationId2, resourceId4, kb) {
-    const annotations = await this.getResourceAnnotations(resourceId4, kb);
-    return annotations.annotations.find((a) => a.id === annotationId2) || null;
+  static async getAnnotation(annotationId3, resourceId7, kb) {
+    const annotations = await this.getResourceAnnotations(resourceId7, kb);
+    return annotations.annotations.find((a) => a.id === annotationId3) || null;
   }
   /**
    * List annotations with optional filtering
@@ -11349,8 +11352,8 @@ Summary:`;
   /**
    * Get annotation context (selected text with surrounding context)
    */
-  static async getAnnotationContext(annotationId2, resourceId4, contextBefore, contextAfter, kb) {
-    const annotation = await this.getAnnotation(annotationId2, resourceId4, kb);
+  static async getAnnotationContext(annotationId3, resourceId7, contextBefore, contextAfter, kb) {
+    const annotation = await this.getAnnotation(annotationId3, resourceId7, kb);
     if (!annotation) {
       throw new Error("Annotation not found");
     }
@@ -11382,8 +11385,8 @@ Summary:`;
   /**
    * Generate AI summary of annotation in context
    */
-  static async generateAnnotationSummary(annotationId2, resourceId4, kb, inferenceClient) {
-    const annotation = await this.getAnnotation(annotationId2, resourceId4, kb);
+  static async generateAnnotationSummary(annotationId3, resourceId7, kb, inferenceClient) {
+    const annotation = await this.getAnnotation(annotationId3, resourceId7, kb);
     if (!annotation) {
       throw new Error("Annotation not found");
     }
@@ -11469,8 +11472,8 @@ var GraphContext = class {
    * Get all resources referencing this resource (backlinks)
    * Requires graph traversal - must use graph database
    */
-  static async getBacklinks(resourceId4, kb) {
-    return await kb.graph.getResourceReferencedBy(resourceId4);
+  static async getBacklinks(resourceId7, kb) {
+    return await kb.graph.getResourceReferencedBy(resourceId7);
   }
   /**
    * Find shortest path between two resources
@@ -11483,8 +11486,8 @@ var GraphContext = class {
    * Get resource connections (graph edges)
    * Requires graph traversal - must use graph database
    */
-  static async getResourceConnections(resourceId4, kb) {
-    return await kb.graph.getResourceConnections(resourceId4);
+  static async getResourceConnections(resourceId7, kb) {
+    return await kb.graph.getResourceConnections(resourceId7);
   }
   /**
    * Search resources by name (cross-resource query)
@@ -11497,12 +11500,12 @@ var GraphContext = class {
    * Build graph representation with nodes and edges for a resource and its connections
    * Retrieves connections from graph and builds visualization-ready structure
    */
-  static async buildGraphRepresentation(resourceId4, maxRelated, kb) {
-    const mainDoc = await kb.graph.getResource(resourceId4);
+  static async buildGraphRepresentation(resourceId7, maxRelated, kb) {
+    const mainDoc = await kb.graph.getResource(resourceId7);
     if (!mainDoc) {
       throw new Error("Resource not found");
     }
-    const connections = await kb.graph.getResourceConnections(resourceId4);
+    const connections = await kb.graph.getResourceConnections(resourceId7);
     const relatedDocs = connections.map((conn) => conn.targetResource).slice(0, maxRelated - 1);
     const nodes = [
       {
@@ -11519,7 +11522,7 @@ var GraphContext = class {
       }))
     ].filter((node) => node.id !== void 0);
     const edges = connections.slice(0, maxRelated - 1).map((conn) => ({
-      source: resourceId4,
+      source: resourceId7,
       target: getResourceId2(conn.targetResource),
       type: conn.relationshipType || "link",
       metadata: {}
@@ -11536,19 +11539,19 @@ var LLMContext = class {
    * Get comprehensive LLM context for a resource
    * Includes: main resource, related resources, annotations, graph, content, summary, references
    */
-  static async getResourceContext(resourceId4, options, kb, inferenceClient) {
-    const mainDoc = await ResourceContext.getResourceMetadata(resourceId4, kb);
+  static async getResourceContext(resourceId7, options, kb, inferenceClient) {
+    const mainDoc = await ResourceContext.getResourceMetadata(resourceId7, kb);
     if (!mainDoc) {
       throw new Error("Resource not found");
     }
     const mainContent = options.includeContent ? await ResourceContext.getResourceContent(mainDoc, kb) : void 0;
     const graph = await GraphContext.buildGraphRepresentation(
-      resourceId4,
+      resourceId7,
       options.maxResources,
       kb
     );
     const relatedDocs = [];
-    const resourceIdStr = resourceId4.toString();
+    const resourceIdStr = resourceId7.toString();
     for (const node of graph.nodes) {
       if (node.id !== resourceIdStr) {
         const relatedDoc = await ResourceContext.getResourceMetadata(makeResourceId3(node.id), kb);
@@ -11570,7 +11573,7 @@ var LLMContext = class {
         })
       );
     }
-    const annotations = await AnnotationContext.getAllAnnotations(resourceId4, kb);
+    const annotations = await AnnotationContext.getAllAnnotations(resourceId7, kb);
     const summary = options.includeSummary && mainContent ? await generateResourceSummary(
       mainDoc.name,
       mainContent,
@@ -11630,6 +11633,7 @@ var Gatherer = class {
   // Gather handlers (existing)
   // ========================================================================
   async handleAnnotationGather(event) {
+    const resultBus = this.eventBus.scope(event.resourceId);
     try {
       this.logger.debug("Gathering annotation context", {
         annotationId: event.annotationId,
@@ -11637,14 +11641,14 @@ var Gatherer = class {
       });
       const response = await AnnotationContext.buildLLMContext(
         makeAnnotationId3(event.annotationId),
-        event.resourceId,
+        resourceId(event.resourceId),
         this.kb,
         event.options ?? {},
         this.inferenceClient,
         this.logger,
         this.embeddingProvider
       );
-      this.eventBus.get("gather:complete").next({
+      resultBus.get("gather:complete").next({
         correlationId: event.correlationId,
         annotationId: event.annotationId,
         response
@@ -11654,25 +11658,26 @@ var Gatherer = class {
         annotationId: event.annotationId,
         error
       });
-      this.eventBus.get("gather:failed").next({
+      resultBus.get("gather:failed").next({
         correlationId: event.correlationId,
         annotationId: event.annotationId,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
   async handleResourceGather(event) {
+    const resultBus = this.eventBus.scope(event.resourceId);
     try {
       this.logger.debug("Gathering resource context", {
         resourceId: event.resourceId
       });
       const result = await LLMContext.getResourceContext(
-        event.resourceId,
+        resourceId(event.resourceId),
         event.options,
         this.kb,
         this.inferenceClient
       );
-      this.eventBus.get("gather:resource-complete").next({
+      resultBus.get("gather:resource-complete").next({
         correlationId: event.correlationId,
         resourceId: event.resourceId,
         response: result
@@ -11682,17 +11687,17 @@ var Gatherer = class {
         resourceId: event.resourceId,
         error
       });
-      this.eventBus.get("gather:resource-failed").next({
+      resultBus.get("gather:resource-failed").next({
         correlationId: event.correlationId,
         resourceId: event.resourceId,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
-  async generateAnnotationSummary(annotationId2, resourceId4) {
+  async generateAnnotationSummary(annotationId3, resourceId7) {
     return AnnotationContext.generateAnnotationSummary(
-      annotationId2,
-      resourceId4,
+      annotationId3,
+      resourceId7,
       this.kb,
       this.inferenceClient
     );
@@ -11709,7 +11714,7 @@ var Gatherer = class {
 // src/matcher.ts
 var import_rxjs4 = __toESM(require_cjs(), 1);
 var import_operators4 = __toESM(require_operators(), 1);
-import { resourceId } from "@semiont/core";
+import { resourceId as resourceId2 } from "@semiont/core";
 import { getResourceId as getResourceId4, getResourceEntityTypes as getResourceEntityTypes4 } from "@semiont/api-client";
 var Matcher = class {
   constructor(kb, eventBus, logger, inferenceClient, embeddingProvider) {
@@ -11733,6 +11738,7 @@ var Matcher = class {
   }
   async handleSearch(event) {
     try {
+      const resultBus = this.eventBus.scope(event.resourceId);
       const context = event.context;
       const selectedText = context.sourceContext?.selected ?? "";
       const userHint = context.userHint ?? "";
@@ -11749,7 +11755,7 @@ var Matcher = class {
         event.useSemanticScoring
       );
       const limited = event.limit ? scored.slice(0, event.limit) : scored;
-      this.eventBus.get("match:search-results").next({
+      resultBus.get("match:search-results").next({
         correlationId: event.correlationId,
         referenceId: event.referenceId,
         response: limited
@@ -11759,7 +11765,7 @@ var Matcher = class {
         referenceId: event.referenceId,
         error
       });
-      this.eventBus.get("match:search-failed").next({
+      this.eventBus.scope(event.resourceId).get("match:search-failed").next({
         correlationId: event.correlationId,
         referenceId: event.referenceId,
         error: error instanceof Error ? error.message : String(error)
@@ -11792,7 +11798,7 @@ var Matcher = class {
     ]);
     const neighborResources = await Promise.all(
       connections.map(
-        (conn) => this.kb.graph.getResource(resourceId(conn.resourceId)).catch(() => null)
+        (conn) => this.kb.graph.getResource(resourceId2(conn.resourceId)).catch(() => null)
       )
     );
     const candidateMap = /* @__PURE__ */ new Map();
@@ -11814,7 +11820,7 @@ var Matcher = class {
     const semanticScores = /* @__PURE__ */ new Map();
     for (const sm of semanticMatches) {
       semanticScores.set(sm.resourceId, sm.score);
-      const resource = await this.kb.graph.getResource(resourceId(sm.resourceId)).catch(() => null);
+      const resource = await this.kb.graph.getResource(resourceId2(sm.resourceId)).catch(() => null);
       if (resource) addCandidate(resource, "semantic");
     }
     this.logger.debug("Candidate retrieval", {
@@ -12029,9 +12035,8 @@ No explanations.`;
 var import_rxjs5 = __toESM(require_cjs(), 1);
 var import_operators5 = __toESM(require_operators(), 1);
 import { promises as fs } from "fs";
-import { resourceId as resourceId2, userId as makeUserId, annotationId as makeAnnotationId4, CREATION_METHODS, generateUuid } from "@semiont/core";
+import { resourceId as resourceId3, userId as makeUserId, annotationId as makeAnnotationId4, CREATION_METHODS, generateUuid } from "@semiont/core";
 import { resolveStorageUri } from "@semiont/event-sourcing";
-import { getExtensionForMimeType } from "@semiont/content";
 var Stower = class {
   constructor(kb, eventBus, logger) {
     this.kb = kb;
@@ -12058,8 +12063,8 @@ var Stower = class {
       pipe("job:report-progress", (e) => this.handleJobReportProgress(e)),
       pipe("job:complete", (e) => this.handleJobComplete(e)),
       pipe("job:fail", (e) => this.handleJobFail(e)),
-      pipe("embedding:computed", (e) => this.handleEmbeddingComputed(e)),
-      pipe("embedding:deleted", (e) => this.handleEmbeddingDeleted(e))
+      pipe("embedding:compute", (e) => this.handleEmbeddingComputed(e)),
+      pipe("embedding:delete", (e) => this.handleEmbeddingDeleted(e))
     ).subscribe({
       error: (err) => this.logger.error("Stower pipeline error", { error: err })
     });
@@ -12069,40 +12074,29 @@ var Stower = class {
   // ========================================================================
   async handleYieldCreate(event) {
     try {
-      const rId = resourceId2(generateUuid());
-      let checksum;
-      let byteSize;
-      const resolvedStorageUri = event.storageUri ?? deriveStorageUri(event.name, event.format);
-      if (event.content !== void 0) {
-        const stored = await this.kb.content.store(event.content, resolvedStorageUri, { noGit: event.noGit });
-        checksum = stored.checksum;
-        byteSize = stored.byteSize;
-      } else {
-        if (!event.storageUri) {
-          throw new Error("yield:create without content requires storageUri");
-        }
-        const stored = await this.kb.content.register(resolvedStorageUri, event.contentChecksum, { noGit: event.noGit });
-        checksum = stored.checksum;
-        byteSize = stored.byteSize;
-      }
+      const rId = resourceId3(generateUuid());
+      const stored = await this.kb.content.register(event.storageUri, event.contentChecksum, { noGit: event.noGit });
+      const checksum = stored.checksum;
+      const byteSize = event.byteSize;
       const validCreationMethods = Object.values(CREATION_METHODS);
       const validatedCreationMethod = event.creationMethod && validCreationMethods.includes(event.creationMethod) ? event.creationMethod : CREATION_METHODS.API;
+      const generatedFrom = event.generatedFrom?.resourceId && event.generatedFrom?.annotationId ? { resourceId: event.generatedFrom.resourceId, annotationId: event.generatedFrom.annotationId } : void 0;
       await this.kb.eventStore.appendEvent({
-        type: "resource.created",
+        type: "yield:created",
         resourceId: rId,
-        userId: event.userId,
+        userId: makeUserId(event.userId),
         version: 1,
         payload: {
           name: event.name,
           format: event.format,
           contentChecksum: checksum,
           contentByteSize: byteSize,
-          storageUri: resolvedStorageUri,
+          storageUri: event.storageUri,
           creationMethod: validatedCreationMethod,
           entityTypes: event.entityTypes || [],
           language: event.language || void 0,
           isDraft: event.isDraft ?? false,
-          generatedFrom: event.generatedFrom,
+          generatedFrom,
           generationPrompt: event.generationPrompt,
           generator: event.generator
         }
@@ -12127,40 +12121,33 @@ var Stower = class {
           }
         ]
       };
-      this.eventBus.get("yield:created").next({ resourceId: rId, resource });
+      this.eventBus.get("yield:create-ok").next({ resourceId: rId, resource });
     } catch (error) {
       this.logger.error("Failed to create resource", { error });
       this.eventBus.get("yield:create-failed").next({
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
   async handleYieldUpdate(event) {
     try {
-      let byteSize;
-      if (event.content) {
-        const stored = await this.kb.content.store(event.content, event.storageUri, { noGit: event.noGit });
-        byteSize = stored.byteSize;
-      } else {
-        const stored = await this.kb.content.register(event.storageUri, event.contentChecksum, { noGit: event.noGit });
-        byteSize = stored.byteSize;
-      }
+      await this.kb.content.register(event.storageUri, event.contentChecksum, { noGit: event.noGit });
       await this.kb.eventStore.appendEvent({
-        type: "resource.updated",
-        resourceId: event.resourceId,
-        userId: event.userId,
+        type: "yield:updated",
+        resourceId: resourceId3(event.resourceId),
+        userId: makeUserId(event.userId),
         version: 1,
         payload: {
           contentChecksum: event.contentChecksum,
-          contentByteSize: byteSize
+          contentByteSize: event.byteSize
         }
       });
-      this.eventBus.get("yield:updated").next({ resourceId: event.resourceId });
+      this.eventBus.get("yield:update-ok").next({ resourceId: event.resourceId });
     } catch (error) {
       this.logger.error("Failed to update resource", { error });
       this.eventBus.get("yield:update-failed").next({
         resourceId: event.resourceId,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
@@ -12173,28 +12160,28 @@ var Stower = class {
       this.logger.error("Failed to resolve resource for move", { fromUri: event.fromUri, error });
       this.eventBus.get("yield:move-failed").next({
         fromUri: event.fromUri,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
       return;
     }
     try {
       await this.kb.content.move(event.fromUri, event.toUri, { noGit: event.noGit });
       await this.kb.eventStore.appendEvent({
-        type: "resource.moved",
+        type: "yield:moved",
         resourceId: rId,
-        userId: event.userId,
+        userId: makeUserId(event.userId),
         version: 1,
         payload: {
           fromUri: event.fromUri,
           toUri: event.toUri
         }
       });
-      this.eventBus.get("yield:moved").next({ resourceId: rId });
+      this.eventBus.get("yield:move-ok").next({ resourceId: rId });
     } catch (error) {
       this.logger.error("Failed to move resource", { error });
       this.eventBus.get("yield:move-failed").next({
         fromUri: event.fromUri,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
@@ -12202,17 +12189,17 @@ var Stower = class {
     try {
       this.logger.debug("Stowing annotation", { annotationId: event.annotation.id });
       await this.kb.eventStore.appendEvent({
-        type: "annotation.added",
-        resourceId: event.resourceId,
-        userId: event.userId,
+        type: "mark:added",
+        resourceId: resourceId3(event.resourceId),
+        userId: makeUserId(event.userId),
         version: 1,
         payload: { annotation: event.annotation }
       });
-      this.eventBus.get("mark:created").next({ annotationId: makeAnnotationId4(event.annotation.id) });
+      this.eventBus.get("mark:create-ok").next({ annotationId: makeAnnotationId4(event.annotation.id) });
     } catch (error) {
       this.logger.error("Failed to create annotation", { error });
       this.eventBus.get("mark:create-failed").next({
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
@@ -12222,54 +12209,60 @@ var Stower = class {
     }
     try {
       await this.kb.eventStore.appendEvent({
-        type: "annotation.removed",
-        resourceId: event.resourceId,
-        userId: event.userId,
+        type: "mark:removed",
+        resourceId: resourceId3(event.resourceId),
+        userId: makeUserId(event.userId),
         version: 1,
         payload: { annotationId: event.annotationId }
       });
-      this.eventBus.get("mark:deleted").next({ annotationId: event.annotationId });
+      this.eventBus.get("mark:delete-ok").next({ annotationId: event.annotationId });
     } catch (error) {
       this.logger.error("Failed to delete annotation", { error });
       this.eventBus.get("mark:delete-failed").next({
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
   async handleMarkUpdateBody(event) {
     try {
-      const stored = await this.kb.eventStore.appendEvent({
-        type: "annotation.body.updated",
-        resourceId: event.resourceId,
-        userId: event.userId,
-        version: 1,
-        payload: { annotationId: event.annotationId, operations: event.operations }
-      });
-      this.eventBus.get("mark:body-updated").next(stored.event);
+      await this.kb.eventStore.appendEvent(
+        {
+          type: "mark:body-updated",
+          resourceId: resourceId3(event.resourceId),
+          userId: makeUserId(event.userId),
+          version: 1,
+          payload: { annotationId: event.annotationId, operations: event.operations }
+        },
+        // Thread correlationId from the command into event metadata so the
+        // events-stream can deliver it to the client that initiated the bind.
+        event.correlationId ? { correlationId: event.correlationId } : void 0
+      );
     } catch (error) {
       this.logger.error("Failed to update annotation body", { error });
       this.eventBus.get("mark:body-update-failed").next({
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
   async handleMarkArchive(event) {
-    if (!event || typeof event !== "object" || !("userId" in event) || !("resourceId" in event) || !event.resourceId) {
+    if (!event.userId) {
+      this.logger.warn("mark:archive missing userId \u2014 skipping (frontend-only event?)");
       return;
     }
     if (event.storageUri) {
       await this.kb.content.remove(event.storageUri, { keepFile: event.keepFile, noGit: event.noGit });
     }
     await this.kb.eventStore.appendEvent({
-      type: "resource.archived",
-      resourceId: event.resourceId,
-      userId: event.userId,
+      type: "mark:archived",
+      resourceId: resourceId3(event.resourceId),
+      userId: makeUserId(event.userId),
       version: 1,
       payload: { reason: void 0 }
     });
   }
   async handleMarkUnarchive(event) {
-    if (!event || typeof event !== "object" || !("userId" in event) || !("resourceId" in event) || !event.resourceId) {
+    if (!event.userId) {
+      this.logger.warn("mark:unarchive missing userId \u2014 skipping (frontend-only event?)");
       return;
     }
     if (event.storageUri) {
@@ -12282,9 +12275,9 @@ var Stower = class {
       }
     }
     await this.kb.eventStore.appendEvent({
-      type: "resource.unarchived",
-      resourceId: event.resourceId,
-      userId: event.userId,
+      type: "mark:unarchived",
+      resourceId: resourceId3(event.resourceId),
+      userId: makeUserId(event.userId),
       version: 1,
       payload: {}
     });
@@ -12292,16 +12285,15 @@ var Stower = class {
   async handleAddEntityType(event) {
     try {
       await this.kb.eventStore.appendEvent({
-        type: "entitytype.added",
-        userId: event.userId,
+        type: "mark:entity-type-added",
+        userId: makeUserId(event.userId),
         version: 1,
         payload: { entityType: event.tag }
       });
-      this.eventBus.get("mark:entity-type-added").next({ tag: event.tag });
     } catch (error) {
       this.logger.error("Failed to add entity type", { error });
       this.eventBus.get("mark:entity-type-add-failed").next({
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
@@ -12310,18 +12302,18 @@ var Stower = class {
     const removed = event.currentEntityTypes.filter((et) => !event.updatedEntityTypes.includes(et));
     for (const entityType of added) {
       await this.kb.eventStore.appendEvent({
-        type: "entitytag.added",
-        resourceId: event.resourceId,
-        userId: event.userId,
+        type: "mark:entity-tag-added",
+        resourceId: resourceId3(event.resourceId),
+        userId: makeUserId(event.userId),
         version: 1,
         payload: { entityType }
       });
     }
     for (const entityType of removed) {
       await this.kb.eventStore.appendEvent({
-        type: "entitytag.removed",
-        resourceId: event.resourceId,
-        userId: event.userId,
+        type: "mark:entity-tag-removed",
+        resourceId: resourceId3(event.resourceId),
+        userId: makeUserId(event.userId),
         version: 1,
         payload: { entityType }
       });
@@ -12329,18 +12321,18 @@ var Stower = class {
   }
   async handleJobStart(event) {
     await this.kb.eventStore.appendEvent({
-      type: "job.started",
-      resourceId: event.resourceId,
-      userId: event.userId,
+      type: "job:started",
+      resourceId: resourceId3(event.resourceId),
+      userId: makeUserId(event.userId),
       version: 1,
       payload: { jobId: event.jobId, jobType: event.jobType }
     });
   }
   async handleJobReportProgress(event) {
     await this.kb.eventStore.appendEvent({
-      type: "job.progress",
-      resourceId: event.resourceId,
-      userId: event.userId,
+      type: "job:progress",
+      resourceId: resourceId3(event.resourceId),
+      userId: makeUserId(event.userId),
       version: 1,
       payload: {
         jobId: event.jobId,
@@ -12352,9 +12344,9 @@ var Stower = class {
   }
   async handleJobComplete(event) {
     await this.kb.eventStore.appendEvent({
-      type: "job.completed",
-      resourceId: event.resourceId,
-      userId: event.userId,
+      type: "job:completed",
+      resourceId: resourceId3(event.resourceId),
+      userId: makeUserId(event.userId),
       version: 1,
       payload: {
         jobId: event.jobId,
@@ -12365,9 +12357,9 @@ var Stower = class {
   }
   async handleJobFail(event) {
     await this.kb.eventStore.appendEvent({
-      type: "job.failed",
-      resourceId: event.resourceId,
-      userId: event.userId,
+      type: "job:failed",
+      resourceId: resourceId3(event.resourceId),
+      userId: makeUserId(event.userId),
       version: 1,
       payload: {
         jobId: event.jobId,
@@ -12378,8 +12370,8 @@ var Stower = class {
   }
   async handleEmbeddingComputed(event) {
     await this.kb.eventStore.appendEvent({
-      type: "embedding.computed",
-      resourceId: event.resourceId,
+      type: "embedding:computed",
+      resourceId: resourceId3(event.resourceId),
       userId: makeUserId("did:web:system:smelter"),
       version: 1,
       payload: {
@@ -12394,8 +12386,8 @@ var Stower = class {
   }
   async handleEmbeddingDeleted(event) {
     await this.kb.eventStore.appendEvent({
-      type: "embedding.deleted",
-      resourceId: event.resourceId,
+      type: "embedding:deleted",
+      resourceId: resourceId3(event.resourceId),
       userId: makeUserId("did:web:system:smelter"),
       version: 1,
       payload: {
@@ -12409,18 +12401,13 @@ var Stower = class {
     this.logger.info("Stower actor stopped");
   }
 };
-function deriveStorageUri(name, format) {
-  const slug = name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
-  const ext = getExtensionForMimeType(format);
-  return `file://${slug}${ext}`;
-}
 
 // src/browser.ts
 var import_rxjs6 = __toESM(require_cjs(), 1);
 var import_operators6 = __toESM(require_operators(), 1);
 import { promises as fs3 } from "fs";
 import * as path2 from "path";
-import { resourceId as resourceId3 } from "@semiont/core";
+import { resourceId as resourceId4, annotationId } from "@semiont/core";
 import { getExactText as getExactText2, getTargetSource as getTargetSource2, getTargetSelector as getTargetSelector3, getResourceEntityTypes as getResourceEntityTypes5, getBodySource as getBodySource2 } from "@semiont/api-client";
 import { EventQuery as EventQuery3 } from "@semiont/event-sourcing";
 import { getEntityTypes as getEntityTypes2 } from "@semiont/ontology";
@@ -12480,12 +12467,12 @@ var Browser = class {
   async handleBrowseResource(event) {
     try {
       const eventQuery = new EventQuery3(this.kb.eventStore.log.storage);
-      const events = await eventQuery.getResourceEvents(event.resourceId);
-      const stored = await this.kb.eventStore.views.materializer.materialize(events, event.resourceId);
+      const events = await eventQuery.getResourceEvents(resourceId4(event.resourceId));
+      const stored = await this.kb.eventStore.views.materializer.materialize(events, resourceId4(event.resourceId));
       if (!stored) {
         this.eventBus.get("browse:resource-failed").next({
           correlationId: event.correlationId,
-          error: new Error("Resource not found")
+          message: "Resource not found"
         });
         return;
       }
@@ -12506,7 +12493,7 @@ var Browser = class {
       this.logger.error("Browse resource failed", { resourceId: event.resourceId, error });
       this.eventBus.get("browse:resource-failed").next({
         correlationId: event.correlationId,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
@@ -12536,13 +12523,13 @@ var Browser = class {
       this.logger.error("Browse resources failed", { error });
       this.eventBus.get("browse:resources-failed").next({
         correlationId: event.correlationId,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
   async handleBrowseAnnotations(event) {
     try {
-      const annotations = await AnnotationContext.getAllAnnotations(event.resourceId, this.kb);
+      const annotations = await AnnotationContext.getAllAnnotations(resourceId4(event.resourceId), this.kb);
       this.eventBus.get("browse:annotations-result").next({
         correlationId: event.correlationId,
         response: {
@@ -12554,25 +12541,25 @@ var Browser = class {
       this.logger.error("Browse annotations failed", { resourceId: event.resourceId, error });
       this.eventBus.get("browse:annotations-failed").next({
         correlationId: event.correlationId,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
   async handleBrowseAnnotation(event) {
     try {
-      const annotation = await AnnotationContext.getAnnotation(event.annotationId, event.resourceId, this.kb);
+      const annotation = await AnnotationContext.getAnnotation(annotationId(event.annotationId), resourceId4(event.resourceId), this.kb);
       if (!annotation) {
         this.eventBus.get("browse:annotation-failed").next({
           correlationId: event.correlationId,
-          error: new Error("Annotation not found")
+          message: "Annotation not found"
         });
         return;
       }
-      const resource = await ResourceContext.getResourceMetadata(event.resourceId, this.kb);
+      const resource = await ResourceContext.getResourceMetadata(resourceId4(event.resourceId), this.kb);
       let resolvedResource = null;
       const bodySource = getBodySource2(annotation.body);
       if (bodySource) {
-        resolvedResource = await ResourceContext.getResourceMetadata(resourceId3(bodySource), this.kb);
+        resolvedResource = await ResourceContext.getResourceMetadata(resourceId4(bodySource), this.kb);
       }
       this.eventBus.get("browse:annotation-result").next({
         correlationId: event.correlationId,
@@ -12586,7 +12573,7 @@ var Browser = class {
       this.logger.error("Browse annotation failed", { resourceId: event.resourceId, annotationId: event.annotationId, error });
       this.eventBus.get("browse:annotation-failed").next({
         correlationId: event.correlationId,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
@@ -12594,7 +12581,7 @@ var Browser = class {
     try {
       const eventQuery = new EventQuery3(this.kb.eventStore.log.storage);
       const filters = {
-        resourceId: event.resourceId
+        resourceId: resourceId4(event.resourceId)
       };
       if (event.type) {
         filters.eventTypes = [event.type];
@@ -12606,26 +12593,11 @@ var Browser = class {
         filters.limit = event.limit;
       }
       const storedEvents = await eventQuery.queryEvents(filters);
-      const events = storedEvents.map((stored) => ({
-        event: {
-          id: stored.event.id,
-          type: stored.event.type,
-          timestamp: stored.event.timestamp,
-          userId: stored.event.userId,
-          resourceId: stored.event.resourceId,
-          payload: stored.event.payload
-        },
-        metadata: {
-          sequenceNumber: stored.metadata.sequenceNumber,
-          prevEventHash: stored.metadata.prevEventHash,
-          checksum: stored.metadata.checksum
-        }
-      }));
       this.eventBus.get("browse:events-result").next({
         correlationId: event.correlationId,
         response: {
-          events,
-          total: events.length,
+          events: storedEvents,
+          total: storedEvents.length,
           resourceId: event.resourceId
         }
       });
@@ -12633,47 +12605,34 @@ var Browser = class {
       this.logger.error("Browse events failed", { resourceId: event.resourceId, error });
       this.eventBus.get("browse:events-failed").next({
         correlationId: event.correlationId,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
   async handleBrowseAnnotationHistory(event) {
     try {
-      const annotation = await AnnotationContext.getAnnotation(event.annotationId, event.resourceId, this.kb);
+      const annotation = await AnnotationContext.getAnnotation(annotationId(event.annotationId), resourceId4(event.resourceId), this.kb);
       if (!annotation) {
         this.eventBus.get("browse:annotation-history-failed").next({
           correlationId: event.correlationId,
-          error: new Error("Annotation not found")
+          message: "Annotation not found"
         });
         return;
       }
       const eventQuery = new EventQuery3(this.kb.eventStore.log.storage);
-      const allEvents = await eventQuery.queryEvents({ resourceId: event.resourceId });
+      const allEvents = await eventQuery.queryEvents({ resourceId: resourceId4(event.resourceId) });
       const annotationEvents = allEvents.filter((stored) => {
-        const ev = stored.event;
-        if ("highlightId" in ev.payload && ev.payload.highlightId === event.annotationId) return true;
-        if ("referenceId" in ev.payload && ev.payload.referenceId === event.annotationId) return true;
+        const p = stored.payload;
+        if (p?.highlightId === event.annotationId) return true;
+        if (p?.referenceId === event.annotationId) return true;
         return false;
       });
-      const events = annotationEvents.map((stored) => ({
-        id: stored.event.id,
-        type: stored.event.type,
-        timestamp: stored.event.timestamp,
-        userId: stored.event.userId,
-        resourceId: stored.event.resourceId,
-        payload: stored.event.payload,
-        metadata: {
-          sequenceNumber: stored.metadata.sequenceNumber,
-          prevEventHash: stored.metadata.prevEventHash,
-          checksum: stored.metadata.checksum
-        }
-      }));
-      events.sort((a, b) => a.metadata.sequenceNumber - b.metadata.sequenceNumber);
+      annotationEvents.sort((a, b) => a.metadata.sequenceNumber - b.metadata.sequenceNumber);
       this.eventBus.get("browse:annotation-history-result").next({
         correlationId: event.correlationId,
         response: {
-          events,
-          total: events.length,
+          events: annotationEvents,
+          total: annotationEvents.length,
           annotationId: event.annotationId,
           resourceId: event.resourceId
         }
@@ -12682,7 +12641,7 @@ var Browser = class {
       this.logger.error("Browse annotation history failed", { resourceId: event.resourceId, annotationId: event.annotationId, error });
       this.eventBus.get("browse:annotation-history-failed").next({
         correlationId: event.correlationId,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
@@ -12692,9 +12651,9 @@ var Browser = class {
         resourceId: event.resourceId,
         motivation: event.motivation || "all"
       });
-      const references = await this.kb.graph.getResourceReferencedBy(event.resourceId, event.motivation);
+      const references = await this.kb.graph.getResourceReferencedBy(resourceId4(event.resourceId), event.motivation);
       const sourceIds = [...new Set(references.map((ref) => getTargetSource2(ref.target)))];
-      const resources = await Promise.all(sourceIds.map((id) => this.kb.graph.getResource(resourceId3(id))));
+      const resources = await Promise.all(sourceIds.map((id) => this.kb.graph.getResource(resourceId4(id))));
       for (let i = 0; i < sourceIds.length; i++) {
         if (resources[i] === null) {
           this.logger.warn("Referenced resource not found in graph", { resourceId: sourceIds[i] });
@@ -12724,7 +12683,7 @@ var Browser = class {
       this.logger.error("Referenced-by query failed", { resourceId: event.resourceId, error });
       this.eventBus.get("browse:referenced-by-failed").next({
         correlationId: event.correlationId,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
@@ -12739,7 +12698,7 @@ var Browser = class {
       this.logger.error("Entity types read failed", { error });
       this.eventBus.get("browse:entity-types-failed").next({
         correlationId: event.correlationId,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
@@ -12754,7 +12713,7 @@ var Browser = class {
       this.eventBus.get("browse:directory-failed").next({
         correlationId,
         path: reqPath,
-        error: new Error("path escapes project root")
+        message: "path escapes project root"
       });
       return;
     }
@@ -12766,7 +12725,7 @@ var Browser = class {
       this.eventBus.get("browse:directory-failed").next({
         correlationId,
         path: reqPath,
-        error: new Error(msg)
+        message: msg
       });
       return;
     }
@@ -12851,25 +12810,27 @@ var Browser = class {
 // src/clone-token-manager.ts
 var import_rxjs8 = __toESM(require_cjs(), 1);
 var import_operators8 = __toESM(require_operators(), 1);
-import { CREATION_METHODS as CREATION_METHODS2, cloneToken as makeCloneToken } from "@semiont/core";
+import { CREATION_METHODS as CREATION_METHODS2, cloneToken as makeCloneToken, resourceId as resourceId5, userId as makeUserId2 } from "@semiont/core";
 import { getPrimaryRepresentation as getPrimaryRepresentation3, getResourceEntityTypes as getResourceEntityTypes6 } from "@semiont/api-client";
+import { deriveStorageUri } from "@semiont/content";
 
 // src/resource-operations.ts
 var import_rxjs7 = __toESM(require_cjs(), 1);
 var import_operators7 = __toESM(require_operators(), 1);
+import { resourceId as makeResourceId4 } from "@semiont/core";
 var ResourceOperations = class {
   /**
    * Create a new resource via EventBus → Stower
    */
   static async createResource(input, userId2, eventBus) {
     const result$ = (0, import_rxjs7.race)(
-      eventBus.get("yield:created").pipe(
+      eventBus.get("yield:create-ok").pipe(
         (0, import_operators7.take)(1),
         (0, import_operators7.map)((result) => ({ ok: true, result }))
       ),
       eventBus.get("yield:create-failed").pipe(
         (0, import_operators7.take)(1),
-        (0, import_operators7.map)((failure) => ({ ok: false, error: failure.error }))
+        (0, import_operators7.map)((failure) => ({ ok: false, error: new Error(failure.message) }))
       ),
       (0, import_rxjs7.timer)(3e4).pipe(
         (0, import_operators7.map)(() => ({ ok: false, error: new Error("Resource creation timed out") }))
@@ -12877,19 +12838,20 @@ var ResourceOperations = class {
     );
     eventBus.get("yield:create").next({
       name: input.name,
-      content: input.content,
+      storageUri: input.storageUri,
+      contentChecksum: input.contentChecksum,
+      byteSize: input.byteSize,
       format: input.format,
       userId: userId2,
       language: input.language,
       entityTypes: input.entityTypes,
-      creationMethod: input.creationMethod,
-      storageUri: input.storageUri
+      creationMethod: input.creationMethod
     });
     const outcome = await (0, import_rxjs7.firstValueFrom)(result$);
     if (!outcome.ok) {
       throw outcome.error;
     }
-    return outcome.result.resourceId;
+    return makeResourceId4(outcome.result.resourceId);
   }
   /**
    * Update resource metadata via EventBus → Stower
@@ -12943,18 +12905,18 @@ var CloneTokenManager = class {
   }
   async handleGenerateToken(event) {
     try {
-      const resource = await ResourceContext.getResourceMetadata(event.resourceId, this.kb);
+      const resource = await ResourceContext.getResourceMetadata(resourceId5(event.resourceId), this.kb);
       if (!resource) {
         this.eventBus.get("yield:clone-token-failed").next({
           correlationId: event.correlationId,
-          error: new Error("Resource not found")
+          message: "Resource not found"
         });
         return;
       }
       if (!resource.storageUri) {
         this.eventBus.get("yield:clone-token-failed").next({
           correlationId: event.correlationId,
-          error: new Error("Resource content not found")
+          message: "Resource content not found"
         });
         return;
       }
@@ -12963,14 +12925,14 @@ var CloneTokenManager = class {
       } catch {
         this.eventBus.get("yield:clone-token-failed").next({
           correlationId: event.correlationId,
-          error: new Error("Resource content not found")
+          message: "Resource content not found"
         });
         return;
       }
       const tokenStr = `clone_${Math.random().toString(36).substring(2, 11)}_${Date.now()}`;
       const token = makeCloneToken(tokenStr);
       const expiresAt = new Date(Date.now() + 15 * 60 * 1e3);
-      this.tokens.set(token, { resourceId: event.resourceId, expiresAt });
+      this.tokens.set(token, { resourceId: resourceId5(event.resourceId), expiresAt });
       this.eventBus.get("yield:clone-token-generated").next({
         correlationId: event.correlationId,
         response: {
@@ -12983,7 +12945,7 @@ var CloneTokenManager = class {
       this.logger.error("Generate clone token failed", { resourceId: event.resourceId, error });
       this.eventBus.get("yield:clone-token-failed").next({
         correlationId: event.correlationId,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
@@ -12994,7 +12956,7 @@ var CloneTokenManager = class {
       if (!tokenData) {
         this.eventBus.get("yield:clone-resource-failed").next({
           correlationId: event.correlationId,
-          error: new Error("Invalid or expired token")
+          message: "Invalid or expired token"
         });
         return;
       }
@@ -13002,7 +12964,7 @@ var CloneTokenManager = class {
         this.tokens.delete(token);
         this.eventBus.get("yield:clone-resource-failed").next({
           correlationId: event.correlationId,
-          error: new Error("Token expired")
+          message: "Token expired"
         });
         return;
       }
@@ -13010,7 +12972,7 @@ var CloneTokenManager = class {
       if (!sourceResource) {
         this.eventBus.get("yield:clone-resource-failed").next({
           correlationId: event.correlationId,
-          error: new Error("Source resource not found")
+          message: "Source resource not found"
         });
         return;
       }
@@ -13025,7 +12987,7 @@ var CloneTokenManager = class {
       this.logger.error("Get clone resource failed", { token: event.token, error });
       this.eventBus.get("yield:clone-resource-failed").next({
         correlationId: event.correlationId,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
@@ -13036,7 +12998,7 @@ var CloneTokenManager = class {
       if (!tokenData) {
         this.eventBus.get("yield:clone-create-failed").next({
           correlationId: event.correlationId,
-          error: new Error("Invalid or expired token")
+          message: "Invalid or expired token"
         });
         return;
       }
@@ -13044,7 +13006,7 @@ var CloneTokenManager = class {
         this.tokens.delete(token);
         this.eventBus.get("yield:clone-create-failed").next({
           correlationId: event.correlationId,
-          error: new Error("Token expired")
+          message: "Token expired"
         });
         return;
       }
@@ -13052,7 +13014,7 @@ var CloneTokenManager = class {
       if (!sourceDoc) {
         this.eventBus.get("yield:clone-create-failed").next({
           correlationId: event.correlationId,
-          error: new Error("Source resource not found")
+          message: "Source resource not found"
         });
         return;
       }
@@ -13060,22 +13022,26 @@ var CloneTokenManager = class {
       const mediaType = primaryRep?.mediaType || "text/plain";
       const validFormats = ["text/plain", "text/markdown"];
       const format = validFormats.includes(mediaType) ? mediaType : "text/plain";
-      const resourceId4 = await ResourceOperations.createResource(
+      const resolvedUri = deriveStorageUri(event.name, format);
+      const stored = await this.kb.content.store(Buffer.from(event.content), resolvedUri);
+      const newResourceId = await ResourceOperations.createResource(
         {
           name: event.name,
-          content: Buffer.from(event.content),
+          storageUri: resolvedUri,
+          contentChecksum: stored.checksum,
+          byteSize: stored.byteSize,
           format,
           entityTypes: getResourceEntityTypes6(sourceDoc),
           creationMethod: CREATION_METHODS2.CLONE
         },
-        event.userId,
+        makeUserId2(event.userId),
         this.eventBus
       );
       if (event.archiveOriginal) {
         ResourceOperations.updateResource(
           {
             resourceId: tokenData.resourceId,
-            userId: event.userId,
+            userId: makeUserId2(event.userId),
             currentArchived: sourceDoc.archived,
             updatedArchived: true
           },
@@ -13085,13 +13051,13 @@ var CloneTokenManager = class {
       this.tokens.delete(token);
       this.eventBus.get("yield:clone-created").next({
         correlationId: event.correlationId,
-        response: { resourceId: resourceId4 }
+        response: { resourceId: newResourceId }
       });
     } catch (error) {
       this.logger.error("Clone create failed", { token: event.token, error });
       this.eventBus.get("yield:clone-create-failed").next({
         correlationId: event.correlationId,
-        error: error instanceof Error ? error : new Error(String(error))
+        message: error instanceof Error ? error.message : String(error)
       });
     }
   }
@@ -13108,39 +13074,25 @@ var CloneTokenManager = class {
 // src/bootstrap/entity-types.ts
 var import_rxjs9 = __toESM(require_cjs(), 1);
 var import_operators9 = __toESM(require_operators(), 1);
-import { promises as fs4 } from "fs";
-import * as path3 from "path";
 import { DEFAULT_ENTITY_TYPES } from "@semiont/ontology";
-import { userId } from "@semiont/core";
-var bootstrapCompleted = false;
-async function bootstrapEntityTypes(eventBus, project, logger) {
-  if (bootstrapCompleted) {
-    logger?.debug("Entity types bootstrap already completed, skipping");
-    return;
-  }
-  const projectionPath = path3.join(
-    project.stateDir,
-    "projections",
-    "__system__",
-    "entitytypes.json"
+import { userId, resourceId as resourceId6 } from "@semiont/core";
+async function bootstrapEntityTypes(eventBus, eventStore, logger) {
+  const systemEvents = await eventStore.log.getEvents(resourceId6("__system__"));
+  const existingTypes = new Set(
+    systemEvents.filter((e) => e.type === "mark:entity-type-added").map((e) => e.payload.entityType)
   );
-  try {
-    await fs4.access(projectionPath);
-    logger?.info("Entity types projection already exists, skipping bootstrap");
-    bootstrapCompleted = true;
+  const missing = DEFAULT_ENTITY_TYPES.filter((t) => !existingTypes.has(t));
+  if (missing.length === 0) {
+    logger?.info("All entity types already in event log, skipping bootstrap", { count: existingTypes.size });
     return;
-  } catch (error) {
-    if (error.code !== "ENOENT") {
-      throw error;
-    }
-    logger?.info("Entity types projection does not exist, bootstrapping with DEFAULT_ENTITY_TYPES");
   }
+  logger?.info("Bootstrapping missing entity types", { missing: missing.length, existing: existingTypes.size });
   const SYSTEM_USER_ID = userId("00000000-0000-0000-0000-000000000000");
-  for (const entityType of DEFAULT_ENTITY_TYPES) {
+  for (const entityType of missing) {
     logger?.debug("Adding entity type via EventBus", { entityType });
     const result$ = (0, import_rxjs9.race)(
       eventBus.get("mark:entity-type-added").pipe((0, import_operators9.take)(1), (0, import_operators9.map)(() => ({ ok: true }))),
-      eventBus.get("mark:entity-type-add-failed").pipe((0, import_operators9.take)(1), (0, import_operators9.map)((f) => ({ ok: false, error: f.error }))),
+      eventBus.get("mark:entity-type-add-failed").pipe((0, import_operators9.take)(1), (0, import_operators9.map)((f) => ({ ok: false, error: new Error(f.message) }))),
       (0, import_rxjs9.timer)(1e4).pipe((0, import_operators9.map)(() => ({ ok: false, error: new Error(`Timeout adding entity type: ${entityType}`) })))
     );
     eventBus.get("mark:add-entity-type").next({ tag: entityType, userId: SYSTEM_USER_ID });
@@ -13149,11 +13101,7 @@ async function bootstrapEntityTypes(eventBus, project, logger) {
       throw outcome.error;
     }
   }
-  logger?.info("Entity types bootstrap completed", { count: DEFAULT_ENTITY_TYPES.length });
-  bootstrapCompleted = true;
-}
-function resetBootstrap() {
-  bootstrapCompleted = false;
+  logger?.info("Entity types bootstrap completed", { added: missing.length, total: DEFAULT_ENTITY_TYPES.length });
 }
 
 // src/knowledge-system.ts
@@ -13175,9 +13123,9 @@ async function createJobQueue(project, eventBus, logger) {
   const jobStatusSubscription = eventBus.get("job:status-requested").pipe(
     (0, import_operators10.mergeMap)((event) => (0, import_rxjs10.from)((async () => {
       try {
-        const job = await jobQueue.getJob(event.jobId);
+        const job = await jobQueue.getJob(jobId(event.jobId));
         if (!job) {
-          eventBus.get("job:status-failed").next({ correlationId: event.correlationId, error: new Error("Job not found") });
+          eventBus.get("job:status-failed").next({ correlationId: event.correlationId, message: "Job not found" });
           return;
         }
         eventBus.get("job:status-result").next({
@@ -13198,7 +13146,7 @@ async function createJobQueue(project, eventBus, logger) {
       } catch (error) {
         eventBus.get("job:status-failed").next({
           correlationId: event.correlationId,
-          error: error instanceof Error ? error : new Error(String(error))
+          message: error instanceof Error ? error.message : String(error)
         });
       }
     })()))
@@ -13230,10 +13178,9 @@ async function createKnowledgeSystemFromConfig(project, config, eventBus, logger
       model: embeddingConfig.model
     });
   }
-  const kb = await createKnowledgeBase(eventStore, project, graphDb, logger, {
+  const kb = await createKnowledgeBase(eventStore, project, graphDb, eventBus, logger, {
     vectorStore,
     embeddingProvider,
-    eventBus,
     chunkingConfig: embeddingConfig?.chunking ? {
       chunkSize: embeddingConfig.chunking.chunkSize ?? 512,
       overlap: embeddingConfig.chunking.overlap ?? 64
@@ -13242,7 +13189,7 @@ async function createKnowledgeSystemFromConfig(project, config, eventBus, logger
   });
   const stower = new Stower(kb, eventBus, logger.child({ component: "stower" }));
   await stower.initialize();
-  await bootstrapEntityTypes(eventBus, project, logger.child({ component: "entity-types-bootstrap" }));
+  await bootstrapEntityTypes(eventBus, eventStore, logger.child({ component: "entity-types-bootstrap" }));
   const gatherer = new Gatherer(
     kb,
     eventBus,
@@ -13267,22 +13214,22 @@ async function createKnowledgeSystemFromConfig(project, config, eventBus, logger
   return ks;
 }
 function createContentFetcher(ks) {
-  return async (resourceId4) => {
-    const view = await ks.kb.views.get(resourceId4);
+  return async (resourceId7) => {
+    const view = await ks.kb.views.get(resourceId7);
     if (!view?.resource.storageUri) return null;
     const buffer = await ks.kb.content.retrieve(view.resource.storageUri);
     if (!buffer) return null;
     return Readable.from([buffer]);
   };
 }
-function createWorkers(jobQueue, contentFetcher, eventBus, config, logger) {
+function createWorkers(jobQueue, contentFetcher, contentStore, eventBus, config, logger) {
   const detection = (() => {
     const cfg = resolveWorkerInference(config, "reference-annotation");
     return new ReferenceAnnotationWorker(jobQueue, createInferenceClient(cfg, logger.child({ component: "inference-client-reference-annotation" })), inferenceConfigToGenerator("Reference Worker", cfg), eventBus, contentFetcher, logger.child({ component: "reference-detection-worker" }));
   })();
   const generation = (() => {
     const cfg = resolveWorkerInference(config, "generation");
-    return new GenerationWorker(jobQueue, createInferenceClient(cfg, logger.child({ component: "inference-client-generation" })), inferenceConfigToGenerator("Generation Worker", cfg), eventBus, logger.child({ component: "generation-worker" }));
+    return new GenerationWorker(jobQueue, createInferenceClient(cfg, logger.child({ component: "inference-client-generation" })), inferenceConfigToGenerator("Generation Worker", cfg), eventBus, contentStore, logger.child({ component: "generation-worker" }));
   })();
   const highlight = (() => {
     const cfg = resolveWorkerInference(config, "highlight-annotation");
@@ -13325,7 +13272,7 @@ async function startMakeMeaning(project, config, eventBus, logger, options) {
   const { jobQueue, jobStatusSubscription } = await createJobQueue(project, eventBus, logger);
   const knowledgeSystem = await createKnowledgeSystemFromConfig(project, config, eventBus, logger, skipRebuild);
   const contentFetcher = createContentFetcher(knowledgeSystem);
-  const workers = createWorkers(jobQueue, contentFetcher, eventBus, config, logger);
+  const workers = createWorkers(jobQueue, contentFetcher, knowledgeSystem.kb.content, eventBus, config, logger);
   startWorkers(workers, logger);
   return {
     knowledgeSystem,
@@ -13342,7 +13289,7 @@ async function startMakeMeaning(project, config, eventBus, logger, options) {
 }
 
 // src/exchange/backup-exporter.ts
-import { getExtensionForMimeType as getExtensionForMimeType2 } from "@semiont/content";
+import { getExtensionForMimeType } from "@semiont/content";
 
 // src/exchange/tar.ts
 import { createGzip, createGunzip } from "zlib";
@@ -13468,7 +13415,7 @@ async function exportBackup(options, output) {
   let totalContentBytes = 0;
   for (const [storageUri, mediaType] of contentRefs) {
     const data = await content.retrieve(storageUri);
-    const ext = getExtensionForMimeType2(mediaType);
+    const ext = getExtensionForMimeType(mediaType);
     contentBlobs.set(storageUri, { data, ext });
     totalContentBytes += data.length;
   }
@@ -13522,8 +13469,8 @@ function collectContentRefs(streamData) {
   const refs = /* @__PURE__ */ new Map();
   for (const [, events] of streamData) {
     for (const stored of events) {
-      if (stored.event.type === "resource.created") {
-        const payload = stored.event.payload;
+      if (stored.type === "yield:created") {
+        const payload = stored.payload;
         if (payload.storageUri && payload.format) {
           refs.set(payload.storageUri, payload.format);
         }
@@ -13536,8 +13483,9 @@ function collectContentRefs(streamData) {
 // src/exchange/replay.ts
 var import_rxjs11 = __toESM(require_cjs(), 1);
 var import_operators11 = __toESM(require_operators(), 1);
+import { deriveStorageUri as deriveStorageUri2 } from "@semiont/content";
 var REPLAY_TIMEOUT_MS = 3e4;
-async function replayEventStream(jsonl, eventBus, resolveBlob, logger) {
+async function replayEventStream(jsonl, eventBus, resolveBlob, contentStore, logger) {
   const lines = jsonl.trim().split("\n").filter((l) => l.length > 0);
   const storedEvents = lines.map((line) => JSON.parse(line));
   const stats = {
@@ -13562,51 +13510,51 @@ async function replayEventStream(jsonl, eventBus, resolveBlob, logger) {
     }
   }
   for (const stored of storedEvents) {
-    await replayEvent(stored.event, eventBus, resolveBlob, stats, logger);
+    await replayEvent(stored, eventBus, resolveBlob, contentStore, stats, logger);
     stats.eventsReplayed++;
   }
   return { stats, hashChainValid };
 }
-async function replayEvent(event, eventBus, resolveBlob, stats, logger) {
+async function replayEvent(event, eventBus, resolveBlob, contentStore, stats, logger) {
   switch (event.type) {
-    case "entitytype.added":
+    case "mark:entity-type-added":
       await replayEntityTypeAdded(event, eventBus, logger);
       stats.entityTypesAdded++;
       break;
-    case "resource.created":
-      await replayResourceCreated(event, eventBus, resolveBlob, logger);
+    case "yield:created":
+      await replayResourceCreated(event, eventBus, resolveBlob, contentStore, logger);
       stats.resourcesCreated++;
       break;
-    case "annotation.added":
+    case "mark:added":
       await replayAnnotationAdded(event, eventBus, logger);
       stats.annotationsCreated++;
       break;
-    case "annotation.body.updated":
+    case "mark:body-updated":
       await replayAnnotationBodyUpdated(event, eventBus, logger);
       break;
-    case "annotation.removed":
+    case "mark:removed":
       await replayAnnotationRemoved(event, eventBus, logger);
       break;
-    case "resource.archived":
+    case "mark:archived":
       await replayResourceArchived(event, eventBus, logger);
       break;
-    case "resource.unarchived":
+    case "mark:unarchived":
       await replayResourceUnarchived(event, eventBus, logger);
       break;
-    case "entitytag.added":
-    case "entitytag.removed":
+    case "mark:entity-tag-added":
+    case "mark:entity-tag-removed":
       await replayEntityTagChange(event, eventBus, logger);
       break;
     // Job events are transient — skip during replay
-    case "job.started":
-    case "job.progress":
-    case "job.completed":
-    case "job.failed":
+    case "job:started":
+    case "job:progress":
+    case "job:completed":
+    case "job:failed":
       logger?.debug("Skipping job event during replay", { type: event.type });
       break;
-    // Representation events — content is already stored via resource.created replay
-    case "representation.added":
-    case "representation.removed":
+    // Representation events — content is already stored via yield:created replay
+    case "yield:representation-added":
+    case "yield:representation-removed":
       logger?.debug("Skipping representation event during replay", { type: event.type });
       break;
     default:
@@ -13617,7 +13565,7 @@ async function replayEntityTypeAdded(event, eventBus, logger) {
   const result$ = (0, import_rxjs11.race)(
     eventBus.get("mark:entity-type-added").pipe((0, import_operators11.map)(() => "ok")),
     eventBus.get("mark:entity-type-add-failed").pipe((0, import_operators11.map)((e) => {
-      throw e.error;
+      throw new Error(e.message);
     })),
     (0, import_rxjs11.timer)(REPLAY_TIMEOUT_MS).pipe((0, import_operators11.map)(() => {
       throw new Error("Timeout waiting for mark:entity-type-added");
@@ -13630,24 +13578,28 @@ async function replayEntityTypeAdded(event, eventBus, logger) {
   await (0, import_rxjs11.firstValueFrom)(result$);
   logger?.debug("Replayed entitytype.added", { entityType: event.payload.entityType });
 }
-async function replayResourceCreated(event, eventBus, resolveBlob, logger) {
+async function replayResourceCreated(event, eventBus, resolveBlob, contentStore, logger) {
   const { payload } = event;
   const blob = resolveBlob(payload.contentChecksum);
   if (!blob) {
     throw new Error(`Missing content blob for checksum ${payload.contentChecksum}`);
   }
+  const resolvedUri = payload.storageUri || deriveStorageUri2(payload.name, payload.format);
+  const stored = await contentStore.store(blob, resolvedUri);
   const result$ = (0, import_rxjs11.race)(
-    eventBus.get("yield:created").pipe((0, import_operators11.map)((r) => r)),
+    eventBus.get("yield:create-ok").pipe((0, import_operators11.map)((r) => r)),
     eventBus.get("yield:create-failed").pipe((0, import_operators11.map)((e) => {
-      throw e.error;
+      throw new Error(e.message);
     })),
     (0, import_rxjs11.timer)(REPLAY_TIMEOUT_MS).pipe((0, import_operators11.map)(() => {
-      throw new Error("Timeout waiting for yield:created");
+      throw new Error("Timeout waiting for yield:create-ok");
     }))
   );
   eventBus.get("yield:create").next({
     name: payload.name,
-    content: blob,
+    storageUri: resolvedUri,
+    contentChecksum: stored.checksum,
+    byteSize: stored.byteSize,
     format: payload.format,
     userId: event.userId,
     language: payload.language,
@@ -13662,12 +13614,12 @@ async function replayResourceCreated(event, eventBus, resolveBlob, logger) {
 }
 async function replayAnnotationAdded(event, eventBus, logger) {
   const result$ = (0, import_rxjs11.race)(
-    eventBus.get("mark:created").pipe((0, import_operators11.map)(() => "ok")),
+    eventBus.get("mark:create-ok").pipe((0, import_operators11.map)(() => "ok")),
     eventBus.get("mark:create-failed").pipe((0, import_operators11.map)((e) => {
-      throw e.error;
+      throw new Error(e.message);
     })),
     (0, import_rxjs11.timer)(REPLAY_TIMEOUT_MS).pipe((0, import_operators11.map)(() => {
-      throw new Error("Timeout waiting for mark:created");
+      throw new Error("Timeout waiting for mark:create-ok");
     }))
   );
   eventBus.get("mark:create").next({
@@ -13682,7 +13634,7 @@ async function replayAnnotationBodyUpdated(event, eventBus, logger) {
   const result$ = (0, import_rxjs11.race)(
     eventBus.get("mark:body-updated").pipe((0, import_operators11.map)(() => "ok")),
     eventBus.get("mark:body-update-failed").pipe((0, import_operators11.map)((e) => {
-      throw e.error;
+      throw new Error(e.message);
     })),
     (0, import_rxjs11.timer)(REPLAY_TIMEOUT_MS).pipe((0, import_operators11.map)(() => {
       throw new Error("Timeout waiting for mark:body-updated");
@@ -13699,12 +13651,12 @@ async function replayAnnotationBodyUpdated(event, eventBus, logger) {
 }
 async function replayAnnotationRemoved(event, eventBus, logger) {
   const result$ = (0, import_rxjs11.race)(
-    eventBus.get("mark:deleted").pipe((0, import_operators11.map)(() => "ok")),
+    eventBus.get("mark:delete-ok").pipe((0, import_operators11.map)(() => "ok")),
     eventBus.get("mark:delete-failed").pipe((0, import_operators11.map)((e) => {
-      throw e.error;
+      throw new Error(e.message);
     })),
     (0, import_rxjs11.timer)(REPLAY_TIMEOUT_MS).pipe((0, import_operators11.map)(() => {
-      throw new Error("Timeout waiting for mark:deleted");
+      throw new Error("Timeout waiting for mark:delete-ok");
     }))
   );
   eventBus.get("mark:delete").next({
@@ -13730,18 +13682,18 @@ async function replayResourceUnarchived(event, eventBus, logger) {
   logger?.debug("Replayed resource.unarchived", { resourceId: event.resourceId });
 }
 async function replayEntityTagChange(event, eventBus, logger) {
-  const resourceId4 = event.resourceId;
+  const resourceId7 = event.resourceId;
   const entityType = event.payload.entityType;
-  if (event.type === "entitytag.added") {
+  if (event.type === "mark:entity-tag-added") {
     eventBus.get("mark:update-entity-types").next({
-      resourceId: resourceId4,
+      resourceId: resourceId7,
       userId: event.userId,
       currentEntityTypes: [],
       updatedEntityTypes: [entityType]
     });
   } else {
     eventBus.get("mark:update-entity-types").next({
-      resourceId: resourceId4,
+      resourceId: resourceId7,
       userId: event.userId,
       currentEntityTypes: [entityType],
       updatedEntityTypes: []
@@ -13766,7 +13718,7 @@ function buildBlobResolver(entries) {
   };
 }
 async function importBackup(archive, options) {
-  const { eventBus, logger } = options;
+  const { eventBus, contentStore, logger } = options;
   const entries = /* @__PURE__ */ new Map();
   for await (const entry of readTarGz(archive)) {
     entries.set(entry.name, entry.data);
@@ -13796,6 +13748,7 @@ async function importBackup(archive, options) {
       systemData.toString("utf8"),
       eventBus,
       resolveBlob,
+      contentStore,
       logger
     );
     stats = mergeStats(stats, result.stats);
@@ -13812,6 +13765,7 @@ async function importBackup(archive, options) {
       eventData.toString("utf8"),
       eventBus,
       resolveBlob,
+      contentStore,
       logger
     );
     stats = mergeStats(stats, result.stats);
@@ -13830,7 +13784,7 @@ function mergeStats(a, b) {
 }
 
 // src/exchange/linked-data-exporter.ts
-import { getExtensionForMimeType as getExtensionForMimeType3 } from "@semiont/content";
+import { getExtensionForMimeType as getExtensionForMimeType2 } from "@semiont/content";
 var SEMIONT_CONTEXT = [
   "https://schema.org/",
   "http://www.w3.org/ns/anno.jsonld",
@@ -13897,7 +13851,7 @@ async function exportLinkedData(options, output) {
   for (const [storageUri, mediaType] of contentRefs) {
     try {
       const data = await content.retrieve(storageUri);
-      const ext = getExtensionForMimeType3(mediaType);
+      const ext = getExtensionForMimeType2(mediaType);
       contentBlobs.set(storageUri, { data, ext });
     } catch (err) {
       logger?.warn("Failed to retrieve content blob", { storageUri, error: String(err) });
@@ -13922,10 +13876,10 @@ async function exportLinkedData(options, output) {
       data: Buffer.from(JSON.stringify(manifest, null, 2), "utf8")
     };
     for (const view of resourceViews) {
-      const resourceId4 = view.resource["@id"];
+      const resourceId7 = view.resource["@id"];
       const jsonld = buildResourceJsonLd(view.resource, view.annotations.annotations, sourceUrl);
       yield {
-        name: `.semiont/resources/${resourceId4}.jsonld`,
+        name: `.semiont/resources/${resourceId7}.jsonld`,
         data: Buffer.from(JSON.stringify(jsonld, null, 2), "utf8")
       };
     }
@@ -13942,8 +13896,8 @@ async function exportLinkedData(options, output) {
   return manifest;
 }
 function buildResourceJsonLd(resource, annotations, sourceUrl) {
-  const resourceId4 = resource["@id"];
-  const resourceUri = resourceId4.startsWith("http") ? resourceId4 : `${sourceUrl}/resources/${resourceId4}`;
+  const resourceId7 = resource["@id"];
+  const resourceUri = resourceId7.startsWith("http") ? resourceId7 : `${sourceUrl}/resources/${resourceId7}`;
   const doc = {
     "@context": SEMIONT_CONTEXT,
     "@id": resourceUri,
@@ -13977,7 +13931,7 @@ function buildResourceJsonLd(resource, annotations, sourceUrl) {
       if (rep.checksum) {
         const rawChecksum = rep.checksum.startsWith("sha256:") ? rep.checksum.slice(7) : rep.checksum;
         mediaObj["sha256"] = rawChecksum;
-        const ext = getExtensionForMimeType3(rep.mediaType);
+        const ext = getExtensionForMimeType2(rep.mediaType);
         mediaObj["name"] = `${rawChecksum}${ext}`;
       }
       if (rep.language) mediaObj["inLanguage"] = rep.language;
@@ -14005,6 +13959,8 @@ function collectContentRefsFromResource(resource, refs) {
 // src/exchange/linked-data-importer.ts
 var import_rxjs12 = __toESM(require_cjs(), 1);
 var import_operators12 = __toESM(require_operators(), 1);
+import { resourceId as makeResourceId5 } from "@semiont/core";
+import { deriveStorageUri as deriveStorageUri3 } from "@semiont/content";
 var IMPORT_TIMEOUT_MS = 3e4;
 function stripUriToId(uri) {
   if (!uri.includes("/")) return uri;
@@ -14058,7 +14014,7 @@ function buildBlobResolver2(entries) {
   };
 }
 async function importLinkedData(archive, options) {
-  const { eventBus, userId: userId2, logger } = options;
+  const { eventBus, contentStore, userId: userId2, logger } = options;
   const entries = /* @__PURE__ */ new Map();
   for await (const entry of readTarGz(archive)) {
     entries.set(entry.name, entry.data);
@@ -14089,7 +14045,7 @@ async function importLinkedData(archive, options) {
   let annotationsCreated = 0;
   for (const entryName of resourceEntries) {
     const resourceDoc = JSON.parse(entries.get(entryName).toString("utf8"));
-    const result = await importResource(resourceDoc, userId2, eventBus, resolveBlob, logger);
+    const result = await importResource(resourceDoc, userId2, eventBus, contentStore, resolveBlob, logger);
     resourcesCreated++;
     annotationsCreated += result.annotationsCreated;
   }
@@ -14109,7 +14065,7 @@ async function addEntityType(entityType, userId2, eventBus, logger) {
   const result$ = (0, import_rxjs12.race)(
     eventBus.get("mark:entity-type-added").pipe((0, import_operators12.map)(() => "ok")),
     eventBus.get("mark:entity-type-add-failed").pipe((0, import_operators12.map)((e) => {
-      throw e.error;
+      throw new Error(e.message);
     })),
     (0, import_rxjs12.timer)(IMPORT_TIMEOUT_MS).pipe((0, import_operators12.map)(() => {
       throw new Error("Timeout waiting for mark:entity-type-added");
@@ -14122,7 +14078,7 @@ async function addEntityType(entityType, userId2, eventBus, logger) {
   await (0, import_rxjs12.firstValueFrom)(result$);
   logger?.debug("Added entity type", { entityType });
 }
-async function importResource(doc, userId2, eventBus, resolveBlob, logger) {
+async function importResource(doc, userId2, eventBus, contentStore, resolveBlob, logger) {
   const name = doc["name"];
   const representations = doc["representations"];
   const annotations = doc["annotations"];
@@ -14144,18 +14100,22 @@ async function importResource(doc, userId2, eventBus, resolveBlob, logger) {
   if (!blob) {
     throw new Error(`Missing content blob for checksum ${contentChecksum} (resource "${name}")`);
   }
+  const resolvedUri = deriveStorageUri3(name, format);
+  const stored = await contentStore.store(blob, resolvedUri);
   const createResult$ = (0, import_rxjs12.race)(
-    eventBus.get("yield:created").pipe((0, import_operators12.map)((r) => r)),
+    eventBus.get("yield:create-ok").pipe((0, import_operators12.map)((r) => r)),
     eventBus.get("yield:create-failed").pipe((0, import_operators12.map)((e) => {
-      throw e.error;
+      throw new Error(e.message);
     })),
     (0, import_rxjs12.timer)(IMPORT_TIMEOUT_MS).pipe((0, import_operators12.map)(() => {
-      throw new Error("Timeout waiting for yield:created");
+      throw new Error("Timeout waiting for yield:create-ok");
     }))
   );
   eventBus.get("yield:create").next({
     name,
-    content: blob,
+    storageUri: resolvedUri,
+    contentChecksum: stored.checksum,
+    byteSize: stored.byteSize,
     format,
     userId: userId2,
     language,
@@ -14163,31 +14123,31 @@ async function importResource(doc, userId2, eventBus, resolveBlob, logger) {
     creationMethod
   });
   const created = await (0, import_rxjs12.firstValueFrom)(createResult$);
-  const resourceId4 = created.resourceId;
-  logger?.debug("Created resource from JSON-LD", { name, resourceId: resourceId4 });
+  const resourceId7 = makeResourceId5(created.resourceId);
+  logger?.debug("Created resource from JSON-LD", { name, resourceId: resourceId7 });
   let annotationsCreated = 0;
   if (annotations && annotations.length > 0) {
     for (const annotation of annotations) {
-      await createAnnotation(annotation, resourceId4, userId2, eventBus, logger);
+      await createAnnotation(annotation, resourceId7, userId2, eventBus, logger);
       annotationsCreated++;
     }
   }
   return { annotationsCreated };
 }
-async function createAnnotation(annotation, resourceId4, userId2, eventBus, logger) {
+async function createAnnotation(annotation, resourceId7, userId2, eventBus, logger) {
   const result$ = (0, import_rxjs12.race)(
-    eventBus.get("mark:created").pipe((0, import_operators12.map)(() => "ok")),
+    eventBus.get("mark:create-ok").pipe((0, import_operators12.map)(() => "ok")),
     eventBus.get("mark:create-failed").pipe((0, import_operators12.map)((e) => {
-      throw e.error;
+      throw new Error(e.message);
     })),
     (0, import_rxjs12.timer)(IMPORT_TIMEOUT_MS).pipe((0, import_operators12.map)(() => {
-      throw new Error("Timeout waiting for mark:created");
+      throw new Error("Timeout waiting for mark:create-ok");
     }))
   );
   eventBus.get("mark:create").next({
     annotation: dehydrateAnnotation(annotation),
     userId: userId2,
-    resourceId: resourceId4
+    resourceId: resourceId7
   });
   await (0, import_rxjs12.firstValueFrom)(result$);
   logger?.debug("Created annotation", { annotationId: annotation.id });
@@ -14200,14 +14160,14 @@ import {
 } from "@semiont/core";
 
 // src/annotation-operations.ts
-import { annotationId, resourceId as makeResourceId4, assembleAnnotation as assembleAnnotation2, applyBodyOperations as applyBodyOperations2 } from "@semiont/core";
+import { annotationId as annotationId2, resourceId as makeResourceId6, assembleAnnotation as assembleAnnotation2, applyBodyOperations as applyBodyOperations2 } from "@semiont/core";
 var AnnotationOperations = class {
   /**
    * Create a new annotation via EventBus → Stower
    */
   static async createAnnotation(request, userId2, creator, eventBus) {
     const { annotation } = assembleAnnotation2(request, creator);
-    const resId = makeResourceId4(request.target.source);
+    const resId = makeResourceId6(request.target.source);
     eventBus.get("mark:create").next({
       annotation,
       userId: userId2,
@@ -14219,9 +14179,9 @@ var AnnotationOperations = class {
    * Update annotation body via EventBus → Stower
    */
   static async updateAnnotationBody(id, request, userId2, eventBus, kb) {
-    const resId = makeResourceId4(request.resourceId);
+    const resId = makeResourceId6(request.resourceId);
     const annotation = await AnnotationContext.getAnnotation(
-      annotationId(id),
+      annotationId2(id),
       resId,
       kb
     );
@@ -14229,7 +14189,7 @@ var AnnotationOperations = class {
       throw new Error("Annotation not found");
     }
     eventBus.get("mark:update-body").next({
-      annotationId: annotationId(id),
+      annotationId: annotationId2(id),
       userId: userId2,
       resourceId: resId,
       operations: request.operations
@@ -14246,7 +14206,7 @@ var AnnotationOperations = class {
    * Delete an annotation via EventBus → Stower
    */
   static async deleteAnnotation(id, resourceIdStr, userId2, eventBus, kb, logger) {
-    const resId = makeResourceId4(resourceIdStr);
+    const resId = makeResourceId6(resourceIdStr);
     const projection = await AnnotationContext.getResourceAnnotations(resId, kb);
     const annotation = projection.annotations.find((a) => a.id === id);
     if (!annotation) {
@@ -14254,7 +14214,7 @@ var AnnotationOperations = class {
     }
     logger?.debug("Removing annotation via EventBus", { annotationId: id });
     eventBus.get("mark:delete").next({
-      annotationId: annotationId(id),
+      annotationId: annotationId2(id),
       userId: userId2,
       resourceId: resId
     });
@@ -14294,7 +14254,6 @@ export {
   importLinkedData,
   isBackupManifest,
   readEntityTypesProjection,
-  resetBootstrap,
   startMakeMeaning,
   stopKnowledgeSystem,
   validateManifestVersion