@agentshouse/mdruntime-adapter 0.1.0-cacce09fc82c6 → 0.1.0-cafd7caa7ae65

package/dist/actions.js

@@ -3,44 +3,78 @@ import { doorRefusal } from './refusal.js';
 const HISTORY_PAGE = 100;
 const HISTORY_CONVERSATIONS = 64;
 const OCTET_STREAM = 'application/octet-stream';
-const CONVERSATION_ROUTES = new Map([
-    ['conversation.create', '/door/conversations/create'],
-    ['conversation.send', '/door/conversations/send'],
-    ['conversation.answer', '/door/conversations/interaction/answer'],
-    ['conversation.interrupt', '/door/conversations/interrupt'],
-    ['conversation.kill', '/door/conversations/kill'],
-    ['conversation.delete', '/door/conversations/delete'],
-    ['conversation.history', '/door/conversations/history'],
-]);
+function mapped(door, input = (given) => given) {
+    return {
+        door,
+        async carry(transport, given, name) {
+            return actionOutcome(await transport.door(`/door/${door}`, input(given)), name);
+        },
+    };
+}
+function carried(door, carry, batched) {
+    return {
+        door,
+        ...(batched === undefined ? {} : { batched }),
+        carry: (transport, input, name) => carry(transport, `/door/${door}`, input, name),
+    };
+}
+const APP_ACTS = {
+    'access.read': mapped('rooms/access/read'),
+    'conversation.answer': mapped('conversations/interaction/answer', answerBody),
+    'conversation.create': carried('conversations/create', createAction),
+    'conversation.delete': mapped('conversations/delete', controlBody),
+    'conversation.history': carried('conversations/history', historyAction, ['conversations']),
+    'conversation.interrupt': mapped('conversations/interrupt', controlBody),
+    'conversation.kill': mapped('conversations/kill', controlBody),
+    'conversation.markDone': mapped('conversations/done'),
+    'conversation.rename': mapped('conversations/rename'),
+    'conversation.send': carried('conversations/send', sendAction),
+    'conversation.setOption': mapped('conversations/option'),
+    'feature.list': mapped('apps/features/read'),
+    'holder.list': mapped('apps/holders'),
+    'holder.ring': mapped('apps/ring'),
+    'member.list': mapped('rooms/members'),
+    'message.send': mapped('apps/messages/send'),
+    'processing.read': mapped('rooms/settings/processing/read'),
+    'record.list': carried('records/read', recordsAction),
+    'relay.read': mapped('apps/relay'),
+    'routine.list': mapped('routines/access'),
+    'routineAccess.list': mapped('routines/granted'),
+    'routineAllowance.list': mapped('routines/allowance'),
+    'routineRequest.list': mapped('routines/requests'),
+    'storage.read': mapped('storage/inventory'),
+    'trigger.list': mapped('triggers/read'),
+    'triggerOccurrence.list': mapped('triggers/fired'),
+};
+export const HOUSE_APP_ACTS = Object.fromEntries(Object.entries(APP_ACTS).map(([name, act]) => [name, act.door]));
+export const SITE_SUBMIT = 'submit';
+export const HOUSE_SITE_ACTS = {
+    [SITE_SUBMIT]: 'site/submission',
+};
+export const HOUSE_APP_BATCHES = Object.fromEntries(Object.entries(APP_ACTS).flatMap(([name, act]) => act.batched === undefined ? [] : [[name, act.batched]]));
+const APP_NAMES = new Map(Object.entries(APP_ACTS).map(([name, act]) => [act.door, name]));
 export function houseConversationAgents(locator) {
-    return { locator, type: 'house-agent', identity: 'agent', name: 'name' };
+    return { locator, type: 'house-agent', identity: 'agent', name: 'name', retired: 'retired' };
 }
 export function declaredActions(routes) {
-    const mapped = new Map([...CONVERSATION_ROUTES].map(([name, route]) => [route.slice('/door/'.length), name]));
     return routes.map((route) => ({
-        name: mapped.get(route) ?? route,
+        name: APP_NAMES.get(route) ?? route,
         inputShape: {},
         resultKind: 'house',
     }));
 }
 export function houseAction(transport, request) {
-    if (request.name === 'conversation.send')
-        return sendAction(transport, request.input);
-    if (request.name === 'conversation.history')
-        return historyAction(transport, request.input);
-    if (request.name === 'attachments/upload')
-        return attachAction(transport, request.input);
-    if (request.name === 'attachments/get')
-        return openAction(transport, request.input);
+    if (Object.hasOwn(APP_ACTS, request.name)) {
+        return APP_ACTS[request.name].carry(transport, request.input, request.name);
+    }
+    if (APP_NAMES.has(request.name))
+        return Promise.resolve(unimplemented(request.name));
     const route = routeOf(request.name);
     if (route === null)
         return Promise.resolve(malformed());
     return carry(transport, route, request.name, request.input);
 }
 function routeOf(name) {
-    const mapped = CONVERSATION_ROUTES.get(name);
-    if (mapped !== undefined)
-        return mapped;
     const parts = name.split('/');
     if (parts.some((part) => part === '.' || part === '..'))
         return null;
@@ -62,51 +96,86 @@ function operationId(input) {
     return text(input, 'operation_id') ?? changeBatchIdentity();
 }
 function malformed() {
-    return { kind: 'rejected', code: 'invalid_request', fields: {} };
+    return { kind: 'rejected', code: 'invalid_request', fields: {}, retryable: false };
 }
-function bodyOf(name, input) {
-    if (name === 'conversation.create') {
-        return { agent_id: text(input, 'agent_id'), operation_id: operationId(input) };
-    }
-    if (name === 'conversation.interrupt' ||
-        name === 'conversation.kill' ||
-        name === 'conversation.delete') {
-        return { conversation_id: text(input, 'conversation'), operation_id: operationId(input) };
-    }
-    if (name === 'conversation.answer') {
-        const nested = record(record(input).answer);
-        return {
-            conversation_id: text(input, 'conversation'),
-            operation_id: operationId(input),
-            interaction_id: text(nested, 'interaction_id'),
-            response: nested.response,
+function unimplemented(name) {
+    return { kind: 'rejected', code: 'action-unimplemented', fields: { name }, retryable: false };
+}
+function createBody(input) {
+    return { agent_id: text(input, 'agent_id'), operation_id: operationId(input) };
+}
+function controlBody(input) {
+    return { conversation_id: text(input, 'conversation'), operation_id: operationId(input) };
+}
+function answerBody(input) {
+    const nested = record(record(input).answer);
+    return {
+        conversation_id: text(input, 'conversation'),
+        operation_id: operationId(input),
+        interaction_id: text(nested, 'interaction_id'),
+        response: nested.response,
+    };
+}
+async function createAction(transport, route, input, name) {
+    const outcome = actionOutcome(await transport.door(route, createBody(input)), name);
+    if (outcome.kind !== 'action')
+        return outcome;
+    const held = record(outcome.result);
+    const conversation = text(held, 'conversation_id');
+    return conversation === undefined
+        ? outcome
+        : {
+            ...outcome,
+            result: { ...held, conversation },
         };
-    }
-    return input;
 }
 function withTurn(body) {
     const held = record(body);
     const turn = text(held, 'message_id');
-    return turn === undefined ? body : { ...held, turn };
+    return turn === undefined
+        ? body
+        : { ...held, turn };
 }
 export function actionOutcome(answer, name) {
     if (answer.status === 401)
         return { kind: 'revoked-authorization' };
     const refusal = doorRefusal(answer.body);
-    if (refusal !== null) {
-        return { kind: 'rejected', code: refusal.code, fields: refusal.fields };
-    }
+    if (refusal !== null)
+        return { kind: 'rejected', ...refusal };
     if (answer.status === 404)
-        return { kind: 'rejected', code: 'action-unimplemented', fields: { name } };
+        return unimplemented(name);
     if (answer.status === 0 || answer.status >= 400)
         return { kind: 'transport-uncertainty' };
-    if (name === 'conversation.send')
-        return { kind: 'action', result: withTurn(answer.body) };
     return { kind: 'action', result: answer.body };
 }
+function referredRecord(view, roomRef) {
+    const held = record(view);
+    if (roomRef === undefined || typeof held.record !== 'string' || !Array.isArray(held.attachments))
+        return view;
+    const referrer = {
+        room_ref: roomRef,
+        record: held.record,
+    };
+    return {
+        ...held,
+        attachments: held.attachments.map((attachment) => ({ ...record(attachment), referrer })),
+    };
+}
+async function recordsAction(transport, route, input, name) {
+    const outcome = actionOutcome(await transport.door(route, input), name);
+    if (outcome.kind !== 'action')
+        return outcome;
+    const roomRef = text(input, 'room_ref');
+    const read = record(outcome.result);
+    return {
+        ...outcome,
+        result: Array.isArray(read.records)
+            ? { ...read, records: read.records.map((view) => referredRecord(view, roomRef)) }
+            : referredRecord(outcome.result, roomRef),
+    };
+}
 async function carry(transport, route, name, input) {
-    const answer = await transport.door(route, bodyOf(name, input));
-    return actionOutcome(answer, name);
+    return actionOutcome(await transport.door(route, input), name);
 }
 function sendFile(entry) {
     const file = record(entry);
@@ -176,12 +245,12 @@ function uploadGrant(entry) {
         return null;
     return { method: 'POST', operation: upload.operation, url: upload.url };
 }
-async function uploadOriginals(transport, input, result) {
-    const originals = record(result).originals;
-    if (!Array.isArray(originals) || originals.length === 0)
+async function uploadFiles(transport, input, result, name) {
+    const sent = record(result).files;
+    if (!Array.isArray(sent) || sent.length === 0)
         return null;
     const files = Array.isArray(record(input).files) ? record(input).files : [];
-    for (const [index, entry] of originals.entries()) {
+    for (const [index, entry] of sent.entries()) {
         const grant = uploadGrant(entry);
         if (grant === 'absent')
             continue;
@@ -189,81 +258,35 @@ async function uploadOriginals(transport, input, result) {
             return malformed();
         const bytes = index < files.length ? await fileBytes(files[index]) : null;
         if (bytes === null) {
-            return { kind: 'rejected', code: 'conversation_original_descriptor_required', fields: {} };
+            return {
+                kind: 'rejected',
+                code: 'conversation_file_descriptor_required',
+                fields: {},
+                retryable: false,
+            };
         }
         const failed = delivered(await transport.transfer({
-            act: 'conversation_original_upload',
-            method: 'POST',
+            act: 'conversation_file_upload',
             url: grant.url,
-            answer: 'json',
             body: bytes,
             operation: grant.operation,
-        }), 'conversation.send');
+        }), name);
         if (failed !== null)
             return failed;
     }
     return null;
 }
-async function attachAction(transport, input) {
-    const { blob, ...descriptor } = record(input);
-    const bytes = await fileBytes({ blob });
-    if (bytes === null)
-        return malformed();
-    const answer = await transport.door('/door/attachments/upload', descriptor);
-    const outcome = actionOutcome(answer, 'attachments/upload');
-    if (outcome.kind !== 'action')
-        return outcome;
-    const grant = uploadGrant(outcome.result);
-    if (grant === 'absent')
-        return outcome;
-    if (grant === null)
-        return malformed();
-    const stored = await transport.transfer({
-        act: 'original_upload',
-        method: 'POST',
-        url: grant.url,
-        answer: 'json',
-        body: bytes,
-        operation: grant.operation,
-    });
-    return delivered(stored, 'attachments/upload') ?? { kind: 'action', result: stored.body };
-}
-async function openAction(transport, input) {
-    const answer = await transport.door('/door/attachments/get', input);
-    const outcome = actionOutcome(answer, 'attachments/get');
-    if (outcome.kind !== 'action')
-        return outcome;
-    const { download, ...opened } = record(outcome.result);
-    if (download === undefined)
-        return outcome;
-    const grant = record(download);
-    if (grant.method !== 'GET' || typeof grant.url !== 'string')
-        return malformed();
-    const read = await transport.transfer({
-        act: 'original_download',
-        method: 'GET',
-        url: grant.url,
-        answer: 'bytes',
-    });
-    const failed = delivered(read, 'attachments/get');
-    if (failed !== null)
-        return failed;
-    if (!(read.body instanceof Blob))
-        return { kind: 'transport-uncertainty' };
-    return { kind: 'action', result: { ...opened, blob: read.body } };
-}
-async function sendAction(transport, input) {
+async function sendAction(transport, route, input, name) {
     const body = sendBody(input);
     if (body === null)
         return malformed();
-    const answer = await transport.door('/door/conversations/send', body);
-    const outcome = actionOutcome(answer, 'conversation.send');
+    const outcome = actionOutcome(await transport.door(route, body), name);
     if (outcome.kind !== 'action')
         return outcome;
-    const uploaded = await uploadOriginals(transport, input, outcome.result);
+    const uploaded = await uploadFiles(transport, input, outcome.result, name);
     if (uploaded !== null)
         return uploaded;
-    return outcome;
+    return { ...outcome, result: withTurn(outcome.result) };
 }
 function historyCursor(value) {
     const acceptedAt = text(value, 'accepted_at');
@@ -287,12 +310,19 @@ export function acceptedMessage(entry) {
     const cursor = historyCursor(entry);
     if (cursor === null)
         return null;
+    const message = structuredClone(record(entry));
+    const referrer = { message: cursor.message_id };
     return {
         identity: cursor.message_id,
         turn: text(entry, 'turn_id') ?? cursor.message_id,
         position: position(cursor),
         text: text(entry, 'text') ?? '',
-        message: structuredClone(entry),
+        message: Array.isArray(message.files)
+            ? {
+                ...message,
+                files: message.files.map((file) => ({ ...record(file), referrer })),
+            }
+            : message,
     };
 }
 function historyPage(entry) {
@@ -329,17 +359,17 @@ function historyAsks(input) {
     }
     return asks;
 }
-async function historyAction(transport, input) {
+async function historyAction(transport, route, input, name) {
     const asks = historyAsks(input);
     if (asks === null)
         return malformed();
     const histories = [];
     for (let at = 0; at < asks.length; at += HISTORY_CONVERSATIONS) {
-        const answer = await transport.door('/door/conversations/history', {
+        const answer = await transport.door(route, {
             conversations: asks.slice(at, at + HISTORY_CONVERSATIONS),
             limit: HISTORY_PAGE,
         });
-        const outcome = actionOutcome(answer, 'conversation.history');
+        const outcome = actionOutcome(answer, name);
         if (outcome.kind !== 'action')
             return outcome;
         const answered = record(outcome.result).histories;

package/dist/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,OAAO,EACP,aAAa,EAWd,MAAM,wBAAwB,CAAC;AAqChC,OAAO,EAOL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACpB,MAAM,gBAAgB,CAAC;AAyBxB,MAAM,MAAM,yBAAyB,GACjC;IACE,SAAS,EAAE,cAAc,CAAC;IAC1B,SAAS,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;CACrC,GACD;IAAE,IAAI,EAAE,kBAAkB,CAAA;CAAE,CAAC;AAsBjC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CA0WpF"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,OAAO,EACP,aAAa,EAgBd,MAAM,wBAAwB,CAAC;AAuChC,OAAO,EASL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACpB,MAAM,gBAAgB,CAAC;AAyBxB,MAAM,MAAM,yBAAyB,GACjC;IACE,SAAS,EAAE,cAAc,CAAC;IAC1B,SAAS,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;CACrC,GACD;IAAE,IAAI,EAAE,kBAAkB,CAAA;CAAE,CAAC;AAwBjC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CA8cpF"}