@agentshouse/mdruntime 0.1.0-cf04ede9fb796 → 0.1.0-cf0c43fc48aad

package/dist/opened.js

@@ -20,7 +20,7 @@ function taken(chunks, size) {
     }
     return part;
 }
-export function openedFiles(database, fenced) {
+export function openedFiles(database, lost) {
     const fetching = new Map();
     async function find(name) {
         const held = await database.ask({ kind: 'opened.find', ...name });
@@ -36,14 +36,14 @@ export function openedFiles(database, fenced) {
         let part = 0;
         const write = async (bytes) => {
             if (!(await database.ask({ kind: 'opened.part', key, part, bytes }))) {
-                throw new Error('the device no longer keeps this download');
+                throw new Error();
             }
             part += 1;
         };
         try {
-            if (fenced(name.locator) ||
+            if (lost(name.locator) ||
                 !(await database.ask({ kind: 'opened.begin', key, ...name, mediaType }))) {
-                throw new Error('the device no longer reads this Room');
+                throw new Error();
             }
             for (;;) {
                 const read = await reader.read();
@@ -61,7 +61,7 @@ export function openedFiles(database, fenced) {
                 await write(taken(chunks, held));
             const received = hashed.hex();
             if (sha256 !== undefined && sha256 !== received) {
-                throw new Error('the bytes are not the file the device asked for');
+                throw new Error();
             }
             const whole = await database.ask({
                 kind: 'opened.keep',

package/dist/opening.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opening.d.ts","sourceRoot":"","sources":["../src/opening.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,wBAAsB,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CA2CxF"}
+{"version":3,"file":"opening.d.ts","sourceRoot":"","sources":["../src/opening.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,wBAAsB,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAqCxF"}

package/dist/opening.js

@@ -1,11 +1,13 @@
 import { conversationsOpened } from './conversation.js';
 import { detectStorageLoss, nextGeneration, refusedForSpace } from './durability.js';
+import { uncaught } from './failure.js';
 import { sweep } from './install.js';
 import { eraseFenced } from './lost.js';
 import { prepare } from './preparation.js';
+import { unpair } from './queue.js';
 import { emitRooms, emitStorageLoss, statusShown } from './shown.js';
 export async function open(runtime, opened) {
-    const { store, socket, journal, shell, conversations, build, usableWhenHeld } = runtime;
+    const { store, socket, shell, conversations, build, usableWhenHeld } = runtime;
     if (socket.closed())
         throw new Error('runtime closed');
     const interrupted = await opened.fences();
@@ -40,18 +42,12 @@ export async function open(runtime, opened) {
     await conversationsOpened(conversations, opened);
     if (interrupted.length > 0) {
         queueMicrotask(() => {
-            void eraseFenced(runtime, interrupted).catch(() => {
-                journal.record('erasure failed');
-            });
+            void eraseFenced(runtime, interrupted).catch(uncaught);
         });
     }
     statusShown(runtime);
     prepare(runtime);
     emitRooms(runtime);
-    void store
-        .exclusive(() => runtime.unpair(opened))
-        .catch(() => {
-        journal.record('unpair failed');
-    });
+    void unpair(runtime).catch(uncaught);
     return opened;
 }

package/dist/outcome.d.ts

@@ -1,5 +1,6 @@
 import type { ActionResult, AdapterFailure, AttachResult, BinaryLinkResult, HistoryResult, HistoryRevision, ProviderRefusal, RoomVersionAt, ScopedRefusal } from './adapter.js';
 import type { ChangeBatch } from './change.js';
+import type { Attempt, Retries } from './retried.js';
 import type { KeptBinary, KeptResult } from './opened.js';
 type Refused<Kind extends string> = ProviderRefusal & {
     kind: Kind;
@@ -84,5 +85,7 @@ export type QueueEntry = {
 } & (Submission | {
     readonly state: 'local';
 });
+export declare const UNANSWERED: ActionResult;
+export declare function handedOutcome(retries: Retries, attempt: Attempt | undefined, result: ActionResult): CallResult;
 export {};
 //# sourceMappingURL=outcome.d.ts.map

package/dist/outcome.d.ts.map

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

package/dist/outcome.js

@@ -1,3 +1,4 @@
+import { refusalError } from './failure.js';
 export const UNREADABLE = {
     kind: 'unreadable',
     code: 'room-not-readable',
@@ -82,3 +83,17 @@ export function historyAnswer(result) {
         ? result
         : failure(result);
 }
+export const UNANSWERED = { kind: 'transport-uncertainty' };
+export function handedOutcome(retries, attempt, result) {
+    if (attempt !== undefined) {
+        const { step, instance } = attempt;
+        if (result.kind === 'action')
+            retries.succeeded(step, instance);
+        else if (result.kind === 'transport-uncertainty')
+            retries.uncertain(step, instance, result);
+        else if (result.kind === 'rejected' && result.retryable) {
+            retries.failed(step, instance, refusalError(result));
+        }
+    }
+    return calledResult(result);
+}

package/dist/overlay.d.ts

@@ -1,4 +1,6 @@
+import { type ApplyResult } from '@agentshouse/mdmodel';
 import type { BinaryFile, HeadChange } from './adapter.js';
+import { type Composition } from './collection.js';
 import type { ChangeBatch } from './change.js';
 export type Heads = {
     revisions: Readonly<Record<string, string>>;
@@ -22,5 +24,7 @@ export type Layer = Heads & {
 export declare function acceptedBinaries(files: Readonly<Record<string, BinaryFile>>): Generator<readonly [string, HeldBinary]>;
 export declare function sameBinary(left: HeldBinary | undefined, right: HeldBinary | undefined): boolean;
 export declare function sameChange(left: HeadChange | undefined, right: HeadChange | undefined): boolean;
-export declare function overlaying(base: Layer, queue: readonly ChangeBatch[], unapplied?: () => void): Generator<number, Layer, void>;
+export declare function composed(path: string, fields: Readonly<Record<string, unknown>>, sections: Readonly<Record<string, string>>, composition: Composition): ApplyResult;
+export declare function compose(path: string, fields: Readonly<Record<string, unknown>>, sections: Readonly<Record<string, string>>, composition: Composition): string;
+export declare function overlaying(base: Layer, queue: readonly ChangeBatch[], composition: Composition, unapplied?: () => void): Generator<number, Layer, void>;
 //# sourceMappingURL=overlay.d.ts.map

package/dist/overlay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../src/overlay.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,KAAK,EAAU,WAAW,EAAgB,MAAM,aAAa,CAAC;AAIrE,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,UAAU,GAClB,CAAC;IAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAA;CAAE,GAAG,UAAU,CAAC,GAC7C;IACE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAEN,MAAM,MAAM,KAAK,GAAG,KAAK,GAAG;IAC1B,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;CAChD,CAAC;AAEF,wBAAiB,gBAAgB,CAC/B,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,GAC1C,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAE1C;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAW/F;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAQ/F;AA6MD,wBAAiB,UAAU,CACzB,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,SAAS,CAAC,EAAE,MAAM,IAAI,GACrB,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAsChC"}
+{"version":3,"file":"overlay.d.ts","sourceRoot":"","sources":["../src/overlay.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,WAAW,EAEjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAiB,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,KAAK,EAAU,WAAW,EAAgB,MAAM,aAAa,CAAC;AAIrE,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,UAAU,GAClB,CAAC;IAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAA;CAAE,GAAG,UAAU,CAAC,GAC7C;IACE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAEN,MAAM,MAAM,KAAK,GAAG,KAAK,GAAG;IAC1B,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5C,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;CAChD,CAAC;AAEF,wBAAiB,gBAAgB,CAC/B,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,GAC1C,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAE1C;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAW/F;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,EAAE,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAQ/F;AAqDD,wBAAgB,QAAQ,CACtB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC1C,WAAW,EAAE,WAAW,GACvB,WAAW,CAqBb;AAED,wBAAgB,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC1C,WAAW,EAAE,WAAW,GACvB,MAAM,CAIR;AA8ID,wBAAiB,UAAU,CACzB,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,WAAW,EAAE,WAAW,EACxB,SAAS,CAAC,EAAE,MAAM,IAAI,GACrB,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAsChC"}

package/dist/overlay.js

@@ -1,4 +1,5 @@
-import { apply, frontmatterValue, parse, serialize, } from '@agentshouse/mdmodel';
+import { apply, create, frontmatterValue, parse, serialize, TYPE_FIELD, } from '@agentshouse/mdmodel';
+import { definitionsAt } from './collection.js';
 import { drafted, entriesIn, settling } from './shared.js';
 import { ROW_WEIGHT } from './turn.js';
 export function* acceptedBinaries(files) {
@@ -24,7 +25,6 @@ export function sameChange(left, right) {
         left.author?.id === right.author?.id &&
         left.author?.name === right.author?.name);
 }
-const EMPTY_FRONTMATTER = '---\n---\n';
 function isPart(change) {
     return change.kind === 'field' || change.kind === 'section' || change.kind === 'preamble';
 }
@@ -53,16 +53,27 @@ function* priorsOf(preconditions) {
         preamble: (path) => preambles.get(path) ?? '',
     };
 }
-function compose(fields, sections) {
-    const body = Object.entries(sections)
-        .map(([name, value]) => `\n## ${name}\n${value}`)
-        .join('');
-    const skeleton = `${EMPTY_FRONTMATTER}${body}`;
-    const opened = parse(skeleton);
-    if (!opened.ok)
-        return skeleton;
-    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);
+export function composed(path, fields, sections, composition) {
+    const declared = fields[TYPE_FIELD];
+    const type = typeof declared === 'string' && declared !== '' ? declared : undefined;
+    const definition = definitionsAt(composition, path)(type);
+    return apply(create(type, definition), [
+        ...Object.entries(fields).flatMap(([name, value]) => (name !== TYPE_FIELD || type === undefined) && frontmatterValue(value)
+            ? [{ kind: 'field', name, value, prior: undefined }]
+            : []),
+        ...Object.entries(sections).map(([name, value]) => ({
+            kind: 'section',
+            name,
+            value,
+            prior: undefined,
+        })),
+    ], definition);
+}
+export function compose(path, fields, sections, composition) {
+    const next = composed(path, fields, sections, composition);
+    if (next.outcome !== 'applied')
+        throw new Error(`the creation of ${path} writes no document`);
+    return serialize(next.document);
 }
 function edited(change, priors) {
     if (change.kind === 'field')
@@ -81,17 +92,19 @@ function edited(change, priors) {
         prior: priors.section(change.path, change.name),
     };
 }
-function edit(staged, changes, priors) {
+function edit(staged, changes, priors, composition) {
     const path = changes[0].path;
     delete staged.revisions[path];
     const text = staged.documents[path];
     if (text === undefined)
         return changes.length;
-    const parsed = parse(text, path);
+    const definitions = definitionsAt(composition, path);
+    const parsed = parse(text, path, definitions);
     if (!parsed.ok)
         return changes.length;
+    const definition = definitions(parsed.document.type);
     const wanted = changes.map((change) => edited(change, priors));
-    const first = apply(parsed.document, wanted);
+    const first = apply(parsed.document, wanted, definition);
     if (first.outcome === 'refuse')
         return changes.length;
     if (first.outcome === 'applied') {
@@ -100,7 +113,7 @@ function edit(staged, changes, priors) {
     }
     const stale = new Set(first.stale);
     const kept = wanted.filter((_, at) => !stale.has(at));
-    const rest = apply(parsed.document, kept);
+    const rest = apply(parsed.document, kept, definition);
     if (rest.outcome !== 'applied')
         return changes.length;
     staged.documents[path] = serialize(rest.document);
@@ -151,10 +164,12 @@ function erase(staged, path) {
     delete staged.changes[path];
     delete staged.binaries[path];
 }
-function stage(staged, change) {
+function stage(staged, change, composition) {
     if (change.kind === 'create') {
         staged.documents[change.path] =
-            'content' in change ? change.content : compose(change.fields, change.sections);
+            'content' in change
+                ? change.content
+                : compose(change.path, change.fields, change.sections, composition);
         delete staged.fileIds[change.path];
         delete staged.created[change.path];
         delete staged.changes[change.path];
@@ -206,7 +221,7 @@ function arrive(heads, change) {
     if (change.change !== undefined)
         heads.changes[change.path] = change.change;
 }
-export function* overlaying(base, queue, unapplied) {
+export function* overlaying(base, queue, composition, unapplied) {
     const staged = {
         documents: drafted(base.documents),
         binaries: drafted(base.binaries),
@@ -220,7 +235,7 @@ export function* overlaying(base, queue, unapplied) {
         for (let index = 0; index < batch.changes.length; index += 1) {
             const change = batch.changes[index];
             if (!isPart(change)) {
-                if (!stage(staged, change))
+                if (!stage(staged, change, composition))
                     unapplied?.();
                 yield ROW_WEIGHT;
                 continue;
@@ -234,7 +249,7 @@ export function* overlaying(base, queue, unapplied) {
                 index += 1;
             }
             const text = staged.documents[change.path] ?? '';
-            for (let left = edit(staged, run, priors); left > 0; left -= 1)
+            for (let left = edit(staged, run, priors, composition); left > 0; left -= 1)
                 unapplied?.();
             yield ROW_WEIGHT + text.length;
         }

package/dist/page-metadata.d.ts

@@ -0,0 +1,8 @@
+export declare const PAGE_METADATA_WORDS: {
+    readonly heading: 'Page metadata';
+    readonly app: 'App';
+    readonly address: 'Address';
+    readonly queries: 'Local Queries';
+};
+export declare function pageMetadataBlock(app: string, address: string, queries: readonly unknown[]): string;
+//# sourceMappingURL=page-metadata.d.ts.map

package/dist/page-metadata.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"page-metadata.d.ts","sourceRoot":"","sources":["../src/page-metadata.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,mBAAmB;aAC9B,OAAO,EAAE,eAAe;aACxB,GAAG,EAAE,KAAK;aACV,OAAO,EAAE,SAAS;aAClB,OAAO,EAAE,eAAe;CAChB,CAAC;AAIX,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,SAAS,OAAO,EAAE,GAC1B,MAAM,CAUR"}

package/dist/page-metadata.js

@@ -0,0 +1,19 @@
+import { queryKey } from '@agentshouse/mdmodel';
+export const PAGE_METADATA_WORDS = {
+    heading: 'Page metadata',
+    app: 'App',
+    address: 'Address',
+    queries: 'Local Queries',
+};
+const PAGE_METADATA_QUERIES = 10;
+export function pageMetadataBlock(app, address, queries) {
+    const held = [...new Set(queries.map(queryKey))];
+    return [
+        PAGE_METADATA_WORDS.heading,
+        `${PAGE_METADATA_WORDS.app}: ${app}`,
+        `${PAGE_METADATA_WORDS.address}: ${address}`,
+        ...(held.length === 0 || held.length > PAGE_METADATA_QUERIES
+            ? []
+            : [`${PAGE_METADATA_WORDS.queries}:`, ...held]),
+    ].join('\n');
+}

package/dist/parts.d.ts

@@ -1,60 +1,4 @@
-import type { RunningSubagent, TurnContext } from './adapter.js';
-import { type JobMarker, type OpenJob } from './job.js';
-export type PlanStep = {
-    readonly content: string;
-    readonly status: string;
-};
-export type Marker = 'mode' | 'compaction' | 'retry' | 'model' | 'job';
-export type Part = {
-    readonly type: 'text';
-    readonly text: string;
-} | {
-    readonly type: 'reasoning';
-    readonly text: string;
-} | {
-    readonly type: 'commands';
-    readonly count: number;
-} | {
-    readonly type: 'subagent';
-    readonly description: string;
-    readonly done: boolean;
-    readonly result: string | null;
-} | {
-    readonly type: 'message';
-    readonly command: string;
-    readonly target: string | null;
-} | {
-    readonly type: 'image';
-    readonly path: string;
-    readonly name: string;
-    readonly mediaType: string;
-} | {
-    readonly type: 'marker';
-    readonly marker: Marker;
-    readonly text: string;
-} | {
-    readonly type: 'plan';
-    readonly steps: readonly PlanStep[];
-};
-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[];
-    readonly ended: boolean;
-};
-export type ChatWork = {
-    readonly kind: 'job' | 'schedule' | 'subagent';
-    readonly title: string;
-    readonly next: string | null;
-    readonly activity: string | null;
-};
-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[]>;
+import { type Part } from '@agentshouse/session-content';
+export declare function currentStep(parts: readonly Part[]): string | null;
+export declare function runningLine(parts: readonly Part[]): string | null;
 //# sourceMappingURL=parts.d.ts.map

package/dist/parts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parts.d.ts","sourceRoot":"","sources":["../src/parts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parts.d.ts","sourceRoot":"","sources":["../src/parts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAGhE,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,GAAG,MAAM,GAAG,IAAI,CAGjE;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE,GAAG,MAAM,GAAG,IAAI,CAKjE"}

package/dist/parts.js

@@ -1,126 +1,13 @@
-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);
-    switch (text(part, 'type')) {
-        case 'text':
-        case 'reasoning': {
-            const said = text(part, 'text');
-            return said === null ? null : { type: part.type, text: said };
-        }
-        case 'commands':
-            return typeof part.count === 'number' ? { type: 'commands', count: part.count } : null;
-        case 'subagent':
-            return {
-                type: 'subagent',
-                description: text(part, 'description') ?? '',
-                done: part.status === 'done',
-                result: text(part, 'result'),
-            };
-        case 'message': {
-            const command = text(part, 'command');
-            return command === null ? null : { type: 'message', command, target: text(part, 'target') };
-        }
-        case 'image': {
-            const path = text(part, 'file');
-            const name = text(part, 'name');
-            return path === null || name === null
-                ? null
-                : { type: 'image', path, name, mediaType: text(part, 'media_type') ?? '' };
-        }
-        case 'marker': {
-            const marker = text(part, 'marker');
-            return marker === null || !MARKERS.includes(marker)
-                ? null
-                : { type: 'marker', marker: marker, text: text(part, 'text') ?? '' };
-        }
-        case 'plan':
-            return {
-                type: 'plan',
-                steps: list(part, 'entries').flatMap((entry) => {
-                    const step = record(entry);
-                    const content = text(step, 'content');
-                    return content === null ? [] : [{ content, status: text(step, 'status') ?? '' }];
-                }),
-            };
-        default:
-            return null;
-    }
-}
-export function partsOf(raw) {
-    return raw.flatMap((one) => partOf(one) ?? []);
-}
-export function contextIn(raw) {
-    const held = record(raw);
-    return typeof held.used === 'number' && typeof held.window === 'number' && held.window > 0
-        ? { used: held.used, window: held.window }
-        : 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() !== '');
+import { isOwn } from '@agentshouse/session-content';
+import { excerpt } from './read.js';
+export function currentStep(parts) {
+    const call = [...parts].reverse().find((part) => part.type === 'call');
+    return call?.type === 'call' && call.line !== '' ? call.line : null;
+}
+export function runningLine(parts) {
+    const own = parts.filter(isOwn);
+    const note = [...own].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 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 = [];
-    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)
-                    closeLast(open, key);
-                else if (ended) {
-                    open.push({
-                        turn,
-                        key,
-                        work: { kind: 'subagent', title: part.description, next: null, activity: null },
-                    });
-                }
-                continue;
-            }
-            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,
-                    },
-                }
-                : null);
-        }
-    }
-    const doing = [...subagents];
-    const under = new Map();
-    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;
+    return currentStep(own);
 }

package/dist/preparation.d.ts.map

@@ -1 +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"}
+{"version":3,"file":"preparation.d.ts","sourceRoot":"","sources":["../src/preparation.ts"],"names":[],"mappings":"AAIA,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;AAqCF,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,GAAE,SAAS,MAAM,EAAO,QA4BzE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,CAElE;AAgDD,wBAAsB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAMrF;AA8ED,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,QAKtC"}