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

package/src/lib/design/system/sketch/merge-commit.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.commitMergeResultSync = exports.dirtyFilesOfSync = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const sketch_1 = require("./sketch");
+const plain_output_1 = require("../../../plain-output");
+const runSync = (target, flow) => {
+    let step = flow.next();
+    while (!step.done)
+        step = flow.next((0, plain_output_1.spawnPlain)(['git', ...step.value.args], { cwd: target, input: step.value.input }));
+    return step.value;
+};
+const dirsOf = (product) => [product.dir, ...(product.base ? [product.base.dir] : [])];
+const below = (path, dir) => path === dir || path.startsWith(`${dir}${path_1.sep}`);
+function* dirtyFilesFlow(product) {
+    const root = yield { args: ['rev-parse', '--show-toplevel'] };
+    const status = yield {
+        args: ['status', '--porcelain', '-z', '--no-renames', '--untracked-files=all', '--', ...dirsOf(product)],
+    };
+    if (root.status !== 0 || status.status !== 0)
+        return null;
+    const top = (0, fs_1.realpathSync)(root.stdout.trim());
+    const files = status.stdout
+        .split('\0')
+        .filter((line) => /^.. /.test(line))
+        .map((entry) => (0, path_1.resolve)(top, entry.slice(3)));
+    const present = files.filter((file) => (0, fs_1.existsSync)(file));
+    const hashed = present.length > 0 ? yield { args: ['hash-object', '--stdin-paths'], input: present.join('\n') } : null;
+    const hashes = (hashed === null || hashed === void 0 ? void 0 : hashed.status) === 0 ? hashed.stdout.trim().split('\n') : [];
+    return new Map(files.map((file) => { var _a; return [file, (_a = hashes[present.indexOf(file)]) !== null && _a !== void 0 ? _a : 'deleted']; }));
+}
+function* commitFlow(options) {
+    const { product, sketch, before } = options;
+    const after = yield* dirtyFilesFlow(product);
+    if (!before || !after)
+        return false;
+    const productDir = (0, fs_1.realpathSync)(product.dir);
+    const sketches = (0, sketch_1.sketchesDirOf)(productDir);
+    const merged = (0, path_1.resolve)(productDir, (0, path_1.relative)(product.dir, sketch.dir));
+    const files = [...after]
+        .filter(([file, hash]) => before.get(file) !== hash)
+        .map(([file]) => file)
+        .filter((file) => !below(file, sketches) || below(file, merged));
+    if (files.length === 0)
+        return true;
+    const added = yield { args: ['add', '--all', '--', ...files] };
+    const committed = added.status === 0
+        ? yield {
+            args: [
+                'commit',
+                '-m',
+                `feat(repo): Merge ${sketch.target} variant ${options.variant} into ${product.name}`,
+                '--',
+                ...files,
+            ],
+        }
+        : added;
+    if (committed.status !== 0)
+        console.warn(`Could not commit the merge: ${(committed.stderr || committed.stdout).trim()}`);
+    return committed.status === 0;
+}
+/** The dirty files of the product's folders by absolute path, each with a hash of its content; `null` outside a git checkout. */
+const dirtyFilesOfSync = (options) => runSync(options.target, dirtyFilesFlow(options.product));
+exports.dirtyFilesOfSync = dirtyFilesOfSync;
+/**
+ * Commits what a merge wrote into the product's folders - the files dirty now that were clean or different before,
+ * and the merged sketch's own deletion, never another open sketch - as one commit. A failed commit warns and leaves the files as they are.
+ */
+const commitMergeResultSync = (options) => runSync(options.target, commitFlow(options));
+exports.commitMergeResultSync = commitMergeResultSync;
+//# sourceMappingURL=merge-commit.js.map

package/src/lib/design/system/sketch/merge-commit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-commit.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/lib/design/system/sketch/merge-commit.ts"],"names":[],"mappings":";;;AAAA,2BAA8C;AAC9C,+BAA8C;AAE9C,qCAAiD;AACjD,wDAAgE;AAKhE,MAAM,OAAO,GAAG,CAAI,MAAc,EAAE,IAAgB,EAAE,EAAE;IACtD,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAEvB,OAAO,CAAC,IAAI,CAAC,IAAI;QACf,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAA,yBAAU,EAAC,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAEtG,OAAO,IAAI,CAAC,KAAK,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,CAAC,OAAwB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAExG,MAAM,KAAK,GAAG,CAAC,IAAY,EAAE,GAAW,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,GAAG,GAAG,UAAG,EAAE,CAAC,CAAC;AAE7F,QAAQ,CAAC,CAAC,cAAc,CAAC,OAAwB;IAC/C,MAAM,IAAI,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,iBAAiB,CAAC,EAAE,CAAC;IAC9D,MAAM,MAAM,GAAG,MAAM;QACnB,IAAI,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,uBAAuB,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;KACzG,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAE1D,MAAM,GAAG,GAAG,IAAA,iBAAY,EAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM;SACxB,KAAK,CAAC,IAAI,CAAC;SACX,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,cAAO,EAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAU,EAAC,IAAI,CAAC,CAAC,CAAC;IACzD,MAAM,MAAM,GACV,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1G,MAAM,MAAM,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,MAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE5E,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,WAAC,OAAA,CAAC,IAAI,EAAE,MAAA,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,mCAAI,SAAS,CAAC,CAAA,EAAA,CAAC,CAAC,CAAC;AAC1F,CAAC;AAED,QAAQ,CAAC,CAAC,UAAU,CAAC,OAKpB;IACC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAE7C,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IAEpC,MAAM,UAAU,GAAG,IAAA,iBAAY,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,UAAU,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAA,cAAO,EAAC,UAAU,EAAE,IAAA,eAAQ,EAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACtE,MAAM,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC;SACrB,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;SACnD,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC;SACrB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAEnE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEpC,MAAM,KAAK,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;IAC/D,MAAM,SAAS,GACb,KAAK,CAAC,MAAM,KAAK,CAAC;QAChB,CAAC,CAAC,MAAM;YACJ,IAAI,EAAE;gBACJ,QAAQ;gBACR,IAAI;gBACJ,qBAAqB,MAAM,CAAC,MAAM,YAAY,OAAO,CAAC,OAAO,SAAS,OAAO,CAAC,IAAI,EAAE;gBACpF,IAAI;gBACJ,GAAG,KAAK;aACT;SACF;QACH,CAAC,CAAC,KAAK,CAAC;IAEZ,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QACxB,OAAO,CAAC,IAAI,CAAC,+BAA+B,CAAC,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAE/F,OAAO,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC;AAChC,CAAC;AAUD,iIAAiI;AAC1H,MAAM,gBAAgB,GAAG,CAAC,OAAqD,EAAE,EAAE,CACxF,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;AAD9C,QAAA,gBAAgB,oBAC8B;AAE3D;;;GAGG;AACI,MAAM,qBAAqB,GAAG,CAAC,OAAsB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;AAAjG,QAAA,qBAAqB,yBAA4E"}

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

@@ -0,0 +1,20 @@
+import { MergeRefusal } from './merge';
+import { Sketch } from './sketch';
+export type MergeRequest = {
+    target: string;
+    product: string;
+    sketch: Sketch;
+    note?: string;
+};
+export type MergeResponse = {
+    result?: string[] | MergeRefusal;
+    error?: string;
+};
+/** Merges the picked variant of `sketch` as the Studio merge does, on this thread: refreshes the harness map, records the note and commits the result. */
+export declare const studioMergeOf: ({ target, product: name, sketch, note }: MergeRequest) => string[] | MergeRefusal;
+/**
+ * Runs `studioMergeOf` in a worker of its own, so the server keeps answering while the merge copies, checks, writes and
+ * commits. On Linux a child process blocks the thread that spawns it for as long as forking the whole process takes, so
+ * the server thread spawns none.
+ */
+export declare const mergeInWorker: (request: MergeRequest) => Promise<string[] | MergeRefusal>;

package/src/lib/design/system/sketch/merge-runner.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeInWorker = exports.studioMergeOf = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const url_1 = require("url");
+const worker_threads_1 = require("worker_threads");
+const package_root_1 = require("../../package-root");
+const design_config_1 = require("../../design-config");
+const harness_map_1 = require("../harness-map");
+const cli_args_1 = require("./cli-args");
+const merge_commit_1 = require("./merge-commit");
+const merge_1 = require("./merge");
+const merged_parts_1 = require("./merged-parts");
+/** Merges the picked variant of `sketch` as the Studio merge does, on this thread: refreshes the harness map, records the note and commits the result. */
+const studioMergeOf = ({ target, product: name, sketch, note }) => {
+    var _a;
+    const config = (0, design_config_1.readConfig)(target);
+    if (!config)
+        return { reason: 'no design config' };
+    const product = (0, cli_args_1.oneProductOf)({ target, config, asked: name });
+    if (typeof product === 'string')
+        return { reason: product };
+    const before = (0, merge_commit_1.dirtyFilesOfSync)({ target, product });
+    const merged = (0, merge_1.mergeSketch)({ target, config, product, sketch, note });
+    if (!Array.isArray(merged))
+        return merged;
+    (0, harness_map_1.refreshHarnessMap)({ target, product });
+    if (note === null || note === void 0 ? void 0 : note.trim())
+        for (const part of sketch.targets)
+            (0, merged_parts_1.recordMergeReason)({ product, part, reason: note.trim() });
+    const variant = ((_a = sketch.decision) === null || _a === void 0 ? void 0 : _a.kind) === 'pick' ? sketch.decision.variant : '';
+    (0, merge_commit_1.commitMergeResultSync)({ target, product, sketch, variant, before });
+    return merged;
+};
+exports.studioMergeOf = studioMergeOf;
+const startWorker = () => {
+    const built = (0, package_root_1.packageFileOf)((0, path_1.resolve)(__dirname, 'merge-worker.js'));
+    // Specs run this file from source, where only the `.ts` worker exists.
+    return (0, fs_1.existsSync)(built)
+        ? new worker_threads_1.Worker(built)
+        : new worker_threads_1.Worker((0, path_1.resolve)(__dirname, 'merge-worker.ts'), {
+            execArgv: [
+                '--import',
+                (0, url_1.pathToFileURL)((0, path_1.resolve)(require.resolve('jiti/package.json'), '../lib/jiti-register.mjs')).href,
+            ],
+        });
+};
+/**
+ * Runs `studioMergeOf` in a worker of its own, so the server keeps answering while the merge copies, checks, writes and
+ * commits. On Linux a child process blocks the thread that spawns it for as long as forking the whole process takes, so
+ * the server thread spawns none.
+ */
+const mergeInWorker = (request) => new Promise((done, fail) => {
+    const worker = startWorker();
+    let answered = false;
+    worker.once('message', ({ result, error }) => {
+        answered = true;
+        void worker.terminate();
+        if (result)
+            done(result);
+        else
+            fail(new Error(error !== null && error !== void 0 ? error : 'the merge worker answered nothing'));
+    });
+    worker.once('error', (error) => fail(new Error(`the merge worker failed: ${error.message}`)));
+    worker.once('exit', () => {
+        if (!answered)
+            fail(new Error('the merge worker exited before it answered'));
+    });
+    worker.postMessage(request);
+});
+exports.mergeInWorker = mergeInWorker;
+//# sourceMappingURL=merge-runner.js.map

package/src/lib/design/system/sketch/merge-runner.js.map

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

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

@@ -1,12 +1,22 @@
-import { DesignConfig } from '../../paths';
-import { DesignStep } from '../tom-confirm';
+import { DesignConfig } from '../../design-config';
 import { ResolvedProduct } from '../resolve-product';
 import { Sketch } from './sketch';
+export type DesignStep = {
+    line: string;
+    run: () => Promise<number>;
+};
 /** The sketch with the pick a plan allows: its only live variant, when `variant` names it and nobody picked yet. */
 export declare const allowedMergeOf: (options: {
     sketch: Sketch;
     variant: string;
+    by?: string;
+    editRef?: boolean;
 }) => string | Sketch;
+export declare const editRefOf: (options: {
+    target: string;
+    sketch: Sketch;
+    planRef: string;
+}) => boolean;
 /** Merges the picked variant of `sketch` and logs the reason; answers the merged variant and part keys, or why not. */
 export declare const mergeAndRecord: (options: {
     target: string;
@@ -16,9 +26,11 @@ export declare const mergeAndRecord: (options: {
     note?: string;
     replaceNote?: boolean;
     by?: string;
+    decidedBy?: string;
     allowed?: {
         variant: string;
         planRef: string;
+        editRef?: boolean;
     };
 }) => {
     variant: string;

package/src/lib/design/system/sketch/merge-step.js

@@ -9,43 +9,53 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeStepOf = exports.mergeAndRecord = exports.allowedMergeOf = void 0;
+exports.mergeStepOf = exports.mergeAndRecord = exports.editRefOf = exports.allowedMergeOf = void 0;
+const phase_timing_1 = require("../../phase-timing");
+const decision_refs_1 = require("../decision-refs");
 const harness_map_1 = require("../harness-map");
 const resolve_product_1 = require("../resolve-product");
 const cli_args_1 = require("./cli-args");
+const merge_commit_1 = require("./merge-commit");
 const merge_1 = require("./merge");
 const merged_parts_1 = require("./merged-parts");
+const write_origin_1 = require("../write-origin");
 const sketch_1 = require("./sketch");
 /** The sketch with the pick a plan allows: its only live variant, when `variant` names it and nobody picked yet. */
 const allowedMergeOf = (options) => {
-    const { sketch, variant } = options;
+    const { sketch, variant, by = '', editRef } = options;
     const live = sketch.variants.filter((candidate) => !(0, sketch_1.rejectionOf)(sketch, candidate));
-    if (live.length !== 1 || live[0] !== variant)
+    if (editRef ? !live.includes(variant) : live.length !== 1 || live[0] !== variant)
         return `${sketch.target} has ${live.length} live variants (${live.join(', ') || 'none'}), not only "${variant}" - the user picks in Studio`;
-    return (0, sketch_1.decideSketch)({ sketch, decision: { kind: 'pick', variant } });
+    return (0, sketch_1.decideSketch)({ sketch, decision: Object.assign({ kind: 'pick', variant }, (0, write_origin_1.originOf)(by)) });
 };
 exports.allowedMergeOf = allowedMergeOf;
+const editRefOf = (options) => options.sketch.target.endsWith('@edit') &&
+    (0, decision_refs_1.decisionRefsOf)({ target: options.target, text: options.planRef }).length > 0;
+exports.editRefOf = editRefOf;
 /** Merges the picked variant of `sketch` and logs the reason; answers the merged variant and part keys, or why not. */
 const mergeAndRecord = (options) => {
     var _a;
-    const { target, config, product, sketch, note, replaceNote, by, allowed } = options;
-    const decided = allowed ? (0, exports.allowedMergeOf)({ sketch, variant: allowed.variant }) : sketch;
+    const { target, config, product, sketch, note, replaceNote, by, decidedBy, allowed } = options;
+    const decided = allowed ? (0, exports.allowedMergeOf)({ sketch, variant: allowed.variant, by, editRef: allowed.editRef }) : sketch;
     if (typeof decided === 'string')
         return decided;
-    const result = (0, merge_1.mergeSketch)(Object.assign({ target,
+    const before = (0, merge_commit_1.dirtyFilesOfSync)({ target, product });
+    const result = (0, phase_timing_1.timedPhase)('merge-files', () => (0, merge_1.mergeSketch)(Object.assign({ target,
         config,
         product, sketch: decided, note,
-        replaceNote, author: by }, (allowed ? { decidedBy: `plan: ${allowed.planRef.trim()}` } : {})));
+        replaceNote, author: by }, (allowed ? { decidedBy: `plan: ${allowed.planRef.trim()}` } : decidedBy ? { decidedBy } : {}))));
     if (!Array.isArray(result))
         return result.reason;
-    const refreshed = (0, harness_map_1.refreshHarnessMap)({ target, product });
+    const refreshed = (0, phase_timing_1.timedPhase)('harness-map', () => (0, harness_map_1.refreshHarnessMap)({ target, product }));
     if (typeof refreshed === 'string')
         console.error(`merged, but the harness map is still stale: ${refreshed}`);
     const reason = (note === null || note === void 0 ? void 0 : note.trim()) || undefined;
     if (allowed || reason)
         for (const part of sketch.targets)
             (0, merged_parts_1.recordMergeReason)({ product, part, planRef: allowed === null || allowed === void 0 ? void 0 : allowed.planRef.trim(), reason });
-    return { variant: ((_a = decided.decision) === null || _a === void 0 ? void 0 : _a.kind) === 'pick' ? decided.decision.variant : '', parts: result };
+    const variant = ((_a = decided.decision) === null || _a === void 0 ? void 0 : _a.kind) === 'pick' ? decided.decision.variant : '';
+    (0, merge_commit_1.commitMergeResultSync)({ target, product, sketch, variant, before });
+    return { variant, parts: result };
 };
 exports.mergeAndRecord = mergeAndRecord;
 /** A merge of one ready sketch as a step, or why it may not run; checks everything a merge needs before anything is written. */
@@ -71,11 +81,13 @@ const mergeStepOf = (options) => {
     if (sketch.status !== 'ready')
         return `${sketch.target} is ${sketch.status} - mark it ready first: design sketch ready ${sketch.target} --by <model id> --product ${product.name}`;
     const picked = ((_a = sketch.decision) === null || _a === void 0 ? void 0 : _a.kind) === 'pick' ? sketch.decision.variant : undefined;
-    const allowed = variant !== undefined && picked === undefined ? { variant, planRef: note } : undefined;
+    const allowed = variant !== undefined && picked === undefined
+        ? { variant, planRef: note, editRef: (0, exports.editRefOf)({ target, sketch, planRef: note }) }
+        : undefined;
     if (variant !== undefined && picked !== undefined && picked !== variant)
         return `${sketch.target} was picked as variant "${picked}", not "${variant}"`;
     if (allowed) {
-        const decided = (0, exports.allowedMergeOf)({ sketch, variant: allowed.variant });
+        const decided = (0, exports.allowedMergeOf)({ sketch, variant: allowed.variant, by, editRef: allowed.editRef });
         if (typeof decided === 'string')
             return decided;
     }

package/src/lib/design/system/sketch/merge-step.js.map

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

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

@@ -0,0 +1 @@
+export {};

package/src/lib/design/system/sketch/merge-worker.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const worker_threads_1 = require("worker_threads");
+const merge_runner_1 = require("./merge-runner");
+const answerOf = (request) => {
+    try {
+        return { result: (0, merge_runner_1.studioMergeOf)(request) };
+    }
+    catch (error) {
+        return { error: error instanceof Error ? error.message : String(error) };
+    }
+};
+worker_threads_1.parentPort === null || worker_threads_1.parentPort === void 0 ? void 0 : worker_threads_1.parentPort.once('message', (request) => worker_threads_1.parentPort === null || worker_threads_1.parentPort === void 0 ? void 0 : worker_threads_1.parentPort.postMessage(answerOf(request)));
+//# sourceMappingURL=merge-worker.js.map

package/src/lib/design/system/sketch/merge-worker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-worker.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/lib/design/system/sketch/merge-worker.ts"],"names":[],"mappings":";;AAAA,mDAA4C;AAC5C,iDAA4E;AAE5E,MAAM,QAAQ,GAAG,CAAC,OAAqB,EAAiB,EAAE;IACxD,IAAI,CAAC;QACH,OAAO,EAAE,MAAM,EAAE,IAAA,4BAAa,EAAC,OAAO,CAAC,EAAE,CAAC;IAC5C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;IAC3E,CAAC;AACH,CAAC,CAAC;AAEF,2BAAU,aAAV,2BAAU,uBAAV,2BAAU,CAAE,IAAI,CAAC,SAAS,EAAE,CAAC,OAAqB,EAAE,EAAE,CAAC,2BAAU,aAAV,2BAAU,uBAAV,2BAAU,CAAE,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC"}

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

@@ -1,4 +1,4 @@
-import { DesignConfig } from '../../paths';
+import { DesignConfig } from '../../design-config';
 import { ResolvedProduct } from '../resolve-product';
 import { Sketch } from './sketch';
 /**
@@ -9,14 +9,21 @@ export type MergeRefusal = {
     reason: string;
     changed?: string[];
     findings?: string[];
+    dirty?: string[];
 };
+/** Why `sketch` cannot be merged as it stands - not ready, no valid pick, or a rejected pick - or `null` when it can. */
+export declare const mergeRefusalOf: (options: {
+    product: ResolvedProduct;
+    sketch: Sketch;
+}) => string | null;
 /**
  * Merges the variant the user picked in a ready sketch into the product: copies each part it holds
  * over the product's - a part the product takes from its base over the base's, unless the sketch was opened with
  * `override`; `into-base` also removes the product copy and its `merged.json` entry - keeps the target's note (replaces it with `note`
  * only with `replaceNote`; an empty one takes the variant note) and sets `madeBy` (the file's own plus the variant's authors) on the target, runs the check
- * records each merged part's hash in `merged.json`, with the pick (variant, `decidedBy` - default `user` - and when), and deletes the sketch. With `override`, a target the product only takes from its base is copied into the product first. When the check fails, the
- * product's old files come back and the sketch stays. Each file in the variant's `assets/` goes into the product's `assets/`. A file of the sketch's `shared/` folder whose path the product's `shared/` holds
+ * records each merged part's hash in `merged.json`, with the pick (variant, `decidedBy` - default `user` - and when), and deletes the sketch. With `override`, a target the product only takes from its base is copied into the product first. All of this
+ * runs in a clean copy of HEAD plus the sketch; only the result reaches the checkout, and a result that would overwrite
+ * a file with uncommitted edits refuses with that file in `dirty`. When the check fails, the checkout and the sketch stay as they were. Each file in the variant's `assets/` goes into the product's `assets/`. A file of the sketch's `shared/` folder whose path the product's `shared/` holds
  * replaces it there; the rest goes into the target's folder when the target imports it, with its `@shared/` imports made relative; any other part that imports it stops the merge. Otherwise the addressed comments on its variants, and those on the merged parts that have no sketch, are resolved, and the open ones on its variants are addressed, by `author` or the user. Refuses without a
  * pick, and when a part the variant replaces changed in the product since the sketch's baseline. Answers with the merged part keys, or with why nothing was merged - and, when a rebase
  * would let it, the parts that changed (`[]` without a baseline).