mirror of
https://github.com/garrytan/gbrain.git
synced 2026-08-16 01:42:23 +00:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Garry TanandClaude Fable 5
|
52fffc7ecc | ||
|
Garry TanandClaude Fable 5
|
039b97df36 | ||
|
Garry TanandClaude Fable 5
|
2bb3424863 |
Vendored
+56
File diff suppressed because one or more lines are too long
Vendored
-57
File diff suppressed because one or more lines are too long
Vendored
+1
-1
@@ -7,7 +7,7 @@
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
||||
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=JetBrains+Mono:wght@400;500&display=swap" rel="stylesheet" />
|
||||
<script type="module" crossorigin src="/admin/assets/index-CzLjRij_.js"></script>
|
||||
<script type="module" crossorigin src="/admin/assets/index-CoGEje3-.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/admin/assets/index-GxkWX7v3.css">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@@ -39,7 +39,6 @@ export const api = {
|
||||
stats: () => apiFetch('/admin/api/stats'),
|
||||
health: () => apiFetch('/admin/api/health-indicators'),
|
||||
agents: () => apiFetch('/admin/api/agents'),
|
||||
sources: () => apiFetch('/admin/api/sources'),
|
||||
requests: (page = 1, qs = '') => apiFetch(`/admin/api/requests?page=${page}${qs}`),
|
||||
apiKeys: () => apiFetch('/admin/api/api-keys'),
|
||||
createApiKey: (name: string) => apiFetch('/admin/api/api-keys', { method: 'POST', body: JSON.stringify({ name }) }),
|
||||
|
||||
@@ -23,16 +23,9 @@ interface Agent {
|
||||
total_requests: number;
|
||||
requests_today: number;
|
||||
token_ttl: number | null;
|
||||
source_id: string | null;
|
||||
federated_read: string[] | null;
|
||||
status: 'active' | 'revoked';
|
||||
}
|
||||
|
||||
interface SourceOption {
|
||||
id: string;
|
||||
name: string | null;
|
||||
}
|
||||
|
||||
interface ApiKey {
|
||||
id: string;
|
||||
name: string;
|
||||
@@ -95,7 +88,6 @@ export function AgentsPage() {
|
||||
<th>Name</th>
|
||||
<th>Type</th>
|
||||
<th>Scopes</th>
|
||||
<th>Source</th>
|
||||
<th>Status</th>
|
||||
<th>Requests</th>
|
||||
<th>Last Used</th>
|
||||
@@ -116,9 +108,6 @@ export function AgentsPage() {
|
||||
<span key={s} className={`badge badge-${s}`} style={{ marginRight: 4 }}>{s}</span>
|
||||
))}
|
||||
</td>
|
||||
<td className="mono" style={{ fontSize: 12, color: 'var(--text-secondary)' }}>
|
||||
{a.auth_type === 'oauth' ? (a.source_id || 'default') : 'all'}
|
||||
</td>
|
||||
<td>
|
||||
<span className={`badge ${a.status === 'active' ? 'badge-success' : 'badge-danger'}`}>{a.status}</span>
|
||||
</td>
|
||||
@@ -268,29 +257,9 @@ function RegisterModal({ onClose, onRegistered }: {
|
||||
Object.fromEntries(ALLOWED_SCOPES_LIST.map(s => [s, s === 'read'])) as Record<Scope, boolean>,
|
||||
);
|
||||
const [ttl, setTtl] = useState('86400'); // 24h default
|
||||
const [redirectUris, setRedirectUris] = useState('');
|
||||
const [sources, setSources] = useState<SourceOption[]>([{ id: 'default', name: 'default' }]);
|
||||
const [sourceId, setSourceId] = useState('default');
|
||||
const [readSources, setReadSources] = useState<Record<string, boolean>>({ default: true });
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
|
||||
useEffect(() => {
|
||||
api.sources()
|
||||
.then((rows: SourceOption[]) => {
|
||||
const nextSources = rows.length > 0 ? rows : [{ id: 'default', name: 'default' }];
|
||||
const nextSourceId = nextSources.some(s => s.id === sourceId) ? sourceId : nextSources[0].id;
|
||||
setSources(nextSources);
|
||||
setSourceId(nextSourceId);
|
||||
setReadSources(prev => {
|
||||
const next = Object.fromEntries(nextSources.map(s => [s.id, Boolean(prev[s.id])])) as Record<string, boolean>;
|
||||
next[nextSourceId] = true;
|
||||
return next;
|
||||
});
|
||||
})
|
||||
.catch(() => {});
|
||||
}, []);
|
||||
|
||||
const ttlOptions = [
|
||||
{ label: '1 hour', value: '3600' },
|
||||
{ label: '24 hours', value: '86400' },
|
||||
@@ -308,24 +277,11 @@ function RegisterModal({ onClose, onRegistered }: {
|
||||
try {
|
||||
// Use the CLI registration endpoint (POST to admin API)
|
||||
const selectedScopes = Object.entries(scopes).filter(([, v]) => v).map(([k]) => k).join(' ');
|
||||
const federatedRead = sources.map(s => s.id).filter(id => readSources[id]);
|
||||
if (federatedRead.length === 0) { setError('Select at least one read source'); setLoading(false); return; }
|
||||
// #1036: redirect URIs, one per line. Mirrors the CLI convention
|
||||
// (src/commands/auth.ts): presence of redirect URIs implies
|
||||
// authorization_code + refresh_token grants unless the user had none.
|
||||
const uris = redirectUris.split('\n').map(u => u.trim()).filter(Boolean);
|
||||
const res = await fetch('/admin/api/register-client', {
|
||||
method: 'POST',
|
||||
credentials: 'same-origin',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
name: name.trim(),
|
||||
scopes: selectedScopes,
|
||||
tokenTtl: ttl === '0' ? 315360000 : Number(ttl),
|
||||
source_id: sourceId,
|
||||
federated_read: federatedRead,
|
||||
...(uris.length > 0 ? { redirectUris: uris, grantTypes: ['authorization_code', 'refresh_token'] } : {}),
|
||||
}),
|
||||
body: JSON.stringify({ name: name.trim(), scopes: selectedScopes, tokenTtl: ttl === '0' ? 315360000 : Number(ttl) }),
|
||||
});
|
||||
if (!res.ok) throw new Error('Registration failed');
|
||||
const data = await res.json();
|
||||
@@ -356,42 +312,6 @@ function RegisterModal({ onClose, onRegistered }: {
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
<div style={{ marginBottom: 16 }}>
|
||||
<label>Write Source</label>
|
||||
<select value={sourceId} onChange={e => {
|
||||
const id = e.target.value;
|
||||
setSourceId(id);
|
||||
setReadSources(p => ({ ...p, [id]: true }));
|
||||
}}
|
||||
style={{ width: '100%', background: 'var(--bg-secondary)', color: 'var(--text-primary)', border: '1px solid var(--border)', borderRadius: 6, padding: '6px 10px', fontSize: 14 }}>
|
||||
{sources.map(s => <option key={s.id} value={s.id}>{s.name && s.name !== s.id ? `${s.id} (${s.name})` : s.id}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
<div style={{ marginBottom: 16 }}>
|
||||
<label>Read Sources</label>
|
||||
<div className="checkbox-group">
|
||||
{sources.map(s => (
|
||||
<label key={s.id} className="checkbox-label">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={Boolean(readSources[s.id])}
|
||||
onChange={e => setReadSources(p => ({ ...p, [s.id]: e.target.checked }))}
|
||||
/>
|
||||
{s.name && s.name !== s.id ? `${s.id} (${s.name})` : s.id}
|
||||
</label>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
<div style={{ marginBottom: 16 }}>
|
||||
<label>Redirect URIs <span style={{ color: 'var(--text-secondary)', fontWeight: 400 }}>(optional, one per line — enables authorization_code flow)</span></label>
|
||||
<textarea
|
||||
placeholder={'https://example.com/callback'}
|
||||
value={redirectUris}
|
||||
onChange={e => setRedirectUris(e.target.value)}
|
||||
rows={2}
|
||||
style={{ width: '100%', background: 'var(--bg-secondary)', color: 'var(--text-primary)', border: '1px solid var(--border)', borderRadius: 6, padding: '6px 10px', fontSize: 13, fontFamily: 'inherit', resize: 'vertical' }}
|
||||
/>
|
||||
</div>
|
||||
<div style={{ marginBottom: 20 }}>
|
||||
<label>Token Lifetime</label>
|
||||
<select value={ttl} onChange={e => setTtl(e.target.value)}
|
||||
@@ -608,8 +528,6 @@ function AgentDrawer({ agent, onClose, onRevoked }: { agent: Agent; onClose: ()
|
||||
client_name: agentName,
|
||||
auth_type: agent.auth_type,
|
||||
scope: agent.scope,
|
||||
source_id: agent.source_id,
|
||||
federated_read: agent.federated_read,
|
||||
}, null, 2),
|
||||
};
|
||||
|
||||
@@ -629,10 +547,6 @@ function AgentDrawer({ agent, onClose, onRevoked }: { agent: Agent; onClose: ()
|
||||
<span>{(agent.scope || '').split(' ').filter(Boolean).map(s => (
|
||||
<span key={s} className={`badge badge-${s}`} style={{ marginRight: 4 }}>{s}</span>
|
||||
))}</span>
|
||||
<span style={{ color: 'var(--text-secondary)' }}>Write Source</span>
|
||||
<span className="mono">{agent.source_id || (isOAuth ? 'default' : 'all')}</span>
|
||||
<span style={{ color: 'var(--text-secondary)' }}>Read Sources</span>
|
||||
<span className="mono">{isOAuth ? (agent.federated_read && agent.federated_read.length > 0 ? agent.federated_read.join(', ') : (agent.source_id || 'default')) : 'all'}</span>
|
||||
<span style={{ color: 'var(--text-secondary)' }}>Registered</span>
|
||||
<span>{new Date(agent.created_at).toLocaleDateString()}</span>
|
||||
<span style={{ color: 'var(--text-secondary)' }}>Token TTL</span>
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
// AUTO-GENERATED — do not edit by hand.
|
||||
// Run `bun run scripts/build-admin-embedded.ts` to regenerate.
|
||||
// Source: admin/dist/ at 2026-07-21.
|
||||
// Source: admin/dist/ at 2026-05-27.
|
||||
//
|
||||
// Bun resolves the file: imports to a path that works at runtime even
|
||||
// inside a compiled binary (`bun build --compile`). The manifest maps
|
||||
// the request path the express handler sees to (resolved-path, mime).
|
||||
|
||||
// @ts-ignore — type: 'file' is Bun ESM, not in lib.d.ts
|
||||
import A_0_assets_index_CzLjRij__js from '../admin/dist/assets/index-CzLjRij_.js' with { type: 'file' };
|
||||
import A_0_assets_index_CoGEje3__js from '../admin/dist/assets/index-CoGEje3-.js' with { type: 'file' };
|
||||
// @ts-ignore — type: 'file' is Bun ESM, not in lib.d.ts
|
||||
import A_1_assets_index_GxkWX7v3_css from '../admin/dist/assets/index-GxkWX7v3.css' with { type: 'file' };
|
||||
// @ts-ignore — type: 'file' is Bun ESM, not in lib.d.ts
|
||||
@@ -19,7 +19,7 @@ export interface AdminAsset {
|
||||
}
|
||||
|
||||
export const ADMIN_ASSETS: Record<string, AdminAsset> = {
|
||||
"/admin/assets/index-CzLjRij_.js": { path: A_0_assets_index_CzLjRij__js as unknown as string, mime: "application/javascript; charset=utf-8" },
|
||||
"/admin/assets/index-CoGEje3-.js": { path: A_0_assets_index_CoGEje3__js as unknown as string, mime: "application/javascript; charset=utf-8" },
|
||||
"/admin/assets/index-GxkWX7v3.css": { path: A_1_assets_index_GxkWX7v3_css as unknown as string, mime: "text/css; charset=utf-8" },
|
||||
"/admin/index.html": { path: A_2_index_html as unknown as string, mime: "text/html; charset=utf-8" },
|
||||
};
|
||||
|
||||
+12
-1
@@ -54,7 +54,7 @@ export function bigintToStringReplacer(_key: string, value: unknown): unknown {
|
||||
}
|
||||
|
||||
// CLI-only commands that bypass the operation layer
|
||||
export const CLI_ONLY = new Set(['init', 'reinit-pglite', 'upgrade', 'post-upgrade', 'check-update', 'integrations', 'publish', 'check-backlinks', 'lint', 'report', 'import', 'export', 'files', 'embed', 'serve', 'call', 'config', 'doctor', 'migrate', 'eval', 'sync', 'extract', 'extract-conversation-facts', 'enrich', 'features', 'autopilot', 'graph-query', 'jobs', 'agent', 'apply-migrations', 'skillpack-check', 'skillpack', 'resolvers', 'integrity', 'repair-jsonb', 'orphans', 'sources', 'mounts', 'dream', 'check-resolvable', 'routing-eval', 'skillify', 'smoke-test', 'providers', 'storage', 'repos', 'code-def', 'code-refs', 'reindex', 'reindex-code', 'reindex-frontmatter', 'code-callers', 'code-callees', 'reconcile-links', 'frontmatter', 'auth', 'friction', 'claw-test', 'book-mirror', 'takes', 'think', 'salience', 'anomalies', 'calibration', 'transcripts', 'models', 'remote', 'recall', 'forget', 'edges-backfill', 'cache', 'ze-switch', 'founder', 'brainstorm', 'lsd', 'schema', 'capture', 'onboard', 'conversation-parser', 'status', 'connect', 'skillopt', 'quarantine', 'self-upgrade', 'advisor', 'watch', 'reindex-search-vector']);
|
||||
export const CLI_ONLY = new Set(['init', 'reinit-pglite', 'upgrade', 'post-upgrade', 'check-update', 'integrations', 'publish', 'check-backlinks', 'lint', 'report', 'import', 'export', 'files', 'embed', 'serve', 'call', 'config', 'doctor', 'migrate', 'eval', 'sync', 'extract', 'extract-conversation-facts', 'enrich', 'features', 'autopilot', 'graph-query', 'jobs', 'agent', 'apply-migrations', 'skillpack-check', 'skillpack', 'resolvers', 'integrity', 'repair-jsonb', 'orphans', 'sources', 'mounts', 'dream', 'check-resolvable', 'routing-eval', 'skillify', 'smoke-test', 'providers', 'storage', 'repos', 'code-def', 'code-refs', 'reindex', 'reindex-code', 'reindex-frontmatter', 'code-callers', 'code-callees', 'reconcile-links', 'frontmatter', 'auth', 'friction', 'claw-test', 'book-mirror', 'takes', 'think', 'salience', 'anomalies', 'calibration', 'transcripts', 'models', 'remote', 'recall', 'forget', 'edges-backfill', 'facts', 'cache', 'ze-switch', 'founder', 'brainstorm', 'lsd', 'schema', 'capture', 'onboard', 'conversation-parser', 'status', 'connect', 'skillopt', 'quarantine', 'self-upgrade', 'advisor', 'watch', 'reindex-search-vector']);
|
||||
// CLI-only commands whose handlers print their own --help text. These are
|
||||
// excluded from the generic short-circuit so detailed per-command and
|
||||
// per-subcommand usage stays reachable.
|
||||
@@ -991,6 +991,8 @@ const THIN_CLIENT_REFUSED_COMMANDS = new Set([
|
||||
// hint pointing at the routable MCP tools; per-subcommand splits are
|
||||
// a v0.31.x follow-up TODO.
|
||||
'takes', 'sources',
|
||||
// #1867: fence-backfill edits local .md fences + stamps the local DB.
|
||||
'facts',
|
||||
// v0.32 thin-client routing audit (Codex round 2 findings #2, #4):
|
||||
// - `pages` purge-deleted is admin+localOnly (operations.ts:856-864)
|
||||
// - `files` list / file_url MCP ops are localOnly (operations.ts:1769-1879)
|
||||
@@ -1026,6 +1028,7 @@ const THIN_CLIENT_REFUSE_HINTS: Record<string, string> = {
|
||||
migrate: "migrate runs on the host's local engine. Run on the host machine.",
|
||||
'apply-migrations': 'schema migrations run on the host. SSH and run there.',
|
||||
'repair-jsonb': 'repair-jsonb operates on the local DB only.',
|
||||
facts: 'facts fence-backfill edits local entity-page fences. Run on the host machine.',
|
||||
integrity: 'integrity scans local files. Run on the host machine.',
|
||||
serve: 'serve starts a server. Run on the host, not the thin client.',
|
||||
dream: 'dream runs the autopilot cycle on the host. `gbrain remote ping` queues one. (Native `gbrain dream` thin-client routing planned for v0.31.2.)',
|
||||
@@ -1855,6 +1858,13 @@ async function handleCliOnly(command: string, args: string[]) {
|
||||
await runEdgesBackfill(engine, args);
|
||||
break;
|
||||
}
|
||||
case 'facts': {
|
||||
// #1867 — re-runnable fence-backfill for row_num-NULL legacy fact
|
||||
// rows (idempotent v0_32_2 phase B, exposed as an operator command).
|
||||
const { runFactsCommand } = await import('./commands/facts.ts');
|
||||
await runFactsCommand(engine, args);
|
||||
break;
|
||||
}
|
||||
case 'whoknows': {
|
||||
// v0.33 (Issue #?): expertise + relationship-proximity routing.
|
||||
// MCP op `find_experts` (read-scoped) backs the same code path; CLI
|
||||
@@ -2335,6 +2345,7 @@ TOOLS
|
||||
check-backlinks <check|fix> [dir] Find/fix missing back-links across brain
|
||||
lint <dir|file> [--fix] Catch LLM artifacts, placeholder dates, bad frontmatter
|
||||
orphans [--json] [--count] Find pages with no inbound wikilinks
|
||||
facts fence-backfill [--dry-run] Fence legacy fact rows (row_num NULL) onto entity pages
|
||||
salience [--days N] [--kind P] v0.29: pages ranked by emotional + activity salience
|
||||
anomalies [--since D] [--sigma N] v0.29: cohort-based statistical anomalies (tag, type)
|
||||
transcripts recent [--days N] v0.29: recent raw .txt transcripts (local-only)
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
/**
|
||||
* gbrain facts — fact-store maintenance surface (#1867).
|
||||
*
|
||||
* `fence-backfill` re-runs the v0_32_2 fence-backfill phase on demand.
|
||||
* Remote `extract_facts` deposits that predate the fence-write backstop
|
||||
* (and any legacy DB-only insert) leave `row_num IS NULL` rows that the
|
||||
* cycle extract_facts guard refuses to reconcile past — previously the
|
||||
* only remedy was the one-shot v0_32_2 migration, which the ledger marks
|
||||
* complete and never re-runs. The phase is idempotent (only touches
|
||||
* `row_num IS NULL` rows), so exposing it as a command is safe to re-run
|
||||
* any time the backlog reappears.
|
||||
*/
|
||||
import type { BrainEngine } from '../core/engine.ts';
|
||||
import { setCliExitVerdict } from '../core/cli-force-exit.ts';
|
||||
import { phaseBFenceFacts } from './migrations/v0_32_2.ts';
|
||||
|
||||
function printHelp(): void {
|
||||
process.stderr.write(
|
||||
`Usage: gbrain facts fence-backfill [--dry-run]\n\n` +
|
||||
`Fence-backfill: appends every legacy fact row (row_num IS NULL) to its\n` +
|
||||
`entity page's \`## Facts\` fence and stamps row_num + source_markdown_slug\n` +
|
||||
`back onto the DB row. Idempotent — re-runs only pick up rows still\n` +
|
||||
`missing a fence assignment. Clears the backlog that makes the cycle's\n` +
|
||||
`extract_facts phase skip fence→DB reconciliation.\n\n` +
|
||||
` --dry-run report what would be fenced; no FS or DB writes\n`,
|
||||
);
|
||||
}
|
||||
|
||||
export async function runFactsCommand(engine: BrainEngine, args: string[]): Promise<void> {
|
||||
const sub = args[0];
|
||||
if (!sub || sub === '--help' || sub === '-h') {
|
||||
printHelp();
|
||||
return;
|
||||
}
|
||||
if (sub !== 'fence-backfill') {
|
||||
process.stderr.write(`Unknown facts subcommand: ${sub}\n`);
|
||||
printHelp();
|
||||
setCliExitVerdict(1);
|
||||
return;
|
||||
}
|
||||
|
||||
const dryRun = args.includes('--dry-run');
|
||||
const result = await phaseBFenceFacts(engine, { dryRun });
|
||||
process.stderr.write(
|
||||
`fence-backfill: ${result.status}${result.detail ? ` — ${result.detail}` : ''}\n`,
|
||||
);
|
||||
if (result.status === 'failed') setCliExitVerdict(1);
|
||||
}
|
||||
@@ -39,6 +39,7 @@ import type { BrainEngine } from '../../core/engine.ts';
|
||||
import { loadConfig, toEngineConfig } from '../../core/config.ts';
|
||||
import { createEngine } from '../../core/engine-factory.ts';
|
||||
import { upsertFactRow, parseFactsFence } from '../../core/facts-fence.ts';
|
||||
import { resolvePageFilePath } from '../../core/markdown.ts';
|
||||
|
||||
let testEngineOverride: BrainEngine | null = null;
|
||||
export function __setTestEngineOverride(engine: BrainEngine | null): void {
|
||||
@@ -148,9 +149,16 @@ function isLocalPathDirty(localPath: string): boolean {
|
||||
}
|
||||
}
|
||||
|
||||
async function phaseBFenceFacts(
|
||||
/**
|
||||
* Exported (not just via `__testing`) because `gbrain facts fence-backfill`
|
||||
* (#1867) re-runs this phase on demand: remote `extract_facts` deposits that
|
||||
* predate the fence-write backstop leave row_num-NULL rows the cycle guard
|
||||
* refuses to reconcile past. The phase is idempotent (only touches
|
||||
* `row_num IS NULL` rows), so re-running is always safe.
|
||||
*/
|
||||
export async function phaseBFenceFacts(
|
||||
engine: BrainEngine | null,
|
||||
opts: OrchestratorOpts,
|
||||
opts: Pick<OrchestratorOpts, 'dryRun'>,
|
||||
): Promise<OrchestratorPhaseResult> {
|
||||
if (opts.dryRun) {
|
||||
// Dry-run: report what WOULD happen without touching FS or DB.
|
||||
@@ -238,7 +246,11 @@ async function phaseBFenceFacts(
|
||||
for (const [key, group] of groups) {
|
||||
const [sourceId, entitySlug] = key.split('\0');
|
||||
const localPath = localPathById.get(sourceId)!;
|
||||
const filePath = join(localPath, `${entitySlug}.md`);
|
||||
// resolvePageFilePath, NOT a bare join — non-default sources fence
|
||||
// into `<local_path>/.sources/<id>/<slug>.md`, the same path the
|
||||
// fence-write backstop and put_page write-through compute. A bare
|
||||
// join here diverges fence and DB for non-default sources (#2044).
|
||||
const filePath = resolvePageFilePath(localPath, entitySlug, sourceId);
|
||||
const tmpPath = `${filePath}.tmp`;
|
||||
|
||||
try {
|
||||
@@ -269,6 +281,21 @@ async function phaseBFenceFacts(
|
||||
const existingFence = parseFactsFence(body);
|
||||
const existingKeySet = new Set(existingFence.facts.map(f => `${f.claim}\0${f.source ?? ''}`));
|
||||
|
||||
// Seed appended row_nums from MAX(fence max, DB max) — same #2044
|
||||
// divergence guard as writeFactsToFence. When the fence at the
|
||||
// resolved path is missing/behind but the DB already holds stamped
|
||||
// rows for this slug (legacy wrong-path fence writes), fence-max+1
|
||||
// collides with idx_facts_fence_key on the post-rename UPDATE,
|
||||
// failing the page and leaving fence and DB disagreeing.
|
||||
const dbMaxRows = await engine.executeRaw<{ max: number | string | null }>(
|
||||
`SELECT MAX(row_num) AS max FROM facts
|
||||
WHERE source_id = $1 AND source_markdown_slug = $2`,
|
||||
[sourceId, entitySlug],
|
||||
);
|
||||
const dbMaxRowNum = Number(dbMaxRows[0]?.max ?? 0) || 0;
|
||||
const fenceMaxRowNum = existingFence.facts.reduce((m, f) => Math.max(m, f.rowNum), 0);
|
||||
let nextRowNum = Math.max(fenceMaxRowNum, dbMaxRowNum) + 1;
|
||||
|
||||
const assignments: Array<{ id: string; row_num: number }> = [];
|
||||
for (const row of group) {
|
||||
const key = `${row.fact}\0${row.source ?? ''}`;
|
||||
@@ -291,6 +318,7 @@ async function phaseBFenceFacts(
|
||||
.toISOString().slice(0, 10)
|
||||
: undefined;
|
||||
const { body: updated, rowNum } = upsertFactRow(body, {
|
||||
rowNum: nextRowNum++,
|
||||
claim: row.fact,
|
||||
kind: row.kind,
|
||||
confidence: row.confidence,
|
||||
@@ -381,7 +409,7 @@ async function phaseCVerify(
|
||||
for (const g of groups) {
|
||||
const localPath = localPathById.get(g.source_id);
|
||||
if (!localPath) continue;
|
||||
const filePath = join(localPath, `${g.source_markdown_slug}.md`);
|
||||
const filePath = resolvePageFilePath(localPath, g.source_markdown_slug, g.source_id);
|
||||
if (!existsSync(filePath)) {
|
||||
mismatches.push(`${g.source_markdown_slug} (file missing)`);
|
||||
continue;
|
||||
|
||||
@@ -39,7 +39,6 @@ import * as db from '../core/db.ts';
|
||||
import { sqlQueryForEngine, executeRawJsonb } from '../core/sql-query.ts';
|
||||
import { MinionQueue } from '../core/minions/queue.ts';
|
||||
import { isRetryableError } from '../core/retry-matcher.ts';
|
||||
import { normalizeAdminClientSourceScope } from '../core/admin-source-scope.ts';
|
||||
import {
|
||||
computeContentHash,
|
||||
validateIngestionEvent,
|
||||
@@ -1087,7 +1086,6 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
|
||||
const oauthClients = await sql`
|
||||
SELECT c.client_id as id, c.client_name as name, 'oauth' as auth_type,
|
||||
c.grant_types, c.scope, c.created_at, c.token_ttl,
|
||||
c.source_id, c.federated_read,
|
||||
CASE WHEN c.deleted_at IS NOT NULL THEN 'revoked' ELSE 'active' END as status,
|
||||
(SELECT max(created_at) FROM mcp_request_log WHERE token_name = c.client_id) as last_used_at,
|
||||
(SELECT count(*)::int FROM mcp_request_log WHERE token_name = c.client_id) as total_requests,
|
||||
@@ -1097,7 +1095,6 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
|
||||
const legacyKeys = await sql`
|
||||
SELECT a.id, a.name, 'api_key' as auth_type,
|
||||
'{"bearer"}' as grant_types, 'read write admin' as scope, a.created_at, null as token_ttl,
|
||||
null as source_id, null as federated_read,
|
||||
CASE WHEN a.revoked_at IS NOT NULL THEN 'revoked' ELSE 'active' END as status,
|
||||
a.last_used_at,
|
||||
(SELECT count(*)::int FROM mcp_request_log WHERE token_name = a.name) as total_requests,
|
||||
@@ -1110,17 +1107,6 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
|
||||
}
|
||||
});
|
||||
|
||||
app.get('/admin/api/sources', requireAdmin, async (_req: Request, res: Response) => {
|
||||
try {
|
||||
const sources = await engine.listAllSources({ includeArchived: false });
|
||||
const options = sources.map(s => ({ id: s.id, name: s.name }));
|
||||
if (!options.some(s => s.id === 'default')) options.unshift({ id: 'default', name: 'default' });
|
||||
res.json(options);
|
||||
} catch (e) {
|
||||
res.status(503).json({ error: 'service_unavailable' });
|
||||
}
|
||||
});
|
||||
|
||||
// v0.38 Slice 4 — per-OAuth-client agent spend viewer. Pre-computes today's
|
||||
// spend (committed + pending reservations) per client so the Agents tab
|
||||
// can render a "$X / $Y today" cell. Read-side endpoint only — no mutation.
|
||||
@@ -1454,8 +1440,6 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
|
||||
// missing, empty) and rejects the rest with a structured 400.
|
||||
const { name, tokenTtl, grantTypes, redirectUris, tokenEndpointAuthMethod } = req.body;
|
||||
const rawScopes = (req.body as Record<string, unknown>).scopes ?? (req.body as Record<string, unknown>).scope;
|
||||
const rawSourceId = (req.body as Record<string, unknown>).source_id ?? (req.body as Record<string, unknown>).sourceId;
|
||||
const rawFederatedRead = (req.body as Record<string, unknown>).federated_read ?? (req.body as Record<string, unknown>).federatedRead;
|
||||
if (!name) { res.status(400).json({ error: 'Name required' }); return; }
|
||||
let scopeString: string;
|
||||
try {
|
||||
@@ -1486,23 +1470,8 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
|
||||
});
|
||||
return;
|
||||
}
|
||||
let sourceScope: ReturnType<typeof normalizeAdminClientSourceScope>;
|
||||
try {
|
||||
const sources = await engine.listAllSources({ includeArchived: false });
|
||||
sourceScope = normalizeAdminClientSourceScope(
|
||||
rawSourceId,
|
||||
rawFederatedRead,
|
||||
sources.map(s => s.id),
|
||||
);
|
||||
} catch (e) {
|
||||
res.status(400).json({
|
||||
error: 'invalid_source_scope',
|
||||
message: e instanceof Error ? e.message : String(e),
|
||||
});
|
||||
return;
|
||||
}
|
||||
const result = await oauthProvider.registerClientManual(
|
||||
name, grants, scopeString, uris, sourceScope.sourceId, sourceScope.federatedRead, validatedAuthMethod,
|
||||
name, grants, scopeString, uris, 'default', undefined, validatedAuthMethod,
|
||||
);
|
||||
// Set per-client TTL if specified
|
||||
if (tokenTtl && Number(tokenTtl) > 0) {
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
import { isValidSourceId } from './source-id.ts';
|
||||
|
||||
export interface AdminClientSourceScope {
|
||||
sourceId: string;
|
||||
federatedRead: string[];
|
||||
}
|
||||
|
||||
function parseFederatedReadInput(raw: unknown, sourceId: string): string[] {
|
||||
if (raw === undefined || raw === null) return [sourceId];
|
||||
if (typeof raw === 'string') {
|
||||
const values = raw.split(',').map(s => s.trim()).filter(Boolean);
|
||||
return values.length > 0 ? values : [sourceId];
|
||||
}
|
||||
if (Array.isArray(raw)) {
|
||||
if (!raw.every(v => typeof v === 'string')) {
|
||||
throw new Error('federated_read must be an array of source ids');
|
||||
}
|
||||
const values = raw.map(v => v.trim()).filter(Boolean);
|
||||
return values.length > 0 ? values : [sourceId];
|
||||
}
|
||||
throw new Error('federated_read must be a string or array');
|
||||
}
|
||||
|
||||
export function normalizeAdminClientSourceScope(
|
||||
rawSourceId: unknown,
|
||||
rawFederatedRead: unknown,
|
||||
availableSourceIds: string[],
|
||||
): AdminClientSourceScope {
|
||||
const knownSources = new Set(availableSourceIds);
|
||||
const fallbackSourceId = knownSources.has('default') ? 'default' : (availableSourceIds[0] ?? 'default');
|
||||
const sourceId = rawSourceId === undefined || rawSourceId === null || rawSourceId === ''
|
||||
? fallbackSourceId
|
||||
: rawSourceId;
|
||||
if (!isValidSourceId(sourceId)) {
|
||||
throw new Error(`Invalid source_id: ${JSON.stringify(sourceId)}`);
|
||||
}
|
||||
if (knownSources.size > 0 && !knownSources.has(sourceId)) {
|
||||
throw new Error(`Unknown source_id: ${sourceId}`);
|
||||
}
|
||||
|
||||
const federatedRead = Array.from(new Set(parseFederatedReadInput(rawFederatedRead, sourceId)));
|
||||
for (const id of federatedRead) {
|
||||
if (!isValidSourceId(id)) {
|
||||
throw new Error(`Invalid federated_read source_id: ${JSON.stringify(id)}`);
|
||||
}
|
||||
if (knownSources.size > 0 && !knownSources.has(id)) {
|
||||
throw new Error(`Unknown federated_read source_id: ${id}`);
|
||||
}
|
||||
}
|
||||
return { sourceId, federatedRead };
|
||||
}
|
||||
@@ -176,9 +176,11 @@ export async function runExtractFacts(
|
||||
if (legacyCount > 0) {
|
||||
result.guardTriggered = true;
|
||||
result.warnings.push(
|
||||
`extract_facts: ${legacyCount} legacy v0.31 fact rows pending fence backfill. ` +
|
||||
`Run \`gbrain apply-migrations --yes\` to complete v0_32_2 before this phase ` +
|
||||
`can safely reconcile fence → DB.`,
|
||||
`extract_facts: ${legacyCount} legacy fact rows pending fence backfill ` +
|
||||
`(row_num IS NULL — v0.31 rows or remote extract_facts deposits that ` +
|
||||
`predate the fence backstop). Run \`gbrain facts fence-backfill\` ` +
|
||||
`(idempotent, re-runnable) before this phase can safely reconcile ` +
|
||||
`fence → DB.`,
|
||||
);
|
||||
return result;
|
||||
}
|
||||
|
||||
+7
-6
@@ -1739,13 +1739,14 @@ export interface BrainEngine {
|
||||
* single-row supersede flow because fence reconciliation is the canonical
|
||||
* source-of-truth direction, not the consolidator path.
|
||||
*
|
||||
* Insertion is atomic per call: all rows commit in a single transaction
|
||||
* or none commit (the transaction rolls back on any constraint
|
||||
* violation, e.g. the v51 partial UNIQUE index on
|
||||
* `(source_id, source_markdown_slug, row_num)`).
|
||||
* Insertion runs in a single transaction. A collision on the v51
|
||||
* partial UNIQUE index `(source_id, source_markdown_slug, row_num)`
|
||||
* skips ONLY that row (ON CONFLICT DO NOTHING, #2044) — the rest of
|
||||
* the batch still commits, so a redundant deposit against an
|
||||
* already-indexed fence row is idempotent instead of a hard failure.
|
||||
*
|
||||
* Returns the inserted ids in input-order so callers can correlate
|
||||
* fence-row → DB-id without a separate lookup.
|
||||
* Returns the inserted ids in input-order (colliding rows omitted) so
|
||||
* callers can correlate fence-row → DB-id without a separate lookup.
|
||||
*/
|
||||
insertFacts(
|
||||
rows: Array<NewFact & { row_num: number; source_markdown_slug: string }>,
|
||||
|
||||
@@ -218,11 +218,27 @@ export async function writeFactsToFence(
|
||||
}
|
||||
|
||||
// 2. Upsert each fact onto the fence in input order. row_num
|
||||
// monotonically increases (max-existing + 1 per call, append-only).
|
||||
// monotonically increases, append-only, seeded from the MAX of
|
||||
// the fence and the DB index (#2044): when fence and DB have
|
||||
// diverged (e.g. legacy writes that stamped DB rows against a
|
||||
// fence at a path this code no longer reads), fence-max+1 can
|
||||
// collide with an existing DB row_num, tripping
|
||||
// idx_facts_fence_key and rolling back the whole batch.
|
||||
const dbMaxRows = await engine.executeRaw<{ max: number | string | null }>(
|
||||
`SELECT MAX(row_num) AS max FROM facts
|
||||
WHERE source_id = $1 AND source_markdown_slug = $2`,
|
||||
[target.sourceId, target.slug],
|
||||
);
|
||||
const dbMaxRowNum = Number(dbMaxRows[0]?.max ?? 0) || 0;
|
||||
const fenceMaxRowNum = parseFactsFence(body).facts
|
||||
.reduce((m, f) => Math.max(m, f.rowNum), 0);
|
||||
let nextRowNum = Math.max(fenceMaxRowNum, dbMaxRowNum) + 1;
|
||||
|
||||
const assignedRowNums: number[] = [];
|
||||
for (const f of facts) {
|
||||
const validFromStr = (f.validFrom ?? new Date()).toISOString().slice(0, 10);
|
||||
const { body: updated, rowNum } = upsertFactRow(body, {
|
||||
rowNum: nextRowNum++,
|
||||
claim: f.fact,
|
||||
kind: (f.kind ?? 'fact') as 'fact' | 'event' | 'preference' | 'commitment' | 'belief',
|
||||
confidence: f.confidence ?? 1.0,
|
||||
|
||||
@@ -4102,11 +4102,13 @@ export class PGLiteEngine implements BrainEngine {
|
||||
): Promise<{ inserted: number; ids: number[] }> {
|
||||
if (rows.length === 0) return { inserted: 0, ids: [] };
|
||||
|
||||
// Single transaction so the v51 partial UNIQUE index can roll back the
|
||||
// whole batch on constraint violation. Per-row INSERTs (not multi-row
|
||||
// VALUES) keep the embedding-vs-no-embedding branching readable; batch
|
||||
// sizes are small (5-30 rows per page in practice) so the loop overhead
|
||||
// is negligible vs the embedding compute cost.
|
||||
// Single transaction; per-row INSERTs (not multi-row VALUES) keep the
|
||||
// embedding-vs-no-embedding branching readable; batch sizes are small
|
||||
// (5-30 rows per page in practice) so the loop overhead is negligible
|
||||
// vs the embedding compute cost. #2044: ON CONFLICT DO NOTHING on the
|
||||
// v51 partial UNIQUE index makes a residual fence/DB row_num collision
|
||||
// skip that row instead of rolling back the whole batch (parity with
|
||||
// postgres-engine.ts).
|
||||
const ids = await this.db.transaction(async (tx) => {
|
||||
const out: number[] = [];
|
||||
for (const input of rows) {
|
||||
@@ -4149,7 +4151,11 @@ export class PGLiteEngine implements BrainEngine {
|
||||
$14, $15,
|
||||
$16, $17, $18, $19,
|
||||
$20
|
||||
) RETURNING id`
|
||||
)
|
||||
ON CONFLICT (source_id, source_markdown_slug, row_num)
|
||||
WHERE row_num IS NOT NULL
|
||||
DO NOTHING
|
||||
RETURNING id`
|
||||
: `INSERT INTO facts (
|
||||
source_id, entity_slug, fact, kind, visibility, notability, context,
|
||||
valid_from, valid_until, source, source_session, confidence,
|
||||
@@ -4163,12 +4169,16 @@ export class PGLiteEngine implements BrainEngine {
|
||||
$15, $16,
|
||||
$17, $18, $19, $20,
|
||||
$21
|
||||
) RETURNING id`,
|
||||
)
|
||||
ON CONFLICT (source_id, source_markdown_slug, row_num)
|
||||
WHERE row_num IS NOT NULL
|
||||
DO NOTHING
|
||||
RETURNING id`,
|
||||
embedStr === null
|
||||
? [ctx.source_id, entitySlug, input.fact, kind, visibility, notability, context, validFrom, validUntil, input.source, sourceSession, confidence, embeddedAt, input.row_num, input.source_markdown_slug, claimMetric, claimValue, claimUnit, claimPeriod, eventType]
|
||||
: [ctx.source_id, entitySlug, input.fact, kind, visibility, notability, context, validFrom, validUntil, input.source, sourceSession, confidence, embedStr, embeddedAt, input.row_num, input.source_markdown_slug, claimMetric, claimValue, claimUnit, claimPeriod, eventType],
|
||||
);
|
||||
out.push(ins.rows[0].id);
|
||||
if (ins.rows[0]) out.push(ins.rows[0].id);
|
||||
}
|
||||
return out;
|
||||
});
|
||||
|
||||
@@ -4302,10 +4302,12 @@ export class PostgresEngine implements BrainEngine {
|
||||
// ONCE per process so the cast matches the actual column type
|
||||
// (halfvec vs vector). The probe is cached after first call.
|
||||
const castSuffix = await this.resolveFactsEmbeddingCast();
|
||||
// Single transaction so the v51 partial UNIQUE index can roll back
|
||||
// the whole batch on constraint violation. Per-row INSERTs (not
|
||||
// multi-row VALUES) keep the embedding-vs-no-embedding branching
|
||||
// readable; batch sizes are small (5-30 rows per page in practice).
|
||||
// Single transaction; per-row INSERTs (not multi-row VALUES) keep the
|
||||
// embedding-vs-no-embedding branching readable; batch sizes are small
|
||||
// (5-30 rows per page in practice). #2044: ON CONFLICT DO NOTHING on
|
||||
// the v51 partial UNIQUE index makes a residual fence/DB row_num
|
||||
// collision skip that row instead of rolling back the whole batch —
|
||||
// the fence stays system-of-record and reconciliation catches up.
|
||||
// No supersede flow in this path — fence reconciliation is the
|
||||
// canonical source-of-truth direction, not the consolidator path.
|
||||
const ids = await sql.begin(async (tx) => {
|
||||
@@ -4346,9 +4348,13 @@ export class PostgresEngine implements BrainEngine {
|
||||
${input.row_num}, ${input.source_markdown_slug},
|
||||
${claimMetric}, ${claimValue}, ${claimUnit}, ${claimPeriod},
|
||||
${eventType}
|
||||
) RETURNING id
|
||||
)
|
||||
ON CONFLICT (source_id, source_markdown_slug, row_num)
|
||||
WHERE row_num IS NOT NULL
|
||||
DO NOTHING
|
||||
RETURNING id
|
||||
`;
|
||||
out.push(Number(ins[0].id));
|
||||
if (ins[0]) out.push(Number(ins[0].id));
|
||||
}
|
||||
return out;
|
||||
});
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
import { describe, expect, test } from 'bun:test';
|
||||
import { normalizeAdminClientSourceScope } from '../src/core/admin-source-scope.ts';
|
||||
|
||||
describe('admin register-client source scope normalization', () => {
|
||||
const sources = ['default', 'team-a', 'team-b'];
|
||||
|
||||
test('defaults write and read scope to default source', () => {
|
||||
expect(normalizeAdminClientSourceScope(undefined, undefined, sources)).toEqual({
|
||||
sourceId: 'default',
|
||||
federatedRead: ['default'],
|
||||
});
|
||||
});
|
||||
|
||||
test('accepts snake-case body fields with multiple read sources', () => {
|
||||
expect(normalizeAdminClientSourceScope('team-a', ['team-a', 'team-b'], sources)).toEqual({
|
||||
sourceId: 'team-a',
|
||||
federatedRead: ['team-a', 'team-b'],
|
||||
});
|
||||
});
|
||||
|
||||
test('accepts comma-separated federated_read for API callers', () => {
|
||||
expect(normalizeAdminClientSourceScope('team-a', 'team-b, default,team-b', sources)).toEqual({
|
||||
sourceId: 'team-a',
|
||||
federatedRead: ['team-b', 'default'],
|
||||
});
|
||||
});
|
||||
|
||||
test('falls back to selected write source when federated_read is empty', () => {
|
||||
expect(normalizeAdminClientSourceScope('team-b', [], sources)).toEqual({
|
||||
sourceId: 'team-b',
|
||||
federatedRead: ['team-b'],
|
||||
});
|
||||
});
|
||||
|
||||
test('rejects malformed source ids before registration', () => {
|
||||
expect(() => normalizeAdminClientSourceScope('../secret', undefined, sources)).toThrow(/Invalid source_id/);
|
||||
expect(() => normalizeAdminClientSourceScope('team-a', ['snake_case'], sources)).toThrow(/Invalid federated_read/);
|
||||
});
|
||||
|
||||
test('rejects valid-looking but unregistered source ids', () => {
|
||||
expect(() => normalizeAdminClientSourceScope('ghost', undefined, sources)).toThrow(/Unknown source_id/);
|
||||
expect(() => normalizeAdminClientSourceScope('team-a', ['ghost'], sources)).toThrow(/Unknown federated_read/);
|
||||
});
|
||||
});
|
||||
@@ -304,7 +304,9 @@ describe('runExtractFacts — empty-fence guard (Codex R2-#7)', () => {
|
||||
expect(r.legacyRowsPending).toBe(1);
|
||||
expect(r.factsInserted).toBe(0);
|
||||
expect(r.factsDeleted).toBe(0);
|
||||
expect(r.warnings.some(w => w.includes('apply-migrations'))).toBe(true);
|
||||
// #1867: the remedy hint points at the re-runnable backfill command,
|
||||
// not the one-shot v0_32_2 migration (which the ledger never re-runs).
|
||||
expect(r.warnings.some(w => w.includes('gbrain facts fence-backfill'))).toBe(true);
|
||||
|
||||
// Legacy row was NOT touched.
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
/**
|
||||
* #1867 — `gbrain facts fence-backfill` command tests.
|
||||
*
|
||||
* The command re-runs the (idempotent) v0_32_2 phase B on demand so
|
||||
* row_num-NULL backlogs — remote extract_facts deposits that predate
|
||||
* the fence-write backstop — can be cleared without re-running the
|
||||
* one-shot migration. Real PGLite + real tempdir filesystem.
|
||||
*/
|
||||
|
||||
import { describe, test, expect, beforeAll, afterAll, beforeEach } from 'bun:test';
|
||||
import { mkdtempSync, rmSync, existsSync, readFileSync } from 'node:fs';
|
||||
import { tmpdir } from 'node:os';
|
||||
import { join } from 'node:path';
|
||||
|
||||
import { PGLiteEngine } from '../src/core/pglite-engine.ts';
|
||||
import { runFactsCommand } from '../src/commands/facts.ts';
|
||||
import { phaseBFenceFacts } from '../src/commands/migrations/v0_32_2.ts';
|
||||
|
||||
let engine: PGLiteEngine;
|
||||
let brainDir: string;
|
||||
|
||||
beforeAll(async () => {
|
||||
engine = new PGLiteEngine();
|
||||
await engine.connect({});
|
||||
await engine.initSchema();
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
await engine.disconnect();
|
||||
try {
|
||||
if (brainDir) rmSync(brainDir, { recursive: true, force: true });
|
||||
} catch { /* best-effort */ }
|
||||
});
|
||||
|
||||
beforeEach(async () => {
|
||||
brainDir = mkdtempSync(join(tmpdir(), 'facts-backfill-cmd-test-'));
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
await (engine as any).db.query('DELETE FROM facts');
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
await (engine as any).db.query(
|
||||
`UPDATE sources SET local_path = $1 WHERE id = 'default'`,
|
||||
[brainDir],
|
||||
);
|
||||
});
|
||||
|
||||
async function seedLegacyFact(fact: string): Promise<void> {
|
||||
// The row_num-NULL shape a remote extract_facts deposit leaves behind
|
||||
// when it lands via the legacy DB-only path.
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
await (engine as any).db.query(
|
||||
`INSERT INTO facts (source_id, entity_slug, fact, kind, visibility, notability,
|
||||
valid_from, source, confidence)
|
||||
VALUES ('default', 'people/alice', $1, 'fact', 'private', 'medium',
|
||||
now(), 'mcp:extract_facts', 1.0)`,
|
||||
[fact],
|
||||
);
|
||||
}
|
||||
|
||||
describe('gbrain facts fence-backfill', () => {
|
||||
test('fences row_num-NULL rows and stamps the DB', async () => {
|
||||
await seedLegacyFact('Deposited remotely');
|
||||
|
||||
await runFactsCommand(engine, ['fence-backfill']);
|
||||
|
||||
// The fence exists on disk with the claim.
|
||||
const filePath = join(brainDir, 'people/alice.md');
|
||||
expect(existsSync(filePath)).toBe(true);
|
||||
expect(readFileSync(filePath, 'utf-8')).toContain('Deposited remotely');
|
||||
|
||||
// The backlog is cleared: no row_num-NULL rows remain.
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const rows = await (engine as any).db.query(
|
||||
'SELECT row_num, source_markdown_slug FROM facts',
|
||||
);
|
||||
expect(rows.rows).toHaveLength(1);
|
||||
expect(rows.rows[0].row_num).toBe(1);
|
||||
expect(rows.rows[0].source_markdown_slug).toBe('people/alice');
|
||||
});
|
||||
|
||||
test('re-run is a no-op (idempotent)', async () => {
|
||||
await seedLegacyFact('Deposited remotely');
|
||||
await runFactsCommand(engine, ['fence-backfill']);
|
||||
await runFactsCommand(engine, ['fence-backfill']);
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const rows = await (engine as any).db.query('SELECT id FROM facts');
|
||||
expect(rows.rows).toHaveLength(1);
|
||||
const body = readFileSync(join(brainDir, 'people/alice.md'), 'utf-8');
|
||||
expect(body.match(/Deposited remotely/g)).toHaveLength(1);
|
||||
});
|
||||
|
||||
test('--dry-run reports without writing', async () => {
|
||||
await seedLegacyFact('Deposited remotely');
|
||||
await runFactsCommand(engine, ['fence-backfill', '--dry-run']);
|
||||
|
||||
expect(existsSync(join(brainDir, 'people/alice.md'))).toBe(false);
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const rows = await (engine as any).db.query(
|
||||
'SELECT row_num FROM facts',
|
||||
);
|
||||
expect(rows.rows[0].row_num).toBeNull();
|
||||
});
|
||||
|
||||
test('diverged page: appends past the DB row_num max instead of colliding (#2044 class)', async () => {
|
||||
// The #2044 divergence shape the backfill must survive: the DB already
|
||||
// holds stamped rows 1..3 for the slug (legacy wrong-path fence write),
|
||||
// but the fence at the resolved path is missing. Fence-max+1 (= 1) would
|
||||
// collide with the stamped rows on the post-rename UPDATE, failing the
|
||||
// page and leaving the renamed fence disagreeing with the DB.
|
||||
for (let n = 1; n <= 3; n++) {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
await (engine as any).db.query(
|
||||
`INSERT INTO facts (source_id, entity_slug, fact, kind, visibility, notability,
|
||||
valid_from, source, confidence, row_num, source_markdown_slug)
|
||||
VALUES ('default', 'people/alice', $1, 'fact', 'private', 'medium',
|
||||
now(), 'mcp:extract_facts', 1.0, $2, 'people/alice')`,
|
||||
[`stamped ${n}`, n],
|
||||
);
|
||||
}
|
||||
await seedLegacyFact('Deposited remotely');
|
||||
|
||||
const result = await phaseBFenceFacts(engine, { dryRun: false });
|
||||
expect(result.status).toBe('complete');
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const rows = await (engine as any).db.query(
|
||||
`SELECT row_num FROM facts WHERE fact = 'Deposited remotely'`,
|
||||
);
|
||||
expect(rows.rows[0].row_num).toBe(4);
|
||||
const body = readFileSync(join(brainDir, 'people/alice.md'), 'utf-8');
|
||||
expect(body).toContain('| 4 | Deposited remotely |');
|
||||
});
|
||||
});
|
||||
@@ -292,6 +292,49 @@ describe('lookupSourceLocalPath', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('writeFactsToFence — fence/DB divergence (#2044)', () => {
|
||||
test('seeds row_num past the DB max when the fence lags the DB', async () => {
|
||||
// Simulate the divergence class from #2044: DB rows were stamped with
|
||||
// row_nums against a fence written at a path this code no longer reads
|
||||
// (e.g. the pre-"Local patch 2026-06-11" wrong-path writes). The page
|
||||
// on disk has NO fence, but the DB already holds row_num 1..3 for the
|
||||
// slug. Pre-fix, the next deposit re-assigned row_num=1 from fence
|
||||
// text alone and the whole insertFacts batch failed on
|
||||
// idx_facts_fence_key.
|
||||
for (let n = 1; n <= 3; n++) {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
await (engine as any).db.query(
|
||||
`INSERT INTO facts (source_id, entity_slug, fact, kind, visibility, notability,
|
||||
valid_from, source, confidence, row_num, source_markdown_slug)
|
||||
VALUES ('default', 'people/dana', $1, 'fact', 'private', 'medium',
|
||||
now(), 'mcp:extract_facts', 1.0, $2, 'people/dana')`,
|
||||
[`old claim ${n}`, n],
|
||||
);
|
||||
}
|
||||
|
||||
const result = await writeFactsToFence(
|
||||
engine,
|
||||
{ sourceId: 'default', localPath: brainDir, slug: 'people/dana' },
|
||||
[baseInput({ fact: 'second deposit' })],
|
||||
);
|
||||
|
||||
expect(result.fenceWriteFailed).toBeUndefined();
|
||||
expect(result.inserted).toBe(1);
|
||||
|
||||
// The new row landed PAST the DB max, not at fence-max+1 (= 1).
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const rows = await (engine as any).db.query(
|
||||
'SELECT row_num FROM facts WHERE id = $1',
|
||||
[result.ids[0]],
|
||||
);
|
||||
expect(rows.rows[0].row_num).toBe(4);
|
||||
|
||||
// And the on-disk fence carries the same row_num — fence and DB agree.
|
||||
const body = readFileSync(join(brainDir, 'people/dana.md'), 'utf-8');
|
||||
expect(body).toContain('| 4 | second deposit |');
|
||||
});
|
||||
});
|
||||
|
||||
// Cleanup any leftover tempdirs after the whole suite.
|
||||
afterAll(() => {
|
||||
// No-op: each test cleaned up via the beforeEach; this is a safety net.
|
||||
|
||||
@@ -78,8 +78,6 @@ describe('v0.36.1.x #1077 — admin register-client supports PKCE public clients
|
||||
// (under either name) from req.body. Pin the fallback pattern so the
|
||||
// PKCE-fix regression contract stays load-bearing.
|
||||
expect(src).toMatch(/req\.body[^;]*scopes\s*\?\?\s*[^;]*scope\b/);
|
||||
expect(src).toMatch(/req\.body[^;]*source_id\s*\?\?\s*[^;]*sourceId\b/);
|
||||
expect(src).toMatch(/req\.body[^;]*federated_read\s*\?\?\s*[^;]*federatedRead\b/);
|
||||
// v0.41.3 (T4 atomicity fix, codex F4): admin endpoint now validates
|
||||
// tokenEndpointAuthMethod via the shared validator and passes it to
|
||||
// registerClientManual as a positional arg. Pre-v0.41.3 the route did
|
||||
@@ -89,7 +87,6 @@ describe('v0.36.1.x #1077 — admin register-client supports PKCE public clients
|
||||
// UPDATE block (the regex deliberately asserts the post-insert UPDATE
|
||||
// is GONE).
|
||||
expect(src).toMatch(/validateTokenEndpointAuthMethod\(tokenEndpointAuthMethod\)/);
|
||||
expect(src).toMatch(/normalizeAdminClientSourceScope\(/);
|
||||
expect(src).toMatch(/registerClientManual\([^)]*validatedAuthMethod[^)]*\)/);
|
||||
// Regression guard: post-insert UPDATE flipping client_secret_hash to
|
||||
// NULL based on a runtime check is exactly the non-atomic pattern T4
|
||||
@@ -270,26 +267,3 @@ describe('v0.42.43.0 #2095 — volunteer-events sink + cycle purge wiring (struc
|
||||
expect(src).toMatch(/purged_volunteer_events_count/);
|
||||
});
|
||||
});
|
||||
|
||||
describe('#1490 + #1036 — admin Register Agent form exposes source scope + redirect URIs', () => {
|
||||
test('Agents.tsx RegisterModal sends source_id + federated_read in the POST body (#1490)', () => {
|
||||
const src = readFileSync('admin/src/pages/Agents.tsx', 'utf8');
|
||||
expect(src).toMatch(/source_id:\s*sourceId/);
|
||||
expect(src).toMatch(/federated_read:\s*federatedRead/);
|
||||
// The source list comes from the requireAdmin-gated endpoint, not a hardcoded 'default'.
|
||||
expect(src).toMatch(/api\.sources\(\)/);
|
||||
});
|
||||
|
||||
test('serve-http.ts serves /admin/api/sources behind requireAdmin (#1490)', () => {
|
||||
const src = readFileSync('src/commands/serve-http.ts', 'utf8');
|
||||
expect(src).toMatch(/app\.get\('\/admin\/api\/sources',\s*requireAdmin/);
|
||||
});
|
||||
|
||||
test('Agents.tsx RegisterModal sends redirectUris + authorization_code grants when URIs are entered (#1036)', () => {
|
||||
const src = readFileSync('admin/src/pages/Agents.tsx', 'utf8');
|
||||
// One-per-line textarea split into an array...
|
||||
expect(src).toMatch(/redirectUris\.split\('\\n'\)/);
|
||||
// ...included in the body with the CLI's grant-type inference convention.
|
||||
expect(src).toMatch(/redirectUris:\s*uris,\s*grantTypes:\s*\['authorization_code',\s*'refresh_token'\]/);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
* - Batch insert N rows persists row_num + source_markdown_slug
|
||||
* - Empty batch is a no-op
|
||||
* - Returns ids in input-order
|
||||
* - v51 partial UNIQUE index rolls back the whole batch on a collision
|
||||
* - v51 partial UNIQUE collision skips only the colliding row (#2044)
|
||||
* - deleteFactsForPage scopes by (source_id, source_markdown_slug);
|
||||
* never touches other pages or pre-v51 NULL-source_markdown_slug rows
|
||||
* - deleteFactsForPage on an empty page returns deleted:0 (idempotent)
|
||||
@@ -135,30 +135,29 @@ describe('engine.insertFacts — batch insert', () => {
|
||||
});
|
||||
});
|
||||
|
||||
test('v51 partial UNIQUE index rolls back the whole batch on collision', async () => {
|
||||
test('v51 partial UNIQUE collision skips ONLY the colliding row (#2044)', async () => {
|
||||
// Seed row #1 first.
|
||||
await engine.insertFacts([fixtureFact(1, { fact: 'seeded' })], { source_id: 'default' });
|
||||
|
||||
// Now try to batch-insert rows that include a colliding row_num=1.
|
||||
let threw = false;
|
||||
try {
|
||||
await engine.insertFacts(
|
||||
[
|
||||
fixtureFact(2, { fact: 'second' }),
|
||||
fixtureFact(1, { fact: 'collides' }), // row_num=1 on same (source_id, source_markdown_slug)
|
||||
fixtureFact(3, { fact: 'third' }),
|
||||
],
|
||||
{ source_id: 'default' },
|
||||
);
|
||||
} catch {
|
||||
threw = true;
|
||||
}
|
||||
expect(threw).toBe(true);
|
||||
// Batch-insert rows that include a colliding row_num=1. Pre-#2044 this
|
||||
// threw and rolled back the whole batch, making a second remote
|
||||
// extract_facts deposit to an already-fenced page a hard failure. Now
|
||||
// ON CONFLICT DO NOTHING skips the colliding row and keeps the rest.
|
||||
const result = await engine.insertFacts(
|
||||
[
|
||||
fixtureFact(2, { fact: 'second' }),
|
||||
fixtureFact(1, { fact: 'collides' }), // row_num=1 on same (source_id, source_markdown_slug)
|
||||
fixtureFact(3, { fact: 'third' }),
|
||||
],
|
||||
{ source_id: 'default' },
|
||||
);
|
||||
expect(result.inserted).toBe(2);
|
||||
expect(result.ids).toHaveLength(2);
|
||||
|
||||
// Verify the transaction rolled back — only the seeded row should remain.
|
||||
// The seeded row survives untouched; the colliding claim is skipped.
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const rows = await (engine as any).db.query('SELECT fact FROM facts ORDER BY id');
|
||||
expect(rows.rows.map((r: { fact: string }) => r.fact)).toEqual(['seeded']);
|
||||
expect(rows.rows.map((r: { fact: string }) => r.fact)).toEqual(['seeded', 'second', 'third']);
|
||||
});
|
||||
|
||||
test('different source_markdown_slug values DO NOT collide on the same row_num', async () => {
|
||||
|
||||
@@ -125,30 +125,6 @@ describe('client registration', () => {
|
||||
expect(client!.client_name).toBe('test-agent');
|
||||
});
|
||||
|
||||
test('registerClientManual persists source_id and federated_read into AuthInfo', async () => {
|
||||
await sql`
|
||||
INSERT INTO sources (id, name) VALUES (${'team-a'}, ${'Team A'}), (${'team-b'}, ${'Team B'})
|
||||
ON CONFLICT DO NOTHING
|
||||
`;
|
||||
const { clientId, clientSecret } = await provider.registerClientManual(
|
||||
'source-scoped-test',
|
||||
['client_credentials'],
|
||||
'read write',
|
||||
[],
|
||||
'team-a',
|
||||
['team-a', 'team-b'],
|
||||
);
|
||||
|
||||
const tokens = await provider.exchangeClientCredentials(clientId, clientSecret!, 'read');
|
||||
const authInfo = await provider.verifyAccessToken(tokens.access_token) as {
|
||||
sourceId?: string;
|
||||
allowedSources?: string[];
|
||||
};
|
||||
|
||||
expect(authInfo.sourceId).toBe('team-a');
|
||||
expect(authInfo.allowedSources).toEqual(['team-a', 'team-b']);
|
||||
});
|
||||
|
||||
test('getClient returns undefined for unknown client', async () => {
|
||||
const client = await provider.clientsStore.getClient('nonexistent');
|
||||
expect(client).toBeUndefined();
|
||||
|
||||
Reference in New Issue
Block a user