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

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/cli-args.d.ts

@@ -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;
+exports.oneProductOf = exports.productNamesOf = exports.configOf = exports.NEEDS_AUTHOR = exports.verdictByProblemOf = exports.isModelId = exports.authorOf = exports.argsOf = void 0;
 const paths_1 = require("../../paths");
 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,6 +36,15 @@ 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)}`; };
 exports.configOf = configOf;

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":";;;AAAA,uCAAqE;AACrE,wDAAqE;AAUrE,2FAA2F;AACpF,MAAM,MAAM,GAAG,CAAC,IAAc,EAAE,UAAoB,EAAiB,EAAE;;IAC5E,MAAM,IAAI,GAAS,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;IAElF,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACjD,MAAM,GAAG,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,mCAAI,EAAE,CAAC;QAE9B,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YAE9B,IAAI,KAAK,KAAK,SAAS;gBAAE,OAAO,GAAG,GAAG,gBAAgB,CAAC;YAEvD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACzB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAA,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,mCAAI,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;YAC5D,KAAK,EAAE,CAAC;QACV,CAAC;aAAM,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAtBW,QAAA,MAAM,UAsBjB;AAEF,0GAA0G;AACnG,MAAM,QAAQ,GAAG,CAAC,IAAU,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,0CAAE,IAAI,EAAE,KAAI,IAAI,CAAA,EAAA,CAAC;AAA/D,QAAA,QAAQ,YAAuD;AAE/D,QAAA,YAAY,GACvB,2GAA2G,CAAC;AAEvG,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAyB,EAAE,WAChE,OAAA,MAAA,IAAA,kBAAU,EAAC,MAAM,CAAC,mCAAI,gCAAgC,IAAA,oBAAY,EAAC,MAAM,CAAC,EAAE,CAAA,EAAA,CAAC;AADlE,QAAA,QAAQ,YAC0D;AAE/E,MAAM,UAAU,GAAG,CAAC,MAAoB,EAAE,EAAE,WAAC,OAAA,MAAM,CAAC,IAAI,CAAC,MAAA,MAAM,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAA,EAAA,CAAC;AAEhF,mGAAmG;AAC5F,MAAM,cAAc,GAAG,CAAC,OAA4D,EAAqB,EAAE;IAChH,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE5C,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IACjD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;QACnC,OAAO,eAAe,OAAO,CAAC,KAAK,4BAA4B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,GAAG,CAAC;IAElG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC,CAAC;AARW,QAAA,cAAc,kBAQzB;AAEF,0GAA0G;AACnG,MAAM,YAAY,GAAG,CAAC,OAI5B,EAA4B,EAAE;;IAC7B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAExE,IAAI,IAAI,KAAK,SAAS;QACpB,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC;YACxB,CAAC,CAAC,uEAAuE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YAC/F,CAAC,CAAC,oDAAoD,CAAC;IAE3D,MAAM,KAAK,GAAG,MAAA,MAAM,CAAC,QAAQ,0CAAG,IAAI,CAAC,CAAC;IAEtC,IAAI,CAAC,KAAK;QAAE,OAAO,eAAe,IAAI,4BAA4B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,GAAG,CAAC;IAEnG,OAAO,IAAA,gCAAc,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;AACzD,CAAC,CAAC;AAnBW,QAAA,YAAY,gBAmBvB"}
+{"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/edit-sketch.d.ts

@@ -0,0 +1,21 @@
+import { ResolvedProduct } from '../resolve-product';
+import { Sketch } from './sketch';
+export declare const EDIT_OLD = "old";
+/**
+ * Opens the old/new sketch of a merged part edited outside a sketch, ready for a pick: `old` holds the part's design at
+ * HEAD, `new` the working one. Answers the sketch, or why it cannot open.
+ */
+export declare const openEditSketch: (options: {
+    target: string;
+    product: ResolvedProduct;
+    part: string;
+    author?: string;
+}) => Sketch | string;
+/**
+ * Rewrites the `old` variant of an edit sketch from the part at HEAD, 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;
+}) => string | null;

package/src/lib/design/system/sketch/edit-sketch.js

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.refreshEditOld = exports.openEditSketch = exports.EDIT_OLD = void 0;
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const assets_1 = require("../assets");
+const reachable_files_1 = require("../reachable-files");
+const resolve_product_1 = require("../resolve-product");
+const merged_parts_1 = require("./merged-parts");
+const sketch_1 = require("./sketch");
+exports.EDIT_OLD = 'old';
+const NEW = 'new';
+const EDIT_ROUND_TITLE = 'Direkte Änderung';
+const EDIT_VARIANT_NOTES = { [exports.EDIT_OLD]: 'der Stand von HEAD', [NEW]: 'die Änderung außerhalb eines Sketches' };
+const editRoundNoteOf = (part) => `${part} wurde außerhalb eines Sketches geändert und sieht anders aus - wähle den Stand von HEAD oder die Änderung`;
+const git = (root, args) => (0, child_process_1.execFileSync)('git', args, { cwd: root, encoding: 'utf8', stdio: 'pipe', maxBuffer: 64 * 1024 * 1024 });
+const headFilesOf = (root, dir) => {
+    try {
+        const paths = git(root, ['ls-tree', '-r', '--name-only', 'HEAD', '--', `./${dir}`])
+            .split('\n')
+            .filter((line) => line !== '');
+        return new Map(paths.map((path) => [(0, path_1.relative)(dir, path), git(root, ['show', `HEAD:./${path}`])]));
+    }
+    catch (error) {
+        return error instanceof Error ? error.message : String(error);
+    }
+};
+/**
+ * Opens the old/new sketch of a merged part edited outside a sketch, ready for a pick: `old` holds the part's design at
+ * HEAD, `new` the working one. Answers the sketch, or why it cannot open.
+ */
+const openEditSketch = (options) => {
+    const { target, product, part } = options;
+    const resolved = product.parts.find((candidate) => (0, resolve_product_1.partKeyOf)(candidate) === part);
+    if (!resolved)
+        return `product "${product.name}" has no part "${part}"`;
+    const head = headOf(product, resolved);
+    if (typeof head === 'string')
+        return head;
+    const partDir = (0, path_1.dirname)(resolved.file);
+    const working = (0, assets_1.filesBelow)(partDir);
+    const unchanged = working.length === head.size &&
+        working.every((file) => head.get((0, path_1.relative)(partDir, file)) === (0, fs_1.readFileSync)(file, 'utf8'));
+    if (unchanged)
+        return `HEAD holds the edit of ${part} already - there is no old design to show`;
+    const created = (0, sketch_1.createSketch)({
+        product,
+        sketch: { layer: resolved.layer, name: resolved.name, sketch: merged_parts_1.EDIT_SKETCH },
+        variants: [NEW, exports.EDIT_OLD],
+        roundTitle: EDIT_ROUND_TITLE,
+        roundNote: editRoundNoteOf(part),
+        variantNotes: new Map(Object.entries(EDIT_VARIANT_NOTES)),
+        author: options.author,
+        merge: resolved.origin === 'overridden' ? 'override' : undefined,
+    });
+    if (typeof created === 'string')
+        return created;
+    writeOld({ sketch: created, resolved }, head);
+    return (0, sketch_1.markSketchReady)({ checkout: target, sketch: created, author: options.author });
+};
+exports.openEditSketch = openEditSketch;
+/**
+ * Rewrites the `old` variant of an edit sketch from the part at HEAD, 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.
+ */
+const refreshEditOld = ({ product, sketch }) => {
+    const resolved = product.parts.find((candidate) => (0, resolve_product_1.partKeyOf)(candidate) === (0, resolve_product_1.partKeyOf)(sketch));
+    if (!resolved)
+        return `product "${product.name}" has no part "${(0, resolve_product_1.partKeyOf)(sketch)}"`;
+    const head = headOf(product, resolved);
+    if (typeof head === 'string')
+        return head;
+    writeOld({ sketch, resolved }, head);
+    rewordEditNotes(sketch);
+    return null;
+};
+exports.refreshEditOld = refreshEditOld;
+const rewordEditNotes = (sketch) => {
+    const [first, ...later] = sketch.rounds;
+    const rounds = first
+        ? [Object.assign(Object.assign({}, first), { title: EDIT_ROUND_TITLE, note: editRoundNoteOf((0, resolve_product_1.partKeyOf)(sketch)) }), ...later]
+        : sketch.rounds;
+    const variantInfo = Object.fromEntries(Object.entries(sketch.variantInfo).map(([variant, info]) => [
+        variant,
+        variant === exports.EDIT_OLD || variant === NEW ? Object.assign(Object.assign({}, info), { note: EDIT_VARIANT_NOTES[variant] }) : info,
+    ]));
+    const reworded = Object.assign(Object.assign({}, sketch), { rounds, variantInfo });
+    if (JSON.stringify(reworded) !== JSON.stringify(sketch))
+        (0, sketch_1.writeSketchFile)(reworded);
+};
+const headOf = (product, resolved) => {
+    const part = (0, resolve_product_1.partKeyOf)(resolved);
+    const root = (0, reachable_files_1.repoRootOf)(product);
+    const head = headFilesOf(root, (0, path_1.relative)(root, (0, path_1.dirname)(resolved.file)));
+    if (typeof head === 'string')
+        return `${part} has no design at HEAD to compare with: ${head}`;
+    if (head.size === 0)
+        return `${part} is not in HEAD - there is no old design to show`;
+    return head;
+};
+const writeOld = ({ sketch, resolved }, head) => {
+    const oldDir = (0, path_1.resolve)(sketch.dir, exports.EDIT_OLD, resolved.layer, resolved.name);
+    (0, fs_1.rmSync)(oldDir, { recursive: true, force: true });
+    (0, fs_1.rmSync)((0, sketch_1.variantSharedDirOf)(sketch, exports.EDIT_OLD), { recursive: true, force: true });
+    for (const [path, source] of head) {
+        const file = (0, path_1.resolve)(oldDir, path);
+        (0, fs_1.mkdirSync)((0, path_1.dirname)(file), { recursive: true });
+        (0, fs_1.writeFileSync)(file, source);
+    }
+    if ((0, fs_1.existsSync)((0, path_1.resolve)(oldDir, sketch_1.SHARED_FOLDER))) {
+        (0, sketch_1.rewriteSharedImports)(oldDir);
+        (0, fs_1.cpSync)((0, path_1.resolve)(oldDir, sketch_1.SHARED_FOLDER), (0, sketch_1.variantSharedDirOf)(sketch, exports.EDIT_OLD), { recursive: true });
+        (0, fs_1.rmSync)((0, path_1.resolve)(oldDir, sketch_1.SHARED_FOLDER), { recursive: true });
+    }
+};
+//# sourceMappingURL=edit-sketch.js.map

package/src/lib/design/system/sketch/edit-sketch.js.map

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

package/src/lib/design/system/sketch/frame-budget.d.ts

@@ -0,0 +1,24 @@
+/** Variants times states times widths of a sketch's target part that Studio can show without freezing. */
+export declare const SKETCH_FRAME_BUDGET = 24;
+type Drawn = {
+    sketch?: {
+        target: string;
+        variant: string;
+    } | null;
+    part: string;
+    state: string;
+    size: string;
+};
+/**
+ * One warning per sketch whose target part draws more than `budget` frames across its variants, states and widths,
+ * counted from the frames a render check drew.
+ */
+export declare const frameBudgetWarningsOf: ({ drawn, targets, budget, }: {
+    drawn: readonly Drawn[];
+    targets: readonly {
+        target: string;
+        part: string;
+    }[];
+    budget?: number;
+}) => string[];
+export {};

package/src/lib/design/system/sketch/frame-budget.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.frameBudgetWarningsOf = exports.SKETCH_FRAME_BUDGET = void 0;
+/** Variants times states times widths of a sketch's target part that Studio can show without freezing. */
+exports.SKETCH_FRAME_BUDGET = 24;
+/**
+ * One warning per sketch whose target part draws more than `budget` frames across its variants, states and widths,
+ * counted from the frames a render check drew.
+ */
+const frameBudgetWarningsOf = ({ drawn, targets, budget = exports.SKETCH_FRAME_BUDGET, }) => targets.flatMap(({ target, part }) => {
+    const own = drawn.filter((frame) => { var _a; return ((_a = frame.sketch) === null || _a === void 0 ? void 0 : _a.target) === target && frame.part === part; });
+    const frames = new Set(own.map((frame) => { var _a; return `${(_a = frame.sketch) === null || _a === void 0 ? void 0 : _a.variant} ${frame.state} ${frame.size}`; })).size;
+    if (frames <= budget)
+        return [];
+    const countOf = (key) => new Set(own.map(key)).size;
+    return [
+        `${target}: WARNING ${frames} frames (${countOf((frame) => { var _a, _b; return (_b = (_a = frame.sketch) === null || _a === void 0 ? void 0 : _a.variant) !== null && _b !== void 0 ? _b : ''; })} variants x ` +
+            `${countOf((frame) => frame.state)} states x ${countOf((frame) => frame.size)} widths) pass the budget of ${budget}; ` +
+            'Studio opens them all when no state folds as unchanged',
+    ];
+});
+exports.frameBudgetWarningsOf = frameBudgetWarningsOf;
+//# sourceMappingURL=frame-budget.js.map

package/src/lib/design/system/sketch/frame-budget.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"frame-budget.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/lib/design/system/sketch/frame-budget.ts"],"names":[],"mappings":";;;AAAA,0GAA0G;AAC7F,QAAA,mBAAmB,GAAG,EAAE,CAAC;AAItC;;;GAGG;AACI,MAAM,qBAAqB,GAAG,CAAC,EACpC,KAAK,EACL,OAAO,EACP,MAAM,GAAG,2BAAmB,GAK7B,EAAE,EAAE,CACH,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE;IACnC,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,MAAM,MAAK,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,CAAA,EAAA,CAAC,CAAC;IAC5F,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,WAAC,OAAA,GAAG,MAAA,KAAK,CAAC,MAAM,0CAAE,OAAO,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,CAAA,EAAA,CAAC,CAAC,CAAC,IAAI,CAAC;IAEzG,IAAI,MAAM,IAAI,MAAM;QAAE,OAAO,EAAE,CAAC;IAEhC,MAAM,OAAO,GAAG,CAAC,GAA6B,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;IAE9E,OAAO;QACL,GAAG,MAAM,aAAa,MAAM,YAAY,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,eAAC,OAAA,MAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,OAAO,mCAAI,EAAE,CAAA,EAAA,CAAC,cAAc;YACnG,GAAG,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,+BAA+B,MAAM,IAAI;YACtH,wDAAwD;KAC3D,CAAC;AACJ,CAAC,CAAC,CAAC;AAtBQ,QAAA,qBAAqB,yBAsB7B"}

package/src/lib/design/system/sketch/identical-renders.d.ts

@@ -0,0 +1,31 @@
+import { PictureOf } from '../../merge-compare';
+import { BoxOf } from '../../variant-diff';
+import { ResolvedProduct } from '../resolve-product';
+import { Sketch } from './sketch';
+import { SketchPartLoader } from './unchanged-states';
+export type IdenticalRender = {
+    variant: string;
+    sibling: string | null;
+    line: string;
+};
+/**
+ * One line per live variant of the sketch that draws every state of a target pixel for pixel like another live
+ * variant, or like the product's part when the sketch has more than one live variant. Of two variants that draw
+ * alike in every state, only the later one is named. A lone variant like the product is a change without a visible
+ * difference, which `sketch ready` merges on its own, so it is never named. A state that fails to draw counts as
+ * different. Any other variant is named when its first changed state, in its own state order, draws like the first
+ * changed state of an earlier variant. "Changed" and "draws like" there are the pixel diff of `design shot` (`boxOf`),
+ * at the frame a shot draws: the first preset or width, no interaction.
+ */
+export declare const identicalRenderLinesOf: (options: Parameters<typeof identicalRendersOf>[0]) => Promise<string[]>;
+/**
+ * The variants `identicalRenderLinesOf` names, each with the sibling variant it draws like in its first changed state
+ * (`null` when it draws like the product's part) and its line, which starts with the sketch's target.
+ */
+export declare const identicalRendersOf: (options: {
+    product: ResolvedProduct;
+    sketch: Sketch;
+    load: SketchPartLoader;
+    pictureOf: PictureOf;
+    boxOf: BoxOf;
+}) => Promise<IdenticalRender[]>;

package/src/lib/design/system/sketch/identical-renders.js

@@ -0,0 +1,137 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.identicalRendersOf = exports.identicalRenderLinesOf = void 0;
+const crypto_1 = require("crypto");
+const list_system_1 = require("../list-system");
+const resolve_product_1 = require("../resolve-product");
+const overlay_1 = require("./overlay");
+const sketch_1 = require("./sketch");
+const unchanged_states_1 = require("./unchanged-states");
+const AKTUELL = 'Aktuell';
+const drawingOf = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d;
+    const { product, part, file, sketch, load, pictureOf } = options;
+    const read = yield (0, list_system_1.readPartModule)({
+        part: { file },
+        product: product.name,
+        load: () => load({ file, product: product.name, sketch }),
+    });
+    if (read.problem)
+        return null;
+    const layer = (_b = (_a = product.parts.find((entry) => (0, resolve_product_1.partKeyOf)(entry) === part)) === null || _a === void 0 ? void 0 : _a.layer) !== null && _b !== void 0 ? _b : part.split('/')[0];
+    const frames = (0, unchanged_states_1.framesOf)({ widths: 'widths' in read ? read.widths : undefined, interactions: read.interactions }, layer === 'pages' ? Object.keys(product.presets) : null);
+    const states = new Map();
+    for (const state of read.states) {
+        try {
+            const pictures = yield Promise.all(frames.map((frame) => pictureOf(Object.assign(Object.assign({ product: product.name, part, state }, frame), { sketch, params: new URLSearchParams() }))));
+            const hash = (0, crypto_1.createHash)('sha256');
+            frames.forEach((frame, index) => { var _a, _b; return hash.update(JSON.stringify(frame)).update((_b = (_a = pictures[index]) === null || _a === void 0 ? void 0 : _a.png) !== null && _b !== void 0 ? _b : ''); });
+            states.set(state, { hash: hash.digest('hex'), shot: (_d = (_c = pictures[0]) === null || _c === void 0 ? void 0 : _c.png) !== null && _d !== void 0 ? _d : Buffer.alloc(0) });
+        }
+        catch (_e) {
+            continue;
+        }
+    }
+    return states;
+});
+const sameInEveryState = (drawn, other) => drawn.states.size > 0 && [...drawn.states].every(([state, { hash }]) => { var _a; return ((_a = other.states.get(state)) === null || _a === void 0 ? void 0 : _a.hash) === hash; });
+const samePixels = (boxOf, pair) => __awaiter(void 0, void 0, void 0, function* () { return (yield boxOf(pair[0].shot, pair[1].shot)).length === 0; });
+const firstChangeOf = (boxOf, pair) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    for (const [state, picture] of pair.drawn.states) {
+        const before = (_a = pair.current) === null || _a === void 0 ? void 0 : _a.states.get(state);
+        if (!before || !(yield samePixels(boxOf, [before, picture])))
+            return { state, picture };
+    }
+    return null;
+});
+const likeOf = (drawn) => (drawn.name === AKTUELL ? AKTUELL : `variant ${drawn.name}`);
+const withdrawAdviceOf = (target, variant) => `withdraw it with \`sketch withdraw ${target} --variant ${variant} --by <model id>\` or redraw it`;
+const refusalsOf = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    const { variants, current, of, target, boxOf } = options;
+    const refusals = [];
+    for (const [index, drawn] of variants.entries()) {
+        const earlier = variants.slice(0, index);
+        const later = variants
+            .slice(index + 1)
+            .filter((other) => !(sameInEveryState(other, drawn) && sameInEveryState(drawn, other)));
+        const others = [...earlier, ...later, ...(current && variants.length > 1 ? [current] : [])];
+        const twin = others.find((other) => sameInEveryState(drawn, other));
+        if (!twin) {
+            if (current && sameInEveryState(drawn, current))
+                continue;
+            const shown = yield firstChangeOf(boxOf, { drawn, current });
+            let like;
+            for (const other of shown ? earlier : []) {
+                const first = yield firstChangeOf(boxOf, { drawn: other, current });
+                if (shown && first && (yield samePixels(boxOf, [first.picture, shown.picture]))) {
+                    like = { other, first };
+                    break;
+                }
+            }
+            if (shown && like)
+                refusals.push({
+                    variant: drawn.name,
+                    sibling: like.other.name === AKTUELL ? null : like.other.name,
+                    line: `variant ${drawn.name}${of} first changes ${shown.state}, which draws the same pixels as ${likeOf(like.other)} draws at its first change ${like.first.state}, so the Studio sketch view shows identical frames - ${withdrawAdviceOf(target, drawn.name)}`,
+                });
+            continue;
+        }
+        refusals.push({
+            variant: drawn.name,
+            sibling: twin.name === AKTUELL ? null : twin.name,
+            line: `variant ${drawn.name}${of} draws the same pixels as ${likeOf(twin)} in every state (${[...drawn.states.keys()].join(', ')}) - it adds nothing visible: ${twin.name === AKTUELL ? 'redraw it' : withdrawAdviceOf(target, drawn.name)}`,
+        });
+    }
+    return refusals;
+});
+/**
+ * One line per live variant of the sketch that draws every state of a target pixel for pixel like another live
+ * variant, or like the product's part when the sketch has more than one live variant. Of two variants that draw
+ * alike in every state, only the later one is named. A lone variant like the product is a change without a visible
+ * difference, which `sketch ready` merges on its own, so it is never named. A state that fails to draw counts as
+ * different. Any other variant is named when its first changed state, in its own state order, draws like the first
+ * changed state of an earlier variant. "Changed" and "draws like" there are the pixel diff of `design shot` (`boxOf`),
+ * at the frame a shot draws: the first preset or width, no interaction.
+ */
+const identicalRenderLinesOf = (options) => __awaiter(void 0, void 0, void 0, function* () { return (yield (0, exports.identicalRendersOf)(options)).map((render) => render.line); });
+exports.identicalRenderLinesOf = identicalRenderLinesOf;
+/**
+ * The variants `identicalRenderLinesOf` names, each with the sibling variant it draws like in its first changed state
+ * (`null` when it draws like the product's part) and its line, which starts with the sketch's target.
+ */
+const identicalRendersOf = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
+    const { product, sketch, load, pictureOf, boxOf } = options;
+    const live = sketch.variants.filter((variant) => !(0, sketch_1.rejectionOf)(sketch, variant));
+    const found = [];
+    for (const part of sketch.targets) {
+        const variants = [];
+        for (const variant of live) {
+            const file = (_a = (0, overlay_1.overlaySketch)({ product, sketch, variant }).parts.find((entry) => (0, resolve_product_1.partKeyOf)(entry) === part)) === null || _a === void 0 ? void 0 : _a.file;
+            const drawn = file
+                ? yield drawingOf({ product, part, file, sketch: { target: sketch.target, variant }, load, pictureOf })
+                : null;
+            if (drawn)
+                variants.push({ name: variant, states: drawn });
+        }
+        const file = (_b = product.parts.find((entry) => (0, resolve_product_1.partKeyOf)(entry) === part)) === null || _b === void 0 ? void 0 : _b.file;
+        const now = file ? yield drawingOf({ product, part, file, sketch: null, load, pictureOf }) : null;
+        const of = sketch.targets.length > 1 ? ` ${part}` : '';
+        const current = now ? { name: AKTUELL, states: now } : null;
+        for (const render of yield refusalsOf({ variants, current, of, target: sketch.target, boxOf }))
+            found.push(Object.assign(Object.assign({}, render), { line: `${sketch.target} ${render.line}` }));
+    }
+    return found;
+});
+exports.identicalRendersOf = identicalRendersOf;
+//# sourceMappingURL=identical-renders.js.map

package/src/lib/design/system/sketch/identical-renders.js.map

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

package/src/lib/design/system/sketch/merge-shared.d.ts

@@ -8,6 +8,8 @@ type PartFile = {
 type SharedProduct = Pick<ProductSource, 'dir'> & {
     base: Pick<ProductSource, 'dir'> | null;
 };
+/** The files of the sketch's and the variant's `shared/` under their path there, the variant's file winning. */
+export declare const sketchSharedFilesOf: (sketch: Sketch, variant: string) => Map<string, string>;
 /**
  * What a merge does with the sketch's `shared/` folder: `carry` names the folder of each target with the paths of the
  * files the product's `shared/` does not hold that it takes - each file it imports, directly or through another such