@ethlete/cli 3.0.0-next.26 → 3.0.0-next.28

package/src/lib/design/system/sketch/check-sketches.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typecheckVariant = exports.openSketchProblemsOf = exports.variantWarningsOf = exports.variantProblemsOf = void 0;
+exports.typecheckVariant = exports.openSketchListingOf = exports.openSketchProblemsOf = exports.variantWarningsOf = exports.variantProblemsOf = void 0;
 const check_system_1 = require("../check-system");
 const path_1 = require("path");
 const resolve_product_1 = require("../resolve-product");
 const stale_comment_1 = require("../rules/stale-comment");
 const system_tsconfig_1 = require("../system-tsconfig");
 const duplicate_class_1 = require("./duplicate-class");
+const live_compare_1 = require("../live-compare");
+const merged_layout_1 = require("./merged-layout");
+const reachable_files_1 = require("../reachable-files");
 const overlay_1 = require("./overlay");
 const shared_class_1 = require("./shared-class");
 const unused_files_1 = require("./unused-files");
@@ -34,6 +37,34 @@ const droppedStatesOf = (options) => {
             ];
     });
 };
+const liveStateProblemsOf = (options) => {
+    const { product, overlaid } = options;
+    const live = (0, live_compare_1.liveSpecOf)({ target: (0, reachable_files_1.repoRootOf)(product), product });
+    if (typeof live === 'string')
+        return [];
+    return overlaid.parts
+        .filter((part) => overlaid.sketched.includes((0, resolve_product_1.partKeyOf)(part)))
+        .flatMap((part) => {
+        var _a;
+        const key = (0, resolve_product_1.partKeyOf)(part);
+        const page = live.spec.pages[key];
+        const merged = product.parts.find((candidate) => (0, resolve_product_1.partKeyOf)(candidate) === key);
+        const own = (0, part_definition_1.stateNamesOf)(part.source);
+        const mergedNames = merged ? (0, part_definition_1.stateNamesOf)(merged.source) : [];
+        if (own === null || mergedNames === null) {
+            console.warn(`NOTE ${key}: live states not checked: spread states`);
+            return [];
+        }
+        const known = new Set([...own, ...mergedNames]);
+        return Object.entries((_a = page === null || page === void 0 ? void 0 : page.states) !== null && _a !== void 0 ? _a : {})
+            .filter(([, state]) => !known.has(state.design))
+            .map(([name, state]) => ({
+            rule: 'LIVE',
+            file: part.file,
+            message: `the live spec maps ${key} live state ${name} to design state "${state.design}", which neither the sketch nor the merged design has`,
+        }));
+    });
+};
 /** The rule problems of each variant of a sketch laid over the product, and the states it drops from a part. */
 const variantProblemsOf = (options) => {
     var _a;
@@ -44,9 +75,14 @@ const variantProblemsOf = (options) => {
         const overlaid = (0, overlay_1.overlaySketch)(Object.assign(Object.assign({}, options), { variant }));
         const round = options.sketch.rounds.find((entry) => { var _a; return entry.key === ((_a = options.sketch.variantInfo[variant]) === null || _a === void 0 ? void 0 : _a.round); });
         const variantDir = (0, sketch_1.variantDirOf)(options.sketch, variant);
-        const wasThere = (problem) => had.has(keyOf((0, path_1.relative)(variantDir, problem.file).startsWith('..') ? options.product.dir : variantDir, problem));
-        const found = (0, check_system_1.ruleProblemsOf)(overlaid);
-        const target = overlaid.parts.find((part) => (0, resolve_product_1.partKeyOf)(part) === options.sketch.target);
+        const laidOver = (0, check_system_1.ruleProblemsOf)(overlaid);
+        const seen = new Set(laidOver.map((problem) => keyOf(options.product.dir, problem)));
+        const carried = (0, merged_layout_1.mergedLayoutProblemsOf)(Object.assign(Object.assign({}, options), { variant, overlaid })).filter(({ problem }) => !seen.has(keyOf(options.product.dir, problem)));
+        const carriedWasThere = new Set(carried.flatMap(({ problem, mergedFile }) => had.has(keyOf(options.product.dir, Object.assign(Object.assign({}, problem), { file: mergedFile }))) ? [problem] : []));
+        const wasThere = (problem) => carriedWasThere.has(problem) ||
+            had.has(keyOf((0, path_1.relative)(variantDir, problem.file).startsWith('..') ? options.product.dir : variantDir, problem));
+        const found = [...laidOver, ...carried.map(({ problem }) => problem)];
+        const target = overlaid.parts.find((part) => (0, resolve_product_1.partKeyOf)(part) === (0, resolve_product_1.partKeyOf)(options.sketch));
         const metadataProblem = target && ((0, part_definition_1.withNote)(target.source, '') === null || (0, part_definition_1.withMadeBy)(target.source, ['author']) === null)
             ? [
                 {
@@ -63,6 +99,7 @@ const variantProblemsOf = (options) => {
                 ...found.filter((problem) => !wasThere(problem)),
                 ...metadataProblem,
                 ...droppedStatesOf({ product: options.product, overlaid, allowed: (_a = round === null || round === void 0 ? void 0 : round.drops) !== null && _a !== void 0 ? _a : [] }),
+                ...liveStateProblemsOf({ product: options.product, overlaid }),
             ],
             before: found.filter(wasThere),
         };
@@ -93,6 +130,15 @@ const openSketchProblemsOf = (product) => {
     };
 };
 exports.openSketchProblemsOf = openSketchProblemsOf;
+/** `openSketchProblemsOf` as plain data a worker can post: each variant names its sketch by target. */
+const openSketchListingOf = (product) => {
+    const { unreadable, variants } = (0, exports.openSketchProblemsOf)(product);
+    return {
+        unreadable,
+        variants: variants.map(({ sketch, variant, problems }) => ({ target: sketch.target, variant, problems })),
+    };
+};
+exports.openSketchListingOf = openSketchListingOf;
 /** Runs `tsc` over one variant laid over the product, with a tsconfig of its own. */
 const typecheckVariant = (options) => {
     const { target, product, sketch, variant } = options;

package/src/lib/design/system/sketch/check-sketches.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-sketches.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/lib/design/system/sketch/check-sketches.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"check-sketches.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/lib/design/system/sketch/check-sketches.ts"],"names":[],"mappings":"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"}

package/src/lib/design/system/sketch/clean-copy.d.ts

@@ -0,0 +1,18 @@
+export type CleanCopy = {
+    root: string;
+    inCopy: (path: string) => string;
+    inCheckout: (path: string) => string;
+    relativeOf: (path: string) => string;
+    drop: () => void;
+};
+/**
+ * A copy of the checkout in which each folder of `cloned` holds its committed state (the working tree's
+ * outside git) and every other entry links to the checkout. `node_modules` is a folder of links of its own, so
+ * the tool's work files stay in the copy. `.git` is left out, so git in the copy never sees the checkout.
+ */
+export declare const cleanCopyOf: (options: {
+    target: string;
+    cloned: string[];
+}) => CleanCopy;
+/** Each file below `paths` - a path may be a file - with its bytes. */
+export declare const contentsBelow: (paths: string[]) => Map<string, Buffer<ArrayBufferLike>>;

package/src/lib/design/system/sketch/clean-copy.js

@@ -0,0 +1,104 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.contentsBelow = exports.cleanCopyOf = void 0;
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const os_1 = require("os");
+const path_1 = require("path");
+const WORK_FOLDER = '.design-explore';
+const realOf = (path) => {
+    if ((0, fs_1.existsSync)(path))
+        return (0, fs_1.realpathSync)(path);
+    const parent = (0, path_1.dirname)(path);
+    return parent === path ? path : (0, path_1.join)(realOf(parent), (0, path_1.basename)(path));
+};
+const escapes = (rel) => rel === '..' || rel.startsWith('../') || (0, path_1.isAbsolute)(rel);
+const committedInto = (options) => {
+    const prefix = (0, child_process_1.spawnSync)('git', ['rev-parse', '--show-prefix'], { cwd: options.target, encoding: 'utf8' });
+    if (prefix.status !== 0)
+        return false;
+    const tar = (0, path_1.resolve)((0, path_1.dirname)(options.to), `${(0, path_1.basename)(options.to)}.tar`);
+    const archived = (0, child_process_1.spawnSync)('git', ['archive', '--format=tar', '-o', tar, `HEAD:${prefix.stdout.trim()}${options.rel}`], { cwd: options.target, encoding: 'utf8' });
+    if (archived.status !== 0)
+        return false;
+    (0, fs_1.mkdirSync)(options.to, { recursive: true });
+    const extracted = (0, child_process_1.spawnSync)('tar', ['-xf', tar, '-C', options.to], { encoding: 'utf8' });
+    (0, fs_1.rmSync)(tar, { force: true });
+    return extracted.status === 0;
+};
+/**
+ * A copy of the checkout in which each folder of `cloned` holds its committed state (the working tree's
+ * outside git) and every other entry links to the checkout. `node_modules` is a folder of links of its own, so
+ * the tool's work files stay in the copy. `.git` is left out, so git in the copy never sees the checkout.
+ */
+const cleanCopyOf = (options) => {
+    const { target } = options;
+    const realTarget = (0, fs_1.realpathSync)(target);
+    const root = (0, fs_1.realpathSync)((0, fs_1.mkdtempSync)((0, path_1.join)((0, os_1.tmpdir)(), 'ethlete-sketch-merge-')));
+    const relativeOf = (path) => {
+        const rel = (0, path_1.relative)(target, path);
+        return escapes(rel) ? (0, path_1.relative)(realTarget, realOf(path)) : rel;
+    };
+    const wanted = options.cloned
+        .map(relativeOf)
+        .filter((rel) => rel !== '' && !escapes(rel) && (0, fs_1.existsSync)((0, path_1.resolve)(target, rel)));
+    const cloned = [...new Set(wanted)].filter((rel) => !wanted.some((other) => rel.startsWith(`${other}/`)));
+    const holdsCloned = (rel) => cloned.some((path) => path.startsWith(`${rel}/`));
+    const mirror = (rel) => {
+        for (const name of (0, fs_1.readdirSync)((0, path_1.resolve)(target, rel))) {
+            const entry = rel === '' ? name : `${rel}/${name}`;
+            const into = (0, path_1.resolve)(root, entry);
+            if (name === '.git' && rel === '')
+                continue;
+            if (cloned.includes(entry))
+                continue;
+            if (holdsCloned(entry)) {
+                (0, fs_1.mkdirSync)(into, { recursive: true });
+                mirror(entry);
+            }
+            else if (entry === 'node_modules' && (0, fs_1.statSync)((0, path_1.resolve)(target, entry)).isDirectory()) {
+                (0, fs_1.mkdirSync)(into, { recursive: true });
+                for (const module of (0, fs_1.readdirSync)((0, path_1.resolve)(target, entry)).filter((module) => module !== WORK_FOLDER))
+                    (0, fs_1.symlinkSync)((0, path_1.resolve)(realTarget, entry, module), (0, path_1.resolve)(into, module));
+            }
+            else {
+                (0, fs_1.symlinkSync)((0, path_1.resolve)(realTarget, entry), into);
+            }
+        }
+    };
+    mirror('');
+    for (const rel of cloned) {
+        const to = (0, path_1.resolve)(root, rel);
+        (0, fs_1.mkdirSync)((0, path_1.dirname)(to), { recursive: true });
+        if (!committedInto({ target, rel, to })) {
+            (0, fs_1.rmSync)(to, { recursive: true, force: true });
+            (0, fs_1.cpSync)((0, path_1.resolve)(target, rel), to, { recursive: true });
+        }
+    }
+    return {
+        root,
+        inCopy: (path) => (0, path_1.resolve)(root, relativeOf(path)),
+        inCheckout: (path) => (0, path_1.resolve)(target, (0, path_1.relative)(root, path)),
+        relativeOf,
+        drop: () => (0, fs_1.rmSync)(root, { recursive: true, force: true }),
+    };
+};
+exports.cleanCopyOf = cleanCopyOf;
+/** Each file below `paths` - a path may be a file - with its bytes. */
+const contentsBelow = (paths) => {
+    const contents = new Map();
+    const visit = (path) => {
+        if (!(0, fs_1.existsSync)(path))
+            return;
+        if ((0, fs_1.statSync)(path).isDirectory()) {
+            for (const name of (0, fs_1.readdirSync)(path))
+                visit((0, path_1.resolve)(path, name));
+            return;
+        }
+        contents.set(path, (0, fs_1.readFileSync)(path));
+    };
+    paths.forEach(visit);
+    return contents;
+};
+exports.contentsBelow = contentsBelow;
+//# sourceMappingURL=clean-copy.js.map

package/src/lib/design/system/sketch/clean-copy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clean-copy.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/lib/design/system/sketch/clean-copy.ts"],"names":[],"mappings":"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"}

package/src/lib/design/system/sketch/cli-args.d.ts

@@ -1,4 +1,4 @@
-import { DesignConfig } from '../../paths';
+import { DesignConfig } from '../../design-config';
 import { ResolvedProduct } from '../resolve-product';
 /** `values` holds the last value of each flag, `repeated` every value in order. */
 export type Args = {
@@ -7,10 +7,20 @@ export type Args = {
     repeated: Record<string, string[]>;
     flags: Set<string>;
 };
-/** Splits an argument list into positionals, the flags that take a value, and switches. */
-export declare const argsOf: (argv: string[], valueFlags: string[]) => Args | string;
+/**
+ * Splits an argument list into positionals, the flags that take a value, and switches. With `switches`, any other
+ * `--flag` is refused with a message that lists the known flags.
+ */
+export declare const argsOf: (argv: string[], flags: {
+    values: string[];
+    switches?: string[];
+}) => Args | string;
 /** The model id `--by` names, the agent that runs a write command; `null` when it is missing or blank. */
 export declare const authorOf: (args: Args) => string | null;
+/** Whether `by` looks like the id of a model: a known family, a dash, then the version. */
+export declare const isModelId: (by: string) => boolean;
+/** Why a verdict `--by` is refused: it is neither `designer` nor a model id; `null` when it is valid. */
+export declare const verdictByProblemOf: (by: string) => string | null;
 export declare const NEEDS_AUTHOR = "needs --by <model id>: the exact model id the coordinator gave you, e.g. claude-opus-5-5. Never guess it.";
 export declare const configOf: (target: string) => DesignConfig | string;
 /** The products a command runs on: the one `--product` names, else every product of the config. */

package/src/lib/design/system/sketch/cli-args.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.oneProductOf = exports.productNamesOf = exports.configOf = exports.NEEDS_AUTHOR = exports.authorOf = exports.argsOf = void 0;
-const paths_1 = require("../../paths");
+exports.oneProductOf = exports.productNamesOf = exports.configOf = exports.NEEDS_AUTHOR = exports.verdictByProblemOf = exports.isModelId = exports.authorOf = exports.argsOf = void 0;
+const design_config_1 = require("../../design-config");
 const resolve_product_1 = require("../resolve-product");
-/** Splits an argument list into positionals, the flags that take a value, and switches. */
-const argsOf = (argv, valueFlags) => {
+/**
+ * Splits an argument list into positionals, the flags that take a value, and switches. With `switches`, any other
+ * `--flag` is refused with a message that lists the known flags.
+ */
+const argsOf = (argv, flags) => {
     var _a, _b;
+    const { values: valueFlags, switches } = flags;
     const args = { positional: [], values: {}, repeated: {}, flags: new Set() };
     for (let index = 0; index < argv.length; index++) {
         const arg = (_a = argv[index]) !== null && _a !== void 0 ? _a : '';
@@ -18,6 +22,8 @@ const argsOf = (argv, valueFlags) => {
             index++;
         }
         else if (arg.startsWith('--')) {
+            if (switches && !switches.includes(arg))
+                return `unknown flag ${arg} (flags: ${[...valueFlags, ...switches].join(', ') || 'none'})`;
             args.flags.add(arg);
         }
         else {
@@ -30,8 +36,17 @@ exports.argsOf = argsOf;
 /** The model id `--by` names, the agent that runs a write command; `null` when it is missing or blank. */
 const authorOf = (args) => { var _a; return ((_a = args.values['--by']) === null || _a === void 0 ? void 0 : _a.trim()) || null; };
 exports.authorOf = authorOf;
+const MODEL_ID = /^(claude|gpt|gemini|codex)-[a-z0-9][a-z0-9._-]*$/iu;
+/** Whether `by` looks like the id of a model: a known family, a dash, then the version. */
+const isModelId = (by) => MODEL_ID.test(by);
+exports.isModelId = isModelId;
+/** Why a verdict `--by` is refused: it is neither `designer` nor a model id; `null` when it is valid. */
+const verdictByProblemOf = (by) => by === 'designer' || (0, exports.isModelId)(by)
+    ? null
+    : `--by "${by}" is not valid for a verdict: use designer or a model id such as claude-opus-5-5 (families: claude, gpt, gemini, codex)`;
+exports.verdictByProblemOf = verdictByProblemOf;
 exports.NEEDS_AUTHOR = 'needs --by <model id>: the exact model id the coordinator gave you, e.g. claude-opus-5-5. Never guess it.';
-const configOf = (target) => { var _a; return (_a = (0, paths_1.readConfig)(target)) !== null && _a !== void 0 ? _a : `design-explore: no config at ${(0, paths_1.configPathOf)(target)}`; };
+const configOf = (target) => { var _a; return (_a = (0, design_config_1.readConfig)(target)) !== null && _a !== void 0 ? _a : `design-explore: no config at ${(0, design_config_1.configPathOf)(target)}`; };
 exports.configOf = configOf;
 const declaredOf = (config) => { var _a; return Object.keys((_a = config.products) !== null && _a !== void 0 ? _a : {}); };
 /** The products a command runs on: the one `--product` names, else every product of the config. */

package/src/lib/design/system/sketch/cli-args.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli-args.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/lib/design/system/sketch/cli-args.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli-args.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/lib/design/system/sketch/cli-args.ts"],"names":[],"mappings":"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"}

package/src/lib/design/system/sketch/covered-diffs.d.ts

@@ -0,0 +1,40 @@
+import { PixelCompare } from '../part-compare';
+import { Sketch } from './sketch';
+export type CoverBox = {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+};
+export type Cover = {
+    part: string | null;
+    state: string;
+    box: CoverBox | null;
+};
+/**
+ * Reads a `covers` entry: `<state>` covers the whole state, `<state>@<x>,<y>,<w>,<h>` only that box of its picture.
+ * `<layer>/<name>:` in front names the part; a sketch with several targets needs it.
+ */
+export declare const parseCover: (entry: string) => Cover | string;
+/** Why the entries cannot be a cover of the sketch's parts, or `null`: with several targets every entry names its part. */
+export declare const coverPartProblemOf: (options: {
+    sketch: Sketch;
+    covers: readonly string[];
+}) => string | null;
+/**
+ * The id of the open sketch of `part` whose `covers` take the DIFF of `state`; `null` when none does or its pick is
+ * made. A region cover takes it only when every differing pixel lies in one of the state's boxes, at the same size.
+ */
+export declare const coveringSketchOf: (options: {
+    sketches: readonly Sketch[];
+    part: string;
+    state: string;
+    result: PixelCompare;
+}) => string | null;
+/** Replaces the `covers` of an open sketch; no entry clears them. */
+export declare const editCovers: (options: {
+    sketch: Sketch;
+    covers: readonly string[];
+}) => Sketch | string;
+/** The line `compare` prints for a DIFF an open sketch covers (ADR 0222). */
+export declare const coveredLineOf: (line: string, sketch: string) => string;

package/src/lib/design/system/sketch/covered-diffs.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.coveredLineOf = exports.editCovers = exports.coveringSketchOf = exports.coverPartProblemOf = exports.parseCover = void 0;
+const part_compare_1 = require("../part-compare");
+const sketch_1 = require("./sketch");
+const BOX = /^(\d+),(\d+),(\d+),(\d+)$/u;
+/**
+ * Reads a `covers` entry: `<state>` covers the whole state, `<state>@<x>,<y>,<w>,<h>` only that box of its picture.
+ * `<layer>/<name>:` in front names the part; a sketch with several targets needs it.
+ */
+const parseCover = (entry) => {
+    var _a;
+    const at = entry.lastIndexOf('@');
+    const head = (at === -1 ? entry : entry.slice(0, at)).trim();
+    const colon = head.indexOf(':');
+    const qualified = colon !== -1 && head.slice(0, colon).includes('/');
+    const part = qualified ? head.slice(0, colon).trim() : null;
+    const state = (qualified ? head.slice(colon + 1) : head).trim();
+    if (state === '')
+        return `"${entry}" names no state - use <layer>/<name>:<state> or <layer>/<name>:<state>@<x>,<y>,<w>,<h>`;
+    if (part !== null && typeof (0, sketch_1.parseTarget)(part) === 'string')
+        return `"${entry}" names no part - write <layer>/<name>:<state>`;
+    if (at === -1)
+        return { part, state, box: null };
+    const match = BOX.exec(entry.slice(at + 1).trim());
+    const [x, y, width, height] = ((_a = match === null || match === void 0 ? void 0 : match.slice(1)) !== null && _a !== void 0 ? _a : []).map(Number);
+    if (x === undefined || y === undefined || !width || !height)
+        return `"${entry}" has no region - write <state>@<x>,<y>,<w>,<h> in pixels of the state's picture, w and h above 0`;
+    return { part, state, box: { x, y, width, height } };
+};
+exports.parseCover = parseCover;
+/** Why the entries cannot be a cover of the sketch's parts, or `null`: with several targets every entry names its part. */
+const coverPartProblemOf = (options) => {
+    const { sketch } = options;
+    for (const entry of options.covers) {
+        const cover = (0, exports.parseCover)(entry);
+        if (typeof cover === 'string')
+            continue;
+        if (cover.part === null && sketch.targets.length > 1)
+            return `"${entry}" names no part - ${sketch.target} has ${sketch.targets.length} targets (${sketch.targets.join(', ')}), so write <layer>/<name>:${entry.trim()}`;
+        if (cover.part !== null && !sketch.targets.includes(cover.part))
+            return `"${entry}" names ${cover.part}, which ${sketch.target} does not target (${sketch.targets.join(', ')})`;
+    }
+    return null;
+};
+exports.coverPartProblemOf = coverPartProblemOf;
+const RED = 0xff0000ff;
+const insideAny = (boxes, point) => boxes.some((box) => point.x >= box.x && point.y >= box.y && point.x < box.x + box.width && point.y < box.y + box.height);
+const differsOnlyInside = (diff, boxes) => {
+    const { width, height, data } = (0, part_compare_1.decodePng)(diff);
+    const words = new Uint32Array(Uint8Array.from(data).buffer);
+    for (let y = 0; y < height; y++)
+        for (let x = 0; x < width; x++)
+            if (words[y * width + x] === RED && !insideAny(boxes, { x, y }))
+                return false;
+    return true;
+};
+const coversResult = (covers, result) => {
+    if (covers.some((cover) => cover.box === null))
+        return true;
+    if (result.kind !== 'diff')
+        return false;
+    return differsOnlyInside(result.diff, covers.flatMap((cover) => (cover.box ? [cover.box] : [])));
+};
+/**
+ * The id of the open sketch of `part` whose `covers` take the DIFF of `state`; `null` when none does or its pick is
+ * made. A region cover takes it only when every differing pixel lies in one of the state's boxes, at the same size.
+ */
+const coveringSketchOf = (options) => {
+    const found = options.sketches.find((sketch) => {
+        var _a;
+        if (sketch.decision !== undefined || !sketch.targets.includes(options.part))
+            return false;
+        const covers = ((_a = sketch.covers) !== null && _a !== void 0 ? _a : [])
+            .map(exports.parseCover)
+            .filter((cover) => typeof cover !== 'string' &&
+            cover.state === options.state &&
+            (cover.part === null ? sketch.targets.length === 1 : cover.part === options.part));
+        return covers.length > 0 && coversResult(covers, options.result);
+    });
+    if (!found)
+        return null;
+    const target = (0, sketch_1.parseTarget)(found.target);
+    return typeof target === 'string' ? found.target : (0, sketch_1.sketchIdOf)(target);
+};
+exports.coveringSketchOf = coveringSketchOf;
+/** Replaces the `covers` of an open sketch; no entry clears them. */
+const editCovers = (options) => {
+    const { sketch } = options;
+    if (sketch.decision !== undefined)
+        return `${sketch.target} has a pick - an open sketch covers DIFFs, a picked one does not`;
+    const problem = options.covers.map(exports.parseCover).find((cover) => typeof cover === 'string');
+    if (problem !== undefined)
+        return problem;
+    const partProblem = (0, exports.coverPartProblemOf)({ sketch, covers: options.covers });
+    if (partProblem !== null)
+        return partProblem;
+    const edited = Object.assign(Object.assign({}, sketch), { covers: [...new Set(options.covers.map((cover) => cover.trim()))] });
+    (0, sketch_1.writeSketchFile)(edited);
+    return edited;
+};
+exports.editCovers = editCovers;
+/** The line `compare` prints for a DIFF an open sketch covers (ADR 0222). */
+const coveredLineOf = (line, sketch) => `${line} (covered by open sketch ${sketch}, ADR 0222)`;
+exports.coveredLineOf = coveredLineOf;
+//# sourceMappingURL=covered-diffs.js.map

package/src/lib/design/system/sketch/covered-diffs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"covered-diffs.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/lib/design/system/sketch/covered-diffs.ts"],"names":[],"mappings":"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"}

package/src/lib/design/system/sketch/edit-sketch.d.ts

@@ -0,0 +1,29 @@
+import { ResolvedProduct } from '../resolve-product';
+import { Sketch } from './sketch';
+export declare const EDIT_OLD = "old";
+export declare const EDIT_OLD_NOT_FOUND = "EDIT-OLD-NOT-FOUND";
+export type EditOldNotFound = {
+    rule: typeof EDIT_OLD_NOT_FOUND;
+    message: string;
+};
+/**
+ * Opens the old/new sketch of a merged part edited outside a sketch, ready for a pick: `old` holds the part's folder at
+ * the newest commit whose part hash is its merged hash, `new` the working one. Answers the sketch, `EDIT-OLD-NOT-FOUND`
+ * when no commit has that hash, or why it cannot open.
+ */
+export declare const openEditSketch: (options: {
+    target: string;
+    product: ResolvedProduct;
+    part: string;
+    author?: string;
+}) => Sketch | EditOldNotFound | string;
+/**
+ * Rewrites the `old` variant of an edit sketch from the part at its merged commit, as `openEditSketch` finds it, so `old` draws against the sketch's `shared/` of
+ * today, and its round and variant notes in today's wording. Answers why it cannot, else null.
+ */
+export declare const refreshEditOld: ({ product, sketch, }: {
+    product: ResolvedProduct;
+    sketch: Sketch;
+}) => EditOldNotFound | string | null;
+/** Rewrites the round and variant notes of an edit sketch in today's wording, writing only when they differ. */
+export declare const rewordEditNotes: (sketch: Sketch) => void;