@bevel-software/platform-core-backend 0.26.0 → 0.28.0

package/src/modules/audit/__tests__/agent-audit.service.test.ts

@@ -14,13 +14,17 @@ import type { IExternalApiKeyService } from '../../tool-auth/external-api-key.in
  * update / delete` pops the next queued result. `transaction` runs its
  * callback against the same fake, so queued results are consumed in order.
  * Every `where` predicate and `update` target is captured, so a test can pin
- * WHICH rows a statement addressed (see {@link render}), not just that it ran.
+ * WHICH rows a statement addressed (see {@link render}), not just that it ran;
+ * `orderBy` and `limit` too, since the fake applies neither and a test can
+ * only pin WHICH row of several a read keeps by the clauses it sent.
  */
 function makeFakeDb(queue: unknown[]) {
-  const captured: { values: any[]; set: any[]; where: SQL[]; updateTargets: unknown[] } = {
+  const captured: { values: any[]; set: any[]; where: SQL[]; orderBy: SQL[][]; limit: number[]; updateTargets: unknown[] } = {
     values: [],
     set: [],
     where: [],
+    orderBy: [],
+    limit: [],
     updateTargets: [],
   };
   const counts = { insert: 0, select: 0, update: 0, delete: 0 };
@@ -36,10 +40,10 @@ function makeFakeDb(queue: unknown[]) {
     chain.values = passthrough((a) => captured.values.push(a[0]));
     chain.set = passthrough((a) => captured.set.push(a[0]));
     chain.where = passthrough((a) => captured.where.push(a[0]));
-    chain.limit = passthrough();
+    chain.limit = passthrough((a) => captured.limit.push(a[0]));
     chain.innerJoin = passthrough();
     chain.from = passthrough();
-    chain.orderBy = passthrough();
+    chain.orderBy = passthrough((a) => captured.orderBy.push(a));
     chain.groupBy = passthrough();
     chain.returning = passthrough();
     chain.then = (onF: any, onR: any) => Promise.resolve(result).then(onF, onR);
@@ -355,6 +359,62 @@ describe('AgentAuditService.revokeConnection', () => {
   });
 });
 
+/**
+ * The onboarding's "is your agent connected yet?". The page polls it, so the
+ * contract worth pinning is what it reads (one person's LIVE, USED rows of
+ * each kind — never the event log) and how the two kinds are combined.
+ */
+describe('AgentAuditService.lastAgentUse', () => {
+  it('answers null when neither an agent connection nor a key has been used', async () => {
+    const { service, counts } = makeService([[] /* connections */, [] /* keys */]);
+    await expect(service.lastAgentUse(ALICE.id)).resolves.toBeNull();
+    expect(counts.select).toBe(2);
+  });
+
+  it("reads only the caller's live, used rows of each kind", async () => {
+    const { service, captured } = makeService([[], []]);
+    await service.lastAgentUse(ALICE.id);
+    const [connections, keys] = captured.where.map(render);
+    expect(connections!.sql).toContain('"agent_connections"."user_id" = $1');
+    expect(connections!.sql).toContain('"agent_connections"."revoked_at" is null');
+    expect(connections!.sql).toContain('"agent_connections"."last_used_at" is not null');
+    expect(connections!.params).toEqual([ALICE.id]);
+    expect(keys!.sql).toContain('"api_tokens"."user_id" = $1');
+    expect(keys!.sql).toContain('"api_tokens"."revoked_at" is null');
+    expect(keys!.sql).toContain('"api_tokens"."last_used_at" is not null');
+    expect(keys!.params).toEqual([ALICE.id]);
+  });
+
+  it('keeps the most recently used row of each kind, of however many a person has', async () => {
+    // The fake neither sorts nor limits, so what is pinned is what each read
+    // asks the database for: newest use first, one row.
+    const { service, captured } = makeService([[], []]);
+    await service.lastAgentUse(ALICE.id);
+    expect(captured.orderBy.map((clauses) => clauses.map((c) => render(c).sql))).toEqual([
+      ['"agent_connections"."last_used_at" desc'],
+      ['"api_tokens"."last_used_at" desc'],
+    ]);
+    expect(captured.limit).toEqual([1, 1]);
+  });
+
+  it("names an agent connection by its client, and an unnamed one as such", async () => {
+    const at = new Date(NOW - 60_000);
+    const named = makeService([[{ client: 'Claude', at }], []]);
+    await expect(named.service.lastAgentUse(ALICE.id)).resolves.toEqual({ at, client: 'Claude', kind: 'agent' });
+    const unnamed = makeService([[{ client: null, at }], []]);
+    await expect(unnamed.service.lastAgentUse(ALICE.id)).resolves.toEqual({ at, client: 'Unnamed agent', kind: 'agent' });
+  });
+
+  it('answers with the newer of the two when both kinds have been used', async () => {
+    const older = new Date(NOW - DAY);
+    const newer = new Date(NOW - 60_000);
+    const keyNewer = makeService([[{ client: 'Claude', at: older }], [{ client: 'Laptop', at: newer }]]);
+    await expect(keyNewer.service.lastAgentUse(ALICE.id)).resolves.toEqual({ at: newer, client: 'Laptop', kind: 'key' });
+    const agentNewer = makeService([[{ client: 'Claude', at: newer }], [{ client: 'Laptop', at: older }]]);
+    await expect(agentNewer.service.lastAgentUse(ALICE.id)).resolves.toEqual({ at: newer, client: 'Claude', kind: 'agent' });
+  });
+});
+
 describe('retentionDaysFrom', () => {
   it('reads a positive whole number of days, and blank, zero or negative as forever', () => {
     expect(retentionDaysFrom('30')).toBe(30);

package/src/modules/audit/__tests__/agent-connection.routes.test.ts

@@ -0,0 +1,102 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import express from 'express';
+import type { Server } from 'node:http';
+import { createAgentConnectionRoutes } from '../agent-connection.routes.js';
+import type { AgentUse, IAgentConnectionStatus } from '../audit.contract.js';
+
+/**
+ * GET /onboarding/agent-connection — what the connect-your-agent page polls.
+ * The contract worth pinning:
+ *
+ *  - it answers for the AUTHENTICATED user (req.userId) and nobody else;
+ *    nothing in the request — query or otherwise — can name another account;
+ *  - "not yet" and "connected" are the two shapes, the second with when, as
+ *    what, and whether that name is an agent's or a connection key's label;
+ *  - the answer is never cached, since the next poll expects it to change;
+ *  - a failure is a generic 500, never the driver's message.
+ */
+
+const ALICE = 'u-alice';
+const BOB = 'u-bob';
+const CARA = 'u-cara';
+
+const USES: Record<string, AgentUse> = {
+  [BOB]: { at: new Date(Date.UTC(2026, 9, 7, 12, 0, 0)), client: 'Claude', kind: 'agent' },
+  [CARA]: { at: new Date(Date.UTC(2026, 9, 7, 13, 0, 0)), client: 'Laptop', kind: 'key' },
+};
+
+const status = {
+  lastAgentUse: vi.fn(async (userId: string) => USES[userId] ?? null),
+} satisfies IAgentConnectionStatus;
+
+let server: Server | undefined;
+afterEach(() => {
+  server?.close();
+  server = undefined;
+  vi.clearAllMocks();
+  vi.restoreAllMocks();
+});
+
+/** Mount the route with a stand-in auth middleware stamping `as` as the caller. */
+async function listen(as: string): Promise<string> {
+  const app = express();
+  app.use((req, _res, next) => {
+    req.userId = as;
+    next();
+  });
+  app.use('/api', createAgentConnectionRoutes(status));
+  await new Promise<void>((resolve) => {
+    server = app.listen(0, resolve);
+  });
+  const address = server!.address();
+  if (typeof address === 'string' || !address) throw new Error('no port');
+  return `http://127.0.0.1:${address.port}`;
+}
+
+describe('GET /onboarding/agent-connection', () => {
+  it('says "not yet" for a caller whose agents have not been used', async () => {
+    const base = await listen(ALICE);
+    const res = await fetch(`${base}/api/onboarding/agent-connection`);
+    expect(res.status).toBe(200);
+    expect(await res.json()).toEqual({ connected: false });
+    expect(status.lastAgentUse).toHaveBeenCalledWith(ALICE);
+  });
+
+  it('says connected, with when and as what, once one has', async () => {
+    const base = await listen(BOB);
+    const res = await fetch(`${base}/api/onboarding/agent-connection`);
+    expect(await res.json()).toEqual({ connected: true, at: '2026-10-07T12:00:00.000Z', client: 'Claude', kind: 'agent' });
+  });
+
+  it("keeps a connection key's kind: its label says nothing about which app holds it", async () => {
+    const base = await listen(CARA);
+    const res = await fetch(`${base}/api/onboarding/agent-connection`);
+    expect(await res.json()).toEqual({ connected: true, at: '2026-10-07T13:00:00.000Z', client: 'Laptop', kind: 'key' });
+  });
+
+  it("answers for the caller alone — a named account in the query is not asked about", async () => {
+    const base = await listen(ALICE);
+    const res = await fetch(`${base}/api/onboarding/agent-connection?userId=${BOB}&user=${BOB}`);
+    expect(await res.json()).toEqual({ connected: false });
+    expect(status.lastAgentUse).toHaveBeenCalledTimes(1);
+    expect(status.lastAgentUse).toHaveBeenCalledWith(ALICE);
+  });
+
+  it('is never cached: the next poll expects a different answer', async () => {
+    const base = await listen(ALICE);
+    const res = await fetch(`${base}/api/onboarding/agent-connection`);
+    expect(res.headers.get('cache-control')).toBe('no-store');
+  });
+
+  it('reports a failed read as a generic 500, keeping the detail server-side', async () => {
+    const detail = 'connection to 10.0.0.4:5432 refused';
+    status.lastAgentUse.mockRejectedValueOnce(new Error(detail));
+    vi.spyOn(console, 'error').mockImplementation(() => {});
+    const base = await listen(ALICE);
+    const res = await fetch(`${base}/api/onboarding/agent-connection`);
+    expect(res.status).toBe(500);
+    const body = (await res.json()) as { error: string };
+    expect(body.error).toBe('Could not check your agent');
+    expect(body.error).not.toContain(detail);
+  });
+});

package/src/modules/audit/agent-audit.service.ts

@@ -1,7 +1,7 @@
-import { and, count, desc, eq, isNull, lt, or, type SQL } from 'drizzle-orm';
+import { and, count, desc, eq, isNotNull, isNull, lt, or, type SQL } from 'drizzle-orm';
 import { logger } from '../../shared/logging.js';
 import type { Database } from '../database/connection.js';
-import { agentConnections, agentEvents, oauthTokens, users } from '../database/schema.js';
+import { agentConnections, agentEvents, externalApiKeys, oauthTokens, users } from '../database/schema.js';
 import type { IExternalApiKeyService } from '../tool-auth/external-api-key.interface.js';
 import {
   AuditPrincipalNotFoundError,
@@ -11,10 +11,12 @@ import {
   type AgentEventInput,
   type AgentEventPage,
   type AgentEventView,
+  type AgentUse,
   type AuditPrincipal,
   type AuditPrincipalRef,
   type AuditScope,
   type IAgentAuditService,
+  type IAgentConnectionStatus,
   type IAgentEventRecorder,
 } from './audit.contract.js';
 
@@ -39,7 +41,7 @@ const PRUNE_INTERVAL_MS = 60 * 60_000;
  * Connection keys are read through the key service rather than joined here,
  * so their summary shape (kind, revoked-by, …) has exactly one definition.
  */
-export class AgentAuditService implements IAgentAuditService, IAgentEventRecorder {
+export class AgentAuditService implements IAgentAuditService, IAgentEventRecorder, IAgentConnectionStatus {
   private lastPruneAt = 0;
 
   constructor(
@@ -242,6 +244,59 @@ export class AgentAuditService implements IAgentAuditService, IAgentEventRecorde
     };
   }
 
+  /**
+   * Whether one person's agent has reached the platform yet — what the
+   * onboarding asks once on arrival (the `agent-connected` event the stamp
+   * paths emit tells it the moment it changes). Two single-row reads on the
+   * per-user indexes, never a scan of the event log.
+   *
+   * Read from the `last_used_at` stamps, not from `agent_events`: an agent
+   * stamps its connection (or key) on its FIRST authenticated request — the
+   * `initialize` / `tools/list` every client sends straight after connecting
+   * — while an event is written only once it calls a tool, which may be
+   * never. The stamps are also outside the retention sweep, so "connected"
+   * cannot quietly turn back into "waiting" when old events are pruned.
+   *
+   * Live rows only: an agent its owner disconnected, or an admin revoked, is
+   * not a connected agent, whatever it did before. The key's columns are read
+   * here rather than through the key service because the service has no
+   * single-row read and this question needs only two columns of one row.
+   */
+  async lastAgentUse(userId: string): Promise<AgentUse | null> {
+    const [[agent], [key]] = await Promise.all([
+      this.db
+        .select({ client: agentConnections.clientName, at: agentConnections.lastUsedAt })
+        .from(agentConnections)
+        .where(
+          and(
+            eq(agentConnections.userId, userId),
+            isNull(agentConnections.revokedAt),
+            isNotNull(agentConnections.lastUsedAt),
+          ),
+        )
+        .orderBy(desc(agentConnections.lastUsedAt))
+        .limit(1),
+      this.db
+        .select({ client: externalApiKeys.label, at: externalApiKeys.lastUsedAt })
+        .from(externalApiKeys)
+        .where(
+          and(
+            eq(externalApiKeys.userId, userId),
+            isNull(externalApiKeys.revokedAt),
+            isNotNull(externalApiKeys.lastUsedAt),
+          ),
+        )
+        .orderBy(desc(externalApiKeys.lastUsedAt))
+        .limit(1),
+    ]);
+    const uses = [
+      agent?.at ? { at: agent.at, client: agent.client ?? 'Unnamed agent', kind: 'agent' as const } : null,
+      key?.at ? { at: key.at, client: key.client, kind: 'key' as const } : null,
+    ].filter((u): u is AgentUse => u !== null);
+    if (uses.length === 0) return null;
+    return uses.reduce((newest, u) => (u.at.getTime() > newest.at.getTime() ? u : newest));
+  }
+
   async revokeConnection(id: string, by: 'owner' | 'admin', ownerUserId?: string): Promise<void> {
     const scope = ownerUserId
       ? and(eq(agentConnections.id, id), eq(agentConnections.userId, ownerUserId))!

package/src/modules/audit/agent-connection.routes.ts

@@ -0,0 +1,56 @@
+import express from 'express';
+import { logger } from '../../shared/logging.js';
+import type { IAgentConnectionStatus } from './audit.contract.js';
+import '../auth/auth.middleware.js'; // Express Request augmentation (req.userId)
+
+const log = logger('audit');
+
+/** What the onboarding reads: connected or not, and — once connected — when, as what, and through which kind of credential. */
+export interface AgentConnectionResponse {
+  connected: boolean;
+  /** The agent's most recent call, ISO 8601. */
+  at?: string;
+  /** The agent's registered client name, or the connection key's label. */
+  client?: string;
+  /**
+   * Which of the two `client` is: `agent` for an OAuth connection's
+   * registered name, `key` for a connection key's free-text label. Only an
+   * `agent` name says which app connected.
+   */
+  kind?: 'agent' | 'key';
+}
+
+/**
+ * GET /api/onboarding/agent-connection — "has an agent of mine reached the
+ * platform yet?", JWT-only (mounted behind the session middleware).
+ *
+ * The connect-your-agent page and the Get set up list ask it once on
+ * arrival, and again when the person comes back to the tab; the moment it
+ * changes is told by the `agent-connected` event the use-stamp paths emit
+ * over the event stream, so nothing asks on a timer. It answers for the
+ * CALLER alone: the user is the token's, and nothing in the request can name
+ * anyone else — there is no parameter to try.
+ *
+ * `no-store` because the answer is expected to change between two asks; a
+ * cached "not yet" would keep a page waiting on an agent that has already
+ * arrived.
+ */
+export function createAgentConnectionRoutes(status: IAgentConnectionStatus): express.Router {
+  const router = express.Router();
+
+  router.get('/onboarding/agent-connection', async (req, res) => {
+    res.set('Cache-Control', 'no-store');
+    try {
+      const use = await status.lastAgentUse(req.userId!);
+      const body: AgentConnectionResponse = use
+        ? { connected: true, at: use.at.toISOString(), client: use.client, kind: use.kind }
+        : { connected: false };
+      res.json(body);
+    } catch (err) {
+      log.error('agent connection status failed:', { err });
+      res.status(500).json({ error: 'Could not check your agent' });
+    }
+  });
+
+  return router;
+}

package/src/modules/audit/audit.contract.ts

@@ -121,6 +121,32 @@ export interface IAgentAuditService {
   revokeConnection(id: string, by: 'owner' | 'admin', ownerUserId?: string): Promise<void>;
 }
 
+/**
+ * The most recent use of any of one person's live agents: when, what it
+ * calls itself (the agent's registered client name, or the key's label), and
+ * which of the two that name is.
+ */
+export interface AgentUse {
+  at: Date;
+  client: string;
+  /**
+   * `agent`: an OAuth connection, and `client` is the name the agent
+   * registered. `key`: a connection key, and `client` is whatever label its
+   * owner typed — it says nothing about which app holds the key.
+   */
+  kind: 'agent' | 'key';
+}
+
+/**
+ * The onboarding's "is your agent connected yet?" — answered for ONE person,
+ * from the use stamps the auth paths already write, so it costs two indexed
+ * single-row reads and records nothing new.
+ */
+export interface IAgentConnectionStatus {
+  /** The newest use among the person's live agent connections and connection keys; null when none has been used. */
+  lastAgentUse(userId: string): Promise<AgentUse | null>;
+}
+
 export class AuditPrincipalNotFoundError extends Error {
   constructor() {
     super('No such agent or key');

package/src/modules/audit/index.ts

@@ -2,6 +2,7 @@ export * from './audit.contract.js';
 export { AgentAuditService, MAX_EVENT_PAGE, retentionDaysFrom } from './agent-audit.service.js';
 export { createAgentRestAuditMiddleware } from './agent-rest-audit.middleware.js';
 export { createAuditRoutes } from './audit.routes.js';
+export { createAgentConnectionRoutes, type AgentConnectionResponse } from './agent-connection.routes.js';
 export { RequestAudit } from './request-audit.js';
 export {
   classifyToolCall,

package/src/modules/auth/__tests__/account-deactivation.test.ts

@@ -1,4 +1,6 @@
 import { describe, expect, it, vi } from 'vitest';
+import { PgDialect } from 'drizzle-orm/pg-core';
+import type { SQL } from 'drizzle-orm';
 import type { Database } from '../../database/connection.js';
 import type { CoreConfig } from '../../../core-config.js';
 import { AuthService } from '../auth.service.js';
@@ -16,10 +18,19 @@ import { RECOVERY_BOT_EMAIL } from '../../workflow/recovery-bot.js';
 /**
  * Drizzle chain stub, as in `auth.service.test.ts`: each db.select() /
  * insert() / update() consumes the next queued result; awaiting any point of
- * the chain resolves it. Records what was inserted and set.
+ * the chain resolves it. Records what was inserted and set, and, in order,
+ * every write and lock (`execute`) with the handle it went through: `db`
+ * itself, or the `tx` a transaction hands its callback (a different object,
+ * between `begin` and `commit`), so a lock taken outside the transaction
+ * shows up as `db:`.
  */
 function makeFakeDb(queue: unknown[]) {
-  const captured: { values: Record<string, unknown>[]; set: Record<string, unknown>[] } = { values: [], set: [] };
+  const captured: { values: Record<string, unknown>[]; set: Record<string, unknown>[]; order: string[] } = {
+    values: [],
+    set: [],
+    order: [],
+  };
+  const dialect = new PgDialect();
   function nextChain(): unknown {
     const result = queue.shift();
     const chain: Record<string, unknown> = {};
@@ -42,12 +53,27 @@ function makeFakeDb(queue: unknown[]) {
     });
     return chain;
   }
-  const db = {
-    insert: vi.fn(() => nextChain()),
+  const handle = (tag: 'db' | 'tx') => ({
+    insert: vi.fn(() => (captured.order.push(`${tag}:insert`), nextChain())),
     select: vi.fn(() => nextChain()),
-    update: vi.fn(() => nextChain()),
-  } as unknown as Database;
-  return { db, captured };
+    update: vi.fn(() => (captured.order.push(`${tag}:update`), nextChain())),
+    execute: vi.fn(async (query: SQL) => {
+      const { sql, params } = dialect.sqlToQuery(query);
+      captured.order.push(`${tag}:${sql} ${JSON.stringify(params)}`);
+      return [];
+    }),
+  });
+  const tx = handle('tx');
+  const db = {
+    ...handle('db'),
+    transaction: async <T,>(cb: (t: typeof tx) => Promise<T>) => {
+      captured.order.push('begin');
+      const out = await cb(tx);
+      captured.order.push('commit');
+      return out;
+    },
+  };
+  return { db: db as unknown as Database, captured };
 }
 
 function makeConfig(over: Partial<CoreConfig> = {}): CoreConfig {
@@ -156,6 +182,64 @@ describe('AuthService.isActive', () => {
   });
 });
 
+// An earlier version could switch off an owner without a server-held
+// password; nothing in the product can switch them back on for a workspace
+// whose only admin they are. Their way in clears it.
+describe('an owner switched off by an earlier version', () => {
+  const OWNER_OFF = { ...OFF, id: 'owner-1', email: 'root@example.com' };
+
+  for (const [label, adminPassword] of [
+    ['with ADMIN_PASSWORD', 'sup3r-secret'],
+    ['without ADMIN_PASSWORD (the cloud)', ''],
+  ] as const) {
+    const config = makeConfig({ adminEmail: 'root@example.com', adminPassword });
+
+    it(`signs in with single sign-on, and the switch-off is cleared on the row, ${label}`, async () => {
+      const { db, captured } = makeFakeDb([[OWNER_OFF], []]);
+      const { user } = await new AuthService(db, config).loginWithSso('root@example.com', 'Root');
+      expect(user.id).toBe('owner-1');
+      expect(captured.set).toEqual([expect.objectContaining({ deactivatedAt: null })]);
+    });
+
+    it(`is let in as an embed identity, ${label}`, async () => {
+      const { db, captured } = makeFakeDb([[OWNER_OFF], []]);
+      await expect(new AuthService(db, config).getOrCreateByEmail('root@example.com')).resolves.toMatchObject({ id: 'owner-1' });
+      expect(captured.set).toEqual([expect.objectContaining({ deactivatedAt: null })]);
+    });
+
+    it(`keeps a session they already hold, ${label}`, async () => {
+      const { db, captured } = makeFakeDb([[{ id: 'owner-1', email: 'root@example.com', deactivatedAt: new Date() }], []]);
+      expect(await new AuthService(db, config).isActive('owner-1')).toBe(true);
+      expect(captured.set).toEqual([expect.objectContaining({ deactivatedAt: null })]);
+    });
+  }
+
+  it('signs in with a password they hold on the row, without ADMIN_PASSWORD', async () => {
+    const passwordHash = await hashPassword('a-long-enough-password');
+    const { db, captured } = makeFakeDb([[{ ...OWNER_OFF, passwordHash }], []]);
+    const svc = new AuthService(db, makeConfig({ adminEmail: 'root@example.com' }));
+    const { user } = await svc.loginWithPassword('root@example.com', 'a-long-enough-password');
+    expect(user.id).toBe('owner-1');
+    expect(captured.set).toEqual([expect.objectContaining({ deactivatedAt: null })]);
+  });
+
+  it('signs in with ADMIN_PASSWORD, and the switch-off is cleared on the row', async () => {
+    // The lookup, the upsert, then the clearing update.
+    const { db, captured } = makeFakeDb([[OWNER_OFF], [OWNER_OFF], []]);
+    const svc = new AuthService(db, makeConfig({ adminEmail: 'root@example.com', adminPassword: 'sup3r-secret' }));
+    const { user } = await svc.loginWithPassword('root@example.com', 'sup3r-secret');
+    expect(user.id).toBe('owner-1');
+    expect(captured.set).toEqual([expect.objectContaining({ deactivatedAt: null })]);
+  });
+
+  it('leaves a switched-off account that is not an owner switched off', async () => {
+    const { db, captured } = makeFakeDb([[OFF]]);
+    const svc = new AuthService(db, makeConfig({ adminEmail: 'root@example.com' }));
+    await expect(svc.loginWithSso('alice@example.com', 'Alice')).rejects.toBeInstanceOf(AccountDeactivatedError);
+    expect(captured.set).toEqual([]);
+  });
+});
+
 describe('AuthService.deactivate', () => {
   it('records when the account was switched off', async () => {
     const { db, captured } = makeFakeDb([[ROW], []]);
@@ -163,22 +247,59 @@ describe('AuthService.deactivate', () => {
     expect(captured.set[0].deactivatedAt).toBeInstanceOf(Date);
   });
 
+  it('switches off under the address switch lock, taken before the update', async () => {
+    const { db, captured } = makeFakeDb([[{ ...ROW, email: 'Alice@Example.com' }], []]);
+    await new AuthService(db, makeConfig()).deactivate(ROW.id);
+    expect(captured.order).toEqual([
+      'begin',
+      // The wait for the lock is bounded, inside the transaction.
+      `tx:select set_config('lock_timeout', $1, true) ["15000"]`,
+      'tx:select pg_advisory_xact_lock(hashtext($1)) ["account-switch:alice@example.com"]',
+      'tx:update',
+      'commit',
+    ]);
+  });
+
   it('answers false for an account that does not exist', async () => {
     const { db } = makeFakeDb([[]]);
     expect(await new AuthService(db, makeConfig()).deactivate('nobody')).toBe(false);
   });
 
-  it('refuses the deployment admin, whose environment password is the way back in', async () => {
-    const config = makeConfig({ adminEmail: 'root@example.com', adminPassword: 'sup3r-secret' });
-    const { db } = makeFakeDb([[{ ...ROW, email: 'root@example.com' }]]);
-    await expect(new AuthService(db, config).deactivate(ROW.id)).rejects.toBeInstanceOf(AccountChangeRefusedError);
-    expect(vi.mocked(db.update)).not.toHaveBeenCalled();
+  // With a server-held owner password (self-hosted) and without one (the
+  // cloud's configuration): the owner is never switched off, and the refusal
+  // comes before any lock or write (`captured.order` stays empty).
+  for (const [label, adminPassword] of [
+    ['with ADMIN_PASSWORD', 'sup3r-secret'],
+    ['without ADMIN_PASSWORD (the cloud)', ''],
+  ] as const) {
+    it(`refuses the owner, ${label}, and says why`, async () => {
+      const config = makeConfig({ adminEmail: 'root@example.com', adminPassword });
+      const { db, captured } = makeFakeDb([[{ ...ROW, email: 'root@example.com' }]]);
+      const refusal = new AuthService(db, config).deactivate(ROW.id);
+      await expect(refusal).rejects.toBeInstanceOf(AccountChangeRefusedError);
+      await expect(refusal).rejects.toThrow("The owner can't be switched off.");
+      expect(captured.order).toEqual([]);
+    });
+
+    it(`still switches off an account that is not the owner, ${label}`, async () => {
+      const config = makeConfig({ adminEmail: 'root@example.com', adminPassword });
+      const { db, captured } = makeFakeDb([[ROW], []]);
+      expect(await new AuthService(db, config).deactivate(ROW.id)).toBe(true);
+      expect(captured.set[0].deactivatedAt).toBeInstanceOf(Date);
+    });
+  }
+
+  it('refuses the owner even with password sign-in switched off', async () => {
+    const config = makeConfig({ adminEmail: 'root@example.com', adminPassword: 'sup3r-secret', loginPasswordEnabled: false });
+    const { db, captured } = makeFakeDb([[{ ...ROW, email: 'root@example.com' }]]);
+    await expect(new AuthService(db, config).deactivate(ROW.id)).rejects.toThrow("The owner can't be switched off.");
+    expect(captured.order).toEqual([]);
   });
 
   it('refuses the accounts the platform runs its own work as', async () => {
-    const { db } = makeFakeDb([[{ ...ROW, email: RECOVERY_BOT_EMAIL }]]);
+    const { db, captured } = makeFakeDb([[{ ...ROW, email: RECOVERY_BOT_EMAIL }]]);
     await expect(new AuthService(db, makeConfig()).deactivate(ROW.id)).rejects.toThrow('platform itself');
-    expect(vi.mocked(db.update)).not.toHaveBeenCalled();
+    expect(captured.order).toEqual([]);
   });
 });
 
@@ -221,17 +342,25 @@ describe('a first sign-in the port would rather keep waiting', () => {
     expect(captured.values).toHaveLength(1);
     expect(captured.values[0]).toMatchObject({ email: 'new@example.com' });
     expect(captured.values[0].deactivatedAt).toBeInstanceOf(Date);
+    // Created switched off, so under the address's switch lock.
+    expect(captured.order).toEqual([
+      'begin',
+      `tx:select set_config('lock_timeout', $1, true) ["15000"]`,
+      'tx:select pg_advisory_xact_lock(hashtext($1)) ["account-switch:new@example.com"]',
+      'tx:insert',
+      'commit',
+    ]);
   });
 
   it('is a plain refusal when an admin creates the account', async () => {
     const { port } = recordingPort(waiting);
-    const { db } = makeFakeDb([[]]);
+    const { db, captured } = makeFakeDb([[]]);
     const err = await new AuthService(db, makeConfig(), port)
       .createAccount('new@example.com', 'New')
       .catch((e: unknown) => e);
     expect(err).toBeInstanceOf(AccountAdmissionRefusedError);
     expect((err as AccountAdmissionRefusedError).waitingForAdmin).toBe(false);
-    expect(vi.mocked(db.insert)).not.toHaveBeenCalled();
+    expect(captured.order).toEqual([]);
   });
 });
 

package/src/modules/auth/__tests__/account-hooks.test.ts

@@ -0,0 +1,57 @@
+import { describe, expect, it, vi } from 'vitest';
+import { AccountHooks, type AccountInvitedEvent } from '../account-hooks.js';
+
+const EVENT: AccountInvitedEvent = {
+  account: { id: 'u-lena', email: 'lena@acme.test', name: 'lena' },
+  invitedBy: { id: 'u-dana', email: 'dana@acme.test', name: 'Dana Admin' },
+  passwordSet: true,
+};
+
+describe('AccountHooks: an account was invited', () => {
+  it('notifies nobody when nothing is registered, and says so', async () => {
+    expect(await new AccountHooks().runAccountInvited(EVENT)).toEqual([]);
+  });
+
+  it('runs every listener in registration order, with the event, and collects the channels that reached the person', async () => {
+    const hooks = new AccountHooks();
+    const seen: string[] = [];
+    hooks.onAccountInvited(async (event) => {
+      seen.push(`mail:${event.account.email}:${event.passwordSet}`);
+      return 'email';
+    });
+    hooks.onAccountInvited(async () => {
+      seen.push('chat');
+      return null;
+    });
+    hooks.onAccountInvited(async () => {
+      seen.push('sms');
+      return 'sms';
+    });
+    expect(await hooks.runAccountInvited(EVENT)).toEqual(['email', 'sms']);
+    expect(seen).toEqual(['mail:lena@acme.test:true', 'chat', 'sms']);
+  });
+
+  it('a listener that throws counts as not having notified, and stops nothing', async () => {
+    const hooks = new AccountHooks();
+    const error = vi.spyOn(console, 'error').mockImplementation(() => {});
+    try {
+      hooks.onAccountInvited(async () => {
+        throw new Error('smtp down');
+      });
+      hooks.onAccountInvited(async () => 'email');
+      expect(await hooks.runAccountInvited(EVENT)).toEqual(['email']);
+      // Logged, so a failing mailer is diagnosable from the server's log.
+      expect(error).toHaveBeenCalledTimes(1);
+      expect(String(error.mock.calls[0]![0])).toContain('an account-invited listener failed');
+    } finally {
+      error.mockRestore();
+    }
+  });
+
+  it('an empty channel name is no channel: it counts as not having notified', async () => {
+    const hooks = new AccountHooks();
+    hooks.onAccountInvited(async () => '');
+    hooks.onAccountInvited(async () => 'email');
+    expect(await hooks.runAccountInvited(EVENT)).toEqual(['email']);
+  });
+});