agor-live 0.23.1 → 0.23.2

package/dist/daemon/register-services.js

@@ -1761,13 +1761,13 @@ var init_identity_token = __esm({
 function oidcFederationProvider(config) {
   return async () => {
     requireSecureTokenEndpoint(config.baseURL);
-    const jwt7 = await config.identityTokenProvider();
-    if (jwt7.length > 16 * 1024) {
-      throw new WorkloadIdentityError(`Identity token is ${Math.ceil(jwt7.length / 1024)} KiB, exceeds the 16 KiB assertion limit`);
+    const jwt8 = await config.identityTokenProvider();
+    if (jwt8.length > 16 * 1024) {
+      throw new WorkloadIdentityError(`Identity token is ${Math.ceil(jwt8.length / 1024)} KiB, exceeds the 16 KiB assertion limit`);
     }
     const body = {
       grant_type: GRANT_TYPE_JWT_BEARER,
-      assertion: jwt7,
+      assertion: jwt8,
       federation_rule_id: config.federationRuleId,
       organization_id: config.organizationId
     };
@@ -12143,6 +12143,24 @@ var init_sdk = __esm({
   }
 });
 
+// src/auth/executor-session-token.ts
+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;
+}
+var EXECUTOR_SESSION_TOKEN_TYPE, EXECUTOR_SESSION_TOKEN_PURPOSE;
+var init_executor_session_token = __esm({
+  "src/auth/executor-session-token.ts"() {
+    "use strict";
+    EXECUTOR_SESSION_TOKEN_TYPE = "executor-session";
+    EXECUTOR_SESSION_TOKEN_PURPOSE = "executor-task";
+  }
+});
+
 // src/mcp/tokens.ts
 var tokens_exports = {};
 __export(tokens_exports, {
@@ -12157,8 +12175,8 @@ __export(tokens_exports, {
 import { MCP_TOKEN } from "@agor/core/config";
 import {
   generateId as generateId4,
-  SessionRepository as SessionRepository4,
-  shortId as shortId16
+  SessionRepository as SessionRepository5,
+  shortId as shortId17
 } from "@agor/core/db";
 import {
   MCP_TOKEN_AUDIENCE,
@@ -12183,7 +12201,7 @@ function initMcpTokens(options) {
   const expirationMs = options.expirationMs ?? MCP_TOKEN.DEFAULT_EXPIRATION_MS;
   const now = options.now ?? (() => Date.now());
   _state = {
-    sessionRepo: new SessionRepository4(options.db),
+    sessionRepo: new SessionRepository5(options.db),
     expirationMs,
     now,
     tokenCache: /* @__PURE__ */ new Map(),
@@ -12213,7 +12231,7 @@ async function generateSessionToken2(app, sessionId, userId) {
   const cached = s.tokenCache.get(cacheKey);
   const refreshBufferMs = Math.min(5 * 60 * 1e3, Math.max(30 * 1e3, s.expirationMs * 0.1));
   if (cached && cached.expiresAtMs - nowMs > refreshBufferMs) {
-    mcpTokenDebug(`\u{1F3AB} MCP token cache hit: session=${shortId16(sessionId)}`);
+    mcpTokenDebug(`\u{1F3AB} MCP token cache hit: session=${shortId17(sessionId)}`);
     return cached.token;
   }
   const sessionExists = await s.sessionRepo.exists(sessionId);
@@ -12239,7 +12257,7 @@ async function generateSessionToken2(app, sessionId, userId) {
   const token = jwt4.sign(payload, jwtSecret, { algorithm: "HS256" });
   s.tokenCache.set(cacheKey, { token, expiresAtMs });
   mcpTokenDebug(
-    `\u{1F3AB} MCP token issued: session=${shortId16(sessionId)} jti=${jti.substring(0, 8)} exp=+${Math.floor(s.expirationMs / 1e3)}s`
+    `\u{1F3AB} MCP token issued: session=${shortId17(sessionId)} jti=${jti.substring(0, 8)} exp=+${Math.floor(s.expirationMs / 1e3)}s`
   );
   return token;
 }
@@ -12279,7 +12297,7 @@ async function validateSessionToken(app, token) {
   }
   const sessionExists = await s.sessionRepo.exists(sessionId);
   if (!sessionExists) {
-    console.warn(`[mcp-tokens] token rejected: session ${shortId16(sessionId)} not found`);
+    console.warn(`[mcp-tokens] token rejected: session ${shortId17(sessionId)} not found`);
     return null;
   }
   return { sessionId, userId, jti: payload.jti };
@@ -12299,8 +12317,8 @@ var session_token_service_exports = {};
 __export(session_token_service_exports, {
   SessionTokenService: () => SessionTokenService
 });
-import { getCurrentTenantId as getCurrentTenantId4 } from "@agor/core/db";
-import jwt6 from "jsonwebtoken";
+import { getCurrentTenantId as getCurrentTenantId5 } from "@agor/core/db";
+import jwt7 from "jsonwebtoken";
 function sessionTokenDebug(...args) {
   if (DEBUG_SESSION_TOKENS) {
     console.debug(...args);
@@ -12310,6 +12328,7 @@ var DEBUG_SESSION_TOKENS, SessionTokenService;
 var init_session_token_service = __esm({
   "src/services/session-token-service.ts"() {
     "use strict";
+    init_executor_session_token();
     DEBUG_SESSION_TOKENS = process.env.AGOR_DEBUG_SESSION_TOKENS === "1" || process.env.DEBUG?.includes("session-token");
     SessionTokenService = class {
       constructor(config) {
@@ -12335,14 +12354,12 @@ var init_session_token_service = __esm({
         }
         const now = /* @__PURE__ */ new Date();
         const expiresAt = new Date(now.getTime() + this.config.expiration_ms);
-        const tenantId = getCurrentTenantId4();
+        const tenantId = getCurrentTenantId5();
         const payload = {
           sub: userId,
           // Standard JWT subject claim (used by Feathers for user lookup)
-          type: "executor-session",
-          purpose: "executor-task",
-          sessionId,
-          // Custom claim for session tracking
+          type: EXECUTOR_SESSION_TOKEN_TYPE,
+          purpose: EXECUTOR_SESSION_TOKEN_PURPOSE,
           session_id: sessionId,
           task_id: scope.taskId,
           branch_id: scope.branchId,
@@ -12356,7 +12373,7 @@ var init_session_token_service = __esm({
           iss: "agor"
           // Must match Feathers jwtOptions.issuer
         };
-        const token = jwt6.sign(payload, this.jwtSecret, {
+        const token = jwt7.sign(payload, this.jwtSecret, {
           algorithm: "HS256"
           // Must match Feathers jwtOptions.algorithm
           // No expiresIn here - we set exp directly in payload
@@ -12557,12 +12574,14 @@ import {
   BoardRepository as BoardRepository5,
   BranchRepository as BranchRepository9,
   eq as eq4,
+  getCurrentTenantId as getCurrentTenantId6,
   inArray as inArray2,
+  isPostgresDatabase as isPostgresDatabase7,
   MCPServerRepository as MCPServerRepository4,
   SessionMCPServerRepository as SessionMCPServerRepository3,
   select as select4,
   sessionMcpServers,
-  shortId as shortId21,
+  shortId as shortId22,
   UserMCPOAuthTokenRepository as UserMCPOAuthTokenRepository3,
   visibleSessionReferenceAccessExists
 } from "@agor/core/db";
@@ -12571,7 +12590,7 @@ import {
   AGENTIC_TOOL_CAPABILITIES,
   isSessionExecuting,
   isTaskExecuting,
-  ROLES as ROLES16,
+  ROLES as ROLES17,
   SessionStatus as SessionStatus5,
   TaskStatus as TaskStatus3
 } from "@agor/core/types";
@@ -12586,6 +12605,13 @@ function untrackExecutorProcess(sessionId) {
   executorProcesses.delete(sessionId);
 }
 
+// src/oauth-auth-helpers.ts
+import { runWithTenantDatabaseScope } from "@agor/core/db";
+async function runInOAuthTenantScope(db, tenantId, work) {
+  if (!tenantId) return work();
+  return runWithTenantDatabaseScope(db, tenantId, work);
+}
+
 // src/oauth-cache.ts
 import { MCPServerRepository, UserMCPOAuthTokenRepository } from "@agor/core/db";
 import { resolveTokenExpiry } from "@agor/core/tools/mcp/oauth-token-expiry";
@@ -15874,6 +15900,13 @@ var BoardsService = class extends DrizzleService {
   async batchUpsertBoardObjects(boardId, objects, _params) {
     return this.boardRepo.batchUpsertBoardObjects(boardId, objects);
   }
+  /**
+   * Custom method: Atomically shallow-merge field patches into existing board
+   * objects (used by z-order reorder to persist only the changed zIndex).
+   */
+  async mergeBoardObjectFields(boardId, patches, _params) {
+    return this.boardRepo.mergeBoardObjectFields(boardId, patches);
+  }
   /**
    * Custom method: Delete a zone and handle associated sessions
    */
@@ -16853,6 +16886,27 @@ function shouldUseCloneReferencePath() {
   return (config.execution?.unix_user_mode ?? "simple") !== "strict";
 }
 
+// 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 ?? {}
+  });
+}
+
 // src/utils/git-impersonation.ts
 async function resolveDaemonUserForGroupRefresh() {
   const { getDaemonUser: getDaemonUser2, isUnixGroupRefreshNeeded } = await import("@agor/core/config");
@@ -16893,7 +16947,7 @@ import {
   enqueueTenantDatabasePostCommitCallback,
   getCurrentTenantId,
   runWithoutTenantDatabaseScope,
-  runWithTenantDatabaseScope
+  runWithTenantDatabaseScope as runWithTenantDatabaseScope2
 } from "@agor/core/db";
 import { NotAuthenticated as NotAuthenticated4 } from "@agor/core/feathers";
 import jwt2 from "jsonwebtoken";
@@ -16915,7 +16969,7 @@ function deferWithTenantDatabaseScope(db, params, work, onError) {
   const schedule = () => {
     runWithoutTenantDatabaseScope(() => {
       setImmediate(() => {
-        void runWithTenantDatabaseScope(db, tenantId, work).catch((error) => {
+        void runWithTenantDatabaseScope2(db, tenantId, work).catch((error) => {
           if (onError) {
             onError(error);
             return;
@@ -18295,7 +18349,13 @@ var BranchesService = class extends DrizzleService {
       },
       resolvedParams
     );
-    this.app.service("branches").emit?.("patched", branch);
+    emitServiceEvent(this.app, {
+      path: "branches",
+      event: "patched",
+      data: branch,
+      params: resolvedParams,
+      id
+    });
     return branch;
   }
   /**
@@ -18730,7 +18790,9 @@ var BranchesService = class extends DrizzleService {
         path: branch.path,
         custom_context: branch.custom_context,
         unix_gid: unixGid,
-        host_ip_address: hostIpAddress
+        host_ip_address: hostIpAddress,
+        base_ref: branch.base_ref,
+        ref_type: branch.ref_type
       },
       requestedVariant
     );
@@ -19185,6 +19247,9 @@ function isAlias(id) {
 }
 var CONTEXT_1M_BETA = "context-1m-2025-08-07";
 var ONE_MILLION_TOKENS = 9e5;
+function hasNativeMillionContext(id) {
+  return id.startsWith("claude-fable");
+}
 function toModelOptions(models) {
   const aliases = models.filter((m) => isAlias(m.id));
   const options = [];
@@ -19195,7 +19260,7 @@ function toModelOptions(models) {
       description: void 0,
       source: "dynamic"
     });
-    if (m.max_input_tokens && m.max_input_tokens >= ONE_MILLION_TOKENS) {
+    if (m.max_input_tokens && m.max_input_tokens >= ONE_MILLION_TOKENS && !hasNativeMillionContext(m.id)) {
       options.push({
         id: `${m.id}[1m]`,
         displayName: `${m.display_name} (1M context)`,
@@ -19539,6 +19604,7 @@ import { Forbidden as Forbidden7, NotAuthenticated as NotAuthenticated7 } from "
 import { hasMinimumRole as hasMinimumRole5, ROLES as ROLES5 } from "@agor/core/types";
 
 // src/auth/executor-runtime-scope.ts
+init_executor_session_token();
 import { Forbidden as Forbidden6 } from "@agor/core/feathers";
 
 // src/utils/authorization.ts
@@ -20278,7 +20344,8 @@ import {
   getHiddenTenantId,
   MCPServerRepository as MCPServerRepository2,
   runWithoutTenantDatabaseScope as runWithoutTenantDatabaseScope2,
-  runWithTenantDatabaseScope as runWithTenantDatabaseScope2,
+  runWithTenantDatabaseScope as runWithTenantDatabaseScope3,
+  SessionRepository as SessionRepository2,
   shortId as shortId10,
   ThreadSessionMapRepository,
   UserMCPOAuthTokenRepository as UserMCPOAuthTokenRepository2,
@@ -20373,6 +20440,13 @@ function oneLineForPrompt(text, maxChars = 900) {
   if (normalized.length <= maxChars) return normalized;
   return `${normalized.slice(0, Math.max(0, maxChars - 1))}\u2026`;
 }
+var SLACK_GATEWAY_REPLY_NOTE = "Note: Any assistant message you send in this current Agor session is streamed back directly to the Slack conversation. Only use outbound gateway tools when you intentionally need to start a separate thread, DM, or message.";
+function prependSlackGatewayReplyNote(prompt) {
+  if (prompt.includes(SLACK_GATEWAY_REPLY_NOTE)) return prompt;
+  return `${SLACK_GATEWAY_REPLY_NOTE}
+
+${prompt}`;
+}
 function formatSlackCatchUpPrompt(args) {
   const slackChannelName = typeof args.metadata?.slack_channel_name === "string" ? args.metadata.slack_channel_name : null;
   const slackChannelId = typeof args.metadata?.channel === "string" ? args.metadata.channel : args.threadId.split("-")[0];
@@ -20559,6 +20633,7 @@ var GatewayService = class _GatewayService {
   threadMapRepo;
   outboundRepo;
   branchRepo;
+  sessionRepo;
   usersRepo;
   mcpServerRepo;
   userTokenRepo;
@@ -20601,6 +20676,7 @@ var GatewayService = class _GatewayService {
     this.threadMapRepo = new ThreadSessionMapRepository(db);
     this.outboundRepo = new GatewayOutboundMessageRepository(db);
     this.branchRepo = new BranchRepository5(db);
+    this.sessionRepo = new SessionRepository2(db);
     this.usersRepo = new UsersRepository5(db);
     this.mcpServerRepo = new MCPServerRepository2(db);
     this.userTokenRepo = new UserMCPOAuthTokenRepository2(db);
@@ -21096,6 +21172,24 @@ ${chunk}` : chunk;
       console.warn("[gateway] Failed to mirror message stream to Slack:", error);
     }
   }
+  /**
+   * Session-context emits are hard-bound to the session's branch, with no
+   * admin-role bypass — agent sessions run as admin users, so a role bypass
+   * would let any session impersonate another assistant's channel. The error
+   * deliberately never echoes the channel's target branch, so a denied emit
+   * cannot be used to enumerate which branch a foreign channel serves.
+   */
+  async ensureSessionBranchBoundToChannel(channel, sessionId) {
+    const session = await this.sessionRepo.findById(sessionId);
+    if (!session) {
+      throw new Error("Gateway outbound denied: emitting session not found");
+    }
+    if (session.branch_id !== channel.target_branch_id) {
+      throw new Error(
+        `Gateway outbound denied: session ${shortId10(sessionId)} runs on branch ${shortId10(session.branch_id)}, but this channel targets a different branch. Sessions can emit only through gateway channels whose target branch matches their own. Call agor_gateway_outbound_targets_list to see usable channels.`
+      );
+    }
+  }
   async ensureCanEmitFromChannel(channel, userId, userRole) {
     if (hasMinimumRole6(userRole, ROLES8.ADMIN)) return;
     const branch = await this.branchRepo.findById(channel.target_branch_id);
@@ -21129,6 +21223,9 @@ ${chunk}` : chunk;
     if (config.outbound_enabled !== true) {
       throw new Error("Gateway outbound is disabled for this channel");
     }
+    if (data.emittedBySessionId) {
+      await this.ensureSessionBranchBoundToChannel(channel, data.emittedBySessionId);
+    }
     await this.ensureCanEmitFromChannel(channel, data.emittedByUserId, data.userRole);
     const target = data.target ?? (typeof config.default_outbound_target === "string" ? config.default_outbound_target : void 0);
     if (!target) throw new Error("No usable default outbound target configured");
@@ -21703,6 +21800,9 @@ ${chunk}` : chunk;
           promptText = contextPrefix + promptText;
         }
       }
+      if (channel.channel_type === "slack") {
+        promptText = prependSlackGatewayReplyNote(promptText);
+      }
       if (created && mcpAuthWarning) {
         promptText = `${mcpAuthWarning}
 
@@ -22010,7 +22110,7 @@ ${promptText}`;
     if (!tenantId) {
       throw new Error(`Missing tenant context for gateway listener channel ${channel.id}`);
     }
-    await runWithTenantDatabaseScope2(this.db, tenantId, async () => {
+    await runWithTenantDatabaseScope3(this.db, tenantId, async () => {
       await this.create({
         channel_key: channel.channel_key,
         thread_id: msg.threadId,
@@ -26783,6 +26883,80 @@ function createSessionMCPServersService(db) {
   return new SessionMCPServersService(db);
 }
 
+// src/services/session-streams.ts
+import { BadRequest as BadRequest12 } from "@agor/core/feathers";
+
+// src/utils/realtime-publish.ts
+import {
+  resolveTenantContext as resolveTenantContext2,
+  TenantResolutionError as TenantResolutionError2
+} from "@agor/core/config";
+import { getCurrentTenantId as getCurrentTenantId3, shortId as shortId14 } from "@agor/core/db";
+import { hasMinimumRole as hasMinimumRole9, ROLES as ROLES11 } from "@agor/core/types";
+
+// 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 sessionStreamChannelName(sessionId) {
+  return `${SESSION_STREAM_CHANNEL_PREFIX}${sessionId}`;
+}
+function existingChannel(app, name) {
+  return (app.channels ?? []).includes(name) ? app.channel(name) : null;
+}
+function joinSessionStreamChannel(app, sessionId, connection) {
+  app.channel(sessionStreamChannelName(sessionId)).join(connection);
+}
+function leaveSessionStreamChannel(app, sessionId, connection) {
+  existingChannel(app, sessionStreamChannelName(sessionId))?.leave(connection);
+}
+var DEBUG_REALTIME_PUBLISH = process.env.AGOR_DEBUG_REALTIME_PUBLISH === "1" || process.env.DEBUG?.includes("realtime-publish");
+
+// src/services/session-streams.ts
+var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function isCanonicalSessionId(id) {
+  return UUID_RE.test(id);
+}
+function createSessionStreamsService(app) {
+  const resolveAccessibleSessionId = async (sessionId, params) => {
+    const session = await app.service("sessions").get(sessionId, { ...params ?? {}, query: {} });
+    return session?.session_id ?? null;
+  };
+  return {
+    async create(data, params) {
+      const connection = params?.connection;
+      if (!connection) {
+        throw new BadRequest12("session stream subscription requires a realtime connection");
+      }
+      const sessionId = data?.session_id ?? data?.sessionId;
+      if (!sessionId || typeof sessionId !== "string") {
+        throw new BadRequest12("session_id is required");
+      }
+      const canonicalId = await resolveAccessibleSessionId(sessionId, params) ?? sessionId;
+      joinSessionStreamChannel(app, canonicalId, connection);
+      return { session_id: canonicalId, subscribed: true };
+    },
+    async remove(id, params) {
+      const connection = params?.connection;
+      const sessionId = typeof id === "string" ? id : "";
+      if (!connection || !sessionId) {
+        return { session_id: sessionId, subscribed: false };
+      }
+      let canonicalId = sessionId;
+      if (!isCanonicalSessionId(sessionId)) {
+        try {
+          canonicalId = await resolveAccessibleSessionId(sessionId, params) ?? sessionId;
+        } catch {
+        }
+      }
+      leaveSessionStreamChannel(app, canonicalId, connection);
+      return { session_id: canonicalId, subscribed: false };
+    }
+  };
+}
+
 // src/services/sessions.ts
 import { PAGINATION as PAGINATION15 } from "@agor/core/config";
 import {
@@ -26790,10 +26964,10 @@ import {
   SessionEnvSelectionRepository as SessionEnvSelectionRepository2,
   SessionMCPServerRepository as SessionMCPServerRepository2,
   SessionRelationshipRepository,
-  SessionRepository as SessionRepository2,
+  SessionRepository as SessionRepository3,
   UsersRepository as UsersRepository6
 } from "@agor/core/db";
-import { BadRequest as BadRequest12, Forbidden as Forbidden15 } from "@agor/core/feathers";
+import { BadRequest as BadRequest13, Forbidden as Forbidden15 } from "@agor/core/feathers";
 import {
   formatModelToolMismatchWarning,
   formatUnsupportedAgorCodexModelMessage,
@@ -26801,7 +26975,7 @@ import {
   lintModelToolMatch
 } from "@agor/core/models";
 import { resolveChildSessionConfig } from "@agor/core/sessions";
-import { ROLES as ROLES11, SessionStatus as SessionStatus2 } from "@agor/core/types";
+import { ROLES as ROLES12, SessionStatus as SessionStatus2 } from "@agor/core/types";
 function getInheritableConfig(parent) {
   return {
     permission_config: parent.permission_config,
@@ -26842,11 +27016,11 @@ var SessionsService = class extends DrizzleService {
   branchRepo;
   assertSupportedModelConfig(agenticTool, modelConfig) {
     if (agenticTool === "codex" && modelConfig?.model && isUnsupportedAgorCodexModel(modelConfig.model)) {
-      throw new BadRequest12(formatUnsupportedAgorCodexModelMessage(modelConfig.model));
+      throw new BadRequest13(formatUnsupportedAgorCodexModelMessage(modelConfig.model));
     }
   }
   constructor(db, app) {
-    const sessionRepo = new SessionRepository2(db);
+    const sessionRepo = new SessionRepository3(db);
     super(sessionRepo, {
       id: "session_id",
       resourceType: "Session",
@@ -27195,7 +27369,7 @@ ${data.extraInstructions}`;
     }
     const callerUserId = params?.user?.user_id;
     const callerRole = params?.user?.role;
-    const callerIsCreatorOrAdmin = callerUserId === parent.created_by || callerRole === ROLES11.ADMIN || isSuperAdmin(callerRole);
+    const callerIsCreatorOrAdmin = callerUserId === parent.created_by || callerRole === ROLES12.ADMIN || isSuperAdmin(callerRole);
     if (data.envVarNames !== void 0 && callerIsCreatorOrAdmin) {
       await this.sessionEnvSelectionRepo.setAll(session.session_id, data.envVarNames);
     } else {
@@ -27403,7 +27577,7 @@ import {
 import { PAGINATION as PAGINATION16, resolveExecutorHeartbeatConfig as resolveExecutorHeartbeatConfig2 } from "@agor/core/config";
 import {
   enqueueTenantDatabasePostCommitCallback as enqueueTenantDatabasePostCommitCallback2,
-  shortId as shortId15,
+  shortId as shortId16,
   TaskRepository
 } from "@agor/core/db";
 import {
@@ -27413,7 +27587,7 @@ import {
 } from "@agor/core/types";
 
 // src/utils/append-system-message.ts
-import { generateId as generateId2, SessionRepository as SessionRepository3 } from "@agor/core/db";
+import { generateId as generateId2, SessionRepository as SessionRepository4 } from "@agor/core/db";
 import { MessageRole } from "@agor/core/types";
 async function appendSystemMessage(opts) {
   const {
@@ -27428,7 +27602,7 @@ async function appendSystemMessage(opts) {
     metadata,
     params
   } = opts;
-  const index = await new SessionRepository3(db).countMessages(sessionId);
+  const index = await new SessionRepository4(db).countMessages(sessionId);
   const preview = contentPreview ?? (typeof content === "string" ? content.substring(0, 200) : "");
   const message = {
     message_id: generateId2(),
@@ -27448,7 +27622,7 @@ async function appendSystemMessage(opts) {
 
 // src/utils/executor-heartbeat-callback.ts
 import { spawn as spawn3 } from "child_process";
-import { shortId as shortId14 } from "@agor/core/db";
+import { shortId as shortId15 } from "@agor/core/db";
 var ExecutorHeartbeatCallbackRunner = class {
   constructor(config) {
     this.config = config;
@@ -27460,7 +27634,7 @@ var ExecutorHeartbeatCallbackRunner = class {
     if (!command) return;
     if (this.runningByTask.has(payload.task_id)) {
       console.warn(
-        `[executor-heartbeat] Previous callback still running for task ${shortId14(payload.task_id)}; skipping heartbeat callback`
+        `[executor-heartbeat] Previous callback still running for task ${shortId15(payload.task_id)}; skipping heartbeat callback`
       );
       return;
     }
@@ -27654,7 +27828,7 @@ var TasksService = class extends DrizzleService {
     );
     if (data.status === TaskStatus.RUNNING && !Array.isArray(result) && this.app) {
       console.log(`\u{1F50D} [TasksService.create] ENTERING session status update block`);
-      console.log(`\u{1F50D} [TasksService.create] About to patch session ${shortId15(result.session_id)}`);
+      console.log(`\u{1F50D} [TasksService.create] About to patch session ${shortId16(result.session_id)}`);
       try {
         const patchResult = await this.app.service("sessions").patch(
           result.session_id,
@@ -27665,7 +27839,7 @@ var TasksService = class extends DrizzleService {
           params
         );
         console.log(
-          `\u2705 [TasksService] Session ${shortId15(result.session_id)} status updated to RUNNING (task ${shortId15(result.task_id)} created)`,
+          `\u2705 [TasksService] Session ${shortId16(result.session_id)} status updated to RUNNING (task ${shortId16(result.task_id)} created)`,
           `Patch result status: ${patchResult.status}`
         );
       } catch (error) {
@@ -27753,7 +27927,7 @@ var TasksService = class extends DrizzleService {
     const heartbeatFailureWon = failedTask.status === TaskStatus.FAILED && failedTask.error_message === data.error_message && (!data.completed_at || failedTask.completed_at === data.completed_at);
     if (!heartbeatFailureWon) {
       console.log(
-        `\u23ED\uFE0F [TasksService] Skipping heartbeat session failure for task ${shortId15(failedTask.task_id)}; heartbeat failure did not win (status=${failedTask.status})`
+        `\u23ED\uFE0F [TasksService] Skipping heartbeat session failure for task ${shortId16(failedTask.task_id)}; heartbeat failure did not win (status=${failedTask.status})`
       );
       return failedTask;
     }
@@ -27773,7 +27947,7 @@ var TasksService = class extends DrizzleService {
       updatedSession = s;
     }).catch((error) => {
       console.warn(
-        `[executor-heartbeat] Failed to mark session ${shortId15(failedTask.session_id)} failed after stale heartbeat:`,
+        `[executor-heartbeat] Failed to mark session ${shortId16(failedTask.session_id)} failed after stale heartbeat:`,
         error instanceof Error ? error.message : String(error)
       );
     });
@@ -27781,7 +27955,7 @@ var TasksService = class extends DrizzleService {
       void this.dispatchCompletionCallbacksAfterCommit(failedTask, updatedSession, params).catch(
         (error) => {
           console.warn(
-            `[executor-heartbeat] Failed to dispatch completion callbacks for task ${shortId15(failedTask.task_id)}:`,
+            `[executor-heartbeat] Failed to dispatch completion callbacks for task ${shortId16(failedTask.task_id)}:`,
             error instanceof Error ? error.message : String(error)
           );
         }
@@ -27803,7 +27977,7 @@ var TasksService = class extends DrizzleService {
       }
     } catch (error) {
       console.warn(
-        `\u26A0\uFE0F  [TasksService] Could not resolve branch_id for heartbeat task ${shortId15(task.task_id)}:`,
+        `\u26A0\uFE0F  [TasksService] Could not resolve branch_id for heartbeat task ${shortId16(task.task_id)}:`,
         error instanceof Error ? error.message : String(error)
       );
     }
@@ -27852,7 +28026,7 @@ var TasksService = class extends DrizzleService {
     const currentTask = nextStatus !== void 0 ? await this.get(id, params) : void 0;
     if (currentTask && isTerminalTaskStatus(currentTask.status) && nextStatus !== void 0) {
       console.warn(
-        `\u23ED\uFE0F [TasksService] Ignoring status rewrite for terminal task ${shortId15(currentTask.task_id)} (${currentTask.status} \u2192 ${nextStatus})`
+        `\u23ED\uFE0F [TasksService] Ignoring status rewrite for terminal task ${shortId16(currentTask.task_id)} (${currentTask.status} \u2192 ${nextStatus})`
       );
       return currentTask;
     }
@@ -27901,7 +28075,7 @@ var TasksService = class extends DrizzleService {
       this.handleExecutorHeartbeat(result, data.last_executor_heartbeat_at).catch(
         (error) => {
           console.warn(
-            `\u26A0\uFE0F  [TasksService] Executor heartbeat callback failed for task ${shortId15(result.task_id)}:`,
+            `\u26A0\uFE0F  [TasksService] Executor heartbeat callback failed for task ${shortId16(result.task_id)}:`,
             error
           );
         }
@@ -27924,7 +28098,7 @@ var TasksService = class extends DrizzleService {
             }).catch((err) => {
               const message = err instanceof Error ? err.message : String(err);
               console.warn(
-                `\u26A0\uFE0F  [TasksService] ensureRepoOriginAlignedById failed for session ${task.session_id ? shortId15(task.session_id) : "unknown"}: ${message}`
+                `\u26A0\uFE0F  [TasksService] ensureRepoOriginAlignedById failed for session ${task.session_id ? shortId16(task.session_id) : "unknown"}: ${message}`
               );
             });
           }
@@ -27934,7 +28108,7 @@ var TasksService = class extends DrizzleService {
           const isStop = data.status === TaskStatus.STOPPED;
           if (latestTaskId && latestTaskId !== task.task_id) {
             console.log(
-              `\u23ED\uFE0F [TasksService] Skipping session terminal-state update - task ${shortId15(task.task_id)} is not the latest (latest: ${shortId15(latestTaskId)})`
+              `\u23ED\uFE0F [TasksService] Skipping session terminal-state update - task ${shortId16(task.task_id)} is not the latest (latest: ${shortId16(latestTaskId)})`
             );
             if (!suppressCompletionCallbacks && !isStop) {
               await this.dispatchCompletionCallbacksAfterCommit(task, session, params);
@@ -27943,11 +28117,11 @@ var TasksService = class extends DrizzleService {
           }
           if (isStop && params?.suppressTerminalQueueProcessing) {
             console.log(
-              `\u23ED\uFE0F [TasksService] Skipping session terminal-state update for STOPPED task ${shortId15(task.task_id)} \u2014 caller suppresses terminal queue processing`
+              `\u23ED\uFE0F [TasksService] Skipping session terminal-state update for STOPPED task ${shortId16(task.task_id)} \u2014 caller suppresses terminal queue processing`
             );
           } else if (params?.suppressTerminalSessionStateUpdate) {
             console.log(
-              `\u23ED\uFE0F [TasksService] Skipping session terminal-state update for task ${shortId15(task.task_id)} (${data.status}) due to internal patch params`
+              `\u23ED\uFE0F [TasksService] Skipping session terminal-state update for task ${shortId16(task.task_id)} (${data.status}) due to internal patch params`
             );
           } else {
             await this.app.service("sessions").patch(
@@ -27959,7 +28133,7 @@ var TasksService = class extends DrizzleService {
               params
             );
             console.log(
-              `\u2705 [TasksService] Session ${shortId15(task.session_id)} status updated after terminal task (task ${shortId15(task.task_id)} ${data.status})`
+              `\u2705 [TasksService] Session ${shortId16(task.session_id)} status updated after terminal task (task ${shortId16(task.task_id)} ${data.status})`
             );
           }
           if (!suppressCompletionCallbacks && !isStop) {
@@ -27973,7 +28147,7 @@ var TasksService = class extends DrizzleService {
                   archived_reason: "btw_completed"
                 });
                 console.log(
-                  `\u{1F4E6} [TasksService] Auto-archived btw fork session ${shortId15(session.session_id)}`
+                  `\u{1F4E6} [TasksService] Auto-archived btw fork session ${shortId16(session.session_id)}`
                 );
               } catch (error) {
                 console.warn(`\u26A0\uFE0F  [TasksService] Failed to auto-archive btw fork:`, error);
@@ -27987,7 +28161,7 @@ var TasksService = class extends DrizzleService {
             await this.triggerQueueProcessingAfterCommit(task.session_id, params);
           } else if (params?.suppressTerminalQueueProcessing) {
             console.log(
-              `\u23ED\uFE0F  [TasksService] Queue trigger suppressed for session ${shortId15(task.session_id)} (suppressTerminalQueueProcessing)`
+              `\u23ED\uFE0F  [TasksService] Queue trigger suppressed for session ${shortId16(task.session_id)} (suppressTerminalQueueProcessing)`
             );
           }
         } catch (error) {
@@ -28068,7 +28242,7 @@ var TasksService = class extends DrizzleService {
         }
       });
       console.log(
-        `\u{1F4AC} [TasksService] Injected btw result message into parent session ${shortId15(parentSessionId)} from btw fork ${shortId15(btwSession.session_id)}`
+        `\u{1F4AC} [TasksService] Injected btw result message into parent session ${shortId16(parentSessionId)} from btw fork ${shortId16(btwSession.session_id)}`
       );
     } catch (error) {
       console.warn(`\u26A0\uFE0F  [TasksService] Failed to inject btw result message:`, error);
@@ -28096,7 +28270,7 @@ var TasksService = class extends DrizzleService {
     if (dispatchResult.callbackTask) {
       try {
         console.log(
-          `\u{1F504} [TasksService] Triggering callback target queue processing for ${shortId15(targetSessionId)} (callback queued)`
+          `\u{1F504} [TasksService] Triggering callback target queue processing for ${shortId16(targetSessionId)} (callback queued)`
         );
         await this.triggerQueueProcessingAfterCommit(targetSessionId, {});
       } catch (error) {
@@ -28116,7 +28290,7 @@ var TasksService = class extends DrizzleService {
           }
         });
         console.log(
-          `\u{1F515} [TasksService] Auto-disabled callback for session ${shortId15(childSession.session_id)} (once mode)`
+          `\u{1F515} [TasksService] Auto-disabled callback for session ${shortId16(childSession.session_id)} (once mode)`
         );
       } catch (error) {
         console.warn(`\u26A0\uFE0F  [TasksService] Failed to auto-disable callback:`, error);
@@ -28162,7 +28336,7 @@ var TasksService = class extends DrizzleService {
       const latestTask = await this.taskRepo.findById(task.task_id) ?? task;
       if (this.hasCompletionCallbackDispatch(latestTask.metadata, targetSessionId)) {
         console.log(
-          `\u23ED\uFE0F  [TasksService] Completion callback for task ${shortId15(task.task_id)} to ${shortId15(targetSessionId)} already dispatched`
+          `\u23ED\uFE0F  [TasksService] Completion callback for task ${shortId16(task.task_id)} to ${shortId16(targetSessionId)} already dispatched`
         );
         return {};
       }
@@ -28182,7 +28356,7 @@ var TasksService = class extends DrizzleService {
           );
         } catch (error) {
           console.warn(
-            `\u26A0\uFE0F  [TasksService] Failed to mark completion callback dispatched for task ${shortId15(task.task_id)} to ${shortId15(targetSessionId)} after queueing:`,
+            `\u26A0\uFE0F  [TasksService] Failed to mark completion callback dispatched for task ${shortId16(task.task_id)} to ${shortId16(targetSessionId)} after queueing:`,
             error
           );
         }
@@ -28208,7 +28382,7 @@ var TasksService = class extends DrizzleService {
       const callbackEnabled = childSession.callback_config?.enabled ?? targetSession.callback_config?.enabled ?? true;
       if (!callbackEnabled) {
         console.log(
-          `\u23ED\uFE0F  [TasksService] Callbacks disabled for child session ${shortId15(childSession.session_id)}`
+          `\u23ED\uFE0F  [TasksService] Callbacks disabled for child session ${shortId16(childSession.session_id)}`
         );
         return void 0;
       }
@@ -28245,13 +28419,13 @@ var TasksService = class extends DrizzleService {
         }
       }
       const context = {
-        childSessionId: shortId15(childSession.session_id),
+        childSessionId: shortId16(childSession.session_id),
         childSessionFullId: childSession.session_id,
-        childTaskId: shortId15(task.task_id),
+        childTaskId: shortId16(task.task_id),
         childTaskFullId: task.task_id,
-        parentSessionId: shortId15(targetSessionId),
+        parentSessionId: shortId16(targetSessionId),
         // backward compat
-        callbackSessionId: shortId15(targetSessionId),
+        callbackSessionId: shortId16(targetSessionId),
         spawnPrompt,
         status: task.status,
         // COMPLETED, FAILED, etc.
@@ -28264,7 +28438,7 @@ var TasksService = class extends DrizzleService {
       const callbackMessage = renderChildCompletionCallback(context, customTemplate);
       if (!targetSession.created_by) {
         console.warn(
-          `\u26A0\uFE0F  [TasksService] Cannot queue callback: target session ${shortId15(targetSessionId)} has no creator (anonymous session)`
+          `\u26A0\uFE0F  [TasksService] Cannot queue callback: target session ${shortId16(targetSessionId)} has no creator (anonymous session)`
         );
         return void 0;
       }
@@ -28284,7 +28458,7 @@ var TasksService = class extends DrizzleService {
       });
       this.emit?.("queued", callbackTask);
       console.log(
-        `\u{1F514} Queued callback task ${shortId15(callbackTask.task_id)} on session ${shortId15(targetSessionId)} from child ${shortId15(childSession.session_id)}`
+        `\u{1F514} Queued callback task ${shortId16(callbackTask.task_id)} on session ${shortId16(targetSessionId)} from child ${shortId16(childSession.session_id)}`
       );
       return callbackTask;
     } catch (error) {
@@ -28364,14 +28538,14 @@ function createTasksService(db, app) {
 }
 
 // src/services/templates.ts
-import { BadRequest as BadRequest13 } from "@agor/core/feathers";
+import { BadRequest as BadRequest14 } from "@agor/core/feathers";
 import { renderTemplate } from "@agor/core/templates/handlebars-helpers";
-import { ROLES as ROLES12 } from "@agor/core/types";
+import { ROLES as ROLES13 } from "@agor/core/types";
 var TemplatesService = class {
   async create(data, params) {
-    ensureMinimumRole(params, ROLES12.MEMBER, "render templates");
+    ensureMinimumRole(params, ROLES13.MEMBER, "render templates");
     if (typeof data?.template !== "string") {
-      throw new BadRequest13("template (string) is required");
+      throw new BadRequest14("template (string) is required");
     }
     const context = data.context && typeof data.context === "object" ? data.context : {};
     const rendered = renderTemplate(data.template, context, { onError: data.onError ?? "empty" });
@@ -28395,8 +28569,8 @@ import {
 } from "@agor/core/config";
 import {
   BranchRepository as BranchRepository8,
-  SessionRepository as SessionRepository6,
-  shortId as shortId18,
+  SessionRepository as SessionRepository7,
+  shortId as shortId19,
   UsersRepository as UsersRepository7
 } from "@agor/core/db";
 import { Forbidden as Forbidden16 } from "@agor/core/feathers";
@@ -28408,15 +28582,15 @@ import {
 } from "@agor/core/unix";
 
 // src/utils/mcp-token-authorization.ts
-import { hasMinimumRole as hasMinimumRole9, ROLES as ROLES13 } from "@agor/core/types";
+import { hasMinimumRole as hasMinimumRole10, ROLES as ROLES14 } from "@agor/core/types";
 function hasExplicitMinimumRole(userRole, minimumRole) {
-  return !!userRole && hasMinimumRole9(userRole, minimumRole);
+  return !!userRole && hasMinimumRole10(userRole, minimumRole);
 }
 function canControlCliSession(params) {
   const { callerUserId, callerRole, sessionCreatedBy } = params;
-  const isSuperadmin = hasExplicitMinimumRole(callerRole, ROLES13.SUPERADMIN);
+  const isSuperadmin = hasExplicitMinimumRole(callerRole, ROLES14.SUPERADMIN);
   const isServiceExecutor = callerRole === "service";
-  const isCreatorMember = !!callerUserId && callerUserId === sessionCreatedBy && hasExplicitMinimumRole(callerRole, ROLES13.MEMBER);
+  const isCreatorMember = !!callerUserId && callerUserId === sessionCreatedBy && hasExplicitMinimumRole(callerRole, ROLES14.MEMBER);
   return isCreatorMember || isSuperadmin || isServiceExecutor;
 }
 
@@ -28436,11 +28610,11 @@ import {
 import { resolveMultiTenancyConfig as resolveMultiTenancyConfig2 } from "@agor/core/config";
 import {
   generateId as generateId5,
-  getCurrentTenantId as getCurrentTenantId3,
+  getCurrentTenantId as getCurrentTenantId4,
   runWithoutTenantDatabaseScope as runWithoutTenantDatabaseScope3,
-  runWithTenantDatabaseScope as runWithTenantDatabaseScope3,
-  SessionRepository as SessionRepository5,
-  shortId as shortId17,
+  runWithTenantDatabaseScope as runWithTenantDatabaseScope4,
+  SessionRepository as SessionRepository6,
+  shortId as shortId18,
   TaskRepository as TaskRepository2
 } from "@agor/core/db";
 import {
@@ -28495,7 +28669,7 @@ function buildSpawnConfigForSession(session, branchCwd, opts = {}) {
   return {
     sessionId: transcriptExists ? void 0 : session.session_id,
     resumeSessionId: transcriptExists ? session.session_id : void 0,
-    displayName: `cli-${shortId17(session.session_id)}`,
+    displayName: `cli-${shortId18(session.session_id)}`,
     model: session.model_config?.model,
     effort: session.model_config?.effort,
     advisorModel: session.model_config?.advisorModel,
@@ -28612,7 +28786,7 @@ async function writeClaudeCliMcpConfigForSession(app, session, opts = {}) {
     sessionCreatedBy: session.created_by
   })) {
     console.warn(
-      `[claude-cli-integration] not writing owner-scoped MCP config for session ${shortId17(session.session_id)}: caller ${opts.actor.user_id ?? "anonymous"} is not allowed to control the owner-scoped CLI MCP config`
+      `[claude-cli-integration] not writing owner-scoped MCP config for session ${shortId18(session.session_id)}: caller ${opts.actor.user_id ?? "anonymous"} is not allowed to control the owner-scoped CLI MCP config`
     );
     return void 0;
   }
@@ -28629,12 +28803,12 @@ async function writeClaudeCliMcpConfigForSession(app, session, opts = {}) {
     });
     return writeClaudeCliMcpConfigFile({
       mcpConfig,
-      sessionShortId: shortId17(session.session_id),
+      sessionShortId: shortId18(session.session_id),
       targetUnixUser: resolveClaudeCliMcpConfigTargetUnixUser(config, session)
     });
   } catch (err) {
     console.warn(
-      `[claude-cli-integration] failed to write MCP config for session ${shortId17(session.session_id)}; Agor MCP tools will be unavailable in Claude CLI/RemoteTrigger:`,
+      `[claude-cli-integration] failed to write MCP config for session ${shortId18(session.session_id)}; Agor MCP tools will be unavailable in Claude CLI/RemoteTrigger:`,
       err instanceof Error ? err.message : String(err)
     );
     return void 0;
@@ -28643,7 +28817,7 @@ async function writeClaudeCliMcpConfigForSession(app, session, opts = {}) {
 
 // src/services/terminals.ts
 function buildBranchShellTabName(branch) {
-  return `${branch.name} \xB7 ${shortId18(branch.branch_id)}`;
+  return `${branch.name} \xB7 ${shortId19(branch.branch_id)}`;
 }
 function safeRealpath(pathToResolve) {
   try {
@@ -28674,7 +28848,7 @@ function writeEnvFile(userId, env, chownTo) {
   if (!userId) return null;
   try {
     const tmpDir = os2.tmpdir();
-    const envFile = path11.join(tmpDir, `agor-env-${shortId18(userId)}.sh`);
+    const envFile = path11.join(tmpDir, `agor-env-${shortId19(userId)}.sh`);
     const exportLines = Object.entries(env).filter(([key]) => {
       const skipKeys = ["PATH", "HOME", "USER", "SHELL", "PWD", "OLDPWD", "TERM", "COLORTERM"];
       return !skipKeys.includes(key);
@@ -28860,7 +29034,7 @@ var TerminalsService = class {
   async resolveEnsureCliTab(sessionId, claimedBranchId, params) {
     if (!sessionId) return null;
     try {
-      const sessionRepo = new SessionRepository6(this.db);
+      const sessionRepo = new SessionRepository7(this.db);
       const session = await sessionRepo.findById(sessionId).catch(() => null);
       if (session?.agentic_tool !== "claude-code-cli") return null;
       if (claimedBranchId && claimedBranchId !== session.branch_id) {
@@ -28915,7 +29089,7 @@ var TerminalsService = class {
       });
       const spawnCfg = buildSpawnConfigForSession(session, branch.path, { mcpConfigPath });
       const built = buildClaudeCliSpawn2(spawnCfg);
-      const tabName = session.cli_state?.zellij_tab_name ?? spawnCfg.displayName ?? `cli-${shortId18(session.session_id)}`;
+      const tabName = session.cli_state?.zellij_tab_name ?? spawnCfg.displayName ?? `cli-${shortId19(session.session_id)}`;
       return {
         tabName,
         cwd: branch.path,
@@ -28944,12 +29118,12 @@ var TerminalsService = class {
     if (await waitForPendingStart()) {
       return this.createExecutorTerminal(data, params);
     }
-    const expectedSessionName = `agor-${shortId18(userId)}`;
+    const expectedSessionName = `agor-${shortId19(userId)}`;
     if (!this.executorTerminals.get(userId)) {
       const adopted = await this.detectExistingExecutor(expectedSessionName);
       if (adopted) {
         console.log(
-          `[TerminalsService] adopting existing zellij executor for user ${shortId18(userId)} (sessionName=${expectedSessionName})`
+          `[TerminalsService] adopting existing zellij executor for user ${shortId19(userId)} (sessionName=${expectedSessionName})`
         );
         this.executorTerminals.set(userId, {
           sessionName: expectedSessionName,
@@ -29076,7 +29250,7 @@ var TerminalsService = class {
           cwd = resolveBranchShellCwd(branch, finalUnixUser);
         }
       }
-      const userSessionSuffix = shortId18(userId);
+      const userSessionSuffix = shortId19(userId);
       const sessionName = `agor-${userSessionSuffix}`;
       const daemonUrl = `http://localhost:${config.daemon?.port || 3030}`;
       const sessionToken = generateScopedServiceToken(this.app, params);
@@ -29105,7 +29279,7 @@ var TerminalsService = class {
           }
         },
         {
-          logPrefix: `[TerminalsService.executor ${shortId18(userId)}]`,
+          logPrefix: `[TerminalsService.executor ${shortId19(userId)}]`,
           asUser: finalUnixUser || void 0,
           env: executorEnv,
           // Clean up map when executor exits (handles crashes too)
@@ -29197,7 +29371,7 @@ var TerminalsService = class {
    */
   handleExecutorExit(userId) {
     this.executorTerminals.delete(userId);
-    console.log(`[TerminalsService] Executor terminal exited for user ${shortId18(userId)}`);
+    console.log(`[TerminalsService] Executor terminal exited for user ${shortId19(userId)}`);
   }
 };
 
@@ -29257,9 +29431,9 @@ import { Forbidden as Forbidden18, NotAuthenticated as NotAuthenticated10 } from
 import { isLikelyGitToken } from "@agor/core/git/pure";
 import {
   extractAgenticToolsPublicValues,
-  hasMinimumRole as hasMinimumRole11,
+  hasMinimumRole as hasMinimumRole12,
   normalizeRole,
-  ROLES as ROLES15,
+  ROLES as ROLES16,
   toAgenticToolsStatus
 } from "@agor/core/types";
 
@@ -29271,7 +29445,7 @@ import {
 } from "@agor/core/db";
 import { Forbidden as Forbidden17 } from "@agor/core/feathers";
 import { SlackConnector } from "@agor/core/gateway";
-import { hasMinimumRole as hasMinimumRole10, ROLES as ROLES14 } from "@agor/core/types";
+import { hasMinimumRole as hasMinimumRole11, ROLES as ROLES15 } from "@agor/core/types";
 var NAMESPACE = "user_avatars";
 var SETTINGS_KEY = "settings";
 var DEFAULT_SETTINGS = {
@@ -29280,7 +29454,7 @@ var DEFAULT_SETTINGS = {
   gateway_channel_id: null
 };
 function isAdmin(params) {
-  return hasMinimumRole10(params?.user?.role, ROLES14.ADMIN);
+  return hasMinimumRole11(params?.user?.role, ROLES15.ADMIN);
 }
 function requireAdmin(params) {
   if (params?.provider && !isAdmin(params)) {
@@ -29398,7 +29572,7 @@ var UserAvatarSyncManager = class {
             user: {
               user_id: "user-avatars-service",
               email: "user-avatars@agor.internal",
-              role: ROLES14.ADMIN,
+              role: ROLES15.ADMIN,
               _isServiceAccount: true
             }
           }
@@ -29504,7 +29678,7 @@ var UserAvatarSyncManager = class {
           user: {
             user_id: "user-avatars-service",
             email: "user-avatars@agor.internal",
-            role: ROLES14.ADMIN,
+            role: ROLES15.ADMIN,
             _isServiceAccount: true
           }
         }
@@ -29571,7 +29745,7 @@ function isServiceAccount(params) {
   return !!params?.user?._isServiceAccount;
 }
 function isAdmin2(params) {
-  return hasMinimumRole11(params?.user?.role, ROLES15.ADMIN);
+  return hasMinimumRole12(params?.user?.role, ROLES16.ADMIN);
 }
 function isSelfEmailLookup(params, email) {
   const requesterEmail = params?.user?.email;
@@ -29700,8 +29874,8 @@ var UsersService = class {
     const hashedPassword = await hash(data.password, 10);
     const now = /* @__PURE__ */ new Date();
     const user_id = generateId6();
-    const role = data.role || ROLES15.MEMBER;
-    const defaultEmoji = role === ROLES15.ADMIN ? "\u2B50" : "\u{1F464}";
+    const role = data.role || ROLES16.MEMBER;
+    const defaultEmoji = role === ROLES16.ADMIN ? "\u2B50" : "\u{1F464}";
     const row = await insert(this.db, users2).values({
       user_id,
       email: data.email,
@@ -30060,21 +30234,37 @@ function createUsersService(db, app) {
 }
 
 // src/setup/socketio.ts
-import { resolveTenantContext as resolveTenantContext2 } from "@agor/core/config";
-import { shortId as shortId19 } from "@agor/core/db";
+import { resolveTenantContext as resolveTenantContext3 } from "@agor/core/config";
+import { shortId as shortId20 } from "@agor/core/db";
 import jwt5 from "jsonwebtoken";
 function userRoomName(userId) {
   return `user:${userId}`;
 }
 
 // src/utils/mcp-header-secrets.ts
+init_executor_session_token();
 import { redactMCPAuthSecrets } from "@agor/core/tools/mcp/auth-secrets";
 import { redactMCPCustomHeaders } from "@agor/core/tools/mcp/http-headers";
+import jwt6 from "jsonwebtoken";
 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 = jwt6.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;
@@ -30175,7 +30365,7 @@ async function restoreFile(filePath, payload) {
 }
 
 // src/utils/session-state-hooks.ts
-import { SerializedSessionRepository, shortId as shortId20 } from "@agor/core/db";
+import { SerializedSessionRepository, shortId as shortId21 } from "@agor/core/db";
 var STALE_PROCESSING_THRESHOLD_MS = 3e4;
 async function pullIfNeeded(ctx) {
   const repo = new SerializedSessionRepository(ctx.db);
@@ -30193,7 +30383,7 @@ async function pullIfNeeded(ctx) {
     const age = Date.now() - latest.created_at;
     if (age > STALE_PROCESSING_THRESHOLD_MS) {
       console.log(
-        `[session-state] Cleaning stale 'processing' row ${shortId20(latest.id)} (age: ${Math.round(age / 1e3)}s)`
+        `[session-state] Cleaning stale 'processing' row ${shortId21(latest.id)} (age: ${Math.round(age / 1e3)}s)`
       );
       await repo.deleteById(latest.id);
       latest = await repo.findLatestDone(ctx.sessionId);
@@ -30216,12 +30406,12 @@ async function pullIfNeeded(ctx) {
   }
   if (!latest.payload) {
     console.warn(
-      `[session-state] 'done' row ${shortId20(latest.id)} has no payload, skipping restore`
+      `[session-state] 'done' row ${shortId21(latest.id)} has no payload, skipping restore`
     );
     return;
   }
   console.log(
-    `[session-state] Restoring session file from DB (row ${shortId20(latest.id)}, turn ${latest.turn_index})`
+    `[session-state] Restoring session file from DB (row ${shortId21(latest.id)}, turn ${latest.turn_index})`
   );
   await restoreFile(filePath, latest.payload);
 }
@@ -30297,6 +30487,13 @@ async function registerServices(ctx) {
   sessionsService.setExecuteHandler(
     createExecuteHandler(ctx, sessionsService, sessionTokenService)
   );
+  app.use("/session-streams", createSessionStreamsService(app), {
+    methods: ["create", "remove"]
+  });
+  app.service("/session-streams").hooks({
+    before: { all: [ctx.requireAuth] }
+  });
+  app.service("/session-streams").publish(() => []);
   app.use("/tasks", createTasksService(db, app), {
     // Custom events not in this list are dropped at the FeathersJS transport
     // boundary — they fire on the local EventEmitter but never reach socket
@@ -30499,7 +30696,7 @@ async function registerServices(ctx) {
     app.use("/gateway-channels/test", createGatewayChannelsTestService(db));
     app.service("gateway-channels/test").hooks({
       before: {
-        create: [ctx.requireAuth, requireMinimumRole(ROLES16.ADMIN, "test gateway channels")]
+        create: [ctx.requireAuth, requireMinimumRole(ROLES17.ADMIN, "test gateway channels")]
       }
     });
     app.use("/thread-session-map", createThreadSessionMapService(db));
@@ -30537,9 +30734,9 @@ async function registerServices(ctx) {
   app.use("/cursor-models", createCursorModelsService(db));
   app.service("/cursor-models").hooks({ before: { find: [ctx.requireAuth] } });
   const branchRepository = new BranchRepository9(db);
-  const { UsersRepository: UsersRepository9, SessionRepository: SessionRepository7 } = await import("@agor/core/db");
+  const { UsersRepository: UsersRepository9, SessionRepository: SessionRepository8 } = await import("@agor/core/db");
   const usersRepository = new UsersRepository9(db);
-  const sessionsRepository = new SessionRepository7(db);
+  const sessionsRepository = new SessionRepository8(db);
   if (svcEnabled("file_browser")) {
     app.use("/context", createContextService(branchRepository));
     app.use("/file", createFileService(branchRepository));
@@ -30800,7 +30997,7 @@ function createExecuteHandler(ctx, sessionsService, sessionTokenService) {
         );
       }
     }
-    const logPrefix = `[Executor ${shortId21(sessionId)}]`;
+    const logPrefix = `[Executor ${shortId22(sessionId)}]`;
     spawnExecutor(executorPayload, {
       cwd,
       asUser: executorUnixUser || void 0,
@@ -30825,7 +31022,7 @@ function createExecuteHandler(ctx, sessionsService, sessionTokenService) {
           const latestTaskId = currentSession.tasks?.[currentSession.tasks.length - 1];
           if (latestTaskId && latestTaskId !== taskId) {
             console.log(
-              `\u23ED\uFE0F [Executor] Task ${shortId21(taskId)} is not the latest (latest: ${shortId21(latestTaskId)}), skipping safety net`
+              `\u23ED\uFE0F [Executor] Task ${shortId22(taskId)} is not the latest (latest: ${shortId22(latestTaskId)}), skipping safety net`
             );
           } else if (isSessionExecuting(currentSession) || currentSession.status === SessionStatus5.TIMED_OUT) {
             try {
@@ -30840,27 +31037,27 @@ function createExecuteHandler(ctx, sessionsService, sessionTokenService) {
                   params
                 );
                 console.log(
-                  `\u2705 [Executor] Task ${shortId21(taskId)} marked as FAILED after executor exit (code: ${code})`
+                  `\u2705 [Executor] Task ${shortId22(taskId)} marked as FAILED after executor exit (code: ${code})`
                 );
               } else {
                 console.log(
-                  `\u26A0\uFE0F  [Executor] Task ${shortId21(taskId)} already ${currentTask.status}, but session still ${currentSession.status} \u2014 repairing session state`
+                  `\u26A0\uFE0F  [Executor] Task ${shortId22(taskId)} already ${currentTask.status}, but session still ${currentSession.status} \u2014 repairing session state`
                 );
                 await app.service("sessions").patch(sessionId, { status: SessionStatus5.IDLE, ready_for_prompt: true }, params);
               }
             } catch (taskError) {
               console.error(
-                `\u26A0\uFE0F  [Executor] Failed to mark task ${shortId21(taskId)} as FAILED, falling back to session IDLE update:`,
+                `\u26A0\uFE0F  [Executor] Failed to mark task ${shortId22(taskId)} as FAILED, falling back to session IDLE update:`,
                 taskError
               );
               await app.service("sessions").patch(sessionId, { status: SessionStatus5.IDLE, ready_for_prompt: true }, params);
               console.log(
-                `\u2705 [Executor] Session ${shortId21(sessionId)} status updated to IDLE after executor exit (was: ${currentSession.status})`
+                `\u2705 [Executor] Session ${shortId22(sessionId)} status updated to IDLE after executor exit (was: ${currentSession.status})`
               );
             }
           } else {
             console.log(
-              `\u2139\uFE0F  [Executor] Session ${shortId21(sessionId)} already in ${currentSession.status} state, skipping IDLE update`
+              `\u2139\uFE0F  [Executor] Session ${shortId22(sessionId)} already in ${currentSession.status} state, skipping IDLE update`
             );
           }
         } catch (error) {
@@ -31016,6 +31213,7 @@ async function registerMCPServices(ctx, sessionsService) {
       mcpServerId: opts.mcpServerId,
       userId: opts.userId,
       oauthMode: opts.oauthMode,
+      tenantId: opts.tenantId ?? getCurrentTenantId6(),
       socketId: opts.socketId,
       createdAt: Date.now(),
       tokenResolve,
@@ -31039,6 +31237,31 @@ async function registerMCPServices(ctx, sessionsService) {
     }
     return base;
   }
+  const tenantIdFromParams = (params) => params?.tenant?.tenant_id ?? getCurrentTenantId6();
+  const persistOAuthTokenForPendingFlow = async (tokenResponse, pendingFlow, logPrefix) => {
+    const work = () => persistOAuthToken(
+      db,
+      tokenResponse,
+      pendingFlow.mcpUrl,
+      {
+        ...pendingFlow,
+        clientId: pendingFlow.context.clientId,
+        clientSecret: pendingFlow.context.clientSecret,
+        tokenEndpoint: pendingFlow.context.tokenEndpoint
+      },
+      logPrefix
+    );
+    if (pendingFlow.tenantId) {
+      await runInOAuthTenantScope(db, pendingFlow.tenantId, work);
+      return;
+    }
+    if (isPostgresDatabase7(db) && pendingFlow.mcpServerId) {
+      throw new Error(
+        "Missing tenant context for MCP OAuth callback. Please restart the OAuth flow."
+      );
+    }
+    await work();
+  };
   const oauthCallbackHandler = async (req, res) => {
     res.setHeader("Content-Security-Policy", "default-src 'none'; style-src 'unsafe-inline'");
     res.setHeader("X-Content-Type-Options", "nosniff");
@@ -31081,18 +31304,7 @@ async function registerMCPServices(ctx, sessionsService) {
         const { completeMCPOAuthFlow } = await import("@agor/core/tools/mcp/oauth-mcp-transport");
         const tokenResponse = await completeMCPOAuthFlow(pendingFlow.context, code, state);
         pendingOAuthFlows.delete(state);
-        await persistOAuthToken(
-          db,
-          tokenResponse,
-          pendingFlow.mcpUrl,
-          {
-            ...pendingFlow,
-            clientId: pendingFlow.context.clientId,
-            clientSecret: pendingFlow.context.clientSecret,
-            tokenEndpoint: pendingFlow.context.tokenEndpoint
-          },
-          "OAuth Callback"
-        );
+        await persistOAuthTokenForPendingFlow(tokenResponse, pendingFlow, "OAuth Callback");
         if (app.io) {
           const oauthEvent = {
             state,
@@ -31221,6 +31433,7 @@ async function registerMCPServices(ctx, sessionsService) {
                   // call (writes to the shared MCP server row, not per-user).
                   oauthMode: "shared",
                   clientId: data.client_id,
+                  tenantId: tenantIdFromParams(params),
                   socketId: connection?.id
                 });
               } catch (err) {
@@ -31423,6 +31636,7 @@ async function registerMCPServices(ctx, sessionsService) {
       try {
         console.log("[OAuth Start] Starting two-phase OAuth flow for:", data.mcp_url);
         const userId = params?.user?.user_id;
+        const tenantId = tenantIdFromParams(params);
         let oauthMode;
         let authorizationUrlOverride;
         let tokenUrlOverride;
@@ -31430,8 +31644,10 @@ async function registerMCPServices(ctx, sessionsService) {
         let clientIdFromConfig;
         let scopeOverride;
         if (data.mcp_server_id) {
-          const mcpServerRepo = new MCPServerRepository4(db);
-          const server = await mcpServerRepo.findById(data.mcp_server_id);
+          const server = await runInOAuthTenantScope(db, tenantId, () => {
+            const mcpServerRepo = new MCPServerRepository4(db);
+            return mcpServerRepo.findById(data.mcp_server_id);
+          });
           if (server?.auth?.type === "oauth") {
             oauthMode = server.auth.oauth_mode || "per_user";
             authorizationUrlOverride = server.auth.oauth_authorization_url;
@@ -31479,6 +31695,7 @@ async function registerMCPServices(ctx, sessionsService) {
             authorizationUrlOverride,
             tokenUrlOverride,
             scope: scopeOverride,
+            tenantId,
             socketId
           });
         } catch (err) {
@@ -31523,18 +31740,13 @@ async function registerMCPServices(ctx, sessionsService) {
           };
         const tokenResponse = await completeMCPOAuthFlow(pendingFlow.context, code, state);
         pendingOAuthFlows.delete(state);
-        await persistOAuthToken(
-          db,
-          tokenResponse,
-          pendingFlow.mcpUrl,
-          {
-            ...pendingFlow,
-            clientId: pendingFlow.context.clientId,
-            clientSecret: pendingFlow.context.clientSecret,
-            tokenEndpoint: pendingFlow.context.tokenEndpoint
-          },
-          "OAuth Complete"
-        );
+        const activeTenantId = getCurrentTenantId6();
+        if (pendingFlow.tenantId && activeTenantId && pendingFlow.tenantId !== activeTenantId) {
+          throw new Error(
+            "OAuth flow belongs to a different tenant. Please restart the OAuth flow."
+          );
+        }
+        await persistOAuthTokenForPendingFlow(tokenResponse, pendingFlow, "OAuth Complete");
         return { success: true, message: "OAuth authentication successful!", tokenObtained: true };
       } catch (error) {
         console.error("[OAuth Complete] Error:", error);
@@ -31591,17 +31803,35 @@ async function registerMCPServices(ctx, sessionsService) {
       }
       const sessionId = params?.session_id;
       const trustedInternalOrService = shouldExposeMCPServerSecrets(params);
-      const trustedSessionExecutor = shouldExposeMCPServerSecretsForSessionToken(params, {
+      let trustedSessionExecutor = shouldExposeMCPServerSecretsForSessionToken(params, {
         sessionId
       });
+      let executorSessionId = sessionId;
+      if (!trustedSessionExecutor && params?.provider && data.executorSessionToken) {
+        const executorTokenService = app.sessionTokenService;
+        const sessionInfo = await executorTokenService?.validateToken(
+          data.executorSessionToken,
+          {}
+        );
+        if (sessionInfo?.session_id) {
+          executorSessionId = sessionInfo.session_id;
+          trustedSessionExecutor = true;
+        }
+      }
       if (!trustedInternalOrService && !trustedSessionExecutor) {
         throw new Forbidden19("oauth-auth-headers is only available to trusted executor paths");
       }
       const userTokenRepo = new UserMCPOAuthTokenRepository3(db);
       const mcpServerRepo = new MCPServerRepository4(db);
       if (trustedSessionExecutor) {
+        if (!executorSessionId) {
+          throw new Forbidden19("oauth-auth-headers requires executor session scope");
+        }
         const sessionMcpRepo = new SessionMCPServerRepository3(db);
-        const attachedServers = await sessionMcpRepo.listServers(sessionId, true);
+        const attachedServers = await sessionMcpRepo.listServers(
+          executorSessionId,
+          true
+        );
         const globalServers = await mcpServerRepo.findAll({ scope: "global", enabled: true });
         const allowedServerIds = /* @__PURE__ */ new Set([
           ...globalServers.map((server) => server.mcp_server_id),
@@ -31741,7 +31971,7 @@ async function registerMCPServices(ctx, sessionsService) {
         const { restoreRedactedMCPAuthSecrets } = await import("@agor/core/tools/mcp/auth-secrets");
         const { resolveMCPAuthHeaders } = await import("@agor/core/tools/mcp/jwt-auth");
         const { mergeMCPRemoteHeaders, restoreRedactedMCPCustomHeaders } = await import("@agor/core/tools/mcp/http-headers");
-        const { hasMinimumRole: hasMinimumRole12, ROLES: ROLES17 } = await import("@agor/core/types");
+        const { hasMinimumRole: hasMinimumRole13, ROLES: ROLES18 } = await import("@agor/core/types");
         const mcpServerRepo = new MCPServerRepository4(db);
         const validateUrl = (url) => {
           try {
@@ -31776,7 +32006,7 @@ async function registerMCPServices(ctx, sessionsService) {
             if (params?.provider && params.user) {
               const userId2 = params.user.user_id;
               const userRole = params.user.role?.toLowerCase();
-              const isAdmin3 = hasMinimumRole12(userRole, ROLES17.ADMIN);
+              const isAdmin3 = hasMinimumRole13(userRole, ROLES18.ADMIN);
               const isOwner = server.owner_user_id === userId2;
               if (server.scope === "global" && !isOwner && !isAdmin3)
                 return {
@@ -31805,7 +32035,7 @@ async function registerMCPServices(ctx, sessionsService) {
           if (params?.provider && params.user) {
             const userId2 = params.user.user_id;
             const userRole = params.user.role?.toLowerCase();
-            const isAdmin3 = hasMinimumRole12(userRole, ROLES17.ADMIN);
+            const isAdmin3 = hasMinimumRole13(userRole, ROLES18.ADMIN);
             const isOwner = server.owner_user_id === userId2;
             if (server.scope === "global" && !isOwner && !isAdmin3)
               return {
@@ -31898,6 +32128,7 @@ async function registerMCPServices(ctx, sessionsService) {
               // call). Without a serverId nothing is persisted to the DB; the
               // daemon-level cache below carries the token for this request.
               oauthMode: "shared",
+              tenantId: tenantIdFromParams(params),
               socketId: connection?.id
             });
             const tokenResponse = await started.awaitToken();
@@ -32072,7 +32303,7 @@ async function registerMCPServices(ctx, sessionsService) {
   return { oauthCallbackHandler };
 }
 async function bootstrapSuperadminUsers(config, usersService, allowSuperadmin) {
-  const { ROLES: ROLES17 } = await import("@agor/core/types");
+  const { ROLES: ROLES18 } = await import("@agor/core/types");
   const bootstrapUsers = config.execution?.bootstrap_superadmin_users ?? [];
   if (bootstrapUsers.length === 0) return;
   if (!allowSuperadmin) {
@@ -32087,15 +32318,15 @@ async function bootstrapSuperadminUsers(config, usersService, allowSuperadmin) {
     if (!userId) continue;
     try {
       const user = await usersService.get(userId);
-      if (user.role === ROLES17.SUPERADMIN) continue;
-      await usersService.patch(userId, { role: ROLES17.SUPERADMIN });
+      if (user.role === ROLES18.SUPERADMIN) continue;
+      await usersService.patch(userId, { role: ROLES18.SUPERADMIN });
       promotedCount++;
       console.log(
-        `[RBAC] Bootstrap promoted user ${shortId21(userId)} (${user.email}) to superadmin`
+        `[RBAC] Bootstrap promoted user ${shortId22(userId)} (${user.email}) to superadmin`
       );
     } catch (error) {
       console.warn(
-        `[RBAC] Failed to bootstrap superadmin for user ${shortId21(userId)}: ${error instanceof Error ? error.message : String(error)}`
+        `[RBAC] Failed to bootstrap superadmin for user ${shortId22(userId)}: ${error instanceof Error ? error.message : String(error)}`
       );
     }
   }