mirror of
https://github.com/garrytan/gbrain.git
synced 2026-08-16 09:52:22 +00:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c3e9daa18f | ||
|
|
f28613178a |
@@ -115,6 +115,7 @@ Full subcommand reference:
|
||||
|
||||
```
|
||||
gbrain sources add <id> --path <p> [--name <n>] [--federated|--no-federated] [--force]
|
||||
[--include <glob>...] [--exclude <glob>...]
|
||||
Register a source. id: [a-z0-9](?:[a-z0-9-]{0,30}[a-z0-9])?
|
||||
--path must be a git repo (or a subdirectory of one) — see
|
||||
"The git requirement for --path sources" below. --force
|
||||
@@ -131,6 +132,43 @@ gbrain sources federate <id>
|
||||
gbrain sources unfederate <id>
|
||||
```
|
||||
|
||||
## Filtering what gets synced (--include / --exclude)
|
||||
|
||||
`--include` and `--exclude` on `gbrain sources add` accept repeatable glob
|
||||
patterns and are honored by every subsequent sync AND lint of the source.
|
||||
Common Obsidian vault setups need to exclude authoring scaffolding so it
|
||||
doesn't pollute search:
|
||||
|
||||
```bash
|
||||
# Skip Templates/, Drafts/, and the smart-env sidecar; everything else syncs.
|
||||
gbrain sources add vault \
|
||||
--path ~/Documents/vault --federated \
|
||||
--exclude 'Templates/**' \
|
||||
--exclude 'Drafts/**' \
|
||||
--exclude '.smart-env/**'
|
||||
|
||||
# Or: only sync the people/ and companies/ subtrees of a CRM vault.
|
||||
gbrain sources add crm \
|
||||
--path ~/Documents/crm --no-federated \
|
||||
--include 'people/**' \
|
||||
--include 'companies/**'
|
||||
```
|
||||
|
||||
Both persist into `sources.config.include_globs` / `exclude_globs` arrays.
|
||||
The filter runs `include` first, then `exclude`, so a path inside
|
||||
`people/**` is still rejected if it also matches `exclude_globs`. Globs use
|
||||
the same matcher as the rest of gbrain's sync classifier (`matchesAnyGlob`
|
||||
in `src/core/sync.ts`) and are matched against the source-root-relative
|
||||
path. Exclusion is conservative: it never deletes previously-imported pages.
|
||||
|
||||
`gbrain sync --include <glob> --exclude <glob>` and
|
||||
`gbrain lint <dir> --include <glob> --exclude <glob>` take the same
|
||||
repeatable flags for one-off scope changes; for lint the persisted source
|
||||
globs are auto-applied when the lint target matches a source's `local_path`.
|
||||
Changing the persisted globs on an existing source triggers a full re-walk
|
||||
on the next sync (the source's config fingerprint invalidates the
|
||||
"already up to date" gate).
|
||||
|
||||
## The git requirement for --path sources
|
||||
|
||||
Every `--path` source must be a git repository (or live inside one — a
|
||||
|
||||
@@ -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 {
|
||||
|
||||
+8
-30
@@ -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.
|
||||
|
||||
@@ -53,6 +53,13 @@ export async function runImport(
|
||||
strategy?: SyncStrategy;
|
||||
sourceId?: string;
|
||||
managedBookmark?: boolean;
|
||||
/**
|
||||
* #2156: allow-list glob patterns — only dir-relative paths matching at
|
||||
* least one pattern are imported. Applied BEFORE `exclude`. Threaded by
|
||||
* performFullSync from `gbrain sync --include` / the source row's
|
||||
* persisted `config.include_globs`.
|
||||
*/
|
||||
include?: string[];
|
||||
/**
|
||||
* #753/#774: glob patterns to exclude from the import (same semantics as
|
||||
* `isSyncable`'s `exclude` — matched against the dir-relative path).
|
||||
@@ -215,6 +222,10 @@ export async function runImport(
|
||||
);
|
||||
const fileTypeLabel = strategy === 'code' ? 'code'
|
||||
: strategy === 'auto' ? 'syncable' : 'markdown';
|
||||
// #2156: apply --include allow-list globs first (threaded by performFullSync).
|
||||
if (opts.include && opts.include.length > 0) {
|
||||
allFiles = allFiles.filter(abs => matchesAnyGlob(relative(dir, abs), opts.include));
|
||||
}
|
||||
// #753/#774: apply --exclude glob patterns (threaded by performFullSync).
|
||||
if (opts.exclude && opts.exclude.length > 0) {
|
||||
const beforeExclude = allFiles.length;
|
||||
|
||||
+172
-12
@@ -17,7 +17,7 @@
|
||||
*/
|
||||
|
||||
import { readFileSync, writeFileSync, readdirSync, statSync, lstatSync, existsSync } from 'fs';
|
||||
import { join, relative } from 'path';
|
||||
import { join, relative, resolve } from 'path';
|
||||
import { isAborted } from '../core/abort-check.ts';
|
||||
import { parseMarkdown, type ParseValidationCode } from '../core/markdown.ts';
|
||||
import {
|
||||
@@ -26,7 +26,9 @@ import {
|
||||
DEFAULT_BYTES_WARN,
|
||||
} from '../core/content-sanity.ts';
|
||||
import { loadOperatorLiterals } from '../core/content-sanity-literals.ts';
|
||||
import { loadConfig, loadConfigWithEngine, gbrainPath } from '../core/config.ts';
|
||||
import { loadConfig, loadConfigWithEngine, toEngineConfig, gbrainPath } from '../core/config.ts';
|
||||
import { matchesAnyGlob } from '../core/sync.ts';
|
||||
import { parseGlobList } from './sync.ts';
|
||||
import type { BrainEngine } from '../core/engine.ts';
|
||||
|
||||
export interface LintIssue {
|
||||
@@ -378,21 +380,89 @@ async function resolveLintContentSanity(
|
||||
};
|
||||
}
|
||||
|
||||
/** Collect markdown files from a directory */
|
||||
function collectPages(dir: string): string[] {
|
||||
/** Collect markdown files from a directory.
|
||||
*
|
||||
* When `opts.include` or `opts.exclude` are set, each candidate `.md` path's
|
||||
* POSIX-style relative path (relative to `dir`) is matched against the same
|
||||
* glob semantics sync uses (`matchesAnyGlob`). `include` allow-lists;
|
||||
* `exclude` deny-lists. Empty or undefined arrays leave the filter
|
||||
* unengaged. Symmetric with `isSyncable` in `src/core/sync.ts` so a
|
||||
* source-config `exclude_globs` honored by `gbrain sync` is also honored
|
||||
* by `gbrain lint` against the same dir.
|
||||
*/
|
||||
function collectPages(
|
||||
dir: string,
|
||||
opts: { include?: string[]; exclude?: string[] } = {},
|
||||
): string[] {
|
||||
const { include, exclude } = opts;
|
||||
const haveInclude = !!(include && include.length > 0);
|
||||
const haveExclude = !!(exclude && exclude.length > 0);
|
||||
const pages: string[] = [];
|
||||
function walk(d: string) {
|
||||
for (const entry of readdirSync(d)) {
|
||||
if (entry.startsWith('.') || entry.startsWith('_')) continue;
|
||||
const full = join(d, entry);
|
||||
if (lstatSync(full).isDirectory()) walk(full);
|
||||
else if (entry.endsWith('.md')) pages.push(full);
|
||||
else if (entry.endsWith('.md')) {
|
||||
if (haveInclude || haveExclude) {
|
||||
// Match against the path RELATIVE to `dir` (the source root),
|
||||
// normalized to POSIX separators by matchesAnyGlob. A
|
||||
// source-config glob like `Resources/veriff/**` is anchored at
|
||||
// the source root; matching against the absolute path would
|
||||
// require the user to anchor on their `$HOME` or repo prefix,
|
||||
// which is brittle.
|
||||
const rel = relative(dir, full);
|
||||
if (haveInclude && !matchesAnyGlob(rel, include)) continue;
|
||||
if (haveExclude && matchesAnyGlob(rel, exclude)) continue;
|
||||
}
|
||||
pages.push(full);
|
||||
}
|
||||
}
|
||||
}
|
||||
walk(dir);
|
||||
return pages.sort();
|
||||
}
|
||||
|
||||
/** Look up the source row whose `local_path` resolves to the same absolute
|
||||
* directory as `target`, and return its persisted `include_globs` /
|
||||
* `exclude_globs` as parsed string arrays. Returns an empty object when no
|
||||
* matching source exists, when the row has no globs configured, or when the
|
||||
* lookup throws (best-effort — auto-resolution must never break standalone
|
||||
* lint on brains without a sources table).
|
||||
*
|
||||
* Mirrors how `syncOneSource` lifts the same fields off `src.config` before
|
||||
* threading them into `SyncOpts.include` / `SyncOpts.exclude`.
|
||||
*/
|
||||
async function resolveSourceGlobsForTarget(
|
||||
engine: BrainEngine,
|
||||
target: string,
|
||||
): Promise<{ include?: string[]; exclude?: string[] }> {
|
||||
try {
|
||||
const absTarget = resolve(target);
|
||||
const rows = await engine.executeRaw<{ config: unknown }>(
|
||||
`SELECT config FROM sources
|
||||
WHERE archived IS NOT TRUE
|
||||
AND local_path IS NOT NULL
|
||||
AND local_path = $1
|
||||
LIMIT 1`,
|
||||
[absTarget],
|
||||
);
|
||||
if (rows.length === 0) return {};
|
||||
const cfg = (rows[0].config && typeof rows[0].config === 'object')
|
||||
? rows[0].config as Record<string, unknown>
|
||||
: {};
|
||||
return {
|
||||
include: parseGlobList(cfg.include_globs),
|
||||
exclude: parseGlobList(cfg.exclude_globs),
|
||||
};
|
||||
} catch {
|
||||
// Engine not connected, sources table missing on a fresh brain, RLS
|
||||
// denial in an unusual scope — all best-effort. Lint proceeds without
|
||||
// filtering rather than fail-closed.
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
export interface LintOpts {
|
||||
target: string;
|
||||
fix?: boolean;
|
||||
@@ -414,6 +484,22 @@ export interface LintOpts {
|
||||
* yields + checks this every 200 pages.
|
||||
*/
|
||||
signal?: AbortSignal;
|
||||
/**
|
||||
* Glob filters threaded into the file walker. When set, paths relative to
|
||||
* `target` are matched against the patterns using the same semantics as
|
||||
* `gbrain sync` (`matchesAnyGlob` in `src/core/sync.ts`). `include`
|
||||
* allow-lists; `exclude` deny-lists; both unset == no filter.
|
||||
*
|
||||
* When BOTH are unset AND `engine` is provided, `runLintCore` attempts to
|
||||
* auto-resolve them from the `sources` row whose `local_path` matches
|
||||
* `target` — symmetric with `syncOneSource`, so a user who has run
|
||||
* `gbrain sources add --exclude 'Resources/veriff/**'` sees the same
|
||||
* exclusion applied to `gbrain lint <same-dir>` and to the cycle.lint
|
||||
* phase without restating it on every invocation. Explicit caller-supplied
|
||||
* arrays always win over the source-row lift.
|
||||
*/
|
||||
include?: string[];
|
||||
exclude?: string[];
|
||||
}
|
||||
|
||||
export interface LintResult {
|
||||
@@ -440,7 +526,21 @@ export async function runLintCore(opts: LintOpts): Promise<LintResult> {
|
||||
}
|
||||
|
||||
const isSingleFile = statSync(opts.target).isFile();
|
||||
const pages = isSingleFile ? [opts.target] : collectPages(opts.target);
|
||||
|
||||
// Resolve glob filters. Explicit caller-supplied include/exclude win;
|
||||
// otherwise lift from `sources.config.{include,exclude}_globs` when an
|
||||
// engine is available and the target matches a known source's local_path.
|
||||
// Single-file lints skip the resolve entirely — globs are a directory
|
||||
// walk concern.
|
||||
let include = opts.include;
|
||||
let exclude = opts.exclude;
|
||||
const haveExplicit = (include && include.length > 0) || (exclude && exclude.length > 0);
|
||||
if (!isSingleFile && !haveExplicit && opts.engine) {
|
||||
const resolved = await resolveSourceGlobsForTarget(opts.engine, opts.target);
|
||||
include = resolved.include;
|
||||
exclude = resolved.exclude;
|
||||
}
|
||||
const pages = isSingleFile ? [opts.target] : collectPages(opts.target, { include, exclude });
|
||||
|
||||
// Resolve content-sanity config once for this lint run (D1: lift DB
|
||||
// config when reachable). Caller can pre-pass via opts.contentSanity
|
||||
@@ -491,14 +591,27 @@ export async function runLintCore(opts: LintOpts): Promise<LintResult> {
|
||||
}
|
||||
|
||||
export async function runLint(args: string[]) {
|
||||
const target = args.find(a => !a.startsWith('--'));
|
||||
const target = args.find(a => !a.startsWith('--') && !args[args.indexOf(a) - 1]?.match(/^--(include|exclude)$/));
|
||||
const doFix = args.includes('--fix');
|
||||
const dryRun = args.includes('--dry-run');
|
||||
|
||||
// Parse repeatable `--include <glob>` and `--exclude <glob>` flags.
|
||||
// Symmetric with `gbrain sources add --include / --exclude` from PR #2157;
|
||||
// explicit flags here override the source-config lift performed below for
|
||||
// dir-mode lints.
|
||||
const cliInclude: string[] = [];
|
||||
const cliExclude: string[] = [];
|
||||
for (let i = 0; i < args.length; i++) {
|
||||
if (args[i] === '--include' && i + 1 < args.length) cliInclude.push(args[++i]);
|
||||
else if (args[i] === '--exclude' && i + 1 < args.length) cliExclude.push(args[++i]);
|
||||
}
|
||||
|
||||
if (!target) {
|
||||
console.error('Usage: gbrain lint <dir|file.md> [--fix] [--dry-run]');
|
||||
console.error(' --fix Auto-fix fixable issues (LLM preambles, code fences)');
|
||||
console.error(' --dry-run Preview fixes without writing');
|
||||
console.error('Usage: gbrain lint <dir|file.md> [--fix] [--dry-run] [--include <glob>]... [--exclude <glob>]...');
|
||||
console.error(' --fix Auto-fix fixable issues (LLM preambles, code fences)');
|
||||
console.error(' --dry-run Preview fixes without writing');
|
||||
console.error(' --include <glob> Repeatable; only lint paths matching at least one pattern');
|
||||
console.error(' --exclude <glob> Repeatable; skip paths matching any pattern (applied after --include)');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
@@ -510,7 +623,44 @@ export async function runLint(args: string[]) {
|
||||
// Single file or directory — print human detail as we go, then rely on
|
||||
// Core for the aggregate numbers at the end.
|
||||
const isSingleFile = statSync(target).isFile();
|
||||
const pages = isSingleFile ? [target] : collectPages(target);
|
||||
|
||||
// Resolve glob filters for directory lints. Explicit CLI flags win;
|
||||
// otherwise lift from `sources.config.{include,exclude}_globs` matching
|
||||
// `target`. Connect a transient engine for the lookup only when (a) no
|
||||
// explicit flags were passed AND (b) file/env config suggests an engine is
|
||||
// available — mirrors the connect-disconnect pattern in
|
||||
// `resolveLintContentSanity` (issue #1678: standalone CLI never shares the
|
||||
// db.ts singleton, so create + dispose here is safe).
|
||||
let runInclude: string[] | undefined = cliInclude.length > 0 ? cliInclude : undefined;
|
||||
let runExclude: string[] | undefined = cliExclude.length > 0 ? cliExclude : undefined;
|
||||
if (!isSingleFile && runInclude === undefined && runExclude === undefined) {
|
||||
const base = loadConfig();
|
||||
if (base?.database_url || base?.database_path) {
|
||||
try {
|
||||
const { createEngine } = await import('../core/engine-factory.ts');
|
||||
const { connectWithRetry } = await import('../core/db.ts');
|
||||
const engineCfg = toEngineConfig(base);
|
||||
const engine = await createEngine(engineCfg);
|
||||
try {
|
||||
// Use the same connect path the rest of the CLI uses
|
||||
// (`connectEngine` in cli.ts). `engine.connect({})` with empty
|
||||
// opts drops the URL — confirmed by direct probe. `noRetry: true`
|
||||
// keeps the standalone lint snappy (no retry tax when the brain
|
||||
// happens to be unreachable; auto-resolve degrades to no-filter).
|
||||
await connectWithRetry(engine, engineCfg, { noRetry: true });
|
||||
const lifted = await resolveSourceGlobsForTarget(engine, target);
|
||||
runInclude = lifted.include;
|
||||
runExclude = lifted.exclude;
|
||||
} finally {
|
||||
await engine.disconnect().catch(() => { /* best-effort */ });
|
||||
}
|
||||
} catch {
|
||||
// best-effort; fall through to no-filter
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const pages = isSingleFile ? [target] : collectPages(target, { include: runInclude, exclude: runExclude });
|
||||
|
||||
// Progress on stderr. Stdout keeps the per-issue human output it always had.
|
||||
const { createProgress } = await import('../core/progress.ts');
|
||||
@@ -557,7 +707,17 @@ export async function runLint(args: string[]) {
|
||||
// produces canonical numbers for the summary line).
|
||||
// Pass contentSanity through so runLintCore skips its own resolve
|
||||
// (we already resolved once for the human-detail loop above).
|
||||
const result = await runLintCore({ target, fix: doFix, dryRun, contentSanity });
|
||||
// Pass include/exclude so the aggregate scope matches the human-detail
|
||||
// walk above — otherwise the summary line reports the unfiltered count
|
||||
// even though the per-page details were already filtered.
|
||||
const result = await runLintCore({
|
||||
target,
|
||||
fix: doFix,
|
||||
dryRun,
|
||||
contentSanity,
|
||||
include: runInclude,
|
||||
exclude: runExclude,
|
||||
});
|
||||
console.log(`\n${result.pages_scanned} pages scanned. ${result.total_issues} issue(s) in ${result.pages_with_issues} page(s).`);
|
||||
if (doFix) {
|
||||
console.log(`${dryRun ? '(dry run) ' : ''}${result.total_fixed} auto-fixed.`);
|
||||
|
||||
+34
-1
@@ -122,7 +122,8 @@ async function runAdd(engine: BrainEngine, args: string[]): Promise<void> {
|
||||
if (!id) {
|
||||
console.error(
|
||||
'Usage: gbrain sources add <id> [--path <path> | --url <https-url>] ' +
|
||||
'[--name <display>] [--federated|--no-federated] [--clone-dir <path>] [--force]',
|
||||
'[--name <display>] [--federated|--no-federated] [--clone-dir <path>] [--force] ' +
|
||||
'[--include <glob>...] [--exclude <glob>...]',
|
||||
);
|
||||
process.exit(2);
|
||||
}
|
||||
@@ -135,6 +136,12 @@ async function runAdd(engine: BrainEngine, args: string[]): Promise<void> {
|
||||
let patFile: string | undefined;
|
||||
let noHarden = false;
|
||||
let force = false;
|
||||
// Repeatable. `--include 'people/**' --include 'companies/**'` accumulates.
|
||||
// Persisted into sources.config.include_globs / .exclude_globs and read at
|
||||
// sync time by commands/sync.ts so `Templates/`, `.smart-env/`, `Drafts/`
|
||||
// and other vault scaffolding can be skipped without renaming directories.
|
||||
const includeGlobs: string[] = [];
|
||||
const excludeGlobs: string[] = [];
|
||||
|
||||
for (let i = 1; i < args.length; i++) {
|
||||
const a = args[i];
|
||||
@@ -147,6 +154,24 @@ async function runAdd(engine: BrainEngine, args: string[]): Promise<void> {
|
||||
if (a === '--pat-file') { patFile = args[++i]; continue; }
|
||||
if (a === '--no-harden') { noHarden = true; continue; }
|
||||
if (a === '--force') { force = true; continue; }
|
||||
if (a === '--include') {
|
||||
const v = args[++i];
|
||||
if (!v || v.startsWith('--')) {
|
||||
console.error('Error: --include requires a glob argument (e.g. --include "people/**")');
|
||||
process.exit(2);
|
||||
}
|
||||
includeGlobs.push(v);
|
||||
continue;
|
||||
}
|
||||
if (a === '--exclude') {
|
||||
const v = args[++i];
|
||||
if (!v || v.startsWith('--')) {
|
||||
console.error('Error: --exclude requires a glob argument (e.g. --exclude "Templates/**")');
|
||||
process.exit(2);
|
||||
}
|
||||
excludeGlobs.push(v);
|
||||
continue;
|
||||
}
|
||||
console.error(`Unknown flag: ${a}`);
|
||||
process.exit(2);
|
||||
}
|
||||
@@ -167,6 +192,8 @@ async function runAdd(engine: BrainEngine, args: string[]): Promise<void> {
|
||||
federated,
|
||||
cloneDir,
|
||||
force,
|
||||
includeGlobs: includeGlobs.length > 0 ? includeGlobs : undefined,
|
||||
excludeGlobs: excludeGlobs.length > 0 ? excludeGlobs : undefined,
|
||||
});
|
||||
|
||||
// Topology A discovery: if the just-added source carries a brain-resident
|
||||
@@ -190,6 +217,12 @@ async function runAdd(engine: BrainEngine, args: string[]): Promise<void> {
|
||||
console.log(
|
||||
` federated: ${fed}${fed ? ' — appears in cross-source default search' : ' — only searched when explicitly named via --source'}`,
|
||||
);
|
||||
if (includeGlobs.length > 0) {
|
||||
console.log(` include globs: ${includeGlobs.join(', ')}`);
|
||||
}
|
||||
if (excludeGlobs.length > 0) {
|
||||
console.log(` exclude globs: ${excludeGlobs.join(', ')}`);
|
||||
}
|
||||
|
||||
// v0.42.44 — auto-harden managed clones for git durability the moment a brain
|
||||
// repo is added with a PAT. Best-effort: NEVER fail `add` if hardening fails.
|
||||
|
||||
+256
-18
@@ -1,6 +1,7 @@
|
||||
import { existsSync, readFileSync, writeFileSync, statSync, realpathSync } from 'fs';
|
||||
import { execFileSync } from 'child_process';
|
||||
import { join, relative } from 'path';
|
||||
import { createHash } from 'crypto';
|
||||
import type { BrainEngine } from '../core/engine.ts';
|
||||
import { DELETE_BATCH_SIZE } from '../core/engine-constants.ts';
|
||||
import { importFile } from '../core/import-file.ts';
|
||||
@@ -756,12 +757,23 @@ export interface SyncOpts {
|
||||
* are rejected before any git op runs.
|
||||
*/
|
||||
srcSubpath?: string;
|
||||
/**
|
||||
* #2156 — glob patterns files must match to be synced (allow-list).
|
||||
* Populated from the source row's persisted `config.include_globs`
|
||||
* (set via `gbrain sources add --include <glob>`) or the repeatable
|
||||
* `--include` CLI flag. Matched against the scope-relative path, same
|
||||
* anchoring as `exclude`. `exclude` is applied after `include`: a path
|
||||
* matching an include pattern is still rejected if it also matches an
|
||||
* exclude pattern. Empty arrays are the same as undefined (no filter).
|
||||
*/
|
||||
include?: string[];
|
||||
/**
|
||||
* #753/#774 — glob patterns for files to exclude from sync (repeatable
|
||||
* `--exclude` on the CLI). Matched against the scope-relative path in both
|
||||
* the full-sync and incremental paths. Excluded files are never imported;
|
||||
* exclusion does NOT delete previously-imported pages (conservative,
|
||||
* matching the #1433 metafile posture).
|
||||
* `--exclude` on the CLI; #2156: also populated from the source row's
|
||||
* persisted `config.exclude_globs`). Matched against the scope-relative
|
||||
* path in both the full-sync and incremental paths. Excluded files are
|
||||
* never imported; exclusion does NOT delete previously-imported pages
|
||||
* (conservative, matching the #1433 metafile posture).
|
||||
*/
|
||||
exclude?: string[];
|
||||
/**
|
||||
@@ -1153,6 +1165,29 @@ function unique<T>(items: T[]): T[] {
|
||||
// `src/core/sync-delta.ts` (re-imported below) so the inline cost estimator
|
||||
// prices detached sources through the same code the executor imports them with.
|
||||
|
||||
/**
|
||||
* Defensive parse for the JSONB-loaded `config.include_globs` / `config.exclude_globs`
|
||||
* arrays read off the sources row. The column is a free-form JSONB and could
|
||||
* contain anything — coerce to a string-only array, drop empties, and return
|
||||
* undefined when the result has no useful entries so the caller can decide
|
||||
* not to engage glob-filtering at all.
|
||||
*/
|
||||
export function parseGlobList(value: unknown): string[] | undefined {
|
||||
if (!Array.isArray(value)) return undefined;
|
||||
const globs = value.filter((v): v is string => typeof v === 'string' && v.length > 0);
|
||||
return globs.length > 0 ? globs : undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* Union of CLI-supplied glob patterns (one-off, this invocation) and the
|
||||
* source row's persisted config globs (every sync). Deduped; undefined when
|
||||
* neither side has entries so `SyncOpts` stays unset and no filter engages.
|
||||
*/
|
||||
export function mergeGlobs(cli: string[], persisted: string[] | undefined): string[] | undefined {
|
||||
const merged = [...new Set([...cli, ...(persisted ?? [])])];
|
||||
return merged.length > 0 ? merged : undefined;
|
||||
}
|
||||
|
||||
// v0.18.0 Step 5: source-scoped sync state helpers. When opts.sourceId
|
||||
// is set, read/write the per-source row instead of the global config
|
||||
// keys. These wrappers centralize the branch so every read/write site
|
||||
@@ -1315,6 +1350,125 @@ async function writeChunkerVersion(
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* #2157 follow-on: detect when sources.config has shifted in a way that
|
||||
* affects which paths the walker will include this run. The "Already up
|
||||
* to date" gate at performSync's git-HEAD equality check honored chunker
|
||||
* version match but ignored config drift — a user who changes
|
||||
* `sources.config.exclude_globs` mid-life got "Already up to date" on
|
||||
* the next sync because git HEAD was unchanged, with no observable
|
||||
* effect until `gbrain sync --full`.
|
||||
*
|
||||
* Fingerprint covers exactly the walk-affecting fields that flow from
|
||||
* `sources.config` into `SyncOpts` at the syncOneSource call site:
|
||||
* `strategy`, `include_globs`, `exclude_globs`. CLI-supplied --include
|
||||
* / --exclude overrides do NOT participate — they are one-off scope
|
||||
* changes, not source state, and shouldn't invalidate the row's
|
||||
* checkpoint. (A user running `gbrain sync --exclude X` on a row whose
|
||||
* stored config has no X is intentionally narrowing this one pass; on
|
||||
* the next no-flags sync, the row config governs again.)
|
||||
*
|
||||
* Array order is normalized (alphabetical, post-defensive-parse) so
|
||||
* `["a/**", "b/**"]` and `["b/**", "a/**"]` fingerprint identically.
|
||||
* `parseGlobList` shares the same defensive coercion as the call site
|
||||
* that builds SyncOpts, so hand-edited or pre-normalization rows
|
||||
* fingerprint to the same shape the walker actually sees.
|
||||
*/
|
||||
export function computeSourceConfigFingerprint(rawConfig: unknown): string {
|
||||
const cfg = (rawConfig || {}) as {
|
||||
strategy?: unknown;
|
||||
include_globs?: unknown;
|
||||
exclude_globs?: unknown;
|
||||
};
|
||||
const canonical = JSON.stringify({
|
||||
strategy: typeof cfg.strategy === 'string' ? cfg.strategy : null,
|
||||
include_globs: (parseGlobList(cfg.include_globs) ?? []).slice().sort(),
|
||||
exclude_globs: (parseGlobList(cfg.exclude_globs) ?? []).slice().sort(),
|
||||
});
|
||||
return createHash('sha256').update(canonical).digest('hex');
|
||||
}
|
||||
|
||||
/**
|
||||
* Read the per-source fingerprint stamp. NULL on pre-migration rows or
|
||||
* sources that have never been synced — the gate treats NULL as
|
||||
* "fingerprint unknown" and skips the invalidation check so first-time
|
||||
* post-upgrade syncs don't spuriously force-full.
|
||||
*/
|
||||
export async function readConfigFingerprint(
|
||||
engine: BrainEngine,
|
||||
sourceId: string | undefined,
|
||||
): Promise<string | null> {
|
||||
if (!sourceId) return null;
|
||||
const rows = await engine.executeRaw<{ config_fingerprint: string | null }>(
|
||||
`SELECT config_fingerprint FROM sources WHERE id = $1`,
|
||||
[sourceId],
|
||||
);
|
||||
return rows[0]?.config_fingerprint ?? null;
|
||||
}
|
||||
|
||||
export async function writeConfigFingerprint(
|
||||
engine: BrainEngine,
|
||||
sourceId: string | undefined,
|
||||
fingerprint: string,
|
||||
): Promise<void> {
|
||||
if (!sourceId) return;
|
||||
await engine.executeRaw(
|
||||
`UPDATE sources SET config_fingerprint = $1 WHERE id = $2`,
|
||||
[fingerprint, sourceId],
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Read the raw `sources.config` value for the named source. Returns an
|
||||
* empty object for missing or never-configured rows. The reader is
|
||||
* defensive about legacy double-encoded JSONB rows (`{"federated":true}`
|
||||
* stored as a JSON string scalar, the #2339 class) — the engine's
|
||||
* `r.config` may arrive as either a string or an object, and both are
|
||||
* normalized to an object before the fingerprint computation walks the
|
||||
* keys.
|
||||
*/
|
||||
async function readSourceConfig(
|
||||
engine: BrainEngine,
|
||||
sourceId: string | undefined,
|
||||
): Promise<unknown> {
|
||||
if (!sourceId) return {};
|
||||
const rows = await engine.executeRaw<{ config: unknown }>(
|
||||
`SELECT config FROM sources WHERE id = $1`,
|
||||
[sourceId],
|
||||
);
|
||||
const raw = rows[0]?.config;
|
||||
if (raw === null || raw === undefined) return {};
|
||||
if (typeof raw === 'string') {
|
||||
try { return JSON.parse(raw); } catch { return {}; }
|
||||
}
|
||||
return raw;
|
||||
}
|
||||
|
||||
/**
|
||||
* Read-hash-stamp wrapper for sync-completion sites outside the gate's
|
||||
* scope (e.g. `performFullSync`'s `advanceFull` closure, which doesn't
|
||||
* see `performSync`'s cached `currentConfigFp` because it's a separate
|
||||
* function). Reads the row's current config and stamps a fresh
|
||||
* fingerprint.
|
||||
*
|
||||
* Race note: if `sources.config` was mutated between the gate's read
|
||||
* and this stamp, the freshly-read value wins. The walker still used
|
||||
* the gate-time effective globs (already captured into `opts.include` /
|
||||
* `opts.exclude` upstream), so the stamp can drift from what was
|
||||
* actually walked. In practice mid-sync mutations are rare and the
|
||||
* NEXT sync will re-evaluate against the latest config anyway, so the
|
||||
* minor staleness is acceptable and avoids threading the gate-time
|
||||
* fingerprint through every helper signature.
|
||||
*/
|
||||
async function stampSourceConfigFingerprint(
|
||||
engine: BrainEngine,
|
||||
sourceId: string | undefined,
|
||||
): Promise<void> {
|
||||
if (!sourceId) return;
|
||||
const cfg = await readSourceConfig(engine, sourceId);
|
||||
await writeConfigFingerprint(engine, sourceId, computeSourceConfigFingerprint(cfg));
|
||||
}
|
||||
|
||||
/**
|
||||
* v0.40 Federated Sync v2: `gbrain sync trigger --source <id> [--priority high|normal|low]`
|
||||
*
|
||||
@@ -2163,7 +2317,25 @@ async function performSyncInner(engine: BrainEngine, opts: SyncOpts): Promise<Sy
|
||||
detachedWorkingTreeManifest.deleted.length > 0 ||
|
||||
detachedWorkingTreeManifest.renamed.length > 0);
|
||||
|
||||
if (lastCommit === headCommit && !versionMismatch && !versionNeverSet && !hasDetachedWorkingTreeChanges) {
|
||||
// #2157 follow-on: parallel gate for sources.config drift. Without
|
||||
// this, changing `sources.config.exclude_globs` (or include_globs /
|
||||
// strategy) on a synced source had no observable effect on the next
|
||||
// sync because git HEAD was unchanged — the "Already up to date"
|
||||
// branch below returned without re-walking. Mismatch path mirrors the
|
||||
// chunker_version gate exactly so both kinds of drift route through
|
||||
// the same `performFullSync` recovery.
|
||||
//
|
||||
// NULL stored fingerprint is "never stamped" (pre-v125 brain OR fresh
|
||||
// source whose first sync hasn't completed yet). Treated as
|
||||
// pass-through in the up-to-date check — first post-upgrade sync
|
||||
// stamps the column quietly so subsequent passes have a baseline.
|
||||
const storedConfigFp = await readConfigFingerprint(engine, opts.sourceId);
|
||||
const currentSourceConfig = await readSourceConfig(engine, opts.sourceId);
|
||||
const currentConfigFp = computeSourceConfigFingerprint(currentSourceConfig);
|
||||
const configMismatch = storedConfigFp !== null && storedConfigFp !== currentConfigFp;
|
||||
const configNeverStamped = storedConfigFp === null && opts.sourceId !== undefined;
|
||||
|
||||
if (lastCommit === headCommit && !versionMismatch && !versionNeverSet && !hasDetachedWorkingTreeChanges && !configMismatch) {
|
||||
// v0.42.52.0 (PR #22xx): bump last_sync_at as a heartbeat on every successful
|
||||
// 0-changes sync. D4 invariant ("never advance last_commit on partial") is
|
||||
// preserved: last_sync_at is a monitoring signal (doctor sync_freshness
|
||||
@@ -2176,6 +2348,14 @@ async function performSyncInner(engine: BrainEngine, opts: SyncOpts): Promise<Sy
|
||||
[opts.sourceId],
|
||||
);
|
||||
}
|
||||
// First post-upgrade sync on a pre-v125 brain lands here with
|
||||
// configNeverStamped=true; stamp the fingerprint so the gate has a
|
||||
// baseline for the NEXT pass. A spurious re-walk on the upgrade
|
||||
// pass would surprise users; quietly establishing the baseline does
|
||||
// not.
|
||||
if (configNeverStamped) {
|
||||
await writeConfigFingerprint(engine, opts.sourceId, currentConfigFp);
|
||||
}
|
||||
return {
|
||||
status: 'up_to_date',
|
||||
fromCommit: lastCommit,
|
||||
@@ -2187,13 +2367,21 @@ async function performSyncInner(engine: BrainEngine, opts: SyncOpts): Promise<Sy
|
||||
};
|
||||
}
|
||||
|
||||
if ((versionMismatch || versionNeverSet) && lastCommit === headCommit) {
|
||||
if ((versionMismatch || versionNeverSet || configMismatch) && lastCommit === headCommit) {
|
||||
const reasons: string[] = [];
|
||||
if (versionMismatch || versionNeverSet) {
|
||||
reasons.push(`chunker_version=${storedVersion ?? 'unset'}→${currentVersion}`);
|
||||
}
|
||||
if (configMismatch) {
|
||||
reasons.push(`config_fingerprint=${storedConfigFp?.slice(0, 8)}→${currentConfigFp.slice(0, 8)}`);
|
||||
}
|
||||
slog(
|
||||
`[sync] chunker_version gate: stored=${storedVersion ?? 'unset'}, current=${currentVersion}. ` +
|
||||
`Forcing full re-chunk pass (git HEAD unchanged but pipeline version advanced).`,
|
||||
`[sync] full re-walk forced (${reasons.join(', ')}): ` +
|
||||
`git HEAD unchanged but a walk-affecting setting advanced.`,
|
||||
);
|
||||
const result = await performFullSync(engine, fullSyncRoots, headCommit, opts);
|
||||
await writeChunkerVersion(engine, opts.sourceId, currentVersion);
|
||||
await writeConfigFingerprint(engine, opts.sourceId, currentConfigFp);
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -2237,8 +2425,16 @@ async function performSyncInner(engine: BrainEngine, opts: SyncOpts): Promise<Sy
|
||||
scoped && p.startsWith(syncScopeRelPath + '/') ? p.slice(syncScopeRelPath.length + 1) : p;
|
||||
const excluded = (p: string): boolean =>
|
||||
opts.exclude !== undefined && opts.exclude.length > 0 && matchesAnyGlob(scopeRel(p), opts.exclude);
|
||||
// #2156: include globs are an allow-list, same scope-relative anchoring as
|
||||
// exclude. Populated from the source row's persisted config.include_globs
|
||||
// (or CLI --include). Deliberately NOT threaded into syncOpts/isSyncable:
|
||||
// the unsyncable-cleanup loop below deletes pages for non-metafile
|
||||
// classifications, and glob filtering must stay conservative (never delete
|
||||
// previously-imported pages — the documented #1433 posture for --exclude).
|
||||
const included = (p: string): boolean =>
|
||||
opts.include === undefined || opts.include.length === 0 || matchesAnyGlob(scopeRel(p), opts.include);
|
||||
|
||||
// Filter to syncable files (strategy-aware + scope-aware + exclude-aware)
|
||||
// Filter to syncable files (strategy-aware + scope-aware + glob-aware)
|
||||
const syncOpts = opts.strategy ? { strategy: opts.strategy } : undefined;
|
||||
// #1970 (F-C): a rename whose DESTINATION is unsyncable drops out of BOTH
|
||||
// `renamed` (only `r.to` is kept below) AND `deleted` (git emits it as `R`,
|
||||
@@ -2252,13 +2448,13 @@ async function performSyncInner(engine: BrainEngine, opts: SyncOpts): Promise<Sy
|
||||
!(inScope(r.to) && isSyncable(r.to, syncOpts)))
|
||||
.map(r => r.from);
|
||||
const filtered: SyncManifest = {
|
||||
added: manifest.added.filter(p => inScope(p) && !excluded(p) && isSyncable(p, syncOpts)),
|
||||
modified: manifest.modified.filter(p => inScope(p) && !excluded(p) && isSyncable(p, syncOpts)),
|
||||
added: manifest.added.filter(p => inScope(p) && included(p) && !excluded(p) && isSyncable(p, syncOpts)),
|
||||
modified: manifest.modified.filter(p => inScope(p) && included(p) && !excluded(p) && isSyncable(p, syncOpts)),
|
||||
deleted: unique([
|
||||
...manifest.deleted.filter(p => inScope(p) && isSyncable(p, syncOpts)),
|
||||
...renamedToUnsyncable,
|
||||
]),
|
||||
renamed: manifest.renamed.filter(r => inScope(r.to) && !excluded(r.to) && isSyncable(r.to, syncOpts)),
|
||||
renamed: manifest.renamed.filter(r => inScope(r.to) && included(r.to) && !excluded(r.to) && isSyncable(r.to, syncOpts)),
|
||||
};
|
||||
|
||||
// NAV-4: warn when --exclude filtered out every candidate change — almost
|
||||
@@ -2355,6 +2551,7 @@ async function performSyncInner(engine: BrainEngine, opts: SyncOpts): Promise<Sy
|
||||
await writeSyncAnchor(engine, opts.sourceId, 'last_commit', pin, commitTimeMs(gitContextRoot, pin));
|
||||
await engine.setConfig('sync.last_run', new Date().toISOString());
|
||||
await writeChunkerVersion(engine, opts.sourceId, String(CHUNKER_VERSION));
|
||||
await writeConfigFingerprint(engine, opts.sourceId, currentConfigFp);
|
||||
await clearOpCheckpoint(engine, ckpt.paths);
|
||||
await clearOpCheckpoint(engine, ckpt.target);
|
||||
return {
|
||||
@@ -3179,6 +3376,7 @@ async function performSyncInner(engine: BrainEngine, opts: SyncOpts): Promise<Sy
|
||||
await engine.setConfig('sync.last_run', new Date().toISOString());
|
||||
await writeSyncAnchor(engine, opts.sourceId, 'repo_path', anchorPath);
|
||||
await writeChunkerVersion(engine, opts.sourceId, String(CHUNKER_VERSION));
|
||||
await writeConfigFingerprint(engine, opts.sourceId, currentConfigFp);
|
||||
await clearOpCheckpoint(engine, ckpt.paths);
|
||||
await clearOpCheckpoint(engine, ckpt.target);
|
||||
};
|
||||
@@ -3430,6 +3628,9 @@ async function performFullSync(
|
||||
// files were waiting.
|
||||
if (opts.dryRun) {
|
||||
let allFiles = collectSyncableFiles(syncScopeRoot, { strategy: opts.strategy ?? 'markdown' });
|
||||
if (opts.include && opts.include.length > 0) {
|
||||
allFiles = allFiles.filter(abs => matchesAnyGlob(relative(syncScopeRoot, abs), opts.include));
|
||||
}
|
||||
if (opts.exclude && opts.exclude.length > 0) {
|
||||
allFiles = allFiles.filter(abs => !matchesAnyGlob(relative(syncScopeRoot, abs), opts.exclude));
|
||||
}
|
||||
@@ -3475,6 +3676,7 @@ async function performFullSync(
|
||||
commit: headCommit,
|
||||
strategy: opts.strategy,
|
||||
sourceId: opts.sourceId,
|
||||
include: opts.include,
|
||||
exclude: opts.exclude,
|
||||
slugRoot,
|
||||
// issue #1939: performFullSync owns the failure ledger + bookmark via the
|
||||
@@ -3504,6 +3706,7 @@ async function performFullSync(
|
||||
await engine.setConfig('sync.last_run', new Date().toISOString());
|
||||
await writeSyncAnchor(engine, opts.sourceId, 'repo_path', anchorPath);
|
||||
await writeChunkerVersion(engine, opts.sourceId, String(CHUNKER_VERSION));
|
||||
await stampSourceConfigFingerprint(engine, opts.sourceId);
|
||||
};
|
||||
|
||||
const fullGate = await applySyncFailureGate({
|
||||
@@ -3967,8 +4170,12 @@ Options:
|
||||
run at the repo root; imports are scoped to the subdir
|
||||
and slugs stay root-relative (wiki/page1). Passing the
|
||||
subdirectory directly as --repo also works.
|
||||
--include <glob> Only sync files matching at least one glob (repeatable;
|
||||
matched against the scope-relative path). Merged with
|
||||
the source's persisted config.include_globs.
|
||||
--exclude <glob> Exclude files matching the glob from sync (repeatable;
|
||||
matched against the scope-relative path).
|
||||
matched against the scope-relative path; applied after
|
||||
--include). Merged with config.exclude_globs.
|
||||
--dry-run Show what would be synced without writing.
|
||||
--skip-failed Acknowledge previously-recorded sync failures so
|
||||
the bookmark can advance past unparseable files.
|
||||
@@ -4129,14 +4336,17 @@ See also:
|
||||
}
|
||||
const strategyArg = args.find((a, i) => args[i - 1] === '--strategy') as SyncOpts['strategy'] | undefined;
|
||||
// #753/#774: monorepo subdir-source flags. --exclude is repeatable.
|
||||
// #2156: --include is the allow-list counterpart, same repeatable shape.
|
||||
const srcSubpath = args.find((a, i) => args[i - 1] === '--src-subpath') || undefined;
|
||||
const excludePatterns: string[] = [];
|
||||
const includePatterns: string[] = [];
|
||||
for (let i = 0; i < args.length; i++) {
|
||||
if (args[i] === '--exclude' && i + 1 < args.length) excludePatterns.push(args[i + 1]);
|
||||
if (args[i] === '--include' && i + 1 < args.length) includePatterns.push(args[i + 1]);
|
||||
}
|
||||
if (syncAll && (srcSubpath || excludePatterns.length > 0)) {
|
||||
if (syncAll && (srcSubpath || excludePatterns.length > 0 || includePatterns.length > 0)) {
|
||||
console.error(
|
||||
`--src-subpath/--exclude scope a single sync invocation; they cannot be combined with --all. ` +
|
||||
`--src-subpath/--include/--exclude scope a single sync invocation; they cannot be combined with --all. ` +
|
||||
`For --all runs, register the subdirectory as the source's local_path instead ` +
|
||||
`(gbrain sources add <id> --path <repo>/<subdir>).`,
|
||||
);
|
||||
@@ -4337,7 +4547,11 @@ See also:
|
||||
const onAllSigint = () => { try { allInterrupt.abort(new Error('SIGINT')); } catch { /* */ } };
|
||||
|
||||
const runOne = async (src: typeof sources[number]): Promise<SyncResult> => {
|
||||
const cfg = (src.config || {}) as { strategy?: 'markdown' | 'code' | 'auto' };
|
||||
const cfg = (src.config || {}) as {
|
||||
strategy?: 'markdown' | 'code' | 'auto';
|
||||
include_globs?: unknown;
|
||||
exclude_globs?: unknown;
|
||||
};
|
||||
// D18: parallel path defers embed; auto-enqueue embed-backfill after.
|
||||
// v0.42.42.0 (#2139): `autoDeferEmbeds` (the inline gate tripped in a
|
||||
// non-TTY session) ALSO forces deferral — global by design (the gate's
|
||||
@@ -4375,6 +4589,8 @@ See also:
|
||||
skipFailed, retryFailed, noSchemaPack,
|
||||
sourceId: src.id,
|
||||
strategy: cfg.strategy,
|
||||
include: parseGlobList(cfg.include_globs),
|
||||
exclude: parseGlobList(cfg.exclude_globs),
|
||||
concurrency,
|
||||
signal: composeAbortSignals(allInterrupt.signal, controller?.signal),
|
||||
};
|
||||
@@ -4586,11 +4802,27 @@ See also:
|
||||
// lock released by its own finally) instead of a hard cut.
|
||||
const singleSourceInterrupt = new AbortController();
|
||||
const onSingleSourceSigint = () => { try { singleSourceInterrupt.abort(new Error('SIGINT')); } catch { /* */ } };
|
||||
// Read persisted include/exclude globs from the source row, mirroring the
|
||||
// --all fan-out's `runOne` closure above. Best-effort: a fetch failure
|
||||
// falls through to "no glob filters", preserving pre-existing behavior.
|
||||
// sourceId is always set here (resolveSourceWithTier ran above), so this
|
||||
// path never silently runs without source-config awareness.
|
||||
let sourceCfg: { include_globs?: unknown; exclude_globs?: unknown } = {};
|
||||
try {
|
||||
const { fetchSource } = await import('../core/sources-load.ts');
|
||||
const src = await fetchSource(engine, sourceId);
|
||||
if (src?.config && typeof src.config === 'object') {
|
||||
sourceCfg = src.config as { include_globs?: unknown; exclude_globs?: unknown };
|
||||
}
|
||||
} catch { /* fall through to no filters */ }
|
||||
const opts: SyncOpts = {
|
||||
repoPath, dryRun, full, noPull, noEmbed, noExtract, skipFailed, retryFailed, noSchemaPack, sourceId,
|
||||
strategy: strategyArg, concurrency,
|
||||
srcSubpath,
|
||||
exclude: excludePatterns.length > 0 ? excludePatterns : undefined,
|
||||
// #2156: union of the repeatable CLI flags (one-off, this invocation
|
||||
// only) and the source row's persisted config globs (every sync).
|
||||
include: mergeGlobs(includePatterns, parseGlobList(sourceCfg.include_globs)),
|
||||
exclude: mergeGlobs(excludePatterns, parseGlobList(sourceCfg.exclude_globs)),
|
||||
signal: composeAbortSignals(singleSourceInterrupt.signal, singleSourceController?.signal),
|
||||
};
|
||||
|
||||
@@ -4818,7 +5050,11 @@ export async function syncOneSource(
|
||||
noExtract?: boolean;
|
||||
},
|
||||
): Promise<{ result: SyncResult; log: string }> {
|
||||
const cfg = (src.config || {}) as { strategy?: 'markdown' | 'code' | 'auto' };
|
||||
const cfg = (src.config || {}) as {
|
||||
strategy?: 'markdown' | 'code' | 'auto';
|
||||
include_globs?: unknown;
|
||||
exclude_globs?: unknown;
|
||||
};
|
||||
const log = `\n--- Syncing source: ${src.name} ---\n`;
|
||||
const repoOpts: SyncOpts = {
|
||||
repoPath: src.local_path!,
|
||||
@@ -4832,6 +5068,8 @@ export async function syncOneSource(
|
||||
noSchemaPack: shared.noSchemaPack,
|
||||
sourceId: src.id,
|
||||
strategy: cfg.strategy,
|
||||
include: parseGlobList(cfg.include_globs),
|
||||
exclude: parseGlobList(cfg.exclude_globs),
|
||||
concurrency: shared.concurrency,
|
||||
// lockId defaults to `gbrain-sync:${src.id}` via the invariant in
|
||||
// performSync (no explicit override needed — sourceId triggers it).
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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`.',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -5671,6 +5671,32 @@ export const MIGRATIONS: Migration[] = [
|
||||
`);
|
||||
},
|
||||
},
|
||||
{
|
||||
version: 125,
|
||||
name: 'sources_config_fingerprint',
|
||||
// #2157 follow-on: the "Already up to date" gate at sync.ts honors
|
||||
// git-HEAD equality + chunker-version match but ignored source-config
|
||||
// drift. A user who runs `gbrain sources add default --exclude
|
||||
// 'Templates/**'` AFTER an initial sync got "Already up to date" on
|
||||
// the next pass because git HEAD was unchanged — the new exclusion
|
||||
// never reached the walk until `gbrain sync --full`.
|
||||
//
|
||||
// This column caches a SHA-256 fingerprint of the walk-affecting
|
||||
// fields in `sources.config` (strategy + include_globs +
|
||||
// exclude_globs); mismatches trigger a full re-walk via the same code
|
||||
// path as a chunker_version bump.
|
||||
//
|
||||
// NULL on pre-migration rows is treated as "not yet stamped" by
|
||||
// readConfigFingerprint, so the FIRST sync after upgrade is normal
|
||||
// (no spurious force-full just because the column was added).
|
||||
//
|
||||
// Keep in sync with src/schema.sql and src/core/schema-embedded.ts.
|
||||
idempotent: true,
|
||||
sql: `
|
||||
ALTER TABLE sources
|
||||
ADD COLUMN IF NOT EXISTS config_fingerprint TEXT;
|
||||
`,
|
||||
},
|
||||
];
|
||||
|
||||
export const LATEST_VERSION = MIGRATIONS.length > 0
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -39,6 +39,13 @@ CREATE TABLE IF NOT EXISTS sources (
|
||||
-- bypassing the git-HEAD up_to_date early-return so CHUNKER_VERSION bumps
|
||||
-- actually trigger re-chunking on upgrade.
|
||||
chunker_version TEXT,
|
||||
-- #2157 follow-on: SHA-256 fingerprint of the walk-affecting fields in
|
||||
-- \`config\` (strategy + include_globs + exclude_globs). Mismatch forces a
|
||||
-- full re-walk via the same code path as chunker_version, so a user who
|
||||
-- changes \`sources.config.exclude_globs\` mid-life doesn't get "Already up
|
||||
-- to date" on the next sync. NULL on pre-migration rows is treated as
|
||||
-- "not yet stamped" and skips the gate (preserves first-run semantics).
|
||||
config_fingerprint TEXT,
|
||||
-- v0.26.5: soft-delete + recovery window. \`archive\` flips archived=true and
|
||||
-- sets archive_expires_at = now() + 72h. The autopilot purge phase
|
||||
-- hard-deletes rows where archive_expires_at <= now(). Promoted from a
|
||||
|
||||
@@ -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
|
||||
// ============================================================
|
||||
|
||||
@@ -155,6 +155,19 @@ export interface AddSourceOpts {
|
||||
* runs). Does NOT auto-`git init` anything — see `addSource` docstring.
|
||||
*/
|
||||
force?: boolean;
|
||||
/**
|
||||
* Glob filters persisted into `sources.config.include_globs` /
|
||||
* `sources.config.exclude_globs`. Read at sync time by
|
||||
* `commands/sync.ts:syncOneSource` and the single-source path, threaded
|
||||
* into `isSyncable` / `unsyncableReason` (their `SyncableOptions` shape
|
||||
* has carried this contract since v0.41.13).
|
||||
*
|
||||
* Empty / unspecified arrays are not persisted at all (no `[]` written
|
||||
* to the JSONB), which keeps the row identical to today for sources
|
||||
* that don't use filtering.
|
||||
*/
|
||||
includeGlobs?: string[];
|
||||
excludeGlobs?: string[];
|
||||
}
|
||||
|
||||
export interface RemoveSourceOpts {
|
||||
@@ -429,6 +442,12 @@ export async function addSource(
|
||||
if (opts.federated !== null && opts.federated !== undefined) {
|
||||
config.federated = opts.federated;
|
||||
}
|
||||
if (opts.includeGlobs && opts.includeGlobs.length > 0) {
|
||||
config.include_globs = opts.includeGlobs;
|
||||
}
|
||||
if (opts.excludeGlobs && opts.excludeGlobs.length > 0) {
|
||||
config.exclude_globs = opts.excludeGlobs;
|
||||
}
|
||||
const displayName = opts.name ?? opts.id;
|
||||
|
||||
try {
|
||||
@@ -508,6 +527,12 @@ export async function addSource(
|
||||
if (opts.federated !== null && opts.federated !== undefined) {
|
||||
config.federated = opts.federated;
|
||||
}
|
||||
if (opts.includeGlobs && opts.includeGlobs.length > 0) {
|
||||
config.include_globs = opts.includeGlobs;
|
||||
}
|
||||
if (opts.excludeGlobs && opts.excludeGlobs.length > 0) {
|
||||
config.exclude_globs = opts.excludeGlobs;
|
||||
}
|
||||
const displayName = opts.name ?? opts.id;
|
||||
await engine.executeRaw(
|
||||
`INSERT INTO sources (id, name, local_path, config)
|
||||
|
||||
@@ -219,6 +219,13 @@ function globToRegex(pattern: string): RegExp {
|
||||
return new RegExp(regex);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test a normalized POSIX-style path against an array of glob patterns. Returns
|
||||
* true if any pattern matches. Empty / undefined `patterns` returns false (no
|
||||
* filter engaged). Exported so non-sync surfaces (lint walker, future ingest
|
||||
* variants) can apply the same glob semantics as `isSyncable` without
|
||||
* re-declaring `globToRegex`.
|
||||
*/
|
||||
export function matchesAnyGlob(path: string, patterns?: string[]): boolean {
|
||||
if (!patterns || patterns.length === 0) return false;
|
||||
const normalized = path.replace(/\\/g, '/');
|
||||
|
||||
@@ -35,6 +35,13 @@ CREATE TABLE IF NOT EXISTS sources (
|
||||
-- bypassing the git-HEAD up_to_date early-return so CHUNKER_VERSION bumps
|
||||
-- actually trigger re-chunking on upgrade.
|
||||
chunker_version TEXT,
|
||||
-- #2157 follow-on: SHA-256 fingerprint of the walk-affecting fields in
|
||||
-- `config` (strategy + include_globs + exclude_globs). Mismatch forces a
|
||||
-- full re-walk via the same code path as chunker_version, so a user who
|
||||
-- changes `sources.config.exclude_globs` mid-life doesn't get "Already up
|
||||
-- to date" on the next sync. NULL on pre-migration rows is treated as
|
||||
-- "not yet stamped" and skips the gate (preserves first-run semantics).
|
||||
config_fingerprint TEXT,
|
||||
-- v0.26.5: soft-delete + recovery window. `archive` flips archived=true and
|
||||
-- sets archive_expires_at = now() + 72h. The autopilot purge phase
|
||||
-- hard-deletes rows where archive_expires_at <= now(). Promoted from a
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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');
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,153 @@
|
||||
/**
|
||||
* `gbrain lint` source-glob filter — walker integration.
|
||||
*
|
||||
* PR #2157 (commit cf9a3b18, `feat/sync-source-glob-filters`) wired
|
||||
* `sources.config.include_globs` / `exclude_globs` into `gbrain sync` so a
|
||||
* user could exclude `Resources/veriff/**` and have every subsequent sync
|
||||
* honor it. The lint command walked the same source dirs blind and emitted
|
||||
* findings against paths the user had already declared out of scope — a
|
||||
* half-finished feature.
|
||||
*
|
||||
* This patch extends the same persisted glob contract to lint:
|
||||
* - `gbrain lint` gains `--include / --exclude` flags (parallel to sync).
|
||||
* - `runLintCore` lifts `sources.config.{include,exclude}_globs` for any
|
||||
* target whose absolute path matches a source row's `local_path`, so the
|
||||
* cycle.lint phase + Minion lint handlers honor the same filter without
|
||||
* restating it.
|
||||
* - The walker in `collectPages` applies the filter using the SAME
|
||||
* `matchesAnyGlob` helper sync uses, anchored at the target dir (so a
|
||||
* persisted `Resources/veriff/**` glob written against the source root
|
||||
* works without rewriting it as an absolute path).
|
||||
*
|
||||
* These tests pin the walker contract. The engine-side lift
|
||||
* (`resolveSourceGlobsForTarget`) is best-effort by design (returns `{}` on
|
||||
* any error) and is exercised by the dream-cycle lint phase end-to-end.
|
||||
*/
|
||||
|
||||
import { describe, test, expect, beforeAll, afterAll } from 'bun:test';
|
||||
import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'fs';
|
||||
import { join } from 'path';
|
||||
import { tmpdir } from 'os';
|
||||
|
||||
// runLintCore is the library entry — the same surface the cycle.lint phase
|
||||
// and Minion handlers call. Exercising it covers the walker via its real
|
||||
// callsite; testing `collectPages` directly would skip the wiring.
|
||||
import { runLintCore } from '../src/commands/lint.ts';
|
||||
|
||||
// A self-contained content-sanity stub so the test never touches a real
|
||||
// engine / config file. Empty operator-literal list keeps the content-sanity
|
||||
// pass silent so the only findings come from the structural rules
|
||||
// (no-frontmatter etc.).
|
||||
const STUB_CS = {
|
||||
fail_on_throw: false,
|
||||
warn_on_throw: false,
|
||||
bytes_warn: 1024 * 1024,
|
||||
operator_literals: [],
|
||||
};
|
||||
|
||||
describe('runLintCore — source-glob walker filter', () => {
|
||||
let root: string;
|
||||
|
||||
beforeAll(() => {
|
||||
root = mkdtempSync(join(tmpdir(), 'gbrain-lint-globs-'));
|
||||
// Three subtrees with mixed structured / archive-style content.
|
||||
// All pages have `# Title` headers but no frontmatter so each one
|
||||
// emits at least one `no-frontmatter` issue under the default rule set.
|
||||
mkdirSync(join(root, 'Notes'), { recursive: true });
|
||||
mkdirSync(join(root, 'Resources', 'veriff'), { recursive: true });
|
||||
mkdirSync(join(root, 'Resources', 'prior-art', 'archive-v1'), { recursive: true });
|
||||
|
||||
writeFileSync(join(root, 'Notes', 'a.md'), '# A\nbody\n');
|
||||
writeFileSync(join(root, 'Notes', 'b.md'), '# B\nbody\n');
|
||||
writeFileSync(join(root, 'Resources', 'veriff', 'spec-1.md'), '# Veriff spec 1\nbody\n');
|
||||
writeFileSync(join(root, 'Resources', 'veriff', 'spec-2.md'), '# Veriff spec 2\nbody\n');
|
||||
writeFileSync(join(root, 'Resources', 'prior-art', 'archive-v1', 'old.md'), '# Old\nbody\n');
|
||||
});
|
||||
|
||||
afterAll(() => {
|
||||
rmSync(root, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
test('no filter — walks every .md (regression guard for default behavior)', async () => {
|
||||
const result = await runLintCore({
|
||||
target: root,
|
||||
contentSanity: STUB_CS,
|
||||
});
|
||||
expect(result.pages_scanned).toBe(5);
|
||||
expect(result.pages_with_issues).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
test('exclude glob skips matching paths (Resources/veriff/** off-limits)', async () => {
|
||||
const result = await runLintCore({
|
||||
target: root,
|
||||
contentSanity: STUB_CS,
|
||||
exclude: ['Resources/veriff/**'],
|
||||
});
|
||||
// 5 total minus 2 veriff specs = 3 pages walked.
|
||||
expect(result.pages_scanned).toBe(3);
|
||||
});
|
||||
|
||||
test('exclude with multiple patterns is union (veriff + prior-art both skipped)', async () => {
|
||||
const result = await runLintCore({
|
||||
target: root,
|
||||
contentSanity: STUB_CS,
|
||||
exclude: ['Resources/veriff/**', 'Resources/prior-art/**'],
|
||||
});
|
||||
// 5 total minus 3 (2 veriff + 1 archive-v1) = 2 pages walked.
|
||||
expect(result.pages_scanned).toBe(2);
|
||||
});
|
||||
|
||||
test('include glob narrows the walk to matching paths only', async () => {
|
||||
const result = await runLintCore({
|
||||
target: root,
|
||||
contentSanity: STUB_CS,
|
||||
include: ['Notes/**'],
|
||||
});
|
||||
expect(result.pages_scanned).toBe(2);
|
||||
});
|
||||
|
||||
test('exclude runs AFTER include (same precedence as `gbrain sync`)', async () => {
|
||||
const result = await runLintCore({
|
||||
target: root,
|
||||
contentSanity: STUB_CS,
|
||||
include: ['**/*.md'],
|
||||
exclude: ['Resources/**'],
|
||||
});
|
||||
// include lets everything through; exclude drops the 3 Resources/* files.
|
||||
expect(result.pages_scanned).toBe(2);
|
||||
});
|
||||
|
||||
test('empty include / exclude arrays do NOT engage the filter', async () => {
|
||||
// Symmetric with `parseGlobList` returning undefined for empty input —
|
||||
// an empty include would otherwise classify every path as a miss and
|
||||
// silently zero out the lint scope. Pin the guard at the walker level.
|
||||
const result = await runLintCore({
|
||||
target: root,
|
||||
contentSanity: STUB_CS,
|
||||
include: [],
|
||||
exclude: [],
|
||||
});
|
||||
expect(result.pages_scanned).toBe(5);
|
||||
});
|
||||
|
||||
test('exclude semantics match sync — `**` matches across path segments', async () => {
|
||||
const result = await runLintCore({
|
||||
target: root,
|
||||
contentSanity: STUB_CS,
|
||||
exclude: ['**/spec-*.md'],
|
||||
});
|
||||
// Both Veriff specs match the deep glob; Notes + archive-v1 survive.
|
||||
expect(result.pages_scanned).toBe(3);
|
||||
});
|
||||
|
||||
test('single-file target bypasses the filter (file mode is not a walk)', async () => {
|
||||
// A user lints one .md explicitly: filters are a directory-walk concern,
|
||||
// so the file is processed even if its name would match an exclude.
|
||||
const result = await runLintCore({
|
||||
target: join(root, 'Resources', 'veriff', 'spec-1.md'),
|
||||
contentSanity: STUB_CS,
|
||||
exclude: ['Resources/veriff/**'],
|
||||
});
|
||||
expect(result.pages_scanned).toBe(1);
|
||||
});
|
||||
});
|
||||
@@ -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
|
||||
|
||||
@@ -694,6 +694,12 @@ const COLUMN_EXEMPTIONS = new Set<string>([
|
||||
'minion_jobs.quiet_hours',
|
||||
'minion_jobs.stagger_key',
|
||||
'sources.chunker_version',
|
||||
// #2157 follow-on (migration v125). TEXT column read by performSync's
|
||||
// `Already up to date` gate; not referenced by any CREATE INDEX. Same
|
||||
// upgrade-path coverage as sources.chunker_version above: fresh installs
|
||||
// get it via the CREATE TABLE in src/schema.sql + schema-embedded.ts;
|
||||
// pre-existing brains get it via the idempotent ALTER TABLE in v125.
|
||||
'sources.config_fingerprint',
|
||||
'access_tokens.permissions',
|
||||
'takes.resolved_quality',
|
||||
'pages.emotional_weight_recomputed_at',
|
||||
|
||||
@@ -159,6 +159,127 @@ describe('sources add', () => {
|
||||
await expect(runSources(engine, ['add', 'plans', '--path', '/tmp/gstack/plans']))
|
||||
.rejects.toThrow(/overlaps with existing source "gstack"/);
|
||||
});
|
||||
|
||||
// Glob filters — TODO #3 from the brettdavies fork recon. Pre-fix, the
|
||||
// `SyncableOptions` shape in `src/core/sync.ts` had been carrying
|
||||
// `include` / `exclude` since v0.41.13, but commands/sync.ts:1454 never
|
||||
// populated them and `sources add` had no flag to persist them — so users
|
||||
// had no way to tell gbrain to skip `Templates/` in an Obsidian vault.
|
||||
test('--exclude persists glob into sources.config.exclude_globs', async () => {
|
||||
const { engine, calls } = makeStub({
|
||||
'SELECT id, name, local_path, last_commit, last_sync_at, config, created_at': [{
|
||||
id: 'vault',
|
||||
name: 'vault',
|
||||
local_path: '/tmp/vault',
|
||||
last_commit: null,
|
||||
last_sync_at: null,
|
||||
config: '{"exclude_globs":["Templates/**"]}',
|
||||
created_at: new Date(),
|
||||
}],
|
||||
});
|
||||
await runSources(engine, ['add', 'vault', '--path', '/tmp/vault', '--exclude', 'Templates/**']);
|
||||
const insert = calls.find(c => c.sql.includes('INSERT INTO sources'));
|
||||
expect(insert!.params[3]).toBe('{"exclude_globs":["Templates/**"]}');
|
||||
});
|
||||
|
||||
test('--include persists glob into sources.config.include_globs', async () => {
|
||||
const { engine, calls } = makeStub({
|
||||
'SELECT id, name, local_path, last_commit, last_sync_at, config, created_at': [{
|
||||
id: 'wiki',
|
||||
name: 'wiki',
|
||||
local_path: '/tmp/wiki',
|
||||
last_commit: null,
|
||||
last_sync_at: null,
|
||||
config: '{"include_globs":["people/**"]}',
|
||||
created_at: new Date(),
|
||||
}],
|
||||
});
|
||||
await runSources(engine, ['add', 'wiki', '--path', '/tmp/wiki', '--include', 'people/**']);
|
||||
const insert = calls.find(c => c.sql.includes('INSERT INTO sources'));
|
||||
expect(insert!.params[3]).toBe('{"include_globs":["people/**"]}');
|
||||
});
|
||||
|
||||
test('--exclude is repeatable; preserves order', async () => {
|
||||
const { engine, calls } = makeStub({
|
||||
'SELECT id, name, local_path, last_commit, last_sync_at, config, created_at': [{
|
||||
id: 'vault',
|
||||
name: 'vault',
|
||||
local_path: '/tmp/vault',
|
||||
last_commit: null,
|
||||
last_sync_at: null,
|
||||
config: '{}',
|
||||
created_at: new Date(),
|
||||
}],
|
||||
});
|
||||
await runSources(engine, [
|
||||
'add', 'vault', '--path', '/tmp/vault',
|
||||
'--exclude', 'Templates/**',
|
||||
'--exclude', '.smart-env/**',
|
||||
'--exclude', 'Drafts/**',
|
||||
]);
|
||||
const insert = calls.find(c => c.sql.includes('INSERT INTO sources'));
|
||||
expect(insert!.params[3]).toBe('{"exclude_globs":["Templates/**",".smart-env/**","Drafts/**"]}');
|
||||
});
|
||||
|
||||
test('--include and --exclude compose in one command (federated source with both filter axes)', async () => {
|
||||
const { engine, calls } = makeStub({
|
||||
'SELECT id, name, local_path, last_commit, last_sync_at, config, created_at': [{
|
||||
id: 'vault',
|
||||
name: 'vault',
|
||||
local_path: '/tmp/vault',
|
||||
last_commit: null,
|
||||
last_sync_at: null,
|
||||
config: '{"federated":true,"include_globs":["people/**"],"exclude_globs":["Templates/**"]}',
|
||||
created_at: new Date(),
|
||||
}],
|
||||
});
|
||||
await runSources(engine, [
|
||||
'add', 'vault', '--path', '/tmp/vault', '--federated',
|
||||
'--include', 'people/**',
|
||||
'--exclude', 'Templates/**',
|
||||
]);
|
||||
const insert = calls.find(c => c.sql.includes('INSERT INTO sources'));
|
||||
expect(insert!.params[3]).toBe(
|
||||
'{"federated":true,"include_globs":["people/**"],"exclude_globs":["Templates/**"]}',
|
||||
);
|
||||
});
|
||||
|
||||
test('omitted glob flags leave config untouched (no [] entries persisted)', async () => {
|
||||
// Regression guard: empty glob arrays must NOT be written. Otherwise a
|
||||
// brain that never opts into filtering grows {"include_globs": [],
|
||||
// "exclude_globs": []} cruft in every source row, and the parseGlobList
|
||||
// path would return undefined anyway (the cruft is purely noise).
|
||||
const { engine, calls } = makeStub({
|
||||
'SELECT id, name, local_path, last_commit, last_sync_at, config, created_at': [{
|
||||
id: 'gstack',
|
||||
name: 'gstack',
|
||||
local_path: '/tmp/gstack',
|
||||
last_commit: null,
|
||||
last_sync_at: null,
|
||||
config: '{}',
|
||||
created_at: new Date(),
|
||||
}],
|
||||
});
|
||||
await runSources(engine, ['add', 'gstack', '--path', '/tmp/gstack']);
|
||||
const insert = calls.find(c => c.sql.includes('INSERT INTO sources'));
|
||||
expect(insert!.params[3]).toBe('{}');
|
||||
});
|
||||
|
||||
test('--exclude requires a glob argument', async () => {
|
||||
const { engine } = makeStub();
|
||||
const code = await withExitCapture(() => runSources(engine, [
|
||||
'add', 'vault', '--path', '/tmp/vault', '--exclude',
|
||||
]));
|
||||
expect(code).toBe(2);
|
||||
});
|
||||
|
||||
test('--include rejects a flag-like value (--include --path looks like a typo)', async () => {
|
||||
const { engine } = makeStub();
|
||||
const code = await withExitCapture(() => runSources(engine, [
|
||||
'add', 'vault', '--path', '/tmp/vault', '--include', '--federated',
|
||||
]));
|
||||
expect(code).toBe(2);
|
||||
});
|
||||
});
|
||||
|
||||
// ── add — #2707 git-repo validation (CLI wiring) ───────────────
|
||||
|
||||
@@ -0,0 +1,95 @@
|
||||
/**
|
||||
* #2157 follow-on (migration v125) — end-to-end gate wiring.
|
||||
*
|
||||
* `test/sync-config-fingerprint.test.ts` pins the persistence + comparison
|
||||
* primitives (compute/read/write). This file pins the WIRING inside
|
||||
* `performSync`: with git HEAD unchanged, a drift in the walk-affecting
|
||||
* `sources.config` fields must break out of the "Already up to date" early
|
||||
* return and force a full re-walk — and the re-stamped fingerprint must
|
||||
* settle the gate back to `up_to_date` on the following pass. Deleting the
|
||||
* `configMismatch` term from the gate condition fails this test; none of the
|
||||
* primitive tests would catch that.
|
||||
*/
|
||||
|
||||
import { test, expect, beforeAll, afterAll } from 'bun:test';
|
||||
import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'fs';
|
||||
import { join } from 'path';
|
||||
import { tmpdir } from 'os';
|
||||
import { execFileSync } from 'child_process';
|
||||
import { PGLiteEngine } from '../src/core/pglite-engine.ts';
|
||||
import { performSync } from '../src/commands/sync.ts';
|
||||
|
||||
let engine: PGLiteEngine;
|
||||
let repoPath: string;
|
||||
|
||||
function git(cwd: string, ...args: string[]) {
|
||||
execFileSync('git', args, { cwd, stdio: 'pipe' });
|
||||
}
|
||||
|
||||
beforeAll(async () => {
|
||||
engine = new PGLiteEngine();
|
||||
await engine.connect({});
|
||||
await engine.initSchema();
|
||||
|
||||
repoPath = mkdtempSync(join(tmpdir(), 'gbrain-fp-gate-'));
|
||||
mkdirSync(join(repoPath, 'wiki'));
|
||||
mkdirSync(join(repoPath, 'memory'));
|
||||
writeFileSync(join(repoPath, 'wiki', 'page1.md'), '# Page 1\n\nbody\n');
|
||||
writeFileSync(join(repoPath, 'memory', 'note1.md'), '# Note 1\n\nbody\n');
|
||||
git(repoPath, 'init');
|
||||
git(repoPath, 'add', '-A');
|
||||
git(repoPath, '-c', 'user.email=t@example.com', '-c', 'user.name=t', 'commit', '-m', 'init');
|
||||
|
||||
await engine.executeRaw(
|
||||
`INSERT INTO sources (id, name, local_path, config) VALUES ($1, $2, $3, $4::text::jsonb)`,
|
||||
['vault', 'vault', repoPath, JSON.stringify({ include_globs: ['wiki/**'] })],
|
||||
);
|
||||
}, 60_000);
|
||||
|
||||
afterAll(async () => {
|
||||
await engine?.disconnect();
|
||||
rmSync(repoPath, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
test('config-glob drift with unchanged git HEAD forces a re-walk, then settles', async () => {
|
||||
// First sync: row config include_globs = ['wiki/**'], caller threads it
|
||||
// (as syncOneSource / the single-source CLI path do). memory/* skipped.
|
||||
const first = await performSync(engine, {
|
||||
repoPath, sourceId: 'vault', include: ['wiki/**'],
|
||||
noPull: true, noEmbed: true, full: true,
|
||||
});
|
||||
expect(first.status).toBe('first_sync');
|
||||
expect(await engine.getPage('wiki/page1')).not.toBeNull();
|
||||
expect(await engine.getPage('memory/note1')).toBeNull();
|
||||
|
||||
// No drift, HEAD unchanged: gate stays quiet.
|
||||
const second = await performSync(engine, {
|
||||
repoPath, sourceId: 'vault', include: ['wiki/**'],
|
||||
noPull: true, noEmbed: true,
|
||||
});
|
||||
expect(second.status).toBe('up_to_date');
|
||||
|
||||
// User widens the persisted globs (what `gbrain sources add --include`
|
||||
// writes). Git HEAD has NOT moved.
|
||||
await engine.executeRaw(
|
||||
`UPDATE sources SET config = $1::text::jsonb WHERE id = $2`,
|
||||
[JSON.stringify({ include_globs: ['wiki/**', 'memory/**'] }), 'vault'],
|
||||
);
|
||||
|
||||
// Pre-fix this returned `up_to_date` (HEAD unchanged) and memory/note1
|
||||
// stayed missing until a manual `--full`. The fingerprint gate must force
|
||||
// the full re-walk instead.
|
||||
const third = await performSync(engine, {
|
||||
repoPath, sourceId: 'vault', include: ['wiki/**', 'memory/**'],
|
||||
noPull: true, noEmbed: true,
|
||||
});
|
||||
expect(third.status).not.toBe('up_to_date');
|
||||
expect(await engine.getPage('memory/note1')).not.toBeNull();
|
||||
|
||||
// Re-stamped fingerprint matches the current row: gate settles.
|
||||
const fourth = await performSync(engine, {
|
||||
repoPath, sourceId: 'vault', include: ['wiki/**', 'memory/**'],
|
||||
noPull: true, noEmbed: true,
|
||||
});
|
||||
expect(fourth.status).toBe('up_to_date');
|
||||
});
|
||||
@@ -0,0 +1,234 @@
|
||||
/**
|
||||
* #2157 follow-on (migration v125 — `sources.config_fingerprint`).
|
||||
*
|
||||
* The "Already up to date" gate at performSync's git-HEAD equality check
|
||||
* honored chunker_version match but ignored `sources.config` drift.
|
||||
* Changing `sources.config.exclude_globs` (or include_globs / strategy)
|
||||
* had no observable effect on the next sync because git HEAD was
|
||||
* unchanged — the gate returned early and the new walk scope never
|
||||
* applied. This file exercises the persistence shape + drift detection
|
||||
* end-to-end on PGLite, including:
|
||||
*
|
||||
* - Migration v125 actually adds the column (regression guard against
|
||||
* a future re-numbering or accidental deletion).
|
||||
* - read/write round-trips preserve the value.
|
||||
* - The fingerprint differs across the three walk-affecting fields
|
||||
* and is order-insensitive on the array fields.
|
||||
* - NULL fingerprint on pre-v125 rows treats as "not stamped" so a
|
||||
* first post-upgrade sync doesn't spuriously force-full.
|
||||
* - A toggle-and-revert leaves the stored fingerprint matching the
|
||||
* current row, so the gate stays quiet.
|
||||
*
|
||||
* The wired-up gate behavior (force-full triggered on mismatch) is
|
||||
* exercised by the existing sync end-to-end tests; here we pin the
|
||||
* persistence + comparison primitives the gate depends on.
|
||||
*/
|
||||
|
||||
import { describe, test, expect, beforeAll, afterAll } from 'bun:test';
|
||||
import {
|
||||
computeSourceConfigFingerprint,
|
||||
readConfigFingerprint,
|
||||
writeConfigFingerprint,
|
||||
} from '../src/commands/sync.ts';
|
||||
import { PGLiteEngine } from '../src/core/pglite-engine.ts';
|
||||
|
||||
let engine: PGLiteEngine;
|
||||
|
||||
beforeAll(async () => {
|
||||
engine = new PGLiteEngine();
|
||||
await engine.connect({});
|
||||
await engine.initSchema();
|
||||
}, 60_000);
|
||||
|
||||
afterAll(async () => {
|
||||
await engine?.disconnect();
|
||||
});
|
||||
|
||||
/** Insert a fresh source row with the given config. Returns the id. */
|
||||
async function makeSource(
|
||||
id: string,
|
||||
config: Record<string, unknown> = {},
|
||||
): Promise<string> {
|
||||
await engine.executeRaw(
|
||||
`INSERT INTO sources (id, name, local_path, config) VALUES ($1, $2, $3, $4::text::jsonb)`,
|
||||
[id, id, `/tmp/${id}`, JSON.stringify(config)],
|
||||
);
|
||||
return id;
|
||||
}
|
||||
|
||||
describe('migration v125 — sources.config_fingerprint column', () => {
|
||||
test('column exists on the sources table', async () => {
|
||||
const rows = await engine.executeRaw<{ column_name: string }>(
|
||||
`SELECT column_name FROM information_schema.columns
|
||||
WHERE table_name = 'sources' AND column_name = 'config_fingerprint'`,
|
||||
);
|
||||
expect(rows).toHaveLength(1);
|
||||
});
|
||||
|
||||
test('column is nullable (preserves pre-migration row semantics)', async () => {
|
||||
const rows = await engine.executeRaw<{ is_nullable: string }>(
|
||||
`SELECT is_nullable FROM information_schema.columns
|
||||
WHERE table_name = 'sources' AND column_name = 'config_fingerprint'`,
|
||||
);
|
||||
expect(rows[0]?.is_nullable).toBe('YES');
|
||||
});
|
||||
});
|
||||
|
||||
describe('readConfigFingerprint / writeConfigFingerprint — persistence round-trip', () => {
|
||||
test('round-trip: write then read returns the same value', async () => {
|
||||
const id = await makeSource('rt-basic', { exclude_globs: ['Templates/**'] });
|
||||
const fp = computeSourceConfigFingerprint({ exclude_globs: ['Templates/**'] });
|
||||
await writeConfigFingerprint(engine, id, fp);
|
||||
const got = await readConfigFingerprint(engine, id);
|
||||
expect(got).toBe(fp);
|
||||
});
|
||||
|
||||
test('NULL on never-stamped row (pre-v125 semantics)', async () => {
|
||||
const id = await makeSource('rt-never');
|
||||
const got = await readConfigFingerprint(engine, id);
|
||||
expect(got).toBeNull();
|
||||
});
|
||||
|
||||
test('undefined sourceId returns null (legacy non-source-scoped sync)', async () => {
|
||||
const got = await readConfigFingerprint(engine, undefined);
|
||||
expect(got).toBeNull();
|
||||
});
|
||||
|
||||
test('write with undefined sourceId is a no-op (does not throw)', async () => {
|
||||
// The legacy global-sync code path hits this branch; the guard must
|
||||
// be silent rather than fail the sync run.
|
||||
await writeConfigFingerprint(engine, undefined, 'deadbeef'.repeat(8));
|
||||
// No assertion beyond "did not throw"; the function returns void.
|
||||
});
|
||||
|
||||
test('overwrite: a second write replaces the prior fingerprint', async () => {
|
||||
const id = await makeSource('rt-overwrite');
|
||||
await writeConfigFingerprint(engine, id, 'a'.repeat(64));
|
||||
await writeConfigFingerprint(engine, id, 'b'.repeat(64));
|
||||
const got = await readConfigFingerprint(engine, id);
|
||||
expect(got).toBe('b'.repeat(64));
|
||||
});
|
||||
});
|
||||
|
||||
describe('end-to-end drift simulation — the gate semantics this column enables', () => {
|
||||
test('first stamp matches computed fingerprint of the row config', async () => {
|
||||
const cfg = { exclude_globs: ['Templates/**', 'Photos/**'], strategy: 'markdown' };
|
||||
const id = await makeSource('e2e-first-stamp', cfg);
|
||||
const computed = computeSourceConfigFingerprint(cfg);
|
||||
await writeConfigFingerprint(engine, id, computed);
|
||||
expect(await readConfigFingerprint(engine, id)).toBe(computed);
|
||||
});
|
||||
|
||||
test('exclude_globs mutation makes stored != current (drift detected)', async () => {
|
||||
const before = { exclude_globs: ['Templates/**'] };
|
||||
const after = { exclude_globs: ['Templates/**', 'Photos/**'] };
|
||||
const id = await makeSource('e2e-exclude-drift', before);
|
||||
const beforeFp = computeSourceConfigFingerprint(before);
|
||||
await writeConfigFingerprint(engine, id, beforeFp);
|
||||
|
||||
// Simulate the user mutating sources.config via `gbrain sources add
|
||||
// --exclude`. The gate's next read of (stored, computed-from-current)
|
||||
// detects the drift and forces a re-walk.
|
||||
await engine.executeRaw(
|
||||
`UPDATE sources SET config = $1::text::jsonb WHERE id = $2`,
|
||||
[JSON.stringify(after), id],
|
||||
);
|
||||
const afterFp = computeSourceConfigFingerprint(after);
|
||||
const stored = await readConfigFingerprint(engine, id);
|
||||
expect(stored).toBe(beforeFp);
|
||||
expect(stored).not.toBe(afterFp);
|
||||
});
|
||||
|
||||
test('toggle-and-revert: add then remove same pattern leaves stored matching current', async () => {
|
||||
const original = { exclude_globs: ['Templates/**'] };
|
||||
const id = await makeSource('e2e-toggle', original);
|
||||
const originalFp = computeSourceConfigFingerprint(original);
|
||||
await writeConfigFingerprint(engine, id, originalFp);
|
||||
|
||||
// Add a pattern (drift) then remove it (revert).
|
||||
await engine.executeRaw(
|
||||
`UPDATE sources SET config = $1::text::jsonb WHERE id = $2`,
|
||||
[JSON.stringify({ exclude_globs: ['Templates/**', 'Photos/**'] }), id],
|
||||
);
|
||||
await engine.executeRaw(
|
||||
`UPDATE sources SET config = $1::text::jsonb WHERE id = $2`,
|
||||
[JSON.stringify(original), id],
|
||||
);
|
||||
const revertedFp = computeSourceConfigFingerprint(original);
|
||||
expect(revertedFp).toBe(originalFp);
|
||||
expect(await readConfigFingerprint(engine, id)).toBe(originalFp);
|
||||
// ⇒ Gate compares storedFp (==originalFp) to currentFp (==originalFp): no drift, no force-full.
|
||||
});
|
||||
|
||||
test('include_globs drift detected independently', async () => {
|
||||
const before = { include_globs: ['people/**'] };
|
||||
const after = { include_globs: ['people/**', 'companies/**'] };
|
||||
const id = await makeSource('e2e-include-drift', before);
|
||||
await writeConfigFingerprint(engine, id, computeSourceConfigFingerprint(before));
|
||||
await engine.executeRaw(
|
||||
`UPDATE sources SET config = $1::text::jsonb WHERE id = $2`,
|
||||
[JSON.stringify(after), id],
|
||||
);
|
||||
const stored = await readConfigFingerprint(engine, id);
|
||||
const current = computeSourceConfigFingerprint(after);
|
||||
expect(stored).not.toBe(current);
|
||||
});
|
||||
|
||||
test('strategy drift detected', async () => {
|
||||
const before = { strategy: 'markdown' };
|
||||
const after = { strategy: 'code' };
|
||||
const id = await makeSource('e2e-strategy-drift', before);
|
||||
await writeConfigFingerprint(engine, id, computeSourceConfigFingerprint(before));
|
||||
await engine.executeRaw(
|
||||
`UPDATE sources SET config = $1::text::jsonb WHERE id = $2`,
|
||||
[JSON.stringify(after), id],
|
||||
);
|
||||
expect(await readConfigFingerprint(engine, id))
|
||||
.not.toBe(computeSourceConfigFingerprint(after));
|
||||
});
|
||||
|
||||
test('mutating unrelated config field (federated) does NOT drift', async () => {
|
||||
// The fingerprint hashes ONLY walk-affecting fields. Federation
|
||||
// changes search visibility, not the walk set — must not invalidate
|
||||
// the checkpoint.
|
||||
const id = await makeSource('e2e-federated-toggle', {
|
||||
federated: true,
|
||||
exclude_globs: ['Templates/**'],
|
||||
});
|
||||
await writeConfigFingerprint(
|
||||
engine,
|
||||
id,
|
||||
computeSourceConfigFingerprint({ exclude_globs: ['Templates/**'] }),
|
||||
);
|
||||
await engine.executeRaw(
|
||||
`UPDATE sources SET config = $1::text::jsonb WHERE id = $2`,
|
||||
[
|
||||
JSON.stringify({ federated: false, exclude_globs: ['Templates/**'] }),
|
||||
id,
|
||||
],
|
||||
);
|
||||
const stored = await readConfigFingerprint(engine, id);
|
||||
const current = computeSourceConfigFingerprint({
|
||||
federated: false,
|
||||
exclude_globs: ['Templates/**'],
|
||||
});
|
||||
expect(stored).toBe(current);
|
||||
});
|
||||
|
||||
test('double-encoded JSONB config (the sources-add stringify bug) hashes equivalently to the parsed object', async () => {
|
||||
// `gbrain sources add` writes `JSON.stringify(config)::jsonb`, which
|
||||
// double-encodes the value into a JSON-string scalar (`"{\"x\":1}"`)
|
||||
// rather than a proper JSONB object. The defensive reader in
|
||||
// postgres-engine.ts:1274 + readSourceConfig parses the string back
|
||||
// before the fingerprint sees it, so a double-encoded row and a
|
||||
// properly-shaped row must fingerprint identically.
|
||||
const cfg = { exclude_globs: ['Templates/**'], strategy: 'markdown' };
|
||||
const direct = computeSourceConfigFingerprint(cfg);
|
||||
// The pure compute fn handles a pre-parsed object; the persistence
|
||||
// layer's job is to deliver a parsed object. We assert that the
|
||||
// round-trip a real read would produce (parse the string scalar)
|
||||
// hashes to the same value.
|
||||
const parsed = JSON.parse(JSON.stringify(cfg));
|
||||
expect(computeSourceConfigFingerprint(parsed)).toBe(direct);
|
||||
});
|
||||
});
|
||||
@@ -355,6 +355,69 @@ describe('sync monorepo subdir-source support (#753/#774)', () => {
|
||||
expect(await engine.getPage('wiki/draft-a')).toBeNull();
|
||||
});
|
||||
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
// --include: allow-list counterpart (#2156). Same scope-relative anchoring
|
||||
// as --exclude; exclude applies after include.
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
|
||||
test('--include: only matching files import on full sync', async () => {
|
||||
const { performSync } = await import('../src/commands/sync.ts');
|
||||
const result = await performSync(engine, {
|
||||
repoPath,
|
||||
include: ['wiki/**'],
|
||||
noPull: true,
|
||||
noEmbed: true,
|
||||
full: true,
|
||||
});
|
||||
expect(result.status).toBe('first_sync');
|
||||
expect(result.added).toBe(2); // wiki/page1 + wiki/page2; memory/* miss the allow-list
|
||||
expect(await engine.getPage('wiki/page1')).not.toBeNull();
|
||||
expect(await engine.getPage('memory/note1')).toBeNull();
|
||||
});
|
||||
|
||||
test('--include applies to the incremental path too', async () => {
|
||||
const { performSync } = await import('../src/commands/sync.ts');
|
||||
const first = await performSync(engine, {
|
||||
repoPath,
|
||||
include: ['wiki/**'],
|
||||
noPull: true,
|
||||
noEmbed: true,
|
||||
full: true,
|
||||
});
|
||||
expect(first.status).toBe('first_sync');
|
||||
|
||||
writeFileSync(join(repoPath, 'wiki', 'page3.md'), mdPage('Wiki Page 3'));
|
||||
writeFileSync(join(repoPath, 'memory', 'note3.md'), mdPage('Memory Note 3'));
|
||||
gitCommit(repoPath, 'more pages');
|
||||
|
||||
const second = await performSync(engine, {
|
||||
repoPath,
|
||||
include: ['wiki/**'],
|
||||
noPull: true,
|
||||
noEmbed: true,
|
||||
});
|
||||
expect(second.status).toBe('synced');
|
||||
expect(second.added).toBe(1); // wiki/page3 only; memory/note3 misses the allow-list
|
||||
expect(await engine.getPage('wiki/page3')).not.toBeNull();
|
||||
expect(await engine.getPage('memory/note3')).toBeNull();
|
||||
});
|
||||
|
||||
test('--exclude applies after --include (path in both is rejected)', async () => {
|
||||
const { performSync } = await import('../src/commands/sync.ts');
|
||||
const result = await performSync(engine, {
|
||||
repoPath,
|
||||
include: ['wiki/**'],
|
||||
exclude: ['wiki/page2.md'],
|
||||
noPull: true,
|
||||
noEmbed: true,
|
||||
full: true,
|
||||
});
|
||||
expect(result.status).toBe('first_sync');
|
||||
expect(result.added).toBe(1); // page1 only: page2 included then excluded
|
||||
expect(await engine.getPage('wiki/page1')).not.toBeNull();
|
||||
expect(await engine.getPage('wiki/page2')).toBeNull();
|
||||
});
|
||||
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
// --exclude '**/*' emits warning (NAV-4)
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
|
||||
@@ -0,0 +1,212 @@
|
||||
/**
|
||||
* TODO #3 — `parseGlobList` defensive parse.
|
||||
*
|
||||
* `sources.config` is a JSONB column with no schema. The runtime can find
|
||||
* anything in `config.include_globs` / `config.exclude_globs`:
|
||||
* - A user `gbrain sources add` wrote `["people/**"]` (the happy path).
|
||||
* - A stray hand-edit wrote `"people/**"` (string, not array).
|
||||
* - A future migration's null default.
|
||||
* - A test fixture that left the column at `{}`.
|
||||
*
|
||||
* The parse must produce `string[] | undefined` so the downstream
|
||||
* `SyncOpts.include` / `SyncOpts.exclude` are either undefined (no filter)
|
||||
* or a non-empty list of usable globs. Returning `[]` would make
|
||||
* `commands/sync.ts:1454` engage the filter loop with an empty allow-list
|
||||
* that classifies every path as `include-glob-miss`.
|
||||
*/
|
||||
|
||||
import { describe, test, expect } from 'bun:test';
|
||||
import { parseGlobList, mergeGlobs, computeSourceConfigFingerprint } from '../src/commands/sync.ts';
|
||||
|
||||
describe('parseGlobList — JSONB-safe coercion to string[] | undefined', () => {
|
||||
test('happy path: array of strings round-trips identically', () => {
|
||||
expect(parseGlobList(['people/**', 'companies/**'])).toEqual(['people/**', 'companies/**']);
|
||||
});
|
||||
|
||||
test('single-element array returned as-is', () => {
|
||||
expect(parseGlobList(['Templates/**'])).toEqual(['Templates/**']);
|
||||
});
|
||||
|
||||
test('non-array values return undefined (string, object, number, null)', () => {
|
||||
expect(parseGlobList('Templates/**')).toBeUndefined();
|
||||
expect(parseGlobList({ globs: ['Templates/**'] })).toBeUndefined();
|
||||
expect(parseGlobList(42)).toBeUndefined();
|
||||
expect(parseGlobList(null)).toBeUndefined();
|
||||
expect(parseGlobList(undefined)).toBeUndefined();
|
||||
});
|
||||
|
||||
test('empty array returns undefined (no engagement of the filter loop)', () => {
|
||||
// Critical: a literal `[]` must not slip through. Empty `include` in
|
||||
// SyncableOptions silently passes everything (good), but empty
|
||||
// `exclude` is fine too — the real motivation is to keep `SyncOpts`
|
||||
// unset so callers can ignore the field entirely. Symmetric with the
|
||||
// `omitted glob flags leave config untouched` regression guard in
|
||||
// sources.test.ts.
|
||||
expect(parseGlobList([])).toBeUndefined();
|
||||
});
|
||||
|
||||
test('mixed array drops non-string entries and keeps the rest', () => {
|
||||
expect(parseGlobList(['people/**', 42, null, 'companies/**'])).toEqual([
|
||||
'people/**',
|
||||
'companies/**',
|
||||
]);
|
||||
});
|
||||
|
||||
test('empty strings dropped (a `""` glob would match every path)', () => {
|
||||
expect(parseGlobList(['', 'people/**', ''])).toEqual(['people/**']);
|
||||
});
|
||||
|
||||
test('array of only empty strings collapses to undefined', () => {
|
||||
expect(parseGlobList(['', '', ''])).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
describe('mergeGlobs — CLI flags union with persisted source-config globs', () => {
|
||||
test('both sides present: union, deduped, CLI first', () => {
|
||||
expect(mergeGlobs(['a/**', 'b/**'], ['b/**', 'c/**'])).toEqual(['a/**', 'b/**', 'c/**']);
|
||||
});
|
||||
|
||||
test('CLI only', () => {
|
||||
expect(mergeGlobs(['a/**'], undefined)).toEqual(['a/**']);
|
||||
});
|
||||
|
||||
test('persisted only', () => {
|
||||
expect(mergeGlobs([], ['Templates/**'])).toEqual(['Templates/**']);
|
||||
});
|
||||
|
||||
test('neither side: undefined so SyncOpts stays unset', () => {
|
||||
expect(mergeGlobs([], undefined)).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* #2157 follow-on (sources_config_fingerprint, migration v125).
|
||||
*
|
||||
* computeSourceConfigFingerprint hashes the walk-affecting fields of
|
||||
* sources.config (strategy + include_globs + exclude_globs) so the
|
||||
* "Already up to date" gate at performSync's git-HEAD equality check
|
||||
* can detect drift and force a re-walk. These cases pin the contract
|
||||
* the gate depends on:
|
||||
*
|
||||
* - Deterministic over equivalent inputs (order-insensitive,
|
||||
* defensively-coerced via parseGlobList).
|
||||
* - Sensitive to each walk-affecting field separately.
|
||||
* - Insensitive to fields the walker doesn't read (federated,
|
||||
* unrelated keys).
|
||||
* - A toggle-and-revert is a no-op (returns to the original hash).
|
||||
*
|
||||
* Without the canonicalization the gate would fire spuriously on
|
||||
* cosmetic changes (e.g. a user re-ordering their exclude list) and
|
||||
* miss real drift (e.g. an add-then-remove that nets to a different
|
||||
* effective set than the stored fingerprint).
|
||||
*/
|
||||
describe('computeSourceConfigFingerprint — walk-affecting config drift detector', () => {
|
||||
test('empty config produces a stable hash', () => {
|
||||
const a = computeSourceConfigFingerprint({});
|
||||
const b = computeSourceConfigFingerprint({});
|
||||
expect(a).toBe(b);
|
||||
expect(a).toMatch(/^[a-f0-9]{64}$/);
|
||||
});
|
||||
|
||||
test('null / undefined / missing config all hash the same', () => {
|
||||
const empty = computeSourceConfigFingerprint({});
|
||||
expect(computeSourceConfigFingerprint(null)).toBe(empty);
|
||||
expect(computeSourceConfigFingerprint(undefined)).toBe(empty);
|
||||
});
|
||||
|
||||
test('same config → same hash (deterministic)', () => {
|
||||
const cfg = { strategy: 'markdown', exclude_globs: ['Templates/**', 'Photos/**'] };
|
||||
expect(computeSourceConfigFingerprint(cfg)).toBe(computeSourceConfigFingerprint(cfg));
|
||||
});
|
||||
|
||||
test('array order does not affect hash (canonical sort)', () => {
|
||||
const a = computeSourceConfigFingerprint({ exclude_globs: ['a/**', 'b/**', 'c/**'] });
|
||||
const b = computeSourceConfigFingerprint({ exclude_globs: ['c/**', 'a/**', 'b/**'] });
|
||||
expect(a).toBe(b);
|
||||
});
|
||||
|
||||
test('exclude_globs change → different hash', () => {
|
||||
const a = computeSourceConfigFingerprint({ exclude_globs: ['Templates/**'] });
|
||||
const b = computeSourceConfigFingerprint({ exclude_globs: ['Templates/**', 'Photos/**'] });
|
||||
expect(a).not.toBe(b);
|
||||
});
|
||||
|
||||
test('include_globs change → different hash', () => {
|
||||
const a = computeSourceConfigFingerprint({ include_globs: ['people/**'] });
|
||||
const b = computeSourceConfigFingerprint({ include_globs: ['people/**', 'companies/**'] });
|
||||
expect(a).not.toBe(b);
|
||||
});
|
||||
|
||||
test('strategy change → different hash', () => {
|
||||
const a = computeSourceConfigFingerprint({ strategy: 'markdown' });
|
||||
const b = computeSourceConfigFingerprint({ strategy: 'code' });
|
||||
expect(a).not.toBe(b);
|
||||
});
|
||||
|
||||
test('strategy unset vs set differ', () => {
|
||||
const unset = computeSourceConfigFingerprint({});
|
||||
const set = computeSourceConfigFingerprint({ strategy: 'markdown' });
|
||||
expect(unset).not.toBe(set);
|
||||
});
|
||||
|
||||
test('add-then-remove returns to original hash (toggle is a no-op)', () => {
|
||||
const original = computeSourceConfigFingerprint({ exclude_globs: ['Templates/**'] });
|
||||
const added = computeSourceConfigFingerprint({ exclude_globs: ['Templates/**', 'Photos/**'] });
|
||||
const reverted = computeSourceConfigFingerprint({ exclude_globs: ['Templates/**'] });
|
||||
expect(added).not.toBe(original);
|
||||
expect(reverted).toBe(original);
|
||||
});
|
||||
|
||||
test('non-walk-affecting fields are ignored (federated, unrelated keys)', () => {
|
||||
const a = computeSourceConfigFingerprint({ exclude_globs: ['Templates/**'], federated: true });
|
||||
const b = computeSourceConfigFingerprint({ exclude_globs: ['Templates/**'], federated: false });
|
||||
const c = computeSourceConfigFingerprint({ exclude_globs: ['Templates/**'], some_unrelated_key: 'value' });
|
||||
expect(a).toBe(b);
|
||||
expect(a).toBe(c);
|
||||
});
|
||||
|
||||
test('non-string strategy coerced to null (defensive)', () => {
|
||||
// A hand-edited row could leave `strategy: 42` or `strategy: {}` — both
|
||||
// collapse to the same shape as `strategy: undefined` so the fingerprint
|
||||
// doesn't reflect a value the walker can't honor anyway.
|
||||
const empty = computeSourceConfigFingerprint({});
|
||||
expect(computeSourceConfigFingerprint({ strategy: 42 })).toBe(empty);
|
||||
expect(computeSourceConfigFingerprint({ strategy: {} })).toBe(empty);
|
||||
expect(computeSourceConfigFingerprint({ strategy: null })).toBe(empty);
|
||||
});
|
||||
|
||||
test('defensive parsing: mixed-type glob arrays hash same as cleaned arrays', () => {
|
||||
// parseGlobList drops non-string + empty entries; the fingerprint must
|
||||
// reflect what the walker actually uses, not what the raw row says.
|
||||
const dirty = computeSourceConfigFingerprint({
|
||||
exclude_globs: ['Templates/**', 42, null, '', 'Photos/**'],
|
||||
});
|
||||
const clean = computeSourceConfigFingerprint({
|
||||
exclude_globs: ['Templates/**', 'Photos/**'],
|
||||
});
|
||||
expect(dirty).toBe(clean);
|
||||
});
|
||||
|
||||
test('empty array and missing field hash identically', () => {
|
||||
const missing = computeSourceConfigFingerprint({});
|
||||
const emptyArray = computeSourceConfigFingerprint({ exclude_globs: [] });
|
||||
const emptyAfterClean = computeSourceConfigFingerprint({ exclude_globs: ['', '', ''] });
|
||||
expect(emptyArray).toBe(missing);
|
||||
expect(emptyAfterClean).toBe(missing);
|
||||
});
|
||||
|
||||
test('non-array exclude_globs (string, object) hash same as missing', () => {
|
||||
const missing = computeSourceConfigFingerprint({});
|
||||
expect(computeSourceConfigFingerprint({ exclude_globs: 'Templates/**' })).toBe(missing);
|
||||
expect(computeSourceConfigFingerprint({ exclude_globs: { foo: 'bar' } })).toBe(missing);
|
||||
});
|
||||
|
||||
test('SHA-256 output shape: 64 hex characters', () => {
|
||||
const fp = computeSourceConfigFingerprint({
|
||||
strategy: 'markdown',
|
||||
include_globs: ['people/**'],
|
||||
exclude_globs: ['Templates/**', '.git/**'],
|
||||
});
|
||||
expect(fp).toMatch(/^[a-f0-9]{64}$/);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user