@agentshouse/mdruntime 0.1.0-c7bd7ca3faee4 → 0.1.0-c89fa07b05d4b

package/dist/replica.js

@@ -1,10 +1,9 @@
-import { parse } from '@agentshouse/mdmodel';
-import { immutable } from './change.js';
-import { parseCollection, readCollection, validateCollection, } from './collection.js';
-import { overlay, overlayChanged, sameLayerText } from './overlay.js';
+import { equalValue, parse } from '@agentshouse/mdmodel';
+import { immutable, landing } from './change.js';
+import { changedCleanly, collectionOf, unreadable, validateCollection, } from './collection.js';
+import { acceptedBinaries, overlay, overlayChanged, sameLayerText, } from './overlay.js';
 import { providerRewritten } from './save.js';
-import { equalValue } from './room-draft.js';
-import { declaredAttachments } from './attachment.js';
+import { drafted, patched, settled, shared } from './shared.js';
 export function compositionOf(record) {
     return {
         model: record.model,
@@ -13,48 +12,97 @@ export function compositionOf(record) {
             : { roots: record.typedSelection.roots, model: record.selectionModel },
     };
 }
-export function readConfirmed(record, previous) {
-    const read = readCollection(record.documents, compositionOf(record), previous === undefined
-        ? undefined
-        : { text: previous.record.documents, collection: previous.collection });
-    return read.kind === 'read'
-        ? { kind: 'staged', confirmed: { record, collection: read.collection } }
-        : read;
+function held(record) {
+    const documents = shared(record.documents);
+    const binaries = shared(record.binaries);
+    const revisions = shared(record.revisions);
+    const changes = shared(record.changes);
+    const written = shared(record.written);
+    return documents === record.documents &&
+        binaries === record.binaries &&
+        revisions === record.revisions &&
+        changes === record.changes &&
+        written === record.written
+        ? record
+        : { ...record, documents, binaries, revisions, changes, written };
+}
+export function confirmedOf(record, previous) {
+    const kept = held(record);
+    return {
+        record: kept,
+        collection: collectionOf(kept.documents, compositionOf(kept), previous?.collection),
+    };
 }
 export function sameMembership(record, other) {
     return (JSON.stringify(record.typedSelection?.roots ?? null) ===
         JSON.stringify(other.typedSelection?.roots ?? null));
 }
-export function readStaged(record, previous) {
-    if ((record.model.status !== 'unavailable' || record.selectionModel.status !== 'unavailable') &&
-        (previous === undefined ||
-            !sameLayerText(record, previous.record) ||
-            record.model !== previous.record.model ||
-            record.selectionModel !== previous.record.selectionModel)) {
-        const verdict = validateCollection(record.documents, record.binaryTargets, compositionOf(record));
+function cleanly(record, previous) {
+    if (previous === undefined)
+        return false;
+    const before = previous.record;
+    return changedCleanly({ text: record.documents, binaries: record.binaries }, { text: before.documents, binaries: before.binaries, composition: compositionOf(before) }, compositionOf(record));
+}
+export function readStaged(staged, previous) {
+    const record = held(staged);
+    const textChanged = previous === undefined || !sameLayerText(record, previous.record);
+    const modeled = record.model.status !== 'unavailable' || record.selectionModel.status !== 'unavailable';
+    if (modeled &&
+        (textChanged ||
+            record.model !== previous?.record.model ||
+            record.selectionModel !== previous?.record.selectionModel) &&
+        !cleanly(record, previous)) {
+        const verdict = validateCollection(record.documents, Object.keys(record.binaries), compositionOf(record));
         if (verdict.verdict === 'refuse' && verdict.rule !== 'model-unavailable') {
             return { kind: 'refused', refusal: verdict };
         }
+        if (verdict.verdict === 'refuse') {
+            const refused = unreadable(record.documents, previous?.record.documents);
+            if (refused !== null)
+                return refused;
+        }
+    }
+    else if (textChanged) {
+        const refused = unreadable(record.documents, previous?.record.documents);
+        if (refused !== null)
+            return refused;
     }
-    return readConfirmed(record, previous);
+    return { kind: 'staged', confirmed: confirmedOf(record, previous) };
 }
 export function readReclassified(record, previous) {
-    const verdict = validateCollection(record.documents, record.binaryTargets, compositionOf(record));
+    const verdict = validateCollection(record.documents, Object.keys(record.binaries), compositionOf(record));
     if (verdict.verdict !== 'refuse')
-        return readConfirmed(record, previous);
+        return { kind: 'staged', confirmed: confirmedOf(record, previous) };
     return verdict.rule === 'model-unavailable'
         ? { kind: 'deferred' }
         : { kind: 'refused', refusal: verdict };
 }
-export function applyReturned(confirmed, documents, revisions, changes, removals, attachments, roomVersion, writtenAt) {
-    const nextDocuments = { ...confirmed.record.documents, ...documents };
-    const nextRevisions = { ...confirmed.record.revisions, ...revisions };
-    const nextChanges = { ...confirmed.record.changes };
-    const nextWritten = {
-        ...confirmed.record.written,
-        ...Object.fromEntries(Object.keys(documents).map((path) => [path, writtenAt])),
-    };
-    const binaryTargets = new Set(confirmed.record.binaryTargets);
+function returnedBinaries(held, submitted, accepted) {
+    const binaries = drafted(held);
+    for (const change of submitted.changes) {
+        if (change.kind !== 'move')
+            continue;
+        const moved = binaries[change.path];
+        if (moved === undefined || accepted.revisions[change.to] === undefined)
+            continue;
+        binaries[change.to] = moved;
+        delete binaries[change.path];
+    }
+    Object.assign(binaries, acceptedBinaries(accepted.binaryFiles ?? {}));
+    for (const path of accepted.removals)
+        delete binaries[path];
+    return settled(binaries);
+}
+export function applyReturned(confirmed, submitted, accepted, roomVersion, writtenAt) {
+    const { documents, revisions, changes, removals } = accepted;
+    const nextDocuments = drafted(confirmed.record.documents);
+    const nextRevisions = drafted(confirmed.record.revisions);
+    const nextChanges = drafted(confirmed.record.changes);
+    const nextWritten = drafted(confirmed.record.written);
+    Object.assign(nextDocuments, documents);
+    Object.assign(nextRevisions, revisions);
+    for (const path of Object.keys(documents))
+        nextWritten[path] = writtenAt;
     for (const [path, revision] of Object.entries(revisions)) {
         if (confirmed.record.revisions[path] !== revision)
             delete nextChanges[path];
@@ -65,19 +113,15 @@ export function applyReturned(confirmed, documents, revisions, changes, removals
         delete nextRevisions[path];
         delete nextChanges[path];
         delete nextWritten[path];
-        binaryTargets.delete(path);
     }
     return readStaged({
         ...confirmed.record,
         roomVersion,
-        documents: nextDocuments,
-        revisions: nextRevisions,
-        changes: nextChanges,
-        written: nextWritten,
-        binaryTargets: [...binaryTargets].sort(),
-        attachments: attachments === undefined
-            ? confirmed.record.attachments
-            : declaredAttachments([attachments]),
+        documents: settled(nextDocuments),
+        revisions: settled(nextRevisions),
+        changes: settled(nextChanges),
+        written: settled(nextWritten),
+        binaries: returnedBinaries(confirmed.record.binaries, submitted, accepted),
     }, confirmed);
 }
 function predicted(confirmed, batches, previous) {
@@ -98,9 +142,7 @@ function predicted(confirmed, batches, previous) {
         const collection = hasMove
             ? reuseRewrite
                 ? old.collection
-                : parseCollection(before.documents, composition, old?.collection === undefined
-                    ? { text: confirmed.record.documents, collection: confirmed.collection }
-                    : { text: old.before.documents, collection: old.collection })
+                : collectionOf(before.documents, composition, old?.collection ?? confirmed.collection)
             : undefined;
         const effective = collection === undefined
             ? batch
@@ -129,7 +171,7 @@ export function replicaOf(confirmed, queue, previous) {
             queue: batches,
             visible: {
                 documents: confirmed.record.documents,
-                binaryTargets: confirmed.record.binaryTargets,
+                binaries: confirmed.record.binaries,
                 revisions: confirmed.record.revisions,
                 changes: confirmed.record.changes,
                 collection: confirmed.collection,
@@ -144,14 +186,12 @@ export function replicaOf(confirmed, queue, previous) {
         replay,
         visible: {
             ...layer,
-            collection: parseCollection(layer.documents, compositionOf(confirmed.record), previous === undefined
-                ? undefined
-                : { text: previous.visible.documents, collection: previous.visible.collection }),
+            collection: collectionOf(layer.documents, compositionOf(confirmed.record), previous?.visible.collection ?? confirmed.collection),
         },
     };
 }
 function present(layer, path) {
-    return layer.documents[path] !== undefined || layer.binaryTargets.includes(path);
+    return layer.documents[path] !== undefined || layer.binaries[path] !== undefined;
 }
 function holds(layer, preconditions) {
     const parsed = new Map();
@@ -172,6 +212,8 @@ function holds(layer, preconditions) {
         if (precondition.kind === 'revision') {
             return present(layer, path) && layer.revisions[path] === precondition.revision;
         }
+        if (precondition.kind === 'content')
+            return layer.documents[path] === precondition.content;
         const document = documentAt(path);
         if (document === null)
             return false;
@@ -216,36 +258,33 @@ function effects(change) {
             { kind: 'present', path: change.to },
         ];
     }
+    if (change.kind === 'binary')
+        return [{ kind: 'present', path }];
     return [{ kind: 'absent', path }];
 }
-function after(changes, index, path) {
-    let at = path;
-    for (const change of changes.slice(index + 1)) {
-        if (change.path !== at)
-            continue;
-        if (change.kind === 'remove')
-            return null;
-        if (change.kind === 'move')
-            at = change.to;
-    }
-    return at;
-}
 export function landed(batch, confirmed, current = {}) {
-    const layer = { ...confirmed.record, documents: { ...confirmed.record.documents, ...current } };
+    const layer = {
+        ...confirmed.record,
+        documents: patched(confirmed.record.documents, Object.entries(current)),
+    };
     return batch.changes.every((change, index) => {
         if (change.kind === 'replace' || (change.kind === 'create' && 'content' in change)) {
-            const at = after(batch.changes, index, change.path);
+            const at = landing(batch.changes, index, change.path);
             return at === null || layer.documents[at] === change.content;
         }
+        if (change.kind === 'binary') {
+            const at = landing(batch.changes, index, change.path);
+            return at === null || layer.binaries[at]?.sha256 === change.sha256;
+        }
         return effects(change).every((effect) => {
             if (effect.kind === 'absent')
                 return holds(layer, [effect]);
-            const at = after(batch.changes, index, effect.path);
+            const at = landing(batch.changes, index, effect.path);
             return at === null || holds(layer, [{ ...effect, path: at }]);
         });
     });
 }
-export function withdrawals(confirmed, queue, withdrawable) {
+export function withdrawals(confirmed, queue, withdrawable, local) {
     if (!queue.some(withdrawable))
         return [];
     const composition = compositionOf(confirmed.record);
@@ -259,10 +298,18 @@ export function withdrawals(confirmed, queue, withdrawable) {
         const effective = batch.changes.some((change) => change.kind === 'move')
             ? providerRewritten(batch, {
                 ...layer,
-                collection: parseCollection(layer.documents, composition),
+                collection: collectionOf(layer.documents, composition),
             })
             : batch;
-        layer = overlay(layer, [effective]);
+        let unapplied = false;
+        const next = overlay(layer, [effective], () => {
+            unapplied = true;
+        });
+        if (local && unapplied) {
+            withdrawn.push(batch);
+            continue;
+        }
+        layer = next;
     }
     return withdrawn;
 }

package/dist/room-draft.d.ts

@@ -1,4 +1,5 @@
 import type { ProviderRefusal } from './adapter.js';
+import type { Open } from './open.js';
 import type { Change, Precondition } from './change.js';
 import type { VisibleLayer } from './replica.js';
 export type FieldValue = {
@@ -36,6 +37,17 @@ export type RoomDraftParts = {
     readonly removal?: {
         readonly base?: string | null;
     };
+    readonly file?: {
+        readonly blob: Blob;
+    };
+};
+export type HeldFile = {
+    readonly blob: Blob;
+    readonly localId: string;
+    readonly byteLength: number;
+    readonly mediaType: string;
+    readonly sha256: string;
+    readonly base: string | null;
 };
 type HeldParts = {
     readonly fields?: Readonly<Record<string, {
@@ -62,6 +74,7 @@ type HeldParts = {
     readonly removal?: {
         readonly base: string | null;
     };
+    readonly file?: HeldFile;
 };
 type ChangedUnderneath = {
     readonly fields?: Readonly<Record<string, FieldValue>>;
@@ -71,14 +84,12 @@ type ChangedUnderneath = {
     readonly creation?: string;
     readonly move?: string | null;
     readonly removal?: string | null;
+    readonly file?: string | null;
 };
-export type ReturnReason = (ProviderRefusal & {
-    readonly kind: 'conflicted' | 'rejected';
-}) | {
-    readonly kind: 'expired';
-} | {
-    readonly kind: 'withdrawn';
+export type ReturnReason = ProviderRefusal & {
+    readonly kind: 'conflicted' | 'rejected' | 'expired' | 'withdrawn';
 };
+export declare function returnedBy(kind: 'expired' | 'withdrawn'): ReturnReason;
 export type RoomDraft = {
     readonly room: string;
     readonly path: string;
@@ -92,11 +103,14 @@ export type RoomDraftWrite = {
     readonly roomDraft: RoomDraft | null;
 } | {
     readonly outcome: 'stale';
+    readonly code: string;
+    readonly retryable: boolean;
     readonly current: RoomDraft | null;
 };
+export declare function staleWrite(current: RoomDraft | null): RoomDraftWrite;
 export type ChangedPart = {
     readonly path: string;
-    readonly part: 'field' | 'section' | 'preamble' | 'markdown' | 'creation' | 'move' | 'removal';
+    readonly part: Open<'field' | 'section' | 'preamble' | 'markdown' | 'creation' | 'move' | 'removal' | 'file'>;
     readonly name?: string;
 };
 export type RoomDraftRecord = {
@@ -111,9 +125,10 @@ export type SavedDraft = {
     readonly parts: HeldParts;
 };
 export declare function readParts(value: unknown): RoomDraftParts;
-export declare function held(current: HeldParts | undefined, parts: RoomDraftParts): HeldParts;
-export declare function equalValue(left: unknown, right: unknown): boolean;
+export declare function held(current: HeldParts | undefined, parts: RoomDraftParts, file?: HeldFile): HeldParts;
 export declare function underneath(parts: HeldParts, path: string, visible: VisibleLayer | undefined): ChangedUnderneath;
+export declare function heldFile(blob: Blob, base: string | null): Promise<HeldFile>;
+export declare function binaryBase(visible: VisibleLayer | undefined, path: string): string | null;
 export declare function changedParts(path: string, report: ChangedUnderneath): readonly ChangedPart[];
 export declare function returnedInto(existing: HeldParts | undefined, returned: HeldParts): HeldParts;
 export declare function moveTarget(move: {
@@ -123,5 +138,7 @@ export declare function changesOf(path: string, parts: HeldParts): {
     changes: readonly Change[];
     bases: readonly Precondition[];
 };
+export declare function joinedDraft(carried: SavedDraft, saved: readonly SavedDraft[]): SavedDraft;
+export declare function withdrawnDrafts(drafts: readonly SavedDraft[], changes: readonly Change[]): readonly SavedDraft[];
 export {};
 //# sourceMappingURL=room-draft.d.ts.map

package/dist/room-draft.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"room-draft.d.ts","sourceRoot":"","sources":["../src/room-draft.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"room-draft.d.ts","sourceRoot":"","sources":["../src/room-draft.ts"],"names":[],"mappings":"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"}

package/dist/room-draft.js

@@ -1,19 +1,20 @@
-import { apply, parse, serialize } from '@agentshouse/mdmodel';
+import { apply, equalValue, frontmatterValue, parse, serialize } from '@agentshouse/mdmodel';
+import { runtimeError } from './failure.js';
+import { hexDigest } from './file.js';
+import { binaryLocalId } from './identity.js';
 import { normalize } from './paths.js';
+export function returnedBy(kind) {
+    return { kind, code: kind, fields: {}, retryable: false };
+}
+export function staleWrite(current) {
+    return { outcome: 'stale', code: 'stale', retryable: false, current };
+}
 function malformed() {
-    throw new Error('room-draft-malformed');
+    throw runtimeError('room-draft-malformed');
 }
 function plain(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
-function frontmatterValue(value) {
-    if (Array.isArray(value))
-        return value.every(frontmatterValue);
-    return (value === null ||
-        typeof value === 'string' ||
-        typeof value === 'boolean' ||
-        (typeof value === 'number' && Number.isFinite(value)));
-}
 function text(value) {
     return typeof value === 'string' ? value : malformed();
 }
@@ -61,6 +62,7 @@ const PART_NAMES = new Set([
     'creation',
     'move',
     'removal',
+    'file',
 ]);
 export function readParts(value) {
     if (!plain(value) || Object.keys(value).some((name) => !PART_NAMES.has(name)))
@@ -96,6 +98,13 @@ export function readParts(value) {
         const base = markdownBase(value.removal.base);
         parts.removal = base === undefined ? {} : { base };
     }
+    if (value.file !== undefined) {
+        if (!plain(value.file) || !(value.file.blob instanceof Blob))
+            malformed();
+        if (Object.keys(value).length > 1)
+            throw runtimeError('room-draft-file-exclusive');
+        parts.file = { blob: value.file.blob };
+    }
     return parts;
 }
 function named(record) {
@@ -108,7 +117,7 @@ function kept(prior, base) {
     if (prior !== undefined)
         return prior.base;
     if (base === undefined)
-        throw new Error('room-draft-base-missing');
+        throw runtimeError('room-draft-base-missing');
     return base;
 }
 function editsText(parts) {
@@ -116,9 +125,32 @@ function editsText(parts) {
         named(parts.fields).length > 0 ||
         named(parts.sections).length > 0);
 }
-export function held(current, parts) {
+export function held(current, parts, file) {
     if (parts.markdown !== undefined && editsText(parts)) {
-        throw new Error('room-draft-markdown-exclusive');
+        throw runtimeError('room-draft-markdown-exclusive');
+    }
+    if (file !== undefined) {
+        if (current !== undefined && current.file === undefined) {
+            throw runtimeError('room-draft-file-exclusive');
+        }
+        return { file: { ...file, base: current?.file === undefined ? file.base : current.file.base } };
+    }
+    if (current?.file !== undefined) {
+        if (editsText(parts) ||
+            parts.markdown !== undefined ||
+            parts.creation !== undefined ||
+            (parts.move === undefined && parts.removal === undefined)) {
+            throw runtimeError('room-draft-file-exclusive');
+        }
+        return {
+            file: current.file,
+            ...(parts.move === undefined
+                ? {}
+                : { move: { to: parts.move.to, base: kept(current.move, parts.move.base) } }),
+            ...(parts.removal === undefined
+                ? {}
+                : { removal: { base: kept(current.removal, parts.removal.base) } }),
+        };
     }
     const next = {};
     const fields = named(parts.fields);
@@ -156,17 +188,9 @@ export function held(current, parts) {
         next.removal = { base: kept(current?.removal, parts.removal.base) };
     }
     if (Object.keys(next).length === 0)
-        throw new Error('room-draft-empty');
+        throw runtimeError('room-draft-empty');
     return next;
 }
-export function equalValue(left, right) {
-    if (left === right)
-        return true;
-    return (Array.isArray(left) &&
-        Array.isArray(right) &&
-        left.length === right.length &&
-        left.every((item, index) => equalValue(item, right[index])));
-}
 function sameField(left, right) {
     if (left === null || right === null)
         return left === right;
@@ -174,7 +198,7 @@ function sameField(left, right) {
 }
 export function underneath(parts, path, visible) {
     const markdown = visible?.documents[path] ?? null;
-    const document = visible?.collection.documents[path];
+    const document = visible?.collection.document(path);
     const report = {};
     const fields = {};
     for (const [name, part] of named(parts.fields)) {
@@ -207,8 +231,28 @@ export function underneath(parts, path, visible) {
         report.move = markdown;
     if (parts.removal !== undefined && markdown !== parts.removal.base)
         report.removal = markdown;
+    if (parts.file !== undefined) {
+        const file = binaryBase(visible, path);
+        if (file !== parts.file.base || markdown !== null)
+            report.file = file;
+    }
     return report;
 }
+const UNTYPED_MEDIA_TYPE = 'application/octet-stream';
+export async function heldFile(blob, base) {
+    const bytes = await blob.arrayBuffer();
+    return {
+        blob,
+        localId: binaryLocalId(),
+        byteLength: bytes.byteLength,
+        mediaType: blob.type === '' ? UNTYPED_MEDIA_TYPE : blob.type,
+        sha256: hexDigest(await crypto.subtle.digest('SHA-256', bytes)),
+        base,
+    };
+}
+export function binaryBase(visible, path) {
+    return visible?.binaries[path] === undefined ? null : (visible.revisions[path] ?? null);
+}
 export function changedParts(path, report) {
     return [
         ...(report.creation === undefined ? [] : [{ path, part: 'creation' }]),
@@ -218,6 +262,7 @@ export function changedParts(path, report) {
         ...(report.markdown === undefined ? [] : [{ path, part: 'markdown' }]),
         ...(report.move === undefined ? [] : [{ path, part: 'move' }]),
         ...(report.removal === undefined ? [] : [{ path, part: 'removal' }]),
+        ...(report.file === undefined ? [] : [{ path, part: 'file' }]),
     ];
 }
 function joined(existing, returned) {
@@ -280,12 +325,15 @@ export function returnedInto(existing, returned) {
     const creation = existing.creation ?? returned.creation;
     const move = existing.move ?? returned.move;
     const removal = existing.removal ?? returned.removal;
+    const file = existing.file ?? returned.file;
     if (creation !== undefined)
         next.creation = creation;
     if (move !== undefined)
         next.move = move;
     if (removal !== undefined)
         next.removal = removal;
+    if (file !== undefined)
+        next.file = file;
     return next;
 }
 export function moveTarget(move) {
@@ -321,9 +369,70 @@ export function changesOf(path, parts) {
     if (parts.markdown !== undefined) {
         changes.push({ kind: 'replace', path, content: parts.markdown.value });
     }
+    if (parts.file !== undefined && parts.removal === undefined) {
+        const { base, ...file } = parts.file;
+        const at = parts.move === undefined ? path : moveTarget(parts.move);
+        if (base !== null && at !== path)
+            changes.push({ kind: 'move', path, to: at });
+        changes.push({ kind: 'binary', path: at, ...file });
+        if (base === null && at !== path)
+            bases.push({ kind: 'absent', path: at });
+        return { changes, bases };
+    }
+    if (parts.file?.base === null)
+        return { changes, bases };
     if (parts.move !== undefined)
         changes.push({ kind: 'move', path, to: moveTarget(parts.move) });
     if (parts.removal !== undefined)
         changes.push({ kind: 'remove', path });
     return { changes, bases };
 }
+function rebased(before, after) {
+    return before === undefined ? after : { ...after, base: before.base };
+}
+function rebasedAll(before, after) {
+    return {
+        ...before,
+        ...Object.fromEntries(Object.entries(after).map(([name, part]) => [name, rebased(before?.[name], part)])),
+    };
+}
+export function joinedDraft(carried, saved) {
+    const draft = saved.find((item) => item.path === carried.path);
+    if (draft === undefined)
+        return carried;
+    const held = carried.parts;
+    const next = draft.parts;
+    return {
+        path: carried.path,
+        parts: {
+            ...held,
+            ...next,
+            ...(next.fields === undefined ? {} : { fields: rebasedAll(held.fields, next.fields) }),
+            ...(next.sections === undefined
+                ? {}
+                : { sections: rebasedAll(held.sections, next.sections) }),
+            ...(next.preamble === undefined ? {} : { preamble: rebased(held.preamble, next.preamble) }),
+            ...(next.markdown === undefined ? {} : { markdown: rebased(held.markdown, next.markdown) }),
+        },
+    };
+}
+export function withdrawnDrafts(drafts, changes) {
+    return drafts.flatMap((draft) => {
+        const file = draft.parts.file;
+        const at = draft.parts.move?.to ?? draft.path;
+        const change = changes.find((item) => (item.kind === 'move' || item.kind === 'remove') && item.path === at);
+        if (file === undefined || change === undefined)
+            return [draft];
+        if (change.kind === 'move') {
+            return [
+                {
+                    path: draft.path,
+                    parts: change.to === draft.path ? { file } : { file, move: { to: change.to, base: null } },
+                },
+            ];
+        }
+        return file.base === null
+            ? []
+            : [{ path: draft.path, parts: { file, removal: { base: null } } }];
+    });
+}