agor-live 0.21.2 → 0.23.1

package/dist/core/unix/index.js

@@ -1,5 +1,7 @@
 var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
@@ -7,6 +9,15 @@ var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
+var __copyProps = (to, from, except, desc6) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc6 = __getOwnPropDesc(from, key)) || desc6.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 
 // ../../node_modules/.pnpm/tsup@8.5.1_jiti@2.6.1_postcss@8.5.15_tsx@4.22.4_typescript@6.0.3_yaml@2.9.0/node_modules/tsup/assets/esm_shims.js
 import path from "path";
@@ -136,6 +147,71 @@ var init_executor_heartbeat = __esm({
   }
 });
 
+// src/config/multitenancy.ts
+function detectPostgresUrl(url) {
+  if (!url) return false;
+  const lower = url.toLowerCase();
+  return lower.startsWith("postgresql://") || lower.startsWith("postgres://") || lower.startsWith("pg://");
+}
+function resolveMultiTenancyDatabaseDialect(config = {}) {
+  if (process.env.AGOR_DB_DIALECT === "postgresql" || process.env.AGOR_DB_DIALECT === "sqlite") {
+    return process.env.AGOR_DB_DIALECT;
+  }
+  if (detectPostgresUrl(process.env.DATABASE_URL)) return "postgresql";
+  if (config.database?.dialect === "postgresql" || config.database?.dialect === "sqlite") {
+    return config.database.dialect;
+  }
+  if (detectPostgresUrl(config.database?.postgresql?.url) || config.database?.postgresql?.host) {
+    return "postgresql";
+  }
+  return "sqlite";
+}
+function resolveMultiTenancyConfig(config) {
+  const raw = config.multi_tenancy ?? {};
+  const mode = raw.mode ?? "static";
+  return {
+    mode,
+    static_tenant_id: raw.static_tenant_id?.trim() || DEFAULT_STATIC_TENANT_ID,
+    ...raw.auth_claim ? { auth_claim: raw.auth_claim } : {},
+    ...raw.trusted_header ? { trusted_header: raw.trusted_header } : {}
+  };
+}
+function assertValidMultiTenancyConfig(config) {
+  const resolved = resolveMultiTenancyConfig(config);
+  if (resolved.mode !== "static" && resolved.mode !== "required_from_auth") {
+    throw new Error("Config error: multi_tenancy.mode must be one of: static, required_from_auth");
+  }
+  if (!resolved.static_tenant_id) {
+    throw new Error("Config error: multi_tenancy.static_tenant_id must not be empty");
+  }
+  if (resolved.auth_claim && RESERVED_AUTH_CLAIMS.has(resolved.auth_claim)) {
+    throw new Error(
+      `Config error: multi_tenancy.auth_claim cannot be reserved JWT claim '${resolved.auth_claim}'`
+    );
+  }
+  if (resolved.mode === "required_from_auth") {
+    if (resolveMultiTenancyDatabaseDialect(config) !== "postgresql") {
+      throw new Error(
+        "Config error: multi_tenancy.required_from_auth requires database.dialect: postgresql"
+      );
+    }
+    if (!resolved.auth_claim && !resolved.trusted_header) {
+      throw new Error(
+        "Config error: multi_tenancy.required_from_auth requires multi_tenancy.auth_claim or multi_tenancy.trusted_header"
+      );
+    }
+  }
+}
+var DEFAULT_STATIC_TENANT_ID, RESERVED_AUTH_CLAIMS;
+var init_multitenancy = __esm({
+  "src/config/multitenancy.ts"() {
+    "use strict";
+    init_esm_shims();
+    DEFAULT_STATIC_TENANT_ID = "default";
+    RESERVED_AUTH_CLAIMS = /* @__PURE__ */ new Set(["aud", "exp", "iat", "iss", "jti", "nbf", "sub", "type"]);
+  }
+});
+
 // src/config/types.ts
 var BRANCH_STORAGE_MODES, DEFAULT_BRANCH_STORAGE_MODE;
 var init_types = __esm({
@@ -180,6 +256,7 @@ __export(config_manager_exports, {
   requireDaemonUser: () => requireDaemonUser,
   requirePublicBaseUrl: () => requirePublicBaseUrl,
   resolveBranchStorageConfig: () => resolveBranchStorageConfig,
+  resolveExecutionSecurityMode: () => resolveExecutionSecurityMode,
   saveConfig: () => saveConfig,
   setConfigValue: () => setConfigValue,
   unsetConfigValue: () => unsetConfigValue
@@ -188,14 +265,14 @@ import { readFileSync, statSync } from "fs";
 import fs2 from "fs/promises";
 import os from "os";
 import path2 from "path";
-import yaml2 from "js-yaml";
+import * as yaml2 from "js-yaml";
 function cacheKeyMatches(a, b) {
   return a.mtimeMs === b.mtimeMs && a.size === b.size;
 }
 function statCacheKey(configPath) {
   try {
-    const stat2 = statSync(configPath);
-    return { mtimeMs: stat2.mtimeMs, size: stat2.size };
+    const stat = statSync(configPath);
+    return { mtimeMs: stat.mtimeMs, size: stat.size };
   } catch (error) {
     if (error.code === "ENOENT") {
       return NO_FILE_KEY;
@@ -223,6 +300,9 @@ function __resetConfigCacheForTests() {
   invalidateConfigCache();
 }
 function parseAndValidateConfig(content) {
+  if (content.trim() === "") {
+    return {};
+  }
   const parsed = yaml2.load(content);
   const finalConfig = parsed || {};
   validateConfig(finalConfig);
@@ -260,6 +340,7 @@ To update: agor config set execution.unix_user_mode insulated`
       `Config error: execution.managed_envs_execution_mode must be one of: hybrid, webhook-only`
     );
   }
+  assertValidMultiTenancyConfig(config);
   validateOptionalHttpUrl(
     config.external_launch,
     "login_redirect_url",
@@ -377,7 +458,12 @@ function getDefaultConfig() {
       // Default: sync passwords to Unix
       executor_heartbeat: resolveExecutorHeartbeatConfig()
     },
-    analytics: getDefaultAnalyticsConfig()
+    analytics: getDefaultAnalyticsConfig(),
+    telemetry: {},
+    multi_tenancy: {
+      mode: "static",
+      static_tenant_id: "default"
+    }
   };
 }
 function expandHomePath(input) {
@@ -409,7 +495,8 @@ async function getConfigValue(key) {
     ui: { ...defaults.ui, ...config.ui },
     execution: { ...defaults.execution, ...config.execution },
     paths: { ...defaults.paths, ...config.paths },
-    analytics: { ...defaults.analytics, ...config.analytics }
+    analytics: { ...defaults.analytics, ...config.analytics },
+    telemetry: { ...defaults.telemetry, ...config.telemetry }
   };
   const parts = key.split(".");
   let value = merged;
@@ -480,6 +567,9 @@ async function getBaseUrl() {
   if (config.daemon?.base_url) {
     return validateBaseUrl(config.daemon.base_url);
   }
+  if (config.ui?.base_url) {
+    return validateBaseUrl(config.ui.base_url);
+  }
   const defaults = getDefaultConfig();
   const envPort = process.env.PORT ? Number.parseInt(process.env.PORT, 10) : void 0;
   const port = envPort || config.daemon?.port || defaults.daemon?.port || DAEMON.DEFAULT_PORT;
@@ -494,8 +584,11 @@ async function requirePublicBaseUrl() {
   if (config.daemon?.base_url) {
     return validateBaseUrl(config.daemon.base_url);
   }
+  if (config.ui?.base_url) {
+    return validateBaseUrl(config.ui.base_url);
+  }
   throw new PublicBaseUrlNotConfiguredError(
-    "No public base URL configured. Set the AGOR_BASE_URL environment variable or `daemon.base_url` in ~/.agor/config.yaml to the daemon's browser-reachable URL (e.g. https://agor.example.com). This is required so OAuth providers can redirect users back to a URL their browser can reach \u2014 the localhost fallback only works for browsers on the daemon machine."
+    "No public base URL configured. Set the AGOR_BASE_URL environment variable or `daemon.base_url` (preferred) / `ui.base_url` (legacy) in ~/.agor/config.yaml to the daemon's browser-reachable URL (e.g. https://agor.example.com). This is required so OAuth providers can redirect users back to a URL their browser can reach \u2014 the localhost fallback only works for browsers on the daemon machine."
   );
 }
 function loadConfigSync() {
@@ -565,10 +658,10 @@ function requireDaemonUser(config) {
   if (config.daemon?.unix_user) {
     return config.daemon.unix_user;
   }
-  const unixIsolationEnabled = config.execution?.branch_rbac === true || config.execution?.unix_user_mode && config.execution.unix_user_mode !== "simple";
+  const unixIsolationEnabled = resolveExecutionSecurityMode(config).requiresDaemonUnixUser;
   if (unixIsolationEnabled) {
     throw new Error(
-      "Unix isolation is enabled (branch_rbac or unix_user_mode) but daemon.unix_user is not configured.\nPlease set daemon.unix_user in ~/.agor/config.yaml to the user running the daemon.\nExample:\n  daemon:\n    unix_user: agor"
+      "Unix isolation is enabled (execution.unix_user_mode is insulated or strict) but daemon.unix_user is not configured.\nPlease set daemon.unix_user in ~/.agor/config.yaml to the user running the daemon.\nExample:\n  daemon:\n    unix_user: agor"
     );
   }
   const user = process.env.USER || os.userInfo().username;
@@ -579,19 +672,29 @@ function requireDaemonUser(config) {
   }
   return user;
 }
+function resolveExecutionSecurityMode(config = loadConfigSync()) {
+  const unixUserMode = config.execution?.unix_user_mode ?? "simple";
+  const unixIsolationEnabled = unixUserMode !== "simple";
+  return {
+    appRbacEnabled: config.execution?.branch_rbac === true,
+    unixUserMode,
+    unixImpersonationEnabled: unixIsolationEnabled,
+    unixFsIsolationEnabled: unixIsolationEnabled,
+    unixGroupRefreshNeeded: unixIsolationEnabled,
+    requiresDaemonUnixUser: unixIsolationEnabled,
+    shouldInitUnixGroups: unixIsolationEnabled
+  };
+}
 function isBranchRbacEnabled() {
   try {
-    const config = loadConfigSync();
-    return config.execution?.branch_rbac === true;
+    return resolveExecutionSecurityMode().appRbacEnabled;
   } catch {
     return false;
   }
 }
 function isUnixImpersonationEnabled() {
   try {
-    const config = loadConfigSync();
-    const mode = config.execution?.unix_user_mode;
-    return mode !== void 0 && mode !== "simple";
+    return resolveExecutionSecurityMode().unixImpersonationEnabled;
   } catch {
     return false;
   }
@@ -617,7 +720,7 @@ function ensureBranchStorageModeAllowed(mode) {
   }
 }
 function isUnixGroupRefreshNeeded() {
-  return isBranchRbacEnabled() || isUnixImpersonationEnabled();
+  return resolveExecutionSecurityMode().unixGroupRefreshNeeded;
 }
 function getDataHome() {
   if (process.env.AGOR_DATA_HOME) {
@@ -668,6 +771,7 @@ var init_config_manager = __esm({
     init_analytics_defaults();
     init_constants();
     init_executor_heartbeat();
+    init_multitenancy();
     init_types();
     NO_FILE = -1;
     NO_FILE_KEY = { mtimeMs: NO_FILE, size: 0 };
@@ -690,6 +794,21 @@ var init_config_manager = __esm({
   }
 });
 
+// src/db/tenant-context.ts
+import { AsyncLocalStorage } from "async_hooks";
+function getCurrentTenantId() {
+  const store = tenantDatabaseScope.getStore();
+  return store?.kind === "tenant" ? store.tenantId : void 0;
+}
+var tenantDatabaseScope;
+var init_tenant_context = __esm({
+  "src/db/tenant-context.ts"() {
+    "use strict";
+    init_esm_shims();
+    tenantDatabaseScope = new AsyncLocalStorage();
+  }
+});
+
 // src/db/database-wrapper.ts
 var database_wrapper_exports = {};
 __export(database_wrapper_exports, {
@@ -756,7 +875,7 @@ function dateTruncUtc(db, column, bucket) {
     }
   } else {
     return sql`to_char(
-      date_trunc(${bucket}, ${column} AT TIME ZONE 'UTC'),
+      date_trunc(${sql.raw(`'${bucket}'`)}, ${column} AT TIME ZONE 'UTC'),
       'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
     )`;
   }
@@ -778,12 +897,12 @@ function advisoryLockKeyForUuid(uuid) {
   const FNV_OFFSET = 0xcbf29ce484222325n;
   const FNV_PRIME = 0x100000001b3n;
   const MASK_64 = 0xffffffffffffffffn;
-  let hash2 = FNV_OFFSET;
+  let hash = FNV_OFFSET;
   for (let i = 0; i < uuid.length; i++) {
-    hash2 ^= BigInt(uuid.charCodeAt(i));
-    hash2 = hash2 * FNV_PRIME & MASK_64;
+    hash ^= BigInt(uuid.charCodeAt(i));
+    hash = hash * FNV_PRIME & MASK_64;
   }
-  return hash2 > 0x7fffffffffffffffn ? hash2 - 0x10000000000000000n : hash2;
+  return hash > 0x7fffffffffffffffn ? hash - 0x10000000000000000n : hash;
 }
 async function executeRaw(db, query) {
   if (isSQLiteDatabase(db)) {
@@ -811,21 +930,36 @@ async function getOne(db, table, where) {
 }
 async function insertOne(db, table, values) {
   if (isSQLiteDatabase(db)) {
-    const result = await db.insert(table).values(values).returning();
+    const result = await db.insert(table).values(withTenantInsertValues(values, table)).returning();
     return result;
   } else {
-    const result = await db.insert(table).values(values).returning();
+    const result = await db.insert(table).values(withTenantInsertValues(values, table)).returning();
     return result[0];
   }
 }
-function wrapQuery(query, db) {
+function tableHasTenantColumn(table) {
+  return Boolean(table && "tenant_id" in table);
+}
+function withTenantInsertValues(values, table) {
+  const tenantId = getCurrentTenantId();
+  if (!tenantId || !tableHasTenantColumn(table)) return values;
+  const stamp = (row) => {
+    if (!row || typeof row !== "object" || Array.isArray(row)) return row;
+    if ("tenant_id" in row) return row;
+    return { tenant_id: tenantId, ...row };
+  };
+  return Array.isArray(values) ? values.map(stamp) : stamp(values);
+}
+function wrapQuery(query, db, table) {
   return {
     ...query,
     one: async () => {
       if (isSQLiteDatabase(db)) {
         return await query.get();
       } else {
-        const results = await query.limit(1);
+        const results = await query.limit(
+          1
+        );
         return results[0] || null;
       }
     },
@@ -847,30 +981,55 @@ function wrapQuery(query, db) {
         return { rowsAffected: result.length || 0 };
       }
     },
-    // biome-ignore lint/suspicious/noExplicitAny: Drizzle query builder types vary by dialect
     returning: () => wrapReturning(query.returning(), db),
     // Preserve chainable methods
-    // biome-ignore lint/suspicious/noExplicitAny: These methods accept varying argument types from Drizzle
-    where: (...args) => wrapQuery(query.where(...args), db),
-    // biome-ignore lint/suspicious/noExplicitAny: These methods accept varying argument types from Drizzle
-    limit: (...args) => wrapQuery(query.limit(...args), db),
-    // biome-ignore lint/suspicious/noExplicitAny: These methods accept varying argument types from Drizzle
-    offset: (...args) => wrapQuery(query.offset(...args), db),
-    // biome-ignore lint/suspicious/noExplicitAny: These methods accept varying argument types from Drizzle
-    orderBy: (...args) => wrapQuery(query.orderBy(...args), db),
-    // biome-ignore lint/suspicious/noExplicitAny: These methods accept varying argument types from Drizzle
-    groupBy: (...args) => wrapQuery(query.groupBy(...args), db),
-    // biome-ignore lint/suspicious/noExplicitAny: These methods accept varying argument types from Drizzle
-    set: (...args) => wrapQuery(query.set(...args), db),
-    // biome-ignore lint/suspicious/noExplicitAny: These methods accept varying argument types from Drizzle
-    values: (...args) => wrapQuery(query.values(...args), db),
-    // biome-ignore lint/suspicious/noExplicitAny: These methods accept varying argument types from Drizzle
-    innerJoin: (...args) => wrapQuery(query.innerJoin(...args), db),
-    // biome-ignore lint/suspicious/noExplicitAny: These methods accept varying argument types from Drizzle
-    leftJoin: (...args) => wrapQuery(query.leftJoin(...args), db),
-    onConflictDoNothing: (...args) => (
-      // biome-ignore lint/suspicious/noExplicitAny: Drizzle exposes onConflictDoNothing on both dialects after .values()
-      wrapQuery(query.onConflictDoNothing(...args), db)
+    where: (...args) => wrapQuery(
+      query.where(...args),
+      db,
+      table
+    ),
+    limit: (...args) => wrapQuery(
+      query.limit(...args),
+      db,
+      table
+    ),
+    offset: (...args) => wrapQuery(
+      query.offset(...args),
+      db,
+      table
+    ),
+    orderBy: (...args) => wrapQuery(
+      query.orderBy(...args),
+      db,
+      table
+    ),
+    groupBy: (...args) => wrapQuery(
+      query.groupBy(...args),
+      db,
+      table
+    ),
+    set: (...args) => wrapQuery(query.set(...args), db, table),
+    values: (...args) => wrapQuery(
+      query.values(
+        ...args.map((arg) => withTenantInsertValues(arg, table))
+      ),
+      db,
+      table
+    ),
+    innerJoin: (...args) => wrapQuery(
+      query.innerJoin(...args),
+      db,
+      table
+    ),
+    leftJoin: (...args) => wrapQuery(
+      query.leftJoin(...args),
+      db,
+      table
+    ),
+    onConflictDoNothing: (...args) => wrapQuery(
+      query.onConflictDoNothing(...args),
+      db,
+      table
     )
   };
 }
@@ -903,7 +1062,7 @@ function select(db, columns) {
 }
 function insert(db, table) {
   const query = db.insert(table);
-  return wrapQuery(query, db);
+  return wrapQuery(query, db, table);
 }
 function update(db, table) {
   const query = db.update(table);
@@ -941,6 +1100,7 @@ var init_database_wrapper = __esm({
   "src/db/database-wrapper.ts"() {
     "use strict";
     init_esm_shims();
+    init_tenant_context();
   }
 });
 
@@ -1145,15 +1305,35 @@ var init_schedule = __esm({
 });
 
 // src/types/session.ts
+var SessionStatus, EXECUTING_SESSION_STATUSES;
 var init_session = __esm({
   "src/types/session.ts"() {
     "use strict";
     init_esm_shims();
+    SessionStatus = {
+      IDLE: "idle",
+      RUNNING: "running",
+      STOPPING: "stopping",
+      // Stop requested, waiting for task to stop
+      AWAITING_PERMISSION: "awaiting_permission",
+      AWAITING_INPUT: "awaiting_input",
+      // Legacy / pre-#1177: AskUserQuestion was disallowed at the SDK; new sessions never enter this state, kept for historical rows
+      TIMED_OUT: "timed_out",
+      // Permission/input request timed out, executor exited — user must re-prompt
+      COMPLETED: "completed",
+      FAILED: "failed"
+    };
+    EXECUTING_SESSION_STATUSES = /* @__PURE__ */ new Set([
+      SessionStatus.RUNNING,
+      SessionStatus.STOPPING,
+      SessionStatus.AWAITING_PERMISSION,
+      SessionStatus.AWAITING_INPUT
+    ]);
   }
 });
 
 // src/types/task.ts
-var TaskStatus, TERMINAL_TASK_STATUSES;
+var TaskStatus, TERMINAL_TASK_STATUSES, EXECUTING_TASK_STATUSES;
 var init_task = __esm({
   "src/types/task.ts"() {
     "use strict";
@@ -1181,6 +1361,12 @@ var init_task = __esm({
       TaskStatus.STOPPED,
       TaskStatus.TIMED_OUT
     ]);
+    EXECUTING_TASK_STATUSES = /* @__PURE__ */ new Set([
+      TaskStatus.RUNNING,
+      TaskStatus.STOPPING,
+      TaskStatus.AWAITING_PERMISSION,
+      TaskStatus.AWAITING_INPUT
+    ]);
   }
 });
 
@@ -1192,6 +1378,14 @@ var init_template = __esm({
   }
 });
 
+// src/types/tenant.ts
+var init_tenant = __esm({
+  "src/types/tenant.ts"() {
+    "use strict";
+    init_esm_shims();
+  }
+});
+
 // src/types/ui.ts
 var init_ui = __esm({
   "src/types/ui.ts"() {
@@ -1297,6 +1491,7 @@ var init_types2 = __esm({
     init_session();
     init_task();
     init_template();
+    init_tenant();
     init_ui();
     init_user();
     init_utils();
@@ -1322,6 +1517,7 @@ __export(schema_postgres_exports, {
   cardTypes: () => cardTypes,
   cards: () => cards,
   gatewayChannels: () => gatewayChannels,
+  gatewayOutboundMessages: () => gatewayOutboundMessages,
   groupMemberships: () => groupMemberships,
   groups: () => groups,
   kbDocumentUnits: () => kbDocumentUnits,
@@ -1340,6 +1536,8 @@ __export(schema_postgres_exports, {
   serializedSessions: () => serializedSessions,
   sessionEnvSelections: () => sessionEnvSelections,
   sessionMcpServers: () => sessionMcpServers,
+  sessionRelationships: () => sessionRelationships,
+  sessionRelationshipsRelations: () => sessionRelationshipsRelations,
   sessions: () => sessions,
   sessionsRelations: () => sessionsRelations,
   tasks: () => tasks,
@@ -1363,7 +1561,7 @@ import {
   uniqueIndex,
   varchar
 } from "drizzle-orm/pg-core";
-var bytea, t, sessions, tasks, serializedSessions, messages, boards, repos, branches, branchOwners, boardOwners, schedules, users, groups, groupMemberships, branchGroupGrants, boardGroupGrants, appVariables, userApiKeys, mcpServers, cardTypes, cards, artifacts, artifactTrustGrants, boardObjects, sessionMcpServers, userMcpOauthTokens, boardComments, gatewayChannels, threadSessionMap, sessionEnvSelections, kbNamespaces, kbNamespaceAcl, kbDocuments, kbDocumentVersions, kbDocumentUnits, kbEmbeddingSpaces, kbGraphNodes, kbGraphEdges, sessionsRelations, branchesRelations, schedulesRelations;
+var bytea, t, sessions, sessionRelationships, tasks, serializedSessions, messages, boards, repos, branches, branchOwners, boardOwners, schedules, users, groups, groupMemberships, branchGroupGrants, boardGroupGrants, appVariables, userApiKeys, mcpServers, cardTypes, cards, artifacts, artifactTrustGrants, boardObjects, sessionMcpServers, userMcpOauthTokens, boardComments, gatewayChannels, threadSessionMap, gatewayOutboundMessages, sessionEnvSelections, kbNamespaces, kbNamespaceAcl, kbDocuments, kbDocumentVersions, kbDocumentUnits, kbEmbeddingSpaces, kbGraphNodes, kbGraphEdges, sessionsRelations, sessionRelationshipsRelations, branchesRelations, schedulesRelations;
 var init_schema_postgres = __esm({
   "src/db/schema.postgres.ts"() {
     "use strict";
@@ -1382,6 +1580,7 @@ var init_schema_postgres = __esm({
     sessions = pgTable(
       "sessions",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         // Primary identity
         session_id: varchar("session_id", { length: 36 }).primaryKey(),
         created_at: t.timestamp("created_at").notNull(),
@@ -1441,7 +1640,9 @@ var init_schema_postgres = __esm({
         data: t.json("data").$type().notNull()
       },
       (table) => ({
+        tenantIdx: index("sessions_tenant_id_idx").on(table.tenant_id),
         statusIdx: index("sessions_status_idx").on(table.status),
+        statusReadyIdx: index("sessions_status_ready_idx").on(table.status, table.ready_for_prompt),
         agenticToolIdx: index("sessions_agentic_tool_idx").on(table.agentic_tool),
         boardIdx: index("sessions_board_idx").on(table.board_id),
         branchIdx: index("sessions_branch_idx").on(table.branch_id),
@@ -1453,12 +1654,57 @@ var init_schema_postgres = __esm({
         // Partial unique index — covering for the scheduler's dedup lookup
         // AND serves as the DB-level guard against check-then-create races
         // in spawnScheduledSession.
-        scheduleRunUnique: uniqueIndex("sessions_schedule_run_unique").on(table.schedule_id, table.scheduled_run_at).where(sql2`${table.schedule_id} IS NOT NULL AND ${table.scheduled_run_at} IS NOT NULL`)
+        scheduleRunUnique: uniqueIndex("sessions_schedule_run_unique").on(table.tenant_id, table.schedule_id, table.scheduled_run_at).where(sql2`${table.schedule_id} IS NOT NULL AND ${table.scheduled_run_at} IS NOT NULL`)
+      })
+    );
+    sessionRelationships = pgTable(
+      "session_relationships",
+      {
+        tenant_id: text("tenant_id").notNull().default("default"),
+        relationship_id: varchar("relationship_id", { length: 36 }).primaryKey(),
+        source_session_id: varchar("source_session_id", { length: 36 }).notNull().references(() => sessions.session_id, { onDelete: "cascade" }),
+        target_session_id: varchar("target_session_id", { length: 36 }).notNull().references(() => sessions.session_id, { onDelete: "cascade" }),
+        relationship_type: text("relationship_type", { enum: ["remote_create"] }).notNull(),
+        created_by: varchar("created_by", { length: 36 }).notNull(),
+        created_at: t.timestamp("created_at").notNull(),
+        updated_at: t.timestamp("updated_at"),
+        callback_enabled: t.bool("callback_enabled").notNull().default(false),
+        callback_session_id: varchar("callback_session_id", { length: 36 }).references(
+          () => sessions.session_id,
+          {
+            onDelete: "set null"
+          }
+        ),
+        data: t.json("data")
+      },
+      (table) => ({
+        tenantIdx: index("session_relationships_tenant_id_idx").on(table.tenant_id),
+        sourceIdx: index("session_relationships_source_idx").on(table.source_session_id),
+        targetIdx: index("session_relationships_target_idx").on(table.target_session_id),
+        callbackIdx: index("session_relationships_callback_idx").on(table.callback_session_id),
+        // Composite indexes so the OR predicate in dispatchCompletionCallbacks
+        // (WHERE source_session_id = $1 OR target_session_id = $2) uses BitmapOr
+        // over these instead of a full tenant table scan via tenant_id_idx.
+        tenantSourceIdx: index("session_relationships_tenant_source_idx").on(
+          table.tenant_id,
+          table.source_session_id
+        ),
+        tenantTargetIdx: index("session_relationships_tenant_target_idx").on(
+          table.tenant_id,
+          table.target_session_id
+        ),
+        sourceTargetTypeUnique: uniqueIndex("session_relationships_source_target_type_unique").on(
+          table.tenant_id,
+          table.source_session_id,
+          table.target_session_id,
+          table.relationship_type
+        )
       })
     );
     tasks = pgTable(
       "tasks",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         task_id: varchar("task_id", { length: 36 }).primaryKey(),
         session_id: varchar("session_id", { length: 36 }).notNull().references(() => sessions.session_id, { onDelete: "cascade" }),
         created_at: t.timestamp("created_at").notNull(),
@@ -1488,19 +1734,23 @@ var init_schema_postgres = __esm({
         data: t.json("data").$type().notNull()
       },
       (table) => ({
+        tenantIdx: index("tasks_tenant_id_idx").on(table.tenant_id),
         sessionIdx: index("tasks_session_idx").on(table.session_id),
         statusIdx: index("tasks_status_idx").on(table.status),
         createdIdx: index("tasks_created_idx").on(table.created_at),
+        // Composite for "latest task for session" queries (ORDER BY created_at DESC LIMIT 1).
+        sessionCreatedIdx: index("tasks_session_created_idx").on(table.session_id, table.created_at),
         queueIdx: index("tasks_queue_idx").on(table.session_id, table.status, table.queue_position),
         // Partial unique index — defense-in-depth for `tasks.createPending` race
         // serialization. Only QUEUED rows are constrained; CREATED/RUNNING/done
         // rows have NULL queue_position and are unaffected.
-        queuedPositionUnique: uniqueIndex("tasks_queued_position_unique").on(table.session_id, table.queue_position).where(sql2`${table.status} = 'queued'`)
+        queuedPositionUnique: uniqueIndex("tasks_queued_position_unique").on(table.tenant_id, table.session_id, table.queue_position).where(sql2`${table.status} = 'queued'`)
       })
     );
     serializedSessions = pgTable(
       "serialized_sessions",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         id: varchar("id", { length: 36 }).primaryKey(),
         session_id: varchar("session_id", { length: 36 }).notNull().references(() => sessions.session_id, { onDelete: "cascade" }),
         branch_id: varchar("branch_id", { length: 36 }).notNull().references(() => branches.branch_id, { onDelete: "cascade" }),
@@ -1516,6 +1766,7 @@ var init_schema_postgres = __esm({
         // gzipped; NULL while status='processing'
       },
       (table) => ({
+        tenantIdx: index("serialized_sessions_tenant_id_idx").on(table.tenant_id),
         sessionTurnIdx: index("serialized_sessions_session_turn_idx").on(
           table.session_id,
           table.turn_index
@@ -1526,6 +1777,7 @@ var init_schema_postgres = __esm({
     messages = pgTable(
       "messages",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         // Primary identity
         message_id: varchar("message_id", { length: 36 }).primaryKey(),
         created_at: t.timestamp("created_at").notNull(),
@@ -1565,15 +1817,23 @@ var init_schema_postgres = __esm({
         data: t.json("data").$type().notNull()
       },
       (table) => ({
+        tenantIdx: index("messages_tenant_id_idx").on(table.tenant_id),
+        tenantTimestampIdx: index("messages_tenant_timestamp_idx").on(table.tenant_id, table.timestamp),
         // Indexes for efficient lookups
         sessionIdx: index("messages_session_id_idx").on(table.session_id),
         taskIdx: index("messages_task_id_idx").on(table.task_id),
-        sessionIndexIdx: index("messages_session_index_idx").on(table.session_id, table.index)
+        sessionIndexIdx: index("messages_session_index_idx").on(table.session_id, table.index),
+        timestampIdx: index("messages_timestamp_idx").on(table.timestamp),
+        sessionTimestampIdx: index("messages_session_timestamp_idx").on(
+          table.session_id,
+          table.timestamp
+        )
       })
     );
     boards = pgTable(
       "boards",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         board_id: varchar("board_id", { length: 36 }).primaryKey(),
         created_at: t.timestamp("created_at").notNull(),
         updated_at: t.timestamp("updated_at"),
@@ -1581,7 +1841,7 @@ var init_schema_postgres = __esm({
         created_by: varchar("created_by", { length: 36 }).notNull(),
         // Materialized for lookups
         name: text("name").notNull(),
-        slug: text("slug").unique(),
+        slug: text("slug"),
         primary_assistant_id: varchar("primary_assistant_id", { length: 36 }).references(
           () => branches.branch_id,
           {
@@ -1596,18 +1856,21 @@ var init_schema_postgres = __esm({
         archived_by: varchar("archived_by", { length: 36 })
       },
       (table) => ({
+        tenantIdx: index("boards_tenant_id_idx").on(table.tenant_id),
         nameIdx: index("boards_name_idx").on(table.name),
-        slugIdx: index("boards_slug_idx").on(table.slug)
+        slugIdx: index("boards_slug_idx").on(table.slug),
+        slugTenantUnique: uniqueIndex("boards_tenant_slug_unique").on(table.tenant_id, table.slug)
       })
     );
     repos = pgTable(
       "repos",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         repo_id: varchar("repo_id", { length: 36 }).primaryKey(),
         created_at: t.timestamp("created_at").notNull(),
         updated_at: t.timestamp("updated_at"),
         // Materialized for querying
-        slug: text("slug").notNull().unique(),
+        slug: text("slug").notNull(),
         repo_type: text("repo_type", { enum: ["remote", "local"] }).notNull().default("remote"),
         // Unix group for repo-level git access (agor_rp_<short-id>)
         // Users who have access to ANY branch in this repo get added to this group.
@@ -1618,12 +1881,15 @@ var init_schema_postgres = __esm({
         data: t.json("data").$type().notNull()
       },
       (table) => ({
-        slugIdx: index("repos_slug_idx").on(table.slug)
+        tenantIdx: index("repos_tenant_id_idx").on(table.tenant_id),
+        slugIdx: index("repos_slug_idx").on(table.slug),
+        slugTenantUnique: uniqueIndex("repos_tenant_slug_unique").on(table.tenant_id, table.slug)
       })
     );
     branches = pgTable(
       "branches",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         // Primary identity
         branch_id: varchar("branch_id", { length: 36 }).primaryKey(),
         repo_id: varchar("repo_id", { length: 36 }).notNull().references(() => repos.repo_id, { onDelete: "cascade" }),
@@ -1698,6 +1964,7 @@ var init_schema_postgres = __esm({
         data: t.json("data").$type().notNull()
       },
       (table) => ({
+        tenantIdx: index("branches_tenant_id_idx").on(table.tenant_id),
         repoIdx: index("branches_repo_idx").on(table.repo_id),
         nameIdx: index("branches_name_idx").on(table.name),
         refIdx: index("branches_ref_idx").on(table.ref),
@@ -1711,22 +1978,26 @@ var init_schema_postgres = __esm({
     branchOwners = pgTable(
       "branch_owners",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         branch_id: varchar("branch_id", { length: 36 }).notNull().references(() => branches.branch_id, { onDelete: "cascade" }),
         user_id: varchar("user_id", { length: 36 }).notNull().references(() => users.user_id, { onDelete: "cascade" }),
         created_at: t.timestamp("created_at").defaultNow()
       },
       (table) => ({
+        tenantIdx: index("branch_owners_tenant_id_idx").on(table.tenant_id),
         pk: primaryKey({ columns: [table.branch_id, table.user_id] })
       })
     );
     boardOwners = pgTable(
       "board_owners",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         board_id: varchar("board_id", { length: 36 }).notNull().references(() => boards.board_id, { onDelete: "cascade" }),
         user_id: varchar("user_id", { length: 36 }).notNull().references(() => users.user_id, { onDelete: "cascade" }),
         created_at: t.timestamp("created_at")
       },
       (table) => ({
+        tenantIdx: index("board_owners_tenant_id_idx").on(table.tenant_id),
         pk: primaryKey({ columns: [table.board_id, table.user_id] }),
         userIdx: index("board_owners_user_idx").on(table.user_id)
       })
@@ -1734,6 +2005,7 @@ var init_schema_postgres = __esm({
     schedules = pgTable(
       "schedules",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         schedule_id: varchar("schedule_id", { length: 36 }).primaryKey(),
         branch_id: varchar("branch_id", { length: 36 }).notNull().references(() => branches.branch_id, { onDelete: "cascade" }),
         name: text("name").notNull(),
@@ -1757,6 +2029,7 @@ var init_schema_postgres = __esm({
         created_by: varchar("created_by", { length: 36 }).notNull().references(() => users.user_id)
       },
       (table) => ({
+        tenantIdx: index("schedules_tenant_id_idx").on(table.tenant_id),
         enabledNextRunIdx: index("schedules_enabled_next_run_idx").on(table.enabled, table.next_run_at),
         branchIdx: index("schedules_branch_idx").on(table.branch_id),
         createdByIdx: index("schedules_created_by_idx").on(table.created_by)
@@ -1765,12 +2038,13 @@ var init_schema_postgres = __esm({
     users = pgTable(
       "users",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         // Primary identity
         user_id: varchar("user_id", { length: 36 }).primaryKey(),
         created_at: t.timestamp("created_at").notNull(),
         updated_at: t.timestamp("updated_at"),
         // Materialized for auth lookups
-        email: text("email").unique().notNull(),
+        email: text("email").notNull(),
         password: text("password").notNull(),
         // bcrypt hashed
         // Basic profile (materialized for display)
@@ -1786,16 +2060,22 @@ var init_schema_postgres = __esm({
         onboarding_completed: t.bool("onboarding_completed").notNull().default(false),
         // Force password change flag (admin-settable, auto-cleared on password change)
         must_change_password: t.bool("must_change_password").notNull().default(false),
+        // Auth invalidation marker. Password changes set this timestamp so any
+        // previously issued browser access or refresh token is rejected.
+        tokens_valid_after: t.timestamp("tokens_valid_after"),
         // JSON blob for profile/preferences
         data: t.json("data").$type().notNull()
       },
       (table) => ({
-        emailIdx: index("users_email_idx").on(table.email)
+        tenantIdx: index("users_tenant_id_idx").on(table.tenant_id),
+        emailIdx: index("users_email_idx").on(table.email),
+        emailTenantUnique: uniqueIndex("users_tenant_email_unique").on(table.tenant_id, table.email)
       })
     );
     groups = pgTable(
       "groups",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         group_id: varchar("group_id", { length: 36 }).primaryKey(),
         name: text("name").notNull(),
         slug: text("slug").notNull(),
@@ -1808,13 +2088,15 @@ var init_schema_postgres = __esm({
         updated_at: t.timestamp("updated_at")
       },
       (table) => ({
-        slugIdx: uniqueIndex("groups_slug_idx").on(table.slug),
+        tenantIdx: index("groups_tenant_id_idx").on(table.tenant_id),
+        slugIdx: uniqueIndex("groups_tenant_slug_unique").on(table.tenant_id, table.slug),
         archivedIdx: index("groups_archived_idx").on(table.archived)
       })
     );
     groupMemberships = pgTable(
       "group_memberships",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         group_id: varchar("group_id", { length: 36 }).notNull().references(() => groups.group_id, { onDelete: "cascade" }),
         user_id: varchar("user_id", { length: 36 }).notNull().references(() => users.user_id, { onDelete: "cascade" }),
         added_by: varchar("added_by", { length: 36 }).references(() => users.user_id, {
@@ -1823,6 +2105,7 @@ var init_schema_postgres = __esm({
         created_at: t.timestamp("created_at").notNull()
       },
       (table) => ({
+        tenantIdx: index("group_memberships_tenant_id_idx").on(table.tenant_id),
         pk: primaryKey({ columns: [table.group_id, table.user_id] }),
         userIdx: index("group_memberships_user_idx").on(table.user_id)
       })
@@ -1830,6 +2113,7 @@ var init_schema_postgres = __esm({
     branchGroupGrants = pgTable(
       "branch_group_grants",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         branch_id: varchar("branch_id", { length: 36 }).notNull().references(() => branches.branch_id, { onDelete: "cascade" }),
         group_id: varchar("group_id", { length: 36 }).notNull().references(() => groups.group_id, { onDelete: "cascade" }),
         can: text("can", { enum: [...BRANCH_PERMISSION_LEVELS] }).notNull().default("view"),
@@ -1841,6 +2125,7 @@ var init_schema_postgres = __esm({
         updated_at: t.timestamp("updated_at")
       },
       (table) => ({
+        tenantIdx: index("branch_group_grants_tenant_id_idx").on(table.tenant_id),
         pk: primaryKey({ columns: [table.branch_id, table.group_id] }),
         groupIdx: index("branch_group_grants_group_idx").on(table.group_id)
       })
@@ -1848,6 +2133,7 @@ var init_schema_postgres = __esm({
     boardGroupGrants = pgTable(
       "board_group_grants",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         board_id: varchar("board_id", { length: 36 }).notNull().references(() => boards.board_id, { onDelete: "cascade" }),
         group_id: varchar("group_id", { length: 36 }).notNull().references(() => groups.group_id, { onDelete: "cascade" }),
         can: text("can", { enum: [...BRANCH_PERMISSION_LEVELS] }).notNull().default("view"),
@@ -1859,6 +2145,7 @@ var init_schema_postgres = __esm({
         updated_at: t.timestamp("updated_at")
       },
       (table) => ({
+        tenantIdx: index("board_group_grants_tenant_id_idx").on(table.tenant_id),
         pk: primaryKey({ columns: [table.board_id, table.group_id] }),
         groupIdx: index("board_group_grants_group_idx").on(table.group_id)
       })
@@ -1866,6 +2153,7 @@ var init_schema_postgres = __esm({
     appVariables = pgTable(
       "app_variables",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         variable_id: varchar("variable_id", { length: 36 }).primaryKey(),
         namespace: text("namespace").notNull(),
         key: text("key").notNull(),
@@ -1881,13 +2169,19 @@ var init_schema_postgres = __esm({
         updated_at: t.timestamp("updated_at").notNull()
       },
       (table) => ({
-        namespaceKeyIdx: uniqueIndex("app_variables_namespace_key_idx").on(table.namespace, table.key),
+        tenantIdx: index("app_variables_tenant_id_idx").on(table.tenant_id),
+        namespaceKeyIdx: uniqueIndex("app_variables_tenant_namespace_key_unique").on(
+          table.tenant_id,
+          table.namespace,
+          table.key
+        ),
         namespaceIdx: index("app_variables_namespace_idx").on(table.namespace)
       })
     );
     userApiKeys = pgTable(
       "user_api_keys",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         id: varchar("id", { length: 36 }).primaryKey(),
         user_id: varchar("user_id", { length: 36 }).notNull().references(() => users.user_id, { onDelete: "cascade" }),
         name: text("name").notNull(),
@@ -1899,6 +2193,7 @@ var init_schema_postgres = __esm({
         last_used_at: t.timestamp("last_used_at")
       },
       (table) => ({
+        tenantIdx: index("user_api_keys_tenant_id_idx").on(table.tenant_id),
         userIdx: index("user_api_keys_user_idx").on(table.user_id),
         prefixIdx: index("user_api_keys_prefix_idx").on(table.prefix)
       })
@@ -1906,6 +2201,7 @@ var init_schema_postgres = __esm({
     mcpServers = pgTable(
       "mcp_servers",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         // Primary identity
         mcp_server_id: varchar("mcp_server_id", { length: 36 }).primaryKey(),
         created_at: t.timestamp("created_at").notNull(),
@@ -1932,6 +2228,7 @@ var init_schema_postgres = __esm({
         data: t.json("data").$type().notNull()
       },
       (table) => ({
+        tenantIdx: index("mcp_servers_tenant_id_idx").on(table.tenant_id),
         nameIdx: index("mcp_servers_name_idx").on(table.name),
         scopeIdx: index("mcp_servers_scope_idx").on(table.scope),
         ownerIdx: index("mcp_servers_owner_idx").on(table.owner_user_id),
@@ -1941,6 +2238,7 @@ var init_schema_postgres = __esm({
     cardTypes = pgTable(
       "card_types",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         card_type_id: varchar("card_type_id", { length: 36 }).primaryKey(),
         name: text("name").notNull(),
         emoji: text("emoji"),
@@ -1952,12 +2250,14 @@ var init_schema_postgres = __esm({
         updated_at: t.timestamp("updated_at").notNull()
       },
       (table) => ({
+        tenantIdx: index("card_types_tenant_id_idx").on(table.tenant_id),
         nameIdx: index("card_types_name_idx").on(table.name)
       })
     );
     cards = pgTable(
       "cards",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         card_id: varchar("card_id", { length: 36 }).primaryKey(),
         board_id: varchar("board_id", { length: 36 }).notNull().references(() => boards.board_id, { onDelete: "cascade" }),
         card_type_id: varchar("card_type_id", { length: 36 }).references(() => cardTypes.card_type_id, {
@@ -1978,6 +2278,7 @@ var init_schema_postgres = __esm({
         archived_at: t.timestamp("archived_at")
       },
       (table) => ({
+        tenantIdx: index("cards_tenant_id_idx").on(table.tenant_id),
         boardIdx: index("cards_board_idx").on(table.board_id),
         cardTypeIdx: index("cards_card_type_idx").on(table.card_type_id),
         titleIdx: index("cards_title_idx").on(table.title),
@@ -1988,10 +2289,17 @@ var init_schema_postgres = __esm({
     artifacts = pgTable(
       "artifacts",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         artifact_id: varchar("artifact_id", { length: 36 }).primaryKey(),
         branch_id: varchar("branch_id", { length: 36 }).references(() => branches.branch_id, {
           onDelete: "set null"
         }),
+        source_session_id: varchar("source_session_id", { length: 36 }).references(
+          () => sessions.session_id,
+          {
+            onDelete: "set null"
+          }
+        ),
         board_id: varchar("board_id", { length: 36 }).notNull().references(() => boards.board_id, { onDelete: "cascade" }),
         name: text("name").notNull(),
         description: text("description"),
@@ -2017,7 +2325,9 @@ var init_schema_postgres = __esm({
         archived_at: t.timestamp("archived_at")
       },
       (table) => ({
+        tenantIdx: index("artifacts_tenant_id_idx").on(table.tenant_id),
         branchIdx: index("artifacts_branch_idx").on(table.branch_id),
+        sourceSessionIdx: index("artifacts_source_session_idx").on(table.source_session_id),
         boardIdx: index("artifacts_board_idx").on(table.board_id),
         archivedIdx: index("artifacts_archived_idx").on(table.archived),
         publicIdx: index("artifacts_public_idx").on(table.public)
@@ -2026,6 +2336,7 @@ var init_schema_postgres = __esm({
     artifactTrustGrants = pgTable(
       "artifact_trust_grants",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         grant_id: varchar("grant_id", { length: 36 }).primaryKey(),
         user_id: varchar("user_id", { length: 36 }).notNull(),
         scope_type: text("scope_type").notNull(),
@@ -2036,6 +2347,7 @@ var init_schema_postgres = __esm({
         revoked_at: t.timestamp("revoked_at")
       },
       (table) => ({
+        tenantIdx: index("artifact_trust_grants_tenant_id_idx").on(table.tenant_id),
         userIdx: index("artifact_trust_grants_user_idx").on(table.user_id),
         scopeIdx: index("artifact_trust_grants_scope_idx").on(table.scope_type, table.scope_value)
       })
@@ -2043,6 +2355,7 @@ var init_schema_postgres = __esm({
     boardObjects = pgTable(
       "board_objects",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         // Primary identity
         object_id: varchar("object_id", { length: 36 }).primaryKey(),
         board_id: varchar("board_id", { length: 36 }).notNull().references(() => boards.board_id, { onDelete: "cascade" }),
@@ -2058,6 +2371,7 @@ var init_schema_postgres = __esm({
         data: t.json("data").$type().notNull()
       },
       (table) => ({
+        tenantIdx: index("board_objects_tenant_id_idx").on(table.tenant_id),
         boardIdx: index("board_objects_board_idx").on(table.board_id),
         branchIdx: index("board_objects_branch_idx").on(table.branch_id),
         cardIdx: index("board_objects_card_idx").on(table.card_id)
@@ -2066,12 +2380,14 @@ var init_schema_postgres = __esm({
     sessionMcpServers = pgTable(
       "session_mcp_servers",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         session_id: varchar("session_id", { length: 36 }).notNull().references(() => sessions.session_id, { onDelete: "cascade" }),
         mcp_server_id: varchar("mcp_server_id", { length: 36 }).notNull().references(() => mcpServers.mcp_server_id, { onDelete: "cascade" }),
         enabled: t.bool("enabled").notNull().default(true),
         added_at: t.timestamp("added_at").notNull()
       },
       (table) => ({
+        tenantIdx: index("session_mcp_servers_tenant_id_idx").on(table.tenant_id),
         // Composite primary key
         pk: index("session_mcp_servers_pk").on(table.session_id, table.mcp_server_id),
         // Indexes for queries
@@ -2083,6 +2399,7 @@ var init_schema_postgres = __esm({
     userMcpOauthTokens = pgTable(
       "user_mcp_oauth_tokens",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         // NULL = shared-mode token (one per mcp_server_id)
         user_id: varchar("user_id", { length: 36 }).references(() => users.user_id, {
           onDelete: "cascade"
@@ -2100,6 +2417,7 @@ var init_schema_postgres = __esm({
         updated_at: t.timestamp("updated_at")
       },
       (table) => ({
+        tenantIdx: index("user_mcp_oauth_tokens_tenant_id_idx").on(table.tenant_id),
         // Composite lookup indexes. Uniqueness enforced via partial unique indexes
         // created in the migration (one for per-user rows, one for the shared row).
         pk: index("user_mcp_oauth_tokens_pk").on(table.user_id, table.mcp_server_id),
@@ -2110,6 +2428,7 @@ var init_schema_postgres = __esm({
     boardComments = pgTable(
       "board_comments",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         // Primary identity
         comment_id: varchar("comment_id", { length: 36 }).primaryKey(),
         created_at: t.timestamp("created_at").notNull(),
@@ -2151,6 +2470,7 @@ var init_schema_postgres = __esm({
         data: t.json("data").$type().notNull()
       },
       (table) => ({
+        tenantIdx: index("board_comments_tenant_id_idx").on(table.tenant_id),
         boardIdx: index("board_comments_board_idx").on(table.board_id),
         sessionIdx: index("board_comments_session_idx").on(table.session_id),
         taskIdx: index("board_comments_task_idx").on(table.task_id),
@@ -2165,6 +2485,7 @@ var init_schema_postgres = __esm({
     gatewayChannels = pgTable(
       "gateway_channels",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         // Primary identity
         id: varchar("id", { length: 36 }).primaryKey(),
         created_at: t.timestamp("created_at").notNull(),
@@ -2174,11 +2495,11 @@ var init_schema_postgres = __esm({
         // Materialized for queries
         name: text("name").notNull(),
         channel_type: text("channel_type", {
-          enum: ["slack", "discord", "whatsapp", "telegram", "github"]
+          enum: ["slack", "discord", "whatsapp", "telegram", "github", "teams"]
         }).notNull(),
         target_branch_id: varchar("target_branch_id", { length: 36 }).notNull().references(() => branches.branch_id, { onDelete: "cascade" }),
         agor_user_id: varchar("agor_user_id", { length: 36 }).notNull(),
-        channel_key: text("channel_key").notNull().unique(),
+        channel_key: text("channel_key").notNull(),
         enabled: t.bool("enabled").notNull().default(true),
         last_message_at: t.timestamp("last_message_at"),
         // JSON blob for platform credentials (encrypted at rest)
@@ -2187,13 +2508,19 @@ var init_schema_postgres = __esm({
         agentic_config: t.json("agentic_config")
       },
       (table) => ({
+        tenantIdx: index("gateway_channels_tenant_id_idx").on(table.tenant_id),
         channelKeyIdx: index("idx_gateway_channel_key").on(table.channel_key),
+        channelKeyTenantUnique: uniqueIndex("gateway_channels_tenant_channel_key_unique").on(
+          table.tenant_id,
+          table.channel_key
+        ),
         enabledTypeIdx: index("idx_gateway_enabled_type").on(table.enabled, table.channel_type)
       })
     );
     threadSessionMap = pgTable(
       "thread_session_map",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         // Primary identity
         id: varchar("id", { length: 36 }).primaryKey(),
         created_at: t.timestamp("created_at").notNull(),
@@ -2211,7 +2538,9 @@ var init_schema_postgres = __esm({
         metadata: t.json("metadata")
       },
       (table) => ({
-        uniqueChannelThread: uniqueIndex("uniq_thread_map_channel_thread").on(
+        tenantIdx: index("thread_session_map_tenant_id_idx").on(table.tenant_id),
+        uniqueChannelThread: uniqueIndex("uniq_thread_map_tenant_channel_thread").on(
+          table.tenant_id,
           table.channel_id,
           table.thread_id
         ),
@@ -2220,14 +2549,82 @@ var init_schema_postgres = __esm({
         channelStatusIdx: index("idx_thread_map_channel_status").on(table.channel_id, table.status)
       })
     );
+    gatewayOutboundMessages = pgTable(
+      "gateway_outbound_messages",
+      {
+        tenant_id: text("tenant_id").notNull().default("default"),
+        id: varchar("id", { length: 36 }).primaryKey(),
+        created_at: t.timestamp("created_at").notNull(),
+        updated_at: t.timestamp("updated_at").notNull(),
+        gateway_channel_id: varchar("gateway_channel_id", { length: 36 }).notNull().references(() => gatewayChannels.id, { onDelete: "cascade" }),
+        channel_type: text("channel_type", {
+          enum: ["slack", "discord", "whatsapp", "telegram", "github", "teams"]
+        }).notNull(),
+        platform_channel_id: text("platform_channel_id").notNull(),
+        platform_message_id: text("platform_message_id").notNull(),
+        platform_thread_id: text("platform_thread_id").notNull(),
+        platform_permalink: text("platform_permalink"),
+        target_branch_id: varchar("target_branch_id", { length: 36 }).notNull().references(() => branches.branch_id),
+        emitted_by_user_id: varchar("emitted_by_user_id", { length: 36 }).notNull().references(() => users.user_id),
+        emitted_by_session_id: varchar("emitted_by_session_id", { length: 36 }).references(
+          () => sessions.session_id,
+          {
+            onDelete: "set null"
+          }
+        ),
+        emitted_by_task_id: varchar("emitted_by_task_id", { length: 36 }).references(
+          () => tasks.task_id,
+          {
+            onDelete: "set null"
+          }
+        ),
+        emitted_by_schedule_id: varchar("emitted_by_schedule_id", { length: 36 }).references(
+          () => schedules.schedule_id,
+          {
+            onDelete: "set null"
+          }
+        ),
+        message_text: text("message_text").notNull(),
+        message_preview: text("message_preview").notNull(),
+        metadata: t.json("metadata"),
+        consumed_by_session_id: varchar("consumed_by_session_id", { length: 36 }).references(
+          () => sessions.session_id,
+          {
+            onDelete: "set null"
+          }
+        ),
+        consumed_at: t.timestamp("consumed_at")
+      },
+      (table) => ({
+        tenantIdx: index("gateway_outbound_messages_tenant_id_idx").on(table.tenant_id),
+        uniqueChannelThread: uniqueIndex("uniq_gateway_outbound_tenant_channel_thread").on(
+          table.tenant_id,
+          table.gateway_channel_id,
+          table.platform_thread_id
+        ),
+        emittedSessionIdx: index("idx_gateway_outbound_emitted_session").on(
+          table.emitted_by_session_id
+        ),
+        emittedScheduleIdx: index("idx_gateway_outbound_emitted_schedule").on(
+          table.emitted_by_schedule_id
+        ),
+        targetBranchCreatedIdx: index("idx_gateway_outbound_branch_created").on(
+          table.target_branch_id,
+          table.created_at
+        ),
+        consumedIdx: index("idx_gateway_outbound_consumed").on(table.consumed_at)
+      })
+    );
     sessionEnvSelections = pgTable(
       "session_env_selections",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         session_id: varchar("session_id", { length: 36 }).notNull().references(() => sessions.session_id, { onDelete: "cascade" }),
         env_var_name: text("env_var_name").notNull(),
         created_at: t.timestamp("created_at").notNull()
       },
       (table) => ({
+        tenantIdx: index("session_env_selections_tenant_id_idx").on(table.tenant_id),
         pk: primaryKey({ columns: [table.session_id, table.env_var_name] }),
         sessionIdx: index("session_env_selections_session_idx").on(table.session_id)
       })
@@ -2235,6 +2632,7 @@ var init_schema_postgres = __esm({
     kbNamespaces = pgTable(
       "kb_namespaces",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         namespace_id: varchar("namespace_id", { length: 36 }).primaryKey(),
         slug: text("slug").notNull(),
         display_name: text("display_name").notNull(),
@@ -2261,7 +2659,8 @@ var init_schema_postgres = __esm({
         archived_at: t.timestamp("archived_at")
       },
       (table) => ({
-        slugIdx: uniqueIndex("kb_namespaces_slug_idx").on(table.slug).where(sql2`${table.archived} = false`),
+        tenantIdx: index("kb_namespaces_tenant_id_idx").on(table.tenant_id),
+        slugIdx: uniqueIndex("kb_namespaces_tenant_slug_unique").on(table.tenant_id, table.slug).where(sql2`${table.archived} = false`),
         kindIdx: index("kb_namespaces_kind_idx").on(table.kind),
         ownerIdx: index("kb_namespaces_owner_idx").on(table.owner_user_id),
         repoIdx: index("kb_namespaces_repo_idx").on(table.repo_id),
@@ -2272,6 +2671,7 @@ var init_schema_postgres = __esm({
     kbNamespaceAcl = pgTable(
       "kb_namespace_acl",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         namespace_acl_id: varchar("namespace_acl_id", { length: 36 }).primaryKey(),
         namespace_id: varchar("namespace_id", { length: 36 }).notNull().references(() => kbNamespaces.namespace_id, { onDelete: "cascade" }),
         subject_type: text("subject_type", { enum: ["user", "group"] }).notNull(),
@@ -2284,9 +2684,11 @@ var init_schema_postgres = __esm({
         updated_at: t.timestamp("updated_at")
       },
       (table) => ({
+        tenantIdx: index("kb_namespace_acl_tenant_id_idx").on(table.tenant_id),
         namespaceIdx: index("kb_namespace_acl_namespace_idx").on(table.namespace_id),
         subjectIdx: index("kb_namespace_acl_subject_idx").on(table.subject_type, table.subject_id),
-        namespaceSubjectIdx: uniqueIndex("kb_namespace_acl_namespace_subject_idx").on(
+        namespaceSubjectIdx: uniqueIndex("kb_namespace_acl_tenant_namespace_subject_unique").on(
+          table.tenant_id,
           table.namespace_id,
           table.subject_type,
           table.subject_id
@@ -2296,6 +2698,7 @@ var init_schema_postgres = __esm({
     kbDocuments = pgTable(
       "kb_documents",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         document_id: varchar("document_id", { length: 36 }).primaryKey(),
         namespace_id: varchar("namespace_id", { length: 36 }).notNull().references(() => kbNamespaces.namespace_id, { onDelete: "cascade" }),
         path: text("path").notNull(),
@@ -2323,8 +2726,9 @@ var init_schema_postgres = __esm({
         archived_at: t.timestamp("archived_at")
       },
       (table) => ({
-        namespacePathIdx: uniqueIndex("kb_documents_namespace_path_idx").on(table.namespace_id, table.path).where(sql2`${table.archived} = false`),
-        uriIdx: uniqueIndex("kb_documents_uri_idx").on(table.uri).where(sql2`${table.archived} = false`),
+        tenantIdx: index("kb_documents_tenant_id_idx").on(table.tenant_id),
+        namespacePathIdx: uniqueIndex("kb_documents_tenant_namespace_path_unique").on(table.tenant_id, table.namespace_id, table.path).where(sql2`${table.archived} = false`),
+        uriIdx: uniqueIndex("kb_documents_tenant_uri_unique").on(table.tenant_id, table.uri).where(sql2`${table.archived} = false`),
         namespaceIdx: index("kb_documents_namespace_idx").on(table.namespace_id),
         kindIdx: index("kb_documents_kind_idx").on(table.kind),
         visibilityIdx: index("kb_documents_visibility_idx").on(table.visibility),
@@ -2337,6 +2741,7 @@ var init_schema_postgres = __esm({
     kbDocumentVersions = pgTable(
       "kb_document_versions",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         version_id: varchar("version_id", { length: 36 }).primaryKey(),
         document_id: varchar("document_id", { length: 36 }).notNull().references(() => kbDocuments.document_id, { onDelete: "cascade" }),
         version_number: integer("version_number").notNull(),
@@ -2356,7 +2761,9 @@ var init_schema_postgres = __esm({
         created_at: t.timestamp("created_at").notNull()
       },
       (table) => ({
-        documentVersionIdx: uniqueIndex("kb_document_versions_document_version_idx").on(
+        tenantIdx: index("kb_document_versions_tenant_id_idx").on(table.tenant_id),
+        documentVersionIdx: uniqueIndex("kb_document_versions_tenant_document_version_unique").on(
+          table.tenant_id,
           table.document_id,
           table.version_number
         ),
@@ -2368,6 +2775,7 @@ var init_schema_postgres = __esm({
     kbDocumentUnits = pgTable(
       "kb_document_units",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         unit_id: varchar("unit_id", { length: 36 }).primaryKey(),
         document_id: varchar("document_id", { length: 36 }).notNull().references(() => kbDocuments.document_id, { onDelete: "cascade" }),
         version_id: varchar("version_id", { length: 36 }).notNull().references(() => kbDocumentVersions.version_id, { onDelete: "cascade" }),
@@ -2392,6 +2800,7 @@ var init_schema_postgres = __esm({
         updated_at: t.timestamp("updated_at")
       },
       (table) => ({
+        tenantIdx: index("kb_document_units_tenant_id_idx").on(table.tenant_id),
         documentIdx: index("kb_document_units_document_idx").on(table.document_id),
         versionIdx: index("kb_document_units_version_idx").on(table.version_id),
         versionOrdinalIdx: index("kb_document_units_version_ordinal_idx").on(
@@ -2405,6 +2814,7 @@ var init_schema_postgres = __esm({
     kbEmbeddingSpaces = pgTable(
       "kb_embedding_spaces",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         embedding_space_id: varchar("embedding_space_id", { length: 36 }).primaryKey(),
         provider: text("provider").notNull(),
         model: text("model").notNull(),
@@ -2417,7 +2827,9 @@ var init_schema_postgres = __esm({
         updated_at: t.timestamp("updated_at")
       },
       (table) => ({
-        providerModelIdx: uniqueIndex("kb_embedding_spaces_provider_model_idx").on(
+        tenantIdx: index("kb_embedding_spaces_tenant_id_idx").on(table.tenant_id),
+        providerModelIdx: uniqueIndex("kb_embedding_spaces_tenant_provider_model_unique").on(
+          table.tenant_id,
           table.provider,
           table.model,
           table.dimensions,
@@ -2430,6 +2842,7 @@ var init_schema_postgres = __esm({
     kbGraphNodes = pgTable(
       "kb_graph_nodes",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         node_id: varchar("node_id", { length: 36 }).primaryKey(),
         node_type: text("node_type", {
           enum: [
@@ -2495,7 +2908,8 @@ var init_schema_postgres = __esm({
         archived_at: t.timestamp("archived_at")
       },
       (table) => ({
-        uriIdx: uniqueIndex("kb_graph_nodes_uri_idx").on(table.uri).where(sql2`${table.archived} = false`),
+        tenantIdx: index("kb_graph_nodes_tenant_id_idx").on(table.tenant_id),
+        uriIdx: uniqueIndex("kb_graph_nodes_tenant_uri_unique").on(table.tenant_id, table.uri).where(sql2`${table.archived} = false`),
         typeIdx: index("kb_graph_nodes_type_idx").on(table.node_type),
         namespaceIdx: index("kb_graph_nodes_namespace_idx").on(table.namespace_id),
         documentIdx: index("kb_graph_nodes_document_idx").on(table.document_id),
@@ -2515,6 +2929,7 @@ var init_schema_postgres = __esm({
     kbGraphEdges = pgTable(
       "kb_graph_edges",
       {
+        tenant_id: text("tenant_id").notNull().default("default"),
         edge_id: varchar("edge_id", { length: 36 }).primaryKey(),
         source_node_id: varchar("source_node_id", { length: 36 }).notNull().references(() => kbGraphNodes.node_id, { onDelete: "cascade" }),
         target_node_id: varchar("target_node_id", { length: 36 }).notNull().references(() => kbGraphNodes.node_id, { onDelete: "cascade" }),
@@ -2543,6 +2958,7 @@ var init_schema_postgres = __esm({
         archived_at: t.timestamp("archived_at")
       },
       (table) => ({
+        tenantIdx: index("kb_graph_edges_tenant_id_idx").on(table.tenant_id),
         sourceIdx: index("kb_graph_edges_source_idx").on(table.source_node_id),
         targetIdx: index("kb_graph_edges_target_idx").on(table.target_node_id),
         typeIdx: index("kb_graph_edges_type_idx").on(table.edge_type),
@@ -2554,11 +2970,11 @@ var init_schema_postgres = __esm({
           table.target_node_id,
           table.edge_type
         ),
-        sourceTargetTypeIdx: uniqueIndex("kb_graph_edges_source_target_type_idx").on(table.source_node_id, table.target_node_id, table.edge_type).where(sql2`${table.archived} = false`),
+        sourceTargetTypeIdx: uniqueIndex("kb_graph_edges_tenant_source_target_type_unique").on(table.tenant_id, table.source_node_id, table.target_node_id, table.edge_type).where(sql2`${table.archived} = false`),
         archivedIdx: index("kb_graph_edges_archived_idx").on(table.archived)
       })
     );
-    sessionsRelations = relations(sessions, ({ one }) => ({
+    sessionsRelations = relations(sessions, ({ one, many }) => ({
       branch: one(branches, {
         fields: [sessions.branch_id],
         references: [branches.branch_id]
@@ -2566,6 +2982,24 @@ var init_schema_postgres = __esm({
       schedule: one(schedules, {
         fields: [sessions.schedule_id],
         references: [schedules.schedule_id]
+      }),
+      outboundRelationships: many(sessionRelationships, { relationName: "relationshipSource" }),
+      inboundRelationships: many(sessionRelationships, { relationName: "relationshipTarget" })
+    }));
+    sessionRelationshipsRelations = relations(sessionRelationships, ({ one }) => ({
+      sourceSession: one(sessions, {
+        fields: [sessionRelationships.source_session_id],
+        references: [sessions.session_id],
+        relationName: "relationshipSource"
+      }),
+      targetSession: one(sessions, {
+        fields: [sessionRelationships.target_session_id],
+        references: [sessions.session_id],
+        relationName: "relationshipTarget"
+      }),
+      callbackSession: one(sessions, {
+        fields: [sessionRelationships.callback_session_id],
+        references: [sessions.session_id]
       })
     }));
     branchesRelations = relations(branches, ({ many }) => ({
@@ -2600,6 +3034,7 @@ __export(schema_sqlite_exports, {
   cardTypes: () => cardTypes2,
   cards: () => cards2,
   gatewayChannels: () => gatewayChannels2,
+  gatewayOutboundMessages: () => gatewayOutboundMessages2,
   groupMemberships: () => groupMemberships2,
   groups: () => groups2,
   kbDocumentUnits: () => kbDocumentUnits2,
@@ -2618,6 +3053,8 @@ __export(schema_sqlite_exports, {
   serializedSessions: () => serializedSessions2,
   sessionEnvSelections: () => sessionEnvSelections2,
   sessionMcpServers: () => sessionMcpServers2,
+  sessionRelationships: () => sessionRelationships2,
+  sessionRelationshipsRelations: () => sessionRelationshipsRelations2,
   sessions: () => sessions2,
   sessionsRelations: () => sessionsRelations2,
   tasks: () => tasks2,
@@ -2636,7 +3073,7 @@ import {
   text as text2,
   uniqueIndex as uniqueIndex2
 } from "drizzle-orm/sqlite-core";
-var t2, sessions2, tasks2, serializedSessions2, messages2, boards2, repos2, branches2, branchOwners2, boardOwners2, schedules2, users2, groups2, groupMemberships2, branchGroupGrants2, boardGroupGrants2, appVariables2, userApiKeys2, mcpServers2, cardTypes2, cards2, artifacts2, artifactTrustGrants2, boardObjects2, sessionMcpServers2, userMcpOauthTokens2, boardComments2, gatewayChannels2, threadSessionMap2, sessionEnvSelections2, kbNamespaces2, kbNamespaceAcl2, kbDocuments2, kbDocumentVersions2, kbDocumentUnits2, kbEmbeddingSpaces2, kbGraphNodes2, kbGraphEdges2, sessionsRelations2, branchesRelations2, schedulesRelations2;
+var t2, sessions2, sessionRelationships2, tasks2, serializedSessions2, messages2, boards2, repos2, branches2, branchOwners2, boardOwners2, schedules2, users2, groups2, groupMemberships2, branchGroupGrants2, boardGroupGrants2, appVariables2, userApiKeys2, mcpServers2, cardTypes2, cards2, artifacts2, artifactTrustGrants2, boardObjects2, sessionMcpServers2, userMcpOauthTokens2, boardComments2, gatewayChannels2, threadSessionMap2, gatewayOutboundMessages2, sessionEnvSelections2, kbNamespaces2, kbNamespaceAcl2, kbDocuments2, kbDocumentVersions2, kbDocumentUnits2, kbEmbeddingSpaces2, kbGraphNodes2, kbGraphEdges2, sessionsRelations2, sessionRelationshipsRelations2, branchesRelations2, schedulesRelations2;
 var init_schema_sqlite = __esm({
   "src/db/schema.sqlite.ts"() {
     "use strict";
@@ -2710,6 +3147,7 @@ var init_schema_sqlite = __esm({
       },
       (table) => ({
         statusIdx: index2("sessions_status_idx").on(table.status),
+        statusReadyIdx: index2("sessions_status_ready_idx").on(table.status, table.ready_for_prompt),
         agenticToolIdx: index2("sessions_agentic_tool_idx").on(table.agentic_tool),
         boardIdx: index2("sessions_board_idx").on(table.board_id),
         branchIdx: index2("sessions_branch_idx").on(table.branch_id),
@@ -2726,6 +3164,39 @@ var init_schema_sqlite = __esm({
         scheduleRunUnique: uniqueIndex2("sessions_schedule_run_unique").on(table.schedule_id, table.scheduled_run_at).where(sql3`${table.schedule_id} IS NOT NULL AND ${table.scheduled_run_at} IS NOT NULL`)
       })
     );
+    sessionRelationships2 = sqliteTable(
+      "session_relationships",
+      {
+        relationship_id: text2("relationship_id", { length: 36 }).primaryKey(),
+        source_session_id: text2("source_session_id", { length: 36 }).notNull().references(() => sessions2.session_id, { onDelete: "cascade" }),
+        target_session_id: text2("target_session_id", { length: 36 }).notNull().references(() => sessions2.session_id, { onDelete: "cascade" }),
+        relationship_type: text2("relationship_type", { enum: ["remote_create"] }).notNull(),
+        created_by: text2("created_by", { length: 36 }).notNull(),
+        created_at: t2.timestamp("created_at").notNull(),
+        updated_at: t2.timestamp("updated_at"),
+        callback_enabled: t2.bool("callback_enabled").notNull().default(false),
+        callback_session_id: text2("callback_session_id", { length: 36 }).references(
+          () => sessions2.session_id,
+          {
+            onDelete: "set null"
+          }
+        ),
+        data: t2.json("data")
+      },
+      (table) => ({
+        sourceIdx: index2("session_relationships_source_idx").on(table.source_session_id),
+        targetIdx: index2("session_relationships_target_idx").on(table.target_session_id),
+        callbackIdx: index2("session_relationships_callback_idx").on(table.callback_session_id),
+        // Note: no tenant_source/tenant_target composite indexes here — SQLite schema
+        // has no tenant column on this table (RLS is Postgres-only). The standalone
+        // source/target indexes above are sufficient for SQLite.
+        sourceTargetTypeUnique: uniqueIndex2("session_relationships_source_target_type_unique").on(
+          table.source_session_id,
+          table.target_session_id,
+          table.relationship_type
+        )
+      })
+    );
     tasks2 = sqliteTable(
       "tasks",
       {
@@ -2838,7 +3309,12 @@ var init_schema_sqlite = __esm({
         // Indexes for efficient lookups
         sessionIdx: index2("messages_session_id_idx").on(table.session_id),
         taskIdx: index2("messages_task_id_idx").on(table.task_id),
-        sessionIndexIdx: index2("messages_session_index_idx").on(table.session_id, table.index)
+        sessionIndexIdx: index2("messages_session_index_idx").on(table.session_id, table.index),
+        timestampIdx: index2("messages_timestamp_idx").on(table.timestamp),
+        sessionTimestampIdx: index2("messages_session_timestamp_idx").on(
+          table.session_id,
+          table.timestamp
+        )
       })
     );
     boards2 = sqliteTable(
@@ -3064,6 +3540,9 @@ var init_schema_sqlite = __esm({
         onboarding_completed: t2.bool("onboarding_completed").notNull().default(false),
         // Force password change flag (admin-settable, auto-cleared on password change)
         must_change_password: t2.bool("must_change_password").notNull().default(false),
+        // Auth invalidation marker. Password changes set this timestamp so any
+        // previously issued browser access or refresh token is rejected.
+        tokens_valid_after: t2.timestamp("tokens_valid_after"),
         // JSON blob for profile/preferences
         data: t2.json("data").$type().notNull()
       },
@@ -3270,6 +3749,12 @@ var init_schema_sqlite = __esm({
         branch_id: text2("branch_id", { length: 36 }).references(() => branches2.branch_id, {
           onDelete: "set null"
         }),
+        source_session_id: text2("source_session_id", { length: 36 }).references(
+          () => sessions2.session_id,
+          {
+            onDelete: "set null"
+          }
+        ),
         board_id: text2("board_id", { length: 36 }).notNull().references(() => boards2.board_id, { onDelete: "cascade" }),
         name: text2("name").notNull(),
         description: text2("description"),
@@ -3296,6 +3781,7 @@ var init_schema_sqlite = __esm({
       },
       (table) => ({
         branchIdx: index2("artifacts_branch_idx").on(table.branch_id),
+        sourceSessionIdx: index2("artifacts_source_session_idx").on(table.source_session_id),
         boardIdx: index2("artifacts_board_idx").on(table.board_id),
         archivedIdx: index2("artifacts_archived_idx").on(table.archived),
         publicIdx: index2("artifacts_public_idx").on(table.public)
@@ -3454,7 +3940,7 @@ var init_schema_sqlite = __esm({
         // Materialized for queries
         name: text2("name").notNull(),
         channel_type: text2("channel_type", {
-          enum: ["slack", "discord", "whatsapp", "telegram", "github"]
+          enum: ["slack", "discord", "whatsapp", "telegram", "github", "teams"]
         }).notNull(),
         target_branch_id: text2("target_branch_id", { length: 36 }).notNull().references(() => branches2.branch_id, { onDelete: "cascade" }),
         agor_user_id: text2("agor_user_id", { length: 36 }).notNull(),
@@ -3500,6 +3986,66 @@ var init_schema_sqlite = __esm({
         channelStatusIdx: index2("idx_thread_map_channel_status").on(table.channel_id, table.status)
       })
     );
+    gatewayOutboundMessages2 = sqliteTable(
+      "gateway_outbound_messages",
+      {
+        id: text2("id", { length: 36 }).primaryKey(),
+        created_at: t2.timestamp("created_at").notNull(),
+        updated_at: t2.timestamp("updated_at").notNull(),
+        gateway_channel_id: text2("gateway_channel_id", { length: 36 }).notNull().references(() => gatewayChannels2.id, { onDelete: "cascade" }),
+        channel_type: text2("channel_type", {
+          enum: ["slack", "discord", "whatsapp", "telegram", "github", "teams"]
+        }).notNull(),
+        platform_channel_id: text2("platform_channel_id").notNull(),
+        platform_message_id: text2("platform_message_id").notNull(),
+        platform_thread_id: text2("platform_thread_id").notNull(),
+        platform_permalink: text2("platform_permalink"),
+        target_branch_id: text2("target_branch_id", { length: 36 }).notNull().references(() => branches2.branch_id),
+        emitted_by_user_id: text2("emitted_by_user_id", { length: 36 }).notNull().references(() => users2.user_id),
+        emitted_by_session_id: text2("emitted_by_session_id", { length: 36 }).references(
+          () => sessions2.session_id,
+          {
+            onDelete: "set null"
+          }
+        ),
+        emitted_by_task_id: text2("emitted_by_task_id", { length: 36 }).references(() => tasks2.task_id, {
+          onDelete: "set null"
+        }),
+        emitted_by_schedule_id: text2("emitted_by_schedule_id", { length: 36 }).references(
+          () => schedules2.schedule_id,
+          {
+            onDelete: "set null"
+          }
+        ),
+        message_text: text2("message_text").notNull(),
+        message_preview: text2("message_preview").notNull(),
+        metadata: t2.json("metadata"),
+        consumed_by_session_id: text2("consumed_by_session_id", { length: 36 }).references(
+          () => sessions2.session_id,
+          {
+            onDelete: "set null"
+          }
+        ),
+        consumed_at: t2.timestamp("consumed_at")
+      },
+      (table) => ({
+        uniqueChannelThread: uniqueIndex2("uniq_gateway_outbound_channel_thread").on(
+          table.gateway_channel_id,
+          table.platform_thread_id
+        ),
+        emittedSessionIdx: index2("idx_gateway_outbound_emitted_session").on(
+          table.emitted_by_session_id
+        ),
+        emittedScheduleIdx: index2("idx_gateway_outbound_emitted_schedule").on(
+          table.emitted_by_schedule_id
+        ),
+        targetBranchCreatedIdx: index2("idx_gateway_outbound_branch_created").on(
+          table.target_branch_id,
+          table.created_at
+        ),
+        consumedIdx: index2("idx_gateway_outbound_consumed").on(table.consumed_at)
+      })
+    );
     sessionEnvSelections2 = sqliteTable(
       "session_env_selections",
       {
@@ -3837,7 +4383,7 @@ var init_schema_sqlite = __esm({
         archivedIdx: index2("kb_graph_edges_archived_idx").on(table.archived)
       })
     );
-    sessionsRelations2 = relations2(sessions2, ({ one }) => ({
+    sessionsRelations2 = relations2(sessions2, ({ one, many }) => ({
       branch: one(branches2, {
         fields: [sessions2.branch_id],
         references: [branches2.branch_id]
@@ -3845,6 +4391,24 @@ var init_schema_sqlite = __esm({
       schedule: one(schedules2, {
         fields: [sessions2.schedule_id],
         references: [schedules2.schedule_id]
+      }),
+      outboundRelationships: many(sessionRelationships2, { relationName: "relationshipSource" }),
+      inboundRelationships: many(sessionRelationships2, { relationName: "relationshipTarget" })
+    }));
+    sessionRelationshipsRelations2 = relations2(sessionRelationships2, ({ one }) => ({
+      sourceSession: one(sessions2, {
+        fields: [sessionRelationships2.source_session_id],
+        references: [sessions2.session_id],
+        relationName: "relationshipSource"
+      }),
+      targetSession: one(sessions2, {
+        fields: [sessionRelationships2.target_session_id],
+        references: [sessions2.session_id],
+        relationName: "relationshipTarget"
+      }),
+      callbackSession: one(sessions2, {
+        fields: [sessionRelationships2.callback_session_id],
+        references: [sessions2.session_id]
       })
     }));
     branchesRelations2 = relations2(branches2, ({ many }) => ({
@@ -3923,6 +4487,7 @@ __export(schema_exports, {
   cardTypes: () => cardTypes3,
   cards: () => cards3,
   gatewayChannels: () => gatewayChannels3,
+  gatewayOutboundMessages: () => gatewayOutboundMessages3,
   groupMemberships: () => groupMemberships3,
   groups: () => groups3,
   kbDocumentUnits: () => kbDocumentUnits3,
@@ -3940,6 +4505,7 @@ __export(schema_exports, {
   serializedSessions: () => serializedSessions3,
   sessionEnvSelections: () => sessionEnvSelections3,
   sessionMcpServers: () => sessionMcpServers3,
+  sessionRelationships: () => sessionRelationships3,
   sessions: () => sessions3,
   tasks: () => tasks3,
   threadSessionMap: () => threadSessionMap3,
@@ -3947,7 +4513,7 @@ __export(schema_exports, {
   userMcpOauthTokens: () => userMcpOauthTokens3,
   users: () => users3
 });
-var dialect, schema, sessions3, tasks3, messages3, boards3, repos3, branches3, branchOwners3, boardOwners3, groups3, groupMemberships3, branchGroupGrants3, boardGroupGrants3, schedules3, users3, appVariables3, mcpServers3, cardTypes3, cards3, artifacts3, artifactTrustGrants3, boardObjects3, sessionMcpServers3, sessionEnvSelections3, userMcpOauthTokens3, boardComments3, gatewayChannels3, threadSessionMap3, userApiKeys3, serializedSessions3, kbNamespaces3, kbNamespaceAcl3, kbDocuments3, kbDocumentVersions3, kbDocumentUnits3, kbEmbeddingSpaces3, kbGraphNodes3, kbGraphEdges3;
+var dialect, schema, sessions3, tasks3, messages3, boards3, repos3, branches3, branchOwners3, boardOwners3, groups3, groupMemberships3, branchGroupGrants3, boardGroupGrants3, schedules3, users3, appVariables3, mcpServers3, cardTypes3, cards3, artifacts3, artifactTrustGrants3, boardObjects3, sessionMcpServers3, sessionRelationships3, sessionEnvSelections3, userMcpOauthTokens3, boardComments3, gatewayChannels3, threadSessionMap3, gatewayOutboundMessages3, userApiKeys3, serializedSessions3, kbNamespaces3, kbNamespaceAcl3, kbDocuments3, kbDocumentVersions3, kbDocumentUnits3, kbEmbeddingSpaces3, kbGraphNodes3, kbGraphEdges3;
 var init_schema = __esm({
   "src/db/schema.ts"() {
     "use strict";
@@ -3979,11 +4545,13 @@ var init_schema = __esm({
     artifactTrustGrants3 = schema.artifactTrustGrants;
     boardObjects3 = schema.boardObjects;
     sessionMcpServers3 = schema.sessionMcpServers;
+    sessionRelationships3 = schema.sessionRelationships;
     sessionEnvSelections3 = schema.sessionEnvSelections;
     userMcpOauthTokens3 = schema.userMcpOauthTokens;
     boardComments3 = schema.boardComments;
     gatewayChannels3 = schema.gatewayChannels;
     threadSessionMap3 = schema.threadSessionMap;
+    gatewayOutboundMessages3 = schema.gatewayOutboundMessages;
     userApiKeys3 = schema.userApiKeys;
     serializedSessions3 = schema.serializedSessions;
     kbNamespaces3 = schema.kbNamespaces;
@@ -4015,33 +4583,6 @@ var init_ids = __esm({
   }
 });
 
-// src/db/user-utils.ts
-import bcrypt from "bcryptjs";
-import { eq as eq3 } from "drizzle-orm";
-var init_user_utils = __esm({
-  "src/db/user-utils.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_ids();
-    init_user();
-    init_database_wrapper();
-    init_schema();
-  }
-});
-
-// src/db/first-run-bootstrap.ts
-import { randomInt } from "crypto";
-import { eq as eq4, inArray } from "drizzle-orm";
-var init_first_run_bootstrap = __esm({
-  "src/db/first-run-bootstrap.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_database_wrapper();
-    init_schema();
-    init_user_utils();
-  }
-});
-
 // src/unix/index.ts
 init_esm_shims();
 
@@ -4051,7 +4592,7 @@ import { exec, execSync, spawn } from "child_process";
 import { promisify } from "util";
 var execAsync = promisify(exec);
 function spawnWithInput(cmd, args, input) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve, reject) => {
     const child = spawn(cmd, args, {
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -4065,7 +4606,7 @@ function spawnWithInput(cmd, args, input) {
     });
     child.on("error", reject);
     child.on("close", (code) => {
-      resolve2({
+      resolve({
         stdout,
         stderr,
         exitCode: code ?? 1
@@ -4549,10 +5090,7 @@ import fs from "fs";
 
 // src/yaml/index.ts
 init_esm_shims();
-import yaml from "js-yaml";
-var load = yaml.load;
-var dump = yaml.dump;
-var YAMLException = yaml.YAMLException;
+import * as yaml from "js-yaml";
 
 // src/config/variant-resolver.ts
 init_esm_shims();
@@ -4744,6 +5282,7 @@ import { and, eq } from "drizzle-orm";
 init_esm_shims();
 init_ids();
 init_id();
+init_tenant_context();
 var RepositoryError = class extends Error {
   constructor(message, cause) {
     super(message);
@@ -4785,6 +5324,21 @@ async function resolveByShortIdPrefix(id, entityType, fetchMatches) {
   return matches[0];
 }
 var RESOLVE_SHORT_ID_FETCH_LIMIT = 11;
+function getHiddenTenantId(row) {
+  const tenantId = row?.tenant_id;
+  return typeof tenantId === "string" && tenantId.length > 0 ? tenantId : void 0;
+}
+function attachHiddenTenant(dto, row) {
+  const tenantId = getHiddenTenantId(row);
+  if (tenantId) {
+    Object.defineProperty(dto, "tenant_id", {
+      value: tenantId,
+      enumerable: false,
+      configurable: true
+    });
+  }
+  return dto;
+}
 
 // src/db/repositories/session-env-selections.ts
 var SessionEnvSelectionRepository = class {
@@ -5172,83 +5726,103 @@ init_executor_heartbeat();
 
 // src/config/key-resolver.ts
 init_esm_shims();
-
-// src/db/index.ts
-init_esm_shims();
+init_database_wrapper();
+import { eq as eq3 } from "drizzle-orm";
+init_schema();
 init_ids();
-import {
-  and as and22,
-  asc as asc3,
-  desc as desc6,
-  eq as eq31,
-  gt,
-  gte,
-  inArray as inArray7,
-  like as like16,
-  lte as lte2,
-  or as or8,
-  sql as sql14
-} from "drizzle-orm";
-import bcryptjs from "bcryptjs";
-
-// src/lib/slugs.ts
-init_esm_shims();
-
-// src/db/client.ts
-init_esm_shims();
 init_config_manager();
-init_schema_postgres();
-init_schema_sqlite();
-init_schema_factory();
-import { createClient } from "@libsql/client";
-import { drizzle as drizzleSQLite } from "drizzle-orm/libsql";
-import { drizzle as drizzlePostgres } from "drizzle-orm/postgres-js";
-import postgres from "postgres";
-
-// src/utils/path.ts
-init_esm_shims();
-import { homedir } from "os";
-import { join } from "path";
+var DEBUG_KEY_RESOLUTION = process.env.AGOR_DEBUG_KEY_RESOLUTION === "1" || process.env.DEBUG?.includes("key-resolution");
 
-// src/db/index.ts
-init_database_wrapper();
-init_first_run_bootstrap();
+// src/config/index.ts
+init_multitenancy();
 
-// src/db/migrate.ts
+// src/config/proxies-resolver.ts
 init_esm_shims();
-init_database_wrapper();
-init_schema();
-import { dirname, join as join2 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
-import { eq as eq5, sql as sql4 } from "drizzle-orm";
-import { migrate as migrateSQLite } from "drizzle-orm/libsql/migrator";
-import { migrate as migratePostgres } from "drizzle-orm/postgres-js/migrator";
 
-// src/db/pending-migrations.ts
+// src/config/repo-list.ts
 init_esm_shims();
 
-// src/db/repositories/index.ts
+// src/config/repo-reference.ts
 init_esm_shims();
+var REPO_SLUG_PATTERN = /^[a-zA-Z0-9._-]+\/[a-zA-Z0-9._-]+$/;
 
-// src/db/repositories/app-variables.ts
+// src/config/resolved-config-slice.ts
 init_esm_shims();
-init_ids();
-init_database_wrapper();
-import { and as and2, eq as eq6 } from "drizzle-orm";
-init_schema();
+import { z } from "zod";
+var ResolvedConfigSliceSchema = z.object({
+  /** From `config.execution.*` */
+  execution: z.object({
+    permission_timeout_ms: z.number().int().nonnegative().optional(),
+    executor_heartbeat: z.object({
+      enabled: z.boolean(),
+      interval_ms: z.number().int().positive()
+    }).optional()
+  }).optional(),
+  /** From `config.opencode.*` */
+  opencode: z.object({
+    serverUrl: z.string().optional()
+  }).optional(),
+  /** From `config.daemon.*` (selected fields only) */
+  daemon: z.object({
+    host_ip_address: z.string().optional()
+  }).optional()
+});
 
-// src/db/repositories/artifact-trust.ts
+// src/config/resource-schemas.ts
 init_esm_shims();
-init_ids();
-init_database_wrapper();
-init_schema();
-import { and as and3, eq as eq7, isNull } from "drizzle-orm";
-
-// src/db/repositories/artifacts.ts
+import { z as z2 } from "zod";
+var uuidSchema = z2.string().regex(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i, "Must be a valid UUID");
+var repoSlugSchema = z2.string().regex(
+  REPO_SLUG_PATTERN,
+  'Must be org/name format with alphanumeric, hyphens, underscores, or dots (e.g., "my-org/my-repo")'
+);
+var enforcedAgentConfigSchema = z2.object({
+  agentic_tool: z2.enum(["claude-code", "claude-code-cli", "codex", "gemini", "opencode", "copilot", "cursor"]).optional(),
+  permission_mode: z2.string().optional(),
+  model: z2.string().optional(),
+  mcp_server_ids: z2.array(z2.string()).optional()
+});
+var resourceRepoConfigSchema = z2.object({
+  repo_id: uuidSchema,
+  slug: repoSlugSchema,
+  remote_url: z2.string().optional(),
+  repo_type: z2.enum(["remote", "local"]).default("remote"),
+  default_branch: z2.string().optional(),
+  shallow: z2.boolean().optional()
+}).refine((data) => data.repo_type !== "remote" || data.remote_url, {
+  message: 'remote_url is required when repo_type is "remote"',
+  path: ["remote_url"]
+});
+var resourceBranchConfigSchema = z2.object({
+  branch_id: uuidSchema,
+  name: z2.string().min(1, "Branch name is required"),
+  ref: z2.string().min(1, "Git ref is required"),
+  ref_type: z2.enum(["branch", "tag"]).optional(),
+  others_can: z2.enum(["none", "view", "session", "prompt", "all"]).optional(),
+  mcp_server_ids: z2.array(z2.string()).optional(),
+  repo: repoSlugSchema,
+  readonly: z2.boolean().optional(),
+  agent: enforcedAgentConfigSchema.optional()
+});
+var resourceUserConfigSchema = z2.object({
+  user_id: uuidSchema,
+  email: z2.string().email("Must be a valid email address"),
+  name: z2.string().optional(),
+  role: z2.enum(["superadmin", "admin", "member", "viewer"]).default("member"),
+  unix_username: z2.string().optional(),
+  password: z2.string().optional()
+});
+var daemonResourcesConfigSchema = z2.object({
+  repos: z2.array(resourceRepoConfigSchema).optional(),
+  branches: z2.array(resourceBranchConfigSchema).optional(),
+  users: z2.array(resourceUserConfigSchema).optional()
+});
+
+// src/config/resource-sync.ts
+init_esm_shims();
+
+// src/config/security-resolver.ts
 init_esm_shims();
-init_config_manager();
-init_ids();
-import { and as and4, eq as eq8, like, or } from "drizzle-orm";
 
 // src/utils/url.ts
 init_esm_shims();
@@ -5300,26 +5874,40 @@ function stripHttpUrlUserinfo(rawUrl) {
   }
 }
 
-// src/db/repositories/artifacts.ts
-init_database_wrapper();
-init_schema();
+// src/config/security-resolver.ts
+var DEFAULT_GIT_CONFIG_PARAMETERS = Object.freeze([
+  "transfer.credentialsInUrl=die",
+  "protocol.file.allow=user",
+  "protocol.ext.allow=never",
+  "core.protectHFS=true",
+  "core.protectNTFS=true"
+]);
 
-// src/db/repositories/board-comments.ts
+// src/config/index.ts
+init_types();
+
+// src/db/repositories/index.ts
+init_esm_shims();
+
+// src/db/repositories/app-variables.ts
 init_esm_shims();
 init_ids();
 init_database_wrapper();
+import { and as and2, eq as eq4 } from "drizzle-orm";
 init_schema();
-import { and as and5, eq as eq9, isNull as isNull2, like as like2 } from "drizzle-orm";
 
-// src/db/repositories/board-objects.ts
+// src/db/repositories/artifact-trust.ts
 init_esm_shims();
 init_ids();
-import { and as and7, asc, eq as eq11, getTableColumns, isNotNull as isNotNull2, isNull as isNull3, or as or3, sql as sql6 } from "drizzle-orm";
+init_database_wrapper();
+init_schema();
+import { and as and3, eq as eq5, isNull } from "drizzle-orm";
 
-// src/utils/board-placement.ts
+// src/db/repositories/artifacts.ts
 init_esm_shims();
-
-// src/db/repositories/board-objects.ts
+init_config_manager();
+init_ids();
+import { and as and5, eq as eq7, inArray as inArray2, like, or as or2 } from "drizzle-orm";
 init_database_wrapper();
 init_schema();
 
@@ -5328,26 +5916,26 @@ init_esm_shims();
 init_types2();
 init_database_wrapper();
 init_schema();
-import { and as and6, eq as eq10, exists, inArray as inArray2, isNotNull, or as or2, sql as sql5 } from "drizzle-orm";
+import { and as and4, eq as eq6, exists, inArray, isNotNull, or, sql as sql4 } from "drizzle-orm";
 var VISIBLE_BRANCH_PERMISSION_LEVELS = BRANCH_PERMISSION_LEVELS.filter(
   (level) => level !== "none"
 );
 function activeGroupGrantAccessExists(db, userId) {
   return exists(
     // biome-ignore lint/suspicious/noExplicitAny: Drizzle select has complex cross-dialect overloads
-    db.select({ _: sql5`1` }).from(branchGroupGrants3).innerJoin(
+    db.select({ _: sql4`1` }).from(branchGroupGrants3).innerJoin(
       groupMemberships3,
-      and6(
-        eq10(groupMemberships3.group_id, branchGroupGrants3.group_id),
-        eq10(groupMemberships3.user_id, userId)
+      and4(
+        eq6(groupMemberships3.group_id, branchGroupGrants3.group_id),
+        eq6(groupMemberships3.user_id, userId)
       )
     ).innerJoin(
       groups3,
-      and6(eq10(groups3.group_id, branchGroupGrants3.group_id), eq10(groups3.archived, false))
+      and4(eq6(groups3.group_id, branchGroupGrants3.group_id), eq6(groups3.archived, false))
     ).where(
-      and6(
-        eq10(branchGroupGrants3.branch_id, branches3.branch_id),
-        inArray2(branchGroupGrants3.can, VISIBLE_BRANCH_PERMISSION_LEVELS)
+      and4(
+        eq6(branchGroupGrants3.branch_id, branches3.branch_id),
+        inArray(branchGroupGrants3.can, VISIBLE_BRANCH_PERMISSION_LEVELS)
       )
     )
   );
@@ -5355,25 +5943,25 @@ function activeGroupGrantAccessExists(db, userId) {
 function activeBoardGroupGrantAccessExists(db, userId) {
   return exists(
     // biome-ignore lint/suspicious/noExplicitAny: Drizzle select has complex cross-dialect overloads
-    db.select({ _: sql5`1` }).from(boardGroupGrants3).innerJoin(
+    db.select({ _: sql4`1` }).from(boardGroupGrants3).innerJoin(
       groupMemberships3,
-      and6(
-        eq10(groupMemberships3.group_id, boardGroupGrants3.group_id),
-        eq10(groupMemberships3.user_id, userId)
+      and4(
+        eq6(groupMemberships3.group_id, boardGroupGrants3.group_id),
+        eq6(groupMemberships3.user_id, userId)
       )
     ).innerJoin(
       groups3,
-      and6(eq10(groups3.group_id, boardGroupGrants3.group_id), eq10(groups3.archived, false))
+      and4(eq6(groups3.group_id, boardGroupGrants3.group_id), eq6(groups3.archived, false))
     ).innerJoin(
       boards3,
-      and6(
-        eq10(boards3.board_id, boardGroupGrants3.board_id),
-        eq10(sql5`coalesce(${jsonExtract(db, boards3.data, "access_mode")}, 'shared')`, "shared")
+      and4(
+        eq6(boards3.board_id, boardGroupGrants3.board_id),
+        eq6(sql4`coalesce(${jsonExtract(db, boards3.data, "access_mode")}, 'shared')`, "shared")
       )
     ).where(
-      and6(
-        eq10(boardGroupGrants3.board_id, branches3.board_id),
-        inArray2(boardGroupGrants3.can, VISIBLE_BRANCH_PERMISSION_LEVELS)
+      and4(
+        eq6(boardGroupGrants3.board_id, branches3.board_id),
+        inArray(boardGroupGrants3.can, VISIBLE_BRANCH_PERMISSION_LEVELS)
       )
     )
   );
@@ -5381,18 +5969,18 @@ function activeBoardGroupGrantAccessExists(db, userId) {
 function activeBoardOwnerAccessExists(db, userId) {
   return exists(
     // biome-ignore lint/suspicious/noExplicitAny: Drizzle select has complex cross-dialect overloads
-    db.select({ _: sql5`1` }).from(boardOwners3).where(and6(eq10(boardOwners3.board_id, branches3.board_id), eq10(boardOwners3.user_id, userId)))
+    db.select({ _: sql4`1` }).from(boardOwners3).where(and4(eq6(boardOwners3.board_id, branches3.board_id), eq6(boardOwners3.user_id, userId)))
   );
 }
 function alignedBoardDefaultVisible(db) {
   return exists(
     // biome-ignore lint/suspicious/noExplicitAny: Drizzle select has complex cross-dialect overloads
-    db.select({ _: sql5`1` }).from(boards3).where(
-      and6(
-        eq10(boards3.board_id, branches3.board_id),
-        eq10(sql5`coalesce(${jsonExtract(db, boards3.data, "access_mode")}, 'shared')`, "shared"),
-        inArray2(
-          sql5`coalesce(${jsonExtract(db, boards3.data, "default_others_can")}, 'session')`,
+    db.select({ _: sql4`1` }).from(boards3).where(
+      and4(
+        eq6(boards3.board_id, branches3.board_id),
+        eq6(sql4`coalesce(${jsonExtract(db, boards3.data, "access_mode")}, 'shared')`, "shared"),
+        inArray(
+          sql4`coalesce(${jsonExtract(db, boards3.data, "default_others_can")}, 'session')`,
           VISIBLE_BRANCH_PERMISSION_LEVELS
         )
       )
@@ -5400,26 +5988,74 @@ function alignedBoardDefaultVisible(db) {
   );
 }
 function visibleBranchAccessCondition(db, userId) {
-  return or2(
+  return or(
     isNotNull(branchOwners3.user_id),
     activeGroupGrantAccessExists(db, userId),
-    and6(eq10(branches3.permission_source, "board"), activeBoardOwnerAccessExists(db, userId)),
-    and6(eq10(branches3.permission_source, "board"), activeBoardGroupGrantAccessExists(db, userId)),
-    and6(eq10(branches3.permission_source, "board"), alignedBoardDefaultVisible(db)),
-    and6(
-      eq10(branches3.permission_source, "override"),
-      inArray2(branches3.others_can, VISIBLE_BRANCH_PERMISSION_LEVELS)
+    and4(eq6(branches3.permission_source, "board"), activeBoardOwnerAccessExists(db, userId)),
+    and4(eq6(branches3.permission_source, "board"), activeBoardGroupGrantAccessExists(db, userId)),
+    and4(eq6(branches3.permission_source, "board"), alignedBoardDefaultVisible(db)),
+    and4(
+      eq6(branches3.permission_source, "override"),
+      inArray(branches3.others_can, VISIBLE_BRANCH_PERMISSION_LEVELS)
     )
-  ) ?? sql5`false`;
+  ) ?? sql4`false`;
 }
 
+// src/db/repositories/board-comments.ts
+init_esm_shims();
+init_ids();
+init_database_wrapper();
+init_schema();
+import { and as and6, eq as eq8, isNotNull as isNotNull2, isNull as isNull2, like as like2, or as or3, sql as sql5 } from "drizzle-orm";
+
+// src/db/repositories/board-objects.ts
+init_esm_shims();
+init_ids();
+import { and as and7, asc, eq as eq9, getTableColumns, isNotNull as isNotNull3, isNull as isNull3, or as or4, sql as sql6 } from "drizzle-orm";
+
+// src/utils/board-placement.ts
+init_esm_shims();
+
+// src/db/repositories/board-objects.ts
+init_database_wrapper();
+init_schema();
+
 // src/db/repositories/boards.ts
 init_esm_shims();
 init_types2();
 init_config_manager();
 init_ids();
-import { and as and10, eq as eq14, exists as exists2, isNull as isNull4, like as like4, ne, or as or4, sql as sql8 } from "drizzle-orm";
+import { and as and10, eq as eq12, inArray as inArray4, isNull as isNull4, like as like4, ne } from "drizzle-orm";
 import * as yaml3 from "js-yaml";
+
+// src/lib/slugs.ts
+init_esm_shims();
+
+// src/utils/emoji-shortcodes.ts
+init_esm_shims();
+import { createRequire } from "module";
+var requireJson = createRequire(import.meta.url);
+var emojiData = requireJson("emojibase-data/en/compact.json");
+var shortcodes = requireJson(
+  "emojibase-data/en/shortcodes/emojibase.json"
+);
+var emojiByHexcode = /* @__PURE__ */ new Map();
+for (const emoji of emojiData) {
+  if (emoji.unicode) {
+    emojiByHexcode.set(emoji.hexcode, emoji.unicode);
+  }
+}
+var emojiByShortcode = /* @__PURE__ */ new Map();
+for (const [hexcode, codes] of Object.entries(shortcodes)) {
+  const emoji = emojiByHexcode.get(hexcode);
+  if (!emoji) continue;
+  const codeList = Array.isArray(codes) ? codes : [codes];
+  for (const code of codeList) {
+    emojiByShortcode.set(code.toLowerCase(), emoji);
+  }
+}
+
+// src/db/repositories/boards.ts
 init_database_wrapper();
 init_schema();
 
@@ -5428,7 +6064,7 @@ init_esm_shims();
 init_types2();
 init_config_manager();
 init_ids();
-import { and as and9, desc, eq as eq13, getTableColumns as getTableColumns2, inArray as inArray3, like as like3, sql as sql7 } from "drizzle-orm";
+import { and as and9, desc, eq as eq11, exists as exists2, getTableColumns as getTableColumns2, inArray as inArray3, like as like3, or as or5, sql as sql7 } from "drizzle-orm";
 init_database_wrapper();
 init_schema();
 
@@ -5437,7 +6073,7 @@ init_esm_shims();
 init_ids();
 init_database_wrapper();
 init_schema();
-import { and as and8, eq as eq12 } from "drizzle-orm";
+import { and as and8, eq as eq10 } from "drizzle-orm";
 function slugify(value) {
   return value.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 80);
 }
@@ -5498,17 +6134,17 @@ var GroupRepository = class {
   }
   async findAll(filter) {
     const conditions = [];
-    if (filter?.archived !== void 0) conditions.push(eq12(groups3.archived, filter.archived));
+    if (filter?.archived !== void 0) conditions.push(eq10(groups3.archived, filter.archived));
     const query = select(this.db).from(groups3);
     const rows = conditions.length > 0 ? await query.where(and8(...conditions)).all() : await query.all();
     return rows.map((row) => this.rowToGroup(row));
   }
   async findById(id) {
-    const row = await select(this.db).from(groups3).where(eq12(groups3.group_id, id)).one();
+    const row = await select(this.db).from(groups3).where(eq10(groups3.group_id, id)).one();
     return row ? this.rowToGroup(row) : null;
   }
   async findBySlug(slug) {
-    const row = await select(this.db).from(groups3).where(eq12(groups3.slug, slug)).one();
+    const row = await select(this.db).from(groups3).where(eq10(groups3.slug, slug)).one();
     return row ? this.rowToGroup(row) : null;
   }
   async create(data) {
@@ -5542,7 +6178,7 @@ var GroupRepository = class {
     if (updates.slug !== void 0) patch.slug = normalizeSlug(updates.slug);
     if (updates.description !== void 0) patch.description = updates.description;
     if (updates.archived !== void 0) patch.archived = updates.archived;
-    await update(this.db, groups3).set(patch).where(eq12(groups3.group_id, existing.group_id)).run();
+    await update(this.db, groups3).set(patch).where(eq10(groups3.group_id, existing.group_id)).run();
     const updatedGroup = await this.findById(existing.group_id);
     if (!updatedGroup) throw new RepositoryError("Failed to retrieve updated group");
     return updatedGroup;
@@ -5550,19 +6186,19 @@ var GroupRepository = class {
   async delete(id) {
     const existing = await this.findById(id);
     if (!existing) throw new EntityNotFoundError("Group", id);
-    await deleteFrom(this.db, groups3).where(eq12(groups3.group_id, existing.group_id)).run();
+    await deleteFrom(this.db, groups3).where(eq10(groups3.group_id, existing.group_id)).run();
     return existing;
   }
   async listMemberships(filter) {
     const conditions = [];
-    if (filter?.group_id) conditions.push(eq12(groupMemberships3.group_id, filter.group_id));
-    if (filter?.user_id) conditions.push(eq12(groupMemberships3.user_id, filter.user_id));
+    if (filter?.group_id) conditions.push(eq10(groupMemberships3.group_id, filter.group_id));
+    if (filter?.user_id) conditions.push(eq10(groupMemberships3.user_id, filter.user_id));
     const query = select(this.db).from(groupMemberships3);
     const rows = conditions.length > 0 ? await query.where(and8(...conditions)).all() : await query.all();
     return rows.map((row) => this.rowToMembership(row));
   }
   async addMember(groupId, userId, addedBy) {
-    const existing = await select(this.db).from(groupMemberships3).where(and8(eq12(groupMemberships3.group_id, groupId), eq12(groupMemberships3.user_id, userId))).one();
+    const existing = await select(this.db).from(groupMemberships3).where(and8(eq10(groupMemberships3.group_id, groupId), eq10(groupMemberships3.user_id, userId))).one();
     if (existing) return this.rowToMembership(existing);
     const row = {
       group_id: groupId,
@@ -5574,17 +6210,17 @@ var GroupRepository = class {
     return this.rowToMembership(row);
   }
   async removeMember(groupId, userId) {
-    const existing = await select(this.db).from(groupMemberships3).where(and8(eq12(groupMemberships3.group_id, groupId), eq12(groupMemberships3.user_id, userId))).one();
+    const existing = await select(this.db).from(groupMemberships3).where(and8(eq10(groupMemberships3.group_id, groupId), eq10(groupMemberships3.user_id, userId))).one();
     if (!existing) return null;
-    await deleteFrom(this.db, groupMemberships3).where(and8(eq12(groupMemberships3.group_id, groupId), eq12(groupMemberships3.user_id, userId))).run();
+    await deleteFrom(this.db, groupMemberships3).where(and8(eq10(groupMemberships3.group_id, groupId), eq10(groupMemberships3.user_id, userId))).run();
     return this.rowToMembership(existing);
   }
   async getGroupIdsForUser(userId) {
-    const rows = await select(this.db, { group_id: groupMemberships3.group_id }).from(groupMemberships3).where(eq12(groupMemberships3.user_id, userId)).all();
+    const rows = await select(this.db, { group_id: groupMemberships3.group_id }).from(groupMemberships3).where(eq10(groupMemberships3.user_id, userId)).all();
     return rows.map((r) => r.group_id);
   }
   async listBranchGrants(branchId) {
-    const rows = await select(this.db).from(branchGroupGrants3).leftJoin(groups3, eq12(branchGroupGrants3.group_id, groups3.group_id)).where(eq12(branchGroupGrants3.branch_id, branchId)).all();
+    const rows = await select(this.db).from(branchGroupGrants3).leftJoin(groups3, eq10(branchGroupGrants3.group_id, groups3.group_id)).where(eq10(branchGroupGrants3.branch_id, branchId)).all();
     return rows.map(
       (r) => this.rowToGrant(r.branch_group_grants, r.groups ? this.rowToGroup(r.groups) : void 0)
     );
@@ -5593,15 +6229,15 @@ var GroupRepository = class {
     const now = /* @__PURE__ */ new Date();
     const existing = await select(this.db).from(branchGroupGrants3).where(
       and8(
-        eq12(branchGroupGrants3.branch_id, data.branch_id),
-        eq12(branchGroupGrants3.group_id, data.group_id)
+        eq10(branchGroupGrants3.branch_id, data.branch_id),
+        eq10(branchGroupGrants3.group_id, data.group_id)
       )
     ).one();
     if (existing) {
       await update(this.db, branchGroupGrants3).set({ can: data.can, fs_access: data.fs_access ?? null, updated_at: now }).where(
         and8(
-          eq12(branchGroupGrants3.branch_id, data.branch_id),
-          eq12(branchGroupGrants3.group_id, data.group_id)
+          eq10(branchGroupGrants3.branch_id, data.branch_id),
+          eq10(branchGroupGrants3.group_id, data.group_id)
         )
       ).run();
     } else {
@@ -5624,16 +6260,16 @@ var GroupRepository = class {
     const existing = (await this.listBranchGrants(branchId)).find((g) => g.group_id === groupId) ?? null;
     if (!existing) return null;
     await deleteFrom(this.db, branchGroupGrants3).where(
-      and8(eq12(branchGroupGrants3.branch_id, branchId), eq12(branchGroupGrants3.group_id, groupId))
+      and8(eq10(branchGroupGrants3.branch_id, branchId), eq10(branchGroupGrants3.group_id, groupId))
     ).run();
     return existing;
   }
   async getBranchGrantsForUser(branchId, userId) {
-    const rows = await select(this.db).from(branchGroupGrants3).innerJoin(groupMemberships3, eq12(branchGroupGrants3.group_id, groupMemberships3.group_id)).innerJoin(groups3, eq12(groupMemberships3.group_id, groups3.group_id)).where(
+    const rows = await select(this.db).from(branchGroupGrants3).innerJoin(groupMemberships3, eq10(branchGroupGrants3.group_id, groupMemberships3.group_id)).innerJoin(groups3, eq10(groupMemberships3.group_id, groups3.group_id)).where(
       and8(
-        eq12(branchGroupGrants3.branch_id, branchId),
-        eq12(groupMemberships3.user_id, userId),
-        eq12(groups3.archived, false)
+        eq10(branchGroupGrants3.branch_id, branchId),
+        eq10(groupMemberships3.user_id, userId),
+        eq10(groups3.archived, false)
       )
     ).all();
     return rows.map(
@@ -5641,7 +6277,7 @@ var GroupRepository = class {
     );
   }
   async listBoardGrants(boardId) {
-    const rows = await select(this.db).from(boardGroupGrants3).leftJoin(groups3, eq12(boardGroupGrants3.group_id, groups3.group_id)).where(eq12(boardGroupGrants3.board_id, boardId)).all();
+    const rows = await select(this.db).from(boardGroupGrants3).leftJoin(groups3, eq10(boardGroupGrants3.group_id, groups3.group_id)).where(eq10(boardGroupGrants3.board_id, boardId)).all();
     return rows.map(
       (r) => this.rowToBoardGrant(r.board_group_grants, r.groups ? this.rowToGroup(r.groups) : void 0)
     );
@@ -5650,15 +6286,15 @@ var GroupRepository = class {
     const now = /* @__PURE__ */ new Date();
     const existing = await select(this.db).from(boardGroupGrants3).where(
       and8(
-        eq12(boardGroupGrants3.board_id, data.board_id),
-        eq12(boardGroupGrants3.group_id, data.group_id)
+        eq10(boardGroupGrants3.board_id, data.board_id),
+        eq10(boardGroupGrants3.group_id, data.group_id)
       )
     ).one();
     if (existing) {
       await update(this.db, boardGroupGrants3).set({ can: data.can, fs_access: data.fs_access ?? null, updated_at: now }).where(
         and8(
-          eq12(boardGroupGrants3.board_id, data.board_id),
-          eq12(boardGroupGrants3.group_id, data.group_id)
+          eq10(boardGroupGrants3.board_id, data.board_id),
+          eq10(boardGroupGrants3.group_id, data.group_id)
         )
       ).run();
     } else {
@@ -5680,15 +6316,15 @@ var GroupRepository = class {
   async removeBoardGrant(boardId, groupId) {
     const existing = (await this.listBoardGrants(boardId)).find((g) => g.group_id === groupId) ?? null;
     if (!existing) return null;
-    await deleteFrom(this.db, boardGroupGrants3).where(and8(eq12(boardGroupGrants3.board_id, boardId), eq12(boardGroupGrants3.group_id, groupId))).run();
+    await deleteFrom(this.db, boardGroupGrants3).where(and8(eq10(boardGroupGrants3.board_id, boardId), eq10(boardGroupGrants3.group_id, groupId))).run();
     return existing;
   }
   async getBoardGrantsForUser(boardId, userId) {
-    const rows = await select(this.db).from(boardGroupGrants3).innerJoin(groupMemberships3, eq12(boardGroupGrants3.group_id, groupMemberships3.group_id)).innerJoin(groups3, eq12(groupMemberships3.group_id, groups3.group_id)).where(
+    const rows = await select(this.db).from(boardGroupGrants3).innerJoin(groupMemberships3, eq10(boardGroupGrants3.group_id, groupMemberships3.group_id)).innerJoin(groups3, eq10(groupMemberships3.group_id, groups3.group_id)).where(
       and8(
-        eq12(boardGroupGrants3.board_id, boardId),
-        eq12(groupMemberships3.user_id, userId),
-        eq12(groups3.archived, false)
+        eq10(boardGroupGrants3.board_id, boardId),
+        eq10(groupMemberships3.user_id, userId),
+        eq10(groups3.archived, false)
       )
     ).all();
     return rows.map(
@@ -5748,6 +6384,7 @@ var FS_ACCESS_RANK = {
 };
 var VIEW_OR_BETTER_BRANCH_PERMISSIONS = ["view", "session", "prompt", "all"];
 var BRANCH_PERMISSION_SOURCES = ["board", "override"];
+var FS_ACCESS_BRANCH_PERMISSIONS = ["read", "write"];
 var BranchRepository = class {
   constructor(db) {
     this.db = db;
@@ -5764,44 +6401,47 @@ var BranchRepository = class {
   rowToBranch(row, baseUrl) {
     const branchId = row.branch_id;
     const url = baseUrl && row.board_id ? getBranchUrl(branchId, baseUrl) : null;
-    return {
-      branch_id: branchId,
-      repo_id: row.repo_id,
-      created_at: new Date(row.created_at).toISOString(),
-      updated_at: row.updated_at ? new Date(row.updated_at).toISOString() : new Date(row.created_at).toISOString(),
-      created_by: row.created_by,
-      name: row.name,
-      ref: row.ref,
-      ref_type: row.ref_type ?? "branch",
-      branch_unique_id: row.branch_unique_id,
-      start_command: row.start_command ?? void 0,
-      // Static environment fields
-      stop_command: row.stop_command ?? void 0,
-      nuke_command: row.nuke_command ?? void 0,
-      health_check_url: row.health_check_url ?? void 0,
-      app_url: row.app_url ?? void 0,
-      logs_command: row.logs_command ?? void 0,
-      environment_variant: row.environment_variant ?? void 0,
-      board_id: row.board_id ?? void 0,
-      // Top-level column
-      needs_attention: Boolean(row.needs_attention),
-      // Convert SQLite integer (0/1) to boolean
-      archived: Boolean(row.archived),
-      // Convert SQLite integer (0/1) to boolean
-      archived_at: row.archived_at ? new Date(row.archived_at).toISOString() : void 0,
-      archived_by: row.archived_by ?? void 0,
-      filesystem_status: row.filesystem_status ?? void 0,
-      // RBAC fields
-      permission_source: row.permission_source ?? "override",
-      others_can: row.others_can ?? void 0,
-      others_fs_access: row.others_fs_access ?? void 0,
-      unix_group: row.unix_group ?? void 0,
-      // Branch storage mode
-      storage_mode: row.storage_mode ?? "worktree",
-      clone_depth: row.clone_depth ?? void 0,
-      ...row.data,
-      url
-    };
+    return attachHiddenTenant(
+      {
+        branch_id: branchId,
+        repo_id: row.repo_id,
+        created_at: new Date(row.created_at).toISOString(),
+        updated_at: row.updated_at ? new Date(row.updated_at).toISOString() : new Date(row.created_at).toISOString(),
+        created_by: row.created_by,
+        name: row.name,
+        ref: row.ref,
+        ref_type: row.ref_type ?? "branch",
+        branch_unique_id: row.branch_unique_id,
+        start_command: row.start_command ?? void 0,
+        // Static environment fields
+        stop_command: row.stop_command ?? void 0,
+        nuke_command: row.nuke_command ?? void 0,
+        health_check_url: row.health_check_url ?? void 0,
+        app_url: row.app_url ?? void 0,
+        logs_command: row.logs_command ?? void 0,
+        environment_variant: row.environment_variant ?? void 0,
+        board_id: row.board_id ?? void 0,
+        // Top-level column
+        needs_attention: Boolean(row.needs_attention),
+        // Convert SQLite integer (0/1) to boolean
+        archived: Boolean(row.archived),
+        // Convert SQLite integer (0/1) to boolean
+        archived_at: row.archived_at ? new Date(row.archived_at).toISOString() : void 0,
+        archived_by: row.archived_by ?? void 0,
+        filesystem_status: row.filesystem_status ?? void 0,
+        // RBAC fields
+        permission_source: row.permission_source ?? "override",
+        others_can: row.others_can ?? void 0,
+        others_fs_access: row.others_fs_access ?? void 0,
+        unix_group: row.unix_group ?? void 0,
+        // Branch storage mode
+        storage_mode: row.storage_mode ?? "worktree",
+        clone_depth: row.clone_depth ?? void 0,
+        ...row.data,
+        url
+      },
+      row
+    );
   }
   /**
    * Convert Branch to database insert format
@@ -5911,7 +6551,7 @@ var BranchRepository = class {
         const rows = await select(this.db).from(branches3).where(like3(branches3.branch_id, pattern)).limit(RESOLVE_SHORT_ID_FETCH_LIMIT).all();
         return rows.map((r) => r.branch_id);
       });
-      const row = await select(this.db).from(branches3).where(eq13(branches3.branch_id, fullId)).one();
+      const row = await select(this.db).from(branches3).where(eq11(branches3.branch_id, fullId)).one();
       if (!row) return null;
       const baseUrl = await getBaseUrl();
       return this.rowToBranch(row, baseUrl);
@@ -5934,11 +6574,11 @@ var BranchRepository = class {
         others_can: branches3.others_can,
         board_id: branches3.board_id,
         permission_source: branches3.permission_source
-      }).from(branches3).where(eq13(branches3.branch_id, fullId)).one();
+      }).from(branches3).where(eq11(branches3.branch_id, fullId)).one();
       if (!row) return null;
       let othersCan = row.others_can;
       if (row.permission_source === "board" && row.board_id) {
-        const board = await select(this.db, { data: boards3.data }).from(boards3).where(eq13(boards3.board_id, row.board_id)).one();
+        const board = await select(this.db, { data: boards3.data }).from(boards3).where(eq11(boards3.board_id, row.board_id)).one();
         const boardData = board?.data;
         othersCan = (boardData?.access_mode ?? "shared") === "private" ? "none" : boardData?.default_others_can ?? row.others_can;
       }
@@ -5958,21 +6598,109 @@ var BranchRepository = class {
    * Callers that explicitly want to exclude archived branches should pass
    * `{ includeArchived: false }`.
    *
-   * @param filter - Optional filters (repo_id, includeArchived)
+   * The `board_id`, `archived`, and `branchIds` filters let the list read path
+   * (`BranchesService.find`) push its high-selectivity predicates into SQL so it
+   * no longer materializes the whole table before filtering in memory.
+   *
+   * @param filter - Optional filters
    * @param filter.repo_id - Filter by repository ID
    * @param filter.includeArchived - Include archived branches (default: true)
+   * @param filter.board_id - Filter to a single board
+   * @param filter.archived - Filter to an exact archived state (takes precedence
+   *   over `includeArchived`)
+   * @param filter.branchIds - Restrict to a set of branch IDs (empty set yields
+   *   no rows, matching an `{ $in: [] }` filter)
+   * @param filter.visibleToUserId - Restrict to branches visible to this user
+   *   under branch RBAC, pushed down as a SQL predicate instead of a preloaded
+   *   `branch_id IN (...)` list.
    */
   async findAll(filter) {
+    if (filter?.branchIds !== void 0 && filter.branchIds.length === 0) {
+      return [];
+    }
     const includeArchived = filter?.includeArchived ?? true;
     const conditions = [];
     if (filter?.repo_id) {
-      conditions.push(eq13(branches3.repo_id, filter.repo_id));
+      conditions.push(eq11(branches3.repo_id, filter.repo_id));
+    }
+    if (filter?.board_id) {
+      conditions.push(eq11(branches3.board_id, filter.board_id));
+    }
+    if (filter?.archived !== void 0) {
+      conditions.push(eq11(branches3.archived, filter.archived));
+    } else if (!includeArchived) {
+      conditions.push(eq11(branches3.archived, false));
     }
-    if (!includeArchived) {
-      conditions.push(eq13(branches3.archived, false));
+    if (filter?.branchIds !== void 0) {
+      conditions.push(inArray3(branches3.branch_id, filter.branchIds));
     }
-    const query = select(this.db).from(branches3);
-    const rows = conditions.length > 0 ? await query.where(and9(...conditions)).all() : await query.all();
+    if (filter?.visibleToUserId) {
+      conditions.push(visibleBranchAccessCondition(this.db, filter.visibleToUserId));
+    }
+    const baseQuery = filter?.visibleToUserId ? select(this.db, getTableColumns2(branches3)).from(branches3).leftJoin(
+      branchOwners3,
+      and9(
+        eq11(branchOwners3.branch_id, branches3.branch_id),
+        eq11(branchOwners3.user_id, filter.visibleToUserId)
+      )
+    ) : select(this.db).from(branches3);
+    const rows = conditions.length > 0 ? await baseQuery.where(and9(...conditions)).all() : await baseQuery.all();
+    const baseUrl = await getBaseUrl();
+    return rows.map((row) => this.rowToBranch(row, baseUrl));
+  }
+  /**
+   * Health-monitor discovery query. Returns only routing metadata so the
+   * background monitor can enter the correct tenant DB scope before loading
+   * branch contents or patching health state.
+   */
+  async findActiveEnvironmentRefs() {
+    const tenantColumn = branches3.tenant_id;
+    const columns = isPostgresDatabase(this.db) && tenantColumn ? { branch_id: branches3.branch_id, tenant_id: tenantColumn } : { branch_id: branches3.branch_id };
+    const statusExpr = sql7`${jsonExtract(this.db, branches3.data, "environment_instance.status")}`;
+    const rows = await select(this.db, columns).from(branches3).where(or5(eq11(statusExpr, "running"), eq11(statusExpr, "starting"))).all();
+    return rows.map((row) => ({
+      branch_id: row.branch_id,
+      ...typeof row.tenant_id === "string" && row.tenant_id.length > 0 ? { tenant_id: row.tenant_id } : {}
+    }));
+  }
+  /**
+   * Find active assistant branches without paginating the whole branch list first.
+   *
+   * A branch is discoverable as an assistant when it has the canonical assistant
+   * marker in custom_context (new or legacy key), or as a read-time backfill for
+   * older hand-bootstrapped assistants, when it has at least one enabled
+   * first-class schedule.
+   */
+  async findAssistantBranches(filter) {
+    const assistantKindConditions = [
+      eq11(sql7`${jsonExtract(this.db, branches3.data, "custom_context.assistant.kind")}`, "assistant"),
+      eq11(
+        sql7`${jsonExtract(this.db, branches3.data, "custom_context.assistant.kind")}`,
+        "persisted-agent"
+      ),
+      eq11(sql7`${jsonExtract(this.db, branches3.data, "custom_context.agent.kind")}`, "assistant"),
+      eq11(
+        sql7`${jsonExtract(this.db, branches3.data, "custom_context.agent.kind")}`,
+        "persisted-agent"
+      )
+    ];
+    const hasEnabledSchedule = exists2(
+      // biome-ignore lint/suspicious/noExplicitAny: Drizzle select has complex cross-dialect overloads
+      this.db.select({ _: sql7`1` }).from(schedules3).where(and9(eq11(schedules3.branch_id, branches3.branch_id), eq11(schedules3.enabled, true)))
+    );
+    const conditions = [or5(...assistantKindConditions, hasEnabledSchedule) ?? sql7`false`];
+    if (filter?.repo_id) conditions.push(eq11(branches3.repo_id, filter.repo_id));
+    if (filter?.archived !== void 0) conditions.push(eq11(branches3.archived, filter.archived));
+    if (filter?.userId) conditions.push(visibleBranchAccessCondition(this.db, filter.userId));
+    const baseQuery = select(this.db, getTableColumns2(branches3)).from(branches3);
+    const query = filter?.userId ? baseQuery.leftJoin(
+      branchOwners3,
+      and9(
+        eq11(branchOwners3.branch_id, branches3.branch_id),
+        eq11(branchOwners3.user_id, filter.userId)
+      )
+    ) : baseQuery;
+    const rows = await query.where(and9(...conditions)).limit(filter?.limit ?? 200).all();
     const baseUrl = await getBaseUrl();
     return rows.map((row) => this.rowToBranch(row, baseUrl));
   }
@@ -5993,9 +6721,9 @@ var BranchRepository = class {
         txAsDb(tx),
         this.db,
         branches3,
-        eq13(branches3.branch_id, existing.branch_id)
+        eq11(branches3.branch_id, existing.branch_id)
       );
-      const currentRow = await select(txAsDb(tx)).from(branches3).where(eq13(branches3.branch_id, existing.branch_id)).one();
+      const currentRow = await select(txAsDb(tx)).from(branches3).where(eq11(branches3.branch_id, existing.branch_id)).one();
       if (!currentRow) {
         throw new EntityNotFoundError("Branch", id);
       }
@@ -6012,7 +6740,7 @@ var BranchRepository = class {
         // Always update timestamp
       });
       const insertData = this.branchToInsert(merged);
-      const row = await update(txAsDb(tx), branches3).set(insertData).where(eq13(branches3.branch_id, current.branch_id)).returning().one();
+      const row = await update(txAsDb(tx), branches3).set(insertData).where(eq11(branches3.branch_id, current.branch_id)).returning().one();
       return this.rowToBranch(row, baseUrl);
     });
   }
@@ -6024,13 +6752,13 @@ var BranchRepository = class {
     if (!existing) {
       throw new EntityNotFoundError("Branch", id);
     }
-    await deleteFrom(this.db, branches3).where(eq13(branches3.branch_id, existing.branch_id)).run();
+    await deleteFrom(this.db, branches3).where(eq11(branches3.branch_id, existing.branch_id)).run();
   }
   /**
    * Find branch by repo_id and name
    */
   async findByRepoAndName(repoId, name) {
-    const row = await select(this.db).from(branches3).where(and9(eq13(branches3.repo_id, repoId), eq13(branches3.name, name))).one();
+    const row = await select(this.db).from(branches3).where(and9(eq11(branches3.repo_id, repoId), eq11(branches3.name, name))).one();
     if (!row) return null;
     const baseUrl = await getBaseUrl();
     return this.rowToBranch(row, baseUrl);
@@ -6040,7 +6768,7 @@ var BranchRepository = class {
    */
   async findActiveByRepoAndName(repoId, name) {
     const row = await select(this.db).from(branches3).where(
-      and9(eq13(branches3.repo_id, repoId), eq13(branches3.name, name), eq13(branches3.archived, false))
+      and9(eq11(branches3.repo_id, repoId), eq11(branches3.name, name), eq11(branches3.archived, false))
     ).one();
     if (!row) return null;
     const baseUrl = await getBaseUrl();
@@ -6059,7 +6787,7 @@ var BranchRepository = class {
    * Used for auto-suffix name conflict resolution — bypasses Feathers pagination.
    */
   async getActiveNamesByRepo(repoId) {
-    const rows = await select(this.db, { name: branches3.name }).from(branches3).where(and9(eq13(branches3.repo_id, repoId), eq13(branches3.archived, false))).all();
+    const rows = await select(this.db, { name: branches3.name }).from(branches3).where(and9(eq11(branches3.repo_id, repoId), eq11(branches3.archived, false))).all();
     return rows.map((row) => row.name);
   }
   // ===== RBAC: Ownership Management =====
@@ -6071,7 +6799,7 @@ var BranchRepository = class {
    * @returns true if user is an owner
    */
   async isOwner(branchId, userId) {
-    const row = await select(this.db).from(branchOwners3).where(and9(eq13(branchOwners3.branch_id, branchId), eq13(branchOwners3.user_id, userId))).one();
+    const row = await select(this.db).from(branchOwners3).where(and9(eq11(branchOwners3.branch_id, branchId), eq11(branchOwners3.user_id, userId))).one();
     return row != null;
   }
   /**
@@ -6084,15 +6812,15 @@ var BranchRepository = class {
     const rows = await select(this.db).from(branchGroupGrants3).innerJoin(
       groupMemberships3,
       and9(
-        eq13(groupMemberships3.group_id, branchGroupGrants3.group_id),
-        eq13(groupMemberships3.user_id, userId)
+        eq11(groupMemberships3.group_id, branchGroupGrants3.group_id),
+        eq11(groupMemberships3.user_id, userId)
       )
     ).innerJoin(
       groups3,
-      and9(eq13(groups3.group_id, branchGroupGrants3.group_id), eq13(groups3.archived, false))
+      and9(eq11(groups3.group_id, branchGroupGrants3.group_id), eq11(groups3.archived, false))
     ).where(
       and9(
-        eq13(branchGroupGrants3.branch_id, branchId),
+        eq11(branchGroupGrants3.branch_id, branchId),
         inArray3(branchGroupGrants3.can, BRANCH_PERMISSION_LEVELS)
       )
     ).all();
@@ -6123,7 +6851,7 @@ var BranchRepository = class {
    * this method.
    */
   async resolveUserAccess(branch, userId) {
-    const board = branch.permission_source === "board" && branch.board_id ? await select(this.db, { data: boards3.data, board_id: boards3.board_id }).from(boards3).where(eq13(boards3.board_id, branch.board_id)).one() : null;
+    const board = branch.permission_source === "board" && branch.board_id ? await select(this.db, { data: boards3.data, board_id: boards3.board_id }).from(boards3).where(eq11(boards3.board_id, branch.board_id)).one() : null;
     const boardData = board?.data;
     const boardIsShared = (boardData?.access_mode ?? "shared") === "shared";
     const sharing = branch.permission_source === "board" && boardIsShared ? boardData?.default_dangerously_allow_session_sharing ?? false : branch.dangerously_allow_session_sharing ?? false;
@@ -6139,7 +6867,7 @@ var BranchRepository = class {
     const groupRepo = new GroupRepository(this.db);
     const branchGroupGrants4 = await groupRepo.getBranchGrantsForUser(branch.branch_id, userId);
     if (branch.permission_source === "board" && branch.board_id) {
-      const boardOwner = await select(this.db).from(boardOwners3).where(and9(eq13(boardOwners3.board_id, branch.board_id), eq13(boardOwners3.user_id, userId))).one();
+      const boardOwner = await select(this.db).from(boardOwners3).where(and9(eq11(boardOwners3.board_id, branch.board_id), eq11(boardOwners3.user_id, userId))).one();
       if (boardOwner) {
         return {
           can: "all",
@@ -6196,33 +6924,33 @@ var BranchRepository = class {
     const branchRow = await select(this.db, {
       board_id: branches3.board_id,
       permission_source: branches3.permission_source
-    }).from(branches3).where(eq13(branches3.branch_id, branchId)).one();
-    const ownerRows = await select(this.db, { user_id: branchOwners3.user_id }).from(branchOwners3).where(eq13(branchOwners3.branch_id, branchId)).all();
-    const groupRows = await select(this.db, { user_id: groupMemberships3.user_id }).from(branchGroupGrants3).innerJoin(groupMemberships3, eq13(groupMemberships3.group_id, branchGroupGrants3.group_id)).innerJoin(
+    }).from(branches3).where(eq11(branches3.branch_id, branchId)).one();
+    const ownerRows = await select(this.db, { user_id: branchOwners3.user_id }).from(branchOwners3).where(eq11(branchOwners3.branch_id, branchId)).all();
+    const groupRows = await select(this.db, { user_id: groupMemberships3.user_id }).from(branchGroupGrants3).innerJoin(groupMemberships3, eq11(groupMemberships3.group_id, branchGroupGrants3.group_id)).innerJoin(
       groups3,
-      and9(eq13(groups3.group_id, branchGroupGrants3.group_id), eq13(groups3.archived, false))
+      and9(eq11(groups3.group_id, branchGroupGrants3.group_id), eq11(groups3.archived, false))
     ).where(
       and9(
-        eq13(branchGroupGrants3.branch_id, branchId),
+        eq11(branchGroupGrants3.branch_id, branchId),
         inArray3(branchGroupGrants3.can, VIEW_OR_BETTER_BRANCH_PERMISSIONS)
       )
     ).all();
-    const boardOwnerRows = branchRow?.permission_source === "board" && branchRow.board_id ? await select(this.db, { user_id: boardOwners3.user_id }).from(boardOwners3).where(eq13(boardOwners3.board_id, branchRow.board_id)).all() : [];
-    const boardGroupRows = branchRow?.permission_source === "board" && branchRow.board_id ? await select(this.db, { user_id: groupMemberships3.user_id }).from(boardGroupGrants3).innerJoin(groupMemberships3, eq13(groupMemberships3.group_id, boardGroupGrants3.group_id)).innerJoin(
+    const boardOwnerRows = branchRow?.permission_source === "board" && branchRow.board_id ? await select(this.db, { user_id: boardOwners3.user_id }).from(boardOwners3).where(eq11(boardOwners3.board_id, branchRow.board_id)).all() : [];
+    const boardGroupRows = branchRow?.permission_source === "board" && branchRow.board_id ? await select(this.db, { user_id: groupMemberships3.user_id }).from(boardGroupGrants3).innerJoin(groupMemberships3, eq11(groupMemberships3.group_id, boardGroupGrants3.group_id)).innerJoin(
       groups3,
-      and9(eq13(groups3.group_id, boardGroupGrants3.group_id), eq13(groups3.archived, false))
+      and9(eq11(groups3.group_id, boardGroupGrants3.group_id), eq11(groups3.archived, false))
     ).innerJoin(
       boards3,
       and9(
-        eq13(boards3.board_id, boardGroupGrants3.board_id),
-        eq13(
+        eq11(boards3.board_id, boardGroupGrants3.board_id),
+        eq11(
           sql7`coalesce(${jsonExtract(this.db, boards3.data, "access_mode")}, 'shared')`,
           "shared"
         )
       )
     ).where(
       and9(
-        eq13(boardGroupGrants3.board_id, branchRow.board_id),
+        eq11(boardGroupGrants3.board_id, branchRow.board_id),
         inArray3(boardGroupGrants3.can, VIEW_OR_BETTER_BRANCH_PERMISSIONS)
       )
     ).all() : [];
@@ -6241,6 +6969,83 @@ var BranchRepository = class {
     }
     return Array.from(userIds);
   }
+  /**
+   * Find users whose explicit branch or aligned-board grants should materialize
+   * into filesystem access for the branch.
+   *
+   * This intentionally excludes ambient "others" access because there is no
+   * bounded user set to expand. Board owners apply whenever the branch is
+   * explicitly aligned to board permissions (`permission_source = 'board'`);
+   * board group grants additionally require a shared board. Override branches
+   * must not inherit board grants.
+   */
+  async findExplicitFsAccessUserIds(branchId) {
+    const branchRow = await select(this.db, {
+      board_id: branches3.board_id,
+      permission_source: branches3.permission_source
+    }).from(branches3).where(eq11(branches3.branch_id, branchId)).one();
+    const ownerRows = await select(this.db, { user_id: branchOwners3.user_id }).from(branchOwners3).where(eq11(branchOwners3.branch_id, branchId)).all();
+    const groupRows = await select(this.db, { user_id: groupMemberships3.user_id }).from(branchGroupGrants3).innerJoin(groupMemberships3, eq11(groupMemberships3.group_id, branchGroupGrants3.group_id)).innerJoin(
+      groups3,
+      and9(eq11(groups3.group_id, branchGroupGrants3.group_id), eq11(groups3.archived, false))
+    ).where(
+      and9(
+        eq11(branchGroupGrants3.branch_id, branchId),
+        inArray3(
+          sql7`coalesce(${branchGroupGrants3.fs_access}, 'read')`,
+          FS_ACCESS_BRANCH_PERMISSIONS
+        )
+      )
+    ).all();
+    const isBoardAligned = branchRow?.permission_source === "board" && branchRow.board_id;
+    const boardOwnerRows = isBoardAligned ? await select(this.db, { user_id: boardOwners3.user_id }).from(boardOwners3).where(eq11(boardOwners3.board_id, branchRow.board_id)).all() : [];
+    const boardGroupRows = isBoardAligned ? await select(this.db, { user_id: groupMemberships3.user_id }).from(boardGroupGrants3).innerJoin(groupMemberships3, eq11(groupMemberships3.group_id, boardGroupGrants3.group_id)).innerJoin(
+      groups3,
+      and9(eq11(groups3.group_id, boardGroupGrants3.group_id), eq11(groups3.archived, false))
+    ).innerJoin(
+      boards3,
+      and9(
+        eq11(boards3.board_id, boardGroupGrants3.board_id),
+        eq11(
+          sql7`coalesce(${jsonExtract(this.db, boards3.data, "access_mode")}, 'shared')`,
+          "shared"
+        )
+      )
+    ).where(
+      and9(
+        eq11(boardGroupGrants3.board_id, branchRow.board_id),
+        inArray3(
+          sql7`coalesce(${boardGroupGrants3.fs_access}, 'read')`,
+          FS_ACCESS_BRANCH_PERMISSIONS
+        )
+      )
+    ).all() : [];
+    const userIds = /* @__PURE__ */ new Set();
+    for (const row of ownerRows) {
+      userIds.add(row.user_id);
+    }
+    for (const row of groupRows) {
+      userIds.add(row.user_id);
+    }
+    for (const row of boardOwnerRows) {
+      userIds.add(row.user_id);
+    }
+    for (const row of boardGroupRows) {
+      userIds.add(row.user_id);
+    }
+    return Array.from(userIds);
+  }
+  async findBoardAlignedBranches(boardId) {
+    const rows = await select(this.db).from(branches3).where(
+      and9(
+        eq11(branches3.board_id, boardId),
+        eq11(branches3.permission_source, "board"),
+        eq11(branches3.archived, false)
+      )
+    ).all();
+    const baseUrl = await getBaseUrl();
+    return rows.map((row) => this.rowToBranch(row, baseUrl));
+  }
   /**
    * Get all owners of a branch
    *
@@ -6252,7 +7057,7 @@ var BranchRepository = class {
     if (!branch) {
       throw new EntityNotFoundError("Branch", branchId);
     }
-    const rows = await select(this.db).from(branchOwners3).where(eq13(branchOwners3.branch_id, branch.branch_id)).all();
+    const rows = await select(this.db).from(branchOwners3).where(eq11(branchOwners3.branch_id, branch.branch_id)).all();
     return rows.map((row) => row.user_id);
   }
   /**
@@ -6292,7 +7097,7 @@ var BranchRepository = class {
     if (!branch) {
       throw new EntityNotFoundError("Branch", branchId);
     }
-    await deleteFrom(this.db, branchOwners3).where(and9(eq13(branchOwners3.branch_id, branch.branch_id), eq13(branchOwners3.user_id, userId))).run();
+    await deleteFrom(this.db, branchOwners3).where(and9(eq11(branchOwners3.branch_id, branch.branch_id), eq11(branchOwners3.user_id, userId))).run();
   }
   /**
    * Bulk-load ownership for multiple branches
@@ -6338,13 +7143,13 @@ var BranchRepository = class {
   async findAccessibleBranches(userId, filter) {
     const conditions = [visibleBranchAccessCondition(this.db, userId)];
     if (filter?.archived === true) {
-      conditions.push(eq13(branches3.archived, true));
+      conditions.push(eq11(branches3.archived, true));
     } else if (filter?.archived === false) {
-      conditions.push(eq13(branches3.archived, false));
+      conditions.push(eq11(branches3.archived, false));
     }
     const rows = await select(this.db, getTableColumns2(branches3)).from(branches3).leftJoin(
       branchOwners3,
-      and9(eq13(branchOwners3.branch_id, branches3.branch_id), eq13(branchOwners3.user_id, userId))
+      and9(eq11(branchOwners3.branch_id, branches3.branch_id), eq11(branchOwners3.user_id, userId))
     ).where(and9(...conditions)).all();
     const baseUrl = await getBaseUrl();
     const seen = /* @__PURE__ */ new Set();
@@ -6420,7 +7225,7 @@ var BranchRepository = class {
         zone_id: jsonExtract2(this.db, boardObjectsTable.data, "zone_id"),
         position: jsonExtract2(this.db, boardObjectsTable.data, "position"),
         board_data: boardsTable.data
-      }).from(boardObjectsTable).leftJoin(boardsTable, eq13(boardObjectsTable.board_id, boardsTable.board_id)).where(inArray3(boardObjectsTable.branch_id, branchIds)).all();
+      }).from(boardObjectsTable).leftJoin(boardsTable, eq11(boardObjectsTable.board_id, boardsTable.board_id)).where(inArray3(boardObjectsTable.branch_id, branchIds)).all();
       const boardObjectInfoByBranch = /* @__PURE__ */ new Map();
       for (const row of rows) {
         const info = {
@@ -6508,7 +7313,7 @@ var BranchRepository = class {
       for (const sessionId of sessionIds) {
         const query = select(this.db, {
           data: messagesTable.data
-        }).from(messagesTable).where(and9(eq13(messagesTable.session_id, sessionId), eq13(messagesTable.role, "assistant")));
+        }).from(messagesTable).where(and9(eq11(messagesTable.session_id, sessionId), eq11(messagesTable.role, "assistant")));
         const lastMessage = await query.orderBy(desc(messagesTable.index)).limit(1).one();
         if (lastMessage) {
           const messageData = lastMessage.data;
@@ -6580,22 +7385,30 @@ init_esm_shims();
 init_ids();
 init_database_wrapper();
 init_schema();
-import { eq as eq15, like as like5 } from "drizzle-orm";
+import { eq as eq13, like as like5 } from "drizzle-orm";
 
 // src/db/repositories/cards.ts
 init_esm_shims();
 init_ids();
 init_database_wrapper();
 init_schema();
-import { and as and11, eq as eq16, like as like6 } from "drizzle-orm";
+import { and as and11, eq as eq14, like as like6 } from "drizzle-orm";
 
 // src/db/repositories/gateway-channels.ts
 init_esm_shims();
 init_types2();
 init_ids();
 init_database_wrapper();
-import { eq as eq17, like as like7 } from "drizzle-orm";
+import { eq as eq15, like as like7 } from "drizzle-orm";
+init_schema();
+
+// src/db/repositories/gateway-outbound-messages.ts
+init_esm_shims();
+init_types2();
+init_ids();
+init_database_wrapper();
 init_schema();
+import { and as and12, eq as eq16, isNull as isNull5, like as like8 } from "drizzle-orm";
 
 // src/db/repositories/knowledge.ts
 init_esm_shims();
@@ -6603,14 +7416,14 @@ init_types2();
 init_config_manager();
 init_ids();
 import { createHash } from "crypto";
-import { and as and12, desc as desc2, eq as eq18, inArray as inArray4, like as like8, or as or5, sql as sql9 } from "drizzle-orm";
+import { and as and13, desc as desc2, eq as eq17, inArray as inArray5, like as like9, or as or6, sql as sql8 } from "drizzle-orm";
 init_database_wrapper();
 init_schema();
 
 // src/db/repositories/mcp-servers.ts
 init_esm_shims();
 init_ids();
-import { and as and13, eq as eq19, like as like9 } from "drizzle-orm";
+import { and as and14, eq as eq18, like as like10 } from "drizzle-orm";
 
 // src/tools/mcp/auth-secrets.ts
 init_esm_shims();
@@ -6626,11 +7439,11 @@ init_schema();
 init_esm_shims();
 init_database_wrapper();
 init_schema();
-import { and as and14, eq as eq20 } from "drizzle-orm";
+import { and as and15, eq as eq19, inArray as inArray6 } from "drizzle-orm";
 
 // src/db/repositories/repos.ts
 init_esm_shims();
-import { eq as eq21, like as like10, sql as sql10 } from "drizzle-orm";
+import { eq as eq20, like as like11, sql as sql9 } from "drizzle-orm";
 init_ids();
 init_database_wrapper();
 init_schema();
@@ -6666,20 +7479,23 @@ var RepoRepository = class {
     const environment = data.environment ?? wrapV1AsV2(data.environment_config);
     const environment_config = data.environment_config ?? deriveV1FromV2(environment);
     const remote_url = typeof data.remote_url === "string" ? stripHttpUrlUserinfo(data.remote_url) : data.remote_url;
-    return {
-      repo_id: row.repo_id,
-      slug: row.slug,
-      repo_type: row.repo_type ?? "remote",
-      unix_group: row.unix_group ?? void 0,
-      created_at: new Date(row.created_at).toISOString(),
-      last_updated: row.updated_at ? new Date(row.updated_at).toISOString() : new Date(row.created_at).toISOString(),
-      ...data,
-      remote_url,
-      environment,
-      environment_config,
-      clone_status: data.clone_status,
-      clone_error: data.clone_error
-    };
+    return attachHiddenTenant(
+      {
+        repo_id: row.repo_id,
+        slug: row.slug,
+        repo_type: row.repo_type ?? "remote",
+        unix_group: row.unix_group ?? void 0,
+        created_at: new Date(row.created_at).toISOString(),
+        last_updated: row.updated_at ? new Date(row.updated_at).toISOString() : new Date(row.created_at).toISOString(),
+        ...data,
+        remote_url,
+        environment,
+        environment_config,
+        clone_status: data.clone_status,
+        clone_error: data.clone_error
+      },
+      row
+    );
   }
   /**
    * Convert Repo to database insert format
@@ -6729,7 +7545,7 @@ var RepoRepository = class {
    */
   async resolveId(id) {
     return resolveByShortIdPrefix(id, "Repo", async (pattern) => {
-      const rows = await select(this.db).from(repos3).where(like10(repos3.repo_id, pattern)).limit(RESOLVE_SHORT_ID_FETCH_LIMIT).all();
+      const rows = await select(this.db).from(repos3).where(like11(repos3.repo_id, pattern)).limit(RESOLVE_SHORT_ID_FETCH_LIMIT).all();
       return rows.map((r) => r.repo_id);
     });
   }
@@ -6740,7 +7556,7 @@ var RepoRepository = class {
     try {
       const insertData = this.repoToInsert(data);
       await insert(this.db, repos3).values(insertData).run();
-      const row = await select(this.db).from(repos3).where(eq21(repos3.repo_id, insertData.repo_id)).one();
+      const row = await select(this.db).from(repos3).where(eq20(repos3.repo_id, insertData.repo_id)).one();
       if (!row) {
         throw new RepositoryError("Failed to retrieve created repo");
       }
@@ -6759,7 +7575,7 @@ var RepoRepository = class {
   async findById(id) {
     try {
       const fullId = await this.resolveId(id);
-      const row = await select(this.db).from(repos3).where(eq21(repos3.repo_id, fullId)).one();
+      const row = await select(this.db).from(repos3).where(eq20(repos3.repo_id, fullId)).one();
       return row ? this.rowToRepo(row) : null;
     } catch (error) {
       if (error instanceof EntityNotFoundError) return null;
@@ -6775,7 +7591,7 @@ var RepoRepository = class {
    */
   async findBySlug(slug) {
     try {
-      const row = await select(this.db).from(repos3).where(eq21(repos3.slug, slug)).one();
+      const row = await select(this.db).from(repos3).where(eq20(repos3.slug, slug)).one();
       return row ? this.rowToRepo(row) : null;
     } catch (error) {
       throw new RepositoryError(
@@ -6843,8 +7659,8 @@ var RepoRepository = class {
       let changed = 0;
       for (const finding of scan.findings) {
         await this.db.transaction(async (tx) => {
-          await lockRowForUpdate(txAsDb(tx), this.db, repos3, eq21(repos3.repo_id, finding.repo_id));
-          const currentRow = await select(txAsDb(tx)).from(repos3).where(eq21(repos3.repo_id, finding.repo_id)).one();
+          await lockRowForUpdate(txAsDb(tx), this.db, repos3, eq20(repos3.repo_id, finding.repo_id));
+          const currentRow = await select(txAsDb(tx)).from(repos3).where(eq20(repos3.repo_id, finding.repo_id)).one();
           if (!currentRow) return;
           const data = currentRow.data;
           if (typeof data.remote_url !== "string" || !httpUrlHasUserinfo(data.remote_url)) {
@@ -6856,7 +7672,7 @@ var RepoRepository = class {
               ...data,
               remote_url: stripHttpUrlUserinfo(data.remote_url)
             }
-          }).where(eq21(repos3.repo_id, finding.repo_id)).run();
+          }).where(eq20(repos3.repo_id, finding.repo_id)).run();
           changed += 1;
         });
       }
@@ -6878,8 +7694,8 @@ var RepoRepository = class {
     try {
       const fullId = await this.resolveId(id);
       return await this.db.transaction(async (tx) => {
-        await lockRowForUpdate(txAsDb(tx), this.db, repos3, eq21(repos3.repo_id, fullId));
-        const currentRow = await select(txAsDb(tx)).from(repos3).where(eq21(repos3.repo_id, fullId)).one();
+        await lockRowForUpdate(txAsDb(tx), this.db, repos3, eq20(repos3.repo_id, fullId));
+        const currentRow = await select(txAsDb(tx)).from(repos3).where(eq20(repos3.repo_id, fullId)).one();
         if (!currentRow) {
           throw new EntityNotFoundError("Repo", id);
         }
@@ -6893,7 +7709,7 @@ var RepoRepository = class {
           repo_type: insertData.repo_type,
           unix_group: merged.unix_group ?? null,
           data: insertData.data
-        }).where(eq21(repos3.repo_id, fullId)).run();
+        }).where(eq20(repos3.repo_id, fullId)).run();
         merged.clone_error = insertData.data.clone_error;
         merged.remote_url = insertData.data.remote_url;
         merged.last_updated = newUpdatedAt.toISOString();
@@ -6927,8 +7743,8 @@ var RepoRepository = class {
     try {
       const fullId = await this.resolveId(id);
       return await this.db.transaction(async (tx) => {
-        await lockRowForUpdate(txAsDb(tx), this.db, repos3, eq21(repos3.repo_id, fullId));
-        const currentRow = await select(txAsDb(tx)).from(repos3).where(eq21(repos3.repo_id, fullId)).one();
+        await lockRowForUpdate(txAsDb(tx), this.db, repos3, eq20(repos3.repo_id, fullId));
+        const currentRow = await select(txAsDb(tx)).from(repos3).where(eq20(repos3.repo_id, fullId)).one();
         if (!currentRow) {
           throw new EntityNotFoundError("Repo", id);
         }
@@ -6942,7 +7758,7 @@ var RepoRepository = class {
           repo_type: insertData.repo_type,
           unix_group: next.unix_group ?? null,
           data: insertData.data
-        }).where(eq21(repos3.repo_id, fullId)).run();
+        }).where(eq20(repos3.repo_id, fullId)).run();
         next.environment = insertData.data.environment;
         next.environment_config = insertData.data.environment_config;
         next.remote_url = insertData.data.remote_url;
@@ -6982,7 +7798,7 @@ var RepoRepository = class {
   async delete(id) {
     try {
       const fullId = await this.resolveId(id);
-      const result = await deleteFrom(this.db, repos3).where(eq21(repos3.repo_id, fullId)).run();
+      const result = await deleteFrom(this.db, repos3).where(eq20(repos3.repo_id, fullId)).run();
       if (result.rowsAffected === 0) {
         throw new EntityNotFoundError("Repo", id);
       }
@@ -7013,7 +7829,7 @@ var RepoRepository = class {
    */
   async count() {
     try {
-      const result = await select(this.db, { count: sql10`count(*)` }).from(repos3).one();
+      const result = await select(this.db, { count: sql9`count(*)` }).from(repos3).one();
       return result?.count ?? 0;
     } catch (error) {
       throw new RepositoryError(
@@ -7029,29 +7845,36 @@ init_esm_shims();
 init_ids();
 init_database_wrapper();
 init_schema();
-import { and as and15, asc as asc2, desc as desc3, eq as eq22, isNull as isNull5, like as like11, lte, or as or6, sql as sql11 } from "drizzle-orm";
+import { and as and16, asc as asc2, desc as desc3, eq as eq21, isNull as isNull6, like as like12, lte, or as or7, sql as sql10 } from "drizzle-orm";
 
 // src/db/repositories/serialized-sessions.ts
 init_esm_shims();
 init_ids();
 init_database_wrapper();
 init_schema();
-import { and as and16, desc as desc4, eq as eq23, lt } from "drizzle-orm";
+import { and as and17, desc as desc4, eq as eq22, lt } from "drizzle-orm";
 
 // src/db/repositories/session-mcp-servers.ts
 init_esm_shims();
 init_database_wrapper();
 init_schema();
-import { and as and18, eq as eq25 } from "drizzle-orm";
+import { and as and19, eq as eq24 } from "drizzle-orm";
 
 // src/db/repositories/sessions.ts
 init_esm_shims();
 init_types2();
 init_config_manager();
 init_ids();
-import { and as and17, desc as desc5, eq as eq24, inArray as inArray5, like as like12, or as or7, sql as sql12 } from "drizzle-orm";
+import { and as and18, desc as desc5, eq as eq23, inArray as inArray7, like as like13, or as or8, sql as sql11 } from "drizzle-orm";
+init_database_wrapper();
+init_schema();
+
+// src/db/repositories/session-relationships.ts
+init_esm_shims();
+init_ids();
 init_database_wrapper();
 init_schema();
+import { and as and20, eq as eq25, inArray as inArray8, or as or9 } from "drizzle-orm";
 
 // src/db/repositories/tasks.ts
 init_esm_shims();
@@ -7059,7 +7882,7 @@ init_types2();
 init_ids();
 init_database_wrapper();
 init_schema();
-import { eq as eq26, inArray as inArray6, like as like13, sql as sql13 } from "drizzle-orm";
+import { and as and21, eq as eq26, inArray as inArray9, like as like14, sql as sql12 } from "drizzle-orm";
 
 // src/db/repositories/thread-session-map.ts
 init_esm_shims();
@@ -7067,27 +7890,28 @@ init_types2();
 init_ids();
 init_database_wrapper();
 init_schema();
-import { and as and19, eq as eq27, like as like14, lt as lt2 } from "drizzle-orm";
+import { and as and22, eq as eq27, like as like15, lt as lt2 } from "drizzle-orm";
 
 // src/db/repositories/user-api-keys.ts
 init_esm_shims();
 init_ids();
 init_database_wrapper();
 init_schema();
+init_tenant_context();
 import { randomBytes as randomBytes3 } from "crypto";
-import bcrypt2 from "bcryptjs";
-import { and as and20, eq as eq28 } from "drizzle-orm";
+import bcrypt from "bcryptjs";
+import { and as and23, eq as eq28 } from "drizzle-orm";
 
 // src/db/repositories/user-mcp-oauth-tokens.ts
 init_esm_shims();
 init_database_wrapper();
 init_schema();
-import { and as and21, eq as eq29, isNull as isNull6 } from "drizzle-orm";
+import { and as and24, eq as eq29, isNull as isNull7 } from "drizzle-orm";
 
 // src/db/repositories/users.ts
 init_esm_shims();
 init_types2();
-import { eq as eq30, like as like15 } from "drizzle-orm";
+import { eq as eq30, like as like16, sql as sql13 } from "drizzle-orm";
 init_ids();
 init_database_wrapper();
 init_schema();
@@ -7112,7 +7936,12 @@ var UsersRepository = class {
       unix_username: row.unix_username ?? void 0,
       onboarding_completed: row.onboarding_completed,
       must_change_password: row.must_change_password,
+      tokens_valid_after: row.tokens_valid_after ? new Date(row.tokens_valid_after) : void 0,
+      avatar_url: row.data.avatar_url ?? row.data.avatar,
       avatar: row.data.avatar,
+      avatar_source: row.data.avatar_source,
+      avatar_source_id: row.data.avatar_source_id,
+      avatar_synced_at: row.data.avatar_synced_at,
       preferences: row.data.preferences,
       // Convert encrypted per-tool credential blobs into boolean presence flags.
       agentic_tools: toAgenticToolsStatus(row.data.agentic_tools),
@@ -7156,8 +7985,14 @@ var UsersRepository = class {
       role: user.role ?? "member",
       unix_username: user.unix_username ?? null,
       onboarding_completed: user.onboarding_completed ?? false,
+      must_change_password: user.must_change_password ?? false,
+      tokens_valid_after: user.tokens_valid_after ? new Date(user.tokens_valid_after) : null,
       data: {
+        avatar_url: user.avatar_url,
         avatar: user.avatar,
+        avatar_source: user.avatar_source,
+        avatar_source_id: user.avatar_source_id,
+        avatar_synced_at: user.avatar_synced_at,
         preferences: user.preferences,
         // Encrypted per-tool credentials. Only forwarded when caller passes the
         // raw shape (internal credential mutators); regular updates leave it undefined,
@@ -7179,7 +8014,7 @@ var UsersRepository = class {
    */
   async resolveId(id) {
     return resolveByShortIdPrefix(id, "User", async (pattern) => {
-      const rows = await select(this.db).from(users3).where(like15(users3.user_id, pattern)).limit(RESOLVE_SHORT_ID_FETCH_LIMIT).all();
+      const rows = await select(this.db).from(users3).where(like16(users3.user_id, pattern)).limit(RESOLVE_SHORT_ID_FETCH_LIMIT).all();
       return rows.map((r) => r.user_id);
     });
   }
@@ -7244,6 +8079,35 @@ var UsersRepository = class {
     }
     return this.rowToUser(result);
   }
+  /**
+   * Find user by email for external identity providers.
+   *
+   * Agor intentionally keeps exact/case-sensitive email lookup semantics for
+   * auth paths because the schema historically allowed case-distinct emails.
+   * External providers such as Slack and GitHub treat email addresses as a
+   * canonical identity hint, so their alignment path needs a case-insensitive
+   * match. Prefer an exact match when present; otherwise return a
+   * case-insensitive match only when it is unambiguous.
+   */
+  async findByEmailForAlignment(email) {
+    const normalizedEmail = email.trim().toLowerCase();
+    if (!normalizedEmail) return null;
+    const exact = await this.findByEmail(normalizedEmail);
+    if (exact) return exact;
+    const results = await select(this.db).from(users3).where(sql13`LOWER(${users3.email}) = ${normalizedEmail}`).all();
+    if (results.length !== 1) {
+      if (results.length > 1) {
+        console.warn(
+          `[users] Ambiguous case-insensitive email alignment for ${normalizedEmail}: ${results.map((row) => {
+            const userRow = row;
+            return `${shortId(userRow.user_id)}:${userRow.email}`;
+          }).join(", ")}`
+        );
+      }
+      return null;
+    }
+    return this.rowToUser(results[0]);
+  }
   /**
    * Find all users
    */
@@ -7412,130 +8276,11 @@ var UsersRepository = class {
   }
 };
 
-// src/db/index.ts
-init_schema();
-
-// src/db/session-guard.ts
-init_esm_shims();
-init_ids();
-
-// src/db/index.ts
-init_user_utils();
-var compare = bcryptjs.compare;
-var hash = bcryptjs.hash;
-
-// src/config/key-resolver.ts
-init_database_wrapper();
-init_schema();
-init_ids();
-init_config_manager();
-var DEBUG_KEY_RESOLUTION = process.env.AGOR_DEBUG_KEY_RESOLUTION === "1" || process.env.DEBUG?.includes("key-resolution");
-
-// src/config/proxies-resolver.ts
-init_esm_shims();
-
-// src/config/repo-list.ts
-init_esm_shims();
-
-// src/config/repo-reference.ts
-init_esm_shims();
-var REPO_SLUG_PATTERN = /^[a-zA-Z0-9._-]+\/[a-zA-Z0-9._-]+$/;
-
-// src/config/resolved-config-slice.ts
-init_esm_shims();
-import { z } from "zod";
-var ResolvedConfigSliceSchema = z.object({
-  /** From `config.execution.*` */
-  execution: z.object({
-    permission_timeout_ms: z.number().int().nonnegative().optional(),
-    executor_heartbeat: z.object({
-      enabled: z.boolean(),
-      interval_ms: z.number().int().positive()
-    }).optional()
-  }).optional(),
-  /** From `config.opencode.*` */
-  opencode: z.object({
-    serverUrl: z.string().optional()
-  }).optional(),
-  /** From `config.daemon.*` (selected fields only) */
-  daemon: z.object({
-    host_ip_address: z.string().optional()
-  }).optional()
-});
-
-// src/config/resource-schemas.ts
-init_esm_shims();
-import { z as z2 } from "zod";
-var uuidSchema = z2.string().regex(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i, "Must be a valid UUID");
-var repoSlugSchema = z2.string().regex(
-  REPO_SLUG_PATTERN,
-  'Must be org/name format with alphanumeric, hyphens, underscores, or dots (e.g., "my-org/my-repo")'
-);
-var enforcedAgentConfigSchema = z2.object({
-  agentic_tool: z2.enum(["claude-code", "claude-code-cli", "codex", "gemini", "opencode", "copilot", "cursor"]).optional(),
-  permission_mode: z2.string().optional(),
-  model: z2.string().optional(),
-  mcp_server_ids: z2.array(z2.string()).optional()
-});
-var resourceRepoConfigSchema = z2.object({
-  repo_id: uuidSchema,
-  slug: repoSlugSchema,
-  remote_url: z2.string().optional(),
-  repo_type: z2.enum(["remote", "local"]).default("remote"),
-  default_branch: z2.string().optional(),
-  shallow: z2.boolean().optional()
-}).refine((data) => data.repo_type !== "remote" || data.remote_url, {
-  message: 'remote_url is required when repo_type is "remote"',
-  path: ["remote_url"]
-});
-var resourceBranchConfigSchema = z2.object({
-  branch_id: uuidSchema,
-  name: z2.string().min(1, "Branch name is required"),
-  ref: z2.string().min(1, "Git ref is required"),
-  ref_type: z2.enum(["branch", "tag"]).optional(),
-  others_can: z2.enum(["none", "view", "session", "prompt", "all"]).optional(),
-  mcp_server_ids: z2.array(z2.string()).optional(),
-  repo: repoSlugSchema,
-  readonly: z2.boolean().optional(),
-  agent: enforcedAgentConfigSchema.optional()
-});
-var resourceUserConfigSchema = z2.object({
-  user_id: uuidSchema,
-  email: z2.string().email("Must be a valid email address"),
-  name: z2.string().optional(),
-  role: z2.enum(["superadmin", "admin", "member", "viewer"]).default("member"),
-  unix_username: z2.string().optional(),
-  password: z2.string().optional()
-});
-var daemonResourcesConfigSchema = z2.object({
-  repos: z2.array(resourceRepoConfigSchema).optional(),
-  branches: z2.array(resourceBranchConfigSchema).optional(),
-  users: z2.array(resourceUserConfigSchema).optional()
-});
-
-// src/config/resource-sync.ts
-init_esm_shims();
-
-// src/config/security-resolver.ts
-init_esm_shims();
-var DEFAULT_GIT_CONFIG_PARAMETERS = Object.freeze([
-  "transfer.credentialsInUrl=die",
-  "protocol.file.allow=user",
-  "protocol.ext.allow=never",
-  "core.protectHFS=true",
-  "core.protectNTFS=true"
-]);
-
-// src/config/index.ts
-init_types();
-
 // src/git/index.ts
+var git_exports = {};
 init_esm_shims();
-init_config_manager();
-import { existsSync } from "fs";
-import { mkdir, readFile, stat, writeFile } from "fs/promises";
-import { basename, dirname as dirname2, isAbsolute, join as join3, resolve } from "path";
-import { simpleGit } from "simple-git";
+__reExport(git_exports, git_star);
+import * as git_star from "@agor/git";
 
 // src/unix/run-as-user.ts
 init_esm_shims();
@@ -7891,116 +8636,13 @@ function buildSpawnArgs(command, args = [], options) {
   };
 }
 
-// src/git/index.ts
-init_config_manager();
-var cachedGitBinary;
-function getGitBinary() {
-  if (cachedGitBinary !== void 0) return cachedGitBinary;
-  const commonPaths = [
-    "/opt/homebrew/bin/git",
-    // Homebrew on Apple Silicon
-    "/usr/local/bin/git",
-    // Homebrew on Intel
-    "/usr/bin/git"
-    // System git (Docker and Linux)
-  ];
-  for (const path3 of commonPaths) {
-    if (existsSync(path3)) {
-      cachedGitBinary = path3;
-      return path3;
-    }
-  }
-  cachedGitBinary = "git";
-  return cachedGitBinary;
-}
-function isLikelyGitToken(token) {
-  return /^[A-Za-z0-9_-]{20,255}$/.test(token);
-}
-var DEFAULT_AUTH_HEADER_HOST = "github.com";
-function buildGitConfigEnv(entries) {
-  if (entries.length === 0) return {};
-  const out = {
-    GIT_CONFIG_COUNT: String(entries.length)
-  };
-  for (let i = 0; i < entries.length; i++) {
-    const [key, value] = entries[i];
-    out[`GIT_CONFIG_KEY_${i}`] = key;
-    out[`GIT_CONFIG_VALUE_${i}`] = value;
-  }
-  return out;
-}
-function buildAuthHeaderEnv(token, host = DEFAULT_AUTH_HEADER_HOST) {
-  if (!token) return [];
-  if (!isLikelyGitToken(token)) {
-    console.warn(
-      "\u{1F511} Skipping http.extraheader: token does not match expected shape. Tokens must match /^[A-Za-z0-9_-]{20,255}$/. Re-save the token to enable the auth header."
-    );
-    return [];
-  }
-  const credential = Buffer.from(`x-access-token:${token}`, "utf8").toString("base64");
-  const key = `http.https://${host}/.extraheader`;
-  return [[key, `Authorization: Basic ${credential}`]];
-}
-function createGit(baseDir, env, authHost) {
-  const gitBinary = getGitBinary();
-  const config = [];
-  const rawToken = env?.GITHUB_TOKEN ?? env?.GH_TOKEN;
-  const authConfigEntries = buildAuthHeaderEnv(rawToken, authHost ?? DEFAULT_AUTH_HEADER_HOST);
-  let spawnEnv;
-  if (env || authConfigEntries.length > 0) {
-    spawnEnv = {
-      ...process.env,
-      ...env ?? {},
-      // Inheritance kill (GLOBAL only): ignore the daemon user's
-      // ~/.gitconfig. /etc/gitconfig is intentionally NOT killed — it is
-      // admin-policy territory (CA bundles, proxies). See block comment.
-      GIT_CONFIG_GLOBAL: "/dev/null",
-      // Fail fast instead of blocking on an interactive credential prompt
-      // (which would hang the daemon).
-      GIT_TERMINAL_PROMPT: "0",
-      // Inject http.extraheader (and any future server-constructed config)
-      // via the env-var protocol so it never lands on argv.
-      ...buildGitConfigEnv(authConfigEntries)
-    };
-  }
-  const git = simpleGit({
-    baseDir,
-    binary: gitBinary,
-    config,
-    unsafe: {
-      // simple-git's scanner blocks spawning when these env vars / config keys
-      // are present. We own the daemon env (in strict mode it's the user's own
-      // env) and inject GIT_CONFIG_* ourselves — opting in here mirrors what a
-      // direct `git` invocation on the same machine does.
-      allowUnsafeSshCommand: true,
-      allowUnsafeConfigPaths: true,
-      allowUnsafeConfigEnvCount: true,
-      allowUnsafeEditor: true,
-      allowUnsafeAskPass: true,
-      allowUnsafePager: true,
-      allowUnsafeGitProxy: true,
-      allowUnsafeTemplateDir: true,
-      allowUnsafeDiffExternal: true
-    }
-  });
-  if (spawnEnv) {
-    git.env(spawnEnv);
-  }
-  return { git };
-}
-async function getCurrentSha(repoPath) {
-  const { git } = createGit(repoPath);
-  const log = await git.log({ maxCount: 1 });
-  return log.latest?.hash || "";
-}
-
 // src/unix/user-env-file.ts
 init_esm_shims();
 import { execFileSync } from "child_process";
 import { randomBytes as randomBytes4 } from "crypto";
 import { unlinkSync } from "fs";
 import { tmpdir } from "os";
-import { join as join4 } from "path";
+import { join } from "path";
 
 // src/unix/secret-env.ts
 init_esm_shims();
@@ -8043,7 +8685,7 @@ function writeUserEnvFile(asUser, env) {
     throw new Error(`writeUserEnvFile: invalid Unix username: ${JSON.stringify(asUser)}`);
   }
   const nonce = randomBytes4(16).toString("hex");
-  const envFilePath = join4(tmpdir(), `${ENV_FILE_PREFIX}${nonce}`);
+  const envFilePath = join(tmpdir(), `${ENV_FILE_PREFIX}${nonce}`);
   const lines = [];
   for (const [key, value] of Object.entries(env)) {
     if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key)) {
@@ -8109,7 +8751,7 @@ function prepareImpersonationEnv(options) {
 // src/unix/environment-command-spawn.ts
 async function captureBranchBuildSha(branchPath2) {
   try {
-    const sha = await getCurrentSha(branchPath2);
+    const sha = await (0, git_exports.getCurrentSha)(branchPath2);
     return sha ? sha.slice(0, 7) : void 0;
   } catch {
     return void 0;
@@ -8776,6 +9418,30 @@ var UnixIntegrationService = class {
     this.usersRepo = new UsersRepository(db);
     this.repoRepo = new RepoRepository(db);
   }
+  async getUnixUsernamesForUsers(userIds) {
+    const unixUsernames = /* @__PURE__ */ new Set();
+    for (const userId of userIds) {
+      const user = await this.usersRepo.findById(userId);
+      if (user?.unix_username) {
+        unixUsernames.add(user.unix_username);
+      }
+    }
+    return unixUsernames;
+  }
+  async reconcileUnixGroupMembers(groupName, allowedUnixUsernames, options) {
+    if (this.config.daemonUser) {
+      allowedUnixUsernames.add(this.config.daemonUser);
+    }
+    const result = await this.executor.exec(UnixGroupCommands.listGroupMembers(groupName));
+    const currentMembers = result.stdout.trim().split(",").filter(Boolean);
+    for (const unixUsername of currentMembers) {
+      if (allowedUnixUsernames.has(unixUsername)) continue;
+      console.log(
+        `[UnixIntegration] Removing stale ${options.label} group member ${unixUsername} from ${groupName}`
+      );
+      await this.executor.exec(UnixGroupCommands.removeUserFromGroup(unixUsername, groupName));
+    }
+  }
   /**
    * Get the configured daemon user
    *
@@ -9019,19 +9685,26 @@ var UnixIntegrationService = class {
   /**
    * Initialize Unix group for an existing branch
    *
-   * Creates group and adds all current owners.
+   * Creates group and adds all users with explicit filesystem access.
    *
    * @param branchId - Branch ID
    */
   async initializeBranchGroup(branchId) {
     const groupName = await this.createBranchGroup(branchId);
-    const ownerIds = await this.branchRepo.getOwners(branchId);
-    for (const ownerId of ownerIds) {
-      await this.addUserToBranchGroup(branchId, ownerId);
+    const userIds = await this.branchRepo.findExplicitFsAccessUserIds(branchId);
+    for (const userId of userIds) {
+      await this.addUserToBranchGroup(branchId, userId);
     }
+    await this.reconcileUnixGroupMembers(groupName, await this.getUnixUsernamesForUsers(userIds), {
+      label: "branch"
+    });
     console.log(
-      `[UnixIntegration] Initialized group ${groupName} with ${ownerIds.length} owner(s)`
+      `[UnixIntegration] Initialized group ${groupName} with ${userIds.length} explicit filesystem user(s)`
     );
+    const branch = await this.branchRepo.findById(branchId);
+    if (branch?.repo_id) {
+      await this.syncRepo(branch.repo_id);
+    }
   }
   // ============================================================
   // REPO GROUP MANAGEMENT
@@ -9263,8 +9936,8 @@ var UnixIntegrationService = class {
   /**
    * Check if a user should be in a repo's Unix group
    *
-   * A user should be in the repo group if they have ownership
-   * of ANY branch in that repo.
+   * A user should be in the repo group if they have explicit filesystem access
+   * to ANY branch in that repo.
    *
    * @param repoId - Repo ID
    * @param userId - User ID to check
@@ -9273,8 +9946,8 @@ var UnixIntegrationService = class {
   async shouldUserBeInRepoGroup(repoId, userId) {
     const branches4 = await this.branchRepo.findAll({ repo_id: repoId });
     for (const wt of branches4) {
-      const isOwner = await this.branchRepo.isOwner(wt.branch_id, userId);
-      if (isOwner) {
+      const userIds = await this.branchRepo.findExplicitFsAccessUserIds(wt.branch_id);
+      if (userIds.includes(userId)) {
         return true;
       }
     }
@@ -9283,33 +9956,36 @@ var UnixIntegrationService = class {
   /**
    * Initialize Unix group for an existing repo
    *
-   * Creates group, sets .git permissions, and adds all users who
-   * own any branch in the repo.
+   * Creates group, sets .git permissions, and adds all users who have explicit
+   * filesystem access to any branch in the repo.
    *
    * @param repoId - Repo ID
    */
   async initializeRepoGroup(repoId) {
     const groupName = await this.createRepoGroup(repoId);
     const branches4 = await this.branchRepo.findAll({ repo_id: repoId });
-    const ownerIds = /* @__PURE__ */ new Set();
+    const userIds = /* @__PURE__ */ new Set();
     for (const wt of branches4) {
-      const wtOwners = await this.branchRepo.getOwners(wt.branch_id);
-      for (const ownerId of wtOwners) {
-        ownerIds.add(ownerId);
+      const branchUserIds = await this.branchRepo.findExplicitFsAccessUserIds(wt.branch_id);
+      for (const userId of branchUserIds) {
+        userIds.add(userId);
       }
     }
-    for (const ownerId of ownerIds) {
-      await this.addUserToRepoGroup(repoId, ownerId);
+    for (const userId of userIds) {
+      await this.addUserToRepoGroup(repoId, userId);
     }
+    await this.reconcileUnixGroupMembers(groupName, await this.getUnixUsernamesForUsers(userIds), {
+      label: "repo"
+    });
     console.log(
-      `[UnixIntegration] Initialized repo group ${groupName} with ${ownerIds.size} unique owner(s)`
+      `[UnixIntegration] Initialized repo group ${groupName} with ${userIds.size} unique filesystem user(s)`
     );
   }
   /**
    * Full sync for a repo
    *
    * Ensures repo group exists, .git permissions are set, and all
-   * branch owners are in the repo group.
+   * branch filesystem-access users are in the repo group.
    *
    * @param repoId - Repo ID
    */
@@ -9317,15 +9993,23 @@ var UnixIntegrationService = class {
     console.log(`[UnixIntegration] Full sync for repo ${shortId(repoId)}`);
     await this.createRepoGroup(repoId);
     const branches4 = await this.branchRepo.findAll({ repo_id: repoId });
-    const ownerIds = /* @__PURE__ */ new Set();
+    const userIds = /* @__PURE__ */ new Set();
     for (const wt of branches4) {
-      const wtOwners = await this.branchRepo.getOwners(wt.branch_id);
-      for (const ownerId of wtOwners) {
-        ownerIds.add(ownerId);
+      const branchUserIds = await this.branchRepo.findExplicitFsAccessUserIds(wt.branch_id);
+      for (const userId of branchUserIds) {
+        userIds.add(userId);
       }
     }
-    for (const ownerId of ownerIds) {
-      await this.addUserToRepoGroup(repoId, ownerId);
+    for (const userId of userIds) {
+      await this.addUserToRepoGroup(repoId, userId);
+    }
+    const repo = await this.repoRepo.findById(repoId);
+    if (repo?.unix_group) {
+      await this.reconcileUnixGroupMembers(
+        repo.unix_group,
+        await this.getUnixUsernamesForUsers(userIds),
+        { label: "repo" }
+      );
     }
   }
   // ============================================================
@@ -9602,16 +10286,28 @@ var UnixIntegrationService = class {
   /**
    * Full sync for a branch
    *
-   * Ensures group exists, all owners are in group, and symlinks are created.
+   * Ensures group exists, all explicit filesystem-access users are in group,
+   * and symlinks are created.
    *
    * @param branchId - Branch ID
    */
   async syncBranch(branchId) {
     console.log(`[UnixIntegration] Full sync for branch ${shortId(branchId)}`);
     await this.createBranchGroup(branchId);
-    const ownerIds = await this.branchRepo.getOwners(branchId);
-    for (const ownerId of ownerIds) {
-      await this.addUserToBranchGroup(branchId, ownerId);
+    const userIds = await this.branchRepo.findExplicitFsAccessUserIds(branchId);
+    for (const userId of userIds) {
+      await this.addUserToBranchGroup(branchId, userId);
+    }
+    const branch = await this.branchRepo.findById(branchId);
+    if (branch?.unix_group) {
+      await this.reconcileUnixGroupMembers(
+        branch.unix_group,
+        await this.getUnixUsernamesForUsers(userIds),
+        { label: "branch" }
+      );
+    }
+    if (branch?.repo_id) {
+      await this.syncRepo(branch.repo_id);
     }
   }
   /**