agor-live 0.23.1 → 0.23.2

package/dist/daemon/setup/socketio.js

@@ -1,6 +1,6 @@
 // src/setup/socketio.ts
-import { resolveTenantContext } from "@agor/core/config";
-import { shortId } from "@agor/core/db";
+import { resolveTenantContext as resolveTenantContext2 } from "@agor/core/config";
+import { shortId as shortId3 } from "@agor/core/db";
 import jwt2 from "jsonwebtoken";
 
 // src/auth/runtime-tokens.ts
@@ -8,6 +8,37 @@ import jwt from "jsonwebtoken";
 var RUNTIME_JWT_ISSUER = "agor";
 var RUNTIME_JWT_AUDIENCE = "https://agor.dev";
 
+// src/utils/realtime-publish.ts
+import {
+  resolveTenantContext,
+  TenantResolutionError
+} from "@agor/core/config";
+import { getCurrentTenantId, shortId as shortId2 } from "@agor/core/db";
+import { hasMinimumRole as hasMinimumRole2, ROLES as ROLES2 } from "@agor/core/types";
+
+// src/utils/branch-authorization.ts
+import { shortId } from "@agor/core/db";
+import { Forbidden, NotAuthenticated, NotFound } from "@agor/core/feathers";
+import { BRANCH_PERMISSION_LEVELS, hasMinimumRole, ROLES } from "@agor/core/types";
+var PERMISSION_RANK = Object.fromEntries(
+  BRANCH_PERMISSION_LEVELS.map((level, i) => [level, i - 1])
+);
+
+// src/utils/realtime-access-cache.ts
+var DEFAULT_BRANCH_VISIBILITY_TTL_MS = 5 * 6e4;
+var DEFAULT_SESSION_BRANCH_TTL_MS = 60 * 6e4;
+
+// src/utils/realtime-publish.ts
+var SESSION_STREAM_CHANNEL_PREFIX = "session-stream:";
+function leaveAllSessionStreamChannels(app, connection) {
+  for (const name of app.channels ?? []) {
+    if (name.startsWith(SESSION_STREAM_CHANNEL_PREFIX)) {
+      app.channel(name).leave(connection);
+    }
+  }
+}
+var DEBUG_REALTIME_PUBLISH = process.env.AGOR_DEBUG_REALTIME_PUBLISH === "1" || process.env.DEBUG?.includes("realtime-publish");
+
 // src/setup/socketio.ts
 function socketAuthState(userId, isService, tenant) {
   return tenant ? { userId, isService, tenant } : { userId, isService };
@@ -107,7 +138,7 @@ function createSocketIOConfig(app, options) {
         if (tokenType !== void 0 && tokenType !== "access" && tokenType !== "service") {
           return next(new Error("Invalid token type"));
         }
-        const tenant = multiTenancy ? resolveTenantContext(multiTenancy, {
+        const tenant = multiTenancy ? resolveTenantContext2(multiTenancy, {
           authPayload: decoded,
           headers: socket.handshake.headers
         }) : void 0;
@@ -144,7 +175,7 @@ function createSocketIOConfig(app, options) {
           fs.tenant = tenant;
           if (fs.data) fs.data.tenant = tenant;
         }
-        console.log(`\u{1F510} WebSocket authenticated: ${socket.id} (user: ${shortId(user.user_id)})`);
+        console.log(`\u{1F510} WebSocket authenticated: ${socket.id} (user: ${shortId3(user.user_id)})`);
         next();
       } catch (error) {
         console.error(`\u274C WebSocket authentication failed for ${socket.id}:`, error);
@@ -155,7 +186,7 @@ function createSocketIOConfig(app, options) {
       activeConnections++;
       const user = socket.feathers?.user;
       console.log(
-        `\u{1F50C} Socket.io connection established: ${socket.id} (user: ${user ? shortId(user.user_id) : "unknown"}, total: ${activeConnections})`
+        `\u{1F50C} Socket.io connection established: ${socket.id} (user: ${user ? shortId3(user.user_id) : "unknown"}, total: ${activeConnections})`
       );
       if (buildInfo) {
         socket.emit("server-info", {
@@ -166,7 +197,7 @@ function createSocketIOConfig(app, options) {
       if (user?.user_id) {
         socket.join(userRoomName(user.user_id));
         console.log(
-          `\u{1F3E0} Socket ${socket.id} joined user room at connection: user:${shortId(user.user_id)}`
+          `\u{1F3E0} Socket ${socket.id} joined user room at connection: user:${shortId3(user.user_id)}`
         );
       }
       setTimeout(() => {
@@ -251,7 +282,7 @@ function createSocketIOConfig(app, options) {
         if (typeof payloadUserId !== "string" || payloadUserId !== auth.userId) {
           rejectTerminal(
             event,
-            `payload userId (${shortId(String(payloadUserId))}\u2026) does not match authed userId (${shortId(auth.userId)}\u2026)`
+            `payload userId (${shortId3(String(payloadUserId))}\u2026) does not match authed userId (${shortId3(auth.userId)}\u2026)`
           );
           return null;
         }
@@ -275,7 +306,7 @@ function createSocketIOConfig(app, options) {
         if (!auth.isService && auth.userId !== target) {
           rejectTerminal(
             "join",
-            `user ${auth.userId ? shortId(auth.userId) : "unknown"}\u2026 tried to join ${shortId(target)}\u2026's channel`
+            `user ${auth.userId ? shortId3(auth.userId) : "unknown"}\u2026 tried to join ${shortId3(target)}\u2026's channel`
           );
           return;
         }
@@ -293,7 +324,7 @@ function createSocketIOConfig(app, options) {
           if (!auth.isService && auth.userId !== target) {
             rejectTerminal(
               "leave",
-              `user ${auth.userId ? shortId(auth.userId) : "unknown"}\u2026 tried to leave ${shortId(target)}\u2026's channel`
+              `user ${auth.userId ? shortId3(auth.userId) : "unknown"}\u2026 tried to leave ${shortId3(target)}\u2026's channel`
             );
             return;
           }
@@ -394,7 +425,7 @@ function createSocketIOConfig(app, options) {
         if (socket.feathers === context.connection) {
           socket.join(userRoomName(userId));
           console.debug(
-            `\u{1F3E0} Socket ${socket.id} joined user room after login: user:${shortId(userId)}`
+            `\u{1F3E0} Socket ${socket.id} joined user room after login: user:${shortId3(userId)}`
           );
           break;
         }
@@ -422,7 +453,7 @@ function configureChannels(app, options = {}) {
       const result = authResult;
       console.debug("\u2705 Login event fired:", result.user?.user_id, result.user?.email);
       const connection = context.connection;
-      const tenant = options.multiTenancy ? resolveTenantContext(options.multiTenancy, {
+      const tenant = options.multiTenancy ? resolveTenantContext2(options.multiTenancy, {
         params: {
           user: result.user,
           authentication: { payload: result.authentication?.payload }
@@ -454,6 +485,7 @@ function configureChannels(app, options = {}) {
           app.channel(tenantUserChannelName(tenant.tenant_id, userId)).leave(context.connection);
         }
       }
+      leaveAllSessionStreamChannels(app, context.connection);
     }
   });
 }

package/dist/daemon/startup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startup.d.ts","sourceRoot":"","sources":["../src/startup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAMpD,OAAO,EAKL,KAAK,wBAAwB,EAC9B,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAiB,OAAO,EAAa,IAAI,EAAiB,MAAM,kBAAkB,CAAC;AAE/F,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAoB,MAAM,mBAAmB,CAAC;AAM5F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAiBhE,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,WAAW,CAAC;IACjB,EAAE,EAAE,wBAAwB,CAAC;IAC7B,MAAM,EAAE,UAAU,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,wEAAwE;IACxE,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,2EAA2E;IAE3E,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,CAAC;IACnC,+DAA+D;IAC/D,eAAe,EAAE,MAAM,OAAO,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACzD,gDAAgD;IAChD,eAAe,EAAE,mBAAmB,CAAC;IACrC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;CAC3C;AA0ED,UAAU,mBAAmB;IAC3B,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,gBAAgB,EAAE,OAAO,EAAE,CAAC;IAC5B,2BAA2B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzC,WAAW,EAAE,IAAI,EAAE,CAAC;IACpB,8BAA8B,EAAE,MAAM,CAAC;CACxC;AAED,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAE7F;AA0SD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CASnF;AA0CD,wBAAsB,OAAO,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA8NhE"}
+{"version":3,"file":"startup.d.ts","sourceRoot":"","sources":["../src/startup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAMpD,OAAO,EAKL,KAAK,wBAAwB,EAC9B,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAiB,OAAO,EAAa,IAAI,EAAiB,MAAM,kBAAkB,CAAC;AAE/F,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAoB,MAAM,mBAAmB,CAAC;AAM5F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAiBhE,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,WAAW,CAAC;IACjB,EAAE,EAAE,wBAAwB,CAAC;IAC7B,MAAM,EAAE,UAAU,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,wEAAwE;IACxE,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,2EAA2E;IAE3E,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG,CAAC;IACnC,+DAA+D;IAC/D,eAAe,EAAE,MAAM,OAAO,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACzD,gDAAgD;IAChD,eAAe,EAAE,mBAAmB,CAAC;IACrC,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;CAC3C;AA0ED,UAAU,mBAAmB;IAC3B,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,IAAI,EAAE,CAAC;IACtB,gBAAgB,EAAE,OAAO,EAAE,CAAC;IAC5B,2BAA2B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzC,WAAW,EAAE,IAAI,EAAE,CAAC;IACpB,8BAA8B,EAAE,MAAM,CAAC;CACxC;AAED,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAE7F;AAyUD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CASnF;AA0CD,wBAAsB,OAAO,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA8NhE"}

package/dist/daemon/startup.js

@@ -60,7 +60,7 @@ import {
   SessionRepository as SessionRepository3,
   shortId as shortId6
 } from "@agor/core/db";
-import { SessionStatus as SessionStatus2, TaskStatus } from "@agor/core/types";
+import { isTerminalTaskStatus, SessionStatus as SessionStatus2, TaskStatus } from "@agor/core/types";
 
 // src/services/executor-heartbeat-supervisor.ts
 import { shortId } from "@agor/core/db";
@@ -134,6 +134,7 @@ import { ENVIRONMENT } from "@agor/core/config";
 import {
   BranchRepository,
   getHiddenTenantId,
+  runWithoutTenantDatabaseScope,
   runWithSystemDatabaseScope,
   runWithTenantDatabaseScope,
   shortId as shortId2
@@ -223,15 +224,17 @@ var HealthMonitor = class {
   startMonitoring(branchId, params = this.branchParams.get(branchId)) {
     this.stopMonitoring(branchId);
     if (params) this.branchParams.set(branchId, params);
-    setTimeout(() => {
-      if (this.isShuttingDown) return;
-      this.checkHealth(branchId);
-      const interval = setInterval(() => {
+    runWithoutTenantDatabaseScope(() => {
+      setTimeout(() => {
         if (this.isShuttingDown) return;
         this.checkHealth(branchId);
-      }, ENVIRONMENT.HEALTH_CHECK_INTERVAL_MS);
-      this.intervals.set(branchId, interval);
-    }, ENVIRONMENT.STARTUP_GRACE_PERIOD_MS);
+        const interval = setInterval(() => {
+          if (this.isShuttingDown) return;
+          this.checkHealth(branchId);
+        }, ENVIRONMENT.HEALTH_CHECK_INTERVAL_MS);
+        this.intervals.set(branchId, interval);
+      }, ENVIRONMENT.STARTUP_GRACE_PERIOD_MS);
+    });
   }
   /**
    * Stop monitoring a branch's health
@@ -1895,18 +1898,36 @@ async function cleanupOrphanStatusesInTenantScope(ctx) {
       }
     }
   }
-  const stuckIdleResult = await sessionsService.find({
+  const bootInterruptedTaskIds = /* @__PURE__ */ new Set([
+    ...orphanedTasks.map((t) => t.task_id),
+    ...queuedTasks.map((t) => t.task_id)
+  ]);
+  const idleNotReadyResult = await sessionsService.find({
     query: { status: SessionStatus2.IDLE, ready_for_prompt: false, $limit: 1e3 },
     ...startupParams
   });
-  const stuckIdleSessions = stuckIdleResult.data;
-  if (stuckIdleSessions.length > 0) {
-    for (const session of stuckIdleSessions) {
-      await app.service("sessions").patch(session.session_id, { ready_for_prompt: true }, startupParams);
-      startupDebug(
-        `   \u2713 Unblocked stuck-idle session ${shortId6(session.session_id)} (ready_for_prompt was false)`
-      );
+  const stuckIdleSessions = [];
+  for (const session of idleNotReadyResult.data) {
+    const latestTaskId = session.tasks?.at(-1);
+    if (!latestTaskId) {
+      continue;
     }
+    let wasInterrupted = bootInterruptedTaskIds.has(latestTaskId);
+    if (!wasInterrupted) {
+      try {
+        const latestTask = await tasksService.get(latestTaskId, startupParams);
+        wasInterrupted = !isTerminalTaskStatus(latestTask.status);
+      } catch {
+      }
+    }
+    if (!wasInterrupted) {
+      continue;
+    }
+    stuckIdleSessions.push(session);
+    await app.service("sessions").patch(session.session_id, { ready_for_prompt: true }, startupParams);
+    startupDebug(
+      `   \u2713 Unblocked stuck-idle session ${shortId6(session.session_id)} (ready_for_prompt was false, latest task interrupted)`
+    );
   }
   const cleanupParts = [
     `${orphanedTasks.length} orphaned task(s) stopped`,

package/dist/daemon/utils/authorization.js

@@ -4,19 +4,33 @@ import { hasMinimumRole, ROLES } from "@agor/core/types";
 
 // src/auth/executor-runtime-scope.ts
 import { Forbidden } from "@agor/core/feathers";
+
+// src/auth/executor-session-token.ts
+var EXECUTOR_SESSION_TOKEN_TYPE = "executor-session";
+var EXECUTOR_SESSION_TOKEN_PURPOSE = "executor-task";
+function isExecutorSessionTokenPayload(payload) {
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)) return false;
+  const record = payload;
+  return record.type === EXECUTOR_SESSION_TOKEN_TYPE && record.purpose === EXECUTOR_SESSION_TOKEN_PURPOSE;
+}
+function getExecutorSessionTokenSessionId(payload) {
+  return payload.session_id ?? payload.sessionId;
+}
+
+// src/auth/executor-runtime-scope.ts
 function scopedPayload(context) {
   const params = context.params;
   const payload = params.authentication?.payload;
-  if (payload?.type === "executor-session") {
-    if (payload.purpose !== "executor-task") {
+  if (payload?.type === EXECUTOR_SESSION_TOKEN_TYPE) {
+    if (!isExecutorSessionTokenPayload(payload)) {
       throw new Forbidden("Executor token is not valid for this request");
     }
     return payload;
   }
   if (params.authentication?.strategy === "jwt" && params.task_id) {
     return {
-      type: "executor-session",
-      purpose: "executor-task",
+      type: EXECUTOR_SESSION_TOKEN_TYPE,
+      purpose: EXECUTOR_SESSION_TOKEN_PURPOSE,
       task_id: params.task_id,
       session_id: params.session_id,
       sessionId: params.sessionId,
@@ -126,7 +140,7 @@ function executorRuntimeScopeGuard() {
     const payload = scopedPayload(context);
     if (!payload) return context;
     const scope = {
-      sessionId: payload.session_id ?? payload.sessionId,
+      sessionId: getExecutorSessionTokenSessionId(payload),
       taskId: payload.task_id,
       branchId: payload.branch_id
     };

package/dist/daemon/utils/emit-service-event.d.ts

@@ -0,0 +1,56 @@
+import type { Application } from '@agor/core/feathers';
+import type { HookContext } from '@agor/core/types';
+export type ManualServiceEvent = {
+    /**
+     * Service path the event belongs to (e.g. `'branches'`). Load-bearing: the
+     * realtime publish handler keys tenant + branch/session RBAC scoping off
+     * `context.path`.
+     */
+    path: string;
+    /**
+     * Service event name. Typically one of `created` | `updated` | `patched` |
+     * `removed` (the method is inferred from these), but any custom event string
+     * is supported — pass `method` to set the inferred CRUD method for those.
+     */
+    event: string;
+    /** Record to broadcast (becomes both the event payload and `hook.result`). */
+    data: unknown;
+    /**
+     * Request params carrying tenant/connection context. Load-bearing: without a
+     * resolvable tenant here (or an ambient tenant DB scope), multi-tenant
+     * publishing suppresses the event to service-only sockets.
+     */
+    params?: HookContext['params'];
+    /** Optional record id (publisher uses it as a branch-id fallback and for logging). */
+    id?: HookContext['id'];
+    /** Overrides the CRUD method inferred from `event`. */
+    method?: string;
+};
+/**
+ * Manually emit a Feathers service event with a correctly-shaped publish
+ * context.
+ *
+ * Some services persist through a raw adapter path (e.g. an overridden
+ * `patch()` that calls `super.patch()`), which bypasses Feathers' automatic
+ * event dispatch — so those call sites must emit the service event by hand.
+ *
+ * The shape of the emit matters. Feathers' transport-commons publish listener
+ * passes the THIRD `emit` argument through UNCHANGED as the publish `hook`, and
+ * only synthesizes a fake `{ path, service, app, result }` when that argument
+ * is absent (`@feathersjs/transport-commons` `channels/index.ts`). Automatic
+ * events, by contrast, emit the full HookContext (`@feathersjs/feathers`
+ * `events.ts`). So both malformed shapes lose something the global publish
+ * handler (`configureRealtimePublish`) needs:
+ *   - passing NO third arg gets a synthesized `path`, but no `context.params`
+ *     (no tenant/connection context), and
+ *   - passing raw params as the third arg carries `context.params`-looking data
+ *     at the wrong nesting AND loses `path` (Feathers won't synthesize it once a
+ *     third arg is present).
+ * Either way the handler can't resolve the tenant channel (multi-tenancy)
+ * and/or the branch/session RBAC scope, so it degrades to global-scope
+ * broadcast or service-only suppression.
+ *
+ * Build the hook shape once, here, so call sites can't drift on it.
+ */
+export declare function emitServiceEvent(app: Application, event: ManualServiceEvent): void;
+//# sourceMappingURL=emit-service-event.d.ts.map

package/dist/daemon/utils/emit-service-event.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"emit-service-event.d.ts","sourceRoot":"","sources":["../../src/utils/emit-service-event.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AASpD,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IACd,8EAA8E;IAC9E,IAAI,EAAE,OAAO,CAAC;IACd;;;;OAIG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC/B,sFAAsF;IACtF,EAAE,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IACvB,uDAAuD;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI,CAclF"}

package/dist/daemon/utils/emit-service-event.js

@@ -0,0 +1,23 @@
+// src/utils/emit-service-event.ts
+var DEFAULT_EVENT_METHOD = {
+  created: "create",
+  updated: "update",
+  patched: "patch",
+  removed: "remove"
+};
+function emitServiceEvent(app, event) {
+  const service = app.service(event.path);
+  service.emit?.(event.event, event.data, {
+    app,
+    service,
+    path: event.path,
+    method: event.method ?? DEFAULT_EVENT_METHOD[event.event] ?? "patch",
+    event: event.event,
+    id: event.id,
+    result: event.data,
+    params: event.params ?? {}
+  });
+}
+export {
+  emitServiceEvent
+};

package/dist/daemon/utils/mcp-header-secrets.d.ts

@@ -1,12 +1,10 @@
 import type { MCPServer, Params } from '@agor/core/types';
+import { type ExecutorSessionTokenPayload } from '../auth/executor-session-token.js';
 export type MCPSecretParams = Params & {
     authentication?: {
         strategy?: string;
-        payload?: {
-            type?: string;
-            session_id?: string;
-            sessionId?: string;
-        };
+        accessToken?: string;
+        payload?: ExecutorSessionTokenPayload;
     };
     user?: {
         role?: string;

package/dist/daemon/utils/mcp-header-secrets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-header-secrets.d.ts","sourceRoot":"","sources":["../../src/utils/mcp-header-secrets.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1D,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG;IACrC,cAAc,CAAC,EAAE;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE;YACR,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,UAAU,CAAC,EAAE,MAAM,CAAC;YACpB,SAAS,CAAC,EAAE,MAAM,CAAC;SACpB,CAAC;KACH,CAAC;IACF,IAAI,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IACtD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACvC;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,2CAA2C,CACzD,MAAM,CAAC,EAAE,eAAe,EACxB,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACnC,OAAO,CAST;AAED,wBAAgB,4BAA4B,CAC1C,MAAM,CAAC,EAAE,eAAe,EACxB,OAAO,GAAE,wBAA6B,GACrC,OAAO,CAaT;AAGD,eAAO,MAAM,4BAA4B,qCAA+B,CAAC;AAEzE,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,CAWnE;AAGD,eAAO,MAAM,4BAA4B,+BAAyB,CAAC"}
+{"version":3,"file":"mcp-header-secrets.d.ts","sourceRoot":"","sources":["../../src/utils/mcp-header-secrets.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EACL,KAAK,2BAA2B,EAGjC,MAAM,mCAAmC,CAAC;AAE3C,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG;IACrC,cAAc,CAAC,EAAE;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,OAAO,CAAC,EAAE,2BAA2B,CAAC;KACvC,CAAC;IACF,IAAI,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IACtD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACvC;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,2CAA2C,CACzD,MAAM,CAAC,EAAE,eAAe,EACxB,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACnC,OAAO,CAST;AAuBD,wBAAgB,4BAA4B,CAC1C,MAAM,CAAC,EAAE,eAAe,EACxB,OAAO,GAAE,wBAA6B,GACrC,OAAO,CAaT;AAGD,eAAO,MAAM,4BAA4B,qCAA+B,CAAC;AAEzE,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,CAWnE;AAGD,eAAO,MAAM,4BAA4B,+BAAyB,CAAC"}

package/dist/daemon/utils/mcp-header-secrets.js

@@ -1,11 +1,40 @@
 // src/utils/mcp-header-secrets.ts
 import { redactMCPAuthSecrets } from "@agor/core/tools/mcp/auth-secrets";
 import { redactMCPCustomHeaders } from "@agor/core/tools/mcp/http-headers";
+import jwt from "jsonwebtoken";
+
+// src/auth/executor-session-token.ts
+var EXECUTOR_SESSION_TOKEN_TYPE = "executor-session";
+var EXECUTOR_SESSION_TOKEN_PURPOSE = "executor-task";
+function isExecutorSessionTokenPayload(payload) {
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)) return false;
+  const record = payload;
+  return record.type === EXECUTOR_SESSION_TOKEN_TYPE && record.purpose === EXECUTOR_SESSION_TOKEN_PURPOSE;
+}
+function getExecutorSessionTokenSessionId(payload) {
+  return payload.session_id ?? payload.sessionId;
+}
+
+// src/utils/mcp-header-secrets.ts
 function shouldExposeMCPServerSecretsForSessionToken(params, options = {}) {
-  const payload = params?.authentication?.payload;
-  const sessionId = params?.session_id ?? payload?.session_id ?? payload?.sessionId;
+  const payload = params?.authentication?.payload ?? decodeExecutorSessionPayload(params);
+  const sessionId = params?.session_id ?? getPayloadSessionId(payload);
   return !!params?.provider && (params.authentication?.strategy === "session-token" || payload?.type === "executor-session") && !!sessionId && (!options.sessionId || sessionId === options.sessionId);
 }
+function decodeExecutorSessionPayload(params) {
+  if (params?.authentication?.strategy !== "jwt" || !params.authentication.accessToken) {
+    return void 0;
+  }
+  const decoded = jwt.decode(params.authentication.accessToken);
+  if (!decoded || typeof decoded !== "object" || Array.isArray(decoded)) {
+    return void 0;
+  }
+  if (!isExecutorSessionTokenPayload(decoded)) return void 0;
+  return decoded;
+}
+function getPayloadSessionId(payload) {
+  return payload ? getExecutorSessionTokenSessionId(payload) : void 0;
+}
 function shouldExposeMCPServerSecrets(params, options = {}) {
   if (!params?.provider) return true;
   if (params.user?._isServiceAccount || params.user?.role === "service") return true;

package/dist/daemon/utils/realtime-access-cache.d.ts

@@ -11,6 +11,7 @@ export type RealtimeAccessBranchRepository = {
 };
 export type RealtimeAccessSessionRepository = {
     findBranchIdBySessionId(sessionId: string): Promise<BranchID | null>;
+    findCreatedByBySessionId(sessionId: string): Promise<UUID | null>;
 };
 export interface RealtimeAccessCacheOptions {
     branchRepository: RealtimeAccessBranchRepository;
@@ -29,11 +30,19 @@ export declare class RealtimeAccessCache {
     private readonly options;
     private readonly branchVisibility;
     private readonly sessionBranches;
+    private readonly sessionOwners;
     private readonly branchVisibilityTtlMs;
     private readonly sessionBranchTtlMs;
     private readonly now;
     constructor(options: RealtimeAccessCacheOptions);
     getBranchIdForSession(sessionId: string): Promise<BranchID | null>;
+    /**
+     * Owning user id for a session, cached on the same cadence as the
+     * session→branch map. Used only to offer streaming events to the session
+     * creator's own connections as a fallback when they haven't subscribed to
+     * the per-session stream channel yet.
+     */
+    getSessionOwnerId(sessionId: string): Promise<UserID | null>;
     getBranchVisibility(branchId: BranchID): Promise<BranchRealtimeVisibility | null>;
     invalidateBranch(branchId: string): void;
     invalidateSession(sessionId: string): void;

package/dist/daemon/utils/realtime-access-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"realtime-access-cache.d.ts","sourceRoot":"","sources":["../../src/utils/realtime-access-cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAGvE,MAAM,MAAM,wBAAwB,GAChC;IAAE,IAAI,EAAE,kBAAkB,CAAA;CAAE,GAC5B;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC;AAEpD,MAAM,MAAM,8BAA8B,GAAG;IAC3C,4BAA4B,CAC1B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5D,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;CAC9D,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG;IAC5C,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;CACtE,CAAC;AAWF,MAAM,WAAW,0BAA0B;IACzC,gBAAgB,EAAE,8BAA8B,CAAC;IACjD,kBAAkB,EAAE,+BAA+B,CAAC;IACpD,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAUD;;;;GAIG;AACH,qBAAa,mBAAmB;IAOlB,OAAO,CAAC,QAAQ,CAAC,OAAO;IANpC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmD;IACpF,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA8C;IAC9E,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAS;IAC/C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;gBAEN,OAAO,EAAE,0BAA0B;IAQ1D,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAelE,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,wBAAwB,GAAG,IAAI,CAAC;IA+BvF,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IASxC,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAI1C,eAAe,IAAI,IAAI;IAIvB,QAAQ,IAAI,IAAI;IAKhB,OAAO,CAAC,mBAAmB;CAK5B"}
+{"version":3,"file":"realtime-access-cache.d.ts","sourceRoot":"","sources":["../../src/utils/realtime-access-cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAGvE,MAAM,MAAM,wBAAwB,GAChC;IAAE,IAAI,EAAE,kBAAkB,CAAA;CAAE,GAC5B;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC;AAEpD,MAAM,MAAM,8BAA8B,GAAG;IAC3C,4BAA4B,CAC1B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5D,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;CAC9D,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG;IAC5C,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;IACrE,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;CACnE,CAAC;AAgBF,MAAM,WAAW,0BAA0B;IACzC,gBAAgB,EAAE,8BAA8B,CAAC;IACjD,kBAAkB,EAAE,+BAA+B,CAAC;IACpD,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAUD;;;;GAIG;AACH,qBAAa,mBAAmB;IAQlB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAPpC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmD;IACpF,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA8C;IAC9E,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA6C;IAC3E,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAS;IAC/C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;gBAEN,OAAO,EAAE,0BAA0B;IAQ1D,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAexE;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAkB5D,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,wBAAwB,GAAG,IAAI,CAAC;IA+BvF,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IASxC,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAK1C,eAAe,IAAI,IAAI;IAIvB,QAAQ,IAAI,IAAI;IAMhB,OAAO,CAAC,mBAAmB;CAK5B"}

package/dist/daemon/utils/realtime-access-cache.js

@@ -22,6 +22,7 @@ var RealtimeAccessCache = class {
   }
   branchVisibility = /* @__PURE__ */ new Map();
   sessionBranches = /* @__PURE__ */ new Map();
+  sessionOwners = /* @__PURE__ */ new Map();
   branchVisibilityTtlMs;
   sessionBranchTtlMs;
   now;
@@ -38,6 +39,27 @@ var RealtimeAccessCache = class {
     });
     return branchId;
   }
+  /**
+   * Owning user id for a session, cached on the same cadence as the
+   * session→branch map. Used only to offer streaming events to the session
+   * creator's own connections as a fallback when they haven't subscribed to
+   * the per-session stream channel yet.
+   */
+  async getSessionOwnerId(sessionId) {
+    const cached = this.sessionOwners.get(sessionId);
+    const now = this.now();
+    if (cached && cached.expiresAt > now) {
+      return cached.ownerId;
+    }
+    const ownerId = await this.options.sessionsRepository.findCreatedByBySessionId(
+      sessionId
+    ) ?? null;
+    this.sessionOwners.set(sessionId, {
+      ownerId,
+      expiresAt: now + this.sessionBranchTtlMs
+    });
+    return ownerId;
+  }
   async getBranchVisibility(branchId) {
     const cached = this.branchVisibility.get(branchId);
     const now = this.now();
@@ -73,6 +95,7 @@ var RealtimeAccessCache = class {
   }
   invalidateSession(sessionId) {
     this.sessionBranches.delete(sessionId);
+    this.sessionOwners.delete(sessionId);
   }
   clearVisibility() {
     this.branchVisibility.clear();
@@ -80,6 +103,7 @@ var RealtimeAccessCache = class {
   clearAll() {
     this.branchVisibility.clear();
     this.sessionBranches.clear();
+    this.sessionOwners.clear();
   }
   visibilityFromEntry(entry) {
     return entry.mode === "allAuthenticated" ? { mode: "allAuthenticated" } : { mode: "explicitUsers", userIds: entry.userIds };

package/dist/daemon/utils/realtime-publish.d.ts

@@ -2,6 +2,30 @@ import { type ResolvedMultiTenancyConfig } from '@agor/core/config';
 import type { BranchRepository, SessionRepository } from '@agor/core/db';
 import type { Application } from '@agor/core/feathers';
 import { RealtimeAccessCache } from './realtime-access-cache.js';
+export declare function sessionStreamChannelName(sessionId: string): string;
+/**
+ * Remove a connection from every session-stream room it has joined. Called on
+ * logout so a still-connected-but-deauthenticated socket stops receiving live
+ * session text — Feathers only auto-drops channel membership on socket
+ * disconnect, and streaming delivery would otherwise keep reaching a logged-out
+ * connection (which is no longer in the authenticated/tenant channels but may
+ * still sit in a session-stream room).
+ */
+export declare function leaveAllSessionStreamChannels(app: Application, connection: unknown): void;
+/**
+ * Join a connection to a session's streaming room. Centralized here (the
+ * tenant-aware realtime facade) so subscribe/publish share one channel name
+ * and the raw `app.channel` surface stays in a single audited file.
+ */
+export declare function joinSessionStreamChannel(app: Application, sessionId: string, connection: unknown): void;
+/**
+ * Remove a connection from a session's streaming room, but only if the room
+ * already exists. A `remove` for a never-joined room (any authenticated caller
+ * can send one) or a dispose after logout/disconnect already pruned the room
+ * would otherwise re-materialize an empty, never-cleaned channel — the same
+ * leak class as the publish path. `.leave` on an absent room is a no-op anyway.
+ */
+export declare function leaveSessionStreamChannel(app: Application, sessionId: string, connection: unknown): void;
 type RealtimePublishOptions = {
     app: Application;
     branchRbacEnabled: boolean;

package/dist/daemon/utils/realtime-publish.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"realtime-publish.d.ts","sourceRoot":"","sources":["../../src/utils/realtime-publish.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,0BAA0B,EAGhC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIvD,OAAO,EAEL,mBAAmB,EAEpB,MAAM,4BAA4B,CAAC;AAuBpC,KAAK,sBAAsB,GAAG;IAC5B,GAAG,EAAE,WAAW,CAAC;IACjB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,kBAAkB,EAAE,iBAAiB,CAAC;IACtC,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,0BAA0B,CAAC;CAC3C,CAAC;AAkSF;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI,CA6E9E"}
+{"version":3,"file":"realtime-publish.d.ts","sourceRoot":"","sources":["../../src/utils/realtime-publish.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,0BAA0B,EAGhC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIvD,OAAO,EAEL,mBAAmB,EAEpB,MAAM,4BAA4B,CAAC;AAkBpC,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAElE;AAED;;;;;;;GAOG;AACH,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,GAAG,IAAI,CAMzF;AAcD;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,WAAW,EAChB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,OAAO,GAClB,IAAI,CAEN;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,WAAW,EAChB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,OAAO,GAClB,IAAI,CAEN;AAmBD,KAAK,sBAAsB,GAAG;IAC5B,GAAG,EAAE,WAAW,CAAC;IACjB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,kBAAkB,EAAE,iBAAiB,CAAC;IACtC,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,0BAA0B,CAAC;CAC3C,CAAC;AAyZF;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI,CA2F9E"}