mirror of
https://github.com/garrytan/gbrain.git
synced 2026-08-15 01:12:20 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2247540b4f |
+42
-12
@@ -161,7 +161,7 @@ interface ResolveAIOptionsArgs {
|
||||
nonInteractive: boolean; // --non-interactive (forces D3 fail-loud, no picker)
|
||||
}
|
||||
|
||||
interface ResolvedAIOptions {
|
||||
export interface ResolvedAIOptions {
|
||||
embedding_model?: string;
|
||||
embedding_dimensions?: number;
|
||||
expansion_model?: string;
|
||||
@@ -170,6 +170,41 @@ interface ResolvedAIOptions {
|
||||
noEmbedding?: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* Seed init's AI options from persisted config, falling back to the raw env
|
||||
* vars when loadConfig() returned null (#1058). On a cold install (no
|
||||
* config.json AND no DATABASE_URL) loadConfig short-circuits BEFORE its env
|
||||
* merge, so GBRAIN_EMBEDDING_MODEL / GBRAIN_EMBEDDING_DIMENSIONS /
|
||||
* GBRAIN_EXPANSION_MODEL / GBRAIN_CHAT_MODEL were silently ignored by init
|
||||
* and Tier-3 detection auto-picked by API key instead. Exported for unit
|
||||
* tests (env injectable).
|
||||
*/
|
||||
export function seedAIOptionsFromConfig(
|
||||
cfg: GBrainConfig | null,
|
||||
env: NodeJS.ProcessEnv = process.env,
|
||||
): ResolvedAIOptions {
|
||||
const envDims = env.GBRAIN_EMBEDDING_DIMENSIONS
|
||||
? parseInt(env.GBRAIN_EMBEDDING_DIMENSIONS, 10)
|
||||
: NaN;
|
||||
const seed = cfg ?? {
|
||||
embedding_disabled: undefined,
|
||||
embedding_model: env.GBRAIN_EMBEDDING_MODEL,
|
||||
embedding_dimensions: Number.isFinite(envDims) ? envDims : undefined,
|
||||
expansion_model: env.GBRAIN_EXPANSION_MODEL,
|
||||
chat_model: env.GBRAIN_CHAT_MODEL,
|
||||
};
|
||||
const out: ResolvedAIOptions = {};
|
||||
if (seed.embedding_disabled) {
|
||||
out.noEmbedding = true;
|
||||
} else if (seed.embedding_model) {
|
||||
out.embedding_model = seed.embedding_model;
|
||||
if (seed.embedding_dimensions) out.embedding_dimensions = seed.embedding_dimensions;
|
||||
}
|
||||
if (seed.expansion_model) out.expansion_model = seed.expansion_model;
|
||||
if (seed.chat_model) out.chat_model = seed.chat_model;
|
||||
return out;
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolve AI provider options for `gbrain init`.
|
||||
*
|
||||
@@ -203,18 +238,13 @@ async function resolveAIOptions(opts: ResolveAIOptionsArgs): Promise<ResolvedAIO
|
||||
// user already opted into deferred mode.
|
||||
try {
|
||||
const { loadConfig } = await import('../core/config.ts');
|
||||
const cfg = loadConfig();
|
||||
if (cfg?.embedding_disabled) {
|
||||
out.noEmbedding = true;
|
||||
} else if (cfg?.embedding_model) {
|
||||
out.embedding_model = cfg.embedding_model;
|
||||
if (cfg.embedding_dimensions) out.embedding_dimensions = cfg.embedding_dimensions;
|
||||
}
|
||||
if (cfg?.expansion_model) out.expansion_model = cfg.expansion_model;
|
||||
if (cfg?.chat_model) out.chat_model = cfg.chat_model;
|
||||
// #1058: loadConfig() returns null on a cold install (no config.json AND
|
||||
// no DATABASE_URL) — before it ever reaches its env merge. The seed helper
|
||||
// falls back to the same GBRAIN_* env vars directly in that case.
|
||||
Object.assign(out, seedAIOptionsFromConfig(loadConfig()));
|
||||
} catch {
|
||||
// loadConfig throws when no brain configured — first-time install, fall
|
||||
// through to env detection.
|
||||
// loadConfig threw — treat as first-time install, fall through to env
|
||||
// detection.
|
||||
}
|
||||
|
||||
// --- Tier 1+2: explicit flags ---------------------------------------------
|
||||
|
||||
@@ -18,22 +18,12 @@
|
||||
import { loadConfig } from '../config.ts';
|
||||
|
||||
export function hasAnthropicKey(): boolean {
|
||||
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;
|
||||
if (process.env.ANTHROPIC_API_KEY) return true;
|
||||
try {
|
||||
const cfg = loadConfig();
|
||||
if (cfg?.anthropic_api_key) return cfg.anthropic_api_key;
|
||||
if (cfg?.anthropic_api_key) return true;
|
||||
} catch {
|
||||
// loadConfig may throw on first-run installs; treat as no key available.
|
||||
}
|
||||
return undefined;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -48,7 +48,6 @@ 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';
|
||||
@@ -187,10 +186,7 @@ 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).
|
||||
// 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 makeAnthropic = deps.makeAnthropic ?? (() => new Anthropic());
|
||||
const client: MessagesClient = deps.client ?? makeAnthropic().messages;
|
||||
const config = deps.config ?? loadConfig() ?? ({ engine: 'postgres' } as GBrainConfig);
|
||||
const rateLeaseKey = deps.rateLeaseKey ?? DEFAULT_RATE_KEY;
|
||||
|
||||
+20
-5
@@ -332,6 +332,15 @@ export interface OperationContext {
|
||||
* remote/untrusted (defense in depth in case the type is bypassed via cast).
|
||||
*/
|
||||
remote: boolean;
|
||||
/**
|
||||
* Transport marker for auth-less remote surfaces (#1061). The stdio MCP
|
||||
* dispatch sets 'stdio' — it is deliberately `remote: true` (agent-facing,
|
||||
* untrusted) but has no per-token auth (local pipe), so identity ops like
|
||||
* whoami need a way to distinguish "known auth-less transport" from "a
|
||||
* transport bug forgot to thread ctx.auth". Trust decisions MUST NOT key
|
||||
* off this field — only `ctx.remote === false` grants trust.
|
||||
*/
|
||||
transport?: 'stdio';
|
||||
/**
|
||||
* Subagent runtime context (v0.16+). Set by the subagent tool dispatcher when
|
||||
* dispatching an op as a tool call from an LLM loop. Used to enforce per-op
|
||||
@@ -3713,9 +3722,10 @@ const whoami: Operation = {
|
||||
'Introspect the calling identity. Returns one of three transport shapes: ' +
|
||||
'{transport: "oauth", client_id, client_name, scopes, expires_at}, ' +
|
||||
'{transport: "legacy", token_name, scopes, expires_at: null}, or ' +
|
||||
'{transport: "local", scopes: []}. Throws unknown_transport when the ' +
|
||||
'context is ambiguous (remote=true without auth) — fail-closed posture ' +
|
||||
'mirroring the v0.26.9 trust-boundary contract.',
|
||||
'{transport: "local", scopes: []}, or {transport: "stdio", scopes: []} ' +
|
||||
'for the auth-less stdio MCP pipe. Throws unknown_transport when the ' +
|
||||
'context is ambiguous (remote=true without auth and no transport marker) ' +
|
||||
'— fail-closed posture mirroring the v0.26.9 trust-boundary contract.',
|
||||
params: {},
|
||||
scope: 'read',
|
||||
handler: async (ctx) => {
|
||||
@@ -3727,6 +3737,12 @@ const whoami: Operation = {
|
||||
if (ctx.remote === false) {
|
||||
return { transport: 'local', scopes: [] };
|
||||
}
|
||||
// #1061: stdio MCP is remote/untrusted by design but has no per-token
|
||||
// auth (local pipe) — a known transport, not a bug. Report it instead of
|
||||
// throwing. Empty scopes: nothing here may be used to gate anything.
|
||||
if (!ctx.auth && ctx.transport === 'stdio') {
|
||||
return { transport: 'stdio', scopes: [] };
|
||||
}
|
||||
if (!ctx.auth) {
|
||||
throw new OperationError(
|
||||
'unknown_transport',
|
||||
@@ -4562,8 +4578,7 @@ 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_PACK_NAMES } = await import('./schema-pack/bundled.ts');
|
||||
const bundled = [...BUNDLED_PACK_NAMES];
|
||||
const bundled = ['gbrain-base', 'gbrain-recommended'];
|
||||
const installedDir = gbrainPath('schema-packs');
|
||||
const installed: string[] = [];
|
||||
if (existsSync(installedDir)) {
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
// 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,7 +37,6 @@ import {
|
||||
type ResolutionInput,
|
||||
type ResolutionResult,
|
||||
} from './registry.ts';
|
||||
import { isBundledPackName } from './bundled.ts';
|
||||
|
||||
/**
|
||||
* Inputs the caller (operations.ts handler / engine query path) provides.
|
||||
@@ -93,7 +92,28 @@ export function _resetPackLocatorForTests(): void {
|
||||
* throwing UnknownPackError with a paste-ready install hint.
|
||||
*/
|
||||
function defaultPackLocator(name: string): string | null {
|
||||
if (isBundledPackName(name)) {
|
||||
// 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)) {
|
||||
// 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,29 +159,6 @@ 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) {
|
||||
@@ -250,10 +227,6 @@ 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);
|
||||
}
|
||||
@@ -284,10 +257,6 @@ 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,7 +65,6 @@ 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';
|
||||
@@ -94,7 +93,7 @@ export class SchemaPackMutationError extends Error {
|
||||
}
|
||||
}
|
||||
|
||||
export const BUNDLED_PACK_NAMES = new Set<string>(BUNDLED_PACK_NAME_LIST);
|
||||
export const BUNDLED_PACK_NAMES = new Set(['gbrain-base', 'gbrain-recommended', 'gbrain-base-v2']);
|
||||
|
||||
export interface MutateResult {
|
||||
/** Pack name that was mutated. */
|
||||
|
||||
@@ -32,6 +32,12 @@ export interface DispatchOpts {
|
||||
remote?: boolean;
|
||||
/** Override the default stderr logger (e.g. CLI uses console.* directly). */
|
||||
logger?: OperationContext['logger'];
|
||||
/**
|
||||
* #1061: transport marker for auth-less remote surfaces. The stdio MCP
|
||||
* server passes 'stdio' so identity ops (whoami) can report the transport
|
||||
* instead of throwing unknown_transport. Never used for trust decisions.
|
||||
*/
|
||||
transport?: OperationContext['transport'];
|
||||
/**
|
||||
* v0.28: per-token allow-list for the takes.holder field. Threaded by
|
||||
* the HTTP/stdio transport from `access_tokens.permissions.takes_holders`.
|
||||
@@ -203,6 +209,7 @@ export function buildOperationContext(
|
||||
logger: opts.logger || stderrLogger,
|
||||
dryRun: !!params.dry_run,
|
||||
remote: opts.remote ?? true,
|
||||
transport: opts.transport,
|
||||
takesHoldersAllowList: opts.takesHoldersAllowList,
|
||||
// v0.34 D4: sourceId is REQUIRED at the type level. Auto-fill 'default'
|
||||
// for single-source brains and any caller who didn't resolve a sourceId.
|
||||
|
||||
@@ -42,6 +42,10 @@ export async function startMcpServer(engine: BrainEngine) {
|
||||
// `gbrain call <op>` (sets remote=false in src/cli.ts).
|
||||
return dispatchToolCall(engine, name, params, {
|
||||
remote: true,
|
||||
// #1061: mark the transport so whoami can report {transport: 'stdio'}
|
||||
// instead of throwing unknown_transport. Trust posture unchanged —
|
||||
// stdio stays remote/untrusted.
|
||||
transport: 'stdio',
|
||||
takesHoldersAllowList: ['world'],
|
||||
// v0.31: source defaults to 'default' for stdio (no per-token scope).
|
||||
// Operators who want a different source on stdio MCP should set
|
||||
|
||||
@@ -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, resolveAnthropicKey } from '../../src/core/ai/anthropic-key.ts';
|
||||
import { hasAnthropicKey } from '../../src/core/ai/anthropic-key.ts';
|
||||
|
||||
const tmpDirs: string[] = [];
|
||||
function freshHome(withConfig?: Record<string, unknown>): string {
|
||||
@@ -62,35 +62,3 @@ 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();
|
||||
},
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
*/
|
||||
|
||||
import { describe, test, expect } from 'bun:test';
|
||||
import { groupReadyByProvider, findEnvKeyTypos } from '../src/commands/init.ts';
|
||||
import { groupReadyByProvider, findEnvKeyTypos, seedAIOptionsFromConfig } from '../src/commands/init.ts';
|
||||
|
||||
describe('groupReadyByProvider — embedding touchpoint', () => {
|
||||
test('OPENAI_API_KEY alone → openai is ready', async () => {
|
||||
@@ -149,3 +149,47 @@ describe('findEnvKeyTypos', () => {
|
||||
expect(got.find(t => t.userSet === 'COMPLETELY_UNRELATED_KEY')).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
describe('seedAIOptionsFromConfig — #1058 cold-install env fallback', () => {
|
||||
test('null config (no config.json, no DATABASE_URL) falls back to GBRAIN_* env vars', () => {
|
||||
const got = seedAIOptionsFromConfig(null, {
|
||||
GBRAIN_EMBEDDING_MODEL: 'voyage:voyage-3-large',
|
||||
GBRAIN_EMBEDDING_DIMENSIONS: '1024',
|
||||
GBRAIN_EXPANSION_MODEL: 'openai:gpt-5-mini',
|
||||
GBRAIN_CHAT_MODEL: 'anthropic:claude-sonnet-4-6',
|
||||
});
|
||||
expect(got.embedding_model).toBe('voyage:voyage-3-large');
|
||||
expect(got.embedding_dimensions).toBe(1024);
|
||||
expect(got.expansion_model).toBe('openai:gpt-5-mini');
|
||||
expect(got.chat_model).toBe('anthropic:claude-sonnet-4-6');
|
||||
});
|
||||
|
||||
test('null config + no env vars → empty seed (Tier-3 detection takes over)', () => {
|
||||
const got = seedAIOptionsFromConfig(null, {});
|
||||
expect(got).toEqual({});
|
||||
});
|
||||
|
||||
test('persisted config wins (loadConfig already merged env when non-null)', () => {
|
||||
const got = seedAIOptionsFromConfig(
|
||||
{ engine: 'pglite', embedding_model: 'openai:text-embedding-3-small', embedding_dimensions: 1536 } as any,
|
||||
{ GBRAIN_EMBEDDING_MODEL: 'voyage:voyage-3-large' },
|
||||
);
|
||||
expect(got.embedding_model).toBe('openai:text-embedding-3-small');
|
||||
expect(got.embedding_dimensions).toBe(1536);
|
||||
});
|
||||
|
||||
test('embedding_disabled sentinel honored on re-init', () => {
|
||||
const got = seedAIOptionsFromConfig({ engine: 'pglite', embedding_disabled: true } as any, {});
|
||||
expect(got.noEmbedding).toBe(true);
|
||||
expect(got.embedding_model).toBeUndefined();
|
||||
});
|
||||
|
||||
test('non-numeric GBRAIN_EMBEDDING_DIMENSIONS ignored, model still seeds', () => {
|
||||
const got = seedAIOptionsFromConfig(null, {
|
||||
GBRAIN_EMBEDDING_MODEL: 'voyage:voyage-3-large',
|
||||
GBRAIN_EMBEDDING_DIMENSIONS: 'not-a-number',
|
||||
});
|
||||
expect(got.embedding_model).toBe('voyage:voyage-3-large');
|
||||
expect(got.embedding_dimensions).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -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('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');
|
||||
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',
|
||||
);
|
||||
for (const name of PACK_NAMES) {
|
||||
expect(BUNDLED_PACK_NAMES).toContain(name);
|
||||
expect(loadActiveSrc).toContain(`'${name}'`);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
@@ -149,9 +149,6 @@ 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');
|
||||
});
|
||||
});
|
||||
|
||||
+1
-38
@@ -64,14 +64,11 @@ describe('gbrain schema CLI (Phase C)', () => {
|
||||
expect(r.stdout + r.stderr).toMatch(/schema|active|list|show|validate|use/i);
|
||||
});
|
||||
|
||||
test('schema list shows all bundled packs', () => {
|
||||
test('schema list shows gbrain-base bundled', () => {
|
||||
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', () => {
|
||||
@@ -100,40 +97,6 @@ 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,34 +345,6 @@ 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');
|
||||
@@ -402,27 +374,6 @@ 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,10 +103,7 @@ 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);
|
||||
// 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);
|
||||
expect(BUNDLED_PACK_NAMES.size).toBe(3);
|
||||
});
|
||||
|
||||
it('rejects gbrain-base-v2 with PACK_READONLY (bundled guard)', () => {
|
||||
|
||||
@@ -94,6 +94,35 @@ describe('whoami op contract', () => {
|
||||
expect(result.expires_at).toBeNull();
|
||||
});
|
||||
|
||||
// #1061: stdio MCP is remote/untrusted by design but has no per-token auth
|
||||
// (local pipe). The stdio dispatch marks ctx.transport='stdio'; whoami
|
||||
// reports it instead of throwing unknown_transport.
|
||||
test('stdio transport (remote=true, no auth, transport marker) reports stdio', async () => {
|
||||
const result = (await whoami.handler(
|
||||
ctxWith({ remote: true, auth: undefined, transport: 'stdio' }),
|
||||
{},
|
||||
)) as any;
|
||||
expect(result.transport).toBe('stdio');
|
||||
expect(result.scopes).toEqual([]);
|
||||
});
|
||||
|
||||
test('stdio marker does not mask real auth (auth still wins)', async () => {
|
||||
const result = (await whoami.handler(
|
||||
ctxWith({
|
||||
remote: true,
|
||||
transport: 'stdio',
|
||||
auth: {
|
||||
token: 'gbrain_at_xxx',
|
||||
clientId: 'gbrain_cl_abc',
|
||||
scopes: ['read'],
|
||||
expiresAt: 1,
|
||||
} as AuthInfo,
|
||||
}),
|
||||
{},
|
||||
)) as any;
|
||||
expect(result.transport).toBe('oauth');
|
||||
});
|
||||
|
||||
// Q3: ambiguous transport — fail-closed. The footgun this guards against
|
||||
// is a future transport that lands without threading auth, where a buggy
|
||||
// caller might trust whoami's output to gate sensitive ops.
|
||||
|
||||
Reference in New Issue
Block a user