mirror of
https://github.com/garrytan/gstack.git
synced 2026-11-01 06:24:41 +01:00
A fresh interactive /plan-eng-review cannot reach Test review inside the 600 s periodic budget: startup plus one-at-a-time Scope Challenge questions took 595 s with six questions and no Test review in census 37174266054 and in a local run (one earlier fresh run passed at 498 s). Per the eval-speed policy, the long run moves to the non-blocking marathon lane and the blocking case becomes a focused checkpoint. - plan-eng-review-artifact (periodic, 600 s unchanged): resumes the real interactive skill from a saved review record: the plan, the Scope Challenge result, Sections 1-2 complete, and a Decision ledger rebuilt from that census run's six actual native questions and answers (test/fixtures/plan-eng-artifact-resume-37174266054.json). The live skill runs Section 3, Test review. Assertion unchanged: exactly one new eng-review test plan in the run's own state root, about the dashboard change. Paid trial (local, Claude Code 2.1.284): PASS, 364 s. - plan-eng-review-artifact-full (marathon, PTY_LONG_MS): the fresh start-to-finish run with the same assertion; budget measured beside it. - test/plan-eng-resume.test.ts proves the rebuilt record is a valid resume point and rejects missing, unanswered, edited or duplicated records. - Registry: touchfiles, tiers, kinds, test-name labels, durations, paid file count 115, PTY consumer list; CHANGELOG and TODOS.
300 lines
14 KiB
TypeScript
300 lines
14 KiB
TypeScript
/**
|
|
* Case and trial shard keys for the paid lane: which files shard per case, how a case shard and its trials are named, and expansion of files into case/trial shards. Moved from scripts/test-paid-shards.ts.
|
|
*/
|
|
import * as fs from 'node:fs';
|
|
import * as os from 'node:os';
|
|
import * as path from 'node:path';
|
|
import { spawnSync } from 'node:child_process';
|
|
import { createBootstrapRetentionScope } from '../../test/helpers/bootstrap-retention';
|
|
import {
|
|
BunTestOutputClassifier,
|
|
createShardSandbox,
|
|
exactTestFileSelectors,
|
|
forwardAndClassify,
|
|
isTerminationRequested,
|
|
nextShardLogPath,
|
|
normalizeRelativePath,
|
|
openShardLog,
|
|
parseCliFlags,
|
|
readDurationSeed,
|
|
removeShardSandbox,
|
|
runShardChild,
|
|
strictShardStatus,
|
|
writeDurationSeed,
|
|
zeroExecutionVerdict,
|
|
type LanePolicy,
|
|
type ShardChildResult,
|
|
type ShardLog,
|
|
} from './shard-engine';
|
|
import { PAID_TEST_GLOBS, isPaidTestFile } from '../../test/helpers/paid-test-set';
|
|
import { CASE_CI_EXCLUDE, CASE_QUARANTINE, EVAL_POLICY, PERIODIC_CI_EXCLUDE } from '../../test/helpers/periodic-exclude-data';
|
|
import { FILE_RETRY_BUDGETS, STRICT_RETRY_CASE_BUDGETS } from '../../test/helpers/eval-budgets';
|
|
import {
|
|
getProjectEvalDir, getClaudeCliVersion, isFinalizedEvalResultFile, evalEntryOutcome, failureClassOf, panelVerdict,
|
|
sanitizeTrialError, formatTrialOutcomes, CONTRACT_VIOLATIONS_FILE, TRIAL_ENV, TRIAL_OUTCOME_SCHEMA, TRIAL_OUTCOMES_FILE,
|
|
type EvalCaseKind, type PanelShape, type PanelVerdict, type TrialFailureClass, type TrialOutcome, type TrialOutcomeRecord,
|
|
} from '../../test/helpers/eval-store';
|
|
import { E2E_KINDS } from '../../test/helpers/touchfiles-data';
|
|
import { manualReviewProblem } from '../../test/helpers/cookie-workflow-manual-review';
|
|
import { preflightAnthropicApi } from '../../test/helpers/anthropic-preflight';
|
|
import { OVERLAY_MIN_FILE_WALL_MS } from '../../test/helpers/overlay-case-policy';
|
|
import { PR_PROFILE_CASE_IDS, PR_PROFILE_FILES, packageChangeOnlyVersion, selectPrProfile, type PrProfileSelection } from '../test-pr-profile';
|
|
import { e2eReuseLaneProblem, prepareE2EShardReuse, selectPlanReceipts, writeNegativeReceipt, writePanelReceipt } from '../e2e-shard-reuse';
|
|
|
|
import {
|
|
detectBaseBranch,
|
|
getChangedFiles,
|
|
selectTests,
|
|
E2E_TOUCHFILES,
|
|
E2E_TIERS,
|
|
LLM_JUDGE_TOUCHFILES,
|
|
GLOBAL_TOUCHFILES,
|
|
} from '../../test/helpers/touchfiles';
|
|
|
|
export { PAID_TEST_GLOBS, isPaidTestFile };
|
|
export { PERIODIC_CI_EXCLUDE };
|
|
|
|
type E2EShardReuse = NonNullable<ReturnType<typeof prepareE2EShardReuse>>;
|
|
import { type PaidTier, ROOT, fileCaseRegistration } from '../test-paid-shards';
|
|
|
|
/**
|
|
* Files whose cases run in separate processes, one shard per registered E2E
|
|
* case (`<file>#<case id>`): the file's lane wall exceeds one runner's budget
|
|
* while every case is short. Separate processes also give each case its own
|
|
* SDK semaphore, so shared-libs(-paths) capture waves never queue inside a
|
|
* sibling case's wall (the reason paths runs test.serial in one process).
|
|
* Every case must be a registered, literal E2E id whose Bun test name is the
|
|
* id or its CASE_TEST_NAMES label (test/paid-shards.test.ts scans the sources).
|
|
*/
|
|
export const CASE_SHARDED_FILES: readonly string[] = [
|
|
'test/skill-e2e-deploy.test.ts',
|
|
'test/skill-e2e-design.test.ts',
|
|
'test/skill-e2e-plan.test.ts',
|
|
'test/skill-e2e-review-army.test.ts',
|
|
'test/skill-e2e-shared-libs-paths.test.ts',
|
|
'test/skill-e2e-shared-libs.test.ts',
|
|
'test/skill-e2e-ship-docsync.test.ts',
|
|
'test/skill-e2e-qa-callers.test.ts',
|
|
];
|
|
|
|
/** Bun test names that differ from their E2E id. */
|
|
export const CASE_TEST_NAMES: Record<string, string> = {
|
|
'plan-review-report': '/plan-eng-review writes GSTACK REVIEW REPORT to plan file',
|
|
'auq-format-gate': "/plan-ceo-review's first AskUserQuestion is a compliant decision brief (7/7 + substance)",
|
|
'autoplan-dual-voice': 'both Claude + Codex voices produce output in Phase 1 (within timeout)',
|
|
'cso-full-audit': '/cso persists supported tenant-boundary findings with redacted evidence',
|
|
'cso-diff-mode': '/cso --diff records its base and investigates changed security paths',
|
|
'cso-infra-scope': '/cso --infra finds an attacker-to-credential execution path',
|
|
'plan-ceo-review-plan-mode': 'first terminal outcome is asked (Step 0 fires before any plan write)',
|
|
'plan-eng-review-artifact': 'an interactive review writes one QA test plan about the reviewed change',
|
|
'plan-eng-review-artifact-full': 'a fresh interactive review reaches Test review and writes one QA test plan',
|
|
};
|
|
|
|
export const CASE_KEY_SEPARATOR = '#';
|
|
const TRIAL_SUFFIX = /~t([1-9][0-9]*)$/;
|
|
|
|
/** The test file behind a shard key (`<file>`, `<file>#<case id>` or `<file>#<case id>~t<N>`). */
|
|
export function shardFile(key: string): string {
|
|
return normalizeRelativePath(key).split(CASE_KEY_SEPARATOR)[0]!;
|
|
}
|
|
|
|
/** The E2E case id of a case or trial shard key, else null. */
|
|
export function shardCaseId(key: string): string | null {
|
|
const [, id] = normalizeRelativePath(key).split(CASE_KEY_SEPARATOR);
|
|
return id === undefined ? null : id.replace(TRIAL_SUFFIX, '');
|
|
}
|
|
|
|
/** The 1-based trial index of an isolated trial shard key, else null. */
|
|
export function shardTrial(key: string): number | null {
|
|
const [, id] = normalizeRelativePath(key).split(CASE_KEY_SEPARATOR);
|
|
const match = id === undefined ? null : TRIAL_SUFFIX.exec(id);
|
|
return match ? Number(match[1]) : null;
|
|
}
|
|
|
|
/** Shard key of one trial of an isolated case. */
|
|
export function trialShardKey(file: string, id: string, trial: number): string {
|
|
return `${normalizeRelativePath(file)}${CASE_KEY_SEPARATOR}${id}~t${trial}`;
|
|
}
|
|
|
|
/** Trial policy of one case, fixed from the registries before the run. */
|
|
export interface CaseTrialPlan { kind: EvalCaseKind; panel: PanelShape; quarantined: boolean }
|
|
|
|
/**
|
|
* `behavior` cases run EVAL_POLICY.panel; a quarantined case runs a full panel
|
|
* whose k keeps its kind's meaning (k = n for rule); everything else runs one
|
|
* trial. Only behavior and quarantined cases are isolated into trial shards.
|
|
*/
|
|
export function caseTrialPlan(id: string, kinds: Record<string, EvalCaseKind> = E2E_KINDS,
|
|
quarantine: Record<string, unknown> = CASE_QUARANTINE): CaseTrialPlan {
|
|
const kind = kinds[id] ?? 'rule';
|
|
const quarantined = Object.hasOwn(quarantine, id);
|
|
if (kind === 'behavior') return { kind, panel: { ...EVAL_POLICY.panel }, quarantined };
|
|
if (quarantined) return { kind, panel: { n: EVAL_POLICY.panel.n, k: EVAL_POLICY.panel.n }, quarantined };
|
|
return { kind, panel: { n: 1, k: 1 }, quarantined };
|
|
}
|
|
|
|
export function isIsolatedCase(plan: CaseTrialPlan): boolean {
|
|
return plan.kind === 'behavior' || plan.quarantined;
|
|
}
|
|
|
|
export function sameTrialPlan(a: CaseTrialPlan | undefined, b: CaseTrialPlan | undefined): boolean {
|
|
return !!a && !!b && a.kind === b.kind && a.quarantined === b.quarantined && a.panel?.n === b.panel?.n && a.panel?.k === b.panel?.k;
|
|
}
|
|
|
|
/** Bun name pattern that runs every case of a file except `ids` (their trial shards run them). */
|
|
export function excludedCasesNamePattern(ids: string[]): string {
|
|
const escaped = ids.map(id => (CASE_TEST_NAMES[id] ?? id).replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
|
|
return `^(?!.*(?:^|\\s)(?:${escaped.join('|')})$)`;
|
|
}
|
|
|
|
/** Exact Bun name pattern for a set of case ids (labels where the test name differs). */
|
|
export function caseTestNamePattern(ids: string[]): string {
|
|
const escaped = ids.map(id => (CASE_TEST_NAMES[id] ?? id).replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
|
|
return `(?:^|\\s)(?:${escaped.join('|')})$`;
|
|
}
|
|
|
|
/**
|
|
* Replace each case-sharded file with one key per registered case of `tier`.
|
|
* Throws when such a file's registration is not statically complete: an
|
|
* unregistered case would otherwise silently never run.
|
|
*/
|
|
export function expandCaseShards(files: string[], tier: PaidTier, rootDir = ROOT,
|
|
touchfiles: Record<string, string[]> = E2E_TOUCHFILES, tiers: Record<string, string> = E2E_TIERS): string[] {
|
|
return files.flatMap(file => {
|
|
const rel = normalizeRelativePath(file);
|
|
if (!CASE_SHARDED_FILES.includes(rel)) return [file];
|
|
const { registered, known } = fileCaseRegistration(rel, fs.readFileSync(path.join(rootDir, rel), 'utf8'), touchfiles, tiers);
|
|
if (!known) throw new Error(`Case-sharded ${rel} needs a complete literal case registration`);
|
|
return registered.filter(id => tiers[id] === tier).sort().map(id => `${rel}${CASE_KEY_SEPARATOR}${id}`);
|
|
});
|
|
}
|
|
|
|
export interface TrialExpansion {
|
|
keys: string[];
|
|
/** Trial policy per trial shard key. */
|
|
trials: Record<string, CaseTrialPlan>;
|
|
/** File shard key -> isolated case ids its name pattern excludes. */
|
|
excludeCases: Record<string, string[]>;
|
|
}
|
|
|
|
/**
|
|
* Isolate every behavior or quarantined case of `tier` into its panel of trial
|
|
* shards (`<file>#<id>~t1..tn`), each selected by EVALS_SELECTION_JSON=[id] and
|
|
* its exact test name. The file shard keeps the remaining ids of the tier and
|
|
* excludes the isolated ones by name; with none remaining it is dropped. A case
|
|
* may be isolated only when its file's registration is statically known.
|
|
*/
|
|
export function expandTrialShards(keys: string[], tier: PaidTier, rootDir = ROOT, opts: {
|
|
kinds?: Record<string, EvalCaseKind>; quarantine?: Record<string, unknown>;
|
|
touchfiles?: Record<string, string[]>; tiers?: Record<string, string>;
|
|
} = {}): TrialExpansion {
|
|
const touchfiles = opts.touchfiles ?? E2E_TOUCHFILES;
|
|
const tiers = opts.tiers ?? E2E_TIERS;
|
|
const planOf = (id: string) => caseTrialPlan(id, opts.kinds, opts.quarantine);
|
|
const out: TrialExpansion = { keys: [], trials: {}, excludeCases: {} };
|
|
const addPanel = (file: string, id: string) => {
|
|
const plan = planOf(id);
|
|
for (let trial = 1; trial <= plan.panel.n; trial++) {
|
|
const key = trialShardKey(file, id, trial);
|
|
out.keys.push(key);
|
|
out.trials[key] = plan;
|
|
}
|
|
};
|
|
for (const key of keys) {
|
|
const file = shardFile(key);
|
|
const caseId = shardCaseId(key);
|
|
if (caseId !== null) {
|
|
if (isIsolatedCase(planOf(caseId))) addPanel(file, caseId);
|
|
else out.keys.push(key);
|
|
continue;
|
|
}
|
|
const { registered, known } = fileCaseRegistration(file, fs.readFileSync(path.join(rootDir, file), 'utf8'), touchfiles, tiers);
|
|
const inTier = registered.filter(id => tiers[id] === tier);
|
|
const isolated = inTier.filter(id => isIsolatedCase(planOf(id)));
|
|
if (isolated.length === 0) { out.keys.push(key); continue; }
|
|
if (!known) {
|
|
throw new Error(`${file}: behavior or quarantined case(s) ${isolated.join(', ')} need a statically known case registration`);
|
|
}
|
|
for (const id of isolated) addPanel(file, id);
|
|
if (inTier.length > isolated.length) {
|
|
out.keys.push(key);
|
|
out.excludeCases[normalizeRelativePath(key)] = [...isolated].sort();
|
|
}
|
|
}
|
|
return out;
|
|
}
|
|
|
|
/**
|
|
* Split expanded shard keys into runnable keys and CI-unrunnable cases
|
|
* (CASE_CI_EXCLUDE), each with its surfaced reason; never an empty shard.
|
|
*/
|
|
export function partitionCaseExclusions(keys: string[]): { runnable: string[]; excluded: Array<{ file: string; reason: string }> } {
|
|
const excluded: Array<{ file: string; reason: string }> = [];
|
|
const runnable = keys.filter(key => {
|
|
const exclusion = CASE_CI_EXCLUDE[normalizeRelativePath(key)];
|
|
if (exclusion) excluded.push({ file: key, reason: `excluded: ${exclusion.reason} [${exclusion.tracking}]` });
|
|
return !exclusion;
|
|
});
|
|
return { runnable, excluded };
|
|
}
|
|
|
|
/**
|
|
* Codex access in the CI eval image, scoped per paid shard.
|
|
*
|
|
* The image installs the pinned Codex CLI off PATH (GSTACK_CI_CODEX_BIN_DIR)
|
|
* and the eval workflows log it in under a non-default home
|
|
* (GSTACK_CI_CODEX_HOME). A gate shard never sees either. A non-gate shard
|
|
* whose every file exercises Codex gets the CLI on PATH and the home as
|
|
* CODEX_HOME. A file that mixes one Codex case with other cases keeps only
|
|
* the two variables, and that case opts in on its own session; hermetic
|
|
* child environments drop GSTACK_* names, so its sibling sessions see no
|
|
* Codex. Every other shard sees neither, so a skill's outside-voice probe
|
|
* (`command -v codex`) reports not_installed exactly as it did before Codex
|
|
* entered the image. Outside CI neither variable is set and nothing changes.
|
|
*/
|
|
export const CODEX_CI_ENV = { binDir: 'GSTACK_CI_CODEX_BIN_DIR', home: 'GSTACK_CI_CODEX_HOME' } as const;
|
|
|
|
/** Paid files whose every case exercises the real Codex CLI. */
|
|
export const CODEX_CI_FILES: readonly string[] = [
|
|
'test/codex-e2e.test.ts',
|
|
'test/codex-e2e-sol-scope.test.ts',
|
|
'test/codex-e2e-shared-libs.test.ts',
|
|
'test/codex-e2e-recommendation-substance.test.ts',
|
|
'test/skill-e2e-outside-voice.test.ts',
|
|
'test/skill-e2e-outside-plan-disabled.test.ts',
|
|
'test/skill-e2e-safety-codex-boundary.test.ts',
|
|
];
|
|
|
|
/**
|
|
* Codex cases inside files whose other cases must not see Codex. Each listed
|
|
* case opts in by putting $GSTACK_CI_CODEX_BIN_DIR on its own session PATH
|
|
* (inline, so the file's other touchfile keys do not grow a helper).
|
|
*/
|
|
export const CODEX_CI_CASES: Readonly<Record<string, readonly string[]>> = {
|
|
'test/skill-e2e-workflow.test.ts': ['codex-review'],
|
|
};
|
|
|
|
export type CodexShardAccess = 'none' | 'case-opt-in' | 'path';
|
|
|
|
/** What one shard, given the test files behind its keys, may see of the CI Codex install in `tier`. */
|
|
export function codexShardAccess(files: readonly string[], tier: string | undefined): CodexShardAccess {
|
|
if (tier === 'gate' || files.length === 0) return 'none';
|
|
if (files.every(file => CODEX_CI_FILES.includes(file))) return 'path';
|
|
return files.every(file => file in CODEX_CI_CASES) ? 'case-opt-in' : 'none';
|
|
}
|
|
|
|
/** Scope one shard's child environment in place; `files` are the shard keys' test files. */
|
|
export function scopeCodexAccess(env: NodeJS.ProcessEnv, files: readonly string[]): void {
|
|
const binDir = env[CODEX_CI_ENV.binDir];
|
|
if (!binDir) return;
|
|
const home = env[CODEX_CI_ENV.home];
|
|
const access = codexShardAccess(files, env.EVALS_TIER);
|
|
delete env.CODEX_HOME;
|
|
if (access === 'case-opt-in') return;
|
|
delete env[CODEX_CI_ENV.binDir];
|
|
delete env[CODEX_CI_ENV.home];
|
|
if (access !== 'path') return;
|
|
env.PATH = env.PATH ? `${binDir}${path.delimiter}${env.PATH}` : binDir;
|
|
if (home) env.CODEX_HOME = home;
|
|
}
|