From f4536ed4d5dbec3778116829fef168da3e54299b Mon Sep 17 00:00:00 2001 From: Garry Tan Date: Sun, 25 Oct 2026 16:39:42 -0700 Subject: [PATCH 1/9] v1.91.222.0 test: daily flaky-fix pass: qa-only late clock, fragment-match verdict, install-admission timeout, ff-update reap, judge parse diagnostics (GSTA-91) (#3413) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test: flaky-fix pass — fragment-match reads the agent's report, ff-update reap counts its own sleepers, install-admission gets a measured timeout, judge parse errors name the judge (GSTA-91) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(qa-only): late scenarios freeze the fixture clock during setup and register their real outer budget (GSTA-91) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(harness): record the llm-judge parse-message change as non-behavioral (GSTA-91) 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> --- CHANGELOG.md | 22 ++++ VERSION | 2 +- agents-digest/gstack-AGENTS.md | 2 +- package.json | 2 +- scripts/harness-version.json | 2 +- test/context-restore-fragment-verdict.test.ts | 121 ++++++++++++++++++ ...ntext-restore-fragment-match-captures.json | 51 ++++++++ test/gstack-ff-update.test.ts | 10 +- test/gstack-skill-start.test.ts | 2 +- test/helpers/context-restore-fragment.ts | 34 +++++ test/helpers/free-fixtures-data.ts | 1 + test/helpers/llm-judge.ts | 11 +- test/helpers/touchfiles-data.ts | 18 +-- test/llm-judge-frontier.test.ts | 16 +++ test/qa-only-fixture.test.ts | 17 ++- test/skill-e2e-context-skills.test.ts | 14 +- test/test-of-test-ratchet.test.ts | 1 + 17 files changed, 294 insertions(+), 32 deletions(-) create mode 100644 test/context-restore-fragment-verdict.test.ts create mode 100644 test/fixtures/context-restore-fragment-match-captures.json create mode 100644 test/helpers/context-restore-fragment.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index ba97bc0e7..38c5d4c45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## [1.91.222.0] - 2026-10-25 + +**Five flaky tests now fail only for real defects, and a judge reply that isn't valid JSON says so in its failure line (daily flaky-fix pass, GSTA-91).** `context-restore-fragment-match` failed 0/3 on main cb99df4, although every run restored the right checkpoint: to find the checkpoint whose title matches, the agent often prints all three, and the case failed whenever another checkpoint's body appeared anywhere in the transcript. `test/gstack-ff-update.test.ts` counted every `sleep 300` on the machine, so heartbeats from parallel test files changed its count (remote pregate at #3412's head: expected "1", received "3"). The `GSTACK_CAPY=1` install-admission case in `test/gstack-skill-start.test.ts` makes ten `gstack-skill-start` spawns under bun's 5 s default timeout and took 3.6–5.7 s on a 4-core machine. The QA-only fixture's late scenarios mocked a 1000 ms capture budget but ran each attempt's real setup inside it. The setup-browser-cookies workflow judge in train-4 gate 40173759210 returned JSON with an unescaped quote in its reasoning, and the flake record read only "JSON Parse error: Expected '}'". + +### Fixed +- **`test/helpers/context-restore-fragment.ts`** (new): `fragmentRestoreVerdict` reads only the agent's report (top-level assistant text and the final result), never tool output. The report must carry the payments checkpoint's body and no other checkpoint's body. `test/skill-e2e-context-skills.test.ts` uses it for the fragment-match case. +- **`test/helpers/llm-judge.ts`**: when a judge response is not valid JSON, `callJudge` throws a `SyntaxError` that names the judge output, its stop reason and length, and the retained `llm-judge-response-parse-error` event. It still fails closed and parses no score; the request is unchanged. + +### Tests +- `test/context-restore-fragment-verdict.test.ts` replays the three captured false reds from main (`test/fixtures/context-restore-fragment-match-captures.json`) as passes. Controls that must fail: captures rewritten to resume alpha or omega, synthetic runs that read and resume only alpha or omega, resume summaries that mix two checkpoints, and a payments body that appears only in tool output. Restoring the old any-byte surface fails all four positive controls. Focused paid runs of the case: 0/3 on main, 3/3 after (about $0.11 a trial). +- `test/llm-judge-frontier.test.ts` replays the exact captured cookie-judge reply: it fails closed with no score, one request and the new diagnosis. It fails on the previous helper. +- `test/gstack-ff-update.test.ts`: the reap case runs `gstack-ff-update` with a heartbeat interval unique to the test process and counts only sleepers of that interval, starting from zero. The old count failed with a loop starting unrelated `sleep 300` processes beside it (expected "5", received "14"); the new one passes, and still fails when the bin stops reaping its sleeper. +- `test/qa-only-fixture.test.ts`: in the late scenarios the fixture clock stands still from the start of each attempt until its runner starts, so the real setup work (directory copies and five `git` calls) costs no fixture time. The runner and cleanup stay on the real clock, as the deadline-evidence check requires. Each late capture must now get exactly the 1000 ms budget. A new `late-slow-retry` scenario stalls each attempt's setup for 1100 ms, longer than the whole budget, and its attempt 2 still has to succeed. Before, a loaded machine either used up the work budget in setup (`QA-only work budget exhausted`) or Bun's 1580 ms deadline killed a setup `git` child (exit `null` at `skill-e2e-qa-workflow.test.ts:133`); this is what failed late-retry in the 2026-10-24 and 2026-10-25 remote pregates. Under 24 busy loops on 4 cores: late-retry 1/20 → 20/20, late-failure-retry 2/20 → 20/20, late-timeout 6/20 → 20/20, late-slow-retry 20/20. Reverting the clock fails all four late scenarios unloaded; reverting the deadline fails `late-slow-retry`. +- `test/gstack-skill-start.test.ts`: the `GSTACK_CAPY=1` install-admission case gets an explicit 20 s timeout. Measured on a 4-core Capy machine with a temporary 60 s cap: 3.6–5.7 s through Capy's git shim (9 of 10 over 5 s), 2.6–4.9 s with the real git binary. Four of its ten spawns are full admissions at about 800 ms each. + +### Gate integrity +- One test budget changed, approved by GStack Minder on 2026-10-25: the install-admission case's timeout goes from bun's 5 s default to 20 s, about 3.5 times the 5.7 s worst case measured above. No assertion changed. +- The QA-only late scenarios register each attempt with its real outer budget (1000 + 80 + 5000 = 6080 ms, the value `outerMs` already asserts) instead of a shortened 1580 ms Bun deadline, which left cleanup 500 ms of real time under load. Measured child totals with the fix under 24 busy loops, 20 runs each: late-timeout 2.4–2.7 s, late-retry 4.1–4.3 s, late-failure-retry 4.7–5.0 s, late-slow-retry 6.2–6.6 s, against the parent's unchanged 15 s spawn timeout. The mocked 1000 ms capture budget, the 80 ms drain and every existing assertion are unchanged. Verdict: justified, because the deadline was a fixture artifact shorter than the budget the case declares, and the clock freeze, not the deadline, is what removes the load sensitivity. +- `context-restore-fragment-match`: the failure surface moves from the whole transcript to the agent's report. Alpha or omega bytes in tool output no longer fail the case; the payments body in tool output no longer counts as loaded, so the report must show it. A run that resumes another checkpoint, or mixes two, still fails. `test/test-of-test-ratchet.test.ts` gains one BASELINE entry, the replay test, with its reason, and the new helper joins the touchfiles of the nine context-skills cases, as the derived-closure rule requires. +- `scripts/harness-version.json` records `test/helpers/llm-judge.ts` as non-behavioral at HARNESS_VERSION 6: only a parse failure's message changes, before any score is parsed, so no case's verdict or pass-rate series changes. +- No threshold, trial count, case kind, rubric, judge request or prompt changed. + ## [1.91.221.0] - 2026-10-25 **The session-start updater no longer skips because of its own session's workflow lease, and the autostash tests stop failing their first pass in Free Tests.** Since #3385, `gstack-session-update` skips the fast-forward while another session holds a workflow lease, and it means to ignore the session that started it (`--exclude-ancestry-of`). The check runs in the forked background updater, though, and passed the hook's own `$$`, which has exited by then, so the ancestry walk excluded nothing. A Claude Code process that had already run a skill (and so held a lease) and then started a session again in the same process (`/clear`, resume or compaction) logged `SKIP leased pid=` and never updated. `test/session-update-autostash.test.ts` hit the same gap plus a fixture leak: its first two fixtures spawned the updater with the whole parent environment, so it read the test preload's `GSTACK_LEASE_DIR`, which every test file in the same Bun process shares. A lease another file left there gave "Received: SKIP leased pid=3196/1m" where UPDATING or PULL_FAILED was expected, in 13 Free Tests runs since #3385 merged (each passed on the serial retry). diff --git a/VERSION b/VERSION index 13b9186ef..f9722c1cb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.91.221.0 +1.91.222.0 diff --git a/agents-digest/gstack-AGENTS.md b/agents-digest/gstack-AGENTS.md index a582bf0f8..b0dec46e0 100644 --- a/agents-digest/gstack-AGENTS.md +++ b/agents-digest/gstack-AGENTS.md @@ -1,4 +1,4 @@ -# gstack digest v1.91.221.0 — regenerate/re-copy after upgrading gstack +# gstack digest v1.91.222.0 — regenerate/re-copy after upgrading gstack Behavioral rules from gstack (https://github.com/garrytan/gstack), compressed for agent hosts without a full skill install. The full skills add workflows, diff --git a/package.json b/package.json index 0b396bbf1..7f40e8da9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gstack", - "version": "1.91.221", + "version": "1.91.222", "description": "Garry's Stack — Claude Code skills + fast headless browser. One repo, one install, entire AI engineering workflow.", "license": "MIT", "type": "module", diff --git a/scripts/harness-version.json b/scripts/harness-version.json index bcf395dd3..0cb61ce66 100644 --- a/scripts/harness-version.json +++ b/scripts/harness-version.json @@ -29,7 +29,7 @@ "test/helpers/eval-budgets.ts": {"blob":"667d0e09b20fe5d7366f57b77b5fb9b04baa37ef","since":6}, "test/helpers/eval-store.ts": {"blob":"a50ea2c28f508ad9f35ea9353dd2f502ee0dcfc2","since":6,"nonBehavioral":"credential rejections are classed infra instead of assertion: no case's pass or fail changes; only failed trials whose provider rejected the run's key move class, so no rerun spends on a rejected key"}, "test/helpers/hermetic-env.ts": {"blob":"cc072895461dc52ea317d1beff72121342420d30","since":6}, - "test/helpers/llm-judge.ts": {"blob":"d0bc6bbbe9f478603d11a1ece95e66c812ad34e6","since":6}, + "test/helpers/llm-judge.ts": {"blob":"a3177665b662932ce485ccc976c2b36a1531a0bb","since":6,"nonBehavioral":"callJudge rewrites only the message of a JSON parse failure (names the judge output, stop reason, length and the retained llm-judge-response-parse-error event); it still throws a SyntaxError before any score is parsed, the request is unchanged, and no case's pass or fail changes"}, "test/helpers/paid-test-set.ts": {"blob":"ff9bfe43c43ec2bdd11114f7b8ec7c5736116f75","since":6}, "test/helpers/pty-screen.ts": {"blob":"4f77569f9ce11f9cee9f347216e468cd7c956820","since":6}, "test/helpers/pty/auq.ts": {"blob":"16e5ea2bb5b9f28f44808a1a09024dbd3e6f28c4","since":6}, diff --git a/test/context-restore-fragment-verdict.test.ts b/test/context-restore-fragment-verdict.test.ts new file mode 100644 index 000000000..6fed164e0 --- /dev/null +++ b/test/context-restore-fragment-verdict.test.ts @@ -0,0 +1,121 @@ +import { describe, test, expect } from 'bun:test'; +import * as fs from 'fs'; +import * as path from 'path'; +import { parseNDJSON } from './helpers/session-runner'; +import { fragmentRestoreVerdict } from './helpers/context-restore-fragment'; + +const MARKERS = { restored: 'FRAGMATCH_PAYMENTS_BUILD', others: ['FRAGMATCH_ALPHA_BUILD', 'FRAGMATCH_OMEGA_BUILD'] }; +const BODIES: Record = { + '20260101-120000-alpha-feature.md': 'branch: feat/alpha\n## Working on: alpha feature\n### Summary\nAlpha content FRAGMATCH_ALPHA_BUILD\n', + '20260202-120000-middle-payments.md': 'branch: feat/payments\n## Working on: middle payments\n### Summary\nPayments content FRAGMATCH_PAYMENTS_BUILD\n', + '20260303-120000-omega-release.md': 'branch: feat/omega\n## Working on: omega release\n### Summary\nOmega content FRAGMATCH_OMEGA_BUILD\n', +}; +const ALL_FILES = Object.keys(BODIES); + +const captures: { sessions: Array<{ session_id: string; ndjson: string[] }> } = JSON.parse( + fs.readFileSync(path.join(import.meta.dir, 'fixtures', 'context-restore-fragment-match-captures.json'), 'utf8'), +); + +function replay(lines: string[]) { + const parsed = parseNDJSON(lines); + return { ...parsed, output: parsed.resultLine?.result || '' }; +} + +function toolOutput(run: ReturnType): string { + return run.toolCalls.map((call) => call.output).join('\n'); +} + +function isReportLine(line: string): boolean { + const event = JSON.parse(line); + return event.type === 'result' + || (event.type === 'assistant' && event.message.content.some((block: any) => block.type === 'text')); +} + +function rewriteReport(lines: string[], rewrite: (line: string) => string): string[] { + return lines.map((line) => (isReportLine(line) ? rewrite(line) : line)); +} + +function synthetic(files: string[], report: string): string[] { + const lines: string[] = [ + JSON.stringify({ type: 'assistant', parent_tool_use_id: null, message: { content: [{ type: 'tool_use', id: 'skill', name: 'Skill', input: { skill: 'context-restore', args: 'payments' } }] } }), + JSON.stringify({ type: 'user', parent_tool_use_id: null, message: { content: [{ type: 'tool_result', tool_use_id: 'skill', content: 'Launching skill: context-restore' }] } }), + ]; + files.forEach((file, i) => { + lines.push(JSON.stringify({ type: 'assistant', parent_tool_use_id: null, message: { content: [{ type: 'tool_use', id: `read-${i}`, name: 'Read', input: { file_path: `.gstack-home/projects/p/checkpoints/${file}` } }] } })); + lines.push(JSON.stringify({ type: 'user', parent_tool_use_id: null, message: { content: [{ type: 'tool_result', tool_use_id: `read-${i}`, content: BODIES[file] }] } })); + }); + if (report) { + lines.push(JSON.stringify({ type: 'assistant', parent_tool_use_id: null, message: { content: [{ type: 'text', text: report }] } })); + } + lines.push(JSON.stringify({ type: 'result', subtype: report ? 'success' : 'error_max_turns', result: report })); + return lines; +} + +function resumeReport(file: string, ...summaries: string[]): string { + return `I loaded \`${file}\`.\n\nRESUMING CONTEXT\n### Summary\n${summaries.join('\n')}\n`; +} + +describe('context-restore-fragment-match verdict', () => { + test('captured runs hold three sessions that each printed another checkpoint body', () => { + expect(captures.sessions).toHaveLength(3); + for (const session of captures.sessions) { + const run = replay(session.ndjson); + expect(run.toolCalls.map((call) => call.tool)).toContain('Skill'); + expect(toolOutput(run)).toContain('FRAGMATCH_PAYMENTS_BUILD'); + expect(MARKERS.others.some((marker) => toolOutput(run).includes(marker))).toBe(true); + } + }); + + test.each(captures.sessions.map((s) => [s.session_id, s.ndjson] as const))( + 'captured run %s: inspected every checkpoint, restored payments -> pass', + (_id, ndjson) => { + expect(fragmentRestoreVerdict(replay(ndjson), MARKERS)).toEqual({ loadedTarget: true, didNotLoadOthers: true }); + }, + ); + + test('synthetic: prints every checkpoint, reports payments -> pass', () => { + const run = replay(synthetic(ALL_FILES, resumeReport(ALL_FILES[1], 'Payments content FRAGMATCH_PAYMENTS_BUILD'))); + expect(fragmentRestoreVerdict(run, MARKERS)).toEqual({ loadedTarget: true, didNotLoadOthers: true }); + }); + + test.each([ + ['alpha', 'FRAGMATCH_ALPHA_BUILD'], + ['omega', 'FRAGMATCH_OMEGA_BUILD'], + ])('captured run rewritten to resume %s -> fail', (_name, marker) => { + for (const session of captures.sessions) { + const run = replay(rewriteReport(session.ndjson, (line) => line.replaceAll('FRAGMATCH_PAYMENTS_BUILD', marker))); + expect(toolOutput(run)).toContain('FRAGMATCH_PAYMENTS_BUILD'); + expect(fragmentRestoreVerdict(run, MARKERS)).toEqual({ loadedTarget: false, didNotLoadOthers: false }); + } + }); + + test.each([ + ['alpha', ALL_FILES[0], 'Alpha content FRAGMATCH_ALPHA_BUILD'], + ['omega', ALL_FILES[2], 'Omega content FRAGMATCH_OMEGA_BUILD'], + ])('synthetic: reads only %s and resumes it -> fail', (_name, file, summary) => { + const run = replay(synthetic([file], resumeReport(file, summary))); + expect(fragmentRestoreVerdict(run, MARKERS)).toEqual({ loadedTarget: false, didNotLoadOthers: false }); + }); + + test('captured run with omega content mixed into the resume summary -> fail', () => { + for (const session of captures.sessions) { + const mixed = rewriteReport(session.ndjson, (line) => line.replaceAll( + 'Payments content FRAGMATCH_PAYMENTS_BUILD', 'Payments content FRAGMATCH_PAYMENTS_BUILD\\nOmega content FRAGMATCH_OMEGA_BUILD')); + expect(fragmentRestoreVerdict(replay(mixed), MARKERS)).toEqual({ loadedTarget: true, didNotLoadOthers: false }); + } + }); + + test('synthetic: resume summary mixes alpha and payments -> fail', () => { + const run = replay(synthetic(ALL_FILES, resumeReport(ALL_FILES[1], + 'Payments content FRAGMATCH_PAYMENTS_BUILD', 'Alpha content FRAGMATCH_ALPHA_BUILD'))); + expect(fragmentRestoreVerdict(run, MARKERS)).toEqual({ loadedTarget: true, didNotLoadOthers: false }); + }); + + test('payments body only in tool output, no report of it -> fail', () => { + const noReport = replay(synthetic([ALL_FILES[1]], '')); + expect(toolOutput(noReport)).toContain('FRAGMATCH_PAYMENTS_BUILD'); + expect(fragmentRestoreVerdict(noReport, MARKERS).loadedTarget).toBe(false); + const nameOnly = replay(synthetic(ALL_FILES, `I loaded \`${ALL_FILES[1]}\`.`)); + expect(fragmentRestoreVerdict(nameOnly, MARKERS).loadedTarget).toBe(false); + }); +}); diff --git a/test/fixtures/context-restore-fragment-match-captures.json b/test/fixtures/context-restore-fragment-match-captures.json new file mode 100644 index 000000000..36e729068 --- /dev/null +++ b/test/fixtures/context-restore-fragment-match-captures.json @@ -0,0 +1,51 @@ +{ + "provenance": { + "case": "context-restore-fragment-match", + "run": "local paid baseline: scripts/test-paid-shards.ts --tier periodic --case context-restore-fragment-match --trials 3 (0/3, all on didNotLoadOthers)", + "head": "cb99df4a2fc45bc983e0a64f862f79fab0ce899a", + "claude_code": "2.1.292", + "source_sha256": "2d05a7257f7d559d60ec2e644178a3d65cd0799121260633c931d5b54755b495", + "projection": "Raw NDJSON lines of each session's assistant, user and result events, unchanged; system events, thinking-only assistant events and the synthetic user message carrying the extracted SKILL.md body dropped." + }, + "sessions": [ + { + "session_id": "d1147327-49e3-4371-ab54-784d135573ac", + "ndjson": [ + "{\"type\":\"assistant\",\"message\":{\"model\":\"claude-opus-5-5\",\"id\":\"msg_011CgP2Sp1UcGZ3JFpbUbxQg\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"tool_use\",\"id\":\"toolu_01HHxMjn7G6dQ36WFwvafm5W\",\"name\":\"Skill\",\"input\":{\"skill\":\"context-restore\",\"args\":\"payments\"},\"caller\":{\"type\":\"direct\"}}],\"container\":null,\"stop_reason\":null,\"stop_sequence\":null,\"stop_details\":null,\"usage\":{\"input_tokens\":2,\"cache_creation_input_tokens\":6256,\"cache_read_input_tokens\":12042,\"cache_creation\":{\"ephemeral_5m_input_tokens\":6256,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":16,\"service_tier\":\"standard\",\"inference_geo\":\"global\",\"speed\":\"standard\"},\"input_transformations\":[],\"diagnostics\":null,\"context_management\":null},\"parent_tool_use_id\":null,\"session_id\":\"d1147327-49e3-4371-ab54-784d135573ac\",\"uuid\":\"691912ce-6742-4e21-8f4c-a3cfa15b4112\",\"timestamp\":\"2026-10-25T13:21:55.808Z\",\"request_id\":\"req_011CgP2Som6KWQBvN4W6W3B8\",\"wire_tool_inputs\":{\"toolu_01HHxMjn7G6dQ36WFwvafm5W\":{\"skill\":\"context-restore\",\"args\":\"payments\"}}}", + "{\"type\":\"user\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"tool_result\",\"tool_use_id\":\"toolu_01HHxMjn7G6dQ36WFwvafm5W\",\"content\":\"Launching skill: context-restore\"}]},\"parent_tool_use_id\":null,\"session_id\":\"d1147327-49e3-4371-ab54-784d135573ac\",\"uuid\":\"9e05cd18-bf0c-4d75-93d8-db0f817d8c87\",\"timestamp\":\"2026-10-25T13:21:55.840Z\",\"tool_use_result\":{\"success\":true,\"commandName\":\"context-restore\",\"allowedTools\":[\"Bash\",\"Read\",\"Glob\",\"Grep\",\"AskUserQuestion\"]}}", + "{\"type\":\"assistant\",\"message\":{\"model\":\"claude-opus-5-5\",\"id\":\"msg_011CgP2SwJ2idXv6jZBjmMRS\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"tool_use\",\"id\":\"toolu_01EyWkH3v7Gu7cBDAgVzCiSu\",\"name\":\"Bash\",\"input\":{\"command\":\"cd /tmp/gstack-paid-shard-O15pOD/tmp/skill-e2e-ctx-fragment-svqfPa; ls bin; export GSTACK_HOME=\\\"$PWD/.gstack-home\\\"; B=./bin\\nGSTACK_STATE_ROOT=$($B/gstack-paths --get GSTACK_STATE_ROOT); echo ROOT=$GSTACK_STATE_ROOT\\nSLUG=$($B/gstack-slug --get SLUG 2>/dev/null); echo SLUG=$SLUG\\nCHECKPOINT_DIR=\\\"$GSTACK_STATE_ROOT/projects/$SLUG/checkpoints\\\"; ls -la \\\"$CHECKPOINT_DIR\\\"; find .gstack-home -type f\"},\"caller\":{\"type\":\"direct\"}}],\"container\":null,\"stop_reason\":null,\"stop_sequence\":null,\"stop_details\":null,\"usage\":{\"input_tokens\":2,\"cache_creation_input_tokens\":6339,\"cache_read_input_tokens\":18298,\"cache_creation\":{\"ephemeral_5m_input_tokens\":6339,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":8,\"service_tier\":\"standard\",\"inference_geo\":\"global\",\"speed\":\"standard\"},\"input_transformations\":[],\"diagnostics\":null,\"context_management\":null},\"parent_tool_use_id\":null,\"session_id\":\"d1147327-49e3-4371-ab54-784d135573ac\",\"uuid\":\"c6cad35f-a6b6-4eb2-8741-39112ddc1cae\",\"timestamp\":\"2026-10-25T13:21:58.959Z\",\"request_id\":\"req_011CgP2Sw39kvpLEXQaPZoUk\",\"wire_tool_inputs\":{\"toolu_01EyWkH3v7Gu7cBDAgVzCiSu\":{\"command\":\"cd /tmp/gstack-paid-shard-O15pOD/tmp/skill-e2e-ctx-fragment-svqfPa; ls bin; export GSTACK_HOME=\\\"$PWD/.gstack-home\\\"; B=./bin\\nGSTACK_STATE_ROOT=$($B/gstack-paths --get GSTACK_STATE_ROOT); echo ROOT=$GSTACK_STATE_ROOT\\nSLUG=$($B/gstack-slug --get SLUG 2>/dev/null); echo SLUG=$SLUG\\nCHECKPOINT_DIR=\\\"$GSTACK_STATE_ROOT/projects/$SLUG/checkpoints\\\"; ls -la \\\"$CHECKPOINT_DIR\\\"; find .gstack-home -type f\"}}}", + "{\"type\":\"user\",\"message\":{\"role\":\"user\",\"content\":[{\"tool_use_id\":\"toolu_01EyWkH3v7Gu7cBDAgVzCiSu\",\"type\":\"tool_result\",\"content\":\"gstack-config\\ngstack-learnings-log\\ngstack-learnings-search\\ngstack-paths\\ngstack-remote-identity.sh\\ngstack-repo-mode\\ngstack-slug\\ngstack-state-root.sh\\ngstack-timeline-log\\ngstack-timeline-read\\ngstack-update-check\\nROOT=/tmp/gstack-paid-shard-O15pOD/tmp/skill-e2e-ctx-fragment-svqfPa/.gstack-home\\nSLUG=skill-e2e-ctx-fragment-svqfPa\\ntotal 16\\ndrwxr-xr-x 2 user user 4096 Oct 25 13:21 .\\ndrwxr-xr-x 3 user user 60 Oct 25 13:21 ..\\n-rw-r--r-- 1 user user 157 Oct 25 13:21 20260101-120000-alpha-feature.md\\n-rw-r--r-- 1 user user 168 Oct 25 13:21 20260202-120000-middle-payments.md\\n-rw-r--r-- 1 user user 157 Oct 25 13:21 20260303-120000-omega-release.md\\n.gstack-home/projects/skill-e2e-ctx-fragment-svqfPa/checkpoints/20260101-120000-alpha-feature.md\\n.gstack-home/projects/skill-e2e-ctx-fragment-svqfPa/checkpoints/20260202-120000-middle-payments.md\\n.gstack-home/projects/skill-e2e-ctx-fragment-svqfPa/checkpoints/20260303-120000-omega-release.md\\n.gstack-home/slug-cache/_tmp_gstack-paid-shard-O15pOD_tmp_skill-e2e-ctx-fragment-svqfPa_.git\\n.gstack-home/slug-cache/_tmp_gstack-paid-shard-O15pOD_tmp_skill-e2e-ctx-fragment-svqfPa\",\"is_error\":false}]},\"parent_tool_use_id\":null,\"session_id\":\"d1147327-49e3-4371-ab54-784d135573ac\",\"uuid\":\"1beb6923-1013-4359-a964-2b06e7594c17\",\"timestamp\":\"2026-10-25T13:21:59.621Z\",\"tool_use_result\":{\"stdout\":\"gstack-config\\ngstack-learnings-log\\ngstack-learnings-search\\ngstack-paths\\ngstack-remote-identity.sh\\ngstack-repo-mode\\ngstack-slug\\ngstack-state-root.sh\\ngstack-timeline-log\\ngstack-timeline-read\\ngstack-update-check\\nROOT=/tmp/gstack-paid-shard-O15pOD/tmp/skill-e2e-ctx-fragment-svqfPa/.gstack-home\\nSLUG=skill-e2e-ctx-fragment-svqfPa\\ntotal 16\\ndrwxr-xr-x 2 user user 4096 Oct 25 13:21 .\\ndrwxr-xr-x 3 user user 60 Oct 25 13:21 ..\\n-rw-r--r-- 1 user user 157 Oct 25 13:21 20260101-120000-alpha-feature.md\\n-rw-r--r-- 1 user user 168 Oct 25 13:21 20260202-120000-middle-payments.md\\n-rw-r--r-- 1 user user 157 Oct 25 13:21 20260303-120000-omega-release.md\\n.gstack-home/projects/skill-e2e-ctx-fragment-svqfPa/checkpoints/20260101-120000-alpha-feature.md\\n.gstack-home/projects/skill-e2e-ctx-fragment-svqfPa/checkpoints/20260202-120000-middle-payments.md\\n.gstack-home/projects/skill-e2e-ctx-fragment-svqfPa/checkpoints/20260303-120000-omega-release.md\\n.gstack-home/slug-cache/_tmp_gstack-paid-shard-O15pOD_tmp_skill-e2e-ctx-fragment-svqfPa_.git\\n.gstack-home/slug-cache/_tmp_gstack-paid-shard-O15pOD_tmp_skill-e2e-ctx-fragment-svqfPa\",\"stderr\":\"\",\"interrupted\":false,\"isImage\":false,\"noOutputExpected\":false,\"bashEditDiff\":{\"files\":[{\"filePath\":\"/tmp/gstack-paid-shard-O15pOD/tmp/skill-e2e-ctx-fragment-svqfPa/.gstack-home/slug-cache/_tmp_gstack-paid-shard-O15pOD_tmp_skill-e2e-ctx-fragment-svqfPa\",\"hunks\":[{\"oldStart\":0,\"oldLines\":0,\"newStart\":1,\"newLines\":1,\"lines\":[\"+v2:skill-e2e-ctx-fragment-svqfPa\"]}],\"created\":true},{\"filePath\":\"/tmp/gstack-paid-shard-O15pOD/tmp/skill-e2e-ctx-fragment-svqfPa/.gstack-home/slug-cache/_tmp_gstack-paid-shard-O15pOD_tmp_skill-e2e-ctx-fragment-svqfPa_.git\",\"hunks\":[{\"oldStart\":0,\"oldLines\":0,\"newStart\":1,\"newLines\":1,\"lines\":[\"+v2:skill-e2e-ctx-fragment-svqfPa\"]}],\"created\":true}],\"moreFiles\":0,\"changedFiles\":[\"/tmp/gstack-paid-shard-O15pOD/tmp/skill-e2e-ctx-fragment-svqfPa/.gstack-home/slug-cache/_tmp_gstack-paid-shard-O15pOD_tmp_skill-e2e-ctx-fragment-svqfPa\",\"/tmp/gstack-paid-shard-O15pOD/tmp/skill-e2e-ctx-fragment-svqfPa/.gstack-home/slug-cache/_tmp_gstack-paid-shard-O15pOD_tmp_skill-e2e-ctx-fragment-svqfPa_.git\"]}}}", + "{\"type\":\"assistant\",\"message\":{\"model\":\"claude-opus-5-5\",\"id\":\"msg_011CgP2TDR8mJC7cqYJgSDrA\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"tool_use\",\"id\":\"toolu_01E9t3wnBeL5brVygUoRfuoh\",\"name\":\"Bash\",\"input\":{\"command\":\"cd /tmp/gstack-paid-shard-O15pOD/tmp/skill-e2e-ctx-fragment-svqfPa/.gstack-home/projects/*/checkpoints; for f in *; do echo \\\"== $f\\\"; cat \\\"$f\\\"; done; cd ../../../..; export GSTACK_HOME=\\\"$PWD/.gstack-home\\\"; ls .gstack-home/projects/*/checkpoints/*.md | ./bin/gstack-slug --classify-checkpoints; echo rc=$?\"},\"caller\":{\"type\":\"direct\"}}],\"container\":null,\"stop_reason\":null,\"stop_sequence\":null,\"stop_details\":null,\"usage\":{\"input_tokens\":2,\"cache_creation_input_tokens\":1039,\"cache_read_input_tokens\":24637,\"cache_creation\":{\"ephemeral_5m_input_tokens\":1039,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":16,\"service_tier\":\"standard\",\"inference_geo\":\"global\",\"speed\":\"standard\"},\"input_transformations\":[],\"diagnostics\":null,\"context_management\":null},\"parent_tool_use_id\":null,\"session_id\":\"d1147327-49e3-4371-ab54-784d135573ac\",\"uuid\":\"9fa3b490-1be5-4221-b712-c671e2422c46\",\"timestamp\":\"2026-10-25T13:22:01.775Z\",\"request_id\":\"req_011CgP2TD6nbxFnYubbkBVGv\",\"wire_tool_inputs\":{\"toolu_01E9t3wnBeL5brVygUoRfuoh\":{\"command\":\"cd /tmp/gstack-paid-shard-O15pOD/tmp/skill-e2e-ctx-fragment-svqfPa/.gstack-home/projects/*/checkpoints; for f in *; do echo \\\"== $f\\\"; cat \\\"$f\\\"; done; cd ../../../..; export GSTACK_HOME=\\\"$PWD/.gstack-home\\\"; ls .gstack-home/projects/*/checkpoints/*.md | ./bin/gstack-slug --classify-checkpoints; echo rc=$?\"}}}", + "{\"type\":\"user\",\"message\":{\"role\":\"user\",\"content\":[{\"tool_use_id\":\"toolu_01E9t3wnBeL5brVygUoRfuoh\",\"type\":\"tool_result\",\"content\":\"== 20260101-120000-alpha-feature.md\\n---\\nstatus: in-progress\\nbranch: feat/alpha\\ntimestamp: 2026-01-01T12:00:00Z\\n---\\n## Working on: alpha feature\\n\\n### Summary\\nAlpha content FRAGMATCH_ALPHA_BUILD\\n== 20260202-120000-middle-payments.md\\n---\\nstatus: in-progress\\nbranch: feat/payments\\ntimestamp: 2026-02-02T12:00:00Z\\n---\\n## Working on: middle payments\\n\\n### Summary\\nPayments content FRAGMATCH_PAYMENTS_BUILD\\n== 20260303-120000-omega-release.md\\n---\\nstatus: in-progress\\nbranch: feat/omega\\ntimestamp: 2026-03-03T12:00:00Z\\n---\\n## Working on: omega release\\n\\n### Summary\\nOmega content FRAGMATCH_OMEGA_BUILD\\nunstamped\\t.gstack-home/projects/skill-e2e-ctx-fragment-svqfPa/checkpoints/20260101-120000-alpha-feature.md\\nunstamped\\t.gstack-home/projects/skill-e2e-ctx-fragment-svqfPa/checkpoints/20260202-120000-middle-payments.md\\nunstamped\\t.gstack-home/projects/skill-e2e-ctx-fragment-svqfPa/checkpoints/20260303-120000-omega-release.md\\nrc=0\",\"is_error\":false}]},\"parent_tool_use_id\":null,\"session_id\":\"d1147327-49e3-4371-ab54-784d135573ac\",\"uuid\":\"96853ca6-5db9-445b-ab54-ac9103ca336a\",\"timestamp\":\"2026-10-25T13:22:02.045Z\",\"tool_use_result\":{\"stdout\":\"== 20260101-120000-alpha-feature.md\\n---\\nstatus: in-progress\\nbranch: feat/alpha\\ntimestamp: 2026-01-01T12:00:00Z\\n---\\n## Working on: alpha feature\\n\\n### Summary\\nAlpha content FRAGMATCH_ALPHA_BUILD\\n== 20260202-120000-middle-payments.md\\n---\\nstatus: in-progress\\nbranch: feat/payments\\ntimestamp: 2026-02-02T12:00:00Z\\n---\\n## Working on: middle payments\\n\\n### Summary\\nPayments content FRAGMATCH_PAYMENTS_BUILD\\n== 20260303-120000-omega-release.md\\n---\\nstatus: in-progress\\nbranch: feat/omega\\ntimestamp: 2026-03-03T12:00:00Z\\n---\\n## Working on: omega release\\n\\n### Summary\\nOmega content FRAGMATCH_OMEGA_BUILD\\nunstamped\\t.gstack-home/projects/skill-e2e-ctx-fragment-svqfPa/checkpoints/20260101-120000-alpha-feature.md\\nunstamped\\t.gstack-home/projects/skill-e2e-ctx-fragment-svqfPa/checkpoints/20260202-120000-middle-payments.md\\nunstamped\\t.gstack-home/projects/skill-e2e-ctx-fragment-svqfPa/checkpoints/20260303-120000-omega-release.md\\nrc=0\",\"stderr\":\"\",\"interrupted\":false,\"isImage\":false,\"noOutputExpected\":false}}", + "{\"type\":\"assistant\",\"message\":{\"model\":\"claude-opus-5-5\",\"id\":\"msg_011CgP2TPmyymz1BeaE3qngr\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"I loaded the checkpoint matching \\\"payments\\\": `20260202-120000-middle-payments.md`. It's the only one of the three saved checkpoints whose title contains that word. All three are unstamped and none come from another project, so there's no project mismatch.\\n\\n```\\nRESUMING CONTEXT\\n════════════════════════════════════════\\nTitle: middle payments\\nBranch: feat/payments\\nSaved: Feb 2, 2026, 12:00 UTC\\nDuration: (not recorded)\\nStatus: in-progress\\n════════════════════════════════════════\\n\\n### Summary\\nPayments content FRAGMATCH_PAYMENTS_BUILD\\n\\n### Remaining Work\\n(none recorded in the checkpoint)\\n\\n### Notes\\n(none recorded)\\n```\\n\\n**Branch:** this context was saved on `feat/payments`, but you're on `main`. You may want to switch to `feat/payments` before continuing.\\n\\nThe other two checkpoints, which I did not load:\\n- `alpha feature` (`feat/alpha`, 2026-01-01)\\n- `omega release` (`feat/omega`, 2026-03-03), the newest\\n\\nYou asked me not to use AskUserQuestion, so I skipped the follow-up prompt. The checkpoint lists no remaining work. You can continue on the payments work, see the full saved file (it's only the short content above), or stop here.\"}],\"container\":null,\"stop_reason\":null,\"stop_sequence\":null,\"stop_details\":null,\"usage\":{\"input_tokens\":2,\"cache_creation_input_tokens\":718,\"cache_read_input_tokens\":25676,\"cache_creation\":{\"ephemeral_5m_input_tokens\":718,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":7,\"service_tier\":\"standard\",\"inference_geo\":\"global\",\"speed\":\"standard\"},\"input_transformations\":[],\"diagnostics\":null,\"context_management\":null},\"parent_tool_use_id\":null,\"session_id\":\"d1147327-49e3-4371-ab54-784d135573ac\",\"uuid\":\"833cfc7c-5f23-4673-b45c-d7d70c0e3f35\",\"timestamp\":\"2026-10-25T13:22:06.611Z\",\"request_id\":\"req_011CgP2TPV8JNDtZyf4D3mYB\"}", + "{\"duration_api_ms\":11552,\"stop_reason\":\"end_turn\",\"session_id\":\"d1147327-49e3-4371-ab54-784d135573ac\",\"total_cost_usd\":0.1106026,\"usage\":{\"input_tokens\":8,\"cache_creation_input_tokens\":14352,\"cache_read_input_tokens\":80653,\"output_tokens\":1134,\"output_tokens_details\":{\"thinking_tokens\":86},\"server_tool_use\":{\"web_search_requests\":0,\"web_fetch_requests\":0},\"service_tier\":\"standard\",\"cache_creation\":{\"ephemeral_1h_input_tokens\":0,\"ephemeral_5m_input_tokens\":14352},\"inference_geo\":\"global\",\"iterations\":[{\"input_tokens\":2,\"output_tokens\":484,\"cache_read_input_tokens\":25676,\"cache_creation_input_tokens\":718,\"cache_creation\":{\"ephemeral_5m_input_tokens\":718,\"ephemeral_1h_input_tokens\":0},\"type\":\"message\"}],\"speed\":\"standard\",\"fallback_credit\":null},\"modelUsage\":{\"claude-opus-5-5\":{\"inputTokens\":8,\"outputTokens\":1134,\"cacheReadInputTokens\":80653,\"cacheCreationInputTokens\":14352,\"webSearchRequests\":0,\"costUSD\":0.1106026,\"contextWindow\":1000000,\"maxOutputTokens\":128000,\"thinkingTokens\":86,\"canonicalModel\":\"claude-opus-5-5\",\"provider\":\"firstParty\",\"costBasis\":\"list\"}},\"permission_denials\":[],\"terminal_reason\":\"completed\",\"fast_mode_state\":\"off\",\"fast_mode_disabled_reason\":\"sdk_opt_in_required\",\"subagent_stats\":{\"spawned\":0,\"requested\":{\"background\":0,\"foreground\":0,\"unset\":0},\"started_in_background\":0,\"max_depth\":0,\"spawned_by_subagents\":0,\"completed\":0,\"failed\":0,\"killed\":{\"parent\":0,\"user\":0,\"system\":0},\"refused\":{\"depth_limit\":0,\"concurrency_limit\":0,\"budget\":0},\"by_type\":{}},\"safety_stops\":0,\"is_error\":false,\"num_turns\":5,\"subtype\":\"success\",\"api_error_status\":null,\"result\":\"I loaded the checkpoint matching \\\"payments\\\": `20260202-120000-middle-payments.md`. It's the only one of the three saved checkpoints whose title contains that word. All three are unstamped and none come from another project, so there's no project mismatch.\\n\\n```\\nRESUMING CONTEXT\\n════════════════════════════════════════\\nTitle: middle payments\\nBranch: feat/payments\\nSaved: Feb 2, 2026, 12:00 UTC\\nDuration: (not recorded)\\nStatus: in-progress\\n════════════════════════════════════════\\n\\n### Summary\\nPayments content FRAGMATCH_PAYMENTS_BUILD\\n\\n### Remaining Work\\n(none recorded in the checkpoint)\\n\\n### Notes\\n(none recorded)\\n```\\n\\n**Branch:** this context was saved on `feat/payments`, but you're on `main`. You may want to switch to `feat/payments` before continuing.\\n\\nThe other two checkpoints, which I did not load:\\n- `alpha feature` (`feat/alpha`, 2026-01-01)\\n- `omega release` (`feat/omega`, 2026-03-03), the newest\\n\\nYou asked me not to use AskUserQuestion, so I skipped the follow-up prompt. The checkpoint lists no remaining work. You can continue on the payments work, see the full saved file (it's only the short content above), or stop here.\",\"ttft_ms\":1839,\"type\":\"result\",\"duration_ms\":12657,\"uuid\":\"170f9374-7a93-44aa-9ce6-c54054faf5cc\",\"ttft_stream_ms\":902,\"time_to_request_ms\":199,\"first_content_frame_ms\":902,\"queued_turn_count\":0,\"result_index\":0}" + ] + }, + { + "session_id": "8889e81b-d4bf-4eba-9ade-cd8805219972", + "ndjson": [ + "{\"type\":\"assistant\",\"message\":{\"model\":\"claude-opus-5-5\",\"id\":\"msg_011CgP2SpsKBS3fLGqXc3Bwm\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"tool_use\",\"id\":\"toolu_01DewVZTi4xMmGQYH14JLR52\",\"name\":\"Skill\",\"input\":{\"skill\":\"context-restore\",\"args\":\"payments\"},\"caller\":{\"type\":\"direct\"}}],\"container\":null,\"stop_reason\":null,\"stop_sequence\":null,\"stop_details\":null,\"usage\":{\"input_tokens\":2,\"cache_creation_input_tokens\":6260,\"cache_read_input_tokens\":12042,\"cache_creation\":{\"ephemeral_5m_input_tokens\":6260,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":16,\"service_tier\":\"standard\",\"inference_geo\":\"global\",\"speed\":\"standard\"},\"input_transformations\":[],\"diagnostics\":null,\"context_management\":null},\"parent_tool_use_id\":null,\"session_id\":\"8889e81b-d4bf-4eba-9ade-cd8805219972\",\"uuid\":\"73df9278-656a-4350-9f2b-11f00fc83e23\",\"timestamp\":\"2026-10-25T13:21:55.982Z\",\"request_id\":\"req_011CgP2SpdBaxUoNcNgUqkdU\",\"wire_tool_inputs\":{\"toolu_01DewVZTi4xMmGQYH14JLR52\":{\"skill\":\"context-restore\",\"args\":\"payments\"}}}", + "{\"type\":\"user\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"tool_result\",\"tool_use_id\":\"toolu_01DewVZTi4xMmGQYH14JLR52\",\"content\":\"Launching skill: context-restore\"}]},\"parent_tool_use_id\":null,\"session_id\":\"8889e81b-d4bf-4eba-9ade-cd8805219972\",\"uuid\":\"d884aeed-d430-4d45-93b4-29855244b2ab\",\"timestamp\":\"2026-10-25T13:21:56.013Z\",\"tool_use_result\":{\"success\":true,\"commandName\":\"context-restore\",\"allowedTools\":[\"Bash\",\"Read\",\"Glob\",\"Grep\",\"AskUserQuestion\"]}}", + "{\"type\":\"assistant\",\"message\":{\"model\":\"claude-opus-5-5\",\"id\":\"msg_011CgP2Swzw8ptggHdz4yMNm\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"tool_use\",\"id\":\"toolu_01YASRbf3r6DvzQdp2WBoi5v\",\"name\":\"Bash\",\"input\":{\"command\":\"cd /tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T; export GSTACK_HOME=\\\"$PWD/.gstack-home\\\"; ls bin; B=./bin\\nGSTACK_STATE_ROOT=$($B/gstack-paths --get GSTACK_STATE_ROOT); echo ROOT=$GSTACK_STATE_ROOT\\nSLUG=$($B/gstack-slug --get SLUG 2>/dev/null); echo SLUG=$SLUG\\nCHECKPOINT_DIR=\\\"$GSTACK_STATE_ROOT/projects/$SLUG/checkpoints\\\"; ls -la \\\"$CHECKPOINT_DIR\\\"; find \\\"$GSTACK_HOME\\\" -name \\\"*.md\\\"\",\"description\":\"Locate saved checkpoints\"},\"caller\":{\"type\":\"direct\"}}],\"container\":null,\"stop_reason\":null,\"stop_sequence\":null,\"stop_details\":null,\"usage\":{\"input_tokens\":2,\"cache_creation_input_tokens\":6340,\"cache_read_input_tokens\":18302,\"cache_creation\":{\"ephemeral_5m_input_tokens\":6340,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":8,\"service_tier\":\"standard\",\"inference_geo\":\"global\",\"speed\":\"standard\"},\"input_transformations\":[],\"diagnostics\":null,\"context_management\":null},\"parent_tool_use_id\":null,\"session_id\":\"8889e81b-d4bf-4eba-9ade-cd8805219972\",\"uuid\":\"88f53b0b-92b0-433b-be2e-30a6e9c4f180\",\"timestamp\":\"2026-10-25T13:21:59.368Z\",\"request_id\":\"req_011CgP2SwkZ9Z8jUt6x2i38U\",\"wire_tool_inputs\":{\"toolu_01YASRbf3r6DvzQdp2WBoi5v\":{\"command\":\"cd /tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T; export GSTACK_HOME=\\\"$PWD/.gstack-home\\\"; ls bin; B=./bin\\nGSTACK_STATE_ROOT=$($B/gstack-paths --get GSTACK_STATE_ROOT); echo ROOT=$GSTACK_STATE_ROOT\\nSLUG=$($B/gstack-slug --get SLUG 2>/dev/null); echo SLUG=$SLUG\\nCHECKPOINT_DIR=\\\"$GSTACK_STATE_ROOT/projects/$SLUG/checkpoints\\\"; ls -la \\\"$CHECKPOINT_DIR\\\"; find \\\"$GSTACK_HOME\\\" -name \\\"*.md\\\"\",\"description\":\"Locate saved checkpoints\"}}}", + "{\"type\":\"user\",\"message\":{\"role\":\"user\",\"content\":[{\"tool_use_id\":\"toolu_01YASRbf3r6DvzQdp2WBoi5v\",\"type\":\"tool_result\",\"content\":\"gstack-config\\ngstack-learnings-log\\ngstack-learnings-search\\ngstack-paths\\ngstack-remote-identity.sh\\ngstack-repo-mode\\ngstack-slug\\ngstack-state-root.sh\\ngstack-timeline-log\\ngstack-timeline-read\\ngstack-update-check\\nROOT=/tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T/.gstack-home\\nSLUG=skill-e2e-ctx-fragment-mF7D6T\\ntotal 16\\ndrwxr-xr-x 2 user user 4096 Oct 25 13:21 .\\ndrwxr-xr-x 3 user user 60 Oct 25 13:21 ..\\n-rw-r--r-- 1 user user 157 Oct 25 13:21 20260101-120000-alpha-feature.md\\n-rw-r--r-- 1 user user 168 Oct 25 13:21 20260202-120000-middle-payments.md\\n-rw-r--r-- 1 user user 157 Oct 25 13:21 20260303-120000-omega-release.md\\n/tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T/.gstack-home/projects/skill-e2e-ctx-fragment-mF7D6T/checkpoints/20260101-120000-alpha-feature.md\\n/tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T/.gstack-home/projects/skill-e2e-ctx-fragment-mF7D6T/checkpoints/20260202-120000-middle-payments.md\\n/tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T/.gstack-home/projects/skill-e2e-ctx-fragment-mF7D6T/checkpoints/20260303-120000-omega-release.md\",\"is_error\":false}]},\"parent_tool_use_id\":null,\"session_id\":\"8889e81b-d4bf-4eba-9ade-cd8805219972\",\"uuid\":\"d8dab3b1-3cb6-4750-a8b1-30e12536377f\",\"timestamp\":\"2026-10-25T13:21:59.932Z\",\"tool_use_result\":{\"stdout\":\"gstack-config\\ngstack-learnings-log\\ngstack-learnings-search\\ngstack-paths\\ngstack-remote-identity.sh\\ngstack-repo-mode\\ngstack-slug\\ngstack-state-root.sh\\ngstack-timeline-log\\ngstack-timeline-read\\ngstack-update-check\\nROOT=/tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T/.gstack-home\\nSLUG=skill-e2e-ctx-fragment-mF7D6T\\ntotal 16\\ndrwxr-xr-x 2 user user 4096 Oct 25 13:21 .\\ndrwxr-xr-x 3 user user 60 Oct 25 13:21 ..\\n-rw-r--r-- 1 user user 157 Oct 25 13:21 20260101-120000-alpha-feature.md\\n-rw-r--r-- 1 user user 168 Oct 25 13:21 20260202-120000-middle-payments.md\\n-rw-r--r-- 1 user user 157 Oct 25 13:21 20260303-120000-omega-release.md\\n/tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T/.gstack-home/projects/skill-e2e-ctx-fragment-mF7D6T/checkpoints/20260101-120000-alpha-feature.md\\n/tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T/.gstack-home/projects/skill-e2e-ctx-fragment-mF7D6T/checkpoints/20260202-120000-middle-payments.md\\n/tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T/.gstack-home/projects/skill-e2e-ctx-fragment-mF7D6T/checkpoints/20260303-120000-omega-release.md\",\"stderr\":\"\",\"interrupted\":false,\"isImage\":false,\"noOutputExpected\":false,\"bashEditDiff\":{\"files\":[{\"filePath\":\"/tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T/.gstack-home/slug-cache/_tmp_gstack-paid-shard-XShYTB_tmp_skill-e2e-ctx-fragment-mF7D6T\",\"hunks\":[{\"oldStart\":0,\"oldLines\":0,\"newStart\":1,\"newLines\":1,\"lines\":[\"+v2:skill-e2e-ctx-fragment-mF7D6T\"]}],\"created\":true},{\"filePath\":\"/tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T/.gstack-home/slug-cache/_tmp_gstack-paid-shard-XShYTB_tmp_skill-e2e-ctx-fragment-mF7D6T_.git\",\"hunks\":[{\"oldStart\":0,\"oldLines\":0,\"newStart\":1,\"newLines\":1,\"lines\":[\"+v2:skill-e2e-ctx-fragment-mF7D6T\"]}],\"created\":true}],\"moreFiles\":0,\"changedFiles\":[\"/tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T/.gstack-home/slug-cache/_tmp_gstack-paid-shard-XShYTB_tmp_skill-e2e-ctx-fragment-mF7D6T\",\"/tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T/.gstack-home/slug-cache/_tmp_gstack-paid-shard-XShYTB_tmp_skill-e2e-ctx-fragment-mF7D6T_.git\"]}}}", + "{\"type\":\"assistant\",\"message\":{\"model\":\"claude-opus-5-5\",\"id\":\"msg_011CgP2TEimtnXFfvDRRUFde\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"tool_use\",\"id\":\"toolu_0148N1vosxsxAic6XBPYrXGQ\",\"name\":\"Bash\",\"input\":{\"command\":\"cd /tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T/.gstack-home/projects/*/checkpoints; for f in *; do echo \\\"== $f\\\"; cat \\\"$f\\\"; done\",\"description\":\"Read checkpoint files\"},\"caller\":{\"type\":\"direct\"}}],\"container\":null,\"stop_reason\":null,\"stop_sequence\":null,\"stop_details\":null,\"usage\":{\"input_tokens\":2,\"cache_creation_input_tokens\":1098,\"cache_read_input_tokens\":24642,\"cache_creation\":{\"ephemeral_5m_input_tokens\":1098,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":16,\"service_tier\":\"standard\",\"inference_geo\":\"global\",\"speed\":\"standard\"},\"input_transformations\":[],\"diagnostics\":null,\"context_management\":null},\"parent_tool_use_id\":null,\"session_id\":\"8889e81b-d4bf-4eba-9ade-cd8805219972\",\"uuid\":\"83ba03a6-8c2c-4fb6-8a99-168b4da4b9ab\",\"timestamp\":\"2026-10-25T13:22:01.555Z\",\"request_id\":\"req_011CgP2TEStrRVjCJmLjGxUQ\",\"wire_tool_inputs\":{\"toolu_0148N1vosxsxAic6XBPYrXGQ\":{\"command\":\"cd /tmp/gstack-paid-shard-XShYTB/tmp/skill-e2e-ctx-fragment-mF7D6T/.gstack-home/projects/*/checkpoints; for f in *; do echo \\\"== $f\\\"; cat \\\"$f\\\"; done\",\"description\":\"Read checkpoint files\"}}}", + "{\"type\":\"user\",\"message\":{\"role\":\"user\",\"content\":[{\"tool_use_id\":\"toolu_0148N1vosxsxAic6XBPYrXGQ\",\"type\":\"tool_result\",\"content\":\"== 20260101-120000-alpha-feature.md\\n---\\nstatus: in-progress\\nbranch: feat/alpha\\ntimestamp: 2026-01-01T12:00:00Z\\n---\\n## Working on: alpha feature\\n\\n### Summary\\nAlpha content FRAGMATCH_ALPHA_BUILD\\n== 20260202-120000-middle-payments.md\\n---\\nstatus: in-progress\\nbranch: feat/payments\\ntimestamp: 2026-02-02T12:00:00Z\\n---\\n## Working on: middle payments\\n\\n### Summary\\nPayments content FRAGMATCH_PAYMENTS_BUILD\\n== 20260303-120000-omega-release.md\\n---\\nstatus: in-progress\\nbranch: feat/omega\\ntimestamp: 2026-03-03T12:00:00Z\\n---\\n## Working on: omega release\\n\\n### Summary\\nOmega content FRAGMATCH_OMEGA_BUILD\",\"is_error\":false}]},\"parent_tool_use_id\":null,\"session_id\":\"8889e81b-d4bf-4eba-9ade-cd8805219972\",\"uuid\":\"686ae24d-a3eb-4707-ae3b-330574244652\",\"timestamp\":\"2026-10-25T13:22:01.697Z\",\"tool_use_result\":{\"stdout\":\"== 20260101-120000-alpha-feature.md\\n---\\nstatus: in-progress\\nbranch: feat/alpha\\ntimestamp: 2026-01-01T12:00:00Z\\n---\\n## Working on: alpha feature\\n\\n### Summary\\nAlpha content FRAGMATCH_ALPHA_BUILD\\n== 20260202-120000-middle-payments.md\\n---\\nstatus: in-progress\\nbranch: feat/payments\\ntimestamp: 2026-02-02T12:00:00Z\\n---\\n## Working on: middle payments\\n\\n### Summary\\nPayments content FRAGMATCH_PAYMENTS_BUILD\\n== 20260303-120000-omega-release.md\\n---\\nstatus: in-progress\\nbranch: feat/omega\\ntimestamp: 2026-03-03T12:00:00Z\\n---\\n## Working on: omega release\\n\\n### Summary\\nOmega content FRAGMATCH_OMEGA_BUILD\",\"stderr\":\"\",\"interrupted\":false,\"isImage\":false,\"noOutputExpected\":false}}", + "{\"type\":\"assistant\",\"message\":{\"model\":\"claude-opus-5-5\",\"id\":\"msg_011CgP2TNGCLmG6DD1SMJXr4\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"I loaded the checkpoint matching \\\"payments\\\": `20260202-120000-middle-payments.md`. Three checkpoints were saved in this project (alpha-feature, middle-payments, omega-release), and only this one has \\\"payments\\\" in its title. Omega-release is newer, but you asked for this one by name.\\n\\n```\\nRESUMING CONTEXT\\n════════════════════════════════════════\\nTitle: middle payments\\nBranch: feat/payments\\nSaved: 2026-02-02 12:00:00 UTC\\nDuration: (not recorded)\\nStatus: in-progress\\n════════════════════════════════════════\\n\\n### Summary\\nPayments content FRAGMATCH_PAYMENTS_BUILD\\n\\n### Remaining Work\\n(none recorded)\\n\\n### Notes\\n(none recorded)\\n```\\n\\n- **Branch:** this context was saved on `feat/payments`, but you're on `main`. You may want to switch branches before continuing.\\n- **Project check:** the checkpoint has no project identity stamp. That's fine here, because no other project has saved checkpoints in this folder.\\n\\nI didn't change any code, and I skipped the usual follow-up question as you asked. Your options are to keep working on this context, see the full file (it's short and shown above in full), or stop here.\"}],\"container\":null,\"stop_reason\":null,\"stop_sequence\":null,\"stop_details\":null,\"usage\":{\"input_tokens\":2,\"cache_creation_input_tokens\":635,\"cache_read_input_tokens\":25740,\"cache_creation\":{\"ephemeral_5m_input_tokens\":635,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":2,\"service_tier\":\"standard\",\"inference_geo\":\"global\",\"speed\":\"standard\"},\"input_transformations\":[],\"diagnostics\":null,\"context_management\":null},\"parent_tool_use_id\":null,\"session_id\":\"8889e81b-d4bf-4eba-9ade-cd8805219972\",\"uuid\":\"70979650-0199-44e3-956e-0824d1de507a\",\"timestamp\":\"2026-10-25T13:22:06.359Z\",\"request_id\":\"req_011CgP2TN24xUJz1E2rmAPb1\"}", + "{\"duration_api_ms\":11304,\"stop_reason\":\"end_turn\",\"session_id\":\"8889e81b-d4bf-4eba-9ade-cd8805219972\",\"total_cost_usd\":0.10918220000000001,\"usage\":{\"input_tokens\":8,\"cache_creation_input_tokens\":14333,\"cache_read_input_tokens\":80726,\"output_tokens\":1067,\"output_tokens_details\":{\"thinking_tokens\":71},\"server_tool_use\":{\"web_search_requests\":0,\"web_fetch_requests\":0},\"service_tier\":\"standard\",\"cache_creation\":{\"ephemeral_1h_input_tokens\":0,\"ephemeral_5m_input_tokens\":14333},\"inference_geo\":\"global\",\"iterations\":[{\"input_tokens\":2,\"output_tokens\":439,\"cache_read_input_tokens\":25740,\"cache_creation_input_tokens\":635,\"cache_creation\":{\"ephemeral_5m_input_tokens\":635,\"ephemeral_1h_input_tokens\":0},\"type\":\"message\"}],\"speed\":\"standard\",\"fallback_credit\":null},\"modelUsage\":{\"claude-opus-5-5\":{\"inputTokens\":8,\"outputTokens\":1067,\"cacheReadInputTokens\":80726,\"cacheCreationInputTokens\":14333,\"webSearchRequests\":0,\"costUSD\":0.10918220000000001,\"contextWindow\":1000000,\"maxOutputTokens\":128000,\"thinkingTokens\":71,\"canonicalModel\":\"claude-opus-5-5\",\"provider\":\"firstParty\",\"costBasis\":\"list\"}},\"permission_denials\":[],\"terminal_reason\":\"completed\",\"fast_mode_state\":\"off\",\"fast_mode_disabled_reason\":\"sdk_opt_in_required\",\"subagent_stats\":{\"spawned\":0,\"requested\":{\"background\":0,\"foreground\":0,\"unset\":0},\"started_in_background\":0,\"max_depth\":0,\"spawned_by_subagents\":0,\"completed\":0,\"failed\":0,\"killed\":{\"parent\":0,\"user\":0,\"system\":0},\"refused\":{\"depth_limit\":0,\"concurrency_limit\":0,\"budget\":0},\"by_type\":{}},\"safety_stops\":0,\"is_error\":false,\"num_turns\":5,\"subtype\":\"success\",\"api_error_status\":null,\"result\":\"I loaded the checkpoint matching \\\"payments\\\": `20260202-120000-middle-payments.md`. Three checkpoints were saved in this project (alpha-feature, middle-payments, omega-release), and only this one has \\\"payments\\\" in its title. Omega-release is newer, but you asked for this one by name.\\n\\n```\\nRESUMING CONTEXT\\n════════════════════════════════════════\\nTitle: middle payments\\nBranch: feat/payments\\nSaved: 2026-02-02 12:00:00 UTC\\nDuration: (not recorded)\\nStatus: in-progress\\n════════════════════════════════════════\\n\\n### Summary\\nPayments content FRAGMATCH_PAYMENTS_BUILD\\n\\n### Remaining Work\\n(none recorded)\\n\\n### Notes\\n(none recorded)\\n```\\n\\n- **Branch:** this context was saved on `feat/payments`, but you're on `main`. You may want to switch branches before continuing.\\n- **Project check:** the checkpoint has no project identity stamp. That's fine here, because no other project has saved checkpoints in this folder.\\n\\nI didn't change any code, and I skipped the usual follow-up question as you asked. Your options are to keep working on this context, see the full file (it's short and shown above in full), or stop here.\",\"ttft_ms\":1797,\"type\":\"result\",\"duration_ms\":12189,\"uuid\":\"3003a3de-20c9-4a22-8387-f4c23597d9c3\",\"ttft_stream_ms\":873,\"time_to_request_ms\":179,\"first_content_frame_ms\":874,\"queued_turn_count\":0,\"result_index\":0}" + ] + }, + { + "session_id": "6d684089-4cb5-4016-bc86-203a9a8cdab3", + "ndjson": [ + "{\"type\":\"assistant\",\"message\":{\"model\":\"claude-opus-5-5\",\"id\":\"msg_011CgP2SoyF1qZULHrLjmM3K\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"tool_use\",\"id\":\"toolu_01X9nJt9XVFgAKfbeHTY7jhD\",\"name\":\"Skill\",\"input\":{\"skill\":\"context-restore\",\"args\":\"payments\"},\"caller\":{\"type\":\"direct\"}}],\"container\":null,\"stop_reason\":null,\"stop_sequence\":null,\"stop_details\":null,\"usage\":{\"input_tokens\":2,\"cache_creation_input_tokens\":6260,\"cache_read_input_tokens\":12042,\"cache_creation\":{\"ephemeral_5m_input_tokens\":6260,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":16,\"service_tier\":\"standard\",\"inference_geo\":\"global\",\"speed\":\"standard\"},\"input_transformations\":[],\"diagnostics\":null,\"context_management\":null},\"parent_tool_use_id\":null,\"session_id\":\"6d684089-4cb5-4016-bc86-203a9a8cdab3\",\"uuid\":\"7756244d-e82e-4aeb-9437-732412ccb96f\",\"timestamp\":\"2026-10-25T13:21:56.218Z\",\"request_id\":\"req_011CgP2Soi7ME2b1kXN8NCRG\",\"wire_tool_inputs\":{\"toolu_01X9nJt9XVFgAKfbeHTY7jhD\":{\"skill\":\"context-restore\",\"args\":\"payments\"}}}", + "{\"type\":\"user\",\"message\":{\"role\":\"user\",\"content\":[{\"type\":\"tool_result\",\"tool_use_id\":\"toolu_01X9nJt9XVFgAKfbeHTY7jhD\",\"content\":\"Launching skill: context-restore\"}]},\"parent_tool_use_id\":null,\"session_id\":\"6d684089-4cb5-4016-bc86-203a9a8cdab3\",\"uuid\":\"376841c6-0fe2-417f-8da9-5d79c52f0694\",\"timestamp\":\"2026-10-25T13:21:56.247Z\",\"tool_use_result\":{\"success\":true,\"commandName\":\"context-restore\",\"allowedTools\":[\"Bash\",\"Read\",\"Glob\",\"Grep\",\"AskUserQuestion\"]}}", + "{\"type\":\"assistant\",\"message\":{\"model\":\"claude-opus-5-5\",\"id\":\"msg_011CgP2Sy7Apg39RghKe7nhs\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"tool_use\",\"id\":\"toolu_016oZY36mo3ibs1cL3rNt82T\",\"name\":\"Bash\",\"input\":{\"command\":\"cd /tmp/gstack-paid-shard-V2G2le/tmp/skill-e2e-ctx-fragment-GZoJH5; ls bin; export GSTACK_HOME=\\\"$PWD/.gstack-home\\\"; B=./bin\\nGSTACK_STATE_ROOT=$($B/gstack-paths --get GSTACK_STATE_ROOT 2>&1); echo \\\"ROOT=$GSTACK_STATE_ROOT\\\"\\nSLUG=$($B/gstack-slug --get SLUG 2>&1); echo \\\"SLUG=$SLUG\\\"\\nfind .gstack-home -name \\\"*.md\\\" | sort -r\",\"description\":\"Locate gstack state and checkpoints\"},\"caller\":{\"type\":\"direct\"}}],\"container\":null,\"stop_reason\":null,\"stop_sequence\":null,\"stop_details\":null,\"usage\":{\"input_tokens\":2,\"cache_creation_input_tokens\":6340,\"cache_read_input_tokens\":18302,\"cache_creation\":{\"ephemeral_5m_input_tokens\":6340,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":8,\"service_tier\":\"standard\",\"inference_geo\":\"global\",\"speed\":\"standard\"},\"input_transformations\":[],\"diagnostics\":null,\"context_management\":null},\"parent_tool_use_id\":null,\"session_id\":\"6d684089-4cb5-4016-bc86-203a9a8cdab3\",\"uuid\":\"46203839-ca20-4fe1-a98b-d965e965f665\",\"timestamp\":\"2026-10-25T13:22:00.005Z\",\"request_id\":\"req_011CgP2SxnaBEsoXQB2CY6kN\",\"wire_tool_inputs\":{\"toolu_016oZY36mo3ibs1cL3rNt82T\":{\"command\":\"cd /tmp/gstack-paid-shard-V2G2le/tmp/skill-e2e-ctx-fragment-GZoJH5; ls bin; export GSTACK_HOME=\\\"$PWD/.gstack-home\\\"; B=./bin\\nGSTACK_STATE_ROOT=$($B/gstack-paths --get GSTACK_STATE_ROOT 2>&1); echo \\\"ROOT=$GSTACK_STATE_ROOT\\\"\\nSLUG=$($B/gstack-slug --get SLUG 2>&1); echo \\\"SLUG=$SLUG\\\"\\nfind .gstack-home -name \\\"*.md\\\" | sort -r\",\"description\":\"Locate gstack state and checkpoints\"}}}", + "{\"type\":\"user\",\"message\":{\"role\":\"user\",\"content\":[{\"tool_use_id\":\"toolu_016oZY36mo3ibs1cL3rNt82T\",\"type\":\"tool_result\",\"content\":\"gstack-config\\ngstack-learnings-log\\ngstack-learnings-search\\ngstack-paths\\ngstack-remote-identity.sh\\ngstack-repo-mode\\ngstack-slug\\ngstack-state-root.sh\\ngstack-timeline-log\\ngstack-timeline-read\\ngstack-update-check\\nROOT=/tmp/gstack-paid-shard-V2G2le/tmp/skill-e2e-ctx-fragment-GZoJH5/.gstack-home\\nSLUG=skill-e2e-ctx-fragment-GZoJH5\\n.gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260303-120000-omega-release.md\\n.gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260202-120000-middle-payments.md\\n.gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260101-120000-alpha-feature.md\",\"is_error\":false}]},\"parent_tool_use_id\":null,\"session_id\":\"6d684089-4cb5-4016-bc86-203a9a8cdab3\",\"uuid\":\"d7748b04-b48b-498b-89e5-ce4df4e6d58c\",\"timestamp\":\"2026-10-25T13:22:00.921Z\",\"tool_use_result\":{\"stdout\":\"gstack-config\\ngstack-learnings-log\\ngstack-learnings-search\\ngstack-paths\\ngstack-remote-identity.sh\\ngstack-repo-mode\\ngstack-slug\\ngstack-state-root.sh\\ngstack-timeline-log\\ngstack-timeline-read\\ngstack-update-check\\nROOT=/tmp/gstack-paid-shard-V2G2le/tmp/skill-e2e-ctx-fragment-GZoJH5/.gstack-home\\nSLUG=skill-e2e-ctx-fragment-GZoJH5\\n.gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260303-120000-omega-release.md\\n.gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260202-120000-middle-payments.md\\n.gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260101-120000-alpha-feature.md\",\"stderr\":\"\",\"interrupted\":false,\"isImage\":false,\"noOutputExpected\":false,\"bashEditDiff\":{\"files\":[{\"filePath\":\"/tmp/gstack-paid-shard-V2G2le/tmp/skill-e2e-ctx-fragment-GZoJH5/.gstack-home/slug-cache/_tmp_gstack-paid-shard-V2G2le_tmp_skill-e2e-ctx-fragment-GZoJH5\",\"hunks\":[{\"oldStart\":0,\"oldLines\":0,\"newStart\":1,\"newLines\":1,\"lines\":[\"+v2:skill-e2e-ctx-fragment-GZoJH5\"]}],\"created\":true},{\"filePath\":\"/tmp/gstack-paid-shard-V2G2le/tmp/skill-e2e-ctx-fragment-GZoJH5/.gstack-home/slug-cache/_tmp_gstack-paid-shard-V2G2le_tmp_skill-e2e-ctx-fragment-GZoJH5_.git\",\"hunks\":[{\"oldStart\":0,\"oldLines\":0,\"newStart\":1,\"newLines\":1,\"lines\":[\"+v2:skill-e2e-ctx-fragment-GZoJH5\"]}],\"created\":true}],\"moreFiles\":0,\"changedFiles\":[\"/tmp/gstack-paid-shard-V2G2le/tmp/skill-e2e-ctx-fragment-GZoJH5/.gstack-home/slug-cache/_tmp_gstack-paid-shard-V2G2le_tmp_skill-e2e-ctx-fragment-GZoJH5\",\"/tmp/gstack-paid-shard-V2G2le/tmp/skill-e2e-ctx-fragment-GZoJH5/.gstack-home/slug-cache/_tmp_gstack-paid-shard-V2G2le_tmp_skill-e2e-ctx-fragment-GZoJH5_.git\"]}}}", + "{\"type\":\"assistant\",\"message\":{\"model\":\"claude-opus-5-5\",\"id\":\"msg_011CgP2TJxWctw7y2Vz5qBJH\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"tool_use\",\"id\":\"toolu_01FMDVzkCc6y3vknp52LsMBF\",\"name\":\"Bash\",\"input\":{\"command\":\"cd /tmp/gstack-paid-shard-V2G2le/tmp/skill-e2e-ctx-fragment-GZoJH5; export GSTACK_HOME=\\\"$PWD/.gstack-home\\\"; D=.gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints\\nls $D/*.md | ./bin/gstack-slug --classify-checkpoints 2>&1; echo ---; cat $D/20260202-120000-middle-payments.md; echo ---; head -12 $D/20260303-120000-omega-release.md $D/20260101-120000-alpha-feature.md\",\"description\":\"Classify checkpoints and read payments file\"},\"caller\":{\"type\":\"direct\"}}],\"container\":null,\"stop_reason\":null,\"stop_sequence\":null,\"stop_details\":null,\"usage\":{\"input_tokens\":2,\"cache_creation_input_tokens\":718,\"cache_read_input_tokens\":24642,\"cache_creation\":{\"ephemeral_5m_input_tokens\":718,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":16,\"service_tier\":\"standard\",\"inference_geo\":\"global\",\"speed\":\"standard\"},\"input_transformations\":[],\"diagnostics\":null,\"context_management\":null},\"parent_tool_use_id\":null,\"session_id\":\"6d684089-4cb5-4016-bc86-203a9a8cdab3\",\"uuid\":\"bf17bfed-5ea2-42c9-8b0d-df4adf7e20ff\",\"timestamp\":\"2026-10-25T13:22:03.980Z\",\"request_id\":\"req_011CgP2TJg9vKd8HjaMC2abX\",\"wire_tool_inputs\":{\"toolu_01FMDVzkCc6y3vknp52LsMBF\":{\"command\":\"cd /tmp/gstack-paid-shard-V2G2le/tmp/skill-e2e-ctx-fragment-GZoJH5; export GSTACK_HOME=\\\"$PWD/.gstack-home\\\"; D=.gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints\\nls $D/*.md | ./bin/gstack-slug --classify-checkpoints 2>&1; echo ---; cat $D/20260202-120000-middle-payments.md; echo ---; head -12 $D/20260303-120000-omega-release.md $D/20260101-120000-alpha-feature.md\",\"description\":\"Classify checkpoints and read payments file\"}}}", + "{\"type\":\"user\",\"message\":{\"role\":\"user\",\"content\":[{\"tool_use_id\":\"toolu_01FMDVzkCc6y3vknp52LsMBF\",\"type\":\"tool_result\",\"content\":\"unstamped\\t.gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260101-120000-alpha-feature.md\\nunstamped\\t.gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260202-120000-middle-payments.md\\nunstamped\\t.gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260303-120000-omega-release.md\\n---\\n---\\nstatus: in-progress\\nbranch: feat/payments\\ntimestamp: 2026-02-02T12:00:00Z\\n---\\n## Working on: middle payments\\n\\n### Summary\\nPayments content FRAGMATCH_PAYMENTS_BUILD\\n---\\n==> .gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260303-120000-omega-release.md <==\\n---\\nstatus: in-progress\\nbranch: feat/omega\\ntimestamp: 2026-03-03T12:00:00Z\\n---\\n## Working on: omega release\\n\\n### Summary\\nOmega content FRAGMATCH_OMEGA_BUILD\\n\\n==> .gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260101-120000-alpha-feature.md <==\\n---\\nstatus: in-progress\\nbranch: feat/alpha\\ntimestamp: 2026-01-01T12:00:00Z\\n---\\n## Working on: alpha feature\\n\\n### Summary\\nAlpha content FRAGMATCH_ALPHA_BUILD\",\"is_error\":false}]},\"parent_tool_use_id\":null,\"session_id\":\"6d684089-4cb5-4016-bc86-203a9a8cdab3\",\"uuid\":\"21ec78ab-abbc-4ea3-8ba6-544d6b05fc91\",\"timestamp\":\"2026-10-25T13:22:04.223Z\",\"tool_use_result\":{\"stdout\":\"unstamped\\t.gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260101-120000-alpha-feature.md\\nunstamped\\t.gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260202-120000-middle-payments.md\\nunstamped\\t.gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260303-120000-omega-release.md\\n---\\n---\\nstatus: in-progress\\nbranch: feat/payments\\ntimestamp: 2026-02-02T12:00:00Z\\n---\\n## Working on: middle payments\\n\\n### Summary\\nPayments content FRAGMATCH_PAYMENTS_BUILD\\n---\\n==> .gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260303-120000-omega-release.md <==\\n---\\nstatus: in-progress\\nbranch: feat/omega\\ntimestamp: 2026-03-03T12:00:00Z\\n---\\n## Working on: omega release\\n\\n### Summary\\nOmega content FRAGMATCH_OMEGA_BUILD\\n\\n==> .gstack-home/projects/skill-e2e-ctx-fragment-GZoJH5/checkpoints/20260101-120000-alpha-feature.md <==\\n---\\nstatus: in-progress\\nbranch: feat/alpha\\ntimestamp: 2026-01-01T12:00:00Z\\n---\\n## Working on: alpha feature\\n\\n### Summary\\nAlpha content FRAGMATCH_ALPHA_BUILD\",\"stderr\":\"\",\"interrupted\":false,\"isImage\":false,\"noOutputExpected\":false}}", + "{\"type\":\"assistant\",\"message\":{\"model\":\"claude-opus-5-5\",\"id\":\"msg_011CgP2TZ93aTmrLHgHkg2Je\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"I loaded the checkpoint `20260202-120000-middle-payments.md`. It's the only one of the three saved checkpoints whose title contains \\\"payments\\\". It isn't the newest: `omega-release` (2026-03-03) is, so I chose this one because its title matched, not because it was the latest.\\n\\n```\\nRESUMING CONTEXT\\n════════════════════════════════════════\\nTitle: middle payments\\nBranch: feat/payments\\nSaved: Feb 2, 2026, 12:00 UTC\\nDuration: not recorded\\nStatus: in-progress\\n════════════════════════════════════════\\n\\n### Summary\\nPayments content FRAGMATCH_PAYMENTS_BUILD\\n\\n### Remaining Work\\nNone recorded in the checkpoint.\\n\\n### Notes\\nNone recorded.\\n```\\n\\n- **Branch:** this was saved on `feat/payments`, but you're on `main`. You may want to switch branches before continuing.\\n- **Project check:** none of the checkpoints have a project identity stamp, but none belong to another project, so this one counts as this project's.\\n- **Other checkpoints:** `alpha feature` on `feat/alpha` (2026-01-01) and `omega release` on `feat/omega` (2026-03-03).\\n\\nYou asked me not to use AskUserQuestion, so I skipped the skill's usual \\\"what next?\\\" prompt. I made no code changes; restoring only reads the saved files.\"}],\"container\":null,\"stop_reason\":null,\"stop_sequence\":null,\"stop_details\":null,\"usage\":{\"input_tokens\":2,\"cache_creation_input_tokens\":859,\"cache_read_input_tokens\":25360,\"cache_creation\":{\"ephemeral_5m_input_tokens\":859,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":8,\"service_tier\":\"standard\",\"inference_geo\":\"global\",\"speed\":\"standard\"},\"input_transformations\":[],\"diagnostics\":null,\"context_management\":null},\"parent_tool_use_id\":null,\"session_id\":\"6d684089-4cb5-4016-bc86-203a9a8cdab3\",\"uuid\":\"e8864f23-50e9-4a59-ab4a-b984590d2559\",\"timestamp\":\"2026-10-25T13:22:09.545Z\",\"request_id\":\"req_011CgP2TYqh2XjMw3Nc9cuQu\"}", + "{\"duration_api_ms\":14272,\"stop_reason\":\"end_turn\",\"session_id\":\"6d684089-4cb5-4016-bc86-203a9a8cdab3\",\"total_cost_usd\":0.1112262,\"usage\":{\"input_tokens\":8,\"cache_creation_input_tokens\":14177,\"cache_read_input_tokens\":80346,\"output_tokens\":1212,\"output_tokens_details\":{\"thinking_tokens\":88},\"server_tool_use\":{\"web_search_requests\":0,\"web_fetch_requests\":0},\"service_tier\":\"standard\",\"cache_creation\":{\"ephemeral_1h_input_tokens\":0,\"ephemeral_5m_input_tokens\":14177},\"inference_geo\":\"global\",\"iterations\":[{\"input_tokens\":2,\"output_tokens\":501,\"cache_read_input_tokens\":25360,\"cache_creation_input_tokens\":859,\"cache_creation\":{\"ephemeral_5m_input_tokens\":859,\"ephemeral_1h_input_tokens\":0},\"type\":\"message\"}],\"speed\":\"standard\",\"fallback_credit\":null},\"modelUsage\":{\"claude-opus-5-5\":{\"inputTokens\":8,\"outputTokens\":1212,\"cacheReadInputTokens\":80346,\"cacheCreationInputTokens\":14177,\"webSearchRequests\":0,\"costUSD\":0.1112262,\"contextWindow\":1000000,\"maxOutputTokens\":128000,\"thinkingTokens\":88,\"canonicalModel\":\"claude-opus-5-5\",\"provider\":\"firstParty\",\"costBasis\":\"list\"}},\"permission_denials\":[],\"terminal_reason\":\"completed\",\"fast_mode_state\":\"off\",\"fast_mode_disabled_reason\":\"sdk_opt_in_required\",\"subagent_stats\":{\"spawned\":0,\"requested\":{\"background\":0,\"foreground\":0,\"unset\":0},\"started_in_background\":0,\"max_depth\":0,\"spawned_by_subagents\":0,\"completed\":0,\"failed\":0,\"killed\":{\"parent\":0,\"user\":0,\"system\":0},\"refused\":{\"depth_limit\":0,\"concurrency_limit\":0,\"budget\":0},\"by_type\":{}},\"safety_stops\":0,\"is_error\":false,\"num_turns\":5,\"subtype\":\"success\",\"api_error_status\":null,\"result\":\"I loaded the checkpoint `20260202-120000-middle-payments.md`. It's the only one of the three saved checkpoints whose title contains \\\"payments\\\". It isn't the newest: `omega-release` (2026-03-03) is, so I chose this one because its title matched, not because it was the latest.\\n\\n```\\nRESUMING CONTEXT\\n════════════════════════════════════════\\nTitle: middle payments\\nBranch: feat/payments\\nSaved: Feb 2, 2026, 12:00 UTC\\nDuration: not recorded\\nStatus: in-progress\\n════════════════════════════════════════\\n\\n### Summary\\nPayments content FRAGMATCH_PAYMENTS_BUILD\\n\\n### Remaining Work\\nNone recorded in the checkpoint.\\n\\n### Notes\\nNone recorded.\\n```\\n\\n- **Branch:** this was saved on `feat/payments`, but you're on `main`. You may want to switch branches before continuing.\\n- **Project check:** none of the checkpoints have a project identity stamp, but none belong to another project, so this one counts as this project's.\\n- **Other checkpoints:** `alpha feature` on `feat/alpha` (2026-01-01) and `omega release` on `feat/omega` (2026-03-03).\\n\\nYou asked me not to use AskUserQuestion, so I skipped the skill's usual \\\"what next?\\\" prompt. I made no code changes; restoring only reads the saved files.\",\"ttft_ms\":2268,\"type\":\"result\",\"duration_ms\":15609,\"uuid\":\"39ae4b99-23c4-4444-b94e-4cf48961a993\",\"ttft_stream_ms\":1914,\"time_to_request_ms\":192,\"first_content_frame_ms\":1915,\"queued_turn_count\":0,\"result_index\":0}" + ] + } + ] +} diff --git a/test/gstack-ff-update.test.ts b/test/gstack-ff-update.test.ts index 739e5385b..d6910abf4 100644 --- a/test/gstack-ff-update.test.ts +++ b/test/gstack-ff-update.test.ts @@ -336,10 +336,12 @@ describe.skipIf(process.platform === 'win32')('gstack-ff-update: the install-sco test('the heartbeat and its sleeper are reaped when the bin exits', () => { const fx = makeFixture(); release(fx, { 'notes.txt': 'top UPSTREAM\nmiddle\nbottom\n' }); - const before = execFileSync('bash', ['-c', 'pgrep -f "^sleep 300$" | wc -l'], { encoding: 'utf8', timeout: 30_000 }).trim(); - expect(ff(fx).status).toBe(0); - const after = execFileSync('bash', ['-c', 'sleep 0.3; pgrep -f "^sleep 300$" | wc -l'], { encoding: 'utf8', timeout: 30_000 }).trim(); - expect(after).toBe(before); + const beat = String(3000 + (process.pid % 997)); + const sleepers = (delay = '') => execFileSync('bash', ['-c', `${delay}pgrep -f "^sleep ${beat}$" | wc -l`], { encoding: 'utf8', timeout: 30_000 }).trim(); + const before = sleepers(); + expect(before).toBe('0'); + expect(ff(fx, 'origin/main', { GSTACK_FF_HEARTBEAT_SECONDS: beat }).status).toBe(0); + expect(sleepers('sleep 0.3; ')).toBe(before); }); }); diff --git a/test/gstack-skill-start.test.ts b/test/gstack-skill-start.test.ts index 6669cb711..63f1f9999 100644 --- a/test/gstack-skill-start.test.ts +++ b/test/gstack-skill-start.test.ts @@ -932,7 +932,7 @@ describe('gstack-skill-start install admission', () => { const elsewhere = verdict(gh, {}, path.join(gh, 'named.json')); fs.rmSync(path.join(gh, 'install-verdicts'), { recursive: true, force: true }); expect(start(gh, 'autoplan', { ...capy, GSTACK_INSTALL_VERDICT: elsewhere }).status).toBe(0); - }); + }, 20_000); test('an installed runtime root follows its .source-path to the source checkout for the verdict and HEAD', () => { const gh = scratch(); diff --git a/test/helpers/context-restore-fragment.ts b/test/helpers/context-restore-fragment.ts new file mode 100644 index 000000000..199f4f6e3 --- /dev/null +++ b/test/helpers/context-restore-fragment.ts @@ -0,0 +1,34 @@ +/** + * Verdict for the context-restore-fragment-match E2E: which checkpoint did the + * agent restore? The evidence is the agent's own report (top-level assistant + * text plus the final result), never tool output. Restore has to inspect the + * candidates to find the one whose title matches, so every checkpoint body can + * appear in Bash or Read output without being the restored context. + */ +export interface FragmentRestoreRun { + output?: string; + transcript?: any[]; +} + +export function agentReport(result: FragmentRestoreRun): string { + const parts: string[] = []; + for (const event of result.transcript || []) { + if (event?.type !== 'assistant' || event.parent_tool_use_id) continue; + for (const block of event.message?.content || []) { + if (block?.type === 'text' && typeof block.text === 'string') parts.push(block.text); + } + } + if (result.output) parts.push(result.output); + return parts.join('\n'); +} + +export function fragmentRestoreVerdict( + result: FragmentRestoreRun, + markers: { restored: string; others: string[] }, +): { loadedTarget: boolean; didNotLoadOthers: boolean } { + const report = agentReport(result); + return { + loadedTarget: report.includes(markers.restored), + didNotLoadOthers: markers.others.every((marker) => !report.includes(marker)), + }; +} diff --git a/test/helpers/free-fixtures-data.ts b/test/helpers/free-fixtures-data.ts index d8b7c8440..d7bd733fa 100644 --- a/test/helpers/free-fixtures-data.ts +++ b/test/helpers/free-fixtures-data.ts @@ -60,6 +60,7 @@ export const FREE_FIXTURES: Readonly> = { 'test/fixtures/codex-sandbox/**': ['test/codex-eval-recording.test.ts', 'test/codex-model-probe.test.ts', 'test/outside-review-result.test.ts', 'test/outside-voice-invocation.test.ts'], 'test/fixtures/context-bill/**': ['test/context-bill.test.ts', 'test/context-budget-ratchet.test.ts'], 'test/fixtures/context-budget.json': ['test/helpers/capture-context-budget.ts', 'test/test-value-bar.test.ts'], + 'test/fixtures/context-restore-fragment-match-captures.json': ['test/context-restore-fragment-verdict.test.ts'], 'test/fixtures/coverage-audit-cd-chain.json': ['test/coverage-audit-evidence.test.ts'], 'test/fixtures/coverage-audit-parallel-column.json': ['test/coverage-audit-evidence.test.ts'], 'test/fixtures/coverage-audit-separator-collision.json': ['test/coverage-audit-evidence.test.ts'], diff --git a/test/helpers/llm-judge.ts b/test/helpers/llm-judge.ts index d0bc6bbbe..a3177665b 100644 --- a/test/helpers/llm-judge.ts +++ b/test/helpers/llm-judge.ts @@ -187,6 +187,13 @@ export async function callJudge( .filter(block => block.type === 'text') .map(block => block.text) .join('\n'); + const parseJudgeText = (json: string): T => { + try { + return JSON.parse(json) as T; + } catch (error) { + throw new SyntaxError(`Judge response is not valid JSON (stop_reason=${response.stop_reason}, ${json.length} chars; full text in llm-judge-response-parse-error): ${error instanceof Error ? error.message : String(error)}`); + } + }; try { if (response.stop_reason === 'max_tokens') { throw new Error(`Judge response truncated at max_tokens=${maxTokens} (model=${resolvedModel})`); @@ -194,11 +201,11 @@ export async function callJudge( if (response.stop_reason === 'refusal') throw new JudgeRefusalError(response); if (opts?.jsonSchema !== undefined) { if (response.stop_reason !== 'end_turn') throw new Error(`Structured judge did not complete: stop_reason=${response.stop_reason}`); - return JSON.parse(text) as T; + return parseJudgeText(text); } const jsonMatch = text.match(/\{[\s\S]*\}/); if (!jsonMatch) throw new Error(`Judge returned non-JSON: ${text.slice(0, 200)}`); - return JSON.parse(jsonMatch[0]) as T; + return parseJudgeText(jsonMatch[0]); } catch (error) { // The canonical full stderr spool retains this public response even when // parsing fails before a caller can record a judgment. Never copy content diff --git a/test/helpers/touchfiles-data.ts b/test/helpers/touchfiles-data.ts index 1e9b5f62d..8c8856d66 100644 --- a/test/helpers/touchfiles-data.ts +++ b/test/helpers/touchfiles-data.ts @@ -682,15 +682,15 @@ export const E2E_TOUCHFILES: Record = { // test/skill-e2e-context-skills.test.ts. These are periodic-tier because // each one spawns claude -p and costs ~$0.20-$0.40. Collectively they // verify the thing the /checkpoint → /context-save rename was for. - 'context-save-routing': [ 'context-save/**', 'scripts/resolvers/preamble.ts', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts'], - 'context-save-then-restore-roundtrip': ['bin/gstack-state-root.sh', 'lib/state-root.ts', 'context-save/**', 'context-restore/**', 'bin/gstack-slug', 'bin/gstack-remote-identity.sh', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts'], - 'context-restore-fragment-match': [ 'context-restore/**', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts'], - 'context-restore-provenance-order': ['context-save/**', 'context-restore/**', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts'], - 'context-restore-empty-state': [ 'context-restore/**', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts'], - 'context-restore-list-delegates': [ 'context-restore/**', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts'], - 'context-restore-legacy-compat': [ 'context-restore/**', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts'], - 'context-save-list-current-branch': [ 'context-save/**', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts'], - 'context-save-list-all-branches': [ 'context-save/**', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts'], + 'context-save-routing': [ 'context-save/**', 'scripts/resolvers/preamble.ts', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts', 'test/helpers/context-restore-fragment.ts'], + 'context-save-then-restore-roundtrip': ['bin/gstack-state-root.sh', 'lib/state-root.ts', 'context-save/**', 'context-restore/**', 'bin/gstack-slug', 'bin/gstack-remote-identity.sh', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts', 'test/helpers/context-restore-fragment.ts'], + 'context-restore-fragment-match': [ 'context-restore/**', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts', 'test/helpers/context-restore-fragment.ts'], + 'context-restore-provenance-order': ['context-save/**', 'context-restore/**', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts', 'test/helpers/context-restore-fragment.ts'], + 'context-restore-empty-state': [ 'context-restore/**', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts', 'test/helpers/context-restore-fragment.ts'], + 'context-restore-list-delegates': [ 'context-restore/**', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts', 'test/helpers/context-restore-fragment.ts'], + 'context-restore-legacy-compat': [ 'context-restore/**', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts', 'test/helpers/context-restore-fragment.ts'], + 'context-save-list-current-branch': [ 'context-save/**', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts', 'test/helpers/context-restore-fragment.ts'], + 'context-save-list-all-branches': [ 'context-save/**', 'test/skill-e2e-context-skills.test.ts', 'bin/gstack-skill-start', 'test/helpers/shipped-skill-routing.ts', 'test/helpers/context-restore-fragment.ts'], // Document-release 'document-release': [ 'test/helpers/outside-voice-evidence.ts', 'bin/gstack-version-bump', 'document-release/**', 'test/skill-e2e-workflow.test.ts', 'test/fixtures/coverage-audit-fixture.ts', 'test/helpers/coverage-audit.ts', 'test/helpers/coverage-audit-evidence.ts', 'test/helpers/office-hours-attempt.ts'], diff --git a/test/llm-judge-frontier.test.ts b/test/llm-judge-frontier.test.ts index 5e57344a6..e326ff0d0 100644 --- a/test/llm-judge-frontier.test.ts +++ b/test/llm-judge-frontier.test.ts @@ -218,6 +218,22 @@ describe('frontier Claude judge compatibility', () => { expect(create).toHaveBeenCalledTimes(1); }); + // Train-4 gate 40173759210 slice 4 attempt 1: Sonnet's free-form cookie workflow judgment left the quotes around "one `--domain` per run" unescaped. + const COOKIE_GATE_UNESCAPED_REPLY = "{\"clarity\": 4, \"completeness\": 4, \"actionability\": 4, \"reasoning\": \"The workflow is well ordered: Aside check, then consent questions before any `$B` command, then daemon prep, import, and an honest three-line report. It states the boundaries precisely: profile directory vs display name, `--all` exclusions, Chromium-only reset with its non-rollback caveat, and the rule that copied cookies, counts, and HTTP 200 never prove sign-in. The error and failure-reason tables cover recovery and platform limits. Gaps and ambiguities remain. (1) Step 3.1 sets env vars and runs `$B stop` before `$B status` and `goto`, which is workable but slightly awkward. (2) Step 2 says to ask everything before any `$B` command, yet it also needs the Aside probe, which comes earlier in step 1 and so is an implicit exception. (3) It is unclear how the picker or direct import maps the receipt's states to the three report lines, such as `Imported: ` for partial or failed results, or the storage-reset line when the picker is used. (4) The `--all` flow is not given a command example or a step. (5) For the multiple-domain case the instruction is \"one `--domain` per run\", but it does not say how to handle the target tab or the receipt across runs. (6) `decryption_failed` says to close the source browser, which sits in tension with the Chrome 136+ note, though it is not contradictory. (7) The `handoff` path requires a display, and the fallback when none is available is not defined beyond 'offer only with a display'. (8) The Windows example's `$B reload` without verification is fine, but the unverified case is not tied to the report. Overall it is strong with a few minor missing decisions.\"}"; + + test('the captured cookie judge reply fails closed and names the judge output, stop reason and retained text', async () => { + create.mockResolvedValue({ id: 'msg_011CgNbBNCNcZ2C6WJDCmjgU', model: 'claude-sonnet-5-5', stop_reason: 'end_turn', + content: [{ type: 'text', text: COOKIE_GATE_UNESCAPED_REPLY }], usage: { input_tokens: 4521, output_tokens: 572 } } as never); + let failure: unknown; + try { await callJudge('score the workflow', 'claude-sonnet-5-5'); } catch (error) { failure = error; } + expect(failure).toBeInstanceOf(SyntaxError); + expect((failure as Error).message).toStartWith(`Judge response is not valid JSON (stop_reason=end_turn, ${COOKIE_GATE_UNESCAPED_REPLY.length} chars; full text in llm-judge-response-parse-error): `); + expect(create).toHaveBeenCalledTimes(1); + expect(diagnostics).toHaveBeenCalledTimes(1); + expect(JSON.parse(diagnostics.mock.calls[0][0])).toMatchObject({ type: 'llm-judge-response-parse-error', stopReason: 'end_turn', + textBlocks: [COOKIE_GATE_UNESCAPED_REPLY], error: { name: 'SyntaxError', message: (failure as Error).message } }); + }); + test('a weak structured score still fails the substance bar', async () => { create.mockResolvedValue({ stop_reason: 'end_turn', content: [{ type: 'text', text: JSON.stringify({ reason_substance: 1, reasoning: 'Boilerplate.' }) }] } as never); diff --git a/test/qa-only-fixture.test.ts b/test/qa-only-fixture.test.ts index 004b5c65e..af853d920 100644 --- a/test/qa-only-fixture.test.ts +++ b/test/qa-only-fixture.test.ts @@ -19,7 +19,7 @@ test('QA-only fixture helpers and owned sections select the no-fix consumer', () }); test.each(['success', 'max-turns', 'dependencies', 'metadata', 'edit', 'source-write', 'source-delete', 'source-add', 'setup', 'runner', 'recording', 'runner-recording', 'artifact-error', - 'process-error', 'slow-setup', 'exhausted-setup', 'late-timeout', 'late-retry', 'late-failure-retry', 'unknown-timeout', + 'process-error', 'slow-setup', 'exhausted-setup', 'late-timeout', 'late-retry', 'late-slow-retry', 'late-failure-retry', 'unknown-timeout', 'cleanup', 'cleanup-retry', 'runner-cleanup', 'cleanup-recording', 'remove-error', 'server-stop', 'missing-deadline', 'unguarded-probe', 'forged-receipt', 'deadline-write', 'reset-deadline', 'preparation-missing', 'preparation-failed', 'preparation-unacknowledged', 'preparation-wrong-path', 'preparation-late', @@ -47,11 +47,12 @@ if (scenario === 'remove-error') spyOn(fs, 'rmSync').mockImplementation((target, return originalRm(target, options); }); mock.module(path.join(root, 'test/helpers/eval-store.ts'), () => ({ getProjectEvalDir: () => ${JSON.stringify(path.join(dir, 'evals'))} })); -const late = scenario.startsWith('late-'), workMs = 1000, drainMs = 80; +const late = scenario.startsWith('late-'), lateRetry = ['late-retry', 'late-slow-retry'].includes(scenario), workMs = 1000, drainMs = 80; const realNow = Date.now, controlledClock = ['slow-setup', 'exhausted-setup'].includes(scenario); const clockStart = realNow(); -let clock = clockStart; +let clock = clockStart, frozenAt; if (controlledClock) Date.now = () => clock; +else if (late) Date.now = () => frozenAt ?? realNow(); let finalized = false, outerMs; const collector = { addTest: row => { const cwd = directories.at(-1); @@ -77,8 +78,7 @@ mock.module(path.join(root, 'test/helpers/e2e-helpers.ts'), () => ({ testConcurrentIfSelected: (id, body, budget) => { if (id !== 'qa-only-no-fix') return; outerMs = budget; - const deadline = late ? (budget >= workMs + 5000 ? budget - 5000 + 500 : budget) : 5000; - test(id, body, deadline); + test(id, late ? () => { frozenAt = realNow(); return body(); } : body, late ? budget : 5000); }, copyDirSync: (source, target) => { if (scenario === 'setup') throw new Error('QA-only setup failed'); @@ -87,6 +87,7 @@ mock.module(path.join(root, 'test/helpers/e2e-helpers.ts'), () => ({ setupBrowseShims: cwd => { directories.push(cwd); fs.mkdirSync(path.join(cwd, 'browse/bin'), { recursive: true }); if (controlledClock) clock += scenario === 'slow-setup' ? 295000 : 300000; + if (scenario === 'late-slow-retry') Bun.sleepSync(workMs + 100); }, logCost() {}, createEvalCollector: () => collector, finalizeEvalCollector: async () => { finalized = true; }, recordE2E: (_collector, name, suite, result, extra) => collector.addTest({ name, suite, @@ -96,6 +97,7 @@ mock.module(path.join(root, 'test/helpers/e2e-helpers.ts'), () => ({ mock.module(path.join(root, 'test/helpers/session-runner.ts'), () => ({ SESSION_DRAIN_GRACE_MS: late ? drainMs : 5000, runSkillTest: async options => { + frozenAt = undefined; const cwd = options.workingDirectory; const fact = { cwd, exists: fs.existsSync(cwd), recordedBeforeCapture: records.length, reportBefore: fs.existsSync(path.join(cwd, 'qa-reports/qa-only-report.md')), captureMs: options.timeout, @@ -145,7 +147,7 @@ mock.module(path.join(root, 'test/helpers/session-runner.ts'), () => ({ fact.existsAfterDrain = fs.existsSync(cwd); return { ...result, exitReason: 'timeout' }; } - if (late && (scenario !== 'late-retry' || attempts.length === 1)) { + if (late && (!lateRetry || attempts.length === 1)) { await new Promise(resolve => setTimeout(resolve, options.timeout + drainMs)); fact.existsAfterDrain = fs.existsSync(cwd); return { ...result, exitReason: 'timeout' }; @@ -237,7 +239,7 @@ await import(path.join(root, 'test/skill-e2e-qa-workflow.test.ts')); expect(records[index].cleanupDone).toBe(true); expect(cleanups[index].budget).toBeGreaterThan(0); expect(cleanups[index].budget).toBeLessThanOrEqual(4000); - expect(records[index].passed).toBe(scenario === 'recording' || !shouldFail && !(['late-retry', 'cleanup-retry'].includes(scenario) && index === 0)); + expect(records[index].passed).toBe(scenario === 'recording' || !shouldFail && !(['late-retry', 'late-slow-retry', 'cleanup-retry'].includes(scenario) && index === 0)); if (scenario.includes('cleanup') && !(scenario === 'cleanup-retry' && index === 1)) expect(records[index].error).toContain('QA-only browser cleanup: invalid daemon identity'); } for (const [index, attempt] of attempts.entries()) { @@ -257,6 +259,7 @@ await import(path.join(root, 'test/skill-e2e-qa-workflow.test.ts')); } if (scenario.startsWith('late-')) { expect(outerMs).toBe(1000 + 80 + 5000); + for (const attempt of attempts) expect(attempt.captureMs).toBe(1000); expect(records[0]).toMatchObject({ passed: false, exit_reason: 'timeout', cost_usd: 0.25 }); expect(records[0].error).toContain('timeout'); if (count === 2) expect(directories[0]).not.toBe(directories[1]); diff --git a/test/skill-e2e-context-skills.test.ts b/test/skill-e2e-context-skills.test.ts index 31f214505..c76697a4a 100644 --- a/test/skill-e2e-context-skills.test.ts +++ b/test/skill-e2e-context-skills.test.ts @@ -23,6 +23,7 @@ import { } from './helpers/e2e-helpers'; import { extractSkillBody } from './helpers/skill-fixture'; import { readShippedSkillRouting } from './helpers/shipped-skill-routing'; +import { fragmentRestoreVerdict } from './helpers/context-restore-fragment'; import { spawnSync } from 'child_process'; import * as fs from 'fs'; import * as path from 'path'; @@ -260,11 +261,14 @@ Do NOT use AskUserQuestion.`, logCost('context-restore-fragment-match', result); - // Broader surface — agent may stop at Skill call without echoing the - // body marker. The payments file's body is in tool outputs (Read/Bash). - const out = fullOutputSurface(result); - const loadedPayments = out.includes('FRAGMATCH_PAYMENTS_BUILD'); - const didNotLoadOthers = !out.includes('FRAGMATCH_ALPHA_BUILD') && !out.includes('FRAGMATCH_OMEGA_BUILD'); + // What was restored is what the agent reports, not what its tools printed: + // finding the matching title can cat every checkpoint, so all three bodies + // may appear in Bash/Read output. The report must carry the payments body + // and no other checkpoint's body. + const { loadedTarget: loadedPayments, didNotLoadOthers } = fragmentRestoreVerdict(result, { + restored: 'FRAGMATCH_PAYMENTS_BUILD', + others: ['FRAGMATCH_ALPHA_BUILD', 'FRAGMATCH_OMEGA_BUILD'], + }); const routedToRestore = skillCalls(result).includes('context-restore'); const exitOk = ['success', 'error_max_turns'].includes(result.exitReason); diff --git a/test/test-of-test-ratchet.test.ts b/test/test-of-test-ratchet.test.ts index bffa2c402..983429d25 100644 --- a/test/test-of-test-ratchet.test.ts +++ b/test/test-of-test-ratchet.test.ts @@ -60,6 +60,7 @@ const BASELINE = [ 'test/codex-carve-fixture.test.ts', 'test/codex-eval-recording.test.ts', 'test/codex-resume-flag-semantics.test.ts', + 'test/context-restore-fragment-verdict.test.ts', // GSTA-91: replays three captured false reds (0/3 on main cb99df4) through the paid context-restore-fragment-match case's fragmentRestoreVerdict 'test/cookie-workflow-judge-input.test.ts', // slices test/skill-llm-eval.test.ts source (recorded 2026-10 when the ratchet learned paid-source slicing) 'test/cso-ntfs-fixture.test.ts', 'test/cso-windows-build-contract.test.ts', From 1c28c09b763307fb4c125fef595dc297d7d10446 Mon Sep 17 00:00:00 2001 From: Garry Tan Date: Sun, 25 Oct 2026 16:54:50 -0700 Subject: [PATCH 2/9] fix(plan-tune): map the clicked AskUserQuestion label to the registered option key at capture (#2623) (#3394) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --- CHANGELOG.md | 14 ++++ VERSION | 2 +- agents-digest/gstack-AGENTS.md | 2 +- bin/gstack-question-log | 29 +++++++- package.json | 2 +- scripts/psychographic-signals.ts | 83 +++++++++++++++++++++ test/plan-tune.test.ts | 120 +++++++++++++++++++++++++++++++ 7 files changed, 246 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38c5d4c45..234ee019f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [1.91.223.0] - 2026-10-25 + +**/plan-tune's inferred profile finally moves: a clicked answer is logged as the question's registered option key, not its label.** #2623 showed every inferred dimension stuck at 0.5 on a 1,286-event log: the AskUserQuestion hook recorded labels like "A) Fix it now (recommended)", while the signal map that turns answers into dimension nudges is keyed by registered option keys like `fix-now`, so 0 of 1,286 answers matched. Now five hook-captured label answers to the registered architecture-finding question move `architecture_care` from 0.5 to 0.632, and `--trace` lists all five. + +### Fixed +- **`bin/gstack-question-log`**: on a hook-captured event (`source: hook`) for a registered `question_id`, the clicked label is mapped to that question's registered option key before it is written, and the label is kept in a new `choice_label` field. A label in `recommended` is mapped the same way, so `followed_recommendation` compares keys. Ad-hoc and `hook-` ids and unmatched or ambiguous labels are written as given. Rows from other writers (the agent's own log call, auto-decide, Codex import, typed free text) are unchanged, because readers such as the plan-ceo-review auto-decide check match the full mode names those rows carry. Existing logs are not rewritten. +- **`scripts/psychographic-signals.ts`**: new `resolveOptionKey(question_id, label)`. It strips the `A)` selector and `(recommended)` suffix, then matches the label's leading words against the question's own options only: each key's own words (`fix-now` → "fix now") plus a short cue list ("Add to TODOs" → `defer`, "Ship as-is" → `skip`, "HOLD SCOPE" → `hold`). The longest cue wins and a tie stays unmapped. + +### Tests +- `test/plan-tune.test.ts`: every registered option resolves from its own words, bare and as an `A) … (recommended)` label; 20 common phrasings, including the four plan-ceo-review mode names, map to their keys; negative controls (unregistered ids, a question with no options, a label naming no option, a mid-sentence cue, another question's key, a number that looks like a selector) stay unmapped. Two capture tests run the real bin: hook labels become keys with `choice_label` kept, while agent rows (including a `HOLD SCOPE` auto-decide row), ad-hoc ids, unmatched labels and free text are untouched, and a picked label follows a key recommendation. Both capture tests fail against the old bin. + +### Gate integrity +- No test expectation, threshold, budget, timeout, trial count or case kind changed. Existing tests that pin label rows from the agent, auto-decide and Codex import paths pass unchanged. + ## [1.91.222.0] - 2026-10-25 **Five flaky tests now fail only for real defects, and a judge reply that isn't valid JSON says so in its failure line (daily flaky-fix pass, GSTA-91).** `context-restore-fragment-match` failed 0/3 on main cb99df4, although every run restored the right checkpoint: to find the checkpoint whose title matches, the agent often prints all three, and the case failed whenever another checkpoint's body appeared anywhere in the transcript. `test/gstack-ff-update.test.ts` counted every `sleep 300` on the machine, so heartbeats from parallel test files changed its count (remote pregate at #3412's head: expected "1", received "3"). The `GSTACK_CAPY=1` install-admission case in `test/gstack-skill-start.test.ts` makes ten `gstack-skill-start` spawns under bun's 5 s default timeout and took 3.6–5.7 s on a 4-core machine. The QA-only fixture's late scenarios mocked a 1000 ms capture budget but ran each attempt's real setup inside it. The setup-browser-cookies workflow judge in train-4 gate 40173759210 returned JSON with an unescaped quote in its reasoning, and the flake record read only "JSON Parse error: Expected '}'". diff --git a/VERSION b/VERSION index f9722c1cb..999c96dfa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.91.222.0 +1.91.223.0 diff --git a/agents-digest/gstack-AGENTS.md b/agents-digest/gstack-AGENTS.md index b0dec46e0..fc6fd4bae 100644 --- a/agents-digest/gstack-AGENTS.md +++ b/agents-digest/gstack-AGENTS.md @@ -1,4 +1,4 @@ -# gstack digest v1.91.222.0 — regenerate/re-copy after upgrading gstack +# gstack digest v1.91.223.0 — regenerate/re-copy after upgrading gstack Behavioral rules from gstack (https://github.com/garrytan/gstack), compressed for agent hosts without a full skill install. The full skills add workflows, diff --git a/bin/gstack-question-log b/bin/gstack-question-log index e1722f95f..7d7fd7b00 100755 --- a/bin/gstack-question-log +++ b/bin/gstack-question-log @@ -18,8 +18,13 @@ # door_type — one-way | two-way # (optional — looked up from registry if omitted) # options_count — number of options presented (positive integer) -# user_choice — key user selected (free string; registry-options preferred) -# recommended — option key the agent recommended (optional) +# user_choice — key user selected (free string; registry-options preferred). +# On hook-captured events (source=hook) for a registered +# question_id, the clicked UI label is mapped to its +# registered option key (#2623) and kept in choice_label. +# Unmatched labels and other sources stay as given. +# recommended — option key the agent recommended (optional; mapped +# the same way on hook-captured events) # followed_recommendation — bool (optional — computed if both present) # session_id — stable session identifier # ts — ISO 8601 timestamp (auto-injected if missing) @@ -46,8 +51,9 @@ INPUT="$1" TMPERR=$(mktemp "${TMPDIR:-/tmp}/gstack-question-log.XXXXXX") || { echo "gstack-question-log: could not create a temp file in ${TMPDIR:-/tmp}, so the question was not logged. Fix: point TMPDIR at a writable directory." >&2; exit 1; } trap 'rm -f "$TMPERR"' EXIT set +e -VALIDATED=$(printf '%s' "$INPUT" | GSTACK_LIB_DIR="$SCRIPT_DIR/../lib" bun --no-env-file --config=/dev/null -e " +VALIDATED=$(printf '%s' "$INPUT" | GSTACK_LIB_DIR="$SCRIPT_DIR/../lib" GSTACK_SCRIPTS_DIR="$SCRIPT_DIR/../scripts" bun --no-env-file --config=/dev/null -e " const { hasInjection } = await import(process.env.GSTACK_LIB_DIR + '/jsonl-store.ts'); +const { resolveOptionKey } = await import(process.env.GSTACK_SCRIPTS_DIR + '/psychographic-signals.ts'); const path = require('path'); const raw = await Bun.stdin.text(); let j; @@ -173,6 +179,23 @@ if (j.recommended !== undefined) { if (j.recommended.length > 64) j.recommended = j.recommended.slice(0, 64); } +// Map the clicked UI label to its registered option key (#2623). SIGNAL_MAP +// and question preferences are keyed by the registry's option keys, but the +// PostToolUse hook only sees the label. Hook events and registered ids only; +// an unmatched or ambiguous label stays as given. Agent-written rows keep +// what the agent logged: skills such as plan-ceo-review log full mode names +// that their own readers match on. +if (j.source === 'hook') { + const key = resolveOptionKey(j.question_id, j.user_choice); + if (key !== undefined && key !== j.user_choice) { + j.choice_label = j.user_choice; + j.user_choice = key; + } + if (j.recommended !== undefined) { + j.recommended = resolveOptionKey(j.question_id, j.recommended) ?? j.recommended; + } +} + // followed_recommendation — compute if both sides present. An __unknown__ // choice means extraction failed, not that the user rejected the // recommendation — leave the field absent so metrics can't be poisoned. diff --git a/package.json b/package.json index 7f40e8da9..28dbec666 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gstack", - "version": "1.91.222", + "version": "1.91.223", "description": "Garry's Stack — Claude Code skills + fast headless browser. One repo, one install, entire AI engineering workflow.", "license": "MIT", "type": "module", diff --git a/scripts/psychographic-signals.ts b/scripts/psychographic-signals.ts index decc8c6d5..43d4a89ab 100644 --- a/scripts/psychographic-signals.ts +++ b/scripts/psychographic-signals.ts @@ -223,6 +223,89 @@ export const SIGNAL_MAP: Record> = { }, }; +/** + * Label cues: option key → leading words of UI labels that mean that key. + * + * The AskUserQuestion hook only sees the label the user clicked ("A) Fix it + * now (recommended)"), never a stable key, while SIGNAL_MAP is keyed by the + * registry's option keys (#2623). resolveOptionKey() maps a label back to a + * key when bin/gstack-question-log records a hook event. Every key also + * matches its own words ("fix-now" → "fix now"), so only phrasings beyond + * that need an entry here. Cues are + * lowercase words separated by single spaces and match at the start of the + * normalized label; candidates are limited to the question's own registered + * options, and the longest cue wins. + */ +const OPTION_LABEL_CUES: Record = { + accept: ['yes', 'approve', 'agree', 'add', 'include', 'apply', 'adopt', 'enable', 'go ahead', 'do it', 'proceed', 'run', 'create', 'merge', 'roll back', 'migrate', 'open', 'promote', 'reorganize', 'polish'], + reject: ['no', 'disagree', 'decline', 'cancel', 'abort', 'dont', 'do not', 'keep current', 'keep as is', 'keep it as is'], + skip: ['no', 'no thanks', 'not now', 'dont', 'do not', 'pass', 'drop', 'ignore', 'leave it', 'ship as is', 'ship it as is'], + defer: ['later', 'fix later', 'add to todos', 'add to todo', 'add a todo', 'todo', 'postpone', 'backlog', 'park', 'track it'], + 'fix-now': ['fix', 'fix it', 'fix them', 'fix before shipping'], + 'fix-anyway': ['fix', 'fix it'], + investigate: ['dig in', 'look into', 'debug', 'diagnose', 'root cause'], + 'ack-and-ship': ['ack', 'acknowledge', 'ship', 'ship anyway', 'ship it'], + 'accept-risk': ['accept', 'accept the risk', 'live with it'], + 'false-positive': ['not a bug', 'mark false positive', 'mark as false positive', 'mark it false positive'], + 'add-test': ['add', 'add tests', 'add the test', 'write', 'write the test', 'test it'], + expand: ['scope expansion'], + selective: ['cherry pick', 'selective expansion'], + hold: ['keep', 'keep scope', 'hold scope'], + reduce: ['cut', 'trim', 'shrink', 'scope down', 'scope reduction'], + revise: ['edit', 'change', 'rework'], + restart: ['start over', 'redo'], + 'build-now': ['build', 'build it now', 'include in this pr'], + 'keep-local': ['keep'], + 'keep-vendored': ['keep'], + 'yes-upgrade': ['yes', 'upgrade'], + 'always-auto': ['always'], + 'not-now': ['later', 'snooze'], + 'never-ask': ['never', 'disable'], +}; + +function normalizeOptionLabel(label: string): string { + return label + .toLowerCase() + .replace(/\s*\(recommended\)\s*$/, '') + .replace(/['\u2019]/g, '') + .replace(/^\s*(?:option\s+)?[a-z0-9]\s*(?:[).:]|-(?=\s))\s+/, '') + .replace(/[^a-z0-9]+/g, ' ') + .trim(); +} + +/** + * Map a chosen UI label to the registered option key of its question. + * + * Returns the key when exactly one of the question's registered options + * matches with the longest cue; undefined for unregistered ids, questions + * without options, unmatched labels and ties, so an unclear answer stays + * unmapped instead of nudging the wrong dimension. + */ +export function resolveOptionKey(question_id: string, choice: string): string | undefined { + const options = (QUESTIONS as Record)[question_id]?.options as string[] | undefined; + if (!options?.length) return undefined; + if (options.includes(choice)) return choice; + const label = normalizeOptionLabel(choice); + if (!label) return undefined; + let best: string | undefined; + let bestWords = 0; + let tie = false; + for (const key of options) { + for (const cue of [key.replace(/-/g, ' '), ...(OPTION_LABEL_CUES[key] ?? [])]) { + if (label !== cue && !label.startsWith(cue + ' ')) continue; + const words = cue.split(' ').length; + if (words > bestWords) { + best = key; + bestWords = words; + tie = false; + } else if (words === bestWords && best !== key) { + tie = true; + } + } + } + return tie ? undefined : best; +} + /** * Apply a user choice for a question to the running dimension totals. * diff --git a/test/plan-tune.test.ts b/test/plan-tune.test.ts index a615e95fe..413ed07f9 100644 --- a/test/plan-tune.test.ts +++ b/test/plan-tune.test.ts @@ -33,6 +33,7 @@ import { validateRegistrySignalKeys, newDimensionTotals, normalizeToDimensionValue, + resolveOptionKey, ALL_DIMENSIONS, } from '../scripts/psychographic-signals'; import { @@ -290,6 +291,125 @@ describe('psychographic signal map', () => { }); }); +// ----------------------------------------------------------------------- +// #2623 — chosen UI label → registered option key at capture time +// ----------------------------------------------------------------------- + +describe('option label → registered key (#2623)', () => { + const words = (key: string) => key.replace(/-/g, ' '); + const title = (s: string) => s.charAt(0).toUpperCase() + s.slice(1); + + test('every registered option resolves from its own words, as a bare label and as an AUQ label', () => { + const misses: string[] = []; + for (const q of Object.values(QUESTIONS as Record)) { + for (const key of (q.options ?? []) as string[]) { + for (const label of [key, words(key), `A) ${title(words(key))} (recommended)`, `B. ${title(words(key))}`]) { + if (resolveOptionKey(q.id, label) !== key) misses.push(`${q.id}: ${JSON.stringify(label)} → ${resolveOptionKey(q.id, label)}`); + } + } + } + expect(misses).toEqual([]); + }); + + test('common phrasings map to the question\'s own key', () => { + const cases: Array<[string, string, string]> = [ + ['plan-eng-review-arch-finding', 'A) Fix it now (recommended)', 'fix-now'], + ['plan-eng-review-arch-finding', 'Fix later', 'defer'], + ['plan-eng-review-arch-finding', 'B) Defer to TODOS.md', 'defer'], + ['plan-eng-review-arch-finding', 'C) Accept the risk and ship', 'accept-risk'], + ['plan-ceo-review-expansion-proposal', 'A) Add to plan (recommended)', 'accept'], + ['plan-ceo-review-expansion-proposal', 'B) Add to TODOs', 'defer'], + ['plan-ceo-review-mode', 'A) Expand scope (Recommended)', 'expand'], + ['plan-ceo-review-mode', 'A) SCOPE EXPANSION', 'expand'], + ['plan-ceo-review-mode', 'B) SELECTIVE EXPANSION', 'selective'], + ['plan-ceo-review-mode', 'C) HOLD SCOPE (recommended)', 'hold'], + ['plan-ceo-review-mode', 'D) SCOPE REDUCTION', 'reduce'], + ['plan-ceo-review-mode', 'Cherry-pick expansions', 'selective'], + ['plan-ceo-review-mode', 'Cut to the minimum', 'reduce'], + ['ship-pre-landing-review-fix', 'Ship as-is', 'skip'], + ['ship-test-failure-triage', 'Ship anyway, the failures are known', 'ack-and-ship'], + ['review-finding-fix', 'Not a bug, the input is trusted', 'false-positive'], + ['land-and-deploy-merge-confirm', 'Yes, merge it', 'accept'], + ['land-and-deploy-merge-confirm', 'Don’t merge yet', 'reject'], + ['plan-eng-review-test-gap', 'Add the test now', 'add-test'], + ['office-hours-mode-goal', 'Hackathon / demo', 'hackathon'], + ]; + for (const [id, label, key] of cases) { + expect({ id, label, key: resolveOptionKey(id, label) }).toEqual({ id, label, key }); + } + }); + + test('negative controls stay unmapped', () => { + // Unregistered (ad-hoc or hook-hash) ids: no registered options to map to. + expect(resolveOptionKey('plan-eng-review-ci-typecheck', 'Fix now')).toBeUndefined(); + expect(resolveOptionKey('hook-0123456789', 'Accept')).toBeUndefined(); + // Registered question with no options list. + expect(resolveOptionKey('plan-devex-review-persona', 'Accept')).toBeUndefined(); + // A label that names none of the question's options. + expect(resolveOptionKey('plan-eng-review-arch-finding', 'Restore the parallel typecheck job')).toBeUndefined(); + // Cues anchor at the start of the label, never mid-sentence. + expect(resolveOptionKey('review-sql-safety', 'Ship it, then fix')).toBeUndefined(); + expect(resolveOptionKey('review-sql-safety', "Don't fix")).toBeUndefined(); + // Another question's key is not a candidate. + expect(resolveOptionKey('qa-tier', 'Fix now')).toBeUndefined(); + // A selector-looking number is not stripped into a match. + expect(resolveOptionKey('qa-tier', '1.5x deeper')).toBeUndefined(); + expect(resolveOptionKey('plan-eng-review-arch-finding', '')).toBeUndefined(); + }); + + function logAndRead(entries: Array>): Array> { + const tmpHome = fs.mkdtempSync(path.join(require('os').tmpdir(), 'gstack-2623-')); + try { + const { spawnSync } = require('child_process'); + const env = { ...process.env, GSTACK_HOME: tmpHome, GSTACK_QUESTION_LOG_NO_DERIVE: '1' }; + const logBin = path.join(ROOT, 'bin', 'gstack-question-log'); + for (const e of entries) { + const r = spawnSync(logBin, [JSON.stringify({ skill: 'plan-eng-review', question_summary: 'q?', ...e })], { env, cwd: ROOT, encoding: 'utf-8', timeout: 30_000 }); + expect(r.status).toBe(0); + } + const [slug] = fs.readdirSync(path.join(tmpHome, 'projects')); + return fs + .readFileSync(path.join(tmpHome, 'projects', slug, 'question-log.jsonl'), 'utf-8') + .trim() + .split('\n') + .map((l) => JSON.parse(l)); + } finally { + fs.rmSync(tmpHome, { recursive: true, force: true }); + } + } + + test('gstack-question-log records the key and keeps the label for hook events on registered ids only', () => { + const [hook, agentKey, agentMode, adHoc, unmatched, freeText] = logAndRead([ + { question_id: 'plan-eng-review-arch-finding', user_choice: 'A) Fix it now (recommended)', recommended: 'Fix it now', source: 'hook' }, + { question_id: 'plan-eng-review-arch-finding', user_choice: 'defer', recommended: 'fix-now' }, + { skill: 'plan-ceo-review', question_id: 'plan-ceo-review-mode', user_choice: 'HOLD SCOPE', recommended: 'HOLD SCOPE', auto_decided: true }, + { question_id: 'plan-eng-review-ci-typecheck', user_choice: 'Fix now', source: 'hook' }, + { question_id: 'plan-eng-review-arch-finding', user_choice: 'Restore the parallel typecheck job', source: 'hook' }, + { question_id: 'plan-eng-review-arch-finding', user_choice: 'Fix it but rename the module first', free_text: 'Fix it but rename the module first', source: 'auq-other' }, + ]); + expect(hook).toMatchObject({ user_choice: 'fix-now', choice_label: 'A) Fix it now (recommended)', recommended: 'fix-now', followed_recommendation: true }); + expect(agentKey).toMatchObject({ user_choice: 'defer', recommended: 'fix-now', followed_recommendation: false }); + expect(agentKey.choice_label).toBeUndefined(); + // Agent-written rows keep what the agent logged; the auto-decide harness + // matches plan-ceo-review's full mode names. + expect(agentMode).toMatchObject({ source: 'agent', user_choice: 'HOLD SCOPE', recommended: 'HOLD SCOPE', followed_recommendation: true }); + expect(agentMode.choice_label).toBeUndefined(); + expect(adHoc).toMatchObject({ user_choice: 'Fix now' }); + expect(adHoc.choice_label).toBeUndefined(); + expect(unmatched).toMatchObject({ user_choice: 'Restore the parallel typecheck job' }); + expect(unmatched.choice_label).toBeUndefined(); + expect(freeText).toMatchObject({ user_choice: 'Fix it but rename the module first', source: 'auq-other' }); + expect(freeText.choice_label).toBeUndefined(); + }); + + test('a picked label scores as following a key recommendation', () => { + const [row] = logAndRead([ + { question_id: 'plan-ceo-review-mode', user_choice: 'A) Expand scope (Recommended)', recommended: 'expand', source: 'hook' }, + ]); + expect(row).toMatchObject({ user_choice: 'expand', followed_recommendation: true }); + }); +}); + // ----------------------------------------------------------------------- // Archetypes // ----------------------------------------------------------------------- From 2853304d175997fdd1d5f97c3633f70e28d65d9e Mon Sep 17 00:00:00 2001 From: Garry Tan Date: Sun, 25 Oct 2026 17:14:08 -0700 Subject: [PATCH 3/9] v1.91.224.0 fix(context): record the save commit and flag work that landed after it (port of #3316) (#3396) * fix(context): record the save commit and flag work that landed after it /context-save recorded the branch, a timestamp and the modified files, but not the commit, so /context-restore could not tell that work landed after the save. A checkpoint saved before a step was committed came back with that step still listed as the plan. - gstack-slug --stamp-checkpoint also writes head:, the commit the save describes, next to remote:/project_root:/worktree:. - context-restore compares head: with HEAD before presenting. When commits landed after the save it prints how many and lists them, and moves Remaining Work under Verify first; a saved commit that left the branch history is reported the same way. Checkpoints saved before this keep their old sorting with a one-line note. - test/context-restore-head.test.ts runs the real save-path, stamp and head-check blocks in fixture repos: unchanged, moved, diverged after a reset, pre-tracking, and a malformed head: that must never execute. * fix(context-restore): name another branch as a cause when the saved commit is not in history Cross-branch resume (Conductor handoff) is a supported restore path, and there the checkpoint's commit is usually not an ancestor of HEAD. The diverged line said only 'rebased, reset, or not fetched'. It now names 'saved on another branch' first; the new test case covers a save on a feature branch restored from main. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(changelog): unreleased entry for the context head check (port of #3316) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(context-restore): head check passes the fence lint, reads frontmatter only, prefers worktree:, and overrides provenance sorting - The block used a free-text placeholder, , which the generated-bash lint (test/env-host-fence-conformance.test.ts) refuses on every host. It now uses the allowlisted , with prose naming the Step 2 choice. - head:, worktree: and project_root: are read from the leading frontmatter only (sed, no positional $N tokens Claude Code would rewrite), so a head: line in a checkpoint's notes no longer counts. - Outside git, the comparison uses the saved worktree: before project_root:, so a save from a nested linked worktree is not compared with the main tree. - The provenance rules now say they are skipped after HEAD_MOVED, HEAD_DIVERGED or HEAD_UNKNOWN, instead of contradicting the head check. - The re-stamp test checks the exit status and that the head moves. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --------- Co-authored-by: Yao Amevi A. Sossou <47247401+soyames@users.noreply.github.com> Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --- CHANGELOG.md | 11 ++ VERSION | 2 +- agents-digest/gstack-AGENTS.md | 2 +- bin/gstack-slug | 11 +- context-restore/SKILL.md | 47 ++++++- context-restore/SKILL.md.tmpl | 47 ++++++- context-save/SKILL.md | 7 +- context-save/SKILL.md.tmpl | 7 +- package.json | 2 +- test/context-restore-head.test.ts | 202 ++++++++++++++++++++++++++++++ 10 files changed, 323 insertions(+), 15 deletions(-) create mode 100644 test/context-restore-head.test.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 234ee019f..eb48cbce1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [1.91.224.0] - 2026-10-25 + +**`/context-restore` now says when commits landed after a checkpoint was saved, instead of offering finished steps as the plan.** `/context-save` recorded the branch, a timestamp and the modified files, but not the commit, so a checkpoint saved before a step was committed came back with that step still listed under Remaining Work. Ported from #3316 by @soyames, with their commit kept. + +### Fixed +- **`bin/gstack-slug --stamp-checkpoint`** also writes `head:`, the commit the save describes, next to `remote:`, `project_root:` and `worktree:`. A re-stamp replaces it rather than adding a second line. +- **`/context-restore`** compares `head:` with `HEAD` before presenting. When commits landed after the save it prints how many and lists up to ten, and puts every Remaining Work item under Verify first. A saved commit that is not in this checkout's history (saved on another branch, rebased, reset, or not fetched) is reported the same way. A malformed `head:` is checked as 40 or 64 hex digits before any git command sees it, `head:` is read from the frontmatter only, and outside git the comparison uses the saved `worktree:` before `project_root:`. Checkpoints saved before this keep their usual sorting with a one-line note. + +### Tests +- `test/context-restore-head.test.ts` runs the real save-path, stamp and head-check blocks from the generated SKILL.md files in fixture repos: unchanged, two commits landed, diverged after a reset, resumed from another branch, a nested linked worktree restored from outside git, a re-stamp after a new commit, pre-tracking, a `head:` that appears only in the body, and a `head: $(touch pwned)` that must never execute. + ## [1.91.223.0] - 2026-10-25 **/plan-tune's inferred profile finally moves: a clicked answer is logged as the question's registered option key, not its label.** #2623 showed every inferred dimension stuck at 0.5 on a 1,286-event log: the AskUserQuestion hook recorded labels like "A) Fix it now (recommended)", while the signal map that turns answers into dimension nudges is keyed by registered option keys like `fix-now`, so 0 of 1,286 answers matched. Now five hook-captured label answers to the registered architecture-finding question move `architecture_care` from 0.5 to 0.632, and `--trace` lists all five. diff --git a/VERSION b/VERSION index 999c96dfa..b2bda2069 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.91.223.0 +1.91.224.0 diff --git a/agents-digest/gstack-AGENTS.md b/agents-digest/gstack-AGENTS.md index fc6fd4bae..31e965f93 100644 --- a/agents-digest/gstack-AGENTS.md +++ b/agents-digest/gstack-AGENTS.md @@ -1,4 +1,4 @@ -# gstack digest v1.91.223.0 — regenerate/re-copy after upgrading gstack +# gstack digest v1.91.224.0 — regenerate/re-copy after upgrading gstack Behavioral rules from gstack (https://github.com/garrytan/gstack), compressed for agent hosts without a full skill install. The full skills add workflows, diff --git a/bin/gstack-slug b/bin/gstack-slug index 313b31c85..824b9bb27 100755 --- a/bin/gstack-slug +++ b/bin/gstack-slug @@ -8,7 +8,7 @@ # Code sessions refuse eval/source) # Modes (not on the hot path; see `gstack-slug --help`): # --identity also print PROJECT_REMOTE, PROJECT_ROOT, LEGACY_SLUG -# --stamp-checkpoint write remote:/project_root: into a checkpoint's frontmatter +# --stamp-checkpoint write remote:/project_root:/head: into a checkpoint's frontmatter # --classify-checkpoints read checkpoint paths on stdin, print "\t" # --checkpoints-below list other buckets' checkpoints saved below the cwd, plus pointers # --point-from leave a pointer to in 's bucket (nested-repo saves) @@ -138,7 +138,7 @@ gstack-slug — print SLUG= and BRANCH= for the current di field); no eval needed gstack-slug --identity also print PROJECT_REMOTE (canonical, credential-free), PROJECT_ROOT and LEGACY_SLUG (pre-#3003 bucket, if different) - gstack-slug --stamp-checkpoint FILE write remote:/project_root: into FILE's frontmatter + gstack-slug --stamp-checkpoint FILE write remote:/project_root:/head: into FILE's frontmatter gstack-slug --classify-checkpoints read checkpoint paths on stdin; print "", status = match | match-root | foreign | unstamped gstack-slug --checkpoints-below outside git: other buckets' checkpoints whose project_root @@ -682,15 +682,18 @@ case "$MODE" in STAMP_TMP=$(mktemp "${MODE_ARG}.stamp-XXXXXX") || exit 1 STAMP_WORKTREE=$(_git_toplevel "$PROJECT_DIR") [[ "$STAMP_WORKTREE" != "$ID_ROOT" ]] || STAMP_WORKTREE="" - if GRI_REMOTE="$ID_REMOTE" GRI_ROOT="$ID_ROOT" GRI_WORKTREE="$STAMP_WORKTREE" awk ' + # The commit the save describes, so /context-restore can tell when work landed after it. + STAMP_HEAD=$(git -C "$PROJECT_DIR" rev-parse --verify -q HEAD 2>/dev/null) || STAMP_HEAD="" + if GRI_REMOTE="$ID_REMOTE" GRI_ROOT="$ID_ROOT" GRI_WORKTREE="$STAMP_WORKTREE" GRI_HEAD="$STAMP_HEAD" awk ' function ids() { if (ENVIRON["GRI_REMOTE"] != "") print "remote: " ENVIRON["GRI_REMOTE"] print "project_root: " ENVIRON["GRI_ROOT"] if (ENVIRON["GRI_WORKTREE"] != "") print "worktree: " ENVIRON["GRI_WORKTREE"] + if (ENVIRON["GRI_HEAD"] != "") print "head: " ENVIRON["GRI_HEAD"] } NR == 1 { if ($0 == "---") { infm = 1; print; next } print "---"; ids(); print "---" } infm && $0 == "---" { ids(); print; infm = 0; next } - infm && (/^remote:/ || /^project_root:/ || /^worktree:/) { next } + infm && (/^remote:/ || /^project_root:/ || /^worktree:/ || /^head:/) { next } { print } END { if (NR == 0) { print "---"; ids(); print "---" } }' "$MODE_ARG" > "$STAMP_TMP"; then mv "$STAMP_TMP" "$MODE_ARG" diff --git a/context-restore/SKILL.md b/context-restore/SKILL.md index 4238273ad..833dd0f5b 100644 --- a/context-restore/SKILL.md +++ b/context-restore/SKILL.md @@ -527,8 +527,50 @@ checkpoint(s) from another project; only this project's are listed." If it print `LEGACY_BUCKET`, relay that line. If the chosen file is `ROOT_DIFFERS`, add "Saved from another checkout of this repository at `{project_root}`." as info. +**Check whether the branch moved since the save.** The stamp records the commit +the save was made at in `head:`. Before presenting, compare it with this +checkout. FILE is the checkpoint path chosen in Step 2, one of the paths Step 1 +printed: + +```bash +FILE="" +SAVED_HEAD=$(tr -d '\r' < "$FILE" 2>/dev/null | sed -n '1{/^---$/!q;d;}; /^---$/q; /^head:/{s/^head:[[:space:]]*//p;q;}') +REPO_DIR=. +git rev-parse --git-dir >/dev/null 2>&1 || REPO_DIR=$(tr -d '\r' < "$FILE" 2>/dev/null | sed -n '1{/^---$/!q;d;}; /^---$/q; /^worktree:/{s/^worktree:[[:space:]]*//p;q;}') +[ -n "$REPO_DIR" ] || REPO_DIR=$(tr -d '\r' < "$FILE" 2>/dev/null | sed -n '1{/^---$/!q;d;}; /^---$/q; /^project_root:/{s/^project_root:[[:space:]]*//p;q;}') +CURRENT_HEAD=$(git -C "${REPO_DIR:-.}" rev-parse --verify -q HEAD 2>/dev/null) +if [ -z "$SAVED_HEAD" ]; then + echo "HEAD_UNTRACKED" +elif [ -z "$CURRENT_HEAD" ]; then + echo "HEAD_NOT_CHECKED" +elif [ "$SAVED_HEAD" = "$CURRENT_HEAD" ]; then + echo "HEAD_UNCHANGED" +elif ! printf '%s\n' "$SAVED_HEAD" | grep -Eqx '[0-9a-f]{40}([0-9a-f]{24})?' \ + || ! git -C "$REPO_DIR" cat-file -e "$SAVED_HEAD^{commit}" 2>/dev/null; then + echo "HEAD_UNKNOWN $SAVED_HEAD" +elif git -C "$REPO_DIR" merge-base --is-ancestor "$SAVED_HEAD" "$CURRENT_HEAD"; then + echo "HEAD_MOVED $(git -C "$REPO_DIR" rev-list --count "$SAVED_HEAD..$CURRENT_HEAD")" + git -C "$REPO_DIR" log --oneline -10 "$SAVED_HEAD..$CURRENT_HEAD" +else + echo "HEAD_DIVERGED $SAVED_HEAD" +fi +``` + +- `HEAD_UNCHANGED` or `HEAD_NOT_CHECKED`: nothing to add. +- `HEAD_MOVED `: print ` commit(s) landed since this save:` and the commit + lines above the Remaining Work groups, and list **every** Remaining Work item + under **Verify first**: the saving session could not know about those commits, + so any step may already be done. +- `HEAD_DIVERGED` or `HEAD_UNKNOWN`: print `This checkpoint was saved at {first 7 + characters of head}, which is not in this checkout's history (saved on another + branch, rebased, reset, or not fetched).` and list every item under Verify first. +- `HEAD_UNTRACKED`: print `This checkpoint predates commit tracking; restore cannot tell whether work landed after it.` + and sort as usual. + **Sort Remaining Work by provenance.** Keep every item's original text and saved -order, and drop nothing. Put an item under **Verify first** when it: +order, and drop nothing. When the head check printed `HEAD_MOVED`, `HEAD_DIVERGED` +or `HEAD_UNKNOWN`, skip the rules below: every item goes under Verify first, +whatever its marker. Put an item under **Verify first** when it: - ends in `(path assumed)` or `(code read)`; - ends in `(path run)` but its text reports a failure; - ends in a parenthesised trailing marker that is **not** one of the five English @@ -563,6 +605,7 @@ Status: {status} {summary from saved file} ### Remaining Work +{commit-tracking lines, if any} {legacy banner line, if it applies} Next steps @@ -616,6 +659,8 @@ in the old bucket until the user copies them with `gstack-slug --adopt-legacy`. - **Never present another project's checkpoint as "latest".** Identity is the canonical remote (the root only when there is no remote); a mismatch is reported before any summary. +- **A checkpoint describes the commit it was saved at.** When commits landed + after the save, every Remaining Work item is verified before it is run. - **"Most recent" means the filename `YYYYMMDD-HHMMSS` prefix**, not `ls -1t` (filesystem mtime). Filenames are stable across file-system operations; mtime is not. diff --git a/context-restore/SKILL.md.tmpl b/context-restore/SKILL.md.tmpl index dbebf92e5..c964a88f0 100644 --- a/context-restore/SKILL.md.tmpl +++ b/context-restore/SKILL.md.tmpl @@ -203,8 +203,50 @@ checkpoint(s) from another project; only this project's are listed." If it print `LEGACY_BUCKET`, relay that line. If the chosen file is `ROOT_DIFFERS`, add "Saved from another checkout of this repository at `{project_root}`." as info. +**Check whether the branch moved since the save.** The stamp records the commit +the save was made at in `head:`. Before presenting, compare it with this +checkout. FILE is the checkpoint path chosen in Step 2, one of the paths Step 1 +printed: + +```bash +FILE="" +SAVED_HEAD=$(tr -d '\r' < "$FILE" 2>/dev/null | sed -n '1{/^---$/!q;d;}; /^---$/q; /^head:/{s/^head:[[:space:]]*//p;q;}') +REPO_DIR=. +git rev-parse --git-dir >/dev/null 2>&1 || REPO_DIR=$(tr -d '\r' < "$FILE" 2>/dev/null | sed -n '1{/^---$/!q;d;}; /^---$/q; /^worktree:/{s/^worktree:[[:space:]]*//p;q;}') +[ -n "$REPO_DIR" ] || REPO_DIR=$(tr -d '\r' < "$FILE" 2>/dev/null | sed -n '1{/^---$/!q;d;}; /^---$/q; /^project_root:/{s/^project_root:[[:space:]]*//p;q;}') +CURRENT_HEAD=$(git -C "${REPO_DIR:-.}" rev-parse --verify -q HEAD 2>/dev/null) +if [ -z "$SAVED_HEAD" ]; then + echo "HEAD_UNTRACKED" +elif [ -z "$CURRENT_HEAD" ]; then + echo "HEAD_NOT_CHECKED" +elif [ "$SAVED_HEAD" = "$CURRENT_HEAD" ]; then + echo "HEAD_UNCHANGED" +elif ! printf '%s\n' "$SAVED_HEAD" | grep -Eqx '[0-9a-f]{40}([0-9a-f]{24})?' \ + || ! git -C "$REPO_DIR" cat-file -e "$SAVED_HEAD^{commit}" 2>/dev/null; then + echo "HEAD_UNKNOWN $SAVED_HEAD" +elif git -C "$REPO_DIR" merge-base --is-ancestor "$SAVED_HEAD" "$CURRENT_HEAD"; then + echo "HEAD_MOVED $(git -C "$REPO_DIR" rev-list --count "$SAVED_HEAD..$CURRENT_HEAD")" + git -C "$REPO_DIR" log --oneline -10 "$SAVED_HEAD..$CURRENT_HEAD" +else + echo "HEAD_DIVERGED $SAVED_HEAD" +fi +``` + +- `HEAD_UNCHANGED` or `HEAD_NOT_CHECKED`: nothing to add. +- `HEAD_MOVED `: print ` commit(s) landed since this save:` and the commit + lines above the Remaining Work groups, and list **every** Remaining Work item + under **Verify first**: the saving session could not know about those commits, + so any step may already be done. +- `HEAD_DIVERGED` or `HEAD_UNKNOWN`: print `This checkpoint was saved at {first 7 + characters of head}, which is not in this checkout's history (saved on another + branch, rebased, reset, or not fetched).` and list every item under Verify first. +- `HEAD_UNTRACKED`: print `This checkpoint predates commit tracking; restore cannot tell whether work landed after it.` + and sort as usual. + **Sort Remaining Work by provenance.** Keep every item's original text and saved -order, and drop nothing. Put an item under **Verify first** when it: +order, and drop nothing. When the head check printed `HEAD_MOVED`, `HEAD_DIVERGED` +or `HEAD_UNKNOWN`, skip the rules below: every item goes under Verify first, +whatever its marker. Put an item under **Verify first** when it: - ends in `(path assumed)` or `(code read)`; - ends in `(path run)` but its text reports a failure; - ends in a parenthesised trailing marker that is **not** one of the five English @@ -239,6 +281,7 @@ Status: {status} {summary from saved file} ### Remaining Work +{commit-tracking lines, if any} {legacy banner line, if it applies} Next steps @@ -292,6 +335,8 @@ in the old bucket until the user copies them with `gstack-slug --adopt-legacy`. - **Never present another project's checkpoint as "latest".** Identity is the canonical remote (the root only when there is no remote); a mismatch is reported before any summary. +- **A checkpoint describes the commit it was saved at.** When commits landed + after the save, every Remaining Work item is verified before it is run. - **"Most recent" means the filename `YYYYMMDD-HHMMSS` prefix**, not `ls -1t` (filesystem mtime). Filenames are stable across file-system operations; mtime is not. diff --git a/context-save/SKILL.md b/context-save/SKILL.md index 851260191..29032e6c2 100644 --- a/context-save/SKILL.md +++ b/context-save/SKILL.md @@ -542,12 +542,13 @@ files_modified: The `files_modified` list comes from `git status --short` (both staged and unstaged modified files). Use relative paths from the repo root. Do not write `remote:`, -`project_root:` or `worktree:` yourself; the stamp step below adds them. +`project_root:`, `worktree:` or `head:` yourself; the stamp step below adds them. Then stamp the project identity. Several projects can share one checkpoints directory, so `/context-restore` needs to know which project wrote each file. The helper adds `remote:` (canonical origin: -lowercased host, no credentials, port or `.git`), `project_root:` and, in a -linked worktree, `worktree:` to the frontmatter. When the session started in +lowercased host, no credentials, port or `.git`), `project_root:`, in a linked +worktree `worktree:`, and `head:` (the commit this save describes, so +`/context-restore` can tell when work landed after it) to the frontmatter. When the session started in another directory that files elsewhere (a non-git parent of this repo), it also leaves a pointer there so `/context-restore` in that directory finds this save: diff --git a/context-save/SKILL.md.tmpl b/context-save/SKILL.md.tmpl index 91fce9edf..4166cd159 100644 --- a/context-save/SKILL.md.tmpl +++ b/context-save/SKILL.md.tmpl @@ -217,12 +217,13 @@ files_modified: The `files_modified` list comes from `git status --short` (both staged and unstaged modified files). Use relative paths from the repo root. Do not write `remote:`, -`project_root:` or `worktree:` yourself; the stamp step below adds them. +`project_root:`, `worktree:` or `head:` yourself; the stamp step below adds them. Then stamp the project identity. Several projects can share one checkpoints directory, so `/context-restore` needs to know which project wrote each file. The helper adds `remote:` (canonical origin: -lowercased host, no credentials, port or `.git`), `project_root:` and, in a -linked worktree, `worktree:` to the frontmatter. When the session started in +lowercased host, no credentials, port or `.git`), `project_root:`, in a linked +worktree `worktree:`, and `head:` (the commit this save describes, so +`/context-restore` can tell when work landed after it) to the frontmatter. When the session started in another directory that files elsewhere (a non-git parent of this repo), it also leaves a pointer there so `/context-restore` in that directory finds this save: diff --git a/package.json b/package.json index 28dbec666..723b9014a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gstack", - "version": "1.91.223", + "version": "1.91.224", "description": "Garry's Stack — Claude Code skills + fast headless browser. One repo, one install, entire AI engineering workflow.", "license": "MIT", "type": "module", diff --git a/test/context-restore-head.test.ts b/test/context-restore-head.test.ts new file mode 100644 index 000000000..d7195574d --- /dev/null +++ b/test/context-restore-head.test.ts @@ -0,0 +1,202 @@ +/** + * /context-save records the commit a checkpoint describes, and /context-restore + * notices when commits landed after it, end to end. + * + * Runs the REAL save-path, stamp and head-check bash blocks extracted from the + * generated context-save and context-restore SKILL.md files (with + * ~/.claude/skills/gstack pointed at this checkout) inside fixture repos. The bug + * these pin: a checkpoint saved before work landed came back as the current plan, + * with nothing saying HEAD had moved, so restore offered to redo finished steps. + * + * Value: protects=save stamps head: and restore reports unchanged, moved, diverged, untracked and unknown commits; fails_when=the stamp drops head: or restore stops comparing it with HEAD; why_new=no test compares a checkpoint with commits made after it; seam=none; no_claim=fixture repos and a hand-written checkpoint body stand in for a live /context-save, so green does not prove the agent follows the prompt + */ +import { describe, test, expect, beforeEach, afterEach } from 'bun:test'; +import { spawnSync } from 'child_process'; +import * as fs from 'fs'; +import * as os from 'os'; +import * as path from 'path'; + +const ROOT = path.resolve(import.meta.dir, '..'); +// Forward slashes keep the path intact inside bash on Windows (Git Bash); a no-op elsewhere. +const BASH_ROOT = ROOT.split(path.sep).join('/'); + +function bashBlockAfter(skillFile: string, heading: string, contains?: string): string { + const md = fs.readFileSync(path.join(ROOT, skillFile), 'utf-8'); + const start = md.indexOf(heading); + if (start < 0) throw new Error(`${skillFile}: heading not found: ${heading}`); + const re = /```bash\n([\s\S]*?)```/g; + re.lastIndex = start; + for (let m = re.exec(md); m; m = re.exec(md)) { + if (!contains || m[1].includes(contains)) return m[1].replaceAll('~/.claude/skills/gstack', BASH_ROOT); + } + throw new Error(`${skillFile}: no bash block after ${heading}`); +} + +const SAVE_PATH_BLOCK = bashBlockAfter('context-save/SKILL.md', '### Step 4: Write saved-context file').replace( + 'TIMESTAMP=$(date +%Y%m%d-%H%M%S)', + 'TIMESTAMP="$TEST_TIMESTAMP"', +); +const STAMP_BLOCK = bashBlockAfter('context-save/SKILL.md', '### Step 4: Write saved-context file', '--stamp-checkpoint'); +const HEAD_BLOCK = bashBlockAfter('context-restore/SKILL.md', '**Check whether the branch moved since the save.**', 'SAVED_HEAD'); + +let tmp: string; +let home: string; + +function env(extra: Record = {}): Record { + const out: Record = {}; + for (const [k, v] of Object.entries(process.env)) if (v !== undefined) out[k] = v; + delete out.GSTACK_PROJECT_SLUG; + delete out.GSTACK_STATE_ROOT; + delete out.GSTACK_STATE_DIR; + delete out.CURRENT_BRANCH; + delete out.CLAUDE_PROJECT_DIR; + return { ...out, HOME: tmp, GSTACK_HOME: home, ...extra }; +} + +function sh(script: string, cwd: string, extra: Record = {}) { + const r = spawnSync('bash', ['-c', script], { cwd, env: env(extra), encoding: 'utf-8', timeout: 30_000 }); + return { stdout: r.stdout ?? '', stderr: r.stderr ?? '', status: r.status ?? -1 }; +} + +function git(cwd: string, ...args: string[]): string { + const r = spawnSync('git', args, { cwd, encoding: 'utf-8', timeout: 30_000 }); + if (r.status !== 0) throw new Error(`git ${args.join(' ')}: ${r.stderr}`); + return r.stdout.trim(); +} + +function commit(cwd: string, subject: string) { + fs.appendFileSync(path.join(cwd, 'app.txt'), `${subject}\n`); + git(cwd, 'add', 'app.txt'); + git(cwd, 'commit', '-q', '-m', subject); +} + +function repo(): string { + const dir = path.join(tmp, 'app'); + fs.mkdirSync(dir, { recursive: true }); + git(dir, 'init', '-q', '-b', 'main'); + git(dir, 'remote', 'add', 'origin', 'https://github.com/example/head-check.git'); + git(dir, 'config', 'user.name', 'gstack test'); + git(dir, 'config', 'user.email', 'gstack-test@example.invalid'); + commit(dir, 'baseline'); + return dir; +} + +/** The context-save flow: path block, the agent's Write, then the stamp block. */ +function save(cwd: string): string { + const paths = sh(SAVE_PATH_BLOCK, cwd, { TITLE_RAW: 'login flow', TEST_TIMESTAMP: '20261020-090000' }); + expect(paths.status).toBe(0); + const file = paths.stdout.match(/^FILE=(.+)$/m)![1]; + fs.writeFileSync(file, '---\nstatus: in-progress\nbranch: main\n---\n\n## Working on: login flow\n'); + const stamp = sh(STAMP_BLOCK.replace('FILE=""', `FILE=${JSON.stringify(file)}`), cwd); + expect(stamp.stdout).toContain('STAMPED'); + return file; +} + +function headCheck(cwd: string, file: string) { + const r = sh(HEAD_BLOCK.replace('FILE=""', `FILE=${JSON.stringify(file)}`), cwd); + expect(r.status).toBe(0); + return r.stdout; +} + +beforeEach(() => { + tmp = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), 'ctx-head-'))); + home = path.join(tmp, '.gstack'); +}); + +afterEach(() => { + fs.rmSync(tmp, { recursive: true, force: true }); +}); + +describe('context-save records the commit a checkpoint describes', () => { + test('the stamp writes head: once, and re-stamping does not duplicate it', () => { + const app = repo(); + const file = save(app); + const fm = fs.readFileSync(file, 'utf-8').split('---')[1]; + expect(fm).toContain(`\nhead: ${git(app, 'rev-parse', 'HEAD')}\n`); + commit(app, 'later work'); + const restamp = spawnSync('bash', [path.join(ROOT, 'bin', 'gstack-slug'), '--stamp-checkpoint', file], { cwd: app, env: env(), timeout: 30_000 }); + expect(restamp.status).toBe(0); + expect(fs.readFileSync(file, 'utf-8').split('---')[1].match(/^head:.*$/gm)).toEqual([`head: ${git(app, 'rev-parse', 'HEAD')}`]); + }); +}); + +describe('context-restore compares the checkpoint with HEAD', () => { + test('nothing to add when no commit landed after the save', () => { + const app = repo(); + expect(headCheck(app, save(app)).trim()).toBe('HEAD_UNCHANGED'); + }); + + test('commits that landed after the save are counted and listed', () => { + const app = repo(); + const file = save(app); + commit(app, 'add the login route'); + commit(app, 'add login tests'); + const out = headCheck(app, file); + expect(out).toStartWith('HEAD_MOVED 2\n'); + expect(out).toContain('add the login route'); + expect(out).toContain('add login tests'); + }); + + test('a checkpoint whose commit left the branch history is reported, not trusted', () => { + const app = repo(); + commit(app, 'work in progress'); + const file = save(app); + git(app, 'reset', '-q', '--hard', 'HEAD~1'); + commit(app, 'rewritten work'); + expect(headCheck(app, file)).toStartWith('HEAD_DIVERGED '); + }); + + test('a checkpoint resumed from another branch is reported, and the prompt names that cause', () => { + const app = repo(); + git(app, 'checkout', '-q', '-b', 'feature'); + commit(app, 'feature work'); + const file = save(app); + git(app, 'checkout', '-q', 'main'); + commit(app, 'unrelated main work'); + expect(headCheck(app, file)).toStartWith('HEAD_DIVERGED '); + const restore = fs.readFileSync(path.join(ROOT, 'context-restore/SKILL.md'), 'utf-8'); + expect(restore).toContain('(saved on another\n branch, rebased, reset, or not fetched)'); + }); + + test('checkpoints saved before head tracking, or with a malformed head, are never treated as current', () => { + const app = repo(); + const legacy = path.join(tmp, 'legacy.md'); + fs.writeFileSync(legacy, '---\nstatus: in-progress\nbranch: main\n---\n'); + expect(headCheck(app, legacy).trim()).toBe('HEAD_UNTRACKED'); + const bogus = path.join(tmp, 'bogus.md'); + fs.writeFileSync(bogus, '---\nbranch: main\nhead: $(touch pwned)\n---\n'); + expect(headCheck(app, bogus)).toStartWith('HEAD_UNKNOWN '); + expect(fs.existsSync(path.join(app, 'pwned'))).toBe(false); + const bodyOnly = path.join(tmp, 'body-only.md'); + fs.writeFileSync(bodyOnly, `---\nstatus: in-progress\nbranch: main\n---\n\nhead: ${git(app, 'rev-parse', 'HEAD~0')}\n`); + expect(headCheck(app, bodyOnly).trim()).toBe('HEAD_UNTRACKED'); + }); + + test('outside git, a save from a nested linked worktree is compared with that worktree, not the main checkout', () => { + const app = repo(); + const wt = path.join(app, '.worktrees', 'side'); + git(app, 'worktree', 'add', '-q', '-b', 'side', wt); + const file = save(wt); + expect(fs.readFileSync(file, 'utf-8')).toContain(`\nworktree: ${wt}\n`); + commit(app, 'main moves on'); + commit(app, 'and again'); + const outside = path.join(tmp, 'outside'); + fs.mkdirSync(outside); + expect(headCheck(outside, file).trim()).toBe('HEAD_UNCHANGED'); + commit(wt, 'worktree work'); + expect(headCheck(outside, file)).toStartWith('HEAD_MOVED 1\n'); + }); + + test('the prompt maps every status to what the user sees', () => { + const restore = fs.readFileSync(path.join(ROOT, 'context-restore/SKILL.md'), 'utf-8'); + for (const status of ['HEAD_UNCHANGED', 'HEAD_NOT_CHECKED', 'HEAD_MOVED ', 'HEAD_DIVERGED', 'HEAD_UNKNOWN', 'HEAD_UNTRACKED']) { + expect(restore).toContain(`\`${status}\``); + } + expect(restore).toContain('` commit(s) landed since this save:`'); + expect(restore).toContain('under **Verify first**'); + expect(restore).toContain('{commit-tracking lines, if any}'); + expect(restore).toContain('When the head check printed `HEAD_MOVED`, `HEAD_DIVERGED`\nor `HEAD_UNKNOWN`, skip the rules below: every item goes under Verify first,\nwhatever its marker.'); + const save = fs.readFileSync(path.join(ROOT, 'context-save/SKILL.md'), 'utf-8'); + expect(save).toContain('`project_root:`, `worktree:` or `head:` yourself'); + }); +}); From 7bd3fb4a402c6e272338f2bd44c0ceab60438670 Mon Sep 17 00:00:00 2001 From: Garry Tan Date: Sun, 25 Oct 2026 17:29:01 -0700 Subject: [PATCH 4/9] v1.91.225.0 feat(design-html): craft section and free craft check, adapted from Elaya's design skills (GSTA-92) (#3420) * feat(design-html): craft section and free craft check, adapted from Elaya design skills (GSTA-92) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(GSTA-92): restore the full CHANGELOG under the Unreleased entry; drop a $-digit literal from craft.md; count only craft-check executions in design-html-slop-gate 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> --- CHANGELOG.md | 17 +++++ NOTICE.md | 29 ++++++- VERSION | 2 +- agents-digest/gstack-AGENTS.md | 2 +- bin/gstack-design-craft | 37 +++++++++ design-html/SKILL.md | 7 ++ design-html/SKILL.md.tmpl | 5 ++ design-html/sections/craft.md | 72 ++++++++++++++++++ design-html/sections/craft.md.tmpl | 70 +++++++++++++++++ design-html/sections/manifest.json | 6 ++ design-shotgun/SKILL.md | 3 + design-shotgun/SKILL.md.tmpl | 3 + lib/design-craft.ts | 110 +++++++++++++++++++++++++++ licenses/MIT-elaya.txt | 21 +++++ package.json | 2 +- test/design-craft.test.ts | 118 +++++++++++++++++++++++++++++ test/helpers/carve-guards.ts | 6 +- test/skill-e2e-design.test.ts | 7 +- 18 files changed, 505 insertions(+), 12 deletions(-) create mode 100755 bin/gstack-design-craft create mode 100644 design-html/sections/craft.md create mode 100644 design-html/sections/craft.md.tmpl create mode 100644 lib/design-craft.ts create mode 100644 licenses/MIT-elaya.txt create mode 100644 test/design-craft.test.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index eb48cbce1..c7ee1e9fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [1.91.225.0] - 2026-10-26 + +**/design-html builds landing pages around one visitor action and pages that look finished, without inventing proof; adapted from Elaya's design skills (GSTA-92).** Freeform /design-html asked for purpose, audience and feel, then built. It never asked for the one action the page exists for or where the traffic comes from, and nothing caught a page that shipped with invented customers and numbers, a dead `href="#"`, a scroll-listener reveal, `100vh`, or no description, favicon or working skip link. Now every run reads a craft section at Step 1, and a free checker counts the tells at Step 4. Adapted from Elaya's [ai-design-skills](https://github.com/elayadesign/ai-design-skills) (landing-page-design, design-to-motion) and [redesign-skill](https://github.com/elayadesign/redesign-skill), MIT, © 2026 Elaya. Thank you, Elaya. + +### Changed +- **/design-html reads `sections/craft.md` on every run (Step 1).** The spec opens with `Surface: Persuade` or `Surface: other`. A Persuade page (landing, pricing, waitlist, campaign, comparison) asks at most three multiple-choice questions (primary action, traffic source, published or reference) and states the rest in one `Assumed:` line; picks one of four archetypes with a reason; keeps the hero budget (one proof signal only when real proof exists, never a metric row) and chooses the rest of the page from the archetype and objections; gives the primary action real invalid, pending, failure and success states. Every page: claims (testimonials, logos, results, prices, guarantees) come only from the user, and missing proof is left out or marked `[Needs proof: …]`; illustrative data looks real; a ship floor scoped to full documents (title, description, favicon, share tags on shareable pages, `og:image` only from a supplied URL, a skip link that reaches `
`, landmarks, alt text, inline validation, no dead links, `aria-current` on route navigation); scale snapping with readability floors and the nested-radius rule; balanced line breaks; motion rules for the one authored moment (content visible without script, `IntersectionObserver`, cheap properties only, no `scale(0)`, named curves, `100dvh`). +- **Step 4** runs `bin/gstack-design-craft` after the Slop Gate, whether or not the detector is installed, with the gate's contract: one fix pass, one rerun, the rest accepted with a reason, once more when the refinement loop ends. The hand-off opens with a "Before this can ship" block: proof markers, production dependencies, exceptions, and every claim the check changed. +- **/design-shotgun**: a landing, pricing or campaign screen's variants also differ in page archetype, keep the one primary action identical, and carry their section outline as a caption. + +### Added +- **`bin/gstack-design-craft`** (`lib/design-craft.ts`): prints `CRAFT_CHECK: ` per tell and `CRAFT_RESULT: clean` (exit 0) or ` issue(s)` (exit 1); exit 2 on a non-HTML, empty or unreadable file. Copy rules read decoded visible text; `alert()` counts only in scripts; head and navigation rules run only on a full document. Buzzwords report under the catalog's `marketing-buzzword` id. +- **NOTICE.md** and `licenses/MIT-elaya.txt`. Not carried over, because they conflict with gstack's design rules: Elaya's fixed fonts (Geist and Poppins are on gstack's overused-display list), palette, spacing values and icon sets, gradient hero text, mandatory scroll reveals and tagline section, and the island nav. + +### Tests +- `test/design-craft.test.ts`: every tell with its count; a finished page, inlined Pretext, a `100vh` line with its `100dvh` fallback, discount copy and in-page anchors stay clean; look-alike attributes, encoded markers, `!important` and reversed fallbacks; skip links judged by position and target in any language; the craft section's banned words and names all flagged; CLI exit codes. +- `design-html-slop-gate` also requires the craft check to run once or twice; the design-html carve guard requires the craft section read. + ## [1.91.224.0] - 2026-10-25 **`/context-restore` now says when commits landed after a checkpoint was saved, instead of offering finished steps as the plan.** `/context-save` recorded the branch, a timestamp and the modified files, but not the commit, so a checkpoint saved before a step was committed came back with that step still listed under Remaining Work. Ported from #3316 by @soyames, with their commit kept. diff --git a/NOTICE.md b/NOTICE.md index 931bd4b30..831e0162a 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1,9 +1,9 @@ # Third-Party Notices -gstack is MIT. The files below contain material derived from Apache-2.0 works, -rewritten in gstack's voice and modified. Rewriting is not an exemption: the -license text is in `licenses/Apache-2.0.txt`, and each derived file carries a -notice that it was changed. Unmodified copies (the rule-registry fixture, the +gstack is MIT. The files below contain material derived from Apache-2.0 and MIT +works, rewritten in gstack's voice and modified. Rewriting is not an exemption: +the license texts are in `licenses/`, and each file derived from an Apache-2.0 +work carries a notice that it was changed. Unmodified copies (the rule-registry fixture, the license text) carry no header and are listed here instead. ## impeccable — Copyright Paul Bakaus — Apache License 2.0 @@ -29,6 +29,27 @@ against the checksum pinned in `lib/design-detect-contract.ts`, and recorded in the egress ledger first. gstack does not audit the engine's network behavior; the wrapper refuses URL targets so gstack never asks it to touch the network. +## ai-design-skills and redesign-skill — Copyright (c) 2026 Elaya — MIT License + +https://github.com/elayadesign/ai-design-skills (`skills/landing-page-design`, +`skills/design-to-motion`, at 38bbe576) and +https://github.com/elayadesign/redesign-skill (`skills/redesign-existing-projects`, +at 64627f6e). License text: `licenses/MIT-elaya.txt`. + +Derived, modified (rules rewritten in gstack's voice and reconciled with its +design rules; Elaya's fixed fonts, colors, spacing values, icon sets and +signature components are not carried over): + +- `design-html/sections/craft.md.tmpl`: the Persuade intake, page archetypes, + page structure, conversion and copy rules, indexing and build order from + landing-page-design Part A; the content-realism, ship-floor, scale-snapping, + line-break and motion rules from landing-page-design Part B, the website + context of design-to-motion and the redesign-skill audit; and the generated + `design-html/SKILL.md` / `sections/craft.md`. +- `lib/design-craft.ts` and `bin/gstack-design-craft`: the content-realism and + ship-floor tells, turned into a free check. +- `design-shotgun/SKILL.md.tmpl`: page archetypes as a variant axis. + ## DESIGN.md specification — Copyright Google LLC — Apache License 2.0 https://github.com/google-labs-code/design.md diff --git a/VERSION b/VERSION index b2bda2069..c779e60ef 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.91.224.0 +1.91.225.0 diff --git a/agents-digest/gstack-AGENTS.md b/agents-digest/gstack-AGENTS.md index 31e965f93..b8de4afe8 100644 --- a/agents-digest/gstack-AGENTS.md +++ b/agents-digest/gstack-AGENTS.md @@ -1,4 +1,4 @@ -# gstack digest v1.91.224.0 — regenerate/re-copy after upgrading gstack +# gstack digest v1.91.225.0 — regenerate/re-copy after upgrading gstack Behavioral rules from gstack (https://github.com/garrytan/gstack), compressed for agent hosts without a full skill install. The full skills add workflows, diff --git a/bin/gstack-design-craft b/bin/gstack-design-craft new file mode 100755 index 000000000..50c01cb9f --- /dev/null +++ b/bin/gstack-design-craft @@ -0,0 +1,37 @@ +#!/usr/bin/env -S bun --no-env-file --config=/dev/null +// gstack-design-craft — free craft check for a generated page (/design-html Step 4). +// +// Usage: gstack-design-craft +// +// Prints one "CRAFT_CHECK: " line per tell, then +// "CRAFT_RESULT: clean" (exit 0) or "CRAFT_RESULT: issue(s)" (exit 1). +// Exit 2: usage error, a non-HTML file, an unreadable or empty file. Head and +// navigation rules run only on a full HTML document; a fragment gets the copy +// and code rules alone. + +import { readFileSync } from 'fs'; +import { checkCraft, formatCraft } from '../lib/design-craft'; + +const file = process.argv[2]; +if (!file) { + console.error('Usage: gstack-design-craft '); + process.exit(2); +} +if (!/\.html?$/i.test(file)) { + console.error(`gstack-design-craft: ${file} is not an HTML file; check the rendered HTML preview instead`); + process.exit(2); +} +let source: string; +try { + source = readFileSync(file, 'utf-8'); +} catch (err) { + console.error(`gstack-design-craft: cannot read ${file}: ${(err as Error).message}`); + process.exit(2); +} +if (source.trim() === '') { + console.error(`gstack-design-craft: ${file} is empty; nothing was checked`); + process.exit(2); +} +const findings = checkCraft(source); +console.log(formatCraft(findings)); +process.exit(findings.length === 0 ? 0 : 1); diff --git a/design-html/SKILL.md b/design-html/SKILL.md index 8ff97671d..3f33d4f00 100644 --- a/design-html/SKILL.md +++ b/design-html/SKILL.md @@ -366,6 +366,7 @@ sections. Read a section in full before doing its step; do not work from memory. |------|-------------------| | analyzing the design or making any layout/visual decision (Step 1 onward) — the UX-principles doctrine governs every design choice | `sections/doctrine.md` | | writing the finalized HTML in Step 3 — the Pretext wiring patterns and API cheatsheet are the required reference for all text-layout code | `sections/pretext-patterns.md` | +| writing the Step 1 implementation spec — the Persuade intake and archetype, and the craft floor every page ships with | `sections/craft.md` | | the Setup probe printed DESIGN_DETECTOR_INSTALL_OFFER — ask the user once whether gstack may download impeccable's engine (checksum-pinned, receipted) before any other step | `sections/detector-install-offer.md` | --- @@ -535,6 +536,9 @@ After routing, output a brief context summary: ## Step 1: Design Analysis +> **STOP.** Before writing the Step 1 implementation spec — the Persuade intake and archetype, and the craft floor every page ships with, Read `~/.claude/skills/gstack/design-html/sections/craft.md` and execute it +> in full. Do not work from memory — that section is the source of truth for this step. + 1. If `$D` is available (`DESIGN_READY`), extract a structured implementation spec: ```bash $D prompt --image --output json @@ -658,6 +662,7 @@ For framework output, save to: - `prefers-color-scheme` media query for dark mode - `prefers-reduced-motion` for animation respect - Real content extracted from the mockup (never lorem ipsum) +- The craft section's ship floor, scale-snapped values and motion rules **Never include by default (AI slop blacklist):** an approved mockup that carries one, a DESIGN.md blessing, or an explicit user ask overrides it; say the tradeoff once. - Purple/blue gradients as default @@ -726,6 +731,8 @@ _DJ=$(mktemp "${TMPDIR:-/tmp}/gstack-detect.XXXXXX"); bun --no-env-file --config Exit 2 → one surgical fix pass over the non-advisory rules in the `DETECT_TOP` block, then scan once more. Whatever remains, present the page with those findings listed as accepted-with-reason: a pattern the approved mockup contains, a value DESIGN.md's tokens bless or a pattern its Decisions Log or Do's and Don'ts records as intentional, or an inline `` the user agreed to. One pass, not a loop. Any other first line from the probe: skip, no ceremony. +Then, always: the craft section's check, `~/.claude/skills/gstack/bin/gstack-design-craft `, one fix pass and one rerun, as above. + ### Verification Screenshots Take verification screenshots at 3 viewports. One `gstack-render` call serves diff --git a/design-html/SKILL.md.tmpl b/design-html/SKILL.md.tmpl index c8016fb12..998782370 100644 --- a/design-html/SKILL.md.tmpl +++ b/design-html/SKILL.md.tmpl @@ -156,6 +156,8 @@ After routing, output a brief context summary: ## Step 1: Design Analysis +{{SECTION:craft}} + 1. If `$D` is available (`DESIGN_READY`), extract a structured implementation spec: ```bash $D prompt --image --output json @@ -278,6 +280,7 @@ For framework output, save to: - `prefers-color-scheme` media query for dark mode - `prefers-reduced-motion` for animation respect - Real content extracted from the mockup (never lorem ipsum) +- The craft section's ship floor, scale-snapped values and motion rules **Never include by default (AI slop blacklist):** an approved mockup that carries one, a DESIGN.md blessing, or an explicit user ask overrides it; say the tradeoff once. - Purple/blue gradients as default @@ -338,6 +341,8 @@ kill 2>/dev/null || true {{DESIGN_DETECTOR:gate}} +Then, always: the craft section's check, `{{BIN_DIR}}/gstack-design-craft `, one fix pass and one rerun, as above. + ### Verification Screenshots Take verification screenshots at 3 viewports. One `gstack-render` call serves diff --git a/design-html/sections/craft.md b/design-html/sections/craft.md new file mode 100644 index 000000000..1630f7fb9 --- /dev/null +++ b/design-html/sections/craft.md @@ -0,0 +1,72 @@ + + +## Craft: Persuade pages and the craft floor + +**Persuade pages** applies when the page exists to get one action from a visitor: a landing, marketing, pricing, waitlist, campaign or comparison page. Write `Surface: Persuade` or `Surface: other` as the spec's first line; on `other`, skip to Craft floor, which applies to every page. An approved mockup wins on structure and visuals; this section fills only what it leaves open. + +### Persuade pages + +**One offer → one audience → one primary action.** + +**Intake.** When the context does not settle them, ask one AskUserQuestion with at most three multiple-choice questions: the primary action, the traffic source, and published or design reference. Assume the rest in one `Assumed:` line the user corrects in the refinement loop: +- the conversion and the offer: exactly what they get +- who it is for, the problem they came with, their top three objections, what they already know +- the proof the user can supply (named customers, attributed quotes, real numbers) and the risk terms the business offers + +**Archetype.** Pick one and say why in the spec's layout type: **classic hero + sections** (default; the product reads from one screenshot), **long-form story** (the visitor needs educating or is skeptical), **minimal conversion** (high-intent traffic or a small offer), **comparison** (search intent is "X vs Y"). + +**Structure.** Above the fold at 375×667 and on desktop, inside the hero budget: a headline naming outcome and audience, one sentence on how, one primary CTA, one proof signal only when real proof exists (named logos or one attributed quote; a metric row stays banned), one product visual. Below it, choose modules and order from the archetype and the objections. The long-form menu: problem → solution, three to five benefits, how it works in three steps, proof, an FAQ of six to twelve real objections, the risk reversal, a final CTA identical to the top. A minimal page stays minimal; a comparison page leads with the comparison. + +**Conversion rules.** +- A page behind an ad repeats the ad's promise and tone in the hero. +- One primary CTA; nothing competes with it above the fold. +- Benefit first and specific: "Cut weekly reporting from 4 hours to 15 minutes", never "save time". +- Show the risk reversal the business offers (free plan, trial, no card, cancel anytime). Never invent one. +- Proof sits beside the claim it supports. A high-friction offer moves the FAQ up. + +**The primary action works.** A real destination (supplied URL or form endpoint) and every state: invalid (inline error, input kept), pending (control disabled so it cannot submit twice, announced through `aria-live`), failure (what happened, input kept, retry) and success (what happens next). With no backend, simulate the states and say so in a code comment and your summary. + +**Copy.** A CTA is a verb plus what they get ("Start free trial"). Draft two or three headlines in the product's voice and keep the most specific one that names outcome and audience; "{outcome} without {pain}" is a test, not a template. + +**Indexing.** Record the publication decision; keep the site's policy when known. A page the user keeps out of search gets ``; an indexed page gets a real title and description, and its FAQ ships as FAQPage JSON-LD. + +**Build order.** One section at a time, top down; a refinement edits one section. + +### Craft floor (every page) + +**Claims come from the user, never from you.** Testimonials, customer names and logos, results, uptime, prices and guarantees appear only when supplied. Missing proof: leave the slot out, or mark it `[Needs proof: …]` in the warning color so it cannot ship by accident. A believable invented claim is worse than an obvious placeholder. + +**Illustrative content looks real.** Sample data in product shots and UI (table rows, chart values, people in a demo inbox): +- No placeholder people or brands (John Doe, Jane Doe, Acme, Nexus, SmartFlow); distinct avatars; varied dates. +- No round sample numbers (99.99%, 50%, 1,000+ customers, 10x). In a claim, a round number signals it was made up: use the supplied figure or drop it. +- No buzzwords: elevate, seamless, effortless, supercharge, streamline, revolutionize, unlock, empower, unleash, next-gen, game-changer, delve, tapestry, "in the world of". +- Sentence-case headings. Errors say what happened and what to do, never "Oops!". No exclamation marks in success messages. + +**Ship floor.** Head tags apply to a full HTML document, not a component or fragment. Every full document has ``, a meta description, a favicon (an inline SVG data URI from the brand mark when no file is supplied), and on a page meant for sharing `og:title` and `og:description`; `og:image` only from a supplied URL. A "Skip to content" link is the first focusable element, hidden until focused, targeting the `id` of `<main>`. Landmarks (`<header>`, `<nav>`, `<main>`, `<footer>`); alt text on meaningful images, `alt=""` on decorative ones. A marketing footer links privacy and terms at supplied URLs. Required fields and email format validate inline, wired with `aria-invalid` and `aria-describedby`. Every link goes somewhere real: no `href="#"`, no made-up path; a control with no target renders disabled. Navigation to other pages marks the current one `aria-current="page"`; in-page section links do not. + +**Values come from the scale.** Every font size, space and radius is a step of the system's scale (DESIGN.md, else the spec), chosen by role. An off-scale value snaps to the nearest step that keeps its role, usually the one below, with that step's line height; never below 16px body text or a 44px touch target, and an approved mockup's measured values stand. A shape nested in another with a gap under 32px gets inner radius = outer − gap when that exceeds 2px. + +**Line breaks.** Browser-wrapped headings get `text-wrap: balance`, body `text-wrap: pretty`. Break display lines where the thought breaks; never one word alone on the last line. + +**Motion.** These govern the one authored motion moment and state transitions; they license no more motion. +- Content is visible by default; script adds the hidden start state only after the observer is set up (`.motion-ready` on `<html>`), so a script failure or a crawler sees everything and the CTA never waits on an animation. +- Reveal with `IntersectionObserver` (`threshold: 0`, bottom `rootMargin` about −20%, once). Never an unthrottled `window.addEventListener('scroll')`; scroll-linked effects read scroll inside `requestAnimationFrame`. +- Animate `transform`, `opacity`, `filter`, `clip-path` only; blur 14px or less. +- No object grows from `scale(0)` (start at 0.85 or more); only lines and bars grow from zero. A data bar fills as a left-to-right `clip-path` wipe, 0.7–1.1s. +- Stagger in reading order inside one section (30–80ms), never across the page. +- Curves are named tokens: DESIGN.md's, else `cubic-bezier(0.16, 1, 0.3, 1)` for entrances and `cubic-bezier(0.65, 0, 0.35, 1)` for wipes; `linear` only for constant motion. +- Loops pause off-screen. `prefers-reduced-motion: reduce` shows the final state. Full-height sections use `min-height: 100dvh`, not `100vh`. + +### Craft check + +At Step 4, after the Slop Gate and before the screenshots, run the free checker on a vanilla HTML output (for framework output, say it is unavailable): + +```bash +~/.claude/skills/gstack/bin/gstack-design-craft <path-to-finalized.html> +``` + +It prints one `CRAFT_CHECK: <id> <count> <fix>` line per tell (the realism rules above, `[Needs proof:` markers, scroll listeners, `100vh`, `transition: all`, `href="#"`, `alert()`, missing alt; on a full document a missing title, description, favicon, working skip link, or `aria-current` on route navigation), then `CRAFT_RESULT: clean` or `CRAFT_RESULT: <n> issue(s)`. No `CRAFT_RESULT` line: say the check was unavailable and continue. Same contract as the Slop Gate: one surgical fix pass, one rerun, the rest listed as accepted-with-reason (a real customer named Nexus, a supplied 50% figure). Rerun once when the refinement loop exits; report only new lines. + +**Before this can ship.** Open the Step 4 hand-off, and repeat before Step 5's "Copy to project": every `[Needs proof: …]` marker, the dependencies the page cannot own (legal URLs, form endpoint, og:image, indexing, analytics and cookie consent where required), the accepted exceptions, and every claim the check made you change. + +Adapted from Elaya's [ai-design-skills](https://github.com/elayadesign/ai-design-skills) and [redesign-skill](https://github.com/elayadesign/redesign-skill) (MIT, © 2026 Elaya), rewritten for gstack. See NOTICE.md. diff --git a/design-html/sections/craft.md.tmpl b/design-html/sections/craft.md.tmpl new file mode 100644 index 000000000..e6119d84d --- /dev/null +++ b/design-html/sections/craft.md.tmpl @@ -0,0 +1,70 @@ +## Craft: Persuade pages and the craft floor + +**Persuade pages** applies when the page exists to get one action from a visitor: a landing, marketing, pricing, waitlist, campaign or comparison page. Write `Surface: Persuade` or `Surface: other` as the spec's first line; on `other`, skip to Craft floor, which applies to every page. An approved mockup wins on structure and visuals; this section fills only what it leaves open. + +### Persuade pages + +**One offer → one audience → one primary action.** + +**Intake.** When the context does not settle them, ask one AskUserQuestion with at most three multiple-choice questions: the primary action, the traffic source, and published or design reference. Assume the rest in one `Assumed:` line the user corrects in the refinement loop: +- the conversion and the offer: exactly what they get +- who it is for, the problem they came with, their top three objections, what they already know +- the proof the user can supply (named customers, attributed quotes, real numbers) and the risk terms the business offers + +**Archetype.** Pick one and say why in the spec's layout type: **classic hero + sections** (default; the product reads from one screenshot), **long-form story** (the visitor needs educating or is skeptical), **minimal conversion** (high-intent traffic or a small offer), **comparison** (search intent is "X vs Y"). + +**Structure.** Above the fold at 375×667 and on desktop, inside the hero budget: a headline naming outcome and audience, one sentence on how, one primary CTA, one proof signal only when real proof exists (named logos or one attributed quote; a metric row stays banned), one product visual. Below it, choose modules and order from the archetype and the objections. The long-form menu: problem → solution, three to five benefits, how it works in three steps, proof, an FAQ of six to twelve real objections, the risk reversal, a final CTA identical to the top. A minimal page stays minimal; a comparison page leads with the comparison. + +**Conversion rules.** +- A page behind an ad repeats the ad's promise and tone in the hero. +- One primary CTA; nothing competes with it above the fold. +- Benefit first and specific: "Cut weekly reporting from 4 hours to 15 minutes", never "save time". +- Show the risk reversal the business offers (free plan, trial, no card, cancel anytime). Never invent one. +- Proof sits beside the claim it supports. A high-friction offer moves the FAQ up. + +**The primary action works.** A real destination (supplied URL or form endpoint) and every state: invalid (inline error, input kept), pending (control disabled so it cannot submit twice, announced through `aria-live`), failure (what happened, input kept, retry) and success (what happens next). With no backend, simulate the states and say so in a code comment and your summary. + +**Copy.** A CTA is a verb plus what they get ("Start free trial"). Draft two or three headlines in the product's voice and keep the most specific one that names outcome and audience; "{outcome} without {pain}" is a test, not a template. + +**Indexing.** Record the publication decision; keep the site's policy when known. A page the user keeps out of search gets `<meta name="robots" content="noindex">`; an indexed page gets a real title and description, and its FAQ ships as FAQPage JSON-LD. + +**Build order.** One section at a time, top down; a refinement edits one section. + +### Craft floor (every page) + +**Claims come from the user, never from you.** Testimonials, customer names and logos, results, uptime, prices and guarantees appear only when supplied. Missing proof: leave the slot out, or mark it `[Needs proof: …]` in the warning color so it cannot ship by accident. A believable invented claim is worse than an obvious placeholder. + +**Illustrative content looks real.** Sample data in product shots and UI (table rows, chart values, people in a demo inbox): +- No placeholder people or brands (John Doe, Jane Doe, Acme, Nexus, SmartFlow); distinct avatars; varied dates. +- No round sample numbers (99.99%, 50%, 1,000+ customers, 10x). In a claim, a round number signals it was made up: use the supplied figure or drop it. +- No buzzwords: elevate, seamless, effortless, supercharge, streamline, revolutionize, unlock, empower, unleash, next-gen, game-changer, delve, tapestry, "in the world of". +- Sentence-case headings. Errors say what happened and what to do, never "Oops!". No exclamation marks in success messages. + +**Ship floor.** Head tags apply to a full HTML document, not a component or fragment. Every full document has `<title>`, a meta description, a favicon (an inline SVG data URI from the brand mark when no file is supplied), and on a page meant for sharing `og:title` and `og:description`; `og:image` only from a supplied URL. A "Skip to content" link is the first focusable element, hidden until focused, targeting the `id` of `<main>`. Landmarks (`<header>`, `<nav>`, `<main>`, `<footer>`); alt text on meaningful images, `alt=""` on decorative ones. A marketing footer links privacy and terms at supplied URLs. Required fields and email format validate inline, wired with `aria-invalid` and `aria-describedby`. Every link goes somewhere real: no `href="#"`, no made-up path; a control with no target renders disabled. Navigation to other pages marks the current one `aria-current="page"`; in-page section links do not. + +**Values come from the scale.** Every font size, space and radius is a step of the system's scale (DESIGN.md, else the spec), chosen by role. An off-scale value snaps to the nearest step that keeps its role, usually the one below, with that step's line height; never below 16px body text or a 44px touch target, and an approved mockup's measured values stand. A shape nested in another with a gap under 32px gets inner radius = outer − gap when that exceeds 2px. + +**Line breaks.** Browser-wrapped headings get `text-wrap: balance`, body `text-wrap: pretty`. Break display lines where the thought breaks; never one word alone on the last line. + +**Motion.** These govern the one authored motion moment and state transitions; they license no more motion. +- Content is visible by default; script adds the hidden start state only after the observer is set up (`.motion-ready` on `<html>`), so a script failure or a crawler sees everything and the CTA never waits on an animation. +- Reveal with `IntersectionObserver` (`threshold: 0`, bottom `rootMargin` about −20%, once). Never an unthrottled `window.addEventListener('scroll')`; scroll-linked effects read scroll inside `requestAnimationFrame`. +- Animate `transform`, `opacity`, `filter`, `clip-path` only; blur 14px or less. +- No object grows from `scale(0)` (start at 0.85 or more); only lines and bars grow from zero. A data bar fills as a left-to-right `clip-path` wipe, 0.7–1.1s. +- Stagger in reading order inside one section (30–80ms), never across the page. +- Curves are named tokens: DESIGN.md's, else `cubic-bezier(0.16, 1, 0.3, 1)` for entrances and `cubic-bezier(0.65, 0, 0.35, 1)` for wipes; `linear` only for constant motion. +- Loops pause off-screen. `prefers-reduced-motion: reduce` shows the final state. Full-height sections use `min-height: 100dvh`, not `100vh`. + +### Craft check + +At Step 4, after the Slop Gate and before the screenshots, run the free checker on a vanilla HTML output (for framework output, say it is unavailable): + +```bash +{{BIN_DIR}}/gstack-design-craft <path-to-finalized.html> +``` + +It prints one `CRAFT_CHECK: <id> <count> <fix>` line per tell (the realism rules above, `[Needs proof:` markers, scroll listeners, `100vh`, `transition: all`, `href="#"`, `alert()`, missing alt; on a full document a missing title, description, favicon, working skip link, or `aria-current` on route navigation), then `CRAFT_RESULT: clean` or `CRAFT_RESULT: <n> issue(s)`. No `CRAFT_RESULT` line: say the check was unavailable and continue. Same contract as the Slop Gate: one surgical fix pass, one rerun, the rest listed as accepted-with-reason (a real customer named Nexus, a supplied 50% figure). Rerun once when the refinement loop exits; report only new lines. + +**Before this can ship.** Open the Step 4 hand-off, and repeat before Step 5's "Copy to project": every `[Needs proof: …]` marker, the dependencies the page cannot own (legal URLs, form endpoint, og:image, indexing, analytics and cookie consent where required), the accepted exceptions, and every claim the check made you change. + +Adapted from Elaya's [ai-design-skills](https://github.com/elayadesign/ai-design-skills) and [redesign-skill](https://github.com/elayadesign/redesign-skill) (MIT, © 2026 Elaya), rewritten for gstack. See NOTICE.md. diff --git a/design-html/sections/manifest.json b/design-html/sections/manifest.json index c452a68a3..1a88a88f1 100644 --- a/design-html/sections/manifest.json +++ b/design-html/sections/manifest.json @@ -16,6 +16,12 @@ "title": "Pretext wiring patterns + API reference", "trigger": "writing the finalized HTML in Step 3 — the Pretext wiring patterns and API cheatsheet are the required reference for all text-layout code" }, + { + "id": "craft", + "file": "craft.md", + "title": "Craft: Persuade pages and the craft floor", + "trigger": "writing the Step 1 implementation spec — the Persuade intake and archetype, and the craft floor every page ships with" + }, { "id": "detector-install-offer", "file": "detector-install-offer.md", diff --git a/design-shotgun/SKILL.md b/design-shotgun/SKILL.md index 3287bb48d..cc9703d6b 100644 --- a/design-shotgun/SKILL.md +++ b/design-shotgun/SKILL.md @@ -634,6 +634,9 @@ Draw on DESIGN.md, taste memory, and the user's request to make each concept dis exists, it decides what varies: keep its fonts and palette and vary layout and composition. Without one, vary font family, color palette, and layout approach. If two variants look like siblings, rework the weaker one with a deliberately different direction. +For a landing, pricing or campaign screen, also vary the page archetype (classic hero, +long-form story, minimal conversion, comparison), keep the one primary action identical, +and caption each variant with its section outline. Concrete test: if someone could swap the headline text between two variants without noticing, they're too similar. Variants should feel like separate design teams made diff --git a/design-shotgun/SKILL.md.tmpl b/design-shotgun/SKILL.md.tmpl index 1fc9ec2f3..a037184ad 100644 --- a/design-shotgun/SKILL.md.tmpl +++ b/design-shotgun/SKILL.md.tmpl @@ -219,6 +219,9 @@ Draw on DESIGN.md, taste memory, and the user's request to make each concept dis exists, it decides what varies: keep its fonts and palette and vary layout and composition. Without one, vary font family, color palette, and layout approach. If two variants look like siblings, rework the weaker one with a deliberately different direction. +For a landing, pricing or campaign screen, also vary the page archetype (classic hero, +long-form story, minimal conversion, comparison), keep the one primary action identical, +and caption each variant with its section outline. Concrete test: if someone could swap the headline text between two variants without noticing, they're too similar. Variants should feel like separate design teams made diff --git a/lib/design-craft.ts b/lib/design-craft.ts new file mode 100644 index 000000000..94198739f --- /dev/null +++ b/lib/design-craft.ts @@ -0,0 +1,110 @@ +/** + * Free craft check for a generated page (design-html Step 4). Counts the tells + * that make a page read as generated or unfinished: placeholder content, AI + * cliché copy, scroll listeners, 100vh, dead links, and the missing ship-floor + * tags. Copy checks read the visible text only (script, style and tags + * removed); code checks read the source. Head checks run only on a full + * document. Adapted from Elaya's landing-page-design and redesign-skill + * (MIT); see NOTICE.md. Buzzwords report under the catalog's + * `marketing-buzzword` id, and BUZZWORDS covers every word its heuristic + * names (test-enforced), so the two lists cannot drift. + */ + +/** The catalog's marketing-buzzword words plus Elaya's AI cliché words. */ +export const BUZZWORDS: readonly string[] = [ + 'seamless', 'effortless', 'supercharge', 'streamline', 'revolutionize', 'unlock', 'empower', 'elevate', + 'unleash', 'next-gen', 'game-changer', 'delve', 'tapestry', 'in the world of', +]; + +function buzzwordPattern(): RegExp { + const stem = (w: string) => w.replace(/-/g, '[- ]').replace(/e$/, ''); + return new RegExp(`\\b(?:${BUZZWORDS.map(stem).join('|')})(?:e|es|ed|ing|ly|er|ers|s|d|eration)?\\b`, 'gi'); +} + +export interface CraftFinding { + id: string; + count: number; + fix: string; +} + +interface CountRule { + id: string; + on: 'source' | 'text' | 'script'; + pattern: RegExp; + fix: string; +} + +interface PresenceRule { + id: string; + pattern: RegExp; + fix: string; +} + +const COUNT_RULES: CountRule[] = [ + { id: 'placeholder-name', on: 'text', pattern: /\b(?:John|Jane) Doe\b/gi, fix: 'use a supplied name, or one that fits the product in sample data' }, + { id: 'placeholder-brand', on: 'text', pattern: /\b(?:Acme|Nexus|SmartFlow)\b/g, fix: 'use a supplied customer, or a fitting name in sample data' }, + { id: 'lorem', on: 'text', pattern: /\blorem ipsum\b/gi, fix: 'write real copy' }, + { id: 'marketing-buzzword', on: 'text', pattern: buzzwordPattern(), fix: 'say the specific thing' }, + { id: 'round-number', on: 'text', pattern: /(?<![\d.])(?:99\.9+|[1-9]0|100)%\s+(?:uptime|faster|more|less|fewer|better|growth|increase|reduction|of (?:teams|users|customers|companies))\b|\b(?:\d+0|\d+(?:,\d{3})+)\+?\s+(?:happy |active )?(?:users|customers|teams|companies)\b|(?<![\d.])10x\s+(?:faster|more|better)\b/gi, fix: 'use the supplied figure, or drop the claim' }, + { id: 'needs-proof', on: 'text', pattern: /\[Needs proof:/g, fix: 'supply the proof or remove the claim before publishing' }, + { id: 'oops', on: 'text', pattern: /\boops\b/gi, fix: 'say what happened and what to do' }, + { id: 'scroll-listener', on: 'source', pattern: /addEventListener\(\s*['"`]scroll['"`]/g, fix: 'use IntersectionObserver; read scroll inside requestAnimationFrame for a scroll-linked effect' }, + { id: 'transition-all', on: 'source', pattern: /\btransition\s*:\s*all\b|\btransition-all\b/g, fix: 'list the transitioned properties' }, + { id: 'dead-link', on: 'source', pattern: /\bhref\s*=\s*["']#["']/g, fix: 'link it, or render the control disabled' }, + { id: 'alert', on: 'script', pattern: /(?<![\w.$])(?:window\.)?alert\s*\(/g, fix: 'show the message inline' }, + { id: 'img-no-alt', on: 'source', pattern: /<img\b(?![^>]*(?<![\w-])alt\s*=)[^>]*>/gi, fix: 'add alt text (alt="" when decorative)' }, +]; + +const HEAD_RULES: PresenceRule[] = [ + { id: 'missing-title', pattern: /<title>\s*[^<\s][^<]*<\/title>/i, fix: 'add a <title>' }, + { id: 'missing-meta-description', pattern: /<meta\b[^>]*\bname\s*=\s*["']description["']/i, fix: 'add <meta name="description">' }, + { id: 'missing-favicon', pattern: /<link\b[^>]*\brel\s*=\s*["'][^"']*\bicon\b/i, fix: 'add a favicon <link rel="icon">' }, +]; + +export function visibleText(html: string): string { + return html + .replace(/<!--[\s\S]*?-->/g, ' ') + .replace(/<(script|style|template)\b[\s\S]*?<\/\1>/gi, ' ') + .replace(/<[^>]+>/g, ' ') + .replace(/&#(\d+);/g, (_, n) => String.fromCodePoint(Number(n))) + .replace(/&#x([0-9a-f]+);/gi, (_, n) => String.fromCodePoint(parseInt(n, 16))) + .replace(/&(nbsp|lt|gt|quot|apos|amp);/g, (_, e) => ({ nbsp: ' ', lt: '<', gt: '>', quot: '"', apos: "'", amp: '&' })[e as string] as string) + .replace(/\s+/g, ' '); +} + +export function checkCraft(html: string): CraftFinding[] { + const text = visibleText(html); + const scripts = [...html.matchAll(/<script\b[^>]*>([\s\S]*?)<\/script>/gi), ...html.matchAll(/\bon[a-z]+\s*=\s*"([^"]*)"/gi)].map(m => m[1]).join('\n'); + const findings: CraftFinding[] = []; + for (const rule of COUNT_RULES) { + const count = (rule.on === 'text' ? text : rule.on === 'script' ? scripts : html).match(rule.pattern)?.length ?? 0; + if (count > 0) findings.push({ id: rule.id, count, fix: rule.fix }); + } + const vh = [...html.matchAll(/\b((?:min-|max-)?height)\s*:\s*100vh\b(\s*!important)?([^}]*)/g)] + .filter(m => m[2] || !new RegExp(`(?<![\\w-])${m[1]}\\s*:\\s*100[dsl]vh\\b`).test(m[3])).length + + (html.match(/\b(?:min-)?h-screen\b/g)?.length ?? 0); + if (vh > 0) findings.push({ id: 'vh-height', count: vh, fix: 'use min-height: 100dvh (a 100vh line followed by a 100dvh fallback is fine)' }); + if (!/<head\b/i.test(html)) return findings; + for (const rule of HEAD_RULES) { + if (!rule.pattern.test(html)) findings.push({ id: rule.id, count: 1, fix: rule.fix }); + } + const body = html.slice(html.search(/<body\b/i) + 1); + const firstFocusable = body.match(/<(?:a\b[^>]*\bhref|button|input|select|textarea)\b[^>]*>/i)?.[0] ?? ''; + const skipTarget = firstFocusable.match(/^<a\b[^>]*\bhref\s*=\s*["']#([^"']+)["']/i)?.[1]; + const main = html.match(/<main\b[^>]*(?<![\w-])id\s*=\s*["']([^"']+)["']/i)?.[1] + ?? html.match(/<[a-z]+\b[^>]*\brole\s*=\s*["']main["'][^>]*(?<![\w-])id\s*=\s*["']([^"']+)["']/i)?.[1]; + if (!skipTarget || skipTarget !== main) { + findings.push({ id: 'missing-skip-link', count: 1, fix: 'add a "Skip to content" link first in <body> whose #id exists on <main>' }); + } + const routeLinks = html.match(/<nav\b[\s\S]*?<\/nav>/gi)?.join('').match(/<a\b[^>]*\bhref\s*=\s*["'](?!#)[^"']+["']/gi)?.length ?? 0; + if (routeLinks >= 2 && !/\baria-current\s*=\s*["']page["']/i.test(html)) { + findings.push({ id: 'missing-aria-current', count: 1, fix: 'mark the current nav link aria-current="page"' }); + } + return findings; +} + +export function formatCraft(findings: CraftFinding[]): string { + const lines = findings.map(f => `CRAFT_CHECK: ${f.id} ${f.count} ${f.fix}`); + lines.push(findings.length === 0 ? 'CRAFT_RESULT: clean' : `CRAFT_RESULT: ${findings.length} issue(s)`); + return lines.join('\n'); +} diff --git a/licenses/MIT-elaya.txt b/licenses/MIT-elaya.txt new file mode 100644 index 000000000..9ff21c8c5 --- /dev/null +++ b/licenses/MIT-elaya.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2026 Elaya + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/package.json b/package.json index 723b9014a..88c1a1100 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gstack", - "version": "1.91.224", + "version": "1.91.225", "description": "Garry's Stack — Claude Code skills + fast headless browser. One repo, one install, entire AI engineering workflow.", "license": "MIT", "type": "module", diff --git a/test/design-craft.test.ts b/test/design-craft.test.ts new file mode 100644 index 000000000..d6d832f3b --- /dev/null +++ b/test/design-craft.test.ts @@ -0,0 +1,118 @@ +import { describe, expect, test } from 'bun:test'; +import * as fs from 'fs'; +import * as os from 'os'; +import * as path from 'path'; +import { BUZZWORDS, checkCraft, formatCraft, visibleText } from '../lib/design-craft'; +import { catalogEntry } from '../lib/design-catalog'; + +const ROOT = path.resolve(import.meta.dir, '..'); +const BIN = path.join(ROOT, 'bin', 'gstack-design-craft'); + +const DIRTY = `<!doctype html><html><head><style>.hero{height:100vh;transition: all .3s}</style></head><body> +<nav><a href="#">Docs</a><a href="/">Home</a><a href="/pricing">Pricing</a></nav> +<h1>Elevate your workflow seamlessly</h1><p>Trusted by Acme and John Doe. 99.99% uptime, 50% faster, 10,000+ happy users. [Needs proof: logo]</p> +<img src="a.png"><p>Oops! Something broke. Lorem ipsum.</p> +<script>window.addEventListener('scroll', () => {}); alert('hi'); showAlert(1);</script></body></html>`; + +const CLEAN = `<!doctype html><html lang="en"><head><title>Ledgerline: close the books in 2 days + + +Skip to contentPricing +

Close the books in 2 days, not 9

Teams at Halvorsen Freight cut month-end by 47.2%. Save 20% yearly. 100% open source. 30-day refund.

+`; + +function run(file?: string) { + const r = Bun.spawnSync([BIN, ...(file ? [file] : [])], { stdout: 'pipe', stderr: 'pipe', timeout: 30_000 }); + return { code: r.exitCode, out: r.stdout.toString(), err: r.stderr.toString() }; +} + +describe('design-craft check', () => { + test('a page with every tell reports each one with its count', () => { + const counts = Object.fromEntries(checkCraft(DIRTY).map(f => [f.id, f.count])); + expect(counts).toEqual({ + 'placeholder-name': 1, 'placeholder-brand': 1, lorem: 1, 'marketing-buzzword': 2, 'round-number': 3, 'needs-proof': 1, oops: 1, + 'scroll-listener': 1, 'transition-all': 1, 'dead-link': 1, alert: 1, 'img-no-alt': 1, 'vh-height': 1, + 'missing-title': 1, 'missing-meta-description': 1, 'missing-favicon': 1, + 'missing-skip-link': 1, 'missing-aria-current': 1, + }); + }); + + test('a finished page is clean: CSS 100%, a 100vh line with its 100dvh fallback, in-page anchors, a showAlert helper and inlined Pretext are not flagged', () => { + expect(checkCraft(CLEAN)).toEqual([]); + const pretext = fs.readFileSync(path.join(ROOT, 'design-html', 'vendor', 'pretext.js'), 'utf-8'); + expect(checkCraft(CLEAN.replace('', ``))).toEqual([]); + expect(formatCraft([])).toBe('CRAFT_RESULT: clean'); + }); + + test('BUZZWORDS covers every word the catalog marketing-buzzword heuristic names', () => { + const heuristic = catalogEntry('marketing-buzzword')?.heuristic ?? ''; + const words = heuristic.replace(/^.*?for /, '').replace(/\.$/, '').split(/,\s*/); + expect(words.length).toBeGreaterThan(5); + for (const word of words) expect(BUZZWORDS).toContain(word); + expect(checkCraft('

Unlocking seamless, next gen workflows that elevate teams

').map(f => [f.id, f.count])).toEqual([['marketing-buzzword', 4]]); + expect(checkCraft('

Take the elevator to the elevation map; streamers sold here

')).toEqual([]); + }); + + test('the skip link must reach an existing id, and aria-current is required only for route navigation', () => { + const ids = (html: string) => checkCraft(html).map(f => f.id); + expect(ids(CLEAN.replace('id="main"', 'id="content"'))).toEqual(['missing-skip-link']); + const sectionNav = CLEAN.replace('HomePricing', 'FeaturesFAQ'); + expect(ids(sectionNav)).toEqual([]); + expect(ids(CLEAN.replace(' aria-current="page"', ''))).toEqual(['missing-aria-current']); + }); + + test('attribute look-alikes, encoded markers and 100vh ordering are read correctly', () => { + const ids = (html: string) => checkCraft(html).map(f => f.id); + expect(ids('')).toEqual(['img-no-alt']); + expect(ids('

[Needs proof: logo]

')).toEqual(['needs-proof']); + expect(ids(CLEAN.replace('id="main"', 'data-id="main"'))).toEqual(['missing-skip-link']); + expect(ids('')).toEqual(['vh-height']); + expect(ids('')).toEqual(['vh-height']); + }); + + test('every word and name the craft section bans is one the checker flags', () => { + const section = fs.readFileSync(path.join(ROOT, 'design-html', 'sections', 'craft.md.tmpl'), 'utf-8'); + const buzz = section.match(/No buzzwords: ([^\n]+)\.\n/)?.[1].replace(/"/g, '').split(/,\s*/) ?? []; + expect(buzz.length).toBeGreaterThan(10); + for (const word of buzz) expect(BUZZWORDS).toContain(word); + const names = section.match(/No placeholder people or brands \(([^)]+)\)/)?.[1].split(/,\s*/) ?? []; + expect(names.length).toBe(5); + for (const name of names) expect(checkCraft(`

${name}

`).map(f => f.id)).toEqual([/Doe/.test(name) ? 'placeholder-name' : 'placeholder-brand']); + }); + + test('skip link is judged by position and target; alert() counts only in script; svg text is copy', () => { + const ids = (html: string) => checkCraft(html).map(f => f.id); + expect(ids(CLEAN.replace('>Skip to content<', '>Zum Inhalt springen<'))).toEqual([]); + expect(ids(CLEAN.replace('Skip to content', ''))).toEqual(['missing-skip-link']); + expect(ids('

Set a price alert (free)

')).toEqual([]); + expect(ids('')).toEqual(['alert']); + expect(ids('Acme')).toEqual(['placeholder-brand']); + }); + + test('copy rules read visible text only; head rules skip a fragment', () => { + expect(visibleText('

Halvorsen

')).toBe(' Halvorsen '); + expect(checkCraft('

Pricing

Start free trial
')).toEqual([]); + }); + + test('the CLI prints CRAFT_CHECK lines and exits 1 on tells, 0 when clean, 2 on usage', () => { + const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'design-craft-')); + try { + fs.writeFileSync(path.join(dir, 'dirty.html'), DIRTY); + fs.writeFileSync(path.join(dir, 'clean.html'), CLEAN); + const dirty = run(path.join(dir, 'dirty.html')); + expect(dirty.code).toBe(1); + expect(dirty.out).toContain('CRAFT_CHECK: scroll-listener 1 '); + expect(dirty.out.trim().split('\n').at(-1)).toBe('CRAFT_RESULT: 18 issue(s)'); + const clean = run(path.join(dir, 'clean.html')); + expect(clean).toMatchObject({ code: 0, out: 'CRAFT_RESULT: clean\n' }); + expect(run().code).toBe(2); + expect(run(path.join(dir, 'missing.html')).code).toBe(2); + fs.writeFileSync(path.join(dir, 'empty.html'), ' \n'); + expect(run(path.join(dir, 'empty.html')).code).toBe(2); + fs.writeFileSync(path.join(dir, 'page.tsx'), 'export const P = () =>

Acme

;'); + expect(run(path.join(dir, 'page.tsx'))).toMatchObject({ code: 2, out: '' }); + } finally { + fs.rmSync(dir, { recursive: true, force: true }); + } + }); +}); diff --git a/test/helpers/carve-guards.ts b/test/helpers/carve-guards.ts index ff3ff4203..d61dec498 100644 --- a/test/helpers/carve-guards.ts +++ b/test/helpers/carve-guards.ts @@ -736,8 +736,8 @@ do not launch the downstream skill or open a browser.`, // (D3A: read-on-demand doctrine, requiredReads-guarded + loading eval) 'design-html': { skill: 'design-html', - expectedSections: ['doctrine.md', 'pretext-patterns.md', 'detector-install-offer.md'], - requiredReads: ['doctrine.md', 'pretext-patterns.md'], + expectedSections: ['doctrine.md', 'pretext-patterns.md', 'craft.md', 'detector-install-offer.md'], + requiredReads: ['doctrine.md', 'pretext-patterns.md', 'craft.md'], scenario: 'Walk /design-html in SIMULATION — do not run bash, start servers, launch a browser, or take screenshots. Treat Step 0 as already resolved: no CEO plan, no approved mockup, no variants, no DESIGN.md, no prior finalized.html — freeform mode (Case C option D), screen name "pricing", the user wants a pricing page for a developer-tools SaaS (dark, dense, three tiers, monospace-leaning). Do NOT use AskUserQuestion — proceed with the stated assumptions. Read each pointed section before doing its step, then execute Steps 1-3: produce the implementation spec, state the chosen Pretext tier and why, and generate the complete Pretext-native HTML — include the HTML in your report instead of writing files. Stop there: skip Step 3.5, Step 4, and Step 5.', staticInvariants: { @@ -759,7 +759,7 @@ do not launch the downstream skill or open a browser.`, gateAfterStop: undefined, // operational skill, no plan-mode gate }, behavioral: 'prompt', - maxSkeletonBytes: 56_200, // measured 55,262 (2026-09-09): the detector install offer pointer + its sections-table row (the brief itself lives in sections/detector-install-offer.md); before that 54,545 for the review-cycle trust prose, the Slop Gate's Decisions-Log clause, and the blacklist header's override sentence + Honest Work wave merged (W2/W3 gate integrity in review/ship, W4 kernel + DONE line in every tier-2+ skill, W5/W7 in spec/ship): re-measured on the integrated tree (2026-10-10). + maxSkeletonBytes: 56_200, // measured 55,786 (2026-10-25): the craft section pointer, its index row and the Step 4 craft-check line (GSTA-92); before that 55,262 (2026-09-09): the detector install offer pointer + its sections-table row (the brief itself lives in sections/detector-install-offer.md); before that 54,545 for the review-cycle trust prose, the Slop Gate's Decisions-Log clause, and the blacklist header's override sentence + Honest Work wave merged (W2/W3 gate integrity in review/ship, W4 kernel + DONE line in every tier-2+ skill, W5/W7 in spec/ship): re-measured on the integrated tree (2026-10-10). minUnionBytes: 57_500, // Phase 4 wave 4; measured union 58,682 mustContain: ["Don't make me think", "Users scan, they don't read", 'The Goodwill Reservoir', 'PRETEXT API CHEATSHEET', 'Pattern 3: Text around obstacles'], }, diff --git a/test/skill-e2e-design.test.ts b/test/skill-e2e-design.test.ts index 8f078f9ce..8c4fa2c1f 100644 --- a/test/skill-e2e-design.test.ts +++ b/test/skill-e2e-design.test.ts @@ -1316,8 +1316,8 @@ describeIfSelected('Design HTML slop gate E2E', ['design-html-slop-gate'], () => testConcurrentIfSelected('design-html-slop-gate', async () => { const result = await runSkillTest({ prompt: `Read design-html-gate.md: the /design-html detector probe block and its "Slop Gate (bounded, never a loop)" step. -finalized.html in this directory is the finished page. Run the probe (--host claude), then the slop gate on finalized.html exactly as written: one surgical fix pass over the non-advisory findings, one rescan, then stop. -Write ${workDir}/gate-output.md listing what you fixed and every remaining finding as accepted-with-reason, each tagged with its [rule-id]. Do not take screenshots, do not run npx, do not scan more than twice.`, +finalized.html in this directory is the finished page. Run the probe (--host claude), then the slop gate on finalized.html exactly as written: one surgical fix pass over the non-advisory findings, one rescan. Then the craft check line that follows it, the same way, then stop. +Write ${workDir}/gate-output.md listing what you fixed and every remaining finding as accepted-with-reason, each tagged with its [rule-id] or craft id. Do not take screenshots, do not run npx, do not run either check more than twice.`, workingDirectory: workDir, maxTurns: 20, timeout: CAPTURE_MS, @@ -1332,6 +1332,9 @@ Write ${workDir}/gate-output.md listing what you fixed and every remaining findi const scans = result.toolCalls.filter(c => c.tool === 'Bash' && /gstack-design-detect\.ts scan /.test(String(c.input?.command ?? ''))); expect(scans.length).toBeGreaterThanOrEqual(1); expect(scans.length).toBeLessThanOrEqual(2); + const craftRuns = result.toolCalls.filter(c => c.tool === 'Bash' && /gstack-design-craft['"]?\s+[^\s;|&]*\.html\b/.test(String(c.input?.command ?? ''))); + expect(craftRuns.length).toBeGreaterThanOrEqual(1); + expect(craftRuns.length).toBeLessThanOrEqual(2); const outPath = path.join(workDir, 'gate-output.md'); expect(fs.existsSync(outPath)).toBe(true); const out = fs.readFileSync(outPath, 'utf-8').toLowerCase(); From 8d9501373b55897447ae30f1d281c4dbc8a1369e Mon Sep 17 00:00:00 2001 From: Garry Tan Date: Sun, 25 Oct 2026 17:43:12 -0700 Subject: [PATCH 5/9] v1.91.226.0 feat(review): /review re-reviews only its fixes after an edited pass, with a final full pass (#3339) (#3414) * feat(review): /review re-reviews only its fixes after an edited pass, with a final full pass (#3339) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(review): fix-range narrows only DIFF_BASE outside Step 4.8; Step 5.0 ignores this invocation's records (#3339) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(review): fix-range walk logs each pass's Step 4.8 attempt in /review's real order (#3339) 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> --- CHANGELOG.md | 26 ++++++++ VERSION | 2 +- agents-digest/gstack-AGENTS.md | 2 +- package.json | 2 +- review/SKILL.md | 51 ++++++++------- review/SKILL.md.tmpl | 51 ++++++++------- test/fixtures/skill-md-size-allowlist.json | 16 ++--- test/review-fix-range.test.ts | 74 +++++++++++++++++++++- test/review-workflow-clarity.test.ts | 11 ++-- 9 files changed, 166 insertions(+), 69 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7ee1e9fa..c468eaf5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,31 @@ # Changelog +## [1.91.226.0] - 2026-10-26 + +**/review can re-review just its own fixes after a fixing pass, under the same rules as /ship (#3339).** Before, every /review fix cycle reran the whole review over the whole branch, so a large branch could hit the three-cycle stop on findings in code the earlier passes had already read. Now the pass after an edited pass starts with `gstack-review-log --start review --fix-range` and its checklist, specialists and QA read only what changed since that pass. The Step 4.8 adversarial review still reads the whole branch on every pass, because its rows carry their own freshness. A narrowed pass is never the final review: when it makes no edits, /review runs one full pass before writing the final record, and a fix-range record is never CURRENT. Garry's "do it" on 2026-10-24 for a fix-range re-review with a final full pass covers it. + +### Changed +- **`review/SKILL.md.tmpl`** Step 3: the first pass always starts full. The pass right after an edited pass starts with `--start review --fix-range`, and wherever that pass sets DIFF_BASE outside Step 4.8 it uses the printed `FIX_BASE=` instead. Step 4.8 and every other `` use (state-matrix detection, the gate, banned-terms and slop scans, the queue check) keep the base branch. State-matrix detection builds `origin/` from its argument, and the slop scan diffs `...HEAD`, which is empty while /review's fixes are uncommitted. If the logger refuses (for example, the first pass read uncommitted work, so no commit marks what it read), the pass starts full. +- **Step 5.8**: an edited pass now saves its own record with `converged:false` before the repeat, because the fix-range start takes its base from that record. Before, only the final pass was logged. Step 5.0 never treats this invocation's own records as prior reviews, so a defect the user skipped this invocation is not suppressed on the next pass and still counts as unresolved. "No edits" fills the final record only after a full pass; after a fix-range pass it repeats Steps 3–5 with a full start. Each logged pass finishes its own REVIEW_START. +- Nearby prose was tightened to pay for the growth (the slop-scan note, the Step 4.7 probe-reuse rule, the search-before-recommending list, the version-compare note, the final-report and Greptile lines). Every host's review SKILL.md shrank by 36 characters, and its size pin was lowered to match. The Claude skeleton is 80,581 bytes against its 80,900 cap. + +### Tests +- `test/review-fix-range.test.ts` adds five cases. Two check the rendered rules: the first pass's start block has no `--fix-range`, only the pass after an edited pass narrows, FIX_BASE replaces only DIFF_BASE outside Step 4.8, a refusal falls back to a full start, the edited pass is logged before the repeat and kept out of Step 5.0, and a fix-range pass is never final. Three run /review's real order on every pass against the real logger: core start, then the Step 4.8 attempt's start and finish, then fixes in the working tree, then the core finish with the pass's own token, and never a commit. A committed first pass narrows the next repeat to the uncommitted fixes, and the following repeat is refused back to a full pass that is CURRENT. A zero-edit fix-range row is UNVERIFIED even if it were logged. A first pass over uncommitted work can't be narrowed. +- `test/review-workflow-clarity.test.ts`: three expectations follow the new contract: the "No edits" marker, the edited pass saving its record with `converged:false`, and each pass finishing its own token instead of only the final one. The test formerly named "finish only the final core token without log-time capture" is now "each logged pass finishes its own core token without log-time capture". It still requires one `--finish REVIEW_START`, no `--start review` in Step 5.8 and no log-time token capture. + +### Gate integrity +- One gate change to review: /review may narrow a repeat pass. Verdict: this does not weaken what the final review covers, because a narrowed pass can't be the final record. The logger never marks a fix-range row CURRENT, Step 5.8 requires a full pass after a zero-edit fix-range pass, Step 4.8 stays full, and Step 5.0 can't suppress this invocation's skipped defects through its own intermediate records. Mutation checks on the rendered skill, each caught by the suite: + - letting a fix-range pass be final; + - dropping the full-pass condition on "No edits"; + - narrowing every repeat; + - dropping the refusal fallback; + - narrowing the first pass; + - not logging the edited pass; + - logging after the repeat; + - narrowing Step 4.8 and other base uses; + - letting Step 5.0 read this invocation's records. +- No threshold, budget, timeout, trial count or case kind changed. Size pins only went down. + ## [1.91.225.0] - 2026-10-26 **/design-html builds landing pages around one visitor action and pages that look finished, without inventing proof; adapted from Elaya's design skills (GSTA-92).** Freeform /design-html asked for purpose, audience and feel, then built. It never asked for the one action the page exists for or where the traffic comes from, and nothing caught a page that shipped with invented customers and numbers, a dead `href="#"`, a scroll-listener reveal, `100vh`, or no description, favicon or working skip link. Now every run reads a craft section at Step 1, and a free checker counts the tells at Step 4. Adapted from Elaya's [ai-design-skills](https://github.com/elayadesign/ai-design-skills) (landing-page-design, design-to-motion) and [redesign-skill](https://github.com/elayadesign/redesign-skill), MIT, © 2026 Elaya. Thank you, Elaya. diff --git a/VERSION b/VERSION index c779e60ef..df1fb708a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.91.225.0 +1.91.226.0 diff --git a/agents-digest/gstack-AGENTS.md b/agents-digest/gstack-AGENTS.md index b8de4afe8..f56ac87b8 100644 --- a/agents-digest/gstack-AGENTS.md +++ b/agents-digest/gstack-AGENTS.md @@ -1,4 +1,4 @@ -# gstack digest v1.91.225.0 — regenerate/re-copy after upgrading gstack +# gstack digest v1.91.226.0 — regenerate/re-copy after upgrading gstack Behavioral rules from gstack (https://github.com/garrytan/gstack), compressed for agent hosts without a full skill install. The full skills add workflows, diff --git a/package.json b/package.json index 88c1a1100..b28272089 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gstack", - "version": "1.91.225", + "version": "1.91.226", "description": "Garry's Stack — Claude Code skills + fast headless browser. One repo, one install, entire AI engineering workflow.", "license": "MIT", "type": "module", diff --git a/review/SKILL.md b/review/SKILL.md index f319f1669..edb01a2c8 100644 --- a/review/SKILL.md +++ b/review/SKILL.md @@ -505,8 +505,11 @@ git diff "$DIFF_BASE" ``` 1. Save the printed REVIEW_START for this core candidate before reading its diff. -2. Each re-review captures a new token before reading, never at log time. Earlier - core tokens remain unused; Step 5.8 finishes only the final core token. +2. Each re-review captures a new token before reading, never at log time. After an + edited pass, start the next with `--start review --fix-range`: it prints + REVIEW_START, then `FIX_BASE=`. Wherever this pass sets DIFF_BASE outside + Step 4.8, use FIX_BASE instead; Step 4.8 and every other `` use stay full. + On refusal, start a full pass. 3. Native/outside reviewer attempts own separate PASS_START tokens, not REVIEW_START. 4. Read non-ignored untracked source too (`git ls-files --others --exclude-standard`); the captured candidate includes it. @@ -540,13 +543,13 @@ OFFLINE=$(echo "$QUEUE_JSON" | jq -r '.offline // false') - `OFFLINE=true`: skip this section. - Otherwise, include ONE line in the review output: `Version claimed: v. Queue: PR(s) ahead. ` where VERDICT is either `Slot free` (if `BRANCH_VERSION >= NEXT_SLOT`) or `⚠ queue moved — rerun /ship to reconcile v → v`. -Compare dotted version components as integers from left to right; missing trailing components count as zero. +Compare versions numerically per dotted component; missing ones count as zero. --- ## Step 3.5: Diff scans -Run the gate scan first (local, seconds; every diff size), then the slop scan. +Run the gate scan first (local; every diff size), then the slop scan. ### Gate scan @@ -589,14 +592,11 @@ category, Step 5.8's record and the final report. ### Slop scan (advisory) -Scan changed files for empty catches, redundant `return await` and needless abstractions: - ```bash bun run slop:diff origin/ 2>/dev/null || true ``` -Include findings as non-blocking informational diagnostics. If slop:diff is -unavailable, skip silently. +Findings are non-blocking informational diagnostics; skip if unavailable. --- @@ -719,10 +719,8 @@ a clean result. Gate findings are ASK in Step 5 regardless of how mechanical the revert looks. A test-only flake fix (timeout, retry, looser assertion, skip) states `P(fail | regression)` before and after, from a forced probe; without both numbers it is RH-15. **Search-before-recommending:** Research proposed fixes through Aside, especially -concurrency, caching, auth and framework behavior: -- Check current best practice for the installed framework version. -- Look for a newer built-in before proposing a workaround. -- Verify API signatures against current docs. +concurrency, caching, auth and framework behavior: current best practice for the +installed version, newer built-ins that replace a workaround, and current API signatures. Prompt file text (create, write and send it with the Web research runs in Aside blocks above): `{framework} {version} {pattern} current best practice and whether a built-in replaces it. Reply with up to 5 bullets, each with its source URL.` @@ -1052,7 +1050,7 @@ Verify claims or flag them as unknown; "this looks fine" is not evidence. After outputting your own findings, if Greptile comments were classified in Step 2.5: -**Include a Greptile summary in your output header:** `+ N Greptile comments (X valid, Y fixed, Z FP)` +**Greptile summary in your output header:** `+ N Greptile comments (X valid, Y fixed, Z FP)` Before replying to any comment, run greptile-triage.md's **Escalation Detection** to choose Tier 1 (friendly) or Tier 2 (firm) reply templates. @@ -1067,7 +1065,7 @@ Before replying to any comment, run greptile-triage.md's **Escalation Detection* 3. **VALID BUT ALREADY FIXED comments:** Reply with greptile-triage.md's **Already Fixed reply template**, no AskUserQuestion: what was done and the fixing commit SHA; save to both per-project and global greptile-history. -4. **SUPPRESSED comments:** Skip silently (known false positives from previous triage). +4. **SUPPRESSED comments:** Skip silently. --- @@ -1076,16 +1074,17 @@ Before replying to any comment, run greptile-triage.md's **Escalation Detection* ### 1. Re-review after edits 1. A pass covers Steps 3–5, including all reviewers before fixes. Allow at most 3 fix cycles: - - Edited: increment CYCLES once. Below 3, repeat Steps 3–5 with a new - REVIEW_START. At 3, persist `converged:false` and remaining findings by filling - and saving the record below. Report nonconvergence and coverage gaps, then STOP - this invocation, without a clean summary or a fourth pass. - - No edits: fill the record below. + - Edited: increment CYCLES once, then fill and save the record below with + `converged:false`. Step 5.0 never treats this invocation's records as prior + reviews. Below 3, repeat Steps 3–5 with a new REVIEW_START. At 3, report + nonconvergence and coverage gaps, then STOP this invocation, without a clean + summary or a fourth pass. + - No edits: after a full pass, fill the record below. A fix-range pass is never + final: repeat Steps 3–5 with a full start. 2. On a repeat, execute Steps 3–5 in order. At Step 4.7, reuse only this invocation's - unchanged-input QA evidence; rerun affected probes after source, test, contract, - command or fixture changes. Reusing a probe never skips a review step. - A probe is affected when its entrypoint, dependencies, contract or replay inputs - change; if uncertain, rerun it. + unchanged-input QA evidence; rerun a probe if its source, tests, entrypoint, + dependencies, contract, command, fixture or replay inputs changed, or if uncertain. + Reusing a probe never skips a review step. 3. **Verify completed actions.** On the final zero-edit pass, reconcile this invocation's actions with current findings. Deduplicate by structural identity and advisory/defect kind. For a completed extraction, retain `fixed` and the @@ -1121,7 +1120,7 @@ pass: report it with its reason. - Use Step 4.6's `specialists` object unchanged, including its empty small-diff map. If this host omits Review Army, use `specialists: {}` without claiming specialist coverage. -- Build `findings` from Step 5's combined final-pass findings (core, specialist, +- Build `findings` from Step 5's combined findings (core, specialist, adversarial, actionable Greptile, verified exploratory QA findings) and invocation actions. Retain `fingerprint`, `severity` (`CRITICAL|INFORMATIONAL`), `action`, and any `advisory`, `evidence_paths`, `helper_target`. Recheck source after fixes. The logger uses `sharedLibsFingerprint`, @@ -1149,11 +1148,11 @@ were skipped or this host omits Review Army). This default is not completion evi unresolved non-advisory core defects still count in `issues_found`, `critical`, `informational`. The logger builds trusted `review_binding` from the validated captured branch digest, discarding caller bindings. Never invent a binding -or replace REVIEW_START at log time; finish only the final core token. +or replace REVIEW_START at log time; finish only this pass's own token. ### Report the final review -Emit one final report, merging all reviewers rather than concatenating them: +Emit one final report merging all reviewers: 1. `Pre-Landing Review: N issues (X critical, Y informational)` counts final unresolved non-advisory defects. State INCOMPLETE if `COMPLETED` is false, even when N=0. 2. Use the checklist's action groups with confidence-tagged finding lines. Keep fixed, diff --git a/review/SKILL.md.tmpl b/review/SKILL.md.tmpl index 1eb1711e7..667c2aa9f 100644 --- a/review/SKILL.md.tmpl +++ b/review/SKILL.md.tmpl @@ -87,8 +87,11 @@ git diff "$DIFF_BASE" ``` 1. Save the printed REVIEW_START for this core candidate before reading its diff. -2. Each re-review captures a new token before reading, never at log time. Earlier - core tokens remain unused; Step 5.8 finishes only the final core token. +2. Each re-review captures a new token before reading, never at log time. After an + edited pass, start the next with `--start review --fix-range`: it prints + REVIEW_START, then `FIX_BASE=`. Wherever this pass sets DIFF_BASE outside + Step 4.8, use FIX_BASE instead; Step 4.8 and every other `` use stay full. + On refusal, start a full pass. 3. Native/outside reviewer attempts own separate PASS_START tokens, not REVIEW_START. 4. Read non-ignored untracked source too (`git ls-files --others --exclude-standard`); the captured candidate includes it. @@ -122,13 +125,13 @@ OFFLINE=$(echo "$QUEUE_JSON" | jq -r '.offline // false') - `OFFLINE=true`: skip this section. - Otherwise, include ONE line in the review output: `Version claimed: v. Queue: PR(s) ahead. ` where VERDICT is either `Slot free` (if `BRANCH_VERSION >= NEXT_SLOT`) or `⚠ queue moved — rerun /ship to reconcile v → v`. -Compare dotted version components as integers from left to right; missing trailing components count as zero. +Compare versions numerically per dotted component; missing ones count as zero. --- ## Step 3.5: Diff scans -Run the gate scan first (local, seconds; every diff size), then the slop scan. +Run the gate scan first (local; every diff size), then the slop scan. ### Gate scan @@ -143,14 +146,11 @@ category, Step 5.8's record and the final report. ### Slop scan (advisory) -Scan changed files for empty catches, redundant `return await` and needless abstractions: - ```bash bun run slop:diff origin/ 2>/dev/null || true ``` -Include findings as non-blocking informational diagnostics. If slop:diff is -unavailable, skip silently. +Findings are non-blocking informational diagnostics; skip if unavailable. --- @@ -180,10 +180,8 @@ a clean result. Gate findings are ASK in Step 5 regardless of how mechanical the revert looks. {{FLAKE_FIX_NUMBER:review}} **Search-before-recommending:** Research proposed fixes through Aside, especially -concurrency, caching, auth and framework behavior: -- Check current best practice for the installed framework version. -- Look for a newer built-in before proposing a workaround. -- Verify API signatures against current docs. +concurrency, caching, auth and framework behavior: current best practice for the +installed version, newer built-ins that replace a workaround, and current API signatures. Prompt file text (create, write and send it with the Web research runs in Aside blocks above): `{framework} {version} {pattern} current best practice and whether a built-in replaces it. Reply with up to 5 bullets, each with its source URL.` @@ -352,7 +350,7 @@ Verify claims or flag them as unknown; "this looks fine" is not evidence. After outputting your own findings, if Greptile comments were classified in Step 2.5: -**Include a Greptile summary in your output header:** `+ N Greptile comments (X valid, Y fixed, Z FP)` +**Greptile summary in your output header:** `+ N Greptile comments (X valid, Y fixed, Z FP)` Before replying to any comment, run greptile-triage.md's **Escalation Detection** to choose Tier 1 (friendly) or Tier 2 (firm) reply templates. @@ -367,7 +365,7 @@ Before replying to any comment, run greptile-triage.md's **Escalation Detection* 3. **VALID BUT ALREADY FIXED comments:** Reply with greptile-triage.md's **Already Fixed reply template**, no AskUserQuestion: what was done and the fixing commit SHA; save to both per-project and global greptile-history. -4. **SUPPRESSED comments:** Skip silently (known false positives from previous triage). +4. **SUPPRESSED comments:** Skip silently. --- @@ -376,16 +374,17 @@ Before replying to any comment, run greptile-triage.md's **Escalation Detection* ### 1. Re-review after edits 1. A pass covers Steps 3–5, including all reviewers before fixes. Allow at most 3 fix cycles: - - Edited: increment CYCLES once. Below 3, repeat Steps 3–5 with a new - REVIEW_START. At 3, persist `converged:false` and remaining findings by filling - and saving the record below. Report nonconvergence and coverage gaps, then STOP - this invocation, without a clean summary or a fourth pass. - - No edits: fill the record below. + - Edited: increment CYCLES once, then fill and save the record below with + `converged:false`. Step 5.0 never treats this invocation's records as prior + reviews. Below 3, repeat Steps 3–5 with a new REVIEW_START. At 3, report + nonconvergence and coverage gaps, then STOP this invocation, without a clean + summary or a fourth pass. + - No edits: after a full pass, fill the record below. A fix-range pass is never + final: repeat Steps 3–5 with a full start. 2. On a repeat, execute Steps 3–5 in order. At Step 4.7, reuse only this invocation's - unchanged-input QA evidence; rerun affected probes after source, test, contract, - command or fixture changes. Reusing a probe never skips a review step. - A probe is affected when its entrypoint, dependencies, contract or replay inputs - change; if uncertain, rerun it. + unchanged-input QA evidence; rerun a probe if its source, tests, entrypoint, + dependencies, contract, command, fixture or replay inputs changed, or if uncertain. + Reusing a probe never skips a review step. 3. **Verify completed actions.** On the final zero-edit pass, reconcile this invocation's actions with current findings. Deduplicate by structural identity and advisory/defect kind. For a completed extraction, retain `fixed` and the @@ -421,7 +420,7 @@ pass: report it with its reason. - Use Step 4.6's `specialists` object unchanged, including its empty small-diff map. If this host omits Review Army, use `specialists: {}` without claiming specialist coverage. -- Build `findings` from Step 5's combined final-pass findings (core, specialist, +- Build `findings` from Step 5's combined findings (core, specialist, adversarial, actionable Greptile, verified exploratory QA findings) and invocation actions. Retain `fingerprint`, `severity` (`CRITICAL|INFORMATIONAL`), `action`, and any `advisory`, `evidence_paths`, `helper_target`. Recheck source after fixes. The logger uses `sharedLibsFingerprint`, @@ -449,11 +448,11 @@ were skipped or this host omits Review Army). This default is not completion evi unresolved non-advisory core defects still count in `issues_found`, `critical`, `informational`. The logger builds trusted `review_binding` from the validated captured branch digest, discarding caller bindings. Never invent a binding -or replace REVIEW_START at log time; finish only the final core token. +or replace REVIEW_START at log time; finish only this pass's own token. ### Report the final review -Emit one final report, merging all reviewers rather than concatenating them: +Emit one final report merging all reviewers: 1. `Pre-Landing Review: N issues (X critical, Y informational)` counts final unresolved non-advisory defects. State INCOMPLETE if `COMPLETED` is false, even when N=0. 2. Use the checklist's action groups with confidence-tagged finding lines. Keep fixed, diff --git a/test/fixtures/skill-md-size-allowlist.json b/test/fixtures/skill-md-size-allowlist.json index 444c0d79b..ebb862fd6 100644 --- a/test/fixtures/skill-md-size-allowlist.json +++ b/test/fixtures/skill-md-size-allowlist.json @@ -9,7 +9,7 @@ "agy/gstack-plan-design-review": 140013, "agy/gstack-plan-devex-review": 135760, "agy/gstack-plan-eng-review": 152582, - "agy/gstack-review": 124218, + "agy/gstack-review": 124182, "claude/design-review": 136531, "codex/gstack-autoplan": 130628, "codex/gstack-design-consultation": 109452, @@ -19,7 +19,7 @@ "codex/gstack-plan-design-review": 142466, "codex/gstack-plan-devex-review": 138649, "codex/gstack-plan-eng-review": 155128, - "codex/gstack-review": 125122, + "codex/gstack-review": 125086, "copilot/gstack-autoplan": 131637, "copilot/gstack-codex": 100235, "copilot/gstack-design-consultation": 109536, @@ -29,7 +29,7 @@ "copilot/gstack-plan-design-review": 140884, "copilot/gstack-plan-devex-review": 136912, "copilot/gstack-plan-eng-review": 153307, - "copilot/gstack-review": 125489, + "copilot/gstack-review": 125453, "cursor/gstack-autoplan": 129278, "cursor/gstack-design-consultation": 107222, "cursor/gstack-design-review": 142507, @@ -37,7 +37,7 @@ "cursor/gstack-plan-design-review": 138968, "cursor/gstack-plan-devex-review": 134591, "cursor/gstack-plan-eng-review": 151436, - "cursor/gstack-review": 140750, + "cursor/gstack-review": 140714, "factory/gstack-autoplan": 131562, "factory/gstack-codex": 100655, "factory/gstack-design-consultation": 108670, @@ -47,7 +47,7 @@ "factory/gstack-plan-design-review": 141749, "factory/gstack-plan-devex-review": 137960, "factory/gstack-plan-eng-review": 154550, - "factory/gstack-review": 144529, + "factory/gstack-review": 144493, "gbrain/gstack-autoplan": 129815, "gbrain/gstack-design-review": 132842, "gbrain/gstack-land-and-deploy": 117167, @@ -67,7 +67,7 @@ "kiro/gstack-plan-design-review": 138808, "kiro/gstack-plan-devex-review": 134431, "kiro/gstack-plan-eng-review": 151286, - "kiro/gstack-review": 140562, + "kiro/gstack-review": 140526, "openclaw/gstack-autoplan": 129520, "openclaw/gstack-design-review": 131647, "openclaw/gstack-land-and-deploy": 116757, @@ -82,7 +82,7 @@ "opencode/gstack-plan-design-review": 140738, "opencode/gstack-plan-devex-review": 136812, "opencode/gstack-plan-eng-review": 153188, - "opencode/gstack-review": 142985, + "opencode/gstack-review": 142949, "slate/gstack-autoplan": 129159, "slate/gstack-design-consultation": 107143, "slate/gstack-design-review": 142414, @@ -90,6 +90,6 @@ "slate/gstack-plan-design-review": 138888, "slate/gstack-plan-devex-review": 134511, "slate/gstack-plan-eng-review": 151361, - "slate/gstack-review": 140656 + "slate/gstack-review": 140620 } } diff --git a/test/review-fix-range.test.ts b/test/review-fix-range.test.ts index defb04c03..757b6be1c 100644 --- a/test/review-fix-range.test.ts +++ b/test/review-fix-range.test.ts @@ -1,5 +1,5 @@ /** - * #3339: /ship Step 9 may re-review only the fix range, but a fix-range pass + * #3339: /ship Step 9 and /review may re-review only the fix range, but a fix-range pass * can never be the last review. The fix base comes from the review log (never * the working tree or the caller) and is the commit whose tree the fixing pass * started from, a narrowed row is never CURRENT and carries no @@ -214,3 +214,75 @@ describe('ship Step 9 instructions', () => { expect(army).toContain('continue to Step 10, and only from a full pass: after a fix-range pass, run one full Step 9 first.'); }); }); + +describe('review Step 3 and Step 5.8 instructions', () => { + const skill = fs.readFileSync(path.join(ROOT, 'review/SKILL.md'), 'utf8'); + const step3 = skill.slice(skill.indexOf('## Step 3: Get the diff'), skill.indexOf('## Step 3.4:')); + const step58 = skill.slice(skill.indexOf('## Step 5.8: Persist Eng Review result'), skill.indexOf('### Report the final review')); + const flat3 = step3.replace(/\s+/g, ' '), flat58 = step58.replace(/\s+/g, ' '); + + test('the first pass starts full and only the pass after an edited pass narrows its DIFF_BASE, never Step 4.8 or other base uses', () => { + const block = step3.slice(step3.indexOf('```bash'), step3.indexOf('```', step3.indexOf('```bash') + 7)); + expect(block).toContain('gstack-review-log --start review\ngit diff "$DIFF_BASE"'); + expect(block).not.toContain('--fix-range'); + expect(flat3).toContain('After an edited pass, start the next with `--start review --fix-range`: it prints REVIEW_START, then `FIX_BASE=`. Wherever this pass sets DIFF_BASE outside Step 4.8, use FIX_BASE instead; Step 4.8 and every other `` use stay full. On refusal, start a full pass.'); + expect(skill.match(/--fix-range/g)).toHaveLength(1); + }); + + test('an edited pass is logged before the repeat, kept out of Step 5.0, and a fix-range pass is never the final review', () => { + const edited = flat58.indexOf("Edited: increment CYCLES once, then fill and save the record below with `converged:false`. Step 5.0 never treats this invocation's records as prior reviews."); + const repeat = flat58.indexOf('Below 3, repeat Steps 3–5 with a new REVIEW_START.'); + const none = flat58.indexOf('No edits: after a full pass, fill the record below. A fix-range pass is never final: repeat Steps 3–5 with a full start.'); + expect(edited).toBeGreaterThan(-1); + expect(repeat).toBeGreaterThan(edited); + expect(none).toBeGreaterThan(repeat); + expect(flat58).toContain("finish only this pass's own token"); + }); +}); + +describe('review Step 3/5.8 order against the real logger', () => { + // /review's order on every pass: core start, Step 4.8 attempt start and finish, fixes in the working tree, core finish; never a commit. + const reviewRow = (fields: Record) => JSON.stringify({ skill: 'review', status: 'clean', issues_found: 0, critical: 0, informational: 0, ...fields }); + function reviewPass(fields: Record, start: string[], fixes?: string) { + const started = bin('gstack-review-log', start); + expect(started.code).toBe(0); + const [token, base] = started.out.split('\n'); + // Step 4.8: each pass's adversarial attempt saves its row before any fix and before the core row. + const attempt = bin('gstack-review-log', ['--start', 'adversarial-review']); + expect(attempt.code).toBe(0); + expect(bin('gstack-review-log', [JSON.stringify({ skill: 'adversarial-review', status: 'clean', source: 'claude', ...clean }), '--finish', attempt.out]).code).toBe(0); + if (fixes) edit(fixes); + expect(bin('gstack-review-log', [reviewRow(fields), '--finish', token!]).code).toBe(0); + return base; + } + + test('a committed first pass narrows the next repeat to the uncommitted fixes, then the chain returns to a full pass', () => { + const reviewed = head(); + reviewPass(fixing, ['--start', 'review'], 'export const a = 2;\n'); + expect(reviewPass(fixing, ['--start', 'review', '--fix-range'], 'export const a = 3;\n')).toBe(`FIX_BASE=${reviewed}`); + expect(gitIn(repo, `diff --name-only ${reviewed}`).trim()).toBe('a.ts'); + const third = narrowStart(); + expect(third.code).toBe(1); + expect(third.err).toContain('started from uncommitted content'); + reviewPass(clean, ['--start', 'review']); + const last = rows().at(-1)!; + expect(last.scope).toBeUndefined(); + expect(reviewFreshness(last, last.wtree)?.status).toBe('CURRENT'); + }, 30_000); + + test('a zero-edit fix-range pass is never CURRENT even if it were logged, so the final record needs a full pass', () => { + reviewPass(fixing, ['--start', 'review'], 'export const a = 2;\n'); + reviewPass(clean, ['--start', 'review', '--fix-range']); + const narrowed = rows().at(-1)!; + expect(narrowed.scope).toBe('fix-range'); + expect(reviewFreshness(narrowed, narrowed.review_binding.range_end_wtree)?.status).toBe('UNVERIFIED'); + }, 30_000); + + test('a first pass over uncommitted work cannot be narrowed', () => { + edit('export const a = 1; // uncommitted\n'); + reviewPass(fixing, ['--start', 'review'], 'export const a = 2;\n'); + const r = narrowStart(); + expect(r.code).toBe(1); + expect(r.err).toContain('started from uncommitted content'); + }, 30_000); +}); diff --git a/test/review-workflow-clarity.test.ts b/test/review-workflow-clarity.test.ts index c68b71d1a..4d9bcdd40 100644 --- a/test/review-workflow-clarity.test.ts +++ b/test/review-workflow-clarity.test.ts @@ -229,7 +229,8 @@ test('review finalization ownership: initialize invocation state and capture the expect(flat).toMatch(/REVIEW_START for this core candidate before reading its diff/i); expectMentions(flat, [['never', 'reading', 'before']], 'flat'); expect(flat).toMatch(/separate PASS_START tokens, not REVIEW_START/); - expectMentions(flat, [['only', 'finishes', 'final']], 'flat'); + expect(flat).toContain('After an edited pass, start the next with `--start review --fix-range`'); + expect(flat).toContain('On refusal, start a full pass.'); }); test('review finalization ownership: late findings use Fix-First before the bounded parent transition', () => { @@ -240,7 +241,7 @@ test('review finalization ownership: late findings use Fix-First before the boun 'Structured approval does not waive advisory/test_stub ASK gates', '## Step 5.8: Persist Eng Review result', 'Edited: increment CYCLES once', - 'No edits: fill the record below', + 'No edits: after a full pass, fill the record below', '### 2. Fill the record', '--finish REVIEW_START', ]; @@ -248,7 +249,7 @@ test('review finalization ownership: late findings use Fix-First before the boun expect(positions.every(position => position >= 0)).toBe(true); expect(positions).toEqual([...positions].sort((a, b) => a - b)); expect(flat).toContain('at most 3 fix cycles'); - expect(flat).toContain('At 3, persist `converged:false`'); + expect(flat).toContain('Edited: increment CYCLES once, then fill and save the record below with `converged:false`.'); const limit = flat.slice(flat.indexOf('At 3,'), flat.indexOf('No edits:')); expect(limit).toMatch(/then stop this invocation/i); expectMentions(limit, [['without', 'summary', 'fourth']], 'limit'); @@ -276,14 +277,14 @@ test('review finalization ownership: required native completion and optional out expect(flat).toContain('`CONVERGED`: true only for a completed zero-edit pass'); }); -test('review finalization ownership: finish only the final core token without log-time capture', () => { +test('review finalization ownership: each logged pass finishes its own core token without log-time capture', () => { const step = skill.slice(skill.indexOf('## Step 5.8: Persist Eng Review result')); const flat = step.replace(/\s+/g, ' '); expect(step.match(/--finish REVIEW_START/g)).toHaveLength(1); expect(step).not.toContain('--start review'); expect(step).not.toContain('--finish PASS_START'); expect(flat).toMatch(/never invent a binding or replace REVIEW_START at log time/i); - expectMentions(flat, [['only', 'finish', 'final']], 'flat'); + expect(flat).toContain("finish only this pass's own token"); expect(step).toContain('"completed":COMPLETED,"converged":CONVERGED,"cycles":CYCLES'); }); From 9dc1dfb729a1eed0843a086ec9b86305a87b2e42 Mon Sep 17 00:00:00 2001 From: Garry Tan Date: Sun, 25 Oct 2026 21:32:27 -0700 Subject: [PATCH 6/9] v1.91.227.0 fix(windows): shell bins pass NUL as Bun's empty config when MSYS path conversion is off (#3415) (#3431) * fix(windows): shell bins pass NUL as Bun's empty config when MSYS path conversion is off (#3415) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(windows): detect Git Bash/MSYS2/Cygwin from OSTYPE, as gstack-doctor does, so uname stubs in setup fixtures stay untouched Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: pre-landing review fixes (#3415) - Choose NUL only when cygpath is also on PATH, so an OSTYPE=msys inherited by a POSIX bash keeps /dev/null instead of a cwd-relative NUL file. - gstack-developer-profile --log-session reports a Bun failure instead of skipping it as invalid input, like gstack-timeline-log. - learnings-injection tests check that their anchored bun -e block exists. - CHANGELOG names the callers this fix does not cover; curation reason fixed. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: pre-landing review fixes, cycle 2 (#3415) - timeline-log and developer-profile validators print their verdict; any non-zero Bun exit is a reported failure (a Bun crash on Windows exits 3). - timeline-log keeps the original event when ts stamping fails. - The definition ratchet scopes a local GSTACK_BUN_CONFIG to its function. - The shell-bins fixture clears its preload marker per test. - CHANGELOG states the callers that discard the report and the Bun 1.3.x case. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs: CHANGELOG notes Bun 1.3.10 evidence and remaining literal /dev/null callers (#3415) 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> --- AGENTS.md | 2 +- CHANGELOG.md | 28 +++ VERSION | 2 +- agents-digest/gstack-AGENTS.md | 2 +- autoplan/bin/phase-publication-hook | 3 +- bin/gstack-brain-sync | 3 +- bin/gstack-browser-ensure | 3 +- bin/gstack-codex-probe | 3 +- bin/gstack-codex-session-import | 3 +- bin/gstack-developer-profile | 45 ++-- bin/gstack-distill-apply | 5 +- bin/gstack-distill-free-text | 11 +- bin/gstack-doctor | 3 +- bin/gstack-doctor-check.sh | 7 +- bin/gstack-gbrain-install | 5 +- bin/gstack-gbrain-source-wireup | 3 +- bin/gstack-hook-check | 3 +- bin/gstack-install-verdict.sh | 4 +- bin/gstack-ios-qa-daemon | 3 +- bin/gstack-ios-qa-mint | 3 +- bin/gstack-ios-qa-regen | 3 +- bin/gstack-learnings-log | 3 +- bin/gstack-learnings-search | 3 +- bin/gstack-memorable | 3 +- bin/gstack-question-log | 7 +- bin/gstack-question-preference | 9 +- bin/gstack-relink | 3 +- bin/gstack-review-log | 7 +- bin/gstack-review-read | 3 +- bin/gstack-settings-hook | 19 +- bin/gstack-specialist-stats | 3 +- bin/gstack-team-init | 3 +- bin/gstack-telemetry-log | 3 +- bin/gstack-timeline-log | 31 ++- bin/gstack-timeline-read | 3 +- browse/test/learnings-injection.test.ts | 9 +- gstack-upgrade/migrations/v1.86.0.0.sh | 3 +- hosts/claude/hooks/auq-error-fallback-hook | 3 +- hosts/claude/hooks/memorable-user-prompt-hook | 3 +- hosts/claude/hooks/question-log-hook | 3 +- hosts/claude/hooks/question-preference-hook | 3 +- hosts/claude/hooks/timeline-stop-hook | 3 +- lib/bun-isolation.ts | 10 +- package.json | 2 +- plan-ceo-review/bin/mode-handoff-hook | 3 +- scripts/build-cso.sh | 3 +- scripts/lib/windows-curation.ts | 1 + setup | 7 +- test/bun-config-shell-bins.test.ts | 204 ++++++++++++++++++ test/bun-entry-isolation.test.ts | 68 +++++- test/bun-isolation-launch.test.ts | 17 ++ test/learnings-injection.test.ts | 11 +- test/plan-mode-preamble-render.test.ts | 2 +- test/setup-hook-canonical-paths.test.ts | 4 +- 54 files changed, 491 insertions(+), 112 deletions(-) create mode 100644 test/bun-config-shell-bins.test.ts diff --git a/AGENTS.md b/AGENTS.md index 4299662d0..ac84585d1 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -303,4 +303,4 @@ Agents poll `eval:bg:*` logs for the `### gstack-detach EXIT= ###` sentine - Every Codex run's verdict goes through `lib/outside-review-result.ts`; its reason codes live in `lib/gate-outcomes.ts`, each with a `docs/troubleshooting.md` anchor. - `test/module-size-ratchet.test.ts` keeps refactored owner modules at or under 800 lines (150 per function) and residual files from growing. - The `claude` CLI binary resolves via `lib/claude-bin.ts` (re-exported from `browse/src/claude-bin.ts` for browse internals; `Bun.which()` + `GSTACK_CLAUDE_BIN` override). Set `GSTACK_CLAUDE_BIN=wsl` plus `GSTACK_CLAUDE_BIN_ARGS='["claude"]'` to run Claude through WSL on Windows. -- Every Bun gstack starts ignores the working directory's `.env` files and `bunfig.toml`: bun shebangs are `#!/usr/bin/env -S bun --no-env-file --config=/dev/null`, shell and skill callers pass `bun --no-env-file --config=/dev/null`, TypeScript spawns use `bunIsolationArgs()` from `lib/bun-isolation.ts`, and `bun build --compile` adds `--no-compile-autoload-dotenv --no-compile-autoload-bunfig`. `test/bun-entry-isolation.test.ts` enforces all four. +- Every Bun gstack starts ignores the working directory's `.env` files and `bunfig.toml`: bun shebangs are `#!/usr/bin/env -S bun --no-env-file --config=/dev/null`, skill prose passes `bun --no-env-file --config=/dev/null`, shipped shell files define `GSTACK_BUN_CONFIG` with the line in `test/bun-entry-isolation.test.ts` (`NUL` when `OSTYPE` is `msys` or `cygwin` and `cygpath` is on `PATH`, where native Bun cannot open `/dev/null`, #3415) and pass `bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}"`, TypeScript spawns use `bunIsolationArgs()` from `lib/bun-isolation.ts`, and `bun build --compile` adds `--no-compile-autoload-dotenv --no-compile-autoload-bunfig`. `test/bun-entry-isolation.test.ts` enforces all four. diff --git a/CHANGELOG.md b/CHANGELOG.md index c468eaf5e..8353ed224 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,33 @@ # Changelog +## [1.91.227.0] - 2026-10-26 + +**Windows: gstack's record bins stop losing review, question, learning and timeline records when Git Bash path conversion is off (#3415).** Since GSTA-56 every shell bin started Bun with `--config=/dev/null`. Native `bun.exe` cannot open `/dev/null`: it exits 1 with `EINVAL` on Bun 1.3.10, 1.4.2 and 1.4.4 (measured on windows-latest). Git Bash hides this by rewriting the argument to `nul`, but only while MSYS path conversion is on. With it off (`MSYS_NO_PATHCONV` set to any value, even empty; `MSYS2_ARG_CONV_EXCL=*`; or Cygwin), `gstack-review-log`, `gstack-question-log` and `gstack-learnings-log` exited 1 with nothing written, and `gstack-timeline-log` exited 0 with nothing written. + +### Fixed +- **40 shipped shell files** (the bash bins, the Claude hook wrappers, `setup`, `scripts/build-cso.sh` and one migration) define `GSTACK_BUN_CONFIG` once and start Bun with `--config="${GSTACK_BUN_CONFIG:-/dev/null}"`. The value is `NUL` only when `OSTYPE` is `msys` or `cygwin` (Git Bash, MSYS2 and Cygwin, the check `gstack-doctor` already uses) and `cygpath` is on `PATH`; everywhere else it is `/dev/null`. The `cygpath` check is a builtin `command -v`, so it forks nothing. It means an `OSTYPE=msys` inherited by a Linux or macOS bash keeps `/dev/null`, instead of passing a relative `NUL` that Bun there resolves to a file in the repository. Bun 1.4.2 and later, the version gstack tests against, read `NUL` as an empty config whether or not conversion is on. Bun 1.3.10 on Windows exits 1 on `--config=NUL` and on the lowercase `nul` that Git Bash used to produce alike (measured from PowerShell on windows-latest; the #3085 entry recorded a panic). Versions between 1.3.3 and 1.4.1, which setup and `gstack-doctor` only warn about, were not measured. The `:-/dev/null` default covers a call that loses its definition: it still passes `/dev/null`, so POSIX is unchanged and Windows fails loudly as before, and never reads the repository's `bunfig.toml`. `bin/gstack-codex-probe` is sourced into the caller's shell, so it defines the variable inside the one function that starts Bun and still runs nothing at source time. +- **`bin/gstack-timeline-log`** and **`gstack-developer-profile --log-session`**: invalid input still exits 0 with nothing logged (the hook-path contract). Their validators now print `valid` or `invalid`, and any non-zero exit, which is Bun itself failing, is reported on stderr and returned instead of being skipped as invalid. The verdict is not an exit code because a Bun crash on Windows exits 3. When stamping a missing `ts` fails, `gstack-timeline-log` keeps the original event instead of appending an empty line. Their production callers (`gstack-skill-start`, `gstack-skill-end` and the `/office-hours` templates) still discard stderr and the exit status, so the report shows only when the bin is run directly. +- Unchanged: bun shebangs keep `--config=/dev/null` because a shebang cannot name a per-platform path, and skill prose (templates and resolvers) keeps it because `test/bun-entry-isolation.test.ts` holds skill sources to the literal spelling. TypeScript spawns keep `bunIsolationArgs()`, and `scripts/ubicloud/` keeps `/dev/null` because it runs on Linux. +- Not covered: callers that hand `bun.exe` a POSIX script path built from `pwd` or `$HOME` (the Claude hook wrappers, `autoplan/bin/phase-publication-hook`, `plan-ceo-review/bin/mode-handoff-hook`, and some `gstack-doctor`, `gstack-codex-probe`, `setup` and migration calls) only got the config spelling. With path conversion off they may still fail on the `/c/...` script path itself. The record bins convert their own paths with `cygpath -m`; the others were not verified on Windows with conversion off. Bun shebang entry points and Bun calls in skill prose still pass the literal `--config=/dev/null`, so with conversion off they fail with `EINVAL` as before. One example is the outside-voice probe in `scripts/resolvers/outside-voice.ts`, which then reports Claude as not installed. + +### Tests +- `test/bun-config-shell-bins.test.ts` (new; force-included in the Windows lane): + - On every platform, the four record bins run through `lib/script-invocation.ts` with conversion off in a repository whose `bunfig.toml` preload and `.env` are hostile. Each writes exactly one record, and neither the preload nor the `.env` state root takes effect. Invalid timeline input still exits 0 silently. + - On POSIX hosts a simulated Windows bash (`OSTYPE=msys`, a `cygpath`, and a `bun` stand-in that rejects `/dev/null` with EINVAL as `bun.exe` does) reproduces the bug: on main the four bins write nothing and the timeline control exits 0 (5 failures); with the fix they pass. The controls, without `OSTYPE=msys`, show each bin exits non-zero with nothing written. + - An inherited `OSTYPE=msys` with no `cygpath`, in a repository that commits a file named `NUL` with a preload, leaves each bin on `/dev/null`: the record is written and the preload never runs. This fails on the first version of this fix (4 failures). + - `gstack-developer-profile --log-session` reports a rejected config on stderr and exits non-zero, and still skips invalid input silently. This fails on main. + - A `bun` that exits 3 with no output, the way a Bun crash exits on Windows, makes both bins report and exit non-zero instead of skipping the event as invalid input. This fails with an exit-code verdict. +- `test/bun-isolation-launch.test.ts`: the shell-file spelling stays isolated with conversion off, and a win32-only control shows that the literal `--config=/dev/null` fails there with EINVAL. +- `test/bun-entry-isolation.test.ts`: shipped shell files must use the fail-closed spelling and define `GSTACK_BUN_CONFIG` with the canonical line before first use. A `local` definition covers only the rest of its function. Skill sources keep the literal spelling. +- `test/learnings-injection.test.ts`, `browse/test/learnings-injection.test.ts` and `test/setup-hook-canonical-paths.test.ts` now anchor on the new spelling. The two learnings-injection files also check that the anchored `bun -e` block exists. Before, a missing anchor sliced the script's last character and the negative assertions passed without checking anything. + +### Gate integrity +- `test/bun-entry-isolation.test.ts` is strengthened. On POSIX the required shell spelling still resolves to `/dev/null`. + - Now offenders: the literal `--config=/dev/null` in a shipped shell file, and an undefined or redefined `GSTACK_BUN_CONFIG`. + - The shell-caller detector also skips a `--config` value before deciding whether a call starts a program, so `bun --no-env-file --config= -e` no longer passes unchecked. The tree has no such call. + - Negative controls, each of which fails the check: the old spelling, a variable without the default, an empty `--config=`, a missing, late or altered definition, a `local` definition used from another function, and a reverted bin. + - No threshold, budget, timeout, trial count or case kind changed. + ## [1.91.226.0] - 2026-10-26 **/review can re-review just its own fixes after a fixing pass, under the same rules as /ship (#3339).** Before, every /review fix cycle reran the whole review over the whole branch, so a large branch could hit the three-cycle stop on findings in code the earlier passes had already read. Now the pass after an edited pass starts with `gstack-review-log --start review --fix-range` and its checklist, specialists and QA read only what changed since that pass. The Step 4.8 adversarial review still reads the whole branch on every pass, because its rows carry their own freshness. A narrowed pass is never the final review: when it makes no edits, /review runs one full pass before writing the final record, and a fix-range record is never CURRENT. Garry's "do it" on 2026-10-24 for a fix-range re-review with a final full pass covers it. diff --git a/VERSION b/VERSION index df1fb708a..0831dfe12 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.91.226.0 +1.91.227.0 diff --git a/agents-digest/gstack-AGENTS.md b/agents-digest/gstack-AGENTS.md index f56ac87b8..073efdb52 100644 --- a/agents-digest/gstack-AGENTS.md +++ b/agents-digest/gstack-AGENTS.md @@ -1,4 +1,4 @@ -# gstack digest v1.91.226.0 — regenerate/re-copy after upgrading gstack +# gstack digest v1.91.227.0 — regenerate/re-copy after upgrading gstack Behavioral rules from gstack (https://github.com/garrytan/gstack), compressed for agent hosts without a full skill install. The full skills add workflows, diff --git a/autoplan/bin/phase-publication-hook b/autoplan/bin/phase-publication-hook index 2de8c92d9..c88b95e29 100755 --- a/autoplan/bin/phase-publication-hook +++ b/autoplan/bin/phase-publication-hook @@ -1,6 +1,7 @@ #!/usr/bin/env bash # Native Read barrier. A broken install must return deny JSON, never silence. set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac _AUTOPLAN_DECIDED='' _autoplan_backstop() { if [ -z "$_AUTOPLAN_DECIDED" ]; then @@ -9,7 +10,7 @@ _autoplan_backstop() { } trap _autoplan_backstop EXIT _AUTOPLAN_HOOK_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)" -_AUTOPLAN_RESULT="$(bun --no-env-file --config=/dev/null "$_AUTOPLAN_HOOK_DIR/phase-publication-hook.ts")" +_AUTOPLAN_RESULT="$(bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" "$_AUTOPLAN_HOOK_DIR/phase-publication-hook.ts")" test -n "$_AUTOPLAN_RESULT" printf '%s\n' "$_AUTOPLAN_RESULT" _AUTOPLAN_DECIDED=1 diff --git a/bin/gstack-brain-sync b/bin/gstack-brain-sync index 50f377b0b..0c5d07afb 100755 --- a/bin/gstack-brain-sync +++ b/bin/gstack-brain-sync @@ -77,6 +77,7 @@ BASH_COMPAT=50 set -uo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac . "$(dirname "$0")/gstack-state-root.sh" 2>/dev/null || { echo "$0: cannot resolve the gstack state root: $(dirname "$0")/gstack-state-root.sh is missing. fix: reinstall with ./setup or /gstack-upgrade (docs/state-root.md)" >&2; exit 1; } gstack_state_root_select @@ -576,7 +577,7 @@ PYEOF CONSENT_TS="$SCRIPT_DIR/../lib/transcript-consent.ts" transcript_policy() { command -v bun >/dev/null 2>&1 || return 2 - GSTACK_STATE_ROOT="$GSTACK_HOME" bun --no-env-file --config=/dev/null run "$CONSENT_TS" "$@" + GSTACK_STATE_ROOT="$GSTACK_HOME" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" run "$CONSENT_TS" "$@" } # 0 when staged transcript pages may sync at all. diff --git a/bin/gstack-browser-ensure b/bin/gstack-browser-ensure index bda9718f5..764995fbb 100755 --- a/bin/gstack-browser-ensure +++ b/bin/gstack-browser-ensure @@ -24,6 +24,7 @@ # GSTACK_CHROMIUM_NO_SANDBOX=1 for the probe. Bash 3.2 plus POSIX tools. BASH_COMPAT=50 set -u +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac ROOT="$(cd "$(dirname "$0")/.." && pwd -P)" || { echo "gstack-browser-ensure: cannot resolve the install root" >&2; exit 1; } DOCS="https://github.com/garrytan/gstack/blob/main/docs/troubleshooting.md#browser-ensure-failed" @@ -58,7 +59,7 @@ probe() { else PROBE_OUT=$(cd "$ROOT" && node -e "$PROBE" &1); PROBE_RC=$?; fi elif command -v bun >/dev/null 2>&1; then ENGINE=bun - PROBE_OUT=$(cd "$ROOT" && bun --no-env-file --config=/dev/null -e "$PROBE" &1); PROBE_RC=$? + PROBE_OUT=$(cd "$ROOT" && bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e "$PROBE" &1); PROBE_RC=$? else fail "neither node nor bun is on PATH to launch Chromium" "install Node.js (https://nodejs.org) or Bun, then re-run $0" fi diff --git a/bin/gstack-codex-probe b/bin/gstack-codex-probe index a089b8d62..0292e5674 100755 --- a/bin/gstack-codex-probe +++ b/bin/gstack-codex-probe @@ -157,6 +157,7 @@ _gstack_codex_select_model() { # working-directory context forwarded to the shared role resolver. # The TOML is read by the TypeScript resolver; bash never parses it. local _kind="${1:-exec}" _explicit="${2:-}" _role="${3:-}" _cwd="${4:-}" _line _rc _rest + local GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac case "$_kind" in exec|review) ;; *) echo "ERROR: _gstack_codex_select_model takes exec or review" >&2; return 2 ;; esac case "$_role" in ''|plan-review) ;; *) echo "ERROR: _gstack_codex_select_model role must be plan-review" >&2; return 2 ;; esac if ! command -v bun >/dev/null 2>&1; then @@ -168,7 +169,7 @@ _gstack_codex_select_model() { [ -n "$_role" ] && set -- "$@" --role "$_role" [ -n "$_explicit" ] && set -- "$@" --explicit "$_explicit" [ -n "$_cwd" ] && set -- "$@" --cwd "$_cwd" - _line=$(bun --no-env-file --config=/dev/null run "$_GSTACK_CODEX_BIN/../scripts/resolve-codex-generation-model.ts" "$@") + _line=$(bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" run "$_GSTACK_CODEX_BIN/../scripts/resolve-codex-generation-model.ts" "$@") _rc=$? _GSTACK_CODEX_SEL="${_line%%$'\t'*}" _rest="${_line#*$'\t'}" diff --git a/bin/gstack-codex-session-import b/bin/gstack-codex-session-import index 782ae0550..73543e799 100755 --- a/bin/gstack-codex-session-import +++ b/bin/gstack-codex-session-import @@ -20,6 +20,7 @@ # Writes via bin/gstack-question-log so source tagging, dedup, and async # derive all apply uniformly. set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" . "$(dirname "$0")/gstack-state-root.sh" 2>/dev/null || { echo "$0: cannot resolve the gstack state root: $(dirname "$0")/gstack-state-root.sh is missing. fix: reinstall with ./setup or /gstack-upgrade (docs/state-root.md)" >&2; exit 1; } gstack_state_root_select @@ -101,7 +102,7 @@ IMPORTED=0 SKIPPED_NO_ANSWER=0 for SESSION_FILE in "${SESSION_FILES[@]}"; do - COUNT_LINE=$(SESSION_FILE_PATH="$SESSION_FILE" QLOG_BIN="$SCRIPT_DIR/gstack-question-log" bun --no-env-file --config=/dev/null -e ' + COUNT_LINE=$(SESSION_FILE_PATH="$SESSION_FILE" QLOG_BIN="$SCRIPT_DIR/gstack-question-log" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e ' const fs = require("fs"); const path = require("path"); const { spawnSync } = require("child_process"); diff --git a/bin/gstack-developer-profile b/bin/gstack-developer-profile index f5bfd5391..5e004d453 100755 --- a/bin/gstack-developer-profile +++ b/bin/gstack-developer-profile @@ -28,6 +28,7 @@ # docs/designs/PLAN_TUNING_V0.md). Event file: ~/.gstack/projects/{SLUG}/ # question-events.jsonl. set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" @@ -70,7 +71,7 @@ do_migrate() { TMPOUT=$(mktemp "$GSTACK_HOME/developer-profile.json.tmp.XXXXXX") trap 'rm -f "$TMPOUT"' EXIT - cat "$LEGACY_FILE" | bun --no-env-file --config=/dev/null -e " + cat "$LEGACY_FILE" | bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const lines = (await Bun.stdin.text()).trim().split('\n').filter(Boolean); const sessions = []; const signalsAcc = {}; @@ -127,7 +128,7 @@ do_migrate() { mv "$LEGACY_FILE" "$LEGACY_FILE.migrated-$TS" local COUNT - COUNT=$(PROFILE_FILE_PATH="$PROFILE_FILE" bun --no-env-file --config=/dev/null -e "console.log(JSON.parse(require('fs').readFileSync(process.env.PROFILE_FILE_PATH,'utf-8')).sessions.length)" 2>/dev/null || echo "?") + COUNT=$(PROFILE_FILE_PATH="$PROFILE_FILE" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e "console.log(JSON.parse(require('fs').readFileSync(process.env.PROFILE_FILE_PATH,'utf-8')).sessions.length)" 2>/dev/null || echo "?") echo "MIGRATE: ok — migrated $COUNT sessions from builder-profile.jsonl" } @@ -175,7 +176,8 @@ EOF # and update aggregates (signals_accumulated, resources_shown, topics). # Fix for #1671: the writer side of the v1.0.0.0 migration. Reader and # writer now share the same file. -# Silent skip on invalid input (matches gstack-timeline-log:22-26 pattern). +# Invalid input is skipped silently; a Bun failure is reported and returned, +# as in gstack-timeline-log (#3415). # ----------------------------------------------------------------------- do_log_session() { local INPUT="${1:-}" @@ -184,12 +186,23 @@ do_log_session() { fi # Validate: input must be parseable JSON with required fields (date, mode). - if ! printf '%s' "$INPUT" | bun --no-env-file --config=/dev/null -e " - const j = JSON.parse(await Bun.stdin.text()); - if (!j.date || !j.mode) process.exit(1); - " 2>/dev/null; then - return 0 + # The validator prints its verdict; a non-zero exit means Bun itself failed. + local VALIDATE_RC=0 VALIDATE_OUT + VALIDATE_OUT=$(printf '%s' "$INPUT" | bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " + const text = await Bun.stdin.text(); + let j; + try { j = JSON.parse(text); } catch {} + console.log(j && j.date && j.mode ? 'valid' : 'invalid'); + ") || VALIDATE_RC=$? + if [ "$VALIDATE_RC" -ne 0 ]; then + echo "gstack-developer-profile: bun exited $VALIDATE_RC before the session was validated; nothing was logged" >&2 + return "$VALIDATE_RC" fi + case "$VALIDATE_OUT" in + valid) ;; + invalid) return 0 ;; + *) echo "gstack-developer-profile: bun printed no verdict while validating the session; nothing was logged" >&2; return 1 ;; + esac ensure_profile @@ -197,7 +210,7 @@ do_log_session() { TMPOUT=$(mktemp "$GSTACK_HOME/developer-profile.json.tmp.XXXXXX") trap 'rm -f "$TMPOUT"' EXIT - PROFILE_FILE_PATH="$PROFILE_FILE" RECORD_INPUT="$INPUT" TMPOUT_PATH="$TMPOUT" bun --no-env-file --config=/dev/null -e " + PROFILE_FILE_PATH="$PROFILE_FILE" RECORD_INPUT="$INPUT" TMPOUT_PATH="$TMPOUT" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const fs = require('fs'); const entry = JSON.parse(process.env.RECORD_INPUT); if (!entry.ts) entry.ts = new Date().toISOString(); @@ -244,7 +257,7 @@ do_reconcile() { TMPOUT=$(mktemp "$GSTACK_HOME/developer-profile.json.tmp.XXXXXX") trap 'rm -f "$TMPOUT"' EXIT - PROFILE_FILE_PATH="$PROFILE_FILE" PROJECTS_DIR="$GSTACK_HOME/projects" TMPOUT_PATH="$TMPOUT" bun --no-env-file --config=/dev/null -e " + PROFILE_FILE_PATH="$PROFILE_FILE" PROJECTS_DIR="$GSTACK_HOME/projects" TMPOUT_PATH="$TMPOUT" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const fs = require('fs'); const path = require('path'); const profile = JSON.parse(fs.readFileSync(process.env.PROFILE_FILE_PATH, 'utf-8')); @@ -314,7 +327,7 @@ do_reconcile() { # ----------------------------------------------------------------------- do_read() { ensure_profile - cat "$PROFILE_FILE" | bun --no-env-file --config=/dev/null -e " + cat "$PROFILE_FILE" | bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const p = JSON.parse(await Bun.stdin.text()); const sessions = p.sessions || []; @@ -388,7 +401,7 @@ do_profile() { # ----------------------------------------------------------------------- do_gap() { ensure_profile - cat "$PROFILE_FILE" | bun --no-env-file --config=/dev/null -e " + cat "$PROFILE_FILE" | bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const p = JSON.parse(await Bun.stdin.text()); const declared = p.declared || {}; const inferred = (p.inferred && p.inferred.values) || {}; @@ -417,7 +430,7 @@ do_derive() { fi cd "$ROOT_DIR" - PROFILE_FILE_PATH="$PROFILE_FILE" EVENTS_PATH="$EVENTS" bun --no-env-file --config=/dev/null -e " + PROFILE_FILE_PATH="$PROFILE_FILE" EVENTS_PATH="$EVENTS" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " import('./scripts/question-registry.ts').then(async (regmod) => { const sigmod = await import('./scripts/psychographic-signals.ts'); const fs = require('fs'); @@ -504,7 +517,7 @@ do_trace() { return 0 fi cd "$ROOT_DIR" - EVENTS_PATH="$EVENTS" TRACE_DIM="$DIM" bun --no-env-file --config=/dev/null -e " + EVENTS_PATH="$EVENTS" TRACE_DIM="$DIM" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " import('./scripts/question-registry.ts').then(async (regmod) => { const sigmod = await import('./scripts/psychographic-signals.ts'); const fs = require('fs'); @@ -542,7 +555,7 @@ do_trace() { # ----------------------------------------------------------------------- do_check_mismatch() { ensure_profile - cat "$PROFILE_FILE" | bun --no-env-file --config=/dev/null -e " + cat "$PROFILE_FILE" | bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const p = JSON.parse(await Bun.stdin.text()); const declared = p.declared || {}; const inferred = (p.inferred && p.inferred.values) || {}; @@ -586,7 +599,7 @@ do_narrative() { do_vibe() { ensure_profile cd "$ROOT_DIR" - cat "$PROFILE_FILE" | PROFILE_DATA="$(cat "$PROFILE_FILE")" bun --no-env-file --config=/dev/null -e " + cat "$PROFILE_FILE" | PROFILE_DATA="$(cat "$PROFILE_FILE")" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " import('./scripts/archetypes.ts').then(async (mod) => { const p = JSON.parse(process.env.PROFILE_DATA); const dims = (p.inferred && p.inferred.values) || { diff --git a/bin/gstack-distill-apply b/bin/gstack-distill-apply index 9a0a804b0..769445d1c 100755 --- a/bin/gstack-distill-apply +++ b/bin/gstack-distill-apply @@ -23,6 +23,7 @@ # gstack-distill-apply --proposal --gbrain-published true # gstack-distill-apply --list # show pending proposals set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" . "$(dirname "$0")/gstack-state-root.sh" 2>/dev/null || { echo "$0: cannot resolve the gstack state root: $(dirname "$0")/gstack-state-root.sh is missing. fix: reinstall with ./setup or /gstack-upgrade (docs/state-root.md)" >&2; exit 1; } gstack_state_root_select @@ -57,7 +58,7 @@ if [ ! -f "$PROPOSAL_FILE" ]; then fi if [ "$ACTION" = "list" ]; then - PROPOSAL_FILE_PATH="$PROPOSAL_FILE" bun --no-env-file --config=/dev/null -e ' + PROPOSAL_FILE_PATH="$PROPOSAL_FILE" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e ' const fs = require("fs"); const p = JSON.parse(fs.readFileSync(process.env.PROPOSAL_FILE_PATH, "utf-8")); const proposals = p.proposals || []; @@ -100,7 +101,7 @@ MEMORY_FILE_PATH="$MEMORY_FILE" \ PROFILE_FILE_PATH="$PROFILE_FILE" \ PREF_BIN="$SCRIPT_DIR/gstack-question-preference" \ GBRAIN_PUBLISHED="$GBRAIN_PUBLISHED" \ -bun --no-env-file --config=/dev/null -e ' +bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e ' const fs = require("fs"); const { spawnSync } = require("child_process"); const idx = parseInt(process.env.PROPOSAL_IDX, 10); diff --git a/bin/gstack-distill-free-text b/bin/gstack-distill-free-text index 97e3e1291..2c4f50f67 100755 --- a/bin/gstack-distill-free-text +++ b/bin/gstack-distill-free-text @@ -20,6 +20,7 @@ # auditability via --status when you want it. # Per D6: Anthropic SDK direct call, fail-loud on missing ANTHROPIC_API_KEY. set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac # Heredoc delivery guard. bash 5.2+ writes a heredoc body <=64KiB through a # pipe in the forked child before exec, with no reader on the other end. On @@ -59,7 +60,7 @@ esac # --- Status subcommand -------------------------------------------------- if [ "$MODE" = "status" ]; then - COST_LOG_PATH="$COST_LOG" SLUG_PATH="$SLUG" bun --no-env-file --config=/dev/null -e ' + COST_LOG_PATH="$COST_LOG" SLUG_PATH="$SLUG" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e ' const fs = require("fs"); const slug = process.env.SLUG_PATH; const path = process.env.COST_LOG_PATH; @@ -98,7 +99,7 @@ if [ ! -f "$LOG_FILE" ]; then exit 0 fi -EVENTS_JSON=$(LOG_FILE_PATH="$LOG_FILE" bun --no-env-file --config=/dev/null -e ' +EVENTS_JSON=$(LOG_FILE_PATH="$LOG_FILE" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e ' const fs = require("fs"); const lines = fs.readFileSync(process.env.LOG_FILE_PATH, "utf-8").trim().split("\n").filter(Boolean); const out = []; @@ -119,7 +120,7 @@ EVENTS_JSON=$(LOG_FILE_PATH="$LOG_FILE" bun --no-env-file --config=/dev/null -e process.stdout.write(JSON.stringify(out)); ') -EVENT_COUNT=$(printf '%s' "$EVENTS_JSON" | bun --no-env-file --config=/dev/null -e 'const a = JSON.parse(await Bun.stdin.text()); console.log(a.length);') +EVENT_COUNT=$(printf '%s' "$EVENTS_JSON" | bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e 'const a = JSON.parse(await Bun.stdin.text()); console.log(a.length);') if [ "$EVENT_COUNT" -eq 0 ]; then echo "NO_FREE_TEXT: nothing to distill" exit 0 @@ -172,7 +173,7 @@ if [ "$MODE" = "dry-run" ]; then echo "$DISTILL_PROMPT" echo echo "=== EVENTS ($EVENT_COUNT) ===" - echo "$EVENTS_JSON" | bun --no-env-file --config=/dev/null -e 'console.log(JSON.stringify(JSON.parse(await Bun.stdin.text()), null, 2));' + echo "$EVENTS_JSON" | bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e 'console.log(JSON.stringify(JSON.parse(await Bun.stdin.text()), null, 2));' exit 0 fi @@ -196,7 +197,7 @@ fi RESULT=$(EVENTS_JSON="$EVENTS_JSON" DISTILL_PROMPT="$DISTILL_PROMPT" \ PROPOSAL_FILE_PATH="$PROPOSAL_FILE" LOG_FILE_PATH="$LOG_FILE" \ ANTHROPIC_API_KEY="$ANTHROPIC_API_KEY" \ - bun --no-env-file --config=/dev/null --cwd "$ROOT_DIR" -e ' + bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" --cwd "$ROOT_DIR" -e ' const fs = require("fs"); const Anthropic = require("@anthropic-ai/sdk").default; const client = new Anthropic({ apiKey: process.env.ANTHROPIC_API_KEY }); diff --git a/bin/gstack-doctor b/bin/gstack-doctor index d088098c6..9e18a5a38 100755 --- a/bin/gstack-doctor +++ b/bin/gstack-doctor @@ -40,6 +40,7 @@ BASH_COMPAT=50 set -u +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac usage() { sed -n '3,13p' "$0" | sed 's/^# \{0,1\}//' @@ -512,7 +513,7 @@ check_windows_bash() { row warn "windows bash" "not checked: bun not found" "install Bun (see the bun row), then rerun $BIN/gstack-doctor" return fi - out=$(bun --no-env-file --config=/dev/null "$BIN/gstack-windows-bash.ts" ${GSTACK_DOCTOR_BASH_PROBE:+--probe "$GSTACK_DOCTOR_BASH_PROBE"} &1) + out=$(bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" "$BIN/gstack-windows-bash.ts" ${GSTACK_DOCTOR_BASH_PROBE:+--probe "$GSTACK_DOCTOR_BASH_PROBE"} &1) rc=$? out=$(printf '%s\n' "$out" | tr -d '\000-\010\013-\037') bash=$(printf '%s\n' "$out" | sed -n 's/^WINDOWS_BASH: //p' | head -1) diff --git a/bin/gstack-doctor-check.sh b/bin/gstack-doctor-check.sh index 12fb50a90..8cc9e2e34 100644 --- a/bin/gstack-doctor-check.sh +++ b/bin/gstack-doctor-check.sh @@ -19,6 +19,7 @@ # remote's capy/support.env, `unknown` when its fetch failed, or ""), LIVE. # GSTACK_CAPY_WRAPPER_PATH (optional) names the wrapper a below-minimum fix runs. +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac . "$BIN/gstack-doctor-components.sh" || { echo "gstack-doctor: $BIN/gstack-doctor-components.sh is missing; reinstall with cd $SRC && ./setup" >&2; exit 1; } . "$BIN/gstack-install-registry.sh" 2>/dev/null || { echo "gstack-doctor: $BIN/gstack-install-registry.sh is missing; reinstall with cd $SRC && ./setup" >&2; exit 1; } . "$BIN/gstack-bun-version.sh" 2>/dev/null || { echo "gstack-doctor: $BIN/gstack-bun-version.sh is missing; reinstall with cd $SRC && ./setup" >&2; exit 1; } @@ -213,7 +214,7 @@ _dc_check_browser() { out=$(cd "$ROOT" && { command -v timeout >/dev/null 2>&1 && timeout 90 node -e "$script" &1 || node -e "$script" &1; }); rc=$? elif command -v bun >/dev/null 2>&1; then engine=bun - out=$(cd "$ROOT" && bun --no-env-file --config=/dev/null -e "$script" &1); rc=$? + out=$(cd "$ROOT" && bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e "$script" &1); rc=$? else _dc_row FAIL browser "neither node nor bun is on PATH to launch Chromium" "install Node.js (https://nodejs.org) or Bun, then $fix" BROWSER_UNAVAILABLE return @@ -329,7 +330,7 @@ _dc_check_pins() { return fi node=$(node --version /dev/null | clamp 'v0-9.' 20); node="${node#v}" - out=$(bun --no-env-file --config=/dev/null "$BIN/gstack-runtime-pins.ts" --project "$project" ${_dc_bun:+--bun "$_dc_bun"} ${node:+--node "$node"} &1); rc=$? + out=$(bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" "$BIN/gstack-runtime-pins.ts" --project "$project" ${_dc_bun:+--bun "$_dc_bun"} ${node:+--node "$node"} &1); rc=$? verdict=$(printf '%s\n' "$out" | sed -n 's/^PINS_VERDICT: //p' | tail -1 | clamp 'a-z' 8) summary=$(printf '%s\n' "$out" | sed -n 's/^PIN_SUMMARY: //p' | tr '\n' '|' | sed 's/|$//; s/|/; /g') case "$verdict" in @@ -357,7 +358,7 @@ _dc_check_pins() { fi fi if [ -n "$_dc_ln_dir" ] && [ "$_dc_ln_ver" != "$_dc_bun" ] \ - && bun --no-env-file --config=/dev/null "$BIN/gstack-runtime-pins.ts" --project "$project" --bun "$_dc_ln_ver" ${node:+--node "$node"} /dev/null | grep -q '^PINS_VERDICT: pass'; then + && bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" "$BIN/gstack-runtime-pins.ts" --project "$project" --bun "$_dc_ln_ver" ${node:+--node "$node"} /dev/null | grep -q '^PINS_VERDICT: pass'; then note="; bun $_dc_ln_ver found at $_dc_ln_dir (not on PATH) satisfies them" fix="$_dc_ln_fix" fi _dc_row FAIL pins "$failline$note" "$fix" PROJECT_PIN_MISMATCH ;; diff --git a/bin/gstack-gbrain-install b/bin/gstack-gbrain-install index 9ecdcb4e0..4b67a12c6 100755 --- a/bin/gstack-gbrain-install +++ b/bin/gstack-gbrain-install @@ -36,6 +36,7 @@ # 2 — prerequisite missing or invalid argument # 3 — post-install validation failed (PATH shadow, broken binary, etc.) set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac # --- defaults --- # No version pin by default — install the latest default-branch HEAD (#1744). @@ -100,7 +101,7 @@ fi # bun, which this installer already requires. It used to need jq, which it # never checked for, so a successful install reported failure (#1675). pkg_field() { - GSTACK_PKG_JSON="$1" GSTACK_PKG_FIELD="$2" bun --no-env-file --config=/dev/null -e ' + GSTACK_PKG_JSON="$1" GSTACK_PKG_FIELD="$2" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e ' try { const pkg = JSON.parse(require("fs").readFileSync(process.env.GSTACK_PKG_JSON, "utf8")); const v = process.env.GSTACK_PKG_FIELD.split(".").reduce((o, k) => (o == null ? o : o[k]), pkg); @@ -198,7 +199,7 @@ _bun_exe_hint() { [ "$IS_WINDOWS" -eq 1 ] || return 0 command -v bun.exe >/dev/null 2>&1 && return 0 local real_bun - real_bun=$(bun --no-env-file --config=/dev/null -e 'console.log(process.execPath)' 2>/dev/null | tr -d '\r' || true) + real_bun=$(bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e 'console.log(process.execPath)' 2>/dev/null | tr -d '\r' || true) echo " detected: bun was installed via npm — bun.exe is NOT on %PATH%, and the gbrain.exe shim needs it." >&2 if [ -n "$real_bun" ]; then echo " fix: add bun.exe's directory to PATH (persist it in your shell profile):" >&2 diff --git a/bin/gstack-gbrain-source-wireup b/bin/gstack-gbrain-source-wireup index c5f23738c..97cbb1b4a 100755 --- a/bin/gstack-gbrain-source-wireup +++ b/bin/gstack-gbrain-source-wireup @@ -39,6 +39,7 @@ # Depends on: bun (already a gstack dependency), gbrain, git. set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" CONFIG_BIN="$SCRIPT_DIR/gstack-config" @@ -222,7 +223,7 @@ ensure_worktree() { # is not JSON. source_local_path() { gbrain sources list --json 2>/dev/null \ - | GB_SOURCE_ID="$1" bun --no-env-file --config=/dev/null -e ' + | GB_SOURCE_ID="$1" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e ' const raw = await Bun.stdin.text(); try { const s = (JSON.parse(raw).sources || []).find((x) => x.id === process.env.GB_SOURCE_ID); diff --git a/bin/gstack-hook-check b/bin/gstack-hook-check index e6cc2a73c..a399d2ba6 100755 --- a/bin/gstack-hook-check +++ b/bin/gstack-hook-check @@ -37,6 +37,7 @@ # (needed when a hook runs TypeScript) is not found. Set GSTACK_HOOK_CHECK_BUN to # the bun to run (setup passes its own). set -u +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac LIST_ONLY=0 SETUP_FILE="" while [ $# -gt 1 ]; do @@ -173,7 +174,7 @@ if [ -n "$ENTRIES" ]; then # up below (lib/path-spelling.ts shellPath; test/path-spelling.test.ts keeps # the two equal). # shellcheck disable=SC2086 # newline-split list (IFS is set to a newline below) - (cd "$ROOT" && IFS=$NL && "$BUN" --no-env-file --config=/dev/null -e ' + (cd "$ROOT" && IFS=$NL && "$BUN" --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e ' const shellPath = (value) => process.platform === "win32" ? String(value).replace(/\\/g, "/").replace(/^([A-Za-z]):(?=\/|$)/, (_, drive) => `/${drive.toLowerCase()}`) : String(value); diff --git a/bin/gstack-install-verdict.sh b/bin/gstack-install-verdict.sh index e500344a8..3e244e830 100644 --- a/bin/gstack-install-verdict.sh +++ b/bin/gstack-install-verdict.sh @@ -31,6 +31,8 @@ # spawned sessions (ambient OpenClaw) only warn. GSTACK_ALLOW_UNSUPPORTED_RUNTIME=1 # admits anyway and says so. +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac + # gstack_source_root BIN_DIR — the source checkout behind an install: an # installed runtime root's recorded .source-path (setup _link_runtime_dists), # else BIN_DIR/.. resolved. Prints the realpath; returns 1 when unresolvable. @@ -159,7 +161,7 @@ gstack_install_admission() { v_bun=$(gstack_install_verdict_field "$file" bun_path) if [ -z "$detail" ] && [ -n "$v_bun" ]; then running=$(gstack_realpath "$where" 2>/dev/null) - _gstack_bun_is_shim "$where" && running=$(bun --no-env-file --config=/dev/null -p process.execPath /dev/null | head -1) + _gstack_bun_is_shim "$where" && running=$(bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -p process.execPath /dev/null | head -1) if [ -n "$running" ] && [ "$running" != "$v_bun" ]; then _ia_status=runtime code=BUN_RESOLUTION_DRIFT detail="bun $found at $running is running, but the install verdict recorded bun $(gstack_install_verdict_field "$file" bun_version) at $v_bun" diff --git a/bin/gstack-ios-qa-daemon b/bin/gstack-ios-qa-daemon index 391dd225d..0a2f713c7 100755 --- a/bin/gstack-ios-qa-daemon +++ b/bin/gstack-ios-qa-daemon @@ -21,6 +21,7 @@ # session tokens are outstanding. set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac # The --help heredoc is over 512 bytes; keep it off a pipe (test/heredoc-pipe-deadlock.test.ts). BASH_COMPAT=50 @@ -67,4 +68,4 @@ if ! command -v bun >/dev/null 2>&1; then exit 1 fi -exec bun --no-env-file --config=/dev/null run "$ENTRY" "$@" +exec bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" run "$ENTRY" "$@" diff --git a/bin/gstack-ios-qa-mint b/bin/gstack-ios-qa-mint index 8270ffbda..44cbb8ebf 100755 --- a/bin/gstack-ios-qa-mint +++ b/bin/gstack-ios-qa-mint @@ -10,6 +10,7 @@ # Allowlist file: ~/.gstack/ios-qa-allowlist.json (mode 0600). set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" GSTACK_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" @@ -25,4 +26,4 @@ if ! command -v bun >/dev/null 2>&1; then exit 1 fi -exec bun --no-env-file --config=/dev/null run "$ENTRY" "$@" +exec bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" run "$ENTRY" "$@" diff --git a/bin/gstack-ios-qa-regen b/bin/gstack-ios-qa-regen index b14a86251..33e6c95b9 100755 --- a/bin/gstack-ios-qa-regen +++ b/bin/gstack-ios-qa-regen @@ -3,6 +3,7 @@ # package and the app-owned typed state accessors. set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac usage() { cat <<'EOF' @@ -144,7 +145,7 @@ do fi done -bun --no-env-file --config=/dev/null run "$GENERATOR" --input "$APP_SOURCE" --output "$GENERATED_DIR" +bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" run "$GENERATOR" --input "$APP_SOURCE" --output "$GENERATED_DIR" # Stamp only after successful accessor generation. ios-sync uses this marker # to distinguish a complete current install from an interrupted regeneration. diff --git a/bin/gstack-learnings-log b/bin/gstack-learnings-log index ca8bfeb05..f5fa21713 100755 --- a/bin/gstack-learnings-log +++ b/bin/gstack-learnings-log @@ -6,6 +6,7 @@ # Append-only storage. Duplicates (same key+type) are resolved at read time # by gstack-learnings-search ("latest winner" per key+type). set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" # Windows git-bash (#1950): pwd yields a POSIX path (/c/Users/...), which Bun # on Windows cannot resolve as an ES module specifier in the import below. @@ -27,7 +28,7 @@ INPUT="$1" TMPERR=$(mktemp "${TMPDIR:-/tmp}/gstack-learnings-log.XXXXXX") || { echo "gstack-learnings-log: could not create a temp file in ${TMPDIR:-/tmp}, so the learning was not recorded. Fix: point TMPDIR at a writable directory." >&2; exit 1; } trap 'rm -f "$TMPERR"' EXIT set +e -VALIDATED=$(printf '%s' "$INPUT" | GSTACK_LIB_DIR="$SCRIPT_DIR/../lib" bun --no-env-file --config=/dev/null -e " +VALIDATED=$(printf '%s' "$INPUT" | GSTACK_LIB_DIR="$SCRIPT_DIR/../lib" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const { hasInjection } = await import(process.env.GSTACK_LIB_DIR + '/jsonl-store.ts'); const raw = await Bun.stdin.text(); let j; diff --git a/bin/gstack-learnings-search b/bin/gstack-learnings-search index 6f58737a4..8e19da27c 100755 --- a/bin/gstack-learnings-search +++ b/bin/gstack-learnings-search @@ -8,6 +8,7 @@ # exits 127 and a failed read exits non-zero with its stderr (#2790): "could # not read" must never look like "nothing recorded". set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" eval "$("$SCRIPT_DIR/gstack-slug" 2>/dev/null)" . "$(dirname "$0")/gstack-state-root.sh" 2>/dev/null || { echo "$0: cannot resolve the gstack state root: $(dirname "$0")/gstack-state-root.sh is missing. fix: reinstall with ./setup or /gstack-upgrade (docs/state-root.md)" >&2; exit 1; } @@ -69,7 +70,7 @@ emit_tagged_file() { emit_tagged_file cross "$f" done fi -} | GSTACK_SEARCH_TYPE="$TYPE" GSTACK_SEARCH_QUERY="$QUERY" GSTACK_SEARCH_LIMIT="$LIMIT" GSTACK_SEARCH_CROSS="$CROSS_PROJECT" bun --no-env-file --config=/dev/null -e " +} | GSTACK_SEARCH_TYPE="$TYPE" GSTACK_SEARCH_QUERY="$QUERY" GSTACK_SEARCH_LIMIT="$LIMIT" GSTACK_SEARCH_CROSS="$CROSS_PROJECT" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const lines = (await Bun.stdin.text()).trim().split('\n').filter(Boolean); const now = Date.now(); const type = process.env.GSTACK_SEARCH_TYPE || ''; diff --git a/bin/gstack-memorable b/bin/gstack-memorable index 629040674..558767b14 100755 --- a/bin/gstack-memorable +++ b/bin/gstack-memorable @@ -32,6 +32,7 @@ # Heredoc delivery guard (see bin/gstack-settings-hook for the rationale). BASH_COMPAT=50 set -uo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" @@ -374,7 +375,7 @@ status_bridge() { # JSON; a failed query is reported as unknown, never as an empty history. local egress_json if egress_json="$("$EGRESS_BIN" list --sink "$SINK" --json 2>/dev/null)"; then - n="$(printf '%s' "$egress_json" | bun --no-env-file --config=/dev/null -e 'const a=JSON.parse(require("fs").readFileSync(0,"utf8")||"[]");console.log(Array.isArray(a)?a.length:0)' 2>/dev/null)" + n="$(printf '%s' "$egress_json" | bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e 'const a=JSON.parse(require("fs").readFileSync(0,"utf8")||"[]");console.log(Array.isArray(a)?a.length:0)' 2>/dev/null)" case "$n" in *[!0-9]*|"") n="unknown (could not parse gstack-egress output)" ;; esac else n="unknown (gstack-egress list failed; run it yourself)" diff --git a/bin/gstack-question-log b/bin/gstack-question-log index 7d7fd7b00..6661ba8a8 100755 --- a/bin/gstack-question-log +++ b/bin/gstack-question-log @@ -31,6 +31,7 @@ # # Append-only JSONL. Dedup is at read time in gstack-question-sensitivity --read-log. set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" # Windows git-bash (#1950): pwd yields a POSIX path (/c/Users/...), which Bun # on Windows cannot resolve as an ES module specifier in bun -e imports. @@ -51,7 +52,7 @@ INPUT="$1" TMPERR=$(mktemp "${TMPDIR:-/tmp}/gstack-question-log.XXXXXX") || { echo "gstack-question-log: could not create a temp file in ${TMPDIR:-/tmp}, so the question was not logged. Fix: point TMPDIR at a writable directory." >&2; exit 1; } trap 'rm -f "$TMPERR"' EXIT set +e -VALIDATED=$(printf '%s' "$INPUT" | GSTACK_LIB_DIR="$SCRIPT_DIR/../lib" GSTACK_SCRIPTS_DIR="$SCRIPT_DIR/../scripts" bun --no-env-file --config=/dev/null -e " +VALIDATED=$(printf '%s' "$INPUT" | GSTACK_LIB_DIR="$SCRIPT_DIR/../lib" GSTACK_SCRIPTS_DIR="$SCRIPT_DIR/../scripts" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const { hasInjection } = await import(process.env.GSTACK_LIB_DIR + '/jsonl-store.ts'); const { resolveOptionKey } = await import(process.env.GSTACK_SCRIPTS_DIR + '/psychographic-signals.ts'); const path = require('path'); @@ -241,7 +242,7 @@ LOG_FILE="$GSTACK_HOME/projects/$SLUG/question-log.jsonl" # Lookup is bounded so the bin stays cheap on hot paths. DEDUP_SKIP="" if [ -f "$LOG_FILE" ]; then - DEDUP_SKIP=$(VALIDATED_JSON="$VALIDATED" LOG_FILE_PATH="$LOG_FILE" bun --no-env-file --config=/dev/null -e ' + DEDUP_SKIP=$(VALIDATED_JSON="$VALIDATED" LOG_FILE_PATH="$LOG_FILE" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e ' const fs = require("fs"); const j = JSON.parse(process.env.VALIDATED_JSON); if (!j.tool_use_id) { console.log(""); process.exit(0); } @@ -261,7 +262,7 @@ if [ -f "$LOG_FILE" ]; then fi if [ "$DEDUP_SKIP" = "dup" ]; then - echo "DEDUP: skipped (source=$(echo "$VALIDATED" | bun --no-env-file --config=/dev/null -e 'const j=JSON.parse(await Bun.stdin.text()); console.log(j.source);'), tool_use_id duplicate)" + echo "DEDUP: skipped (source=$(echo "$VALIDATED" | bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e 'const j=JSON.parse(await Bun.stdin.text()); console.log(j.source);'), tool_use_id duplicate)" exit 0 fi diff --git a/bin/gstack-question-preference b/bin/gstack-question-preference index 2cc2e81fc..5d0d1af40 100755 --- a/bin/gstack-question-preference +++ b/bin/gstack-question-preference @@ -35,6 +35,7 @@ # --check already ignores those prefs; storing them made --stats lie. # always-ask on a one-way id is fine (it agrees with the safety override). set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" @@ -105,7 +106,7 @@ do_check() { fi ensure_file cd "$ROOT_DIR" - PREF_FILE_PATH="$PREF_FILE" GLOBAL_PREF_FILE_PATH="$GLOBAL_PREF_FILE" QID="$QID" QSUMMARY="$QSUMMARY" bun --no-env-file --config=/dev/null -e " + PREF_FILE_PATH="$PREF_FILE" GLOBAL_PREF_FILE_PATH="$GLOBAL_PREF_FILE" QID="$QID" QSUMMARY="$QSUMMARY" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " import('./scripts/one-way-doors.ts').then((oneway) => { const fs = require('fs'); const qid = process.env.QID; @@ -201,7 +202,7 @@ do_write() { set +e local RESULT - RESULT=$(cd "$ROOT_DIR" && printf '%s' "$INPUT" | PREF_FILE_PATH="$PREF_FILE" EVENT_FILE_PATH="$EVENT_FILE" FREE_TEXT="$FREE_TEXT" HAS_FREE_TEXT="$HAS_FREE_TEXT" bun --no-env-file --config=/dev/null -e " + RESULT=$(cd "$ROOT_DIR" && printf '%s' "$INPUT" | PREF_FILE_PATH="$PREF_FILE" EVENT_FILE_PATH="$EVENT_FILE" FREE_TEXT="$FREE_TEXT" HAS_FREE_TEXT="$HAS_FREE_TEXT" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const fs = require('fs'); const raw = await Bun.stdin.text(); let j; @@ -320,7 +321,7 @@ do_clear() { echo '{}' > "$PREF_FILE" echo "OK: cleared all preferences" else - PREF_FILE_PATH="$PREF_FILE" QID="$QID" bun --no-env-file --config=/dev/null -e " + PREF_FILE_PATH="$PREF_FILE" QID="$QID" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const fs = require('fs'); const prefs = JSON.parse(fs.readFileSync(process.env.PREF_FILE_PATH, 'utf-8')); if (prefs[process.env.QID] !== undefined) { @@ -339,7 +340,7 @@ do_clear() { # ----------------------------------------------------------------------- do_stats() { ensure_file - (cd "$ROOT_DIR" && PREF_FILE_PATH="$PREF_FILE" bun --no-env-file --config=/dev/null -e " + (cd "$ROOT_DIR" && PREF_FILE_PATH="$PREF_FILE" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " import('./scripts/one-way-doors.ts').then((oneway) => { const fs = require('fs'); const prefs = JSON.parse(fs.readFileSync(process.env.PREF_FILE_PATH, 'utf-8')); diff --git a/bin/gstack-relink b/bin/gstack-relink index f280390c2..f7443deba 100755 --- a/bin/gstack-relink +++ b/bin/gstack-relink @@ -9,6 +9,7 @@ # GSTACK_INSTALL_DIR — override gstack install directory # GSTACK_SKILLS_DIR — override target skills directory set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" GSTACK_CONFIG="${SCRIPT_DIR}/gstack-config" @@ -474,7 +475,7 @@ if { [ "$DISABLED" != " " ] || grep -q '^Disabled on this install' "$_ROUTER" 2> _ROUTER_TMP="$(mktemp -d "${TMPDIR:-/tmp}/gstack-router.XXXXXX")" || _ROUTER_TMP="" _DISABLED_CSV="$(printf '%s' "$DISABLED" | xargs | tr ' ' ',')" if [ -n "$_ROUTER_TMP" ] && command -v bun >/dev/null 2>&1 \ - && (cd "$_GEN_SRC" && bun --no-env-file --config=/dev/null run scripts/gen-skill-docs.ts --host claude --out-dir "$_ROUTER_TMP" ${_DISABLED_CSV:+"--disabled-skills=$_DISABLED_CSV"} ${_PLAN_MODE_ARG:+"$_PLAN_MODE_ARG"} >/dev/null 2>&1) \ + && (cd "$_GEN_SRC" && bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" run scripts/gen-skill-docs.ts --host claude --out-dir "$_ROUTER_TMP" ${_DISABLED_CSV:+"--disabled-skills=$_DISABLED_CSV"} ${_PLAN_MODE_ARG:+"$_PLAN_MODE_ARG"} >/dev/null 2>&1) \ && [ -s "$_ROUTER_TMP/SKILL.md" ] && cp "$_ROUTER_TMP/SKILL.md" "$_ROUTER.tmp.$$" && mv "$_ROUTER.tmp.$$" "$_ROUTER"; then _link_root_skill_alias [ -n "$_DISABLED_CSV" ] && echo "Router: disabled skills left out of $_ROUTER" diff --git a/bin/gstack-review-log b/bin/gstack-review-log index 102fb1dc1..b60832497 100755 --- a/bin/gstack-review-log +++ b/bin/gstack-review-log @@ -17,6 +17,7 @@ # a model read the code. Caller-supplied binding fields are always discarded. # Plan-tier rows retain their legacy binding behavior. set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac export GIT_OPTIONAL_LOCKS=0 export GIT_CONFIG_PARAMETERS="${GIT_CONFIG_PARAMETERS:+$GIT_CONFIG_PARAMETERS }'core.fsmonitor=false' 'core.untrackedCache=false'" SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" @@ -77,7 +78,7 @@ SESSION_KIND=$("$SCRIPT_DIR/gstack-session-kind" 2>/dev/null || echo interactive export GSTACK_STAMP_COMMIT_FULL="$COMMIT_FULL" GSTACK_STAMP_TREE="$TREE" GSTACK_STAMP_WTREE="$WTREE" GSTACK_STAMP_DIRTY="$DIRTY" GSTACK_STAMP_SESSION_KIND="$SESSION_KIND" if [ "$INPUT" = --start ]; then case "${3:-}" in ''|--fix-range) ;; *) echo 'Usage: gstack-review-log --start SKILL [--fix-range]' >&2; exit 2 ;; esac - GSTACK_REVIEW_SKILL="${2:-}" GSTACK_REVIEW_FIX_RANGE="${3:-}" bun --no-env-file --config=/dev/null -e ' + GSTACK_REVIEW_SKILL="${2:-}" GSTACK_REVIEW_FIX_RANGE="${3:-}" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e ' const { captureReviewStart } = await import(process.env.GSTACK_REVIEW_LIB); try { console.log(captureReviewStart(process.env.GSTACK_REVIEW_SKILL, process.env, process.env.GSTACK_REVIEW_FIX_RANGE === "--fix-range")); } catch (e) { console.error(e.message); process.exit(1); } @@ -85,7 +86,7 @@ if [ "$INPUT" = --start ]; then exit $? fi if [ "$INPUT" = --check-shared-libs ] && [ "$#" -eq 2 ]; then - GSTACK_REVIEW_TOKEN="$2" bun --no-env-file --config=/dev/null -e ' + GSTACK_REVIEW_TOKEN="$2" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e ' const { checkSharedLibsReuse } = await import(process.env.GSTACK_REVIEW_LIB); console.log(JSON.stringify(checkSharedLibsReuse(JSON.parse(await Bun.stdin.text()), process.env.GSTACK_REVIEW_TOKEN))); ' @@ -113,7 +114,7 @@ case "$INPUT" in --*) usage ;; esac # Caller values for the binding keys are dropped before stamping. A binding or # validation failure reaches stderr as its own line (never folded into # "invalid JSON"), and exits 1 with nothing written. -STAMPED=$(printf '%s' "$INPUT" | GSTACK_REVIEW_TOKEN="$TOKEN" GSTACK_REVIEW_FINDINGS="$FINDINGS" bun --no-env-file --config=/dev/null -e " +STAMPED=$(printf '%s' "$INPUT" | GSTACK_REVIEW_TOKEN="$TOKEN" GSTACK_REVIEW_FINDINGS="$FINDINGS" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const { bindReview } = await import(process.env.GSTACK_REVIEW_LIB); let rec; try { rec = JSON.parse(await Bun.stdin.text()); } catch (e) { console.error('gstack-review-log: invalid JSON, skipping (' + e.message + ')'); process.exit(1); } diff --git a/bin/gstack-review-read b/bin/gstack-review-read index 8233e2076..6be765749 100755 --- a/bin/gstack-review-read +++ b/bin/gstack-review-read @@ -9,6 +9,7 @@ # rows using review_freshness; legacy or uncaptured diff evidence cannot fall # back to HEAD equality. Plan rows are unchanged. set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" case "$(uname -s)" in MINGW*|MSYS*|CYGWIN*) command -v cygpath >/dev/null 2>&1 && SCRIPT_DIR="$(cygpath -m "$SCRIPT_DIR")" ;; @@ -19,7 +20,7 @@ gstack_state_root_select GSTACK_HOME="$_gstack_sr_root" WTREE=$("$SCRIPT_DIR/gstack-wtree" 2>/dev/null || echo "unknown") if [ -f "$GSTACK_HOME/projects/$SLUG/$BRANCH-reviews.jsonl" ]; then - GSTACK_REVIEW_LIB="$SCRIPT_DIR/../lib/review-evidence.ts" GSTACK_REVIEW_WTREE="$WTREE" bun --no-env-file --config=/dev/null -e ' + GSTACK_REVIEW_LIB="$SCRIPT_DIR/../lib/review-evidence.ts" GSTACK_REVIEW_WTREE="$WTREE" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e ' const { reviewFreshness } = await import(process.env.GSTACK_REVIEW_LIB); for (const line of (await Bun.stdin.text()).split("\n").filter(Boolean)) { try { diff --git a/bin/gstack-settings-hook b/bin/gstack-settings-hook index 9068f57bd..239be557f 100755 --- a/bin/gstack-settings-hook +++ b/bin/gstack-settings-hook @@ -69,6 +69,7 @@ BASH_COMPAT=50 set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac ACTION="${1:-}" SETTINGS_FILE="${GSTACK_SETTINGS_FILE:-${CLAUDE_CONFIG_DIR:-$HOME/.claude}/settings.json}" @@ -307,7 +308,7 @@ function gsWriteIfChanged(path, beforeText, settings, existed) { GSTACK_SETTINGS_INPUT="$SETTINGS_FILE" export GSTACK_SETTINGS_INPUT -SETTINGS_FILE=$(bun --no-env-file --config=/dev/null -e "$_HOOK_JS_PRELUDE"'gsMain(function () { +SETTINGS_FILE=$(bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e "$_HOOK_JS_PRELUDE"'gsMain(function () { process.stdout.write(gsResolveSettingsPath(process.env.GSTACK_SETTINGS_INPUT)); });') || exit $? @@ -405,7 +406,7 @@ case "$ACTION" in fi _acquire_lock || exit 5 _mutation_env - GSTACK_SETTINGS_PATH="$SETTINGS_FILE" GSTACK_HOOK_CMD="$HOOK_CMD" bun --no-env-file --config=/dev/null -e "$_HOOK_JS_PRELUDE"'gsMain(function () { + GSTACK_SETTINGS_PATH="$SETTINGS_FILE" GSTACK_HOOK_CMD="$HOOK_CMD" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e "$_HOOK_JS_PRELUDE"'gsMain(function () { const settingsPath = process.env.GSTACK_SETTINGS_PATH; const hookCmd = process.env.GSTACK_HOOK_CMD; const loaded = gsLoadSettings(settingsPath); @@ -435,7 +436,7 @@ case "$ACTION" in [ -f "$SETTINGS_FILE" ] || exit 1 _acquire_lock || exit 5 _mutation_env - GSTACK_SETTINGS_PATH="$SETTINGS_FILE" bun --no-env-file --config=/dev/null -e "$_HOOK_JS_PRELUDE"'gsMain(function () { + GSTACK_SETTINGS_PATH="$SETTINGS_FILE" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e "$_HOOK_JS_PRELUDE"'gsMain(function () { const settingsPath = process.env.GSTACK_SETTINGS_PATH; const loaded = gsLoadSettings(settingsPath); const settings = loaded.settings; @@ -505,7 +506,7 @@ case "$ACTION" in GSTACK_TIMEOUT="$TIMEOUT" \ GSTACK_DIFF_ONLY="$DIFF_ONLY" \ GSTACK_ENSURE="$ENSURE" \ - bun --no-env-file --config=/dev/null -e "$_HOOK_JS_PRELUDE"'gsMain(function () { + bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e "$_HOOK_JS_PRELUDE"'gsMain(function () { const settingsPath = process.env.GSTACK_SETTINGS_PATH; const event = process.env.GSTACK_EVENT; const cmd = process.env.GSTACK_COMMAND; @@ -660,7 +661,7 @@ case "$ACTION" in [ -f "$SETTINGS_FILE" ] || exit 0 _acquire_lock || exit 5 _mutation_env - GSTACK_SETTINGS_PATH="$SETTINGS_FILE" GSTACK_SOURCE="$SOURCE" GSTACK_RS_EVENT="$RS_EVENT" bun --no-env-file --config=/dev/null -e "$_HOOK_JS_PRELUDE"'gsMain(function () { + GSTACK_SETTINGS_PATH="$SETTINGS_FILE" GSTACK_SOURCE="$SOURCE" GSTACK_RS_EVENT="$RS_EVENT" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e "$_HOOK_JS_PRELUDE"'gsMain(function () { const settingsPath = process.env.GSTACK_SETTINGS_PATH; const source = process.env.GSTACK_SOURCE; const onlyEvent = process.env.GSTACK_RS_EVENT || ""; @@ -763,7 +764,7 @@ case "$ACTION" in GSTACK_PRUNE_ALL="$PRUNE_ALL" \ GSTACK_PT_OPTOUT="$GSTACK_PT_OPTOUT" \ GSTACK_SWEEP_EXCLUDE_SOURCES="${GSTACK_SWEEP_EXCLUDE_SOURCES:-}" \ - bun --no-env-file --config=/dev/null -e "$_HOOK_JS_PRELUDE"'gsMain(function () { + bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e "$_HOOK_JS_PRELUDE"'gsMain(function () { const settingsPath = process.env.GSTACK_SETTINGS_PATH; const root = (process.env.GSTACK_REPOINT_ROOT || "").replace(/\/+$/, ""); const all = process.env.GSTACK_PRUNE_ALL === "1"; @@ -902,7 +903,7 @@ case "$ACTION" in fi _mutation_env GSTACK_SETTINGS_PATH="$SETTINGS_FILE" GSTACK_RESTORE_PATH="$LATEST" \ - bun --no-env-file --config=/dev/null -e "$_HOOK_JS_PRELUDE"'gsMain(function () { + bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e "$_HOOK_JS_PRELUDE"'gsMain(function () { var fs = require("fs"); var target = process.env.GSTACK_SETTINGS_PATH; var backup = process.env.GSTACK_RESTORE_PATH; @@ -944,7 +945,7 @@ case "$ACTION" in exit 1 fi [ -f "$SETTINGS_FILE" ] || exit 0 - GSTACK_SETTINGS_PATH="$SETTINGS_FILE" GSTACK_LI_EVENT="$LI_EVENT" GSTACK_LI_OWNED_BY="$LI_OWNED_BY" GSTACK_LI_CMD_RE="$LI_CMD_RE" bun --no-env-file --config=/dev/null -e "$_HOOK_JS_PRELUDE"'gsMain(function () { + GSTACK_SETTINGS_PATH="$SETTINGS_FILE" GSTACK_LI_EVENT="$LI_EVENT" GSTACK_LI_OWNED_BY="$LI_OWNED_BY" GSTACK_LI_CMD_RE="$LI_CMD_RE" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e "$_HOOK_JS_PRELUDE"'gsMain(function () { const event = process.env.GSTACK_LI_EVENT; const ownedBy = process.env.GSTACK_LI_OWNED_BY || ""; const reSrc = process.env.GSTACK_LI_CMD_RE || ""; @@ -982,7 +983,7 @@ case "$ACTION" in list-sources) [ -f "$SETTINGS_FILE" ] || { echo "(no settings file)"; exit 0; } - GSTACK_SETTINGS_PATH="$SETTINGS_FILE" bun --no-env-file --config=/dev/null -e "$_HOOK_JS_PRELUDE"'gsMain(function () { + GSTACK_SETTINGS_PATH="$SETTINGS_FILE" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e "$_HOOK_JS_PRELUDE"'gsMain(function () { const fs = require("fs"); let settings = {}; try { settings = JSON.parse(fs.readFileSync(process.env.GSTACK_SETTINGS_PATH, "utf8")); } diff --git a/bin/gstack-specialist-stats b/bin/gstack-specialist-stats index af0b3d15e..0c5c66532 100755 --- a/bin/gstack-specialist-stats +++ b/bin/gstack-specialist-stats @@ -8,6 +8,7 @@ # Fix-range passes (scope "fix-range", #3339) are skipped: a narrowed dispatch # says nothing about a specialist's hit rate on a whole branch. set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" eval "$("$SCRIPT_DIR/gstack-slug" 2>/dev/null)" . "$(dirname "$0")/gstack-state-root.sh" 2>/dev/null || { echo "$0: cannot resolve the gstack state root: $(dirname "$0")/gstack-state-root.sh is missing. fix: reinstall with ./setup or /gstack-upgrade (docs/state-root.md)" >&2; exit 1; } @@ -33,7 +34,7 @@ if [ -z "$COMBINED" ]; then exit 0 fi -printf '%s' "$COMBINED" | bun --no-env-file --config=/dev/null -e " +printf '%s' "$COMBINED" | bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const lines = (await Bun.stdin.text()).trim().split('\n').filter(Boolean); const NEVER_GATE = new Set(['security', 'data-migration', 'state-machines']); const stats = {}; diff --git a/bin/gstack-team-init b/bin/gstack-team-init index 901f5999b..d284ad04c 100755 --- a/bin/gstack-team-init +++ b/bin/gstack-team-init @@ -18,6 +18,7 @@ BASH_COMPAT=50 set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac MODE="${1:-}" @@ -192,7 +193,7 @@ HOOK_EOF if ! command -v bun >/dev/null 2>&1; then echo " ! bun not found — manually add this PreToolUse hook (matcher Skill|skill, \"onFailure\": \"block\") to .claude/settings.json:" echo " $HOOK_COMMAND" - elif GSTACK_SETTINGS_PATH="$SETTINGS" GSTACK_HOOK_COMMAND="$HOOK_COMMAND" bun --no-env-file --config=/dev/null -e " + elif GSTACK_SETTINGS_PATH="$SETTINGS" GSTACK_HOOK_COMMAND="$HOOK_COMMAND" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const fs = require('fs'); const settingsPath = process.env.GSTACK_SETTINGS_PATH; const handler = { type: 'command', command: process.env.GSTACK_HOOK_COMMAND, onFailure: 'block' }; diff --git a/bin/gstack-telemetry-log b/bin/gstack-telemetry-log index b5eac29b9..a662e350f 100755 --- a/bin/gstack-telemetry-log +++ b/bin/gstack-telemetry-log @@ -21,6 +21,7 @@ # # NOTE: Uses set -uo pipefail (no -e) — telemetry must never exit non-zero set -uo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac GSTACK_DIR="${GSTACK_DIR:-$(cd "$(dirname "$0")/.." && pwd)}" SCRIPT_DIR="$GSTACK_DIR/bin" @@ -205,7 +206,7 @@ ERR_FIELD="null" # look like a JSON string, the whole message becomes null — never raw. ERR_MSG_FIELD="null" if [ -n "$ERROR_MESSAGE" ]; then - ERR_MSG_FIELD="$(printf '%s' "$ERROR_MESSAGE" | GSTACK_LIB_DIR="$SCRIPT_DIR/../lib" bun --no-env-file --config=/dev/null -e " + ERR_MSG_FIELD="$(printf '%s' "$ERROR_MESSAGE" | GSTACK_LIB_DIR="$SCRIPT_DIR/../lib" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const { redactFindingSpans } = await import(process.env.GSTACK_LIB_DIR + '/redact-engine.ts'); const input = await Bun.stdin.text(); const out = redactFindingSpans(input, { repoVisibility: 'private' }); diff --git a/bin/gstack-timeline-log b/bin/gstack-timeline-log index 2efd343f0..ab6eabff1 100755 --- a/bin/gstack-timeline-log +++ b/bin/gstack-timeline-log @@ -10,6 +10,7 @@ # Optional: branch, outcome, duration_s, session, ts. # Validation failure → skip silently (non-blocking). set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" eval "$("$SCRIPT_DIR/gstack-slug" 2>/dev/null)" . "$(dirname "$0")/gstack-state-root.sh" 2>/dev/null || { echo "$0: cannot resolve the gstack state root: $(dirname "$0")/gstack-state-root.sh is missing. fix: reinstall with ./setup or /gstack-upgrade (docs/state-root.md)" >&2; exit 1; } @@ -19,21 +20,33 @@ mkdir -p "$GSTACK_HOME/projects/$SLUG" INPUT="$1" -# Validate: input must be parseable JSON with required fields -if ! printf '%s' "$INPUT" | bun --no-env-file --config=/dev/null -e " - const j = JSON.parse(await Bun.stdin.text()); - if (!j.skill || !j.event) process.exit(1); -" 2>/dev/null; then - exit 0 # skip silently, non-blocking +# Validate: input must be parseable JSON with required fields. The validator +# prints its verdict; a non-zero exit means Bun itself failed (#3415). An exit +# code cannot carry the verdict: a Bun crash on Windows exits 3. +VALIDATE_RC=0 +VALIDATE_OUT=$(printf '%s' "$INPUT" | bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " + const text = await Bun.stdin.text(); + let j; + try { j = JSON.parse(text); } catch {} + console.log(j && j.skill && j.event ? 'valid' : 'invalid'); +") || VALIDATE_RC=$? +if [ "$VALIDATE_RC" -ne 0 ]; then + echo "gstack-timeline-log: bun exited $VALIDATE_RC before the event was validated; nothing was logged" >&2 + exit "$VALIDATE_RC" fi +case "$VALIDATE_OUT" in + valid) ;; + invalid) exit 0 ;; # skip silently, non-blocking + *) echo "gstack-timeline-log: bun printed no verdict while validating the event; nothing was logged" >&2; exit 1 ;; +esac # Inject timestamp if not present -if ! printf '%s' "$INPUT" | bun --no-env-file --config=/dev/null -e "const j=JSON.parse(await Bun.stdin.text()); if(!j.ts) process.exit(1)" 2>/dev/null; then - INPUT=$(printf '%s' "$INPUT" | bun --no-env-file --config=/dev/null -e " +if ! printf '%s' "$INPUT" | bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e "const j=JSON.parse(await Bun.stdin.text()); if(!j.ts) process.exit(1)" 2>/dev/null; then + STAMPED=$(printf '%s' "$INPUT" | bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const j = JSON.parse(await Bun.stdin.text()); j.ts = new Date().toISOString(); console.log(JSON.stringify(j)); - " 2>/dev/null) || true + " 2>/dev/null) && [ -n "$STAMPED" ] && INPUT=$STAMPED || true fi echo "$INPUT" >> "$GSTACK_HOME/projects/$SLUG/timeline.jsonl" diff --git a/bin/gstack-timeline-read b/bin/gstack-timeline-read index c4dd93cfe..35db5fb46 100755 --- a/bin/gstack-timeline-read +++ b/bin/gstack-timeline-read @@ -10,6 +10,7 @@ # --branch, or an unknown argument exits 2 before any read (#1723); --help # prints the usage line and exits 0. set -euo pipefail +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac USAGE='Usage: gstack-timeline-read [--since "7 days ago"|7d|YYYY-MM-DD] [--limit N] [--branch NAME]' SINCE_FORMS='accepted: " minute|hour|day|week|month[s] ago", "h|d|w", or an ISO date YYYY-MM-DD or YYYY-MM-DDTHH:MM:SSZ' SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" @@ -108,7 +109,7 @@ command -v bun >/dev/null 2>&1 || { exit 127 } -cat "$TIMELINE_FILE" | GSTACK_TIMELINE_SINCE_MS="$SINCE_MS" GSTACK_TIMELINE_BRANCH="$BRANCH" GSTACK_TIMELINE_LIMIT="$LIMIT" bun --no-env-file --config=/dev/null -e " +cat "$TIMELINE_FILE" | GSTACK_TIMELINE_SINCE_MS="$SINCE_MS" GSTACK_TIMELINE_BRANCH="$BRANCH" GSTACK_TIMELINE_LIMIT="$LIMIT" bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e " const lines = (await Bun.stdin.text()).trim().split('\n').filter(Boolean); const branch = process.env.GSTACK_TIMELINE_BRANCH || ''; const limit = Number(process.env.GSTACK_TIMELINE_LIMIT); diff --git a/browse/test/learnings-injection.test.ts b/browse/test/learnings-injection.test.ts index de3b09538..2d202dca1 100644 --- a/browse/test/learnings-injection.test.ts +++ b/browse/test/learnings-injection.test.ts @@ -6,17 +6,22 @@ import { spawnSync } from 'child_process'; const SCRIPT_PATH = path.join(import.meta.dir, '../../bin/gstack-learnings-search'); const SCRIPT = fs.readFileSync(SCRIPT_PATH, 'utf-8'); const BIN_DIR = path.join(import.meta.dir, '../../bin'); +const BUN_BLOCK_AT = SCRIPT.indexOf('bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e'); describe('gstack-learnings-search injection safety', () => { + it('finds the bun -e block the checks below read', () => { + expect(BUN_BLOCK_AT).toBeGreaterThanOrEqual(0); + }); + it('must not interpolate variables into JS string literals', () => { - const jsBlock = SCRIPT.slice(SCRIPT.indexOf('bun --no-env-file --config=/dev/null -e')); + const jsBlock = SCRIPT.slice(BUN_BLOCK_AT); expect(jsBlock).not.toMatch(/const \w+ = '\$\{/); expect(jsBlock).not.toMatch(/= \$\{[A-Z_]+\};/); expect(jsBlock).not.toMatch(/'\$\{CROSS_PROJECT\}'/); }); it('must use process.env for parameters', () => { - const jsBlock = SCRIPT.slice(SCRIPT.indexOf('bun --no-env-file --config=/dev/null -e')); + const jsBlock = SCRIPT.slice(BUN_BLOCK_AT); expect(jsBlock).toContain('process.env'); }); }); diff --git a/gstack-upgrade/migrations/v1.86.0.0.sh b/gstack-upgrade/migrations/v1.86.0.0.sh index fcdbf83cc..ceb589c23 100755 --- a/gstack-upgrade/migrations/v1.86.0.0.sh +++ b/gstack-upgrade/migrations/v1.86.0.0.sh @@ -5,8 +5,9 @@ # shared old renders are retired. This post-setup pass repairs missed upgrades. # Idempotent and non-fatal: foreign entries and failed replacements stay intact. set -u +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac INSTALL_DIR="${GSTACK_INSTALL_DIR:-$HOME/.claude/skills/gstack}" if [ -f "$INSTALL_DIR/bin/gstack-migrate-claude-code" ] && command -v bun >/dev/null 2>&1; then - bun --no-env-file --config=/dev/null "$INSTALL_DIR/bin/gstack-migrate-claude-code" --install-dir "$INSTALL_DIR" || true + bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" "$INSTALL_DIR/bin/gstack-migrate-claude-code" --install-dir "$INSTALL_DIR" || true fi exit 0 diff --git a/hosts/claude/hooks/auq-error-fallback-hook b/hosts/claude/hooks/auq-error-fallback-hook index 4db80b738..7c351fd9b 100755 --- a/hosts/claude/hooks/auq-error-fallback-hook +++ b/hosts/claude/hooks/auq-error-fallback-hook @@ -3,5 +3,6 @@ # wrapper makes the TypeScript hook executable via bun. Settings.json # references this file directly. set -e +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac HERE="$(cd "$(dirname "$0")" && pwd)" -exec bun --no-env-file --config=/dev/null "$HERE/auq-error-fallback-hook.ts" +exec bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" "$HERE/auq-error-fallback-hook.ts" diff --git a/hosts/claude/hooks/memorable-user-prompt-hook b/hosts/claude/hooks/memorable-user-prompt-hook index f476ac7f4..9a7d07069 100755 --- a/hosts/claude/hooks/memorable-user-prompt-hook +++ b/hosts/claude/hooks/memorable-user-prompt-hook @@ -12,8 +12,9 @@ # vendor process running with the prompt on its stdin. Forwarded, the signal # reaches the .ts, which kills the vendor's process group on its way out. # `<&0` keeps stdin: bash hands background jobs /dev/null otherwise. +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac HERE="$(cd "$(dirname "$0")" && pwd)" || exit 0 -bun --no-env-file --config=/dev/null "$HERE/memorable-user-prompt-hook.ts" <&0 & +bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" "$HERE/memorable-user-prompt-hook.ts" <&0 & _child=$! trap 'kill -TERM "$_child" 2>/dev/null' TERM INT HUP wait "$_child" 2>/dev/null || wait "$_child" 2>/dev/null || true diff --git a/hosts/claude/hooks/question-log-hook b/hosts/claude/hooks/question-log-hook index 5b6012cec..c70484a90 100755 --- a/hosts/claude/hooks/question-log-hook +++ b/hosts/claude/hooks/question-log-hook @@ -3,5 +3,6 @@ # wrapper makes the TypeScript hook executable via bun. Settings.json # references this file directly. set -e +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac HERE="$(cd "$(dirname "$0")" && pwd)" -exec bun --no-env-file --config=/dev/null "$HERE/question-log-hook.ts" +exec bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" "$HERE/question-log-hook.ts" diff --git a/hosts/claude/hooks/question-preference-hook b/hosts/claude/hooks/question-preference-hook index 8dac5ff3c..a910c3cf4 100755 --- a/hosts/claude/hooks/question-preference-hook +++ b/hosts/claude/hooks/question-preference-hook @@ -3,5 +3,6 @@ # wrapper makes the TypeScript hook executable via bun. Settings.json # references this file directly. set -e +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac HERE="$(cd "$(dirname "$0")" && pwd)" -exec bun --no-env-file --config=/dev/null "$HERE/question-preference-hook.ts" +exec bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" "$HERE/question-preference-hook.ts" diff --git a/hosts/claude/hooks/timeline-stop-hook b/hosts/claude/hooks/timeline-stop-hook index 74c716649..9cddf1fe5 100755 --- a/hosts/claude/hooks/timeline-stop-hook +++ b/hosts/claude/hooks/timeline-stop-hook @@ -5,6 +5,7 @@ # # FAIL-OPEN (F5): a Stop-event telemetry repair must never block the session. # Every failure path — bun missing, script crash — still exits 0. +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac HERE="$(cd "$(dirname "$0")" && pwd)" || exit 0 -bun --no-env-file --config=/dev/null "$HERE/timeline-stop-hook.ts" || true +bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" "$HERE/timeline-stop-hook.ts" || true exit 0 diff --git a/lib/bun-isolation.ts b/lib/bun-isolation.ts index 63c9d09ef..426b6dd3f 100644 --- a/lib/bun-isolation.ts +++ b/lib/bun-isolation.ts @@ -4,10 +4,12 @@ * variables, and a `bunfig.toml` preload runs code before the entry point. * gstack runs inside the user's repository, so that directory belongs to the * code under review. Every Bun gstack starts passes --no-env-file and an empty - * --config: shebangs and shell callers spell it - * `bun --no-env-file --config=/dev/null`, TypeScript spawns use - * bunIsolationArgs(). test/bun-entry-isolation.test.ts holds every entry point - * to that form. + * --config: shebangs and skill prose spell it + * `bun --no-env-file --config=/dev/null`, shipped shell files spell + * `--config="${GSTACK_BUN_CONFIG:-/dev/null}"` (NUL when OSTYPE is msys or + * cygwin and cygpath is on PATH, #3415), TypeScript spawns use + * bunIsolationArgs(). + * test/bun-entry-isolation.test.ts holds every entry point to that form. * * POSIX passes /dev/null. Native Windows has no /dev/null and `--config=NUL` * panicked Bun 1.3.10 while parsing the flag (#3085), so a TypeScript spawn on diff --git a/package.json b/package.json index b28272089..316846110 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gstack", - "version": "1.91.226", + "version": "1.91.227", "description": "Garry's Stack — Claude Code skills + fast headless browser. One repo, one install, entire AI engineering workflow.", "license": "MIT", "type": "module", diff --git a/plan-ceo-review/bin/mode-handoff-hook b/plan-ceo-review/bin/mode-handoff-hook index b0461686f..58ad95c08 100755 --- a/plan-ceo-review/bin/mode-handoff-hook +++ b/plan-ceo-review/bin/mode-handoff-hook @@ -1,5 +1,6 @@ #!/usr/bin/env bash # Bash shim — Claude Code runs hook commands through /bin/sh; this runs the # TypeScript hook with bun. +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac HERE="$(cd "$(dirname "$0")" && pwd)" -exec bun --no-env-file --config=/dev/null "$HERE/mode-handoff-hook.ts" +exec bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" "$HERE/mode-handoff-hook.ts" diff --git a/scripts/build-cso.sh b/scripts/build-cso.sh index 62be650c4..303d03e6a 100644 --- a/scripts/build-cso.sh +++ b/scripts/build-cso.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash set -eu +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac CSO_BUILD_ROOT="$(cd "$(dirname "$0")/.." && pwd -P)" cd "$CSO_BUILD_ROOT" @@ -227,7 +228,7 @@ cso_build_evaluation_candidate() { cp -R lib scripts "$source_root/" cp -R test/helpers "$source_root/test/" cp "$candidate_catalog" "$source_root/lib/cso/runtime-catalog.json" - (cd "$source_root" && "$BUN_CMD" --no-env-file --config=/dev/null scripts/cso-runtime-promotion.ts check-evaluation lib/cso/runtime-catalog.json) + (cd "$source_root" && "$BUN_CMD" --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" scripts/cso-runtime-promotion.ts check-evaluation lib/cso/runtime-catalog.json) (cd "$source_root" && cso_compile_bun lib/cso/cli.ts "$CSO_EVALUATION_UNIT/gstack-cso-core") (cd "$source_root" && cso_compile_bun scripts/cso-eval-producer.ts "$CSO_EVALUATION_UNIT/cso-eval-producer") cso_compile_watchdog "$CSO_EVALUATION_UNIT/gstack-cso-watchdog" diff --git a/scripts/lib/windows-curation.ts b/scripts/lib/windows-curation.ts index 8d153facf..36dae63ac 100644 --- a/scripts/lib/windows-curation.ts +++ b/scripts/lib/windows-curation.ts @@ -314,6 +314,7 @@ export const KNOWN_WINDOWS_SAFE: Array<{ file: string; reason: string }> = [ { file: 'test/ship-hook-windows-paths.test.ts', reason: 'runs bin/ helpers through explicit bash and Bun argv with forward-slash paths; never executes a shebang; the path-spelling simulation is skipIf win32' }, { file: 'test/gstack-wtree-windows-paths.test.ts', reason: '#3101: runs bin/gstack-wtree through explicit bash in an os.tmpdir linked worktree with forward-slash paths; never executes a shebang; the drive-letter simulation is skipIf win32' }, { file: 'test/setup-hook-syntax-gate.test.ts', reason: '#3088/#3100: runs bin/gstack-hook-check and the setup hook sections through explicit bash with forward-slash paths; never executes a shebang. Its Bun drive-path spelling is the Windows bug it guards' }, + { file: 'test/bun-config-shell-bins.test.ts', reason: '#3415: runs the record bins through lib/script-invocation.ts (Git Bash on Windows) with MSYS path conversion off, the case it guards; its bun and cygpath stand-ins and simulated-OSTYPE cases are skipIf win32' }, { file: 'test/path-spelling.test.ts', reason: 'sources bin/gstack-path-spelling.sh through explicit bash and checks lib/path-spelling.ts; on Windows it exercises the real Git Bash spellings' }, { file: 'test/state-root-parity.test.ts', reason: 'runs the bash twin and lib/state-root.ts over an env table with PATH empty; no shebang execution, raw-string comparison is platform-neutral' }, { file: 'test/generator-eexist.test.ts', diff --git a/setup b/setup index 10c0ae56c..50225c258 100755 --- a/setup +++ b/setup @@ -1,6 +1,7 @@ #!/usr/bin/env bash # gstack setup — build browser binary + register skills with Claude Code / Codex set -e +GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac umask 077 # Restrict new files to owner-only (0o600 files, 0o700 dirs) # Heredoc delivery guard. bash 5.2+ writes a heredoc body <=64KiB through a @@ -362,7 +363,7 @@ _runtime_root_refused() { # --claude-model is validated before anything is written, and persisted once # Claude is known to be selected (below, and in the --refresh-registered parent). if [ "$CLAUDE_MODEL_SET" -eq 1 ]; then - if ! _CLAUDE_MODEL_RESOLVED="$(cd "$SOURCE_GSTACK_DIR" && bun --no-env-file --config=/dev/null run scripts/models.ts claude-overlay "$CLAUDE_MODEL_ARG" 2>&1)"; then + if ! _CLAUDE_MODEL_RESOLVED="$(cd "$SOURCE_GSTACK_DIR" && bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" run scripts/models.ts claude-overlay "$CLAUDE_MODEL_ARG" 2>&1)"; then printf 'Error: --claude-model %s\n' "$_CLAUDE_MODEL_RESOLVED" | sed '2,$s/^/ /' >&2 echo " Nothing was installed or changed." >&2 exit 1 @@ -1317,7 +1318,7 @@ if [ "$LOCAL_INSTALL" -eq 0 ]; then _CODEX_PREFLIGHT_SELECTED=1 fi fi -bun --no-env-file --config=/dev/null "$SOURCE_GSTACK_DIR/scripts/preflight-codex-overlap.ts" \ +bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" "$SOURCE_GSTACK_DIR/scripts/preflight-codex-overlap.ts" \ --source "$SOURCE_GSTACK_DIR" --namespace "$CODEX_SKILLS" \ --selected "$_CODEX_PREFLIGHT_SELECTED" --local "$CODEX_REPO_LOCAL" \ --windows "$IS_WINDOWS" --relocation "$HOME/.gstack/repos/gstack" || exit 1 @@ -1584,7 +1585,7 @@ ensure_playwright_browser() { echo "gstack setup failed: Node.js is required on Windows" >&2 return 1 else - probe_cmd="bun --no-env-file --config=/dev/null --eval 'import { chromium } from \"playwright\"; const browser = await chromium.launch(); await browser.close();'" + probe_cmd="bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" --eval 'import { chromium } from \"playwright\"; const browser = await chromium.launch(); await browser.close();'" fi ( cd "$SOURCE_GSTACK_DIR" diff --git a/test/bun-config-shell-bins.test.ts b/test/bun-config-shell-bins.test.ts new file mode 100644 index 000000000..9eefc12eb --- /dev/null +++ b/test/bun-config-shell-bins.test.ts @@ -0,0 +1,204 @@ +/** + * #3415: gstack's shell bins start Bun with + * --config="${GSTACK_BUN_CONFIG:-/dev/null}", and each defines + * GSTACK_BUN_CONFIG as NUL when OSTYPE is msys or cygwin and cygpath is on PATH + * (Git Bash, MSYS2, Cygwin). Native bun.exe cannot + * open /dev/null (EINVAL), so a Windows bash with MSYS path conversion off + * (MSYS_NO_PATHCONV=1, MSYS2_ARG_CONV_EXCL=*) made the literal spelling fail: + * the record bins wrote nothing, and gstack-timeline-log still exited 0. + * + * On every platform the free lanes run, windows-latest included, the record + * bins run through lib/script-invocation.ts with conversion off in a hostile + * repository: each writes its record, and the repository's bunfig.toml preload + * and .env never load. On POSIX a simulated Windows bash (OSTYPE=msys, a + * cygpath, a bun that rejects /dev/null the way bun.exe does) reproduces the + * bug; its controls, without OSTYPE=msys, show each bin fails loudly with + * nothing written instead of exiting 0. An OSTYPE=msys inherited by a POSIX + * bash with no cygpath keeps /dev/null, so a file named NUL in the repository + * is never read as Bun's config. + */ +import { afterAll, beforeAll, describe, expect, test } from 'bun:test'; +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 { runScriptSync } from '../lib/script-invocation'; + +const ROOT = path.resolve(import.meta.dir, '..'); +const IS_WINDOWS = process.platform === 'win32'; + +let tmp = ''; +let repo = ''; +let stateRoot = ''; +let evilRoot = ''; +let preloadMarker = ''; +let fakeBun = ''; +let crashBun = ''; + +const BINS: Array<{ bin: string; input: string; log: string }> = [ + { bin: 'gstack-review-log', log: 'main-reviews.jsonl', input: JSON.stringify({ skill: 'plan-eng-review', timestamp: '2026-10-25T00:00:00Z', status: 'clean', unresolved: 0, critical_gaps: 0, issues_found: 0, mode: 'FULL_REVIEW', commit: 'abc1234' }) }, + { bin: 'gstack-question-log', log: 'question-log.jsonl', input: JSON.stringify({ skill: 'ship', question_id: 'ship-test-failure-triage', question_summary: 'Tests failed', options_count: 3, user_choice: 'fix-now', recommended: 'fix-now', session_id: 's1' }) }, + { bin: 'gstack-learnings-log', log: 'learnings.jsonl', input: JSON.stringify({ skill: 'review', type: 'pitfall', key: 'n-plus-one', insight: 'fixture insight', confidence: 8, source: 'observed' }) }, + { bin: 'gstack-timeline-log', log: 'timeline.jsonl', input: JSON.stringify({ skill: 'review', event: 'started', branch: 'main' }) }, +]; + +function env(pathPrefix?: string, extra: Record = {}): NodeJS.ProcessEnv { + const out: NodeJS.ProcessEnv = {}; + for (const [k, v] of Object.entries(process.env)) if (!/^(GSTACK_|MSYS|OSTYPE$)/.test(k)) out[k] = v; + const PATH = Object.keys(out).find(k => k.toUpperCase() === 'PATH') ?? 'PATH'; + if (pathPrefix) out[PATH] = pathPrefix + path.delimiter + (out[PATH] ?? ''); + return { ...out, HOME: path.join(tmp, 'home'), GSTACK_STATE_ROOT: stateRoot, MSYS_NO_PATHCONV: '1', MSYS2_ARG_CONV_EXCL: '*', ...extra }; +} + +function run(bin: string, input: string, pathPrefix?: string, extra: Record = {}, rest: string[] = []) { + return runScriptSync(path.join(ROOT, 'bin', bin), [input, ...rest], { cwd: repo, env: env(pathPrefix, extra), encoding: 'utf8', timeout: 60_000 }); +} + +function records(log: string): string[] { + const projects = path.join(stateRoot, 'projects'); + if (!fs.existsSync(projects)) return []; + return fs.readdirSync(projects).flatMap(slug => { + const file = path.join(projects, slug, log); + return fs.existsSync(file) ? fs.readFileSync(file, 'utf8').split('\n').filter(Boolean) : []; + }); +} + +function resetState(): void { + fs.rmSync(stateRoot, { recursive: true, force: true }); + fs.rmSync(preloadMarker, { force: true }); + fs.mkdirSync(stateRoot, { recursive: true }); +} + +function writeExec(file: string, text: string): void { + fs.writeFileSync(file, text); + fs.chmodSync(file, 0o755); +} + +beforeAll(() => { + tmp = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), 'gstack-bunconfig-'))); + repo = path.join(tmp, 'repo'); + stateRoot = path.join(tmp, 'state'); + evilRoot = path.join(tmp, 'evil'); + preloadMarker = path.join(tmp, 'preload-ran'); + for (const d of [repo, stateRoot, path.join(tmp, 'home')]) fs.mkdirSync(d, { recursive: true }); + for (const args of [['init', '-q', '-b', 'main'], ['-c', 'user.email=t@example.com', '-c', 'user.name=t', 'commit', '-q', '--allow-empty', '-m', 'init']]) { + expect(spawnSync('git', args, { cwd: repo, timeout: 30_000 }).status).toBe(0); + } + fs.writeFileSync(path.join(repo, '.env'), `GSTACK_STATE_ROOT=${evilRoot}\nGSTACK_HOME=${evilRoot}\n`); + fs.writeFileSync(path.join(repo, 'preload.ts'), `require('fs').writeFileSync(${JSON.stringify(preloadMarker)}, 'ran');\n`); + fs.writeFileSync(path.join(repo, 'bunfig.toml'), 'preload = ["./preload.ts"]\n'); + if (IS_WINDOWS) return; + fakeBun = path.join(tmp, 'fake-bun'); + fs.mkdirSync(fakeBun); + writeExec(path.join(fakeBun, 'bun'), [ + '#!/usr/bin/env bash', + 'a=()', + 'for x in "$@"; do', + ' case "$x" in', + ' --config=/dev/null) echo "EINVAL: Invalid argument (open())" >&2; echo "while reading config \\"/dev/null\\"" >&2; exit 1 ;;', + ' --config=NUL) a+=(--config=/dev/null) ;;', + ' *) a+=("$x") ;;', + ' esac', + 'done', + `exec ${JSON.stringify(process.execPath)} "\${a[@]}"`, + '', + ].join('\n')); + crashBun = path.join(tmp, 'crash-bun'); + fs.mkdirSync(crashBun); + writeExec(path.join(crashBun, 'bun'), '#!/usr/bin/env bash\nexit 3\n'); + writeExec(path.join(fakeBun, 'cygpath'), '#!/usr/bin/env bash\nprintf \'%s\\n\' "${@: -1}"\n'); +}); + +afterAll(() => { if (tmp) fs.rmSync(tmp, { recursive: true, force: true }); }); + +describe('#3415: record bins start Bun on a Windows bash with path conversion off', () => { + test('fixture control: a plain bun in the repository runs its bunfig preload', () => { + const r = spawnSync(process.execPath, ['-e', '0'], { cwd: repo, encoding: 'utf8', timeout: 60_000 }); + expect(r.status).toBe(0); + expect(fs.existsSync(preloadMarker)).toBe(true); + fs.rmSync(preloadMarker); + }); + + for (const { bin, input, log } of BINS) { + test(`${bin} writes its record and ignores the repository bunfig.toml and .env`, () => { + resetState(); + const r = run(bin, input); + expect(r.stderr).not.toContain('EINVAL'); + expect(r.status).toBe(0); + expect(records(log).length).toBe(1); + expect(fs.existsSync(preloadMarker)).toBe(false); + expect(fs.existsSync(evilRoot)).toBe(false); + }); + } + + test('gstack-timeline-log still skips invalid input silently with exit 0', () => { + resetState(); + for (const bad of ['not json', '{"skill":"review"}', 'null']) { + const r = run('gstack-timeline-log', bad); + expect(r.status).toBe(0); + expect(r.stderr).toBe(''); + } + expect(records('timeline.jsonl')).toEqual([]); + }); +}); + +describe.skipIf(IS_WINDOWS)('#3415: simulated Windows bash (POSIX hosts)', () => { + test('gstack-developer-profile --log-session reports a Bun failure instead of skipping it, and still skips invalid input silently', () => { + resetState(); + const session = JSON.stringify({ date: '2026-10-25', mode: 'startup' }); + const failed = run('gstack-developer-profile', '--log-session', fakeBun, {}, [session]); + expect(failed.stderr).toContain('EINVAL'); + expect(failed.stderr).toContain('nothing was logged'); + expect(failed.status).not.toBe(0); + for (const bad of ['not json', '{"date":"2026-10-25"}', 'null']) { + const r = run('gstack-developer-profile', '--log-session', undefined, {}, [bad]); + expect(r.status).toBe(0); + expect(r.stderr).toBe(''); + } + }); + + test('a Bun that dies with exit 3 (how a Bun crash exits on Windows) is reported, never read as invalid input', () => { + resetState(); + const timeline = run('gstack-timeline-log', JSON.stringify({ skill: 'review', event: 'started' }), crashBun); + expect(timeline.status).not.toBe(0); + expect(timeline.stderr).toContain('bun exited 3'); + expect(records('timeline.jsonl')).toEqual([]); + const profile = run('gstack-developer-profile', '--log-session', crashBun, {}, [JSON.stringify({ date: '2026-10-25', mode: 'startup' })]); + expect(profile.status).not.toBe(0); + expect(profile.stderr).toContain('bun exited 3'); + }); + + for (const { bin, input, log } of BINS) { + test(`${bin} passes NUL and writes its record`, () => { + resetState(); + const r = run(bin, input, fakeBun, { OSTYPE: 'msys' }); + expect(r.stderr).not.toContain('EINVAL'); + expect(r.status).toBe(0); + expect(records(log).length).toBe(1); + expect(fs.existsSync(preloadMarker)).toBe(false); + }); + + test(`an inherited OSTYPE=msys without cygpath keeps /dev/null: ${bin} never reads a repository file named NUL`, () => { + resetState(); + const nul = path.join(repo, 'NUL'); + fs.writeFileSync(nul, 'preload = ["./preload.ts"]\n'); + try { + const r = run(bin, input, undefined, { OSTYPE: 'msys' }); + expect(r.status).toBe(0); + expect(records(log).length).toBe(1); + expect(fs.existsSync(preloadMarker)).toBe(false); + } finally { + fs.rmSync(nul, { force: true }); + fs.rmSync(preloadMarker, { force: true }); + } + }); + + test(`control: when Bun rejects the config, ${bin} fails loudly and writes nothing`, () => { + resetState(); + const r = run(bin, input, fakeBun); + expect(r.stderr).toContain('EINVAL'); + expect(r.status).not.toBe(0); + expect(records(log)).toEqual([]); + }); + } +}); diff --git a/test/bun-entry-isolation.test.ts b/test/bun-entry-isolation.test.ts index 71b0eb338..5b53d30e9 100644 --- a/test/bun-entry-isolation.test.ts +++ b/test/bun-entry-isolation.test.ts @@ -6,9 +6,11 @@ * kinds are held to the isolated form: * 1. bun shebangs: exactly ISOLATED_SHEBANG (`bun run ` ignores the * shebang, so callers carry the flags too); - * 2. shell callers in shipped shell files, skill templates, generated skill - * docs and resolvers: `bun --no-env-file --config=/dev/null` before - * `run`, `-e`/`-p` or a script path; + * 2. shell callers: skill templates, generated skill docs and resolvers + * spell `bun --no-env-file --config=/dev/null` before `run`, `-e`/`-p` + * or a script path; shipped shell files spell SHELL_FLAGS after + * CONFIG_DEF, so a Windows bash with MSYS path conversion off passes + * NUL instead of a /dev/null native Bun cannot open (#3415); * 3. TypeScript spawns of a Bun: bunIsolationArgs() (or browse's * bunChildFlags()) in the argument list; * 4. scriptInvocation, which launches gstack's own bun bins; @@ -27,6 +29,8 @@ import { emptyBunConfig as browseEmptyBunConfig } from '../browse/src/bun-child- const ROOT = path.resolve(import.meta.dir, '..'); const FLAGS = '--no-env-file --config=/dev/null'; const ISOLATED_SHEBANG = `#!/usr/bin/env -S bun ${FLAGS}`; +const SHELL_FLAGS = '--no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}"'; +const CONFIG_DEF = 'GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac'; const TRACKED = spawnSync('git', ['ls-files', '-z'], { cwd: ROOT, encoding: 'utf8', timeout: 30_000 }).stdout.split('\0').filter(Boolean) .filter(f => !/(^|\/)test\//.test(f) && fs.existsSync(path.join(ROOT, f)) && fs.statSync(path.join(ROOT, f)).isFile()); @@ -43,7 +47,7 @@ const BUN_WORD = /(^|[\s;&|({`"']|\$\()(bun|"\$\{?BUN(?:_[A-Z]+)?\}?"|\$\{?BUN(? /** Whether the text after a `bun` word starts a program: -e/-p, a script path, `run ` or a bin path. A package script (`bun run build`) is not one. */ function runsCode(rest: string): boolean { - const r = rest.replace(/^\s+/, '').replace(/^(?:--(?:no-env-file|cwd[= ]\S+)\s+)*/, ''); + const r = rest.replace(/^\s+/, '').replace(/^(?:--(?:no-env-file|cwd[= ]\S+|config(?:=\S*|\s+\S+))\s+)*/, ''); return /^(?:run\s+)?(?:-e|-p|--eval|--print)(?:\s|=|$)/.test(r) || /^(?:run\s+)?["']?[^\s"'|;&)]*\.(?:ts|js|mjs|cjs|tsx)(?:["'\s)|;&\\`]|$)/.test(r) || /^run\s+["']?\$\{?[A-Za-z_]/.test(r) @@ -51,14 +55,14 @@ function runsCode(rest: string): boolean { } /** Bun invocations on one shell line that start a program without the isolation flags. */ -function unisolatedBunCalls(line: string): string[] { +function unisolatedBunCalls(line: string, flags = FLAGS): string[] { if (/^\s*(#|\/\/|\*)/.test(line)) return []; const out: string[] = []; for (const m of line.matchAll(BUN_WORD)) { const at = m.index! + m[1]!.length; if (/\bln\s+-\w+\s+$/.test(line.slice(0, at))) continue; const rest = line.slice(at + m[2]!.length); - if (!rest.startsWith(` ${FLAGS}`) && runsCode(rest)) out.push(line.slice(at, at + 80)); + if (!rest.startsWith(` ${flags}`) && runsCode(rest)) out.push(line.slice(at, at + 80)); } return out; } @@ -69,6 +73,26 @@ const SHELL_EXEMPT: Record = { 'skillify/SKILL.md': 'generated from skillify/SKILL.md.tmpl', }; +/** Run only on Linux (the Ubicloud VM or its Linux-only local fallback), where /dev/null is the spelling; remote command strings expand there. */ +const SHELL_LINUX_ONLY = (f: string) => f.startsWith('scripts/ubicloud/'); + +/** Lines of shell text that use GSTACK_BUN_CONFIG with no CONFIG_DEF line before them, or define it any other way. A `local` definition covers only the rest of its function. */ +function configDefinitionGaps(text: string): string[] { + const gaps: string[] = []; + let defined = false; + let definedInFunction = false; + text.split('\n').forEach((line, i) => { + if (/^\s*(?:local\s+)?GSTACK_BUN_CONFIG=/.test(line)) { + const local = /^\s*local\s/.test(line); + if (line.trim().replace(/^local\s+/, '') !== CONFIG_DEF) gaps.push(`${i + 1}: redefined: ${line.trim()}`); + else if (local) definedInFunction = true; + else defined = true; + } else if (/^}/.test(line)) definedInFunction = false; + else if (!defined && !definedInFunction && line.includes('${GSTACK_BUN_CONFIG')) gaps.push(`${i + 1}: used before CONFIG_DEF`); + }); + return gaps; +} + const isShell = (f: string) => f.endsWith('.sh') || /^#!.*\b(?:ba|z)?sh\b/.test(firstLine(f)); const isSkillSource = (f: string) => f.endsWith('.tmpl') || /^scripts\/resolvers\/.+\.ts$/.test(f) || /(^|\/)SKILL\.md$/.test(f) || /\/sections\/[^/]+\.md$/.test(f); @@ -116,13 +140,41 @@ describe('GSTA-56: gstack never takes configuration from the audited repository' ]) expect(unisolatedBunCalls(ok)).toEqual([]); }); + test('in shipped shell files the detector requires the Windows-safe, fail-closed config spelling (#3415)', () => { + for (const bad of [ + `printf x | bun ${FLAGS} -e "console.log(1)"`, + 'bun --no-env-file --config="$GSTACK_BUN_CONFIG" -e 1', + 'bun --no-env-file --config= -e 1', + 'bun --no-env-file --config=NUL run "$X/bin/gstack-design-detect.ts"', + ]) expect(unisolatedBunCalls(bad, SHELL_FLAGS)).not.toEqual([]); + for (const ok of [ + `printf x | bun ${SHELL_FLAGS} -e "console.log(1)"`, + `exec bun ${SHELL_FLAGS} "$HERE/question-log-hook.ts"`, + `probe_cmd="bun ${SHELL_FLAGS} --eval 'import x from \\"y\\"'"`, + ]) expect(unisolatedBunCalls(ok, SHELL_FLAGS)).toEqual([]); + }); + + test('the config-definition check flags a missing, late or altered GSTACK_BUN_CONFIG definition', () => { + const use = `bun ${SHELL_FLAGS} -e 1`; + expect(configDefinitionGaps(`#!/usr/bin/env bash\n${CONFIG_DEF}\n${use}\n`)).toEqual([]); + expect(configDefinitionGaps(`f() {\n local ${CONFIG_DEF}\n ${use}\n}\n`)).toEqual([]); + expect(configDefinitionGaps(`f() {\n local ${CONFIG_DEF}\n}\ng() {\n ${use}\n}\n`)).toEqual(['5: used before CONFIG_DEF']); + expect(configDefinitionGaps(`#!/usr/bin/env bash\n${use}\n`)).toEqual(['2: used before CONFIG_DEF']); + expect(configDefinitionGaps(`${use}\n${CONFIG_DEF}\n`)).toEqual(['1: used before CONFIG_DEF']); + expect(configDefinitionGaps(`GSTACK_BUN_CONFIG=./bunfig.toml\n${use}\n`)).toEqual(['1: redefined: GSTACK_BUN_CONFIG=./bunfig.toml', '2: used before CONFIG_DEF']); + expect(configDefinitionGaps(`${CONFIG_DEF}\nGSTACK_BUN_CONFIG=\n${use}\n`)).toEqual(['2: redefined: GSTACK_BUN_CONFIG=']); + }); + test('shell callers, skill templates, generated skill docs and resolvers pass the isolation flags', () => { const offenders: string[] = []; for (const f of TRACKED) { if (f.startsWith('.github/') || SHELL_EXEMPT[f] || !(isSkillSource(f) || isShell(f))) continue; - fs.readFileSync(path.join(ROOT, f), 'utf8').split('\n').forEach((line, i) => { - for (const call of unisolatedBunCalls(line)) offenders.push(`${f}:${i + 1}: ${call}`); + const flags = isSkillSource(f) || SHELL_LINUX_ONLY(f) ? FLAGS : SHELL_FLAGS; + const text = fs.readFileSync(path.join(ROOT, f), 'utf8'); + text.split('\n').forEach((line, i) => { + for (const call of unisolatedBunCalls(line, flags)) offenders.push(`${f}:${i + 1}: ${call}`); }); + if (flags === SHELL_FLAGS) for (const gap of configDefinitionGaps(text)) offenders.push(`${f}:${gap}`); } expect(offenders).toEqual([]); }); diff --git a/test/bun-isolation-launch.test.ts b/test/bun-isolation-launch.test.ts index eba3d4862..d56a943bf 100644 --- a/test/bun-isolation-launch.test.ts +++ b/test/bun-isolation-launch.test.ts @@ -5,6 +5,9 @@ * --config=nul for the native bun.exe, which Bun 1.4.2 reads as an empty * config; a native Windows spawn has no /dev/null, so TypeScript callers use * bunIsolationArgs() (lib/bun-isolation.ts) instead of spelling the flag. + * With conversion off (MSYS_NO_PATHCONV=1) bun.exe gets /dev/null itself and + * fails with EINVAL, so gstack's shell files resolve GSTACK_BUN_CONFIG to NUL + * there (#3415). */ import { afterAll, beforeAll, describe, expect, test } from 'bun:test'; import { spawnSync } from 'node:child_process'; @@ -15,6 +18,8 @@ import { bunIsolationArgs } from '../lib/bun-isolation'; import { bashCommandInvocation } from '../lib/script-invocation'; const PRINT = 'console.log("env=" + (process.env.GSTACK_LAUNCH_PROBE ?? "unset"))'; +const CONFIG_DEF = 'GSTACK_BUN_CONFIG=/dev/null; case "${OSTYPE:-}" in msys*|cygwin*) if command -v cygpath >/dev/null 2>&1; then GSTACK_BUN_CONFIG=NUL; fi ;; esac'; +const NO_PATHCONV = { MSYS_NO_PATHCONV: '1', MSYS2_ARG_CONV_EXCL: '*' }; let project = ''; let preloadMarker = ''; @@ -61,6 +66,18 @@ describe('GSTA-56: isolated Bun launches on this platform', () => { expectIsolated(bash('bun --no-env-file --config=/dev/null run probe.ts')); }); + test('a shipped shell file spelling, with MSYS path conversion off', () => { + expectIsolated(bash(`${CONFIG_DEF}; bun --no-env-file --config="\${GSTACK_BUN_CONFIG:-/dev/null}" -e '${PRINT}'`, NO_PATHCONV)); + expectIsolated(bash(`${CONFIG_DEF}; bun --no-env-file --config="\${GSTACK_BUN_CONFIG:-/dev/null}" run probe.ts`, NO_PATHCONV)); + }); + + test.if(process.platform === 'win32')('control: with MSYS path conversion off, bun.exe cannot open --config=/dev/null', () => { + const r = bash(`bun --no-env-file --config=/dev/null -e '${PRINT}'`, NO_PATHCONV); + expect(r.status).not.toBe(0); + expect(r.stderr).toContain('EINVAL'); + expect(fs.existsSync(preloadMarker)).toBe(false); + }); + test('a TypeScript spawn with bunIsolationArgs()', () => { expectIsolated(spawnSync(process.execPath, [...bunIsolationArgs(), 'probe.ts'], { cwd: project, encoding: 'utf8', timeout: 60_000 })); }); diff --git a/test/learnings-injection.test.ts b/test/learnings-injection.test.ts index df387f248..89515fe79 100644 --- a/test/learnings-injection.test.ts +++ b/test/learnings-injection.test.ts @@ -6,10 +6,15 @@ const SCRIPT = path.join(import.meta.dir, "..", "bin", "gstack-learnings-search" describe("gstack-learnings-search injection prevention", () => { const script = readFileSync(SCRIPT, "utf-8"); + const bunBlockAt = script.indexOf('bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e "'); + + test("the bun -e block the checks below read is present", () => { + expect(bunBlockAt).toBeGreaterThanOrEqual(0); + }); test("no shell interpolation inside bun -e string", () => { // Extract the bun -e block (everything between `bun -e "` and the closing `"`) - const bunBlock = script.slice(script.indexOf('bun --no-env-file --config=/dev/null -e "')); + const bunBlock = script.slice(bunBlockAt); // Should NOT contain ${VAR} patterns (shell interpolation) // These are RCE vectors: a malicious learnings entry with '; rm -rf / ;' in the @@ -27,7 +32,7 @@ describe("gstack-learnings-search injection prevention", () => { }); test("uses process.env for all user-controlled values", () => { - const bunBlock = script.slice(script.indexOf('bun --no-env-file --config=/dev/null -e "')); + const bunBlock = script.slice(bunBlockAt); // Must use process.env for TYPE, QUERY, LIMIT. // SLUG and CROSS are no longer threaded as env vars inside the bun @@ -52,7 +57,7 @@ describe("gstack-learnings-search injection prevention", () => { }); test("current vs cross-project rows distinguished by inline tags, not SLUG env (#1619)", () => { - const bunBlock = script.slice(script.indexOf('bun --no-env-file --config=/dev/null -e "')); + const bunBlock = script.slice(bunBlockAt); // The bun block must inspect the per-line tag to mark cross-project rows. // The current shape emits `current\t` or `cross\t` from the // upstream pipe (via emit_tagged_file). Inside the bun block, the script diff --git a/test/plan-mode-preamble-render.test.ts b/test/plan-mode-preamble-render.test.ts index 78a476c0f..24bedde3f 100644 --- a/test/plan-mode-preamble-render.test.ts +++ b/test/plan-mode-preamble-render.test.ts @@ -16,7 +16,7 @@ import * as path from 'path'; const ROOT = path.resolve(import.meta.dir, '..'); const PLAN_ARG = '${_PLAN_MODE_ARG:+"$_PLAN_MODE_ARG"}'; -const GENERATOR = /(?:\bbun(?: --no-env-file --config=\/dev\/null)?|\bbun_cmd|_gstack_render_bun) run (?:gen:skill-docs(?::user)?|scripts\/gen-skill-docs\.ts) --[a-z]/; +const GENERATOR = /(?:\bbun(?: --no-env-file --config=(?:\/dev\/null|"\$\{GSTACK_BUN_CONFIG:-\/dev\/null\}"))?|\bbun_cmd|_gstack_render_bun) run (?:gen:skill-docs(?::user)?|scripts\/gen-skill-docs\.ts) --[a-z]/; const CONFIG_READ = '[ "$("$GSTACK_CONFIG" get plan_mode_preamble 2>/dev/null || true)" != off ] || _PLAN_MODE_ARG="--plan-mode=off"'; /** Generator invocations in a file: not comments, and not echoed or logged instructions. */ diff --git a/test/setup-hook-canonical-paths.test.ts b/test/setup-hook-canonical-paths.test.ts index 8d238185c..0dc955da9 100644 --- a/test/setup-hook-canonical-paths.test.ts +++ b/test/setup-hook-canonical-paths.test.ts @@ -210,8 +210,8 @@ describe('setup: heal-first ordering + visibility', () => { describe('gstack-settings-hook: shared prelude (dedupe key == prune predicate)', () => { test('every bun script call site uses the shared JS prelude concatenation', () => { const codeLines = hookBinSrc.split('\n').filter((l) => !l.trim().startsWith('#')); - const bunCalls = codeLines.filter((l) => l.includes('bun --no-env-file --config=/dev/null -e ')); - const preludeCalls = codeLines.filter((l) => l.includes(`bun --no-env-file --config=/dev/null -e "$_HOOK_JS_PRELUDE"'`)); + const bunCalls = codeLines.filter((l) => l.includes('bun --no-env-file --config="${GSTACK_BUN_CONFIG:-/dev/null}" -e ')); + const preludeCalls = codeLines.filter((l) => l.includes(`bun --no-env-file --config="\${GSTACK_BUN_CONFIG:-/dev/null}" -e "$_HOOK_JS_PRELUDE"'`)); expect(bunCalls.length).toBeGreaterThanOrEqual(6); expect(preludeCalls.length).toBe(bunCalls.length); }); From e622075a18e7490101e7f61ee65a1772fcf2fbfe Mon Sep 17 00:00:00 2001 From: Garry Tan Date: Sun, 25 Oct 2026 21:46:42 -0700 Subject: [PATCH 7/9] v1.91.228.0 fix(gstack-lease): take the lease lock with mkdir, not ln -s, so Git Bash on Windows stops waiting out 300 tries (#3330) (#3424) * fix(gstack-lease): take the lease lock with mkdir, not ln -s, so Git Bash on Windows stops waiting out 300 tries (#3330) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(gstack-lease): count lock retries instead of timing them Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(lease): a dead lock that cannot be renamed aside no longer spins lock() break_lock ignored drop()'s failure and returned 0, so lock() continued past the tries limit forever when a dead holder's .lock could not be renamed aside (a Windows file in use). It now removes the lock in place under .lock.break, and returns 1 when that also fails so the try is counted. touch no longer calls a dead holder 'live' in its exit-3 message. Adds the /ship coverage-audit tests for the lock's failure paths. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(lease): pre-landing review fixes - drop() reports a lock released once it is renamed aside, so a failed delete of the renamed copy never makes unlock or break_lock rm -rf a new taker's lock at .lock. - An ownerless lock is broken only once it is 2 s old, so a live taker whose claim landed after a breaker read the claims keeps the lock it is about to publish. An empty owner, an invalid pid or a stray file counts as ownerless. - touch's prune stays out of the lock (top-level lease files only) and clears leftover renamed-aside locks; a failed claim write leaves no claim. - Docs and CHANGELOG state the mixed-version and dead-break-lock limits instead of claiming exclusion that does not hold. Tests pin each fix (each fails against the previous bin), make the exclusion case wait on a release file, prove the parallel case is mutually exclusive, and check the Git Bash holder keeps its lock. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(lease): second /ship review pass - orphaned() reads the clock before the lock's mtime and requires the mtime unchanged at the end, so a lock made meanwhile is never removed; an mtime a minute or more ahead (clock skew) counts as old. - Claims older than 2 minutes are abandoned and pruned by touch. - A waiter skips the claim and mkdir while the lock is visibly held; the wait is bounded at 300 tries or 30 s; a non-numeric tries value falls back to 300; ten quick retries (not three) before a lock nobody holds is reported as untakeable; pid 1 is a valid holder again. - Tests: deterministic young-lock clock, skew and non-numeric owner shapes, abandoned claims, the deadline, explicit 30 s timeouts. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(lease): third /ship review pass - A claim is honored while its claimant lives; only a claim with no start identity expires after 2 minutes, so a stalled live taker keeps its lock on hosts that record identities (the remaining case is a documented limit). - A late taker never overwrites an owner already in its directory, and does not remove a directory that has one. - A lock whose owner file exists but cannot be read is never ownerless. - Zero-padded owner pids count as dead; --help prints the whole usage; touch prunes only claims whose claimant is gone or recorded no identity. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(lease): scope 'never by age' to locks that name a holder 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> --- CHANGELOG.md | 19 ++ VERSION | 2 +- agents-digest/gstack-AGENTS.md | 2 +- bin/gstack-lease | 172 ++++++++++--- docs/capy-install.md | 33 ++- package.json | 2 +- test/gstack-lease-git-bash.test.ts | 94 +++++++ test/gstack-lease.test.ts | 399 +++++++++++++++++++++++++++-- 8 files changed, 662 insertions(+), 61 deletions(-) create mode 100644 test/gstack-lease-git-bash.test.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 8353ed224..d01ec79b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [1.91.228.0] - 2026-10-26 + +**Skills start at once on Windows again: the workflow lease lock no longer depends on symlinks (#3330).** `bin/gstack-lease` took its lock with `ln -s "" .lock`. In Git for Windows' default symlink mode (`MSYS` unset), `ln -s` cannot link to a target that does not exist, so the lock was never taken. Every skill start then waited out all 300 tries (0.1 s apart, plus process start costs) before `gstack-skill-start` printed anything, and still wrote no lease. One report measured 499 s per skill start. The error also blamed a "live process" with an empty pid. + +### Fixed +- **`bin/gstack-lease`**: the lock is now a `.lock` directory taken with `mkdir`, which is atomic on every host gstack runs on, with an `owner` file naming the holder's pid and start identity. A taker writes a claim (`.lock.claim.`) before its `mkdir` and renames it in as the owner after, so a lock left ownerless by a taker killed between the two steps is broken once no claimant lives and the lock is at least 2 s old and unchanged while it was checked (a live taker between its two steps is never mistaken for a crash, and a new lock made meanwhile is never removed). A claim that records no start identity (Git Bash has none) is abandoned after 2 minutes, so a reused pid cannot keep an orphan forever. An owner that names no valid pid (0, zero-padded or not a number) counts as a dead holder, an owner file that exists but cannot be read keeps the lock, and an empty owner, a stray file at `.lock`, or an ownerless lock whose mtime is a minute or more in the future (clock skew) counts as ownerless instead of wedging every skill start. A lock is removed by renaming it aside first, so nobody sees it half-removed; once renamed it is released even if the renamed copy cannot be deleted, and `touch` prunes leftover copies and claims over 2 minutes old whose claimant is gone or recorded no identity. A late taker never overwrites an owner already in the lock it made. A waiter no longer writes a claim or runs `mkdir` while the lock is visibly held, and a live holder that never lets go bounds the wait at 300 tries or 30 s, whichever comes first (a non-numeric `GSTACK_LEASE_LOCK_TRIES` falls back to 300 instead of looping forever). Stale-holder semantics are unchanged: a lock is broken only when its holder is dead or its pid now belongs to another process, breakers still serialize on `.lock.break` and reread before removing, and unlock removes only the caller's own lock. A symlink `.lock` left by an older gstack is still read and broken the same way, and it excludes the new lock at the same path. The reverse does not hold: an older gstack's `ln -s` onto the directory lock links inside it, so a process that started before an upgrade of the same checkout can briefly share the lock (documented as a known limit, with a taker stalled over 2 minutes mid-take on a host without start identities). +- A dead holder's lock that cannot be renamed aside (a Windows file in use) is removed in place under `.lock.break`, and when that fails too the try is counted, so `touch` ends with exit 3 instead of spinning without sleeping. The message no longer calls a dead holder live. +- The 120-minute prune in `touch` no longer reaches into the lock: it removed the `owner` file of a holder that resumed past the window, which then left its own lock behind. +- When the lock cannot be taken although nobody holds it, `touch` now fails after ten quick retries with `gstack-lease: cannot take the lease directory lock ` instead of waiting out every try and naming an empty pid. `gstack-skill-start` stays fail-open, as before. +- `docs/capy-install.md` describes the directory lock. + +### Tests +- `test/gstack-lease-git-bash.test.ts` (new, in the curated windows-free-tests lane, launched through `lib/script-invocation.ts`, so Git Bash on `windows-latest`): `touch` with the default 300 tries takes the lock on its first try (no sleep between tries), writes its lease and leaves no lock. On `windows-latest` the old bin fails this case; a host whose `ln -s` fails like Git Bash's still takes the lock (with a control that the shim really fails `ln -s`); a lock held by a live Git Bash process is kept and named, and a dead holder's lock is broken. The last two fail against the old bin. +- `test/gstack-lease.test.ts`: the dead-holder, live-holder and dead-breaker cases run against both the directory lock and the legacy symlink lock. The race cases inject at `mkdir` instead of `ln`. New cases: a lock held by a running gstack-lease excludes a second taker, which names it; 16 parallel touches all land and leave nothing behind; an ownerless lock is kept while a claimant lives and broken once none does; a lock that cannot be taken while nobody holds it fails without sleeping between tries. Seven of these fail against the old bin. +- From /ship's coverage audit and review: the 16 parallel touches now also prove no two are inside the lock at once (a mutant whose `mkdir` always succeeds fails it); the exclusion case holds the lock until the test releases it instead of for a 3 s sleep; a young ownerless lock is kept and malformed locks (empty owner, pid 0 or 00, a non-numeric owner, a stray file, an mtime an hour ahead) are broken; an identity-less claim older than 2 minutes neither keeps an ownerless lock nor survives `touch` while an old claim with a live identity is honored; an unreadable owner file keeps the lock; `--help` prints the whole usage again; leftover renamed-aside copies are pruned; a live holder bounds `touch` by the 30 s deadline with the default and with a non-numeric tries value, without one `mkdir` on the held lock; the prune keeps a resumed holder's lock; a renamed-aside lock that cannot be deleted never takes a new taker's lock with it; a dead holder's lock that cannot be renamed aside ends `touch` instead of spinning. Each case that pins a fix fails against the bin before that fix. Also covered: a live or ownerless `.lock.break`, a failed owner rename, a lock released between a failed take and its check, and unlock's fallback. The Git Bash case now also checks that the live holder still owns the lock after a blocked `touch`. + +### Gate integrity +- No threshold, budget, timeout, trial count, case kind or assertion was weakened. Three existing race tests moved their fault injection from `ln` to `mkdir`, because the lock no longer calls `ln`. Their assertions are unchanged. Under /ship review, the exclusion case's wait for the holder's owner file rose from 2 s to 10 s and its fixed 3 s hold became a release file (no assertion changed), the ownerless-lock cases backdate their planted lock by a minute because an ownerless lock is now broken only once 2 s old (their assertions are unchanged; the new young-lock case pins the guard), and the exclusion and parallel cases got an explicit 30 s test timeout instead of Bun's 5 s default. + ## [1.91.227.0] - 2026-10-26 **Windows: gstack's record bins stop losing review, question, learning and timeline records when Git Bash path conversion is off (#3415).** Since GSTA-56 every shell bin started Bun with `--config=/dev/null`. Native `bun.exe` cannot open `/dev/null`: it exits 1 with `EINVAL` on Bun 1.3.10, 1.4.2 and 1.4.4 (measured on windows-latest). Git Bash hides this by rewriting the argument to `nul`, but only while MSYS path conversion is on. With it off (`MSYS_NO_PATHCONV` set to any value, even empty; `MSYS2_ARG_CONV_EXCL=*`; or Cygwin), `gstack-review-log`, `gstack-question-log` and `gstack-learnings-log` exited 1 with nothing written, and `gstack-timeline-log` exited 0 with nothing written. diff --git a/VERSION b/VERSION index 0831dfe12..7d734b27e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.91.227.0 +1.91.228.0 diff --git a/agents-digest/gstack-AGENTS.md b/agents-digest/gstack-AGENTS.md index 073efdb52..b4e5fdadb 100644 --- a/agents-digest/gstack-AGENTS.md +++ b/agents-digest/gstack-AGENTS.md @@ -1,4 +1,4 @@ -# gstack digest v1.91.227.0 — regenerate/re-copy after upgrading gstack +# gstack digest v1.91.228.0 — regenerate/re-copy after upgrading gstack Behavioral rules from gstack (https://github.com/garrytan/gstack), compressed for agent hosts without a full skill install. The full skills add workflows, diff --git a/bin/gstack-lease b/bin/gstack-lease index ded79313e..2073af92d 100755 --- a/bin/gstack-lease +++ b/bin/gstack-lease @@ -14,7 +14,8 @@ # (bin/gstack-harness-pid.sh, the same derivation the session marker # uses), or behind --from (a caller whose own parent is short-lived # passes its parent pid); leases older than 120 min are pruned. Exits 3 -# and writes nothing when a live process holds the directory lock +# and writes nothing when a live process holds the directory lock or +# the lock cannot be taken # gstack-lease live [--root ] [--exclude-ancestry-of ] # print ` m ` per lease held by a live process that # is neither the given pid nor one of its ancestors (the caller's own @@ -31,7 +32,7 @@ # runtime root's .source-path, else ../). A root that is not a git checkout # exits 2 and writes nothing. GSTACK_LEASE_DIR overrides the lease directory # (hermetic tests; a dev checkout's own tests must not lease it). Bash 3.2 -# plus git, ps, find, ln, readlink. +# plus git, ps, find, stat, date, head, mkdir, mv, readlink. set -u BIN="$(cd "$(dirname "$0")" && pwd -P)" # shellcheck source=bin/gstack-install-verdict.sh @@ -53,7 +54,7 @@ while [ $# -gt 0 ]; do done case "$VERB" in touch|live|list) ;; - -h|--help|'') sed -n '2,24p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;; + -h|--help|'') sed -n '2,25p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;; *) echo "gstack-lease: unknown verb '$VERB'" >&2; exit 2 ;; esac [ -n "$ROOT" ] || ROOT=$(gstack_source_root "$BIN") @@ -99,43 +100,139 @@ state() { } # The lease directory's lock: touch's publish and prune, and reclaim's # reread-and-delete, run under it, so a reclaim never deletes a renewal and a -# lease never disappears while it is live. The lock is a symlink whose target -# names its holder (` `): ln -s creates it and its owner -# in one atomic step. It is broken only when that holder is dead or its pid -# now belongs to another process, never by age, and unlock removes only the -# caller's own lock. A live holder makes lock() give up after -# GSTACK_LEASE_LOCK_TRIES tries 0.1 s apart (default 300). +# lease never disappears while it is live. The lock is a directory, .lock, +# whose owner file names its holder (` `); mkdir is +# atomic everywhere gstack runs, Git Bash on Windows included, where ln -s to a +# target that does not exist always fails (#3330). A taker publishes its token +# as a claim (.lock.claim.) before its mkdir and renames the claim into +# the lock as its owner after, so a lock without an owner is either being +# taken by a live claimant or orphaned by a dead one. A lock is broken only +# when its holder is dead or its pid now belongs to another process, never by +# age, and unlock removes only the caller's own lock. An ownerless lock is +# broken once no claimant lives and it is at least 2 s old (and unchanged +# while it was checked), so a taker between its mkdir and its owner rename is +# never taken for a crash, even when its claim landed after the claims were +# read. A claim is honored while its claimant lives; one that records no +# start identity (so a reused pid cannot be told apart) is abandoned after 2 +# minutes, since a live taker holds one for milliseconds. Known limit: on such +# a host a taker stalled over 2 minutes between its mkdir and its owner rename +# can be broken and then publish into its successor's lock. An owner whose +# pid is 0, zero-padded or not a number counts as a dead holder, and a lock +# whose owner file exists but cannot be read is never treated as ownerless. A symlink .lock left by an older +# gstack names its holder the same way and excludes a directory lock at the +# same path. Known limit: the reverse does not hold, since an older gstack's +# ln -s onto a directory lock links inside it and succeeds; only a process +# that started before an upgrade of this checkout can run that code. A live holder +# makes lock() give up after GSTACK_LEASE_LOCK_TRIES tries 0.1 s apart +# (default 300) or 30 s, whichever comes first. LOCK="$DIR/.lock" TOKEN="" +# take PATH — create the lock PATH owned by TOKEN; 1 when it exists. +take() { + if [ -e "$1" ] || [ -L "$1" ]; then return 1; fi + { printf '%s\n' "$TOKEN" > "$1.claim.$$"; } 2>/dev/null || { rm -f "$1.claim.$$"; return 1; } + if mkdir "$1" 2>/dev/null; then + [ ! -e "$1/owner" ] && mv -f "$1.claim.$$" "$1/owner" && return 0 + [ -e "$1/owner" ] || rm -rf "$1" + fi + rm -f "$1.claim.$$" + return 1 +} +# owner_of PATH — the token the lock PATH names, empty when it names none. +owner_of() { if [ -L "$1" ]; then readlink "$1" 2>/dev/null; else head -1 "$1/owner" 2>/dev/null; fi; } +mtime() { stat -c %Y "$1" 2>/dev/null || stat -f %m "$1" 2>/dev/null; } +# orphaned PATH — PATH is a lock (not a legacy symlink) whose owner file is +# missing or readable and empty, has no live claimant, is at least 2 s old and kept +# its mtime throughout. The clock is read before the first mtime, so a pause +# only makes the lock look younger, and a lock made since (a new generation) +# has a newer mtime. Claims are read before the owner, so a taker that renames +# its claim in between is seen as the owner. An empty claim is a taker that +# has not reached its mkdir, so it never made this lock. An mtime a minute or +# more in the future (clock skew) counts as old. +orphaned() { + _oclock=$(date +%s) + [ -e "$1" ] && [ ! -L "$1" ] || return 1 + _om=$(mtime "$1") || return 1 + for _c in "$1".claim.*; do + _t=$(head -1 "$_c" 2>/dev/null) + abandoned "$_c" "$_t" && continue + [ -n "$_t" ] && ! holder_gone "$_t" && return 1 + done + if [ -d "$1" ] && [ -e "$1/owner" ]; then + _o=$(head -1 "$1/owner" 2>/dev/null) || return 1 + [ -z "$_o" ] || return 1 + fi + [ "$(mtime "$1")" = "$_om" ] || return 1 + _oage=$((_oclock - _om)) + [ "$_oage" -ge 2 ] || [ "$_oage" -le -60 ] +} +# drop PATH — remove a lock in one step: a directory is renamed aside first, +# so nobody sees it ownerless on the way out. Once renamed the lock is +# released, whether or not the renamed copy can be deleted (touch prunes it). +drop() { + if [ -L "$1" ]; then rm -f "$1"; return; fi + mv "$1" "$1.gone.$$" 2>/dev/null || return 1 + rm -rf "$1.gone.$$" 2>/dev/null + return 0 +} lock() { [ -n "$TOKEN" ] || TOKEN="$$ $(identity $$)" - _tries=0 - until ln -s "$TOKEN" "$LOCK" 2>/dev/null; do - _tries=$((_tries + 1)) - LOCK_OWNER=$(readlink "$LOCK" 2>/dev/null) - [ -n "$LOCK_OWNER" ] && holder_gone "$LOCK_OWNER" && break_lock "$LOCK_OWNER" && continue - [ "$_tries" -ge "${GSTACK_LEASE_LOCK_TRIES:-300}" ] && return 1 + _tries=0 _gone=0 _max=${GSTACK_LEASE_LOCK_TRIES:-300} _start=$SECONDS + case "$_max" in ''|*[!0-9]*) _max=300 ;; esac + until take "$LOCK"; do + LOCK_OWNER=$(owner_of "$LOCK") + if [ ! -e "$LOCK" ] && [ ! -L "$LOCK" ]; then + # Released since take, or take itself cannot work here: never wait out + # the tries for a lock nobody holds. + _gone=$((_gone + 1)) + [ "$_gone" -ge 10 ] && return 1 + continue + fi + _gone=0 _tries=$((_tries + 1)) + if [ -n "$LOCK_OWNER" ]; then holder_gone "$LOCK_OWNER" && break_lock "$LOCK_OWNER" && continue + elif orphaned "$LOCK"; then break_lock "" && continue + fi + [ "$_tries" -ge "$_max" ] && return 1 + [ $((SECONDS - _start)) -ge 30 ] && return 1 sleep 0.1 done } -holder_gone() { case "$(state "${1%% *}" "${1#* }" 0)" in dead|stale) return 0 ;; esac; return 1; } -# break_lock OWNER — remove the lock only if it still names OWNER. Breakers -# take a second symlink, .lock.break, and reread the lock under it, so a lock -# taken since the verdict is never removed; a .lock.break whose holder is gone -# is cleared. Returns 1 when another breaker holds .lock.break. Known limit: -# that clear is not atomic, so two gstack-lease processes killed in a row (one -# holding .lock, the next inside this function) can let a reclaim delete a -# renewal; one crash is always safe. +# abandoned CLAIM TOKEN — the claim records no start identity and is over 2 +# minutes old. +abandoned() { [ -z "${2#* }" ] && [ -z "$(find "$1" -mmin -2 2>/dev/null)" ]; } +holder_gone() { + case "${1%% *}" in ''|*[!0-9]*|0*) return 0 ;; esac + case "$(state "${1%% *}" "${1#* }" 0)" in dead|stale) return 0 ;; esac; return 1 +} +# break_lock OWNER — remove the lock only if it still names OWNER (empty: is +# still orphaned). Breakers take a second lock, .lock.break, and reread the +# lock under it, so a lock taken since the verdict is never removed; a +# .lock.break whose holder is gone is cleared. A lock that cannot be renamed +# aside is removed in place (other breakers wait on .lock.break meanwhile). +# Returns 1 when another breaker holds .lock.break or the lock could not be +# removed, so lock() counts the try instead of spinning. Known limit: that +# clear is check-then-remove, so a breaker killed while holding .lock.break, +# followed by two live breakers clearing it at once, can let both break and a +# reclaim delete a renewal. break_lock() { - if ! ln -s "$TOKEN" "$LOCK.break" 2>/dev/null; then - _b=$(readlink "$LOCK.break" 2>/dev/null) - [ -n "$_b" ] && holder_gone "$_b" && [ "$(readlink "$LOCK.break" 2>/dev/null)" = "$_b" ] && rm -f "$LOCK.break" + if ! take "$LOCK.break"; then + _b=$(owner_of "$LOCK.break") + if [ -n "$_b" ]; then + holder_gone "$_b" && [ "$(owner_of "$LOCK.break")" = "$_b" ] && drop "$LOCK.break" + else + orphaned "$LOCK.break" && drop "$LOCK.break" + fi return 1 fi - [ "$(readlink "$LOCK" 2>/dev/null)" = "$1" ] && rm -f "$LOCK" - rm -f "$LOCK.break" - return 0 + _kept=0 + if [ -n "$1" ]; then + [ "$(owner_of "$LOCK")" = "$1" ] && { drop "$LOCK" || rm -rf "$LOCK" || _kept=1; } + else + orphaned "$LOCK" && { drop "$LOCK" || rm -rf "$LOCK" || _kept=1; } + fi + drop "$LOCK.break" + return $_kept } -unlock() { [ "$(readlink "$LOCK" 2>/dev/null)" = "$TOKEN" ] && rm -f "$LOCK"; return 0; } +unlock() { [ "$(owner_of "$LOCK")" = "$TOKEN" ] && { drop "$LOCK" || rm -rf "$LOCK"; }; return 0; } # reclaim FILE RECORD — delete a stale lease only if, under the lock, it still # holds the record judged stale; a renewal since then keeps it. reclaim() { @@ -153,10 +250,21 @@ case "$VERB" in touch) [ -n "$PID" ] || PID=$(gstack_harness_pid "${FROM:-$PPID}") mkdir -p "$DIR" || exit 2 - lock || { echo "gstack-lease: the lease directory is locked by live process ${LOCK_OWNER%% *}; lease $PID not renewed" >&2; exit 3; } + lock || { + if [ -n "${LOCK_OWNER:-}" ] && ! holder_gone "$LOCK_OWNER"; then echo "gstack-lease: the lease directory is locked by live process ${LOCK_OWNER%% *}; lease $PID not renewed" >&2 + else echo "gstack-lease: cannot take the lease directory lock $LOCK; lease $PID not renewed" >&2 + fi + exit 3 + } _tmp="$DIR/.$PID.$$" identity "$PID" > "$_tmp" && mv -f "$_tmp" "$DIR/$PID" || { rm -f "$_tmp"; unlock; exit 2; } - find "$DIR" -mmin +120 -type f -exec rm -f {} + 2>/dev/null + find "$DIR" -maxdepth 1 -mmin +120 -type f ! -name '.lock*' -exec rm -f {} + 2>/dev/null + for _c in "$DIR"/.lock*.claim.*; do + [ -f "$_c" ] || continue + _t=$(head -1 "$_c" 2>/dev/null) + [ -n "$(find "$_c" -mmin +2 2>/dev/null)" ] && { abandoned "$_c" "$_t" || holder_gone "$_t"; } && rm -f "$_c" + done + rm -rf "$DIR"/.lock*.gone.* 2>/dev/null unlock exit 0 ;; list) diff --git a/docs/capy-install.md b/docs/capy-install.md index c2d0ce97b..dd272cb18 100644 --- a/docs/capy-install.md +++ b/docs/capy-install.md @@ -120,15 +120,30 @@ lease …`). Stale needs proof: two well-formed identities from the same backend that differ (`ps` is read under `LC_ALL=C TZ=UTC0`). An identity that cannot be read, a malformed record or a backend change keeps the lease. `touch` (publish by rename, prune) and reclaim (reread, then delete only the record judged -stale) run under one lock in the lease directory, a symlink naming its holder's -pid and start identity, so a renewal is never deleted and a live lease never -disappears from a concurrent scan. The lock is broken only when its holder is -dead or its pid was reused, never by age, and breakers serialize on a second -symlink and reread the lock before removing it. One killed gstack-lease process -is always safe; two killed in a row, one holding the lock and the next while -breaking it, can still let a reclaim delete a renewal. While a live process holds it, -`touch` exits 3 without writing (`gstack-skill-start` reports that the -session holds no lease) and a reclaim keeps the lease. `bin/gstack-lease list` shows `alive|dead|stale`, and +stale) run under one lock in the lease directory, a `.lock` directory whose +`owner` file names its holder's pid and start identity, so a renewal is never +deleted and a live lease never disappears from a concurrent scan. The lock is a +directory because `mkdir` is atomic on every host, while Git Bash on Windows +cannot `ln -s` to a target that does not exist (#3330). A taker publishes a +claim before its `mkdir` and renames it in as the owner after, so an ownerless +lock is broken only once no claimant lives and the lock is at least 2 s old +and unchanged while checked, which keeps a taker between its two steps safe. +A claim that records no start identity is abandoned after 2 minutes, so a +reused pid cannot keep an orphan forever; an owner that names no valid pid +counts as a dead holder, and an owner file that cannot be read keeps the +lock. A live holder that never lets go bounds the wait at 300 tries or 30 s. A lock that names a holder is broken only when that holder is dead or +its pid was reused, never by age, and breakers serialize on a second lock and +reread the lock before removing it. A symlink `.lock` left by an older gstack +is honored the same way. Three known limits remain. An older gstack's `ln -s` +onto a directory lock links inside it and succeeds, so a process that started +before an upgrade of this checkout can share the lock with a newer one. And a +breaker killed while holding the second lock, followed by two live breakers +clearing it at once, can let a reclaim delete a renewal. On a host without start +identities, a taker stalled over 2 minutes between its `mkdir` and its owner +rename can be broken and then publish into its successor's lock. While a live process +holds the lock, or it cannot be taken at all, `touch` exits 3 without writing +(`gstack-skill-start` reports that the session holds no lease) and a reclaim +keeps the lease. `bin/gstack-lease list` shows `alive|dead|stale`, and `GSTACK_UPGRADE_FORCE=1` overrides. ## What the installer does diff --git a/package.json b/package.json index 316846110..f66c1ffae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gstack", - "version": "1.91.227", + "version": "1.91.228", "description": "Garry's Stack — Claude Code skills + fast headless browser. One repo, one install, entire AI engineering workflow.", "license": "MIT", "type": "module", diff --git a/test/gstack-lease-git-bash.test.ts b/test/gstack-lease-git-bash.test.ts new file mode 100644 index 000000000..61cc68c18 --- /dev/null +++ b/test/gstack-lease-git-bash.test.ts @@ -0,0 +1,94 @@ +/** + * #3330: gstack-lease took its lock with `ln -s .lock`. Git + * for Windows' default symlink mode (MSYS unset) cannot link to a target that + * does not exist, so the lock was never taken and every skill start waited out + * 300 tries (one report: 499 s) and still wrote no lease. The lock is now a + * directory (mkdir) with an owner file. test/gstack-lease.test.ts pins the full + * contract but is POSIX-bound (mode bits, sleep children), so this file is the + * one the curated windows-free-tests lane runs: it launches the bin through + * lib/script-invocation.ts, which is Git Bash on windows-latest. + */ +import { afterEach, describe, expect, test } from 'bun:test'; +import { spawnSync } from 'child_process'; +import * as fs from 'fs'; +import * as os from 'os'; +import * as path from 'path'; +import { BIN_DIR, runBashSync, runScriptSync } from '../lib/script-invocation'; + +const LEASE = path.join(BIN_DIR, 'gstack-lease'); +const fwd = (p: string) => p.replace(/\\/g, '/'); +const dirs: string[] = []; +afterEach(() => { + for (const d of dirs.splice(0)) fs.rmSync(d, { recursive: true, force: true }); +}); + +// No inherited lease dir from the test preload, and Git Bash's default symlink mode (no winsymlinks). +const { GSTACK_LEASE_DIR: _preload, MSYS: _msys, CYGWIN: _cygwin, GSTACK_LEASE_LOCK_TRIES: _tries, ...baseEnv } = process.env as Record; + +function checkout() { + const dir = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), 'gstack-lease-gb-'))); + dirs.push(dir); + const r = spawnSync('git', ['init', '-q', dir], { encoding: 'utf8', timeout: 30_000 }); + if (r.status !== 0) throw new Error(r.stderr); + return { dir, leases: path.join(dir, '.git', 'gstack-leases') }; +} + +/** A BASH_ENV file in which `ln -s` behaves as Git Bash's default: linking to a missing target fails. */ +function gitBashLn(dir: string): string { + const file = path.join(dir, 'git-bash-ln.sh'); + fs.writeFileSync(file, 'ln() { if [ "$1" = -s ] && [ ! -e "$2" ]; then echo "ln: failed to create symbolic link \'$3\': No such file or directory" >&2; return 1; fi; command ln "$@"; }\n'); + return file; +} + +/** A BASH_ENV file that logs every `sleep` (one per failed lock try) to $WAITS. */ +function sleepLog(dir: string): string { + const file = path.join(dir, 'sleep-log.sh'); + fs.writeFileSync(file, 'sleep() { echo "$*" >> "$WAITS"; command sleep "$@"; }\n'); + return file; +} + +describe('gstack-lease under Git Bash semantics (#3330)', () => { + test('touch takes the lock on its first try with the default tries and writes the lease, leaving no lock behind', () => { + const { dir, leases } = checkout(); + const waits = path.join(dir, 'waits.log'); + const r = runScriptSync(LEASE, ['touch', '--root', fwd(dir), '--pid', '4242'], { encoding: 'utf8', env: { ...baseEnv, BASH_ENV: fwd(sleepLog(dir)), WAITS: fwd(waits) }, timeout: 120_000 }); + expect(r.status, `${r.error ?? ''}${r.stdout}${r.stderr}`).toBe(0); + expect(fs.existsSync(waits), 'lock() slept between tries').toBe(false); + expect(fs.readdirSync(leases)).toEqual(['4242']); + }); + + test('a host whose ln -s cannot link to a missing target still takes the lock (negative control: the shim really fails ln -s)', () => { + const { dir, leases } = checkout(); + const shim = gitBashLn(dir); + const probe = runBashSync('ln -s "1 2" "$PROBE"', { encoding: 'utf8', env: { ...baseEnv, BASH_ENV: fwd(shim), PROBE: fwd(path.join(dir, 'probe')) }, timeout: 30_000 }); + expect(probe.status, `${probe.error ?? ''}${probe.stderr}`).not.toBe(0); + expect(probe.stderr).toContain('failed to create symbolic link'); + const r = runScriptSync(LEASE, ['touch', '--root', fwd(dir), '--pid', '4243'], { encoding: 'utf8', env: { ...baseEnv, BASH_ENV: fwd(shim), GSTACK_LEASE_LOCK_TRIES: '3' }, timeout: 120_000 }); + expect(r.status, `${r.error ?? ''}${r.stdout}${r.stderr}`).toBe(0); + expect(fs.readdirSync(leases)).toEqual(['4243']); + }); + + test('a lock held by a live Git Bash process is kept (touch exits 3 naming it); a dead holder\'s lock is broken', () => { + const { dir, leases } = checkout(); + const script = [ + 'set -u', + 'mkdir -p "$LEASES/.lock" && printf "%s \\n" "$$" > "$LEASES/.lock/owner"', + 'GSTACK_LEASE_LOCK_TRIES=2 bash "$LEASE" touch --root "$ROOT" --pid 4244; echo "held=$? holder=$$ owner=$(head -1 "$LEASES/.lock/owner")"', + '( exit 0 ) & dead=$!; wait "$dead"', + 'printf "%s \\n" "$dead" > "$LEASES/.lock/owner"', + 'GSTACK_LEASE_LOCK_TRIES=2 bash "$LEASE" touch --root "$ROOT" --pid 4245; echo "dead=$?"', + ].join('\n'); + const r = runBashSync(script, { + encoding: 'utf8', timeout: 120_000, + env: { ...baseEnv, LEASE: fwd(LEASE), ROOT: fwd(dir), LEASES: fwd(leases) }, + }); + const out = `${r.error ?? ''}${r.stdout}${r.stderr}`; + expect(r.status, out).toBe(0); + const holder = /held=(\d+) holder=(\d+) owner=(\d+)/.exec(r.stdout); + expect(holder?.[1], out).toBe('3'); + expect(holder?.[3], out).toBe(holder?.[2]); + expect(r.stderr).toContain(`locked by live process ${holder?.[2]}`); + expect(r.stdout, out).toContain('dead=0'); + expect(fs.readdirSync(leases).sort()).toEqual(['4245']); + }); +}); diff --git a/test/gstack-lease.test.ts b/test/gstack-lease.test.ts index f2b6585d2..05cb4945d 100644 --- a/test/gstack-lease.test.ts +++ b/test/gstack-lease.test.ts @@ -59,6 +59,24 @@ function otherStart(recorded: string): string { return recorded.startsWith('linux ') ? recorded.replace(/\d+$/, (n) => String(Number(n) + 1)) : 'ps Thu Jan 1 00:00:00 1970'; } +/** A directory lock as gstack-lease takes it: /owner holds the holder's token. */ +function plantLock(lockPath: string, token: string) { + fs.mkdirSync(lockPath, { recursive: true }); + fs.writeFileSync(path.join(lockPath, 'owner'), token + '\n'); +} +const ownerOf = (lockPath: string) => fs.readFileSync(path.join(lockPath, 'owner'), 'utf8').trim(); +/** Backdate a lock a minute: an ownerless lock is broken only once it is 2 s old. */ +function age(lockPath: string) { + const minuteAgo = new Date(Date.now() - 60_000); + fs.utimesSync(lockPath, minuteAgo, minuteAgo); +} + +/** Each lock layout a holder can leave: the directory lock, and the symlink lock an older gstack took. */ +const LAYOUTS: Array<[string, (lockPath: string, token: string) => void]> = [ + ['directory lock', plantLock], + ['legacy symlink lock', (lockPath, token) => fs.symlinkSync(token, lockPath)], +]; + /** A BASH_ENV file whose functions shadow commands inside the lease script (fault injection). */ function bashEnv(dir: string, body: string): string { const file = path.join(dir, 'bash-env.sh'); @@ -72,6 +90,8 @@ describe('gstack-lease', () => { expect(fs.statSync(LEASE).mode & 0o111).not.toBe(0); const r = spawnSync('bash', ['-n', LEASE], { encoding: 'utf8', timeout: 30_000 }); expect(r.status, r.stderr).toBe(0); + const help = spawnSync('bash', [LEASE, '--help'], { encoding: 'utf8', timeout: 30_000 }); + expect(help.stdout).toContain('print ` m alive|dead|stale` for every lease'); }); test('touch writes /gstack-leases/ for --pid and prunes leases older than 120 minutes', () => { @@ -160,7 +180,7 @@ describe('gstack-lease', () => { const renewed = path.join(dir, 'renewed'); fs.writeFileSync(renewed, fresh); // The holder renews just before reclaim takes the lock, as if touch ran after the stale verdict. - const racing = bashEnv(dir, `ln() { case "$*" in *"/.lock") command cp "${renewed}" "${file}" ;; esac; command ln "$@"; }\n`); + const racing = bashEnv(dir, `mkdir() { case "$*" in *"/.lock") command cp "${renewed}" "${file}" ;; esac; command mkdir "$@"; }\n`); const r = run(['live', '--root', dir], { BASH_ENV: racing }); expect(r.status, r.stdout + r.stderr).toBe(0); expect(r.stderr).not.toContain('reclaimed'); @@ -168,23 +188,24 @@ describe('gstack-lease', () => { expect(fs.readdirSync(leases).filter((n) => n.startsWith('.'))).toEqual([]); }); - test('a lock whose holder died, or whose pid now belongs to another process, is broken at once', () => { + test.each(LAYOUTS)('a %s whose holder died, or whose pid now belongs to another process, is broken at once', (_layout, plant) => { const { dir, leases } = checkout(); const holder = sleeper(); fs.mkdirSync(leases, { recursive: true }); - fs.symlinkSync(`${deadPid()} `, path.join(leases, '.lock')); + plant(path.join(leases, '.lock'), `${deadPid()} `); const r = run(['touch', '--root', dir, '--pid', String(holder)], { GSTACK_LEASE_LOCK_TRIES: '3' }); expect(r.status, r.stdout + r.stderr).toBe(0); expect(fs.existsSync(path.join(leases, '.lock'))).toBe(false); const identity = fs.readFileSync(path.join(leases, String(holder)), 'utf8').trim(); expect(identity).toMatch(/^(linux|ps) /); - fs.symlinkSync(`${holder} ${otherStart(identity)}`, path.join(leases, '.lock')); + plant(path.join(leases, '.lock'), `${holder} ${otherStart(identity)}`); const again = run(['touch', '--root', dir, '--pid', String(holder)], { GSTACK_LEASE_LOCK_TRIES: '3' }); expect(again.status, again.stdout + again.stderr).toBe(0); expect(fs.existsSync(path.join(leases, '.lock'))).toBe(false); + expect(fs.readdirSync(leases).filter((n) => n.startsWith('.'))).toEqual([]); }); - test('a live holder\'s lock is never broken, however old: touch exits 3 without writing and a reclaim keeps the lease', () => { + test.each(LAYOUTS)('a live holder\'s %s is never broken, however old: touch exits 3 without writing and a reclaim keeps the lease', (layout, plant) => { const { dir, leases } = checkout(); const owner = sleeper(); const holder = sleeper(); @@ -192,9 +213,10 @@ describe('gstack-lease', () => { expect(run(['touch', '--root', dir, '--pid', String(holder)]).status).toBe(0); const ownerToken = `${owner} ${fs.readFileSync(path.join(leases, String(owner)), 'utf8').trim()}`; const lockPath = path.join(leases, '.lock'); - fs.symlinkSync(ownerToken, lockPath); + plant(lockPath, ownerToken); const old = new Date(Date.now() - 5 * 60_000); fs.lutimesSync(lockPath, old, old); + if (layout === 'directory lock') fs.utimesSync(path.join(lockPath, 'owner'), old, old); const holderFile = path.join(leases, String(holder)); const stale = otherStart(fs.readFileSync(holderFile, 'utf8').trim()) + '\n'; fs.writeFileSync(holderFile, stale); @@ -207,7 +229,7 @@ describe('gstack-lease', () => { expect(l.stderr).not.toContain('reclaimed'); expect(l.stdout).toContain(`${holder} `); expect(fs.existsSync(holderFile)).toBe(true); - expect(fs.readlinkSync(lockPath)).toBe(ownerToken); + expect(layout === 'directory lock' ? ownerOf(lockPath) : fs.readlinkSync(lockPath)).toBe(ownerToken); }); test('two breakers of one dead lock: the second rereads under .lock.break and leaves the lock the first one took', () => { @@ -217,21 +239,21 @@ describe('gstack-lease', () => { expect(run(['touch', '--root', dir, '--pid', String(owner)]).status).toBe(0); const ownerToken = `${owner} ${fs.readFileSync(path.join(leases, String(owner)), 'utf8').trim()}`; const lockPath = path.join(leases, '.lock'); - fs.symlinkSync(`${deadPid()} `, lockPath); + plantLock(lockPath, `${deadPid()} `); // Between this breaker's dead verdict and its .lock.break, another breaker removes the dead lock and takes it. - const first = bashEnv(dir, `ln() { case "$*" in *"/.lock.break") command rm -f "${lockPath}"; command ln -s "${ownerToken}" "${lockPath}" ;; esac; command ln "$@"; }\n`); + const first = bashEnv(dir, `mkdir() { case "$*" in *"/.lock.break") command rm -rf "${lockPath}"; command mkdir "${lockPath}"; printf '%s\\n' "${ownerToken}" > "${lockPath}/owner" ;; esac; command mkdir "$@"; }\n`); const t = run(['touch', '--root', dir, '--pid', String(holder)], { BASH_ENV: first, GSTACK_LEASE_LOCK_TRIES: '3' }); expect(t.status, t.stdout + t.stderr).toBe(3); - expect(fs.readlinkSync(lockPath)).toBe(ownerToken); - expect(fs.existsSync(path.join(leases, '.lock.break'))).toBe(false); + expect(ownerOf(lockPath)).toBe(ownerToken); + expect(fs.readdirSync(leases).filter((n) => n.startsWith('.')).sort()).toEqual(['.lock']); }); - test('a .lock.break left by a dead breaker is cleared and the dead lock is still broken', () => { + test.each(LAYOUTS)('a .lock.break (%s) left by a dead breaker is cleared and the dead lock is still broken', (_layout, plant) => { const { dir, leases } = checkout(); const holder = sleeper(); fs.mkdirSync(leases, { recursive: true }); - fs.symlinkSync(`${deadPid()} `, path.join(leases, '.lock')); - fs.symlinkSync(`${deadPid()} `, path.join(leases, '.lock.break')); + plant(path.join(leases, '.lock'), `${deadPid()} `); + plant(path.join(leases, '.lock.break'), `${deadPid()} `); const r = run(['touch', '--root', dir, '--pid', String(holder)], { GSTACK_LEASE_LOCK_TRIES: '5' }); expect(r.status, r.stdout + r.stderr).toBe(0); expect(fs.existsSync(path.join(leases, String(holder)))).toBe(true); @@ -249,12 +271,355 @@ describe('gstack-lease', () => { fs.writeFileSync(holderFile, otherStart(fs.readFileSync(holderFile, 'utf8').trim()) + '\n'); const lockPath = path.join(leases, '.lock'); // While reclaim deletes the stale lease under its lock, the lock changes hands. - const swap = bashEnv(dir, `rm() { if [ "$*" = "-f ${holderFile}" ]; then command rm -f "${lockPath}"; command ln -s "${ownerToken}" "${lockPath}"; fi; command rm "$@"; }\n`); + const swap = bashEnv(dir, `rm() { if [ "$*" = "-f ${holderFile}" ]; then command rm -rf "${lockPath}"; command mkdir "${lockPath}"; printf '%s\\n' "${ownerToken}" > "${lockPath}/owner"; fi; command rm "$@"; }\n`); const r = run(['live', '--root', dir, '--exclude-ancestry-of', String(owner)], { BASH_ENV: swap }); expect(r.stderr).toContain(`reclaimed stale lease ${holder}`); - expect(fs.readlinkSync(lockPath)).toBe(ownerToken); + expect(ownerOf(lockPath)).toBe(ownerToken); }); + test('a lock held by a running gstack-lease excludes a second taker, which names it; both leases land once it is released', async () => { + const { dir, leases } = checkout(); + const [first, second] = [sleeper(), sleeper()]; + // The first touch holds the lock across its prune (find runs under the lock) until the test releases it. + const release = path.join(dir, 'release'); + const slow = bashEnv(dir, `find() { case "$*" in *'+120'*) until [ -e "${release}" ]; do sleep 0.05; done ;; esac; command find "$@"; }\n`); + const holder = spawn('bash', [LEASE, 'touch', '--root', dir, '--pid', String(first)], { env: { ...baseEnv, BASH_ENV: slow }, stdio: 'ignore' }); + children.push(holder); + const exited = new Promise((resolve) => holder.on('exit', resolve)); + const owner = path.join(leases, '.lock', 'owner'); + for (let i = 0; i < 500 && !fs.existsSync(owner); i++) await Bun.sleep(20); + expect(fs.readFileSync(owner, 'utf8')).toMatch(new RegExp(`^${holder.pid} `)); + const blocked = run(['touch', '--root', dir, '--pid', String(second)], { GSTACK_LEASE_LOCK_TRIES: '3' }); + fs.writeFileSync(release, ''); + expect(blocked.status, blocked.stdout + blocked.stderr).toBe(3); + expect(blocked.stderr).toContain(`locked by live process ${holder.pid};`); + expect(await exited).toBe(0); + expect(run(['touch', '--root', dir, '--pid', String(second)]).status).toBe(0); + expect(fs.readdirSync(leases).sort()).toEqual([String(first), String(second)].sort()); + }, 30_000); + + test('parallel touches all take the lock in turn and leave no lock, claim or temp file behind', async () => { + const { dir, leases } = checkout(); + const pids = Array.from({ length: 16 }, (_, i) => 4300 + i); + // The prune runs under the lock: a second process inside it at the same time logs an overlap. + const inside = path.join(dir, 'inside'); + const overlaps = path.join(dir, 'overlaps.log'); + const probe = bashEnv(dir, `find() { case "$*" in *'+120'*) command mkdir "${inside}" 2>/dev/null || echo overlap >> "${overlaps}"; sleep 0.05; command rmdir "${inside}" 2>/dev/null ;; esac; command find "$@"; }\n`); + const codes = await Promise.all(pids.map((p) => new Promise((resolve) => { + const c = spawn('bash', [LEASE, 'touch', '--root', dir, '--pid', String(p)], { env: { ...baseEnv, BASH_ENV: probe }, stdio: 'ignore' }); + children.push(c); + c.on('exit', resolve); + }))); + expect(codes).toEqual(pids.map(() => 0)); + expect(fs.existsSync(overlaps), 'two touches were inside the lock at once').toBe(false); + expect(fs.readdirSync(leases).sort()).toEqual(pids.map(String).sort()); + }, 30_000); + + // #3330: a taker killed between its mkdir and its owner rename leaves an ownerless lock. + test('an ownerless lock is broken once every claimant is gone, and kept while a live claimant may still own it', () => { + const { dir, leases } = checkout(); + const holder = sleeper(); + const lockPath = path.join(leases, '.lock'); + fs.mkdirSync(lockPath, { recursive: true }); + age(lockPath); + fs.writeFileSync(path.join(leases, `.lock.claim.${holder}`), `${holder} \n`); + const kept = run(['touch', '--root', dir, '--pid', String(holder)], { GSTACK_LEASE_LOCK_TRIES: '3' }); + expect(kept.status, kept.stdout + kept.stderr).toBe(3); + expect(kept.stderr).toContain('cannot take the lease directory lock'); + expect(fs.existsSync(path.join(leases, String(holder)))).toBe(false); + expect(fs.readdirSync(lockPath)).toEqual([]); + + const dead = deadPid(); + fs.renameSync(path.join(leases, `.lock.claim.${holder}`), path.join(leases, `.lock.claim.${dead}`)); + fs.writeFileSync(path.join(leases, `.lock.claim.${dead}`), `${dead} \n`); + fs.writeFileSync(path.join(leases, '.lock.claim.1'), ''); + age(lockPath); + const broken = run(['touch', '--root', dir, '--pid', String(holder)], { GSTACK_LEASE_LOCK_TRIES: '3' }); + expect(broken.status, broken.stdout + broken.stderr).toBe(0); + expect(fs.existsSync(path.join(leases, String(holder)))).toBe(true); + expect(fs.existsSync(lockPath)).toBe(false); + + fs.rmSync(path.join(leases, `.lock.claim.${dead}`)); + fs.mkdirSync(lockPath); + age(lockPath); + const unclaimed = run(['touch', '--root', dir, '--pid', String(holder)], { GSTACK_LEASE_LOCK_TRIES: '3' }); + expect(unclaimed.status, unclaimed.stdout + unclaimed.stderr).toBe(0); + expect(fs.existsSync(lockPath)).toBe(false); + }); + + // Value: protects=an ownerless lock younger than 2 s is never broken, so a live taker whose claim landed after the breaker read the claims keeps + // the lock it is about to publish; a malformed lock (empty owner, pid 0, or a stray file) is broken once old instead of wedging every touch; + // fails_when=orphaned() drops its age check, or treats only a missing owner file (not an empty or invalid one) as ownerless; + // why_new=the ownerless cases above all backdate the lock; nothing pins the young-lock guard or the malformed shapes; + // seam=none; no_claim=the claim-read race itself (a young unclaimed lock stands in for a taker whose claim the breaker missed) + test('an ownerless lock is broken only once it is 2 s old, and a malformed lock is treated as ownerless', () => { + const { dir, leases } = checkout(); + const holder = sleeper(); + const lockPath = path.join(leases, '.lock'); + fs.mkdirSync(lockPath, { recursive: true }); + // The clock reads the lock's own mtime, so the lock stays 0 s old however slow the runner is. + const frozen = bashEnv(dir, `date() { case "$1" in +%s) command stat -c %Y "${lockPath}" 2>/dev/null || command stat -f %m "${lockPath}" ;; *) command date "$@" ;; esac; }\n`); + const young = run(['touch', '--root', dir, '--pid', String(holder)], { GSTACK_LEASE_LOCK_TRIES: '3', BASH_ENV: frozen }); + expect(young.status, young.stdout + young.stderr).toBe(3); + expect(fs.existsSync(lockPath)).toBe(true); + expect(fs.existsSync(path.join(leases, String(holder)))).toBe(false); + + const shapes: Array<[string, () => void]> = [ + ['an empty owner file', () => plantLock(lockPath, '')], + ['owner pid 0', () => plantLock(lockPath, '0 ')], + ['a zero-padded owner pid', () => plantLock(lockPath, '00 ')], + ['a non-numeric owner', () => plantLock(lockPath, 'garbage x')], + ['an ownerless lock an hour ahead (clock skew)', () => fs.mkdirSync(lockPath)], + ['a stray file', () => { fs.rmSync(lockPath, { recursive: true, force: true }); fs.writeFileSync(lockPath, ''); }], + ]; + for (const [shape, plant] of shapes) { + fs.rmSync(lockPath, { recursive: true, force: true }); + fs.rmSync(path.join(leases, String(holder)), { force: true }); + plant(); + age(lockPath); + if (shape.includes('clock skew')) { + const hourAhead = new Date(Date.now() + 3_600_000); + fs.utimesSync(lockPath, hourAhead, hourAhead); + } + const r = run(['touch', '--root', dir, '--pid', String(holder)], { GSTACK_LEASE_LOCK_TRIES: '3' }); + expect(r.status, `${shape}: ${r.stdout}${r.stderr}`).toBe(0); + expect(fs.readdirSync(leases), shape).toEqual([String(holder)]); + } + }); + + // Value: protects=a claim without a start identity left by a killed taker neither blocks recovery of an ownerless lock (even when its pid is + // alive again) nor lingers once 2 minutes old, while a claim whose recorded identity is still live is honored however old; + // fails_when=orphaned() honors identity-less claims of any age, expires live identified claims, or touch's prune skips claim files; + // why_new=the ownerless cases plant fresh claims only; nothing ages one or checks the prune for claims; + // seam=none; no_claim=real pid reuse (a live sleeper stands in for the reused pid) + test('an identity-less claim older than 2 minutes is abandoned and pruned; an old claim with a live identity is honored', () => { + const { dir, leases } = checkout(); + const [holder, reused] = [sleeper(), sleeper()]; + const lockPath = path.join(leases, '.lock'); + fs.mkdirSync(lockPath, { recursive: true }); + age(lockPath); + const claim = path.join(leases, `.lock.claim.${reused}`); + fs.writeFileSync(claim, `${reused} \n`); + const fiveMinutesAgo = new Date(Date.now() - 300_000); + fs.utimesSync(claim, fiveMinutesAgo, fiveMinutesAgo); + const r = run(['touch', '--root', dir, '--pid', String(holder)], { GSTACK_LEASE_LOCK_TRIES: '3' }); + expect(r.status, r.stdout + r.stderr).toBe(0); + expect(fs.readdirSync(leases)).toEqual([String(holder)]); + + // A claim that records its claimant's start identity is honored however old, so a stalled live taker keeps its lock. + expect(run(['touch', '--root', dir, '--pid', String(reused)]).status).toBe(0); + const identity = fs.readFileSync(path.join(leases, String(reused)), 'utf8').trim(); + expect(identity, 'this host records start identities').not.toBe(''); + fs.rmSync(path.join(leases, String(reused))); + fs.mkdirSync(lockPath); + age(lockPath); + fs.writeFileSync(claim, `${reused} ${identity}\n`); + fs.utimesSync(claim, fiveMinutesAgo, fiveMinutesAgo); + const kept = run(['touch', '--root', dir, '--pid', String(holder)], { GSTACK_LEASE_LOCK_TRIES: '3' }); + expect(kept.status, kept.stdout + kept.stderr).toBe(3); + expect(fs.existsSync(lockPath)).toBe(true); + expect(fs.existsSync(claim)).toBe(true); + }); + + // Value: protects=a live holder's lock is never broken because its owner file could not be read (a Windows sharing violation, a permission error); + // fails_when=orphaned() treats an unreadable owner (empty owner_of output) as no owner; + // why_new=every ownerless case removes or empties the owner file; none makes a present owner unreadable; + // seam=none; no_claim=a real sharing violation (a head shim fails reads of the owner file) + test('a lock whose owner file cannot be read is kept, not taken for ownerless', () => { + const { dir, leases } = checkout(); + const [holder, owner] = [sleeper(), sleeper()]; + const lockPath = path.join(leases, '.lock'); + plantLock(lockPath, `${owner} `); + age(lockPath); + const shim = bashEnv(dir, 'head() { case "$*" in *"/.lock/owner") return 1 ;; esac; command head "$@"; }\n'); + const r = run(['touch', '--root', dir, '--pid', String(holder)], { GSTACK_LEASE_LOCK_TRIES: '3', BASH_ENV: shim }); + expect(r.status, r.stdout + r.stderr).toBe(3); + expect(ownerOf(lockPath)).toBe(String(owner)); + expect(fs.existsSync(path.join(leases, String(holder)))).toBe(false); + }); + + // Value: protects=a live holder that never lets go bounds touch at 30 s even with the default 300 tries, a non-numeric + // GSTACK_LEASE_LOCK_TRIES falls back to the default instead of looping forever, and a visibly held lock is never mkdir'd; + // fails_when=lock() loses its SECONDS deadline or its tries validation, or take() stops checking the path first; + // why_new=every live-holder case lowers the tries; none runs the default budget, a bad value or counts mkdir calls; + // seam=none; no_claim=real elapsed time (a sleep shim advances SECONDS 10 s per wait) + test('a live holder bounds touch by a 30 s deadline, and a non-numeric tries value cannot loop forever', () => { + const { dir, leases } = checkout(); + const [holder, owner] = [sleeper(), sleeper()]; + plantLock(path.join(leases, '.lock'), `${owner} `); + const waits = path.join(dir, 'waits.log'); + const mkdirs = path.join(dir, 'mkdirs.log'); + const shim = bashEnv(dir, `sleep() { echo "$*" >> "${waits}"; SECONDS=$((SECONDS + 10)); }\nmkdir() { case "$*" in *"/.lock") echo "$*" >> "${mkdirs}" ;; esac; command mkdir "$@"; }\n`); + for (const tries of [undefined, 'abc']) { + fs.rmSync(waits, { force: true }); + const env: Record = { BASH_ENV: shim }; + if (tries) env.GSTACK_LEASE_LOCK_TRIES = tries; + const r = spawnSync('bash', [LEASE, 'touch', '--root', dir, '--pid', String(holder)], { encoding: 'utf8', env: { ...baseEnv, ...env }, timeout: 20_000 }); + expect(r.error?.message ?? '', `tries=${tries}: touch did not end`).not.toContain('ETIMEDOUT'); + expect(r.status, `tries=${tries}: ${r.stdout}${r.stderr}`).toBe(3); + expect(r.stderr).toContain(`locked by live process ${owner};`); + expect(r.stderr).not.toContain('integer expression'); + expect(fs.readFileSync(waits, 'utf8').trim().split('\n').length, `tries=${tries}`).toBeLessThanOrEqual(3); + } + expect(fs.existsSync(mkdirs), 'take() ran mkdir on a visibly held lock').toBe(false); + expect(ownerOf(path.join(leases, '.lock'))).toBe(String(owner)); + }, 30_000); + + // Value: protects=a holder that resumes past the 120-minute prune window keeps its own lock metadata, so unlock still recognizes and removes it; + // fails_when=touch's prune recurses into .lock (deleting owner) or matches lock files at the top level; + // why_new=the prune test plants only lease files; none ages the lock's owner file before the prune runs; + // seam=none; no_claim=a real suspension (a BASH_ENV find shim backdates the owner file just before the prune) + test('the 120-minute prune never deletes the lock it runs under', () => { + const { dir, leases } = checkout(); + const holder = sleeper(); + const shim = bashEnv(dir, 'find() { command touch -d "3 hours ago" "$1/.lock/owner" 2>/dev/null || command touch -t 197001010000 "$1/.lock/owner"; command find "$@"; }\n'); + // Renamed-aside copies a failed delete left behind are pruned too. + fs.mkdirSync(path.join(leases, '.lock.gone.99999'), { recursive: true }); + fs.writeFileSync(path.join(leases, '.lock.gone.99999', 'owner'), '99999 \n'); + fs.mkdirSync(path.join(leases, '.lock.break.gone.99998')); + const r = run(['touch', '--root', dir, '--pid', String(holder)], { BASH_ENV: shim }); + expect(r.status, r.stdout + r.stderr).toBe(0); + expect(fs.readdirSync(leases)).toEqual([String(holder)]); + }); + + // Value: protects=once a lock is renamed aside it is released: a failed delete of the renamed copy never removes a lock a new taker made at .lock; + // fails_when=drop() reports failure after a successful rename, so unlock's in-place rm -rf fallback runs on the new taker's lock; + // why_new=the rename-aside tests fail the rename itself; none lets the rename succeed and the delete fail; + // seam=none; no_claim=a real new taker in that window (the rm shim plants one, then fails like a Windows file in use) + test('a renamed-aside lock that cannot be deleted never takes a new taker\'s lock with it', () => { + const { dir, leases } = checkout(); + const [holder, taker] = [sleeper(), sleeper()]; + const lockPath = path.join(leases, '.lock'); + const shim = bashEnv(dir, `rm() { case "$*" in *".lock.gone."*) command mkdir "${lockPath}" && printf '%s \\n' "${taker}" > "${lockPath}/owner"; return 1 ;; esac; command rm "$@"; }\n`); + const r = run(['touch', '--root', dir, '--pid', String(holder)], { BASH_ENV: shim }); + expect(r.status, r.stdout + r.stderr).toBe(0); + expect(ownerOf(lockPath)).toBe(String(taker)); + expect(fs.existsSync(path.join(leases, String(holder)))).toBe(true); + }); + + test('a lock that cannot be taken while nobody holds it fails at once instead of waiting out the tries', () => { + const { dir, leases } = checkout(); + const holder = sleeper(); + const waits = path.join(dir, 'waits.log'); + const broken = bashEnv(dir, `mkdir() { case "$*" in *"/.lock") return 1 ;; esac; command mkdir "$@"; }\nsleep() { echo "$*" >> "${waits}"; command sleep "$@"; }\n`); + const r = run(['touch', '--root', dir, '--pid', String(holder)], { BASH_ENV: broken }); + expect(r.status, r.stdout + r.stderr).toBe(3); + expect(fs.existsSync(waits), 'lock() slept between tries').toBe(false); + expect(r.stderr).toContain('cannot take the lease directory lock'); + expect(r.stderr).not.toContain('locked by live process'); + expect(fs.readdirSync(leases)).toEqual([]); + }); + + // Value: protects=a .lock.break held by a live breaker (owner, or claim on an ownerless dir) is never cleared; an ownerless one with no claimant is; + // fails_when=break_lock's liveness check on .lock.break is dropped, or orphaned() ignores a live claim; + // why_new=the existing .lock.break test plants only a dead breaker's owner, never a live breaker or an ownerless one; + // seam=none; no_claim=two live breakers racing for real (sleeping children stand in as the live holders) + test('a .lock.break whose breaker lives (owner or claim) is never cleared; an ownerless one with no live claimant is', () => { + const { dir, leases } = checkout(); + const holder = sleeper(); + const breaker = sleeper(); + const lockPath = path.join(leases, '.lock'); + const breakPath = path.join(leases, '.lock.break'); + plantLock(lockPath, `${deadPid()} `); + plantLock(breakPath, `${breaker} `); + const owned = run(['touch', '--root', dir, '--pid', String(holder)], { GSTACK_LEASE_LOCK_TRIES: '3' }); + expect(owned.status, owned.stdout + owned.stderr).toBe(3); + expect(ownerOf(breakPath)).toBe(String(breaker)); + expect(fs.existsSync(lockPath)).toBe(true); + expect(fs.existsSync(path.join(leases, String(holder)))).toBe(false); + + fs.rmSync(breakPath, { recursive: true }); + fs.mkdirSync(breakPath); + age(breakPath); + fs.writeFileSync(path.join(leases, `.lock.break.claim.${breaker}`), `${breaker} \n`); + const claimed = run(['touch', '--root', dir, '--pid', String(holder)], { GSTACK_LEASE_LOCK_TRIES: '3' }); + expect(claimed.status, claimed.stdout + claimed.stderr).toBe(3); + expect(fs.readdirSync(breakPath)).toEqual([]); + expect(fs.existsSync(lockPath)).toBe(true); + expect(fs.existsSync(path.join(leases, String(holder)))).toBe(false); + + fs.rmSync(path.join(leases, `.lock.break.claim.${breaker}`)); + age(breakPath); + const orphaned = run(['touch', '--root', dir, '--pid', String(holder)], { GSTACK_LEASE_LOCK_TRIES: '5' }); + expect(orphaned.status, orphaned.stdout + orphaned.stderr).toBe(0); + expect(fs.readdirSync(leases)).toEqual([String(holder)]); + }); + + // Value: protects=a lock dir whose owner rename failed is removed, never left ownerless; touch exits 3 saying it cannot take the lock; + // fails_when=take() stops removing the lock dir after a failed owner rename; + // why_new=the ownerless-lock test plants the dir by hand; none fails take() between its mkdir and its owner rename; + // seam=none; no_claim=real mv failure modes (a BASH_ENV shim fails the claim-to-owner rename) + test('a lock whose owner cannot be published is removed, not left ownerless, and touch fails at once', () => { + const { dir, leases } = checkout(); + const holder = sleeper(); + const shim = bashEnv(dir, 'mv() { case "$*" in *".lock.claim."*) return 1 ;; esac; command mv "$@"; }\n'); + const r = run(['touch', '--root', dir, '--pid', String(holder)], { BASH_ENV: shim }); + expect(r.status, r.stdout + r.stderr).toBe(3); + expect(r.stderr).toContain('cannot take the lease directory lock'); + expect(r.stderr).not.toContain('locked by live process'); + expect(fs.readdirSync(leases)).toEqual([]); + }); + + // Value: protects=a lock that vanishes between a failed take and its check is retaken at once: touch writes its lease, no sleep, no lock left; + // fails_when=the vanished-lock retry limit drops to 1, so one release race exits 3; + // why_new=the fails-at-once test pins only the upper bound (every take fails); no test fails a single take; + // seam=none; no_claim=a real release race (a BASH_ENV shim fails the first mkdir of the lock) + test('a lock released between a failed take and its check is retaken without waiting', () => { + const { dir, leases } = checkout(); + const holder = sleeper(); + const waits = path.join(dir, 'waits.log'); + const once = path.join(dir, 'failed-once'); + const shim = bashEnv(dir, `mkdir() { case "$*" in *"/.lock") if [ ! -e "${once}" ]; then : > "${once}"; return 1; fi ;; esac; command mkdir "$@"; }\nsleep() { echo "$*" >> "${waits}"; command sleep "$@"; }\n`); + const r = run(['touch', '--root', dir, '--pid', String(holder)], { BASH_ENV: shim }); + expect(r.status, r.stdout + r.stderr).toBe(0); + expect(fs.existsSync(once), 'the shim never failed a take').toBe(true); + expect(fs.existsSync(waits), 'lock() slept between tries').toBe(false); + expect(fs.readdirSync(leases)).toEqual([String(holder)]); + }); + + // Value: protects=unlock removes the caller's own lock even when renaming it aside fails: touch exits 0, lease written, no .lock left behind; + // fails_when=the rm -rf fallback after drop in unlock() is removed; + // why_new=no test fails the rename-aside step of drop(), so unlock's fallback never runs; + // seam=none; no_claim=real mv failure modes such as a Windows file in use (a BASH_ENV shim fails the .lock.gone rename) + test('unlock still removes its own lock when renaming it aside fails', () => { + const { dir, leases } = checkout(); + const holder = sleeper(); + const shim = bashEnv(dir, 'mv() { case "$*" in *".lock.gone."*) return 1 ;; esac; command mv "$@"; }\n'); + const r = run(['touch', '--root', dir, '--pid', String(holder)], { BASH_ENV: shim }); + expect(r.status, r.stdout + r.stderr).toBe(0); + expect(fs.readdirSync(leases)).toEqual([String(holder)]); + }); + + // Value: protects=a dead holder's lock that cannot be renamed aside is removed in place, and one that cannot be removed at all ends touch + // with exit 3 within the tries limit instead of spinning, without calling the dead holder live; + // fails_when=break_lock reports success after a failed drop and lock() loops without sleeping or counting tries; + // why_new=the dead-holder tests always let the rename-aside succeed; the tries limit is only reached through the live-holder path; + // seam=none; no_claim=real mv/rm failure modes such as a Windows file in use (a BASH_ENV shim fails the .lock.gone rename and the rm) + test('a dead holder\'s lock that cannot be renamed aside ends touch with a verdict instead of spinning', () => { + const { dir, leases } = checkout(); + const holder = sleeper(); + const dead = deadPid(); + const touch = (shim: string) => spawnSync('bash', [LEASE, 'touch', '--root', dir, '--pid', String(holder)], { + encoding: 'utf8', env: { ...baseEnv, BASH_ENV: shim, GSTACK_LEASE_LOCK_TRIES: '3' }, timeout: 8_000, + }); + const noRename = 'mv() { case "$*" in *".lock.gone."*) return 1 ;; esac; command mv "$@"; }\n'; + plantLock(path.join(leases, '.lock'), `${dead} `); + const removed = touch(bashEnv(dir, noRename)); + expect(removed.error?.message ?? '', 'touch did not end within 8 s').not.toContain('ETIMEDOUT'); + expect(removed.status, removed.stdout + removed.stderr).toBe(0); + expect(fs.readdirSync(leases)).toEqual([String(holder)]); + + fs.rmSync(path.join(leases, String(holder))); + plantLock(path.join(leases, '.lock'), `${dead} `); + const stuck = touch(bashEnv(dir, noRename + 'rm() { case "$*" in *"/.lock") return 1 ;; esac; command rm "$@"; }\n')); + expect(stuck.error?.message ?? '', 'touch did not end within 8 s').not.toContain('ETIMEDOUT'); + expect(stuck.status, stuck.stdout + stuck.stderr).toBe(3); + expect(stuck.stderr).toContain('cannot take the lease directory lock'); + expect(stuck.stderr).not.toContain('locked by live process'); + expect(ownerOf(path.join(leases, '.lock'))).toBe(String(dead)); + expect(fs.existsSync(path.join(leases, String(holder)))).toBe(false); + }, 20_000); + test('a lease without a recorded identity (older gstack) counts while fresh and is stale past the 120-minute window', () => { const { dir, leases } = checkout(); const holder = sleeper(); @@ -333,7 +698,7 @@ describe('gstack-lease', () => { fs.writeFileSync(path.join(state, 'config.yaml'), 'update_check: false\n'); const leaseDir = path.join(state, 'leases'); fs.mkdirSync(leaseDir); - fs.symlinkSync(`${sleeper()} `, path.join(leaseDir, '.lock')); + plantLock(path.join(leaseDir, '.lock'), `${sleeper()} `); const r = spawnSync(START, ['--skill', 'testskill', '--parent-pid', '424244'], { encoding: 'utf8', cwd: home, env: { PATH: process.env.PATH!, HOME: home, GSTACK_HOME: state, GSTACK_LEASE_DIR: leaseDir, GSTACK_LEASE_LOCK_TRIES: '2' }, timeout: 30_000, }); From 5128ec146997640224badf33ff18d65c236aa1db Mon Sep 17 00:00:00 2001 From: Garry Tan Date: Sun, 25 Oct 2026 22:01:10 -0700 Subject: [PATCH 8/9] ci(scorecard): bump github/codeql-action/upload-sarif from 4.38.3 to 4.39.0 (#3401) Recreates Dependabot's #3307 on a crew branch so it can take a version stamp at merge. 6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee is the commit the annotated tag v4.39.0 points to. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --- .github/workflows/scorecard.yml | 2 +- CHANGELOG.md | 7 +++++++ VERSION | 2 +- agents-digest/gstack-AGENTS.md | 2 +- package.json | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 601e3ebab..79d159a95 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -47,6 +47,6 @@ jobs: path: results.sarif retention-days: 5 - - uses: github/codeql-action/upload-sarif@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3 + - uses: github/codeql-action/upload-sarif@6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee # v4.39.0 with: sarif_file: results.sarif diff --git a/CHANGELOG.md b/CHANGELOG.md index d01ec79b1..dc2778549 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.91.229.0] - 2026-10-26 + +**The OpenSSF Scorecard workflow uploads its results with `github/codeql-action/upload-sarif` 4.39.0 (from 4.38.3), recreated from Dependabot's #3307.** Dependabot's branch can't take a version stamp at merge time, so the same one-line change ships from a crew branch. The new pin `6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee` is the commit that the annotated tag `v4.39.0` points to in github/codeql-action, and GitHub shows that commit as verified. 4.39.0's one breaking change raises the minimum CodeQL bundle to 2.20.7, which applies to `init` and `analyze`. This workflow uses only `upload-sarif` with Scorecard's own SARIF file. + +### Changed +- **`.github/workflows/scorecard.yml`**: `upload-sarif` pinned to `6f2ac81f…` (`# v4.39.0`), byte-for-byte the change in #3307. + ## [1.91.228.0] - 2026-10-26 **Skills start at once on Windows again: the workflow lease lock no longer depends on symlinks (#3330).** `bin/gstack-lease` took its lock with `ln -s "" .lock`. In Git for Windows' default symlink mode (`MSYS` unset), `ln -s` cannot link to a target that does not exist, so the lock was never taken. Every skill start then waited out all 300 tries (0.1 s apart, plus process start costs) before `gstack-skill-start` printed anything, and still wrote no lease. One report measured 499 s per skill start. The error also blamed a "live process" with an empty pid. diff --git a/VERSION b/VERSION index 7d734b27e..a62380468 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.91.228.0 +1.91.229.0 diff --git a/agents-digest/gstack-AGENTS.md b/agents-digest/gstack-AGENTS.md index b4e5fdadb..4cf8065f5 100644 --- a/agents-digest/gstack-AGENTS.md +++ b/agents-digest/gstack-AGENTS.md @@ -1,4 +1,4 @@ -# gstack digest v1.91.228.0 — regenerate/re-copy after upgrading gstack +# gstack digest v1.91.229.0 — regenerate/re-copy after upgrading gstack Behavioral rules from gstack (https://github.com/garrytan/gstack), compressed for agent hosts without a full skill install. The full skills add workflows, diff --git a/package.json b/package.json index f66c1ffae..8846de526 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gstack", - "version": "1.91.228", + "version": "1.91.229", "description": "Garry's Stack — Claude Code skills + fast headless browser. One repo, one install, entire AI engineering workflow.", "license": "MIT", "type": "module", From 4814b3d8a45338853145eb93ded63736c5848ebd Mon Sep 17 00:00:00 2001 From: Garry Tan Date: Sun, 25 Oct 2026 23:07:07 -0700 Subject: [PATCH 9/9] v1.91.230.0 feat(design-shotgun,design-html): archetype handoff and persisted craft exceptions (GSTA-92 phase 2) (#3422) * feat(design-html): craft section and free craft check, adapted from Elaya design skills (GSTA-92) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(GSTA-92): restore the full CHANGELOG under the Unreleased entry; drop a $-digit literal from craft.md; count only craft-check executions in design-html-slop-gate Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * feat(design-shotgun,design-html): carry the chosen archetype into approved.json; persist accepted craft exceptions in finalized.json (GSTA-92 phase 2) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(touchfiles): design-html-slop-gate selects on the craft check it runs (GSTA-92) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: pre-landing review fixes (GSTA-92) A malformed or missing --accepted exceptions file now gets the full craft check with nothing accepted, after a warning, still exiting 2. Before, it printed nothing, and the craft section treats a missing CRAFT_RESULT as 'check unavailable', so one bad finalized.json switched the gate off (found by both adversarial passes). The header comment and the craft section now document the accepted-count suffix on CRAFT_RESULT. Tests cover duplicate carried-forward exception ids and the slop-gate touchfiles selection. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix: scope --accepted to the same page; record current counts (GSTA-92) The craft section passed --accepted whenever a finalized.json sat beside the page, so a same-day Start fresh build inherited the old page's exceptions. It now passes them only when evolving or rerunning a page it finalized, records the count the check reports now, and writes [] when nothing was accepted instead of the template's placeholder entry. A test pins exit 2 for a clean page with a broken exceptions file. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs: note the archetype handoff in the shotgun and design-html loops (GSTA-92) 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> --- CHANGELOG.md | 13 ++++ VERSION | 2 +- agents-digest/gstack-AGENTS.md | 2 +- bin/gstack-design-craft | 39 +++++++--- design-html/SKILL.md | 6 +- design-html/SKILL.md.tmpl | 6 +- design-html/sections/craft.md | 6 +- design-html/sections/craft.md.tmpl | 6 +- design-shotgun/SKILL.md | 10 +-- design-shotgun/SKILL.md.tmpl | 10 +-- docs/skills.md | 4 +- lib/design-craft.ts | 40 ++++++++++- package.json | 2 +- test/design-craft.test.ts | 110 ++++++++++++++++++++++++++++- test/helpers/touchfiles-data.ts | 2 +- 15 files changed, 219 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc2778549..16e635d98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [1.91.230.0] - 2026-10-26 + +### Changed +- **The archetype the user picks on the /design-shotgun board now reaches /design-html.** Captions name the archetype id (`classic-hero`, `long-form-story`, `minimal-conversion`, `comparison`). On approval, approved.json also gets the chosen `archetype` and its `sections` outline, added with the Edit tool so no free text reaches a shell command. /design-html reads both in Case A, and the craft section uses them as given instead of choosing again or asking. +- **Accepted craft exceptions persist.** /design-html's finalized.json records each accepted `CRAFT_CHECK` finding in `craft_exceptions` (`id`, `count`, `reason`) and carries forward earlier ones. A later run passes that file with `--accepted`, so a finding the user already accepted is reported as accepted instead of flagged again. A higher count is still flagged as a new issue. + +### Added +- **`gstack-design-craft --accepted `**: a finding whose id an exception covers, at no more than the accepted count, prints `CRAFT_ACCEPTED: ` and doesn't fail the check. `CRAFT_RESULT` adds the accepted count. Exit codes: 0 when only accepted findings remain, 1 for unaccepted ones, and 2 for an unknown argument or a missing, unreadable or malformed exceptions file. A bad exceptions file still gets the full check with nothing accepted, after a warning, so a broken record can't switch the craft check off. A finalized.json with no `craft_exceptions` field, written before this change, means no exceptions. + +### Tests +- `design-html-slop-gate` is now selected by changes to `lib/design-craft.ts` and `bin/gstack-design-craft` (`test/helpers/touchfiles-data.ts`), which it already exercised but did not list. +- `test/design-craft.test.ts` also covers accepted exceptions: count coverage and overflow, duplicate ids carried forward (the highest count wins), a bad exceptions file still checked in full, the finalized.json block in design-html/SKILL.md parsed by the same reader the CLI uses, rejected malformed lists, CLI exit codes with `--accepted`, and the archetype handoff contract (the same four ids in /design-shotgun and the craft section, the approved.json step, Case A and the craft section's no-re-ask rule). + ## [1.91.229.0] - 2026-10-26 **The OpenSSF Scorecard workflow uploads its results with `github/codeql-action/upload-sarif` 4.39.0 (from 4.38.3), recreated from Dependabot's #3307.** Dependabot's branch can't take a version stamp at merge time, so the same one-line change ships from a crew branch. The new pin `6f2ac81f5cd81fe351a197ba0b00d91d03cd2aee` is the commit that the annotated tag `v4.39.0` points to in github/codeql-action, and GitHub shows that commit as verified. 4.39.0's one breaking change raises the minimum CodeQL bundle to 2.20.7, which applies to `init` and `analyze`. This workflow uses only `upload-sarif` with Scorecard's own SARIF file. diff --git a/VERSION b/VERSION index a62380468..2b6fc7540 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.91.229.0 +1.91.230.0 diff --git a/agents-digest/gstack-AGENTS.md b/agents-digest/gstack-AGENTS.md index 4cf8065f5..e920a894c 100644 --- a/agents-digest/gstack-AGENTS.md +++ b/agents-digest/gstack-AGENTS.md @@ -1,4 +1,4 @@ -# gstack digest v1.91.229.0 — regenerate/re-copy after upgrading gstack +# gstack digest v1.91.230.0 — regenerate/re-copy after upgrading gstack Behavioral rules from gstack (https://github.com/garrytan/gstack), compressed for agent hosts without a full skill install. The full skills add workflows, diff --git a/bin/gstack-design-craft b/bin/gstack-design-craft index 50c01cb9f..11569f4ed 100755 --- a/bin/gstack-design-craft +++ b/bin/gstack-design-craft @@ -1,20 +1,27 @@ #!/usr/bin/env -S bun --no-env-file --config=/dev/null // gstack-design-craft — free craft check for a generated page (/design-html Step 4). // -// Usage: gstack-design-craft +// Usage: gstack-design-craft [--accepted ] // // Prints one "CRAFT_CHECK: " line per tell, then // "CRAFT_RESULT: clean" (exit 0) or "CRAFT_RESULT: issue(s)" (exit 1). -// Exit 2: usage error, a non-HTML file, an unreadable or empty file. Head and -// navigation rules run only on a full HTML document; a fragment gets the copy -// and code rules alone. +// --accepted reads the craft_exceptions a finalized.json recorded: a tell an +// exception covers (same id, count at most the accepted count) prints as +// "CRAFT_ACCEPTED: " and does not fail the check; the +// result line then adds " ( accepted)" or ", accepted". +// Exit 2: usage error, a non-HTML file, or an unreadable or empty file, with +// nothing checked; or an unreadable or malformed exceptions file, after a +// warning and a full check with no exceptions accepted, so a bad record never +// hides the page's tells. Head and navigation rules run only on a full HTML +// document; a fragment gets the copy and code rules alone. import { readFileSync } from 'fs'; -import { checkCraft, formatCraft } from '../lib/design-craft'; +import { acceptFindings, checkCraft, formatCraft, parseCraftExceptions, type CraftException } from '../lib/design-craft'; -const file = process.argv[2]; -if (!file) { - console.error('Usage: gstack-design-craft '); +const USAGE = 'Usage: gstack-design-craft [--accepted ]'; +const [file, flag, acceptedFile, ...rest] = process.argv.slice(2); +if (!file || (flag !== undefined && (flag !== '--accepted' || !acceptedFile)) || rest.length > 0) { + console.error(USAGE); process.exit(2); } if (!/\.html?$/i.test(file)) { @@ -32,6 +39,16 @@ if (source.trim() === '') { console.error(`gstack-design-craft: ${file} is empty; nothing was checked`); process.exit(2); } -const findings = checkCraft(source); -console.log(formatCraft(findings)); -process.exit(findings.length === 0 ? 0 : 1); +let exceptions: CraftException[] = []; +let badExceptions = false; +if (acceptedFile) { + try { + exceptions = parseCraftExceptions(readFileSync(acceptedFile, 'utf-8')); + } catch (err) { + console.error(`gstack-design-craft: cannot use exceptions from ${acceptedFile}: ${(err as Error).message}; checked with none accepted`); + badExceptions = true; + } +} +const { issues, accepted } = acceptFindings(checkCraft(source), exceptions); +console.log(formatCraft(issues, accepted)); +process.exit(badExceptions ? 2 : issues.length === 0 ? 0 : 1); diff --git a/design-html/SKILL.md b/design-html/SKILL.md index 3f33d4f00..fa2c85ac8 100644 --- a/design-html/SKILL.md +++ b/design-html/SKILL.md @@ -462,7 +462,8 @@ Now route based on what was found. Check these cases in order: ### Case A: approved.json exists (design-shotgun ran) -If `APPROVED` was found, read it for user feedback and screen name, and resolve the +If `APPROVED` was found, read it for user feedback, screen name, and any `archetype` +and `sections` (the craft section takes them as given), and resolve the approved PNG (never guess it from a letter or the newest variant): ```bash @@ -731,7 +732,7 @@ _DJ=$(mktemp "${TMPDIR:-/tmp}/gstack-detect.XXXXXX"); bun --no-env-file --config Exit 2 → one surgical fix pass over the non-advisory rules in the `DETECT_TOP` block, then scan once more. Whatever remains, present the page with those findings listed as accepted-with-reason: a pattern the approved mockup contains, a value DESIGN.md's tokens bless or a pattern its Decisions Log or Do's and Don'ts records as intentional, or an inline `` the user agreed to. One pass, not a loop. Any other first line from the probe: skip, no ceremony. -Then, always: the craft section's check, `~/.claude/skills/gstack/bin/gstack-design-craft `, one fix pass and one rerun, as above. +Then, always: the craft section's check, `~/.claude/skills/gstack/bin/gstack-design-craft ` (plus `--accepted` per the section), one fix pass and one rerun, as above. ### Verification Screenshots @@ -832,6 +833,7 @@ Write `finalized.json` alongside the HTML: "pretext_tier": "", "framework": "", "iterations": , + "craft_exceptions": [{"id": "", "count": , "reason": ""}], "date": "", "screen": "", "branch": "" diff --git a/design-html/SKILL.md.tmpl b/design-html/SKILL.md.tmpl index 998782370..80d425437 100644 --- a/design-html/SKILL.md.tmpl +++ b/design-html/SKILL.md.tmpl @@ -82,7 +82,8 @@ Now route based on what was found. Check these cases in order: ### Case A: approved.json exists (design-shotgun ran) -If `APPROVED` was found, read it for user feedback and screen name, and resolve the +If `APPROVED` was found, read it for user feedback, screen name, and any `archetype` +and `sections` (the craft section takes them as given), and resolve the approved PNG (never guess it from a letter or the newest variant): ```bash @@ -341,7 +342,7 @@ kill 2>/dev/null || true {{DESIGN_DETECTOR:gate}} -Then, always: the craft section's check, `{{BIN_DIR}}/gstack-design-craft `, one fix pass and one rerun, as above. +Then, always: the craft section's check, `{{BIN_DIR}}/gstack-design-craft ` (plus `--accepted` per the section), one fix pass and one rerun, as above. ### Verification Screenshots @@ -442,6 +443,7 @@ Write `finalized.json` alongside the HTML: "pretext_tier": "", "framework": "", "iterations": , + "craft_exceptions": [{"id": "", "count": , "reason": ""}], "date": "", "screen": "", "branch": "" diff --git a/design-html/sections/craft.md b/design-html/sections/craft.md index 1630f7fb9..e17d7ee12 100644 --- a/design-html/sections/craft.md +++ b/design-html/sections/craft.md @@ -13,7 +13,7 @@ - who it is for, the problem they came with, their top three objections, what they already know - the proof the user can supply (named customers, attributed quotes, real numbers) and the risk terms the business offers -**Archetype.** Pick one and say why in the spec's layout type: **classic hero + sections** (default; the product reads from one screenshot), **long-form story** (the visitor needs educating or is skeptical), **minimal conversion** (high-intent traffic or a small offer), **comparison** (search intent is "X vs Y"). +**Archetype.** When approved.json carries an `archetype`, the user already chose it on the /design-shotgun board: take it and its `sections` outline as given, name both in the spec's layout type, and do not re-pick or re-ask. Otherwise pick one and say why there: **classic hero + sections** (`classic-hero`, default; the product reads from one screenshot), **long-form story** (`long-form-story`, the visitor needs educating or is skeptical), **minimal conversion** (`minimal-conversion`, high-intent traffic or a small offer), **comparison** (`comparison`, search intent is "X vs Y"). **Structure.** Above the fold at 375×667 and on desktop, inside the hero budget: a headline naming outcome and audience, one sentence on how, one primary CTA, one proof signal only when real proof exists (named logos or one attributed quote; a metric row stays banned), one product visual. Below it, choose modules and order from the archetype and the objections. The long-form menu: problem → solution, three to five benefits, how it works in three steps, proof, an FAQ of six to twelve real objections, the risk reversal, a final CTA identical to the top. A minimal page stays minimal; a comparison page leads with the comparison. @@ -65,7 +65,9 @@ At Step 4, after the Slop Gate and before the screenshots, run the free checker ~/.claude/skills/gstack/bin/gstack-design-craft ``` -It prints one `CRAFT_CHECK: ` line per tell (the realism rules above, `[Needs proof:` markers, scroll listeners, `100vh`, `transition: all`, `href="#"`, `alert()`, missing alt; on a full document a missing title, description, favicon, working skip link, or `aria-current` on route navigation), then `CRAFT_RESULT: clean` or `CRAFT_RESULT: issue(s)`. No `CRAFT_RESULT` line: say the check was unavailable and continue. Same contract as the Slop Gate: one surgical fix pass, one rerun, the rest listed as accepted-with-reason (a real customer named Nexus, a supplied 50% figure). Rerun once when the refinement loop exits; report only new lines. +It prints one `CRAFT_CHECK: ` line per tell (the realism rules above, `[Needs proof:` markers, scroll listeners, `100vh`, `transition: all`, `href="#"`, `alert()`, missing alt; on a full document a missing title, description, favicon, working skip link, or `aria-current` on route navigation), then `CRAFT_RESULT: clean` or `CRAFT_RESULT: issue(s)`, plus the accepted count when `--accepted` covers any. No `CRAFT_RESULT` line: say the check was unavailable and continue. Same contract as the Slop Gate: one surgical fix pass, one rerun, the rest listed as accepted-with-reason (a real customer named Nexus, a supplied 50% figure). Rerun once when the refinement loop exits; report only new lines. + +**Accepted exceptions persist.** Step 5's finalized.json records each one in `craft_exceptions` as `{ id, count, reason }`, carrying forward earlier ones the check still reports at the count it reports now (`[]` when none, never the template's placeholder entry). When evolving a finalized page, or rerunning on the page this run finalized, append `--accepted ` to the command; never after Start fresh or for a new page, whose old exceptions covered different content: a tell it covers prints `CRAFT_ACCEPTED: ` and does not fail the check, so name those as accepted earlier instead of fixing or re-flagging them. A count above the accepted one stays a `CRAFT_CHECK` line; it is new, so fix it or accept the new count with a reason. A `cannot use exceptions` warning with exit 2 means that record is malformed: the page was still checked with none accepted, so treat every line as new and write `craft_exceptions` correctly at Step 5. **Before this can ship.** Open the Step 4 hand-off, and repeat before Step 5's "Copy to project": every `[Needs proof: …]` marker, the dependencies the page cannot own (legal URLs, form endpoint, og:image, indexing, analytics and cookie consent where required), the accepted exceptions, and every claim the check made you change. diff --git a/design-html/sections/craft.md.tmpl b/design-html/sections/craft.md.tmpl index e6119d84d..b249a50ee 100644 --- a/design-html/sections/craft.md.tmpl +++ b/design-html/sections/craft.md.tmpl @@ -11,7 +11,7 @@ - who it is for, the problem they came with, their top three objections, what they already know - the proof the user can supply (named customers, attributed quotes, real numbers) and the risk terms the business offers -**Archetype.** Pick one and say why in the spec's layout type: **classic hero + sections** (default; the product reads from one screenshot), **long-form story** (the visitor needs educating or is skeptical), **minimal conversion** (high-intent traffic or a small offer), **comparison** (search intent is "X vs Y"). +**Archetype.** When approved.json carries an `archetype`, the user already chose it on the /design-shotgun board: take it and its `sections` outline as given, name both in the spec's layout type, and do not re-pick or re-ask. Otherwise pick one and say why there: **classic hero + sections** (`classic-hero`, default; the product reads from one screenshot), **long-form story** (`long-form-story`, the visitor needs educating or is skeptical), **minimal conversion** (`minimal-conversion`, high-intent traffic or a small offer), **comparison** (`comparison`, search intent is "X vs Y"). **Structure.** Above the fold at 375×667 and on desktop, inside the hero budget: a headline naming outcome and audience, one sentence on how, one primary CTA, one proof signal only when real proof exists (named logos or one attributed quote; a metric row stays banned), one product visual. Below it, choose modules and order from the archetype and the objections. The long-form menu: problem → solution, three to five benefits, how it works in three steps, proof, an FAQ of six to twelve real objections, the risk reversal, a final CTA identical to the top. A minimal page stays minimal; a comparison page leads with the comparison. @@ -63,7 +63,9 @@ At Step 4, after the Slop Gate and before the screenshots, run the free checker {{BIN_DIR}}/gstack-design-craft ``` -It prints one `CRAFT_CHECK: ` line per tell (the realism rules above, `[Needs proof:` markers, scroll listeners, `100vh`, `transition: all`, `href="#"`, `alert()`, missing alt; on a full document a missing title, description, favicon, working skip link, or `aria-current` on route navigation), then `CRAFT_RESULT: clean` or `CRAFT_RESULT: issue(s)`. No `CRAFT_RESULT` line: say the check was unavailable and continue. Same contract as the Slop Gate: one surgical fix pass, one rerun, the rest listed as accepted-with-reason (a real customer named Nexus, a supplied 50% figure). Rerun once when the refinement loop exits; report only new lines. +It prints one `CRAFT_CHECK: ` line per tell (the realism rules above, `[Needs proof:` markers, scroll listeners, `100vh`, `transition: all`, `href="#"`, `alert()`, missing alt; on a full document a missing title, description, favicon, working skip link, or `aria-current` on route navigation), then `CRAFT_RESULT: clean` or `CRAFT_RESULT: issue(s)`, plus the accepted count when `--accepted` covers any. No `CRAFT_RESULT` line: say the check was unavailable and continue. Same contract as the Slop Gate: one surgical fix pass, one rerun, the rest listed as accepted-with-reason (a real customer named Nexus, a supplied 50% figure). Rerun once when the refinement loop exits; report only new lines. + +**Accepted exceptions persist.** Step 5's finalized.json records each one in `craft_exceptions` as `{ id, count, reason }`, carrying forward earlier ones the check still reports at the count it reports now (`[]` when none, never the template's placeholder entry). When evolving a finalized page, or rerunning on the page this run finalized, append `--accepted ` to the command; never after Start fresh or for a new page, whose old exceptions covered different content: a tell it covers prints `CRAFT_ACCEPTED: ` and does not fail the check, so name those as accepted earlier instead of fixing or re-flagging them. A count above the accepted one stays a `CRAFT_CHECK` line; it is new, so fix it or accept the new count with a reason. A `cannot use exceptions` warning with exit 2 means that record is malformed: the page was still checked with none accepted, so treat every line as new and write `craft_exceptions` correctly at Step 5. **Before this can ship.** Open the Step 4 hand-off, and repeat before Step 5's "Copy to project": every `[Needs proof: …]` marker, the dependencies the page cannot own (legal URLs, form endpoint, og:image, indexing, analytics and cookie consent where required), the accepted exceptions, and every claim the check made you change. diff --git a/design-shotgun/SKILL.md b/design-shotgun/SKILL.md index cc9703d6b..2e7608b4c 100644 --- a/design-shotgun/SKILL.md +++ b/design-shotgun/SKILL.md @@ -634,9 +634,9 @@ Draw on DESIGN.md, taste memory, and the user's request to make each concept dis exists, it decides what varies: keep its fonts and palette and vary layout and composition. Without one, vary font family, color palette, and layout approach. If two variants look like siblings, rework the weaker one with a deliberately different direction. -For a landing, pricing or campaign screen, also vary the page archetype (classic hero, -long-form story, minimal conversion, comparison), keep the one primary action identical, -and caption each variant with its section outline. +For a landing, pricing or campaign screen, also vary the page archetype (`classic-hero`, +`long-form-story`, `minimal-conversion`, `comparison`), keep the one primary action +identical, and caption each variant with its archetype id and section outline. Concrete test: if someone could swap the headline text between two variants without noticing, they're too similar. Variants should feel like separate design teams made @@ -880,7 +880,9 @@ Use AskUserQuestion to confirm before saving. ## Step 6: Save & Next Steps -Write `approved.json` to `$_DESIGN_DIR/` (handled by the loop above). +Write `approved.json` to `$_DESIGN_DIR/` (handled by the loop above). When the variants +varied archetype, then add the chosen variant's `archetype` id and `sections` (its outline +as an array of section names) to it with the Edit tool; /design-html takes them as given. If invoked from another skill: return the structured feedback for that skill to consume. The calling skill reads `approved.json` and resolves the approved image with diff --git a/design-shotgun/SKILL.md.tmpl b/design-shotgun/SKILL.md.tmpl index a037184ad..ac85e05c4 100644 --- a/design-shotgun/SKILL.md.tmpl +++ b/design-shotgun/SKILL.md.tmpl @@ -219,9 +219,9 @@ Draw on DESIGN.md, taste memory, and the user's request to make each concept dis exists, it decides what varies: keep its fonts and palette and vary layout and composition. Without one, vary font family, color palette, and layout approach. If two variants look like siblings, rework the weaker one with a deliberately different direction. -For a landing, pricing or campaign screen, also vary the page archetype (classic hero, -long-form story, minimal conversion, comparison), keep the one primary action identical, -and caption each variant with its section outline. +For a landing, pricing or campaign screen, also vary the page archetype (`classic-hero`, +`long-form-story`, `minimal-conversion`, `comparison`), keep the one primary action +identical, and caption each variant with its archetype id and section outline. Concrete test: if someone could swap the headline text between two variants without noticing, they're too similar. Variants should feel like separate design teams made @@ -286,7 +286,9 @@ Use AskUserQuestion to confirm before saving. ## Step 6: Save & Next Steps -Write `approved.json` to `$_DESIGN_DIR/` (handled by the loop above). +Write `approved.json` to `$_DESIGN_DIR/` (handled by the loop above). When the variants +varied archetype, then add the chosen variant's `archetype` id and `sections` (its outline +as an array of section names) to it with the Edit tool; /design-html takes them as given. If invoked from another skill: return the structured feedback for that skill to consume. The calling skill reads `approved.json` and resolves the approved image with diff --git a/docs/skills.md b/docs/skills.md index e6cb489bf..718376b7f 100644 --- a/docs/skills.md +++ b/docs/skills.md @@ -462,7 +462,7 @@ You know the feeling. You have a feature, a page, a landing screen... and you're 3. It generates 3 distinct design variants as PNGs 4. A comparison board opens in your browser with all 3 side-by-side 5. You click "Approve" on the one you like, or give feedback for another round -6. The approved variant saves to `~/.gstack/projects/$SLUG/designs/` with an `approved.json` +6. The approved variant saves to `~/.gstack/projects/$SLUG/designs/` with an `approved.json`; for a landing, pricing or campaign screen, it also records the page archetype you picked (`classic-hero`, `long-form-story`, `minimal-conversion` or `comparison`) and its section outline That `approved.json` is one way to feed `/design-html`. The design pipeline chains: shotgun picks the direction, design-html renders it as working code. But `/design-html` also works with CEO plans, design reviews, or just a description. @@ -512,7 +512,7 @@ Not every page needs the full Pretext engine. The skill reads the design and pic ### The refinement loop -1. Reads the approved mockup from `approved.json` +1. Reads the approved mockup from `approved.json`, plus any page archetype and section outline you picked on the board, which it builds as given instead of asking again 2. Uses GPT-4o vision to extract implementation spec (colors, typography, layout) 3. Generates self-contained HTML with Pretext inlined (15KB, zero network dependency) 4. Spins up a live-reload server so you see changes instantly diff --git a/lib/design-craft.ts b/lib/design-craft.ts index 94198739f..faa5a12dc 100644 --- a/lib/design-craft.ts +++ b/lib/design-craft.ts @@ -103,8 +103,42 @@ export function checkCraft(html: string): CraftFinding[] { return findings; } -export function formatCraft(findings: CraftFinding[]): string { - const lines = findings.map(f => `CRAFT_CHECK: ${f.id} ${f.count} ${f.fix}`); - lines.push(findings.length === 0 ? 'CRAFT_RESULT: clean' : `CRAFT_RESULT: ${findings.length} issue(s)`); +/** An accepted finding recorded in finalized.json's `craft_exceptions`. */ +export interface CraftException { + id: string; + count: number; + reason: string; +} + +/** Reads `craft_exceptions` from a finalized.json; a record without one has none. Throws on a malformed record. */ +export function parseCraftExceptions(json: string): CraftException[] { + const record = JSON.parse(json); + if (typeof record !== 'object' || record === null || Array.isArray(record)) throw new Error('not a finalized.json object'); + const list = record.craft_exceptions ?? []; + const valid = (e: any) => typeof e?.id === 'string' && Number.isInteger(e.count) && e.count > 0 && typeof e.reason === 'string' && e.reason.trim() !== ''; + if (!Array.isArray(list) || !list.every(valid)) throw new Error('craft_exceptions must be a list of { id, count, reason } with a positive count and a reason'); + return list.map(({ id, count, reason }) => ({ id, count, reason: reason.replace(/\s+/g, ' ').trim() })); +} + +/** A finding is accepted when an exception names its id with at least its count; a higher count stays an issue and says how many were accepted. */ +export function acceptFindings(findings: CraftFinding[], exceptions: CraftException[]): { issues: CraftFinding[]; accepted: CraftException[] } { + const issues: CraftFinding[] = []; + const accepted: CraftException[] = []; + for (const finding of findings) { + const exception = exceptions.filter(e => e.id === finding.id).sort((a, b) => b.count - a.count)[0]; + if (!exception) issues.push(finding); + else if (finding.count <= exception.count) accepted.push({ id: finding.id, count: finding.count, reason: exception.reason }); + else issues.push({ ...finding, fix: `${finding.fix} (${exception.count} accepted earlier: ${exception.reason})` }); + } + return { issues, accepted }; +} + +export function formatCraft(findings: CraftFinding[], accepted: CraftException[] = []): string { + const lines = [ + ...findings.map(f => `CRAFT_CHECK: ${f.id} ${f.count} ${f.fix}`), + ...accepted.map(a => `CRAFT_ACCEPTED: ${a.id} ${a.count} ${a.reason}`), + ]; + const note = accepted.length === 0 ? '' : findings.length === 0 ? ` (${accepted.length} accepted)` : `, ${accepted.length} accepted`; + lines.push(`${findings.length === 0 ? 'CRAFT_RESULT: clean' : `CRAFT_RESULT: ${findings.length} issue(s)`}${note}`); return lines.join('\n'); } diff --git a/package.json b/package.json index 8846de526..7c5eb415d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gstack", - "version": "1.91.229", + "version": "1.91.230", "description": "Garry's Stack — Claude Code skills + fast headless browser. One repo, one install, entire AI engineering workflow.", "license": "MIT", "type": "module", diff --git a/test/design-craft.test.ts b/test/design-craft.test.ts index d6d832f3b..f1c2af57b 100644 --- a/test/design-craft.test.ts +++ b/test/design-craft.test.ts @@ -2,8 +2,10 @@ import { describe, expect, test } from 'bun:test'; import * as fs from 'fs'; import * as os from 'os'; import * as path from 'path'; -import { BUZZWORDS, checkCraft, formatCraft, visibleText } from '../lib/design-craft'; +import { acceptFindings, BUZZWORDS, checkCraft, formatCraft, parseCraftExceptions, visibleText } from '../lib/design-craft'; import { catalogEntry } from '../lib/design-catalog'; +import { selectTests } from './helpers/test-selection'; +import { E2E_TOUCHFILES } from './helpers/touchfiles-data'; const ROOT = path.resolve(import.meta.dir, '..'); const BIN = path.join(ROOT, 'bin', 'gstack-design-craft'); @@ -21,8 +23,8 @@ const CLEAN = `Ledgerline: close the <main id="main"><h1>Close the books in 2 days, not 9</h1><p>Teams at Halvorsen Freight cut month-end by 47.2%. Save 20% yearly. 100% open source. 30-day refund.</p><img src="x.png" alt=""></main> <script>const io = new IntersectionObserver(() => {}); window.showAlert = () => {};</script></body></html>`; -function run(file?: string) { - const r = Bun.spawnSync([BIN, ...(file ? [file] : [])], { stdout: 'pipe', stderr: 'pipe', timeout: 30_000 }); +function run(file?: string, ...extra: string[]) { + const r = Bun.spawnSync([BIN, ...(file ? [file] : []), ...extra], { stdout: 'pipe', stderr: 'pipe', timeout: 30_000 }); return { code: r.exitCode, out: r.stdout.toString(), err: r.stderr.toString() }; } @@ -116,3 +118,105 @@ describe('design-craft check', () => { } }); }); + +describe('accepted craft exceptions (finalized.json craft_exceptions)', () => { + test('an exception covers its id up to the accepted count; a higher count stays an issue and names the accepted count', () => { + const findings = checkCraft(DIRTY); + const { issues, accepted } = acceptFindings(findings, [ + { id: 'placeholder-brand', count: 1, reason: 'Acme is the real customer' }, + { id: 'round-number', count: 2, reason: 'supplied figures' }, + { id: 'scroll-listener', count: 5, reason: 'unused' }, + ]); + expect(accepted).toEqual([{ id: 'placeholder-brand', count: 1, reason: 'Acme is the real customer' }, { id: 'scroll-listener', count: 1, reason: 'unused' }]); + expect(issues.find(f => f.id === 'round-number')?.fix).toEndWith('(2 accepted earlier: supplied figures)'); + expect(issues).toHaveLength(findings.length - 2); + expect(formatCraft([], accepted)).toBe('CRAFT_ACCEPTED: placeholder-brand 1 Acme is the real customer\nCRAFT_ACCEPTED: scroll-listener 1 unused\nCRAFT_RESULT: clean (2 accepted)'); + const carried = [{ id: 'round-number', count: 1, reason: 'first run' }, { id: 'round-number', count: 3, reason: 'supplied figures' }]; + for (const list of [carried, [...carried].reverse()]) { + expect(acceptFindings([{ id: 'round-number', count: 3, fix: 'use the supplied figure' }], list)).toEqual({ issues: [], accepted: [{ id: 'round-number', count: 3, reason: 'supplied figures' }] }); + } + }); + + test('parseCraftExceptions reads the finalized.json design-html writes and rejects a malformed list', () => { + const skill = fs.readFileSync(path.join(ROOT, 'design-html', 'SKILL.md'), 'utf-8'); + const block = skill.slice(skill.indexOf('Write `finalized.json` alongside the HTML')).match(/```json\n([\s\S]*?)```/)![1]; + const record = JSON.parse(block.replace(/<number of refinement iterations>|<n>/g, '1')); + expect(parseCraftExceptions(JSON.stringify(record))).toEqual([{ id: '<craft id>', count: 1, reason: '<why accepted>' }]); + expect(parseCraftExceptions('{"mode":"freeform"}')).toEqual([]); + expect(parseCraftExceptions('{"craft_exceptions":[{"id":"oops","count":1,"reason":"quoted\\nfrom the user"}]}')).toEqual([{ id: 'oops', count: 1, reason: 'quoted from the user' }]); + for (const bad of ['[]', 'null', '{"craft_exceptions":{}}', '{"craft_exceptions":[{"id":"oops","count":0,"reason":"x"}]}', '{"craft_exceptions":[{"id":"oops","count":1,"reason":" "}]}', '{"craft_exceptions":[{"id":"oops","count":1.5,"reason":"x"}]}']) { + expect(() => parseCraftExceptions(bad)).toThrow(); + } + }); + + test('the CLI reports accepted tells as CRAFT_ACCEPTED lines: exit 0 when only accepted ones remain, 1 for the rest, 2 on a bad exceptions file after a full check with none accepted', () => { + const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'design-craft-accepted-')); + try { + const page = path.join(dir, 'finalized.html'); + const record = path.join(dir, 'finalized.json'); + fs.writeFileSync(page, CLEAN.replace('Halvorsen Freight', 'Acme')); + fs.writeFileSync(record, JSON.stringify({ mode: 'evolve', craft_exceptions: [{ id: 'placeholder-brand', count: 1, reason: 'Acme Freight is the customer' }] })); + expect(run(page, '--accepted', record)).toMatchObject({ code: 0, out: 'CRAFT_ACCEPTED: placeholder-brand 1 Acme Freight is the customer\nCRAFT_RESULT: clean (1 accepted)\n' }); + expect(run(page).code).toBe(1); + fs.writeFileSync(page, CLEAN.replace('Halvorsen Freight', 'Acme and Nexus')); + const twice = run(page, '--accepted', record); + expect(twice.code).toBe(1); + expect(twice.out).toBe('CRAFT_CHECK: placeholder-brand 2 use a supplied customer, or a fitting name in sample data (1 accepted earlier: Acme Freight is the customer)\nCRAFT_RESULT: 1 issue(s)\n'); + fs.writeFileSync(page, DIRTY); + const dirty = run(page, '--accepted', record); + expect(dirty.code).toBe(1); + expect(dirty.out).toContain('CRAFT_ACCEPTED: placeholder-brand 1 '); + expect(dirty.out.trim().split('\n').at(-1)).toBe('CRAFT_RESULT: 17 issue(s), 1 accepted'); + fs.writeFileSync(path.join(dir, 'old.json'), JSON.stringify({ mode: 'freeform' })); + expect(run(page, '--accepted', path.join(dir, 'old.json')).out).toBe(run(page).out); + fs.writeFileSync(path.join(dir, 'bad.json'), '{"craft_exceptions":[{"id":"oops"}]}'); + fs.writeFileSync(path.join(dir, 'broken.json'), '{'); + for (const name of ['bad.json', 'broken.json', 'missing.json']) { + const bad = run(page, '--accepted', path.join(dir, name)); + expect(bad).toMatchObject({ code: 2, out: run(page).out }); + expect(bad.err).toContain('checked with none accepted'); + } + fs.writeFileSync(page, CLEAN); + expect(run(page, '--accepted', path.join(dir, 'broken.json'))).toMatchObject({ code: 2, out: 'CRAFT_RESULT: clean\n' }); + expect(run(page, '--accepted').code).toBe(2); + expect(run(page, '--strict').code).toBe(2); + expect(run(page, '--accepted', record, 'extra').code).toBe(2); + } finally { + fs.rmSync(dir, { recursive: true, force: true }); + } + }); +}); + +describe('design-shotgun to design-html handoff', () => { + const ARCHETYPES = ['classic-hero', 'long-form-story', 'minimal-conversion', 'comparison']; + const read = (...p: string[]) => fs.readFileSync(path.join(ROOT, ...p), 'utf-8'); + + test('design-shotgun records the chosen archetype and outline in approved.json, and design-html takes them as given', () => { + const shotgun = read('design-shotgun', 'SKILL.md'); + const craft = read('design-html', 'sections', 'craft.md'); + const html = read('design-html', 'SKILL.md'); + for (const id of ARCHETYPES) { + expect(shotgun).toContain(`\`${id}\``); + expect(craft).toContain(`\`${id}\``); + } + const save = shotgun.slice(shotgun.indexOf('## Step 6: Save & Next Steps')); + expect(save).toMatch(/add the chosen variant's `archetype` id and `sections`[^.]*to it with the Edit tool/); + expect(html.slice(html.indexOf('### Case A'), html.indexOf('### Case B'))).toContain('any `archetype`\nand `sections`'); + expect(craft).toMatch(/When approved\.json carries an `archetype`[^.]*: take it and its `sections` outline as given[^.]*do not re-pick or re-ask/); + }); + + test('a change to the craft checker selects the design-html-slop-gate E2E that runs it', () => { + for (const file of ['lib/design-craft.ts', 'bin/gstack-design-craft']) { + expect(selectTests([file], E2E_TOUCHFILES).selected).toContain('design-html-slop-gate'); + } + }); + + test('design-html persists accepted exceptions and passes them back with --accepted', () => { + const html = read('design-html', 'SKILL.md'); + const craft = read('design-html', 'sections', 'craft.md'); + expect(html).toMatch(/gstack-design-craft <path-to-finalized\.html>` \(plus `--accepted` per the section\)/); + expect(craft).toContain('records each one in `craft_exceptions`'); + expect(craft).toContain('append `--accepted <that finalized.json>` to the command'); + expect(craft).toContain('CRAFT_ACCEPTED: <id> <count> <reason>'); + }); +}); diff --git a/test/helpers/touchfiles-data.ts b/test/helpers/touchfiles-data.ts index 8c8856d66..0f0376441 100644 --- a/test/helpers/touchfiles-data.ts +++ b/test/helpers/touchfiles-data.ts @@ -856,7 +856,7 @@ export const E2E_TOUCHFILES: Record<string, string[]> = { 'design-review-detector-shim-dom': ['bin/gstack-state-root.sh', 'lib/state-root.ts', 'design-review/**', 'scripts/resolvers/design.ts', 'scripts/resolvers/outside-voice.ts', 'lib/design-detect-contract.ts', 'lib/dom-dump-script.ts', 'lib/dom-dump.js', 'bin/gstack-design-detect.ts', 'browse/src/**', 'test/helpers/fake-impeccable.ts', 'test/fixtures/fake-impeccable.ts', 'test/fixtures/impeccable-detect-sample.json', 'test/fixtures/review-eval-design-slop.*', 'test/skill-e2e-design.test.ts', 'scripts/resolvers/testing.ts', 'test/helpers/aside-available.ts', 'test/helpers/llm-judge.ts', 'test/helpers/office-hours-attempt.ts'], 'design-review-plugin-handoff': ['bin/gstack-state-root.sh', 'lib/state-root.ts', 'design-review/**', 'scripts/resolvers/design.ts', 'scripts/resolvers/outside-voice.ts', 'scripts/resolvers/testing.ts', 'lib/design-catalog.ts', 'lib/design-detect-contract.ts', 'bin/gstack-design-detect.ts', 'test/helpers/hermetic-env.ts', 'test/helpers/fake-impeccable.ts', 'test/fixtures/fake-impeccable.ts', 'test/fixtures/impeccable-detect-sample.json', 'test/fixtures/review-eval-design-slop.html', 'test/fixtures/review-eval-design-slop.css', 'test/skill-e2e-design.test.ts', 'test/helpers/aside-available.ts', 'test/helpers/llm-judge.ts', 'test/helpers/office-hours-attempt.ts'], - 'design-html-slop-gate': ['bin/gstack-state-root.sh', 'lib/state-root.ts', 'design-html/**', 'scripts/resolvers/design.ts', 'scripts/resolvers/outside-voice.ts', 'lib/design-detect-contract.ts', 'bin/gstack-design-detect.ts', 'test/helpers/fake-impeccable.ts', 'test/fixtures/fake-impeccable.ts', 'test/fixtures/impeccable-detect-sample.json', 'test/skill-e2e-design.test.ts', 'test/fixtures/review-eval-design-slop.html', 'test/fixtures/review-eval-design-slop.css', 'test/helpers/aside-available.ts', 'test/helpers/llm-judge.ts', 'test/helpers/office-hours-attempt.ts'], + 'design-html-slop-gate': ['bin/gstack-state-root.sh', 'lib/state-root.ts', 'design-html/**', 'scripts/resolvers/design.ts', 'scripts/resolvers/outside-voice.ts', 'lib/design-detect-contract.ts', 'bin/gstack-design-detect.ts', 'lib/design-craft.ts', 'bin/gstack-design-craft', 'test/helpers/fake-impeccable.ts', 'test/fixtures/fake-impeccable.ts', 'test/fixtures/impeccable-detect-sample.json', 'test/skill-e2e-design.test.ts', 'test/fixtures/review-eval-design-slop.html', 'test/fixtures/review-eval-design-slop.css', 'test/helpers/aside-available.ts', 'test/helpers/llm-judge.ts', 'test/helpers/office-hours-attempt.ts'], // /diagram (diagram-render bundle consumers). Triplet = deterministic // functional (gate); authoring quality = LLM-judged benchmark (periodic).