diff --git a/.gstack/pregate.json b/.gstack/pregate.json index 0454e74f3..f5d357841 100644 --- a/.gstack/pregate.json +++ b/.gstack/pregate.json @@ -1,6 +1,6 @@ { "$schema": "https://github.com/garrytan/gstack/docs/pregate.md#pregate-v1", - "runner": "bun test {files}", + "runner": "bun test --timeout=30000 {files}", "remote_gate": "bash scripts/ubicloud/pregate-remote.sh", "dependencies": { ".github/workflows/**": ["test/pregate-selection.test.ts", "test/free-tests-workflow-wiring.test.ts"], diff --git a/browse/src/cookie-import-native-job.ts b/browse/src/cookie-import-native-job.ts index 60c678d2f..429024c6e 100644 --- a/browse/src/cookie-import-native-job.ts +++ b/browse/src/cookie-import-native-job.ts @@ -47,6 +47,8 @@ export function parseNativeCookieDiagnostic(value: unknown): NativeCookieDiagnos return diagnostic; } +export const NATIVE_CLEANUP_MS = 20_000; + export interface NativeCookieJob { name: string; terminate(): void; @@ -64,10 +66,13 @@ export async function createNativeCookieJob(): Promise { let stage: NativeCookieDiagnostic['stage'] = 'job_create'; let handle: number | bigint = 0; let closed = false; + const held = new Map(); const close = () => { if (closed) return; closed = true; try { + for (const member of held.values()) api.CloseHandle(member); + held.clear(); if (handle && !api.CloseHandle(handle)) throw new NativeCookieJobError('job_close', api.GetLastError()); } finally { closeLibrary(); @@ -93,7 +98,25 @@ export async function createNativeCookieJob(): Promise { const accounting = Buffer.alloc(48); if (closed) throw new NativeCookieJobError('job_query'); if (!api.QueryInformationJobObject(handle, 1, ptr(accounting), accounting.byteLength, null)) throw new NativeCookieJobError('job_query', api.GetLastError()); - return accounting.readUInt32LE(40); + const listed = Buffer.alloc(8 + 8 * 1024); + if (!api.QueryInformationJobObject(handle, 3, ptr(listed), listed.byteLength, null)) throw new NativeCookieJobError('job_query', api.GetLastError()); + for (let index = 0; index < Math.min(listed.readUInt32LE(4), 1024); index++) { + const pid = Number(listed.readBigUInt64LE(8 + 8 * index)); + if (held.has(pid)) continue; + const member = api.OpenProcess(0x00101000, 0, pid); + if (!member) continue; + const inJob = Buffer.alloc(4); + if (api.IsProcessInJob(member, handle, ptr(inJob)) && inJob.readInt32LE(0) !== 0) held.set(pid, member); + else api.CloseHandle(member); + } + let running = 0; + for (const [pid, member] of held) { + const state = api.WaitForSingleObject(member, 0); + if (state === 0x102) running++; + else if (state === 0) { api.CloseHandle(member); held.delete(pid); } + else throw new NativeCookieJobError('job_query', api.GetLastError()); + } + return Math.max(accounting.readUInt32LE(40), running); }, close, }; @@ -150,6 +173,8 @@ async function openKernel() { QueryInformationJobObject: { args: [FFIType.u64, FFIType.u32, FFIType.ptr, FFIType.u32, FFIType.ptr], returns: FFIType.i32 }, AssignProcessToJobObject: { args: [FFIType.u64, FFIType.u64], returns: FFIType.i32 }, OpenProcess: { args: [FFIType.u32, FFIType.i32, FFIType.u32], returns: FFIType.u64 }, + IsProcessInJob: { args: [FFIType.u64, FFIType.u64, FFIType.ptr], returns: FFIType.i32 }, + WaitForSingleObject: { args: [FFIType.u64, FFIType.u32], returns: FFIType.u32 }, TerminateJobObject: { args: [FFIType.u64, FFIType.u32], returns: FFIType.i32 }, CloseHandle: { args: [FFIType.u64], returns: FFIType.i32 }, GetLastError: { args: [], returns: FFIType.u32 }, diff --git a/browse/src/cookie-import-native-worker.ts b/browse/src/cookie-import-native-worker.ts index 1d04e2afe..e23ca8d6f 100644 --- a/browse/src/cookie-import-native-worker.ts +++ b/browse/src/cookie-import-native-worker.ts @@ -1,7 +1,7 @@ import { spawn } from 'node:child_process'; import { createInterface } from 'node:readline'; import { writeSync } from 'node:fs'; -import { createNativeCookieJob, joinNativeCookieJob, nativeCookieDiagnostic, parseNativeCookieDiagnostic, type NativeCookieDiagnostic, type NativeCookieJob } from './cookie-import-native-job'; +import { createNativeCookieJob, joinNativeCookieJob, NATIVE_CLEANUP_MS, nativeCookieDiagnostic, parseNativeCookieDiagnostic, type NativeCookieDiagnostic, type NativeCookieJob } from './cookie-import-native-job'; import type { PlaywrightCookie } from './cookie-import-browser'; import { emptyBunConfig } from './bun-child-config'; @@ -114,11 +114,11 @@ export async function superviseNativeCookieImport( void member.closed.then(() => { closed = true; }, () => { closed = true; }); while (!reply && !closed && now() < deadline && !dependencies.signal?.aborted) await sleep(Math.min(20, deadline - now())); reply ??= { error: now() >= deadline ? 'native_timeout' : 'native_failed' }; - const cleanupDeadline = now() + 5_000; + const cleanupDeadline = now() + NATIVE_CLEANUP_MS; const graceDeadline = now() + ('cookies' in reply ? 2_000 : 0); - while ((!closed || job.activeProcesses() !== 0) && now() < graceDeadline) await sleep(20); + while ((job.activeProcesses() !== 0 || !closed) && now() < graceDeadline) await sleep(20); if (job.activeProcesses() !== 0) job.terminate(); - while ((!closed || job.activeProcesses() !== 0) && now() < cleanupDeadline) await sleep(20); + while ((job.activeProcesses() !== 0 || !closed) && now() < cleanupDeadline) await sleep(20); if (!closed || job.activeProcesses() !== 0) return { error: 'native_cleanup_failed' }; return reply; } catch (error) { diff --git a/browse/src/cookie-import-native.ts b/browse/src/cookie-import-native.ts index 7632300a6..f693a34d4 100644 --- a/browse/src/cookie-import-native.ts +++ b/browse/src/cookie-import-native.ts @@ -6,6 +6,7 @@ import path from 'node:path'; import { CookieImportError, normalizeCookieDomain, type PlaywrightCookie } from './cookie-import-browser'; import { emptyBunConfig, findWindowsBunExe } from './bun-child-config'; import { hashNativeFile, nativeCodeHashes, nativeCodeMatches, readNativeQualifications, type NativeQualifiedBuild } from './cookie-import-native-integrity'; +import { NATIVE_CLEANUP_MS } from './cookie-import-native-job'; type BrowserName = 'Chrome' | 'Chromium' | 'Brave' | 'Edge'; @@ -123,7 +124,7 @@ export async function importNativeCookies(options: { const timer = setTimeout(() => { worker.kill(); reject(new CookieImportError('Native cookie cleanup could not be confirmed within its deadline.', 'native_cleanup_failed')); - }, Math.max(0, deadline + 5_000 - Date.now())); + }, Math.max(0, deadline + NATIVE_CLEANUP_MS - Date.now())); worker.stdout.setEncoding('utf8'); worker.stdout.on('data', chunk => { output += chunk; diff --git a/browse/test/cookie-import-native-job.test.ts b/browse/test/cookie-import-native-job.test.ts index 44b068d52..0b2ab14f4 100644 --- a/browse/test/cookie-import-native-job.test.ts +++ b/browse/test/cookie-import-native-job.test.ts @@ -10,7 +10,7 @@ import { Database } from 'bun:sqlite'; import { dlopen, FFIType, ptr } from 'bun:ffi'; import { nativeBrowserPaths } from '../src/cookie-import-native'; import { NATIVE_BROWSER_VERSION_COMMAND } from '../src/cookie-import-native-integrity'; -import { createNativeCookieJob, joinNativeCookieJob, NativeCookieJobError, nativeCookieDiagnostic, parseNativeCookieDiagnostic, type NativeCookieJob } from '../src/cookie-import-native-job'; +import { createNativeCookieJob, joinNativeCookieJob, NATIVE_CLEANUP_MS, NativeCookieJobError, nativeCookieDiagnostic, parseNativeCookieDiagnostic, type NativeCookieJob } from '../src/cookie-import-native-job'; import { nativeCookieEnvironment, NATIVE_COOKIE_NODE_SCRIPT, superviseNativeCookieImport, type NativeCookieMember, type NativeCookieReply, type NativeCookieRequest } from '../src/cookie-import-native-worker'; import { decodeNativeCommandLine } from './fixtures/native-cookie-process-observer'; import { createFixtureDeleteLease, FixtureDeleteError } from './fixtures/native-cookie-delete-lease'; @@ -349,6 +349,8 @@ const request: NativeCookieRequest = { function kernelContract(mode: string) { const script = ` const calls = []; + const polls = {}; + let listings = 0; globalThis.__nativeCookieFfi = { FFIType: { ptr: 'ptr', u64: 'u64', u32: 'u32', i32: 'i32' }, ptr: buffer => buffer, @@ -358,8 +360,18 @@ function kernelContract(mode: string) { CreateJobObjectW: (security, name) => { calls.push(['create', security, name.toString('utf16le')]); return 42; }, OpenJobObjectW: (access, inherit, name) => { calls.push(['open', access, inherit, name.toString('utf16le')]); return 42; }, SetInformationJobObject: (handle, kind, buffer, length) => { calls.push(['limits', handle, kind, length, buffer.readUInt32LE(16)]); return 1; }, - QueryInformationJobObject: (handle, kind, buffer, length) => { calls.push(['query', handle, kind, length]); buffer.writeUInt32LE(3, 40); return 1; }, - OpenProcess: (access, inherit, pid) => { calls.push(['open-process', access, inherit, pid === process.pid]); return 999; }, + QueryInformationJobObject: (handle, kind, buffer, length) => { + calls.push(['query', handle, kind, length]); + if (kind === 1) buffer.writeUInt32LE(${mode === 'exiting' ? 0 : 3}, 40); + if (kind === 3 && ${JSON.stringify(mode)} === 'exiting' && listings++ === 0) { + buffer.writeUInt32LE(3, 4); + [101, 102, 103].forEach((pid, index) => buffer.writeBigUInt64LE(BigInt(pid), 8 + 8 * index)); + } + return 1; + }, + OpenProcess: (access, inherit, pid) => { calls.push(['open-process', access, inherit, pid === process.pid]); return ${mode === 'exiting' ? '1000 + pid' : 999}; }, + IsProcessInJob: (member, job, result) => { calls.push(['in-job', member, job]); result.writeInt32LE(member === 1103 ? 0 : 1, 0); return 1; }, + WaitForSingleObject: (member, milliseconds) => { calls.push(['wait', member, milliseconds]); polls[member] ??= member - 1100; return polls[member]-- > 0 ? 0x102 : 0; }, AssignProcessToJobObject: (job, process) => { calls.push(['assign', job, process]); return ${mode === 'join-fail' ? 0 : 1}; }, TerminateJobObject: (job, code) => { calls.push(['terminate', job, code]); return 1; }, CloseHandle: handle => { calls.push(['close', handle]); return 1; }, @@ -378,6 +390,11 @@ function kernelContract(mode: string) { const active = job.activeProcesses(); job.terminate(); job.close(); job.close(); console.log(JSON.stringify({ name: job.name, active, calls })); + } else if (${JSON.stringify(mode)} === 'exiting') { + const job = await createNativeCookieJob(); + const active = [job.activeProcesses(), job.activeProcesses(), job.activeProcesses()]; + job.close(); + console.log(JSON.stringify({ active, calls })); } else { let error, diagnostic; try { await joinNativeCookieJob('Local\\\\gstack-cookie-12345678-1234-1234-1234-123456789abc'); } catch (caught) { error = caught.message; diagnostic = caught.diagnostic; } @@ -416,6 +433,15 @@ describe('production Windows Job Object API contract', () => { expect(result.calls.filter((call: unknown[]) => call[0] === 'close')).toEqual([['close', 42]]); }); + test('a member the Job no longer counts stays active until its process handle signals exit', () => { + const result = kernelContract('exiting'); + expect(result.active).toEqual([2, 1, 0]); + expect(result.calls).toContainEqual(['query', 42, 3, 8 + 8 * 1024]); + expect(result.calls).toContainEqual(['open-process', 0x00101000, 0, false]); + expect(result.calls.filter((call: unknown[]) => call[0] === 'in-job')).toEqual([['in-job', 1101, 42], ['in-job', 1102, 42], ['in-job', 1103, 42]]); + expect(result.calls.filter((call: unknown[]) => call[0] === 'close')).toEqual([['close', 1103], ['close', 1101], ['close', 1102], ['close', 42]]); + }); + test('member assigns its own handle, never a discovered PID', () => { const result = kernelContract('join'); expect(result.error).toBeUndefined(); @@ -921,10 +947,36 @@ describe('owned native-cookie lifecycle', () => { expect(now).toBeLessThan(30_000); }); + test('cleanup waits for a member that is still exiting after the Job count reads zero', async () => { + let now = 0; + let held = false; + let settleReply!: (reply: NativeCookieReply) => void; + let settleClose!: () => void; + const result = await superviseNativeCookieImport(request, { + now: () => now, + sleep: async milliseconds => { + now += milliseconds; + if (now >= 20) settleReply({ cookies: [] }); + if (now >= 200) settleClose(); + }, + createJob: async () => ({ + name: 'synthetic-owned-job', close() {}, terminate() {}, + activeProcesses: () => { + if (now < 100) held = true; + return now < 100 || (held && now < 5_000) ? 1 : 0; + }, + }), + startMember: () => ({ result: new Promise(resolve => { settleReply = resolve; }), closed: new Promise(resolve => { settleClose = resolve; }), stop() {} }), + }); + expect(result).toEqual({ cookies: [] }); + expect(now).toBeGreaterThanOrEqual(5_000); + expect(now).toBeLessThan(NATIVE_CLEANUP_MS); + }); + test('unconfirmed termination is reported as cleanup failure, never success', async () => { const run = simulation({ retainAfterTerminate: true }); expect(await run.run).toEqual({ error: 'native_cleanup_failed' }); - expect(run.state()).toMatchObject({ time: 30_000, terminated: 1, stopped: 1, jobClosed: 1 }); + expect(run.state()).toMatchObject({ time: 25_000 + NATIVE_CLEANUP_MS, terminated: 1, stopped: 1, jobClosed: 1 }); }); test('a process crash cannot strand remaining members', async () => { @@ -1029,11 +1081,11 @@ function safeLaunchEvidence(file: string): object { } function nativeSupervisor(input: NativeCookieRequest, env: NodeJS.ProcessEnv) { - const cleanupDeadline = performance.now() + 30_000; + const cleanupDeadline = performance.now() + 25_000 + NATIVE_CLEANUP_MS; const child = ownFixtureChild(spawn(process.execPath, ['--no-env-file', '--no-install', '--no-macros', '--config=NUL', path.resolve(import.meta.dir, '../src/cookie-import-native-worker.ts')], { env, stdio: ['pipe', 'pipe', 'ignore'], windowsHide: true })); let output = ''; child.stdout.on('data', chunk => { output += chunk; }); - const timer = setTimeout(() => child.kill(), 30_000); + const timer = setTimeout(() => child.kill(), 25_000 + NATIVE_CLEANUP_MS); const done = new Promise((resolve, reject) => { child.once('error', reject); child.once('close', () => { diff --git a/changelog.d/capy-gsta240-followup.md b/changelog.d/capy-gsta240-followup.md new file mode 100644 index 000000000..9bd397458 --- /dev/null +++ b/changelog.d/capy-gsta240-followup.md @@ -0,0 +1,10 @@ +**Native cookie import now waits for its browser to actually exit before it reports cleanup, and four more flaky tests from the 2026-11-01 flaky pass are repaired.** Windows drops a Job's process count to zero while terminated Edge processes are still shutting down and still hold the profile's files, so cleanup that trusted the count returned early and the next profile reset failed with a sharing violation. + +### Fixed +- **`browse/src/cookie-import-native-job.ts`, `browse/src/cookie-import-native-worker.ts`, `browse/src/cookie-import-native.ts`**: the supervisor holds a handle to every process it sees in the import's Job and counts a process as active until that handle signals exit, not only until the Job's counter drops. The cleanup budget is now 20 s (was 5 s), because terminated Edge took up to 17.8 s to exit on a loaded Windows runner and 2 to 57 ms idle; an idle import returns as soon as its processes are gone. Cleanup that still cannot confirm the exit reports `native_cleanup_failed`, as before. +- **`test/skill-e2e-autoplan-guard-pty.test.ts`**: the live actor is Sonnet 5.5 instead of Haiku 4.5. Haiku rewrote the 64-character content hash when it retyped the Phase 2 dispatch prompt, so the publication guard correctly refused a prompt the actor had changed. The guard, the case kind and its single trial are unchanged. +- **`.gstack/pregate.json`**: the local pregate lane runs `bun test --timeout=30000 {files}`, the 30 s per-test timeout CI and the remote pregate already use, so a case that takes 5 s on a busy machine no longer fails only locally. +- **`test/gstack-ship-receipt.test.ts`**: the full `write` case, about 62 git calls, gets a 15 s timeout instead of bun's 5 s default. + +### Changed +- `test/helpers/docsync-contract.ts` names the missing `documentation_section` when a document-release completion fails the contract, so the next paid red says which field was absent. diff --git a/docs/pregate.md b/docs/pregate.md index e6d45e4da..af0f9d342 100644 --- a/docs/pregate.md +++ b/docs/pregate.md @@ -74,7 +74,7 @@ the byte-pinned `/ship` renders in `test/fixtures/golden/`). | Key | Meaning | |---|---| -| `runner` | the local test command with `{files}` (gstack: `bun test {files}`); unset, it is detected (bun, vitest, jest, pytest, `node --test`, and `flutter test`/`dart test` per Dart package root, through fvm when that package or an ancestor pins it with `.fvmrc` or `.fvm/fvm_config.json` and fvm is on PATH; `cargo test -p ` per Rust crate, run from the root of the workspace the crate is a member of (Cargo's `members` globs, `exclude` and `package.workspace`), else the crate directory; a JS/TS test whose nearest package.json is a nested package declaring vitest or jest (a dependency or its `test` script) runs from that package, with package-relative paths, through the package manager its `packageManager` field or the nearest lockfile up to the repo root names: `pnpm exec`, `yarn`, `bun x`, else `npx`; every other JS/TS test keeps the root detection); nothing detected, a Dart SDK, cargo or package manager missing from PATH, a `.dart` file with no `pubspec.yaml` above it, a `.rs` file outside any crate, or one in a crate whose name Cargo would reject (anything but letters, digits, `_` and `-`), is `incomplete` (the runnable groups still run, so a real failure still fails) | +| `runner` | the local test command with `{files}` (gstack: `bun test --timeout=30000 {files}`, the 30 s per-test timeout CI uses); unset, it is detected (bun, vitest, jest, pytest, `node --test`, and `flutter test`/`dart test` per Dart package root, through fvm when that package or an ancestor pins it with `.fvmrc` or `.fvm/fvm_config.json` and fvm is on PATH; `cargo test -p ` per Rust crate, run from the root of the workspace the crate is a member of (Cargo's `members` globs, `exclude` and `package.workspace`), else the crate directory; a JS/TS test whose nearest package.json is a nested package declaring vitest or jest (a dependency or its `test` script) runs from that package, with package-relative paths, through the package manager its `packageManager` field or the nearest lockfile up to the repo root names: `pnpm exec`, `yarn`, `bun x`, else `npx`; every other JS/TS test keeps the root detection); nothing detected, a Dart SDK, cargo or package manager missing from PATH, a `.dart` file with no `pubspec.yaml` above it, a `.rs` file outside any crate, or one in a crate whose name Cargo would reject (anything but letters, digits, `_` and `-`), is `incomplete` (the runnable groups still run, so a real failure still fails) | | `dependencies` | glob → test files for subprocess targets, runtime reads and generated inputs the import graph cannot see; `[]` declares "no lane needed" (docs, licences) | | `empty_lanes` | extra globs for the docs/no-tests empty lane. Any Markdown file already qualifies with no pin file when no test depends on it (the same import graph as other files: a quoted path, a `join()` of path segments, an import, or a `dependencies` entry). reStructuredText and AsciiDoc count as Markdown here. README, CHANGELOG, CONTRIBUTING, LICENSE, AGENTS and CLAUDE qualify even without `.md`, and so does licence text under any vendored name (`roboto-LICENSE.txt`, `LICENSE-MIT`, `licenses/*.txt`). Source code and files under a test directory never qualify. A test that reads the file still selects that test | | `selection` | `workflow.yml/job` → a command printing the lane's file list, for matrices a planner computes (gstack: `scripts/test-free-shards.ts --list`) | diff --git a/test/fixtures/docsync-spawned-missing-section-public.json b/test/fixtures/docsync-spawned-missing-section-public.json new file mode 100644 index 000000000..84eb49848 --- /dev/null +++ b/test/fixtures/docsync-spawned-missing-section-public.json @@ -0,0 +1,29 @@ +{ + "source": "Final output of each claude-opus-5-5 docsync-spawned gate record in runs 41217563527 (train 39597129) and 41238366045 (train 0926fe2e): the red paid-slice-13 attempt (\"completion fields\") and its in-run rule-16 rerun", + "outputs": [ + { + "run": "41217563527", + "attempt": "slices-13", + "recordedPassed": false, + "output": "The audit is finished but blocked. I made one factual fix. The new `SECURITY.md` contradicts the new `options.ts`, and as a spawned child I can't approve a security-model change, so that goes back to you.\n\n- **Fixed:** `handbook/reference/commands/widget.md.tmpl` said \"Default format: text.\" It now says \"json\", matching the staged change in `app.ts`. The user note in that file is unchanged. `README.md` already said JSON, so I left it alone.\n- **Blocker:** `SECURITY.md` says output never contains sensitive data, but `options.ts` sets `outputIncludesSensitiveData = true`. Someone needs to decide which one is right; I edited neither.\n- **Not touched:** `CHANGELOG.md`, `TODOS.md`, `VERSION` and `package.json` are off-limits in this mode. I didn't read `personal-note.txt` because the candidate didn't select it. I also skipped the banned-terms check (`gstack-banned-terms`), because this run's allowed commands don't include it.\n- **Lifecycle:** start echoed `SESSION_KIND: spawned` (session `2438-1793462745-a59776a3`). End returned `SKILL_END: recorded outcome=success`, which marks the run as finished, not the blocked status. Nothing was staged or committed, and the template still needs regenerating.\n\n{\"schema_version\":1,\"audit_id\":\"fixture-risky\",\"status\":\"blocked\",\"files_updated\":[\"handbook/reference/commands/widget.md.tmpl\"],\"files_reviewed\":[\"AGENTS.md\",\"README.md\",\"SECURITY.md\",\"CHANGELOG.md\",\"TODOS.md\",\"VERSION\",\"package.json\",\"app.ts\",\"options.ts\",\"handbook/reference/commands/widget.md.tmpl\"],\"blockers\":[\"Security model contradiction (SECURITY.md, options.ts): new SECURITY.md states 'All command output is guaranteed to contain no sensitive data.' while new options.ts exports outputIncludesSensitiveData = true. Changing a security-model description is risky; left unedited for parent/user decision.\"],\"decisions\":[\"Edited the authored template handbook/reference/commands/widget.md.tmpl ('Default format: text.' -> 'json.') to match staged app.ts; preserved the user-maintained note. Parent owns any regeneration of generated pages from this template.\",\"README.md already states JSON default (pre-existing unstaged user edit); left as-is.\",\"personal-note.txt is untracked but not in candidate selected_paths; not read or audited.\",\"Metadata observation: package.json version 0.1.0 differs in format from VERSION/CHANGELOG 0.1.0.0; manifests and VERSION are protected, not changed.\",\"CHANGELOG.md has no entry for the default-format change from text to json; CHANGELOG mutation is outside ship-owned scope, reported to parent.\",\"TODOS.md not mutated (Steps 5, 7, 8, 9 and cross-model review skipped per ship-owned scope).\",\"gstack-banned-terms check not run: command is outside the fixture's closed command interface.\",\"SECURITY.md is not linked from README.md or AGENTS.md (discoverability gap); adding a link touches security docs and is deferred with the blocker.\",\"All selected file hashes matched candidate content_hashes before editing; HEAD equals base 54e1bad, so audited content is staged, unstaged and new files only.\"]}" + }, + { + "run": "41217563527", + "attempt": "rerun-1", + "recordedPassed": true, + "output": "The audit finished but is **blocked**: `SECURITY.md` promises one thing about sensitive data and `options.ts` says the opposite. I made one factual doc fix and left the security wording for you to decide.\n\n**Lifecycle:** the start command echoed `SESSION_KIND: spawned` (`SESSION_ID: 908-1793463092-ae1a2fec`, `TEL_START: 1793463092`). The end command returned `SKILL_END: recorded outcome=error duration_s=18`; I used `error` because of the blocker.\n\n**Scope:** the branch has no commits past `main` (both are `3c11ba6`). So the audit covered the staged change to `app.ts`, the unstaged change to `README.md`, and the new files `SECURITY.md` and `options.ts`. I also checked the docs and metadata in the candidate list: `AGENTS.md`, `CHANGELOG.md`, `TODOS.md`, `VERSION`, `package.json` and `handbook/reference/commands/widget.md.tmpl`. Their hashes matched the candidate. I did not open `personal-note.txt` because it wasn't in the candidate list.\n\n**Results:**\n- **Fixed:** `widget.md.tmpl` said the default format is `text`. `app.ts` now sets it to `json`, so I changed that line to `json`. The \"KEEP THIS EXACTLY\" note is untouched.\n- **Blocked:** `SECURITY.md` guarantees that command output never contains sensitive data. `options.ts` sets `outputIncludesSensitiveData = true`. This is a security-model change, so I left the wording alone.\n- **Not run:** the skill's banned-terms check isn't allowed under this session's command rules.\n\n**For you:**\n- **Security wording:** either the guarantee in `SECURITY.md` or the flag in `options.ts` needs to change.\n- **Regeneration:** no generated widget page exists yet. If your build makes one from the template, regenerate it.\n- **Version mismatch:** `package.json` says `0.1.0` while `VERSION` and the changelog say `0.1.0.0`. I didn't touch either.\n- **Undocumented settings:** `pretty` and `outputIncludesSensitiveData` in `options.ts` aren't mentioned in any doc.\n- **`SECURITY.md` not linked:** `README.md` doesn't link to it.\n\nNo git commands that change the repo were run, and I didn't touch `CHANGELOG.md`, `TODOS.md`, `VERSION` or `package.json`.\n\nDocumentation health:\n README.md Current (default-format JSON line matches app.ts)\n handbook/reference/commands/widget.md.tmpl Updated (default format text → json)\n SECURITY.md Blocked (contradicts options.ts)\n AGENTS.md Current\n CHANGELOG.md Current (not edited; 0.1.0.0 matches VERSION)\n TODOS.md Current (not edited)\n\n{\"schema_version\":1,\"audit_id\":\"fixture-risky\",\"status\":\"blocked\",\"files_updated\":[\"handbook/reference/commands/widget.md.tmpl\"],\"files_reviewed\":[\"README.md\",\"AGENTS.md\",\"CHANGELOG.md\",\"TODOS.md\",\"VERSION\",\"package.json\",\"app.ts\",\"options.ts\",\"SECURITY.md\",\"handbook/reference/commands/widget.md.tmpl\"],\"blockers\":[\"Security model contradiction (SECURITY.md vs options.ts): SECURITY.md states 'All command output is guaranteed to contain no sensitive data.' but new options.ts exports outputIncludesSensitiveData = true. Changing the security model description is a risky security/narrative edit; parent must decide whether to revise SECURITY.md or the code. SECURITY.md left unchanged.\"],\"decisions\":[\"Edited authored source handbook/reference/commands/widget.md.tmpl (not a generated page); no generated page exists in the repo, so parent should regenerate handbook output if its build renders this template.\",\"Preserved 'User-maintained note: KEEP THIS EXACTLY.' in widget.md.tmpl and the pre-existing unstaged README.md edit.\",\"Metadata observation: package.json version 0.1.0 differs from VERSION/CHANGELOG 0.1.0.0; left untouched (parent owns metadata).\",\"CHANGELOG.md, TODOS.md, VERSION, package.json not edited per ship-owned boundary; Steps 5, 7, 8, cross-model review and Step 9 skipped.\",\"Discoverability: SECURITY.md is not linked from README.md or AGENTS.md; not auto-added (security doc, new content) and reported as debt.\",\"personal-note.txt is untracked but not in the candidate selected_paths; excluded from audit and not read.\",\"gstack-banned-terms check not run: it is outside the closed fixture command interface.\",\"No Git mutation performed; base and HEAD are both 3c11ba6995842939ac994da7548bcdd8bf2bed5b, so scope is staged, unstaged and new-file content only.\"],\"documentation_section\":\"**Status:** blocked. One factual fix applied; the security model doc contradicts new code and needs a decision.\\n\\n**Scope:** base/HEAD 3c11ba6 (no commits ahead). Audited staged `app.ts` (default format `text` → `json`), unstaged `README.md`, new `SECURITY.md` and `options.ts`, plus `AGENTS.md`, `CHANGELOG.md`, `TODOS.md`, `VERSION`, `package.json` and the declared handbook root (`handbook/reference/commands/widget.md.tmpl`).\\n\\n**Documentation health:**\\n- `README.md`: Current (already says the default output is JSON)\\n- `handbook/reference/commands/widget.md.tmpl`: Updated (default format `text` → `json`; user note preserved; regenerate any rendered page)\\n- `SECURITY.md`: Blocked (guarantees no sensitive data in output, but `options.ts` sets `outputIncludesSensitiveData = true`)\\n- `AGENTS.md`: Current\\n- `CHANGELOG.md`: Current (not edited by this audit; 0.1.0.0 matches VERSION)\\n- `TODOS.md`: Current (not edited by this audit)\\n\\n**Documentation debt:**\\n- Critical gap: the `options.ts` settings `pretty` and `outputIncludesSensitiveData` have no reference, how-to, tutorial or explanation docs.\\n- Discoverability: `SECURITY.md` is not linked from `README.md` or `AGENTS.md`.\\n- Metadata: `package.json` version `0.1.0` differs from `VERSION` `0.1.0.0` (parent-owned).\\n\\n**Diagram drift:** none. No ASCII or Mermaid diagrams found.\"}" + }, + { + "run": "41238366045", + "attempt": "slices-13", + "recordedPassed": false, + "output": "I updated one doc. The audit is **blocked** because SECURITY.md contradicts the new code, and that's a security-model change I'm not allowed to make.\n\n**Lifecycle:** start echoed `SESSION_KIND: spawned` (`SESSION_ID: 2345-1793478604-fbb1a915`, `TEL_START: 1793478604`). The end command printed `SKILL_END: recorded outcome=success duration_s=18`. I recorded `success` because Steps 1–4 and 6 all ran, but the audit result itself is `blocked`.\n\n**Scope:** base and HEAD are the same commit, `3b56abb`. The release content is the staged `app.ts`, the unstaged `README.md`, and two new files, `SECURITY.md` and `options.ts`, all from the candidate's selected paths. I didn't read `personal-note.txt` because the candidate didn't select it.\n\n**What I changed:**\n- `handbook/reference/commands/widget.md.tmpl`: changed \"Default format: text.\" to \"Default format: json.\" to match `app.ts` (`format = \"json\"`). The user's \"KEEP THIS EXACTLY\" note is unchanged.\n\n**Blocker:**\n- `SECURITY.md` says \"All command output is guaranteed to contain no sensitive data\", but `options.ts` exports `outputIncludesSensitiveData = true`. I left `SECURITY.md` alone. You (or the parent) need to decide whether the doc or the code is right.\n\n**Not run:**\n- I didn't run the `gstack-banned-terms` check, because the command interface for this run doesn't allow it.\n- `VERSION` is `0.1.0.0` and `package.json` says `0.1.0`. I noted this but didn't touch either file.\n- `CHANGELOG.md` and `TODOS.md` were read but not changed.\n\n**Doc health:** README.md is current (it already says JSON). The widget template is updated. SECURITY.md is blocked. AGENTS.md is current. The template has to be regenerated, and that step belongs to the parent.\n\n**Gaps:** the new `options.ts` exports `pretty` and `outputIncludesSensitiveData` have no docs at all. There are no diagrams, so there's nothing to drift.\n\nNo durable learnings this session.\n\n{\"schema_version\":1,\"audit_id\":\"fixture-risky\",\"status\":\"blocked\",\"files_updated\":[\"handbook/reference/commands/widget.md.tmpl\"],\"files_reviewed\":[\"AGENTS.md\",\"README.md\",\"SECURITY.md\",\"CHANGELOG.md\",\"TODOS.md\",\"VERSION\",\"package.json\",\"app.ts\",\"options.ts\",\"handbook/reference/commands/widget.md.tmpl\"],\"blockers\":[\"Security model contradiction: SECURITY.md states all command output is guaranteed to contain no sensitive data, but new options.ts exports outputIncludesSensitiveData = true. Security model changes are never auto-updated; parent/user must decide whether to revise SECURITY.md or the code. SECURITY.md left unchanged; partial edit to handbook/reference/commands/widget.md.tmpl was applied.\"],\"decisions\":[\"Updated handbook/reference/commands/widget.md.tmpl default format from text to json, matching staged app.ts (format = \\\"json\\\"); preserved the user-maintained note. Generated output may need regeneration by the parent.\",\"README.md already states JSON default (pre-existing unstaged user edit); left unchanged.\",\"Skipped gstack-banned-terms check: command is outside the closed fixture command interface.\",\"Metadata observation: VERSION is 0.1.0.0 while package.json version is 0.1.0; not modified (parent owns metadata). CHANGELOG latest 0.1.0.0 matches VERSION.\",\"CHANGELOG.md and TODOS.md read only; no mutation per ship-owned scope.\",\"personal-note.txt not selected by the candidate; not read or audited.\",\"Skill lifecycle end recorded with outcome=success: the workflow ran through Step 6; the audit result itself is blocked.\"]}" + }, + { + "run": "41238366045", + "attempt": "rerun-1", + "recordedPassed": true, + "output": "The audit ended **blocked** on a security-doc contradiction. I made one factual edit and left everything else alone. The start helper echoed `SESSION_KIND: spawned` (session `880-1793479337-e91b5979`, `TEL_START: 1793479337`). The end helper returned `SKILL_END: recorded outcome=error duration_s=24`.\n\n**Documentation health:**\n- **`handbook/reference/commands/widget.md.tmpl` (updated):** changed \"Default format: text.\" to \"Default format: json.\" so it matches the staged `app.ts` change. The user note stayed exactly as it was.\n- **`README.md` (current):** your unstaged line already says the default is JSON.\n- **`AGENTS.md` (current).**\n- **`SECURITY.md` (blocked, not edited):** this new file says output never contains sensitive data, but the new `options.ts` sets `outputIncludesSensitiveData = true`.\n- **`CHANGELOG.md` (not changed by this audit):** the 0.1.0.0 entry doesn't mention the switch to JSON.\n- **`TODOS.md` (not changed by this audit).**\n\n**Coverage gaps:**\n- The JSON default now has reference coverage but no how-to or tutorial.\n- The new `pretty` and `outputIncludesSensitiveData` options aren't documented anywhere.\n- There are no architecture diagrams, so nothing to check for drift.\n\n`personal-note.txt` wasn't in the selected paths, so I didn't read it. I didn't run the banned-terms check because it isn't allowed in this fixture.\n\n{\"schema_version\":1,\"audit_id\":\"fixture-risky\",\"status\":\"blocked\",\"files_updated\":[\"handbook/reference/commands/widget.md.tmpl\"],\"files_reviewed\":[\"AGENTS.md\",\"README.md\",\"SECURITY.md\",\"CHANGELOG.md\",\"TODOS.md\",\"VERSION\",\"package.json\",\"app.ts\",\"options.ts\",\"handbook/reference/commands/widget.md.tmpl\"],\"blockers\":[\"SECURITY.md: security-model contradiction. The new SECURITY.md says all command output is guaranteed to contain no sensitive data, but new options.ts sets outputIncludesSensitiveData = true. Changing the security model needs a human decision (rewrite, remove the guarantee, or change the code), so SECURITY.md was left untouched. Paths: SECURITY.md, options.ts\"],\"decisions\":[\"handbook/reference/commands/widget.md.tmpl: made a factual edit, 'Default format: text.' to 'Default format: json.', matching staged app.ts (format = \\\"json\\\") and the unstaged README.md line; the user-maintained note is preserved exactly. This is a partial edit inside a blocked audit.\",\"handbook/reference/commands/widget.md.tmpl is an authored template; no generated page exists in the tree, and the parent owns any regeneration.\",\"README.md: the unstaged user line 'The default output format is JSON.' is accurate and was kept as is.\",\"SECURITY.md is not linked from README.md or AGENTS.md. No link was added because its content is under the security blocker.\",\"CHANGELOG.md: the 0.1.0.0 entry does not mention the default format change from text to JSON; this audit may not change CHANGELOG, so this is left to the parent.\",\"Metadata: VERSION 0.1.0.0 matches the CHANGELOG 0.1.0.0 heading; package.json version is 0.1.0 (3-part form). Observation only; nothing changed.\",\"TODOS.md: 'Confirm launch readiness.' has no clear completion evidence in the diff; left unchanged.\",\"personal-note.txt is not in candidate selected_paths, so it was excluded and not read.\",\"Step 1 banned-terms check (gstack-banned-terms) skipped: not permitted by the fixture command interface.\",\"Committed diff is empty (base_sha equals HEAD fd60290); the audit covered staged app.ts, unstaged README.md and new SECURITY.md and options.ts.\"],\"documentation_section\":\"**Status:** blocked. One factual doc fix was applied (the handbook template now says the default format is JSON); a security-model contradiction in SECURITY.md needs a human decision.\\n\\n**Scope:** branch `feature/docs` against base `main` at `fd60290`. The committed diff is empty; the audit covered staged `app.ts`, unstaged `README.md`, new `SECURITY.md` and `options.ts`, plus `AGENTS.md`, `CHANGELOG.md`, `TODOS.md` and the declared docs root `handbook/`. `personal-note.txt` was not selected and was not read.\\n\\n**Documentation health:**\\n```\\n README.md Current (unstaged line already states the default is JSON)\\n AGENTS.md Current\\n handbook/reference/commands/widget.md.tmpl Updated (Default format: text -> json; user note preserved)\\n SECURITY.md Blocked (guarantees no sensitive output; options.ts sets outputIncludesSensitiveData = true)\\n CHANGELOG.md Not changed (out of scope here; the 0.1.0.0 entry does not mention the JSON default)\\n TODOS.md Not changed (out of scope here)\\n```\\n\\n**Documentation debt:**\\n- Common gap: the JSON default output format has reference coverage only (README, handbook template), with no how-to or tutorial.\\n- Critical gap: `pretty` in `options.ts` has no documentation.\\n- Critical gap: `outputIncludesSensitiveData` in `options.ts` has no documentation and contradicts SECURITY.md.\\n- Discoverability: SECURITY.md is not linked from README.md or AGENTS.md.\\n\\n**Diagram drift:** none; no ASCII or Mermaid diagrams exist.\"}" + } + ] +} diff --git a/test/gstack-ship-receipt.test.ts b/test/gstack-ship-receipt.test.ts index 7e0eb68c8..155fee501 100644 --- a/test/gstack-ship-receipt.test.ts +++ b/test/gstack-ship-receipt.test.ts @@ -70,7 +70,7 @@ describe('gstack-ship-receipt write', () => { expect(rewritten.match(/```gstack-ship-receipt/g)).toHaveLength(1); expect(rewritten).toContain('"pr": 43'); expect(rewritten).toContain('## Summary'); - }); + }, 15_000); test('refuses an invalid receipt before writing (RECEIPT_INVALID) and a non-integer --pr', () => { const repo = fixture(); diff --git a/test/helpers/docsync-contract.ts b/test/helpers/docsync-contract.ts index 5aa102ba9..7365a2fa8 100644 --- a/test/helpers/docsync-contract.ts +++ b/test/helpers/docsync-contract.ts @@ -15,8 +15,9 @@ const keys = ['schema_version', 'audit_id', 'status', 'files_updated', 'files_re export function parseDocsCompletion(output: string, auditId: string): DocsCompletion { const result = JSON.parse(output.trimEnd().split('\n').at(-1)!); - if (!result || Array.isArray(result) || typeof result !== 'object' || - Object.keys(result).sort().join() !== [...keys].sort().join()) throw new Error('completion fields'); + if (!result || Array.isArray(result) || typeof result !== 'object') throw new Error('completion fields'); + const missing = keys.filter(key => !Object.hasOwn(result, key)), extra = Object.keys(result).filter(key => !keys.includes(key)); + if (missing.length || extra.length) throw new Error(`completion fields: missing ${missing.join(',') || 'none'}; extra ${extra.join(',') || 'none'}`); if (result.schema_version !== 1 || result.audit_id !== auditId) throw new Error('completion identity'); if (!['updated', 'current', 'blocked'].includes(result.status)) throw new Error('completion status'); for (const field of ['files_updated', 'files_reviewed', 'blockers', 'decisions']) { diff --git a/test/ship-document-release-dispatch.test.ts b/test/ship-document-release-dispatch.test.ts index 70edc8a32..ffb9bb4f4 100644 --- a/test/ship-document-release-dispatch.test.ts +++ b/test/ship-document-release-dispatch.test.ts @@ -11,6 +11,7 @@ import { observeDocsWrites, docsWriteFailures, docsCommandAllowed, docsPreambleC import { docsActorCommand, docsActorHook, installDocsActor, type DocsActorState, type DocsFault } from './helpers/docsync-fault-actor'; import { docsActorVerdict } from './helpers/docsync-fault-eval'; import { expectMentions, expectTokens } from './helpers/prompt-structure'; +import missingSection from './fixtures/docsync-spawned-missing-section-public.json'; const ROOT = path.join(import.meta.dir, '..'); const read = (p: string) => fs.readFileSync(path.join(ROOT, p), 'utf8'); @@ -657,3 +658,23 @@ describe('two-attempt documentation audits', () => { expect(docsDispatchIndex(calls.filter((_, index) => !dispatches.includes(index)))).toBe(-1); }); }); + +// Gates 41217563527 and 41238366045 (docsync-spawned): the child returned every field +// except documentation_section, and the red read only "completion fields". +describe('completion field failures name the fields', () => { + test('the captured spawned completions name the omitted documentation_section; the reruns parse', () => { + for (const { run, attempt, recordedPassed, output } of missingSection.outputs) { + const auditId = JSON.parse(output.trimEnd().split('\n').at(-1)!).audit_id; + if (recordedPassed) expect(parseDocsCompletion(output, auditId).status, run + attempt).toBe('blocked'); + else expect(() => parseDocsCompletion(output, auditId), run + attempt).toThrow('completion fields: missing documentation_section; extra none'); + } + }); + + test('an extra or legacy field is named too', () => { + const accepted = missingSection.outputs.find(row => row.recordedPassed)!.output; + const report = JSON.parse(accepted.trimEnd().split('\n').at(-1)!); + expect(() => parseDocsCompletion(JSON.stringify({ ...report, commit_sha: null }), report.audit_id)).toThrow('completion fields: missing none; extra commit_sha'); + const { files_reviewed: _, ...rest } = report; + expect(() => parseDocsCompletion(JSON.stringify({ ...rest, pushed: false }), report.audit_id)).toThrow('completion fields: missing files_reviewed; extra pushed'); + }); +}); diff --git a/test/skill-e2e-autoplan-guard-pty.test.ts b/test/skill-e2e-autoplan-guard-pty.test.ts index 29af2ba66..072016b8f 100644 --- a/test/skill-e2e-autoplan-guard-pty.test.ts +++ b/test/skill-e2e-autoplan-guard-pty.test.ts @@ -1,5 +1,5 @@ /** - * /autoplan publication guard, live (gate tier, rule kind, one trial, haiku). + * /autoplan publication guard, live (gate tier, rule kind, one trial, Sonnet 5.5). * * On the pinned Claude Code, in an interactive PTY session with default * settings, a project skill carrying /autoplan's own hook block enters Phase 1, @@ -22,7 +22,7 @@ import { describeIfSelected, testIfSelected } from './helpers/e2e-helpers'; import { launchClaudePty, selectPtyNumberedOption } from './helpers/claude-pty-runner'; import { closePacketReadAfterNotice, prepareGuardSession, stoppedAtPhaseBoundary } from './helpers/autoplan-guard-pty'; -const MODEL = 'claude-haiku-4-5-20251001'; +const MODEL = 'claude-sonnet-5-5'; describeIfSelected('autoplan publication guard live PTY', ['autoplan-guard-pty'], () => { testIfSelected('autoplan-guard-pty', async () => {