@amoshydra/oktoso 0.1.4 → 0.1.6

package/dist/hub.js

@@ -21159,6 +21159,7 @@ var zAttentionSummary = external_exports.object({
 var zAttention = external_exports.object({
   id: external_exports.string(),
   sessionRef: external_exports.string(),
+  parentRef: external_exports.string().optional(),
   type: zAttentionType,
   priority: zAttentionPriority,
   title: external_exports.string(),
@@ -21209,6 +21210,7 @@ var zSessionPage = external_exports.object({
 });
 var zSessionListQuery = external_exports.object({
   provider: external_exports.string().optional(),
+  scope: external_exports.enum(["all", "root"]).optional(),
   status: zSessionStatus.optional(),
   q: external_exports.string().optional(),
   cursor: external_exports.string().optional(),
@@ -25855,6 +25857,7 @@ var SessionService = class {
     const limit = clampLimit(query.limit);
     const search = query.q?.trim().toLowerCase();
     let data = [...this.sessions.values()];
+    if (query.scope === "root") data = data.filter((session) => !session.parentRef);
     if (query.provider) data = data.filter((session) => session.providerID === query.provider);
     if (query.status) data = data.filter((session) => session.status === query.status);
     if (search) {
@@ -26250,11 +26253,17 @@ var AttentionService = class {
           }
         }
       }
+      const blockingRefs = new Set(
+        [...next.values()].filter(
+          (item) => item.type === "permission" || item.type === "approval" || item.type === "question"
+        ).map((item) => item.sessionRef)
+      );
       const unreadSessions = sessionPage.data.filter(
-        (session) => session.status !== "error" && session.unread && this.now() - session.updatedAt <= this.unreadWindowMs
+        (session) => !session.parentRef && !blockingRefs.has(session.ref) && session.status !== "error" && session.unread && this.now() - session.updatedAt <= this.unreadWindowMs
       ).sort((left, right) => right.updatedAt - left.updatedAt).slice(0, this.maxUnread);
       const unreadRefs = new Set(unreadSessions.map((session) => session.ref));
       for (const session of sessionPage.data) {
+        if (session.parentRef) continue;
         if (session.status === "error") {
           const item = {
             id: `${session.providerID}:error:${session.nativeID}:${session.updatedAt}`,
@@ -26348,9 +26357,11 @@ var AttentionService = class {
   }
   enrichProviderItem(item, session) {
     if (!session) return item;
+    const parent = session.parentRef ? { parentRef: session.parentRef } : {};
     if (item.type === "permission" || item.type === "approval") {
       return {
         ...item,
+        ...parent,
         title: session.title,
         summary: item.summary || item.title
       };
@@ -26358,11 +26369,12 @@ var AttentionService = class {
     if (item.type === "question") {
       return {
         ...item,
+        ...parent,
         title: session.title,
         summary: [item.title, item.summary].filter(Boolean).join(" \xB7 ")
       };
     }
-    return item;
+    return { ...item, ...parent };
   }
   async emitChanges(previous, next) {
     for (const [id, item] of next) {
@@ -29444,7 +29456,7 @@ var IdempotencyService = class {
 };
 
 // package.json
-var version2 = "0.1.4";
+var version2 = "0.1.6";
 
 // packages/hub/src/version.ts
 var VERSION = version2;
@@ -29590,16 +29602,17 @@ function requestHost(c) {
 }
 function isSameOriginRequest(c) {
   const origin = c.req.header("origin");
+  const site = c.req.header("sec-fetch-site");
   if (origin && origin !== "null") {
     try {
       const host = requestHost(c) ?? new URL(c.req.url).host;
-      return new URL(origin).host === host;
+      if (new URL(origin).host === host) return true;
     } catch {
-      return false;
     }
+    return site === "same-origin" || site === "none";
   }
-  const site = c.req.header("sec-fetch-site");
-  return site === "same-origin" || site === "none";
+  if (site) return site === "same-origin" || site === "none";
+  return false;
 }
 
 // packages/hub/src/http/auth-cookie.ts
@@ -29944,12 +29957,13 @@ function registerPairRoutes(app, deps) {
   });
   app.post("/pair/:code", (c) => {
     noStore2(c);
-    if (c.req.header("origin") && !isSameOriginRequest(c)) {
-      throw new AppError(
-        "forbidden",
-        "Cross-origin pairing request rejected",
-        403
-      );
+    if (!isSameOriginRequest(c)) {
+      c.get("logger").warn("pairing origin mismatch", {
+        origin: c.req.header("origin") ?? null,
+        host: requestHost(c) ?? null,
+        forwardedHost: c.req.header("x-forwarded-host") ?? null,
+        site: c.req.header("sec-fetch-site") ?? null
+      });
     }
     const consumed = deps.auth.consumePairing(c.req.param("code"));
     if (!consumed) {
@@ -30618,7 +30632,7 @@ function createApp(deps) {
   app.onError((error62, c) => {
     const requestId = c.get("requestId");
     const logger = c.get("logger") ?? deps.logger;
-    const appError = error62 instanceof AppError ? error62 : error62 instanceof ProviderError ? providerAppError(error62) : new AppError("internal", "Internal server error", 500);
+    const appError = appErrorFor(error62);
     logger.error("request failed", {
       code: appError.code,
       status: appError.status,
@@ -30640,6 +30654,19 @@ function createApp(deps) {
   });
   return app;
 }
+function isTimeoutError(error62) {
+  return error62 instanceof Error && (error62.name === "TimeoutError" || error62.name === "AbortError");
+}
+function appErrorFor(error62) {
+  if (error62 instanceof AppError) return error62;
+  if (error62 instanceof ProviderError) return providerAppError(error62);
+  if (isTimeoutError(error62)) {
+    return new AppError("timeout", "The hub request timed out", 504, {
+      retryable: true
+    });
+  }
+  return new AppError("internal", "Internal server error", 500);
+}
 function providerAppError(error62) {
   const status = error62.code === "not_found" ? 404 : error62.code === "conflict" ? 409 : error62.code === "rate_limited" ? 429 : error62.code === "invalid_request" ? 400 : error62.code === "unsupported" ? 501 : 502;
   return new AppError(error62.code, error62.message, status, {