mirror of
https://github.com/garrytan/gbrain.git
synced 2026-08-16 09:52:22 +00:00
Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
62bd7fb3b7 | ||
|
|
733fcd633a | ||
|
|
97e716b01f | ||
|
|
ff737e4345 |
+1
-22
@@ -365,12 +365,6 @@ async function main() {
|
||||
if (def.required && params[key] === undefined) {
|
||||
if (queryHasAlt && key === 'query') continue;
|
||||
const cliName = op.cliHints?.name || op.name;
|
||||
// #2822: when the missing param is the op's stdin-fed one, the usage
|
||||
// line alone is misleading (the positionals may all be present — the
|
||||
// pipe was just empty). Name the real problem.
|
||||
if (op.cliHints?.stdin === key) {
|
||||
console.error(`Error: required "${key}" is missing — stdin was empty or not piped. Pipe content on stdin or pass --${key.replace(/_/g, '-')}.`);
|
||||
}
|
||||
const positional = op.cliHints?.positional || [];
|
||||
const usage = positional.map(p => `<${p}>`).join(' ');
|
||||
console.error(`Usage: gbrain ${cliName} ${usage}`);
|
||||
@@ -767,10 +761,6 @@ export function parseOpArgs(op: Operation, args: string[]): Record<string, unkno
|
||||
const params: Record<string, unknown> = {};
|
||||
const positional = op.cliHints?.positional || [];
|
||||
let posIdx = 0;
|
||||
// #2822: track which params came from positionals so a later flag that
|
||||
// silently discards one (`gbrain put CONTENT --slug foo` — CONTENT was
|
||||
// parsed as the slug) gets a stderr warning instead of vanishing.
|
||||
const positionallySet = new Set<string>();
|
||||
|
||||
for (let i = 0; i < args.length; i++) {
|
||||
const arg = args[i];
|
||||
@@ -788,20 +778,13 @@ export function parseOpArgs(op: Operation, args: string[]): Record<string, unkno
|
||||
if (paramDef?.type === 'boolean') {
|
||||
params[key] = true;
|
||||
} else if (i + 1 < args.length) {
|
||||
if (positionallySet.has(key) && params[key] !== args[i + 1]) {
|
||||
console.error(`Warning: ${arg} overrides the positional <${key}> value ${JSON.stringify(params[key])}.`);
|
||||
}
|
||||
params[key] = args[++i];
|
||||
if (paramDef?.type === 'number') params[key] = Number(params[key]);
|
||||
}
|
||||
} else if (posIdx < positional.length) {
|
||||
const key = positional[posIdx++];
|
||||
const paramDef = op.params[key];
|
||||
if (params[key] !== undefined && params[key] !== (paramDef?.type === 'number' ? Number(arg) : arg)) {
|
||||
console.error(`Warning: positional <${key}> overrides the earlier --${key.replace(/_/g, '-')} value ${JSON.stringify(params[key])}.`);
|
||||
}
|
||||
params[key] = paramDef?.type === 'number' ? Number(arg) : arg;
|
||||
positionallySet.add(key);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -813,11 +796,7 @@ export function parseOpArgs(op: Operation, args: string[]): Record<string, unkno
|
||||
console.error(`Error: stdin content exceeds ${MAX_STDIN} bytes. Split into smaller inputs.`);
|
||||
process.exit(1);
|
||||
}
|
||||
// #2822: empty/whitespace-only stdin (cron with no input, broken pipe)
|
||||
// stays UNSET so the required-param check rejects the call instead of
|
||||
// silently writing an empty page (0 chunks, invisible to search and
|
||||
// embed --stale).
|
||||
if (stdinContent.trim().length > 0) params[op.cliHints.stdin] = stdinContent;
|
||||
params[op.cliHints.stdin] = stdinContent;
|
||||
}
|
||||
|
||||
return params;
|
||||
|
||||
@@ -48,7 +48,6 @@ const FRONTMATTER_RULE_NAMES: Record<ParseValidationCode, string> = {
|
||||
NESTED_QUOTES: 'frontmatter-nested-quotes',
|
||||
NON_STRING_FIELD: 'frontmatter-non-string-field',
|
||||
EMPTY_FRONTMATTER: 'frontmatter-empty',
|
||||
MULTI_FRONTMATTER: 'frontmatter-multi',
|
||||
};
|
||||
|
||||
/** Codes whose lint findings are fixable by `gbrain frontmatter validate --fix`. */
|
||||
|
||||
@@ -18,12 +18,22 @@
|
||||
import { loadConfig } from '../config.ts';
|
||||
|
||||
export function hasAnthropicKey(): boolean {
|
||||
if (process.env.ANTHROPIC_API_KEY) return true;
|
||||
return resolveAnthropicKey() !== undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolve the actual key value: env first, then the gbrain config file.
|
||||
* Callers constructing an Anthropic client directly (e.g. the legacy
|
||||
* subagent path) must pass this as `apiKey` — a bare `new Anthropic()`
|
||||
* only sees env, so launchd/MCP workers with config-stored keys fail.
|
||||
*/
|
||||
export function resolveAnthropicKey(): string | undefined {
|
||||
if (process.env.ANTHROPIC_API_KEY) return process.env.ANTHROPIC_API_KEY;
|
||||
try {
|
||||
const cfg = loadConfig();
|
||||
if (cfg?.anthropic_api_key) return true;
|
||||
if (cfg?.anthropic_api_key) return cfg.anthropic_api_key;
|
||||
} catch {
|
||||
// loadConfig may throw on first-run installs; treat as no key available.
|
||||
}
|
||||
return false;
|
||||
return undefined;
|
||||
}
|
||||
|
||||
+1
-22
@@ -301,17 +301,6 @@ export async function importFromContent(
|
||||
// silently fabricated a duplicate at (default, slug) — causing later
|
||||
// bare-slug subqueries (getTags, deleteChunks, etc.) to crash with 21000.
|
||||
const sourceId = opts.sourceId;
|
||||
// #2822: reject empty/whitespace-only content before any work happens. An
|
||||
// empty page writes 0 chunks — invisible to search AND to `embed --stale`
|
||||
// (nothing to embed), so the mistake never surfaces. Empty content is
|
||||
// always a caller bug (empty piped stdin, bad shell substitution). Thrown
|
||||
// (not returned) so every wrapper site surfaces the message, matching the
|
||||
// ContentSanityBlockError flow.
|
||||
if (content.trim().length === 0) {
|
||||
throw new Error(
|
||||
`Content for "${slug}" is empty; refusing to write an empty page (0 chunks would be invisible to search and embed --stale).`,
|
||||
);
|
||||
}
|
||||
// Reject oversized payloads before any parsing, chunking, or embedding happens.
|
||||
// Uses Buffer.byteLength to count UTF-8 bytes the same way disk size would,
|
||||
// so the network path behaves identically to the file path.
|
||||
@@ -325,17 +314,7 @@ export async function importFromContent(
|
||||
};
|
||||
}
|
||||
|
||||
const parsed = parseMarkdown(content, slug + '.md', { activePack: opts.activePack, validate: true });
|
||||
|
||||
// #2743: reject stacked frontmatter (the double-put corruption class —
|
||||
// already-serialized markdown re-wrapped in fresh frontmatter). gray-matter
|
||||
// parses only the first block; the second would land verbatim in the body
|
||||
// and poison every subsequent round-trip. Only MULTI_FRONTMATTER rejects
|
||||
// here — the other validation codes keep their lint-only semantics.
|
||||
const multiFm = parsed.errors?.find(e => e.code === 'MULTI_FRONTMATTER');
|
||||
if (multiFm) {
|
||||
throw new Error(`MULTI_FRONTMATTER: ${multiFm.message} (slug "${slug}", line ${multiFm.line})`);
|
||||
}
|
||||
const parsed = parseMarkdown(content, slug + '.md', { activePack: opts.activePack });
|
||||
|
||||
// v0.42 (#1699 trust boundary): strip gate-owned markers from UNTRUSTED
|
||||
// input. parseMarkdown preserves every frontmatter key except type/title/
|
||||
|
||||
+1
-46
@@ -11,8 +11,7 @@ export type ParseValidationCode =
|
||||
| 'NULL_BYTES'
|
||||
| 'NESTED_QUOTES'
|
||||
| 'NON_STRING_FIELD'
|
||||
| 'EMPTY_FRONTMATTER'
|
||||
| 'MULTI_FRONTMATTER';
|
||||
| 'EMPTY_FRONTMATTER';
|
||||
|
||||
export interface ParseValidationError {
|
||||
code: ParseValidationCode;
|
||||
@@ -332,50 +331,6 @@ function collectValidationErrors(
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 9. MULTI_FRONTMATTER (#2743) — a second ---…--- block right after the
|
||||
// closing fence is stacked frontmatter (the double-put corruption class:
|
||||
// already-serialized markdown re-wrapped in fresh frontmatter).
|
||||
// gray-matter parses only the first block and silently leaves the second
|
||||
// in the body. Heuristic: first non-empty line after the close is `---`,
|
||||
// a later `---` closes it, EVERY line between is frontmatter-shaped
|
||||
// (YAML `key:`, `- ` list item, `#` comment, indented continuation, or
|
||||
// blank — the issue's "stop at the first non-frontmatter character"
|
||||
// spec), and at least one is a `key:` line. A lone `---` stays a
|
||||
// markdown horizontal rule, and an hrule followed by prose — even
|
||||
// colon-prefixed prose like `Note: …` mixed with plain lines — is body
|
||||
// content, not a stacked block.
|
||||
let afterClose = closeLine + 1;
|
||||
while (afterClose < lines.length && lines[afterClose].trim().length === 0) afterClose++;
|
||||
if (afterClose < lines.length && lines[afterClose].trim() === '---') {
|
||||
let secondClose = -1;
|
||||
for (let i = afterClose + 1; i < lines.length; i++) {
|
||||
const trimmed = lines[i].trim();
|
||||
if (trimmed === '---') {
|
||||
secondClose = i;
|
||||
break;
|
||||
}
|
||||
const yamlShaped =
|
||||
trimmed.length === 0 ||
|
||||
/^[A-Za-z_][\w-]*\s*:/.test(trimmed) ||
|
||||
trimmed.startsWith('- ') ||
|
||||
trimmed === '-' ||
|
||||
trimmed.startsWith('#') ||
|
||||
/^\s/.test(lines[i]);
|
||||
if (!yamlShaped) break; // first non-frontmatter line → body prose, not a stacked block
|
||||
}
|
||||
if (
|
||||
secondClose > afterClose + 1 &&
|
||||
lines.slice(afterClose + 1, secondClose).some(l => /^\s*[A-Za-z_][\w-]*\s*:/.test(l))
|
||||
) {
|
||||
errors.push({
|
||||
code: 'MULTI_FRONTMATTER',
|
||||
message:
|
||||
'Stacked frontmatter: a second ---…--- block follows the frontmatter (double-put corruption); merge into a single frontmatter block',
|
||||
line: afterClose + 1,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -48,6 +48,7 @@ import {
|
||||
logSubagentHeartbeat,
|
||||
} from './subagent-audit.ts';
|
||||
import { resolveModel, isAnthropicProvider, TIER_DEFAULTS } from '../../model-config.ts';
|
||||
import { resolveAnthropicKey } from '../../ai/anthropic-key.ts';
|
||||
import { buildSystemPrompt, DEFAULT_SUBAGENT_SYSTEM } from '../system-prompt.ts';
|
||||
import { toolLoop as gatewayToolLoop } from '../../ai/gateway.ts';
|
||||
import type { ChatToolDef, ChatMessage, ChatBlock, ChatResult, ToolHandler } from '../../ai/gateway.ts';
|
||||
@@ -186,7 +187,10 @@ export function makeSubagentHandler(deps: SubagentDeps) {
|
||||
// lives at sdk.messages.create. Assigning sdk.messages directly gets the
|
||||
// right object; JS method-call semantics preserve `this` at the call
|
||||
// site (subagent.ts invokes client.create(...) with client === sdk.messages).
|
||||
const makeAnthropic = deps.makeAnthropic ?? (() => new Anthropic());
|
||||
// Resolve the key env-first, then config (anthropic_api_key) — a bare
|
||||
// new Anthropic() only reads env, so launchd/MCP workers whose key lives
|
||||
// in the gbrain config file would fail auth (#2048).
|
||||
const makeAnthropic = deps.makeAnthropic ?? (() => new Anthropic({ apiKey: resolveAnthropicKey() }));
|
||||
const client: MessagesClient = deps.client ?? makeAnthropic().messages;
|
||||
const config = deps.config ?? loadConfig() ?? ({ engine: 'postgres' } as GBrainConfig);
|
||||
const rateLeaseKey = deps.rateLeaseKey ?? DEFAULT_RATE_KEY;
|
||||
|
||||
@@ -4562,7 +4562,8 @@ const list_schema_packs: Operation = {
|
||||
const { existsSync, readdirSync } = await import('node:fs');
|
||||
const { join } = await import('node:path');
|
||||
const { gbrainPath } = await import('./config.ts');
|
||||
const bundled = ['gbrain-base', 'gbrain-recommended'];
|
||||
const { BUNDLED_PACK_NAMES } = await import('./schema-pack/bundled.ts');
|
||||
const bundled = [...BUNDLED_PACK_NAMES];
|
||||
const installedDir = gbrainPath('schema-packs');
|
||||
const installed: string[] = [];
|
||||
if (existsSync(installedDir)) {
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
// Bundled schema-pack registry — single source of truth for the packs that
|
||||
// ship in src/core/schema-pack/base/. Keep every bundled-pack consumer
|
||||
// (CLI/MCP inspection, active-pack loading, mutation guards, upgrade
|
||||
// discovery) on this one list so they cannot drift.
|
||||
//
|
||||
// v0.39 T8 — gbrain-base + gbrain-recommended.
|
||||
// v0.41 T4 — lens packs: creator, investor, engineer, everything (meta-pack).
|
||||
// v0.42 type-unification — gbrain-base-v2, the 15-type canonical successor.
|
||||
|
||||
export const BUNDLED_PACK_NAMES = [
|
||||
'gbrain-base',
|
||||
'gbrain-recommended',
|
||||
'gbrain-creator',
|
||||
'gbrain-investor',
|
||||
'gbrain-engineer',
|
||||
'gbrain-everything',
|
||||
'gbrain-base-v2',
|
||||
] as const;
|
||||
|
||||
export type BundledPackName = typeof BUNDLED_PACK_NAMES[number];
|
||||
|
||||
export function isBundledPackName(name: string): name is BundledPackName {
|
||||
return (BUNDLED_PACK_NAMES as readonly string[]).includes(name);
|
||||
}
|
||||
@@ -37,6 +37,7 @@ import {
|
||||
type ResolutionInput,
|
||||
type ResolutionResult,
|
||||
} from './registry.ts';
|
||||
import { isBundledPackName } from './bundled.ts';
|
||||
|
||||
/**
|
||||
* Inputs the caller (operations.ts handler / engine query path) provides.
|
||||
@@ -92,28 +93,7 @@ export function _resetPackLocatorForTests(): void {
|
||||
* throwing UnknownPackError with a paste-ready install hint.
|
||||
*/
|
||||
function defaultPackLocator(name: string): string | null {
|
||||
// v0.39 T8 — bundled packs registry. gbrain-base + gbrain-recommended
|
||||
// ship in src/core/schema-pack/base/. Add a new entry here to bundle
|
||||
// additional canonical packs.
|
||||
//
|
||||
// v0.41 T4 — lens packs join the bundle: creator (atoms + concepts +
|
||||
// extract_atoms/synthesize_concepts phases), investor (theses + bet
|
||||
// resolution + 3 calibration domains), engineer (gstack-learnings bridge
|
||||
// + 3 calibration domains), everything (meta-pack stacking all three
|
||||
// via extends + borrow_from). Each ships as a real YAML at base/<name>.yaml.
|
||||
const BUNDLED: ReadonlyArray<string> = [
|
||||
'gbrain-base',
|
||||
'gbrain-recommended',
|
||||
'gbrain-creator',
|
||||
'gbrain-investor',
|
||||
'gbrain-engineer',
|
||||
'gbrain-everything',
|
||||
// v0.42 type-unification: 15-type canonical successor to gbrain-base.
|
||||
// Ships as install default (Lane E T17) + via gbrain onboard pack
|
||||
// upgrade flow (the unify-types Minion handler).
|
||||
'gbrain-base-v2',
|
||||
];
|
||||
if (BUNDLED.includes(name)) {
|
||||
if (isBundledPackName(name)) {
|
||||
// Resolve bundled YAML relative to this source file. Works in both
|
||||
// direct-bun execution and bun --compile binaries.
|
||||
const here = dirname(fileURLToPath(import.meta.url));
|
||||
|
||||
@@ -159,6 +159,29 @@ export function parseYamlMini(content: string): unknown {
|
||||
return parseMapping(baseIndent);
|
||||
}
|
||||
|
||||
function parseBlockScalar(parentIndent: number, folded: boolean): string {
|
||||
const contentIndent = parentIndent + 2;
|
||||
const out: string[] = [];
|
||||
while (i < lines.length) {
|
||||
const raw = lines[i];
|
||||
// Inside a block scalar everything is literal content — '#' is NOT a
|
||||
// comment here, so use the raw line (no stripComment / isBlank).
|
||||
if (raw.trim() === '') {
|
||||
out.push('');
|
||||
i++;
|
||||
continue;
|
||||
}
|
||||
const indent = indentOf(raw);
|
||||
if (indent <= parentIndent) break;
|
||||
out.push(raw.slice(Math.min(contentIndent, indent)));
|
||||
i++;
|
||||
}
|
||||
if (folded) {
|
||||
return out.join(' ').replace(/\s+$/u, '');
|
||||
}
|
||||
return out.join('\n').replace(/\n+$/u, '');
|
||||
}
|
||||
|
||||
function parseSequence(baseIndent: number): unknown[] {
|
||||
const result: unknown[] = [];
|
||||
while (i < lines.length) {
|
||||
@@ -227,6 +250,10 @@ export function parseYamlMini(content: string): unknown {
|
||||
i++;
|
||||
if (rest2 === '') {
|
||||
map[key2] = parseBlock(nextIndent + 2);
|
||||
} else if (rest2 === '|' || rest2 === '|-' || rest2 === '|+') {
|
||||
map[key2] = parseBlockScalar(nextIndent, false);
|
||||
} else if (rest2 === '>' || rest2 === '>-' || rest2 === '>+') {
|
||||
map[key2] = parseBlockScalar(nextIndent, true);
|
||||
} else {
|
||||
map[key2] = parseScalar(rest2);
|
||||
}
|
||||
@@ -257,6 +284,10 @@ export function parseYamlMini(content: string): unknown {
|
||||
i++;
|
||||
if (rest === '') {
|
||||
result[key] = parseBlock(indent + 2);
|
||||
} else if (rest === '|' || rest === '|-' || rest === '|+') {
|
||||
result[key] = parseBlockScalar(indent, false);
|
||||
} else if (rest === '>' || rest === '>-' || rest === '>+') {
|
||||
result[key] = parseBlockScalar(indent, true);
|
||||
} else {
|
||||
result[key] = parseScalar(rest);
|
||||
}
|
||||
|
||||
@@ -65,6 +65,7 @@ import { invalidateQueryCache } from './query-cache-invalidator.ts';
|
||||
import { logMutationFailure, logMutationSuccess, type MutationActor, type MutationOp } from './mutate-audit.ts';
|
||||
import { runFilePlaneLintRules } from './lint-rules.ts';
|
||||
import { withPackLock, type PackLockOpts } from './pack-lock.ts';
|
||||
import { BUNDLED_PACK_NAMES as BUNDLED_PACK_NAME_LIST } from './bundled.ts';
|
||||
import type { BrainEngine } from '../engine.ts';
|
||||
|
||||
export type PackFileFormat = 'json' | 'yaml';
|
||||
@@ -93,7 +94,7 @@ export class SchemaPackMutationError extends Error {
|
||||
}
|
||||
}
|
||||
|
||||
export const BUNDLED_PACK_NAMES = new Set(['gbrain-base', 'gbrain-recommended', 'gbrain-base-v2']);
|
||||
export const BUNDLED_PACK_NAMES = new Set<string>(BUNDLED_PACK_NAME_LIST);
|
||||
|
||||
export interface MutateResult {
|
||||
/** Pack name that was mutated. */
|
||||
|
||||
@@ -10,7 +10,7 @@ import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs';
|
||||
import { tmpdir } from 'node:os';
|
||||
import { join } from 'node:path';
|
||||
import { withEnv } from '../helpers/with-env.ts';
|
||||
import { hasAnthropicKey } from '../../src/core/ai/anthropic-key.ts';
|
||||
import { hasAnthropicKey, resolveAnthropicKey } from '../../src/core/ai/anthropic-key.ts';
|
||||
|
||||
const tmpDirs: string[] = [];
|
||||
function freshHome(withConfig?: Record<string, unknown>): string {
|
||||
@@ -62,3 +62,35 @@ describe('hasAnthropicKey', () => {
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('resolveAnthropicKey (#2048 — subagent config-key auth)', () => {
|
||||
test('env wins over config', async () => {
|
||||
const home = freshHome({ anthropic_api_key: 'sk-from-config' });
|
||||
await withEnv(
|
||||
{ ANTHROPIC_API_KEY: 'sk-from-env', GBRAIN_HOME: home, DATABASE_URL: undefined, GBRAIN_DATABASE_URL: undefined },
|
||||
async () => {
|
||||
expect(resolveAnthropicKey()).toBe('sk-from-env');
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
test('config key returned when env unset', async () => {
|
||||
const home = freshHome({ anthropic_api_key: 'sk-from-config' });
|
||||
await withEnv(
|
||||
{ ANTHROPIC_API_KEY: undefined, GBRAIN_HOME: home, DATABASE_URL: undefined, GBRAIN_DATABASE_URL: undefined },
|
||||
async () => {
|
||||
expect(resolveAnthropicKey()).toBe('sk-from-config');
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
test('neither → undefined', async () => {
|
||||
const home = freshHome();
|
||||
await withEnv(
|
||||
{ ANTHROPIC_API_KEY: undefined, GBRAIN_HOME: home, DATABASE_URL: undefined, GBRAIN_DATABASE_URL: undefined },
|
||||
async () => {
|
||||
expect(resolveAnthropicKey()).toBeUndefined();
|
||||
},
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
+1
-70
@@ -1,8 +1,4 @@
|
||||
import { afterEach, describe, expect, test } from 'bun:test';
|
||||
import { spawnSync } from 'child_process';
|
||||
import { join, resolve } from 'path';
|
||||
import { mkdtempSync, rmSync } from 'fs';
|
||||
import { tmpdir } from 'os';
|
||||
import { describe, expect, test } from 'bun:test';
|
||||
import { parseOpArgs } from '../src/cli.ts';
|
||||
import { operationsByName } from '../src/core/operations.ts';
|
||||
|
||||
@@ -24,70 +20,5 @@ describe('parseOpArgs', () => {
|
||||
source_id: 'gstack-code-repo-0e4763c9',
|
||||
});
|
||||
});
|
||||
|
||||
describe('positional/flag overwrite warning (#2822)', () => {
|
||||
const errors: string[] = [];
|
||||
const origError = console.error;
|
||||
const captureErrors = () => {
|
||||
console.error = (...args: unknown[]) => errors.push(args.join(' '));
|
||||
};
|
||||
afterEach(() => {
|
||||
console.error = origError;
|
||||
errors.length = 0;
|
||||
});
|
||||
|
||||
test('a flag that overwrites a positional value warns to stderr', () => {
|
||||
captureErrors();
|
||||
const params = parseOpArgs(operationsByName.query, ['positional text', '--query', 'flag text']);
|
||||
expect(params.query).toBe('flag text');
|
||||
expect(errors.some(e => e.includes('Warning') && e.includes('--query'))).toBe(true);
|
||||
});
|
||||
|
||||
test('a positional that overwrites an earlier flag value warns to stderr', () => {
|
||||
captureErrors();
|
||||
const params = parseOpArgs(operationsByName.query, ['--query', 'flag text', 'positional text']);
|
||||
expect(params.query).toBe('positional text');
|
||||
expect(errors.some(e => e.includes('Warning') && e.includes('<query>'))).toBe(true);
|
||||
});
|
||||
|
||||
test('no warning when flag and positional agree', () => {
|
||||
captureErrors();
|
||||
parseOpArgs(operationsByName.query, ['same', '--query', 'same']);
|
||||
expect(errors).toEqual([]);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('gbrain put — empty non-TTY stdin rejects (#2822)', () => {
|
||||
const REPO = resolve(import.meta.dir, '..');
|
||||
const CLI = join(REPO, 'src', 'cli.ts');
|
||||
|
||||
const runPut = (input: string) => {
|
||||
// Isolated HOME so a regression can never write into a real brain.
|
||||
const home = mkdtempSync(join(tmpdir(), 'gbrain-put-empty-'));
|
||||
try {
|
||||
return spawnSync('bun', [CLI, 'put', 'inbox/empty-stdin-test'], {
|
||||
stdio: ['pipe', 'pipe', 'pipe'],
|
||||
input,
|
||||
encoding: 'utf-8',
|
||||
timeout: 60_000,
|
||||
env: { ...process.env, HOME: home, GBRAIN_SKIP_STARTUP_HOOKS: '1' },
|
||||
});
|
||||
} finally {
|
||||
rmSync(home, { recursive: true, force: true });
|
||||
}
|
||||
};
|
||||
|
||||
test('empty stdin exits 1 and names the missing content param', () => {
|
||||
const res = runPut('');
|
||||
expect(res.status).toBe(1);
|
||||
expect(res.stderr).toContain('content');
|
||||
expect(res.stderr).toContain('stdin');
|
||||
}, 90_000);
|
||||
|
||||
test('whitespace-only stdin also exits 1', () => {
|
||||
const res = runPut(' \n\t\n');
|
||||
expect(res.status).toBe(1);
|
||||
expect(res.stderr).toContain('stdin');
|
||||
}, 90_000);
|
||||
});
|
||||
|
||||
@@ -708,32 +708,3 @@ body unchanged
|
||||
expect(shortCircuited).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe('importFromContent — empty content guard (#2822)', () => {
|
||||
test('empty string throws instead of writing an invisible 0-chunk page', async () => {
|
||||
const engine = mockEngine();
|
||||
await expect(importFromContent(engine, 'inbox/empty', '', { noEmbed: true })).rejects.toThrow(/empty/i);
|
||||
expect((engine as any)._calls.find((c: any) => c.method === 'putPage')).toBeUndefined();
|
||||
});
|
||||
|
||||
test('whitespace-only content throws', async () => {
|
||||
const engine = mockEngine();
|
||||
await expect(importFromContent(engine, 'inbox/ws', ' \n\t \n', { noEmbed: true })).rejects.toThrow(/empty/i);
|
||||
});
|
||||
});
|
||||
|
||||
describe('importFromContent — stacked frontmatter rejection (#2743)', () => {
|
||||
test('double-put shaped content (two ---…--- blocks) throws MULTI_FRONTMATTER', async () => {
|
||||
const engine = mockEngine();
|
||||
const md = '---\ntitle: outer\n---\n\n---\ntitle: inner\ntype: concept\n---\n\nreal body';
|
||||
await expect(importFromContent(engine, 'inbox/double', md, { noEmbed: true })).rejects.toThrow(/MULTI_FRONTMATTER/);
|
||||
expect((engine as any)._calls.find((c: any) => c.method === 'putPage')).toBeUndefined();
|
||||
});
|
||||
|
||||
test('normal content with horizontal rules in the body still imports', async () => {
|
||||
const engine = mockEngine();
|
||||
const md = '---\ntitle: ok\ntype: concept\n---\n\nprose before\n\n---\n\nprose after the rule';
|
||||
const result = await importFromContent(engine, 'inbox/hrule', md, { noEmbed: true });
|
||||
expect(result.status).toBe('imported');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -55,13 +55,13 @@ describe('v0.41 T4: all 4 bundled lens packs parse cleanly', () => {
|
||||
});
|
||||
|
||||
describe('v0.41 T4: bundled registry includes lens packs', () => {
|
||||
test('load-active.ts BUNDLED array source includes the 4 lens pack names', () => {
|
||||
const loadActiveSrc = readFileSync(
|
||||
join(here, '..', 'src', 'core', 'schema-pack', 'load-active.ts'),
|
||||
'utf-8',
|
||||
);
|
||||
test('BUNDLED_PACK_NAMES includes the 4 lens pack names', async () => {
|
||||
// The bundled list moved from load-active.ts to bundled.ts (the
|
||||
// single source of truth); assert the array directly instead of
|
||||
// grepping source text.
|
||||
const { BUNDLED_PACK_NAMES } = await import('../src/core/schema-pack/bundled.ts');
|
||||
for (const name of PACK_NAMES) {
|
||||
expect(loadActiveSrc).toContain(`'${name}'`);
|
||||
expect(BUNDLED_PACK_NAMES).toContain(name);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
@@ -256,56 +256,6 @@ body`;
|
||||
});
|
||||
});
|
||||
|
||||
describe('MULTI_FRONTMATTER (#2743)', () => {
|
||||
test('stacked frontmatter immediately after the close fence', () => {
|
||||
const md = `${fence}\ntitle: outer\n${fence}\n${fence}\ntitle: inner\ntype: concept\n${fence}\n\nbody`;
|
||||
const parsed = parseMarkdown(md, undefined, { validate: true });
|
||||
expect(parsed.errors!.map(e => e.code)).toContain('MULTI_FRONTMATTER');
|
||||
});
|
||||
|
||||
test('stacked frontmatter with a blank line between blocks (serializeMarkdown shape)', () => {
|
||||
const md = `${fence}\ntitle: outer\n${fence}\n\n${fence}\ntitle: inner\n${fence}\n\nbody`;
|
||||
const parsed = parseMarkdown(md, undefined, { validate: true });
|
||||
expect(parsed.errors!.map(e => e.code)).toContain('MULTI_FRONTMATTER');
|
||||
});
|
||||
|
||||
test('horizontal rules in the body are NOT flagged', () => {
|
||||
const md = `${fence}\ntitle: ok\n${fence}\n\nsome prose\n\n${fence}\n\nmore prose\n\n${fence}\n\nend`;
|
||||
const parsed = parseMarkdown(md, undefined, { validate: true });
|
||||
expect(parsed.errors!.map(e => e.code)).not.toContain('MULTI_FRONTMATTER');
|
||||
});
|
||||
|
||||
test('hrule pair at body start without YAML-shaped lines is NOT flagged', () => {
|
||||
const md = `${fence}\ntitle: ok\n${fence}\n\n${fence}\n\nplain prose between rules\n\n${fence}\n\nend`;
|
||||
const parsed = parseMarkdown(md, undefined, { validate: true });
|
||||
expect(parsed.errors!.map(e => e.code)).not.toContain('MULTI_FRONTMATTER');
|
||||
});
|
||||
|
||||
test('timeline sentinel form is NOT flagged', () => {
|
||||
const md = `${fence}\ntitle: ok\n${fence}\n\nbody text\n\n${fence}\n\n## Timeline\n- 2024-01-01: thing`;
|
||||
const parsed = parseMarkdown(md, undefined, { validate: true });
|
||||
expect(parsed.errors!.map(e => e.code)).not.toContain('MULTI_FRONTMATTER');
|
||||
});
|
||||
|
||||
test('body hrule + colon-prefixed prose (`Note: …`) mixed with plain lines is NOT flagged', () => {
|
||||
const md = `${fence}\ntitle: ok\ntype: concept\n${fence}\n\n${fence}\n\nNote: remember to follow up\n\nlots of plain prose here\n\n${fence}\n\nmore prose`;
|
||||
const parsed = parseMarkdown(md, undefined, { validate: true });
|
||||
expect(parsed.errors!.map(e => e.code)).not.toContain('MULTI_FRONTMATTER');
|
||||
});
|
||||
|
||||
test('fence pairing stops at the first non-frontmatter line (no far-fence pairing across prose)', () => {
|
||||
const md = `${fence}\ntitle: ok\n${fence}\n\n${fence}\n\n${'plain prose line\n'.repeat(40)}TODO: fix the widget\n${'more prose\n'.repeat(40)}${fence}\nend`;
|
||||
const parsed = parseMarkdown(md, undefined, { validate: true });
|
||||
expect(parsed.errors!.map(e => e.code)).not.toContain('MULTI_FRONTMATTER');
|
||||
});
|
||||
|
||||
test('stacked block with list-valued keys is still flagged', () => {
|
||||
const md = `${fence}\ntitle: outer\n${fence}\n\n${fence}\ntitle: inner\ntags:\n - a\n - b\n${fence}\n\nbody`;
|
||||
const parsed = parseMarkdown(md, undefined, { validate: true });
|
||||
expect(parsed.errors!.map(e => e.code)).toContain('MULTI_FRONTMATTER');
|
||||
});
|
||||
});
|
||||
|
||||
test('error.line is set for line-bearing errors', () => {
|
||||
const md = `${fence}\ntype: concept\n${fence}\n# Heading inline\n\nbody\x00drop`;
|
||||
const parsed = parseMarkdown(md, undefined, { validate: true });
|
||||
|
||||
@@ -149,6 +149,9 @@ describe('list_schema_packs', () => {
|
||||
seedPack('mine');
|
||||
const result = await operationsByName.list_schema_packs!.handler(ctxOf(), {}) as { bundled: string[]; installed: string[] };
|
||||
expect(result.bundled).toContain('gbrain-base');
|
||||
expect(result.bundled).toContain('gbrain-recommended');
|
||||
expect(result.bundled).toContain('gbrain-base-v2');
|
||||
expect(result.bundled).toContain('gbrain-investor');
|
||||
expect(result.installed).toContain('mine');
|
||||
});
|
||||
});
|
||||
|
||||
+38
-1
@@ -64,11 +64,14 @@ describe('gbrain schema CLI (Phase C)', () => {
|
||||
expect(r.stdout + r.stderr).toMatch(/schema|active|list|show|validate|use/i);
|
||||
});
|
||||
|
||||
test('schema list shows gbrain-base bundled', () => {
|
||||
test('schema list shows all bundled packs', () => {
|
||||
const r = gbrain(['schema', 'list']);
|
||||
expect(r.code).toBe(0);
|
||||
expect(r.stdout).toContain('Bundled packs:');
|
||||
expect(r.stdout).toContain('gbrain-base');
|
||||
expect(r.stdout).toContain('gbrain-recommended');
|
||||
expect(r.stdout).toContain('gbrain-base-v2');
|
||||
expect(r.stdout).toContain('gbrain-investor');
|
||||
});
|
||||
|
||||
test('schema show gbrain-base prints manifest details', () => {
|
||||
@@ -97,6 +100,40 @@ describe('gbrain schema CLI (Phase C)', () => {
|
||||
expect(r.stdout).toContain('valid manifest');
|
||||
});
|
||||
|
||||
test('schema show/validate exposes bundled gbrain-recommended', () => {
|
||||
const show = gbrain(['schema', 'show', 'gbrain-recommended']);
|
||||
expect(show.code).toBe(0);
|
||||
expect(show.stdout).toContain('gbrain-recommended v1.0.0');
|
||||
expect(show.stdout).toContain('Page types (');
|
||||
expect(show.stdout).toContain('meeting :: temporal');
|
||||
|
||||
const validate = gbrain(['schema', 'validate', 'gbrain-recommended']);
|
||||
expect(validate.code).toBe(0);
|
||||
expect(validate.stdout).toContain('valid manifest');
|
||||
});
|
||||
|
||||
test('schema show exposes bundled gbrain-base-v2 successor pack', () => {
|
||||
const r = gbrain(['schema', 'show', 'gbrain-base-v2']);
|
||||
expect(r.code).toBe(0);
|
||||
expect(r.stdout).toContain('gbrain-base-v2 v1.0.0');
|
||||
expect(r.stdout).toContain('Page types (');
|
||||
expect(r.stdout).toContain('Link verbs (14)');
|
||||
});
|
||||
|
||||
test('schema active loads configured gbrain-recommended with real types', () => {
|
||||
const home = mkdtempSync(join(tmpdir(), 'gbrain-schema-active-recommended-'));
|
||||
try {
|
||||
mkdirSync(join(home, '.gbrain'), { recursive: true });
|
||||
writeFileSync(join(home, '.gbrain', 'config.json'), JSON.stringify({ schema_pack: 'gbrain-recommended' }), 'utf-8');
|
||||
const r = gbrain(['schema', 'active'], { GBRAIN_HOME: home });
|
||||
expect(r.code).toBe(0);
|
||||
expect(r.stdout).toContain('Active pack: gbrain-recommended');
|
||||
expect(r.stdout).not.toContain('Page types: 0');
|
||||
} finally {
|
||||
rmSync(home, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
test('schema active reports default resolution', () => {
|
||||
const r = gbrain(['schema', 'active']);
|
||||
expect(r.code).toBe(0);
|
||||
|
||||
@@ -345,6 +345,34 @@ describe('YAML mini-parser', () => {
|
||||
expect(result.types[1].weight).toBe(2);
|
||||
});
|
||||
|
||||
test('parses block scalar without swallowing following keys', () => {
|
||||
const yaml = `name: blocky
|
||||
description: |
|
||||
First line.
|
||||
Second line.
|
||||
page_types:
|
||||
- name: meeting
|
||||
primitive: temporal
|
||||
path_prefixes:
|
||||
- meetings/
|
||||
aliases: []
|
||||
extractable: true
|
||||
expert_routing: false`;
|
||||
const result = parseYamlMini(yaml) as { description: string; page_types: Array<Record<string, unknown>> };
|
||||
expect(result.description).toBe('First line.\nSecond line.');
|
||||
expect(result.page_types).toHaveLength(1);
|
||||
expect(result.page_types[0].name).toBe('meeting');
|
||||
});
|
||||
|
||||
test('block scalar keeps # as literal content, not a comment', () => {
|
||||
const yaml = `description: |
|
||||
See issue #2029 for context.
|
||||
name: hashy`;
|
||||
const result = parseYamlMini(yaml) as Record<string, unknown>;
|
||||
expect(result.description).toBe('See issue #2029 for context.');
|
||||
expect(result.name).toBe('hashy');
|
||||
});
|
||||
|
||||
test('strips comments', () => {
|
||||
const result = parseYamlMini('# top comment\nname: value # inline comment') as Record<string, unknown>;
|
||||
expect(result.name).toBe('value');
|
||||
@@ -374,6 +402,27 @@ extends: null`;
|
||||
const pack = loadPackFromString(json, 'fixture.json');
|
||||
expect(pack.name).toBe('json-pack');
|
||||
});
|
||||
|
||||
test('loads block-scalar pack descriptions without losing page types', () => {
|
||||
const pack = loadPackFromString(`api_version: gbrain-schema-pack-v1
|
||||
name: recommended-fixture
|
||||
version: 1.0.0
|
||||
extends: gbrain-base
|
||||
description: |
|
||||
Operational starter pack.
|
||||
page_types:
|
||||
- name: meeting
|
||||
primitive: temporal
|
||||
path_prefixes:
|
||||
- meetings/
|
||||
aliases: []
|
||||
extractable: true
|
||||
expert_routing: false
|
||||
link_types: []`, 'fixture.yaml');
|
||||
expect(pack.name).toBe('recommended-fixture');
|
||||
expect(pack.extends).toBe('gbrain-base');
|
||||
expect(pack.page_types.map((t) => t.name)).toContain('meeting');
|
||||
});
|
||||
});
|
||||
|
||||
describe('ReDoS guard', () => {
|
||||
|
||||
@@ -103,7 +103,10 @@ describe('locateMutablePackFile — bundled guard', () => {
|
||||
expect(BUNDLED_PACK_NAMES.has('gbrain-recommended')).toBe(true);
|
||||
// v0.42 (T22): gbrain-base-v2 joins the bundled set.
|
||||
expect(BUNDLED_PACK_NAMES.has('gbrain-base-v2')).toBe(true);
|
||||
expect(BUNDLED_PACK_NAMES.size).toBe(3);
|
||||
// Derived from the single bundled registry — the lens packs (creator,
|
||||
// investor, engineer, everything) are read-only too.
|
||||
expect(BUNDLED_PACK_NAMES.has('gbrain-investor')).toBe(true);
|
||||
expect(BUNDLED_PACK_NAMES.size).toBe(7);
|
||||
});
|
||||
|
||||
it('rejects gbrain-base-v2 with PACK_READONLY (bundled guard)', () => {
|
||||
|
||||
Reference in New Issue
Block a user