@semiont/cli 0.4.19 → 0.4.21

package/dist/cli.mjs

@@ -6528,10 +6528,10 @@ async function isPortInUse(port) {
     server.listen(port);
   });
 }
-async function isHostReachable(host, port, timeout4 = 5e3) {
+async function isHostReachable(host, port, timeout = 5e3) {
   return new Promise((resolve9) => {
     const socket = new net.Socket();
-    socket.setTimeout(timeout4);
+    socket.setTimeout(timeout);
     socket.once("connect", () => {
       socket.end();
       resolve9(true);
@@ -7008,7 +7008,7 @@ import * as fs11 from "fs";
 import * as path11 from "path";
 import { execFileSync as execFileSync8 } from "child_process";
 import { SemiontProject as SemiontProject4 } from "@semiont/core/node";
-import { baseUrl, EventBus } from "@semiont/core";
+import { baseUrl } from "@semiont/core";
 import { SemiontApiClient } from "@semiont/api-client";
 var checkBackendService, preflightBackendCheck, backendCheckDescriptor;
 var init_backend_check = __esm({
@@ -7089,7 +7089,7 @@ var init_backend_check = __esm({
       }
       if (status === "unhealthy" || status === "unknown") {
         const localUrl = `http://localhost:${config.port}`;
-        const client = new SemiontApiClient({ baseUrl: baseUrl(localUrl), eventBus: new EventBus() });
+        const client = new SemiontApiClient({ baseUrl: baseUrl(localUrl) });
         try {
           const healthData = await client.healthCheck();
           healthy = true;
@@ -8622,7 +8622,7 @@ ssl: {
 // src/platforms/posix/handlers/backend-provision.ts
 import * as fs20 from "fs";
 import * as path17 from "path";
-import * as crypto from "crypto";
+import * as crypto2 from "crypto";
 import { execFileSync as execFileSync12 } from "child_process";
 import { SemiontProject as SemiontProject6 } from "@semiont/core/node";
 var provisionBackendService, preflightBackendProvision, backendProvisionDescriptor;
@@ -8667,7 +8667,7 @@ var init_backend_provision = __esm({
       }
       let jwtSecret = options.rotateSecret ? void 0 : readSecret("JWT_SECRET");
       if (!jwtSecret) {
-        jwtSecret = service.environmentConfig.app?.security?.jwtSecret ?? crypto.randomBytes(32).toString("base64");
+        jwtSecret = service.environmentConfig.app?.security?.jwtSecret ?? crypto2.randomBytes(32).toString("base64");
         writeSecret("JWT_SECRET", jwtSecret);
         printInfo(options.rotateSecret ? "Generated new JWT_SECRET (--rotate-secret)" : "Generated new JWT_SECRET");
       } else {
@@ -8897,10 +8897,10 @@ async function stopJanusGraph(context) {
         printInfo(`Stopping JanusGraph gracefully (PID: ${pid})...`);
       }
       process.kill(pid, "SIGTERM");
-      const timeout4 = options.timeout * 1e3;
+      const timeout = options.timeout * 1e3;
       const startTime = Date.now();
       let processRunning = true;
-      while (processRunning && Date.now() - startTime < timeout4) {
+      while (processRunning && Date.now() - startTime < timeout) {
         await new Promise((resolve9) => setTimeout(resolve9, 1e3));
         try {
           process.kill(pid, 0);
@@ -9687,10 +9687,10 @@ var init_inference_stop = __esm({
         printInfo(`Stopping Ollama gracefully (PID: ${pid})...`);
       }
       process.kill(pid, "SIGTERM");
-      const timeout4 = options.timeout * 1e3;
+      const timeout = options.timeout * 1e3;
       const startTime = Date.now();
       let processRunning = true;
-      while (processRunning && Date.now() - startTime < timeout4) {
+      while (processRunning && Date.now() - startTime < timeout) {
         await new Promise((resolve9) => setTimeout(resolve9, 1e3));
         try {
           process.kill(pid, 0);
@@ -10192,7 +10192,7 @@ var init_platform2 = __esm({
 
 // src/platforms/container/handlers/web-check.ts
 import { execFileSync as execFileSync16 } from "child_process";
-import { baseUrl as baseUrl2, EventBus as EventBus2 } from "@semiont/core";
+import { baseUrl as baseUrl2 } from "@semiont/core";
 import { SemiontApiClient as SemiontApiClient2 } from "@semiont/api-client";
 var checkWebContainer, preflightWebCheck, webCheckDescriptor, webFrontendCheckDescriptor;
 var init_web_check = __esm({
@@ -10248,7 +10248,7 @@ var init_web_check = __esm({
         try {
           if (isBackend) {
             const backendConfig = config;
-            const client = new SemiontApiClient2({ baseUrl: baseUrl2(backendConfig.publicURL), eventBus: new EventBus2() });
+            const client = new SemiontApiClient2({ baseUrl: baseUrl2(backendConfig.publicURL) });
             try {
               const healthData = await client.healthCheck();
               health = {
@@ -14420,7 +14420,7 @@ var init_database_stop = __esm({
     init_preflight_utils();
     stopDatabaseContainer = async (context) => {
       const { service, runtime, containerName } = context;
-      const { force, timeout: timeout4 } = context.options;
+      const { force, timeout } = context.options;
       if (!service.quiet) {
         printInfo(`Stopping database container: ${containerName}`);
       }
@@ -14459,7 +14459,7 @@ var init_database_stop = __esm({
           execFileSync25(runtime, ["kill", containerName], { stdio: "pipe" });
         } else {
           if (!service.quiet) {
-            printInfo(`Gracefully stopping database (timeout: ${timeout4}s)...`);
+            printInfo(`Gracefully stopping database (timeout: ${timeout}s)...`);
           }
           const image = service.getImage();
           if (image.includes("postgres")) {
@@ -14471,26 +14471,26 @@ var init_database_stop = __esm({
                   containerName,
                   "su",
                   "-c",
-                  `pg_ctl stop -D /var/lib/postgresql/data -m smart -t ${timeout4}`,
+                  `pg_ctl stop -D /var/lib/postgresql/data -m smart -t ${timeout}`,
                   "postgres"
                 ],
-                { stdio: "pipe", timeout: (timeout4 + 5) * 1e3 }
+                { stdio: "pipe", timeout: (timeout + 5) * 1e3 }
               );
             } catch {
-              execFileSync25(runtime, ["stop", "-t", timeout4.toString(), containerName], { stdio: "pipe" });
+              execFileSync25(runtime, ["stop", "-t", timeout.toString(), containerName], { stdio: "pipe" });
             }
           } else if (image.includes("mysql")) {
             try {
               execFileSync25(
                 runtime,
                 ["exec", containerName, "mysqladmin", "shutdown"],
-                { stdio: "pipe", timeout: timeout4 * 1e3 }
+                { stdio: "pipe", timeout: timeout * 1e3 }
               );
             } catch {
-              execFileSync25(runtime, ["stop", "-t", timeout4.toString(), containerName], { stdio: "pipe" });
+              execFileSync25(runtime, ["stop", "-t", timeout.toString(), containerName], { stdio: "pipe" });
             }
           } else {
-            execFileSync25(runtime, ["stop", "-t", timeout4.toString(), containerName], { stdio: "pipe" });
+            execFileSync25(runtime, ["stop", "-t", timeout.toString(), containerName], { stdio: "pipe" });
           }
         }
         let stopped = false;
@@ -18194,12 +18194,12 @@ async function fetchTaskLogs(clusterName, taskArn, region, verbose = false) {
     return [];
   }
 }
-async function waitForECSDeployment(clusterName, serviceName, deploymentId, region, timeout4, verbose = false) {
+async function waitForECSDeployment(clusterName, serviceName, deploymentId, region, timeout, verbose = false) {
   const startTime = Date.now();
   const checkInterval = 5e3;
   let imagePullDetected = false;
   let lastEventCount = 0;
-  let effectiveTimeout = timeout4;
+  let effectiveTimeout = timeout;
   let recentStoppedTasks = /* @__PURE__ */ new Set();
   let consecutiveFailures = 0;
   let taskDetails = { new: { total: 0, running: 0, healthy: 0, pending: 0 }, old: { total: 0, running: 0, healthy: 0, pending: 0 } };
@@ -18235,7 +18235,7 @@ async function waitForECSDeployment(clusterName, serviceName, deploymentId, regi
         );
         if (pullEvents.length > 0 && !imagePullDetected) {
           imagePullDetected = true;
-          effectiveTimeout = timeout4 + 300;
+          effectiveTimeout = timeout + 300;
           if (!verbose) {
             process.stdout.write("\n");
           }
@@ -18619,11 +18619,11 @@ var init_ecs_update = __esm({
         const newDeployment = deployments.find((d) => d.status === "PRIMARY");
         const deploymentId = newDeployment?.id;
         if (service.config?.wait && deploymentId) {
-          const timeout4 = service.config.timeout || 300;
+          const timeout = service.config.timeout || 300;
           if (!service.quiet) {
-            printInfo(`Waiting for deployment to complete (timeout: ${timeout4}s)...`);
+            printInfo(`Waiting for deployment to complete (timeout: ${timeout}s)...`);
           }
-          await waitForECSDeployment(clusterName, serviceName, deploymentId, region, timeout4, service.verbose);
+          await waitForECSDeployment(clusterName, serviceName, deploymentId, region, timeout, service.verbose);
         }
         return {
           success: true,
@@ -21908,16 +21908,16 @@ var require_timeoutProvider = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.timeoutProvider = void 0;
     exports.timeoutProvider = {
-      setTimeout: function(handler, timeout4) {
+      setTimeout: function(handler, timeout) {
         var args = [];
         for (var _i = 2; _i < arguments.length; _i++) {
           args[_i - 2] = arguments[_i];
         }
         var delegate = exports.timeoutProvider.delegate;
         if (delegate === null || delegate === void 0 ? void 0 : delegate.setTimeout) {
-          return delegate.setTimeout.apply(delegate, __spreadArray([handler, timeout4], __read(args)));
+          return delegate.setTimeout.apply(delegate, __spreadArray([handler, timeout], __read(args)));
         }
-        return setTimeout.apply(void 0, __spreadArray([handler, timeout4], __read(args)));
+        return setTimeout.apply(void 0, __spreadArray([handler, timeout], __read(args)));
       },
       clearTimeout: function(handle) {
         var delegate = exports.timeoutProvider.delegate;
@@ -22991,26 +22991,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;
@@ -23018,12 +23018,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;
   }
 });
 
@@ -23268,16 +23268,16 @@ var require_intervalProvider = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.intervalProvider = void 0;
     exports.intervalProvider = {
-      setInterval: function(handler, timeout4) {
+      setInterval: function(handler, timeout) {
         var args = [];
         for (var _i = 2; _i < arguments.length; _i++) {
           args[_i - 2] = arguments[_i];
         }
         var delegate = exports.intervalProvider.delegate;
         if (delegate === null || delegate === void 0 ? void 0 : delegate.setInterval) {
-          return delegate.setInterval.apply(delegate, __spreadArray([handler, timeout4], __read(args)));
+          return delegate.setInterval.apply(delegate, __spreadArray([handler, timeout], __read(args)));
         }
-        return setInterval.apply(void 0, __spreadArray([handler, timeout4], __read(args)));
+        return setInterval.apply(void 0, __spreadArray([handler, timeout], __read(args)));
       },
       clearInterval: function(handle) {
         var delegate = exports.intervalProvider.delegate;
@@ -25338,7 +25338,7 @@ var require_timeout = __commonJS({
         this.info = info;
       };
     });
-    function timeout4(config, schedulerArg) {
+    function timeout(config, schedulerArg) {
       var _a = isDate_1.isValidDate(config) ? { first: config } : typeof config === "number" ? { each: config } : config, first = _a.first, each = _a.each, _b = _a.with, _with = _b === void 0 ? timeoutErrorFactory : _b, _c = _a.scheduler, scheduler = _c === void 0 ? schedulerArg !== null && schedulerArg !== void 0 ? schedulerArg : async_1.asyncScheduler : _c, _d = _a.meta, meta = _d === void 0 ? null : _d;
       if (first == null && each == null) {
         throw new TypeError("No timeout provided.");
@@ -25376,7 +25376,7 @@ var require_timeout = __commonJS({
         !seen && startTimer(first != null ? typeof first === "number" ? first : +first - scheduler.now() : each);
       });
     }
-    exports.timeout = timeout4;
+    exports.timeout = timeout;
     function timeoutErrorFactory(info) {
       throw new exports.TimeoutError(info);
     }
@@ -27612,7 +27612,7 @@ var require_take = __commonJS({
     var empty_1 = require_empty();
     var lift_1 = require_lift();
     var OperatorSubscriber_1 = require_OperatorSubscriber();
-    function take4(count) {
+    function take(count) {
       return count <= 0 ? function() {
         return empty_1.EMPTY;
       } : lift_1.operate(function(source, subscriber) {
@@ -27627,7 +27627,7 @@ var require_take = __commonJS({
         }));
       });
     }
-    exports.take = take4;
+    exports.take = take;
   }
 });
 
@@ -31683,7 +31683,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@semiont/cli",
-      version: "0.4.19",
+      version: "0.4.21",
       description: "Semiont CLI - Unified environment management tool",
       _comment: "AWS SDK dependencies (@aws-sdk/*) are only used by platforms/aws",
       type: "module",
@@ -31730,12 +31730,12 @@ var require_package = __commonJS({
         "test:watch:unit": "vitest --watch --config vitest.config.unit.ts"
       },
       dependencies: {
-        "@semiont/api-client": "0.4.19",
-        "@semiont/content": "0.4.19",
-        "@semiont/core": "0.4.19",
-        "@semiont/event-sourcing": "0.4.19",
-        "@semiont/graph": "0.4.19",
-        "@semiont/make-meaning": "0.4.19",
+        "@semiont/api-client": "0.4.21",
+        "@semiont/content": "0.4.21",
+        "@semiont/core": "0.4.21",
+        "@semiont/event-sourcing": "0.4.21",
+        "@semiont/graph": "0.4.21",
+        "@semiont/make-meaning": "0.4.21",
         arg: "^5.0.2",
         argon2: "^0.44.0",
         express: "^5.2.1",
@@ -32784,7 +32784,7 @@ init_command_definition();
 init_base_options_schema();
 init_cli_logger();
 init_config_loader();
-import * as crypto2 from "crypto";
+import * as crypto3 from "crypto";
 import * as argon2 from "argon2";
 import * as path30 from "path";
 import { createRequire as createRequire2 } from "module";
@@ -32846,7 +32846,7 @@ function extractDomain(email) {
   return parts[1];
 }
 function generatePassword() {
-  return crypto2.randomBytes(12).toString("base64");
+  return crypto3.randomBytes(12).toString("base64");
 }
 async function useradd(options) {
   const startTime = Date.now();
@@ -33057,7 +33057,7 @@ init_config_loader();
 import * as fs38 from "fs";
 import * as path31 from "path";
 import { SemiontProject as SemiontProject11 } from "@semiont/core/node";
-import { EventBus as EventBus3 } from "@semiont/core";
+import { EventBus } from "@semiont/core";
 import { createEventStore } from "@semiont/event-sourcing";
 import { WorkingTreeStore } from "@semiont/content";
 import { exportBackup } from "@semiont/make-meaning";
@@ -33086,7 +33086,7 @@ async function runBackup(options) {
   }
   const project = new SemiontProject11(projectRoot);
   const logger = createCliLogger(options.verbose ?? false);
-  const eventStore = createEventStore(project, new EventBus3(), logger);
+  const eventStore = createEventStore(project, new EventBus(), logger);
   const contentStore = new WorkingTreeStore(
     project,
     logger.child({ component: "content-store" })
@@ -33140,7 +33140,7 @@ init_config_loader();
 import * as fs39 from "fs";
 import * as path32 from "path";
 import { SemiontProject as SemiontProject12 } from "@semiont/core/node";
-import { EventBus as EventBus4 } from "@semiont/core";
+import { EventBus as EventBus2 } from "@semiont/core";
 import { createEventStore as createEventStore2 } from "@semiont/event-sourcing";
 import { importBackup, Stower, createKnowledgeBase } from "@semiont/make-meaning";
 function createCliLogger2(verbose) {
@@ -33212,7 +33212,7 @@ async function runRestore(options) {
   if (!options.quiet) {
     printInfo(`Restoring from ${filePath}`);
   }
-  const eventBus = new EventBus4();
+  const eventBus = new EventBus2();
   const eventStore = createEventStore2(project, eventBus, logger);
   const kb = await createKnowledgeBase(eventStore, project, createNoopGraphDatabase(), eventBus, logger);
   const stower = new Stower(kb, eventBus, logger.child({ component: "stower" }));
@@ -33414,7 +33414,7 @@ init_config_loader();
 import * as fs41 from "fs";
 import * as path34 from "path";
 import { SemiontProject as SemiontProject13 } from "@semiont/core/node";
-import { EventBus as EventBus5 } from "@semiont/core";
+import { EventBus as EventBus3 } from "@semiont/core";
 import { createEventStore as createEventStore3 } from "@semiont/event-sourcing";
 import { WorkingTreeStore as WorkingTreeStore2 } from "@semiont/content";
 import { exportLinkedData } from "@semiont/make-meaning";
@@ -33445,7 +33445,7 @@ async function runExport(options) {
   }
   const project = new SemiontProject13(projectRoot);
   const logger = createCliLogger3(options.verbose ?? false);
-  const eventStore = createEventStore3(project, new EventBus5(), logger);
+  const eventStore = createEventStore3(project, new EventBus3(), logger);
   const contentStore = new WorkingTreeStore2(
     project,
     logger.child({ component: "content-store" })
@@ -33514,7 +33514,7 @@ init_config_loader();
 import * as fs42 from "fs";
 import * as path35 from "path";
 import { SemiontProject as SemiontProject14 } from "@semiont/core/node";
-import { EventBus as EventBus6 } from "@semiont/core";
+import { EventBus as EventBus4 } from "@semiont/core";
 import { createEventStore as createEventStore4 } from "@semiont/event-sourcing";
 import { importLinkedData, Stower as Stower2, createKnowledgeBase as createKnowledgeBase2 } from "@semiont/make-meaning";
 function createCliLogger4(verbose) {
@@ -33589,7 +33589,7 @@ async function runImport(options) {
     printInfo(`Importing JSON-LD archive from ${filePath}`);
     printInfo(`User identity: ${userId}`);
   }
-  const eventBus = new EventBus6();
+  const eventBus = new EventBus4();
   const eventStore = createEventStore4(project, eventBus, logger);
   const kb = await createKnowledgeBase2(eventStore, project, createNoopGraphDatabase2(), eventBus, logger);
   const stower = new Stower2(kb, eventBus, logger.child({ component: "stower" }));
@@ -34245,7 +34245,7 @@ init_cli_logger();
 init_config_loader();
 init_preflight_utils();
 import { SemiontProject as SemiontProject16 } from "@semiont/core/node";
-import { EventBus as EventBus7 } from "@semiont/core";
+import { EventBus as EventBus5 } from "@semiont/core";
 import { createEventStore as createEventStore5 } from "@semiont/event-sourcing";
 import { Stower as Stower3, createKnowledgeBase as createKnowledgeBase3 } from "@semiont/make-meaning";
 function createCliLogger5(verbose) {
@@ -34325,7 +34325,7 @@ async function runMv(options) {
     const gitCheck = checkGitAvailable();
     if (!gitCheck.pass) throw new Error(gitCheck.message);
   }
-  const eventBus = new EventBus7();
+  const eventBus = new EventBus5();
   const eventStore = createEventStore5(project, eventBus, logger);
   const kb = await createKnowledgeBase3(eventStore, project, createNoopGraphDatabase3(), eventBus, logger);
   const stower = new Stower3(kb, eventBus, logger.child({ component: "stower" }));
@@ -34387,7 +34387,7 @@ var mvCmd = new CommandBuilder().name("mv").description("Move (rename) a tracked
 
 // src/core/commands/yield.ts
 init_zod();
-var import_rxjs = __toESM(require_cjs(), 1);
+var import_rxjs2 = __toESM(require_cjs(), 1);
 var import_operators = __toESM(require_operators(), 1);
 init_command_definition();
 init_base_options_schema();
@@ -34396,8 +34396,10 @@ init_config_loader();
 import * as path38 from "path";
 import { promises as nodeFs } from "fs";
 import { resourceId as toResourceId, annotationId as toAnnotationId } from "@semiont/core";
+import { createGatherVM, createYieldVM } from "@semiont/api-client";
 
 // src/core/api-client-factory.ts
+var import_rxjs = __toESM(require_cjs(), 1);
 import * as fs45 from "fs";
 import * as path37 from "path";
 import * as os6 from "os";
@@ -34405,8 +34407,7 @@ import { SemiontApiClient as SemiontApiClient3 } from "@semiont/api-client";
 import {
   email as toEmail,
   accessToken as toAccessToken,
-  baseUrl as toBaseUrl,
-  EventBus as EventBus8
+  baseUrl as toBaseUrl
 } from "@semiont/core";
 var TOKEN_CACHE_TTL_MS = 864e5;
 function authStoreDir() {
@@ -34436,7 +34437,7 @@ function isTokenValid(cache) {
   return Date.now() < cachedAt + TOKEN_CACHE_TTL_MS;
 }
 async function acquireToken(rawBusUrl, emailStr, passwordStr) {
-  const semiont = new SemiontApiClient3({ baseUrl: toBaseUrl(rawBusUrl), eventBus: new EventBus8() });
+  const semiont = new SemiontApiClient3({ baseUrl: toBaseUrl(rawBusUrl) });
   const authResult = await semiont.authenticatePassword(toEmail(emailStr), passwordStr);
   const cache = {
     bus: rawBusUrl,
@@ -34455,8 +34456,13 @@ function loadCachedClient(rawBusUrl) {
 Run: semiont login --bus ${rawBusUrl}`
     );
   }
-  const semiont = new SemiontApiClient3({ baseUrl: toBaseUrl(rawBusUrl), eventBus: new EventBus8() });
-  return { semiont, token: toAccessToken(cached.token) };
+  const token = toAccessToken(cached.token);
+  const token$ = new import_rxjs.BehaviorSubject(token);
+  const semiont = new SemiontApiClient3({
+    baseUrl: toBaseUrl(rawBusUrl),
+    token$
+  });
+  return { semiont, token };
 }
 function resolveBusUrl(busFlag) {
   const url = busFlag ?? process.env.SEMIONT_BUS;
@@ -34523,21 +34529,28 @@ var YieldOptionsSchema = ApiOptionsSchema.extend({
 async function runDelegate(semiont, _token, options) {
   const rawResourceId = options.resource;
   const rawAnnotationId = options.annotation;
-  const resourceId = toResourceId(rawResourceId);
-  const annotationId = toAnnotationId(rawAnnotationId);
-  const gatherCompletion = await (0, import_rxjs.firstValueFrom)(
-    semiont.gather.annotation(annotationId, resourceId, { contextWindow: options.contextWindow }).pipe(
-      (0, import_operators.filter)((e) => "response" in e),
-      (0, import_operators.take)(1),
-      (0, import_operators.timeout)(6e4)
-    )
-  );
-  const context = gatherCompletion.response?.context;
-  if (!context) throw new Error("No context returned from gatherAnnotation \u2014 cannot generate");
+  const rId = toResourceId(rawResourceId);
+  const aId = toAnnotationId(rawAnnotationId);
+  const gatherVM = createGatherVM(semiont, rId);
+  let context;
+  try {
+    semiont.emit("gather:requested", {
+      correlationId: crypto.randomUUID(),
+      annotationId: aId,
+      resourceId: rId,
+      options: { contextWindow: options.contextWindow }
+    });
+    context = await (0, import_rxjs2.firstValueFrom)(
+      gatherVM.context$.pipe((0, import_operators.filter)((c) => c !== null))
+    );
+  } finally {
+    gatherVM.dispose();
+  }
   if (!options.quiet) process.stderr.write(`Generating from annotation ${rawAnnotationId}...
 `);
-  const result = await new Promise((resolve9, reject) => {
-    semiont.yield.fromAnnotation(resourceId, annotationId, {
+  const yieldVM = createYieldVM(semiont, rId, options.language ?? "en");
+  try {
+    yieldVM.generate(aId, {
       title: options.title ?? rawAnnotationId,
       storageUri: options.storageUri,
       context,
@@ -34545,17 +34558,27 @@ async function runDelegate(semiont, _token, options) {
       language: options.language,
       temperature: options.temperature,
       maxTokens: options.maxTokens
-    }).subscribe({
-      next: (progress) => {
-        if (progress.resourceId) {
-          resolve9({ resourceId: progress.resourceId, resourceName: progress.resourceName });
-        }
-      },
-      error: (err) => reject(err),
-      complete: () => resolve9({})
     });
-  });
-  return result;
+    return await new Promise((resolve9, reject) => {
+      const completeUnsub = semiont.on("job:complete", (event) => {
+        if (event.jobType !== "generation") return;
+        cleanup();
+        const r = event.result ?? {};
+        resolve9({ resourceId: r.resourceId, resourceName: r.resourceName });
+      });
+      const failUnsub = semiont.on("job:fail", (event) => {
+        if (event.jobType !== "generation") return;
+        cleanup();
+        reject(new Error(event.error ?? "Generation failed"));
+      });
+      function cleanup() {
+        completeUnsub();
+        failUnsub();
+      }
+    });
+  } finally {
+    yieldVM.dispose();
+  }
 }
 async function runYield(options) {
   const startTime = Date.now();
@@ -34688,6 +34711,7 @@ init_command_definition();
 init_base_options_schema();
 init_cli_logger();
 import { resourceId as toResourceId2 } from "@semiont/core";
+import { createMarkVM } from "@semiont/api-client";
 var MOTIVATIONS = ["highlighting", "commenting", "tagging", "assessing", "linking"];
 var CONTEXT_WINDOW = 32;
 var MarkOptionsSchema = ApiOptionsSchema.extend({
@@ -34719,7 +34743,7 @@ var MarkOptionsSchema = ApiOptionsSchema.extend({
   // ── Delegate mode: shared ──────────────────────────────────────────────
   instructions: external_exports.string().optional(),
   density: external_exports.coerce.number().int().optional(),
-  tone: external_exports.string().optional(),
+  tone: external_exports.enum(["scholarly", "explanatory", "conversational", "technical", "analytical", "critical", "balanced", "constructive"]).optional(),
   // ── Delegate mode: linking ─────────────────────────────────────────────
   entityType: external_exports.array(external_exports.string()).default([]),
   includeDescriptive: external_exports.boolean().default(false),
@@ -34824,32 +34848,49 @@ function buildBody(options) {
 }
 async function runDelegate2(semiont, options) {
   const rawResourceId = options.resourceIdArr[0];
-  const resourceId = toResourceId2(rawResourceId);
+  const rId = toResourceId2(rawResourceId);
   const { motivation, instructions, density, tone, entityType, includeDescriptive, schemaId, category } = options;
   if (!options.quiet) process.stderr.write(`Annotating ${motivation} on ${rawResourceId}...
 `);
-  const result = await new Promise((resolve9, reject) => {
-    semiont.mark.assist(resourceId, motivation, {
-      instructions,
-      density,
-      tone,
-      entityTypes: entityType,
-      includeDescriptiveReferences: includeDescriptive,
-      schemaId,
-      categories: category
-    }).subscribe({
-      next: (progress) => {
-        if ("foundCount" in progress) {
-          resolve9({ createdCount: progress.createdCount ?? 0 });
-        }
-      },
-      error: (err) => reject(err),
-      complete: () => resolve9({ createdCount: 0 })
+  const vm = createMarkVM(semiont, rId);
+  try {
+    semiont.emit("mark:assist-request", {
+      motivation,
+      options: {
+        instructions,
+        density,
+        tone,
+        entityTypes: entityType,
+        includeDescriptiveReferences: includeDescriptive,
+        schemaId,
+        categories: category
+      }
     });
-  });
-  if (!options.quiet) process.stderr.write(`\u2713 ${result.createdCount} annotations created
+    const result = await new Promise((resolve9, reject) => {
+      const isAnnotationJob = (jt) => jt !== "generation";
+      const completeUnsub = semiont.on("job:complete", (event) => {
+        if (!isAnnotationJob(event.jobType)) return;
+        cleanup();
+        const r = event.result ?? {};
+        const createdCount = typeof r.highlightsCreated === "number" && r.highlightsCreated || typeof r.commentsCreated === "number" && r.commentsCreated || typeof r.assessmentsCreated === "number" && r.assessmentsCreated || typeof r.tagsCreated === "number" && r.tagsCreated || typeof r.totalEmitted === "number" && r.totalEmitted || 0;
+        resolve9({ createdCount });
+      });
+      const failUnsub = semiont.on("job:fail", (event) => {
+        if (!isAnnotationJob(event.jobType)) return;
+        cleanup();
+        reject(new Error(event.error ?? "Annotation failed"));
+      });
+      function cleanup() {
+        completeUnsub();
+        failUnsub();
+      }
+    });
+    if (!options.quiet) process.stderr.write(`\u2713 ${result.createdCount} annotations created
 `);
-  return { motivation, resourceId: rawResourceId, createdCount: result.createdCount };
+    return { motivation, resourceId: rawResourceId, createdCount: result.createdCount };
+  } finally {
+    vm.dispose();
+  }
 }
 async function runMark(options) {
   const startTime = Date.now();
@@ -35019,11 +35060,12 @@ var markCmd = new CommandBuilder().name("mark").description(
 
 // src/core/commands/gather.ts
 init_zod();
-var import_rxjs2 = __toESM(require_cjs(), 1);
+var import_rxjs3 = __toESM(require_cjs(), 1);
 var import_operators2 = __toESM(require_operators(), 1);
 init_command_definition();
 init_base_options_schema();
 import { resourceId as toResourceId3, annotationId as toAnnotationId2 } from "@semiont/core";
+import { createGatherVM as createGatherVM2 } from "@semiont/api-client";
 var GatherOptionsSchema = ApiOptionsSchema.extend({
   args: external_exports.array(external_exports.string()).min(2, "Usage: semiont gather resource <resourceId> | gather annotation <resourceId> <annotationId>"),
   depth: external_exports.coerce.number().int().min(1).max(3).default(2),
@@ -35045,16 +35087,22 @@ async function runGather(options) {
     if (!rawAnnotationId) {
       throw new Error("Usage: semiont gather annotation <resourceId> <annotationId>");
     }
-    const resourceId = toResourceId3(rawResourceId);
-    const annotationId = toAnnotationId2(rawAnnotationId);
-    const completion = await (0, import_rxjs2.firstValueFrom)(
-      semiont.gather.annotation(annotationId, resourceId, { contextWindow: options.contextWindow }).pipe(
-        (0, import_operators2.filter)((e) => "response" in e),
-        (0, import_operators2.take)(1),
-        (0, import_operators2.timeout)(6e4)
-      )
-    );
-    result = completion.response;
+    const rid = toResourceId3(rawResourceId);
+    const aid = toAnnotationId2(rawAnnotationId);
+    const vm = createGatherVM2(semiont, rid);
+    try {
+      semiont.emit("gather:requested", {
+        correlationId: crypto.randomUUID(),
+        annotationId: aid,
+        resourceId: rid,
+        options: { contextWindow: options.contextWindow }
+      });
+      result = await (0, import_rxjs3.firstValueFrom)(
+        vm.context$.pipe((0, import_operators2.filter)((c) => c !== null))
+      );
+    } finally {
+      vm.dispose();
+    }
   } else {
     throw new Error(`Unknown subcommand: ${subcommand}. Use 'resource' or 'annotation'.`);
   }
@@ -35095,11 +35143,12 @@ var gatherCmd = new CommandBuilder().name("gather").description("Fetch LLM-optim
 
 // src/core/commands/match.ts
 init_zod();
-var import_rxjs3 = __toESM(require_cjs(), 1);
+var import_rxjs4 = __toESM(require_cjs(), 1);
 var import_operators3 = __toESM(require_operators(), 1);
 init_command_definition();
 init_base_options_schema();
 import { resourceId as toResourceId4, annotationId as toAnnotationId3 } from "@semiont/core";
+import { createGatherVM as createGatherVM3 } from "@semiont/api-client";
 var MatchOptionsSchema = ApiOptionsSchema.extend({
   args: external_exports.array(external_exports.string()).min(2, "Usage: semiont match <resourceId> <annotationId>").max(2),
   contextWindow: external_exports.coerce.number().int().min(100).max(5e3).default(1e3),
@@ -35114,23 +35163,29 @@ async function runMatch(options) {
   const annotationId = toAnnotationId3(rawAnnotationId);
   const rawBusUrl = resolveBusUrl(options.bus);
   const { semiont } = loadCachedClient(rawBusUrl);
-  const gatherCompletion = await (0, import_rxjs3.firstValueFrom)(
-    semiont.gather.annotation(annotationId, resourceId, { contextWindow: options.contextWindow }).pipe(
-      (0, import_operators3.filter)((e) => "response" in e),
-      (0, import_operators3.take)(1),
-      (0, import_operators3.timeout)(6e4)
-    )
-  );
-  let context = gatherCompletion.response?.context;
-  if (!context) throw new Error("No context returned from gather");
+  const gatherVM = createGatherVM3(semiont, resourceId);
+  let context;
+  try {
+    semiont.emit("gather:requested", {
+      correlationId: crypto.randomUUID(),
+      annotationId,
+      resourceId,
+      options: { contextWindow: options.contextWindow }
+    });
+    context = await (0, import_rxjs4.firstValueFrom)(
+      gatherVM.context$.pipe((0, import_operators3.filter)((c) => c !== null))
+    );
+  } finally {
+    gatherVM.dispose();
+  }
   if (options.userHint) {
     context = { ...context, userHint: options.userHint };
   }
-  const searchResult = await (0, import_rxjs3.firstValueFrom)(
+  const searchResult = await (0, import_rxjs4.firstValueFrom)(
     semiont.match.search(resourceId, rawAnnotationId, context, {
       limit: options.limit,
       useSemanticScoring: !options.noSemantic
-    }).pipe((0, import_operators3.take)(1), (0, import_operators3.timeout)(6e4))
+    })
   );
   const results = searchResult.response;
   process.stdout.write(JSON.stringify(results, null, 2));
@@ -35454,7 +35509,8 @@ var browseCmd = new CommandBuilder().name("browse").description(
 init_zod();
 init_command_definition();
 init_base_options_schema();
-import { resourceId as toResourceId7, EventBus as EventBus9 } from "@semiont/core";
+import { resourceId as toResourceId7 } from "@semiont/core";
+import { createActorVM } from "@semiont/api-client";
 var ListenOptionsSchema = ApiOptionsSchema.extend({
   args: external_exports.array(external_exports.string()).default([])
 }).superRefine((val, ctx) => {
@@ -35466,46 +35522,53 @@ var ListenOptionsSchema = ApiOptionsSchema.extend({
     ctx.addIssue({ code: external_exports.ZodIssueCode.custom, message: "Usage: semiont listen resource <resourceId>" });
   }
 });
+var ALL_EVENT_TYPES = [
+  "yield:created",
+  "yield:cloned",
+  "yield:updated",
+  "yield:moved",
+  "yield:representation-added",
+  "yield:representation-removed",
+  "mark:added",
+  "mark:removed",
+  "mark:body-updated",
+  "mark:archived",
+  "mark:unarchived",
+  "mark:entity-tag-added",
+  "mark:entity-tag-removed",
+  "mark:entity-type-added",
+  "job:started",
+  "job:progress",
+  "job:completed",
+  "job:failed"
+];
 async function runListen(options) {
   const startTime = Date.now();
   const rawBusUrl = resolveBusUrl(options.bus);
-  const { semiont, token } = loadCachedClient(rawBusUrl);
+  const { token } = loadCachedClient(rawBusUrl);
   const [subcommand, rawResourceId] = options.args;
   const isResourceScoped = subcommand === "resource";
-  const eventBus = new EventBus9();
   let eventCount = 0;
-  const allEventTypes = [
-    "yield:created",
-    "yield:cloned",
-    "yield:updated",
-    "yield:moved",
-    "yield:representation-added",
-    "yield:representation-removed",
-    "mark:added",
-    "mark:removed",
-    "mark:body-updated",
-    "mark:archived",
-    "mark:unarchived",
-    "mark:entity-tag-added",
-    "mark:entity-tag-removed",
-    "mark:entity-type-added",
-    "job:started",
-    "job:progress",
-    "job:completed",
-    "job:failed"
-  ];
-  for (const eventType of allEventTypes) {
-    eventBus.get(eventType).subscribe((event) => {
+  const label = isResourceScoped ? `Listening for events on resource ${rawResourceId}` : "Listening for global events";
+  if (!options.quiet) process.stderr.write(label + " (Ctrl-C to stop)\n");
+  const actor = createActorVM({
+    baseUrl: rawBusUrl,
+    token,
+    channels: isResourceScoped ? [] : [...ALL_EVENT_TYPES]
+  });
+  if (isResourceScoped) {
+    actor.addChannels([...ALL_EVENT_TYPES], toResourceId7(rawResourceId));
+  }
+  for (const eventType of ALL_EVENT_TYPES) {
+    actor.on$(eventType).subscribe((event) => {
       eventCount++;
       process.stdout.write(JSON.stringify(event) + "\n");
     });
   }
-  const label = isResourceScoped ? `Listening for events on resource ${rawResourceId}` : "Listening for global events";
-  if (!options.quiet) process.stderr.write(label + " (Ctrl-C to stop)\n");
-  const stream = isResourceScoped ? semiont.sse.resourceEvents(toResourceId7(rawResourceId), { auth: token, eventBus }) : semiont.sse.globalEvents({ auth: token, eventBus });
+  actor.start();
   await new Promise((resolve9) => {
     const cleanup = () => {
-      stream.close();
+      actor.dispose();
       resolve9();
     };
     process.once("SIGINT", cleanup);
@@ -35517,22 +35580,13 @@ async function runListen(options) {
     timestamp: /* @__PURE__ */ new Date(),
     duration: Date.now() - startTime,
     summary: { succeeded: eventCount, failed: 0, total: eventCount, warnings: 0 },
-    executionContext: { user: process.env.USER || "unknown", workingDirectory: process.cwd(), dryRun: options.dryRun },
-    results: [{ entity: rawResourceId ?? "global", platform: "posix", success: true, duration: Date.now() - startTime }]
+    executionContext: { user: process.env.USER || "unknown", workingDirectory: process.cwd(), dryRun: options.dryRun }
   };
 }
-var listenCmd = new CommandBuilder().name("listen").description(
-  "Open a persistent SSE connection and stream domain events as NDJSON to stdout. Without a subcommand, streams global system events. With `resource <resourceId>`, streams events scoped to that resource. Runs until Ctrl-C or the server closes the connection."
-).requiresEnvironment(true).requiresServices(true).examples(
+var listenCmd = new CommandBuilder().name("listen").description("Subscribe to real-time domain events from the knowledge base").requiresEnvironment(true).requiresServices(true).examples(
   "semiont listen",
-  "semiont listen resource <resourceId>",
-  "semiont listen resource <resourceId> | jq .type",
-  "semiont listen | grep entitytype"
-).args({
-  ...withApiArgs({}, {}),
-  restAs: "args",
-  aliases: {}
-}).schema(ListenOptionsSchema).handler(runListen).build();
+  "semiont listen resource <resourceId>"
+).args({ ...withApiArgs({}, {}), restAs: "args", aliases: {} }).schema(ListenOptionsSchema).handler(runListen).build();
 
 // src/core/commands/login.ts
 init_zod();
@@ -36770,7 +36824,7 @@ async function generateGlobalHelp() {
 }
 
 // src/cli.ts
-var VERSION = "0.4.19";
+var VERSION = "0.4.21";
 function printVersion() {
   console.log(`Semiont CLI v${VERSION}`);
 }