fix(webhook): extract links for incremental push syncs (#2849)

GitHub webhook + sync-trigger 'sync' jobs never opted into extraction:
the standalone sync handler defaults noExtract to TRUE, so webhook-
imported pages advanced the source bookmark with links_extracted_at
unstamped — and nothing behind a standalone job ever swept them (the
autopilot cycle's extract phase only walks that cycle's changedSlugs).

Fix, both halves of the issue:
- webhook + sync-trigger payloads pass noExtract:false so normal
  incremental pushes get sync's inline link/timeline extraction.
- >100-file deferral branch: performSync surfaces extractDeferred, and
  the sync job handler queues a source-scoped extract{stale:true}
  follow-up job (idempotent sweep; extract handler gains a stale mode
  backed by the same extractStaleFromDB core as `gbrain extract --stale`).

Tests: new sync-large-deferral-extract.serial.test.ts drives a real
101-file incremental sync end-to-end (deferral flag → queued follow-up →
stale sweep recovers links + watermark); webhook payload contract test +
sync-trigger noExtract assertion salvaged from #2850.

Fixes #2849
Takeover of #2850

Co-authored-by: patentsong <patentsong@users.noreply.github.com>
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

src/commands/doctor.ts

@@ -820,10 +820,6 @@ export async function doctorReportRemote(engine: BrainEngine): Promise<DoctorRep
   // v0.42.x (#1794, 4A): pool-budget nudge when GBRAIN_MAX_CONNECTIONS is set.
   checks.push(await checkPoolBudget(engine));
 
-  // #2552: warn when an explicit embed-concurrency override fans out against
-  // a local single-slot embedding endpoint (silent backfill starvation).
-  checks.push(await checkEmbedConcurrency());
-
   // v0.42.7 (#1696): link-extraction lag. Strictly SQL (single indexed COUNT),
   // safe on the thin-client/remote path — remote operators on checkout-less
   // Postgres brains are exactly who can't otherwise see the extraction backlog.
@@ -3819,61 +3815,6 @@ export function computePoolBudgetCheck(
   };
 }
 
-/**
- * #2552: warn when an explicit GBRAIN_EMBED_CONCURRENCY override fans out
- * against a local single-slot embedding endpoint (Ollama / llama-server /
- * localhost base URL). Requests serialize on the one loaded model, so N
- * parallel pages multiply latency xN and can exceed the fetch timeout with
- * no surfaced error — the backfill silently starves. (When the env var is
- * unset, embed auto-caps at LOCAL_EMBED_CONCURRENCY_CAP and this check
- * reports ok.) Pure; exported for tests.
- */
-export function computeEmbedConcurrencyCheck(
-  isLocalEndpoint: boolean,
-  envValue: string | undefined,
-  localCap: number,
-): Check {
-  const name = 'embed_concurrency';
-  if (!isLocalEndpoint) {
-    return { name, status: 'ok', message: 'Embedding endpoint is not a local inference server — cloud concurrency defaults apply.' };
-  }
-  const parsed = envValue ? parseInt(envValue, 10) : NaN;
-  if (envValue && Number.isFinite(parsed) && parsed > localCap) {
-    return {
-      name,
-      status: 'warn',
-      message:
-        `GBRAIN_EMBED_CONCURRENCY=${parsed} against a local embedding endpoint. ` +
-        `Local inference servers serialize requests, so ${parsed} parallel pages multiply ` +
-        `latency x${parsed} and can exceed the fetch timeout — the embed backfill stalls ` +
-        `with no error. Unset GBRAIN_EMBED_CONCURRENCY (auto-caps at ${localCap}) or set it <= ${localCap}.`,
-    };
-  }
-  return {
-    name,
-    status: 'ok',
-    message: `Local embedding endpoint detected; embed concurrency capped at ${envValue ? parsed : localCap}.`,
-  };
-}
-
-/** Thin gateway/env wrapper over `computeEmbedConcurrencyCheck`. */
-export async function checkEmbedConcurrency(): Promise<Check> {
-  try {
-    const { isLocalEmbeddingEndpoint, LOCAL_EMBED_CONCURRENCY_CAP } = await import('../core/ai/gateway.ts');
-    return computeEmbedConcurrencyCheck(
-      isLocalEmbeddingEndpoint(),
-      process.env.GBRAIN_EMBED_CONCURRENCY,
-      LOCAL_EMBED_CONCURRENCY_CAP,
-    );
-  } catch (err) {
-    return {
-      name: 'embed_concurrency',
-      status: 'ok',
-      message: `Skipped (${err instanceof Error ? err.message : String(err)})`,
-    };
-  }
-}
-
 /** Thin env/engine wrapper over `computePoolBudgetCheck`. */
 export async function checkPoolBudget(_engine: BrainEngine): Promise<Check> {
   try {

src/commands/embed.ts

@@ -1,6 +1,5 @@
 import type { BrainEngine } from '../core/engine.ts';
 import { embedBatch, currentEmbeddingSignature } from '../core/embedding.ts';
-import { isLocalEmbeddingEndpoint, LOCAL_EMBED_CONCURRENCY_CAP } from '../core/ai/gateway.ts';
 import type { ChunkInput } from '../core/types.ts';
 import { chunkText } from '../core/chunkers/recursive.ts';
 import { createProgress, type ProgressReporter } from '../core/progress.ts';
@@ -177,31 +176,6 @@ export class EmbeddingDimMismatchError extends Error {
   }
 }
 
-/**
- * #2552: resolve the bulk-embed worker count. Env override or the
- * cloud-tuned default of 20 — but when the operator did NOT set
- * GBRAIN_EMBED_CONCURRENCY and the embedding endpoint is a local inference
- * server (Ollama / llama-server / localhost base URL), cap at
- * LOCAL_EMBED_CONCURRENCY_CAP: 20 parallel pages against a single-slot
- * server serialize on the one loaded model, multiply latency x20 past the
- * fetch timeout, and starve the backfill with no surfaced error. An
- * explicit env value always wins (`gbrain doctor` warns instead).
- * Pacing only ever LOWERS concurrency (Codex P2).
- */
-export function resolveEmbedConcurrency(paceMaxConcurrency?: number): number {
-  const envSet = !!process.env.GBRAIN_EMBED_CONCURRENCY;
-  const base = parseInt(process.env.GBRAIN_EMBED_CONCURRENCY || '20', 10);
-  let resolved = base;
-  if (!envSet && isLocalEmbeddingEndpoint() && base > LOCAL_EMBED_CONCURRENCY_CAP) {
-    resolved = LOCAL_EMBED_CONCURRENCY_CAP;
-    serr(
-      `[embed] local embedding endpoint detected — capping concurrency at ` +
-      `${LOCAL_EMBED_CONCURRENCY_CAP} (set GBRAIN_EMBED_CONCURRENCY to override)`,
-    );
-  }
-  return paceMaxConcurrency ? Math.min(resolved, paceMaxConcurrency) : resolved;
-}
-
 /**
  * Pre-flight check: read the actual schema column dim and compare to the
  * gateway's resolved dim. Throws `EmbeddingDimMismatchError` on mismatch
@@ -703,8 +677,10 @@ async function embedAll(
   // Paced runs lower this to the resolved cap (the real lever vs pooler-slot
   // starvation); unpaced keeps the env/default 20. Codex P2: only ever LOWER —
   // never raise above an operator's existing env cap.
-  // #2552: local endpoints auto-cap — see resolveEmbedConcurrency.
-  const CONCURRENCY = resolveEmbedConcurrency(staleOpts?.paceMaxConcurrency);
+  const BASE_CONCURRENCY = parseInt(process.env.GBRAIN_EMBED_CONCURRENCY || '20', 10);
+  const CONCURRENCY = staleOpts?.paceMaxConcurrency
+    ? Math.min(BASE_CONCURRENCY, staleOpts.paceMaxConcurrency)
+    : BASE_CONCURRENCY;
 
   async function embedOnePage(page: typeof pages[number]) {
     // #1737: bail before doing any work for this page if the run was aborted.
@@ -879,8 +855,10 @@ async function embedAllStale(
   // Paced runs lower concurrency to the resolved cap (E-1: worker count IS the
   // lever on this single pool, no separate permit). Codex P2: pacing only ever
   // LOWERS concurrency — never raise above an operator's existing env cap.
-  // #2552: local endpoints auto-cap — see resolveEmbedConcurrency.
-  const CONCURRENCY = resolveEmbedConcurrency(staleOpts?.paceMaxConcurrency);
+  const BASE_CONCURRENCY = parseInt(process.env.GBRAIN_EMBED_CONCURRENCY || '20', 10);
+  const CONCURRENCY = staleOpts?.paceMaxConcurrency
+    ? Math.min(BASE_CONCURRENCY, staleOpts.paceMaxConcurrency)
+    : BASE_CONCURRENCY;
   const pacer = staleOpts?.pacer ?? createNoopPacer();
 
   // D3 + D3a + D8: wall-clock budget. 30 min default; env override.

src/commands/extract.ts

@@ -1651,7 +1651,7 @@ async function extractTimelineFromDB(
  * make re-extraction idempotent). EVERY processed page is stamped, including
  * zero-link pages — they WERE processed.
  */
-async function extractStaleFromDB(
+export async function extractStaleFromDB(
   engine: BrainEngine,
   opts: {
     dryRun: boolean;

src/commands/jobs.ts

@@ -1479,7 +1479,31 @@ export async function registerBuiltinHandlers(
       embedSkipReason = 'auto_embed_disabled';
     }
 
-    return { ...result, embed_job_id: embedJobId, embed_skip_reason: embedSkipReason };
+    // #2849: large-sync extract deferral follow-up. performSync skips inline
+    // link/timeline extraction when totalChanges > 100, leaving
+    // links_extracted_at unstamped. A standalone sync job (webhook push,
+    // sync trigger) has no autopilot extract phase behind it, so the pages
+    // would stay extraction-stale until a manual `gbrain extract --stale`.
+    // Queue a source-scoped stale sweep instead. Best-effort + idempotent:
+    // a duplicate sweep finds 0 stale pages and no-ops.
+    let extractJobId: number | null = null;
+    if (result.extractDeferred) {
+      try {
+        const { MinionQueue } = await import('../core/minions/queue.ts');
+        const queue = new MinionQueue(engine);
+        const followUp = await queue.add(
+          'extract',
+          { stale: true, ...(sourceId ? { sourceId } : {}) },
+          {
+            idempotency_key: `sync-extract-stale:${sourceId ?? 'default'}:${Math.floor(Date.now() / 30_000)}`,
+            maxWaiting: 1,
+          },
+        );
+        extractJobId = followUp.id;
+      } catch { /* best-effort: extract --stale sweeps it later */ }
+    }
+
+    return { ...result, embed_job_id: embedJobId, embed_skip_reason: embedSkipReason, extract_stale_job_id: extractJobId };
   });
 
   registerBuiltinJob(worker, engine, 'embed', async (job) => {
@@ -1652,6 +1676,20 @@ export async function registerBuiltinHandlers(
   });
 
   worker.register('extract', async (job) => {
+    // #2849: stale-sweep mode — the sync handler's large-sync deferral
+    // follow-up. DB-source (reads page content from the DB, so it runs on
+    // checkout-less brains), source-scopable, idempotent. Same core as
+    // `gbrain extract --stale`.
+    if (job.data.stale === true) {
+      const { extractStaleFromDB } = await import('./extract.ts');
+      return await extractStaleFromDB(engine, {
+        dryRun: !!job.data.dryRun,
+        jsonMode: false,
+        includeFrontmatter: false,
+        sourceIdFilter: typeof job.data.sourceId === 'string' ? job.data.sourceId : undefined,
+        catchUp: false,
+      });
+    }
     const { runExtractCore } = await import('./extract.ts');
     const mode = (typeof job.data.mode === 'string' && ['links', 'timeline', 'all'].includes(job.data.mode))
       ? (job.data.mode as 'links' | 'timeline' | 'all')

src/commands/serve-http.ts

@@ -2146,8 +2146,13 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
   //     Other event types (ping, pull_request, etc.) return 202 'ignored'
   //     so GitHub doesn't retry.
   // D15.5: HMAC compare uses the shared safeHexEqual helper.
-  // D18: submits 'sync' job with auto_embed_backfill=true and priority -10
-  //     (above autopilot's 0).
+  // D18: submits 'sync' job with extraction + auto_embed_backfill enabled and
+  //     priority -10 (above autopilot's 0). noExtract:false opts normal
+  //     incremental pushes into sync's inline link/timeline extraction (#2849
+  //     — the standalone sync handler defaults noExtract to TRUE, which left
+  //     webhook-imported pages permanently stale). Large (>100 file) pushes
+  //     defer inline extract; the sync handler queues an extract --stale
+  //     follow-up job for that branch.
   // ---------------------------------------------------------------------------
   const githubWebhookLimiter = rateLimit({
     windowMs: 60_000,
@@ -2267,6 +2272,7 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
           'sync',
           {
             sourceId: source.id,
+            noExtract: false,
             auto_embed_backfill: true,
             embed_reason: 'webhook',
           },

src/commands/sync.ts

@@ -222,6 +222,14 @@ export interface SyncResult {
    * everything," the exact misdiagnosis in the #1794 recurrence report.
    */
   bankedFiles?: number;
+  /**
+   * #2849: true when extraction was REQUESTED (noExtract false) but this sync
+   * skipped inline link/timeline extraction because totalChanges > 100 (the
+   * #1794 large-sync deferral). links_extracted_at stays unstamped for the
+   * imported pages. The standalone `sync` job handler queues a source-scoped
+   * `extract --stale` follow-up when set; CLI runs print the manual hint.
+   */
+  extractDeferred?: boolean;
 }
 
 /**
@@ -1379,6 +1387,10 @@ See also:
     {
       sourceId: sourceIdArg,
       repoPath: source.local_path,
+      // #2849: opt in to inline extraction — the standalone sync handler
+      // defaults noExtract to TRUE (dedupe for doctor's [sync, extract]
+      // remediation plan), which would leave triggered syncs extraction-stale.
+      noExtract: false,
       auto_embed_backfill: true,
       embed_reason: 'sync_trigger',
     },
@@ -3287,11 +3299,16 @@ async function performSyncInner(engine: BrainEngine, opts: SyncOpts): Promise<Sy
   // the stale sweep scans the whole source, so banked-across-runs pages are
   // covered regardless.
   const extractOpts = opts.sourceId ? { sourceId: opts.sourceId } : undefined;
+  let extractDeferred = false;
   if (!opts.noExtract && totalChanges > 100 && pagesAffected.length > 0) {
+    // #2849: surface the deferral to callers. A standalone sync job (webhook
+    // push, sync trigger) has no autopilot extract phase behind it, so the
+    // job handler queues an `extract --stale` follow-up off this flag.
+    extractDeferred = true;
     slog(
       `  Large sync: deferring link/timeline extraction. ` +
       `Run 'gbrain extract --stale${opts.sourceId ? ` --source-id ${opts.sourceId}` : ''}' ` +
-      `(or let the autopilot cycle's extract phase sweep it).`,
+      `(sync jobs queue this follow-up automatically).`,
     );
   }
   if (!opts.noExtract && totalChanges <= 100 && pagesAffected.length > 0) {
@@ -3400,6 +3417,7 @@ async function performSyncInner(engine: BrainEngine, opts: SyncOpts): Promise<Sy
     chunksCreated,
     embedded,
     pagesAffected,
+    extractDeferred,
   };
 }
 

src/core/ai/gateway.ts

@@ -683,33 +683,6 @@ export function getEmbeddingDimensions(): number {
   return requireConfig().embedding_dimensions ?? DEFAULT_EMBEDDING_DIMENSIONS;
 }
 
-/**
- * #2552: cap for parallel bulk-embed workers against a local inference
- * server. A single-slot Ollama/llama-server serializes requests, so the
- * cloud-tuned 20-worker fan-out multiplies latency x20 and blows past the
- * fetch timeout with no surfaced error (the backfill silently starves).
- */
-export const LOCAL_EMBED_CONCURRENCY_CAP = 2;
-
-/**
- * #2552: true when the configured embedding model routes to a local
- * inference server — the `ollama` / `llama-server` recipes, or any recipe
- * whose base URL was explicitly pointed at localhost. Bulk callers use this
- * to pick CPU-safe concurrency defaults; `gbrain doctor` uses it to warn
- * about an explicit cloud-sized override. Fail-open: unconfigured or
- * unresolvable gateway → false (cloud behavior, the historical default).
- */
-export function isLocalEmbeddingEndpoint(): boolean {
-  try {
-    const { recipe } = resolveRecipe(getEmbeddingModel());
-    if (recipe.id === 'ollama' || recipe.id === 'llama-server') return true;
-    const base = requireConfig().base_urls?.[recipe.id] ?? '';
-    return /\/\/(localhost|127\.0\.0\.1|\[::1\])(:|\/|$)/i.test(base);
-  } catch {
-    return false;
-  }
-}
-
 /**
  * v0.28.11: returns the configured multimodal embedding model when set,
  * or undefined if the brain falls back to `embedding_model` for multimodal

src/core/ai/recipes/ollama.ts

@@ -29,17 +29,9 @@ export const ollama: Recipe = {
       trust_custom_dims: true, // #2271: local models carry varied native dims
       cost_per_1m_tokens_usd: 0,
       price_last_verified: '2026-04-20',
-      // #2552: Ollama's true batch capacity depends on the locally loaded
-      // model + OLLAMA_NUM_PARALLEL, but the previous `no_batch_cap: true`
-      // meant a whole page went out in ONE request — on a CPU-only box that
-      // multiplies latency past the fetch timeout and the backfill starves
-      // with no surfaced error. Ollama doesn't return a recognizable
-      // token-limit error either, so the recursive-halving safety net never
-      // fires; a conservative static pre-split cap is the only guard.
-      // 4096 tokens x 2 chars/token ~= 8K chars per request (code-dense
-      // pages run ~2 chars/token, not the tiktoken-ish 4).
-      max_batch_tokens: 4096,
-      chars_per_token: 2,
+      // Ollama's batch capacity depends on the locally loaded model + the
+      // OLLAMA_NUM_PARALLEL config; no static cap to declare. v0.32 (#779).
+      no_batch_cap: true,
     },
   },
   setup_hint: 'Install Ollama from https://ollama.ai, then `ollama pull nomic-embed-text` and `ollama serve`.',

src/core/doctor-categories.ts

@@ -141,7 +141,6 @@ export const OPS_CHECK_NAMES: ReadonlySet<string> = new Set([
   'pgbouncer_prepare',
   'pgvector',
   'pool_budget',
-  'embed_concurrency',
   'progressive_batch_audit_health',
   'queue_health',
   'reranker_health',

src/core/pglite-engine.ts

@@ -56,7 +56,7 @@ import { GBrainError, PAGE_SORT_SQL, ENRICH_ORDER_SQL } from './types.ts';
 import { finalizeLastSeen } from './chronicle/last-seen.ts';
 import { computeAnomaliesFromBuckets } from './cycle/anomaly.ts';
 import { resolveBoostMap, resolveHardExcludes } from './search/source-boost.ts';
-import { buildSourceFactorCase, buildHardExcludeClause, buildVisibilityClause, buildRecencyComponentSql, buildBestPerPagePoolCte, buildOrFallbackWebsearchQuery, buildWebsearchQueryExpr } from './search/sql-ranking.ts';
+import { buildSourceFactorCase, buildHardExcludeClause, buildVisibilityClause, buildRecencyComponentSql, buildBestPerPagePoolCte, buildOrFallbackWebsearchQuery } from './search/sql-ranking.ts';
 import {
   normalizeEngineColumn,
   buildVectorCastFragment,
@@ -1591,8 +1591,6 @@ export class PGLiteEngine implements BrainEngine {
     }
 
     // v0.20.0 Cathedral II Layer 10 C1/C2: language + symbol-kind filters.
-    // #2380: slash-bearing queries match both the split-word and literal
-    // slash forms — see buildWebsearchQueryExpr in ./search/sql-ranking.ts.
     const params: unknown[] = [query, innerLimit, limit, offset];
     let extraFilter = '';
     if (opts?.language) {
@@ -1632,7 +1630,6 @@ export class PGLiteEngine implements BrainEngine {
     // FTS config name (e.g. 'english', 'pt_br'). Validated by getFtsLanguage()
     // — safe to interpolate into raw SQL.
     const ftsLang = getFtsLanguage();
-    const ftsQueryExpr = buildWebsearchQueryExpr(ftsLang, '$1', query);
 
     const keywordSql =
       `WITH ranked AS (
@@ -1640,14 +1637,14 @@ export class PGLiteEngine implements BrainEngine {
            p.slug, p.id as page_id, p.title, p.type, p.source_id,
            p.effective_date, p.effective_date_source,
            cc.id as chunk_id, cc.chunk_index, cc.chunk_text, cc.chunk_source,
-           ts_rank(cc.search_vector, ${ftsQueryExpr}) * ${sourceFactorCase} AS score,
+           ts_rank(cc.search_vector, websearch_to_tsquery('${ftsLang}', $1)) * ${sourceFactorCase} AS score,
            CASE WHEN p.updated_at < (
              SELECT MAX(te.created_at) FROM timeline_entries te WHERE te.page_id = p.id
            ) THEN true ELSE false END AS stale
          FROM content_chunks cc
          JOIN pages p ON p.id = cc.page_id
          JOIN sources s ON s.id = p.source_id
-         WHERE cc.search_vector @@ ${ftsQueryExpr} ${detailFilter}${extraFilter} ${hardExcludeClause} ${visibilityClause}
+         WHERE cc.search_vector @@ websearch_to_tsquery('${ftsLang}', $1) ${detailFilter}${extraFilter} ${hardExcludeClause} ${visibilityClause}
            -- v0.27.1: hide image rows from default text-keyword search so
            -- OCR text doesn't drown text-page hits. Image-similarity queries
            -- run a separate vector path on embedding_image.
@@ -1715,10 +1712,7 @@ export class PGLiteEngine implements BrainEngine {
     // FTS config name (e.g. 'english', 'pt_br'). Validated by getFtsLanguage()
     // — safe to interpolate into raw SQL.
     const ftsLang = getFtsLanguage();
-    const ftsQueryExpr = buildWebsearchQueryExpr(ftsLang, '$1', query);
 
-    // #2380: slash-bearing queries match both the split-word and literal
-    // slash forms — see buildWebsearchQueryExpr in ./search/sql-ranking.ts.
     const params: unknown[] = [query, limit, offset];
     let extraFilter = '';
     if (opts?.type) {
@@ -1766,7 +1760,7 @@ export class PGLiteEngine implements BrainEngine {
          COALESCE(rep.chunk_index, 0) as chunk_index,
          COALESCE(rep.chunk_text, '') as chunk_text,
          COALESCE(rep.chunk_source, 'compiled_truth') as chunk_source,
-         ts_rank_cd(p.search_vector, ${ftsQueryExpr}) * ${sourceFactorCase} AS score,
+         ts_rank_cd(p.search_vector, websearch_to_tsquery('${ftsLang}', $1)) * ${sourceFactorCase} AS score,
          CASE WHEN p.updated_at < (
            SELECT MAX(te.created_at) FROM timeline_entries te WHERE te.page_id = p.id
          ) THEN true ELSE false END AS stale
@@ -1781,7 +1775,7 @@ export class PGLiteEngine implements BrainEngine {
          ORDER BY (cc.chunk_source = 'compiled_truth') DESC, cc.chunk_index ASC
          LIMIT 1
        ) rep ON true
-       WHERE p.search_vector @@ ${ftsQueryExpr}
+       WHERE p.search_vector @@ websearch_to_tsquery('${ftsLang}', $1)
          ${extraFilter} ${hardExcludeClause} ${visibilityClause}
        ORDER BY score DESC, p.id ASC
        LIMIT $2 OFFSET $3`;
@@ -1968,8 +1962,6 @@ export class PGLiteEngine implements BrainEngine {
       });
     }
 
-    // #2380: slash-bearing queries match both the split-word and literal
-    // slash forms — see buildWebsearchQueryExpr in ./search/sql-ranking.ts.
     const params: unknown[] = [query, limit, offset];
     let extraFilter = '';
     if (opts?.language) {
@@ -2004,21 +1996,20 @@ export class PGLiteEngine implements BrainEngine {
     // FTS config name (e.g. 'english', 'pt_br'). Validated by getFtsLanguage()
     // — safe to interpolate into raw SQL.
     const ftsLang = getFtsLanguage();
-    const ftsQueryExpr = buildWebsearchQueryExpr(ftsLang, '$1', query);
 
     const { rows } = await this.db.query(
       `SELECT
          p.slug, p.id as page_id, p.title, p.type, p.source_id,
          p.effective_date, p.effective_date_source,
          cc.id as chunk_id, cc.chunk_index, cc.chunk_text, cc.chunk_source,
-         ts_rank(cc.search_vector, ${ftsQueryExpr}) * ${sourceFactorCase} AS score,
+         ts_rank(cc.search_vector, websearch_to_tsquery('${ftsLang}', $1)) * ${sourceFactorCase} AS score,
          CASE WHEN p.updated_at < (
            SELECT MAX(te.created_at) FROM timeline_entries te WHERE te.page_id = p.id
          ) THEN true ELSE false END AS stale
        FROM content_chunks cc
        JOIN pages p ON p.id = cc.page_id
        JOIN sources s ON s.id = p.source_id
-       WHERE cc.search_vector @@ ${ftsQueryExpr} ${detailFilter}${extraFilter} ${hardExcludeClause} ${visibilityClause}
+       WHERE cc.search_vector @@ websearch_to_tsquery('${ftsLang}', $1) ${detailFilter}${extraFilter} ${hardExcludeClause} ${visibilityClause}
        ORDER BY score DESC
        LIMIT $2 OFFSET $3`,
       params

src/core/postgres-engine.ts

@@ -64,7 +64,7 @@ import { ConnectionManager } from './connection-manager.ts';
 import { logConnectionEvent } from './connection-audit.ts';
 import { validateSlug, contentHash, rowToPage, rowToStalePage, rowToChunk, rowToSearchResult, parseEmbedding, tryParseEmbedding, takeRowToTake, takeHitRowToHit, isUndefinedTableError, warnOncePerProcess } from './utils.ts';
 import { resolveBoostMap, resolveHardExcludes } from './search/source-boost.ts';
-import { buildSourceFactorCase, buildHardExcludeClause, buildVisibilityClause, buildRecencyComponentSql, buildBestPerPagePoolCte, buildOrFallbackWebsearchQuery, buildWebsearchQueryExpr } from './search/sql-ranking.ts';
+import { buildSourceFactorCase, buildHardExcludeClause, buildVisibilityClause, buildRecencyComponentSql, buildBestPerPagePoolCte, buildOrFallbackWebsearchQuery } from './search/sql-ranking.ts';
 import { DEFAULT_EMBEDDING_MODEL, DEFAULT_EMBEDDING_DIMENSIONS } from './ai/defaults.ts';
 import { DELETE_BATCH_SIZE } from './engine-constants.ts';
 
@@ -1691,8 +1691,6 @@ export class PostgresEngine implements BrainEngine {
     const hardExcludePrefixes = resolveHardExcludes(opts?.exclude_slug_prefixes, opts?.include_slug_prefixes);
     const hardExcludeClause = buildHardExcludeClause('p.slug', hardExcludePrefixes);
 
-    // #2380: slash-bearing queries match both the split-word and literal
-    // slash forms — see buildWebsearchQueryExpr in ./search/sql-ranking.ts.
     const params: unknown[] = [query];
     let typeClause = '';
     if (type) {
@@ -1763,7 +1761,6 @@ export class PostgresEngine implements BrainEngine {
     // FTS config name (e.g. 'english', 'pt_br'). Validated by getFtsLanguage()
     // — safe to interpolate into raw SQL.
     const ftsLang = getFtsLanguage();
-    const ftsQueryExpr = buildWebsearchQueryExpr(ftsLang, '$1', query);
 
     const rawQuery = `
       WITH ranked_chunks AS (
@@ -1771,11 +1768,11 @@ export class PostgresEngine implements BrainEngine {
           p.slug, p.id as page_id, p.title, p.type, p.source_id,
           p.effective_date, p.effective_date_source,
           cc.id as chunk_id, cc.chunk_index, cc.chunk_text, cc.chunk_source,
-          ts_rank(cc.search_vector, ${ftsQueryExpr}) * ${sourceFactorCase} AS score
+          ts_rank(cc.search_vector, websearch_to_tsquery('${ftsLang}', $1)) * ${sourceFactorCase} AS score
         FROM content_chunks cc
         JOIN pages p ON p.id = cc.page_id
         JOIN sources s ON s.id = p.source_id
-        WHERE cc.search_vector @@ ${ftsQueryExpr}
+        WHERE cc.search_vector @@ websearch_to_tsquery('${ftsLang}', $1)
           ${typeClause}
           ${typesClause}
           ${excludeSlugsClause}
@@ -1866,10 +1863,7 @@ export class PostgresEngine implements BrainEngine {
     // FTS config name (e.g. 'english', 'pt_br'). Validated by getFtsLanguage()
     // — safe to interpolate into raw SQL.
     const ftsLang = getFtsLanguage();
-    const ftsQueryExpr = buildWebsearchQueryExpr(ftsLang, '$1', query);
 
-    // #2380: slash-bearing queries match both the split-word and literal
-    // slash forms — see buildWebsearchQueryExpr in ./search/sql-ranking.ts.
     const params: unknown[] = [query];
     let typeClause = '';
     if (opts?.type) {
@@ -1929,7 +1923,7 @@ export class PostgresEngine implements BrainEngine {
         COALESCE(rep.chunk_index, 0) as chunk_index,
         COALESCE(rep.chunk_text, '') as chunk_text,
         COALESCE(rep.chunk_source, 'compiled_truth') as chunk_source,
-        ts_rank_cd(p.search_vector, ${ftsQueryExpr}) * ${sourceFactorCase} AS score,
+        ts_rank_cd(p.search_vector, websearch_to_tsquery('${ftsLang}', $1)) * ${sourceFactorCase} AS score,
         false AS stale
       FROM pages p
       JOIN sources s ON s.id = p.source_id
@@ -1942,7 +1936,7 @@ export class PostgresEngine implements BrainEngine {
         ORDER BY (cc.chunk_source = 'compiled_truth') DESC, cc.chunk_index ASC
         LIMIT 1
       ) rep ON true
-      WHERE p.search_vector @@ ${ftsQueryExpr}
+      WHERE p.search_vector @@ websearch_to_tsquery('${ftsLang}', $1)
         ${typeClause}
         ${typesClause}
         ${excludeSlugsClause}
@@ -2006,8 +2000,6 @@ export class PostgresEngine implements BrainEngine {
     const hardExcludePrefixes = resolveHardExcludes(opts?.exclude_slug_prefixes, opts?.include_slug_prefixes);
     const hardExcludeClause = buildHardExcludeClause('p.slug', hardExcludePrefixes);
 
-    // #2380: slash-bearing queries match both the split-word and literal
-    // slash forms — see buildWebsearchQueryExpr in ./search/sql-ranking.ts.
     const params: unknown[] = [query];
     let typeClause = '';
     if (type) {
@@ -2068,19 +2060,18 @@ export class PostgresEngine implements BrainEngine {
     // FTS config name (e.g. 'english', 'pt_br'). Validated by getFtsLanguage()
     // — safe to interpolate into raw SQL.
     const ftsLang = getFtsLanguage();
-    const ftsQueryExpr = buildWebsearchQueryExpr(ftsLang, '$1', query);
 
     const rawQuery = `
       SELECT
         p.slug, p.id as page_id, p.title, p.type, p.source_id,
         p.effective_date, p.effective_date_source,
         cc.id as chunk_id, cc.chunk_index, cc.chunk_text, cc.chunk_source,
-        ts_rank(cc.search_vector, ${ftsQueryExpr}) * ${sourceFactorCase} AS score,
+        ts_rank(cc.search_vector, websearch_to_tsquery('${ftsLang}', $1)) * ${sourceFactorCase} AS score,
         false AS stale
       FROM content_chunks cc
       JOIN pages p ON p.id = cc.page_id
       JOIN sources s ON s.id = p.source_id
-      WHERE cc.search_vector @@ ${ftsQueryExpr}
+      WHERE cc.search_vector @@ websearch_to_tsquery('${ftsLang}', $1)
         ${typeClause}
         ${typesClause}
         ${excludeSlugsClause}

src/core/search/sql-ranking.ts

@@ -251,28 +251,6 @@ export function buildOrFallbackWebsearchQuery(query: string): string | null {
   return tokens.join(' OR ');
 }
 
-/**
- * #2380: FTS query expression for slash-bearing queries. Postgres' default
- * text-search parser classifies `foo/bar` as a single `file`-alias lexeme —
- * on BOTH the query side and the index side. So a raw `foo/bar` query only
- * matched documents carrying the identical joined lexeme (literal paths),
- * and a slash-split query only matches documents whose text had the words
- * separated. Neither form alone covers both document shapes; OR the two
- * parses so a slash query matches prose ("foo and bar", stemmed, AND
- * semantics) AND literal slash forms ("src/core/x.ts") alike.
- *
- * Slash-free queries return the plain single-parse expression — byte-
- * identical SQL and identical ts_rank to the historical behavior.
- *
- * `ftsLang` is validated by getFtsLanguage() (safe to interpolate);
- * `param` is a `$N` placeholder, never user text.
- */
-export function buildWebsearchQueryExpr(ftsLang: string, param: string, query: string): string {
-  const plain = `websearch_to_tsquery('${ftsLang}', ${param})`;
-  if (!query.includes('/')) return plain;
-  return `(websearch_to_tsquery('${ftsLang}', translate(${param}, '/', ' ')) || ${plain})`;
-}
-
 // ============================================================
 // v0.29.1 — Recency component SQL builder
 // ============================================================

test/ai/no-batch-cap-suppression.serial.test.ts

@@ -28,8 +28,8 @@ describe('v0.32 #779: no_batch_cap suppresses the missing-max_batch_tokens warni
     resetGateway();
   });
 
-  test('LiteLLM and llama-server declare no_batch_cap: true', () => {
-    for (const id of ['litellm', 'llama-server']) {
+  test('Ollama, LiteLLM, llama-server all declare no_batch_cap: true', () => {
+    for (const id of ['ollama', 'litellm', 'llama-server']) {
       const r = getRecipe(id);
       expect(r, `${id} not registered`).toBeDefined();
       expect(
@@ -39,18 +39,6 @@ describe('v0.32 #779: no_batch_cap suppresses the missing-max_batch_tokens warni
     }
   });
 
-  test('#2552: Ollama declares a conservative static batch cap, not no_batch_cap', () => {
-    // A CPU-only Ollama box wedges when a whole page ships in one request;
-    // Ollama never returns a token-limit error so the recursive-halving
-    // safety net can't fire. The pre-split cap is the only guard.
-    const r = getRecipe('ollama');
-    expect(r).toBeDefined();
-    const e = r!.touchpoints.embedding!;
-    expect(e.no_batch_cap).toBeUndefined();
-    expect(e.max_batch_tokens).toBe(4096);
-    expect(e.chars_per_token).toBe(2);
-  });
-
   test('configureGateway does NOT warn for ollama/litellm/llama-server', () => {
     warnSpy.mockClear();
     resetGateway();

test/embed-local-endpoint.serial.test.ts

@@ -1,118 +0,0 @@
-/**
- * #2552: cloud-tuned embedding defaults silently wedge CPU-only local
- * endpoints (Ollama). Three-part fix under test:
- *
- *  1. `isLocalEmbeddingEndpoint()` — gateway helper detecting local
- *     inference servers (ollama / llama-server recipes, localhost base URL).
- *  2. `resolveEmbedConcurrency()` — embed auto-caps the 20-worker fan-out
- *     at LOCAL_EMBED_CONCURRENCY_CAP for local endpoints unless the
- *     operator set GBRAIN_EMBED_CONCURRENCY explicitly.
- *  3. `computeEmbedConcurrencyCheck()` — doctor warns when an explicit env
- *     override fans out against a local endpoint.
- *
- * Serial: mutates process.env and the module-global gateway config.
- */
-
-import { afterAll, afterEach, describe, expect, test } from 'bun:test';
-import {
-  configureGateway,
-  resetGateway,
-  isLocalEmbeddingEndpoint,
-  LOCAL_EMBED_CONCURRENCY_CAP,
-} from '../src/core/ai/gateway.ts';
-import { resolveEmbedConcurrency } from '../src/commands/embed.ts';
-import { computeEmbedConcurrencyCheck } from '../src/commands/doctor.ts';
-
-const SAVED_ENV = process.env.GBRAIN_EMBED_CONCURRENCY;
-
-afterEach(() => {
-  resetGateway();
-  if (SAVED_ENV === undefined) delete process.env.GBRAIN_EMBED_CONCURRENCY;
-  else process.env.GBRAIN_EMBED_CONCURRENCY = SAVED_ENV;
-});
-
-afterAll(() => {
-  resetGateway();
-});
-
-describe('#2552 isLocalEmbeddingEndpoint', () => {
-  test('false when the gateway is not configured (fail-open to cloud behavior)', () => {
-    resetGateway();
-    expect(isLocalEmbeddingEndpoint()).toBe(false);
-  });
-
-  test('true for the ollama recipe', () => {
-    configureGateway({ embedding_model: 'ollama:nomic-embed-text', env: {} });
-    expect(isLocalEmbeddingEndpoint()).toBe(true);
-  });
-
-  test('true for the llama-server recipe', () => {
-    configureGateway({ embedding_model: 'llama-server:my-gguf', env: {} });
-    expect(isLocalEmbeddingEndpoint()).toBe(true);
-  });
-
-  test('false for a cloud recipe', () => {
-    configureGateway({
-      embedding_model: 'openai:text-embedding-3-small',
-      env: { OPENAI_API_KEY: 'fake' },
-    });
-    expect(isLocalEmbeddingEndpoint()).toBe(false);
-  });
-
-  test('true when a cloud recipe base URL is explicitly pointed at localhost', () => {
-    configureGateway({
-      embedding_model: 'openai:text-embedding-3-small',
-      env: { OPENAI_API_KEY: 'fake' },
-      base_urls: { openai: 'http://localhost:8080/v1' },
-    });
-    expect(isLocalEmbeddingEndpoint()).toBe(true);
-  });
-});
-
-describe('#2552 resolveEmbedConcurrency', () => {
-  test('caps at LOCAL_EMBED_CONCURRENCY_CAP for a local endpoint when env is unset', () => {
-    delete process.env.GBRAIN_EMBED_CONCURRENCY;
-    configureGateway({ embedding_model: 'ollama:nomic-embed-text', env: {} });
-    expect(resolveEmbedConcurrency()).toBe(LOCAL_EMBED_CONCURRENCY_CAP);
-  });
-
-  test('explicit env override always wins, even against a local endpoint', () => {
-    process.env.GBRAIN_EMBED_CONCURRENCY = '10';
-    configureGateway({ embedding_model: 'ollama:nomic-embed-text', env: {} });
-    expect(resolveEmbedConcurrency()).toBe(10);
-  });
-
-  test('cloud endpoints keep the historical default of 20', () => {
-    delete process.env.GBRAIN_EMBED_CONCURRENCY;
-    configureGateway({ env: { OPENAI_API_KEY: 'fake' } });
-    expect(resolveEmbedConcurrency()).toBe(20);
-  });
-
-  test('pacing only ever lowers concurrency', () => {
-    delete process.env.GBRAIN_EMBED_CONCURRENCY;
-    configureGateway({ embedding_model: 'ollama:nomic-embed-text', env: {} });
-    expect(resolveEmbedConcurrency(1)).toBe(1);
-    expect(resolveEmbedConcurrency(16)).toBe(LOCAL_EMBED_CONCURRENCY_CAP);
-  });
-});
-
-describe('#2552 computeEmbedConcurrencyCheck (doctor)', () => {
-  test('ok for non-local endpoints', () => {
-    expect(computeEmbedConcurrencyCheck(false, '20', 2).status).toBe('ok');
-  });
-
-  test('warn when an explicit override exceeds the local cap', () => {
-    const check = computeEmbedConcurrencyCheck(true, '20', 2);
-    expect(check.status).toBe('warn');
-    expect(check.message).toContain('GBRAIN_EMBED_CONCURRENCY=20');
-  });
-
-  test('ok when env is unset against a local endpoint (auto-cap applies)', () => {
-    expect(computeEmbedConcurrencyCheck(true, undefined, 2).status).toBe('ok');
-  });
-
-  test('ok when the override is at or under the cap', () => {
-    expect(computeEmbedConcurrencyCheck(true, '2', 2).status).toBe('ok');
-    expect(computeEmbedConcurrencyCheck(true, '1', 2).status).toBe('ok');
-  });
-});

test/pglite-engine.test.ts

@@ -216,67 +216,6 @@ describe('PGLiteEngine: Search', () => {
     expect(results.length).toBe(0);
   });
 
-  // Regression (#2380): queries containing `/` used to bypass FTS AND
-  // semantics. Postgres' default text-search parser classifies `foo/bar` as
-  // a `file`-alias token mapped to the `simple` dictionary, so it became a
-  // single un-stemmed lexeme `'foo/bar'` that never matches indexed text —
-  // the primary FTS pass returned 0 and the OR fallback took over, matching
-  // pages that contain EITHER term. searchKeyword/searchTitles now normalize
-  // `/` to whitespace before websearch_to_tsquery parses, so the primary
-  // AND pass matches directly.
-  test('searchKeyword: slash query matches with AND semantics, not OR fallback', async () => {
-    // Decoy shares only ONE of the two query terms ('enterprise').
-    await engine.putPage('concepts/enterprise-pricing', {
-      type: 'concept', title: 'Widget Pricing',
-      compiled_truth: 'Enterprise pricing for widgets.',
-    });
-    await engine.upsertChunks('concepts/enterprise-pricing', [
-      { chunk_index: 0, chunk_text: 'Enterprise pricing for widgets', chunk_source: 'compiled_truth' },
-    ]);
-
-    // Both terms co-occur only in the novamind chunk. Pre-fix this returned
-    // BOTH pages (primary pass zero-hit → OR fallback); post-fix the primary
-    // AND pass returns exactly the co-occurrence page.
-    const results = await engine.searchKeyword('NovaMind/enterprise');
-    expect(results.length).toBe(1);
-    expect(results[0].slug).toBe('companies/novamind');
-  });
-
-  test('searchTitles: slash query matches with AND semantics, not OR fallback', async () => {
-    await engine.putPage('companies/novamind-enterprise', {
-      type: 'company', title: 'NovaMind Enterprise Platform',
-      compiled_truth: 'Placeholder body.',
-    });
-    await engine.putPage('guides/enterprise-sales', {
-      type: 'concept', title: 'Enterprise Sales Guide',
-      compiled_truth: 'Placeholder body.',
-    });
-
-    // Pre-fix: `NovaMind/Enterprise` parsed as one file-alias lexeme → the
-    // primary title pass returned 0 and the OR fallback matched BOTH titles.
-    const results = await engine.searchTitles('NovaMind/Enterprise');
-    expect(results.length).toBe(1);
-    expect(results[0].slug).toBe('companies/novamind-enterprise');
-  });
-
-  test('searchKeyword: slash query still matches the literal slash form (file paths)', async () => {
-    // The INDEX side also emits the joined file-alias lexeme for literal
-    // `foo/bar` text, so a query normalized to split words alone would go
-    // blind to documents containing the literal slash form (paths, URLs).
-    // buildWebsearchQueryExpr ORs both parses; this pins the raw arm.
-    await engine.putPage('runbooks/widget-deploy', {
-      type: 'concept', title: 'Widget Deploy Runbook',
-      compiled_truth: 'Runbook for the acme/widget deployment pipeline.',
-    });
-    await engine.upsertChunks('runbooks/widget-deploy', [
-      { chunk_index: 0, chunk_text: 'Runbook for the acme/widget deployment pipeline', chunk_source: 'compiled_truth' },
-    ]);
-
-    const results = await engine.searchKeyword('acme/widget');
-    expect(results.length).toBe(1);
-    expect(results[0].slug).toBe('runbooks/widget-deploy');
-  });
-
   test('tsvector trigger populates search_vector on insert', async () => {
     // Verify the PL/pgSQL trigger fires and content_chunks.search_vector is
     // populated from chunk_text. v0.20.0 Cathedral II Layer 3 moved FTS from

test/sources-webhook.test.ts

@@ -16,6 +16,7 @@
  */
 import { describe, test, expect } from 'bun:test';
 import { createHmac } from 'node:crypto';
+import { readFileSync } from 'node:fs';
 import { safeHexEqual } from '../src/core/timing-safe.ts';
 
 const GITHUB_SECRET = 'super-secret-webhook-key';
@@ -123,3 +124,25 @@ describe('Branch ref construction (D5)', () => {
     expect(pushedRef === `refs/heads/${trackedBranch}`).toBe(false);
   });
 });
+
+describe('Webhook sync job extraction contract (#2849)', () => {
+  test('opts into extraction before the pushed commit is consumed', () => {
+    const serveSource = readFileSync(
+      new URL('../src/commands/serve-http.ts', import.meta.url),
+      'utf8',
+    );
+    const routeStart = serveSource.indexOf("'/webhooks/github'");
+    const queueStart = serveSource.indexOf('const job = await queue.add(', routeStart);
+    const responseStart = serveSource.indexOf('res.status(202)', queueStart);
+    expect(routeStart).toBeGreaterThanOrEqual(0);
+    expect(queueStart).toBeGreaterThan(routeStart);
+    expect(responseStart).toBeGreaterThan(queueStart);
+
+    const routeSource = serveSource.slice(queueStart, responseStart);
+    const payload = routeSource.match(
+      /queue\.add\(\s*'sync',\s*\{([\s\S]*?)\}\s*,\s*\{/,
+    );
+    expect(payload).not.toBeNull();
+    expect(payload?.[1]).toMatch(/\bnoExtract:\s*false\b/);
+  });
+});

test/sync-large-deferral-extract.serial.test.ts

@@ -0,0 +1,130 @@
+/**
+ * #2849 — large-sync extract deferral queues an `extract --stale` follow-up.
+ *
+ * performSync's incremental path skips inline link/timeline extraction when
+ * totalChanges > 100 (the #1794 large-sync deferral), leaving
+ * links_extracted_at unstamped. Pre-fix, a standalone sync job (webhook push,
+ * `gbrain sync trigger`) had NOTHING behind it to sweep those pages — the
+ * autopilot cycle's extract phase only walks that cycle's changedSlugs — so a
+ * large webhook push left extraction permanently stale until a manual
+ * `gbrain extract --stale`.
+ *
+ * Pins:
+ *   (a) performSync surfaces `extractDeferred: true` on the >100 branch and
+ *       leaves the pages unstamped/unlinked.
+ *   (b) the `sync` job handler queues an `extract` job with
+ *       { stale: true, sourceId? } when extractDeferred is set.
+ *   (c) the `extract` handler's stale mode actually sweeps: links created +
+ *       watermark stamped (end-to-end recovery, no manual step).
+ *
+ * Marked .serial.test.ts — spawns git subprocesses + shares one PGLite engine.
+ */
+
+import { describe, test, expect, beforeAll, afterAll } from 'bun:test';
+import { mkdtempSync, writeFileSync, rmSync, mkdirSync } from 'fs';
+import { execSync } from 'child_process';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { PGLiteEngine } from '../src/core/pglite-engine.ts';
+import { MinionWorker } from '../src/core/minions/worker.ts';
+import { MinionQueue } from '../src/core/minions/queue.ts';
+import { registerBuiltinHandlers } from '../src/commands/jobs.ts';
+
+let engine: PGLiteEngine;
+let worker: MinionWorker;
+let repoPath: string;
+
+function git(cmd: string): void { execSync(cmd, { cwd: repoPath, stdio: 'pipe' }); }
+
+describe('#2849 — large sync defers extract and queues a stale sweep', () => {
+  beforeAll(async () => {
+    engine = new PGLiteEngine();
+    await engine.connect({});
+    await engine.initSchema();
+    worker = new MinionWorker(engine, { queue: 'test' });
+    await registerBuiltinHandlers(worker, engine, { quiet: true });
+
+    repoPath = mkdtempSync(join(tmpdir(), 'gbrain-large-defer-'));
+    git('git init');
+    git('git config user.email "t@t.com"');
+    git('git config user.name "T"');
+    mkdirSync(join(repoPath, 'people'), { recursive: true });
+    mkdirSync(join(repoPath, 'notes'), { recursive: true });
+    writeFileSync(join(repoPath, 'people/alice.md'), [
+      '---', 'type: person', 'title: Alice', '---', '', 'Alice is a founder.',
+    ].join('\n'));
+    git('git add -A && git commit -m "initial"');
+
+    // Seed: full first sync imports the anchor page + sets last_commit.
+    const { performSync } = await import('../src/commands/sync.ts');
+    await performSync(engine, { repoPath, full: true, noPull: true, noEmbed: true });
+
+    // Second commit: 101 new pages → incremental totalChanges > 100.
+    for (let i = 0; i < 101; i++) {
+      writeFileSync(join(repoPath, `notes/n${i}.md`), [
+        '---', 'type: note', `title: Note ${i}`, '---', '',
+        `[Alice](people/alice) appears in note ${i}.`,
+      ].join('\n'));
+    }
+    git('git add -A && git commit -m "add 101 pages"');
+  }, 120_000);
+
+  afterAll(async () => {
+    if (repoPath) rmSync(repoPath, { recursive: true, force: true });
+    if (engine) await engine.disconnect();
+  }, 60_000);
+
+  test('sync handler defers inline extract and queues extract{stale} follow-up; stale sweep recovers', async () => {
+    const syncHandler = (worker as unknown as { handlers: Map<string, (job: unknown) => Promise<unknown>> })
+      .handlers.get('sync');
+    expect(syncHandler).toBeDefined();
+
+    // Same payload shape the webhook submits (minus embed backfill noise).
+    const result = await syncHandler!({
+      data: { repoPath, noExtract: false, noPull: true, auto_embed_backfill: false },
+      signal: { aborted: false },
+      updateProgress: async () => {},
+    }) as { status: string; extractDeferred?: boolean; extract_stale_job_id?: number | null };
+
+    expect(result.status).toBe('synced');
+    // (a) inline extract was deferred, pages left stale.
+    expect(result.extractDeferred).toBe(true);
+    const staleBefore = await engine.countStalePagesForExtraction();
+    expect(staleBefore).toBeGreaterThan(100);
+    expect(await engine.getLinks('notes/n0')).toHaveLength(0);
+
+    // (b) a follow-up extract job with stale:true was queued.
+    expect(result.extract_stale_job_id).toBeGreaterThan(0);
+    const queue = new MinionQueue(engine);
+    const extractJobs = await queue.getJobs({ name: 'extract', limit: 5 });
+    expect(extractJobs.length).toBe(1);
+    expect((extractJobs[0].data as { stale: boolean }).stale).toBe(true);
+
+    // (c) running the extract handler's stale mode recovers: links + stamps.
+    const extractHandler = (worker as unknown as { handlers: Map<string, (job: unknown) => Promise<unknown>> })
+      .handlers.get('extract');
+    await extractHandler!({
+      data: extractJobs[0].data,
+      signal: { aborted: false },
+      updateProgress: async () => {},
+    });
+    const links = await engine.getLinks('notes/n0');
+    expect(links.some(l => l.to_slug === 'people/alice')).toBe(true);
+    const rows = await engine.executeRaw<{ links_extracted_at: string | null }>(
+      `SELECT links_extracted_at FROM pages WHERE slug = 'notes/n0'`,
+    );
+    expect(rows[0]?.links_extracted_at).not.toBeNull();
+  }, 180_000);
+
+  test('sub-threshold sync does NOT set extractDeferred (no spurious follow-up)', async () => {
+    // One more small commit → inline extract path, no deferral.
+    writeFileSync(join(repoPath, 'notes/small.md'), [
+      '---', 'type: note', 'title: Small', '---', '', 'No big deal.',
+    ].join('\n'));
+    git('git add -A && git commit -m "one small page"');
+    const { performSync } = await import('../src/commands/sync.ts');
+    const result = await performSync(engine, { repoPath, noPull: true, noEmbed: true });
+    expect(result.status).toBe('synced');
+    expect(result.extractDeferred).toBeFalsy();
+  }, 60_000);
+});

test/sync-trigger-cli.test.ts

@@ -100,6 +100,10 @@ describe('runSyncTrigger', () => {
     const job = jobs[0];
     expect(job.priority).toBe(-10);
     expect((job.data as { sourceId: string }).sourceId).toBe('default');
+    // #2849: opt in to inline extraction — the standalone sync handler
+    // defaults noExtract to TRUE, which would leave triggered syncs
+    // extraction-stale.
+    expect((job.data as { noExtract: boolean }).noExtract).toBe(false);
     expect((job.data as { auto_embed_backfill: boolean }).auto_embed_backfill).toBe(true);
   });