mirror of
https://github.com/garrytan/gstack.git
synced 2026-11-06 17:04:27 +01:00
* fix(pregate): recognise bats test files so lanes does not fail in bats repos (#3161) gstack-pregate never treated a .bats file as a test, so in a repository whose tests are bats files the lanes check failed every run with PREGATE_NO_LANE: a .gstack/pregate.json dependency pointing at tests/foo.bats selected nothing, a selection manifest printing .bats paths yielded 0 files, and a bats run that executed no tests could not trip the zero-run rule. Recognise .bats in the test-file pattern and in the manifest-output parser, and read the bats TAP plan and pretty summary (as a last resort, after every existing runner's summary) so a run that reports zero tests is a failure. Fixes #3161. Cherry-picked from #3177 (d355c116b). Conflicts resolved as in the author's own merges (b09476beb,444f4e768): lane-selection.ts keeps main's isTestFile-based manifest parser, and lanes.ts carries the bats summary on main's supervised runner. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(pregate): a nested .bats file is selected and run end to end (#3161) Reviewer test for #3177: touched itself with no declaration, and through a declared dependency; a failing nested bats run reports the bats counts. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(pregate): a wtree failure is WTREE_UNAVAILABLE, not an unresolvable base (#3197) The pregate consumers of the working-tree fingerprint (buildContext, withFingerprint, verifyPregate) move to lib/script-invocation.ts's {tree}|{error} form, and lib/regen.ts drops its string-returning wrapper. - A fingerprint failure was reported as "policy source unavailable: origin/<base> is not a resolvable commit" with git fetch as the fix. It is now WTREE_UNAVAILABLE: a launch failure lists each Windows bash candidate with its rejection reason and names GSTACK_GIT_BASH; a gstack-wtree exit keeps the repair it printed (set TMPDIR to a writable directory). - A fingerprint failing after a check is incomplete with that cause, not "working tree changed"; verify says the tree cannot be fingerprinted. - #3190's gstack-config read (test_backend) goes through runScriptSync, so Windows reaches it through Git Bash. The tripwire learns the bin-constant shape that let it through. - Under --json every context refusal is one envelope on stdout ({ok:false,status:'refused',code,detail,fix,docs}, exit 3); the run object carries ok and status too, and GSTACK_RESULT goes to stderr. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ci(pregate): gstack-pregate joins the Windows pregate job; pregate tests return to the Windows lane (#3197) - windows-pregate-e2e runs gstack-pregate run (preflight: regen, secrets through the gstack-redact bun bin, literals, guards) in both journeys, and asserts a missing GSTACK_GIT_BASH refuses with one WTREE_UNAVAILABLE --json envelope. - test/helpers/pregate-fixture.ts and restamp-fixture.ts runBin launch bins through lib/script-invocation.ts (bun bins as Bun argv, bash bins through Git Bash on Windows), which removes the "shebang via CreateProcess" reason for the pregate tests; they move from KNOWN_WINDOWS_INCOMPATIBLE to KNOWN_WINDOWS_SAFE. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * doctor: list rescue refs and warn about CLAUDE.md skill lists gstack-doctor's plain report gains two rows. 'rescue refs' lists each refs/gstack/rescue/* commit in the install checkout, newest first, with its date, a needs-manual-resolution label when the rescue held unmerged files, and the shell-quoted inspect and delete commands bin/gstack-ff-update's banner prints. 'CLAUDE.md' warns when a gstack section in ~/.claude/CLAUDE.md or the project's CLAUDE.md enumerates skills (#3169) and prints the short block to paste instead; docs/troubleshooting.md#claude-md-skill-list explains it. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * doctor: name the Windows bash gstack resolves and what chose it On Windows (OSTYPE msys/cygwin) gstack-doctor adds a 'windows bash' row from lib/script-invocation.ts resolveWindowsBash, run through the new thin bin/gstack-windows-bash.ts with the bun on PATH: the resolved bash and the override or discovery step that chose it, a warn when GSTACK_GIT_BASH and GSTACK_BASH differ, and a fail carrying the BASH_UNAVAILABLE line (every candidate with its rejection reason) when none qualifies. Tests inject the platform (GSTACK_DOCTOR_PLATFORM) and the discovery inputs (GSTACK_DOCTOR_BASH_PROBE) so the row runs on every OS. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * doctor --check: name the held-install recovery on Windows, not bin/gstack-upgrade bin/gstack-upgrade compares a pwd -P path (/c/...) with git's toplevel (C:/...) and refuses on every Git Bash install, so on Windows the revision row's upgrade fix (REVISION_BELOW_MINIMUM, the Capy-wrapper variant and REVISION_UNMET) names the held-install recovery forms from docs/troubleshooting.md#auto-update-held-install-recovery instead: the Git Bash form and the Windows PowerShell 5.1 form, each labelled by shell with the install path quoted for that shell. Other platforms keep bin/gstack-upgrade. A test pins both printed forms to the documented ones. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(skills): omit the plan-mode section on hosts without plan mode (#3168) generatePlanModeInfo now honours capabilities.planMode. Hosts that declare planMode:false (codex, agy, hermes, openclaw, and define-host's default: factory, kiro, slate, cursor, gbrain) no longer render the '## Plan Mode Safe Operations' and '## Skill Invocation During Plan Mode' preamble sections. Claude, copilot and opencode are unchanged. The codex, factory and agy ship goldens are regenerated. The clarity test that pinned the plan-mode entry-order prose on every host now pins it on planMode hosts and asserts its absence elsewhere (intentional contract change). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(skills): guard generated SKILL.md size at 100,000 chars on every host (#3199) A free test renders every host and fails when a generated SKILL.md exceeds 100,000 characters, naming host, skill, actual size, limit and the fix. The 89 current offenders are pinned at their exact size in test/fixtures/skill-md-size-allowlist.json: growth past a pin fails, and a shrink fails until the pin is lowered. The shared-preamble hoist is deferred (owner Garry, revisit 2026-11-15). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(pregate): keep #3177's bats tests beside the nested-directory test Moves #3177's bats describe block verbatim from test/pregate-selection.test.ts into test/pregate-bats-nested.test.ts, so pregate-selection.test.ts is unchanged on this branch and the in-flight field-list-2 pregate lane (capy/fl2-L6-pregate, which edits that file's imports and adds cases) merges without a conflict. No assertion changes. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * doctor --check: keep bin/gstack-upgrade as the Windows fix (path spelling fixed on main) Reverts37bac07f8. Plan item D named the held-install recovery forms on Windows only until bin/gstack-upgrade stopped refusing Git Bash installs. bin/gstack-upgrade:63-67 now compares with gstack_path_same from bin/gstack-path-spelling.sh, pinned by test/gstack-upgrade-path-spelling.test.ts, so bin/gstack-upgrade is the right fix on every platform again. * test(skills): measure the size-guard pins on v1.91.109.0 #3225 (merged into this branch) grew 53 pinned skills: 3 characters each from the Aside driver resolver, and about 340 more in plan-design-review and plan-devex-review from the #3219 summary sections. The pins are this PR's starting measurement, so they are taken on the merged base; no skill this PR renders grew. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ci(windows): only the pregate tests that pass on windows-latest join the lane windows-free-tests run 38984824731 (this branch at8ed6da402) ran the moved files. gstack-regen and the new pregate-wtree-refusal passed. pregate-guards, -remote, -regate, -invalidation, -selection and -bats-nested launched gstack-pregate fine but fail on Linux-host expectations: their fixture lanes are Linux workflow jobs, which a Windows host records as requires-remote obligations. They go back to KNOWN_WINDOWS_INCOMPATIBLE with that reason instead of "shebang via CreateProcess". Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * windows curation: keep CI run ids out of reason prose (pii.phone false positive) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * skill-md size pins: follow #3231's review-army line (+21 chars on five inlining hosts) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * doctor test: drop the reverted Windows upgrade-fix wording from item D's describe Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * skill-md size pins: follow #3226 (plan-devex-review +3324) and #3234 (autoplan +59) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * WTREE_UNAVAILABLE moves to lib/result-codes-release.ts (#3235 split; result-codes.ts stays at 796 of 800 lines); doctor fixture copies the release table; size pins follow #3235's review +1 Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(changelog): fix wave PR 5 release notes Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * v1.91.117.0 fix: fix wave PR 5 (pregate bats + WTREE_UNAVAILABLE, doctor rows, SKILL.md size guard, planMode hosts) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(qa): an invalid-input probe breaks only the rule it tests The paid gate's qa-functional-cli-report failed again on #3236 (run 39001107574): the agent probed the digits-only amount rule with -5, which the positivity check rejected first, so the planted parseInt defect stayed hidden and it reported no defect. The contract map's invalid-input row now asks for each input to break only the rule it tests, so another check cannot reject it first. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --------- Co-authored-by: harjothkhara <48686985+harjothkhara@users.noreply.github.com> Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com> Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
172 lines
9.6 KiB
TypeScript
172 lines
9.6 KiB
TypeScript
/**
|
|
* Fixture repo for the C-stamp tests (gstack-ship-policy, gstack-restamp,
|
|
* gstack-tree-receipt, gstack-ship-receipt): a bare origin plus a working
|
|
* clone with a 4-digit VERSION, a package.json and lockfile, a CHANGELOG, a
|
|
* `release:restamp` script that regenerates `generated/digest.md` from
|
|
* VERSION, docs with `since:` / `vX` / `(was X)` mentions, and a committed
|
|
* `.gstack/ship-policy.json`. Everything lives under os.tmpdir(), outside
|
|
* any checkout, with its own hermetic git identity.
|
|
*/
|
|
import { spawnSync } from 'node:child_process';
|
|
import * as fs from 'node:fs';
|
|
import * as os from 'node:os';
|
|
import * as path from 'node:path';
|
|
import { gitArgvIn } from './scratch-repo';
|
|
import { mergeChangelogs } from '../../lib/changelog-check';
|
|
import { runScriptSync } from '../../lib/script-invocation';
|
|
|
|
export const ROOT = path.resolve(import.meta.dir, '..', '..');
|
|
export const BIN = (name: string) => path.join(ROOT, 'bin', name);
|
|
|
|
export interface FixtureRepo { root: string; work: string; origin: string; home: string; git: (...args: string[]) => string; env: Record<string, string> }
|
|
|
|
export const BASE_POLICY = {
|
|
$schema: 'https://github.com/garrytan/gstack/docs/ship-policy.md#schema-v1',
|
|
bump: 'patch',
|
|
queue_mode: 'stamp-at-merge',
|
|
release_tool: 'node gen.js',
|
|
release_outputs: ['generated/**'],
|
|
stamp_paths: ['docs/**/*.md'],
|
|
changelog: 'CHANGELOG.md',
|
|
history: 'squash-ok',
|
|
stamp_sensitive_gates: ['digest'],
|
|
};
|
|
|
|
export function makeFixtureRepo(opts: { policy?: Record<string, unknown> | null; version?: string; prefix?: string } = {}): FixtureRepo {
|
|
const root = fs.mkdtempSync(path.join(os.tmpdir(), opts.prefix ?? 'gstack-restamp-fx-'));
|
|
const origin = path.join(root, 'origin.git');
|
|
const work = path.join(root, 'work');
|
|
const home = path.join(root, 'home');
|
|
fs.mkdirSync(home, { recursive: true });
|
|
fs.mkdirSync(work, { recursive: true });
|
|
const env = { GSTACK_HOME: home, GSTACK_STATE_DIR: home, HOME: home, GIT_CONFIG_GLOBAL: path.join(root, 'gitconfig'), GIT_CONFIG_NOSYSTEM: '1' };
|
|
fs.writeFileSync(env.GIT_CONFIG_GLOBAL, '[user]\n\tname = t\n\temail = t@test\n[commit]\n\tgpgsign = false\n[init]\n\tdefaultBranch = main\n');
|
|
const git = (...args: string[]): string => {
|
|
const r = gitArgvIn(work, args, 30_000, { ...process.env, ...env });
|
|
if (r.status !== 0) throw new Error(`git ${args.join(' ')} failed: ${r.stderr?.toString()}`);
|
|
return r.stdout?.toString().trim() ?? '';
|
|
};
|
|
spawnSync('git', ['init', '-q', '--bare', origin], { timeout: 30_000, env: { ...process.env, ...env } });
|
|
git('init', '-q', '-b', 'main');
|
|
const version = opts.version ?? '1.2.3.0';
|
|
const npm = version.split('.').slice(0, 3).join('.');
|
|
fs.mkdirSync(path.join(work, 'docs'), { recursive: true });
|
|
fs.mkdirSync(path.join(work, 'generated'), { recursive: true });
|
|
fs.mkdirSync(path.join(work, '.gstack'), { recursive: true });
|
|
fs.writeFileSync(path.join(work, 'VERSION'), version + '\n');
|
|
fs.writeFileSync(path.join(work, 'package.json'), JSON.stringify({ name: 'fixture', version: npm, scripts: { 'release:restamp': 'node gen.js' }, dependencies: { 'left-pad': '1.2.3' } }, null, 2) + '\n');
|
|
fs.writeFileSync(path.join(work, 'package-lock.json'), JSON.stringify({ name: 'fixture', version: npm, lockfileVersion: 3, packages: { '': { name: 'fixture', version: npm, dependencies: { 'left-pad': '1.2.3' } }, 'node_modules/left-pad': { version: '1.2.3' } } }, null, 2) + '\n');
|
|
fs.writeFileSync(path.join(work, 'gen.js'), "const fs=require('fs');const v=fs.readFileSync('VERSION','utf8').trim();fs.writeFileSync('generated/digest.md',`# digest v${v}\\nbody\\n`);\n");
|
|
fs.writeFileSync(path.join(work, 'generated', 'digest.md'), `# digest v${version}\nbody\n`);
|
|
fs.writeFileSync(path.join(work, 'CHANGELOG.md'), `# Changelog\n\n## [${version}] - 2026-10-01\n\n- base release\n\n## [1.2.2.0] - 2026-09-01\n\n- older\n`);
|
|
fs.writeFileSync(path.join(work, 'docs', 'notes.md'), `Previous release v${version}.\nleft-pad pinned at 1.2.3 (was 1.2.2)\n`);
|
|
if (opts.policy !== null) fs.writeFileSync(path.join(work, '.gstack', 'ship-policy.json'), JSON.stringify(opts.policy ?? BASE_POLICY, null, 2) + '\n');
|
|
git('add', '-A');
|
|
git('commit', '-q', '-m', `base ${version}`);
|
|
git('remote', 'add', 'origin', origin);
|
|
git('push', '-q', 'origin', 'main');
|
|
git('remote', 'set-head', 'origin', 'main');
|
|
return { root, work, origin, home, git, env };
|
|
}
|
|
|
|
/** A PR branch from origin/main with an `[Unreleased]` CHANGELOG entry and a doc mentioning the version it expects. */
|
|
export function makePr(repo: FixtureRepo, branch: string, opts: { expects?: string; file?: string; changelog?: boolean } = {}): string {
|
|
repo.git('checkout', '-q', 'origin/main', '-b', branch);
|
|
const file = opts.file ?? `${branch}.txt`;
|
|
fs.writeFileSync(path.join(repo.work, file), `${branch}\n`);
|
|
if (opts.changelog !== false) {
|
|
const cl = fs.readFileSync(path.join(repo.work, 'CHANGELOG.md'), 'utf8');
|
|
fs.writeFileSync(path.join(repo.work, 'CHANGELOG.md'), cl.replace('# Changelog\n', `# Changelog\n\n## [Unreleased]\n\n- ${branch} change\n`));
|
|
}
|
|
if (opts.expects) fs.writeFileSync(path.join(repo.work, 'docs', `${branch}.md`), `since: ${opts.expects}\nRequires v${opts.expects} or later.\n`);
|
|
repo.git('add', '-A');
|
|
repo.git('commit', '-q', '-m', `feat ${branch}`);
|
|
return repo.git('rev-parse', 'HEAD');
|
|
}
|
|
|
|
export function runBin(repo: FixtureRepo, name: string, args: string[], extraEnv: Record<string, string> = {}, cwd = repo.work) {
|
|
const r = runScriptSync(BIN(name), args, { cwd, encoding: 'utf8', timeout: 120_000, env: { ...process.env, ...repo.env, ...extraEnv } });
|
|
return { status: r.status, out: r.stdout ?? '', err: r.stderr ?? '' };
|
|
}
|
|
|
|
export function restamp(repo: FixtureRepo, args: string[], extraEnv: Record<string, string> = {}) {
|
|
return runBin(repo, 'gstack-restamp', ['--base', 'main', '--allow-repo-commands', ...args], extraEnv);
|
|
}
|
|
|
|
export function readFile(repo: FixtureRepo, rel: string): string {
|
|
return fs.readFileSync(path.join(repo.work, rel), 'utf8');
|
|
}
|
|
|
|
/** Merge a branch into origin/main with a merge commit (the coordinator's merge) and return the new main head. */
|
|
export function mergeToMain(repo: FixtureRepo, branch: string): string {
|
|
repo.git('checkout', '-q', 'main');
|
|
repo.git('merge', '-q', '--no-ff', '--no-edit', branch);
|
|
repo.git('push', '-q', 'origin', 'main');
|
|
return repo.git('rev-parse', 'HEAD');
|
|
}
|
|
|
|
/**
|
|
* Integrate origin/main into the checked-out branch the way /ship does at its
|
|
* turn: a plain merge, with a CHANGELOG conflict resolved by lib/changelog-check
|
|
* (the branch's Unreleased entries above main's released sections) and a version
|
|
* file conflict taken from main. Any other conflict throws.
|
|
*/
|
|
export function mergeMain(repo: FixtureRepo): string {
|
|
const r = gitArgvIn(repo.work, ['merge', '--no-ff', '--no-edit', '-q', 'origin/main'], 30_000, { ...process.env, ...repo.env });
|
|
if (r.status !== 0) {
|
|
const conflicts = repo.git('diff', '--name-only', '--diff-filter=U').split('\n').filter(Boolean);
|
|
for (const c of conflicts) {
|
|
if (c === 'CHANGELOG.md') {
|
|
const merged = mergeChangelogs(repo.git('show', `:2:${c}`) + '\n', repo.git('show', `:3:${c}`) + '\n');
|
|
if (merged === null) throw new Error(`fixture merge: CHANGELOG conflict is not a heading move`);
|
|
fs.writeFileSync(path.join(repo.work, c), merged);
|
|
} else if (/^(VERSION|package(-lock)?\.json)$/.test(c)) repo.git('checkout', '--theirs', '--', c);
|
|
else throw new Error(`fixture merge: unexpected conflict in ${c}`);
|
|
}
|
|
repo.git('add', '--', ...conflicts);
|
|
repo.git('commit', '-q', '--no-edit');
|
|
}
|
|
return repo.git('rev-parse', 'HEAD');
|
|
}
|
|
|
|
export function cleanup(repo: FixtureRepo): void {
|
|
fs.rmSync(repo.root, { recursive: true, force: true });
|
|
}
|
|
|
|
/**
|
|
* A `gh` on PATH that answers `gh pr view <n> --json ...` from a map of PR
|
|
* number → JSON object and `gh pr list` with a fixed array, so queue-order
|
|
* and PREDECESSOR MOVED checks run without the network.
|
|
*/
|
|
export function ghShim(repo: FixtureRepo, prs: Record<string, unknown>, list: unknown[] = []): { PATH: string } {
|
|
const dir = path.join(repo.root, 'gh-shim');
|
|
fs.mkdirSync(dir, { recursive: true });
|
|
fs.writeFileSync(path.join(dir, 'prs.json'), JSON.stringify({ prs, list }));
|
|
const script = [
|
|
'#!/bin/sh',
|
|
`DATA="${path.join(dir, 'prs.json')}"`,
|
|
'if [ "$1" = "pr" ] && [ "$2" = "view" ]; then',
|
|
' node -e "const d=require(process.argv[1]);const p=d.prs[process.argv[2]];if(!p){console.error(\'no such pr\');process.exit(1)}console.log(JSON.stringify(p))" "$DATA" "$3"',
|
|
' exit $?',
|
|
'fi',
|
|
'if [ "$1" = "pr" ] && [ "$2" = "list" ]; then node -e "console.log(JSON.stringify(require(process.argv[1]).list))" "$DATA"; exit $?; fi',
|
|
'echo "gh shim: unsupported $*" >&2; exit 1',
|
|
'',
|
|
].join('\n');
|
|
fs.writeFileSync(path.join(dir, 'gh'), script, { mode: 0o755 });
|
|
return { PATH: `${dir}:${process.env.PATH ?? ''}` };
|
|
}
|
|
|
|
/** Record one evidence lane on the current HEAD of `cwd` and export a bundle for it. */
|
|
export function recordAndBundle(repo: FixtureRepo, cwd: string, lanes: Array<{ label: string; command: string }>, out: string, extraEnv: Record<string, string> = {}): string {
|
|
for (const lane of lanes) {
|
|
const r = runBin(repo, 'gstack-evidence', ['run', '--label', lane.label, '--', lane.command], extraEnv, cwd);
|
|
if (r.status !== 0) throw new Error(`lane ${lane.label} failed: ${r.err}`);
|
|
}
|
|
const args = ['bundle', '--out', out, '--base', 'main', '--require', lanes.map(l => l.label).join(',')];
|
|
for (const lane of lanes) args.push('--label', lane.label);
|
|
const b = runBin(repo, 'gstack-evidence', args, extraEnv, cwd);
|
|
if (b.status !== 0) throw new Error(`bundle failed: ${b.err} ${b.out}`);
|
|
return b.out;
|
|
}
|