fix(admin): source scoping + redirect URIs in admin OAuth registration

Takeover of #1558 (rebased onto master, admin/dist + admin-embedded regenerated so asset hashes match; source changes salvaged intact): - /admin/api/register-client now accepts source_id + federated_read (snake and camel case), validated fail-closed against the registered source list via the new normalizeAdminClientSourceScope (src/core/admin-source-scope.ts) before reaching registerClientManual — unknown or malformed ids are a 400, never a silently-hardcoded 'default'. Fixes #1490. - New requireAdmin-gated GET /admin/api/sources feeds the Register Agent form; the form now has a Write Source select + Read Sources checkboxes, and the agents table/drawer show each client's scope. - #1036: the Register Agent form now has a Redirect URIs textarea (one per line). When present, the POST carries redirectUris plus the authorization_code + refresh_token grants, mirroring the CLI's --redirect-uri grant-inference convention (src/commands/auth.ts). Backend plumbing already existed; this was UI-only. Tests: test/admin-source-scope.test.ts (normalization matrix), test/oauth.test.ts (registerClientManual persists source scope into AuthInfo), test/fix-wave-structural.test.ts (endpoint + form pins for #1490 and #1036). Co-authored-by: flamerged <flamerged@users.noreply.github.com> Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-08-16 01:42:23 +00:00 · 2026-07-21 15:09:32 -07:00
17 changed files with 335 additions and 312 deletions
@@ -7,7 +7,7 @@
  <link rel="preconnect" href="https://fonts.googleapis.com" />
  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
  <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=JetBrains+Mono:wght@400;500&display=swap" rel="stylesheet" />
-  <script type="module" crossorigin src="/admin/assets/index-CoGEje3-.js"></script>
+  <script type="module" crossorigin src="/admin/assets/index-CzLjRij_.js"></script>
  <link rel="stylesheet" crossorigin href="/admin/assets/index-GxkWX7v3.css">
 </head>
 <body>
@@ -39,6 +39,7 @@ export const api = {
  stats: () => apiFetch('/admin/api/stats'),
  health: () => apiFetch('/admin/api/health-indicators'),
  agents: () => apiFetch('/admin/api/agents'),
+  sources: () => apiFetch('/admin/api/sources'),
  requests: (page = 1, qs = '') => apiFetch(`/admin/api/requests?page=${page}${qs}`),
  apiKeys: () => apiFetch('/admin/api/api-keys'),
  createApiKey: (name: string) => apiFetch('/admin/api/api-keys', { method: 'POST', body: JSON.stringify({ name }) }),
@@ -23,9 +23,16 @@ interface Agent {
  total_requests: number;
  requests_today: number;
  token_ttl: number | null;
+  source_id: string | null;
+  federated_read: string[] | null;
  status: 'active' | 'revoked';
 }

+interface SourceOption {
+  id: string;
+  name: string | null;
+}
+
 interface ApiKey {
  id: string;
  name: string;
@@ -88,6 +95,7 @@ export function AgentsPage() {
                <th>Name</th>
                <th>Type</th>
                <th>Scopes</th>
+                <th>Source</th>
                <th>Status</th>
                <th>Requests</th>
                <th>Last Used</th>
@@ -108,6 +116,9 @@ export function AgentsPage() {
                      <span key={s} className={`badge badge-${s}`} style={{ marginRight: 4 }}>{s}</span>
                    ))}
                  </td>
+                  <td className="mono" style={{ fontSize: 12, color: 'var(--text-secondary)' }}>
+                    {a.auth_type === 'oauth' ? (a.source_id || 'default') : 'all'}
+                  </td>
                  <td>
                    <span className={`badge ${a.status === 'active' ? 'badge-success' : 'badge-danger'}`}>{a.status}</span>
                  </td>
@@ -257,9 +268,29 @@ function RegisterModal({ onClose, onRegistered }: {
    Object.fromEntries(ALLOWED_SCOPES_LIST.map(s => [s, s === 'read'])) as Record<Scope, boolean>,
  );
  const [ttl, setTtl] = useState('86400'); // 24h default
+  const [redirectUris, setRedirectUris] = useState('');
+  const [sources, setSources] = useState<SourceOption[]>([{ id: 'default', name: 'default' }]);
+  const [sourceId, setSourceId] = useState('default');
+  const [readSources, setReadSources] = useState<Record<string, boolean>>({ default: true });
  const [loading, setLoading] = useState(false);
  const [error, setError] = useState('');

+  useEffect(() => {
+    api.sources()
+      .then((rows: SourceOption[]) => {
+        const nextSources = rows.length > 0 ? rows : [{ id: 'default', name: 'default' }];
+        const nextSourceId = nextSources.some(s => s.id === sourceId) ? sourceId : nextSources[0].id;
+        setSources(nextSources);
+        setSourceId(nextSourceId);
+        setReadSources(prev => {
+          const next = Object.fromEntries(nextSources.map(s => [s.id, Boolean(prev[s.id])])) as Record<string, boolean>;
+          next[nextSourceId] = true;
+          return next;
+        });
+      })
+      .catch(() => {});
+  }, []);
+
  const ttlOptions = [
    { label: '1 hour', value: '3600' },
    { label: '24 hours', value: '86400' },
@@ -277,11 +308,24 @@ function RegisterModal({ onClose, onRegistered }: {
    try {
      // Use the CLI registration endpoint (POST to admin API)
      const selectedScopes = Object.entries(scopes).filter(([, v]) => v).map(([k]) => k).join(' ');
+      const federatedRead = sources.map(s => s.id).filter(id => readSources[id]);
+      if (federatedRead.length === 0) { setError('Select at least one read source'); setLoading(false); return; }
+      // #1036: redirect URIs, one per line. Mirrors the CLI convention
+      // (src/commands/auth.ts): presence of redirect URIs implies
+      // authorization_code + refresh_token grants unless the user had none.
+      const uris = redirectUris.split('\n').map(u => u.trim()).filter(Boolean);
      const res = await fetch('/admin/api/register-client', {
        method: 'POST',
        credentials: 'same-origin',
        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ name: name.trim(), scopes: selectedScopes, tokenTtl: ttl === '0' ? 315360000 : Number(ttl) }),
+        body: JSON.stringify({
+          name: name.trim(),
+          scopes: selectedScopes,
+          tokenTtl: ttl === '0' ? 315360000 : Number(ttl),
+          source_id: sourceId,
+          federated_read: federatedRead,
+          ...(uris.length > 0 ? { redirectUris: uris, grantTypes: ['authorization_code', 'refresh_token'] } : {}),
+        }),
      });
      if (!res.ok) throw new Error('Registration failed');
      const data = await res.json();
@@ -312,6 +356,42 @@ function RegisterModal({ onClose, onRegistered }: {
            ))}
          </div>
        </div>
+        <div style={{ marginBottom: 16 }}>
+          <label>Write Source</label>
+          <select value={sourceId} onChange={e => {
+            const id = e.target.value;
+            setSourceId(id);
+            setReadSources(p => ({ ...p, [id]: true }));
+          }}
+            style={{ width: '100%', background: 'var(--bg-secondary)', color: 'var(--text-primary)', border: '1px solid var(--border)', borderRadius: 6, padding: '6px 10px', fontSize: 14 }}>
+            {sources.map(s => <option key={s.id} value={s.id}>{s.name && s.name !== s.id ? `${s.id} (${s.name})` : s.id}</option>)}
+          </select>
+        </div>
+        <div style={{ marginBottom: 16 }}>
+          <label>Read Sources</label>
+          <div className="checkbox-group">
+            {sources.map(s => (
+              <label key={s.id} className="checkbox-label">
+                <input
+                  type="checkbox"
+                  checked={Boolean(readSources[s.id])}
+                  onChange={e => setReadSources(p => ({ ...p, [s.id]: e.target.checked }))}
+                />
+                {s.name && s.name !== s.id ? `${s.id} (${s.name})` : s.id}
+              </label>
+            ))}
+          </div>
+        </div>
+        <div style={{ marginBottom: 16 }}>
+          <label>Redirect URIs <span style={{ color: 'var(--text-secondary)', fontWeight: 400 }}>(optional, one per line — enables authorization_code flow)</span></label>
+          <textarea
+            placeholder={'https://example.com/callback'}
+            value={redirectUris}
+            onChange={e => setRedirectUris(e.target.value)}
+            rows={2}
+            style={{ width: '100%', background: 'var(--bg-secondary)', color: 'var(--text-primary)', border: '1px solid var(--border)', borderRadius: 6, padding: '6px 10px', fontSize: 13, fontFamily: 'inherit', resize: 'vertical' }}
+          />
+        </div>
        <div style={{ marginBottom: 20 }}>
          <label>Token Lifetime</label>
          <select value={ttl} onChange={e => setTtl(e.target.value)}
@@ -528,6 +608,8 @@ function AgentDrawer({ agent, onClose, onRevoked }: { agent: Agent; onClose: ()
      client_name: agentName,
      auth_type: agent.auth_type,
      scope: agent.scope,
+      source_id: agent.source_id,
+      federated_read: agent.federated_read,
    }, null, 2),
  };

@@ -547,6 +629,10 @@ function AgentDrawer({ agent, onClose, onRevoked }: { agent: Agent; onClose: ()
          <span>{(agent.scope || '').split(' ').filter(Boolean).map(s => (
            <span key={s} className={`badge badge-${s}`} style={{ marginRight: 4 }}>{s}</span>
          ))}</span>
+          <span style={{ color: 'var(--text-secondary)' }}>Write Source</span>
+          <span className="mono">{agent.source_id || (isOAuth ? 'default' : 'all')}</span>
+          <span style={{ color: 'var(--text-secondary)' }}>Read Sources</span>
+          <span className="mono">{isOAuth ? (agent.federated_read && agent.federated_read.length > 0 ? agent.federated_read.join(', ') : (agent.source_id || 'default')) : 'all'}</span>
          <span style={{ color: 'var(--text-secondary)' }}>Registered</span>
          <span>{new Date(agent.created_at).toLocaleDateString()}</span>
          <span style={{ color: 'var(--text-secondary)' }}>Token TTL</span>
@@ -1,13 +1,13 @@
 // AUTO-GENERATED — do not edit by hand.
 // Run `bun run scripts/build-admin-embedded.ts` to regenerate.
-// Source: admin/dist/ at 2026-05-27.
+// Source: admin/dist/ at 2026-07-21.
 //
 // Bun resolves the file: imports to a path that works at runtime even
 // inside a compiled binary (`bun build --compile`). The manifest maps
 // the request path the express handler sees to (resolved-path, mime).

 // @ts-ignore — type: 'file' is Bun ESM, not in lib.d.ts
-import A_0_assets_index_CoGEje3__js from '../admin/dist/assets/index-CoGEje3-.js' with { type: 'file' };
+import A_0_assets_index_CzLjRij__js from '../admin/dist/assets/index-CzLjRij_.js' with { type: 'file' };
 // @ts-ignore — type: 'file' is Bun ESM, not in lib.d.ts
 import A_1_assets_index_GxkWX7v3_css from '../admin/dist/assets/index-GxkWX7v3.css' with { type: 'file' };
 // @ts-ignore — type: 'file' is Bun ESM, not in lib.d.ts
@@ -19,7 +19,7 @@ export interface AdminAsset {
 }

 export const ADMIN_ASSETS: Record<string, AdminAsset> = {
-  "/admin/assets/index-CoGEje3-.js": { path: A_0_assets_index_CoGEje3__js as unknown as string, mime: "application/javascript; charset=utf-8" },
+  "/admin/assets/index-CzLjRij_.js": { path: A_0_assets_index_CzLjRij__js as unknown as string, mime: "application/javascript; charset=utf-8" },
  "/admin/assets/index-GxkWX7v3.css": { path: A_1_assets_index_GxkWX7v3_css as unknown as string, mime: "text/css; charset=utf-8" },
  "/admin/index.html": { path: A_2_index_html as unknown as string, mime: "text/html; charset=utf-8" },
 };
@@ -38,7 +38,6 @@ import { logSelfUpgrade } from '../core/audit/self-upgrade-audit.ts';
 import { detectInstallMethod } from './upgrade.ts';
 import { evaluateQuietHours } from '../core/minions/quiet-hours.ts';
 import { inspectLock } from '../core/db-lock.ts';
-import { registerCleanup } from '../core/process-cleanup.ts';

 /**
 * v0.37.7.0 #1162 — classify autopilot reconnect-loop errors.
@@ -434,37 +433,6 @@ export async function runAutopilot(engine: BrainEngine, args: string[]) {
  let stopping = false;
  let childSupervisor: ChildWorkerSupervisor | null = null;

-  // #1872: graceful engine shutdown. On PGLite the cycle steps run INLINE in
-  // this process, so a hard `process.exit` mid-write (systemctl stop →
-  // SIGTERM) kills WASM Postgres with the WAL dirty and can corrupt the
-  // brain. Two exit paths must both close the engine:
-  //   - autopilot's own shutdown() below (owns SIGINT + internal stops like
-  //     max_crashes / cycle-failure-cap), and
-  //   - process-cleanup's SIGTERM handler (installed at cli.ts module load;
-  //     it runs the cleanup registry with a 3s deadline and then exits) —
-  //     which is why closeEngine is ALSO registered there.
-  // closeEngine aborts the in-flight inline cycle (runCycle checks the
-  // signal between phases and threads it into phase sub-work), gives it a
-  // short bounded window to wind down, then disconnects. PGLite's
-  // disconnect() drains the pending query and checkpoints before closing;
-  // a second call is a no-op (disconnect snapshots + nulls the handle), so
-  // both paths firing is safe.
-  const shutdownAbort = new AbortController();
-  let inflightInlineCycle: Promise<unknown> | null = null;
-  const closeEngine = async () => {
-    shutdownAbort.abort(new Error('autopilot shutdown'));
-    if (inflightInlineCycle) {
-      // ponytail: 2s cap keeps us inside process-cleanup's 3s deadline; a
-      // between-phase abort resolves instantly, a mid-phase one may not.
-      await Promise.race([
-        inflightInlineCycle.catch(() => { /* cycle errors already logged by the loop */ }),
-        new Promise((r) => setTimeout(r, 2_000)),
-      ]);
-    }
-    try { await engine.disconnect(); } catch { /* best-effort */ }
-  };
-  const deregisterEngineClose = registerCleanup('autopilot-engine-close', closeEngine);
-
  if (spawnManagedWorker) {
    const cliPath = resolveGbrainCliPath();
    // Cgroup-aware auto-sized RSS watchdog cap (issue #1678). The old flat
@@ -552,10 +520,6 @@ export async function runAutopilot(engine: BrainEngine, args: string[]) {
        childSupervisor.killChild('SIGKILL');
      }
    }
-    // #1872: abort the in-flight inline cycle and close the engine BEFORE
-    // process.exit — a hard exit mid-write corrupts PGLite's WASM Postgres.
-    await closeEngine();
-    deregisterEngineClose();
    try { unlinkSync(lockPath); } catch { /* already gone */ }
    process.exit(0);
  };
@@ -1044,21 +1008,16 @@ export async function runAutopilot(engine: BrainEngine, args: string[]) {
      // path's phase set). Now both converge on the same primitive.
      try {
        const { runCycle } = await import('../core/cycle.ts');
-        // #1872: track the promise so closeEngine can drain it on shutdown,
-        // and pass the abort signal so the cycle winds down between phases.
-        const cyclePromise = runCycle(engine, {
+        const report = await runCycle(engine, {
          brainDir: repoPath,
          // Autopilot daemon path: pulls by default (matches
          // pre-v0.17 autopilot behavior). CLI dream defaults false
          // for cron safety; that choice is scoped to dream only.
          pull: true,
-          signal: shutdownAbort.signal,
          yieldBetweenPhases: async () => {
            await new Promise(r => setImmediate(r));
          },
        });
-        inflightInlineCycle = cyclePromise;
-        const report = await cyclePromise.finally(() => { inflightInlineCycle = null; });
        // Only 'failed' (every attempted phase failed) trips the autopilot
        // circuit breaker. 'partial' means at least one phase warned or
        // failed while others ran — that's a soft signal, not a fatal
@@ -26,7 +26,6 @@
 import type { BrainEngine } from '../core/engine.ts';
 import {
  runCycle,
-  resolveSourceForDir,
  ALL_PHASES,
  type CyclePhase,
  type CycleReport,
@@ -381,9 +380,9 @@ Options:

  --source <id>       Scope the cycle to one source so doctor's
                      cycle_freshness check sees a fresh stamp on
-                      completion. When omitted, gbrain derives the
-                      source from --dir / the configured checkout
-                      when it matches a source's local_path (#1869).
+                      completion. Without this, gbrain dream's
+                      timestamp never lands and federated brains
+                      see "stale cycle" forever.
  --source-id <id>    Alias for --source. Matches the v0.37.7.0+
                      naming used by import/extract/graph-query.

@@ -635,25 +634,6 @@ export async function runDream(engine: BrainEngine | null, args: string[]): Prom
    );
    process.exit(1);
  }
-
-  // #1869: a path-scoped run (--dir, or the configured sync.repo_path) whose
-  // directory matches a registered source's local_path IS that source's cycle
-  // — derive the source id so runCycle writes last_source_cycle_at /
-  // last_full_cycle_at on success and doctor's cycle_freshness check stops
-  // reading perpetually stale. Explicit --source still wins (resolved above).
-  // Fixed here at the command level, NOT in runCycle's stamp gate, so legacy
-  // global callers (autopilot-global-maintenance runs GLOBAL_PHASES with a
-  // brainDir and no sourceId) can't falsely stamp per-source freshness.
-  // A derived match on an archived source is skipped silently (falls back to
-  // legacy unscoped behavior) — stamping it would mask staleness on restore,
-  // mirroring the explicit --source archived guard above.
-  if (resolvedSourceId === undefined && engine !== null && brainDir !== null) {
-    const derived = await resolveSourceForDir(engine, brainDir);
-    if (derived !== undefined) {
-      const src = await fetchSource(engine, derived);
-      if (src?.archived !== true) resolvedSourceId = derived;
-    }
-  }
  // ─── issue #1678: bounded single-hold extract_atoms drain ──────────
  if (opts.drain) {
    if (engine === null) {
@@ -39,6 +39,7 @@ import * as db from '../core/db.ts';
 import { sqlQueryForEngine, executeRawJsonb } from '../core/sql-query.ts';
 import { MinionQueue } from '../core/minions/queue.ts';
 import { isRetryableError } from '../core/retry-matcher.ts';
+import { normalizeAdminClientSourceScope } from '../core/admin-source-scope.ts';
 import {
  computeContentHash,
  validateIngestionEvent,
@@ -1086,6 +1087,7 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
      const oauthClients = await sql`
        SELECT c.client_id as id, c.client_name as name, 'oauth' as auth_type,
          c.grant_types, c.scope, c.created_at, c.token_ttl,
+          c.source_id, c.federated_read,
          CASE WHEN c.deleted_at IS NOT NULL THEN 'revoked' ELSE 'active' END as status,
          (SELECT max(created_at) FROM mcp_request_log WHERE token_name = c.client_id) as last_used_at,
          (SELECT count(*)::int FROM mcp_request_log WHERE token_name = c.client_id) as total_requests,
@@ -1095,6 +1097,7 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
      const legacyKeys = await sql`
        SELECT a.id, a.name, 'api_key' as auth_type,
          '{"bearer"}' as grant_types, 'read write admin' as scope, a.created_at, null as token_ttl,
+          null as source_id, null as federated_read,
          CASE WHEN a.revoked_at IS NOT NULL THEN 'revoked' ELSE 'active' END as status,
          a.last_used_at,
          (SELECT count(*)::int FROM mcp_request_log WHERE token_name = a.name) as total_requests,
@@ -1107,6 +1110,17 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
    }
  });

+  app.get('/admin/api/sources', requireAdmin, async (_req: Request, res: Response) => {
+    try {
+      const sources = await engine.listAllSources({ includeArchived: false });
+      const options = sources.map(s => ({ id: s.id, name: s.name }));
+      if (!options.some(s => s.id === 'default')) options.unshift({ id: 'default', name: 'default' });
+      res.json(options);
+    } catch (e) {
+      res.status(503).json({ error: 'service_unavailable' });
+    }
+  });
+
  // v0.38 Slice 4 — per-OAuth-client agent spend viewer. Pre-computes today's
  // spend (committed + pending reservations) per client so the Agents tab
  // can render a "$X / $Y today" cell. Read-side endpoint only — no mutation.
@@ -1440,6 +1454,8 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
      // missing, empty) and rejects the rest with a structured 400.
      const { name, tokenTtl, grantTypes, redirectUris, tokenEndpointAuthMethod } = req.body;
      const rawScopes = (req.body as Record<string, unknown>).scopes ?? (req.body as Record<string, unknown>).scope;
+      const rawSourceId = (req.body as Record<string, unknown>).source_id ?? (req.body as Record<string, unknown>).sourceId;
+      const rawFederatedRead = (req.body as Record<string, unknown>).federated_read ?? (req.body as Record<string, unknown>).federatedRead;
      if (!name) { res.status(400).json({ error: 'Name required' }); return; }
      let scopeString: string;
      try {
@@ -1470,8 +1486,23 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
        });
        return;
      }
+      let sourceScope: ReturnType<typeof normalizeAdminClientSourceScope>;
+      try {
+        const sources = await engine.listAllSources({ includeArchived: false });
+        sourceScope = normalizeAdminClientSourceScope(
+          rawSourceId,
+          rawFederatedRead,
+          sources.map(s => s.id),
+        );
+      } catch (e) {
+        res.status(400).json({
+          error: 'invalid_source_scope',
+          message: e instanceof Error ? e.message : String(e),
+        });
+        return;
+      }
      const result = await oauthProvider.registerClientManual(
-        name, grants, scopeString, uris, 'default', undefined, validatedAuthMethod,
+        name, grants, scopeString, uris, sourceScope.sourceId, sourceScope.federatedRead, validatedAuthMethod,
      );
      // Set per-client TTL if specified
      if (tokenTtl && Number(tokenTtl) > 0) {
@@ -0,0 +1,51 @@
+import { isValidSourceId } from './source-id.ts';
+
+export interface AdminClientSourceScope {
+  sourceId: string;
+  federatedRead: string[];
+}
+
+function parseFederatedReadInput(raw: unknown, sourceId: string): string[] {
+  if (raw === undefined || raw === null) return [sourceId];
+  if (typeof raw === 'string') {
+    const values = raw.split(',').map(s => s.trim()).filter(Boolean);
+    return values.length > 0 ? values : [sourceId];
+  }
+  if (Array.isArray(raw)) {
+    if (!raw.every(v => typeof v === 'string')) {
+      throw new Error('federated_read must be an array of source ids');
+    }
+    const values = raw.map(v => v.trim()).filter(Boolean);
+    return values.length > 0 ? values : [sourceId];
+  }
+  throw new Error('federated_read must be a string or array');
+}
+
+export function normalizeAdminClientSourceScope(
+  rawSourceId: unknown,
+  rawFederatedRead: unknown,
+  availableSourceIds: string[],
+): AdminClientSourceScope {
+  const knownSources = new Set(availableSourceIds);
+  const fallbackSourceId = knownSources.has('default') ? 'default' : (availableSourceIds[0] ?? 'default');
+  const sourceId = rawSourceId === undefined || rawSourceId === null || rawSourceId === ''
+    ? fallbackSourceId
+    : rawSourceId;
+  if (!isValidSourceId(sourceId)) {
+    throw new Error(`Invalid source_id: ${JSON.stringify(sourceId)}`);
+  }
+  if (knownSources.size > 0 && !knownSources.has(sourceId)) {
+    throw new Error(`Unknown source_id: ${sourceId}`);
+  }
+
+  const federatedRead = Array.from(new Set(parseFederatedReadInput(rawFederatedRead, sourceId)));
+  for (const id of federatedRead) {
+    if (!isValidSourceId(id)) {
+      throw new Error(`Invalid federated_read source_id: ${JSON.stringify(id)}`);
+    }
+    if (knownSources.size > 0 && !knownSources.has(id)) {
+      throw new Error(`Unknown federated_read source_id: ${id}`);
+    }
+  }
+  return { sourceId, federatedRead };
+}
@@ -855,16 +855,8 @@ interface SyncPhaseResult extends PhaseResult {
 * Resolve the source id for a brain directory by looking up the sources
 * table. Returns undefined when no registered source matches (falls back
 * to pre-v0.18 global config.sync.* keys).
- *
- * Exported for dream.ts (#1869): a `gbrain dream --dir <path>` run whose
- * path matches a registered source's local_path is a per-source cycle in
- * everything but name, so dream derives the source id up front and passes
- * it as opts.sourceId — landing the freshness stamp without changing
- * runCycle's stamp/lock semantics for legacy global callers (the
- * autopilot-global-maintenance handler runs GLOBAL_PHASES with a brainDir
- * and MUST NOT stamp per-source freshness; see rejected PR #2549).
 */
-export async function resolveSourceForDir(
+async function resolveSourceForDir(
  engine: BrainEngine,
  brainDir: string | null,
 ): Promise<string | undefined> {
@@ -0,0 +1,44 @@
+import { describe, expect, test } from 'bun:test';
+import { normalizeAdminClientSourceScope } from '../src/core/admin-source-scope.ts';
+
+describe('admin register-client source scope normalization', () => {
+  const sources = ['default', 'team-a', 'team-b'];
+
+  test('defaults write and read scope to default source', () => {
+    expect(normalizeAdminClientSourceScope(undefined, undefined, sources)).toEqual({
+      sourceId: 'default',
+      federatedRead: ['default'],
+    });
+  });
+
+  test('accepts snake-case body fields with multiple read sources', () => {
+    expect(normalizeAdminClientSourceScope('team-a', ['team-a', 'team-b'], sources)).toEqual({
+      sourceId: 'team-a',
+      federatedRead: ['team-a', 'team-b'],
+    });
+  });
+
+  test('accepts comma-separated federated_read for API callers', () => {
+    expect(normalizeAdminClientSourceScope('team-a', 'team-b, default,team-b', sources)).toEqual({
+      sourceId: 'team-a',
+      federatedRead: ['team-b', 'default'],
+    });
+  });
+
+  test('falls back to selected write source when federated_read is empty', () => {
+    expect(normalizeAdminClientSourceScope('team-b', [], sources)).toEqual({
+      sourceId: 'team-b',
+      federatedRead: ['team-b'],
+    });
+  });
+
+  test('rejects malformed source ids before registration', () => {
+    expect(() => normalizeAdminClientSourceScope('../secret', undefined, sources)).toThrow(/Invalid source_id/);
+    expect(() => normalizeAdminClientSourceScope('team-a', ['snake_case'], sources)).toThrow(/Invalid federated_read/);
+  });
+
+  test('rejects valid-looking but unregistered source ids', () => {
+    expect(() => normalizeAdminClientSourceScope('ghost', undefined, sources)).toThrow(/Unknown source_id/);
+    expect(() => normalizeAdminClientSourceScope('team-a', ['ghost'], sources)).toThrow(/Unknown federated_read/);
+  });
+});
@@ -1,63 +0,0 @@
-/**
- * #1872 — autopilot SIGTERM/SIGINT must close the engine before exit.
- *
- * On PGLite the cycle steps run INLINE in the autopilot process, so a hard
- * `process.exit` mid-write (systemctl stop → SIGTERM) kills WASM Postgres
- * with the WAL dirty and can corrupt the brain. Two exit paths must both
- * close the engine:
- *
- *   - autopilot's own shutdown() (owns SIGINT + internal stops like
- *     max_crashes / cycle-failure-cap), and
- *   - process-cleanup's SIGTERM handler (installed at cli.ts module load,
- *     which exits within its 3s cleanup deadline) — reached via the
- *     registered 'autopilot-engine-close' cleanup callback.
- *
- * Because the shutdown path is deep inside `runAutopilot()` (a long-running
- * daemon loop that ends in process.exit), a behavioral test would have to
- * spawn + signal a real daemon. Following the established precedent
- * (test/autopilot-supervisor-wiring.test.ts, test/autopilot-fanout-wiring.test.ts),
- * these static-shape regressions pin the load-bearing wiring instead.
- */
-import { describe, expect, it } from 'bun:test';
-import { readFileSync } from 'fs';
-import { join } from 'path';
-
-const AUTOPILOT_SRC = readFileSync(
-  join(import.meta.dir, '..', 'src', 'commands', 'autopilot.ts'),
-  'utf8',
-);
-
-describe('autopilot.ts graceful engine shutdown (#1872)', () => {
-  it('registers an engine-close callback in the process-cleanup registry (SIGTERM path)', () => {
-    // process-cleanup owns SIGTERM (installed at cli.ts:10) and hard-exits
-    // after its cleanup pass; without this registration the engine is never
-    // closed on `systemctl stop`.
-    expect(AUTOPILOT_SRC).toContain(
-      "import { registerCleanup } from '../core/process-cleanup.ts';",
-    );
-    expect(AUTOPILOT_SRC).toContain(
-      "registerCleanup('autopilot-engine-close', closeEngine)",
-    );
-  });
-
-  it('closeEngine aborts the in-flight inline cycle then disconnects the engine', () => {
-    // Abort first (runCycle checks the signal between phases and threads it
-    // into phase sub-work), bounded drain, then disconnect.
-    expect(AUTOPILOT_SRC).toMatch(
-      /const closeEngine = async \(\) => \{[\s\S]{0,900}shutdownAbort\.abort\([\s\S]{0,900}engine\.disconnect\(\)/,
-    );
-  });
-
-  it('the inline runCycle call carries the shutdown abort signal and is tracked as in-flight', () => {
-    // PGLite / --inline path: the cycle runs in-process, so shutdown must be
-    // able to (a) signal it to wind down and (b) await it before closing.
-    expect(AUTOPILOT_SRC).toMatch(/signal:\s*shutdownAbort\.signal/);
-    expect(AUTOPILOT_SRC).toMatch(/inflightInlineCycle\s*=\s*cyclePromise/);
-  });
-
-  it('shutdown() awaits closeEngine() before process.exit(0) (SIGINT + internal-stop path)', () => {
-    expect(AUTOPILOT_SRC).toMatch(
-      /await closeEngine\(\);[\s\S]{0,400}process\.exit\(0\)/,
-    );
-  });
-});
@@ -1,99 +0,0 @@
-/**
- * #1869 — `gbrain dream --dir <path>` stamps cycle freshness when the path
- * matches a registered source's local_path.
- *
- * Pre-fix, only `--source <id>` runs wrote last_source_cycle_at /
- * last_full_cycle_at (runCycle's stamp gate reads opts.sourceId, and dream
- * never derived one from --dir), so a path-scoped brain showed doctor's
- * cycle_freshness as perpetually stale.
- *
- * The fix lives in dream.ts (derive the source id from the resolved brain
- * dir via resolveSourceForDir), NOT in runCycle's stamp gate — a runCycle-
- * wide change would make the autopilot-global-maintenance handler (global
- * phases, brainDir set, no sourceId) falsely stamp per-source freshness
- * (the #2194 poisoning class; see rejected PR #2549).
- *
- * Same real-PGLite/no-mocks discipline as test/dream.test.ts; same
- * GBRAIN_HOME isolation as test/cycle-last-full-cycle-at.test.ts (the
- * cycle's PGLite file lock lives under ~/.gbrain).
- */
-import { describe, test, expect, beforeAll, afterAll, beforeEach, afterEach } from 'bun:test';
-import { mkdtempSync, rmSync } from 'fs';
-import { join } from 'path';
-import { tmpdir } from 'os';
-import { PGLiteEngine } from '../src/core/pglite-engine.ts';
-import { resetPgliteState } from './helpers/reset-pglite.ts';
-import { runDream } from '../src/commands/dream.ts';
-import { withEnv } from './helpers/with-env.ts';
-
-let engine: PGLiteEngine;
-let brainDir: string;
-let gbrainHome: string;
-
-beforeAll(async () => {
-  engine = new PGLiteEngine();
-  await engine.connect({});
-  await engine.initSchema();
-}, 60_000);
-
-afterAll(async () => {
-  await engine.disconnect();
-});
-
-beforeEach(async () => {
-  await resetPgliteState(engine);
-  brainDir = mkdtempSync(join(tmpdir(), 'gbrain-dream-stamp-'));
-  gbrainHome = mkdtempSync(join(tmpdir(), 'gbrain-dream-stamp-home-'));
-}, 60_000);
-
-afterEach(() => {
-  rmSync(brainDir, { recursive: true, force: true });
-  rmSync(gbrainHome, { recursive: true, force: true });
-});
-
-async function seedSource(id: string, archived = false): Promise<void> {
-  await engine.executeRaw(
-    `INSERT INTO sources (id, name, local_path, config, archived, created_at)
-     VALUES ($1, $2, $3, '{}'::jsonb, $4, NOW())`,
-    [id, id, brainDir, archived],
-  );
-}
-
-async function readLastFullCycleAt(sourceId: string): Promise<string | null> {
-  const rows = await engine.executeRaw<{ config: Record<string, unknown> | null }>(
-    `SELECT config FROM sources WHERE id = $1`,
-    [sourceId],
-  );
-  const raw = rows[0]?.config?.last_full_cycle_at;
-  return typeof raw === 'string' ? raw : null;
-}
-
-describe('gbrain dream --dir <path> freshness stamp (#1869)', () => {
-  test('--dir matching a source local_path stamps last_full_cycle_at', async () => {
-    await withEnv({ GBRAIN_HOME: gbrainHome }, async () => {
-      await seedSource('path-scoped');
-      expect(await readLastFullCycleAt('path-scoped')).toBeNull();
-
-      const report = await runDream(engine, ['--dir', brainDir, '--phase', 'lint', '--json']);
-      expect(report).toBeTruthy();
-      if (report) expect(['ok', 'clean']).toContain(report.status);
-
-      // Pre-fix this stays null forever: dream never passed a sourceId, so
-      // runCycle's stamp gate skipped the write.
-      expect(await readLastFullCycleAt('path-scoped')).not.toBeNull();
-    });
-  }, 60_000);
-
-  test('--dir matching an ARCHIVED source does not stamp it', async () => {
-    await withEnv({ GBRAIN_HOME: gbrainHome }, async () => {
-      await seedSource('mothballed', true);
-
-      const report = await runDream(engine, ['--dir', brainDir, '--phase', 'lint', '--json']);
-      expect(report).toBeTruthy();
-
-      // Stamping an archived source would mask data staleness when it is
-      // later restored (mirrors the explicit --source archived guard).
-      expect(await readLastFullCycleAt('mothballed')).toBeNull();
-    });
-  }, 60_000);
-});
@@ -562,22 +562,12 @@ describe('runDream — --source / --source-id (v0.41.13)', () => {

  // ─── Back-compat: bare `gbrain dream` does NOT write per-source stamp ─

-  test('gbrain dream (no --source) stamps only the source whose local_path matches --dir (#1869)', async () => {
-    // Pre-#1869 this asserted NO source was ever stamped without an explicit
-    // --source — which is exactly the bug: a path-scoped `gbrain dream --dir`
-    // run never landed a freshness stamp and doctor's cycle_freshness stayed
-    // stale forever. New truth: the source whose local_path matches the
-    // resolved brain dir is derived and stamped; unrelated sources stay
-    // untouched (cross-source isolation).
-    await seedSource('alpha'); // local_path = repo → derived + stamped
-    await engine.executeRaw(
-      `INSERT INTO sources (id, name, local_path, config, archived, created_at)
-       VALUES ($1, $2, $3, '{}'::jsonb, false, NOW())`,
-      ['beta', 'beta', '/somewhere/else'],
-    );
+  test('gbrain dream (no --source) leaves all sources untouched (back-compat regression)', async () => {
+    await seedSource('alpha');
+    await seedSource('beta');
    const report = await runDream(engine, ['--dir', repo, '--phase', 'lint', '--json']);
    expect(report).toBeTruthy();
-    expect(await readLastFullCycleAt('alpha')).not.toBeNull();
+    expect(await readLastFullCycleAt('alpha')).toBeNull();
    expect(await readLastFullCycleAt('beta')).toBeNull();
  }, 60_000);

@@ -78,6 +78,8 @@ describe('v0.36.1.x #1077 — admin register-client supports PKCE public clients
    // (under either name) from req.body. Pin the fallback pattern so the
    // PKCE-fix regression contract stays load-bearing.
    expect(src).toMatch(/req\.body[^;]*scopes\s*\?\?\s*[^;]*scope\b/);
+    expect(src).toMatch(/req\.body[^;]*source_id\s*\?\?\s*[^;]*sourceId\b/);
+    expect(src).toMatch(/req\.body[^;]*federated_read\s*\?\?\s*[^;]*federatedRead\b/);
    // v0.41.3 (T4 atomicity fix, codex F4): admin endpoint now validates
    // tokenEndpointAuthMethod via the shared validator and passes it to
    // registerClientManual as a positional arg. Pre-v0.41.3 the route did
@@ -87,6 +89,7 @@ describe('v0.36.1.x #1077 — admin register-client supports PKCE public clients
    // UPDATE block (the regex deliberately asserts the post-insert UPDATE
    // is GONE).
    expect(src).toMatch(/validateTokenEndpointAuthMethod\(tokenEndpointAuthMethod\)/);
+    expect(src).toMatch(/normalizeAdminClientSourceScope\(/);
    expect(src).toMatch(/registerClientManual\([^)]*validatedAuthMethod[^)]*\)/);
    // Regression guard: post-insert UPDATE flipping client_secret_hash to
    // NULL based on a runtime check is exactly the non-atomic pattern T4
@@ -267,3 +270,26 @@ describe('v0.42.43.0 #2095 — volunteer-events sink + cycle purge wiring (struc
    expect(src).toMatch(/purged_volunteer_events_count/);
  });
 });
+
+describe('#1490 + #1036 — admin Register Agent form exposes source scope + redirect URIs', () => {
+  test('Agents.tsx RegisterModal sends source_id + federated_read in the POST body (#1490)', () => {
+    const src = readFileSync('admin/src/pages/Agents.tsx', 'utf8');
+    expect(src).toMatch(/source_id:\s*sourceId/);
+    expect(src).toMatch(/federated_read:\s*federatedRead/);
+    // The source list comes from the requireAdmin-gated endpoint, not a hardcoded 'default'.
+    expect(src).toMatch(/api\.sources\(\)/);
+  });
+
+  test('serve-http.ts serves /admin/api/sources behind requireAdmin (#1490)', () => {
+    const src = readFileSync('src/commands/serve-http.ts', 'utf8');
+    expect(src).toMatch(/app\.get\('\/admin\/api\/sources',\s*requireAdmin/);
+  });
+
+  test('Agents.tsx RegisterModal sends redirectUris + authorization_code grants when URIs are entered (#1036)', () => {
+    const src = readFileSync('admin/src/pages/Agents.tsx', 'utf8');
+    // One-per-line textarea split into an array...
+    expect(src).toMatch(/redirectUris\.split\('\\n'\)/);
+    // ...included in the body with the CLI's grant-type inference convention.
+    expect(src).toMatch(/redirectUris:\s*uris,\s*grantTypes:\s*\['authorization_code',\s*'refresh_token'\]/);
+  });
+});
@@ -125,6 +125,30 @@ describe('client registration', () => {
    expect(client!.client_name).toBe('test-agent');
  });

+  test('registerClientManual persists source_id and federated_read into AuthInfo', async () => {
+    await sql`
+      INSERT INTO sources (id, name) VALUES (${'team-a'}, ${'Team A'}), (${'team-b'}, ${'Team B'})
+      ON CONFLICT DO NOTHING
+    `;
+    const { clientId, clientSecret } = await provider.registerClientManual(
+      'source-scoped-test',
+      ['client_credentials'],
+      'read write',
+      [],
+      'team-a',
+      ['team-a', 'team-b'],
+    );
+
+    const tokens = await provider.exchangeClientCredentials(clientId, clientSecret!, 'read');
+    const authInfo = await provider.verifyAccessToken(tokens.access_token) as {
+      sourceId?: string;
+      allowedSources?: string[];
+    };
+
+    expect(authInfo.sourceId).toBe('team-a');
+    expect(authInfo.allowedSources).toEqual(['team-a', 'team-b']);
+  });
+
  test('getClient returns undefined for unknown client', async () => {
    const client = await provider.clientsStore.getClient('nonexistent');
    expect(client).toBeUndefined();