@ifc-lite/cli 0.17.2 → 0.19.0

package/dist/commands/layer-diff.d.ts

@@ -0,0 +1,3 @@
+export { diffLayerStacks, diffStackStates as diffStates, type ModifiedEntity, type StackDiff as LayerDiffResult, } from '@ifc-lite/merge';
+export declare function layerDiffCommand(args: string[]): Promise<void>;
+//# sourceMappingURL=layer-diff.d.ts.map

package/dist/commands/layer-diff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"layer-diff.d.ts","sourceRoot":"","sources":["../../src/commands/layer-diff.ts"],"names":[],"mappings":"AAgBA,OAAO,EACL,eAAe,EACf,eAAe,IAAI,UAAU,EAC7B,KAAK,cAAc,EACnB,KAAK,SAAS,IAAI,eAAe,GAClC,MAAM,iBAAiB,CAAC;AAEzB,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAkCpE"}

package/dist/commands/layer-diff.js

@@ -0,0 +1,46 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+/**
+ * `ifc-lite layer diff` — compare two composed states. Each side resolves
+ * to an ordered layer list (a ref's stack, a stored layer, or an .ifcx
+ * file). The diff itself is the shared contract in `@ifc-lite/merge`
+ * (state-diff.ts): CLI, MCP, and the review UI emit the identical JSON.
+ */
+import { diffLayerStacks } from '@ifc-lite/merge';
+import { getFlag, hasFlag, printJson } from '../output.js';
+import { resolveSide, storeFromArgs } from './layer-store.js';
+// Re-exported under the historical CLI names for existing imports.
+export { diffLayerStacks, diffStackStates as diffStates, } from '@ifc-lite/merge';
+export async function layerDiffCommand(args) {
+    const store = storeFromArgs(args);
+    const target = args[0];
+    if (!target || target.startsWith('-')) {
+        throw new Error('Usage: ifc-lite layer diff <layer-id|ref|file.ifcx> [--against <layer-id|ref|file.ifcx>] [--components] [--json]');
+    }
+    const againstSpec = getFlag(args, '--against');
+    const to = resolveSide(store, target);
+    const from = againstSpec
+        ? resolveSide(store, againstSpec)
+        : { kind: 'ref', layers: [], label: '(empty)' };
+    const result = diffLayerStacks(from.layers, to.layers);
+    if (hasFlag(args, '--json')) {
+        printJson(result);
+        return;
+    }
+    process.stdout.write(`diff ${from.label} → ${to.label}\n`);
+    process.stdout.write(`${result.added.length} added, ${result.deleted.length} deleted, ${result.modified.length} modified\n`);
+    for (const path of result.added)
+        process.stdout.write(`  A ${path}\n`);
+    for (const path of result.deleted)
+        process.stdout.write(`  D ${path}\n`);
+    const showComponents = hasFlag(args, '--components');
+    for (const entry of result.modified) {
+        process.stdout.write(`  M ${entry.path}\n`);
+        if (showComponents) {
+            for (const key of entry.components)
+                process.stdout.write(`      ~ ${key}\n`);
+        }
+    }
+}
+//# sourceMappingURL=layer-diff.js.map

package/dist/commands/layer-diff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"layer-diff.js","sourceRoot":"","sources":["../../src/commands/layer-diff.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D;;;;;GAKG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE9D,mEAAmE;AACnE,OAAO,EACL,eAAe,EACf,eAAe,IAAI,UAAU,GAG9B,MAAM,iBAAiB,CAAC;AAEzB,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAAc;IACnD,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACvB,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CACb,kHAAkH,CACnH,CAAC;IACJ,CAAC;IACD,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAE/C,MAAM,EAAE,GAAG,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,WAAW;QACtB,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC;QACjC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAc,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IAC3D,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IAEvD,IAAI,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC5B,SAAS,CAAC,MAAM,CAAC,CAAC;QAClB,OAAO;IACT,CAAC;IAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,MAAM,EAAE,CAAC,KAAK,IAAI,CAAC,CAAC;IAC3D,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,WAAW,MAAM,CAAC,OAAO,CAAC,MAAM,aAAa,MAAM,CAAC,QAAQ,CAAC,MAAM,aAAa,CACvG,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK;QAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;IACvE,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO;QAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;IACzE,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACrD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;QAC5C,IAAI,cAAc,EAAE,CAAC;YACnB,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,UAAU;gBAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/commands/layer-history.d.ts

@@ -0,0 +1,61 @@
+import type { AuthorKind, IfcxFile } from '@ifc-lite/ifcx';
+import { type MergeConflict } from '@ifc-lite/merge';
+import { type LayerStore } from './layer-store.js';
+import { type DerivedScopeOp } from './layer-publish.js';
+export interface LogEntry {
+    id: string;
+    shortId: string;
+    hasManifest: boolean;
+    authorKind?: AuthorKind;
+    principal?: string;
+    created?: string;
+    intent?: string;
+}
+/** Provenance log of a ref's layers, newest first. */
+export declare function logRef(store: LayerStore, refName: string): LogEntry[];
+export declare function layerLogCommand(args: string[]): Promise<void>;
+/** Bake a ref's stack into one tombstone-free flat document. */
+export declare function bakeRef(store: LayerStore, refName: string): IfcxFile;
+export declare function layerBakeCommand(args: string[]): Promise<void>;
+export type RevertOutcome = {
+    status: 'conflicts';
+    conflicts: MergeConflict[];
+} | {
+    status: 'reverted';
+    revertLayerId: string;
+    refLayers: string[];
+};
+/**
+ * Publish an inverse-op layer for `layerId` and append it to the ref.
+ *
+ * Reverting a non-tip layer is a three-way plan, not a blind inverse:
+ * ancestor = the stack through the target layer, theirs = the stack with
+ * the target undone, ours = the ref's current state. Components later
+ * layers also touched surface as conflicts instead of being silently
+ * restored to their pre-target values (`--resolve ours|theirs` decides
+ * them in bulk).
+ */
+export declare function revertInRef(store: LayerStore, layerId: string, refName: string, options?: {
+    principal?: string;
+    created?: string;
+    resolve?: 'ours' | 'theirs';
+}): RevertOutcome;
+export declare function layerRevertCommand(args: string[]): Promise<void>;
+export type RebaseOutcome = {
+    status: 'conflicts';
+    conflicts: MergeConflict[];
+} | {
+    status: 'rebased';
+    layerId: string;
+    file: IfcxFile;
+    /** Carried claims re-verified against the rebased writes (07 §7.2). */
+    scopeVerified: boolean;
+    violations: DerivedScopeOp[];
+};
+/** Re-plan a candidate onto a ref's current stack and publish the result. */
+export declare function rebaseLayerOnto(store: LayerStore, layerId: string, ontoRef: string, options?: {
+    principal?: string;
+    created?: string;
+}): RebaseOutcome;
+export declare function layerRebaseCommand(args: string[]): Promise<void>;
+//# sourceMappingURL=layer-history.d.ts.map

package/dist/commands/layer-history.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"layer-history.d.ts","sourceRoot":"","sources":["../../src/commands/layer-history.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAS3D,OAAO,EAKL,KAAK,aAAa,EAEnB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAUL,KAAK,UAAU,EAChB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAqC,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAM5F,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,sDAAsD;AACtD,wBAAgB,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,GAAG,QAAQ,EAAE,CAgBrE;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBnE;AAMD,gEAAgE;AAChE,wBAAgB,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,GAAG,QAAQ,CAMpE;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAcpE;AAMD,MAAM,MAAM,aAAa,GACrB;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE,aAAa,EAAE,CAAA;CAAE,GACnD;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEvE;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,UAAU,EACjB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAA;CAAO,GAClF,aAAa,CAoDf;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA0CtE;AAMD,MAAM,MAAM,aAAa,GACrB;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE,aAAa,EAAE,CAAA;CAAE,GACnD;IACE,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,QAAQ,CAAC;IACf,uEAAuE;IACvE,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,cAAc,EAAE,CAAC;CAC9B,CAAC;AAEN,6EAA6E;AAC7E,wBAAgB,eAAe,CAC7B,KAAK,EAAE,UAAU,EACjB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GACrD,aAAa,CAkDf;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAqCtE"}

package/dist/commands/layer-history.js

@@ -0,0 +1,276 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+/**
+ * `ifc-lite layer log|bake|revert|rebase` — history-shaped operations on
+ * the local layer store: provenance log (newest first), tombstone-free
+ * bake for foreign tools, append-only revert layers, and rebase as a
+ * re-planned three-way (no operational transform).
+ */
+import { writeFileSync } from 'node:fs';
+import { bakeLayers, computeLayerId, computeStackHash, createProvenanceManifest, getProvenance, setProvenance, } from '@ifc-lite/ifcx';
+import { applyResolutions, opsToNodes, planRebase, planThreeWayMerge, } from '@ifc-lite/merge';
+import { getFlag, hasFlag, printJson } from '../output.js';
+import { defaultPrincipal, loadLayer, loadRefLayers, requireRef, resolveLayerId, setRef, shortId, storeFromArgs, storeLayer, } from './layer-store.js';
+import { resolveAncestor } from './layer-merge.js';
+import { deriveScopeOps, verifyScopeClaims } from './layer-publish.js';
+/** Provenance log of a ref's layers, newest first. */
+export function logRef(store, refName) {
+    const ids = requireRef(store, refName).layers;
+    const entries = [];
+    for (let i = ids.length - 1; i >= 0; i--) {
+        const id = ids[i];
+        const manifest = getProvenance(loadLayer(store, id));
+        const entry = { id, shortId: shortId(id), hasManifest: manifest !== undefined };
+        if (manifest) {
+            entry.authorKind = manifest.author.kind;
+            entry.principal = manifest.author.principal;
+            entry.created = manifest.created;
+            entry.intent = manifest.intent;
+        }
+        entries.push(entry);
+    }
+    return entries;
+}
+export async function layerLogCommand(args) {
+    const refName = args[0];
+    if (!refName || refName.startsWith('-')) {
+        throw new Error('Usage: ifc-lite layer log <ref> [--json]');
+    }
+    const entries = logRef(storeFromArgs(args), refName);
+    if (hasFlag(args, '--json')) {
+        printJson(entries);
+        return;
+    }
+    if (entries.length === 0) {
+        process.stderr.write(`Ref ${refName} has no layers.\n`);
+        return;
+    }
+    for (const entry of entries) {
+        if (!entry.hasManifest) {
+            process.stdout.write(`${entry.shortId}  (no manifest)\n`);
+            continue;
+        }
+        process.stdout.write(`${entry.shortId}  ${entry.authorKind}:${entry.principal}  ${entry.created}  ${entry.intent}\n`);
+    }
+}
+// ---------------------------------------------------------------------------
+// bake
+// ---------------------------------------------------------------------------
+/** Bake a ref's stack into one tombstone-free flat document. */
+export function bakeRef(store, refName) {
+    const layers = loadRefLayers(store, refName);
+    if (layers.length === 0) {
+        throw new Error(`Ref ${refName} has no layers to bake`);
+    }
+    return bakeLayers(layers);
+}
+export async function layerBakeCommand(args) {
+    const refName = args[0];
+    const outPath = getFlag(args, '-o') ?? getFlag(args, '--out');
+    if (!refName || refName.startsWith('-') || !outPath) {
+        throw new Error('Usage: ifc-lite layer bake <ref> -o <out.ifcx> [--json]');
+    }
+    const store = storeFromArgs(args);
+    const baked = bakeRef(store, refName);
+    writeFileSync(outPath, `${JSON.stringify(baked, null, 2)}\n`, 'utf-8');
+    if (hasFlag(args, '--json')) {
+        printJson({ ref: refName, out: outPath, nodes: baked.data.length });
+    }
+    else {
+        process.stderr.write(`Baked ${refName} (${baked.data.length} node(s)) → ${outPath}\n`);
+    }
+}
+/**
+ * Publish an inverse-op layer for `layerId` and append it to the ref.
+ *
+ * Reverting a non-tip layer is a three-way plan, not a blind inverse:
+ * ancestor = the stack through the target layer, theirs = the stack with
+ * the target undone, ours = the ref's current state. Components later
+ * layers also touched surface as conflicts instead of being silently
+ * restored to their pre-target values (`--resolve ours|theirs` decides
+ * them in bulk).
+ */
+export function revertInRef(store, layerId, refName, options = {}) {
+    const id = resolveLayerId(store, layerId);
+    const entry = requireRef(store, refName);
+    const idx = entry.layers.indexOf(id);
+    if (idx === -1) {
+        throw new Error(`Layer ${id} is not part of ref ${refName}`);
+    }
+    const before = entry.layers.slice(0, idx).map((lid) => loadLayer(store, lid));
+    const through = entry.layers.slice(0, idx + 1).map((lid) => loadLayer(store, lid));
+    const current = loadRefLayers(store, refName);
+    // A→T is the inverse of the target layer; A→O is everything later
+    // layers changed. The matrix folds disjoint edits and flags overlaps.
+    const plan = planThreeWayMerge({ ancestor: through, ours: current, theirs: before });
+    const resolutions = options.resolve
+        ? plan.conflicts.map((conflict) => {
+            const resolution = { path: conflict.path, choice: options.resolve };
+            if (conflict.componentKey !== undefined)
+                resolution.componentKey = conflict.componentKey;
+            return resolution;
+        })
+        : [];
+    const applied = applyResolutions(plan, resolutions);
+    if (applied.unresolved.length > 0) {
+        return { status: 'conflicts', conflicts: applied.unresolved };
+    }
+    const manifest = createProvenanceManifest({
+        author: { kind: 'human', principal: options.principal ?? defaultPrincipal() },
+        intent: `Revert layer ${id}`,
+        base: { kind: 'stack', id: computeStackHash(entry.layers) },
+        created: options.created,
+        parents: [id],
+    });
+    const target = loadLayer(store, id);
+    const bare = {
+        header: {
+            id: '',
+            ifcxVersion: target.header.ifcxVersion,
+            dataVersion: target.header.dataVersion,
+            author: manifest.author.principal,
+            timestamp: manifest.created,
+        },
+        imports: [],
+        schemas: {},
+        data: opsToNodes([...plan.autoOps, ...applied.ops]),
+    };
+    const withManifest = setProvenance(bare, manifest);
+    const revertLayerId = computeLayerId(withManifest);
+    storeLayer(store, { ...withManifest, header: { ...withManifest.header, id: revertLayerId } });
+    const refLayers = [...entry.layers, revertLayerId];
+    setRef(store, refName, { ...entry, layers: refLayers });
+    return { status: 'reverted', revertLayerId, refLayers };
+}
+export async function layerRevertCommand(args) {
+    const layerId = args[0];
+    const refName = getFlag(args, '--in');
+    if (!layerId || layerId.startsWith('-') || !refName) {
+        throw new Error('Usage: ifc-lite layer revert <layer-id> --in <ref> [--resolve ours|theirs] [--json]');
+    }
+    const store = storeFromArgs(args);
+    const options = {};
+    const principal = getFlag(args, '--principal');
+    if (principal !== undefined)
+        options.principal = principal;
+    const resolve = getFlag(args, '--resolve');
+    if (resolve !== undefined) {
+        if (resolve !== 'ours' && resolve !== 'theirs') {
+            throw new Error('--resolve must be ours or theirs');
+        }
+        options.resolve = resolve;
+    }
+    const result = revertInRef(store, layerId, refName, options);
+    const json = hasFlag(args, '--json');
+    if (result.status === 'conflicts') {
+        if (json)
+            printJson({ status: 'conflicts', conflicts: result.conflicts });
+        else {
+            process.stderr.write(`${result.conflicts.length} conflict(s): later layers touched components this revert would restore.\n`);
+            for (const c of result.conflicts) {
+                const component = c.componentKey ? ` ${c.componentKey}` : '';
+                process.stderr.write(`  [${c.kind}] ${c.path}${component}\n`);
+            }
+            process.stderr.write('Re-run with --resolve ours|theirs to decide them in bulk.\n');
+        }
+        process.exit(2);
+        return;
+    }
+    if (json) {
+        printJson({ status: 'reverted', revertLayer: result.revertLayerId, ref: refName, layers: result.refLayers });
+    }
+    else {
+        process.stdout.write(`${result.revertLayerId}\n`);
+        process.stderr.write(`Reverted ${shortId(layerId)} in ${refName}\n`);
+    }
+}
+/** Re-plan a candidate onto a ref's current stack and publish the result. */
+export function rebaseLayerOnto(store, layerId, ontoRef, options = {}) {
+    const candidateId = resolveLayerId(store, layerId);
+    const candidate = loadLayer(store, candidateId);
+    const manifest = getProvenance(candidate);
+    const entry = requireRef(store, ontoRef);
+    const oldBase = resolveAncestor(store, entry.layers, manifest?.base ?? null);
+    if (!oldBase.matched) {
+        process.stderr.write('Warning: candidate base is unknown or not a prefix of the target ref — rebasing from an empty base\n');
+    }
+    const newBase = loadRefLayers(store, ontoRef);
+    const { plan, applied } = planRebase({ candidate, oldBase: oldBase.layers, newBase });
+    if (applied.unresolved.length > 0) {
+        return { status: 'conflicts', conflicts: applied.unresolved };
+    }
+    const manifestOut = createProvenanceManifest({
+        author: manifest?.author ?? { kind: 'human', principal: options.principal ?? defaultPrincipal() },
+        intent: `${manifest?.intent ?? `Rebase ${candidateId}`} (rebased)`,
+        base: { kind: 'stack', id: computeStackHash(entry.layers) },
+        created: options.created,
+        parents: [candidateId],
+        scope_claim: manifest?.scope_claim ?? [],
+    });
+    const bare = {
+        header: {
+            id: '',
+            ifcxVersion: candidate.header.ifcxVersion,
+            dataVersion: candidate.header.dataVersion,
+            author: manifestOut.author.principal,
+            timestamp: manifestOut.created,
+        },
+        imports: [],
+        schemas: {},
+        data: opsToNodes([...plan.autoOps, ...applied.ops]),
+    };
+    // Carried claims must be re-verified against the rebased writes and the
+    // new base — rebasing can change which entities the ops touch, so a
+    // claim that covered the original delta may no longer cover this one.
+    // Mismatch is flagged, never silently accepted (07 §7.2).
+    const scopeOps = deriveScopeOps(bare, newBase);
+    const { verified, violations } = verifyScopeClaims(manifestOut.scope_claim, scopeOps);
+    const withManifest = setProvenance(bare, manifestOut);
+    const newId = computeLayerId(withManifest);
+    const file = { ...withManifest, header: { ...withManifest.header, id: newId } };
+    storeLayer(store, file);
+    return { status: 'rebased', layerId: newId, file, scopeVerified: verified, violations };
+}
+export async function layerRebaseCommand(args) {
+    const layerId = args[0];
+    const ontoRef = getFlag(args, '--onto');
+    if (!layerId || layerId.startsWith('-') || !ontoRef) {
+        throw new Error('Usage: ifc-lite layer rebase <layer-id> --onto <ref> [--json]');
+    }
+    const store = storeFromArgs(args);
+    const options = {};
+    const principal = getFlag(args, '--principal');
+    if (principal !== undefined)
+        options.principal = principal;
+    const outcome = rebaseLayerOnto(store, layerId, ontoRef, options);
+    const json = hasFlag(args, '--json');
+    if (outcome.status === 'conflicts') {
+        if (json)
+            printJson({ status: 'conflicts', conflicts: outcome.conflicts });
+        else {
+            process.stderr.write(`${outcome.conflicts.length} conflict(s) rebasing onto ${ontoRef}:\n`);
+            for (const c of outcome.conflicts) {
+                const component = c.componentKey ? ` ${c.componentKey}` : '';
+                process.stderr.write(`  [${c.kind}] ${c.path}${component}\n`);
+            }
+        }
+        process.exit(2);
+        return;
+    }
+    if (!outcome.scopeVerified) {
+        process.stderr.write('Warning: scope claim mismatch — rebased ops outside the declared claims:\n');
+        for (const op of outcome.violations) {
+            const type = op.ifcType ? ` (${op.ifcType})` : '';
+            process.stderr.write(`  ${op.path}: ${op.capability}${type}\n`);
+        }
+    }
+    if (json) {
+        printJson({ status: 'rebased', id: outcome.layerId, scope_verified: outcome.scopeVerified });
+    }
+    else {
+        process.stdout.write(`${outcome.layerId}\n`);
+        process.stderr.write(`Rebased ${shortId(layerId)} onto ${ontoRef}\n`);
+    }
+}
+//# sourceMappingURL=layer-history.js.map

package/dist/commands/layer-history.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"layer-history.js","sourceRoot":"","sources":["../../src/commands/layer-history.ts"],"names":[],"mappings":"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"}

package/dist/commands/layer-merge.d.ts

@@ -0,0 +1,22 @@
+/**
+ * `ifc-lite layer merge <layer-id> --into <ref>` — CLI transport for the
+ * shared merge flow in `@ifc-lite/merge` (ref-flow.ts): fast-forward,
+ * three-way planning with explicit conflicts, blanket resolutions
+ * (--resolve ours|theirs), and ref-policy enforcement. The registry route
+ * runs the identical flow server-side.
+ *
+ * Exit codes (09 §9.3): 0 clean, 2 conflicts, 3 policy failure,
+ * 5 unrelated base.
+ */
+import type { ProvenanceBase } from '@ifc-lite/ifcx';
+import { type AncestorResolution, type LayerRefStore, type MergeInit, type MergeOutcome } from '@ifc-lite/merge';
+import { type LayerStore } from './layer-store.js';
+export { checkRefPolicy, type MergeInit, type MergeOutcome, type Waiver } from '@ifc-lite/merge';
+/** The shared flow's store surface, backed by the local `.ifc-lite/` store. */
+export declare function refStoreFor(store: LayerStore): LayerRefStore;
+/** CLI entry to the shared merge flow; defaults the resolver principal. */
+export declare function mergeIntoRef(store: LayerStore, init: MergeInit): MergeOutcome;
+/** CLI-signature wrapper kept for the history (revert/rebase) commands. */
+export declare function resolveAncestor(store: LayerStore, refLayerIds: readonly string[], base: ProvenanceBase | null | undefined): AncestorResolution;
+export declare function layerMergeCommand(args: string[]): Promise<void>;
+//# sourceMappingURL=layer-merge.d.ts.map

package/dist/commands/layer-merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"layer-merge.d.ts","sourceRoot":"","sources":["../../src/commands/layer-merge.ts"],"names":[],"mappings":"AAIA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAElB,KAAK,SAAS,EACd,KAAK,YAAY,EAElB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EASL,KAAK,UAAU,EAChB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,cAAc,EAAE,KAAK,SAAS,EAAE,KAAK,YAAY,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEjG,+EAA+E;AAC/E,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,aAAa,CAQ5D;AAED,2EAA2E;AAC3E,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,GAAG,YAAY,CAK7E;AAED,2EAA2E;AAC3E,wBAAgB,eAAe,CAC7B,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,SAAS,MAAM,EAAE,EAC9B,IAAI,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,GACtC,kBAAkB,CAEpB;AAuBD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA0FrE"}

package/dist/commands/layer-merge.js

@@ -0,0 +1,138 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+import { mergeIntoRef as mergeIntoRefShared, resolveAncestor as resolveAncestorShared, } from '@ifc-lite/merge';
+import { getAllFlags, getFlag, hasFlag, printJson } from '../output.js';
+import { defaultPrincipal, getRef, loadLayer, resolveLayerId, setRef, shortId, storeFromArgs, storeLayer, } from './layer-store.js';
+export { checkRefPolicy } from '@ifc-lite/merge';
+/** The shared flow's store surface, backed by the local `.ifc-lite/` store. */
+export function refStoreFor(store) {
+    return {
+        loadLayer: (id) => loadLayer(store, id),
+        storeLayer: (file) => storeLayer(store, file),
+        getRef: (name) => getRef(store, name),
+        setRef: (name, entry) => setRef(store, name, entry),
+        resolveLayerId: (idOrPrefix) => resolveLayerId(store, idOrPrefix),
+    };
+}
+/** CLI entry to the shared merge flow; defaults the resolver principal. */
+export function mergeIntoRef(store, init) {
+    return mergeIntoRefShared(refStoreFor(store), {
+        ...init,
+        principal: init.principal ?? defaultPrincipal(),
+    });
+}
+/** CLI-signature wrapper kept for the history (revert/rebase) commands. */
+export function resolveAncestor(store, refLayerIds, base) {
+    return resolveAncestorShared({ loadLayer: (id) => loadLayer(store, id) }, refLayerIds, base);
+}
+// ---------------------------------------------------------------------------
+// command
+// ---------------------------------------------------------------------------
+function parseWaivers(args) {
+    const specs = getAllFlags(args, '--waive');
+    const reasons = getAllFlags(args, '--reason');
+    if (specs.length !== reasons.length) {
+        throw new Error('Each --waive <spec> requires a matching --reason "<text>"');
+    }
+    return specs.map((spec, i) => ({ spec, reason: reasons[i] }));
+}
+function printConflicts(conflicts) {
+    process.stderr.write(`${conflicts.length} conflict(s):\n`);
+    for (const c of conflicts) {
+        const component = c.componentKey ? ` ${c.componentKey}` : '';
+        process.stderr.write(`  [${c.kind}] ${c.path}${component}\n`);
+    }
+}
+export async function layerMergeCommand(args) {
+    const candidateId = args[0];
+    const into = getFlag(args, '--into');
+    if (!candidateId || candidateId.startsWith('-') || !into) {
+        throw new Error('Usage: ifc-lite layer merge <layer-id> --into <ref> [--preview] [--resolve ours|theirs] [--waive <spec> --reason "<text>"]... [--approved-by <principal>] [--allow-unrelated] [--json]');
+    }
+    const resolveFlag = getFlag(args, '--resolve');
+    if (resolveFlag !== undefined && resolveFlag !== 'ours' && resolveFlag !== 'theirs') {
+        throw new Error(`--resolve must be "ours" or "theirs", got "${resolveFlag}"`);
+    }
+    const store = storeFromArgs(args);
+    const init = {
+        candidateId,
+        into,
+        preview: hasFlag(args, '--preview'),
+        waivers: parseWaivers(args),
+        allowUnrelated: hasFlag(args, '--allow-unrelated'),
+    };
+    if (resolveFlag !== undefined)
+        init.resolve = resolveFlag;
+    const approvedBy = getFlag(args, '--approved-by');
+    if (approvedBy !== undefined)
+        init.approvedBy = approvedBy;
+    const principal = getFlag(args, '--principal');
+    if (principal !== undefined)
+        init.principal = principal;
+    const outcome = mergeIntoRef(store, init);
+    const json = hasFlag(args, '--json');
+    if (outcome.status !== 'policy-failure' &&
+        outcome.status !== 'unrelated-base' &&
+        outcome.status !== 'fast-forward' &&
+        !outcome.ancestorMatched) {
+        process.stderr.write('Warning: candidate base is unknown or not a prefix of the target ref — using an empty ancestor\n');
+    }
+    switch (outcome.status) {
+        case 'fast-forward':
+            if (json)
+                printJson({ status: outcome.status, ref: into, layers: outcome.refLayers });
+            else
+                process.stdout.write(`Fast-forwarded ${into} to ${shortId(candidateId)}\n`);
+            return;
+        case 'preview':
+            if (json)
+                printJson(outcome.plan);
+            else {
+                process.stdout.write(`plan: ${outcome.plan.autoOps.length} auto op(s), ${outcome.plan.conflicts.length} conflict(s)\n`);
+                if (outcome.plan.conflicts.length > 0)
+                    printConflicts(outcome.plan.conflicts);
+            }
+            if (outcome.plan.conflicts.length > 0)
+                process.exit(2);
+            return;
+        case 'conflicts':
+            if (json)
+                printJson({ status: outcome.status, conflicts: outcome.conflicts });
+            else
+                printConflicts(outcome.conflicts);
+            process.exit(2);
+            return;
+        case 'policy-failure':
+            if (json)
+                printJson({ status: outcome.status, reason: outcome.reason });
+            else
+                process.stderr.write(`Policy failure: ${outcome.reason}\n`);
+            process.exit(3);
+            return;
+        case 'unrelated-base':
+            if (json)
+                printJson({ status: outcome.status, declaredBase: outcome.declaredBase });
+            else {
+                process.stderr.write(`Candidate declares base ${outcome.declaredBase.kind} ${outcome.declaredBase.id} which matches nothing on ${into} — ` +
+                    'it was authored against a different history. Re-run with --allow-unrelated to merge against an empty ancestor (every candidate op will read as new).\n');
+            }
+            process.exit(5);
+            return;
+        case 'merged':
+            if (json) {
+                printJson({
+                    status: outcome.status,
+                    mergeLayer: outcome.mergeLayerId,
+                    ref: into,
+                    layers: outcome.refLayers,
+                });
+            }
+            else {
+                process.stdout.write(`${outcome.mergeLayerId}\n`);
+                process.stderr.write(`Merged ${shortId(candidateId)} into ${into}\n`);
+            }
+            return;
+    }
+}
+//# sourceMappingURL=layer-merge.js.map

package/dist/commands/layer-merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"layer-merge.js","sourceRoot":"","sources":["../../src/commands/layer-merge.ts"],"names":[],"mappings":"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"}