agor-live 0.22.0 → 0.23.2

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/mcp-token-authorization.d.ts

@@ -1,26 +1,31 @@
-export interface SessionActorAuthorizationParams {
+export interface McpTokenAuthorizationParams {
     callerUserId: string | undefined;
     callerRole: string | undefined;
+}
+export interface CliSessionControlParams extends McpTokenAuthorizationParams {
     sessionCreatedBy: string | null | undefined;
 }
 /**
- * Authorization predicate for handing a session-scoped MCP token to a caller.
+ * Authorization predicate for handing an Agor MCP token to a caller.
  *
- * The token binds `uid = session.created_by` and lets the bearer act as the
- * session creator on the MCP channel. It must therefore only be returned to
- * callers who are already allowed to act as that creator: the creator (member+),
- * a superadmin, or the executor/service identity.
+ * The token is minted for the *current authenticated caller* (not necessarily
+ * `session.created_by`) and is bound to the requested session context. Normal
+ * session/branch RBAC has already run before the after-hook calls this helper;
+ * this gate only prevents anonymous/viewer contexts from receiving a bearer
+ * credential. Returning caller-scoped tokens is important for gateway/aligned
+ * user prompts: a collaborator prompting someone else's session must execute
+ * MCP tools as themselves, not as the original session creator.
  */
-export declare function canReceiveMcpTokenForSession(params: SessionActorAuthorizationParams): boolean;
+export declare function canReceiveMcpTokenForSession(params: McpTokenAuthorizationParams): boolean;
 /**
  * Authorization predicate for controlling a Claude CLI process bound to a
  * session (ensure/focus cold-start tab, restart/kill/re-spawn).
  *
- * CLI control is as sensitive as receiving the MCP token: in simple Unix mode
- * the process may run from the creator's shared home/session state, and even in
- * stricter modes resuming someone else's CLI session can execute with that
- * session's credentials/context. Keep this boundary aligned with MCP token
- * delivery unless the CLI ownership model is redesigned explicitly.
+ * CLI control is intentionally stricter than caller-scoped Agor MCP token
+ * delivery. In simple Unix mode the process may run from the creator's shared
+ * home/session state, and even in stricter modes resuming someone else's CLI
+ * session can execute with that session's credentials/context. Only the creator,
+ * a superadmin, or the service identity may control that process boundary.
  */
-export declare function canControlCliSession(params: SessionActorAuthorizationParams): boolean;
+export declare function canControlCliSession(params: CliSessionControlParams): boolean;
 //# sourceMappingURL=mcp-token-authorization.d.ts.map

package/dist/daemon/utils/mcp-token-authorization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-token-authorization.d.ts","sourceRoot":"","sources":["../../src/utils/mcp-token-authorization.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,+BAA+B;IAC9C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CAC7C;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,+BAA+B,GAAG,OAAO,CAO7F;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,+BAA+B,GAAG,OAAO,CAErF"}
+{"version":3,"file":"mcp-token-authorization.d.ts","sourceRoot":"","sources":["../../src/utils/mcp-token-authorization.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,2BAA2B;IAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED,MAAM,WAAW,uBAAwB,SAAQ,2BAA2B;IAC1E,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CAC7C;AAiBD;;;;;;;;;;GAUG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAKzF;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAS7E"}

package/dist/daemon/utils/mcp-token-authorization.js

@@ -1,14 +1,20 @@
 // src/utils/mcp-token-authorization.ts
 import { hasMinimumRole, ROLES } from "@agor/core/types";
+function hasExplicitMinimumRole(userRole, minimumRole) {
+  return !!userRole && hasMinimumRole(userRole, minimumRole);
+}
 function canReceiveMcpTokenForSession(params) {
-  const { callerUserId, callerRole, sessionCreatedBy } = params;
-  const isSuperadmin = hasMinimumRole(callerRole, ROLES.SUPERADMIN);
+  const { callerUserId, callerRole } = params;
   const isServiceExecutor = callerRole === "service";
-  const isCreatorMember = !!callerUserId && callerUserId === sessionCreatedBy && hasMinimumRole(callerRole, ROLES.MEMBER);
-  return isCreatorMember || isSuperadmin || isServiceExecutor;
+  const isAuthenticatedMember = !!callerUserId && hasExplicitMinimumRole(callerRole, ROLES.MEMBER);
+  return isAuthenticatedMember || isServiceExecutor;
 }
 function canControlCliSession(params) {
-  return canReceiveMcpTokenForSession(params);
+  const { callerUserId, callerRole, sessionCreatedBy } = params;
+  const isSuperadmin = hasExplicitMinimumRole(callerRole, ROLES.SUPERADMIN);
+  const isServiceExecutor = callerRole === "service";
+  const isCreatorMember = !!callerUserId && callerUserId === sessionCreatedBy && hasExplicitMinimumRole(callerRole, ROLES.MEMBER);
+  return isCreatorMember || isSuperadmin || isServiceExecutor;
 }
 export {
   canControlCliSession,

package/dist/daemon/utils/open-source-telemetry-config.d.ts

@@ -0,0 +1,6 @@
+import type { AgorConfig } from '@agor/core/config';
+export declare function ensureOpenSourceTelemetryEnvEnabledConfig(config: AgorConfig, env?: NodeJS.ProcessEnv, generateInstanceId?: () => string): {
+    config: AgorConfig;
+    changed: boolean;
+};
+//# sourceMappingURL=open-source-telemetry-config.d.ts.map

package/dist/daemon/utils/open-source-telemetry-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"open-source-telemetry-config.d.ts","sourceRoot":"","sources":["../../src/utils/open-source-telemetry-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,wBAAgB,yCAAyC,CACvD,MAAM,EAAE,UAAU,EAClB,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,kBAAkB,GAAE,MAAM,MAAoC,GAC7D;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAgB1C"}

package/dist/daemon/utils/open-source-telemetry-config.js

@@ -0,0 +1,21 @@
+// src/utils/open-source-telemetry-config.ts
+import { generateTelemetryInstanceId, isTelemetryEnabledByEnv } from "@agor/core/telemetry";
+function ensureOpenSourceTelemetryEnvEnabledConfig(config, env = process.env, generateInstanceId = generateTelemetryInstanceId) {
+  if (!isTelemetryEnabledByEnv(env) || config.telemetry?.instance_id) {
+    return { config, changed: false };
+  }
+  return {
+    config: {
+      ...config,
+      telemetry: {
+        ...config.telemetry,
+        enabled: true,
+        instance_id: generateInstanceId()
+      }
+    },
+    changed: true
+  };
+}
+export {
+  ensureOpenSourceTelemetryEnvEnabledConfig
+};

package/dist/daemon/utils/open-source-telemetry-heartbeat.d.ts

@@ -0,0 +1,7 @@
+import type { AgorConfig } from '@agor/core/config';
+export declare function getOpenSourceTelemetryUtcDay(now?: Date): string;
+export declare function shouldEmitOpenSourceTelemetryDaemonActive(config: AgorConfig, now?: Date): {
+    day: string;
+    shouldEmit: boolean;
+};
+//# sourceMappingURL=open-source-telemetry-heartbeat.d.ts.map

package/dist/daemon/utils/open-source-telemetry-heartbeat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"open-source-telemetry-heartbeat.d.ts","sourceRoot":"","sources":["../../src/utils/open-source-telemetry-heartbeat.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,wBAAgB,4BAA4B,CAAC,GAAG,OAAa,GAAG,MAAM,CAErE;AAED,wBAAgB,yCAAyC,CACvD,MAAM,EAAE,UAAU,EAClB,GAAG,OAAa,GACf;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,CAMtC"}

package/dist/daemon/utils/open-source-telemetry-heartbeat.js

@@ -0,0 +1,15 @@
+// src/utils/open-source-telemetry-heartbeat.ts
+function getOpenSourceTelemetryUtcDay(now = /* @__PURE__ */ new Date()) {
+  return now.toISOString().slice(0, 10);
+}
+function shouldEmitOpenSourceTelemetryDaemonActive(config, now = /* @__PURE__ */ new Date()) {
+  const day = getOpenSourceTelemetryUtcDay(now);
+  return {
+    day,
+    shouldEmit: config.telemetry?.last_daemon_active_day !== day
+  };
+}
+export {
+  getOpenSourceTelemetryUtcDay,
+  shouldEmitOpenSourceTelemetryDaemonActive
+};

package/dist/daemon/utils/open-source-telemetry-usage.d.ts

@@ -0,0 +1,9 @@
+import { type TenantScopeAwareDatabase } from '@agor/core/db';
+import type { TenantID } from '@agor/core/types';
+export declare function flushOpenSourceTelemetryUsageSummary(db: TenantScopeAwareDatabase): Promise<void>;
+export interface OpenSourceTelemetryUsageSummaryIntervalOptions {
+    /** Tenant used for daemon-global telemetry scans that have no request auth context. */
+    tenantId: TenantID | string;
+}
+export declare function startOpenSourceTelemetryUsageSummaryInterval(db: TenantScopeAwareDatabase, options: OpenSourceTelemetryUsageSummaryIntervalOptions): NodeJS.Timeout;
+//# sourceMappingURL=open-source-telemetry-usage.d.ts.map

package/dist/daemon/utils/open-source-telemetry-usage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"open-source-telemetry-usage.d.ts","sourceRoot":"","sources":["../../src/utils/open-source-telemetry-usage.ts"],"names":[],"mappings":"AACA,OAAO,EAUL,KAAK,wBAAwB,EAE9B,MAAM,eAAe,CAAC;AAOvB,OAAO,KAAK,EAAW,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAwE1D,wBAAsB,oCAAoC,CACxD,EAAE,EAAE,wBAAwB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAyDf;AAED,MAAM,WAAW,8CAA8C;IAC7D,uFAAuF;IACvF,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC;CAC7B;AAED,wBAAgB,4CAA4C,CAC1D,EAAE,EAAE,wBAAwB,EAC5B,OAAO,EAAE,8CAA8C,GACtD,MAAM,CAAC,OAAO,CAqBhB"}

package/dist/daemon/utils/open-source-telemetry-usage.js

@@ -0,0 +1,121 @@
+// src/utils/open-source-telemetry-usage.ts
+import { loadConfig, saveConfig } from "@agor/core/config";
+import {
+  and,
+  branches,
+  count,
+  eq,
+  gte,
+  lt,
+  runWithTenantDatabaseScope,
+  select,
+  sessions,
+  tasks
+} from "@agor/core/db";
+import {
+  normalizeTelemetryModelFamily,
+  normalizeTelemetryProvider,
+  openSourceTelemetryLogger,
+  pruneDefaultOpenSourceTelemetryDestination
+} from "@agor/core/telemetry";
+var ONE_HOUR_MS = 60 * 60 * 1e3;
+var ONE_DAY_MS = 24 * ONE_HOUR_MS;
+function increment(map, key) {
+  map[key] = (map[key] ?? 0) + 1;
+}
+function previousUtcDayRange(now = /* @__PURE__ */ new Date()) {
+  const end = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()));
+  const start = new Date(end.getTime() - ONE_DAY_MS);
+  return { day: start.toISOString().slice(0, 10), start, end };
+}
+async function countCreatedRows(db, table, start, end) {
+  const row = await select(db, { value: count() }).from(table).where(and(gte(table.created_at, start), lt(table.created_at, end))).one();
+  return Number(row?.value ?? 0);
+}
+async function addDistinctCreatedBy(db, table, start, end, users) {
+  const rows = await select(db, { createdBy: table.created_by }).from(table).where(and(gte(table.created_at, start), lt(table.created_at, end))).groupBy(table.created_by).all();
+  for (const row of rows) {
+    if (row.createdBy) users.add(row.createdBy);
+  }
+}
+async function getTaskUsageRows(db, start, end) {
+  return await select(db, {
+    taskData: tasks.data,
+    agenticTool: sessions.agentic_tool,
+    sessionData: sessions.data
+  }).from(tasks).innerJoin(sessions, eq(tasks.session_id, sessions.session_id)).where(and(gte(tasks.created_at, start), lt(tasks.created_at, end))).all();
+}
+async function flushOpenSourceTelemetryUsageSummary(db) {
+  if (!openSourceTelemetryLogger.isEnabled()) return;
+  const { day, start, end } = previousUtcDayRange();
+  const config = await loadConfig();
+  if (config.telemetry?.last_usage_summary_day === day) return;
+  const [promptCount, branchCreatedCount, sessionCreatedCount, taskRows] = await Promise.all([
+    countCreatedRows(db, tasks, start, end),
+    countCreatedRows(db, branches, start, end),
+    countCreatedRows(db, sessions, start, end),
+    getTaskUsageRows(db, start, end)
+  ]);
+  const activeUsers = /* @__PURE__ */ new Set();
+  await Promise.all([
+    addDistinctCreatedBy(db, tasks, start, end, activeUsers),
+    addDistinctCreatedBy(db, sessions, start, end, activeUsers),
+    addDistinctCreatedBy(db, branches, start, end, activeUsers)
+  ]);
+  const taskCountByAgenticTool = {};
+  const taskCountByProvider = {};
+  const taskCountByModelFamily = {};
+  for (const task of taskRows) {
+    increment(taskCountByAgenticTool, task.agenticTool ?? "unknown");
+    increment(
+      taskCountByProvider,
+      normalizeTelemetryProvider(task.sessionData?.model_config?.provider)
+    );
+    increment(
+      taskCountByModelFamily,
+      normalizeTelemetryModelFamily(task.taskData?.model ?? task.sessionData?.model_config?.model)
+    );
+  }
+  if (promptCount > 0 || sessionCreatedCount > 0 || branchCreatedCount > 0) {
+    openSourceTelemetryLogger.track({
+      event: "usage.daily_summary",
+      properties: {
+        day,
+        period: "previous_utc_day",
+        prompt_count: promptCount,
+        active_user_count: activeUsers.size,
+        session_created_count: sessionCreatedCount,
+        branch_created_count: branchCreatedCount,
+        task_count_by_agentic_tool: taskCountByAgenticTool,
+        task_count_by_provider: taskCountByProvider,
+        task_count_by_model_family: taskCountByModelFamily
+      }
+    });
+    await openSourceTelemetryLogger.flush();
+  }
+  config.telemetry = { ...config.telemetry, last_usage_summary_day: day };
+  await saveConfig(pruneDefaultOpenSourceTelemetryDestination(config));
+}
+function startOpenSourceTelemetryUsageSummaryInterval(db, options) {
+  const run = () => {
+    runWithTenantDatabaseScope(
+      db,
+      options.tenantId,
+      () => flushOpenSourceTelemetryUsageSummary(db)
+    ).catch((error) => {
+      console.warn(
+        "[telemetry] failed to emit usage summary:",
+        error instanceof Error ? error.message : String(error)
+      );
+    });
+  };
+  const startupTimer = setTimeout(run, 3e4);
+  startupTimer.unref?.();
+  const timer = setInterval(run, ONE_HOUR_MS);
+  timer.unref?.();
+  return timer;
+}
+export {
+  flushOpenSourceTelemetryUsageSummary,
+  startOpenSourceTelemetryUsageSummaryInterval
+};

package/dist/daemon/utils/realign-repo-origin.d.ts

@@ -1,5 +1,5 @@
 import type { Application } from '@agor/core/feathers';
-import type { HookContext, Repo, RepoID } from '@agor/core/types';
+import type { AuthenticatedParams, HookContext, Repo, RepoID } from '@agor/core/types';
 /**
  * Daemon-side wrappers around the executor's `git.repo.realign-origin` command —
  * fire-and-forget, security-cleanup-only. Callers `.catch(...)` and continue.
@@ -8,9 +8,9 @@ import type { HookContext, Repo, RepoID } from '@agor/core/types';
  * deliberately not logged: drift may have come from a token-in-URL leak.
  */
 /** Look up the repo row, then realign. Use when caller only has a repoId. */
-export declare function ensureRepoOriginAlignedById(app: Application, repoId: RepoID): Promise<void>;
+export declare function ensureRepoOriginAlignedById(app: Application, repoId: RepoID, params?: Partial<AuthenticatedParams>): Promise<void>;
 /** Realign using a Repo row the caller already has (no extra DB fetch before spawning). */
-export declare function ensureRepoOriginAlignedForRepo(app: Application, repo: Repo): Promise<void>;
+export declare function ensureRepoOriginAlignedForRepo(app: Application, repo: Repo, params?: Partial<AuthenticatedParams>): Promise<void>;
 /**
  * Filter: realign only when the patch changed `remote_url` or signalled
  * `clone_status: 'ready'`. Other patches don't change what the canonical URL

package/dist/daemon/utils/realign-repo-origin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"realign-repo-origin.d.ts","sourceRoot":"","sources":["../../src/utils/realign-repo-origin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAOlE;;;;;;GAMG;AAEH,6EAA6E;AAC7E,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQjG;AAED,2FAA2F;AAC3F,wBAAsB,8BAA8B,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAsBhG;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,OAAO,CAGzF;AAED,iFAAiF;AACjF,wBAAgB,+BAA+B,KAC/B,SAAS,WAAW,KAAG,OAAO,CAAC,WAAW,CAAC,CAmB1D"}
+{"version":3,"file":"realign-repo-origin.d.ts","sourceRoot":"","sources":["../../src/utils/realign-repo-origin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAOvF;;;;;;GAMG;AAEH,6EAA6E;AAC7E,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC,CAQf;AAED,2FAA2F;AAC3F,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,IAAI,EACV,MAAM,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,OAAO,CAGzF;AAED,iFAAiF;AACjF,wBAAgB,+BAA+B,KAC/B,SAAS,WAAW,KAAG,OAAO,CAAC,WAAW,CAAC,CAqB1D"}

package/dist/daemon/utils/realign-repo-origin.js

@@ -108,6 +108,13 @@ function generateTaskId() {
   return Array.from(bytes).map((b) => b.toString(16).padStart(2, "0")).join("");
 }
 function findExecutorPath() {
+  const configuredPath = process.env.AGOR_EXECUTOR_PATH;
+  if (configuredPath) {
+    if (!existsSync(configuredPath)) {
+      throw new Error(`Configured AGOR_EXECUTOR_PATH does not exist: ${configuredPath}`);
+    }
+    return configuredPath;
+  }
   const dirname = typeof __dirname !== "undefined" ? __dirname : path.dirname(fileURLToPath(import.meta.url));
   const possiblePaths = [
     path.join(dirname, "../executor/cli.js"),
@@ -218,6 +225,12 @@ function spawnExecutorLocal(payload, options) {
     options.onExit?.(127);
     return;
   }
+  let reportedExit = false;
+  const reportExit = (code) => {
+    if (reportedExit) return;
+    reportedExit = true;
+    options.onExit?.(code);
+  };
   const executorProcess = spawn(cmd, args, {
     cwd,
     env: asUser ? void 0 : { ...envWithDaemonUrl },
@@ -231,6 +244,7 @@ function spawnExecutorLocal(payload, options) {
   onSpawn?.(executorProcess);
   executorProcess.on("error", (error) => {
     console.error(`${logPrefix} Spawn error:`, error.message);
+    reportExit(127);
   });
   executorProcess.on("exit", (code) => {
     if (code === 0) {
@@ -238,7 +252,7 @@ function spawnExecutorLocal(payload, options) {
     } else {
       console.error(`${logPrefix} Executor exited with code ${code}`);
     }
-    options.onExit?.(code);
+    reportExit(code);
   });
   executorProcess.stdin?.write(JSON.stringify(payload));
   executorProcess.stdin?.end();
@@ -251,6 +265,12 @@ function spawnExecutorWithTemplate(payload, options) {
   console.log(`${logPrefix} Task ID: ${templateVariables.task_id}`);
   console.log(`${logPrefix} Command: ${payload.command}`);
   console.log(`${logPrefix} Template command (first 200 chars): ${command.slice(0, 200)}...`);
+  let reportedExit = false;
+  const reportExit = (code) => {
+    if (reportedExit) return;
+    reportedExit = true;
+    options.onExit?.(code);
+  };
   const executorProcess = spawn("sh", ["-c", command], {
     env: { ...process.env, LOG_LEVEL: logLevel },
     stdio: ["pipe", "pipe", "pipe"]
@@ -264,6 +284,7 @@ function spawnExecutorWithTemplate(payload, options) {
   });
   executorProcess.on("error", (error) => {
     console.error(`${logPrefix} Spawn error:`, error.message);
+    reportExit(127);
   });
   executorProcess.on("exit", (code) => {
     if (code === 0) {
@@ -275,7 +296,7 @@ function spawnExecutorWithTemplate(payload, options) {
         `${logPrefix} Executor exited with code ${code} (task: ${templateVariables.task_id})`
       );
     }
-    options.onExit?.(code);
+    reportExit(code);
   });
   executorProcess.stdin?.write(JSON.stringify(payload));
   executorProcess.stdin?.end();
@@ -298,31 +319,39 @@ function createServiceToken(jwtSecret, expiresIn, scope = {}) {
     expiresIn || "5m"
   );
 }
-function generateSessionToken(app) {
+function serviceTokenScopeForParams(params) {
+  const tenantId = params?.tenant?.tenant_id ?? params?.tenant_id ?? params?.user?.tenant_id;
+  return tenantId ? { tenant_id: tenantId } : {};
+}
+function generateSessionToken(app, scope = {}) {
   const jwtSecret = app.settings.authentication?.secret;
   if (!jwtSecret) {
     throw new Error("JWT secret not configured in app settings");
   }
-  return createServiceToken(jwtSecret);
+  return createServiceToken(jwtSecret, void 0, scope);
+}
+function generateScopedServiceToken(app, params) {
+  return generateSessionToken(app, serviceTokenScopeForParams(params));
 }
 var spawnExecutorFireAndForget = spawnExecutor;
 
 // src/utils/realign-repo-origin.ts
-async function ensureRepoOriginAlignedById(app, repoId) {
+async function ensureRepoOriginAlignedById(app, repoId, params) {
   let repo;
   try {
-    repo = await app.service("repos").get(repoId);
+    repo = await app.service("repos").get(repoId, params);
   } catch {
     return;
   }
-  return ensureRepoOriginAlignedForRepo(app, repo);
+  return ensureRepoOriginAlignedForRepo(app, repo, params);
 }
-async function ensureRepoOriginAlignedForRepo(app, repo) {
+async function ensureRepoOriginAlignedForRepo(app, repo, params) {
   if (repo.repo_type !== "remote") return;
   if (!repo.remote_url) return;
   if (!repo.local_path) return;
-  const sessionToken = generateSessionToken(
-    app
+  const sessionToken = generateScopedServiceToken(
+    app,
+    params
   );
   spawnExecutorFireAndForget(
     {
@@ -351,12 +380,14 @@ function realignRepoOriginAfterPatchHook() {
     const repos = Array.isArray(result) ? result : [result];
     for (const repo of repos) {
       if (!repo?.repo_id) continue;
-      ensureRepoOriginAlignedForRepo(context.app, repo).catch((err) => {
-        const message = err instanceof Error ? err.message : String(err);
-        console.warn(
-          `\u26A0\uFE0F  [repos.after.patch] ensureRepoOriginAlignedForRepo failed for repo ${repo.repo_id}: ${message}`
-        );
-      });
+      ensureRepoOriginAlignedForRepo(context.app, repo, context.params).catch(
+        (err) => {
+          const message = err instanceof Error ? err.message : String(err);
+          console.warn(
+            `\u26A0\uFE0F  [repos.after.patch] ensureRepoOriginAlignedForRepo failed for repo ${repo.repo_id}: ${message}`
+          );
+        }
+      );
     }
     return context;
   };

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

@@ -1,6 +1,31 @@
+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;
@@ -8,6 +33,7 @@ type RealtimePublishOptions = {
     sessionsRepository: SessionRepository;
     accessCache?: RealtimeAccessCache;
     allowSuperadmin?: boolean;
+    multiTenancy?: ResolvedMultiTenancyConfig;
 };
 /**
  * Register the single global Feathers publish handler.

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,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;AAmBpC,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;CAC3B,CAAC;AAoQF;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI,CA2D9E"}
+{"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"}