agor-live 0.22.0 → 0.23.2

package/dist/daemon/services/terminals.js

@@ -20,7 +20,11 @@ __export(tokens_exports, {
   validateSessionToken: () => validateSessionToken
 });
 import { MCP_TOKEN } from "@agor/core/config";
-import { generateId as generateId2, SessionRepository, shortId as shortId2 } from "@agor/core/db";
+import {
+  generateId as generateId2,
+  SessionRepository,
+  shortId as shortId2
+} from "@agor/core/db";
 import {
   MCP_TOKEN_AUDIENCE,
   MCP_TOKEN_ISSUER
@@ -174,6 +178,7 @@ import {
 } from "@agor/core/db";
 import { Forbidden as Forbidden2 } from "@agor/core/feathers";
 import {
+  getBranchSymlinkPath,
   resolveUnixUserForImpersonation as resolveUnixUserForImpersonation2,
   UnixUserNotFoundError,
   validateResolvedUnixUser
@@ -205,16 +210,16 @@ function hasBranchPermission(branch, userId, isOwner, requiredLevel, userRole, a
 
 // src/utils/mcp-token-authorization.ts
 import { hasMinimumRole as hasMinimumRole2, ROLES as ROLES2 } from "@agor/core/types";
-function canReceiveMcpTokenForSession(params) {
+function hasExplicitMinimumRole(userRole, minimumRole) {
+  return !!userRole && hasMinimumRole2(userRole, minimumRole);
+}
+function canControlCliSession(params) {
   const { callerUserId, callerRole, sessionCreatedBy } = params;
-  const isSuperadmin = hasMinimumRole2(callerRole, ROLES2.SUPERADMIN);
+  const isSuperadmin = hasExplicitMinimumRole(callerRole, ROLES2.SUPERADMIN);
   const isServiceExecutor = callerRole === "service";
-  const isCreatorMember = !!callerUserId && callerUserId === sessionCreatedBy && hasMinimumRole2(callerRole, ROLES2.MEMBER);
+  const isCreatorMember = !!callerUserId && callerUserId === sessionCreatedBy && hasExplicitMinimumRole(callerRole, ROLES2.MEMBER);
   return isCreatorMember || isSuperadmin || isServiceExecutor;
 }
-function canControlCliSession(params) {
-  return canReceiveMcpTokenForSession(params);
-}
 
 // src/utils/spawn-executor.ts
 import { spawn } from "child_process";
@@ -326,6 +331,13 @@ function generateTaskId() {
   return Array.from(bytes).map((b) => b.toString(16).padStart(2, "0")).join("");
 }
 function findExecutorPath() {
+  const configuredPath = process.env.AGOR_EXECUTOR_PATH;
+  if (configuredPath) {
+    if (!existsSync(configuredPath)) {
+      throw new Error(`Configured AGOR_EXECUTOR_PATH does not exist: ${configuredPath}`);
+    }
+    return configuredPath;
+  }
   const dirname = typeof __dirname !== "undefined" ? __dirname : path.dirname(fileURLToPath(import.meta.url));
   const possiblePaths = [
     path.join(dirname, "../executor/cli.js"),
@@ -436,6 +448,12 @@ function spawnExecutorLocal(payload, options) {
     options.onExit?.(127);
     return;
   }
+  let reportedExit = false;
+  const reportExit = (code) => {
+    if (reportedExit) return;
+    reportedExit = true;
+    options.onExit?.(code);
+  };
   const executorProcess = spawn(cmd, args, {
     cwd,
     env: asUser ? void 0 : { ...envWithDaemonUrl },
@@ -449,6 +467,7 @@ function spawnExecutorLocal(payload, options) {
   onSpawn?.(executorProcess);
   executorProcess.on("error", (error) => {
     console.error(`${logPrefix} Spawn error:`, error.message);
+    reportExit(127);
   });
   executorProcess.on("exit", (code) => {
     if (code === 0) {
@@ -456,7 +475,7 @@ function spawnExecutorLocal(payload, options) {
     } else {
       console.error(`${logPrefix} Executor exited with code ${code}`);
     }
-    options.onExit?.(code);
+    reportExit(code);
   });
   executorProcess.stdin?.write(JSON.stringify(payload));
   executorProcess.stdin?.end();
@@ -469,6 +488,12 @@ function spawnExecutorWithTemplate(payload, options) {
   console.log(`${logPrefix} Task ID: ${templateVariables.task_id}`);
   console.log(`${logPrefix} Command: ${payload.command}`);
   console.log(`${logPrefix} Template command (first 200 chars): ${command.slice(0, 200)}...`);
+  let reportedExit = false;
+  const reportExit = (code) => {
+    if (reportedExit) return;
+    reportedExit = true;
+    options.onExit?.(code);
+  };
   const executorProcess = spawn("sh", ["-c", command], {
     env: { ...process.env, LOG_LEVEL: logLevel },
     stdio: ["pipe", "pipe", "pipe"]
@@ -482,6 +507,7 @@ function spawnExecutorWithTemplate(payload, options) {
   });
   executorProcess.on("error", (error) => {
     console.error(`${logPrefix} Spawn error:`, error.message);
+    reportExit(127);
   });
   executorProcess.on("exit", (code) => {
     if (code === 0) {
@@ -493,7 +519,7 @@ function spawnExecutorWithTemplate(payload, options) {
         `${logPrefix} Executor exited with code ${code} (task: ${templateVariables.task_id})`
       );
     }
-    options.onExit?.(code);
+    reportExit(code);
   });
   executorProcess.stdin?.write(JSON.stringify(payload));
   executorProcess.stdin?.end();
@@ -516,12 +542,19 @@ function createServiceToken(jwtSecret, expiresIn, scope = {}) {
     expiresIn || "5m"
   );
 }
-function generateSessionToken(app) {
+function serviceTokenScopeForParams(params) {
+  const tenantId = params?.tenant?.tenant_id ?? params?.tenant_id ?? params?.user?.tenant_id;
+  return tenantId ? { tenant_id: tenantId } : {};
+}
+function generateSessionToken(app, scope = {}) {
   const jwtSecret = app.settings.authentication?.secret;
   if (!jwtSecret) {
     throw new Error("JWT secret not configured in app settings");
   }
-  return createServiceToken(jwtSecret);
+  return createServiceToken(jwtSecret, void 0, scope);
+}
+function generateScopedServiceToken(app, params) {
+  return generateSessionToken(app, serviceTokenScopeForParams(params));
 }
 var spawnExecutorFireAndForget = spawnExecutor;
 
@@ -538,8 +571,12 @@ import {
   permissionModeForCli,
   slugForCwd
 } from "@agor/core/claude-cli";
+import { resolveMultiTenancyConfig } from "@agor/core/config";
 import {
   generateId as generateId3,
+  getCurrentTenantId,
+  runWithoutTenantDatabaseScope,
+  runWithTenantDatabaseScope,
   SessionRepository as SessionRepository2,
   shortId as shortId3,
   TaskRepository
@@ -710,13 +747,13 @@ function writeClaudeCliMcpConfigFile(params) {
 async function writeClaudeCliMcpConfigForSession(app, session, opts = {}) {
   const config = app.get("config");
   if (config?.daemon?.mcpEnabled === false) return void 0;
-  if (opts.actor && !canReceiveMcpTokenForSession({
+  if (opts.actor && !canControlCliSession({
     callerUserId: opts.actor.user_id,
     callerRole: opts.actor.role,
     sessionCreatedBy: session.created_by
   })) {
     console.warn(
-      `[claude-cli-integration] not writing owner-scoped MCP config for session ${shortId3(session.session_id)}: caller ${opts.actor.user_id ?? "anonymous"} cannot receive session creator token`
+      `[claude-cli-integration] not writing owner-scoped MCP config for session ${shortId3(session.session_id)}: caller ${opts.actor.user_id ?? "anonymous"} is not allowed to control the owner-scoped CLI MCP config`
     );
     return void 0;
   }
@@ -746,6 +783,25 @@ async function writeClaudeCliMcpConfigForSession(app, session, opts = {}) {
 }
 
 // src/services/terminals.ts
+function buildBranchShellTabName(branch) {
+  return `${branch.name} \xB7 ${shortId4(branch.branch_id)}`;
+}
+function safeRealpath(pathToResolve) {
+  try {
+    return fs2.realpathSync(pathToResolve);
+  } catch {
+    return null;
+  }
+}
+function resolveBranchShellCwd(branch, finalUnixUser) {
+  if (!finalUnixUser) return branch.path;
+  const symlinkPath = getBranchSymlinkPath(finalUnixUser, branch.name);
+  const symlinkRealpath = safeRealpath(symlinkPath);
+  if (!symlinkRealpath) return branch.path;
+  const branchRealpath = safeRealpath(branch.path);
+  if (!branchRealpath) return branch.path;
+  return symlinkRealpath === branchRealpath ? symlinkPath : branch.path;
+}
 function isZellijAvailable() {
   try {
     execSync("which zellij", { stdio: "pipe", timeout: 2e3 });
@@ -1051,13 +1107,14 @@ var TerminalsService = class {
         const branchRepo = new BranchRepository(this.db);
         const branch = await branchRepo.findById(data.branchId);
         if (branch) {
+          const branchTabName = buildBranchShellTabName(branch);
           this.app.io?.to(`user/${userId}/terminal`).emit("terminal:tab", {
             userId,
             action: "create",
-            tabName: branch.name,
+            tabName: branchTabName,
             cwd: branch.path
           });
-          if (data.cliEnsure && data.cliEnsure.tabName !== branch.name) {
+          if (data.cliEnsure && data.cliEnsure.tabName !== branchTabName) {
             const ensure = data.cliEnsure;
             const alive = await isClaudeRunningFor(
               ensure.sessionId
@@ -1081,7 +1138,7 @@ var TerminalsService = class {
                 });
               }
             }, 300);
-          } else if (data.focusTabName && data.focusTabName !== branch.name) {
+          } else if (data.focusTabName && data.focusTabName !== branchTabName) {
             setTimeout(() => {
               this.app.io?.to(`user/${userId}/terminal`).emit("terminal:tab", {
                 userId,
@@ -1150,23 +1207,20 @@ var TerminalsService = class {
       }
       let cwd = os2.homedir();
       let branchName;
+      let branchTabName;
       if (data.branchId) {
         const branchRepo = new BranchRepository(this.db);
         const branch = await branchRepo.findById(data.branchId);
         if (branch) {
           branchName = branch.name;
-          if (finalUnixUser) {
-            const symlinkPath = `/home/${finalUnixUser}/agor/worktrees/${branch.name}`;
-            cwd = fs2.existsSync(symlinkPath) ? symlinkPath : branch.path;
-          } else {
-            cwd = branch.path;
-          }
+          branchTabName = buildBranchShellTabName(branch);
+          cwd = resolveBranchShellCwd(branch, finalUnixUser);
         }
       }
       const userSessionSuffix = shortId4(userId);
       const sessionName = `agor-${userSessionSuffix}`;
       const daemonUrl = `http://localhost:${config.daemon?.port || 3030}`;
-      const sessionToken = generateSessionToken(this.app);
+      const sessionToken = generateScopedServiceToken(this.app, params);
       const userEnv = await resolveUserEnvironment(userId, this.db);
       const envFile = writeEnvFile(userId, userEnv, finalUnixUser);
       const executorEnv = await createUserProcessEnvironment(
@@ -1184,7 +1238,7 @@ var TerminalsService = class {
             userId,
             sessionName,
             cwd,
-            tabName: branchName,
+            tabName: branchTabName,
             cols: data.cols || 160,
             rows: data.rows || 40,
             envFile
@@ -1288,5 +1342,7 @@ var TerminalsService = class {
   }
 };
 export {
-  TerminalsService
+  TerminalsService,
+  buildBranchShellTabName,
+  resolveBranchShellCwd
 };

package/dist/daemon/services/thread-session-map.d.ts

@@ -4,12 +4,12 @@
  * Provides REST + WebSocket API for thread-session mapping management.
  * Uses DrizzleService adapter with ThreadSessionMapRepository.
  */
-import { type Database } from '@agor/core/db';
+import { type TenantScopeAwareDatabase } from '@agor/core/db';
 import type { ThreadSessionMap } from '@agor/core/types';
 import { DrizzleService } from '../adapters/drizzle';
 export declare class ThreadSessionMapService extends DrizzleService<ThreadSessionMap, Partial<ThreadSessionMap>> {
     private threadMapRepo;
-    constructor(db: Database);
+    constructor(db: TenantScopeAwareDatabase);
     /**
      * Find all thread-session mappings for a branch
      * Used by UI to identify gateway-created sessions
@@ -19,5 +19,5 @@ export declare class ThreadSessionMapService extends DrizzleService<ThreadSessio
 /**
  * Service factory function
  */
-export declare function createThreadSessionMapService(db: Database): ThreadSessionMapService;
+export declare function createThreadSessionMapService(db: TenantScopeAwareDatabase): ThreadSessionMapService;
 //# sourceMappingURL=thread-session-map.d.ts.map

package/dist/daemon/services/thread-session-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thread-session-map.d.ts","sourceRoot":"","sources":["../../src/services/thread-session-map.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,KAAK,QAAQ,EAA8B,MAAM,eAAe,CAAC;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,qBAAa,uBAAwB,SAAQ,cAAc,CACzD,gBAAgB,EAChB,OAAO,CAAC,gBAAgB,CAAC,CAC1B;IACC,OAAO,CAAC,aAAa,CAA6B;gBAEtC,EAAE,EAAE,QAAQ;IAaxB;;;OAGG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAGlE;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,QAAQ,GAAG,uBAAuB,CAEnF"}
+{"version":3,"file":"thread-session-map.d.ts","sourceRoot":"","sources":["../../src/services/thread-session-map.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,KAAK,wBAAwB,EAA8B,MAAM,eAAe,CAAC;AAC1F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,qBAAa,uBAAwB,SAAQ,cAAc,CACzD,gBAAgB,EAChB,OAAO,CAAC,gBAAgB,CAAC,CAC1B;IACC,OAAO,CAAC,aAAa,CAA6B;gBAEtC,EAAE,EAAE,wBAAwB;IAaxC;;;OAGG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAGlE;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,EAAE,EAAE,wBAAwB,GAC3B,uBAAuB,CAEzB"}

package/dist/daemon/services/thread-session-map.js

@@ -19,6 +19,34 @@ var DrizzleService = class {
   // Event emitter for FeathersJS (will be injected by framework)
   // biome-ignore lint/suspicious/noExplicitAny: FeathersJS event system
   emit;
+  /** Extract resolved tenant context from Feathers params. */
+  getTenant(params) {
+    return params?.tenant;
+  }
+  /**
+   * Whether a row belongs to the current tenant. Rows from pre-migration test
+   * fixtures that do not expose tenant_id are treated as visible so existing
+   * single-tenant unit tests keep working; migrated DB rows always carry it.
+   */
+  rowBelongsToTenant(row, tenant) {
+    if (!tenant) return true;
+    const record = row;
+    if (!("tenant_id" in record)) return true;
+    return record.tenant_id === tenant.tenant_id;
+  }
+  /** Stamp tenant_id onto created rows and prevent client-supplied drift. */
+  withTenant(data, params) {
+    const tenant = this.getTenant(params);
+    if (!tenant || !data || typeof data !== "object" || Array.isArray(data)) return data;
+    return { ...data, tenant_id: tenant.tenant_id };
+  }
+  /** Never allow a patch/update to move a row across tenants. */
+  stripTenantMutation(data) {
+    if (!data || typeof data !== "object" || Array.isArray(data)) return data;
+    const clone = { ...data };
+    delete clone.tenant_id;
+    return clone;
+  }
   /**
    * Extract query parameters from params
    */
@@ -110,12 +138,28 @@ var DrizzleService = class {
       data: paginated
     };
   }
+  /**
+   * Resolve the candidate row set that `find` filters, sorts, and paginates.
+   *
+   * The base implementation reads the whole table and relies on `filterData` to
+   * narrow it in memory. Subclasses may override this to push high-selectivity
+   * predicates into SQL; because `find` always re-applies every query filter via
+   * `filterData`, an override only needs to return a superset of the matching
+   * rows for the result to stay identical.
+   */
+  async fetchData(_query, _params) {
+    return this.repository.findAll();
+  }
   /**
    * Find records
    */
   async find(params) {
     const query = this.getQuery(params);
-    let data = await this.repository.findAll();
+    let data = await this.fetchData(query, params);
+    const tenant = this.getTenant(params);
+    if (tenant) {
+      data = data.filter((row) => this.rowBelongsToTenant(row, tenant));
+    }
     data = this.filterData(data, query);
     const total = data.length;
     data = this.sortData(data, query.$sort);
@@ -127,10 +171,13 @@ var DrizzleService = class {
    */
   async get(id, _params) {
     const prefetched = _params?._agorPrefetchedRecord;
-    if (prefetched && prefetched.idField === this.id && prefetched.id === String(id) && String(prefetched.record[this.id]) === String(id)) {
+    if (prefetched && prefetched.idField === this.id && prefetched.id === String(id) && String(prefetched.record[this.id]) === String(id) && this.rowBelongsToTenant(prefetched.record, this.getTenant(_params))) {
       return prefetched.record;
     }
     const result = await this.repository.findById(String(id));
+    if (result && !this.rowBelongsToTenant(result, this.getTenant(_params))) {
+      throw new NotFoundError(this.resourceType, String(id));
+    }
     if (!result) {
       throw new NotFoundError(this.resourceType, String(id));
     }
@@ -142,14 +189,18 @@ var DrizzleService = class {
   async create(data, params) {
     if (Array.isArray(data)) {
       const results = await Promise.all(
-        data.map((item) => this.repository.create(item))
+        data.map(
+          (item) => this.repository.create(this.withTenant(item, params))
+        )
       );
       for (const result2 of results) {
         this.emit?.("created", result2, params);
       }
       return results;
     }
-    const result = await this.repository.create(data);
+    const result = await this.repository.create(
+      this.withTenant(data, params)
+    );
     this.emit?.("created", result, params);
     return result;
   }
@@ -165,7 +216,10 @@ var DrizzleService = class {
    */
   async update(id, data, params) {
     await this.get(id, params);
-    const result = await this.repository.update(String(id), data);
+    const result = await this.repository.update(
+      String(id),
+      this.stripTenantMutation(data)
+    );
     this.emit?.("updated", result, params);
     return result;
   }
@@ -179,12 +233,14 @@ var DrizzleService = class {
       }
       const query = this.getQuery(params);
       let records = await this.repository.findAll();
+      const tenant = this.getTenant(params);
+      if (tenant) records = records.filter((row) => this.rowBelongsToTenant(row, tenant));
       records = this.filterData(records, query);
       const results = await Promise.all(
         records.map(
           (record) => this.repository.update(
             record[this.id],
-            data
+            this.stripTenantMutation(data)
           )
         )
       );
@@ -194,7 +250,10 @@ var DrizzleService = class {
       return results;
     }
     await this.get(id, params);
-    const result = await this.repository.update(String(id), data);
+    const result = await this.repository.update(
+      String(id),
+      this.stripTenantMutation(data)
+    );
     this.emit?.("patched", result, params);
     return result;
   }
@@ -208,6 +267,8 @@ var DrizzleService = class {
       }
       const query = this.getQuery(params);
       let records = await this.repository.findAll();
+      const tenant = this.getTenant(params);
+      if (tenant) records = records.filter((row) => this.rowBelongsToTenant(row, tenant));
       records = this.filterData(records, query);
       await Promise.all(records.map((record) => this.repository.delete(record[this.id])));
       for (const record of records) {

package/dist/daemon/services/user-avatar-sync.d.ts

@@ -0,0 +1,21 @@
+import { type TenantScopeAwareDatabase } from '@agor/core/db';
+import { type Application } from '@agor/core/feathers';
+import type { Params, UserAvatarSettings, UserAvatarSyncRequest, UserAvatarSyncResult, UserID } from '@agor/core/types';
+export declare class UserAvatarSyncManager {
+    private app;
+    private variables;
+    private gatewayChannels;
+    private users;
+    constructor(db: TenantScopeAwareDatabase, app: Application);
+    getSettings(params?: Params): Promise<UserAvatarSettings>;
+    updateSettings(data: Partial<UserAvatarSettings>, params?: Params): Promise<UserAvatarSettings>;
+    syncAvatars(data?: UserAvatarSyncRequest, params?: Params): Promise<UserAvatarSyncResult>;
+    refreshUserFromSettings(userId: UserID): Promise<UserAvatarSyncResult | null>;
+    private saveSettings;
+    private clearSlackAvatars;
+    private getSlackGateway;
+    private refreshAllUsers;
+    private refreshSingleUser;
+    private refreshUserWithConnector;
+}
+//# sourceMappingURL=user-avatar-sync.d.ts.map

package/dist/daemon/services/user-avatar-sync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-avatar-sync.d.ts","sourceRoot":"","sources":["../../src/services/user-avatar-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,wBAAwB,EAE9B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,KAAK,WAAW,EAAa,MAAM,qBAAqB,CAAC;AAElE,OAAO,KAAK,EAGV,MAAM,EAEN,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,MAAM,EACP,MAAM,kBAAkB,CAAC;AAyC1B,qBAAa,qBAAqB;IAO9B,OAAO,CAAC,GAAG;IANb,OAAO,CAAC,SAAS,CAAwB;IACzC,OAAO,CAAC,eAAe,CAA2B;IAClD,OAAO,CAAC,KAAK,CAAkB;gBAG7B,EAAE,EAAE,wBAAwB,EACpB,GAAG,EAAE,WAAW;IAOpB,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAMzD,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM;IAuBjE,WAAW,CACf,IAAI,GAAE,qBAA0B,EAChC,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,oBAAoB,CAAC;IAyB1B,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;YAUrE,YAAY;YAUZ,iBAAiB;YA4BjB,eAAe;YAaf,eAAe;YA2Cf,iBAAiB;YAqBjB,wBAAwB;CA8DvC"}