@agentshouse/mdruntime 0.1.0-cd1c52311c638 → 0.1.0-cd3ee807e46ae

package/dist/connection.js

@@ -8,14 +8,16 @@ import { createSearchIndex, searchPlanOf, } from './search.js';
 import { bootstrapRoom } from './bootstrap.js';
 import { changeSet, mergeChangeSets } from './change-set.js';
 import { createConversationStore, } from './conversation.js';
+import { queuedFile } from './change.js';
 import { validRoot } from './collection.js';
 import { runtimeError } from './failure.js';
 import { createLog } from './log.js';
-import { calledResult, historyAnswer, undeclared, UNCERTAIN, } from './outcome.js';
+import { binaryRecord } from './binary.js';
+import { absentBinary, binaryAnswer, calledResult, historyAnswer, undeclared, UNCERTAIN, } from './outcome.js';
 import { refreshRoom } from './refresh.js';
-import { buildBatch } from './save.js';
+import { buildBatch, joined, limitedIn, requeued } from './save.js';
 import { applyReturned, compositionOf, confirmedOf, landed, readReclassified, replicaOf, sameMembership, withdrawals, } from './replica.js';
-import { changedParts, changesOf, held, readParts, returnedBy, returnedInto, staleWrite, underneath, } from './room-draft.js';
+import { binaryBase, changedParts, changesOf, held, heldFile, joinedDraft, readParts, returnedBy, returnedInto, staleWrite, underneath, withdrawnDrafts, } from './room-draft.js';
 import { same, saving, STARTING, transferring, } from './status.js';
 import { detectStorageLoss, nextGeneration } from './durability.js';
 import { roomDraftRevision } from './identity.js';
@@ -42,6 +44,7 @@ export function composeRuntime(options) {
     let opening;
     let store;
     const replicas = new Map();
+    const queuesWithoutReplica = new Map();
     const pendings = new Map();
     const roomDrafts = new Map();
     const presentations = new Map();
@@ -194,7 +197,9 @@ export function composeRuntime(options) {
         }
     }
     function pending() {
-        return !localSaves && [...replicas.values()].some((replica) => replica.queue.length > 0);
+        return (!localSaves &&
+            (queuesWithoutReplica.size > 0 ||
+                [...replicas.values()].some((replica) => replica.queue.length > 0)));
     }
     function attention() {
         const attentionRequired = [];
@@ -304,10 +309,7 @@ export function composeRuntime(options) {
         return Object.freeze({ batch, ...(state?.submission ?? { state: 'waiting' }) });
     }
     function entriesOf(locator) {
-        const replica = replicas.get(locator);
-        if (replica === undefined)
-            return [];
-        return replica.queue.map(entryOf);
+        return (replicas.get(locator)?.queue ?? queuesWithoutReplica.get(locator) ?? []).map(entryOf);
     }
     function emitQueue(locator) {
         const entries = entriesOf(locator);
@@ -404,10 +406,7 @@ export function composeRuntime(options) {
                     const revoked = { status: 'unavailable', reason: 'revoked' };
                     try {
                         const local = await openLocal();
-                        await local.revokeModels([...replicas.values()].map((replica) => ({
-                            record: replica.confirmed.record,
-                            queue: replica.queue,
-                        })));
+                        await local.revokeModels([...replicas.values()].map((replica) => replica.confirmed.record));
                     }
                     catch {
                         journal.record('model revocation persistence failed');
@@ -474,7 +473,6 @@ export function composeRuntime(options) {
                 },
             providerOwnedPaths: room.providerOwnedPaths,
             roomVersion: replicas.get(room.locator)?.confirmed.record.roomVersion ?? null,
-            attachments: replicas.get(room.locator)?.confirmed.record.attachments ?? [],
             synchronizationAvailable,
             refusal: scopedRefusals.get(room.locator) ?? sourceRefusals.get(room.locator) ?? null,
         });
@@ -499,7 +497,14 @@ export function composeRuntime(options) {
         emitRooms();
     }
     function unlistedHeld(listed) {
-        return [...new Set([...rooms.keys(), ...roomDrafts.keys(), ...transfers.keys()])].filter((locator) => !listed.has(locator));
+        return [
+            ...new Set([
+                ...rooms.keys(),
+                ...roomDrafts.keys(),
+                ...transfers.keys(),
+                ...queuesWithoutReplica.keys(),
+            ]),
+        ].filter((locator) => !listed.has(locator));
     }
     async function dropUnlisted(listed, local) {
         if (unlistedHeld(listed).length === 0)
@@ -513,9 +518,10 @@ export function composeRuntime(options) {
                 drafts: [...(roomDrafts.get(locator)?.keys() ?? [])],
             }));
             for (const locator of unlisted) {
-                for (const batch of replicas.get(locator)?.queue ?? [])
+                for (const batch of replicas.get(locator)?.queue ?? queuesWithoutReplica.get(locator) ?? [])
                     pendings.delete(batch.id);
                 replicas.delete(locator);
+                queuesWithoutReplica.delete(locator);
                 rooms.delete(locator);
                 roomDrafts.delete(locator);
                 transfers.delete(locator);
@@ -589,6 +595,12 @@ export function composeRuntime(options) {
         }
         const previousReplicas = new Map(replicas);
         replicas.clear();
+        queuesWithoutReplica.clear();
+        const replicated = new Set(records.map((record) => record.locator));
+        for (const [locator, queue] of queuedBatches) {
+            if (!replicated.has(locator))
+                queuesWithoutReplica.set(locator, queue);
+        }
         for (const record of records) {
             const model = restored(modelKey(record.locator, 'collection'), record.model);
             const selectionModel = restored(modelKey(record.locator, 'typed-selection'), record.selectionModel);
@@ -602,7 +614,6 @@ export function composeRuntime(options) {
                 rooms.set(record.locator, {
                     ...existing,
                     roomVersion: record.roomVersion,
-                    attachments: record.attachments,
                     operations: record.operations,
                     replica: record.replica,
                     model: modelTypes(model),
@@ -675,6 +686,7 @@ export function composeRuntime(options) {
         return state !== undefined && state.submission.state !== 'submitted' && !state.lost;
     }
     async function settle(local, locator, before, confirmed, queue, settling = {}) {
+        const previousQueue = before?.queue ?? queuesWithoutReplica.get(locator) ?? [];
         const withdrawn = withdrawals(confirmed, queue, withdrawable, localSaves);
         const kept = queue.filter((batch) => !withdrawn.includes(batch));
         const unqueued = withdrawn.map((batch) => ({
@@ -700,20 +712,36 @@ export function composeRuntime(options) {
                 });
             }
         }
-        await local.write({
-            next: confirmed.record,
-            previous: before?.confirmed.record ?? null,
-            ...(settling.stored === undefined ? {} : { stored: settling.stored }),
-            queue: kept,
-            previousQueue: before?.queue ?? [],
-            roomDrafts: [...written.values()],
-        });
-        for (const batch of before?.queue ?? []) {
+        await local.keepAuthored({ locator, queue: kept, roomDrafts: [...written.values()] });
+        for (const batch of previousQueue) {
             if (!kept.includes(batch))
                 pendings.delete(batch.id);
         }
         for (const record of written.values())
             rememberRoomDraft(record);
+        try {
+            await local.write({
+                next: confirmed.record,
+                previous: before?.confirmed.record ?? null,
+                ...(settling.stored === undefined ? {} : { stored: settling.stored }),
+            });
+        }
+        catch (error) {
+            const held = before === undefined ? null : replicaOf(before.confirmed, kept, before);
+            if (held !== null)
+                replicas.set(locator, held);
+            else if (kept.length > 0)
+                queuesWithoutReplica.set(locator, kept);
+            else
+                queuesWithoutReplica.delete(locator);
+            publishChangeSet(changeSet(locator, before ?? null, held, {
+                queue: kept.length !== previousQueue.length,
+                drafts: [...written.keys()],
+            }));
+            moveTo({ ...status, ...attention() });
+            throw error;
+        }
+        queuesWithoutReplica.delete(locator);
         for (const { batch, returned } of unqueued) {
             const outcome = localSaves ? 'dropped' : returned === null ? 'landed' : 'withdrawn';
             journal.record(`outcome ${locator} ${batch.id} ${outcome}`);
@@ -721,7 +749,7 @@ export function composeRuntime(options) {
         replicas.set(locator, replicaOf(confirmed, kept, before));
         return changeSet(locator, before ?? null, replicas.get(locator) ?? null, {
             room: settling.room,
-            queue: kept.length !== (before?.queue.length ?? 0),
+            queue: kept.length !== previousQueue.length,
             drafts: [...written.keys()],
         });
     }
@@ -768,7 +796,7 @@ export function composeRuntime(options) {
                 return false;
             }
             adoptModels(room.locator, confirmed.record);
-            const queue = prior?.queue ?? [];
+            const queue = prior?.queue ?? queuesWithoutReplica.get(room.locator) ?? [];
             const roomVersion = confirmed.record.roomVersion;
             const accepted = queue.filter((batch) => {
                 const accepted = pendings.get(batch.id)?.accepted;
@@ -810,7 +838,24 @@ export function composeRuntime(options) {
         if (changed.length > 0)
             return { outcome: 'refused', code: 'changed-underneath', retryable: false, parts: changed };
         const parts = saved.map(({ path, parts }) => changesOf(path, parts));
-        const built = buildBatch({
+        const changes = parts.flatMap(({ changes }) => changes);
+        const requeue = requeued(replica.queue, changes, replica.visible, withdrawable, (queue) => replicaOf(replica.confirmed, queue, replica).visible);
+        if (requeue.kind === 'refused')
+            return { outcome: 'refused', ...requeue.refusal };
+        const foreign = [...requeue.withdrawn.keys()].some((origin) => {
+            const writer = replica.queue.find((batch) => batch.id === origin)?.writtenBy;
+            return writer?.app !== writtenBy?.app || writer?.release !== writtenBy?.release;
+        });
+        if (foreign) {
+            return {
+                outcome: 'refused',
+                code: 'unknown-revision',
+                retryable: false,
+                file: [...requeue.queued].at(-1),
+            };
+        }
+        const withdrawing = requeue.withdrawn.size > 0;
+        const input = {
             local: localSaves,
             baseRoomVersion: replica.confirmed.record.roomVersion,
             composition: compositionFor(replica.confirmed.record),
@@ -819,28 +864,84 @@ export function composeRuntime(options) {
             providerLimits: limits,
             handle: room.handle,
             visible: replica.visible,
-            changes: parts.flatMap(({ changes }) => changes),
+            changes,
             bases: parts.flatMap(({ bases }) => bases),
             writtenBy,
+        };
+        const checked = withdrawing ? buildBatch({ ...input, queued: requeue.queued }) : null;
+        if (checked?.kind === 'refused')
+            return { outcome: 'refused', ...checked.refusal };
+        const owners = [...requeue.owners].flatMap((origin) => {
+            const batch = requeue.withdrawn.get(origin);
+            return batch === undefined || batch === null ? [] : [{ origin, batch }];
         });
-        if (built.kind === 'refused')
+        if (owners.length > 1) {
+            return {
+                outcome: 'refused',
+                code: 'unknown-revision',
+                retryable: false,
+                file: [...requeue.queued].at(-1),
+            };
+        }
+        const built = !withdrawing
+            ? buildBatch(input)
+            : requeue.changes.length === 0
+                ? null
+                : buildBatch({
+                    ...input,
+                    visible: replicaOf(replica.confirmed, requeue.queue, replica).visible,
+                    changes: requeue.changes,
+                });
+        if (built?.kind === 'refused')
             return { outcome: 'refused', ...built.refusal };
-        const batches = [...replica.queue, built.batch];
+        const [owner] = owners;
+        const join = built === null || owner === undefined
+            ? null
+            : joined(requeue.queue, owner.batch, built.batch);
+        if (join?.kind === 'refused')
+            return { outcome: 'refused', ...join.refusal };
+        const withdrawn = new Map(requeue.withdrawn);
+        if (join !== null && owner !== undefined)
+            withdrawn.set(owner.origin, join.batch);
+        const drafted = new Map();
+        for (const [origin, replaced] of withdrawn) {
+            if (replaced === null)
+                continue;
+            const carried = withdrawnDrafts(pendings.get(origin)?.drafts ?? [], changes);
+            drafted.set(replaced.id, replaced === join?.batch
+                ? [
+                    ...carried.map((held) => joinedDraft(held, saved)),
+                    ...saved.filter((draft) => !carried.some((held) => held.path === draft.path)),
+                ]
+                : carried);
+        }
+        if (built !== null && join === null)
+            drafted.set(built.batch.id, saved);
+        const batches = join !== null ? join.queue : built === null ? requeue.queue : [...requeue.queue, built.batch];
+        for (const replaced of withdrawn.values()) {
+            if (replaced === null || !batches.includes(replaced))
+                continue;
+            const limited = limitedIn(batches, replaced, limits, (queue) => replicaOf(replica.confirmed, queue, replica).visible);
+            if (limited !== null)
+                return { outcome: 'refused', ...limited };
+        }
         const consumed = saved.map(({ path }) => path);
         try {
-            await local.write({
-                next: replica.confirmed.record,
-                previous: replica.confirmed.record,
+            await local.keepAuthored({
+                locator,
                 queue: batches,
-                previousQueue: replica.queue,
-                saved,
+                saved: drafted,
                 consumedRoomDrafts: consumed,
             });
         }
         catch {
             return { outcome: 'refused', code: 'durable-write', retryable: true };
         }
-        pendings.set(built.batch.id, { drafts: saved, submission: { state: 'waiting' }, lost: false });
+        for (const origin of withdrawn.keys())
+            pendings.delete(origin);
+        for (const [id, drafts] of drafted) {
+            pendings.set(id, { drafts, submission: { state: 'waiting' }, lost: false });
+        }
         if (!localSaves)
             recorded = false;
         for (const path of consumed)
@@ -852,7 +953,10 @@ export function composeRuntime(options) {
         }));
         moveTo({ ...(localSaves ? status : saving(status)), ...attention() });
         submitLater(locator);
-        return { outcome: 'saved', identifier: built.batch.id };
+        const identifier = join?.batch.id ??
+            built?.batch.id ??
+            [...requeue.withdrawn].map(([origin, replaced]) => replaced?.id ?? origin).at(-1);
+        return { outcome: 'saved', identifier };
     }
     async function mark(local, locator, identifier, submission, lost) {
         const state = pendings.get(identifier);
@@ -915,6 +1019,90 @@ export function composeRuntime(options) {
             return UNCERTAIN;
         }
     }
+    function queuedBlob(locator, path, localId) {
+        for (const batch of replicas.get(locator)?.queue ?? []) {
+            const change = batch.changes[queuedFile(batch, path, localId)];
+            if (change?.kind === 'binary')
+                return change.blob;
+        }
+        return null;
+    }
+    async function readBinary(request) {
+        if (closed || refusal !== null)
+            return UNCERTAIN;
+        try {
+            await ensureAuthorization();
+        }
+        catch {
+            return UNCERTAIN;
+        }
+        if (closed || authorization === undefined || refusal !== null)
+            return UNCERTAIN;
+        journal.record(request.kind === 'path'
+            ? `transfer binary ${request.locator} ${request.path}`
+            : `transfer binary ${request.fileRef}`);
+        try {
+            const result = await options.adapter.binary(authorization, request);
+            journal.record(`outcome binary ${result.kind}`);
+            if (result.kind === 'scoped-refusal') {
+                const room = replicas.get(result.locator)?.confirmed.record;
+                if (room !== undefined)
+                    await scoped(result, room, await openLocal());
+            }
+            if (result.kind === 'revoked-authorization')
+                await refuse('revoked-authorization');
+            return binaryAnswer(result);
+        }
+        catch {
+            journal.record('outcome binary transport-uncertainty');
+            return UNCERTAIN;
+        }
+    }
+    async function readBinaryPath(locator, path, revision) {
+        await ready;
+        if (revision !== undefined)
+            return readBinary({ kind: 'path', locator, path, revision });
+        const visible = replicas.get(locator)?.visible;
+        const held = visible?.binaries[path];
+        if (visible === undefined || held === undefined)
+            return absentBinary(path);
+        if (held.state === 'pending') {
+            const blob = queuedBlob(locator, path, held.localId);
+            return blob === null ? absentBinary(path) : { kind: 'binary', blob };
+        }
+        const record = binaryRecord(path, held, visible.revisions[path]);
+        if (record.state !== 'accepted')
+            return absentBinary(path);
+        const replica = replicas.get(locator);
+        const queued = (replica?.queue ?? []).flatMap((batch) => batch.changes);
+        const holds = (at) => {
+            const kept = replica?.confirmed.record.binaries[at];
+            return (kept?.state === 'accepted' &&
+                kept.fileRef === record.fileRef &&
+                replica?.confirmed.record.revisions[at] === record.revision);
+        };
+        let confirmed = path;
+        for (let index = queued.length - 1; index >= 0 && !holds(confirmed); index -= 1) {
+            const change = queued[index];
+            if (change.kind === 'move' && change.to === confirmed)
+                confirmed = change.path;
+        }
+        return readBinary({
+            kind: 'path',
+            locator,
+            path: confirmed,
+            revision: record.revision,
+            fileRef: record.fileRef,
+        });
+    }
+    async function readBinaryReference(reference) {
+        await ready;
+        return readBinary({
+            kind: 'reference',
+            fileRef: reference.fileRef,
+            referrer: reference.referrer,
+        });
+    }
     function declaredAgents() {
         for (const capability of capabilities) {
             if (capability.conversationAgents !== undefined)
@@ -1138,7 +1326,7 @@ export function composeRuntime(options) {
         logAccepted(room.locator, submitted, accepted);
         const applied = options.adapter.reached(room.locator, held, accepted.roomVersion)
             ? { kind: 'staged', confirmed: current.confirmed }
-            : applyReturned(current.confirmed, accepted.documents, accepted.revisions, accepted.changes, accepted.removals, accepted.attachments, options.adapter.follows(room.locator, held, accepted.roomVersion)
+            : applyReturned(current.confirmed, submitted, accepted, options.adapter.follows(room.locator, held, accepted.roomVersion)
                 ? accepted.roomVersion
                 : held, accepted.roomVersion);
         if (applied.kind !== 'staged') {
@@ -1357,11 +1545,7 @@ export function composeRuntime(options) {
                 const read = reclassified.kind === 'deferred'
                     ? { kind: 'staged', confirmed: confirmedOf(record, held.confirmed) }
                     : reclassified;
-                await local.write({
-                    next: record,
-                    previous: held.confirmed.record,
-                    queue: held.queue,
-                });
+                await local.write({ next: record, previous: held.confirmed.record });
                 if (read.kind === 'staged') {
                     replicas.set(room.locator, replicaOf(read.confirmed, held.queue, held));
                     if (declarationRefusals.delete(room.locator)) {
@@ -1429,7 +1613,6 @@ export function composeRuntime(options) {
                     roomVersion: record.roomVersion,
                     documents: record.documents,
                     revisions: record.revisions,
-                    attachments: record.attachments,
                 },
             ];
         });
@@ -2022,6 +2205,8 @@ export function composeRuntime(options) {
         }
         if (topic === 'conversations')
             return conversations.watchList(deliver);
+        if (topic === 'agents')
+            return conversations.watchAgents(deliver);
         if (topic === 'presentation') {
             const listener = {
                 app: input[0],
@@ -2135,11 +2320,14 @@ export function composeRuntime(options) {
                     if ((current?.revision ?? null) !== revision) {
                         return staleWrite(current === undefined ? null : roomDraftOf(current));
                     }
+                    const file = parts.file === undefined
+                        ? undefined
+                        : await heldFile(parts.file.blob, binaryBase(replicas.get(room)?.visible, path));
                     const record = {
                         locator: room,
                         path,
                         revision: roomDraftRevision(),
-                        parts: held(current?.parts, parts),
+                        parts: held(current?.parts, parts, file),
                         returned: current?.returned ?? null,
                     };
                     await local.keepRoomDraft(record);
@@ -2188,6 +2376,10 @@ export function composeRuntime(options) {
         history(locator, path, query) {
             return readHistory(locator, path, query);
         },
+        binaryFile: {
+            read: readBinaryPath,
+            readReference: readBinaryReference,
+        },
         call(name, input) {
             return invokeAction(name, input);
         },
@@ -2220,6 +2412,7 @@ export function composeRuntime(options) {
     const reachable = {
         md,
         watch,
+        referrerScope: (referrer) => options.adapter.referrerScope(referrer),
         plan: planned,
         query: (plan) => rowsQuery(plan),
         watchPlan,

package/dist/conversation.d.ts

@@ -21,6 +21,10 @@ export type ConversationEntry = {
     state: ConversationState;
     started: string | null;
 };
+export type ConversationAgent = {
+    identity: string;
+    name: string;
+};
 export type RunningTurn = {
     turn: string;
     started: string | null;
@@ -44,7 +48,9 @@ export type ConversationView = {
     } | null;
     commands: readonly ProcessCommand[];
     options: readonly SessionOption[];
-    chatDraft: ChatDraft | null;
+    chatDraft: (ChatDraft & {
+        readonly revision: string;
+    }) | null;
 };
 export type ConversationSurface = {
     list(): Promise<readonly ConversationEntry[]>;
@@ -58,7 +64,7 @@ export type ConversationSurface = {
     delete(conversation: string): Promise<CallResult>;
 };
 export type ChatDraftSurface = {
-    write(conversation: string, draft: ChatDraft): Promise<void>;
+    write(conversation: string, draft: ChatDraft, revision?: string): Promise<void>;
     discard(conversation: string): Promise<void>;
 };
 export type ConversationDependencies = {
@@ -80,6 +86,7 @@ export type ConversationStore = {
     reconnected(): void;
     watch(conversation: string, options: ConversationOptions, deliver: (view: ConversationView) => void): () => void;
     watchList(deliver: (entries: readonly ConversationEntry[]) => void): () => void;
+    watchAgents(deliver: (agents: readonly ConversationAgent[]) => void): () => void;
     changed(set: ChangeSet): void;
     receive(event: ConversationEvent): boolean;
     messages(): readonly SearchedMessage[];

package/dist/conversation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../src/conversation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../src/conversation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EAEjB,mBAAmB,EACnB,kBAAkB,EAElB,cAAc,EACd,aAAa,EACb,WAAW,EAEZ,MAAM,cAAc,CAAC;AACtB,OAAO,EAAyB,KAAK,SAAS,EAAsB,MAAM,iBAAiB,CAAC;AAE5F,OAAO,EAAgB,KAAK,aAAa,EAAE,MAAM,WAAW,CAAC;AAE7D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAElF,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAC;AAEpE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,KAAK,EAAE,iBAAiB,CAAC;IACzB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnE,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,KAAK,EAAE,SAAS,OAAO,EAAE,CAAC;IAC1B,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,SAAS,aAAa,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAErD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,SAAS,mBAAmB,EAAE,CAAC;IACzC,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,SAAS,OAAO,EAAE,CAAC;IAC9B,OAAO,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;IACrC,QAAQ,EAAE,SAAS,cAAc,EAAE,CAAC;IACpC,OAAO,EAAE,SAAS,aAAa,EAAE,CAAC;IAClC,SAAS,EAAE,CAAC,SAAS,GAAG;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,IAAI,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,IAAI,OAAO,CAAC,SAAS,iBAAiB,EAAE,CAAC,CAAC;IAC9C,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACrF,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5C,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACnE,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACrD,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAChE,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChF,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9C,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,IAAI,kBAAkB,GAAG,SAAS,CAAC;IACzC,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IACpD,IAAI,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACpE,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAClE,MAAM,IAAI,kBAAkB,GAAG,SAAS,CAAC;IACzC,OAAO,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI,CAAC;IAC9B,MAAM,IAAI,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,mBAAmB,CAAC;IAC7B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,OAAO,CAAC,IAAI,EAAE,SAAS,gBAAgB,EAAE,EAAE,MAAM,EAAE,SAAS,eAAe,EAAE,GAAG,IAAI,CAAC;IACrF,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,OAAO,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,OAAO,IAAI,OAAO,CAAC;IACnB,WAAW,IAAI,IAAI,CAAC;IACpB,KAAK,CACH,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,GACxC,MAAM,IAAI,CAAC;IACd,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,SAAS,iBAAiB,EAAE,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IAChF,WAAW,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,SAAS,iBAAiB,EAAE,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IACjF,OAAO,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI,CAAC;IAC9B,OAAO,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC;IAC3C,QAAQ,IAAI,SAAS,eAAe,EAAE,CAAC;IACvC,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAAC;IACxE,KAAK,IAAI,IAAI,CAAC;CACf,CAAC;AAyBF,wBAAgB,UAAU,CAAC,YAAY,EAAE,MAAM,GAAG,gBAAgB,CAWjE;AAmJD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,wBAAwB,GAAG,iBAAiB,CAklBzF"}

package/dist/conversation.js

@@ -1,6 +1,7 @@
 import { conversationChangeSet } from './change-set.js';
 import { runtimeError } from './failure.js';
 import { declaredFile } from './file.js';
+import { chatDraftRevision } from './identity.js';
 const QUIET = {
     turn: null,
     questions: [],
@@ -169,7 +170,9 @@ export function createConversationStore(deps) {
     const listing = new Map();
     const listWatchers = new Set();
     let listKnown = false;
+    const agentWatchers = new Set();
     let agentNames = new Map();
+    let retiredAgents = new Set();
     let agentsRead = null;
     let replicated = new Set();
     let handedReplicated;
@@ -199,7 +202,7 @@ export function createConversationStore(deps) {
             options: structuredClone(facts.options),
             chatDraft: draft === undefined || draft.turn !== null || sending.get(conversation)?.draft === draft
                 ? null
-                : { text: draft.text, files: [...draft.files] },
+                : { text: draft.text, files: [...draft.files], revision: draft.revision },
         };
     }
     function emit(conversation, messagesChanged = true) {
@@ -244,6 +247,21 @@ export function createConversationStore(deps) {
         for (const watcher of listWatchers)
             watcher(value);
     }
+    function agents() {
+        return [...agentNames]
+            .filter(([identity]) => !retiredAgents.has(identity))
+            .map(([identity, name]) => ({ identity, name }))
+            .sort((left, right) => left.name === right.name
+            ? left.identity.localeCompare(right.identity)
+            : left.name.localeCompare(right.name));
+    }
+    function emitAgents() {
+        if (deps.closed() || agentWatchers.size === 0)
+            return;
+        const value = agents();
+        for (const watcher of agentWatchers)
+            watcher(value);
+    }
     function setLive(conversation, next) {
         const before = stateOf(conversation);
         const began = lives.get(conversation)?.turn?.started;
@@ -262,18 +280,27 @@ export function createConversationStore(deps) {
             return;
         const { documents } = await deps.documents(declaration.locator);
         const names = new Map();
+        const retired = new Set();
         for (const document of documents) {
             if (document.type !== declaration.type)
                 continue;
             const identity = document.fields?.[declaration.identity];
             const name = document.fields?.[declaration.name];
-            if (typeof identity === 'string' && typeof name === 'string')
-                names.set(identity, name);
+            if (typeof identity !== 'string' || typeof name !== 'string')
+                continue;
+            names.set(identity, name);
+            const ended = declaration.retired === undefined ? null : document.fields?.[declaration.retired];
+            if (ended !== undefined && ended !== null)
+                retired.add(identity);
         }
-        if (JSON.stringify([...names]) === JSON.stringify([...agentNames]))
+        const named = JSON.stringify([...names]) !== JSON.stringify([...agentNames]);
+        if (!named && JSON.stringify([...retired]) === JSON.stringify([...retiredAgents]))
             return;
         agentNames = names;
-        emitList();
+        retiredAgents = retired;
+        if (named)
+            emitList();
+        emitAgents();
     }
     function agentsReady() {
         agentsRead ??= readAgents().catch(() => {
@@ -551,12 +578,13 @@ export function createConversationStore(deps) {
         },
     };
     const chatDraft = {
-        write(conversation, draft) {
+        write(conversation, draft, revision = chatDraftRevision()) {
             return withDraft(conversation, () => ({
                 conversation,
                 text: draft.text,
                 files: [...draft.files],
                 turn: null,
+                revision,
             }));
         },
         discard(conversation) {
@@ -651,6 +679,16 @@ export function createConversationStore(deps) {
                 listWatchers.delete(deliver);
             };
         },
+        watchAgents(deliver) {
+            agentWatchers.add(deliver);
+            void agentsReady().then(() => {
+                if (!deps.closed() && agentWatchers.has(deliver))
+                    deliver(agents());
+            });
+            return () => {
+                agentWatchers.delete(deliver);
+            };
+        },
         changed(set) {
             for (const conversation of set.conversations)
                 emit(conversation);
@@ -698,6 +736,7 @@ export function createConversationStore(deps) {
             views.clear();
             lives.clear();
             listWatchers.clear();
+            agentWatchers.clear();
         },
     };
 }