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-17 02:12:40 +00:00 · 2026-07-21 15:09:32 -07:00
18 changed files with 332 additions and 367 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" },
 };
@@ -433,10 +433,7 @@ export async function extractLinksFromFile(
      async resolve(name: string, dirHint?: string | string[]): Promise<string | null> {
        if (!name) return null;
        const trimmed = name.trim();
-        // Same broadened slug-shape as makeResolver step 1: accepts
-        // digit-leading folders (`90-people/nicolai`) and nested paths.
-        // Exact Set membership guards it — no false positives.
-        if (/\//.test(trimmed) && /^[a-z0-9][a-z0-9/_-]*$/.test(trimmed) && allSlugs.has(trimmed)) {
+        if (/^[a-z][a-z0-9-]*\/[a-z0-9][a-z0-9-]*$/.test(trimmed) && allSlugs.has(trimmed)) {
          return trimmed;
        }
        const hints = Array.isArray(dirHint) ? dirHint : (dirHint ? [dirHint] : []);
@@ -585,17 +582,6 @@ export interface ExtractOpts {
   * before (single-'default'-source brains unaffected).
   */
  sourceId?: string;
-  /**
-   * v0.42 — also extract frontmatter links on the incremental (slugs) path.
-   * `extractForSlugs` extracts BODY links only by default; set this true to also
-   * parse each changed page's frontmatter so `sources:`/`related:` edges stay fresh
-   * when YAML is edited externally and synced in. Applied PER changed page, so the
-   * incremental walk stays bounded (no switch to a full DB scan). Only honored on
-   * the incremental path (`slugs` defined); the full-walk path already covers
-   * frontmatter via its own dispatch. Gated upstream by the config key
-   * `autopilot.incremental_extract_include_frontmatter` (default off).
-   */
-  includeFrontmatter?: boolean;
 }

 /**
@@ -634,7 +620,7 @@ export async function runExtractCore(engine: BrainEngine, opts: ExtractOpts): Pr
      // Nothing changed — skip entirely.
      return result;
    }
-    const r = await extractForSlugs(engine, opts.dir, opts.slugs, opts.mode, dryRun, jsonMode, workers, opts.signal, opts.sourceId, opts.includeFrontmatter);
+    const r = await extractForSlugs(engine, opts.dir, opts.slugs, opts.mode, dryRun, jsonMode, workers, opts.signal, opts.sourceId);
    result.links_created = r.links_created;
    result.timeline_entries_created = r.timeline_created;
    result.pages_processed = r.pages;
@@ -1025,11 +1011,6 @@ async function extractForSlugs(
  signal?: AbortSignal,
  // #1747/#1503: stamp resolved brain source id on batch rows (see ExtractOpts.sourceId).
  sourceId?: string,
-  // v0.42: when true, also extract frontmatter links per changed page so
-  // externally-edited YAML (`sources:`/`related:`) stays fresh on the cycle.
-  // Default false preserves the body-only incremental behavior. Gated upstream
-  // by `autopilot.incremental_extract_include_frontmatter`.
-  includeFrontmatter: boolean = false,
 ): Promise<{ links_created: number; timeline_created: number; pages: number }> {
  // Build the full slug set for link resolution (fast: just readdir, no file reads)
  const allFiles = walkMarkdownFiles(brainDir);
@@ -1104,7 +1085,7 @@ async function extractForSlugs(
        const content = readFileSync(fullPath, 'utf-8');

        if (doLinks) {
-          const links = await extractLinksFromFile(content, relPath, allSlugs, { globalBasename, includeFrontmatter });
+          const links = await extractLinksFromFile(content, relPath, allSlugs, { globalBasename });
          for (const link of links) {
            if (dryRun) {
              if (!jsonMode) console.log(`  ${link.from_slug} → ${link.to_slug} (${link.link_type})`);
@@ -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 };
+}
@@ -121,18 +121,6 @@ export interface GBrainConfig {
      /** Daily spend cap (USD); bounds drains/day = floor(cap / ~$0.30). Default 2.0. */
      max_usd_per_day?: number;
    };
-    /**
-     * v0.42 — keep frontmatter links fresh on the incremental cycle. The cycle's
-     * extract phase re-extracts only the slugs a sync changed, but `extractForSlugs`
-     * extracts BODY links only — frontmatter (`sources:`/`related:` etc.) link edges
-     * silently drift stale when a page's YAML is edited externally and synced in.
-     * Set true to also extract frontmatter links per changed page each cycle, keeping
-     * externally-edited YAML edges fresh without a full rescan. Default false
-     * (preserves current behavior). Read via the file/env/DB plane in the cycle's
-     * extract dispatch. Disable/enable with
-     * `gbrain config set autopilot.incremental_extract_include_frontmatter <bool>`.
-     */
-    incremental_extract_include_frontmatter?: boolean;
  };
  eval?: {
    /** false disables capture entirely. Defaults to true. */
@@ -996,21 +996,6 @@ async function runPhaseExtract(
 ): Promise<PhaseResult> {
  try {
    const { runExtractCore } = await import('../commands/extract.ts');
-    const { loadConfig } = await import('./config.ts');
-    // Default off: the incremental cycle extracts body links only unless the
-    // operator opts in to keeping externally-edited frontmatter links fresh too.
-    // Both planes, file wins (env > file > DB precedence, per loadConfigWithEngine):
-    // `gbrain config set autopilot.incremental_extract_include_frontmatter true`
-    // writes the DB plane (engine.setConfig), so a file-plane-only read here
-    // would make the documented enable command a silent no-op (#2120 class).
-    const fileVal = loadConfig()?.autopilot?.incremental_extract_include_frontmatter;
-    let includeFrontmatter = fileVal === true;
-    if (fileVal === undefined) {
-      try {
-        includeFrontmatter =
-          (await engine.getConfig('autopilot.incremental_extract_include_frontmatter')) === 'true';
-      } catch { /* config table unreadable → default off */ }
-    }
    // Extract is read-mostly against the filesystem + write to links table.
    // Honor dryRun by skipping with a 'skipped' entry: extract doesn't have
    // a clean dry-run mode today and runCycle should be honest about it.
@@ -1031,7 +1016,6 @@ async function runPhaseExtract(
      slugs: changedSlugs,  // undefined = full walk (first run / manual)
      signal,
      sourceId,
-      includeFrontmatter,  // honored on the incremental (slugs) path only
    });
    const linksCreated = result?.links_created ?? 0;
    const timelineCreated = result?.timeline_entries_created ?? 0;
@@ -942,17 +942,8 @@ export function makeResolver(

      const hints = Array.isArray(dirHint) ? dirHint : (dirHint ? [dirHint] : []);

-      // Step 1: already a slug? Try an exact page lookup for any slug-shaped
-      // value (contains '/', slug charset). Broadened beyond the original
-      // single-segment lowercase-leading form (`^[a-z][a-z0-9-]*\/[a-z0-9]...`)
-      // to also accept digit-leading folders (`90-people/nicolai`,
-      // `01-trading/...`) and nested paths (`a/b/c`) — common in PARA-numbered
-      // vaults. This is an EXACT getPage match only — no fuzzy — so it never
-      // produces a false positive; a non-existent slug just falls through to
-      // the steps below. Fixes frontmatter `related: [[dir/slug]]` values
-      // (unwrapped by unwrapWikilink) that name a real page the strict regex
-      // could not reach and whose full-path fuzzy score is below threshold.
-      if (/\//.test(trimmed) && /^[a-z0-9][a-z0-9/_-]*$/.test(trimmed)) {
+      // Step 1: already a slug? (dir/name shape, lowercase, hyphenated)
+      if (/^[a-z][a-z0-9-]*\/[a-z0-9][a-z0-9-]*$/.test(trimmed)) {
        const page = await engine.getPage(trimmed);
        if (page) {
          cache.set(cacheKey, trimmed);
@@ -1012,25 +1003,6 @@ export function makeResolver(

 // ─── Frontmatter extractor ──────────────────────────────────────

-/**
- * Unwrap an Obsidian `[[wikilink]]` frontmatter value to its bare link
- * target so the resolver (which expects bare titles / dir slugs) can match
- * it. Mainstream Obsidian authors frontmatter links as `related: ["[[Page]]"]`;
- * without this, the resolver treats the brackets as part of the value and a
- * `[[90-people/nicolai]]` is normalized into `90peoplenicolai`, so it never
- * resolves. Strips a trailing `|alias`, `#heading`, or `^block` suffix — the
- * link target only. The regex is anchored to a wholly-wrapped value
- * (`^\s*\[\[…\]\]\s*$`), so bare titles and any value not fully wrapped pass
- * through unchanged and existing behavior is preserved exactly.
- */
-export function unwrapWikilink(value: string): string {
-  const match = /^\s*\[\[(.+?)\]\]\s*$/.exec(value);
-  if (!match) return value;
-  // Take the link target: drop |alias, then #heading / ^block suffixes.
-  const target = match[1].split('|')[0].split('#')[0].split('^')[0];
-  return target.trim();
-}
-
 export interface UnresolvedFrontmatterRef {
  /** The frontmatter field name. */
  field: string;
@@ -1088,12 +1060,7 @@ export async function extractFrontmatterLinks(
        }
        if (!name) continue;   // skip numbers, nulls, malformed objects

-        // Accept Obsidian `[[wikilink]]` values in frontmatter link fields by
-        // unwrapping to the bare target before resolution. Bare titles pass
-        // through unchanged; the original `name` is preserved for the
-        // unresolved report and edge context.
-        const linkTarget = unwrapWikilink(name);
-        const resolved = await resolver.resolve(linkTarget, mapping.dirHint);
+        const resolved = await resolver.resolve(name, mapping.dirHint);
        if (!resolved) {
          unresolved.push({ field, name });
          continue;
@@ -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/);
+  });
+});
@@ -191,37 +191,3 @@ describe('runExtractCore — incremental cycle path (#417)', () => {
    expect(result.links_created).toBeGreaterThan(0);
  });
 });
-describe('runExtractCore — incremental frontmatter gate (includeFrontmatter)', () => {
-  // alice has a `source:` frontmatter edge but NO body links. The incremental
-  // path extracts body links only by default, so the frontmatter edge is the
-  // sole signal that distinguishes the gate off vs on.
-  const aliceFm = '---\nsource: companies/acme-example\n---\n# alice';
-
-  test('9. default (flag omitted) does NOT extract frontmatter links on the incremental path', async () => {
-    await seedPage('companies/acme-example', '# acme');
-    await seedPage('people/alice-example', aliceFm);
-    const result = await runExtractCore(engine as unknown as BrainEngine, {
-      mode: 'all',
-      dir: tempDir,
-      slugs: ['people/alice-example'],
-    });
-    // alice's only potential edge is her frontmatter `source:`; with the gate off
-    // it must not be extracted (preserves the body-only incremental behavior).
-    expect(result.pages_processed).toBe(1);
-    expect(result.links_created).toBe(0);
-  });
-
-  test('10. includeFrontmatter: true extracts the frontmatter link on the incremental path', async () => {
-    await seedPage('companies/acme-example', '# acme');
-    await seedPage('people/alice-example', aliceFm);
-    const result = await runExtractCore(engine as unknown as BrainEngine, {
-      mode: 'all',
-      dir: tempDir,
-      slugs: ['people/alice-example'],
-      includeFrontmatter: true,
-    });
-    // Same page, gate on → the `source:` frontmatter edge is now extracted.
-    expect(result.pages_processed).toBe(1);
-    expect(result.links_created).toBeGreaterThan(0);
-  });
-});
@@ -76,18 +76,6 @@ describe('extractLinksFromFile', () => {
    }
  });

-  it('resolves wrapped [[wikilink]] digit-leading slug-path in frontmatter (fs resolver, broadened step 1)', async () => {
-    // Same bug class as makeResolver step 1 (#1983): the fs resolver's strict
-    // `^[a-z]…` slug regex rejected digit-leading / nested paths, so a PARA-vault
-    // `related: "[[90-people/nicolai]]"` never resolved even though the page exists.
-    const content = '---\nrelated: "[[90-people/nicolai]]"\ntype: concept\n---\nContent.';
-    const allSlugs = new Set(['wiki/note', '90-people/nicolai']);
-    const links = await extractLinksFromFile(content, 'wiki/note.md', allSlugs, { includeFrontmatter: true });
-    const related = links.filter(l => l.link_type === 'related_to');
-    expect(related).toHaveLength(1);
-    expect(related[0].to_slug).toBe('90-people/nicolai');
-  });
-
  it('frontmatter extraction is default OFF (back-compat)', async () => {
    // Without includeFrontmatter, fs-source no longer auto-extracts frontmatter.
    // Matches db-source behavior. User opts in with --include-frontmatter flag.
@@ -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'\]/);
+  });
+});
@@ -9,7 +9,6 @@ import {
  parseTimelineEntries,
  isAutoLinkEnabled,
  FRONTMATTER_LINK_MAP,
-  unwrapWikilink,
  type SlugResolver,
 } from '../src/core/link-extraction.ts';
 import type { BrainEngine } from '../src/core/engine.ts';
@@ -1292,175 +1291,3 @@ describe('parseTimelineEntries — Format 3: inline [Source: ..., YYYY-MM-DD] ci
    expect(parseTimelineEntries('[Source: import batch, 2025-07-01]')).toHaveLength(0);
  });
 });
-// ─── Frontmatter [[wikilink]] + slug-path resolution ──────────────────────
-// Mainstream Obsidian authors frontmatter links as `related: ["[[Page]]"]`,
-// and PARA-numbered vaults use digit-leading / nested slug paths like
-// `[[90-people/nicolai]]`. Both were silently dropped: brackets were treated
-// as part of the value and the step-1 slug regex (`^[a-z]…`) rejected
-// digit-leading / nested paths, while full-path fuzzy scored below threshold.
-// Fix: unwrapWikilink() before resolution + an exact getPage() for any
-// slug-shaped value (exact-match only → no false positives).
-
-describe('unwrapWikilink', () => {
-  test('wrapped title → bare title', () => {
-    expect(unwrapWikilink('[[Monday Range]]')).toBe('Monday Range');
-  });
-  test('wrapped slug-path (digit-leading folder) → bare slug', () => {
-    expect(unwrapWikilink('[[90-people/nicolai]]')).toBe('90-people/nicolai');
-  });
-  test('wrapped nested slug-path → bare slug', () => {
-    expect(unwrapWikilink('[[01-trading/wiki/strategies/opening-range-breakout]]'))
-      .toBe('01-trading/wiki/strategies/opening-range-breakout');
-  });
-  test('strips |alias', () => {
-    expect(unwrapWikilink('[[90-people/nicolai|Nicolai]]')).toBe('90-people/nicolai');
-  });
-  test('strips #heading', () => {
-    expect(unwrapWikilink('[[Page#Section]]')).toBe('Page');
-  });
-  test('strips ^block', () => {
-    expect(unwrapWikilink('[[Page^abc123]]')).toBe('Page');
-  });
-  test('surrounding whitespace tolerated', () => {
-    expect(unwrapWikilink('  [[Page]]  ')).toBe('Page');
-  });
-  test('bare title passes through unchanged', () => {
-    expect(unwrapWikilink('Monday Range')).toBe('Monday Range');
-  });
-  test('bare slug passes through unchanged', () => {
-    expect(unwrapWikilink('90-people/nicolai')).toBe('90-people/nicolai');
-  });
-  test('partially-wrapped value is NOT unwrapped (anchored)', () => {
-    // Not a wholly-wrapped value → left intact so existing behavior is exact.
-    expect(unwrapWikilink('see [[Page]] for detail')).toBe('see [[Page]] for detail');
-  });
-});
-
-describe('makeResolver — slug-path exact getPage (step 1 broadened)', () => {
-  function fakeEngine(
-    slugs: string[],
-    fuzzyMap: Map<string, { slug: string; similarity: number }> = new Map(),
-  ): BrainEngine {
-    const lookup = new Set(slugs);
-    return {
-      async getPage(slug: string) { return lookup.has(slug) ? { slug } as any : null; },
-      async findByTitleFuzzy(name: string) { return fuzzyMap.get(name) ?? null; },
-      async searchKeyword() { return []; },
-    } as unknown as BrainEngine;
-  }
-
-  test('digit-leading folder slug resolves via exact getPage', async () => {
-    const r = makeResolver(fakeEngine(['90-people/nicolai']));
-    expect(await r.resolve('90-people/nicolai')).toBe('90-people/nicolai');
-  });
-
-  test('nested (>2 segment) slug resolves via exact getPage', async () => {
-    const r = makeResolver(fakeEngine(['01-trading/wiki/strategies/opening-range-breakout']));
-    expect(await r.resolve('01-trading/wiki/strategies/opening-range-breakout'))
-      .toBe('01-trading/wiki/strategies/opening-range-breakout');
-  });
-
-  test('regression: single-segment lowercase slug still resolves', async () => {
-    const r = makeResolver(fakeEngine(['people/pedro']));
-    expect(await r.resolve('people/pedro')).toBe('people/pedro');
-  });
-
-  test('exact-only: slug-shaped value with no matching page falls through (no false positive)', async () => {
-    // `90-people/ghost` is slug-shaped but absent → step-1 getPage misses,
-    // no fuzzy hit → null. Never invents an edge.
-    const r = makeResolver(fakeEngine(['90-people/nicolai']));
-    expect(await r.resolve('90-people/ghost')).toBeNull();
-  });
-
-  test('non-slug value still routes to fuzzy', async () => {
-    const r = makeResolver(fakeEngine(
-      ['01-trading/monday-range'],
-      new Map([['Monday Range', { slug: '01-trading/monday-range', similarity: 1 }]]),
-    ));
-    expect(await r.resolve('Monday Range')).toBe('01-trading/monday-range');
-  });
-});
-
-describe('extractFrontmatterLinks — [[wikilink]] related: values (end-to-end)', () => {
-  function fakeEngine(
-    slugs: string[],
-    fuzzyMap: Map<string, { slug: string; similarity: number }> = new Map(),
-  ): BrainEngine {
-    const lookup = new Set(slugs);
-    return {
-      async getPage(slug: string) { return lookup.has(slug) ? { slug } as any : null; },
-      async findByTitleFuzzy(name: string) { return fuzzyMap.get(name) ?? null; },
-      async searchKeyword() { return []; },
-    } as unknown as BrainEngine;
-  }
-
-  test('wrapped slug-path related: resolves (the core win)', async () => {
-    const resolver = makeResolver(fakeEngine(['90-people/nicolai']));
-    const { candidates, unresolved } = await extractFrontmatterLinks(
-      'wiki/originals/ideas/note', 'note' as never,
-      { related: '[[90-people/nicolai]]' }, resolver,
-    );
-    expect(unresolved).toHaveLength(0);
-    expect(candidates).toHaveLength(1);
-    expect(candidates[0]).toMatchObject({
-      fromSlug: 'wiki/originals/ideas/note',
-      targetSlug: '90-people/nicolai',
-      linkType: 'related_to',
-      linkSource: 'frontmatter',
-    });
-  });
-
-  test('wrapped nested slug-path related: resolves', async () => {
-    const resolver = makeResolver(fakeEngine(['01-trading/wiki/strategies/opening-range-breakout']));
-    const { candidates } = await extractFrontmatterLinks(
-      'wiki/note', 'note' as never,
-      { related: ['[[01-trading/wiki/strategies/opening-range-breakout]]'] }, resolver,
-    );
-    expect(candidates).toHaveLength(1);
-    expect(candidates[0].targetSlug).toBe('01-trading/wiki/strategies/opening-range-breakout');
-  });
-
-  test('wrapped value with |alias resolves to the target', async () => {
-    const resolver = makeResolver(fakeEngine(['90-people/nicolai']));
-    const { candidates } = await extractFrontmatterLinks(
-      'wiki/note', 'note' as never,
-      { related: '[[90-people/nicolai|Nicolai]]' }, resolver,
-    );
-    expect(candidates).toHaveLength(1);
-    expect(candidates[0].targetSlug).toBe('90-people/nicolai');
-  });
-
-  test('regression: bare slug related: still resolves', async () => {
-    const resolver = makeResolver(fakeEngine(['90-people/nicolai']));
-    const { candidates } = await extractFrontmatterLinks(
-      'wiki/note', 'note' as never,
-      { related: '90-people/nicolai' }, resolver,
-    );
-    expect(candidates).toHaveLength(1);
-    expect(candidates[0].targetSlug).toBe('90-people/nicolai');
-  });
-
-  test('regression: wrapped title resolves via fuzzy (brackets harmless)', async () => {
-    const resolver = makeResolver(fakeEngine(
-      ['01-trading/monday-range'],
-      new Map([['Monday Range', { slug: '01-trading/monday-range', similarity: 1 }]]),
-    ));
-    const { candidates } = await extractFrontmatterLinks(
-      'wiki/note', 'note' as never,
-      { related: '[[Monday Range]]' }, resolver,
-    );
-    expect(candidates).toHaveLength(1);
-    expect(candidates[0].targetSlug).toBe('01-trading/monday-range');
-  });
-
-  test('unknown wrapped slug → unresolved (no crash), original value preserved', async () => {
-    const resolver = makeResolver(fakeEngine(['90-people/nicolai']));
-    const { candidates, unresolved } = await extractFrontmatterLinks(
-      'wiki/note', 'note' as never,
-      { related: '[[99-archive/does-not-exist]]' }, resolver,
-    );
-    expect(candidates).toHaveLength(0);
-    expect(unresolved).toHaveLength(1);
-    expect(unresolved[0]).toEqual({ field: 'related', name: '[[99-archive/does-not-exist]]' });
-  });
-});
@@ -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();