@semiont/backend 0.4.21 → 0.5.0

package/dist/index.js

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 import winston from 'winston';
+import { recordSubscriberConnect, recordSubscriberDisconnect, withTraceparent, withSpan, recordBusEmit, SpanKind, injectTraceparent, getLogTraceContext } from '@semiont/observability';
 import { z } from 'zod';
 import jwt from 'jsonwebtoken';
-import { email, userId, googleCredential, RESOURCE_BROADCAST_TYPES, PERSISTED_EVENT_TYPES, EventBus, accessToken, resourceId, jobId, entityType, annotationId, didToAgent, assembleAnnotation, CHANNEL_SCHEMAS, userToDid } from '@semiont/core';
+import { email, userId, googleCredential, EventBus, accessToken, resourceId, CHANNEL_SCHEMAS, userToDid, busLog, getPrimaryMediaType, decodeRepresentation } from '@semiont/core';
 import { cors } from 'hono/cors';
 import { serve } from '@hono/node-server';
 import { Hono } from 'hono';
 import { swaggerUI } from '@hono/swagger-ui';
 import { SemiontProject, loadEnvironmentConfig } from '@semiont/core/node';
-import { exportBackup, importBackup, readEntityTypesProjection, exportLinkedData, importLinkedData, startMakeMeaning, AnnotationContext, ResourceOperations, ResourceContext } from '@semiont/make-meaning';
-import crypto2, { randomUUID } from 'crypto';
+import { exportBackup, importBackup, readEntityTypesProjection, exportLinkedData, importLinkedData, startMakeMeaning, ResourceOperations, ResourceContext } from '@semiont/make-meaning';
 import { PrismaClient } from '@prisma/client';
 import { PrismaPg } from '@prisma/adapter-pg';
 import { setCookie, deleteCookie, getCookie } from 'hono/cookie';
@@ -22,6 +22,7 @@ import { streamSSE } from 'hono/streaming';
 import * as fs from 'fs';
 import * as path from 'path';
 import { fileURLToPath } from 'url';
+import { randomUUID } from 'crypto';
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -88,12 +89,14 @@ function createFormat(config2) {
     return winston.format.combine(
       winston.format.timestamp(),
       winston.format.errors({ stack: true }),
+      traceContextFormat,
       winston.format.json()
     );
   }
   return winston.format.combine(
     winston.format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }),
     winston.format.errors({ stack: true }),
+    traceContextFormat,
     winston.format.printf(({ level, message, timestamp, ...meta }) => {
       const metaStr = Object.keys(meta).length > 0 ? ` ${JSON.stringify(meta)}` : "";
       return `${timestamp} [${level.toUpperCase()}] ${message}${metaStr}`;
@@ -152,9 +155,17 @@ function createChildLogger(context) {
 function createComponentLogger(component) {
   return createChildLogger({ component });
 }
-var loggerInstance;
+var traceContextFormat, loggerInstance;
 var init_logger = __esm({
   "src/logger.ts"() {
+    traceContextFormat = winston.format((info) => {
+      const trace = getLogTraceContext();
+      if (trace) {
+        info.trace_id = trace.trace_id;
+        info.span_id = trace.span_id;
+      }
+      return info;
+    })();
     loggerInstance = null;
   }
 });
@@ -267,11 +278,11 @@ var init_jwt = __esm({
           throw error;
         }
       }
-      static generateMediaToken(resourceId7, userId6) {
-        const payload = { purpose: "media", sub: resourceId7, userId: userId6 };
+      static generateMediaToken(resourceId2, userId2) {
+        const payload = { purpose: "media", sub: resourceId2, userId: userId2 };
         return jwt.sign(payload, this.getSecret(), { expiresIn: "5m" });
       }
-      static verifyMediaToken(token, resourceId7) {
+      static verifyMediaToken(token, resourceId2) {
         let decoded;
         try {
           decoded = jwt.verify(token, this.getSecret());
@@ -280,10 +291,10 @@ var init_jwt = __esm({
           throw new Error("Invalid media token");
         }
         if (decoded["purpose"] !== "media") throw new Error("Invalid media token");
-        if (decoded["sub"] !== resourceId7) throw new Error("Media token resource mismatch");
+        if (decoded["sub"] !== resourceId2) throw new Error("Media token resource mismatch");
       }
-      static isAllowedDomain(email2) {
-        const parts = email2.split("@");
+      static isAllowedDomain(email) {
+        const parts = email.split("@");
         if (parts.length !== 2 || !parts[0] || !parts[1]) {
           return false;
         }
@@ -9992,290 +10003,6 @@ function makeMeaningConfigFrom(config2) {
 
 // src/index.ts
 init_logger();
-
-// ../../node_modules/nanoid/url-alphabet/index.js
-var urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
-
-// ../../node_modules/nanoid/index.js
-var POOL_SIZE_MULTIPLIER = 128;
-var pool;
-var poolOffset;
-var fillPool = (bytes) => {
-  if (!pool || pool.length < bytes) {
-    pool = Buffer.allocUnsafe(bytes * POOL_SIZE_MULTIPLIER);
-    crypto2.randomFillSync(pool);
-    poolOffset = 0;
-  } else if (poolOffset + bytes > pool.length) {
-    crypto2.randomFillSync(pool);
-    poolOffset = 0;
-  }
-  poolOffset += bytes;
-};
-var nanoid = (size = 21) => {
-  fillPool(size |= 0);
-  let id = "";
-  for (let i = poolOffset - size; i < poolOffset; i++) {
-    id += urlAlphabet[pool[i] & 63];
-  }
-  return id;
-};
-
-// src/handlers/job-commands.ts
-init_logger();
-var logger = () => getLogger().child({ component: "job-commands" });
-function parseDidUser(did) {
-  const parts = did.split(":");
-  const usersIdx = parts.indexOf("users");
-  const domain = parts.slice(2, usersIdx).join(":");
-  const email2 = decodeURIComponent(parts.slice(usersIdx + 1).join(":"));
-  return { userId: did, email: email2, domain };
-}
-function registerJobCommandHandlers(eventBus2, jobQueue) {
-  eventBus2.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-${nanoid()}`),
-          type: jobType,
-          userId: userId(_userId),
-          userName: user.email,
-          userEmail: user.email,
-          userDomain: user.domain,
-          created: (/* @__PURE__ */ new Date()).toISOString(),
-          retryCount: 0,
-          maxRetries: jobType === "generation" ? 3 : 1
-        },
-        params: {
-          resourceId: resourceId(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 });
-      eventBus2.get("job:created").next({
-        correlationId,
-        response: { jobId: job.metadata.id }
-      });
-    } catch (error) {
-      logger().error("job:create failed", { correlationId, error: error.message });
-      eventBus2.get("job:create-failed").next({
-        correlationId,
-        message: error.message
-      });
-    }
-  });
-  eventBus2.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");
-      eventBus2.get("job:claimed").next({
-        correlationId,
-        response: runningJob
-      });
-    } catch (error) {
-      eventBus2.get("job:claim-failed").next({
-        correlationId,
-        message: error.message
-      });
-    }
-  });
-}
-
-// src/handlers/annotation-lookups.ts
-init_logger();
-var logger2 = () => getLogger().child({ component: "annotation-lookups" });
-function registerAnnotationLookupHandlers(eventBus2, kb, gatherer) {
-  eventBus2.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(
-        annotationId(annId),
-        resourceId(resId),
-        contextBefore,
-        contextAfter,
-        kb
-      );
-      eventBus2.get("browse:annotation-context-result").next({
-        correlationId,
-        response
-      });
-    } catch (error) {
-      logger2().warn("annotation-context failed", { correlationId, error: error.message });
-      eventBus2.get("browse:annotation-context-failed").next({
-        correlationId,
-        message: error.message
-      });
-    }
-  });
-  eventBus2.get("gather:summary-requested").subscribe(async (command) => {
-    const { correlationId } = command;
-    const annId = command.annotationId;
-    const resId = command.resourceId;
-    try {
-      const response = await gatherer.generateAnnotationSummary(
-        annotationId(annId),
-        resourceId(resId)
-      );
-      eventBus2.get("gather:summary-result").next({
-        correlationId,
-        response
-      });
-    } catch (error) {
-      logger2().warn("gather:summary failed", { correlationId, error: error.message });
-      eventBus2.get("gather:summary-failed").next({
-        correlationId,
-        message: error.message
-      });
-    }
-  });
-}
-
-// src/handlers/annotation-assembly.ts
-init_logger();
-var logger3 = () => getLogger().child({ component: "annotation-assembly" });
-function registerAnnotationAssemblyHandler(eventBus2) {
-  const inflight = /* @__PURE__ */ new Map();
-  eventBus2.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 = didToAgent(_userId);
-      const { annotation } = assembleAnnotation(request, agent);
-      inflight.set(cid, { annotationId: annotation.id });
-      eventBus2.get("mark:create").next({
-        correlationId: cid,
-        annotation,
-        userId: userId(_userId),
-        resourceId: resourceId(resId)
-      });
-      logger3().info("Annotation assembled, awaiting persistence", {
-        annotationId: annotation.id,
-        correlationId: cid
-      });
-    } catch (error) {
-      logger3().warn("mark:create-request failed during assembly", {
-        correlationId: cid,
-        error: error.message
-      });
-      eventBus2.get("mark:create-failed").next({
-        correlationId: cid,
-        message: error.message
-      });
-    }
-  });
-  eventBus2.get("mark:added").subscribe((event) => {
-    const cid = event.metadata?.correlationId;
-    if (!cid) return;
-    const pending = inflight.get(cid);
-    if (!pending) return;
-    inflight.delete(cid);
-    eventBus2.get("mark:create-ok").next({
-      correlationId: cid,
-      response: { annotationId: pending.annotationId }
-    });
-    logger3().info("Annotation persisted", { annotationId: pending.annotationId, correlationId: cid });
-  });
-  eventBus2.get("mark:create-failed").subscribe((event) => {
-    const cid = event.correlationId;
-    if (!cid || !inflight.has(cid)) return;
-    inflight.delete(cid);
-  });
-}
-
-// src/handlers/bind-update-body.ts
-init_logger();
-var logger4 = () => getLogger().child({ component: "bind-update-body" });
-function registerBindUpdateBodyHandler(eventBus2) {
-  const inflight = /* @__PURE__ */ new Set();
-  eventBus2.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);
-      eventBus2.get("mark:update-body").next({
-        correlationId: cid,
-        annotationId: annotationId(annId),
-        userId: userId(_userId),
-        resourceId: resourceId(resId),
-        operations
-      });
-      logger4().info("Bind update-body forwarded to mark:update-body, awaiting persistence", {
-        annotationId: annId,
-        correlationId: cid
-      });
-    } catch (error) {
-      logger4().warn("bind:update-body failed before forwarding", {
-        correlationId: cid,
-        error: error.message
-      });
-      eventBus2.get("bind:body-update-failed").next({
-        correlationId: cid,
-        message: error.message
-      });
-    }
-  });
-  eventBus2.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;
-    eventBus2.get("bind:body-updated").next({
-      correlationId: cid,
-      annotationId: annId
-    });
-    logger4().info("Bind body-updated confirmed", { annotationId: annId, correlationId: cid });
-  });
-  eventBus2.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";
-    eventBus2.get("bind:body-update-failed").next({
-      correlationId: cid,
-      message
-    });
-    logger4().warn("Bind body-update failed after forwarding", { correlationId: cid, message });
-  });
-}
 var rootRouter = new Hono();
 rootRouter.get("/", (c) => {
   const config2 = c.get("config");
@@ -11515,27 +11242,6 @@ var openapi_default = {
           "newItem"
         ]
       },
-      BeckonResponse: {
-        type: "object",
-        properties: {
-          participant: {
-            type: "string",
-            description: "Username or agent identifier that was beckoned"
-          },
-          resourceId: {
-            type: "string",
-            description: "Resource the attention was directed at"
-          },
-          annotationId: {
-            type: "string",
-            description: "Annotation the attention was directed at (if provided)"
-          }
-        },
-        required: [
-          "participant",
-          "resourceId"
-        ]
-      },
       CloneResourceWithTokenResponse: {
         type: "object",
         properties: {
@@ -13637,20 +13343,6 @@ var openapi_default = {
           "operations"
         ]
       },
-      UpdateResourceRequest: {
-        type: "object",
-        properties: {
-          entityTypes: {
-            type: "array",
-            items: {
-              type: "string"
-            }
-          },
-          archived: {
-            type: "boolean"
-          }
-        }
-      },
       UpdateUserRequest: {
         type: "object",
         properties: {
@@ -13883,6 +13575,10 @@ var openapi_default = {
         type: "object",
         description: "Command payload sent on the bind:update-body bus channel to modify annotation bodies.",
         properties: {
+          _userId: {
+            type: "string",
+            description: "Authenticated user's DID, injected by the /bus/emit gateway. Clients do not set this."
+          },
           correlationId: {
             type: "string",
             description: "Client-supplied id used to match this command to its result event(s) on the events-stream. Generated by the route handler if absent."
@@ -13895,10 +13591,6 @@ var openapi_default = {
             type: "string",
             description: "Branded ResourceId of the resource the annotation belongs to"
           },
-          userId: {
-            type: "string",
-            description: "Branded UserId of the user performing the update"
-          },
           operations: {
             type: "array",
             items: {
@@ -14935,10 +14627,11 @@ var openapi_default = {
         type: "object",
         description: "Command to mark a job as complete",
         properties: {
-          resourceId: {
-            type: "string"
+          _userId: {
+            type: "string",
+            description: "Authenticated user's DID, injected by the /bus/emit gateway. Clients do not set this."
           },
-          userId: {
+          resourceId: {
             type: "string"
           },
           jobId: {
@@ -14957,7 +14650,6 @@ var openapi_default = {
         },
         required: [
           "resourceId",
-          "userId",
           "jobId",
           "jobType"
         ]
@@ -14966,10 +14658,11 @@ var openapi_default = {
         type: "object",
         description: "Command to mark a job as failed",
         properties: {
-          resourceId: {
-            type: "string"
+          _userId: {
+            type: "string",
+            description: "Authenticated user's DID, injected by the /bus/emit gateway. Clients do not set this."
           },
-          userId: {
+          resourceId: {
             type: "string"
           },
           jobId: {
@@ -14988,7 +14681,6 @@ var openapi_default = {
         },
         required: [
           "resourceId",
-          "userId",
           "jobId",
           "jobType",
           "error"
@@ -15136,12 +14828,17 @@ var openapi_default = {
           },
           resourceId: {
             type: "string"
+          },
+          userId: {
+            type: "string",
+            description: "DID of the user who initiated the job (audit)."
           }
         },
         required: [
           "jobId",
           "jobType",
-          "resourceId"
+          "resourceId",
+          "userId"
         ]
       },
       JobReferenceAnnotationResult: {
@@ -15171,10 +14868,11 @@ var openapi_default = {
         type: "object",
         description: "Command to report progress on a job",
         properties: {
-          resourceId: {
-            type: "string"
+          _userId: {
+            type: "string",
+            description: "Authenticated user's DID, injected by the /bus/emit gateway. Clients do not set this."
           },
-          userId: {
+          resourceId: {
             type: "string"
           },
           jobId: {
@@ -15196,7 +14894,6 @@ var openapi_default = {
         },
         required: [
           "resourceId",
-          "userId",
           "jobId",
           "jobType",
           "percentage"
@@ -15229,10 +14926,11 @@ var openapi_default = {
         type: "object",
         description: "Command to start a job",
         properties: {
-          resourceId: {
-            type: "string"
+          _userId: {
+            type: "string",
+            description: "Authenticated user's DID, injected by the /bus/emit gateway. Clients do not set this."
           },
-          userId: {
+          resourceId: {
             type: "string"
           },
           jobId: {
@@ -15248,7 +14946,6 @@ var openapi_default = {
         },
         required: [
           "resourceId",
-          "userId",
           "jobId",
           "jobType"
         ]
@@ -15316,21 +15013,22 @@ var openapi_default = {
           tag: {
             type: "string"
           },
-          userId: {
-            type: "string"
+          _userId: {
+            type: "string",
+            description: "Authenticated user's DID, injected by the /bus/emit gateway. Clients do not set this."
           }
         },
         required: [
-          "tag",
-          "userId"
+          "tag"
         ]
       },
       MarkArchiveCommand: {
         type: "object",
         description: "Bus command to archive a resource and optionally remove its file.",
         properties: {
-          userId: {
-            type: "string"
+          _userId: {
+            type: "string",
+            description: "Authenticated user's DID, injected by the /bus/emit gateway. Clients do not set this."
           },
           resourceId: {
             type: "string"
@@ -15427,6 +15125,10 @@ var openapi_default = {
         type: "object",
         description: "Bus command to create an annotation on a resource.",
         properties: {
+          _userId: {
+            type: "string",
+            description: "Authenticated user's DID, injected by the /bus/emit gateway. Clients do not set this."
+          },
           correlationId: {
             type: "string",
             description: "Optional correlation id threaded from the originating mark:create-request. Propagated into event metadata by Stower so annotation-assembly can emit mark:create-ok after persistence completes."
@@ -15434,16 +15136,12 @@ var openapi_default = {
           annotation: {
             $ref: "#/components/schemas/Annotation"
           },
-          userId: {
-            type: "string"
-          },
           resourceId: {
             type: "string"
           }
         },
         required: [
           "annotation",
-          "userId",
           "resourceId"
         ]
       },
@@ -15483,10 +15181,11 @@ var openapi_default = {
         type: "object",
         description: "Bus command to delete an annotation.",
         properties: {
-          annotationId: {
-            type: "string"
+          _userId: {
+            type: "string",
+            description: "Authenticated user's DID, injected by the /bus/emit gateway. Clients do not set this."
           },
-          userId: {
+          annotationId: {
             type: "string"
           },
           resourceId: {
@@ -15653,8 +15352,9 @@ var openapi_default = {
         type: "object",
         description: "Bus command to unarchive a previously archived resource.",
         properties: {
-          userId: {
-            type: "string"
+          _userId: {
+            type: "string",
+            description: "Authenticated user's DID, injected by the /bus/emit gateway. Clients do not set this."
           },
           resourceId: {
             type: "string"
@@ -15671,6 +15371,10 @@ var openapi_default = {
         type: "object",
         description: "Bus command to update an annotation's body with patch operations.",
         properties: {
+          _userId: {
+            type: "string",
+            description: "Authenticated user's DID, injected by the /bus/emit gateway. Clients do not set this."
+          },
           correlationId: {
             type: "string",
             description: "Correlation id threaded from the originating route through to event metadata. Lets the events-stream deliver matched results to the client that initiated the bind."
@@ -15678,9 +15382,6 @@ var openapi_default = {
           annotationId: {
             type: "string"
           },
-          userId: {
-            type: "string"
-          },
           resourceId: {
             type: "string"
           },
@@ -15703,7 +15404,6 @@ var openapi_default = {
         },
         required: [
           "annotationId",
-          "userId",
           "resourceId",
           "operations"
         ]
@@ -15715,8 +15415,9 @@ var openapi_default = {
           resourceId: {
             type: "string"
           },
-          userId: {
-            type: "string"
+          _userId: {
+            type: "string",
+            description: "Authenticated user's DID, injected by the /bus/emit gateway. Clients do not set this."
           },
           currentEntityTypes: {
             type: "array",
@@ -15733,7 +15434,6 @@ var openapi_default = {
         },
         required: [
           "resourceId",
-          "userId",
           "currentEntityTypes",
           "updatedEntityTypes"
         ]
@@ -15946,6 +15646,10 @@ var openapi_default = {
         type: "object",
         description: "Bus command to create a yielded resource in the knowledge base.",
         properties: {
+          _userId: {
+            type: "string",
+            description: "Authenticated user's DID, injected by the /bus/emit gateway. Clients do not set this."
+          },
           name: {
             type: "string"
           },
@@ -15961,9 +15665,6 @@ var openapi_default = {
           format: {
             $ref: "#/components/schemas/ContentFormat"
           },
-          userId: {
-            type: "string"
-          },
           language: {
             type: "string"
           },
@@ -16015,8 +15716,7 @@ var openapi_default = {
           "storageUri",
           "contentChecksum",
           "byteSize",
-          "format",
-          "userId"
+          "format"
         ]
       },
       YieldCreateOk: {
@@ -16051,23 +15751,23 @@ var openapi_default = {
         type: "object",
         description: "Bus command to move (rename) a yielded resource.",
         properties: {
+          _userId: {
+            type: "string",
+            description: "Authenticated user's DID, injected by the /bus/emit gateway. Clients do not set this."
+          },
           fromUri: {
             type: "string"
           },
           toUri: {
             type: "string"
           },
-          userId: {
-            type: "string"
-          },
           noGit: {
             type: "boolean"
           }
         },
         required: [
           "fromUri",
-          "toUri",
-          "userId"
+          "toUri"
         ]
       },
       YieldRequestCommand: {
@@ -16125,6 +15825,10 @@ var openapi_default = {
         type: "object",
         description: "Bus command to update a yielded resource's storage content.",
         properties: {
+          _userId: {
+            type: "string",
+            description: "Authenticated user's DID, injected by the /bus/emit gateway. Clients do not set this."
+          },
           resourceId: {
             type: "string"
           },
@@ -16137,9 +15841,6 @@ var openapi_default = {
           byteSize: {
             type: "integer"
           },
-          userId: {
-            type: "string"
-          },
           noGit: {
             type: "boolean"
           }
@@ -16148,8 +15849,7 @@ var openapi_default = {
           "resourceId",
           "storageUri",
           "contentChecksum",
-          "byteSize",
-          "userId"
+          "byteSize"
         ]
       },
       YieldUpdateOk: {
@@ -16293,8 +15993,8 @@ function validateRequestBody(schemaName) {
 // src/auth/oauth.ts
 init_jwt();
 var OAuthService = class {
-  static async verifyGoogleToken(accessToken3) {
-    const response = await fetch(`https://www.googleapis.com/oauth2/v2/userinfo?access_token=${accessToken3}`);
+  static async verifyGoogleToken(accessToken2) {
+    const response = await fetch(`https://www.googleapis.com/oauth2/v2/userinfo?access_token=${accessToken2}`);
     if (!response.ok) {
       throw new Error("Failed to verify Google token");
     }
@@ -16363,8 +16063,8 @@ var OAuthService = class {
       isAdmin: user.isAdmin
     };
     const token = accessToken(JWTService.generateToken(jwtPayload, "1h"));
-    const refreshToken2 = JWTService.generateToken(jwtPayload, "30d");
-    return { user, token, refreshToken: refreshToken2, isNewUser };
+    const refreshToken = JWTService.generateToken(jwtPayload, "30d");
+    return { user, token, refreshToken, isNewUser };
   }
   static async getUserFromToken(token) {
     const payload = JWTService.verifyToken(token);
@@ -16380,10 +16080,10 @@ var OAuthService = class {
     }
     return user;
   }
-  static async acceptTerms(userId6) {
+  static async acceptTerms(userId2) {
     const prisma2 = DatabaseConnection.getClient();
     const user = await prisma2.user.update({
-      where: { id: userId6 },
+      where: { id: userId2 },
       data: {
         termsAcceptedAt: /* @__PURE__ */ new Date()
       }
@@ -16396,19 +16096,19 @@ var OAuthService = class {
 init_jwt();
 var MEDIA_TOKEN_PATH = /^\/api\/resources\/([^/]+)$/;
 var authMiddleware = async (c, next) => {
-  const logger6 = c.get("logger");
+  const logger2 = c.get("logger");
   if (c.req.method === "GET") {
     const mediaTokenParam = c.req.query("token");
     const match = c.req.path.match(MEDIA_TOKEN_PATH);
-    const resourceId7 = match?.[1];
-    if (mediaTokenParam && resourceId7) {
+    const resourceId2 = match?.[1];
+    if (mediaTokenParam && resourceId2) {
       try {
-        JWTService.verifyMediaToken(mediaTokenParam, resourceId7);
+        JWTService.verifyMediaToken(mediaTokenParam, resourceId2);
         c.set("token", mediaTokenParam);
         await next();
         return;
       } catch (error) {
-        logger6.warn("Authentication failed: Invalid media token", {
+        logger2.warn("Authentication failed: Invalid media token", {
           type: "auth_failed",
           reason: "invalid_media_token",
           path: c.req.path,
@@ -16426,7 +16126,7 @@ var authMiddleware = async (c, next) => {
     tokenStr = getCookie(c, "semiont-token");
   }
   if (!tokenStr) {
-    logger6.warn("Authentication failed: No token", {
+    logger2.warn("Authentication failed: No token", {
       type: "auth_failed",
       reason: "missing_token",
       path: c.req.path,
@@ -16438,7 +16138,7 @@ var authMiddleware = async (c, next) => {
     const user = await OAuthService.getUserFromToken(accessToken(tokenStr));
     c.set("user", user);
     c.set("token", tokenStr);
-    logger6.debug("Authentication successful", {
+    logger2.debug("Authentication successful", {
       type: "auth_success",
       userId: user.id,
       email: user.email,
@@ -16448,7 +16148,7 @@ var authMiddleware = async (c, next) => {
     await next();
     return;
   } catch (error) {
-    logger6.warn("Authentication failed: Invalid token", {
+    logger2.warn("Authentication failed: Invalid token", {
       type: "auth_failed",
       reason: "invalid_token",
       path: c.req.path,
@@ -16548,27 +16248,27 @@ authRouter.post(
   async (c) => {
     try {
       const body = c.get("validatedBody");
-      const { email: email2, password } = body;
-      getRouteLogger2().debug("Password auth attempt", { email: email2 });
+      const { email: email$1, password } = body;
+      getRouteLogger2().debug("Password auth attempt", { email: email$1 });
       const prisma2 = DatabaseConnection.getClient();
       const user = await prisma2.user.findUnique({
-        where: { email: email2 }
+        where: { email: email$1 }
       });
       if (!user) {
-        getRouteLogger2().debug("Password auth failed: user not found", { email: email2 });
+        getRouteLogger2().debug("Password auth failed: user not found", { email: email$1 });
         return c.json({
           error: "Invalid credentials"
         }, 401);
       }
       getRouteLogger2().debug("User found", createSafeLogContext({
-        email: email2,
+        email: email$1,
         provider: user.provider,
         isActive: user.isActive,
         hasPasswordHash: !!user.passwordHash
       }));
       if (user.provider !== "password") {
         getRouteLogger2().debug("Password auth failed: wrong provider", {
-          email: email2,
+          email: email$1,
           provider: user.provider
         });
         return c.json({
@@ -16576,25 +16276,25 @@ authRouter.post(
         }, 400);
       }
       if (!user.passwordHash) {
-        getRouteLogger2().debug("Password auth failed: no password hash", { email: email2 });
+        getRouteLogger2().debug("Password auth failed: no password hash", { email: email$1 });
         return c.json({
           error: "Password not set for this account"
         }, 400);
       }
       const isValid = await argon2.verify(user.passwordHash, password);
       if (!isValid) {
-        getRouteLogger2().debug("Password auth failed: invalid password", { email: email2 });
+        getRouteLogger2().debug("Password auth failed: invalid password", { email: email$1 });
         return c.json({
           error: "Invalid credentials"
         }, 401);
       }
       if (!user.isActive) {
-        getRouteLogger2().debug("Password auth failed: inactive account", { email: email2 });
+        getRouteLogger2().debug("Password auth failed: inactive account", { email: email$1 });
         return c.json({
           error: "Account is not active"
         }, 403);
       }
-      getRouteLogger2().debug("Password auth successful", { email: email2 });
+      getRouteLogger2().debug("Password auth successful", { email: email$1 });
       const jwtPayload = {
         userId: userId(user.id),
         email: email(user.email),
@@ -16604,7 +16304,7 @@ authRouter.post(
         isAdmin: user.isAdmin
       };
       const token = JWTService.generateToken(jwtPayload, "1h");
-      const refreshToken2 = JWTService.generateToken(jwtPayload, "30d");
+      const refreshToken = JWTService.generateToken(jwtPayload, "30d");
       await prisma2.user.update({
         where: { id: user.id },
         data: { lastLogin: /* @__PURE__ */ new Date() }
@@ -16628,7 +16328,7 @@ authRouter.post(
           isAdmin: user.isAdmin
         },
         token,
-        refreshToken: refreshToken2,
+        refreshToken,
         isNewUser: false
       };
       return c.json(response, 200);
@@ -16656,7 +16356,7 @@ authRouter.post(
         }, 400);
       }
       const googleUser = await OAuthService.verifyGoogleToken(googleCredential(access_token));
-      const { user, token, refreshToken: refreshToken2, isNewUser } = await OAuthService.createOrUpdateUser(googleUser);
+      const { user, token, refreshToken, isNewUser } = await OAuthService.createOrUpdateUser(googleUser);
       setCookie(c, "semiont-token", token, {
         httpOnly: true,
         secure: process.env.NODE_ENV === "production",
@@ -16676,7 +16376,7 @@ authRouter.post(
           isAdmin: user.isAdmin
         },
         token,
-        refreshToken: refreshToken2,
+        refreshToken,
         isNewUser
       };
       return c.json(response, 200);
@@ -16696,14 +16396,14 @@ authRouter.post(
   async (c) => {
     getRouteLogger2().debug("Refresh endpoint hit");
     const body = c.get("validatedBody");
-    const { refreshToken: refreshToken2 } = body;
-    if (!refreshToken2) {
+    const { refreshToken } = body;
+    if (!refreshToken) {
       getRouteLogger2().debug("Refresh endpoint: No refresh token provided");
       return c.json({ error: "Refresh token required" }, 401);
     }
     getRouteLogger2().debug("Refresh endpoint: Attempting to verify token");
     try {
-      const payload = JWTService.verifyToken(refreshToken2);
+      const payload = JWTService.verifyToken(refreshToken);
       getRouteLogger2().debug("Refresh endpoint: Token verified", { userId: payload.userId });
       if (!payload.userId) {
         getRouteLogger2().debug("Refresh endpoint: No userId in token payload");
@@ -16724,9 +16424,9 @@ authRouter.post(
         isAdmin: user.isAdmin,
         ...user.name && { name: user.name }
       };
-      const accessToken3 = JWTService.generateToken(accessTokenPayload, "1h");
+      const accessToken2 = JWTService.generateToken(accessTokenPayload, "1h");
       const response = {
-        access_token: accessToken3
+        access_token: accessToken2
       };
       return c.json(response, 200);
     } catch (error) {
@@ -16788,8 +16488,8 @@ authRouter.get("/api/tokens/mcp-setup", authMiddleware, async (c) => {
       isAdmin: user.isAdmin,
       ...user.name && { name: user.name }
     };
-    const refreshToken2 = JWTService.generateToken(tokenPayload, "30d");
-    return c.redirect(`${callback}?token=${refreshToken2}`, 302);
+    const refreshToken = JWTService.generateToken(tokenPayload, "30d");
+    return c.redirect(`${callback}?token=${refreshToken}`, 302);
   } catch (error) {
     getRouteLogger2().error("MCP setup error", {
       error: error instanceof Error ? error.message : String(error),
@@ -16809,9 +16509,9 @@ authRouter.post("/api/tokens/mcp-generate", authMiddleware, async (c) => {
       isAdmin: user.isAdmin,
       ...user.name && { name: user.name }
     };
-    const refreshToken2 = JWTService.generateToken(tokenPayload, "30d");
+    const refreshToken = JWTService.generateToken(tokenPayload, "30d");
     const response = {
-      refresh_token: refreshToken2
+      refresh_token: refreshToken
     };
     return c.json(response, 200);
   } catch (error) {
@@ -17432,8 +17132,6 @@ function deriveStorageUri(name, format) {
   const ext = getExtensionForMimeType(format);
   return `file://${slug}${ext}`;
 }
-
-// src/routes/resources/routes/create.ts
 function registerCreateResource(router) {
   router.post("/resources", async (c) => {
     const user = c.get("user");
@@ -17459,108 +17157,63 @@ function registerCreateResource(router) {
       });
     }
     const format = formatRaw;
-    const entityTypes = entityTypesStr ? JSON.parse(entityTypesStr) : [];
-    const generator = generatorStr ? JSON.parse(generatorStr) : void 0;
-    const generatedFrom = sourceResourceId || sourceAnnotationId ? {
-      ...sourceResourceId ? { resourceId: sourceResourceId } : {},
-      ...sourceAnnotationId ? { annotationId: sourceAnnotationId } : {}
-    } : void 0;
-    const arrayBuffer = await file.arrayBuffer();
-    const contentBuffer = Buffer.from(arrayBuffer);
-    const { knowledgeSystem: { kb } } = c.get("makeMeaning");
-    const resolvedUri = storageUri || deriveStorageUri(name, format);
-    const stored = await kb.content.store(contentBuffer, resolvedUri);
-    const eventBus2 = c.get("eventBus");
-    const resourceId7 = await ResourceOperations.createResource(
-      {
-        name,
-        storageUri: resolvedUri,
-        contentChecksum: stored.checksum,
-        byteSize: stored.byteSize,
-        format,
-        language: language || void 0,
-        entityTypes,
-        creationMethod: creationMethod || void 0,
-        generatedFrom,
-        generationPrompt: generationPrompt || void 0,
-        generator,
-        isDraft: isDraftStr ? isDraftStr === "true" : void 0
-      },
-      userId(userToDid(user)),
-      eventBus2
+    busLog("PUT", "content", {
+      name,
+      format,
+      storageUri,
+      sizeBytes: file.size
+    });
+    const traceparent = c.req.header("traceparent");
+    const tracestate = c.req.header("tracestate");
+    const carrier = traceparent ? tracestate ? { traceparent, tracestate } : { traceparent } : void 0;
+    const resourceId2 = await withTraceparent(
+      carrier,
+      () => withSpan(
+        "content.put.server",
+        async () => {
+          const entityTypes = entityTypesStr ? JSON.parse(entityTypesStr) : [];
+          const generator = generatorStr ? JSON.parse(generatorStr) : void 0;
+          const generatedFrom = sourceResourceId || sourceAnnotationId ? {
+            ...sourceResourceId ? { resourceId: sourceResourceId } : {},
+            ...sourceAnnotationId ? { annotationId: sourceAnnotationId } : {}
+          } : void 0;
+          const arrayBuffer = await file.arrayBuffer();
+          const contentBuffer = Buffer.from(arrayBuffer);
+          const { knowledgeSystem: { kb } } = c.get("makeMeaning");
+          const resolvedUri = storageUri || deriveStorageUri(name, format);
+          const stored = await kb.content.store(contentBuffer, resolvedUri);
+          const eventBus2 = c.get("eventBus");
+          return ResourceOperations.createResource(
+            {
+              name,
+              storageUri: resolvedUri,
+              contentChecksum: stored.checksum,
+              byteSize: stored.byteSize,
+              format,
+              language: language || void 0,
+              entityTypes,
+              creationMethod: creationMethod || void 0,
+              generatedFrom,
+              generationPrompt: generationPrompt || void 0,
+              generator,
+              isDraft: isDraftStr ? isDraftStr === "true" : void 0
+            },
+            userId(userToDid(user)),
+            eventBus2
+          );
+        },
+        {
+          kind: SpanKind.SERVER,
+          attrs: {
+            "content.format": format,
+            "content.size_bytes": file.size
+          }
+        }
+      )
     );
-    return c.json({ resourceId: resourceId7 }, 202);
+    return c.json({ resourceId: resourceId2 }, 202);
   });
 }
-[
-  ...PERSISTED_EVENT_TYPES.filter((t) => t !== "mark:entity-type-added"),
-  ...RESOURCE_BROADCAST_TYPES
-];
-var LOCALES = [
-  { code: "ar", nativeName: "\u0627\u0644\u0639\u0631\u0628\u064A\u0629", englishName: "Arabic" },
-  { code: "bn", nativeName: "\u09AC\u09BE\u0982\u09B2\u09BE", englishName: "Bengali" },
-  { code: "cs", nativeName: "\u010Ce\u0161tina", englishName: "Czech" },
-  { code: "da", nativeName: "Dansk", englishName: "Danish" },
-  { code: "de", nativeName: "Deutsch", englishName: "German" },
-  { code: "el", nativeName: "\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC", englishName: "Greek" },
-  { code: "en", nativeName: "English", englishName: "English" },
-  { code: "es", nativeName: "Espa\xF1ol", englishName: "Spanish" },
-  { code: "fa", nativeName: "\u0641\u0627\u0631\u0633\u06CC", englishName: "Persian" },
-  { code: "fi", nativeName: "Suomi", englishName: "Finnish" },
-  { code: "fr", nativeName: "Fran\xE7ais", englishName: "French" },
-  { code: "he", nativeName: "\u05E2\u05D1\u05E8\u05D9\u05EA", englishName: "Hebrew" },
-  { code: "hi", nativeName: "\u0939\u093F\u0928\u094D\u0926\u0940", englishName: "Hindi" },
-  { code: "id", nativeName: "Bahasa Indonesia", englishName: "Indonesian" },
-  { code: "it", nativeName: "Italiano", englishName: "Italian" },
-  { code: "ja", nativeName: "\u65E5\u672C\u8A9E", englishName: "Japanese" },
-  { code: "ko", nativeName: "\uD55C\uAD6D\uC5B4", englishName: "Korean" },
-  { code: "ms", nativeName: "Bahasa Melayu", englishName: "Malay" },
-  { code: "nl", nativeName: "Nederlands", englishName: "Dutch" },
-  { code: "no", nativeName: "Norsk", englishName: "Norwegian" },
-  { code: "pl", nativeName: "Polski", englishName: "Polish" },
-  { code: "pt", nativeName: "Portugu\xEAs", englishName: "Portuguese" },
-  { code: "ro", nativeName: "Rom\xE2n\u0103", englishName: "Romanian" },
-  { code: "sv", nativeName: "Svenska", englishName: "Swedish" },
-  { code: "th", nativeName: "\u0E44\u0E17\u0E22", englishName: "Thai" },
-  { code: "tr", nativeName: "T\xFCrk\xE7e", englishName: "Turkish" },
-  { code: "uk", nativeName: "\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430", englishName: "Ukrainian" },
-  { code: "vi", nativeName: "Ti\u1EBFng Vi\u1EC7t", englishName: "Vietnamese" },
-  { code: "zh", nativeName: "\u4E2D\u6587", englishName: "Chinese" }
-];
-new Map(
-  LOCALES.map((locale) => [locale.code.toLowerCase(), locale])
-);
-function getPrimaryRepresentation(resource) {
-  if (!resource?.representations) return void 0;
-  const reps = Array.isArray(resource.representations) ? resource.representations : [resource.representations];
-  return reps[0];
-}
-function getPrimaryMediaType(resource) {
-  return getPrimaryRepresentation(resource)?.mediaType;
-}
-function getNodeEncoding(charset) {
-  const normalized = charset.toLowerCase().replace(/[-_]/g, "");
-  const charsetMap = {
-    "utf8": "utf8",
-    "iso88591": "latin1",
-    "latin1": "latin1",
-    "ascii": "ascii",
-    "usascii": "ascii",
-    "utf16le": "utf16le",
-    "ucs2": "ucs2",
-    "binary": "binary",
-    "windows1252": "latin1",
-    // Windows-1252 is a superset of Latin-1
-    "cp1252": "latin1"
-  };
-  return charsetMap[normalized] || "utf8";
-}
-function decodeRepresentation(buffer, mediaType) {
-  const charsetMatch = mediaType.match(/charset=([^\s;]+)/i);
-  const charset = (charsetMatch?.[1] || "utf-8").toLowerCase();
-  const encoding = getNodeEncoding(charset);
-  return buffer.toString(encoding);
-}
 
 // src/utils/event-bus-request.ts
 var import_rxjs = __toESM(require_cjs());
@@ -17594,60 +17247,92 @@ function registerGetResourceUri(router) {
     const { id } = c.req.param();
     let acceptHeader = c.req.header("Accept") || "*/*";
     acceptHeader = acceptHeader.split(",").map((t) => t.trim()).filter((t) => t !== "application/ld+json" && t !== "application/json").join(", ") || "*/*";
-    const { knowledgeSystem: { kb } } = c.get("makeMeaning");
-    let resource;
-    try {
-      resource = await ResourceContext.getResourceMetadata(resourceId(id), kb);
-    } catch {
-      throw new HTTPException(500, { message: "Failed to retrieve resource" });
-    }
-    if (!resource) throw new HTTPException(404, { message: "Resource not found" });
-    if (!resource.storageUri) throw new HTTPException(404, { message: "Resource representation not found" });
-    const content = await kb.content.retrieve(resource.storageUri);
-    if (!content) throw new HTTPException(404, { message: "Resource representation not found" });
-    const mediaType = getPrimaryMediaType(resource);
-    c.header("Cache-Control", "public, max-age=31536000, immutable");
-    if (mediaType) c.header("Content-Type", mediaType);
-    if (mediaType?.startsWith("image/") || mediaType === "application/pdf") {
-      return c.newResponse(new Uint8Array(content), 200, { "Content-Type": mediaType });
-    }
-    return c.text(decodeRepresentation(content, mediaType || "text/plain"));
+    busLog("GET", "content", { resourceId: id, accept: acceptHeader });
+    const traceparent = c.req.header("traceparent");
+    const tracestate = c.req.header("tracestate");
+    const carrier = traceparent ? tracestate ? { traceparent, tracestate } : { traceparent } : void 0;
+    return withTraceparent(
+      carrier,
+      () => withSpan(
+        "content.get.server",
+        async () => {
+          const { knowledgeSystem: { kb } } = c.get("makeMeaning");
+          let resource;
+          try {
+            resource = await ResourceContext.getResourceMetadata(resourceId(id), kb);
+          } catch {
+            throw new HTTPException(500, { message: "Failed to retrieve resource" });
+          }
+          if (!resource) throw new HTTPException(404, { message: "Resource not found" });
+          if (!resource.storageUri) throw new HTTPException(404, { message: "Resource representation not found" });
+          const content = await kb.content.retrieve(resource.storageUri);
+          if (!content) throw new HTTPException(404, { message: "Resource representation not found" });
+          const mediaType = getPrimaryMediaType(resource);
+          c.header("Cache-Control", "public, max-age=31536000, immutable");
+          if (mediaType) c.header("Content-Type", mediaType);
+          if (mediaType?.startsWith("image/") || mediaType === "application/pdf") {
+            return c.newResponse(new Uint8Array(content), 200, { "Content-Type": mediaType });
+          }
+          return c.text(decodeRepresentation(content, mediaType || "text/plain"));
+        },
+        {
+          kind: SpanKind.SERVER,
+          attrs: { "resource.id": id, "http.accept": acceptHeader }
+        }
+      )
+    );
   });
   router.get("/resources/:id", async (c) => {
     const { id } = c.req.param();
     const acceptHeader = c.req.header("Accept") || "application/ld+json";
     if (acceptHeader.includes("text/") || acceptHeader.includes("image/") || acceptHeader.includes("application/pdf")) {
-      const { knowledgeSystem: { kb } } = c.get("makeMeaning");
-      let resource;
-      try {
-        resource = await ResourceContext.getResourceMetadata(resourceId(id), kb);
-      } catch (error) {
-        getRouteLogger3().error("Failed to get resource metadata", {
-          resourceId: id,
-          error: error instanceof Error ? error.message : String(error),
-          stack: error instanceof Error ? error.stack : void 0
-        });
-        throw new HTTPException(500, { message: "Failed to retrieve resource" });
-      }
-      if (!resource) {
-        throw new HTTPException(404, { message: "Resource not found" });
-      }
-      if (!resource.storageUri) {
-        throw new HTTPException(404, { message: "Resource representation not found" });
-      }
-      const content = await kb.content.retrieve(resource.storageUri);
-      if (!content) {
-        throw new HTTPException(404, { message: "Resource representation not found" });
-      }
-      const mediaType = getPrimaryMediaType(resource);
-      if (mediaType) {
-        c.header("Content-Type", mediaType);
-      }
-      if (mediaType?.startsWith("image/") || mediaType === "application/pdf") {
-        return c.newResponse(new Uint8Array(content), 200, { "Content-Type": mediaType });
-      } else {
-        return c.text(decodeRepresentation(content, mediaType || "text/plain"));
-      }
+      busLog("GET", "content", { resourceId: id, accept: acceptHeader });
+      const traceparent = c.req.header("traceparent");
+      const tracestate = c.req.header("tracestate");
+      const carrier = traceparent ? tracestate ? { traceparent, tracestate } : { traceparent } : void 0;
+      return withTraceparent(
+        carrier,
+        () => withSpan(
+          "content.get.server",
+          async () => {
+            const { knowledgeSystem: { kb } } = c.get("makeMeaning");
+            let resource;
+            try {
+              resource = await ResourceContext.getResourceMetadata(resourceId(id), kb);
+            } catch (error) {
+              getRouteLogger3().error("Failed to get resource metadata", {
+                resourceId: id,
+                error: error instanceof Error ? error.message : String(error),
+                stack: error instanceof Error ? error.stack : void 0
+              });
+              throw new HTTPException(500, { message: "Failed to retrieve resource" });
+            }
+            if (!resource) {
+              throw new HTTPException(404, { message: "Resource not found" });
+            }
+            if (!resource.storageUri) {
+              throw new HTTPException(404, { message: "Resource representation not found" });
+            }
+            const content = await kb.content.retrieve(resource.storageUri);
+            if (!content) {
+              throw new HTTPException(404, { message: "Resource representation not found" });
+            }
+            const mediaType = getPrimaryMediaType(resource);
+            if (mediaType) {
+              c.header("Content-Type", mediaType);
+            }
+            if (mediaType?.startsWith("image/") || mediaType === "application/pdf") {
+              return c.newResponse(new Uint8Array(content), 200, { "Content-Type": mediaType });
+            } else {
+              return c.text(decodeRepresentation(content, mediaType || "text/plain"));
+            }
+          },
+          {
+            kind: SpanKind.SERVER,
+            attrs: { "resource.id": id, "http.accept": acceptHeader }
+          }
+        )
+      );
     }
     const eventBus2 = c.get("eventBus");
     const correlationId = crypto.randomUUID();
@@ -17674,42 +17359,12 @@ function registerGetResourceUri(router) {
     }
   });
 }
-function registerUpdateResource(router) {
-  router.patch(
-    "/resources/:id",
-    validateRequestBody("UpdateResourceRequest"),
-    async (c) => {
-      const { id } = c.req.param();
-      const body = c.get("validatedBody");
-      const user = c.get("user");
-      const eventBus2 = c.get("eventBus");
-      const { knowledgeSystem: { kb } } = c.get("makeMeaning");
-      const doc = await ResourceContext.getResourceMetadata(resourceId(id), kb);
-      if (!doc) {
-        throw new HTTPException(404, { message: "Resource not found" });
-      }
-      await ResourceOperations.updateResource(
-        {
-          resourceId: resourceId(id),
-          userId: userId(userToDid(user)),
-          currentArchived: doc.archived,
-          updatedArchived: body.archived,
-          currentEntityTypes: doc.entityTypes,
-          updatedEntityTypes: body.entityTypes
-        },
-        eventBus2
-      );
-      return c.body(null, 202);
-    }
-  );
-}
 
 // src/routes/resources/index.ts
 function createResourcesRouter() {
   const resourcesRouter2 = createResourceRouter();
   registerCreateResource(resourcesRouter2);
   registerGetResourceUri(resourcesRouter2);
-  registerUpdateResource(resourcesRouter2);
   return resourcesRouter2;
 }
 init_logger();
@@ -17753,6 +17408,8 @@ function createBusRouter(authMiddleware2) {
       const connectionId = crypto.randomUUID();
       let ephemeralCounter = 0;
       const nextEphemeralId = () => makeEphemeralId(connectionId, ++ephemeralCounter);
+      recordSubscriberConnect();
+      stream.onAbort(() => recordSubscriberDisconnect());
       const lastDeliveredSeq = /* @__PURE__ */ new Map();
       const writeBusEvent = async (channel, payload, eventScope) => {
         const seq = extractSequence(payload);
@@ -17765,7 +17422,11 @@ function createBusRouter(authMiddleware2) {
         } else {
           id = nextEphemeralId();
         }
+        if (payload && typeof payload === "object") {
+          injectTraceparent(payload);
+        }
         const data = eventScope ? JSON.stringify({ channel, payload, scope: eventScope }) : JSON.stringify({ channel, payload });
+        busLog("SSE", channel, payload, eventScope);
         await stream.writeSSE({ event: "bus-event", data, id }).catch(() => {
         });
       };
@@ -17880,10 +17541,30 @@ function createBusRouter(authMiddleware2) {
     if (user) {
       payload._userId = userToDid(user);
     }
-    const bus = scope ? eventBus2.scope(scope) : eventBus2;
-    const subject = bus.get(channel);
-    subject.next(payload);
-    getBusLogger().info("emit", { channel, scope, correlationId: payload.correlationId });
+    const traceparent = c.req.header("traceparent");
+    const tracestate = c.req.header("tracestate");
+    const carrier = traceparent ? tracestate ? { traceparent, tracestate } : { traceparent } : void 0;
+    await withTraceparent(
+      carrier,
+      () => withSpan(
+        `bus.dispatch:${channel}`,
+        () => {
+          const bus = scope ? eventBus2.scope(scope) : eventBus2;
+          const subject = bus.get(channel);
+          subject.next(payload);
+          busLog("EMIT", channel, payload, scope);
+          recordBusEmit(channel, scope);
+          getBusLogger().info("emit", { channel, scope, correlationId: payload.correlationId });
+        },
+        {
+          kind: SpanKind.SERVER,
+          attrs: {
+            "bus.channel": channel,
+            ...scope ? { "bus.scope": scope } : {}
+          }
+        }
+      )
+    );
     return c.json(null, 202);
   });
   return busRouter2;
@@ -17931,22 +17612,22 @@ var securityHeaders = () => {
 init_logger();
 var requestIdMiddleware = async (c, next) => {
   const requestId = randomUUID();
-  const logger6 = createChildLogger({ requestId });
+  const logger2 = createChildLogger({ requestId });
   c.set("requestId", requestId);
-  c.set("logger", logger6);
+  c.set("logger", logger2);
   c.header("X-Request-ID", requestId);
   await next();
 };
 
 // src/middleware/request-logger.ts
 var requestLoggerMiddleware = async (c, next) => {
-  const logger6 = c.get("logger");
+  const logger2 = c.get("logger");
   const startTime = Date.now();
   const method = c.req.method;
   const path2 = c.req.path;
   const query = c.req.query();
   const userAgent = c.req.header("User-Agent") || "unknown";
-  logger6.info("Incoming request", {
+  logger2.info("Incoming request", {
     type: "request_incoming",
     method,
     path: path2,
@@ -17956,7 +17637,7 @@ var requestLoggerMiddleware = async (c, next) => {
   await next();
   const duration = Date.now() - startTime;
   const status = c.res.status;
-  logger6.info("Outgoing response", {
+  logger2.info("Outgoing response", {
     type: "request_outgoing",
     method,
     path: path2,
@@ -17971,8 +17652,8 @@ var errorLoggerMiddleware = async (c, next) => {
   try {
     await next();
   } catch (error) {
-    const logger6 = c.get("logger");
-    logger6.error("Unhandled error during request processing", {
+    const logger2 = c.get("logger");
+    logger2.error("Unhandled error during request processing", {
       type: "unhandled_error",
       method: c.req.method,
       path: c.req.path,
@@ -18019,12 +17700,12 @@ if (!config.services.backend.corsOrigin) {
 }
 var backendService = config.services.backend;
 initializeLogger(config.logLevel);
-var logger5 = getLogger();
+var logger = getLogger();
 {
   const { monitorEventLoopDelay } = await import('perf_hooks');
   const h = monitorEventLoopDelay({ resolution: 20 });
   h.enable();
-  const monitorLogger = logger5.child({ component: "event-loop-monitor" });
+  const monitorLogger = logger.child({ component: "event-loop-monitor" });
   setInterval(() => {
     const maxMs = Number((h.max / 1e6).toFixed(1));
     const p99Ms = Number((h.percentile(99) / 1e6).toFixed(1));
@@ -18035,7 +17716,7 @@ var logger5 = getLogger();
   }, 3e4).unref();
 }
 if (databaseUrlConstructed) {
-  logger5.info("DATABASE_URL constructed from environment components", {
+  logger.info("DATABASE_URL constructed from environment components", {
     host: process.env.DB_HOST,
     port: process.env.DB_PORT,
     database: process.env.DB_NAME,
@@ -18043,11 +17724,7 @@ if (databaseUrlConstructed) {
   });
 }
 var eventBus = new EventBus();
-var makeMeaning = await startMakeMeaning(new SemiontProject(projectRoot), makeMeaningConfigFrom(config), eventBus, logger5);
-registerJobCommandHandlers(eventBus, makeMeaning.jobQueue);
-registerAnnotationLookupHandlers(eventBus, makeMeaning.knowledgeSystem.kb, makeMeaning.knowledgeSystem.gatherer);
-registerAnnotationAssemblyHandler(eventBus);
-registerBindUpdateBodyHandler(eventBus);
+var makeMeaning = await startMakeMeaning(new SemiontProject(projectRoot), makeMeaningConfigFrom(config), eventBus, logger);
 var __filename$1 = fileURLToPath(import.meta.url);
 var __dirname$1 = path.dirname(__filename$1);
 var app = new Hono();
@@ -18114,7 +17791,7 @@ app.get("/api/docs", async (c) => {
     return await swaggerHandler(c, async () => {
     });
   } catch (error) {
-    logger5.error("Error in /api/docs handler", {
+    logger.error("Error in /api/docs handler", {
       error: error instanceof Error ? error.message : String(error),
       stack: error instanceof Error ? error.stack : void 0
     });
@@ -18131,12 +17808,14 @@ app.all("/api/*", (c) => {
 });
 var port = backendService.port || 4e3;
 if (config.env?.NODE_ENV !== "test") {
+  const { initObservabilityNode } = await import('@semiont/observability/node');
+  initObservabilityNode({ serviceName: "semiont-backend" });
   serve({
     fetch: app.fetch,
     port,
     hostname: "0.0.0.0"
   }, async (info) => {
-    logger5.info("Semiont Backend ready", {
+    logger.info("Semiont Backend ready", {
       url: `http://localhost:${info.port}/api`,
       environment: config.env?.NODE_ENV ?? "development"
     });
@@ -18144,18 +17823,18 @@ if (config.env?.NODE_ENV !== "test") {
       const { JWTService: JWTService2 } = await Promise.resolve().then(() => (init_jwt(), jwt_exports));
       JWTService2.initialize(config);
     } catch (error) {
-      logger5.error("Failed to initialize JWT Service", {
+      logger.error("Failed to initialize JWT Service", {
         error: error instanceof Error ? error.message : String(error),
         stack: error instanceof Error ? error.stack : void 0
       });
     }
     try {
       const entityTypes = await makeMeaning.knowledgeSystem.kb.graph.getEntityTypes();
-      logger5.info("Loaded entity types from graph database", {
+      logger.info("Loaded entity types from graph database", {
         count: entityTypes.length
       });
     } catch (error) {
-      logger5.error("Failed to pre-load entity types", {
+      logger.error("Failed to pre-load entity types", {
         error: error instanceof Error ? error.message : String(error),
         stack: error instanceof Error ? error.stack : void 0
       });