@agentshouse/mdruntime-adapter 0.1.0-ceda7e87cc6e8 → 0.1.0-cedb8e57837a7

package/dist/write.d.ts

@@ -10,6 +10,7 @@ export type ChangeMapping = {
     rule: string;
 };
 export declare function houseChanges(batch: ChangeBatch, handle: string): ChangeMapping;
+export declare function houseMove(batch: ChangeBatch, source: string, destination: string): ChangeMapping;
 export type OperationHead = {
     readonly operation_id: string;
     readonly app_ref?: string;
@@ -21,7 +22,17 @@ export declare function deltaBody(changes: readonly HouseOperation[]): string;
 export declare function deltaBytes(delta: string): number;
 export declare function uploadable(inline: Readonly<Record<string, unknown>>, bytes: number, bounds: Pick<HouseBounds, 'max_inline_body_bytes' | 'max_upload_bytes'>): boolean;
 export declare function deltaDigest(delta: string): Promise<string>;
-export declare function mutationOutcome(status: number, body: unknown, locator: string, handle: string): MutationResult;
+export type MoveAuthorities = {
+    readonly source: {
+        readonly authority: string;
+        readonly handle: string;
+    };
+    readonly destination: {
+        readonly authority: string;
+        readonly handle: string;
+    };
+};
+export declare function mutationOutcome(status: number, body: unknown, locator: string, handle: string, move?: MoveAuthorities): Generator<number, MutationResult, void>;
 export declare function rejectedMapping(mapping: Extract<ChangeMapping, {
     kind: 'unmapped';
 }>): {

package/dist/write.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../src/write.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,WAAW,EAEhB,KAAK,aAAa,EAElB,KAAK,cAAc,EAEpB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAOlD,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAE/D,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,SAAS,cAAc,EAAE,CAAA;CAAE,GACvD;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAwHrD,wBAAgB,YAAY,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,CAQ9E;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,wBAAgB,aAAa,CAAC,KAAK,EAAE,WAAW,GAAG,aAAa,CAK/D;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,SAAS,cAAc,EAAE,GAAG,SAAS,MAAM,EAAE,CAQhF;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,SAAS,cAAc,EAAE,GAAG,MAAM,CAEpE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,UAAU,CACxB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,uBAAuB,GAAG,kBAAkB,CAAC,GACtE,OAAO,CAKT;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAE1D;AAiDD,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,cAAc,CA8EhB;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,EAAE;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAC;IAEjF,IAAI,EAAE,UAAU;IAChB,QAAQ;IACR,IAAI;IACJ,MAAM;QAAI,IAAI;;IACd,SAAS;EAEZ;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAM1B;AA4BD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3C,aAAa,CAyDf"}
+{"version":3,"file":"write.d.ts","sourceRoot":"","sources":["../src/write.ts"],"names":[],"mappings":"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"}

package/dist/write.js

@@ -1,5 +1,5 @@
-import { departure, } from '@agentshouse/mdruntime';
-import { binaryFileOf, headChange } from './read.js';
+import { departure, ROW_WEIGHT, } from '@agentshouse/mdruntime';
+import { answered, answering, binaryFileOf, headChange, revised } from './read.js';
 import { sha256Hex, textBytes } from './digest.js';
 import { nativePath, roomLocalPath } from './map.js';
 import { classifyDoor, doorRefusal, scopedRefusal } from './refusal.js';
@@ -120,6 +120,24 @@ export function houseChanges(batch, handle) {
     }
     return { kind: 'changes', changes };
 }
+export function houseMove(batch, source, destination) {
+    const changes = [];
+    for (const { path, to } of batch.between?.moves ?? []) {
+        const existence = priorExistence(batch, path);
+        if (existence === undefined)
+            return { kind: 'unmapped', path, rule: 'precondition-missing' };
+        if (!('base' in existence)) {
+            return { kind: 'unmapped', path, rule: 'presence-base-unrepresentable' };
+        }
+        changes.push({
+            op: 'rename',
+            path: nativePath(path, source),
+            to: nativePath(to, destination),
+            base: existence.base,
+        });
+    }
+    return { kind: 'changes', changes };
+}
 export function operationHead(batch) {
     const writer = batch.writtenBy;
     return writer === undefined
@@ -129,7 +147,7 @@ export function operationHead(batch) {
 export function batchPaths(changes) {
     return [
         ...new Set(changes.flatMap((change) => change.op === 'rename' ? [String(change.path), String(change.to)] : [String(change.path)])),
-    ].sort();
+    ];
 }
 export function deltaBody(changes) {
     return JSON.stringify({ changes });
@@ -144,16 +162,19 @@ export function uploadable(inline, bytes, bounds) {
 export function deltaDigest(delta) {
     return sha256Hex(delta);
 }
-function material(value, handle) {
+function* material(value, handle, within = () => true) {
     if (!Array.isArray(value))
         return null;
     const held = [];
     for (const entry of value) {
+        yield ROW_WEIGHT;
         if (typeof entry !== 'object' || entry === null)
             return null;
         const file = entry;
         if (typeof file.path !== 'string')
             return null;
+        if (!within(file.path))
+            continue;
         if (file.content !== null && typeof file.content !== 'string')
             return null;
         if (file.revision !== null && file.revision !== undefined && typeof file.revision !== 'string')
@@ -181,27 +202,74 @@ function material(value, handle) {
     }
     return held;
 }
-function affectedOf(held) {
+function* affectedOf(held) {
     const affected = {};
     for (const entry of held) {
         if (entry.content !== null)
             affected[entry.path] = entry.content;
+        yield ROW_WEIGHT;
     }
     return affected;
 }
-export function mutationOutcome(status, body, locator, handle) {
+function* acceptedOf(at, contents) {
+    const answer = answering();
+    for (const entry of contents) {
+        yield ROW_WEIGHT + (entry.content?.length ?? 0);
+        if (entry.revision === null) {
+            answer.removals.add(entry.path);
+            continue;
+        }
+        if (entry.content !== null)
+            answer.documents.set(entry.path, entry.content);
+        if (entry.binary !== undefined)
+            answer.binaryFiles.set(entry.path, entry.binary);
+        revised(answer, entry.path, entry.revision);
+        if (entry.head !== undefined)
+            answer.changes.set(entry.path, entry.head);
+    }
+    const unbinaried = answer.binaryFiles.size === 0;
+    const { binaryFiles, ...room } = yield* answered(answer);
+    return { roomVersion: roomVersion(at), ...room, ...(unbinaried ? {} : { binaryFiles }) };
+}
+function* movedOutcome(held, move) {
+    const authorities = Array.isArray(held.authorities) ? held.authorities : [];
+    const at = (authority) => {
+        const entry = authorities.find((one) => typeof one === 'object' &&
+            one !== null &&
+            one.authority === authority);
+        return entry === undefined ? null : readPosition(entry);
+    };
+    const left = at(move.source.authority);
+    const arrived = at(move.destination.authority);
+    if (left === null || arrived === null)
+        return { kind: 'transport-uncertainty' };
+    const under = (handle) => (path) => path.startsWith(`/rooms/${handle}/`);
+    const leaving = yield* material(held.contents, move.source.handle, under(move.source.handle));
+    const arriving = yield* material(held.contents, move.destination.handle, under(move.destination.handle));
+    if (leaving === null || arriving === null)
+        return { kind: 'transport-uncertainty' };
+    return {
+        kind: 'accepted',
+        ...(yield* acceptedOf(left, leaving)),
+        destination: yield* acceptedOf(arrived, arriving),
+    };
+}
+export function* mutationOutcome(status, body, locator, handle, move) {
     const refusal = doorRefusal(body);
     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) ?? [];
+        const held = (yield* material(current, handle)) ?? [];
         return {
             kind: 'conflicted',
-            affected: affectedOf(held),
+            affected: yield* affectedOf(held),
             code: refusal.code,
             fields,
             retryable: refusal.retryable,
@@ -225,8 +293,9 @@ export function mutationOutcome(status, body, locator, handle) {
     }
     if (classified !== null && classified.kind !== 'scoped-refusal')
         return classified;
-    if (classified !== null && status === 403)
+    if (classified !== null && status === 403 && refusal?.code === 'operation_denied') {
         return classified;
+    }
     if (refusal !== null && status >= 400) {
         return {
             kind: 'rejected',
@@ -240,39 +309,15 @@ export function mutationOutcome(status, body, locator, handle) {
         return { kind: 'transport-uncertainty' };
     }
     const held = body;
+    if (move !== undefined)
+        return yield* movedOutcome(held, move);
     const at = readPosition(held);
     if (at === null)
         return { kind: 'transport-uncertainty' };
-    const contents = material(held.contents, handle);
+    const contents = yield* material(held.contents, handle);
     if (contents === null)
         return { kind: 'transport-uncertainty' };
-    const documents = {};
-    const revisions = {};
-    const changes = {};
-    const binaryFiles = {};
-    const removals = [];
-    for (const entry of contents) {
-        if (entry.revision === null) {
-            removals.push(entry.path);
-            continue;
-        }
-        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,
-        changes,
-        removals: removals.sort(),
-        ...(Object.keys(binaryFiles).length === 0 ? {} : { binaryFiles }),
-    };
+    return { kind: 'accepted', ...(yield* acceptedOf(at, contents)) };
 }
 export function rejectedMapping(mapping) {
     return {
@@ -337,7 +382,7 @@ 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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentshouse/mdruntime-adapter",
-  "version": "0.1.0-ceda7e87cc6e8",
+  "version": "0.1.0-cedb8e57837a7",
   "description": "Agents House Adapter for the MD Runtime",
   "license": "MIT",
   "type": "module",
@@ -25,7 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@agentshouse/mdmodel": "0.1.0-c6e675bb19980",
-    "@agentshouse/mdruntime": "0.1.0-c16fc8caac7ff"
+    "@agentshouse/mdruntime": "0.1.0-c450c0a30a409"
   }
 }