@semiont/make-meaning 0.4.20 → 0.4.22

package/dist/index.js

@@ -7,11 +7,11 @@ var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
-var __copyProps = (to, from9, except, desc) => {
-  if (from9 && typeof from9 === "object" || typeof from9 === "function") {
-    for (let key of __getOwnPropNames(from9))
+var __copyProps = (to, from8, except, desc) => {
+  if (from8 && typeof from8 === "object" || typeof from8 === "function") {
+    for (let key of __getOwnPropNames(from8))
       if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from9[key], enumerable: !(desc = __getOwnPropDesc(from9, key)) || desc.enumerable });
+        __defProp(to, key, { get: () => from8[key], enumerable: !(desc = __getOwnPropDesc(from8, key)) || desc.enumerable });
   }
   return to;
 };
@@ -125,9 +125,9 @@ var require_Subscription = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -135,14 +135,14 @@ var require_Subscription = __commonJS({
     var isFunction_1 = require_isFunction();
     var UnsubscriptionError_1 = require_UnsubscriptionError();
     var arrRemove_1 = require_arrRemove();
-    var Subscription8 = (function() {
-      function Subscription9(initialTeardown) {
+    var Subscription7 = (function() {
+      function Subscription8(initialTeardown) {
         this.initialTeardown = initialTeardown;
         this.closed = false;
         this._parentage = null;
         this._finalizers = null;
       }
-      Subscription9.prototype.unsubscribe = function() {
+      Subscription8.prototype.unsubscribe = function() {
         var e_1, _a, e_2, _b;
         var errors;
         if (!this.closed) {
@@ -209,13 +209,13 @@ var require_Subscription = __commonJS({
           }
         }
       };
-      Subscription9.prototype.add = function(teardown) {
+      Subscription8.prototype.add = function(teardown) {
         var _a;
         if (teardown && teardown !== this) {
           if (this.closed) {
             execFinalizer(teardown);
           } else {
-            if (teardown instanceof Subscription9) {
+            if (teardown instanceof Subscription8) {
               if (teardown.closed || teardown._hasParent(this)) {
                 return;
               }
@@ -225,15 +225,15 @@ var require_Subscription = __commonJS({
           }
         }
       };
-      Subscription9.prototype._hasParent = function(parent) {
+      Subscription8.prototype._hasParent = function(parent) {
         var _parentage = this._parentage;
         return _parentage === parent || Array.isArray(_parentage) && _parentage.includes(parent);
       };
-      Subscription9.prototype._addParent = function(parent) {
+      Subscription8.prototype._addParent = function(parent) {
         var _parentage = this._parentage;
         this._parentage = Array.isArray(_parentage) ? (_parentage.push(parent), _parentage) : _parentage ? [_parentage, parent] : parent;
       };
-      Subscription9.prototype._removeParent = function(parent) {
+      Subscription8.prototype._removeParent = function(parent) {
         var _parentage = this._parentage;
         if (_parentage === parent) {
           this._parentage = null;
@@ -241,24 +241,24 @@ var require_Subscription = __commonJS({
           arrRemove_1.arrRemove(_parentage, parent);
         }
       };
-      Subscription9.prototype.remove = function(teardown) {
+      Subscription8.prototype.remove = function(teardown) {
         var _finalizers = this._finalizers;
         _finalizers && arrRemove_1.arrRemove(_finalizers, teardown);
-        if (teardown instanceof Subscription9) {
+        if (teardown instanceof Subscription8) {
           teardown._removeParent(this);
         }
       };
-      Subscription9.EMPTY = (function() {
-        var empty = new Subscription9();
+      Subscription8.EMPTY = (function() {
+        var empty = new Subscription8();
         empty.closed = true;
         return empty;
       })();
-      return Subscription9;
+      return Subscription8;
     })();
-    exports.Subscription = Subscription8;
-    exports.EMPTY_SUBSCRIPTION = Subscription8.EMPTY;
+    exports.Subscription = Subscription7;
+    exports.EMPTY_SUBSCRIPTION = Subscription7.EMPTY;
     function isSubscription(value) {
-      return value instanceof Subscription8 || value && "closed" in value && isFunction_1.isFunction(value.remove) && isFunction_1.isFunction(value.add) && isFunction_1.isFunction(value.unsubscribe);
+      return value instanceof Subscription7 || value && "closed" in value && isFunction_1.isFunction(value.remove) && isFunction_1.isFunction(value.add) && isFunction_1.isFunction(value.unsubscribe);
     }
     exports.isSubscription = isSubscription;
     function execFinalizer(finalizer) {
@@ -308,9 +308,9 @@ var require_timeoutProvider = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -1068,9 +1068,9 @@ var require_animationFrameProvider = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -1215,9 +1215,9 @@ var require_Subject = __commonJS({
     var ObjectUnsubscribedError_1 = require_ObjectUnsubscribedError();
     var arrRemove_1 = require_arrRemove();
     var errorContext_1 = require_errorContext();
-    var Subject3 = (function(_super) {
-      __extends(Subject4, _super);
-      function Subject4() {
+    var Subject2 = (function(_super) {
+      __extends(Subject3, _super);
+      function Subject3() {
         var _this = _super.call(this) || this;
         _this.closed = false;
         _this.currentObservers = null;
@@ -1227,17 +1227,17 @@ var require_Subject = __commonJS({
         _this.thrownError = null;
         return _this;
       }
-      Subject4.prototype.lift = function(operator) {
+      Subject3.prototype.lift = function(operator) {
         var subject = new AnonymousSubject(this, this);
         subject.operator = operator;
         return subject;
       };
-      Subject4.prototype._throwIfClosed = function() {
+      Subject3.prototype._throwIfClosed = function() {
         if (this.closed) {
           throw new ObjectUnsubscribedError_1.ObjectUnsubscribedError();
         }
       };
-      Subject4.prototype.next = function(value) {
+      Subject3.prototype.next = function(value) {
         var _this = this;
         errorContext_1.errorContext(function() {
           var e_1, _a;
@@ -1263,7 +1263,7 @@ var require_Subject = __commonJS({
           }
         });
       };
-      Subject4.prototype.error = function(err) {
+      Subject3.prototype.error = function(err) {
         var _this = this;
         errorContext_1.errorContext(function() {
           _this._throwIfClosed();
@@ -1277,7 +1277,7 @@ var require_Subject = __commonJS({
           }
         });
       };
-      Subject4.prototype.complete = function() {
+      Subject3.prototype.complete = function() {
         var _this = this;
         errorContext_1.errorContext(function() {
           _this._throwIfClosed();
@@ -1290,11 +1290,11 @@ var require_Subject = __commonJS({
           }
         });
       };
-      Subject4.prototype.unsubscribe = function() {
+      Subject3.prototype.unsubscribe = function() {
         this.isStopped = this.closed = true;
         this.observers = this.currentObservers = null;
       };
-      Object.defineProperty(Subject4.prototype, "observed", {
+      Object.defineProperty(Subject3.prototype, "observed", {
         get: function() {
           var _a;
           return ((_a = this.observers) === null || _a === void 0 ? void 0 : _a.length) > 0;
@@ -1302,16 +1302,16 @@ var require_Subject = __commonJS({
         enumerable: false,
         configurable: true
       });
-      Subject4.prototype._trySubscribe = function(subscriber) {
+      Subject3.prototype._trySubscribe = function(subscriber) {
         this._throwIfClosed();
         return _super.prototype._trySubscribe.call(this, subscriber);
       };
-      Subject4.prototype._subscribe = function(subscriber) {
+      Subject3.prototype._subscribe = function(subscriber) {
         this._throwIfClosed();
         this._checkFinalizedStatuses(subscriber);
         return this._innerSubscribe(subscriber);
       };
-      Subject4.prototype._innerSubscribe = function(subscriber) {
+      Subject3.prototype._innerSubscribe = function(subscriber) {
         var _this = this;
         var _a = this, hasError = _a.hasError, isStopped = _a.isStopped, observers = _a.observers;
         if (hasError || isStopped) {
@@ -1324,7 +1324,7 @@ var require_Subject = __commonJS({
           arrRemove_1.arrRemove(observers, subscriber);
         });
       };
-      Subject4.prototype._checkFinalizedStatuses = function(subscriber) {
+      Subject3.prototype._checkFinalizedStatuses = function(subscriber) {
         var _a = this, hasError = _a.hasError, thrownError = _a.thrownError, isStopped = _a.isStopped;
         if (hasError) {
           subscriber.error(thrownError);
@@ -1332,17 +1332,17 @@ var require_Subject = __commonJS({
           subscriber.complete();
         }
       };
-      Subject4.prototype.asObservable = function() {
+      Subject3.prototype.asObservable = function() {
         var observable = new Observable_1.Observable();
         observable.source = this;
         return observable;
       };
-      Subject4.create = function(destination, source) {
+      Subject3.create = function(destination, source) {
         return new AnonymousSubject(destination, source);
       };
-      return Subject4;
+      return Subject3;
     })(Observable_1.Observable);
-    exports.Subject = Subject3;
+    exports.Subject = Subject2;
     var AnonymousSubject = (function(_super) {
       __extends(AnonymousSubject2, _super);
       function AnonymousSubject2(destination, source) {
@@ -1368,7 +1368,7 @@ var require_Subject = __commonJS({
         return (_b = (_a = this.source) === null || _a === void 0 ? void 0 : _a.subscribe(subscriber)) !== null && _b !== void 0 ? _b : Subscription_1.EMPTY_SUBSCRIPTION;
       };
       return AnonymousSubject2;
-    })(Subject3);
+    })(Subject2);
     exports.AnonymousSubject = AnonymousSubject;
   }
 });
@@ -1399,26 +1399,26 @@ var require_BehaviorSubject = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.BehaviorSubject = void 0;
     var Subject_1 = require_Subject();
-    var BehaviorSubject = (function(_super) {
-      __extends(BehaviorSubject2, _super);
-      function BehaviorSubject2(_value) {
+    var BehaviorSubject2 = (function(_super) {
+      __extends(BehaviorSubject3, _super);
+      function BehaviorSubject3(_value) {
         var _this = _super.call(this) || this;
         _this._value = _value;
         return _this;
       }
-      Object.defineProperty(BehaviorSubject2.prototype, "value", {
+      Object.defineProperty(BehaviorSubject3.prototype, "value", {
         get: function() {
           return this.getValue();
         },
         enumerable: false,
         configurable: true
       });
-      BehaviorSubject2.prototype._subscribe = function(subscriber) {
+      BehaviorSubject3.prototype._subscribe = function(subscriber) {
         var subscription = _super.prototype._subscribe.call(this, subscriber);
         !subscription.closed && subscriber.next(this._value);
         return subscription;
       };
-      BehaviorSubject2.prototype.getValue = function() {
+      BehaviorSubject3.prototype.getValue = function() {
         var _a = this, hasError = _a.hasError, thrownError = _a.thrownError, _value = _a._value;
         if (hasError) {
           throw thrownError;
@@ -1426,12 +1426,12 @@ var require_BehaviorSubject = __commonJS({
         this._throwIfClosed();
         return _value;
       };
-      BehaviorSubject2.prototype.next = function(value) {
+      BehaviorSubject3.prototype.next = function(value) {
         _super.prototype.next.call(this, this._value = value);
       };
-      return BehaviorSubject2;
+      return BehaviorSubject3;
     })(Subject_1.Subject);
-    exports.BehaviorSubject = BehaviorSubject;
+    exports.BehaviorSubject = BehaviorSubject2;
   }
 });
 
@@ -1668,9 +1668,9 @@ var require_intervalProvider = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -1877,9 +1877,9 @@ var require_immediateProvider = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -3441,10 +3441,10 @@ var require_from = __commonJS({
     exports.from = void 0;
     var scheduled_1 = require_scheduled();
     var innerFrom_1 = require_innerFrom();
-    function from9(input, scheduler) {
+    function from8(input, scheduler) {
       return scheduler ? scheduled_1.scheduled(input, scheduler) : innerFrom_1.innerFrom(input);
     }
-    exports.from = from9;
+    exports.from = from8;
   }
 });
 
@@ -3832,9 +3832,9 @@ var require_mapOneOrManyArgs = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -3874,9 +3874,9 @@ var require_bindCallbackInternals = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -4196,12 +4196,12 @@ var require_mergeMap = __commonJS({
     var lift_1 = require_lift();
     var mergeInternals_1 = require_mergeInternals();
     var isFunction_1 = require_isFunction();
-    function mergeMap7(project, resultSelector, concurrent) {
+    function mergeMap6(project, resultSelector, concurrent) {
       if (concurrent === void 0) {
         concurrent = Infinity;
       }
       if (isFunction_1.isFunction(resultSelector)) {
-        return mergeMap7(function(a, i) {
+        return mergeMap6(function(a, i) {
           return map_1.map(function(b, ii) {
             return resultSelector(a, b, i, ii);
           })(innerFrom_1.innerFrom(project(a, i)));
@@ -4213,7 +4213,7 @@ var require_mergeMap = __commonJS({
         return mergeInternals_1.mergeInternals(source, subscriber, project, concurrent);
       });
     }
-    exports.mergeMap = mergeMap7;
+    exports.mergeMap = mergeMap6;
   }
 });
 
@@ -5008,9 +5008,9 @@ var require_zip = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -5638,9 +5638,9 @@ var require_combineLatest2 = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -5686,9 +5686,9 @@ var require_combineLatestWith = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -5713,10 +5713,10 @@ var require_concatMap = __commonJS({
     exports.concatMap = void 0;
     var mergeMap_1 = require_mergeMap();
     var isFunction_1 = require_isFunction();
-    function concatMap6(project, resultSelector) {
+    function concatMap5(project, resultSelector) {
       return isFunction_1.isFunction(resultSelector) ? mergeMap_1.mergeMap(project, resultSelector, 1) : mergeMap_1.mergeMap(project, 1);
     }
-    exports.concatMap = concatMap6;
+    exports.concatMap = concatMap5;
   }
 });
 
@@ -5760,9 +5760,9 @@ var require_concat2 = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -5806,9 +5806,9 @@ var require_concatWith = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -6299,9 +6299,9 @@ var require_endWith = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -6540,7 +6540,7 @@ var require_groupBy = __commonJS({
     var Subject_1 = require_Subject();
     var lift_1 = require_lift();
     var OperatorSubscriber_1 = require_OperatorSubscriber();
-    function groupBy4(keySelector, elementOrOptions, duration, connector) {
+    function groupBy3(keySelector, elementOrOptions, duration, connector) {
       return lift_1.operate(function(source, subscriber) {
         var element;
         if (!elementOrOptions || typeof elementOrOptions === "function") {
@@ -6607,7 +6607,7 @@ var require_groupBy = __commonJS({
         }
       });
     }
-    exports.groupBy = groupBy4;
+    exports.groupBy = groupBy3;
   }
 });
 
@@ -6846,9 +6846,9 @@ var require_merge2 = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -6893,9 +6893,9 @@ var require_mergeWith = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -6978,9 +6978,9 @@ var require_onErrorResumeNextWith = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -7162,9 +7162,9 @@ var require_raceWith = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -7560,9 +7560,9 @@ var require_share = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -8562,9 +8562,9 @@ var require_withLatestFrom = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -8648,9 +8648,9 @@ var require_zip2 = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -8691,9 +8691,9 @@ var require_zipWith = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -9459,9 +9459,9 @@ var require_race2 = __commonJS({
       }
       return ar;
     };
-    var __spreadArray = exports && exports.__spreadArray || function(to, from9) {
-      for (var i = 0, il = from9.length, j = to.length; i < il; i++, j++)
-        to[j] = from9[i];
+    var __spreadArray = exports && exports.__spreadArray || function(to, from8) {
+      for (var i = 0, il = from8.length, j = to.length; i < il; i++, j++)
+        to[j] = from8[i];
       return to;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -9943,9 +9943,10 @@ var require_operators = __commonJS({
 });
 
 // src/service.ts
-import { JobQueue } from "@semiont/jobs";
+import { FsJobQueue } from "@semiont/jobs";
 import { createEventStore as createEventStoreCore } from "@semiont/event-sourcing";
-import { jobId } from "@semiont/core";
+import { jobId as jobId2 } from "@semiont/core";
+import { registerJobQueueProvider } from "@semiont/observability";
 
 // src/config.ts
 function resolveActorInference(config, actor) {
@@ -9955,42 +9956,12 @@ function resolveActorInference(config, actor) {
     `No inference config found for actor '${actor}'. Set actors.${actor}.inference in your config.`
   );
 }
-function resolveWorkerInference(config, workerType) {
-  const specific = config.workers?.[workerType];
-  if (specific) return specific;
-  const defaultWorker = config.workers?.default;
-  if (defaultWorker) return defaultWorker;
-  throw new Error(
-    `No inference config found for worker '${workerType}'. Set workers.${workerType}.inference or workers.default.inference in your config.`
-  );
-}
-
-// src/agent-utils.ts
-function inferenceConfigToGenerator(workerType, config) {
-  const providerLabel = config.type === "ollama" ? `Ollama ${config.model}` : config.type === "anthropic" ? `Anthropic ${config.model}` : config.type != null ? `${config.type} ${config.model}` : void 0;
-  return {
-    "@type": "SoftwareAgent",
-    name: providerLabel ? `${workerType} / ${providerLabel}` : workerType,
-    worker: workerType,
-    inferenceProvider: config.type,
-    model: config.model
-  };
-}
 
 // src/service.ts
-var import_rxjs10 = __toESM(require_cjs(), 1);
-var import_operators10 = __toESM(require_operators(), 1);
-import { Readable } from "stream";
+var import_rxjs9 = __toESM(require_cjs(), 1);
+var import_operators9 = __toESM(require_operators(), 1);
 import { createInferenceClient } from "@semiont/inference";
 import { getGraphDatabase } from "@semiont/graph";
-import {
-  ReferenceAnnotationWorker,
-  GenerationWorker,
-  HighlightAnnotationWorker,
-  AssessmentAnnotationWorker,
-  CommentAnnotationWorker,
-  TagAnnotationWorker
-} from "@semiont/jobs";
 
 // src/knowledge-base.ts
 import { FilesystemViewStorage } from "@semiont/event-sourcing";
@@ -10344,20 +10315,20 @@ var GraphDBConsumer = class _GraphDBConsumer {
    * Rebuild entire resource from events.
    * Bypasses the live pipeline — reads directly from event store.
    */
-  async rebuildResource(resourceId7) {
+  async rebuildResource(resourceId10) {
     const graphDb = this.ensureInitialized();
-    this.logger.info("Rebuilding resource from events", { resourceId: resourceId7 });
+    this.logger.info("Rebuilding resource from events", { resourceId: resourceId10 });
     try {
-      await graphDb.deleteResource(resourceId7);
+      await graphDb.deleteResource(resourceId10);
     } catch (error) {
-      this.logger.debug("No existing resource to delete", { resourceId: resourceId7 });
+      this.logger.debug("No existing resource to delete", { resourceId: resourceId10 });
     }
     const query = new EventQuery(this.eventStore.log.storage);
-    const events = await query.getResourceEvents(resourceId7);
+    const events = await query.getResourceEvents(resourceId10);
     for (const storedEvent of events) {
-      await this.applyEventToGraph(storedEvent);
+      await this.safeApplyEvent(storedEvent);
     }
-    this.logger.info("Resource rebuild complete", { resourceId: resourceId7, eventCount: events.length });
+    this.logger.info("Resource rebuild complete", { resourceId: resourceId10, eventCount: events.length });
   }
   /**
    * Rebuild entire GraphDB from all events.
@@ -10373,22 +10344,22 @@ 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 resourceId7 of allResourceIds) {
-      const events = await query.getResourceEvents(makeResourceId(resourceId7));
+    for (const resourceId10 of allResourceIds) {
+      const events = await query.getResourceEvents(makeResourceId(resourceId10));
       for (const storedEvent of events) {
         if (storedEvent.type === "mark:body-updated") {
           continue;
         }
-        await this.applyEventToGraph(storedEvent);
+        await this.safeApplyEvent(storedEvent);
       }
     }
     this.logger.info("Pass 1 complete - all nodes created");
     this.logger.info("PASS 2: Creating all REFERENCES edges");
-    for (const resourceId7 of allResourceIds) {
-      const events = await query.getResourceEvents(makeResourceId(resourceId7));
+    for (const resourceId10 of allResourceIds) {
+      const events = await query.getResourceEvents(makeResourceId(resourceId10));
       for (const storedEvent of events) {
         if (storedEvent.type === "mark:body-updated") {
-          await this.applyEventToGraph(storedEvent);
+          await this.safeApplyEvent(storedEvent);
         }
       }
     }
@@ -10414,635 +10385,9 @@ var GraphDBConsumer = class _GraphDBConsumer {
   }
 };
 
-// src/smelter.ts
-var import_rxjs2 = __toESM(require_cjs(), 1);
-var import_operators2 = __toESM(require_operators(), 1);
-import { burstBuffer as burstBuffer2, errField as errField2 } from "@semiont/core";
-import { resourceId as makeResourceId2, annotationId as makeAnnotationId2 } from "@semiont/core";
-import { chunkText, DEFAULT_CHUNKING_CONFIG } from "@semiont/vectors";
-import { getExactText, getTargetSelector } from "@semiont/api-client";
-var Smelter = class _Smelter {
-  constructor(_eventStore, eventBus, vectorStore, embeddingProvider, contentStore, embeddingStore, viewStorage, logger, chunkingConfig) {
-    this.eventBus = eventBus;
-    this.vectorStore = vectorStore;
-    this.embeddingProvider = embeddingProvider;
-    this.contentStore = contentStore;
-    this.embeddingStore = embeddingStore;
-    this.viewStorage = viewStorage;
-    this.logger = logger;
-    this.chunkingConfig = chunkingConfig ?? DEFAULT_CHUNKING_CONFIG;
-  }
-  static SMELTER_RELEVANT_EVENTS = /* @__PURE__ */ new Set([
-    "yield:created",
-    "yield:updated",
-    "yield:representation-added",
-    "mark:archived",
-    "mark:added",
-    "mark:removed"
-  ]);
-  static BURST_WINDOW_MS = 50;
-  static MAX_BATCH_SIZE = 100;
-  static IDLE_TIMEOUT_MS = 200;
-  _globalSubscriptions = [];
-  eventSubject = new import_rxjs2.Subject();
-  pipelineSubscription = null;
-  logger;
-  chunkingConfig;
-  async initialize() {
-    this.logger.info("Smelter actor initializing");
-    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.resourceId ?? "__unknown__"),
-      (0, import_operators2.mergeMap)(
-        (group) => group.pipe(
-          burstBuffer2({
-            burstWindowMs: _Smelter.BURST_WINDOW_MS,
-            maxBatchSize: _Smelter.MAX_BATCH_SIZE,
-            idleTimeoutMs: _Smelter.IDLE_TIMEOUT_MS
-          }),
-          (0, import_operators2.concatMap)((eventOrBatch) => {
-            if (Array.isArray(eventOrBatch)) {
-              return (0, import_rxjs2.from)(this.processBatch(eventOrBatch));
-            }
-            return (0, import_rxjs2.from)(this.safeProcessEvent(eventOrBatch));
-          })
-        )
-      )
-    ).subscribe({
-      error: (err) => this.logger.error("Smelter pipeline error", { error: err })
-    });
-    this.logger.info("Smelter actor initialized");
-  }
-  async stop() {
-    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 the EmbeddingStore (.semiont/embeddings/).
-   *
-   * For each stored file, checks whether the model matches the configured
-   * provider. On mismatch, re-embeds from the stored text and overwrites the
-   * file before upserting into Qdrant. On match, loads the stored vectors
-   * directly — no embedding provider calls needed.
-   */
-  async rebuildAll() {
-    this.logger.info("Rebuilding vector store from EmbeddingStore");
-    await this.vectorStore.clearAll();
-    const currentModel = this.embeddingProvider.model();
-    const currentDimensions = this.embeddingProvider.dimensions();
-    const resourceIds = await this.embeddingStore.getAllResourceIds();
-    this.logger.info("Found resource embedding files", { count: resourceIds.length });
-    let resourcesIndexed = 0;
-    for (const rid of resourceIds) {
-      const resourceId7 = makeResourceId2(rid);
-      const stored = await this.embeddingStore.readResourceEmbeddings(resourceId7);
-      if (!stored || stored.chunks.length === 0) continue;
-      let chunks;
-      if (stored.model !== currentModel) {
-        this.logger.info("Re-embedding resource (model mismatch)", {
-          resourceId: rid,
-          storedModel: stored.model,
-          currentModel
-        });
-        const texts = stored.chunks.map((c) => c.text);
-        const embeddings = await this.embeddingProvider.embedBatch(texts);
-        chunks = stored.chunks.map((c, i) => ({
-          chunkIndex: c.chunkIndex,
-          text: c.text,
-          embedding: embeddings[i]
-        }));
-        await this.embeddingStore.writeResourceChunks(resourceId7, currentModel, currentDimensions, chunks);
-      } else {
-        chunks = stored.chunks;
-      }
-      await this.vectorStore.upsertResourceVectors(resourceId7, chunks);
-      resourcesIndexed++;
-    }
-    const annotationIds = await this.embeddingStore.getAllAnnotationIds();
-    this.logger.info("Found annotation embedding files", { count: annotationIds.length });
-    let annotationsIndexed = 0;
-    for (const aid of annotationIds) {
-      const annotationId3 = makeAnnotationId2(aid);
-      const stored = await this.embeddingStore.readAnnotationEmbedding(annotationId3);
-      if (!stored) continue;
-      let embedding;
-      if (stored.model !== currentModel) {
-        this.logger.info("Re-embedding annotation (model mismatch)", {
-          annotationId: aid,
-          storedModel: stored.model,
-          currentModel
-        });
-        embedding = await this.embeddingProvider.embed(stored.text);
-        await this.embeddingStore.writeAnnotationEmbedding(
-          annotationId3,
-          makeResourceId2(stored.resourceId),
-          currentModel,
-          currentDimensions,
-          stored.text,
-          embedding,
-          stored.motivation,
-          stored.entityTypes
-        );
-      } else {
-        embedding = stored.embedding;
-      }
-      const payload = {
-        annotationId: annotationId3,
-        resourceId: makeResourceId2(stored.resourceId),
-        motivation: stored.motivation,
-        entityTypes: stored.entityTypes,
-        exactText: stored.text
-      };
-      await this.vectorStore.upsertAnnotationVector(annotationId3, embedding, payload);
-      annotationsIndexed++;
-    }
-    const storedResourceIdSet = new Set(resourceIds);
-    const allViews = await this.viewStorage.getAll();
-    let backfilled = 0;
-    for (const view of allViews) {
-      const ridStr = view.resource["@id"];
-      if (storedResourceIdSet.has(ridStr)) continue;
-      if (view.resource.archived) continue;
-      if (!view.resource.storageUri) continue;
-      let content;
-      try {
-        content = await this.contentStore.retrieve(view.resource.storageUri);
-      } catch (err) {
-        this.logger.warn("Smelter back-fill skipped \u2014 content missing", {
-          resourceId: ridStr,
-          storageUri: view.resource.storageUri,
-          error: err instanceof Error ? err.message : String(err)
-        });
-        continue;
-      }
-      const text = new TextDecoder().decode(content);
-      if (!text.trim()) continue;
-      const chunks = chunkText(text, this.chunkingConfig);
-      if (chunks.length === 0) continue;
-      const rid = makeResourceId2(ridStr);
-      const embeddings = await this.embeddingProvider.embedBatch(chunks);
-      const embeddingChunks = chunks.map((chunkText2, i) => ({
-        chunkIndex: i,
-        text: chunkText2,
-        embedding: embeddings[i]
-      }));
-      await this.embeddingStore.writeResourceChunks(rid, currentModel, currentDimensions, embeddingChunks);
-      await this.vectorStore.upsertResourceVectors(rid, embeddingChunks);
-      backfilled++;
-      resourcesIndexed++;
-      this.logger.info("Smelter back-filled missing resource embedding", { resourceId: ridStr });
-    }
-    this.logger.info("Vector store rebuild complete", { resourcesIndexed, annotationsIndexed, backfilled });
-  }
-  async processBatch(events) {
-    const runs = partitionByType(events);
-    for (const run of runs) {
-      try {
-        if (run.length === 1) {
-          await this.safeProcessEvent(run[0]);
-        } else {
-          await this.applyBatchByType(run);
-        }
-      } catch (error) {
-        this.logger.error("Smelter failed to process batch run", {
-          eventType: run[0].type,
-          runSize: run.length,
-          error: errField2(error)
-        });
-      }
-    }
-  }
-  /**
-   * Batch-optimized processing for consecutive events of the same type.
-   */
-  async applyBatchByType(events) {
-    const type = events[0].type;
-    switch (type) {
-      case "yield:created":
-        await this.batchResourceCreated(events);
-        break;
-      case "mark:added":
-        await this.batchAnnotationAdded(events);
-        break;
-      default:
-        for (const event of events) {
-          await this.safeProcessEvent(event);
-        }
-    }
-  }
-  /**
-   * Batch-embed chunks from multiple yield:created events in a single
-   * embedBatch() call, then write to EmbeddingStore and index per resource.
-   */
-  async batchResourceCreated(events) {
-    const resourceData = [];
-    const allChunks = [];
-    for (const storedEvent of events) {
-      const event = storedEvent;
-      const rid = makeResourceId2(event.resourceId);
-      const storageUri = event.payload.storageUri;
-      if (!storageUri) continue;
-      const content = await this.contentStore.retrieve(storageUri);
-      if (!content) continue;
-      const text = new TextDecoder().decode(content);
-      if (!text.trim()) continue;
-      const chunks = chunkText(text, this.chunkingConfig);
-      if (chunks.length === 0) continue;
-      resourceData.push({ rid, chunks });
-      allChunks.push(...chunks);
-    }
-    if (allChunks.length === 0) return;
-    const allEmbeddings = await this.embeddingProvider.embedBatch(allChunks);
-    const model = this.embeddingProvider.model();
-    const dimensions = this.embeddingProvider.dimensions();
-    let offset = 0;
-    for (const { rid, chunks } of resourceData) {
-      const embeddingChunks = chunks.map((text, i) => ({
-        chunkIndex: i,
-        text,
-        embedding: allEmbeddings[offset + i]
-      }));
-      await this.embeddingStore.writeResourceChunks(rid, model, dimensions, embeddingChunks);
-      await this.vectorStore.upsertResourceVectors(rid, embeddingChunks);
-      this.logger.debug("Smelter batch-indexed resource", {
-        resourceId: String(rid),
-        chunks: embeddingChunks.length
-      });
-      offset += chunks.length;
-    }
-  }
-  /**
-   * Batch-embed exact texts from multiple mark:added events in a single
-   * embedBatch() call, then write to EmbeddingStore and index per annotation.
-   */
-  async batchAnnotationAdded(events) {
-    const annotationData = [];
-    for (const storedEvent of events) {
-      const event = storedEvent;
-      const annotation = event.payload.annotation;
-      if (!annotation?.id) continue;
-      const selector = getTargetSelector(annotation.target);
-      const exactText = getExactText(selector);
-      if (!exactText?.trim()) continue;
-      annotationData.push({
-        rid: makeResourceId2(event.resourceId),
-        aid: makeAnnotationId2(annotation.id),
-        exactText,
-        motivation: annotation.motivation ?? "",
-        entityTypes: annotation.entityTypes ?? []
-      });
-    }
-    if (annotationData.length === 0) return;
-    const allEmbeddings = await this.embeddingProvider.embedBatch(
-      annotationData.map((a) => a.exactText)
-    );
-    const model = this.embeddingProvider.model();
-    const dimensions = this.embeddingProvider.dimensions();
-    for (let i = 0; i < annotationData.length; i++) {
-      const { rid, aid, exactText, motivation, entityTypes } = annotationData[i];
-      const embedding = allEmbeddings[i];
-      await this.embeddingStore.writeAnnotationEmbedding(
-        aid,
-        rid,
-        model,
-        dimensions,
-        exactText,
-        embedding,
-        motivation,
-        entityTypes
-      );
-      const payload = {
-        annotationId: aid,
-        resourceId: rid,
-        motivation,
-        entityTypes,
-        exactText
-      };
-      await this.vectorStore.upsertAnnotationVector(aid, embedding, payload);
-      this.logger.debug("Smelter batch-indexed annotation", {
-        annotationId: String(aid),
-        resourceId: String(rid)
-      });
-    }
-  }
-  async safeProcessEvent(storedEvent) {
-    try {
-      await this.processEvent(storedEvent);
-    } catch (err) {
-      this.logger.error("Smelter failed to process event", {
-        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) {
-    switch (storedEvent.type) {
-      case "yield:created":
-        await this.handleResourceCreated(storedEvent);
-        break;
-      case "yield:updated":
-        await this.handleResourceUpdated(storedEvent);
-        break;
-      case "yield:representation-added":
-        await this.handleRepresentationAdded(storedEvent);
-        break;
-      case "mark:archived":
-        await this.handleResourceArchived(storedEvent);
-        break;
-      case "mark:added":
-        await this.handleAnnotationAdded(storedEvent);
-        break;
-      case "mark:removed":
-        await this.handleAnnotationRemoved(storedEvent);
-        break;
-    }
-  }
-  async handleResourceCreated(event) {
-    await new Promise((resolve2) => setTimeout(resolve2, 0));
-    const rid = makeResourceId2(event.resourceId);
-    const storageUri = event.payload.storageUri;
-    if (!storageUri) return;
-    this.logger.info("Smelter handleResourceCreated start", {
-      resourceId: String(rid),
-      storageUri,
-      heapMB: Math.round(process.memoryUsage().heapUsed / 1024 / 1024)
-    });
-    const content = await this.contentStore.retrieve(storageUri);
-    if (!content) return;
-    const text = new TextDecoder().decode(content);
-    if (!text.trim()) return;
-    const chunks = chunkText(text, this.chunkingConfig);
-    if (chunks.length === 0) return;
-    this.logger.info("Smelter chunked resource", {
-      resourceId: String(rid),
-      textBytes: text.length,
-      chunkCount: chunks.length,
-      heapMB: Math.round(process.memoryUsage().heapUsed / 1024 / 1024)
-    });
-    const embeddings = await this.embeddingProvider.embedBatch(chunks);
-    const model = this.embeddingProvider.model();
-    const dimensions = this.embeddingProvider.dimensions();
-    this.logger.info("Smelter embedded resource", {
-      resourceId: String(rid),
-      chunkCount: chunks.length,
-      dimensions,
-      heapMB: Math.round(process.memoryUsage().heapUsed / 1024 / 1024)
-    });
-    const embeddingChunks = chunks.map((text2, i) => ({
-      chunkIndex: i,
-      text: text2,
-      embedding: embeddings[i]
-    }));
-    await this.embeddingStore.writeResourceChunks(rid, model, dimensions, embeddingChunks);
-    this.logger.info("Smelter wrote resource embeddings to store", {
-      resourceId: String(rid),
-      chunkCount: embeddingChunks.length,
-      heapMB: Math.round(process.memoryUsage().heapUsed / 1024 / 1024)
-    });
-    await this.vectorStore.upsertResourceVectors(rid, embeddingChunks);
-    this.logger.info("Smelter indexed resource", {
-      resourceId: String(rid),
-      chunks: embeddingChunks.length,
-      heapMB: Math.round(process.memoryUsage().heapUsed / 1024 / 1024)
-    });
-  }
-  /**
-   * Re-embed a resource whose content has changed in-place.
-   *
-   * Used by yield:updated and yield:representation-added handlers. Reads the
-   * current storageUri from the materialized view (which is updated before the
-   * EventBus fires), deletes stale Qdrant vectors, and overwrites the
-   * EmbeddingStore file with fresh chunks.
-   */
-  async reembedResource(rid) {
-    const view = await this.viewStorage.get(rid);
-    const storageUri = view?.resource.storageUri;
-    if (!storageUri) return;
-    const content = await this.contentStore.retrieve(storageUri);
-    if (!content) return;
-    const text = new TextDecoder().decode(content);
-    if (!text.trim()) return;
-    const chunks = chunkText(text, this.chunkingConfig);
-    if (chunks.length === 0) return;
-    const embeddings = await this.embeddingProvider.embedBatch(chunks);
-    const model = this.embeddingProvider.model();
-    const dimensions = this.embeddingProvider.dimensions();
-    const embeddingChunks = chunks.map((chunkText2, i) => ({
-      chunkIndex: i,
-      text: chunkText2,
-      embedding: embeddings[i]
-    }));
-    await this.embeddingStore.writeResourceChunks(rid, model, dimensions, embeddingChunks);
-    await this.vectorStore.deleteResourceVectors(rid);
-    await this.vectorStore.upsertResourceVectors(rid, embeddingChunks);
-    this.logger.debug("Smelter re-embedded resource", {
-      resourceId: String(rid),
-      chunks: embeddingChunks.length
-    });
-  }
-  async handleResourceUpdated(event) {
-    await this.reembedResource(makeResourceId2(event.resourceId));
-  }
-  async handleRepresentationAdded(event) {
-    await this.reembedResource(makeResourceId2(event.resourceId));
-  }
-  async handleResourceArchived(event) {
-    const rid = makeResourceId2(event.resourceId);
-    await this.vectorStore.deleteResourceVectors(rid);
-    await this.embeddingStore.deleteResourceEmbeddings(rid);
-    this.logger.debug("Smelter deleted resource vectors", { resourceId: String(rid) });
-  }
-  async handleAnnotationAdded(event) {
-    await new Promise((resolve2) => setTimeout(resolve2, 0));
-    const annotation = event.payload.annotation;
-    if (!annotation || !annotation.id) return;
-    const rid = makeResourceId2(event.resourceId);
-    const aid = makeAnnotationId2(annotation.id);
-    const selector = getTargetSelector(annotation.target);
-    const exactText = getExactText(selector);
-    if (!exactText || !exactText.trim()) return;
-    this.logger.info("Smelter handleAnnotationAdded start", {
-      annotationId: String(aid),
-      resourceId: String(rid),
-      textLength: exactText.length,
-      heapMB: Math.round(process.memoryUsage().heapUsed / 1024 / 1024)
-    });
-    const embedding = await this.embeddingProvider.embed(exactText);
-    const model = this.embeddingProvider.model();
-    const dimensions = this.embeddingProvider.dimensions();
-    const motivation = annotation.motivation ?? "";
-    const entityTypes = annotation.entityTypes ?? [];
-    await this.embeddingStore.writeAnnotationEmbedding(
-      aid,
-      rid,
-      model,
-      dimensions,
-      exactText,
-      embedding,
-      motivation,
-      entityTypes
-    );
-    const payload = {
-      annotationId: aid,
-      resourceId: rid,
-      motivation,
-      entityTypes,
-      exactText
-    };
-    await this.vectorStore.upsertAnnotationVector(aid, embedding, payload);
-    this.logger.info("Smelter indexed annotation", {
-      annotationId: String(aid),
-      resourceId: String(rid)
-    });
-  }
-  async handleAnnotationRemoved(event) {
-    const annotationId3 = String(event.payload.annotationId);
-    if (!annotationId3) return;
-    const aid = makeAnnotationId2(annotationId3);
-    await this.vectorStore.deleteAnnotationVector(aid);
-    await this.embeddingStore.deleteAnnotationEmbedding(aid);
-    this.logger.debug("Smelter deleted annotation vector", { annotationId: String(aid) });
-  }
-};
-
-// src/embedding-store.ts
-import { promises as fs } from "fs";
-import * as path from "path";
-import { getShardPath } from "@semiont/event-sourcing";
-var EmbeddingStore = class {
-  constructor(project) {
-    this.project = project;
-  }
-  // ── Path helpers ────────────────────────────────────────────────────────────
-  resourceFilePath(resourceId7) {
-    const [ab, cd] = getShardPath(String(resourceId7));
-    return path.join(this.project.embeddingsDir, ab, cd, `${String(resourceId7)}.jsonl`);
-  }
-  annotationFilePath(annotationId3) {
-    const [ab, cd] = getShardPath(String(annotationId3));
-    return path.join(this.project.embeddingsDir, ab, cd, `${String(annotationId3)}.json`);
-  }
-  // ── Resource embeddings ─────────────────────────────────────────────────────
-  async writeResourceChunks(resourceId7, model, dimensions, chunks) {
-    const filePath = this.resourceFilePath(resourceId7);
-    await fs.mkdir(path.dirname(filePath), { recursive: true });
-    const header = JSON.stringify({ model, dimensions });
-    const lines = chunks.map(
-      (c) => JSON.stringify({ chunkIndex: c.chunkIndex, text: c.text, embedding: c.embedding })
-    );
-    await fs.writeFile(filePath, [header, ...lines].join("\n") + "\n", "utf-8");
-  }
-  async readResourceEmbeddings(resourceId7) {
-    const filePath = this.resourceFilePath(resourceId7);
-    try {
-      const content = await fs.readFile(filePath, "utf-8");
-      const lines = content.trim().split("\n").filter((l) => l.trim());
-      if (lines.length === 0) return null;
-      const header = JSON.parse(lines[0]);
-      const chunks = lines.slice(1).map((l) => JSON.parse(l));
-      return { model: header.model, dimensions: header.dimensions, chunks };
-    } catch (err) {
-      if (err.code === "ENOENT") return null;
-      throw err;
-    }
-  }
-  async deleteResourceEmbeddings(resourceId7) {
-    const filePath = this.resourceFilePath(resourceId7);
-    try {
-      await fs.unlink(filePath);
-    } catch (err) {
-      if (err.code !== "ENOENT") throw err;
-    }
-  }
-  // ── Annotation embeddings ───────────────────────────────────────────────────
-  async writeAnnotationEmbedding(annotationId3, resourceId7, model, dimensions, text, embedding, motivation, entityTypes) {
-    const filePath = this.annotationFilePath(annotationId3);
-    await fs.mkdir(path.dirname(filePath), { recursive: true });
-    const data = {
-      model,
-      dimensions,
-      resourceId: String(resourceId7),
-      text,
-      embedding,
-      motivation,
-      entityTypes
-    };
-    await fs.writeFile(filePath, JSON.stringify(data), "utf-8");
-  }
-  async readAnnotationEmbedding(annotationId3) {
-    const filePath = this.annotationFilePath(annotationId3);
-    try {
-      const content = await fs.readFile(filePath, "utf-8");
-      return JSON.parse(content);
-    } catch (err) {
-      if (err.code === "ENOENT") return null;
-      throw err;
-    }
-  }
-  async deleteAnnotationEmbedding(annotationId3) {
-    const filePath = this.annotationFilePath(annotationId3);
-    try {
-      await fs.unlink(filePath);
-    } catch (err) {
-      if (err.code !== "ENOENT") throw err;
-    }
-  }
-  // ── Scan ────────────────────────────────────────────────────────────────────
-  /**
-   * Scan embeddings directory and return all resource IDs (from *.jsonl files).
-   */
-  async getAllResourceIds() {
-    return this.scanIds((name) => name.endsWith(".jsonl"), ".jsonl");
-  }
-  /**
-   * Scan embeddings directory and return all annotation IDs (from *.json files).
-   */
-  async getAllAnnotationIds() {
-    return this.scanIds((name) => name.endsWith(".json"), ".json");
-  }
-  async scanIds(filter, ext) {
-    const base = this.project.embeddingsDir;
-    try {
-      await fs.access(base);
-    } catch {
-      return [];
-    }
-    const results = [];
-    const scan = async (dir) => {
-      let entries;
-      try {
-        entries = await fs.readdir(dir, { withFileTypes: true });
-      } catch {
-        return;
-      }
-      for (const entry of entries) {
-        const full = path.join(dir, entry.name);
-        if (entry.isDirectory()) {
-          await scan(full);
-        } else if (filter(entry.name)) {
-          results.push(entry.name.slice(0, -ext.length));
-        }
-      }
-    };
-    await scan(base);
-    return results;
-  }
-};
-
 // src/knowledge-base.ts
 async function createKnowledgeBase(eventStore, project, graphDb, eventBus, logger, options) {
-  const views = new FilesystemViewStorage(project);
+  const views = new FilesystemViewStorage(project, logger.child({ component: "view-storage" }));
   const content = new WorkingTreeStore(
     project,
     logger.child({ component: "working-tree-store" })
@@ -11066,32 +10411,17 @@ async function createKnowledgeBase(eventStore, project, graphDb, eventBus, logge
     graphConsumer,
     projectionsDir: project.projectionsDir
   };
-  if (options?.vectorStore && options?.embeddingProvider) {
+  if (options?.vectorStore) {
     kb.vectors = options.vectorStore;
-    const embeddingStore = new EmbeddingStore(project);
-    kb.smelter = new Smelter(
-      eventStore,
-      eventBus,
-      options.vectorStore,
-      options.embeddingProvider,
-      content,
-      embeddingStore,
-      views,
-      logger.child({ component: "smelter" }),
-      options.chunkingConfig
-    );
-    await kb.smelter.initialize();
-    if (!options.skipRebuild) {
-      await kb.smelter.rebuildAll();
-    }
   }
   return kb;
 }
 
 // src/gatherer.ts
-var import_rxjs3 = __toESM(require_cjs(), 1);
-var import_operators3 = __toESM(require_operators(), 1);
-import { annotationId as makeAnnotationId3, resourceId, errField as errField3 } from "@semiont/core";
+var import_rxjs2 = __toESM(require_cjs(), 1);
+var import_operators2 = __toESM(require_operators(), 1);
+import { annotationId as makeAnnotationId2, resourceId, errField as errField2 } from "@semiont/core";
+import { withActorSpan } from "@semiont/observability";
 
 // src/generation/resource-generation.ts
 async function generateResourceSummary(resourceName, content, entityTypes, client) {
@@ -11103,10 +10433,10 @@ Resource content:
 ${truncatedContent}
 
 Write a 2-3 sentence summary that captures the key points and would help someone understand what this resource contains.`;
-  return await client.generateText(prompt, 150, 0.5);
+  return client.generateText(prompt, 150, 0.5);
 }
-async function generateReferenceSuggestions(referenceTitle, client, entityType, currentContent) {
-  const prompt = `For a reference titled "${referenceTitle}"${entityType ? ` (type: ${entityType})` : ""}${currentContent ? ` with current stub: "${currentContent}"` : ""}, suggest 3 specific, actionable next steps or related topics to explore.
+async function generateReferenceSuggestions(referenceTitle, client, entityType2, currentContent) {
+  const prompt = `For a reference titled "${referenceTitle}"${entityType2 ? ` (type: ${entityType2})` : ""}${currentContent ? ` with current stub: "${currentContent}"` : ""}, suggest 3 specific, actionable next steps or related topics to explore.
 
 Format as a simple list, one suggestion per line.`;
   const response = await client.generateText(prompt, 200, 0.8);
@@ -11117,27 +10447,18 @@ Format as a simple list, one suggestion per line.`;
 }
 
 // src/annotation-context.ts
-import {
-  getBodySource,
-  getResourceId,
-  getTargetSource,
-  getTargetSelector as getTargetSelector2,
-  getResourceEntityTypes,
-  getTextPositionSelector,
-  getPrimaryRepresentation as getPrimaryRepresentation2,
-  decodeRepresentation as decodeRepresentation2
-} from "@semiont/api-client";
+import { getBodySource, getResourceId, getTargetSource, getTargetSelector, getResourceEntityTypes, getTextPositionSelector, getPrimaryRepresentation as getPrimaryRepresentation2, decodeRepresentation as decodeRepresentation2 } from "@semiont/core";
 import { resourceId as createResourceId } from "@semiont/core";
 import { getEntityTypes } from "@semiont/ontology";
 
 // src/resource-context.ts
-import { getPrimaryRepresentation, decodeRepresentation } from "@semiont/api-client";
+import { getPrimaryRepresentation, decodeRepresentation } from "@semiont/core";
 var ResourceContext = class _ResourceContext {
   /**
    * Get resource metadata from view storage
    */
-  static async getResourceMetadata(resourceId7, kb) {
-    const view = await kb.views.get(resourceId7);
+  static async getResourceMetadata(resourceId10, kb) {
+    const view = await kb.views.get(resourceId10);
     if (!view) {
       return null;
     }
@@ -11182,7 +10503,7 @@ var ResourceContext = class _ResourceContext {
    * Retrieves and decodes the first 200 characters of each resource's primary representation
    */
   static async addContentPreviews(resources, kb) {
-    return await Promise.all(
+    return Promise.all(
       resources.map(async (doc) => {
         try {
           if (doc.storageUri) {
@@ -11225,7 +10546,7 @@ var AnnotationContext = class {
    * @returns Rich context for LLM processing
    * @throws Error if annotation or resource not found
    */
-  static async buildLLMContext(annotationId3, resourceId7, kb, options = {}, inferenceClient, logger, embeddingProvider) {
+  static async buildLLMContext(annotationId5, resourceId10, kb, options = {}, inferenceClient, logger, embeddingProvider) {
     const {
       includeSourceContext = true,
       includeTargetContext = true,
@@ -11234,34 +10555,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: annotationId3, resourceId: resourceId7 });
-    logger?.debug("Getting view for resource", { resourceId: resourceId7 });
+    logger?.debug("Building LLM context", { annotationId: annotationId5, resourceId: resourceId10 });
+    logger?.debug("Getting view for resource", { resourceId: resourceId10 });
     let sourceView;
     try {
-      sourceView = await kb.views.get(resourceId7);
+      sourceView = await kb.views.get(resourceId10);
       logger?.debug("Retrieved view", { hasView: !!sourceView });
       if (!sourceView) {
         throw new Error("Source resource not found");
       }
     } catch (error) {
-      logger?.error("Error getting view", { resourceId: resourceId7, error });
+      logger?.error("Error getting view", { resourceId: resourceId10, error });
       throw error;
     }
     logger?.debug("Looking for annotation in resource", {
-      annotationId: annotationId3,
-      resourceId: resourceId7,
+      annotationId: annotationId5,
+      resourceId: resourceId10,
       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 === annotationId3);
+    const annotation = sourceView.annotations.annotations.find((a) => a.id === annotationId5);
     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: resourceId7 });
-    if (targetSource !== String(resourceId7)) {
-      throw new Error(`Annotation target resource ID (${targetSource}) does not match expected resource ID (${resourceId7})`);
+    logger?.debug("Validating target resource", { targetSource, expectedResourceId: resourceId10 });
+    if (targetSource !== String(resourceId10)) {
+      throw new Error(`Annotation target resource ID (${targetSource}) does not match expected resource ID (${resourceId10})`);
     }
     const sourceDoc = sourceView.resource;
     const bodySource = getBodySource(annotation.body);
@@ -11279,7 +10600,7 @@ var AnnotationContext = class {
       const primaryRep = getPrimaryRepresentation2(sourceDoc);
       const sourceContent = await kb.content.retrieve(sourceDoc.storageUri);
       const contentStr = decodeRepresentation2(sourceContent, primaryRep?.mediaType ?? "text/plain");
-      const targetSelectorRaw = getTargetSelector2(annotation.target);
+      const targetSelectorRaw = getTargetSelector(annotation.target);
       const targetSelector = Array.isArray(targetSelectorRaw) ? targetSelectorRaw[0] : targetSelectorRaw;
       logger?.debug("Target selector", { type: targetSelector?.type });
       if (!targetSelector) {
@@ -11325,16 +10646,16 @@ var AnnotationContext = class {
       }
     }
     const suggestedResolution = void 0;
-    logger?.debug("Building graph context", { resourceId: resourceId7 });
+    logger?.debug("Building graph context", { resourceId: resourceId10 });
     const [connections, referencedByAnnotations, entityTypeStats] = await Promise.all([
-      kb.graph.getResourceConnections(resourceId7),
-      kb.graph.getResourceReferencedBy(resourceId7),
+      kb.graph.getResourceConnections(resourceId10),
+      kb.graph.getResourceReferencedBy(resourceId10),
       kb.graph.getEntityTypeStats()
     ]);
     const citedByMap = /* @__PURE__ */ new Map();
     for (const ann of referencedByAnnotations) {
       const source = getTargetSource(ann.target);
-      if (source && source !== String(resourceId7)) {
+      if (source && source !== String(resourceId10)) {
         const sourceResId = createResourceId(source);
         const sourceView2 = await kb.views.get(sourceResId);
         if (sourceView2?.resource) {
@@ -11345,7 +10666,7 @@ var AnnotationContext = class {
     const annotationEntityTypes = getEntityTypes(annotation);
     const siblingEntityTypes = /* @__PURE__ */ new Set();
     for (const ann of sourceView.annotations.annotations) {
-      if (ann.id !== annotationId3) {
+      if (ann.id !== annotationId5) {
         for (const et of getEntityTypes(ann)) {
           siblingEntityTypes.add(et);
         }
@@ -11406,7 +10727,7 @@ Summary:`;
         const results = await kb.vectors.searchAnnotations(focalEmbedding, {
           limit: 10,
           scoreThreshold: 0.5,
-          filter: { excludeResourceId: resourceId7 }
+          filter: { excludeResourceId: resourceId10 }
         });
         if (results.length > 0) {
           semanticContext = {
@@ -11458,10 +10779,10 @@ Summary:`;
    * Get resource annotations from view storage (fast path)
    * Throws if view missing
    */
-  static async getResourceAnnotations(resourceId7, kb) {
-    const view = await kb.views.get(resourceId7);
+  static async getResourceAnnotations(resourceId10, kb) {
+    const view = await kb.views.get(resourceId10);
     if (!view) {
-      throw new Error(`Resource ${resourceId7} not found in view storage`);
+      throw new Error(`Resource ${resourceId10} not found in view storage`);
     }
     return view.annotations;
   }
@@ -11469,9 +10790,9 @@ Summary:`;
    * Get all annotations
    * @returns Array of all annotation objects
    */
-  static async getAllAnnotations(resourceId7, kb) {
-    const annotations = await this.getResourceAnnotations(resourceId7, kb);
-    return await this.enrichResolvedReferences(annotations.annotations, kb);
+  static async getAllAnnotations(resourceId10, kb) {
+    const annotations = await this.getResourceAnnotations(resourceId10, kb);
+    return this.enrichResolvedReferences(annotations.annotations, kb);
   }
   /**
    * Enrich reference annotations with resolved document names
@@ -11539,8 +10860,8 @@ Summary:`;
    * Get resource stats (version info)
    * @returns Version and timestamp info for the annotations
    */
-  static async getResourceStats(resourceId7, kb) {
-    const annotations = await this.getResourceAnnotations(resourceId7, kb);
+  static async getResourceStats(resourceId10, kb) {
+    const annotations = await this.getResourceAnnotations(resourceId10, kb);
     return {
       resourceId: annotations.resourceId,
       version: annotations.version,
@@ -11550,16 +10871,16 @@ Summary:`;
   /**
    * Check if resource exists in view storage
    */
-  static async resourceExists(resourceId7, kb) {
-    return await kb.views.exists(resourceId7);
+  static async resourceExists(resourceId10, kb) {
+    return kb.views.exists(resourceId10);
   }
   /**
    * Get a single annotation by ID
    * O(1) lookup using resource ID to access view storage
    */
-  static async getAnnotation(annotationId3, resourceId7, kb) {
-    const annotations = await this.getResourceAnnotations(resourceId7, kb);
-    return annotations.annotations.find((a) => a.id === annotationId3) || null;
+  static async getAnnotation(annotationId5, resourceId10, kb) {
+    const annotations = await this.getResourceAnnotations(resourceId10, kb);
+    return annotations.annotations.find((a) => a.id === annotationId5) || null;
   }
   /**
    * List annotations with optional filtering
@@ -11570,13 +10891,13 @@ Summary:`;
     if (!filters?.resourceId) {
       throw new Error("resourceId is required for annotation listing - cross-resource queries not supported in view storage");
     }
-    return await this.getAllAnnotations(filters.resourceId, kb);
+    return this.getAllAnnotations(filters.resourceId, kb);
   }
   /**
    * Get annotation context (selected text with surrounding context)
    */
-  static async getAnnotationContext(annotationId3, resourceId7, contextBefore, contextAfter, kb) {
-    const annotation = await this.getAnnotation(annotationId3, resourceId7, kb);
+  static async getAnnotationContext(annotationId5, resourceId10, contextBefore, contextAfter, kb) {
+    const annotation = await this.getAnnotation(annotationId5, resourceId10, kb);
     if (!annotation) {
       throw new Error("Annotation not found");
     }
@@ -11608,8 +10929,8 @@ Summary:`;
   /**
    * Generate AI summary of annotation in context
    */
-  static async generateAnnotationSummary(annotationId3, resourceId7, kb, inferenceClient) {
-    const annotation = await this.getAnnotation(annotationId3, resourceId7, kb);
+  static async generateAnnotationSummary(annotationId5, resourceId10, kb, inferenceClient) {
+    const annotation = await this.getAnnotation(annotationId5, resourceId10, kb);
     if (!annotation) {
       throw new Error("Annotation not found");
     }
@@ -11656,7 +10977,7 @@ Summary:`;
    * Extract annotation context from resource content
    */
   static extractAnnotationContext(annotation, contentStr, contextBefore, contextAfter) {
-    const targetSelector = getTargetSelector2(annotation.target);
+    const targetSelector = getTargetSelector(annotation.target);
     const posSelector = targetSelector ? getTextPositionSelector(targetSelector) : null;
     if (!posSelector) {
       throw new Error("TextPositionSelector required for context");
@@ -11684,51 +11005,51 @@ Context after: "${context.after.substring(0, 200)}"
 
 Resource: ${resource.name}
 Entity types: ${entityTypes.join(", ")}`;
-    return await inferenceClient.generateText(summaryPrompt, 500, 0.5);
+    return inferenceClient.generateText(summaryPrompt, 500, 0.5);
   }
 };
 
 // src/graph-context.ts
-import { getResourceId as getResourceId2, getResourceEntityTypes as getResourceEntityTypes2 } from "@semiont/api-client";
+import { getResourceId as getResourceId2, getResourceEntityTypes as getResourceEntityTypes2 } from "@semiont/core";
 var GraphContext = class {
   /**
    * Get all resources referencing this resource (backlinks)
    * Requires graph traversal - must use graph database
    */
-  static async getBacklinks(resourceId7, kb) {
-    return await kb.graph.getResourceReferencedBy(resourceId7);
+  static async getBacklinks(resourceId10, kb) {
+    return kb.graph.getResourceReferencedBy(resourceId10);
   }
   /**
    * Find shortest path between two resources
    * Requires graph traversal - must use graph database
    */
   static async findPath(fromResourceId, toResourceId, kb, maxDepth) {
-    return await kb.graph.findPath(fromResourceId, toResourceId, maxDepth);
+    return kb.graph.findPath(fromResourceId, toResourceId, maxDepth);
   }
   /**
    * Get resource connections (graph edges)
    * Requires graph traversal - must use graph database
    */
-  static async getResourceConnections(resourceId7, kb) {
-    return await kb.graph.getResourceConnections(resourceId7);
+  static async getResourceConnections(resourceId10, kb) {
+    return kb.graph.getResourceConnections(resourceId10);
   }
   /**
    * Search resources by name (cross-resource query)
    * Requires full-text search - must use graph database
    */
   static async searchResources(query, kb, limit) {
-    return await kb.graph.searchResources(query, limit);
+    return kb.graph.searchResources(query, limit);
   }
   /**
    * 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(resourceId7, maxRelated, kb) {
-    const mainDoc = await kb.graph.getResource(resourceId7);
+  static async buildGraphRepresentation(resourceId10, maxRelated, kb) {
+    const mainDoc = await kb.graph.getResource(resourceId10);
     if (!mainDoc) {
       throw new Error("Resource not found");
     }
-    const connections = await kb.graph.getResourceConnections(resourceId7);
+    const connections = await kb.graph.getResourceConnections(resourceId10);
     const relatedDocs = connections.map((conn) => conn.targetResource).slice(0, maxRelated - 1);
     const nodes = [
       {
@@ -11745,7 +11066,7 @@ var GraphContext = class {
       }))
     ].filter((node) => node.id !== void 0);
     const edges = connections.slice(0, maxRelated - 1).map((conn) => ({
-      source: resourceId7,
+      source: resourceId10,
       target: getResourceId2(conn.targetResource),
       type: conn.relationshipType || "link",
       metadata: {}
@@ -11755,29 +11076,29 @@ var GraphContext = class {
 };
 
 // src/llm-context.ts
-import { getResourceEntityTypes as getResourceEntityTypes3, getResourceId as getResourceId3 } from "@semiont/api-client";
-import { resourceId as makeResourceId3 } from "@semiont/core";
+import { getResourceEntityTypes as getResourceEntityTypes3, getResourceId as getResourceId3 } from "@semiont/core";
+import { resourceId as makeResourceId2 } from "@semiont/core";
 var LLMContext = class {
   /**
    * Get comprehensive LLM context for a resource
    * Includes: main resource, related resources, annotations, graph, content, summary, references
    */
-  static async getResourceContext(resourceId7, options, kb, inferenceClient) {
-    const mainDoc = await ResourceContext.getResourceMetadata(resourceId7, kb);
+  static async getResourceContext(resourceId10, options, kb, inferenceClient) {
+    const mainDoc = await ResourceContext.getResourceMetadata(resourceId10, 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(
-      resourceId7,
+      resourceId10,
       options.maxResources,
       kb
     );
     const relatedDocs = [];
-    const resourceIdStr = resourceId7.toString();
+    const resourceIdStr = resourceId10.toString();
     for (const node of graph.nodes) {
       if (node.id !== resourceIdStr) {
-        const relatedDoc = await ResourceContext.getResourceMetadata(makeResourceId3(node.id), kb);
+        const relatedDoc = await ResourceContext.getResourceMetadata(makeResourceId2(node.id), kb);
         if (relatedDoc) {
           relatedDocs.push(relatedDoc);
         }
@@ -11796,7 +11117,7 @@ var LLMContext = class {
         })
       );
     }
-    const annotations = await AnnotationContext.getAllAnnotations(resourceId7, kb);
+    const annotations = await AnnotationContext.getAllAnnotations(resourceId10, kb);
     const summary = options.includeSummary && mainContent ? await generateResourceSummary(
       mainDoc.name,
       mainContent,
@@ -11832,18 +11153,22 @@ var Gatherer = class {
     this.logger.info("Gatherer actor initialized");
     const errorHandler = (err) => this.logger.error("Gatherer pipeline error", { error: err });
     const annotationGather$ = this.eventBus.get("gather:requested").pipe(
-      (0, import_operators3.groupBy)((event) => event.resourceId),
-      (0, import_operators3.mergeMap)(
+      (0, import_operators2.groupBy)((event) => event.resourceId),
+      (0, import_operators2.mergeMap)(
         (group$) => group$.pipe(
-          (0, import_operators3.concatMap)((event) => (0, import_rxjs3.from)(this.handleAnnotationGather(event)))
+          (0, import_operators2.concatMap)(
+            (event) => (0, import_rxjs2.from)(withActorSpan("gatherer", "gather:requested", () => this.handleAnnotationGather(event)))
+          )
         )
       )
     );
     const resourceGather$ = this.eventBus.get("gather:resource-requested").pipe(
-      (0, import_operators3.groupBy)((event) => event.resourceId),
-      (0, import_operators3.mergeMap)(
+      (0, import_operators2.groupBy)((event) => event.resourceId),
+      (0, import_operators2.mergeMap)(
         (group$) => group$.pipe(
-          (0, import_operators3.concatMap)((event) => (0, import_rxjs3.from)(this.handleResourceGather(event)))
+          (0, import_operators2.concatMap)(
+            (event) => (0, import_rxjs2.from)(withActorSpan("gatherer", "gather:resource-requested", () => this.handleResourceGather(event)))
+          )
         )
       )
     );
@@ -11856,14 +11181,13 @@ 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,
         resourceId: event.resourceId
       });
       const response = await AnnotationContext.buildLLMContext(
-        makeAnnotationId3(event.annotationId),
+        makeAnnotationId2(event.annotationId),
         resourceId(event.resourceId),
         this.kb,
         event.options ?? {},
@@ -11871,7 +11195,7 @@ var Gatherer = class {
         this.logger,
         this.embeddingProvider
       );
-      resultBus.get("gather:complete").next({
+      this.eventBus.get("gather:complete").next({
         correlationId: event.correlationId,
         annotationId: event.annotationId,
         response
@@ -11879,9 +11203,9 @@ var Gatherer = class {
     } catch (error) {
       this.logger.error("Gather annotation context failed", {
         annotationId: event.annotationId,
-        error: errField3(error)
+        error: errField2(error)
       });
-      resultBus.get("gather:failed").next({
+      this.eventBus.get("gather:failed").next({
         correlationId: event.correlationId,
         annotationId: event.annotationId,
         message: error instanceof Error ? error.message : String(error)
@@ -11889,7 +11213,6 @@ var Gatherer = class {
     }
   }
   async handleResourceGather(event) {
-    const resultBus = this.eventBus.scope(event.resourceId);
     try {
       this.logger.debug("Gathering resource context", {
         resourceId: event.resourceId
@@ -11900,7 +11223,7 @@ var Gatherer = class {
         this.kb,
         this.inferenceClient
       );
-      resultBus.get("gather:resource-complete").next({
+      this.eventBus.get("gather:resource-complete").next({
         correlationId: event.correlationId,
         resourceId: event.resourceId,
         response: result
@@ -11908,19 +11231,19 @@ var Gatherer = class {
     } catch (error) {
       this.logger.error("Gather resource context failed", {
         resourceId: event.resourceId,
-        error: errField3(error)
+        error: errField2(error)
       });
-      resultBus.get("gather:resource-failed").next({
+      this.eventBus.get("gather:resource-failed").next({
         correlationId: event.correlationId,
         resourceId: event.resourceId,
         message: error instanceof Error ? error.message : String(error)
       });
     }
   }
-  async generateAnnotationSummary(annotationId3, resourceId7) {
+  async generateAnnotationSummary(annotationId5, resourceId10) {
     return AnnotationContext.generateAnnotationSummary(
-      annotationId3,
-      resourceId7,
+      annotationId5,
+      resourceId10,
       this.kb,
       this.inferenceClient
     );
@@ -11935,10 +11258,11 @@ var Gatherer = class {
 };
 
 // src/matcher.ts
-var import_rxjs4 = __toESM(require_cjs(), 1);
-var import_operators4 = __toESM(require_operators(), 1);
-import { resourceId as resourceId2, errField as errField4 } from "@semiont/core";
-import { getResourceId as getResourceId4, getResourceEntityTypes as getResourceEntityTypes4 } from "@semiont/api-client";
+var import_rxjs3 = __toESM(require_cjs(), 1);
+var import_operators3 = __toESM(require_operators(), 1);
+import { resourceId as resourceId2, errField as errField3 } from "@semiont/core";
+import { getResourceId as getResourceId4, getResourceEntityTypes as getResourceEntityTypes4 } from "@semiont/core";
+import { withActorSpan as withActorSpan2 } from "@semiont/observability";
 var Matcher = class {
   constructor(kb, eventBus, logger, inferenceClient, embeddingProvider) {
     this.kb = kb;
@@ -11953,7 +11277,9 @@ var Matcher = class {
     this.logger.info("Matcher actor initialized");
     const errorHandler = (err) => this.logger.error("Matcher pipeline error", { error: err });
     const search$ = this.eventBus.get("match:search-requested").pipe(
-      (0, import_operators4.concatMap)((event) => (0, import_rxjs4.from)(this.handleSearch(event)))
+      (0, import_operators3.concatMap)(
+        (event) => (0, import_rxjs3.from)(withActorSpan2("matcher", "match:search-requested", () => this.handleSearch(event)))
+      )
     );
     this.subscriptions.push(
       search$.subscribe({ error: errorHandler })
@@ -11961,7 +11287,6 @@ 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 ?? "";
@@ -11978,7 +11303,7 @@ var Matcher = class {
         event.useSemanticScoring
       );
       const limited = event.limit ? scored.slice(0, event.limit) : scored;
-      resultBus.get("match:search-results").next({
+      this.eventBus.get("match:search-results").next({
         correlationId: event.correlationId,
         referenceId: event.referenceId,
         response: limited
@@ -11986,9 +11311,9 @@ var Matcher = class {
     } catch (error) {
       this.logger.error("Bind search failed", {
         referenceId: event.referenceId,
-        error: errField4(error)
+        error: errField3(error)
       });
-      this.eventBus.scope(event.resourceId).get("match:search-failed").next({
+      this.eventBus.get("match:search-failed").next({
         correlationId: event.correlationId,
         referenceId: event.referenceId,
         error: error instanceof Error ? error.message : String(error)
@@ -12254,10 +11579,11 @@ For each candidate, output a line with the number and score, like:
 };
 
 // src/stower.ts
-var import_rxjs5 = __toESM(require_cjs(), 1);
-var import_operators5 = __toESM(require_operators(), 1);
-import { promises as fs2 } from "fs";
-import { resourceId as resourceId3, userId as makeUserId, annotationId as makeAnnotationId4, CREATION_METHODS, generateUuid } from "@semiont/core";
+var import_rxjs4 = __toESM(require_cjs(), 1);
+var import_operators4 = __toESM(require_operators(), 1);
+import { promises as fs } from "fs";
+import { annotationId, errField as errField4, resourceId as resourceId3, userId as makeUserId, CREATION_METHODS, generateUuid } from "@semiont/core";
+import { withActorSpan as withActorSpan3 } from "@semiont/observability";
 import { resolveStorageUri } from "@semiont/event-sourcing";
 var Stower = class {
   constructor(kb, eventBus, logger) {
@@ -12269,8 +11595,12 @@ var Stower = class {
   logger;
   async initialize() {
     this.logger.info("Stower actor initialized");
-    const pipe = (event, handler) => this.eventBus.get(event).pipe((0, import_operators5.concatMap)((e) => (0, import_rxjs5.from)(handler(e))));
-    this.subscription = (0, import_rxjs5.merge)(
+    const pipe = (event, handler) => this.eventBus.get(event).pipe(
+      (0, import_operators4.concatMap)(
+        (e) => (0, import_rxjs4.from)(withActorSpan3("stower", event, () => handler(e)))
+      )
+    );
+    this.subscription = (0, import_rxjs4.merge)(
       pipe("yield:create", (e) => this.handleYieldCreate(e)),
       pipe("yield:update", (e) => this.handleYieldUpdate(e)),
       pipe("yield:mv", (e) => this.handleYieldMv(e)),
@@ -12282,7 +11612,6 @@ var Stower = class {
       pipe("mark:unarchive", (e) => this.handleMarkUnarchive(e)),
       pipe("mark:update-entity-types", (e) => this.handleUpdateEntityTypes(e)),
       pipe("job:start", (e) => this.handleJobStart(e)),
-      pipe("job:report-progress", (e) => this.handleJobReportProgress(e)),
       pipe("job:complete", (e) => this.handleJobComplete(e)),
       pipe("job:fail", (e) => this.handleJobFail(e))
     ).subscribe({
@@ -12293,6 +11622,10 @@ var Stower = class {
   // Event handlers
   // ========================================================================
   async handleYieldCreate(event) {
+    if (!event._userId) {
+      throw new Error("yield:create missing _userId (gateway injection)");
+    }
+    const uid = makeUserId(event._userId);
     try {
       const rId = resourceId3(generateUuid());
       const stored = await this.kb.content.register(event.storageUri, event.contentChecksum, { noGit: event.noGit });
@@ -12300,11 +11633,14 @@ var Stower = class {
       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;
+      const generatedFrom = event.generatedFrom?.resourceId && event.generatedFrom?.annotationId ? {
+        resourceId: resourceId3(event.generatedFrom.resourceId),
+        annotationId: annotationId(event.generatedFrom.annotationId)
+      } : void 0;
       await this.kb.eventStore.appendEvent({
         type: "yield:created",
         resourceId: rId,
-        userId: makeUserId(event.userId),
+        userId: uid,
         version: 1,
         payload: {
           name: event.name,
@@ -12342,20 +11678,45 @@ var Stower = class {
         ]
       };
       this.eventBus.get("yield:create-ok").next({ resourceId: rId, resource });
+      if (generatedFrom) {
+        this.eventBus.get("mark:update-body").next({
+          annotationId: generatedFrom.annotationId,
+          _userId: event._userId,
+          resourceId: generatedFrom.resourceId,
+          operations: [
+            {
+              op: "add",
+              item: {
+                type: "SpecificResource",
+                source: rId,
+                purpose: "linking"
+              }
+            }
+          ]
+        });
+        this.logger.info("Auto-bound generated resource to source reference", {
+          resourceId: rId,
+          sourceAnnotationId: generatedFrom.annotationId,
+          sourceResourceId: generatedFrom.resourceId
+        });
+      }
     } catch (error) {
-      this.logger.error("Failed to create resource", { error });
+      this.logger.error("Failed to create resource", { error: errField4(error) });
       this.eventBus.get("yield:create-failed").next({
         message: error instanceof Error ? error.message : String(error)
       });
     }
   }
   async handleYieldUpdate(event) {
+    if (!event._userId) {
+      throw new Error("yield:update missing _userId (gateway injection)");
+    }
     try {
       await this.kb.content.register(event.storageUri, event.contentChecksum, { noGit: event.noGit });
       await this.kb.eventStore.appendEvent({
         type: "yield:updated",
         resourceId: resourceId3(event.resourceId),
-        userId: makeUserId(event.userId),
+        userId: makeUserId(event._userId),
         version: 1,
         payload: {
           contentChecksum: event.contentChecksum,
@@ -12364,7 +11725,7 @@ var Stower = class {
       });
       this.eventBus.get("yield:update-ok").next({ resourceId: event.resourceId });
     } catch (error) {
-      this.logger.error("Failed to update resource", { error });
+      this.logger.error("Failed to update resource", { error: errField4(error) });
       this.eventBus.get("yield:update-failed").next({
         resourceId: event.resourceId,
         message: error instanceof Error ? error.message : String(error)
@@ -12384,12 +11745,15 @@ var Stower = class {
       });
       return;
     }
+    if (!event._userId) {
+      throw new Error("yield:mv missing _userId (gateway injection)");
+    }
     try {
       await this.kb.content.move(event.fromUri, event.toUri, { noGit: event.noGit });
       await this.kb.eventStore.appendEvent({
         type: "yield:moved",
         resourceId: rId,
-        userId: makeUserId(event.userId),
+        userId: makeUserId(event._userId),
         version: 1,
         payload: {
           fromUri: event.fromUri,
@@ -12398,7 +11762,7 @@ var Stower = class {
       });
       this.eventBus.get("yield:move-ok").next({ resourceId: rId });
     } catch (error) {
-      this.logger.error("Failed to move resource", { error });
+      this.logger.error("Failed to move resource", { error: errField4(error) });
       this.eventBus.get("yield:move-failed").next({
         fromUri: event.fromUri,
         message: error instanceof Error ? error.message : String(error)
@@ -12406,50 +11770,62 @@ var Stower = class {
     }
   }
   async handleMarkCreate(event) {
+    if (!event._userId) {
+      throw new Error("mark:create missing _userId (gateway injection)");
+    }
     try {
       this.logger.debug("Stowing annotation", { annotationId: event.annotation.id });
-      await this.kb.eventStore.appendEvent({
-        type: "mark:added",
-        resourceId: resourceId3(event.resourceId),
-        userId: makeUserId(event.userId),
-        version: 1,
-        payload: { annotation: event.annotation }
-      });
-      this.eventBus.get("mark:create-ok").next({ annotationId: makeAnnotationId4(event.annotation.id) });
+      await this.kb.eventStore.appendEvent(
+        {
+          type: "mark:added",
+          resourceId: resourceId3(event.resourceId),
+          userId: makeUserId(event._userId),
+          version: 1,
+          payload: { annotation: event.annotation }
+        },
+        event.correlationId ? { correlationId: event.correlationId } : void 0
+      );
     } catch (error) {
-      this.logger.error("Failed to create annotation", { error });
+      this.logger.error("Failed to create annotation", { error: errField4(error) });
       this.eventBus.get("mark:create-failed").next({
+        correlationId: event.correlationId,
         message: error instanceof Error ? error.message : String(error)
       });
     }
   }
   async handleMarkDelete(event) {
-    if (!event.userId || !event.resourceId) {
-      return;
+    if (!event._userId) {
+      throw new Error("mark:delete missing _userId (gateway injection)");
+    }
+    if (!event.resourceId) {
+      throw new Error("mark:delete missing resourceId");
     }
     try {
       await this.kb.eventStore.appendEvent({
         type: "mark:removed",
         resourceId: resourceId3(event.resourceId),
-        userId: makeUserId(event.userId),
+        userId: makeUserId(event._userId),
         version: 1,
-        payload: { annotationId: event.annotationId }
+        payload: { annotationId: annotationId(event.annotationId) }
       });
       this.eventBus.get("mark:delete-ok").next({ annotationId: event.annotationId });
     } catch (error) {
-      this.logger.error("Failed to delete annotation", { error });
+      this.logger.error("Failed to delete annotation", { error: errField4(error) });
       this.eventBus.get("mark:delete-failed").next({
         message: error instanceof Error ? error.message : String(error)
       });
     }
   }
   async handleMarkUpdateBody(event) {
+    if (!event._userId) {
+      throw new Error("mark:update-body missing _userId (gateway injection)");
+    }
     try {
       await this.kb.eventStore.appendEvent(
         {
           type: "mark:body-updated",
           resourceId: resourceId3(event.resourceId),
-          userId: makeUserId(event.userId),
+          userId: makeUserId(event._userId),
           version: 1,
           payload: { annotationId: event.annotationId, operations: event.operations }
         },
@@ -12458,16 +11834,16 @@ var Stower = class {
         event.correlationId ? { correlationId: event.correlationId } : void 0
       );
     } catch (error) {
-      this.logger.error("Failed to update annotation body", { error });
+      this.logger.error("Failed to update annotation body", { error: errField4(error) });
       this.eventBus.get("mark:body-update-failed").next({
+        correlationId: event.correlationId,
         message: error instanceof Error ? error.message : String(error)
       });
     }
   }
   async handleMarkArchive(event) {
-    if (!event.userId) {
-      this.logger.warn("mark:archive missing userId \u2014 skipping (frontend-only event?)");
-      return;
+    if (!event._userId) {
+      throw new Error("mark:archive missing _userId (gateway injection)");
     }
     if (event.storageUri) {
       await this.kb.content.remove(event.storageUri, { keepFile: event.keepFile, noGit: event.noGit });
@@ -12475,20 +11851,19 @@ var Stower = class {
     await this.kb.eventStore.appendEvent({
       type: "mark:archived",
       resourceId: resourceId3(event.resourceId),
-      userId: makeUserId(event.userId),
+      userId: makeUserId(event._userId),
       version: 1,
       payload: { reason: void 0 }
     });
   }
   async handleMarkUnarchive(event) {
-    if (!event.userId) {
-      this.logger.warn("mark:unarchive missing userId \u2014 skipping (frontend-only event?)");
-      return;
+    if (!event._userId) {
+      throw new Error("mark:unarchive missing _userId (gateway injection)");
     }
     if (event.storageUri) {
       const absPath = this.kb.content.resolveUri(event.storageUri);
       try {
-        await fs2.access(absPath);
+        await fs.access(absPath);
       } catch {
         this.logger.warn("Unarchive failed: file not found at storageUri", { storageUri: event.storageUri });
         return;
@@ -12497,93 +11872,101 @@ var Stower = class {
     await this.kb.eventStore.appendEvent({
       type: "mark:unarchived",
       resourceId: resourceId3(event.resourceId),
-      userId: makeUserId(event.userId),
+      userId: makeUserId(event._userId),
       version: 1,
       payload: {}
     });
   }
   async handleAddEntityType(event) {
+    if (!event._userId) {
+      throw new Error("mark:add-entity-type missing _userId (gateway injection)");
+    }
     try {
       await this.kb.eventStore.appendEvent({
         type: "mark:entity-type-added",
-        userId: makeUserId(event.userId),
+        userId: makeUserId(event._userId),
         version: 1,
         payload: { entityType: event.tag }
       });
     } catch (error) {
-      this.logger.error("Failed to add entity type", { error });
+      this.logger.error("Failed to add entity type", { error: errField4(error) });
       this.eventBus.get("mark:entity-type-add-failed").next({
         message: error instanceof Error ? error.message : String(error)
       });
     }
   }
   async handleUpdateEntityTypes(event) {
+    if (!event._userId) {
+      throw new Error("mark:update-entity-types missing _userId (gateway injection)");
+    }
+    const uid = makeUserId(event._userId);
     const added = event.updatedEntityTypes.filter((et) => !event.currentEntityTypes.includes(et));
     const removed = event.currentEntityTypes.filter((et) => !event.updatedEntityTypes.includes(et));
-    for (const entityType of added) {
+    for (const entityType2 of added) {
       await this.kb.eventStore.appendEvent({
         type: "mark:entity-tag-added",
         resourceId: resourceId3(event.resourceId),
-        userId: makeUserId(event.userId),
+        userId: uid,
         version: 1,
-        payload: { entityType }
+        payload: { entityType: entityType2 }
       });
     }
-    for (const entityType of removed) {
+    for (const entityType2 of removed) {
       await this.kb.eventStore.appendEvent({
         type: "mark:entity-tag-removed",
         resourceId: resourceId3(event.resourceId),
-        userId: makeUserId(event.userId),
+        userId: uid,
         version: 1,
-        payload: { entityType }
+        payload: { entityType: entityType2 }
       });
     }
   }
   async handleJobStart(event) {
+    if (!event._userId) {
+      throw new Error("job:start missing _userId (gateway injection)");
+    }
     await this.kb.eventStore.appendEvent({
       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: resourceId3(event.resourceId),
-      userId: makeUserId(event.userId),
+      userId: makeUserId(event._userId),
       version: 1,
       payload: {
         jobId: event.jobId,
         jobType: event.jobType,
-        percentage: event.percentage,
-        progress: event.progress
+        ...event.annotationId ? { annotationId: event.annotationId } : {}
       }
     });
   }
   async handleJobComplete(event) {
+    if (!event._userId) {
+      throw new Error("job:complete missing _userId (gateway injection)");
+    }
     await this.kb.eventStore.appendEvent({
       type: "job:completed",
       resourceId: resourceId3(event.resourceId),
-      userId: makeUserId(event.userId),
+      userId: makeUserId(event._userId),
       version: 1,
       payload: {
         jobId: event.jobId,
         jobType: event.jobType,
+        ...event.annotationId ? { annotationId: event.annotationId } : {},
         result: event.result
       }
     });
   }
   async handleJobFail(event) {
+    if (!event._userId) {
+      throw new Error("job:fail missing _userId (gateway injection)");
+    }
     await this.kb.eventStore.appendEvent({
       type: "job:failed",
       resourceId: resourceId3(event.resourceId),
-      userId: makeUserId(event.userId),
+      userId: makeUserId(event._userId),
       version: 1,
       payload: {
         jobId: event.jobId,
         jobType: event.jobType,
+        ...event.annotationId ? { annotationId: event.annotationId } : {},
         error: event.error
       }
     });
@@ -12596,27 +11979,28 @@ var Stower = class {
 };
 
 // src/browser.ts
-var import_rxjs6 = __toESM(require_cjs(), 1);
-var import_operators6 = __toESM(require_operators(), 1);
-import { promises as fs4 } from "fs";
-import * as path3 from "path";
-import { resourceId as resourceId4, annotationId, errField as errField5 } from "@semiont/core";
-import { getExactText as getExactText2, getTargetSource as getTargetSource2, getTargetSelector as getTargetSelector3, getResourceEntityTypes as getResourceEntityTypes5, getBodySource as getBodySource2 } from "@semiont/api-client";
+var import_rxjs5 = __toESM(require_cjs(), 1);
+var import_operators5 = __toESM(require_operators(), 1);
+import { promises as fs3 } from "fs";
+import * as path2 from "path";
+import { resourceId as resourceId4, annotationId as annotationId2, errField as errField5 } from "@semiont/core";
+import { withActorSpan as withActorSpan4 } from "@semiont/observability";
+import { getExactText, getTargetSource as getTargetSource2, getTargetSelector as getTargetSelector2, getResourceEntityTypes as getResourceEntityTypes5, getBodySource as getBodySource2 } from "@semiont/core";
 import { EventQuery as EventQuery2 } from "@semiont/event-sourcing";
 import { getEntityTypes as getEntityTypes2 } from "@semiont/ontology";
 
 // src/views/entity-types-reader.ts
-import { promises as fs3 } from "fs";
-import * as path2 from "path";
+import { promises as fs2 } from "fs";
+import * as path from "path";
 async function readEntityTypesProjection(project) {
-  const entityTypesPath = path2.join(
+  const entityTypesPath = path.join(
     project.stateDir,
     "projections",
     "__system__",
     "entitytypes.json"
   );
   try {
-    const content = await fs3.readFile(entityTypesPath, "utf-8");
+    const content = await fs2.readFile(entityTypesPath, "utf-8");
     const projection = JSON.parse(content);
     return projection.entityTypes || [];
   } catch (error) {
@@ -12641,7 +12025,11 @@ var Browser = class {
   async initialize() {
     this.logger.info("Browser actor initialized");
     const errorHandler = (err) => this.logger.error("Browser pipeline error", { error: err });
-    const pipe = (name, handler) => this.eventBus.get(name).pipe((0, import_operators6.mergeMap)((event) => (0, import_rxjs6.from)(handler(event))));
+    const pipe = (name, handler) => this.eventBus.get(name).pipe(
+      (0, import_operators5.mergeMap)(
+        (event) => (0, import_rxjs5.from)(withActorSpan4("browser", name, () => handler(event)))
+      )
+    );
     this.subscriptions.push(
       pipe("browse:resource-requested", (e) => this.handleBrowseResource(e)).subscribe({ error: errorHandler }),
       pipe("browse:resources-requested", (e) => this.handleBrowseResources(e)).subscribe({ error: errorHandler }),
@@ -12740,7 +12128,7 @@ var Browser = class {
   }
   async handleBrowseAnnotation(event) {
     try {
-      const annotation = await AnnotationContext.getAnnotation(annotationId(event.annotationId), resourceId4(event.resourceId), this.kb);
+      const annotation = await AnnotationContext.getAnnotation(annotationId2(event.annotationId), resourceId4(event.resourceId), this.kb);
       if (!annotation) {
         this.eventBus.get("browse:annotation-failed").next({
           correlationId: event.correlationId,
@@ -12804,7 +12192,7 @@ var Browser = class {
   }
   async handleBrowseAnnotationHistory(event) {
     try {
-      const annotation = await AnnotationContext.getAnnotation(annotationId(event.annotationId), resourceId4(event.resourceId), this.kb);
+      const annotation = await AnnotationContext.getAnnotation(annotationId2(event.annotationId), resourceId4(event.resourceId), this.kb);
       if (!annotation) {
         this.eventBus.get("browse:annotation-history-failed").next({
           correlationId: event.correlationId,
@@ -12855,15 +12243,15 @@ var Browser = class {
       const docMap = new Map(resources.filter((doc) => doc !== null).map((doc) => [doc["@id"], doc]));
       const referencedBy = references.map((ref) => {
         const targetSource = getTargetSource2(ref.target);
-        const targetSelector = getTargetSelector3(ref.target);
-        const doc = docMap.get(targetSource);
+        const targetSelector = getTargetSelector2(ref.target);
+        const doc = targetSource ? docMap.get(resourceId4(targetSource)) : void 0;
         return {
           id: ref.id,
           resourceName: doc?.name || "Untitled Resource",
           target: {
             source: targetSource,
             selector: {
-              exact: targetSelector ? getExactText2(targetSelector) : ""
+              exact: targetSelector ? getExactText(targetSelector) : ""
             }
           }
         };
@@ -12901,8 +12289,8 @@ var Browser = class {
   async handleBrowseDirectory(event) {
     const { correlationId, path: reqPath, sort = "name" } = event;
     const projectRoot = this.project.root;
-    const resolved = path3.resolve(projectRoot, reqPath);
-    if (!resolved.startsWith(projectRoot + path3.sep) && resolved !== projectRoot) {
+    const resolved = path2.resolve(projectRoot, reqPath);
+    if (!resolved.startsWith(projectRoot + path2.sep) && resolved !== projectRoot) {
       this.eventBus.get("browse:directory-failed").next({
         correlationId,
         path: reqPath,
@@ -12912,7 +12300,7 @@ var Browser = class {
     }
     let dirents;
     try {
-      dirents = await fs4.readdir(resolved, { withFileTypes: true, encoding: "utf8" });
+      dirents = await fs3.readdir(resolved, { withFileTypes: true, encoding: "utf8" });
     } catch (err) {
       const msg = err.code === "ENOENT" ? "path not found" : String(err);
       this.eventBus.get("browse:directory-failed").next({
@@ -12926,16 +12314,16 @@ var Browser = class {
     const allViews = await this.views.getAll();
     const prefix = `file://${resolved}`;
     const viewsByUri = new Map(
-      allViews.filter((v) => v.resource.storageUri?.startsWith(prefix + "/") || v.resource.storageUri?.startsWith(prefix + path3.sep)).map((v) => [v.resource.storageUri, v])
+      allViews.filter((v) => v.resource.storageUri?.startsWith(prefix + "/") || v.resource.storageUri?.startsWith(prefix + path2.sep)).map((v) => [v.resource.storageUri, v])
     );
     const entries = [];
     for (const dirent of visible) {
-      const entryPath = path3.join(resolved, dirent.name);
-      const relPath = path3.relative(projectRoot, entryPath);
+      const entryPath = path2.join(resolved, dirent.name);
+      const relPath = path2.relative(projectRoot, entryPath);
       if (dirent.isDirectory()) {
         let mtime = (/* @__PURE__ */ new Date(0)).toISOString();
         try {
-          const stat = await fs4.stat(entryPath);
+          const stat = await fs3.stat(entryPath);
           mtime = stat.mtime.toISOString();
         } catch {
         }
@@ -12945,7 +12333,7 @@ var Browser = class {
         let size = 0;
         let mtime = (/* @__PURE__ */ new Date(0)).toISOString();
         try {
-          const stat = await fs4.stat(entryPath);
+          const stat = await fs3.stat(entryPath);
           size = stat.size;
           mtime = stat.mtime.toISOString();
         } catch {
@@ -13000,33 +12388,51 @@ var Browser = class {
   }
 };
 
+// src/event-enrichment.ts
+function eventAnnotationId(event) {
+  switch (event.type) {
+    case "mark:added":
+      return event.payload.annotation.id;
+    case "mark:body-updated":
+      return event.payload.annotationId;
+    case "mark:removed":
+      return event.payload.annotationId;
+    default:
+      return null;
+  }
+}
+async function readAnnotationFromView(kb, resourceId10, annotationId5) {
+  const allAnnotations = await AnnotationContext.getAllAnnotations(resourceId10, kb);
+  return allAnnotations.find((a) => a.id === annotationId5) ?? null;
+}
+
 // src/clone-token-manager.ts
-var import_rxjs8 = __toESM(require_cjs(), 1);
-var import_operators8 = __toESM(require_operators(), 1);
+var import_rxjs7 = __toESM(require_cjs(), 1);
+var import_operators7 = __toESM(require_operators(), 1);
 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 { getPrimaryRepresentation as getPrimaryRepresentation3, getResourceEntityTypes as getResourceEntityTypes6 } from "@semiont/core";
 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 import_rxjs6 = __toESM(require_cjs(), 1);
+var import_operators6 = __toESM(require_operators(), 1);
+import { resourceId as makeResourceId3 } 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)(
+  static async createResource(input, userId3, eventBus) {
+    const result$ = (0, import_rxjs6.race)(
       eventBus.get("yield:create-ok").pipe(
-        (0, import_operators7.take)(1),
-        (0, import_operators7.map)((result) => ({ ok: true, result }))
+        (0, import_operators6.take)(1),
+        (0, import_operators6.map)((result) => ({ ok: true, result }))
       ),
       eventBus.get("yield:create-failed").pipe(
-        (0, import_operators7.take)(1),
-        (0, import_operators7.map)((failure) => ({ ok: false, error: new Error(failure.message) }))
+        (0, import_operators6.take)(1),
+        (0, import_operators6.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") }))
+      (0, import_rxjs6.timer)(3e4).pipe(
+        (0, import_operators6.map)(() => ({ ok: false, error: new Error("Resource creation timed out") }))
       )
     );
     eventBus.get("yield:create").next({
@@ -13035,36 +12441,20 @@ var ResourceOperations = class {
       contentChecksum: input.contentChecksum,
       byteSize: input.byteSize,
       format: input.format,
-      userId: userId2,
+      _userId: userId3,
       language: input.language,
       entityTypes: input.entityTypes,
-      creationMethod: input.creationMethod
+      creationMethod: input.creationMethod,
+      generatedFrom: input.generatedFrom,
+      generationPrompt: input.generationPrompt,
+      generator: input.generator,
+      isDraft: input.isDraft
     });
-    const outcome = await (0, import_rxjs7.firstValueFrom)(result$);
+    const outcome = await (0, import_rxjs6.firstValueFrom)(result$);
     if (!outcome.ok) {
       throw outcome.error;
     }
-    return makeResourceId4(outcome.result.resourceId);
-  }
-  /**
-   * Update resource metadata via EventBus → Stower
-   */
-  static async updateResource(input, eventBus) {
-    if (input.updatedArchived !== void 0 && input.updatedArchived !== input.currentArchived) {
-      if (input.updatedArchived) {
-        eventBus.get("mark:archive").next({ userId: input.userId, resourceId: input.resourceId });
-      } else {
-        eventBus.get("mark:unarchive").next({ userId: input.userId, resourceId: input.resourceId });
-      }
-    }
-    if (input.updatedEntityTypes && input.currentEntityTypes) {
-      eventBus.get("mark:update-entity-types").next({
-        resourceId: input.resourceId,
-        userId: input.userId,
-        currentEntityTypes: input.currentEntityTypes,
-        updatedEntityTypes: input.updatedEntityTypes
-      });
-    }
+    return makeResourceId3(outcome.result.resourceId);
   }
 };
 
@@ -13082,13 +12472,13 @@ var CloneTokenManager = class {
     this.logger.info("CloneTokenManager actor initialized");
     const errorHandler = (err) => this.logger.error("CloneTokenManager pipeline error", { error: err });
     const generateToken$ = this.eventBus.get("yield:clone-token-requested").pipe(
-      (0, import_operators8.mergeMap)((event) => (0, import_rxjs8.from)(this.handleGenerateToken(event)))
+      (0, import_operators7.mergeMap)((event) => (0, import_rxjs7.from)(this.handleGenerateToken(event)))
     );
     const getResource$ = this.eventBus.get("yield:clone-resource-requested").pipe(
-      (0, import_operators8.mergeMap)((event) => (0, import_rxjs8.from)(this.handleGetResource(event)))
+      (0, import_operators7.mergeMap)((event) => (0, import_rxjs7.from)(this.handleGetResource(event)))
     );
     const createResource$ = this.eventBus.get("yield:clone-create").pipe(
-      (0, import_operators8.mergeMap)((event) => (0, import_rxjs8.from)(this.handleCreateResource(event)))
+      (0, import_operators7.mergeMap)((event) => (0, import_rxjs7.from)(this.handleCreateResource(event)))
     );
     this.subscriptions.push(
       generateToken$.subscribe({ error: errorHandler }),
@@ -13230,16 +12620,11 @@ var CloneTokenManager = class {
         makeUserId2(event.userId),
         this.eventBus
       );
-      if (event.archiveOriginal) {
-        ResourceOperations.updateResource(
-          {
-            resourceId: tokenData.resourceId,
-            userId: makeUserId2(event.userId),
-            currentArchived: sourceDoc.archived,
-            updatedArchived: true
-          },
-          this.eventBus
-        );
+      if (event.archiveOriginal && !sourceDoc.archived) {
+        this.eventBus.get("mark:archive").next({
+          _userId: event.userId,
+          resourceId: tokenData.resourceId
+        });
       }
       this.tokens.delete(token);
       this.eventBus.get("yield:clone-created").next({
@@ -13265,8 +12650,8 @@ var CloneTokenManager = class {
 };
 
 // src/bootstrap/entity-types.ts
-var import_rxjs9 = __toESM(require_cjs(), 1);
-var import_operators9 = __toESM(require_operators(), 1);
+var import_rxjs8 = __toESM(require_cjs(), 1);
+var import_operators8 = __toESM(require_operators(), 1);
 import { DEFAULT_ENTITY_TYPES } from "@semiont/ontology";
 import { userId, resourceId as resourceId6 } from "@semiont/core";
 async function bootstrapEntityTypes(eventBus, eventStore, logger) {
@@ -13281,15 +12666,15 @@ async function bootstrapEntityTypes(eventBus, eventStore, logger) {
   }
   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 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: new Error(f.message) }))),
-      (0, import_rxjs9.timer)(1e4).pipe((0, import_operators9.map)(() => ({ ok: false, error: new Error(`Timeout adding entity type: ${entityType}`) })))
+  for (const entityType2 of missing) {
+    logger?.debug("Adding entity type via EventBus", { entityType: entityType2 });
+    const result$ = (0, import_rxjs8.race)(
+      eventBus.get("mark:entity-type-added").pipe((0, import_operators8.take)(1), (0, import_operators8.map)(() => ({ ok: true }))),
+      eventBus.get("mark:entity-type-add-failed").pipe((0, import_operators8.take)(1), (0, import_operators8.map)((f) => ({ ok: false, error: new Error(f.message) }))),
+      (0, import_rxjs8.timer)(1e4).pipe((0, import_operators8.map)(() => ({ ok: false, error: new Error(`Timeout adding entity type: ${entityType2}`) })))
     );
-    eventBus.get("mark:add-entity-type").next({ tag: entityType, userId: SYSTEM_USER_ID });
-    const outcome = await (0, import_rxjs9.firstValueFrom)(result$);
+    eventBus.get("mark:add-entity-type").next({ tag: entityType2, _userId: SYSTEM_USER_ID });
+    const outcome = await (0, import_rxjs8.firstValueFrom)(result$);
     if (!outcome.ok) {
       throw outcome.error;
     }
@@ -13308,15 +12693,281 @@ async function stopKnowledgeSystem(ks) {
   await ks.kb.graph.disconnect();
 }
 
+// src/handlers/annotation-assembly.ts
+import { resourceId as resourceId7, didToAgent as didToAgent2, assembleAnnotation } from "@semiont/core";
+function registerAnnotationAssemblyHandler(eventBus, parentLogger) {
+  const logger = parentLogger.child({ component: "annotation-assembly" });
+  const inflight = /* @__PURE__ */ new Map();
+  eventBus.get("mark:create-request").subscribe((command) => {
+    const { correlationId, resourceId: resId, request, _userId } = command;
+    const cid = correlationId;
+    try {
+      if (!_userId || typeof _userId !== "string") {
+        throw new Error("_userId is required (injected by bus gateway)");
+      }
+      if (!cid) {
+        throw new Error("correlationId is required on mark:create-request");
+      }
+      const agent = didToAgent2(_userId);
+      const { annotation } = assembleAnnotation(request, agent);
+      inflight.set(cid, { annotationId: annotation.id });
+      eventBus.get("mark:create").next({
+        correlationId: cid,
+        annotation,
+        _userId,
+        resourceId: resourceId7(resId)
+      });
+      logger.info("Annotation assembled, awaiting persistence", {
+        annotationId: annotation.id,
+        correlationId: cid
+      });
+    } catch (error) {
+      logger.warn("mark:create-request failed during assembly", {
+        correlationId: cid,
+        error: error.message
+      });
+      eventBus.get("mark:create-failed").next({
+        correlationId: cid,
+        message: error.message
+      });
+    }
+  });
+  eventBus.get("mark:added").subscribe((event) => {
+    const cid = event.metadata?.correlationId;
+    if (!cid) return;
+    const pending = inflight.get(cid);
+    if (!pending) return;
+    inflight.delete(cid);
+    eventBus.get("mark:create-ok").next({
+      correlationId: cid,
+      response: { annotationId: pending.annotationId }
+    });
+    logger.info("Annotation persisted", { annotationId: pending.annotationId, correlationId: cid });
+  });
+  eventBus.get("mark:create-failed").subscribe((event) => {
+    const cid = event.correlationId;
+    if (!cid || !inflight.has(cid)) return;
+    inflight.delete(cid);
+  });
+}
+
+// src/handlers/annotation-lookups.ts
+import { annotationId as makeAnnotationId3, resourceId as makeResourceId4 } from "@semiont/core";
+function registerAnnotationLookupHandlers(eventBus, kb, gatherer, parentLogger) {
+  const logger = parentLogger.child({ component: "annotation-lookups" });
+  eventBus.get("browse:annotation-context-requested").subscribe(async (command) => {
+    const { correlationId } = command;
+    const annId = command.annotationId;
+    const resId = command.resourceId;
+    const contextBefore = command.contextBefore ?? 100;
+    const contextAfter = command.contextAfter ?? 100;
+    try {
+      const response = await AnnotationContext.getAnnotationContext(
+        makeAnnotationId3(annId),
+        makeResourceId4(resId),
+        contextBefore,
+        contextAfter,
+        kb
+      );
+      eventBus.get("browse:annotation-context-result").next({
+        correlationId,
+        response
+      });
+    } catch (error) {
+      logger.warn("annotation-context failed", { correlationId, error: error.message });
+      eventBus.get("browse:annotation-context-failed").next({
+        correlationId,
+        message: error.message
+      });
+    }
+  });
+  eventBus.get("gather:summary-requested").subscribe(async (command) => {
+    const { correlationId } = command;
+    const annId = command.annotationId;
+    const resId = command.resourceId;
+    try {
+      const response = await gatherer.generateAnnotationSummary(
+        makeAnnotationId3(annId),
+        makeResourceId4(resId)
+      );
+      eventBus.get("gather:summary-result").next({
+        correlationId,
+        response
+      });
+    } catch (error) {
+      logger.warn("gather:summary failed", { correlationId, error: error.message });
+      eventBus.get("gather:summary-failed").next({
+        correlationId,
+        message: error.message
+      });
+    }
+  });
+}
+
+// src/handlers/bind-update-body.ts
+import { resourceId as resourceId8, annotationId as annotationId3 } from "@semiont/core";
+function registerBindUpdateBodyHandler(eventBus, parentLogger) {
+  const logger = parentLogger.child({ component: "bind-update-body" });
+  const inflight = /* @__PURE__ */ new Set();
+  eventBus.get("bind:update-body").subscribe((command) => {
+    const { correlationId, annotationId: annId, resourceId: resId, operations, _userId } = command;
+    const cid = correlationId;
+    try {
+      if (!_userId || typeof _userId !== "string") {
+        throw new Error("_userId is required (injected by bus gateway)");
+      }
+      if (!cid) {
+        throw new Error("correlationId is required on bind:update-body");
+      }
+      inflight.add(cid);
+      eventBus.get("mark:update-body").next({
+        correlationId: cid,
+        annotationId: annotationId3(annId),
+        _userId,
+        resourceId: resourceId8(resId),
+        operations
+      });
+      logger.info("Bind update-body forwarded to mark:update-body, awaiting persistence", {
+        annotationId: annId,
+        correlationId: cid
+      });
+    } catch (error) {
+      logger.warn("bind:update-body failed before forwarding", {
+        correlationId: cid,
+        error: error.message
+      });
+      eventBus.get("bind:body-update-failed").next({
+        correlationId: cid,
+        message: error.message
+      });
+    }
+  });
+  eventBus.get("mark:body-updated").subscribe((event) => {
+    const cid = event.metadata?.correlationId;
+    if (!cid || !inflight.has(cid)) return;
+    inflight.delete(cid);
+    const annId = event.payload?.annotationId;
+    eventBus.get("bind:body-updated").next({
+      correlationId: cid,
+      annotationId: annId
+    });
+    logger.info("Bind body-updated confirmed", { annotationId: annId, correlationId: cid });
+  });
+  eventBus.get("mark:body-update-failed").subscribe((event) => {
+    const cid = event.correlationId;
+    if (!cid || !inflight.has(cid)) return;
+    inflight.delete(cid);
+    const message = event.message ?? "Unknown error";
+    eventBus.get("bind:body-update-failed").next({
+      correlationId: cid,
+      message
+    });
+    logger.warn("Bind body-update failed after forwarding", { correlationId: cid, message });
+  });
+}
+
+// src/handlers/job-commands.ts
+import { generateUuid as generateUuid2, jobId, userId as userId2, resourceId as resourceId9, entityType } from "@semiont/core";
+function parseDidUser(did) {
+  const parts = did.split(":");
+  const usersIdx = parts.indexOf("users");
+  const domain = parts.slice(2, usersIdx).join(":");
+  const email = decodeURIComponent(parts.slice(usersIdx + 1).join(":"));
+  return { userId: did, email, domain };
+}
+function registerJobCommandHandlers(eventBus, jobQueue, parentLogger) {
+  const logger = parentLogger.child({ component: "job-commands" });
+  eventBus.get("job:create").subscribe(async (command) => {
+    const { correlationId, jobType, resourceId: resId, params, _userId } = command;
+    try {
+      if (!_userId || typeof _userId !== "string") {
+        throw new Error("_userId is required (injected by bus gateway)");
+      }
+      const user = parseDidUser(_userId);
+      const job = {
+        status: "pending",
+        metadata: {
+          id: jobId(`job-${generateUuid2()}`),
+          type: jobType,
+          userId: userId2(_userId),
+          userName: user.email,
+          userEmail: user.email,
+          userDomain: user.domain,
+          created: (/* @__PURE__ */ new Date()).toISOString(),
+          retryCount: 0,
+          maxRetries: jobType === "generation" ? 3 : 1
+        },
+        params: {
+          resourceId: resourceId9(resId),
+          ...params
+        }
+      };
+      const jobParams = job.params;
+      if (jobType === "reference-annotation" && jobParams.entityTypes) {
+        jobParams.entityTypes = jobParams.entityTypes.map((et) => entityType(et));
+      }
+      await jobQueue.createJob(job);
+      logger.info("Job created via bus", { jobId: job.metadata.id, jobType, correlationId });
+      eventBus.get("job:created").next({
+        correlationId,
+        response: { jobId: job.metadata.id }
+      });
+    } catch (error) {
+      logger.error("job:create failed", { correlationId, error: error.message });
+      eventBus.get("job:create-failed").next({
+        correlationId,
+        message: error.message
+      });
+    }
+  });
+  eventBus.get("job:claim").subscribe(async (command) => {
+    const { correlationId, jobId: jid } = command;
+    try {
+      const job = await jobQueue.getJob(jobId(jid));
+      if (!job) {
+        throw new Error("Job not found");
+      }
+      if (job.status !== "pending") {
+        throw new Error("Job already claimed");
+      }
+      const runningJob = {
+        ...job,
+        status: "running",
+        startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        progress: {}
+      };
+      await jobQueue.updateJob(runningJob, "pending");
+      eventBus.get("job:claimed").next({
+        correlationId,
+        response: runningJob
+      });
+    } catch (error) {
+      eventBus.get("job:claim-failed").next({
+        correlationId,
+        message: error.message
+      });
+    }
+  });
+}
+
+// src/handlers/index.ts
+function registerBusHandlers(eventBus, knowledgeSystem, jobQueue, logger) {
+  registerAnnotationAssemblyHandler(eventBus, logger);
+  registerAnnotationLookupHandlers(eventBus, knowledgeSystem.kb, knowledgeSystem.gatherer, logger);
+  registerBindUpdateBodyHandler(eventBus, logger);
+  registerJobCommandHandlers(eventBus, jobQueue, logger);
+}
+
 // src/service.ts
 async function createJobQueue(project, eventBus, logger) {
   const jobQueueLogger = logger.child({ component: "job-queue" });
-  const jobQueue = new JobQueue(project, jobQueueLogger, eventBus);
+  const jobQueue = new FsJobQueue(project, jobQueueLogger, eventBus);
   await jobQueue.initialize();
+  registerJobQueueProvider(() => jobQueue.getStats());
   const jobStatusSubscription = eventBus.get("job:status-requested").pipe(
-    (0, import_operators10.mergeMap)((event) => (0, import_rxjs10.from)((async () => {
+    (0, import_operators9.mergeMap)((event) => (0, import_rxjs9.from)((async () => {
       try {
-        const job = await jobQueue.getJob(jobId(event.jobId));
+        const job = await jobQueue.getJob(jobId2(event.jobId));
         if (!job) {
           eventBus.get("job:status-failed").next({ correlationId: event.correlationId, message: "Job not found" });
           return;
@@ -13373,13 +13024,15 @@ async function createKnowledgeSystemFromConfig(project, config, eventBus, logger
   }
   const kb = await createKnowledgeBase(eventStore, project, graphDb, eventBus, logger, {
     vectorStore,
-    embeddingProvider,
-    chunkingConfig: embeddingConfig?.chunking ? {
-      chunkSize: embeddingConfig.chunking.chunkSize ?? 512,
-      overlap: embeddingConfig.chunking.overlap ?? 64
-    } : void 0,
     skipRebuild
   });
+  eventStore.setEnrichEvent(async (event, resourceId10) => {
+    const annId = eventAnnotationId(event);
+    if (annId === null) return event;
+    const annotation = await readAnnotationFromView(kb, resourceId10, annId);
+    if (annotation === null) return event;
+    return { ...event, annotation };
+  });
   const stower = new Stower(kb, eventBus, logger.child({ component: "stower" }));
   await stower.initialize();
   await bootstrapEntityTypes(eventBus, eventStore, logger.child({ component: "entity-types-bootstrap" }));
@@ -13406,57 +13059,6 @@ async function createKnowledgeSystemFromConfig(project, config, eventBus, logger
   const ks = { kb, stower, gatherer, matcher, browser, cloneTokenManager, stop: () => stopKnowledgeSystem(ks) };
   return ks;
 }
-function createContentFetcher(ks) {
-  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, 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, contentStore, logger.child({ component: "generation-worker" }));
-  })();
-  const highlight = (() => {
-    const cfg = resolveWorkerInference(config, "highlight-annotation");
-    return new HighlightAnnotationWorker(jobQueue, createInferenceClient(cfg, logger.child({ component: "inference-client-highlight-annotation" })), inferenceConfigToGenerator("Highlight Worker", cfg), eventBus, contentFetcher, logger.child({ component: "highlight-detection-worker" }));
-  })();
-  const assessment = (() => {
-    const cfg = resolveWorkerInference(config, "assessment-annotation");
-    return new AssessmentAnnotationWorker(jobQueue, createInferenceClient(cfg, logger.child({ component: "inference-client-assessment-annotation" })), inferenceConfigToGenerator("Assessment Worker", cfg), eventBus, contentFetcher, logger.child({ component: "assessment-detection-worker" }));
-  })();
-  const comment = (() => {
-    const cfg = resolveWorkerInference(config, "comment-annotation");
-    return new CommentAnnotationWorker(jobQueue, createInferenceClient(cfg, logger.child({ component: "inference-client-comment-annotation" })), inferenceConfigToGenerator("Comment Worker", cfg), eventBus, contentFetcher, logger.child({ component: "comment-detection-worker" }));
-  })();
-  const tag = (() => {
-    const cfg = resolveWorkerInference(config, "tag-annotation");
-    return new TagAnnotationWorker(jobQueue, createInferenceClient(cfg, logger.child({ component: "inference-client-tag-annotation" })), inferenceConfigToGenerator("Tag Worker", cfg), eventBus, contentFetcher, logger.child({ component: "tag-detection-worker" }));
-  })();
-  return { detection, generation, highlight, assessment, comment, tag };
-}
-function startWorkers(workers, logger) {
-  const entries = [
-    ["detection", "reference-detection-worker"],
-    ["generation", "generation-worker"],
-    ["highlight", "highlight-detection-worker"],
-    ["assessment", "assessment-detection-worker"],
-    ["comment", "comment-detection-worker"],
-    ["tag", "tag-detection-worker"]
-  ];
-  for (const [key, component] of entries) {
-    workers[key].start().catch((error) => {
-      logger.child({ component }).error("Worker stopped unexpectedly", { error });
-    });
-  }
-}
 async function startMakeMeaning(project, config, eventBus, logger, options) {
   if (!config.services?.graph) {
     throw new Error("services.graph is required for make-meaning service");
@@ -13464,16 +13066,12 @@ async function startMakeMeaning(project, config, eventBus, logger, options) {
   const skipRebuild = options?.skipRebuild ?? process.env.SEMIONT_SKIP_REBUILD === "true";
   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, knowledgeSystem.kb.content, eventBus, config, logger);
-  startWorkers(workers, logger);
+  registerBusHandlers(eventBus, knowledgeSystem, jobQueue, logger);
   return {
     knowledgeSystem,
     jobQueue,
-    workers,
     stop: async () => {
       logger.info("Stopping Make-Meaning service");
-      await Promise.all(Object.values(workers).map((w) => w.stop()));
       jobStatusSubscription.unsubscribe();
       await knowledgeSystem.stop();
       logger.info("Make-Meaning service stopped");
@@ -13481,12 +13079,218 @@ async function startMakeMeaning(project, config, eventBus, logger, options) {
   };
 }
 
+// src/local-transport.ts
+var import_rxjs10 = __toESM(require_cjs(), 1);
+import { baseUrl as makeBaseUrl, busLog } from "@semiont/core";
+import { SpanKind, recordBusEmit, withSpan } from "@semiont/observability";
+import {
+  BRIDGED_CHANNELS
+} from "@semiont/core";
+var NOT_SUPPORTED = (method) => new Error(`LocalTransport does not support ${method}() \u2014 local mode runs as a single host-process identity`);
+var LocalTransport = class {
+  baseUrl;
+  state$;
+  bus;
+  userId;
+  bridges = [];
+  bridgeSubs = [];
+  disposed = false;
+  constructor(cfg) {
+    this.bus = cfg.eventBus;
+    this.userId = cfg.userId;
+    this.baseUrl = cfg.baseUrl ?? makeBaseUrl("local://in-process");
+    this.state$ = new import_rxjs10.BehaviorSubject("open");
+  }
+  // ── Bus primitives ──────────────────────────────────────────────────────
+  async emit(channel, payload, resourceScope) {
+    busLog("EMIT", channel, payload, resourceScope);
+    recordBusEmit(channel, resourceScope);
+    await withSpan(
+      `bus.emit:${channel}`,
+      () => {
+        const stamped = { ...payload, _userId: this.userId };
+        const target = resourceScope === void 0 ? this.bus.get(channel) : this.bus.scope(resourceScope).get(channel);
+        target.next(stamped);
+      },
+      {
+        kind: SpanKind.PRODUCER,
+        attrs: {
+          "bus.channel": channel,
+          ...resourceScope ? { "bus.scope": resourceScope } : {}
+        }
+      }
+    );
+  }
+  on(channel, handler) {
+    const sub = this.bus.get(channel).subscribe(handler);
+    return () => sub.unsubscribe();
+  }
+  stream(channel) {
+    return this.bus.get(channel);
+  }
+  subscribeToResource(_resourceId) {
+    return () => {
+    };
+  }
+  bridgeInto(bus) {
+    if (this.bridges.includes(bus)) return;
+    this.bridges.push(bus);
+    for (const channel of BRIDGED_CHANNELS) {
+      const upstream = this.bus.get(channel);
+      this.bridgeSubs.push(
+        upstream.subscribe((payload) => {
+          busLog("RECV", channel, payload);
+          void withSpan(
+            `bus.recv:${channel}`,
+            () => {
+              bus.get(channel).next(payload);
+            },
+            { kind: SpanKind.CONSUMER, attrs: { "bus.channel": channel } }
+          );
+        })
+      );
+    }
+  }
+  // ── Auth (not supported) ────────────────────────────────────────────────
+  async authenticatePassword(_email, _password) {
+    throw NOT_SUPPORTED("authenticatePassword");
+  }
+  async authenticateGoogle(_credential) {
+    throw NOT_SUPPORTED("authenticateGoogle");
+  }
+  async refreshAccessToken(_token) {
+    throw NOT_SUPPORTED("refreshAccessToken");
+  }
+  async logout() {
+  }
+  async acceptTerms() {
+  }
+  async getCurrentUser() {
+    return {
+      did: this.userId,
+      email: "",
+      isAdmin: false,
+      isModerator: false,
+      termsAcceptedAt: null
+    };
+  }
+  async generateMcpToken() {
+    throw NOT_SUPPORTED("generateMcpToken");
+  }
+  async getMediaToken(_resourceId) {
+    throw NOT_SUPPORTED("getMediaToken");
+  }
+  // ── Admin (not supported) ───────────────────────────────────────────────
+  async listUsers() {
+    throw NOT_SUPPORTED("listUsers");
+  }
+  async getUserStats() {
+    throw NOT_SUPPORTED("getUserStats");
+  }
+  async updateUser(_id, _data) {
+    throw NOT_SUPPORTED("updateUser");
+  }
+  async getOAuthConfig() {
+    throw NOT_SUPPORTED("getOAuthConfig");
+  }
+  // ── Exchange (not supported) ────────────────────────────────────────────
+  async backupKnowledgeBase() {
+    throw NOT_SUPPORTED("backupKnowledgeBase");
+  }
+  async restoreKnowledgeBase(_file, _onProgress) {
+    throw NOT_SUPPORTED("restoreKnowledgeBase");
+  }
+  async exportKnowledgeBase(_params) {
+    throw NOT_SUPPORTED("exportKnowledgeBase");
+  }
+  async importKnowledgeBase(_file, _onProgress) {
+    throw NOT_SUPPORTED("importKnowledgeBase");
+  }
+  // ── System ──────────────────────────────────────────────────────────────
+  async healthCheck() {
+    return { status: "ok" };
+  }
+  async getStatus() {
+    return { status: "ok" };
+  }
+  // ── Lifecycle ───────────────────────────────────────────────────────────
+  dispose() {
+    if (this.disposed) return;
+    this.disposed = true;
+    for (const sub of this.bridgeSubs) sub.unsubscribe();
+    this.bridgeSubs.length = 0;
+    this.bridges.length = 0;
+    this.state$.next("closed");
+    this.state$.complete();
+  }
+};
+
+// src/local-content-transport.ts
+import { busLog as busLog2 } from "@semiont/core";
+import { SpanKind as SpanKind2, withSpan as withSpan2 } from "@semiont/observability";
+function primaryRepresentation(reps) {
+  if (!reps) return void 0;
+  return Array.isArray(reps) ? reps[0] : reps;
+}
+var LocalContentTransport = class {
+  constructor(ks) {
+    this.ks = ks;
+  }
+  async putBinary(_request, _options) {
+    throw new Error(
+      "LocalContentTransport does not support putBinary() \u2014 create resources via bus emits (mark/yield namespaces) in local mode"
+    );
+  }
+  async getBinary(resourceId10, options) {
+    busLog2("GET", "content", { resourceId: resourceId10, accept: options?.accept });
+    return withSpan2(
+      "content.get",
+      () => this.loadBinary(resourceId10),
+      { kind: SpanKind2.INTERNAL, attrs: { "resource.id": resourceId10 } }
+    );
+  }
+  async getBinaryStream(resourceId10, options) {
+    busLog2("GET", "content", { resourceId: resourceId10, accept: options?.accept, stream: true });
+    return withSpan2(
+      "content.get",
+      async () => {
+        const { data, contentType } = await this.loadBinary(resourceId10);
+        const bytes = new Uint8Array(data);
+        const stream = new ReadableStream({
+          start(controller) {
+            controller.enqueue(bytes);
+            controller.close();
+          }
+        });
+        return { stream, contentType };
+      },
+      {
+        kind: SpanKind2.INTERNAL,
+        attrs: { "resource.id": resourceId10, "content.stream": true }
+      }
+    );
+  }
+  async loadBinary(resourceId10) {
+    const view = await this.ks.kb.views.get(resourceId10);
+    if (!view) throw new Error(`Resource not found: ${resourceId10}`);
+    const rep = primaryRepresentation(view.resource.representations);
+    if (!rep?.storageUri) {
+      throw new Error(`Resource ${resourceId10} has no representation with a storageUri`);
+    }
+    const buf = await this.ks.kb.content.retrieve(rep.storageUri);
+    const data = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
+    return { data, contentType: rep.mediaType };
+  }
+  dispose() {
+  }
+};
+
 // src/exchange/backup-exporter.ts
 import { getExtensionForMimeType } from "@semiont/content";
 
 // src/exchange/tar.ts
 import { createGzip, createGunzip } from "zlib";
-import { Readable as Readable2, pipeline } from "stream";
+import { Readable, pipeline } from "stream";
 import { promisify } from "util";
 var pipelineAsync = promisify(pipeline);
 var BLOCK_SIZE = 512;
@@ -13516,7 +13320,7 @@ function paddingBytes(size) {
 }
 async function writeTarGz(entries, output) {
   const gzip = createGzip();
-  const tarStream = new Readable2({ read() {
+  const tarStream = new Readable({ read() {
   } });
   const pipePromise = pipelineAsync(tarStream, gzip, output);
   for await (const entry of entries) {
@@ -13673,7 +13477,7 @@ function collectContentRefs(streamData) {
 
 // src/exchange/replay.ts
 var import_rxjs11 = __toESM(require_cjs(), 1);
-var import_operators11 = __toESM(require_operators(), 1);
+var import_operators10 = __toESM(require_operators(), 1);
 import { deriveStorageUri as deriveStorageUri2 } from "@semiont/content";
 var REPLAY_TIMEOUT_MS = 3e4;
 async function replayEventStream(jsonl, eventBus, resolveBlob, contentStore, logger) {
@@ -13739,17 +13543,17 @@ async function replayEvent(event, eventBus, resolveBlob, contentStore, stats, lo
 }
 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) => {
+    eventBus.get("mark:entity-type-added").pipe((0, import_operators10.map)(() => "ok")),
+    eventBus.get("mark:entity-type-add-failed").pipe((0, import_operators10.map)((e) => {
       throw new Error(e.message);
     })),
-    (0, import_rxjs11.timer)(REPLAY_TIMEOUT_MS).pipe((0, import_operators11.map)(() => {
+    (0, import_rxjs11.timer)(REPLAY_TIMEOUT_MS).pipe((0, import_operators10.map)(() => {
       throw new Error("Timeout waiting for mark:entity-type-added");
     }))
   );
   eventBus.get("mark:add-entity-type").next({
     tag: event.payload.entityType,
-    userId: event.userId
+    _userId: event.userId
   });
   await (0, import_rxjs11.firstValueFrom)(result$);
   logger?.debug("Replayed entitytype.added", { entityType: event.payload.entityType });
@@ -13763,11 +13567,11 @@ async function replayResourceCreated(event, eventBus, resolveBlob, contentStore,
   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:create-ok").pipe((0, import_operators11.map)((r) => r)),
-    eventBus.get("yield:create-failed").pipe((0, import_operators11.map)((e) => {
+    eventBus.get("yield:create-ok").pipe((0, import_operators10.map)((r) => r)),
+    eventBus.get("yield:create-failed").pipe((0, import_operators10.map)((e) => {
       throw new Error(e.message);
     })),
-    (0, import_rxjs11.timer)(REPLAY_TIMEOUT_MS).pipe((0, import_operators11.map)(() => {
+    (0, import_rxjs11.timer)(REPLAY_TIMEOUT_MS).pipe((0, import_operators10.map)(() => {
       throw new Error("Timeout waiting for yield:create-ok");
     }))
   );
@@ -13777,7 +13581,7 @@ async function replayResourceCreated(event, eventBus, resolveBlob, contentStore,
     contentChecksum: stored.checksum,
     byteSize: stored.byteSize,
     format: payload.format,
-    userId: event.userId,
+    _userId: event.userId,
     language: payload.language,
     entityTypes: payload.entityTypes,
     creationMethod: payload.creationMethod,
@@ -13790,17 +13594,17 @@ async function replayResourceCreated(event, eventBus, resolveBlob, contentStore,
 }
 async function replayAnnotationAdded(event, eventBus, logger) {
   const result$ = (0, import_rxjs11.race)(
-    eventBus.get("mark:create-ok").pipe((0, import_operators11.map)(() => "ok")),
-    eventBus.get("mark:create-failed").pipe((0, import_operators11.map)((e) => {
+    eventBus.get("mark:create-ok").pipe((0, import_operators10.map)(() => "ok")),
+    eventBus.get("mark:create-failed").pipe((0, import_operators10.map)((e) => {
       throw new Error(e.message);
     })),
-    (0, import_rxjs11.timer)(REPLAY_TIMEOUT_MS).pipe((0, import_operators11.map)(() => {
+    (0, import_rxjs11.timer)(REPLAY_TIMEOUT_MS).pipe((0, import_operators10.map)(() => {
       throw new Error("Timeout waiting for mark:create-ok");
     }))
   );
   eventBus.get("mark:create").next({
     annotation: event.payload.annotation,
-    userId: event.userId,
+    _userId: event.userId,
     resourceId: event.resourceId
   });
   await (0, import_rxjs11.firstValueFrom)(result$);
@@ -13808,17 +13612,17 @@ async function replayAnnotationAdded(event, eventBus, logger) {
 }
 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) => {
+    eventBus.get("mark:body-updated").pipe((0, import_operators10.map)(() => "ok")),
+    eventBus.get("mark:body-update-failed").pipe((0, import_operators10.map)((e) => {
       throw new Error(e.message);
     })),
-    (0, import_rxjs11.timer)(REPLAY_TIMEOUT_MS).pipe((0, import_operators11.map)(() => {
+    (0, import_rxjs11.timer)(REPLAY_TIMEOUT_MS).pipe((0, import_operators10.map)(() => {
       throw new Error("Timeout waiting for mark:body-updated");
     }))
   );
   eventBus.get("mark:update-body").next({
     annotationId: event.payload.annotationId,
-    userId: event.userId,
+    _userId: event.userId,
     resourceId: event.resourceId,
     operations: event.payload.operations
   });
@@ -13827,17 +13631,17 @@ async function replayAnnotationBodyUpdated(event, eventBus, logger) {
 }
 async function replayAnnotationRemoved(event, eventBus, logger) {
   const result$ = (0, import_rxjs11.race)(
-    eventBus.get("mark:delete-ok").pipe((0, import_operators11.map)(() => "ok")),
-    eventBus.get("mark:delete-failed").pipe((0, import_operators11.map)((e) => {
+    eventBus.get("mark:delete-ok").pipe((0, import_operators10.map)(() => "ok")),
+    eventBus.get("mark:delete-failed").pipe((0, import_operators10.map)((e) => {
       throw new Error(e.message);
     })),
-    (0, import_rxjs11.timer)(REPLAY_TIMEOUT_MS).pipe((0, import_operators11.map)(() => {
+    (0, import_rxjs11.timer)(REPLAY_TIMEOUT_MS).pipe((0, import_operators10.map)(() => {
       throw new Error("Timeout waiting for mark:delete-ok");
     }))
   );
   eventBus.get("mark:delete").next({
     annotationId: event.payload.annotationId,
-    userId: event.userId,
+    _userId: event.userId,
     resourceId: event.resourceId
   });
   await (0, import_rxjs11.firstValueFrom)(result$);
@@ -13845,37 +13649,37 @@ async function replayAnnotationRemoved(event, eventBus, logger) {
 }
 async function replayResourceArchived(event, eventBus, logger) {
   eventBus.get("mark:archive").next({
-    userId: event.userId,
+    _userId: event.userId,
     resourceId: event.resourceId
   });
   logger?.debug("Replayed resource.archived", { resourceId: event.resourceId });
 }
 async function replayResourceUnarchived(event, eventBus, logger) {
   eventBus.get("mark:unarchive").next({
-    userId: event.userId,
+    _userId: event.userId,
     resourceId: event.resourceId
   });
   logger?.debug("Replayed resource.unarchived", { resourceId: event.resourceId });
 }
 async function replayEntityTagChange(event, eventBus, logger) {
-  const resourceId7 = event.resourceId;
-  const entityType = event.payload.entityType;
+  const resourceId10 = event.resourceId;
+  const entityType2 = event.payload.entityType;
   if (event.type === "mark:entity-tag-added") {
     eventBus.get("mark:update-entity-types").next({
-      resourceId: resourceId7,
-      userId: event.userId,
+      resourceId: resourceId10,
+      _userId: event.userId,
       currentEntityTypes: [],
-      updatedEntityTypes: [entityType]
+      updatedEntityTypes: [entityType2]
     });
   } else {
     eventBus.get("mark:update-entity-types").next({
-      resourceId: resourceId7,
-      userId: event.userId,
-      currentEntityTypes: [entityType],
+      resourceId: resourceId10,
+      _userId: event.userId,
+      currentEntityTypes: [entityType2],
       updatedEntityTypes: []
     });
   }
-  logger?.debug("Replayed entity tag change", { type: event.type, entityType });
+  logger?.debug("Replayed entity tag change", { type: event.type, entityType: entityType2 });
 }
 
 // src/exchange/backup-importer.ts
@@ -14049,10 +13853,10 @@ async function exportLinkedData(options, output) {
       data: Buffer.from(JSON.stringify(manifest, null, 2), "utf8")
     };
     for (const view of resourceViews) {
-      const resourceId7 = view.resource["@id"];
+      const resourceId10 = view.resource["@id"];
       const jsonld = buildResourceJsonLd(view.resource, view.annotations.annotations, sourceUrl);
       yield {
-        name: `.semiont/resources/${resourceId7}.jsonld`,
+        name: `.semiont/resources/${resourceId10}.jsonld`,
         data: Buffer.from(JSON.stringify(jsonld, null, 2), "utf8")
       };
     }
@@ -14069,8 +13873,8 @@ async function exportLinkedData(options, output) {
   return manifest;
 }
 function buildResourceJsonLd(resource, annotations, sourceUrl) {
-  const resourceId7 = resource["@id"];
-  const resourceUri = resourceId7.startsWith("http") ? resourceId7 : `${sourceUrl}/resources/${resourceId7}`;
+  const resourceId10 = resource["@id"];
+  const resourceUri = resourceId10.startsWith("http") ? resourceId10 : `${sourceUrl}/resources/${resourceId10}`;
   const doc = {
     "@context": SEMIONT_CONTEXT,
     "@id": resourceUri,
@@ -14131,8 +13935,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";
+var import_operators11 = __toESM(require_operators(), 1);
+import { annotationId as annotationIdFactory, resourceId as makeResourceId5 } from "@semiont/core";
 import { deriveStorageUri as deriveStorageUri3 } from "@semiont/content";
 var IMPORT_TIMEOUT_MS = 3e4;
 function stripUriToId(uri) {
@@ -14143,7 +13947,7 @@ function stripUriToId(uri) {
 function dehydrateAnnotation(annotation) {
   const dehydrated = { ...annotation };
   if (dehydrated.id) {
-    dehydrated.id = stripUriToId(dehydrated.id);
+    dehydrated.id = annotationIdFactory(stripUriToId(dehydrated.id));
   }
   if (typeof dehydrated.target === "string") {
     dehydrated.target = stripUriToId(dehydrated.target);
@@ -14187,7 +13991,7 @@ function buildBlobResolver2(entries) {
   };
 }
 async function importLinkedData(archive, options) {
-  const { eventBus, contentStore, userId: userId2, logger } = options;
+  const { eventBus, contentStore, userId: userId3, logger } = options;
   const entries = /* @__PURE__ */ new Map();
   for await (const entry of readTarGz(archive)) {
     entries.set(entry.name, entry.data);
@@ -14209,8 +14013,8 @@ async function importLinkedData(archive, options) {
   });
   const resolveBlob = buildBlobResolver2(entries);
   let entityTypesAdded = 0;
-  for (const entityType of manifest["semiont:entityTypes"]) {
-    await addEntityType(entityType, userId2, eventBus, logger);
+  for (const entityType2 of manifest["semiont:entityTypes"]) {
+    await addEntityType(entityType2, userId3, eventBus, logger);
     entityTypesAdded++;
   }
   const resourceEntries = [...entries.keys()].filter((name) => name.startsWith(".semiont/resources/") && name.endsWith(".jsonld")).sort();
@@ -14218,7 +14022,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, contentStore, resolveBlob, logger);
+    const result = await importResource(resourceDoc, userId3, eventBus, contentStore, resolveBlob, logger);
     resourcesCreated++;
     annotationsCreated += result.annotationsCreated;
   }
@@ -14234,24 +14038,24 @@ async function importLinkedData(archive, options) {
     entityTypesAdded
   };
 }
-async function addEntityType(entityType, userId2, eventBus, logger) {
+async function addEntityType(entityType2, userId3, 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) => {
+    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 new Error(e.message);
     })),
-    (0, import_rxjs12.timer)(IMPORT_TIMEOUT_MS).pipe((0, import_operators12.map)(() => {
+    (0, import_rxjs12.timer)(IMPORT_TIMEOUT_MS).pipe((0, import_operators11.map)(() => {
       throw new Error("Timeout waiting for mark:entity-type-added");
     }))
   );
   eventBus.get("mark:add-entity-type").next({
-    tag: entityType,
-    userId: userId2
+    tag: entityType2,
+    _userId: userId3
   });
   await (0, import_rxjs12.firstValueFrom)(result$);
-  logger?.debug("Added entity type", { entityType });
+  logger?.debug("Added entity type", { entityType: entityType2 });
 }
-async function importResource(doc, userId2, eventBus, contentStore, resolveBlob, logger) {
+async function importResource(doc, userId3, eventBus, contentStore, resolveBlob, logger) {
   const name = doc["name"];
   const representations = doc["representations"];
   const annotations = doc["annotations"];
@@ -14276,11 +14080,11 @@ async function importResource(doc, userId2, eventBus, contentStore, resolveBlob,
   const resolvedUri = deriveStorageUri3(name, format);
   const stored = await contentStore.store(blob, resolvedUri);
   const createResult$ = (0, import_rxjs12.race)(
-    eventBus.get("yield:create-ok").pipe((0, import_operators12.map)((r) => r)),
-    eventBus.get("yield:create-failed").pipe((0, import_operators12.map)((e) => {
+    eventBus.get("yield:create-ok").pipe((0, import_operators11.map)((r) => r)),
+    eventBus.get("yield:create-failed").pipe((0, import_operators11.map)((e) => {
       throw new Error(e.message);
     })),
-    (0, import_rxjs12.timer)(IMPORT_TIMEOUT_MS).pipe((0, import_operators12.map)(() => {
+    (0, import_rxjs12.timer)(IMPORT_TIMEOUT_MS).pipe((0, import_operators11.map)(() => {
       throw new Error("Timeout waiting for yield:create-ok");
     }))
   );
@@ -14290,37 +14094,37 @@ async function importResource(doc, userId2, eventBus, contentStore, resolveBlob,
     contentChecksum: stored.checksum,
     byteSize: stored.byteSize,
     format,
-    userId: userId2,
+    _userId: userId3,
     language,
     entityTypes: entityTypes ?? [],
     creationMethod
   });
   const created = await (0, import_rxjs12.firstValueFrom)(createResult$);
-  const resourceId7 = makeResourceId5(created.resourceId);
-  logger?.debug("Created resource from JSON-LD", { name, resourceId: resourceId7 });
+  const resourceId10 = makeResourceId5(created.resourceId);
+  logger?.debug("Created resource from JSON-LD", { name, resourceId: resourceId10 });
   let annotationsCreated = 0;
   if (annotations && annotations.length > 0) {
     for (const annotation of annotations) {
-      await createAnnotation(annotation, resourceId7, userId2, eventBus, logger);
+      await createAnnotation(annotation, resourceId10, userId3, eventBus, logger);
       annotationsCreated++;
     }
   }
   return { annotationsCreated };
 }
-async function createAnnotation(annotation, resourceId7, userId2, eventBus, logger) {
+async function createAnnotation(annotation, resourceId10, userId3, eventBus, logger) {
   const result$ = (0, import_rxjs12.race)(
-    eventBus.get("mark:create-ok").pipe((0, import_operators12.map)(() => "ok")),
-    eventBus.get("mark:create-failed").pipe((0, import_operators12.map)((e) => {
+    eventBus.get("mark:create-ok").pipe((0, import_operators11.map)(() => "ok")),
+    eventBus.get("mark:create-failed").pipe((0, import_operators11.map)((e) => {
       throw new Error(e.message);
     })),
-    (0, import_rxjs12.timer)(IMPORT_TIMEOUT_MS).pipe((0, import_operators12.map)(() => {
+    (0, import_rxjs12.timer)(IMPORT_TIMEOUT_MS).pipe((0, import_operators11.map)(() => {
       throw new Error("Timeout waiting for mark:create-ok");
     }))
   );
   eventBus.get("mark:create").next({
     annotation: dehydrateAnnotation(annotation),
-    userId: userId2,
-    resourceId: resourceId7
+    _userId: userId3,
+    resourceId: resourceId10
   });
   await (0, import_rxjs12.firstValueFrom)(result$);
   logger?.debug("Created annotation", { annotationId: annotation.id });
@@ -14328,22 +14132,22 @@ async function createAnnotation(annotation, resourceId7, userId2, eventBus, logg
 
 // src/annotation-assembly.ts
 import {
-  assembleAnnotation,
+  assembleAnnotation as assembleAnnotation2,
   applyBodyOperations
 } from "@semiont/core";
 
 // src/annotation-operations.ts
-import { annotationId as annotationId2, resourceId as makeResourceId6, assembleAnnotation as assembleAnnotation2, applyBodyOperations as applyBodyOperations2 } from "@semiont/core";
+import { annotationId as annotationId4, resourceId as makeResourceId6, assembleAnnotation as assembleAnnotation3, 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);
+  static async createAnnotation(request, userId3, creator, eventBus) {
+    const { annotation } = assembleAnnotation3(request, creator);
     const resId = makeResourceId6(request.target.source);
     eventBus.get("mark:create").next({
       annotation,
-      userId: userId2,
+      _userId: userId3,
       resourceId: resId
     });
     return { annotation };
@@ -14351,10 +14155,10 @@ var AnnotationOperations = class {
   /**
    * Update annotation body via EventBus → Stower
    */
-  static async updateAnnotationBody(id, request, userId2, eventBus, kb) {
+  static async updateAnnotationBody(id, request, userId3, eventBus, kb) {
     const resId = makeResourceId6(request.resourceId);
     const annotation = await AnnotationContext.getAnnotation(
-      annotationId2(id),
+      annotationId4(id),
       resId,
       kb
     );
@@ -14362,8 +14166,8 @@ var AnnotationOperations = class {
       throw new Error("Annotation not found");
     }
     eventBus.get("mark:update-body").next({
-      annotationId: annotationId2(id),
-      userId: userId2,
+      annotationId: annotationId4(id),
+      _userId: userId3,
       resourceId: resId,
       operations: request.operations
     });
@@ -14378,7 +14182,7 @@ var AnnotationOperations = class {
   /**
    * Delete an annotation via EventBus → Stower
    */
-  static async deleteAnnotation(id, resourceIdStr, userId2, eventBus, kb, logger) {
+  static async deleteAnnotation(id, resourceIdStr, userId3, eventBus, kb, logger) {
     const resId = makeResourceId6(resourceIdStr);
     const projection = await AnnotationContext.getResourceAnnotations(resId, kb);
     const annotation = projection.annotations.find((a) => a.id === id);
@@ -14387,8 +14191,8 @@ var AnnotationOperations = class {
     }
     logger?.debug("Removing annotation via EventBus", { annotationId: id });
     eventBus.get("mark:delete").next({
-      annotationId: annotationId2(id),
-      userId: userId2,
+      annotationId: annotationId4(id),
+      _userId: userId3,
       resourceId: resId
     });
     logger?.debug("Annotation delete event emitted");
@@ -14408,15 +14212,16 @@ export {
   Gatherer,
   GraphContext,
   LLMContext,
+  LocalContentTransport,
+  LocalTransport,
   Matcher,
   PACKAGE_NAME,
   ResourceContext,
   ResourceOperations,
-  Smelter,
   Stower,
   VERSION,
   applyBodyOperations,
-  assembleAnnotation,
+  assembleAnnotation2 as assembleAnnotation,
   bootstrapEntityTypes,
   createKnowledgeBase,
   exportBackup,
@@ -14427,6 +14232,11 @@ export {
   importLinkedData,
   isBackupManifest,
   readEntityTypesProjection,
+  registerAnnotationAssemblyHandler,
+  registerAnnotationLookupHandlers,
+  registerBindUpdateBodyHandler,
+  registerBusHandlers,
+  registerJobCommandHandlers,
   startMakeMeaning,
   stopKnowledgeSystem,
   validateManifestVersion