@amalgm/live 0.2.58 → 0.2.60

package/PURPOSE.md

@@ -186,26 +186,30 @@ its cutover.
     neither act may weaken the other's result.
 30. **Proof travels forward; disposable bytes need not.** Registration reads
     every ordinary text or binary file through one bounded stream to classify
-    it, derive its content head, and retain any block-manifest evidence needed
-    by the later Upload stage. A graph-only Register capture does not copy
-    those same bytes into the machine cache merely to preserve them for
-    Upload. Upload receives one seekable source selected by the host — an
-    already-sealed cache object when one exists, otherwise the registered
-    ground itself — and verifies every byte it sends against the captured
-    content head. A typed source mismatch returns control to Register so it
-    can recapture current ground; stale bytes can never be sealed or
-    published. During Add, ordinary text and binary bytes land directly in
+    it and derive its content head. When cloud cargo is missing, that same
+    capture stream carries the verified bytes forward: bounded complete small
+    artifacts enter the cargo stream, while large-file blocks become durable
+    under their own digests as they are read and the authority seals the
+    manifest only after every named block exists. A graph-only Register
+    capture never copies or rereads ground merely to preserve bytes for a
+    later Upload stage. A typed source mismatch returns control to Register so
+    it can recapture current ground; stale bytes can never be sealed or
+    published. A final missing-cargo inventory remains the publication
+    guarantor and may reread ground only when fused transport was unavailable
+    or refused. During Add, ordinary text and binary bytes land directly in
     their hidden staged destinations in manifest order while set-wide fetches
     remain bounded and concurrent, so their whole-artifact proof advances from
     arriving bytes without rereading staging; links and repository transports
     keep their dedicated adapter/cache rails. No file type or size permits a
     complete-file allocation in the bounded transfer path.
 31. **A content block is not a round trip.** Text and binary retain independent
-    content-addressed block identities. Cold upload may move complete small
-    artifacts in bounded cargo waves, while cold upload and download move
-    adjacent missing blocks in bounded binary batches. Packing may reduce
-    transport work but can never weaken per-block verification, durable sealing,
-    or commit order.
+    content-addressed block identities. Cold upload moves complete small
+    artifacts in bounded cargo segments and adjacent missing large-file blocks
+    in bounded binary batches. Cold download plans whole waves against
+    placement: all missing manifests, then all missing blocks, each wave
+    grouped by pack so adjacent members merge into bounded range reads.
+    Packing may reduce transport work but can never weaken per-block
+    verification, durable sealing, or commit order.
 32. **A content layout owns a cloud namespace.** A writer change that derives
     different block identities for the same complete bytes advances the
     content contract and storage namespace together. Readers remain additive;
@@ -294,6 +298,17 @@ its cutover.
     current pointer atomically. Retries never reactivate an older id, prior
     deployments remain addressable, and SQLite rows, WAL pages, locks, and
     offsets remain machine-local materializations rather than sync payloads.
+44. **Sealed answers correctness; packed answers placement.** `sealed` proves
+    an artifact's bytes are durably valid under the current content contract,
+    and record submission trusts it unconditionally, whatever the placement.
+    `packed` proves the artifact is stored efficiently inside an immutable
+    pack — and one manifest location row proves its complete packed closure,
+    because the authority records every block location and the manifest
+    location before sealing. Upload skips a small artifact only when it is
+    both sealed and packed; a large artifact requires only sealed. Repacking
+    is placement work, never correctness work: placement rows converge
+    first-wins, a source missing at repack time is skipped silently, and
+    what readers can open never changes.
 
 ## Five surfaces, one behavior
 

package/dist/transfer/cargo.d.ts

@@ -52,6 +52,17 @@ export interface CargoStreamReceipt {
 }
 /** Pack items in order into segments within the byte and artifact bounds. */
 export declare function planCargoSegments<T extends CargoItem>(items: readonly T[]): readonly CargoSegment<T>[];
+/** A cargo stream whose items arrive while a walk is still discovering
+ * them. Full segments ship as they close; `add` applies backpressure when
+ * the shared window is full, and `flush` ships the final partial segment
+ * and settles every acknowledgement. After any rejection, `flush` still
+ * settles in-flight segments before rethrowing the first failure, so their
+ * sealed work stays durable for the resuming rerun. */
+export interface CargoStream<T extends CargoItem> {
+    add(item: T): Promise<void>;
+    flush(): Promise<CargoStreamReceipt>;
+}
+export declare function openCargoStream<T extends CargoItem>(ports: CargoStreamPorts<T>, options?: CargoStreamOptions): CargoStream<T>;
 /** Stream one cold set of small artifacts as bounded pipelined segments.
  * Every item must come back sealed or the stream fails; a failure stops new
  * admission, lets in-flight segments settle, and leaves their sealed work

package/dist/transfer/cargo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cargo.d.ts","sourceRoot":"","sources":["../../src/transfer/cargo.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,eAAO,MAAM,mBAAmB,QAA4B,CAAC;AAC7D;;;uDAGuD;AACvD,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAC3C;;;2EAG2E;AAC3E,eAAO,MAAM,4BAA4B,QAA0B,CAAC;AAEpE,MAAM,WAAW,SAAS;IACxB,gEAAgE;IAChE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,iDAAiD;IACjD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,SAAS;IAC/C,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,SAAS;IACnD;;;uEAGmE;IACnE,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CACpC;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,6EAA6E;AAC7E,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,SAAS,EACnD,KAAK,EAAE,SAAS,CAAC,EAAE,GAClB,SAAS,YAAY,CAAC,CAAC,CAAC,EAAE,CAyB5B;AAED;;;qCAGqC;AACrC,wBAAsB,WAAW,CAAC,CAAC,SAAS,SAAS,EACnD,KAAK,EAAE,SAAS,CAAC,EAAE,EACnB,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC1B,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAqB7B"}
+{"version":3,"file":"cargo.d.ts","sourceRoot":"","sources":["../../src/transfer/cargo.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAKH,eAAO,MAAM,mBAAmB,QAA4B,CAAC;AAC7D;;;uDAGuD;AACvD,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAC3C;;;2EAG2E;AAC3E,eAAO,MAAM,4BAA4B,QAA0B,CAAC;AAEpE,MAAM,WAAW,SAAS;IACxB,gEAAgE;IAChE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,iDAAiD;IACjD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,SAAS;IAC/C,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,SAAS;IACnD;;;uEAGmE;IACnE,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CACpC;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAcD,6EAA6E;AAC7E,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,SAAS,EACnD,KAAK,EAAE,SAAS,CAAC,EAAE,GAClB,SAAS,YAAY,CAAC,CAAC,CAAC,EAAE,CAiB5B;AAED;;;;;uDAKuD;AACvD,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,SAAS;IAC9C,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,KAAK,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACtC;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS,SAAS,EACjD,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC1B,OAAO,GAAE,kBAAuB,GAC/B,WAAW,CAAC,CAAC,CAAC,CAuEhB;AAED;;;qCAGqC;AACrC,wBAAsB,WAAW,CAAC,CAAC,SAAS,SAAS,EACnD,KAAK,EAAE,SAAS,CAAC,EAAE,EACnB,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC1B,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAS7B"}

package/dist/transfer/cargo.js

@@ -26,21 +26,24 @@ export const CARGO_SEGMENT_ARTIFACTS = 256;
  * fan-out, and worst-case payload residency (plaintext plus one encoded
  * copy per in-flight segment) stays comfortably inside a 1-GiB runtime. */
 export const CARGO_STREAM_IN_FLIGHT_BYTES = 4 * CARGO_SEGMENT_BYTES;
+const assertCargoItem = (item) => {
+    if (typeof item.contentHash !== 'string' || item.contentHash.length === 0) {
+        throw new Error('cargo item is missing its content identity');
+    }
+    if (!Number.isSafeInteger(item.bytes) || item.bytes < 0) {
+        throw new Error('cargo item byte count is invalid');
+    }
+    if (item.bytes > CARGO_SEGMENT_BYTES) {
+        throw new Error('cargo item exceeds the segment byte bound');
+    }
+};
 /** Pack items in order into segments within the byte and artifact bounds. */
 export function planCargoSegments(items) {
     const segments = [];
     let current = [];
     let bytes = 0;
     for (const item of items) {
-        if (typeof item.contentHash !== 'string' || item.contentHash.length === 0) {
-            throw new Error('cargo item is missing its content identity');
-        }
-        if (!Number.isSafeInteger(item.bytes) || item.bytes < 0) {
-            throw new Error('cargo item byte count is invalid');
-        }
-        if (item.bytes > CARGO_SEGMENT_BYTES) {
-            throw new Error('cargo item exceeds the segment byte bound');
-        }
+        assertCargoItem(item);
         if (current.length > 0
             && (bytes + item.bytes > CARGO_SEGMENT_BYTES || current.length >= CARGO_SEGMENT_ARTIFACTS)) {
             segments.push({ items: current, bytes });
@@ -54,24 +57,95 @@ export function planCargoSegments(items) {
         segments.push({ items: current, bytes });
     return segments;
 }
+export function openCargoStream(ports, options = {}) {
+    const lanes = options.lanes ?? DEFAULT_TRANSFER_CONCURRENCY;
+    const maxInFlightBytes = options.maxInFlightBytes ?? CARGO_STREAM_IN_FLIGHT_BYTES;
+    const inFlight = new Set();
+    let inFlightBytes = 0;
+    let failure;
+    let current = [];
+    let currentBytes = 0;
+    let segments = 0;
+    let artifacts = 0;
+    let bytes = 0;
+    const dispatch = async (segment) => {
+        const weight = Math.max(segment.bytes, 1);
+        while (failure === undefined
+            && (inFlight.size >= lanes
+                || (inFlight.size > 0 && inFlightBytes + weight > maxInFlightBytes))) {
+            await Promise.race(inFlight);
+        }
+        if (failure !== undefined)
+            throw failure.error;
+        inFlightBytes += weight;
+        const settled = (async () => {
+            const sealed = new Set(await ports.send(segment));
+            for (const item of segment.items) {
+                if (!sealed.has(item.contentHash)) {
+                    throw new Error(`cargo authority did not seal ${item.contentHash}`);
+                }
+            }
+            segments += 1;
+            artifacts += segment.items.length;
+            bytes += segment.bytes;
+        })().then(() => { inFlight.delete(settled); inFlightBytes -= weight; }, (error) => {
+            inFlight.delete(settled);
+            inFlightBytes -= weight;
+            failure ??= { error };
+        });
+        inFlight.add(settled);
+    };
+    const closeCurrent = () => {
+        const segment = { items: current, bytes: currentBytes };
+        current = [];
+        currentBytes = 0;
+        return segment;
+    };
+    return {
+        async add(item) {
+            assertCargoItem(item);
+            if (failure !== undefined)
+                throw failure.error;
+            if (current.length > 0
+                && (currentBytes + item.bytes > CARGO_SEGMENT_BYTES
+                    || current.length >= CARGO_SEGMENT_ARTIFACTS)) {
+                await dispatch(closeCurrent());
+            }
+            current.push(item);
+            currentBytes += item.bytes;
+        },
+        async flush() {
+            if (failure === undefined && current.length > 0) {
+                try {
+                    await dispatch(closeCurrent());
+                }
+                catch {
+                    // The failure is recorded; settle the window before rethrowing.
+                }
+            }
+            while (inFlight.size > 0)
+                await Promise.race(inFlight);
+            if (failure !== undefined)
+                throw failure.error;
+            return { segments, artifacts, bytes };
+        },
+    };
+}
 /** Stream one cold set of small artifacts as bounded pipelined segments.
  * Every item must come back sealed or the stream fails; a failure stops new
  * admission, lets in-flight segments settle, and leaves their sealed work
  * durable for the resuming rerun. */
 export async function streamCargo(items, ports, options = {}) {
-    const segments = planCargoSegments(items);
-    let artifacts = 0;
-    let bytes = 0;
-    await weightedParallelForEach(segments, options.lanes ?? DEFAULT_TRANSFER_CONCURRENCY, options.maxInFlightBytes ?? CARGO_STREAM_IN_FLIGHT_BYTES, (segment) => Math.max(segment.bytes, 1), async (segment) => {
-        const sealed = new Set(await ports.send(segment));
-        for (const item of segment.items) {
-            if (!sealed.has(item.contentHash)) {
-                throw new Error(`cargo authority did not seal ${item.contentHash}`);
-            }
-        }
-        artifacts += segment.items.length;
-        bytes += segment.bytes;
-    });
-    return { segments: segments.length, artifacts, bytes };
+    for (const item of items)
+        assertCargoItem(item);
+    const stream = openCargoStream(ports, options);
+    try {
+        for (const item of items)
+            await stream.add(item);
+    }
+    catch {
+        // add() already recorded the failure; flush settles and rethrows it.
+    }
+    return stream.flush();
 }
 //# sourceMappingURL=cargo.js.map

package/dist/transfer/cargo.js.map

@@ -1 +1 @@
-{"version":3,"file":"cargo.js","sourceRoot":"","sources":["../../src/transfer/cargo.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,4BAA4B,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAEtF,MAAM,CAAC,MAAM,mBAAmB,GAAG,yBAAyB,CAAC;AAC7D;;;uDAGuD;AACvD,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAC3C;;;2EAG2E;AAC3E,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,GAAG,mBAAmB,CAAC;AAiCpE,6EAA6E;AAC7E,MAAM,UAAU,iBAAiB,CAC/B,KAAmB;IAEnB,MAAM,QAAQ,GAAsB,EAAE,CAAC;IACvC,IAAI,OAAO,GAAQ,EAAE,CAAC;IACtB,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1E,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;YACxD,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,GAAG,mBAAmB,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;eACjB,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,mBAAmB,IAAI,OAAO,CAAC,MAAM,IAAI,uBAAuB,CAAC,EAAE,CAAC;YAC7F,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;YACzC,OAAO,GAAG,EAAE,CAAC;YACb,KAAK,GAAG,CAAC,CAAC;QACZ,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;QAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IACjE,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;qCAGqC;AACrC,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,KAAmB,EACnB,KAA0B,EAC1B,UAA8B,EAAE;IAEhC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAC1C,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,MAAM,uBAAuB,CAC3B,QAAQ,EACR,OAAO,CAAC,KAAK,IAAI,4BAA4B,EAC7C,OAAO,CAAC,gBAAgB,IAAI,4BAA4B,EACxD,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EACvC,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAClD,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;gBAClC,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;QACD,SAAS,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;QAClC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC;IACzB,CAAC,CACF,CAAC;IACF,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;AACzD,CAAC"}
+{"version":3,"file":"cargo.js","sourceRoot":"","sources":["../../src/transfer/cargo.ts"],"names":[],"mappings":"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"}

package/dist/transfer/download.d.ts

@@ -1,37 +1,59 @@
 /**
  * Download a set of immutable artifacts into a machine cache.
  *
- * The set is the primitive: one plan phase proves every manifest and asks the
- * cache which chunks are gaps, one fetch phase obtains every gap across the
- * whole set under a single bound, and one seal phase verifies each complete
- * artifact. A lone artifact is a set of one — there is no second path. This
- * shape removes per-artifact serialization: no artifact waits behind
- * another's plan or seal, only behind the shared fetch bound. Each chunk is
- * still its own storage request — the set changes scheduling, not the
- * request count.
+ * The set is the primitive and the plan is physical. Wave one proves every
+ * manifest: locally held ones are checked in place, missing ones are
+ * resolved as one want-list and fetched grouped by the pack that holds
+ * them. Wave two reads the proven manifests, asks the cache which chunks
+ * are gaps, resolves the whole gap list, and fetches it the same way: all
+ * members of one pack collapse into a few broad byte spans — approximately
+ * one read per pack — while standalone objects remain one read each. A
+ * lone artifact is a set of one; there is no second download path.
  *
- * Fetches complete in whatever order the network answers, but each artifact
+ * Spans complete in whatever order storage answers, but each artifact
  * stores its chunks in chunk order: a verified chunk waits until every
- * earlier gap of the same artifact has been stored. Gaps are admitted round
- * robin across artifacts, so one large artifact cannot occupy the whole
- * window while unrelated work waits. Held bytes stay inside the in-flight
- * byte bound.
+ * earlier gap of the same artifact is stored, so a host assembling a
+ * whole-file digest never re-reads what landed early. The scheduler admits
+ * fetch units strictly in fair plan order, and the plan orders units so a
+ * chunk's predecessor always lives in the same or an earlier unit — an
+ * artifact whose gaps do not line up ascending inside one pack falls back
+ * to per-object reads at its own positions — so ordered stores can never
+ * deadlock. Chains enter the plan round-robin by depth, so one multi-chunk
+ * artifact cannot monopolize the bounded window while unrelated artifacts
+ * wait. In-flight span bytes stay inside one explicit bound; raising request
+ * concurrency never silently raises memory.
  *
- * Every chunk keeps one content-addressed identity, whether its sealed
- * envelope lives alone or as a byte range inside an immutable pack. The
- * host's ports resolve and fetch those identities; parallelism, storage
- * layout, transport, and decryption are the host's concern, while the
- * verification laws here remain singular.
+ * Every object keeps one content-addressed identity whether its sealed
+ * envelope lives alone or as a byte range inside an immutable pack, and
+ * placement is immutable: a retried read may refresh its URL but never its
+ * geometry. Wrong or shifted bytes cannot leak — every dispensed slice is
+ * still an authenticated envelope the host opens and this engine
+ * hash-verifies before a single byte is stored.
  */
 import { type ContentManifest } from '../contracts/content.js';
 import type { Sha256Hex } from '../entities/types.js';
 import { type TransferArtifact } from './artifacts.js';
+import { type ByteSpan } from './ranges.js';
+import { type ContentObjectName, type ContentRef } from './refs.js';
 export interface DownloadPorts<LocalArtifact> {
     readonly sha256Hex: Sha256Hex;
-    getManifest(artifact: TransferArtifact): Promise<unknown>;
+    /** A manifest the host already holds for this artifact, or null to have
+     * the set fetch it. A hint only — the answer is still proven here. */
+    localManifest(artifact: TransferArtifact): unknown;
+    /** Resolve one batch of named objects to storage locations, aligned by
+     * index. Called with at most CONTENT_REFS_BATCH_OBJECTS names. */
+    requestRefs(objects: readonly ContentObjectName[]): Promise<readonly ContentRef[]>;
+    /** Perform one storage read: a byte range of a pack, or a whole
+     * standalone object when span is null. `refresh` re-resolves the read's
+     * location for a retry attempt and throws loudly if placement moved. */
+    fetchSpan(url: string, span: ByteSpan | null, refresh: () => Promise<string>): Promise<Uint8Array>;
+    /** Open one sealed envelope into its plaintext bytes. */
+    openEnvelope(object: ContentObjectName, sealed: Uint8Array): Promise<Uint8Array>;
+    /** A fetched manifest just proved against its artifact; the host persists
+     * it wherever this artifact is being assembled. */
+    manifestProven(artifact: TransferArtifact, manifest: ContentManifest): Promise<void>;
     /** True only when this exact content-addressed chunk is locally verified. */
     hasChunk(artifact: TransferArtifact, manifest: ContentManifest, index: number): Promise<boolean>;
-    getChunk(artifact: TransferArtifact, manifest: ContentManifest, index: number): Promise<Uint8Array>;
     putChunk(artifact: TransferArtifact, manifest: ContentManifest, index: number, bytes: Uint8Array): Promise<void>;
     /** Verify and expose the complete immutable artifact assembled from cache. */
     sealArtifact(artifact: TransferArtifact, manifest: ContentManifest): Promise<SealedArtifact<LocalArtifact>>;
@@ -43,8 +65,10 @@ export interface SealedArtifact<LocalArtifact> {
 }
 export interface DownloadOptions {
     readonly concurrency?: number;
-    /** Maximum plaintext chunk bytes held by in-flight fetch effects. Raising
-     * request concurrency never silently raises this memory bound. */
+    /** Maximum bytes held by in-flight fetch units. Raising request
+     * concurrency never silently raises this memory bound. A single sealed
+     * envelope larger than the bound still fetches whole; admission then
+     * serializes around it. */
     readonly maxInFlightBytes?: number;
 }
 export interface DownloadReceipt<LocalArtifact> {
@@ -54,10 +78,26 @@ export interface DownloadReceipt<LocalArtifact> {
     readonly downloadedChunks: number;
     readonly reusedChunks: number;
 }
+/** The physical geometry one download performed — how knowledge arrived and
+ * how many storage reads carried it. */
+export interface DownloadShape {
+    readonly localManifests: number;
+    readonly fetchedManifests: number;
+    readonly packedManifests: number;
+    readonly standaloneManifests: number;
+    /** Ranged pack reads that carried manifests. */
+    readonly manifestSpans: number;
+    readonly packedBlocks: number;
+    readonly standaloneBlocks: number;
+    /** Ranged pack reads that carried chunk blocks. */
+    readonly blockSpans: number;
+}
+export interface DownloadResult<LocalArtifact> {
+    readonly receipts: readonly DownloadReceipt<LocalArtifact>[];
+    readonly shape: DownloadShape;
+}
 /** Download a set of immutable artifacts, fetching only machine-cache gaps.
  * Receipts return in input order; any failure fails the whole set after
  * letting in-flight effects settle. */
-export declare function downloadAll<LocalArtifact>(artifacts: readonly TransferArtifact[], ports: DownloadPorts<LocalArtifact>, options?: DownloadOptions): Promise<readonly DownloadReceipt<LocalArtifact>[]>;
-/** Download one immutable artifact — a set of one. */
-export declare function download<LocalArtifact>(artifact: TransferArtifact, ports: DownloadPorts<LocalArtifact>, options?: DownloadOptions): Promise<DownloadReceipt<LocalArtifact>>;
+export declare function downloadAll<LocalArtifact>(artifacts: readonly TransferArtifact[], ports: DownloadPorts<LocalArtifact>, options?: DownloadOptions): Promise<DownloadResult<LocalArtifact>>;
 //# sourceMappingURL=download.d.ts.map

package/dist/transfer/download.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/transfer/download.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,EAAqC,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAClG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAA0B,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAO/E,MAAM,WAAW,aAAa,CAAC,aAAa;IAC1C,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1D,6EAA6E;IAC7E,QAAQ,CACN,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC,CAAC;IACpB,QAAQ,CACN,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,UAAU,CAAC,CAAC;IACvB,QAAQ,CACN,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,8EAA8E;IAC9E,YAAY,CACV,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,eAAe,GACxB,OAAO,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC;CAC3C;AAED,MAAM,WAAW,cAAc,CAAC,aAAa;IAC3C,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B;sEACkE;IAClE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CACpC;AAED,MAAM,WAAW,eAAe,CAAC,aAAa;IAC5C,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B;AAmBD;;uCAEuC;AACvC,wBAAsB,WAAW,CAAC,aAAa,EAC7C,SAAS,EAAE,SAAS,gBAAgB,EAAE,EACtC,KAAK,EAAE,aAAa,CAAC,aAAa,CAAC,EACnC,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,SAAS,eAAe,CAAC,aAAa,CAAC,EAAE,CAAC,CA0FpD;AAED,sDAAsD;AACtD,wBAAsB,QAAQ,CAAC,aAAa,EAC1C,QAAQ,EAAE,gBAAgB,EAC1B,KAAK,EAAE,aAAa,CAAC,aAAa,CAAC,EACnC,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAIzC"}
+{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../../src/transfer/download.ts"],"names":[],"mappings":"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"}