@agentshouse/mdruntime-adapter 0.1.0-cf22c8563f9f4 → 0.1.0-cf9ab9b7cbbca

package/dist/write.js

@@ -1,4 +1,5 @@
-import { parseOriginals } from './read.js';
+import { departure, } from '@agentshouse/mdruntime';
+import { binaryFileOf, headChange, identities } from './read.js';
 import { sha256Hex, textBytes } from './digest.js';
 import { nativePath, roomLocalPath } from './map.js';
 import { classifyDoor, doorRefusal, scopedRefusal } from './refusal.js';
@@ -73,6 +74,25 @@ function operationOf(batch, change, handle) {
         const operation = created(change, path);
         return operation === null ? { rule: 'type-missing' } : { operation };
     }
+    if (change.kind === 'binary') {
+        const written = {
+            op: 'upload',
+            path,
+            local_id: change.localId,
+            bytes: change.byteLength,
+            sha256: change.sha256,
+            media_type: change.mediaType,
+        };
+        const from = departure(batch.changes, batch.changes.indexOf(change));
+        if (from === change.path && priorAbsence(batch, change.path) !== undefined)
+            return { operation: written };
+        const replaced = priorExistence(batch, from);
+        if (replaced === undefined)
+            return { rule: 'precondition-missing' };
+        if (!('base' in replaced))
+            return { rule: 'presence-base-unrepresentable' };
+        return { operation: { ...written, base: replaced.base } };
+    }
     const existence = priorExistence(batch, change.path);
     if (existence === undefined)
         return { rule: 'precondition-missing' };
@@ -138,6 +158,12 @@ function material(value, handle) {
             return null;
         if (file.revision !== null && file.revision !== undefined && typeof file.revision !== 'string')
             return null;
+        const binary = binaryFileOf(file);
+        if (binary === null)
+            return null;
+        const head = headChange(file);
+        if (head === null)
+            return null;
         let path;
         try {
             path = roomLocalPath(file.path, handle);
@@ -149,6 +175,8 @@ function material(value, handle) {
             path,
             content: file.content,
             revision: typeof file.revision === 'string' ? file.revision : null,
+            ...(binary === undefined ? {} : { binary }),
+            ...(head === undefined ? {} : { head }),
         });
     }
     return held;
@@ -166,12 +194,21 @@ export function mutationOutcome(status, body, locator, handle) {
     if (refusal !== null && refusal.code === 'service_mode_write_halted') {
         return { kind: 'write-halted' };
     }
-    if (refusal !== null && refusal.code === 'expired')
-        return { kind: 'expired' };
+    if (refusal !== null && refusal.code === 'expired') {
+        return refusal.fields.restored === true
+            ? { kind: 'expired', restored: true }
+            : { kind: 'expired' };
+    }
     if (refusal !== null && refusal.code === 'edit_conflict') {
         const { current, ...fields } = refusal.fields;
         const held = material(current, handle) ?? [];
-        return { kind: 'conflicted', affected: affectedOf(held), code: refusal.code, fields };
+        return {
+            kind: 'conflicted',
+            affected: affectedOf(held),
+            code: refusal.code,
+            fields,
+            retryable: refusal.retryable,
+        };
     }
     if (refusal !== null && status === 404) {
         return scopedRefusal(locator, 'undisclosed', refusal);
@@ -181,14 +218,26 @@ export function mutationOutcome(status, body, locator, handle) {
     if (refusal?.retryable === true &&
         typeof reset === 'string' &&
         classified?.kind === 'transport-uncertainty') {
-        return { kind: 'retryable-refusal', code: refusal.code, fields: refusal.fields, reset };
+        return {
+            kind: 'retryable-refusal',
+            code: refusal.code,
+            fields: refusal.fields,
+            retryable: true,
+            reset,
+        };
     }
     if (classified !== null && classified.kind !== 'scoped-refusal')
         return classified;
     if (classified !== null && status === 403)
         return classified;
     if (refusal !== null && status >= 400) {
-        return { kind: 'rejected', affected: {}, code: refusal.code, fields: refusal.fields };
+        return {
+            kind: 'rejected',
+            affected: {},
+            code: refusal.code,
+            fields: refusal.fields,
+            retryable: refusal.retryable,
+        };
     }
     if (status !== 200 || typeof body !== 'object' || body === null) {
         return { kind: 'transport-uncertainty' };
@@ -200,27 +249,33 @@ export function mutationOutcome(status, body, locator, handle) {
     const contents = material(held.contents, handle);
     if (contents === null)
         return { kind: 'transport-uncertainty' };
-    const originals = parseOriginals(held.originals);
-    if (originals === null)
-        return { kind: 'transport-uncertainty' };
     const documents = {};
     const revisions = {};
+    const changes = {};
+    const binaryFiles = {};
     const removals = [];
     for (const entry of contents) {
-        if (entry.content === null || entry.revision === null) {
+        if (entry.revision === null) {
             removals.push(entry.path);
             continue;
         }
-        documents[entry.path] = entry.content;
+        if (entry.content !== null)
+            documents[entry.path] = entry.content;
+        if (entry.binary !== undefined)
+            binaryFiles[entry.path] = entry.binary;
         revisions[entry.path] = entry.revision;
+        if (entry.head !== undefined)
+            changes[entry.path] = entry.head;
     }
     return {
         kind: 'accepted',
         roomVersion: roomVersion(at),
         documents,
         revisions,
+        ...identities(revisions),
+        changes,
         removals: removals.sort(),
-        originals,
+        ...(Object.keys(binaryFiles).length === 0 ? {} : { binaryFiles }),
     };
 }
 export function rejectedMapping(mapping) {
@@ -229,6 +284,7 @@ export function rejectedMapping(mapping) {
         affected: {},
         code: mapping.rule,
         fields: { path: mapping.path },
+        retryable: false,
     };
 }
 export function revisionBody(input) {
@@ -250,6 +306,17 @@ function revisionAuthor(entry) {
     }
     return null;
 }
+function historyBinary(entry) {
+    if (entry.file === undefined)
+        return undefined;
+    const { file, bytes, media_type: mediaType, sha256 } = entry;
+    if (typeof file !== 'string' ||
+        typeof bytes !== 'number' ||
+        typeof mediaType !== 'string' ||
+        typeof sha256 !== 'string')
+        return null;
+    return { fileRef: file, byteLength: bytes, mediaType, sha256 };
+}
 export function historyOutcome(status, body, locator, request) {
     const classified = classifyDoor(status, body, locator);
     if (classified !== null)
@@ -274,11 +341,14 @@ export function historyOutcome(status, body, locator, request) {
             return {
                 kind: 'scoped-refusal',
                 locator,
-                scope: 'content',
+                scope: 'operation',
                 code: 'retained_history_unavailable',
                 fields: { path: request.path, revision: request.revision },
+                retryable: false,
             };
         }
+        if (typeof named.file === 'string')
+            return { kind: 'no-history' };
         if (typeof named.content !== 'string')
             return { kind: 'transport-uncertainty' };
         return { kind: 'revision', content: named.content };
@@ -293,7 +363,15 @@ export function historyOutcome(status, body, locator, request) {
             typeof entry.created_at !== 'string') {
             return { kind: 'transport-uncertainty' };
         }
-        revisions.push({ revision: entry.revision, author, time: entry.created_at });
+        const binaryFile = historyBinary(entry);
+        if (binaryFile === null)
+            return { kind: 'transport-uncertainty' };
+        revisions.push({
+            revision: entry.revision,
+            author,
+            time: entry.created_at,
+            ...(binaryFile === undefined ? {} : { binaryFile }),
+        });
     }
     const next = held.next_before;
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentshouse/mdruntime-adapter",
-  "version": "0.1.0-cf22c8563f9f4",
+  "version": "0.1.0-cf9ab9b7cbbca",
   "description": "Agents House Adapter for the MD Runtime",
   "license": "MIT",
   "type": "module",
@@ -14,7 +14,7 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
+      "default": "./dist/index.js"
     },
     "./package.json": "./package.json"
   },
@@ -25,7 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@agentshouse/mdmodel": "0.1.0-c3d58cb8652e6",
-    "@agentshouse/mdruntime": "0.1.0-cebcd51f70ed1"
+    "@agentshouse/mdruntime": "0.1.0-c2682496ef6d0"
   }
 }

package/dist/links.d.ts

@@ -1,20 +0,0 @@
-import type { HeldRoom, MutationResult, RoomAttachment } from '@agentshouse/mdruntime';
-import type { HouseScope, HouseView } from './read.js';
-import type { StreamedAdvancement } from './stream.js';
-export type RoomLinks = {
-    roomVersion: string;
-    handed: ReadonlyMap<string, RoomAttachment>;
-    paths: ReadonlyMap<string, ReadonlySet<string>>;
-    revisions: ReadonlyMap<string, string>;
-};
-export declare function scopeLinks(scope: HouseScope): RoomLinks;
-export declare function heldLinks(held: HeldRoom): RoomLinks;
-export declare function acceptedLinks(held: RoomLinks, accepted: Extract<MutationResult, {
-    kind: 'accepted';
-}>, roomVersion: string, originals: readonly RoomAttachment[]): {
-    links: RoomLinks;
-    attachments?: readonly RoomAttachment[];
-};
-export declare function enumeratedLinks(view: HouseView, earlier: RoomLinks | undefined): RoomLinks;
-export declare function streamedLinks(held: RoomLinks, advanced: StreamedAdvancement): RoomLinks | null;
-//# sourceMappingURL=links.d.ts.map

package/dist/links.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"links.d.ts","sourceRoot":"","sources":["../src/links.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAOvD,MAAM,MAAM,SAAS,GAAG;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC5C,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IAChD,SAAS,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC,CAAC;AAcF,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,CAWvD;AAOD,wBAAgB,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,CAOnD;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,OAAO,CAAC,cAAc,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC,EACvD,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,SAAS,cAAc,EAAE,GACnC;IAAE,KAAK,EAAE,SAAS,CAAC;IAAC,WAAW,CAAC,EAAE,SAAS,cAAc,EAAE,CAAA;CAAE,CA2B/D;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAgB1F;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,mBAAmB,GAAG,SAAS,GAAG,IAAI,CAoB9F"}

package/dist/links.js

@@ -1,104 +0,0 @@
-import { roomVersion } from './version.js';
-const ATTACHMENT_REFERENCE = /at_[1-9a-hjkmnp-tv-z][0-9a-hjkmnp-tv-z]*\.[0-9a-hjkmnp-tv-z]/g;
-const NONE = new Set();
-function linkedBy(text) {
-    if (text === null)
-        return NONE;
-    const references = new Set(Array.from(text.matchAll(ATTACHMENT_REFERENCE), ([found]) => found));
-    return references.size === 0 ? NONE : references;
-}
-function handedOf(attachments) {
-    return new Map((attachments ?? []).map((attachment) => [attachment.reference, attachment]));
-}
-export function scopeLinks(scope) {
-    return {
-        roomVersion: roomVersion(scope),
-        handed: handedOf(scope.attachments),
-        paths: new Map(scope.contents.map(({ path, content }) => [path, linkedBy(content)])),
-        revisions: new Map(scope.files.flatMap(({ path, revision }) => revision === undefined ? [] : [[path, revision]])),
-    };
-}
-function revised(revisions, path, revision) {
-    if (revision === undefined)
-        revisions.delete(path);
-    else
-        revisions.set(path, revision);
-}
-export function heldLinks(held) {
-    return {
-        roomVersion: held.roomVersion,
-        handed: handedOf(held.attachments),
-        paths: new Map(Object.entries(held.documents).map(([path, text]) => [path, linkedBy(text)])),
-        revisions: new Map(Object.entries(held.revisions)),
-    };
-}
-export function acceptedLinks(held, accepted, roomVersion, originals) {
-    const paths = new Map(held.paths);
-    const revisions = new Map(held.revisions);
-    const handed = new Map(held.handed);
-    const answered = handedOf(originals);
-    for (const [path, text] of Object.entries(accepted.documents)) {
-        const linked = linkedBy(text);
-        for (const reference of linked) {
-            const original = answered.get(reference);
-            if (!handed.has(reference) && original !== undefined)
-                handed.set(reference, original);
-        }
-        paths.set(path, linked);
-    }
-    for (const [path, revision] of Object.entries(accepted.revisions))
-        revisions.set(path, revision);
-    for (const path of accepted.removals) {
-        paths.delete(path);
-        revisions.delete(path);
-    }
-    const linked = new Set([...paths.values()].flatMap((references) => [...references]));
-    for (const reference of held.handed.keys()) {
-        const before = [...held.paths.values()].some((references) => references.has(reference));
-        if (before && !linked.has(reference))
-            handed.delete(reference);
-    }
-    const links = { roomVersion, handed, paths, revisions };
-    const changed = handed.size !== held.handed.size || [...handed.keys()].some((key) => !held.handed.has(key));
-    return changed ? { links, attachments: [...handed.values()] } : { links };
-}
-export function enumeratedLinks(view, earlier) {
-    const paths = new Map(earlier?.paths);
-    const revisions = new Map(earlier?.revisions);
-    for (const change of view.changes) {
-        paths.set(change.path, linkedBy('content' in change ? change.content : null));
-        revised(revisions, change.path, 'removed' in change
-            ? undefined
-            : 'reference' in change
-                ? change.reference.revision
-                : change.revision);
-    }
-    return { roomVersion: roomVersion(view), handed: handedOf(view.attachments), paths, revisions };
-}
-export function streamedLinks(held, advanced) {
-    const paths = new Map(held.paths);
-    const revisions = new Map(held.revisions);
-    const dropped = new Set();
-    for (const entry of advanced.entries) {
-        revised(revisions, entry.path, entry.kind === 'removed' ? undefined : entry.revision);
-        const text = entry.kind === 'removed' ? null : entry.text;
-        if (text === undefined)
-            return null;
-        const linked = linkedBy(text);
-        for (const reference of linked)
-            if (!held.handed.has(reference))
-                return null;
-        for (const reference of paths.get(entry.path) ?? held.handed.keys()) {
-            if (held.handed.has(reference) && !linked.has(reference))
-                dropped.add(reference);
-        }
-        paths.set(entry.path, linked);
-    }
-    for (const references of paths.values()) {
-        for (const reference of references)
-            dropped.delete(reference);
-    }
-    if (dropped.size > 0)
-        return null;
-    return { roomVersion: advanced.page.roomVersion, handed: held.handed, paths, revisions };
-}