mirror of
https://github.com/garrytan/gstack.git
synced 2026-11-02 15:04:37 +01:00
* fix(ship): base merges, adjacent base edits, test-only and audit-requested fixes no longer force a second review loop (GST-407, GST-384, GST-391)
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* ship driver: trim two phrases for headroom with #3662
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* ship driver: keep the Next steps heading phrase the handoff check reads; trim elsewhere
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* test: regenerate ship goldens
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* fix: pre-landing review fixes
comparePath returns same only when every hunk sits where the base change puts it (patch-ids ignore positions) and treats a file-mode change as changed; the scoped-review packet says when a fence is truncated; --docs-result must be the posted audit's result; the --context-reviewed record goes beside the packet, outside the worktree. Negative controls for each.
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* fix: pass-2 review fixes
A test edit routes as tests= only when it adds lines with no gate tag; a removed or changed line or an unreadable test diff goes through the full loop. Diffs skip textconv. A hunkless patch (binary, empty, mode-only) is same when its patch-id matches. Without --reviewed-base test files route as before. finish's packet path and attempt's state directory have fallbacks.
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* fix: Step 11 review fixes; a version-only stamp_files edit after review is release metadata (GBRA-251)
gateEditedPaths reads removed lines only inside hunks; carry refuses when a path listing fails; docs freshness stops on a failed listing; attempt counts an unreadable state file. releasePaths includes stamp_files paths whose edit is a version swap under stamp_patterns.
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* fix: no test edit skips review; guard packet writes; exclusive attempt state
A test-only edit with no gate tag gets the scoped fix-check of its test hunks instead of a lanes-only rerun. Packet write failures print a STOP or RECEIPT_CARRY_REFUSED. attempt's allowance uses an exclusive create.
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* fix: attempt prints gstack's install command; carry checks the product diff outside context paths
The attempt STOP no longer echoes the audit child's fix text. A scoped-review carry now requires the product patch-id without the context paths to match at both heads.
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* fix: oversized packets take the full loop; exact --docs-requested match; name-only test globs only in test dirs
A scoped-review packet section over 200 lines sends that path to the full loop instead of a truncated packet. The docs-result path match is exact. test_*.py, *Test.java and similar count as test code only under a test directory.
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* docs(unattended): carry's scoped-review refusal and what it keeps
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* docs: carry's scoped-review route in ship-policy, review-policy and troubleshooting (docs-a-1)
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* test(windows): curate ship-rereview-triggers out of the Windows lane like ship-release (run 41193336209)
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
* fix: restore bin/gstack-ship-receipt after the main merge
The merge commit b10e2db wrote a truncated copy of the file. This is the
three-way merge of both sides with the refused() union: main's codes plus
RECEIPT_CARRY_SCOPED_REVIEW.
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
---------
Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
168 lines
10 KiB
TypeScript
168 lines
10 KiB
TypeScript
/**
|
|
* ship-bin-common — what gstack-ship-preflight and gstack-ship-release share: running git
|
|
* and sibling bins with timeouts, flag reading, the effective ship policy, and the compact
|
|
* result every step prints (KEY: lines, STOP: where the agent must judge, NEXT: what it
|
|
* does next). The bins chain existing commands and never make a decision the /ship prose
|
|
* assigns to the agent.
|
|
*/
|
|
import { spawn, spawnSync } from 'node:child_process';
|
|
import * as fs from 'node:fs';
|
|
import * as path from 'node:path';
|
|
import { fragmentSlug } from './changelog-fragments';
|
|
import { parseUnifiedDiff, stampOnlyLine, versionAtRef } from './restamp';
|
|
import { matchesAny } from './ship-policy';
|
|
import { extractVersion } from './version-source';
|
|
import { BIN_DIR, runBashSync, runScriptSync, scriptInvocation } from './script-invocation';
|
|
|
|
export interface Run { status: number | null; stdout: string; stderr: string }
|
|
const done = (r: { status: number | null; stdout?: string | Buffer | null; stderr?: string | Buffer | null; error?: Error }): Run =>
|
|
({ status: r.status, stdout: String(r.stdout ?? ''), stderr: String(r.stderr ?? '') + (r.error ? r.error.message : '') });
|
|
|
|
export function git(cwd: string, args: string[], timeout = 120_000): Run {
|
|
return done(spawnSync('git', args, { cwd, encoding: 'utf8', timeout, maxBuffer: 64 * 1024 * 1024, env: { ...process.env, GIT_TERMINAL_PROMPT: '0' } }));
|
|
}
|
|
export function bin(cwd: string, name: string, args: string[], timeout = 600_000): Run {
|
|
return done(runScriptSync(path.join(BIN_DIR, name), args, { cwd, encoding: 'utf8', timeout, maxBuffer: 64 * 1024 * 1024 }));
|
|
}
|
|
/** Whether origin's configured URL names a host (https, ssh or scp form), before any insteadOf rewrite; a local path or file:// remote has none, so gh cannot map it to a repository. */
|
|
export function hostedOrigin(cwd: string): boolean {
|
|
const url = git(cwd, ['config', '--get', 'remote.origin.url']).stdout.trim();
|
|
return /^(?:[a-z][a-z0-9+.-]*:\/\/(?:[^@/\s]+@)?[^/:\s]+[:/]|[^@/\s]+@[^/:\s]+:)\S+$/i.test(url) && !/^file:/i.test(url);
|
|
}
|
|
/** gh with argv, never a shell, so a branch name cannot change what runs. */
|
|
export function gh(cwd: string, args: string[], timeout = 60_000): Run {
|
|
return done(spawnSync('gh', args, { cwd, encoding: 'utf8', timeout, maxBuffer: 64 * 1024 * 1024, env: { ...process.env, GIT_TERMINAL_PROMPT: '0' } }));
|
|
}
|
|
export function sh(cwd: string, command: string, timeout = 1_800_000): Run {
|
|
return done(runBashSync(command, { cwd, encoding: 'utf8', timeout, maxBuffer: 64 * 1024 * 1024 }));
|
|
}
|
|
/** A sibling bin run without blocking, so independent test lanes run in parallel. */
|
|
export function binAsync(cwd: string, name: string, args: string[], timeout = 3_600_000): Promise<Run> {
|
|
const inv = scriptInvocation(path.join(BIN_DIR, name), args);
|
|
if (!inv.ok) return Promise.resolve({ status: null, stdout: '', stderr: inv.error });
|
|
return new Promise(resolve => {
|
|
const child = spawn(inv.cmd, inv.argv, { cwd, stdio: ['ignore', 'pipe', 'pipe'] });
|
|
let stdout = '', stderr = '';
|
|
child.stdout.on('data', d => { stdout = (stdout + d).slice(-200_000); });
|
|
child.stderr.on('data', d => { stderr = (stderr + d).slice(-200_000); });
|
|
const timer = setTimeout(() => child.kill('SIGKILL'), timeout);
|
|
child.on('close', status => { clearTimeout(timer); resolve({ status, stdout, stderr }); });
|
|
});
|
|
}
|
|
|
|
export function flagReader(argv: readonly string[]) {
|
|
const all = (n: string) => argv.flatMap((a, i) => (a === n && argv[i + 1] !== undefined ? [argv[i + 1]!] : []));
|
|
return { all, flag: (n: string) => all(n).at(-1), has: (n: string) => argv.includes(n) };
|
|
}
|
|
|
|
/** --lane <label>=<command> pairs (Step 5's labels and exact commands). */
|
|
export function lanes(argv: readonly string[]): { label: string; command: string }[] | string {
|
|
const out: { label: string; command: string }[] = [];
|
|
for (const raw of flagReader(argv).all('--lane')) {
|
|
const at = raw.indexOf('=');
|
|
if (at < 1 || at === raw.length - 1) return `--lane ${raw} is not <label>=<command>`;
|
|
out.push({ label: raw.slice(0, at), command: raw.slice(at + 1) });
|
|
}
|
|
return out;
|
|
}
|
|
|
|
/** The base branch's effective ship policy (gstack-ship-policy show-effective --json), or null when unreadable. */
|
|
export function shipPolicy(cwd: string, base: string): Record<string, any> | null {
|
|
const r = bin(cwd, 'gstack-ship-policy', ['show-effective', '--base', base, '--json'], 60_000);
|
|
try { return JSON.parse(r.stdout).policy ?? null; } catch { return null; }
|
|
}
|
|
|
|
/** Manifests a version stamp writes: release metadata only while the edit changes nothing but the version. */
|
|
export const VERSIONED_MANIFESTS = ['package.json', 'package-lock.json', 'npm-shrinkwrap.json'];
|
|
|
|
/** True when `p` in the working tree differs from `p` at `ref` (a commit or tree) in its version fields alone; a new, deleted or unparseable file never qualifies. */
|
|
export function versionOnlyEdit(cwd: string, ref: string, p: string): boolean {
|
|
const before = git(cwd, ['show', `${ref}:${p}`]);
|
|
if (before.status !== 0) return false;
|
|
let now: string;
|
|
try { now = fs.readFileSync(path.join(cwd, p), 'utf8'); } catch { return false; }
|
|
const strip = (s: string) => {
|
|
const o = JSON.parse(s);
|
|
delete o.version;
|
|
if (o.packages?.['']) delete o.packages[''].version;
|
|
return JSON.stringify(o);
|
|
};
|
|
try { return strip(before.stdout) === strip(now); } catch { return false; }
|
|
}
|
|
|
|
/**
|
|
* Release metadata a version stamp and Steps 13-14 write, compared against `ref`: the release commit's paths,
|
|
* never a behavior change. A manifest counts only while its edit is version-only (a dependency, script or
|
|
* lockfile change is a build input); bun.lock never counts.
|
|
*/
|
|
export function releasePaths(policy: Record<string, any> | null, cwd: string, ref: string): string[] {
|
|
const list = (v: unknown) => (Array.isArray(v) ? v.filter((s): s is string => typeof s === 'string') : []);
|
|
const fragment = fragmentPath(policy, cwd);
|
|
return [...new Set(['VERSION', 'CHANGELOG.md', 'TODOS.md', 'agents-digest/gstack-AGENTS.md', ...VERSIONED_MANIFESTS.filter(p => versionOnlyEdit(cwd, ref, p)),
|
|
...(typeof policy?.changelog === 'string' ? [policy.changelog] : []), ...(fragment ? [fragment] : []), ...list(policy?.release_outputs), ...list(policy?.stamp_paths),
|
|
...stampedFiles(policy, cwd, ref)])];
|
|
}
|
|
|
|
/**
|
|
* `stamp_files` paths whose working-tree edit against `ref` is a version stamp alone: every changed line swaps the
|
|
* old version for the new one under a built-in form or a `stamp_patterns` template (lib/tree-receipt.ts classifyFile).
|
|
*/
|
|
export function stampedFiles(policy: Record<string, any> | null, cwd: string, ref: string): string[] {
|
|
const globs = Array.isArray(policy?.stamp_files) ? policy.stamp_files.filter((s: unknown): s is string => typeof s === 'string') : [];
|
|
if (!globs.length) return [];
|
|
const before = versionAtRef(cwd, ref);
|
|
if (!('version' in before)) return [];
|
|
let after = '';
|
|
try { after = extractVersion(fs.readFileSync(path.join(cwd, before.rel), 'utf8'), before.rel); } catch { return []; }
|
|
if (!after || after === before.version) return [];
|
|
const templates = Array.isArray(policy?.stamp_patterns) ? policy.stamp_patterns.filter((s: unknown): s is string => typeof s === 'string') : [];
|
|
const diff = git(cwd, ['diff', '--unified=0', '--no-color', '--no-ext-diff', '--no-textconv', '--no-renames', ref]);
|
|
if (diff.status !== 0) return [];
|
|
return parseUnifiedDiff(diff.stdout).filter(f => f.status === 'M' && !f.binary && !f.modeChanged && matchesAny(globs, f.path) && f.hunks.length > 0 &&
|
|
f.hunks.every(h => h.removed.length === h.added.length && h.removed.every((line, i) => stampOnlyLine(line, h.added[i]!, before.version, after, templates)))).map(f => f.path);
|
|
}
|
|
|
|
/** Under `changelog_fragments`, the branch's own Step 13 entry `<dir>/<branch-slug>.md` (docs/ship-policy.md#changelog-fragments); null without the key. */
|
|
export function fragmentPath(policy: Record<string, any> | null, cwd: string): string | null {
|
|
const dir = policy?.changelog_fragments?.dir;
|
|
if (typeof dir !== 'string') return null;
|
|
return `${dir.replace(/\/+$/, '')}/${fragmentSlug(git(cwd, ['rev-parse', '--abbrev-ref', 'HEAD']).stdout.trim())}.md`;
|
|
}
|
|
|
|
/** The paths a lane receipt may ignore: release metadata except TODOS.md, whose Step 14 edit reruns the lanes (ship/SKILL.md Step 16). */
|
|
export const evidenceExempt = (release: readonly string[]) => release.filter(p => p !== 'TODOS.md');
|
|
|
|
export const short = (list: readonly string[], n = 6) => list.slice(0, n).join(',') + (list.length > n ? `,+${list.length - n} more` : '');
|
|
export const firstLine = (s: string) => s.trim().split('\n').filter(Boolean).at(-1)?.slice(0, 240) ?? '';
|
|
|
|
/** The compact result: at most MAX_LINES lines; STOP and NEXT always survive the cap. */
|
|
export const MAX_LINES = 30;
|
|
export class Report {
|
|
readonly lines: string[] = [];
|
|
exit = 0;
|
|
add(line: string): this { this.lines.push(line); return this; }
|
|
next(what: string): this { return this.add(`NEXT: ${what}`); }
|
|
stop(what: string): Report { this.exit = 3; return this.add(`STOP: ${what}`); }
|
|
render(): string {
|
|
const keep = this.lines.length <= MAX_LINES ? this.lines
|
|
: [...this.lines.filter(l => !/^(STOP|NEXT):/.test(l)).slice(0, MAX_LINES - 1 - this.lines.filter(l => /^(STOP|NEXT):/.test(l)).length), `… ${this.lines.length - MAX_LINES + 1} line(s) cut`, ...this.lines.filter(l => /^(STOP|NEXT):/.test(l))];
|
|
return keep.join('\n') + '\n';
|
|
}
|
|
}
|
|
|
|
/** Run each lane through gstack-evidence run in parallel and read its recorded line. */
|
|
export async function runLanes(cwd: string, list: { label: string; command: string }[]): Promise<{ label: string; exit: number | null; testsRan: string; log: string }[]> {
|
|
return Promise.all(list.map(async l => {
|
|
const r = await binAsync(cwd, 'gstack-evidence', ['run', '--label', l.label, '--', l.command]);
|
|
const m = /gstack-evidence: recorded label=\S+ exit=(\S+) tests_ran=(\S+) log=(\S+)/.exec(r.stderr);
|
|
return { label: l.label, exit: r.status, testsRan: m?.[2] ?? 'unknown', log: m?.[3] ?? '-' };
|
|
}));
|
|
}
|
|
|
|
/** Step 5's lane verdict: a lane passes on its runner count, never exit 0 alone. */
|
|
export function laneLine(l: { label: string; exit: number | null; testsRan: string; log: string }): { line: string; ok: boolean } {
|
|
const zero = l.exit === 0 && l.testsRan === '0';
|
|
const state = l.exit !== 0 ? 'FAIL' : zero ? 'ZERO-RUN' : l.testsRan === 'unknown' ? 'pass (count unavailable)' : 'pass';
|
|
return { line: `LANE: ${l.label} ${state} exit=${l.exit} tests_ran=${l.testsRan} log=${l.log}`, ok: l.exit === 0 && !zero };
|
|
}
|