npm - @semiont/backend - Versions diffs - 0.4.6 → 0.4.9 - Mend

@semiont/backend 0.4.6 → 0.4.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/index.js CHANGED Viewed

@@ -268,6 +268,21 @@ var init_jwt = __esm({
           throw error;
         }
       }
+      static generateMediaToken(resourceId21, userId14) {
+        const payload = { purpose: "media", sub: resourceId21, userId: userId14 };
+        return jwt.sign(payload, this.getSecret(), { expiresIn: "5m" });
+      }
+      static verifyMediaToken(token, resourceId21) {
+        let decoded;
+        try {
+          decoded = jwt.verify(token, this.getSecret());
+        } catch (error) {
+          if (error instanceof jwt.TokenExpiredError) throw new Error("Media token expired");
+          throw new Error("Invalid media token");
+        }
+        if (decoded["purpose"] !== "media") throw new Error("Invalid media token");
+        if (decoded["sub"] !== resourceId21) throw new Error("Media token resource mismatch");
+      }
       static isAllowedDomain(email) {
         const parts = email.split("@");
         if (parts.length !== 2 || !parts[0] || !parts[1]) {
@@ -9976,6 +9991,79 @@ function makeMeaningConfigFrom(config2) {
 // src/index.ts
 init_logger();
+var rootRouter = new Hono();
+rootRouter.get("/", (c) => {
+  const config2 = c.get("config");
+  const projectName = config2._metadata?.projectName ?? "";
+  const projectVersion = config2._metadata?.projectVersion ?? "";
+  const siteName = config2.site?.siteName ?? "";
+  const html = `<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Semiont</title>
+  <link rel="preconnect" href="https://fonts.googleapis.com">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link href="https://fonts.googleapis.com/css2?family=Orbitron:wght@400;700&display=swap" rel="stylesheet">
+  <style>
+    * { margin: 0; padding: 0; box-sizing: border-box; }
+    body {
+      background: #0a0a0f;
+      color: #e0e0e0;
+      font-family: 'Orbitron', sans-serif;
+      min-height: 100vh;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      gap: 1rem;
+    }
+    h1 {
+      font-size: 4rem;
+      font-weight: 700;
+      letter-spacing: 0.2em;
+      color: #00e5ff;
+      text-transform: uppercase;
+    }
+    h2 {
+      font-size: 1.2rem;
+      font-weight: 400;
+      letter-spacing: 0.4em;
+      color: #888;
+      text-transform: uppercase;
+    }
+    .meta {
+      margin-top: 2rem;
+      font-size: 0.75rem;
+      letter-spacing: 0.15em;
+      color: #555;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      gap: 0.3rem;
+    }
+    a {
+      color: #00e5ff;
+      text-decoration: none;
+      letter-spacing: 0.15em;
+      font-size: 0.75rem;
+    }
+    a:hover { text-decoration: underline; }
+  </style>
+</head>
+<body>
+  <h1>SEMIONT</h1>
+  <h2>knowledge base</h2>
+  <div class="meta">
+    ${siteName ? `<span>${siteName}</span>` : ""}
+    ${projectName ? `<span>project: ${projectName}${projectVersion ? " v" + projectVersion : ""}</span>` : ""}
+    <a href="/api/health">/api/health</a>
+  </div>
+</body>
+</html>`;
+  return c.html(html);
+});
 var globalForPrisma = global;
 var DatabaseConnection = class {
   static instance = null;
@@ -11542,6 +11630,10 @@ var openapi_default = {
       GatherResourceStreamRequest: {
         type: "object",
         properties: {
+          correlationId: {
+            type: "string",
+            description: "Client-generated correlation ID to thread the response back to the originating request"
+          },
           depth: {
             type: "integer",
             minimum: 1,
@@ -11567,6 +11659,10 @@ var openapi_default = {
       GatherAnnotationStreamRequest: {
         type: "object",
         properties: {
+          correlationId: {
+            type: "string",
+            description: "Client-generated correlation ID to thread the response back to the originating request"
+          },
           contextWindow: {
             type: "integer",
             minimum: 100,
@@ -13392,6 +13488,9 @@ var openapi_default = {
           isAdmin: {
             type: "boolean"
           },
+          isModerator: {
+            type: "boolean"
+          },
           isActive: {
             type: "boolean"
           },
@@ -13419,6 +13518,7 @@ var openapi_default = {
           "domain",
           "provider",
           "isAdmin",
+          "isModerator",
           "isActive",
           "termsAcceptedAt",
           "lastLogin",
@@ -13490,6 +13590,30 @@ var openapi_default = {
         ],
         description: "W3C Web Annotation body purpose vocabulary - https://www.w3.org/TR/annotation-vocab/#motivation"
       },
+      MediaTokenRequest: {
+        type: "object",
+        properties: {
+          resourceId: {
+            type: "string",
+            description: "The resource ID to generate a media token for"
+          }
+        },
+        required: [
+          "resourceId"
+        ]
+      },
+      MediaTokenResponse: {
+        type: "object",
+        properties: {
+          token: {
+            type: "string",
+            description: "Short-lived media token for use as ?token= query parameter on resource URLs"
+          }
+        },
+        required: [
+          "token"
+        ]
+      },
       GatheredContext: {
         type: "object",
         description: "Context gathered for an annotation. Includes source document excerpts, metadata, and graph-derived context. Used by both Find (bind) and Generate (yield) flows.",
@@ -13633,6 +13757,37 @@ var openapi_default = {
           "annotation",
           "sourceResource"
         ]
+      },
+      MatchSearchStreamRequest: {
+        type: "object",
+        properties: {
+          correlationId: {
+            type: "string",
+            description: "Client-generated correlation ID to thread the response back to the originating request"
+          },
+          referenceId: {
+            type: "string",
+            description: "Annotation ID of the reference to search candidates for"
+          },
+          context: {
+            $ref: "#/components/schemas/GatheredContext",
+            description: "Gathered context for the reference annotation"
+          },
+          limit: {
+            type: "integer",
+            minimum: 1,
+            maximum: 20,
+            description: "Maximum number of candidate results to return (default: 10)"
+          },
+          useSemanticScoring: {
+            type: "boolean",
+            description: "Enable semantic similarity scoring in addition to keyword matching (default: true)"
+          }
+        },
+        required: [
+          "referenceId",
+          "context"
+        ]
       }
     }
   }
@@ -13860,8 +14015,33 @@ var OAuthService = class {
     return user;
   }
 };
+// src/middleware/auth.ts
+init_jwt();
+var MEDIA_TOKEN_PATH = /^\/api\/resources\/([^/]+)$/;
 var authMiddleware = async (c, next) => {
   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 resourceId21 = match?.[1];
+    if (mediaTokenParam && resourceId21) {
+      try {
+        JWTService.verifyMediaToken(mediaTokenParam, resourceId21);
+        c.set("token", mediaTokenParam);
+        await next();
+        return;
+      } catch (error) {
+        logger2.warn("Authentication failed: Invalid media token", {
+          type: "auth_failed",
+          reason: "invalid_media_token",
+          path: c.req.path,
+          error: error instanceof Error ? error.message : String(error)
+        });
+        return c.json({ error: "Unauthorized" }, 401);
+      }
+    }
+  }
   const authHeader = c.req.header("Authorization");
   let tokenStr;
   if (authHeader?.startsWith("Bearer ")) {
@@ -14195,6 +14375,7 @@ authRouter.get("/api/users/me", authMiddleware, async (c) => {
     domain: user.domain,
     provider: user.provider,
     isAdmin: user.isAdmin,
+    isModerator: user.isModerator,
     isActive: user.isActive,
     termsAcceptedAt: user.termsAcceptedAt?.toISOString() || null,
     lastLogin: user.lastLogin?.toISOString() || null,
@@ -14260,6 +14441,20 @@ authRouter.post("/api/tokens/mcp-generate", authMiddleware, async (c) => {
     return c.json({ error: "Failed to generate refresh token" }, 401);
   }
 });
+authRouter.post("/api/tokens/media", authMiddleware, async (c) => {
+  const user = c.get("user");
+  let body;
+  try {
+    body = await c.req.json();
+  } catch {
+    return c.json({ error: "Invalid request body" }, 400);
+  }
+  if (!body.resourceId || typeof body.resourceId !== "string") {
+    return c.json({ error: "resourceId is required" }, 400);
+  }
+  const token = JWTService.generateMediaToken(body.resourceId, user.id);
+  return c.json({ token }, 200);
+});
 authRouter.post("/api/users/accept-terms", authMiddleware, async (c) => {
   const user = c.get("user");
   await OAuthService.acceptTerms(userId(user.id));
@@ -14753,7 +14948,7 @@ function registerCreateResource(router) {
     const arrayBuffer = await file.arrayBuffer();
     const contentBuffer = Buffer.from(arrayBuffer);
     const eventBus2 = c.get("eventBus");
-    const resourceId20 = await ResourceOperations.createResource(
+    const resourceId21 = await ResourceOperations.createResource(
       {
         name,
         content: contentBuffer,
@@ -14766,7 +14961,7 @@ function registerCreateResource(router) {
       userId(userToDid(user)),
       eventBus2
     );
-    return c.json({ resourceId: resourceId20 }, 202);
+    return c.json({ resourceId: resourceId21 }, 202);
   });
 }
@@ -15126,7 +15321,7 @@ var nanoid = (size = 21) => {
 async function writeTypedSSE(stream, options) {
   await stream.writeSSE({
     event: options.event,
-    data: options.data,
+    data: JSON.stringify(options.data),
     id: options.id
   });
 }
@@ -15210,16 +15405,13 @@ function registerAnnotateReferencesStream(router, jobQueue) {
               logger2.info("[EventBus] Received mark:progress event", { progress, resourceId: id });
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     status: progress.status || "scanning",
                     resourceId: resourceId(id),
                     currentEntityType: progress.currentEntityType,
-                    totalEntityTypes: entityTypes.length,
-                    processedEntityTypes: progress.completedEntityTypes?.length || 0,
-                    foundCount: progress.completedEntityTypes?.reduce((sum, et) => sum + et.foundCount, 0),
-                    message: progress.message || (progress.currentEntityType ? `Scanning for ${progress.currentEntityType}...` : "Processing..."),
-                    percentage: progress.percentage
-                  }),
+                    percentage: progress.percentage,
+                    message: progress.message || (progress.currentEntityType ? `Scanning for ${progress.currentEntityType}...` : "Processing...")
+                  },
                   event: "mark:progress",
                   id: String(Date.now())
                 });
@@ -15237,15 +15429,13 @@ function registerAnnotateReferencesStream(router, jobQueue) {
               try {
                 const result = event.payload.result;
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     motivation: "linking",
                     status: "complete",
                     resourceId: resourceId(id),
-                    totalEntityTypes: entityTypes.length,
-                    processedEntityTypes: entityTypes.length,
                     foundCount: result?.totalFound,
                     message: result?.totalFound !== void 0 ? `Detection complete! Found ${result.totalFound} entities` : "Detection complete!"
-                  }),
+                  },
                   event: "mark:assist-finished",
                   id: String(Date.now())
                 });
@@ -15262,13 +15452,10 @@ function registerAnnotateReferencesStream(router, jobQueue) {
               logger2.info("Detection failed", { error: event.payload.error });
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
-                    status: "error",
+                  data: {
                     resourceId: resourceId(id),
-                    totalEntityTypes: entityTypes.length,
-                    processedEntityTypes: 0,
                     message: event.payload.error || "Detection failed"
-                  }),
+                  },
                   event: "mark:assist-failed",
                   id: String(Date.now())
                 });
@@ -15398,11 +15585,11 @@ function registerAnnotateHighlightsStream(router, jobQueue) {
               logger2.info("Detection started");
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     status: "started",
                     resourceId: resourceId(id),
                     message: "Starting detection..."
-                  }),
+                  },
                   event: "mark:progress",
                   id: String(Date.now())
                 });
@@ -15418,13 +15605,12 @@ function registerAnnotateHighlightsStream(router, jobQueue) {
               logger2.info("Detection progress", { progress });
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     status: progress.status || "analyzing",
                     resourceId: resourceId(id),
-                    stage: progress.status === "analyzing" || progress.status === "creating" ? progress.status : void 0,
                     percentage: progress.percentage,
                     message: progress.message || "Processing..."
-                  }),
+                  },
                   event: "mark:progress",
                   id: String(Date.now())
                 });
@@ -15442,7 +15628,7 @@ function registerAnnotateHighlightsStream(router, jobQueue) {
               try {
                 const result = event.payload.result;
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     motivation: "highlighting",
                     status: "complete",
                     resourceId: resourceId(id),
@@ -15450,7 +15636,7 @@ function registerAnnotateHighlightsStream(router, jobQueue) {
                     foundCount: result?.highlightsFound,
                     createdCount: result?.highlightsCreated,
                     message: result?.highlightsCreated !== void 0 ? `Complete! Created ${result.highlightsCreated} highlights` : "Highlight detection complete!"
-                  }),
+                  },
                   event: "mark:assist-finished",
                   id: String(Date.now())
                 });
@@ -15467,11 +15653,10 @@ function registerAnnotateHighlightsStream(router, jobQueue) {
               logger2.info("Detection failed", { error: event.payload.error });
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
-                    status: "error",
+                  data: {
                     resourceId: resourceId(id),
                     message: event.payload.error || "Highlight detection failed"
-                  }),
+                  },
                   event: "mark:assist-failed",
                   id: String(Date.now())
                 });
@@ -15601,11 +15786,11 @@ function registerAnnotateAssessmentsStream(router, jobQueue) {
               logger2.info("Detection started");
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     status: "started",
                     resourceId: resourceId(id),
                     message: "Starting detection..."
-                  }),
+                  },
                   event: "mark:progress",
                   id: String(Date.now())
                 });
@@ -15621,13 +15806,12 @@ function registerAnnotateAssessmentsStream(router, jobQueue) {
               logger2.info("Detection progress", { progress });
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     status: progress.status || "analyzing",
                     resourceId: resourceId(id),
-                    stage: progress.status === "analyzing" || progress.status === "creating" ? progress.status : void 0,
                     percentage: progress.percentage,
                     message: progress.message || "Processing..."
-                  }),
+                  },
                   event: "mark:progress",
                   id: String(Date.now())
                 });
@@ -15649,7 +15833,7 @@ function registerAnnotateAssessmentsStream(router, jobQueue) {
               try {
                 const result = event.payload.result;
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     motivation: "assessing",
                     status: "complete",
                     resourceId: resourceId(id),
@@ -15657,7 +15841,7 @@ function registerAnnotateAssessmentsStream(router, jobQueue) {
                     foundCount: result?.assessmentsFound,
                     createdCount: result?.assessmentsCreated,
                     message: result?.assessmentsCreated !== void 0 ? `Complete! Created ${result.assessmentsCreated} assessments` : "Assessment detection complete!"
-                  }),
+                  },
                   event: "mark:assist-finished",
                   id: String(Date.now())
                 });
@@ -15674,11 +15858,10 @@ function registerAnnotateAssessmentsStream(router, jobQueue) {
               logger2.info("Detection failed", { error: event.payload.error });
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
-                    status: "error",
+                  data: {
                     resourceId: resourceId(id),
                     message: event.payload.error || "Assessment detection failed"
-                  }),
+                  },
                   event: "mark:assist-failed",
                   id: String(Date.now())
                 });
@@ -15808,11 +15991,11 @@ function registerAnnotateCommentsStream(router, jobQueue) {
               logger2.info("Detection started");
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     status: "started",
                     resourceId: resourceId(id),
                     message: "Starting detection..."
-                  }),
+                  },
                   event: "mark:progress",
                   id: String(Date.now())
                 });
@@ -15828,13 +16011,12 @@ function registerAnnotateCommentsStream(router, jobQueue) {
               logger2.info("Detection progress", { progress });
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     status: progress.status || "analyzing",
                     resourceId: resourceId(id),
-                    stage: progress.status === "analyzing" || progress.status === "creating" ? progress.status : void 0,
                     percentage: progress.percentage,
                     message: progress.message || "Processing..."
-                  }),
+                  },
                   event: "mark:progress",
                   id: String(Date.now())
                 });
@@ -15852,7 +16034,7 @@ function registerAnnotateCommentsStream(router, jobQueue) {
               try {
                 const result = event.payload.result;
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     motivation: "commenting",
                     status: "complete",
                     resourceId: resourceId(id),
@@ -15860,7 +16042,7 @@ function registerAnnotateCommentsStream(router, jobQueue) {
                     foundCount: result?.commentsFound,
                     createdCount: result?.commentsCreated,
                     message: result?.commentsCreated !== void 0 ? `Complete! Created ${result.commentsCreated} comments` : "Comment detection complete!"
-                  }),
+                  },
                   event: "mark:assist-finished",
                   id: String(Date.now())
                 });
@@ -15877,11 +16059,10 @@ function registerAnnotateCommentsStream(router, jobQueue) {
               logger2.info("Detection failed", { error: event.payload.error });
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
-                    status: "error",
+                  data: {
                     resourceId: resourceId(id),
                     message: event.payload.error || "Comment detection failed"
-                  }),
+                  },
                   event: "mark:assist-failed",
                   id: String(Date.now())
                 });
@@ -16185,12 +16366,12 @@ function registerAnnotateTagsStream(router, jobQueue) {
               logger2.info("Detection started");
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     status: "started",
                     resourceId: resourceId(id),
                     totalCategories: categories.length,
                     message: "Starting detection..."
-                  }),
+                  },
                   event: "mark:progress",
                   id: String(Date.now())
                 });
@@ -16206,16 +16387,15 @@ function registerAnnotateTagsStream(router, jobQueue) {
               logger2.info("Detection progress", { progress });
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     status: progress.status || "analyzing",
                     resourceId: resourceId(id),
-                    stage: progress.status === "analyzing" || progress.status === "creating" ? progress.status : void 0,
                     percentage: progress.percentage,
                     currentCategory: progress.currentCategory,
                     processedCategories: progress.processedCategories,
                     totalCategories: progress.totalCategories,
                     message: progress.message || "Processing..."
-                  }),
+                  },
                   event: "mark:progress",
                   id: String(Date.now())
                 });
@@ -16233,7 +16413,7 @@ function registerAnnotateTagsStream(router, jobQueue) {
               try {
                 const result = event.payload.result;
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     motivation: "tagging",
                     status: "complete",
                     resourceId: resourceId(id),
@@ -16242,7 +16422,7 @@ function registerAnnotateTagsStream(router, jobQueue) {
                     createdCount: result?.tagsCreated,
                     byCategory: result?.byCategory,
                     message: result?.tagsCreated !== void 0 ? `Complete! Created ${result.tagsCreated} tags` : "Tag detection complete!"
-                  }),
+                  },
                   event: "mark:assist-finished",
                   id: String(Date.now())
                 });
@@ -16259,11 +16439,10 @@ function registerAnnotateTagsStream(router, jobQueue) {
               logger2.info("Detection failed", { error: event.payload.error });
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
-                    status: "error",
+                  data: {
                     resourceId: resourceId(id),
                     message: event.payload.error || "Tag detection failed"
-                  }),
+                  },
                   event: "mark:assist-failed",
                   id: String(Date.now())
                 });
@@ -16337,118 +16516,122 @@ function registerGetReferencedBy(router) {
   });
 }
 init_logger();
-function registerBindSearchStream(router) {
-  router.post("/resources/:id/bind-search-stream", async (c) => {
-    const { id } = c.req.param();
-    const logger2 = getLogger().child({
-      component: "bind-search-stream",
-      resourceId: id
-    });
-    const user = c.get("user");
-    if (!user) {
-      throw new HTTPException(401, { message: "Authentication required" });
-    }
-    const body = await c.req.json();
-    const { referenceId, context, limit, useSemanticScoring } = body;
-    if (!referenceId || !context) {
-      throw new HTTPException(400, { message: "referenceId and context are required" });
-    }
-    const eventBus2 = c.get("eventBus");
-    const { knowledgeSystem: { kb } } = c.get("makeMeaning");
-    const resource = await ResourceContext.getResourceMetadata(resourceId(id), kb);
-    if (!resource) {
-      throw new HTTPException(404, { message: "Resource not found" });
-    }
-    const correlationId = crypto.randomUUID();
-    logger2.info("Starting bind search stream", { referenceId, correlationId });
-    c.header("X-Accel-Buffering", "no");
-    c.header("Cache-Control", "no-cache, no-transform");
-    return streamSSE(c, async (stream) => {
-      let isStreamClosed = false;
-      const subscriptions = [];
-      let closeStreamCallback = null;
-      const streamPromise = new Promise((resolve) => {
-        closeStreamCallback = resolve;
+function registerMatchSearchStream(router) {
+  router.post(
+    "/resources/:id/match-search-stream",
+    validateRequestBody("MatchSearchStreamRequest"),
+    async (c) => {
+      const { id } = c.req.param();
+      const logger2 = getLogger().child({
+        component: "match-search-stream",
+        resourceId: id
       });
-      const cleanup = () => {
-        if (isStreamClosed) return;
-        isStreamClosed = true;
-        subscriptions.forEach((sub) => sub.unsubscribe());
-        if (closeStreamCallback) closeStreamCallback();
-      };
-      try {
-        subscriptions.push(
-          eventBus2.get("match:search-results").subscribe(async (event) => {
-            if (event.correlationId !== correlationId) return;
-            if (isStreamClosed) return;
-            logger2.info("Bind search completed", {
-              referenceId,
-              resultCount: event.results.length
-            });
-            try {
-              await writeTypedSSE(stream, {
-                data: JSON.stringify({
-                  referenceId: event.referenceId,
-                  results: event.results
-                }),
-                event: "match:search-results",
-                id: String(Date.now())
-              });
-            } catch (error) {
-              logger2.warn("Client disconnected during results");
-            }
-            cleanup();
-          })
-        );
-        subscriptions.push(
-          eventBus2.get("match:search-failed").subscribe(async (event) => {
-            if (event.correlationId !== correlationId) return;
-            if (isStreamClosed) return;
-            logger2.error("Bind search failed", { referenceId, error: event.error });
-            try {
-              await writeTypedSSE(stream, {
-                data: JSON.stringify({
-                  referenceId: event.referenceId,
-                  error: event.error.message
-                }),
-                event: "match:search-failed",
-                id: String(Date.now())
-              });
-            } catch (error) {
-              logger2.warn("Client disconnected during error");
-            }
-            cleanup();
-          })
-        );
-        eventBus2.get("match:search-requested").next({
-          correlationId,
-          referenceId,
-          context,
-          limit,
-          useSemanticScoring
-        });
-        c.req.raw.signal.addEventListener("abort", () => {
-          logger2.info("Client disconnected from bind search stream");
-          cleanup();
+      const user = c.get("user");
+      if (!user) {
+        throw new HTTPException(401, { message: "Authentication required" });
+      }
+      const body = c.get("validatedBody");
+      const { referenceId, context, limit, useSemanticScoring } = body;
+      const correlationId = body.correlationId ?? crypto.randomUUID();
+      const eventBus2 = c.get("eventBus");
+      const { knowledgeSystem: { kb } } = c.get("makeMeaning");
+      const resource = await ResourceContext.getResourceMetadata(resourceId(id), kb);
+      if (!resource) {
+        throw new HTTPException(404, { message: "Resource not found" });
+      }
+      logger2.info("Starting match search stream", { referenceId, correlationId });
+      c.header("X-Accel-Buffering", "no");
+      c.header("Cache-Control", "no-cache, no-transform");
+      return streamSSE(c, async (stream) => {
+        let isStreamClosed = false;
+        const subscriptions = [];
+        let closeStreamCallback = null;
+        const streamPromise = new Promise((resolve) => {
+          closeStreamCallback = resolve;
         });
-      } catch (error) {
+        const cleanup = () => {
+          if (isStreamClosed) return;
+          isStreamClosed = true;
+          subscriptions.forEach((sub) => sub.unsubscribe());
+          if (closeStreamCallback) closeStreamCallback();
+        };
         try {
-          await writeTypedSSE(stream, {
-            data: JSON.stringify({
-              referenceId,
-              error: error instanceof Error ? error.message : "Search failed"
-            }),
-            event: "match:search-failed",
-            id: String(Date.now())
+          subscriptions.push(
+            eventBus2.get("match:search-results").subscribe(async (event) => {
+              if (event.correlationId !== correlationId) return;
+              if (isStreamClosed) return;
+              logger2.info("Match search completed", {
+                referenceId,
+                resultCount: event.response.length
+              });
+              try {
+                await writeTypedSSE(stream, {
+                  data: {
+                    correlationId: event.correlationId,
+                    referenceId: event.referenceId,
+                    response: event.response
+                  },
+                  event: "match:search-results",
+                  id: String(Date.now())
+                });
+              } catch {
+                logger2.warn("Client disconnected during results");
+              }
+              cleanup();
+            })
+          );
+          subscriptions.push(
+            eventBus2.get("match:search-failed").subscribe(async (event) => {
+              if (event.correlationId !== correlationId) return;
+              if (isStreamClosed) return;
+              logger2.error("Match search failed", { referenceId, error: event.error });
+              try {
+                await writeTypedSSE(stream, {
+                  data: {
+                    correlationId: event.correlationId,
+                    referenceId: event.referenceId,
+                    error: event.error
+                  },
+                  event: "match:search-failed",
+                  id: String(Date.now())
+                });
+              } catch {
+                logger2.warn("Client disconnected during error");
+              }
+              cleanup();
+            })
+          );
+          eventBus2.get("match:search-requested").next({
+            correlationId,
+            referenceId,
+            context,
+            limit,
+            useSemanticScoring
           });
-        } catch (sseError) {
-          logger2.warn("Could not send error to client");
+          c.req.raw.signal.addEventListener("abort", () => {
+            logger2.info("Client disconnected from match search stream");
+            cleanup();
+          });
+        } catch (error) {
+          try {
+            await writeTypedSSE(stream, {
+              data: {
+                correlationId,
+                referenceId,
+                error: error instanceof Error ? error.message : "Search failed"
+              },
+              event: "match:search-failed",
+              id: String(Date.now())
+            });
+          } catch {
+            logger2.warn("Could not send error to client");
+          }
+          cleanup();
         }
-        cleanup();
-      }
-      return streamPromise;
-    });
-  });
+        return streamPromise;
+      });
+    }
+  );
 }
 function registerTokenRoutes(router) {
   router.get("/api/clone-tokens/:token", async (c) => {
@@ -16928,13 +17111,13 @@ function registerYieldResourceStream(router, jobQueue) {
               logger2.info("Generation started");
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     status: "started",
                     referenceId: reference.id,
                     resourceName,
                     percentage: 0,
                     message: "Starting..."
-                  }),
+                  },
                   event: "yield:progress",
                   id: String(Date.now())
                 });
@@ -16950,13 +17133,13 @@ function registerYieldResourceStream(router, jobQueue) {
               logger2.info("Generation progress", { progress });
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     status: progress.status,
                     referenceId: reference.id,
                     resourceName,
                     percentage: progress.percentage || 0,
                     message: progress.message || `${progress.status}...`
-                  }),
+                  },
                   event: "yield:progress",
                   id: String(Date.now())
                 });
@@ -16972,7 +17155,7 @@ function registerYieldResourceStream(router, jobQueue) {
               logger2.info("Generation completed");
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({
+                  data: {
                     status: "complete",
                     referenceId: reference.id,
                     resourceName,
@@ -16980,7 +17163,7 @@ function registerYieldResourceStream(router, jobQueue) {
                     sourceResourceId: resourceIdParam,
                     percentage: 100,
                     message: "Draft resource created! Ready for review."
-                  }),
+                  },
                   event: "yield:finished",
                   id: String(Date.now())
                 });
@@ -17012,12 +17195,12 @@ function registerYieldResourceStream(router, jobQueue) {
         } catch (error) {
           try {
             await writeTypedSSE(stream, {
-              data: JSON.stringify({
+              data: {
                 status: "error",
                 referenceId: reference.id,
                 percentage: 0,
                 message: error instanceof Error ? error.message : "Generation failed"
-              }),
+              },
               event: "yield:failed",
               id: String(Date.now())
             });
@@ -17050,12 +17233,7 @@ function registerGatherAnnotationStream(router) {
       if (!user) {
         throw new HTTPException(401, { message: "Authentication required" });
       }
-      eventBus2.get("gather:requested").next({
-        annotationId: annotationId(annotationIdParam),
-        resourceId: resourceId(resourceIdParam),
-        options: { includeSourceContext: true, includeTargetContext: true, contextWindow }
-      });
-      logger2.info("Emitted gather:requested", { annotationId: annotationIdParam, contextWindow });
+      const correlationId = body.correlationId ?? crypto.randomUUID();
       c.header("X-Accel-Buffering", "no");
       c.header("Cache-Control", "no-cache, no-transform");
       return streamSSE(c, async (stream) => {
@@ -17075,7 +17253,7 @@ function registerGatherAnnotationStream(router) {
               if (isStreamClosed) return;
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({ message: event.message, percentage: event.percentage }),
+                  data: { message: event.message, percentage: event.percentage },
                   event: "gather:annotation-progress",
                   id: String(Date.now())
                 });
@@ -17086,11 +17264,11 @@ function registerGatherAnnotationStream(router) {
           );
           subscriptions.push(
             eventBus2.get("gather:complete").subscribe(async (event) => {
-              if (event.annotationId !== annotationIdParam) return;
+              if (event.correlationId !== correlationId) return;
               if (isStreamClosed) return;
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({ annotationId: event.annotationId, response: event.response }),
+                  data: { correlationId: event.correlationId, annotationId: event.annotationId, response: event.response },
                   event: "gather:annotation-finished",
                   id: String(Date.now())
                 });
@@ -17101,11 +17279,11 @@ function registerGatherAnnotationStream(router) {
           );
           subscriptions.push(
             eventBus2.get("gather:failed").subscribe(async (event) => {
-              if (event.annotationId !== annotationIdParam) return;
+              if (event.correlationId !== correlationId) return;
               if (isStreamClosed) return;
               try {
                 await writeTypedSSE(stream, {
-                  data: JSON.stringify({ annotationId: event.annotationId, error: event.error }),
+                  data: { correlationId: event.correlationId, annotationId: event.annotationId, error: event.error },
                   event: "gather:failed",
                   id: String(Date.now())
                 });
@@ -17114,6 +17292,13 @@ function registerGatherAnnotationStream(router) {
               cleanup();
             })
           );
+          eventBus2.get("gather:requested").next({
+            correlationId,
+            annotationId: annotationId(annotationIdParam),
+            resourceId: resourceId(resourceIdParam),
+            options: { includeSourceContext: true, includeTargetContext: true, contextWindow }
+          });
+          logger2.info("Emitted gather:requested", { annotationId: annotationIdParam, correlationId, contextWindow });
           keepAliveInterval = setInterval(async () => {
             if (isStreamClosed) {
               clearInterval(keepAliveInterval);
@@ -17137,14 +17322,14 @@ function registerGatherAnnotationStream(router) {
 }
 function registerGetAnnotationHistory(router) {
   router.get("/resources/:resourceId/annotations/:annotationId/history", async (c) => {
-    const { resourceId: resourceId20, annotationId: annotationId6 } = c.req.param();
+    const { resourceId: resourceId21, annotationId: annotationId7 } = c.req.param();
     const eventBus2 = c.get("eventBus");
     const correlationId = crypto.randomUUID();
     try {
       const response = await eventBusRequest(
         eventBus2,
         "browse:annotation-history-requested",
-        { correlationId, resourceId: resourceId(resourceId20), annotationId: annotationId(annotationId6) },
+        { correlationId, resourceId: resourceId(resourceId21), annotationId: annotationId(annotationId7) },
         "browse:annotation-history-result",
         "browse:annotation-history-failed"
       );
@@ -17178,7 +17363,7 @@ function createResourcesRouter(jobQueue) {
   registerAnnotateCommentsStream(resourcesRouter2, jobQueue);
   registerAnnotateTagsStream(resourcesRouter2, jobQueue);
   registerGetReferencedBy(resourcesRouter2);
-  registerBindSearchStream(resourcesRouter2);
+  registerMatchSearchStream(resourcesRouter2);
   registerGetResourceAnnotations(resourcesRouter2);
   registerCreateAnnotation(resourcesRouter2);
   registerGetAnnotation(resourcesRouter2);
@@ -17239,8 +17424,8 @@ operationsRouter.get("/api/annotations/:id/context", async (c) => {
   const { id } = c.req.param();
   const query = c.req.query();
   const { knowledgeSystem: { kb } } = c.get("makeMeaning");
-  const resourceId20 = query.resourceId;
-  if (!resourceId20) {
+  const resourceId21 = query.resourceId;
+  if (!resourceId21) {
     throw new HTTPException(400, { message: "resourceId query parameter is required" });
   }
   const contextBefore = query.contextBefore ? Number(query.contextBefore) : 100;
@@ -17254,7 +17439,7 @@ operationsRouter.get("/api/annotations/:id/context", async (c) => {
   try {
     const response = await AnnotationContext.getAnnotationContext(
       annotationId(id),
-      resourceId(resourceId20),
+      resourceId(resourceId21),
       contextBefore,
       contextAfter,
       kb
@@ -17280,14 +17465,14 @@ operationsRouter.get("/api/annotations/:id/summary", async (c) => {
   const { id } = c.req.param();
   const query = c.req.query();
   const { knowledgeSystem: { gatherer } } = c.get("makeMeaning");
-  const resourceId20 = query.resourceId;
-  if (!resourceId20) {
+  const resourceId21 = query.resourceId;
+  if (!resourceId21) {
     throw new HTTPException(400, { message: "resourceId query parameter is required" });
   }
   try {
     const response = await gatherer.generateAnnotationSummary(
       annotationId(id),
-      resourceId(resourceId20)
+      resourceId(resourceId21)
     );
     return c.json(response);
   } catch (error) {
@@ -17774,6 +17959,7 @@ app.use("*", async (c, next) => {
   c.set("makeMeaning", makeMeaning);
   await next();
 });
+app.route("/", rootRouter);
 app.route("/", healthRouter);
 app.route("/", authRouter);
 app.route("/", statusRouter);