@semiont/cli 0.5.1 → 0.5.2

package/dist/cli.mjs

@@ -8378,26 +8378,26 @@ var require_BehaviorSubject = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.BehaviorSubject = void 0;
     var Subject_1 = require_Subject();
-    var BehaviorSubject3 = (function(_super) {
-      __extends(BehaviorSubject4, _super);
-      function BehaviorSubject4(_value) {
+    var BehaviorSubject2 = (function(_super) {
+      __extends(BehaviorSubject3, _super);
+      function BehaviorSubject3(_value) {
         var _this = _super.call(this) || this;
         _this._value = _value;
         return _this;
       }
-      Object.defineProperty(BehaviorSubject4.prototype, "value", {
+      Object.defineProperty(BehaviorSubject3.prototype, "value", {
         get: function() {
           return this.getValue();
         },
         enumerable: false,
         configurable: true
       });
-      BehaviorSubject4.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;
       };
-      BehaviorSubject4.prototype.getValue = function() {
+      BehaviorSubject3.prototype.getValue = function() {
         var _a = this, hasError = _a.hasError, thrownError = _a.thrownError, _value = _a._value;
         if (hasError) {
           throw thrownError;
@@ -8405,12 +8405,12 @@ var require_BehaviorSubject = __commonJS({
         this._throwIfClosed();
         return _value;
       };
-      BehaviorSubject4.prototype.next = function(value) {
+      BehaviorSubject3.prototype.next = function(value) {
         _super.prototype.next.call(this, this._value = value);
       };
-      return BehaviorSubject4;
+      return BehaviorSubject3;
     })(Subject_1.Subject);
-    exports.BehaviorSubject = BehaviorSubject3;
+    exports.BehaviorSubject = BehaviorSubject2;
   }
 });
 
@@ -16922,10 +16922,10 @@ var require_operators = __commonJS({
 });
 
 // ../../packages/sdk/dist/index.js
-import { SemiontError, annotationId, resourceId, email, googleCredential, refreshToken, EventBus, baseUrl, accessToken, isHighlight, isComment, isAssessment, isReference, isTag, decodeWithCharset, getPrimaryMediaType, userDID, searchQuery } from "@semiont/core";
+import { SemiontError, annotationId, resourceId, email, googleCredential, refreshToken, EventBus, baseUrl, accessToken, searchQuery } from "@semiont/core";
 import { SemiontError as SemiontError2, accessToken as accessToken2, annotationId as annotationId2, baseUrl as baseUrl2, entityType, refreshToken as refreshToken2, resourceId as resourceId2, userId } from "@semiont/core";
-import { HttpTransport, HttpContentTransport, createActorVM, APIError } from "@semiont/api-client";
-import { APIError as APIError2, DEGRADED_THRESHOLD_MS, HttpContentTransport as HttpContentTransport2, HttpTransport as HttpTransport2, createActorVM as createActorVM2 } from "@semiont/api-client";
+import { HttpTransport, HttpContentTransport, APIError } from "@semiont/api-client";
+import { APIError as APIError2, HttpContentTransport as HttpContentTransport2, HttpTransport as HttpTransport2 } from "@semiont/api-client";
 async function busRequest(bus, emitChannel, payload, resultChannel, failureChannel, timeoutMs = 3e4) {
   const correlationId = crypto.randomUUID();
   const fullPayload = { ...payload, correlationId };
@@ -17035,7 +17035,17 @@ function createCache(fetchFn) {
     }
   };
 }
-var import_rxjs, import_operators, StreamObservable, CacheObservable, wrapperCache, BusRequestError, ENTITY_TYPES_KEY, BrowseNamespace, MarkNamespace, BindNamespace, GatherNamespace, MatchNamespace, YieldNamespace, BeckonNamespace, JobNamespace, AuthNamespace, AdminNamespace, SemiontClient, REFRESH_BEFORE_EXP_MS;
+function wrapAsStream(source) {
+  return new StreamObservable((subscriber) => {
+    const sub = source.subscribe({
+      next: (v) => subscriber.next(v),
+      error: (e) => subscriber.error(e),
+      complete: () => subscriber.complete()
+    });
+    return () => sub.unsubscribe();
+  });
+}
+var import_rxjs, import_operators, StreamObservable, CacheObservable, wrapperCache, UploadObservable, BusRequestError, ENTITY_TYPES_KEY, BrowseNamespace, MarkNamespace, BindNamespace, GatherNamespace, MatchNamespace, YieldNamespace, BeckonNamespace, FrameNamespace, JobNamespace, AuthNamespace, AdminNamespace, SemiontClient, REFRESH_BEFORE_EXP_MS;
 var init_dist = __esm({
   "../../packages/sdk/dist/index.js"() {
     "use strict";
@@ -17062,7 +17072,7 @@ var init_dist = __esm({
        * Observable per key (its B4 contract), so this preserves that contract
        * through the awaitable wrapping. Without the memo, every public-method
        * call would produce a fresh wrapper and break referential-equality
-       * guarantees that React-side consumers depend on.
+       * guarantees that hook-style reactive consumers depend on.
        *
        * Backed by a `WeakMap`, so wrappers are GC'd when their source is.
        */
@@ -17076,6 +17086,17 @@ var init_dist = __esm({
       }
     };
     wrapperCache = /* @__PURE__ */ new WeakMap();
+    UploadObservable = class extends import_rxjs.Observable {
+      then(onfulfilled, onrejected) {
+        return (0, import_rxjs.lastValueFrom)(this).then((v) => {
+          if (v.phase !== "finished") {
+            throw new Error(`UploadObservable resolved on a non-finished event: ${v.phase}`);
+          }
+          const result = { resourceId: v.resourceId };
+          return onfulfilled ? onfulfilled(result) : result;
+        }, onrejected);
+      }
+    };
     BusRequestError = class extends SemiontError {
       constructor(message, code, details) {
         super(message, code, details);
@@ -17422,7 +17443,7 @@ var init_dist = __esm({
         this.on("yield:update-ok", this.onYieldResourceMutated);
         this.on("mark:archived", this.onArchiveToggled);
         this.on("mark:unarchived", this.onArchiveToggled);
-        this.on("mark:entity-type-added", () => this.invalidateEntityTypes());
+        this.on("frame:entity-type-added", () => this.invalidateEntityTypes());
       }
     };
     MarkNamespace = class {
@@ -17430,7 +17451,8 @@ var init_dist = __esm({
         this.transport = transport;
         this.bus = bus;
       }
-      async annotation(resourceId22, input) {
+      async annotation(input) {
+        const resourceId22 = resourceId(input.target.source);
         const result = await busRequest(
           this.transport,
           "mark:create-request",
@@ -17443,14 +17465,6 @@ var init_dist = __esm({
       async delete(resourceId22, annotationId22) {
         await this.transport.emit("mark:delete", { annotationId: annotationId22, resourceId: resourceId22 });
       }
-      async entityType(type2) {
-        await this.transport.emit("mark:add-entity-type", { tag: type2 });
-      }
-      async entityTypes(types) {
-        for (const tag of types) {
-          await this.transport.emit("mark:add-entity-type", { tag });
-        }
-      }
       async archive(resourceId22) {
         await this.transport.emit("mark:archive", { resourceId: resourceId22 });
       }
@@ -17605,6 +17619,7 @@ var init_dist = __esm({
         if (options.density !== void 0) params.density = options.density;
         if (options.tone !== void 0) params.tone = options.tone;
         if (options.language !== void 0) params.language = options.language;
+        if (options.sourceLanguage !== void 0) params.sourceLanguage = options.sourceLanguage;
         if (options.schemaId !== void 0) params.schemaId = options.schemaId;
         if (options.categories !== void 0) params.categories = options.categories;
         return busRequest(
@@ -17638,7 +17653,7 @@ var init_dist = __esm({
         this.transport = transport;
         this.bus = bus;
       }
-      annotation(annotationId22, resourceId22, options) {
+      annotation(resourceId22, annotationId22, options) {
         return new StreamObservable((subscriber) => {
           const correlationId = crypto.randomUUID();
           const complete$ = this.bus.get("gather:complete").pipe(
@@ -17730,22 +17745,53 @@ var init_dist = __esm({
         this.bus = bus;
         this.content = content;
       }
-      async resource(data) {
-        const result = await this.content.putBinary({
-          name: data.name,
-          file: data.file,
-          format: data.format,
-          storageUri: data.storageUri,
-          ...data.entityTypes ? { entityTypes: data.entityTypes } : {},
-          ...data.language ? { language: data.language } : {},
-          ...data.creationMethod ? { creationMethod: data.creationMethod } : {},
-          ...data.sourceAnnotationId ? { sourceAnnotationId: data.sourceAnnotationId } : {},
-          ...data.sourceResourceId ? { sourceResourceId: data.sourceResourceId } : {},
-          ...data.generationPrompt ? { generationPrompt: data.generationPrompt } : {},
-          ...data.generator ? { generator: data.generator } : {},
-          ...data.isDraft !== void 0 ? { isDraft: data.isDraft } : {}
+      resource(data) {
+        const totalBytes = typeof Buffer !== "undefined" && data.file instanceof Buffer ? data.file.length : data.file.size;
+        return new UploadObservable((subscriber) => {
+          subscriber.next({ phase: "started", totalBytes });
+          let cancelled = false;
+          const abortController = new AbortController();
+          this.content.putBinary(
+            {
+              name: data.name,
+              file: data.file,
+              format: data.format,
+              storageUri: data.storageUri,
+              ...data.entityTypes ? { entityTypes: data.entityTypes } : {},
+              ...data.language ? { language: data.language } : {},
+              ...data.creationMethod ? { creationMethod: data.creationMethod } : {},
+              ...data.sourceAnnotationId ? { sourceAnnotationId: data.sourceAnnotationId } : {},
+              ...data.sourceResourceId ? { sourceResourceId: data.sourceResourceId } : {},
+              ...data.generationPrompt ? { generationPrompt: data.generationPrompt } : {},
+              ...data.generator ? { generator: data.generator } : {},
+              ...data.isDraft !== void 0 ? { isDraft: data.isDraft } : {}
+            },
+            {
+              // Byte-progress hook. Honored by `HttpContentTransport`'s XHR
+              // path; ignored by ky-path uploads (no `onProgress` consumer)
+              // and by `LocalContentTransport` (no wire to observe).
+              onProgress: ({ bytesUploaded, totalBytes: txTotal }) => {
+                if (cancelled) return;
+                const total = txTotal > 0 ? txTotal : totalBytes;
+                subscriber.next({ phase: "progress", bytesUploaded, totalBytes: total });
+              },
+              signal: abortController.signal
+            }
+          ).then((result) => {
+            if (cancelled) return;
+            subscriber.next({
+              phase: "finished",
+              resourceId: resourceId(result.resourceId)
+            });
+            subscriber.complete();
+          }).catch((err) => {
+            if (!cancelled) subscriber.error(err);
+          });
+          return () => {
+            cancelled = true;
+            abortController.abort();
+          };
         });
-        return { resourceId: result.resourceId };
       }
       fromAnnotation(resourceId22, annotationId22, options) {
         return new StreamObservable((subscriber) => {
@@ -17836,6 +17882,7 @@ var init_dist = __esm({
                 title: options.title,
                 prompt: options.prompt,
                 language: options.language,
+                sourceLanguage: options.sourceLanguage,
                 temperature: options.temperature,
                 maxTokens: options.maxTokens,
                 storageUri: options.storageUri,
@@ -17881,13 +17928,14 @@ var init_dist = __esm({
         return result.sourceResource;
       }
       async createFromToken(options) {
-        return busRequest(
+        const result = await busRequest(
           this.transport,
           "yield:clone-create",
           options,
           "yield:clone-created",
           "yield:clone-create-failed"
         );
+        return { resourceId: resourceId(result.resourceId) };
       }
       clone() {
         this.bus.get("yield:clone").next(void 0);
@@ -17898,7 +17946,7 @@ var init_dist = __esm({
         this.transport = transport;
         this.bus = bus;
       }
-      attention(annotationId22, resourceId22) {
+      attention(resourceId22, annotationId22) {
         void this.transport.emit("beckon:focus", { annotationId: annotationId22, resourceId: resourceId22 });
       }
       hover(annotationId22) {
@@ -17908,6 +17956,19 @@ var init_dist = __esm({
         this.bus.get("beckon:sparkle").next({ annotationId: annotationId22 });
       }
     };
+    FrameNamespace = class {
+      constructor(transport) {
+        this.transport = transport;
+      }
+      async addEntityType(type2) {
+        await this.transport.emit("frame:add-entity-type", { tag: type2 });
+      }
+      async addEntityTypes(types) {
+        for (const tag of types) {
+          await this.transport.emit("frame:add-entity-type", { tag });
+        }
+      }
+    };
     JobNamespace = class {
       constructor(transport, bus) {
         this.transport = transport;
@@ -17944,7 +18005,7 @@ var init_dist = __esm({
       }
       async pollUntilComplete(jobId, options) {
         const interval = options?.interval ?? 1e3;
-        const timeout7 = options?.timeout ?? 6e4;
+        const timeout6 = options?.timeout ?? 6e4;
         const startTime = Date.now();
         while (true) {
           const status = await this.status(jobId);
@@ -17952,85 +18013,83 @@ var init_dist = __esm({
           if (status.status === "complete" || status.status === "failed" || status.status === "cancelled") {
             return status;
           }
-          if (Date.now() - startTime > timeout7) {
-            throw new Error(`Job polling timeout after ${timeout7}ms`);
+          if (Date.now() - startTime > timeout6) {
+            throw new Error(`Job polling timeout after ${timeout6}ms`);
           }
           await new Promise((resolve9) => setTimeout(resolve9, interval));
         }
       }
-      async cancel(_jobId, type2) {
-        await this.transport.emit("job:cancel-requested", {
-          jobType: type2 === "generation" ? "generation" : "annotation"
-        });
+      async cancelByType(jobType) {
+        await this.transport.emit("job:cancel-requested", { jobType });
       }
       cancelRequest(jobType) {
         this.bus.get("job:cancel-requested").next({ jobType });
       }
     };
     AuthNamespace = class {
-      constructor(transport) {
-        this.transport = transport;
+      constructor(backend) {
+        this.backend = backend;
       }
       async password(emailStr, passwordStr) {
-        return this.transport.authenticatePassword(email(emailStr), passwordStr);
+        return this.backend.authenticatePassword(email(emailStr), passwordStr);
       }
       async google(credential) {
-        return this.transport.authenticateGoogle(googleCredential(credential));
+        return this.backend.authenticateGoogle(googleCredential(credential));
       }
       async refresh(token) {
-        return this.transport.refreshAccessToken(refreshToken(token));
+        return this.backend.refreshAccessToken(refreshToken(token));
       }
       async logout() {
-        await this.transport.logout();
+        await this.backend.logout();
       }
       async me() {
-        return this.transport.getCurrentUser();
+        return this.backend.getCurrentUser();
       }
       async acceptTerms() {
-        await this.transport.acceptTerms();
+        await this.backend.acceptTerms();
       }
       async mcpToken() {
-        return this.transport.generateMcpToken();
+        return this.backend.generateMcpToken();
       }
       async mediaToken(resourceId22) {
-        return this.transport.getMediaToken(resourceId22);
+        return this.backend.getMediaToken(resourceId22);
       }
     };
     AdminNamespace = class {
-      constructor(transport) {
-        this.transport = transport;
+      constructor(backend) {
+        this.backend = backend;
       }
       async users() {
-        const result = await this.transport.listUsers();
+        const result = await this.backend.listUsers();
         return result.users;
       }
       async userStats() {
-        return this.transport.getUserStats();
+        return this.backend.getUserStats();
       }
       async updateUser(userId2, data) {
-        const result = await this.transport.updateUser(userId2, data);
+        const result = await this.backend.updateUser(userId2, data);
         return result.user;
       }
       async oauthConfig() {
-        return this.transport.getOAuthConfig();
+        return this.backend.getOAuthConfig();
       }
       async healthCheck() {
-        return this.transport.healthCheck();
+        return this.backend.healthCheck();
       }
       async status() {
-        return this.transport.getStatus();
+        return this.backend.getStatus();
       }
       async backup() {
-        return this.transport.backupKnowledgeBase();
+        return this.backend.backupKnowledgeBase();
       }
-      async restore(file, onProgress) {
-        return this.transport.restoreKnowledgeBase(file, onProgress);
+      restore(file) {
+        return wrapAsStream(this.backend.restoreKnowledgeBase(file));
       }
       async exportKnowledgeBase(params) {
-        return this.transport.exportKnowledgeBase(params);
+        return this.backend.exportKnowledgeBase(params);
       }
-      async importKnowledgeBase(file, onProgress) {
-        return this.transport.importKnowledgeBase(file, onProgress);
+      importKnowledgeBase(file) {
+        return wrapAsStream(this.backend.importKnowledgeBase(file));
       }
     };
     SemiontClient = class _SemiontClient {
@@ -18052,6 +18111,15 @@ var init_dist = __esm({
       bus;
       baseUrl;
       // ── Verb-oriented namespace API ──────────────────────────────────────────
+      //
+      // The first nine namespaces are bus-driven and always present. `frame`
+      // is the schema-layer flow's surface (eighth flow); the other eight are
+      // content-layer flows plus `job`. `auth` and `admin` are backend-ops
+      // namespaces — they're only constructed when the caller passes an
+      // `IBackendOperations` instance to the constructor. A `SemiontClient`
+      // over a transport-only setup (e.g. `LocalTransport`) has
+      // `auth === undefined` / `admin === undefined`.
+      frame;
       browse;
       mark;
       bind;
@@ -18074,13 +18142,20 @@ var init_dist = __esm({
        * Callers do not pass a bus in. If they need to interact with the bus
        * (e.g. for tests or to subscribe to arbitrary channels), they read it
        * back via `client.bus`.
+       *
+       * `backend` is optional. When provided, the `auth` and `admin`
+       * namespaces are constructed against it; when omitted, they're
+       * `undefined`. For HTTP setups this is conventionally the same
+       * `HttpTransport` instance that's also passed as `transport` (HTTP
+       * implements both `ITransport` and `IBackendOperations`).
        */
-      constructor(transport, content) {
+      constructor(transport, content, backend) {
         this.transport = transport;
         this.content = content;
         this.baseUrl = transport.baseUrl;
         this.bus = new EventBus();
         this.transport.bridgeInto(this.bus);
+        this.frame = new FrameNamespace(this.transport);
         this.browse = new BrowseNamespace(this.transport, this.bus, this.content);
         this.mark = new MarkNamespace(this.transport, this.bus);
         this.bind = new BindNamespace(this.transport, this.bus);
@@ -18089,8 +18164,8 @@ var init_dist = __esm({
         this.yield = new YieldNamespace(this.transport, this.bus, this.content);
         this.beckon = new BeckonNamespace(this.transport, this.bus);
         this.job = new JobNamespace(this.transport, this.bus);
-        this.auth = new AuthNamespace(this.transport);
-        this.admin = new AdminNamespace(this.transport);
+        this.auth = backend ? new AuthNamespace(backend) : void 0;
+        this.admin = backend ? new AdminNamespace(backend) : void 0;
       }
       /** Transport-level connection state. HTTP reflects SSE health; local is always 'connected'. */
       get state$() {
@@ -18112,9 +18187,10 @@ var init_dist = __esm({
        * Use this for one-shot scripts, CLI commands, or any consumer that
        * doesn't need to drive the token from outside (no manual refresh,
        * no cross-tab sync). For long-running scripts that need refresh,
-       * use `SemiontSession.fromHttp(...)` instead — it owns the same
-       * transport/client wiring plus the proactive-refresh + storage
-       * machinery.
+       * use `SemiontSession.fromHttp(...)` (with a token already on hand)
+       * or `SemiontSession.signInHttp(...)` (credentials-first) instead —
+       * either owns the same transport/client wiring plus the
+       * proactive-refresh + storage machinery.
        *
        * Strings are accepted for `baseUrl` and `token`; they are branded
        * via `baseUrl()` / `accessToken()` from `@semiont/core` automatically.
@@ -18128,13 +18204,13 @@ var init_dist = __esm({
         const token$ = new import_rxjs.BehaviorSubject(tok);
         const transport = new HttpTransport({ baseUrl: url, token$ });
         const content = new HttpContentTransport(transport);
-        return new _SemiontClient(transport, content);
+        return new _SemiontClient(transport, content, transport);
       }
       /**
        * Async factory for the credentials-first script case. Builds a
-       * transient transport, calls `auth.password(email, password)` to
-       * acquire an access token, and returns the wired client with the
-       * token populated.
+       * transient HTTP transport, calls `auth.password(email, password)`
+       * to acquire an access token, and returns the wired client with
+       * the token populated.
        *
        * This is the right entry point for skills, CLI scripts, and any
        * consumer that starts with email + password rather than a JWT
@@ -18143,18 +18219,24 @@ var init_dist = __esm({
        * `fromHttp({ baseUrl, token })` instead.
        *
        * For long-running scripts that need refresh, use
-       * `SemiontSession.signIn(...)` — same credentials shape, plus the
-       * session machinery for proactive refresh and persistence.
+       * `SemiontSession.signInHttp(...)` — same credentials shape, plus
+       * the session machinery for proactive refresh and persistence.
+       *
+       * Named `signInHttp` because email+password authentication is
+       * inherently an HTTP-shaped operation in the current backend; an
+       * in-process `LocalTransport` doesn't have a credentials login
+       * path. Non-HTTP transports construct the client directly from
+       * their package's transport instance.
        *
        * Throws if authentication fails. The transient client is disposed
        * before the throw, so no resources leak on failure.
        */
-      static async signIn(opts) {
+      static async signInHttp(opts) {
         const url = typeof opts.baseUrl === "string" ? baseUrl(opts.baseUrl) : opts.baseUrl;
         const token$ = new import_rxjs.BehaviorSubject(null);
         const transport = new HttpTransport({ baseUrl: url, token$ });
         const content = new HttpContentTransport(transport);
-        const client = new _SemiontClient(transport, content);
+        const client = new _SemiontClient(transport, content, transport);
         try {
           const auth = await client.auth.password(opts.email, opts.password);
           token$.next(accessToken(auth.token));
@@ -18257,7 +18339,7 @@ var init_backend_check = __esm({
       if (status === "unhealthy" || status === "unknown") {
         const localUrl = `http://localhost:${config.port}`;
         const transport = new HttpTransport3({ baseUrl: baseUrl3(localUrl) });
-        const client = new SemiontClient(transport, new HttpContentTransport3(transport));
+        const client = new SemiontClient(transport, new HttpContentTransport3(transport), transport);
         try {
           const healthData = await client.admin.healthCheck();
           healthy = true;
@@ -21418,7 +21500,7 @@ var init_web_check = __esm({
           if (isBackend) {
             const backendConfig = config;
             const transport = new HttpTransport4({ baseUrl: baseUrl4(backendConfig.publicURL) });
-            const client = new SemiontClient(transport, new HttpContentTransport4(transport));
+            const client = new SemiontClient(transport, new HttpContentTransport4(transport), transport);
             try {
               const healthData = await client.admin.healthCheck();
               health = {
@@ -32935,7 +33017,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@semiont/cli",
-      version: "0.5.1",
+      version: "0.5.2",
       description: "Semiont CLI - Unified environment management tool",
       _comment: "AWS SDK dependencies (@aws-sdk/*) are only used by platforms/aws",
       type: "module",
@@ -32982,13 +33064,13 @@ var require_package = __commonJS({
         "test:watch:unit": "vitest --watch --config vitest.config.unit.ts"
       },
       dependencies: {
-        "@semiont/api-client": "0.5.1",
-        "@semiont/content": "0.5.1",
-        "@semiont/core": "0.5.1",
-        "@semiont/event-sourcing": "0.5.1",
-        "@semiont/graph": "0.5.1",
-        "@semiont/sdk": "0.5.1",
-        "@semiont/make-meaning": "0.5.1",
+        "@semiont/api-client": "0.5.2",
+        "@semiont/content": "0.5.2",
+        "@semiont/core": "0.5.2",
+        "@semiont/event-sourcing": "0.5.2",
+        "@semiont/graph": "0.5.2",
+        "@semiont/sdk": "0.5.2",
+        "@semiont/make-meaning": "0.5.2",
         arg: "^5.0.2",
         argon2: "^0.44.0",
         express: "^5.2.1",
@@ -35640,7 +35722,7 @@ var mvCmd = new CommandBuilder().name("mv").description("Move (rename) a tracked
 
 // src/core/commands/yield.ts
 init_zod();
-var import_rxjs3 = __toESM(require_cjs(), 1);
+var import_rxjs2 = __toESM(require_cjs(), 1);
 init_command_definition();
 init_base_options_schema();
 init_cli_logger();
@@ -35651,14 +35733,11 @@ import { resourceId as toResourceId, annotationId as toAnnotationId } from "@sem
 
 // src/core/api-client-factory.ts
 init_dist();
-var import_rxjs2 = __toESM(require_cjs(), 1);
 import * as fs45 from "fs";
 import * as path37 from "path";
 import * as os6 from "os";
-import { HttpContentTransport as HttpContentTransport5, HttpTransport as HttpTransport5 } from "@semiont/api-client";
 import {
-  accessToken as toAccessToken,
-  baseUrl as toBaseUrl
+  accessToken as toAccessToken
 } from "@semiont/core";
 var TOKEN_CACHE_TTL_MS = 864e5;
 function authStoreDir() {
@@ -35688,8 +35767,7 @@ function isTokenValid(cache) {
   return Date.now() < cachedAt + TOKEN_CACHE_TTL_MS;
 }
 async function acquireToken(rawBusUrl, emailStr, passwordStr) {
-  const transport = new HttpTransport5({ baseUrl: toBaseUrl(rawBusUrl) });
-  const semiont = new SemiontClient(transport, new HttpContentTransport5(transport));
+  const semiont = SemiontClient.fromHttp({ baseUrl: rawBusUrl });
   const authResult = await semiont.auth.password(emailStr, passwordStr);
   const cache = {
     bus: rawBusUrl,
@@ -35709,9 +35787,7 @@ Run: semiont login --bus ${rawBusUrl}`
     );
   }
   const token = toAccessToken(cached.token);
-  const token$ = new import_rxjs2.BehaviorSubject(token);
-  const transport = new HttpTransport5({ baseUrl: toBaseUrl(rawBusUrl), token$ });
-  const semiont = new SemiontClient(transport, new HttpContentTransport5(transport));
+  const semiont = SemiontClient.fromHttp({ baseUrl: rawBusUrl, token });
   return { semiont, token };
 }
 function resolveBusUrl(busFlag) {
@@ -35754,7 +35830,14 @@ var YieldOptionsSchema = ApiOptionsSchema.extend({
   // Delegate mode optional
   title: external_exports.string().optional(),
   prompt: external_exports.string().optional(),
+  /** BCP-47 tag — language the *generated resource* is written in. */
   language: external_exports.string().optional(),
+  /**
+   * BCP-47 tag — language of the *source resource* the annotation lives on.
+   * Goes into the prompt so the LLM understands embedded source-context
+   * snippets correctly when source ≠ target language.
+   */
+  sourceLanguage: external_exports.string().optional(),
   temperature: external_exports.coerce.number().min(0).max(1).optional(),
   maxTokens: external_exports.coerce.number().int().min(100).max(4e3).optional(),
   contextWindow: external_exports.coerce.number().int().min(100).max(5e3).default(1e3)
@@ -35781,18 +35864,20 @@ async function runDelegate(semiont, options) {
   const rawAnnotationId = options.annotation;
   const rId = toResourceId(rawResourceId);
   const aId = toAnnotationId(rawAnnotationId);
-  const context = await (0, import_rxjs3.lastValueFrom)(
-    semiont.gather.annotation(aId, rId, { contextWindow: options.contextWindow })
+  const context = await (0, import_rxjs2.lastValueFrom)(
+    semiont.gather.annotation(rId, aId, { contextWindow: options.contextWindow })
   );
   if (!options.quiet) process.stderr.write(`Generating from annotation ${rawAnnotationId}...
 `);
-  const final = await (0, import_rxjs3.lastValueFrom)(
+  const ctxSourceLanguage = context?.metadata?.language;
+  const final = await (0, import_rxjs2.lastValueFrom)(
     semiont.yield.fromAnnotation(rId, aId, {
       title: options.title ?? rawAnnotationId,
       storageUri: options.storageUri,
       context,
       prompt: options.prompt,
       language: options.language,
+      sourceLanguage: options.sourceLanguage ?? ctxSourceLanguage,
       temperature: options.temperature,
       maxTokens: options.maxTokens
     })
@@ -35930,7 +36015,7 @@ init_command_definition();
 init_base_options_schema();
 init_cli_logger();
 import { resourceId as toResourceId2 } from "@semiont/core";
-var import_rxjs4 = __toESM(require_cjs(), 1);
+var import_rxjs3 = __toESM(require_cjs(), 1);
 var MOTIVATIONS = ["highlighting", "commenting", "tagging", "assessing", "linking"];
 var CONTEXT_WINDOW = 32;
 var MarkOptionsSchema = ApiOptionsSchema.extend({
@@ -35963,6 +36048,19 @@ var MarkOptionsSchema = ApiOptionsSchema.extend({
   instructions: external_exports.string().optional(),
   density: external_exports.coerce.number().int().optional(),
   tone: external_exports.enum(["scholarly", "explanatory", "conversational", "technical", "analytical", "critical", "balanced", "constructive"]).optional(),
+  /**
+   * BCP-47 tag for the annotation body language. Tells the LLM what language
+   * to write generated body text in (comment/assessment) and stamps the
+   * `language` field on every TextualBody the worker produces. Independent
+   * from --source-language; this one is about the *output*.
+   */
+  language: external_exports.string().optional(),
+  /**
+   * BCP-47 tag for the source-resource language. Goes into the prompt so the
+   * LLM analyzes non-English source correctly. Independent from --language;
+   * this one is about the *input*.
+   */
+  sourceLanguage: external_exports.string().optional(),
   // ── Delegate mode: linking ─────────────────────────────────────────────
   entityType: external_exports.array(external_exports.string()).default([]),
   includeDescriptive: external_exports.boolean().default(false),
@@ -36068,10 +36166,10 @@ function buildBody(options) {
 async function runDelegate2(semiont, options) {
   const rawResourceId = options.resourceIdArr[0];
   const rId = toResourceId2(rawResourceId);
-  const { motivation, instructions, density, tone, entityType: entityType2, includeDescriptive, schemaId, category } = options;
+  const { motivation, instructions, density, tone, entityType: entityType2, includeDescriptive, schemaId, category, language, sourceLanguage } = options;
   if (!options.quiet) process.stderr.write(`Annotating ${motivation} on ${rawResourceId}...
 `);
-  const final = await (0, import_rxjs4.lastValueFrom)(
+  const final = await (0, import_rxjs3.lastValueFrom)(
     semiont.mark.assist(rId, motivation, {
       instructions,
       density,
@@ -36079,7 +36177,9 @@ async function runDelegate2(semiont, options) {
       entityTypes: entityType2,
       includeDescriptiveReferences: includeDescriptive,
       schemaId,
-      categories: category
+      categories: category,
+      language,
+      sourceLanguage
     })
   );
   const r = (final.kind === "complete" ? final.data.result : void 0) ?? {};
@@ -36116,7 +36216,7 @@ async function runMark(options) {
     target,
     body
   };
-  const { annotationId: annotationId3 } = await semiont.mark.annotation(resourceId3, request);
+  const { annotationId: annotationId3 } = await semiont.mark.annotation(request);
   if (!options.quiet) printSuccess(`Marked: ${rawResourceId} \u2192 ${annotationId3}`);
   return {
     command: "mark",
@@ -36256,7 +36356,7 @@ var markCmd = new CommandBuilder().name("mark").description(
 
 // src/core/commands/gather.ts
 init_zod();
-var import_rxjs5 = __toESM(require_cjs(), 1);
+var import_rxjs4 = __toESM(require_cjs(), 1);
 init_command_definition();
 init_base_options_schema();
 import { resourceId as toResourceId3, annotationId as toAnnotationId2 } from "@semiont/core";
@@ -36283,8 +36383,8 @@ async function runGather(options) {
     }
     const rid = toResourceId3(rawResourceId);
     const aid = toAnnotationId2(rawAnnotationId);
-    result = await (0, import_rxjs5.lastValueFrom)(
-      semiont.gather.annotation(aid, rid, { contextWindow: options.contextWindow })
+    result = await (0, import_rxjs4.lastValueFrom)(
+      semiont.gather.annotation(rid, aid, { contextWindow: options.contextWindow })
     );
   } else {
     throw new Error(`Unknown subcommand: ${subcommand}. Use 'resource' or 'annotation'.`);
@@ -36326,7 +36426,7 @@ var gatherCmd = new CommandBuilder().name("gather").description("Fetch LLM-optim
 
 // src/core/commands/match.ts
 init_zod();
-var import_rxjs6 = __toESM(require_cjs(), 1);
+var import_rxjs5 = __toESM(require_cjs(), 1);
 init_command_definition();
 init_base_options_schema();
 import { resourceId as toResourceId4, annotationId as toAnnotationId3 } from "@semiont/core";
@@ -36344,13 +36444,13 @@ async function runMatch(options) {
   const annotationId3 = toAnnotationId3(rawAnnotationId);
   const rawBusUrl = resolveBusUrl(options.bus);
   const { semiont } = loadCachedClient(rawBusUrl);
-  let context = await (0, import_rxjs6.lastValueFrom)(
-    semiont.gather.annotation(annotationId3, resourceId3, { contextWindow: options.contextWindow })
+  let context = await (0, import_rxjs5.lastValueFrom)(
+    semiont.gather.annotation(resourceId3, annotationId3, { contextWindow: options.contextWindow })
   );
   if (options.userHint) {
     context = { ...context, userHint: options.userHint };
   }
-  const searchResult = await (0, import_rxjs6.firstValueFrom)(
+  const searchResult = await (0, import_rxjs5.firstValueFrom)(
     semiont.match.search(resourceId3, annotationId3, context, {
       limit: options.limit,
       useSemanticScoring: !options.noSemantic
@@ -36499,7 +36599,7 @@ var beckonCmd = new CommandBuilder().name("beckon").description(
 
 // src/core/commands/browse.ts
 init_zod();
-var import_rxjs7 = __toESM(require_cjs(), 1);
+var import_rxjs6 = __toESM(require_cjs(), 1);
 var import_operators2 = __toESM(require_operators(), 1);
 init_command_definition();
 init_base_options_schema();
@@ -36548,15 +36648,15 @@ async function runBrowse(options) {
   if (subcommand === "resources") {
     const filters = { limit: options.limit };
     if (options.search) filters.search = options.search;
-    const items = await (0, import_rxjs7.firstValueFrom)(semiont.browse.resources(filters).pipe((0, import_operators2.filter)(defined)));
+    const items = await (0, import_rxjs6.firstValueFrom)(semiont.browse.resources(filters).pipe((0, import_operators2.filter)(defined)));
     result = items;
     label = `${items.length} resource${items.length !== 1 ? "s" : ""} found`;
   } else if (subcommand === "resource") {
     const id = toResourceId6(rawResourceId);
-    const resourceData = await (0, import_rxjs7.firstValueFrom)(semiont.browse.resource(id).pipe((0, import_operators2.filter)(defined)));
+    const resourceData = await (0, import_rxjs6.firstValueFrom)(semiont.browse.resource(id).pipe((0, import_operators2.filter)(defined)));
     if (options.annotations || options.references) {
-      const annotations = options.annotations ? await (0, import_rxjs7.firstValueFrom)(semiont.browse.annotations(id).pipe((0, import_operators2.filter)(defined))) : void 0;
-      const referencedBy = options.references ? await (0, import_rxjs7.firstValueFrom)(semiont.browse.referencedBy(id).pipe((0, import_operators2.filter)(defined))) : void 0;
+      const annotations = options.annotations ? await (0, import_rxjs6.firstValueFrom)(semiont.browse.annotations(id).pipe((0, import_operators2.filter)(defined))) : void 0;
+      const referencedBy = options.references ? await (0, import_rxjs6.firstValueFrom)(semiont.browse.referencedBy(id).pipe((0, import_operators2.filter)(defined))) : void 0;
       result = {
         ...resourceData,
         ...annotations ? { annotations } : {},
@@ -36569,11 +36669,11 @@ async function runBrowse(options) {
   } else if (subcommand === "annotation") {
     const resourceId3 = toResourceId6(rawResourceId);
     const annotationId3 = toAnnotationId5(rawAnnotationId);
-    result = await (0, import_rxjs7.firstValueFrom)(semiont.browse.annotation(resourceId3, annotationId3).pipe((0, import_operators2.filter)(defined)));
+    result = await (0, import_rxjs6.firstValueFrom)(semiont.browse.annotation(resourceId3, annotationId3).pipe((0, import_operators2.filter)(defined)));
     label = `${rawAnnotationId}: annotation on ${rawResourceId}`;
   } else if (subcommand === "references") {
     const id = toResourceId6(rawResourceId);
-    const refs = await (0, import_rxjs7.firstValueFrom)(semiont.browse.referencedBy(id).pipe((0, import_operators2.filter)(defined)));
+    const refs = await (0, import_rxjs6.firstValueFrom)(semiont.browse.referencedBy(id).pipe((0, import_operators2.filter)(defined)));
     result = refs;
     label = `${refs.length} resource${refs.length !== 1 ? "s" : ""} reference ${rawResourceId}`;
   } else if (subcommand === "events") {
@@ -36593,7 +36693,7 @@ async function runBrowse(options) {
     const entries = data?.entries ?? [];
     label = `${entries.length} entr${entries.length !== 1 ? "ies" : "y"} in ${dirPath ?? "/"}`;
   } else {
-    const tags = await (0, import_rxjs7.firstValueFrom)(semiont.browse.entityTypes().pipe((0, import_operators2.filter)(defined)));
+    const tags = await (0, import_rxjs6.firstValueFrom)(semiont.browse.entityTypes().pipe((0, import_operators2.filter)(defined)));
     result = tags;
     label = `${tags.length} entity type${tags.length !== 1 ? "s" : ""}`;
   }
@@ -36668,7 +36768,7 @@ init_zod();
 init_command_definition();
 init_base_options_schema();
 import { resourceId as toResourceId7 } from "@semiont/core";
-import { createActorVM as createActorVM3 } from "@semiont/api-client";
+import { createActorStateUnit } from "@semiont/api-client";
 var ListenOptionsSchema = ApiOptionsSchema.extend({
   args: external_exports.array(external_exports.string()).default([])
 }).superRefine((val, ctx) => {
@@ -36694,7 +36794,7 @@ var ALL_EVENT_TYPES = [
   "mark:unarchived",
   "mark:entity-tag-added",
   "mark:entity-tag-removed",
-  "mark:entity-type-added",
+  "frame:entity-type-added",
   "job:started",
   "job:progress",
   "job:completed",
@@ -36709,7 +36809,7 @@ async function runListen(options) {
   let eventCount = 0;
   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 = createActorVM3({
+  const actor = createActorStateUnit({
     baseUrl: rawBusUrl,
     token,
     channels: isResourceScoped ? [] : [...ALL_EVENT_TYPES]
@@ -37982,7 +38082,7 @@ async function generateGlobalHelp() {
 }
 
 // src/cli.ts
-var VERSION = "0.5.1";
+var VERSION = "0.5.2";
 function printVersion() {
   console.log(`Semiont CLI v${VERSION}`);
 }