mirror of
https://github.com/garrytan/gstack.git
synced 2026-11-05 00:03:15 +01:00
* fix: mark Remaining Work provenance so restore verifies guessed steps first (#3004) /context-save now starts every Remaining Work item with `Open.` and ends it with how this session knows it: `(path run)` with the observed outcome, `(path read)` or `(path assumed)` for concrete paths, and `(target state checked)`, `(code read)` or `(path assumed)` for writing steps. /context-restore keeps saved order and original text but splits the list into Next steps and Verify first (assumed, code-read, failed runs and unmarked concrete or writing items), prints a banner for pre-marker checkpoints, and option A walks saved order so an unverified first item is verified before any later step runs. Adds a prompt-byte contract test for the marker wire format and a periodic behavior E2E (context-restore-provenance-order) that seeds an assumed item ahead of a run item plus a code-read write. Co-authored-by: Matt Van Horn <455140+mvanhorn@users.noreply.github.com> * fix(design): never overwrite a paid design image (#1529) Every image the API returns now goes through one persistence path (design/src/persist.ts): mkdir, exclusive `wx` claim that bumps x.png -> x-2.png ... x-999.png, write, fsync, close. A failure after the bytes arrived removes the claimed file and keeps a 0600 recovery copy in the temp dir; empty image data is a failure, never a 0-byte PNG. The API call is the only thing inside each retry loop, so a local save failure never buys a second image (variants, iterate fallback, generate --retry). generate, iterate, evolve and variants (both branches) print the same run fields (requested, saved, selected, failures, recovered) on every exit, with exit 0 / 2 (nothing saved) / 3 (stopped after saving). Each generate --retry attempt is its own saved image listed in `attempts`. compare accepts --images-file and JSON-array --images. The gallery lists bumped names, orders history by mtime then board-images.json, and marks approvals by approved_path. New bin/gstack-design-claim publishes staged images without clobbering; bin/gstack-design-approved resolves an approval record (legacy letter-only records still resolve; a missing approved_path is an error, never a substitute). Co-authored-by: Matt Van Horn <455140+mvanhorn@users.noreply.github.com> * fix(design skills): read the paths $D printed, never fixed variant names (#1529) Every design flow now captures each generating $D command's JSON and exit code without set -e, does round accounting before the first board, check or inline view (stopping when nothing was saved), and carries the printed paths forward. Boards are built from board-images.json via compare --images-file after archiving any earlier feedback.json, and approvals map the confirmed letter through that file and record approved_path. design-shotgun subagents generate into a per-run mktemp staging directory and publish with bin/gstack-design-claim instead of a shared /tmp/variant-X.png plus cp. design-html and taste memory resolve approvals with gstack-design-approved; design-review verifies against the printed target path. test/design-printed-paths.test.ts bans fixed variant names, variant globs, variant-{letter} reads, cp/mv of $D output and literal check paths in the generated skills and resolvers (one content-anchored allowlist entry: the design-html discovery probe), and pins the accounting/board marker order. test/design-approval-flow.test.ts runs the generated board and approval blocks through a stubbed two-round flow. * chore: release v1.91.17.0 (mvanhorn fix wave: checkpoint provenance, never-overwrite design images) * fix(design): keep iterate sessions in the OS temp dir and normalize tripwire paths on Windows * fix(setup-deploy): report failing status commands, specify merge-method, health and workflow checks --------- Co-authored-by: Matt Van Horn <455140+mvanhorn@users.noreply.github.com>
57 lines
2.1 KiB
TypeScript
57 lines
2.1 KiB
TypeScript
/**
|
|
* Resolve the image an approval record names. `approved_path` is stored
|
|
* relative to the directory holding approved.json, so a copied or relocated
|
|
* designs directory still resolves. Records without `approved_path` (written
|
|
* before never-overwrite) fall back to `variant-<approved_variant>.png`. A
|
|
* present `approved_path` whose file is missing is an error: another image is
|
|
* never substituted.
|
|
*/
|
|
|
|
import fs from "fs";
|
|
import path from "path";
|
|
|
|
export type ApprovedImage = { ok: true; path: string; legacy: boolean } | { ok: false; error: string };
|
|
|
|
export interface ApprovalRecord {
|
|
approved_variant?: unknown;
|
|
approved_path?: unknown;
|
|
}
|
|
|
|
function missing(imagePath: string): ApprovedImage {
|
|
return { ok: false, error: `approved image ${imagePath} is missing; reselect from the board` };
|
|
}
|
|
|
|
function readable(imagePath: string): boolean {
|
|
try {
|
|
fs.accessSync(imagePath, fs.constants.R_OK);
|
|
return fs.statSync(imagePath).isFile();
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
/** The image path a record names, without checking that it exists. */
|
|
export function approvedImagePath(record: ApprovalRecord, recordDir: string): { path: string; legacy: boolean } | null {
|
|
if (typeof record.approved_path === "string" && record.approved_path !== "") {
|
|
return { path: path.resolve(recordDir, record.approved_path), legacy: false };
|
|
}
|
|
if (typeof record.approved_variant === "string" && record.approved_variant !== "") {
|
|
return { path: path.join(recordDir, `variant-${record.approved_variant}.png`), legacy: true };
|
|
}
|
|
return null;
|
|
}
|
|
|
|
export function resolveApprovedImage(approvedJsonPath: string): ApprovedImage {
|
|
let record: ApprovalRecord;
|
|
try {
|
|
record = JSON.parse(fs.readFileSync(approvedJsonPath, "utf-8"));
|
|
} catch (err: any) {
|
|
return { ok: false, error: `cannot read ${approvedJsonPath}: ${err.code || err.message}` };
|
|
}
|
|
const named = approvedImagePath(record ?? {}, path.dirname(path.resolve(approvedJsonPath)));
|
|
if (!named) {
|
|
return { ok: false, error: `${approvedJsonPath} names no approved image; reselect from the board` };
|
|
}
|
|
return readable(named.path) ? { ok: true, ...named } : missing(named.path);
|
|
}
|