@agentshouse/mdruntime 0.1.0-c3fa75348e547 → 0.1.0-c3faae279d4d2

package/dist/overlay.js

@@ -1,7 +1,9 @@
-import { apply, parse, serialize } from '@agentshouse/mdmodel';
-import { differing, drafted, patched, settled } from './shared.js';
-export function acceptedBinaries(files) {
-    return Object.fromEntries(Object.entries(files).map(([path, file]) => [path, { state: 'accepted', ...file }]));
+import { apply, frontmatterValue, parse, serialize, } from '@agentshouse/mdmodel';
+import { drafted, entriesIn, settling } from './shared.js';
+import { ROW_WEIGHT } from './turn.js';
+export function* acceptedBinaries(files) {
+    for (const [path, file] of entriesIn(files))
+        yield [path, { state: 'accepted', ...file }];
 }
 export function sameBinary(left, right) {
     if (left === undefined || right === undefined)
@@ -11,7 +13,7 @@ export function sameBinary(left, right) {
         left.mediaType === right.mediaType &&
         left.sha256 === right.sha256 &&
         (left.state === 'accepted'
-            ? right.state === 'accepted' && left.fileRef === right.fileRef
+            ? right.state === 'accepted'
             : right.state === 'pending' && left.localId === right.localId));
 }
 export function sameChange(left, right) {
@@ -23,10 +25,13 @@ export function sameChange(left, right) {
         left.author?.name === right.author?.name);
 }
 const EMPTY_FRONTMATTER = '---\n---\n';
+function isPart(change) {
+    return change.kind === 'field' || change.kind === 'section' || change.kind === 'preamble';
+}
 function at(path, name) {
     return `${path} ${name}`;
 }
-function priorsOf(preconditions) {
+function* priorsOf(preconditions) {
     const fields = new Map();
     const sections = new Map();
     const preambles = new Map();
@@ -40,6 +45,7 @@ function priorsOf(preconditions) {
         if (precondition.kind === 'preamble') {
             preambles.set(precondition.path, precondition.value);
         }
+        yield ROW_WEIGHT;
     }
     return {
         field: (path, name) => fields.get(at(path, name)),
@@ -55,51 +61,50 @@ function compose(fields, sections) {
     const opened = parse(skeleton);
     if (!opened.ok)
         return skeleton;
-    let document = opened.document;
-    for (const [name, value] of Object.entries(fields)) {
-        const next = apply(document, { kind: 'field', name, value, prior: undefined });
-        if (next.outcome === 'applied')
-            document = next.document;
-    }
-    return serialize(document);
+    const next = apply(opened.document, Object.entries(fields).flatMap(([name, value]) => frontmatterValue(value) ? [{ kind: 'field', name, value, prior: undefined }] : []));
+    return serialize(next.outcome === 'applied' ? next.document : opened.document);
 }
-function edited(document, change, priors) {
-    if (change.kind === 'field') {
-        return apply(document, {
+function edited(change, priors) {
+    if (change.kind === 'field')
+        return {
             kind: 'field',
             name: change.name,
             value: change.value,
             prior: priors.field(change.path, change.name),
-        });
-    }
-    if (change.kind === 'preamble') {
-        return apply(document, {
-            kind: 'preamble',
-            value: change.value,
-            prior: priors.preamble(change.path),
-        });
-    }
-    if (change.kind !== 'section')
-        return null;
-    return apply(document, {
+        };
+    if (change.kind === 'preamble')
+        return { kind: 'preamble', value: change.value, prior: priors.preamble(change.path) };
+    return {
         kind: 'section',
         name: change.name,
         value: change.value,
         prior: priors.section(change.path, change.name),
-    });
+    };
 }
-function edit(staged, change, priors) {
-    const text = staged.documents[change.path];
+function edit(staged, changes, priors) {
+    const path = changes[0].path;
+    delete staged.revisions[path];
+    const text = staged.documents[path];
     if (text === undefined)
-        return false;
-    const parsed = parse(text, change.path);
+        return changes.length;
+    const parsed = parse(text, path);
     if (!parsed.ok)
-        return false;
-    const next = edited(parsed.document, change, priors);
-    if (next?.outcome !== 'applied')
-        return false;
-    staged.documents[change.path] = serialize(next.document);
-    return true;
+        return changes.length;
+    const wanted = changes.map((change) => edited(change, priors));
+    const first = apply(parsed.document, wanted);
+    if (first.outcome === 'refuse')
+        return changes.length;
+    if (first.outcome === 'applied') {
+        staged.documents[path] = serialize(first.document);
+        return 0;
+    }
+    const stale = new Set(first.stale);
+    const kept = wanted.filter((_, at) => !stale.has(at));
+    const rest = apply(parsed.document, kept);
+    if (rest.outcome !== 'applied')
+        return changes.length;
+    staged.documents[path] = serialize(rest.document);
+    return first.stale.length;
 }
 function relocate(staged, from, to) {
     const text = staged.documents[from];
@@ -120,16 +125,21 @@ function relocate(staged, from, to) {
 function moveHead(heads, from, to) {
     const revision = heads.revisions[from];
     const fileId = heads.fileIds[from];
+    const created = heads.created[from];
     const change = heads.changes[from];
     delete heads.revisions[from];
     delete heads.fileIds[from];
+    delete heads.created[from];
     delete heads.changes[from];
     delete heads.fileIds[to];
+    delete heads.created[to];
     delete heads.changes[to];
     if (revision !== undefined)
         heads.revisions[to] = revision;
     if (fileId !== undefined)
         heads.fileIds[to] = fileId;
+    if (created !== undefined)
+        heads.created[to] = created;
     if (change !== undefined)
         heads.changes[to] = change;
 }
@@ -137,18 +147,16 @@ function erase(staged, path) {
     delete staged.documents[path];
     delete staged.revisions[path];
     delete staged.fileIds[path];
+    delete staged.created[path];
     delete staged.changes[path];
     delete staged.binaries[path];
 }
-function stage(staged, change, priors) {
-    if (change.kind === 'field' || change.kind === 'section' || change.kind === 'preamble') {
-        delete staged.revisions[change.path];
-        return edit(staged, change, priors);
-    }
+function stage(staged, change) {
     if (change.kind === 'create') {
         staged.documents[change.path] =
             'content' in change ? change.content : compose(change.fields, change.sections);
         delete staged.fileIds[change.path];
+        delete staged.created[change.path];
         delete staged.changes[change.path];
         return true;
     }
@@ -176,149 +184,67 @@ function stage(staged, change, priors) {
     if (change.kind === 'move') {
         return relocate(staged, change.path, change.to);
     }
+    if (change.kind === 'arrival') {
+        erase(staged, change.path);
+        if ('content' in change)
+            staged.documents[change.path] = change.content;
+        else
+            staged.binaries[change.path] = { state: 'accepted', ...change.binary };
+        arrive(staged, change);
+        return true;
+    }
     erase(staged, change.path);
     return true;
 }
-export function overlay(base, queue, unapplied) {
+function arrive(heads, change) {
+    if (change.revision !== undefined)
+        heads.revisions[change.path] = change.revision;
+    if (change.fileId !== undefined)
+        heads.fileIds[change.path] = change.fileId;
+    if (change.created !== undefined)
+        heads.created[change.path] = change.created;
+    if (change.change !== undefined)
+        heads.changes[change.path] = change.change;
+}
+export function* overlaying(base, queue, unapplied) {
     const staged = {
         documents: drafted(base.documents),
         binaries: drafted(base.binaries),
         revisions: drafted(base.revisions),
         fileIds: drafted(base.fileIds),
+        created: drafted(base.created),
         changes: drafted(base.changes),
     };
     for (const batch of queue) {
-        const priors = priorsOf(batch.preconditions);
-        for (const change of batch.changes) {
-            if (!stage(staged, change, priors))
-                unapplied?.();
-        }
-    }
-    return {
-        documents: settled(staged.documents),
-        binaries: settled(staged.binaries),
-        revisions: settled(staged.revisions),
-        fileIds: settled(staged.fileIds),
-        changes: settled(staged.changes),
-    };
-}
-function pathsOf(batch) {
-    return batch.changes.flatMap((change) => change.kind === 'move' ? [change.path, change.to] : [change.path]);
-}
-export function sameLayerText(left, right) {
-    return (differing(left.documents, right.documents).size === 0 &&
-        differing(left.binaries, right.binaries, sameBinary).size === 0);
-}
-export function changedPaths(left, right) {
-    return new Set([
-        ...differing(left.documents, right.documents),
-        ...differing(left.revisions, right.revisions),
-        ...differing(left.fileIds, right.fileIds),
-        ...differing(left.changes, right.changes, sameChange),
-        ...differing(left.binaries, right.binaries, sameBinary),
-    ]);
-}
-function replayHeads(base, queue) {
-    const heads = {
-        revisions: drafted(base.revisions),
-        fileIds: drafted(base.fileIds),
-        changes: drafted(base.changes),
-    };
-    for (const batch of queue) {
-        for (const change of batch.changes) {
-            if (change.kind === 'remove') {
-                delete heads.revisions[change.path];
-                delete heads.fileIds[change.path];
-                delete heads.changes[change.path];
-            }
-            else if (change.kind === 'create') {
-                delete heads.fileIds[change.path];
-                delete heads.changes[change.path];
-            }
-            else if (change.kind === 'replace' ||
-                change.kind === 'field' ||
-                change.kind === 'section' ||
-                change.kind === 'preamble') {
-                delete heads.revisions[change.path];
-            }
-            else if (change.kind === 'binary') {
-                delete heads.revisions[change.path];
-                delete heads.changes[change.path];
-            }
-            else if (change.kind === 'move') {
-                moveHead(heads, change.path, change.to);
-            }
-        }
-    }
-    return {
-        revisions: settled(heads.revisions),
-        fileIds: settled(heads.fileIds),
-        changes: settled(heads.changes),
-    };
-}
-export function overlayChanged(base, queue, previousBase, previousQueue, previousVisible) {
-    const before = previousQueue.map((batch) => JSON.stringify(batch));
-    const after = queue.map((batch) => JSON.stringify(batch));
-    if (before.length === after.length &&
-        before.every((id, index) => id === after[index]) &&
-        sameLayerText(base, previousBase)) {
-        return {
-            documents: previousVisible.documents,
-            binaries: previousVisible.binaries,
-            ...replayHeads(base, queue),
-        };
-    }
-    const affected = new Set(changedPaths(base, previousBase));
-    const oldIds = new Set(before);
-    const newIds = new Set(after);
-    for (const batch of previousQueue) {
-        if (!newIds.has(JSON.stringify(batch)))
-            for (const path of pathsOf(batch))
-                affected.add(path);
-    }
-    for (const batch of queue) {
-        if (!oldIds.has(JSON.stringify(batch)))
-            for (const path of pathsOf(batch))
-                affected.add(path);
-    }
-    let expanded = true;
-    while (expanded) {
-        expanded = false;
-        for (const batch of queue) {
-            const touched = pathsOf(batch);
-            if (!touched.some((path) => affected.has(path)))
+        const priors = yield* priorsOf(batch.preconditions);
+        for (let index = 0; index < batch.changes.length; index += 1) {
+            const change = batch.changes[index];
+            if (!isPart(change)) {
+                if (!stage(staged, change))
+                    unapplied?.();
+                yield ROW_WEIGHT;
                 continue;
-            for (const path of touched) {
-                if (affected.has(path))
-                    continue;
-                affected.add(path);
-                expanded = true;
             }
+            const run = [change];
+            while (index + 1 < batch.changes.length) {
+                const next = batch.changes[index + 1];
+                if (!isPart(next) || next.path !== change.path)
+                    break;
+                run.push(next);
+                index += 1;
+            }
+            const text = staged.documents[change.path] ?? '';
+            for (let left = edit(staged, run, priors); left > 0; left -= 1)
+                unapplied?.();
+            yield ROW_WEIGHT + text.length;
         }
     }
-    const documents = {};
-    const revisions = {};
-    const fileIds = {};
-    const changes = {};
-    const binaries = {};
-    for (const path of affected) {
-        if (base.documents[path] !== undefined)
-            documents[path] = base.documents[path];
-        if (base.revisions[path] !== undefined)
-            revisions[path] = base.revisions[path];
-        if (base.fileIds[path] !== undefined)
-            fileIds[path] = base.fileIds[path];
-        if (base.changes[path] !== undefined)
-            changes[path] = base.changes[path];
-        if (base.binaries[path] !== undefined)
-            binaries[path] = base.binaries[path];
-    }
-    const staged = overlay({ documents, revisions, fileIds, changes, binaries }, queue.filter((batch) => pathsOf(batch).some((path) => affected.has(path))));
     return {
-        documents: patched(previousVisible.documents, Object.entries(staged.documents), affected),
-        revisions: patched(previousVisible.revisions, Object.entries(staged.revisions), affected),
-        fileIds: patched(previousVisible.fileIds, Object.entries(staged.fileIds), affected),
-        changes: patched(previousVisible.changes, Object.entries(staged.changes), affected),
-        binaries: patched(previousVisible.binaries, Object.entries(staged.binaries), affected),
+        documents: yield* settling(staged.documents),
+        binaries: yield* settling(staged.binaries),
+        revisions: yield* settling(staged.revisions),
+        fileIds: yield* settling(staged.fileIds),
+        created: yield* settling(staged.created),
+        changes: yield* settling(staged.changes),
     };
 }

package/dist/{chat/parts.d.ts → parts.d.ts}

@@ -1,4 +1,5 @@
-import type { TurnContext } from '../adapter.js';
+import type { RunningSubagent, TurnContext } from './adapter.js';
+import { type JobMarker, type OpenJob } from './job.js';
 export type PlanStep = {
     readonly content: string;
     readonly status: string;
@@ -24,6 +25,7 @@ export type Part = {
     readonly target: string | null;
 } | {
     readonly type: 'image';
+    readonly path: string;
     readonly name: string;
     readonly mediaType: string;
 } | {
@@ -36,6 +38,7 @@ export type Part = {
 };
 export declare function partsOf(raw: readonly unknown[]): readonly Part[];
 export declare function contextIn(raw: unknown): TurnContext | null;
+export declare function tokensIn(raw: unknown): number | null;
 export type Turn = {
     readonly turn: string;
     readonly parts: readonly Part[];
@@ -45,13 +48,13 @@ export type ChatWork = {
     readonly kind: 'job' | 'schedule' | 'subagent';
     readonly title: string;
     readonly next: string | null;
+    readonly activity: string | null;
 };
-export type Job = {
-    readonly label: string;
-    readonly kind: 'started' | 'scheduled' | 'ended';
-    readonly state: string;
-    readonly next: string | null;
-};
-export declare function jobOf(said: string): Job;
-export declare function stillRunning(turns: readonly Turn[]): ReadonlyMap<string, readonly ChatWork[]>;
+export declare function counted(count: number): string;
+export declare function runningLine(raw: readonly unknown[]): string | null;
+export declare function jobsOf(markers: readonly JobMarker[], turn: {
+    readonly started: string | null;
+    readonly parts: readonly unknown[];
+} | null): readonly OpenJob[];
+export declare function stillRunning(turns: readonly Turn[], subagents: readonly RunningSubagent[]): ReadonlyMap<string, readonly ChatWork[]>;
 //# sourceMappingURL=parts.d.ts.map

package/dist/parts.d.ts.map

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

package/dist/{chat/parts.js → parts.js}

@@ -1,4 +1,5 @@
-import { list, record, text } from './read.js';
+import { closeLast, markerMoved, openJobs } from './job.js';
+import { excerpt, list, record, text } from './read.js';
 const MARKERS = ['mode', 'compaction', 'retry', 'model', 'job'];
 function partOf(raw) {
     const part = record(raw);
@@ -22,10 +23,11 @@ function partOf(raw) {
             return command === null ? null : { type: 'message', command, target: text(part, 'target') };
         }
         case 'image': {
+            const path = text(part, 'file');
             const name = text(part, 'name');
-            return name === null
+            return path === null || name === null
                 ? null
-                : { type: 'image', name, mediaType: text(part, 'media_type') ?? '' };
+                : { type: 'image', path, name, mediaType: text(part, 'media_type') ?? '' };
         }
         case 'marker': {
             const marker = text(part, 'marker');
@@ -55,65 +57,70 @@ export function contextIn(raw) {
         ? { used: held.used, window: held.window }
         : null;
 }
-const NEXT_RUN = 'next run ';
-export function jobOf(said) {
-    const at = said.lastIndexOf(': ');
-    const label = at === -1 ? said : said.slice(0, at);
-    const state = at === -1 ? '' : said.slice(at + 2);
-    if (state === 'running')
-        return { label, kind: 'started', state, next: null };
-    if (state === 'scheduled')
-        return { label, kind: 'scheduled', state, next: null };
-    return state.startsWith(NEXT_RUN)
-        ? { label, kind: 'scheduled', state, next: state.slice(NEXT_RUN.length) }
-        : { label, kind: 'ended', state, next: null };
+const TOKEN_KINDS = ['input', 'output', 'cache_read', 'cache_write'];
+export function tokensIn(raw) {
+    const held = record(raw);
+    const counts = TOKEN_KINDS.map((kind) => held[kind]);
+    return counts.every((count) => typeof count === 'number')
+        ? counts.reduce((sum, count) => sum + count, 0)
+        : null;
+}
+export function counted(count) {
+    return count === 1 ? '1 command' : `${count} commands`;
+}
+export function runningLine(raw) {
+    const parts = partsOf(raw);
+    const note = [...parts].reverse().find((part) => part.type === 'text' && part.text.trim() !== '');
+    if (note?.type === 'text')
+        return excerpt(note.text);
+    const commands = parts.reduce((sum, part) => (part.type === 'commands' ? sum + part.count : sum), 0);
+    return commands === 0 ? null : counted(commands);
 }
-export function stillRunning(turns) {
+export function jobsOf(markers, turn) {
+    const running = (turn === null ? [] : partsOf(turn.parts)).flatMap((part) => part.type === 'marker' && part.marker === 'job'
+        ? [{ said: part.text, at: turn?.started ?? null }]
+        : []);
+    return openJobs([...markers, ...running]);
+}
+export function stillRunning(turns, subagents) {
     const open = [];
-    const close = (key) => {
-        const at = open.map((one) => one.key).lastIndexOf(key);
-        if (at !== -1)
-            open.splice(at, 1);
-    };
     for (const { turn, parts, ended } of turns) {
         for (const part of parts) {
             if (part.type === 'subagent') {
                 const key = `subagent\u0000${part.description}`;
                 if (part.done)
-                    close(key);
+                    closeLast(open, key);
                 else if (ended) {
-                    open.push({ turn, key, work: { kind: 'subagent', title: part.description, next: null } });
-                }
-                continue;
-            }
-            if (part.type !== 'marker' || part.marker !== 'job')
-                continue;
-            const job = jobOf(part.text);
-            const started = `job\u0000${job.label}`;
-            const schedule = `schedule\u0000${job.label}`;
-            if (job.kind === 'scheduled') {
-                close(schedule);
-                if (ended) {
                     open.push({
                         turn,
-                        key: schedule,
-                        work: { kind: 'schedule', title: job.label, next: job.next },
+                        key,
+                        work: { kind: 'subagent', title: part.description, next: null, activity: null },
                     });
                 }
+                continue;
             }
-            else if (job.kind === 'started') {
-                if (ended) {
-                    open.push({ turn, key: started, work: { kind: 'job', title: job.label, next: null } });
+            if (part.type !== 'marker' || part.marker !== 'job')
+                continue;
+            markerMoved(open, part.text, (job, key) => ended
+                ? {
+                    turn,
+                    key,
+                    work: {
+                        kind: job.kind === 'started' ? 'job' : 'schedule',
+                        title: job.label,
+                        next: job.next,
+                        activity: null,
+                    },
                 }
-            }
-            else {
-                close(started);
-                close(schedule);
-            }
+                : null);
         }
     }
+    const doing = [...subagents];
     const under = new Map();
-    for (const one of open)
-        under.set(one.turn, [...(under.get(one.turn) ?? []), one.work]);
+    for (const { turn, work } of open) {
+        const at = work.kind === 'subagent' ? doing.findIndex((one) => one.description === work.title) : -1;
+        const shown = at === -1 ? work : { ...work, activity: doing.splice(at, 1)[0].activity };
+        under.set(turn, [...(under.get(turn) ?? []), shown]);
+    }
     return under;
 }

package/dist/paths.d.ts

@@ -1,4 +1,6 @@
 export declare function normalize(path: string): string | null;
 export declare function beneath(prefix: string, path: string): boolean;
 export declare function covered(prefixes: readonly string[], path: string): boolean;
+export declare function authoredAt(patterns: readonly string[], path: string): boolean;
+export declare function ancestors(path: string): readonly string[];
 //# sourceMappingURL=paths.d.ts.map

package/dist/paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYrD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,wBAAgB,OAAO,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAK1E"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAEA,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYrD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,wBAAgB,OAAO,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAK1E;AAwBD,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7E;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAGzD"}

package/dist/paths.js

@@ -1,3 +1,4 @@
+import { isDocumentPath } from '@agentshouse/mdmodel';
 export function normalize(path) {
     const parts = [];
     for (const part of path.split('/')) {
@@ -22,3 +23,28 @@ export function covered(prefixes, path) {
         return normalized !== null && (normalized === '' || beneath(normalized, path));
     });
 }
+function named(pattern, name) {
+    const star = pattern.indexOf('*');
+    if (star === -1)
+        return pattern === name;
+    const before = pattern.slice(0, star);
+    const after = pattern.slice(star + 1);
+    return (name.length > before.length + after.length && name.startsWith(before) && name.endsWith(after));
+}
+function matched(pattern, path) {
+    if (pattern === '/')
+        return isDocumentPath(path);
+    const wanted = pattern.split('/');
+    const names = path.split('/');
+    const open = wanted.at(-1) === '**';
+    const fixed = open ? wanted.slice(0, -1) : wanted;
+    return ((open ? names.length > fixed.length : names.length === fixed.length) &&
+        fixed.every((one, at) => named(one, names[at])));
+}
+export function authoredAt(patterns, path) {
+    return patterns.some((pattern) => matched(pattern, path));
+}
+export function ancestors(path) {
+    const parts = path.split('/');
+    return parts.slice(1).map((_, at) => parts.slice(0, at + 1).join('/'));
+}

package/dist/preparation.d.ts

@@ -0,0 +1,20 @@
+import type { PlanReach } from './query.js';
+import { type PortReach } from './reach.js';
+import { type CodeAvailability, type ConnectionAvailability, type Readiness } from './readiness.js';
+import type { Runtime } from './runtime.js';
+export type ReadinessPort = {
+    readonly target: string;
+    readonly code: CodeAvailability;
+};
+export type ReadinessWatch = {
+    readonly port: ReadinessPort;
+    readonly reach: PortReach | null;
+    readonly deliver: (readiness: Readiness) => void;
+};
+export declare function prepare(runtime: Runtime, locators?: readonly string[]): void;
+export declare function roomsOfReach(reach: PlanReach): ReadonlySet<string>;
+export declare function connectionNow(runtime: Runtime): Promise<ConnectionAvailability>;
+export declare function deliverOwedReadiness(runtime: Runtime, owed: readonly ReadinessWatch[]): Promise<void>;
+export declare function watchReadiness({ store }: Runtime, port: ReadinessPort, reach: PortReach | null, deliver: (readiness: Readiness) => void): () => void;
+export declare function filled(runtime: Runtime): void;
+//# sourceMappingURL=preparation.d.ts.map

package/dist/preparation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preparation.d.ts","sourceRoot":"","sources":["../src/preparation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAE3B,KAAK,SAAS,EAEf,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAK5C,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,CAAC;CAClD,CAAC;AAuCF,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,GAAE,SAAS,MAAM,EAAO,QA8BzE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,CAElE;AAmDD,wBAAsB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAMrF;AAkFD,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,cAAc,EAAE,iBAI3F;AAED,wBAAgB,cAAc,CAC5B,EAAE,KAAK,EAAE,EAAE,OAAO,EAClB,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,SAAS,GAAG,IAAI,EACvB,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,GACtC,MAAM,IAAI,CAQZ;AAED,wBAAgB,MAAM,CAAC,OAAO,EAAE,OAAO,QAMtC"}