@volter/world-core 3.0.123 → 3.0.125

package/dist/src/derived-real.js

@@ -417,7 +417,7 @@ function performOf(units) {
                 adopted.push({ actionId: entry.id, externalId, data });
             }
             const primary = adopted.shift();
-            return primary ? { ...primary, ...(adopted.length ? { also: adopted } : {}) } : { externalId: '', actionId: group.at(-1).id };
+            return primary ? { ...primary, response: answer, ...(adopted.length ? { also: adopted } : {}) } : { externalId: '', actionId: group.at(-1).id, response: answer };
         }
         // an XML answer is read through its document element (S3's `InitiateMultipartUploadResult`), as a JSON one under its key
         const documentElement = () => {
@@ -434,7 +434,7 @@ function performOf(units) {
         // CreateSecretResponse, S3's CreateMultipartUploadOutput) is the group's subject's, its id read by that resource
         const subjectDecl = () => Object.entries(m.resources).find(([r]) => storedType(m, r) === group.at(-1).subject.type)?.[1];
         const decl = resource ? m.resources[resource] : subjectDecl();
-        const idOf = (o, d) => { const v = o?.[d?.idAs ?? 'id']; return typeof v === 'string' ? v : undefined; };
+        const idOf = (o, d) => o ? storedIdOf(d ?? { idPrefix: '' }, o) : undefined;
         // the group's entry the answer is: of the answered resource's stored type (a cascade writes children first), else
         // the last; a delete answers its subject's own vendor id
         const answered = resource ? [...group].reverse().find((e) => e.subject.type === storedType(m, resource)) : undefined;
@@ -443,7 +443,7 @@ function performOf(units) {
         // the membership and its channel_join message) gives no entry its id or its fields: each settles deployed with no
         // vendor id, and refresh adopts it ("Perform", step 2)
         if (resource && !answered)
-            return { externalId: '', actionId: primary.id };
+            return { externalId: '', actionId: primary.id, response: answer };
         const deleted = primary.fields?.deleted === true;
         // a keyed subject's id is its key filled from the answer (its envelope's fields, Slack's `channel` and `ts`, among them)
         const keyed = decl?.key ? decl : Object.entries(m.resources).find(([r]) => storedType(m, r) === primary.subject.type)?.[1];
@@ -453,10 +453,10 @@ function performOf(units) {
         for (const [companion, where] of Object.entries(decl?.companions ?? keyed?.companions ?? {})) {
             const id = at(parsed, where) ?? at(obj, where);
             const entry = group.find((e) => e !== primary && e.subject.type === storedType(m, companion));
-            if (entry && typeof id === 'string')
-                also.push({ actionId: entry.id, externalId: id });
+            if (entry && (typeof id === 'string' || typeof id === 'number'))
+                also.push({ actionId: entry.id, externalId: String(id) });
         }
-        return { externalId, actionId: primary.id, data: obj, ...(also.length ? { also } : {}) };
+        return { externalId, actionId: primary.id, data: obj, response: answer, ...(also.length ? { also } : {}) };
     };
     return async (execute, group, ctx) => {
         await adoptAccount(units, execute, ctx);
@@ -620,7 +620,7 @@ function refreshOf(units, service) {
                         if (answer.status === 404)
                             continue;
                         if (answer.status >= 400 || refusedIn(m, parse(answer)))
-                            throw new Error(`${answer.status}: ${refusalWords(m, parse(answer))}`);
+                            throw new Error(`${m.vendor}: ${resource} refresh ${op.id} (${op.method.toUpperCase()} ${op.path}): ${answer.status}: ${refusalWords(m, parse(answer))}`);
                         const full = object(op.answers?.key ? at(parse(answer), op.answers.key) : parse(answer)) ?? {};
                         const local = m.worldFields?.[resource] ?? {};
                         const fields = Object.fromEntries(Object.entries(full).filter(([k]) => !(k in local)));
@@ -703,7 +703,7 @@ function refreshOf(units, service) {
                                 break;
                             }
                             if (answer.status >= 400 || refusedIn(m, parse(answer)))
-                                throw new Error(`${answer.status}: ${refusalWords(m, parse(answer))}`);
+                                throw new Error(`${m.vendor}: ${resource} refresh ${op.id} (${op.method.toUpperCase()} ${op.path}): ${answer.status}: ${refusalWords(m, parse(answer))}`);
                             answered += 1;
                             const parsed = parse(answer);
                             const shape = 'list' in scope ? scope.shape : undefined;
@@ -753,7 +753,7 @@ function refreshOf(units, service) {
                                     const detailSent = detailRpc && Object.keys(withValues).length ? encode(detail, withValues) : undefined;
                                     const answer = await execute({ method: detail.method.toUpperCase(), path: sentTo(m, marked(detail, Object.keys(detailQuery).length ? `${path}?${new URLSearchParams(detailQuery)}` : path), { ...item, ...under?.params }), ...onLane, headers: { ...fixedHeaders(detail), ...(detailSent?.type ? { 'content-type': detailSent.type } : {}) }, ...(detailSent?.body !== undefined ? { body: detailSent.body } : {}) });
                                     if (answer.status >= 400 || refusedIn(m, parse(answer)))
-                                        throw new Error(`${answer.status}: ${refusalWords(m, parse(answer)) || 'the vendor refused the refresh detail; nothing folded'}`);
+                                        throw new Error(`${m.vendor}: ${resource} refresh detail ${detail.id} (${detail.method.toUpperCase()} ${detail.path}): ${answer.status}: ${refusalWords(m, parse(answer)) || 'the vendor refused the refresh detail; nothing folded'}`);
                                     const detailBody = parse(answer);
                                     const detailKey = scope.detailMerge ?? detail.answers?.key;
                                     const fragment = object(detailKey ? at(detailBody, detailKey) : detailBody);
@@ -857,7 +857,7 @@ function refreshOf(units, service) {
                 // parent is never the account's whole list there
                 if (whole && !decl.parent && !opts.scope)
                     complete.push(type);
-                else if (whole && parents.length)
+                else if (whole && parents.length && decl.parent)
                     complete.push({ type, field: decl.parent.field, within: parents.map((p) => p.value) });
             }
         }

package/dist/src/head.d.ts

@@ -1,7 +1,7 @@
 import { type TwinAction } from './actions.js';
 import { type CredentialPayload, type Sealer } from './credential.js';
 import { type CredentialCustody } from './executor.js';
-import type { RemoteExecute } from './remote-execute.js';
+import type { RemoteExecute, RemoteExecuteResponse } from './remote-execute.js';
 import { type Check, type DeployPolicy, type RootConfig, type StateSystemAdapters } from './state-system.js';
 /** What a perform answers: the id the vendor minted (the local id when it kept ours), its URL, and
  *  the vendor's answer as fields for the landed copy. */
@@ -9,6 +9,8 @@ export type PushOutcome = {
     externalId: string;
     url?: string;
     data?: Record<string, unknown>;
+    /** the successful vendor response for the caller, distinct from the resource fields stored in data */
+    response?: RemoteExecuteResponse;
     /** the group's entry the id is for, when it is not the group's first (a cascade writes children first) */
     actionId?: string;
     /** the group's other entries the answer named an id for (a resource's `companions`) */
@@ -123,6 +125,7 @@ export type DeployReport = {
         externalId?: string;
         at: string; /** what the vendor answered, as the adapter returned it */
         data?: unknown;
+        response?: RemoteExecuteResponse;
     }>;
     /** the first refusal; nothing after it was attempted */
     refused?: {
@@ -187,6 +190,7 @@ export declare function deferPerform<T>(request: string, fn: () => Promise<T>):
  *  reverts one. Nothing when the head is not real and auto, or the request wrote nothing the vendor is offered. */
 export declare function performRequestGroup(service: string, request: string, root?: string): Promise<{
     ids: Map<string, string>;
+    response?: RemoteExecuteResponse;
 } | RefusedWriteError | VendorWriteError>;
 /** Wrap a pack's fetch: a `RefusedWriteError` or `VendorWriteError` the head raised becomes the
  *  vendor's own error body (the pack's `shape`), so an app under live use sees what the vendor

package/dist/src/head.js

@@ -412,7 +412,7 @@ async function performNow(opts) {
                 settle(action, at, { status: 'deployed', ...(action === primary && outcome.url ? { url: outcome.url } : {}) }, { ...action.fields, ...(action === primary ? answered : also.get(action.id)?.data ?? {}) }, externalId || undefined);
                 const data = action === primary ? outcome.data : also.get(action.id)?.data;
                 report.pushed += 1;
-                report.deployed.push({ actionId: action.id, at, ...(externalId ? { externalId } : {}), ...(data !== undefined ? { data } : {}) });
+                report.deployed.push({ actionId: action.id, at, ...(externalId ? { externalId } : {}), ...(data !== undefined ? { data } : {}), ...(action === primary && outcome.response ? { response: outcome.response } : {}) });
             }
         }
         catch (error) {
@@ -514,7 +514,8 @@ export async function performRequestGroup(service, request, root) {
         if (e && d.externalId && d.externalId !== e.subject.id)
             ids.set(e.subject.id, d.externalId);
     }
-    return { ids };
+    const response = report.deployed.find((entry) => entry.response)?.response;
+    return { ids, ...(response ? { response } : {}) };
 }
 /** Wrap a pack's fetch: a `RefusedWriteError` or `VendorWriteError` the head raised becomes the
  *  vendor's own error body (the pack's `shape`), so an app under live use sees what the vendor

package/dist/src/pack-fetch.js

@@ -557,6 +557,13 @@ export function createPackFetch(parts, options = {}) {
         }
         if (performed instanceof VendorWriteError)
             return vendorError(m, { status: 502, message: performed.message });
+        if (performed.response) {
+            const { status, headers: received, body, bodyBytes } = performed.response;
+            const headers = new Headers(received);
+            for (const name of ['content-length', 'content-encoding', 'transfer-encoding', 'connection', 'keep-alive'])
+                headers.delete(name);
+            return new Response([204, 205, 304].includes(status) ? null : bodyBytes ? new Uint8Array(bodyBytes).buffer : body, { status, headers });
+        }
         if (!performed.ids.size || !(answer.headers.get('content-type') ?? '').includes('json'))
             return answer;
         let text = await answer.text();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/world-core",
-  "version": "3.0.123",
+  "version": "3.0.125",
   "description": "The kernel of Volter World: one log per twin, branches as pointers, checkpoints, the fold that keeps a twin current, the head that performs a write against the vendor, references, and the git plane. A twin package builds on it; the runtime serves it.",
   "keywords": [
     "twin",

package/src/derived-real.ts

@@ -348,7 +348,7 @@ function performOf(units: Unit[]): PerformAction {
         adopted.push({ actionId: entry.id, externalId, data });
       }
       const primary = adopted.shift();
-      return primary ? { ...primary, ...(adopted.length ? { also: adopted } : {}) } : { externalId: '', actionId: group.at(-1)!.id };
+      return primary ? { ...primary, response: answer, ...(adopted.length ? { also: adopted } : {}) } : { externalId: '', actionId: group.at(-1)!.id, response: answer };
     }
     // an XML answer is read through its document element (S3's `InitiateMultipartUploadResult`), as a JSON one under its key
     const documentElement = (): Row | undefined => {
@@ -365,7 +365,7 @@ function performOf(units: Unit[]): PerformAction {
     // CreateSecretResponse, S3's CreateMultipartUploadOutput) is the group's subject's, its id read by that resource
     const subjectDecl = (): ResourceDecl | undefined => Object.entries(m.resources).find(([r]) => storedType(m, r) === group.at(-1)!.subject.type)?.[1];
     const decl: ResourceDecl | undefined = resource ? m.resources[resource] : subjectDecl();
-    const idOf = (o: Row | undefined, d: ResourceDecl | undefined): string | undefined => { const v = o?.[d?.idAs ?? 'id']; return typeof v === 'string' ? v : undefined; };
+    const idOf = (o: Row | undefined, d: ResourceDecl | undefined): string | undefined => o ? storedIdOf(d ?? { idPrefix: '' }, o) : undefined;
     // the group's entry the answer is: of the answered resource's stored type (a cascade writes children first), else
     // the last; a delete answers its subject's own vendor id
     const answered = resource ? [...group].reverse().find((e) => e.subject.type === storedType(m, resource)) : undefined;
@@ -373,7 +373,7 @@ function performOf(units: Unit[]): PerformAction {
     // an answer about a subject no entry of the group is (Slack's conversations.join answers the channel; the group is
     // the membership and its channel_join message) gives no entry its id or its fields: each settles deployed with no
     // vendor id, and refresh adopts it ("Perform", step 2)
-    if (resource && !answered) return { externalId: '', actionId: primary.id };
+    if (resource && !answered) return { externalId: '', actionId: primary.id, response: answer };
     const deleted = primary.fields?.deleted === true;
     // a keyed subject's id is its key filled from the answer (its envelope's fields, Slack's `channel` and `ts`, among them)
     const keyed = decl?.key ? decl : Object.entries(m.resources).find(([r]) => storedType(m, r) === primary.subject.type)?.[1];
@@ -383,9 +383,9 @@ function performOf(units: Unit[]): PerformAction {
     for (const [companion, where] of Object.entries(decl?.companions ?? keyed?.companions ?? {})) {
       const id = at(parsed, where) ?? at(obj, where);
       const entry = group.find((e) => e !== primary && e.subject.type === storedType(m, companion));
-      if (entry && typeof id === 'string') also.push({ actionId: entry.id, externalId: id });
+      if (entry && (typeof id === 'string' || typeof id === 'number')) also.push({ actionId: entry.id, externalId: String(id) });
     }
-    return { externalId, actionId: primary.id, data: obj, ...(also.length ? { also } : {}) };
+    return { externalId, actionId: primary.id, data: obj, response: answer, ...(also.length ? { also } : {}) };
   };
   return async (execute: RemoteExecute, group: TwinAction[], ctx: PerformContext): Promise<PushOutcome> => {
     await adoptAccount(units, execute, ctx);
@@ -529,7 +529,7 @@ function refreshOf(units: Unit[], service: string): NonNullable<StateSystemAdapt
             read.push(String(subject.id));
             answered += 1;
             if (answer.status === 404) continue;
-            if (answer.status >= 400 || refusedIn(m, parse(answer))) throw new Error(`${answer.status}: ${refusalWords(m, parse(answer))}`);
+            if (answer.status >= 400 || refusedIn(m, parse(answer))) throw new Error(`${m.vendor}: ${resource} refresh ${op.id} (${op.method.toUpperCase()} ${op.path}): ${answer.status}: ${refusalWords(m, parse(answer))}`);
             const full = object(op.answers?.key ? at(parse(answer), op.answers.key) : parse(answer)) ?? {};
             const local = (m as { worldFields?: Record<string, Record<string, unknown>> }).worldFields?.[resource] ?? {};
             const fields = Object.fromEntries(Object.entries(full).filter(([k]) => !(k in local)));
@@ -596,7 +596,7 @@ function refreshOf(units: Unit[], service: string): NonNullable<StateSystemAdapt
             // one subject read by its parent and not there (an account with no workers.dev subdomain): nothing to observe. A
             // path missing a parameter (an empty segment) is the kernel's mistake, never the vendor's absence
             if ('get' in scope && answer.status === 404 && !unfilled) { answered += 1; break; }
-            if (answer.status >= 400 || refusedIn(m, parse(answer))) throw new Error(`${answer.status}: ${refusalWords(m, parse(answer))}`);
+            if (answer.status >= 400 || refusedIn(m, parse(answer))) throw new Error(`${m.vendor}: ${resource} refresh ${op.id} (${op.method.toUpperCase()} ${op.path}): ${answer.status}: ${refusalWords(m, parse(answer))}`);
             answered += 1;
             const parsed = parse(answer);
             const shape = 'list' in scope ? scope.shape : undefined;
@@ -643,7 +643,7 @@ function refreshOf(units: Unit[], service: string): NonNullable<StateSystemAdapt
                 const detailQuery = { ...(scope.query ?? {}), ...(detailRpc ? {} : withValues) };
                 const detailSent = detailRpc && Object.keys(withValues).length ? encode(detail, withValues) : undefined;
                 const answer = await execute({ method: detail.method.toUpperCase(), path: sentTo(m, marked(detail, Object.keys(detailQuery).length ? `${path}?${new URLSearchParams(detailQuery)}` : path), { ...item, ...under?.params }), ...onLane, headers: { ...fixedHeaders(detail), ...(detailSent?.type ? { 'content-type': detailSent.type } : {}) }, ...(detailSent?.body !== undefined ? { body: detailSent.body } : {}) });
-                if (answer.status >= 400 || refusedIn(m, parse(answer))) throw new Error(`${answer.status}: ${refusalWords(m, parse(answer)) || 'the vendor refused the refresh detail; nothing folded'}`);
+                if (answer.status >= 400 || refusedIn(m, parse(answer))) throw new Error(`${m.vendor}: ${resource} refresh detail ${detail.id} (${detail.method.toUpperCase()} ${detail.path}): ${answer.status}: ${refusalWords(m, parse(answer)) || 'the vendor refused the refresh detail; nothing folded'}`);
                 const detailBody = parse(answer);
                 const detailKey = scope.detailMerge ?? detail.answers?.key;
                 const fragment = object(detailKey ? at(detailBody, detailKey) : detailBody);
@@ -718,7 +718,7 @@ function refreshOf(units: Unit[], service: string): NonNullable<StateSystemAdapt
         // scoped to one resource (`RootConfig.scope`, GitHub's `repos/o/r`) lists only what is under it, so a type with no
         // parent is never the account's whole list there
         if (whole && !decl.parent && !opts.scope) complete.push(type);
-        else if (whole && parents.length) complete.push({ type, field: decl.parent!.field, within: parents.map((p) => p!.value) });
+        else if (whole && parents.length && decl.parent) complete.push({ type, field: decl.parent.field, within: parents.map((p) => p!.value) });
       }
     }
     // every read refused is a credential the vendor refuses, never an account that holds nothing

package/src/head.ts

@@ -14,7 +14,7 @@ import { confirmAction, currentCorrelationId, isTwinBookkeeping, resolveSubjectI
 import { keySealer, type CredentialPayload, type SealedCredential, type Sealer } from './credential.ts';
 import { buildRemoteExecute, validateRemoteOrigin, type CredentialCustody } from './executor.ts';
 import { getPack } from './packRegistry.ts';
-import type { RemoteExecute } from './remote-execute.ts';
+import type { RemoteExecute, RemoteExecuteResponse } from './remote-execute.ts';
 import { aliasesFrom, branchEntries, parentEntries, readTree, type Entry, type Receipt } from './log.ts';
 import { resolveReferences } from './references.ts';
 import { authStrategyFor, NO_SECRETS_CHECK, readRoot, runChecks, stateSystemFor, type Check, type DeployPolicy, type RootConfig, type StateSystemAdapters } from './state-system.ts';
@@ -28,6 +28,8 @@ import { getActiveWorldStore } from './world-store.ts';
  *  the vendor's answer as fields for the landed copy. */
 export type PushOutcome = {
   externalId: string; url?: string; data?: Record<string, unknown>;
+  /** the successful vendor response for the caller, distinct from the resource fields stored in data */
+  response?: RemoteExecuteResponse;
   /** the group's entry the id is for, when it is not the group's first (a cascade writes children first) */
   actionId?: string;
   /** the group's other entries the answer named an id for (a resource's `companions`) */
@@ -253,7 +255,7 @@ export class VendorWriteError extends Error {
 export type DeployReport = {
   /** entries performed by this call */
   pushed: number;
-  deployed: Array<{ actionId: string; externalId?: string; at: string; /** what the vendor answered, as the adapter returned it */ data?: unknown }>;
+  deployed: Array<{ actionId: string; externalId?: string; at: string; /** what the vendor answered, as the adapter returned it */ data?: unknown; response?: RemoteExecuteResponse }>;
   /** the first refusal; nothing after it was attempted */
   refused?: { actionId: string; check: string; reason: string };
   /** the first failure, with the vendor's words; nothing after it was attempted */
@@ -417,7 +419,7 @@ async function performNow(opts: Parameters<typeof performEntries>[0]): Promise<D
         settle(action, at, { status: 'deployed', ...(action === primary && outcome.url ? { url: outcome.url } : {}) }, { ...action.fields, ...(action === primary ? answered : also.get(action.id)?.data ?? {}) }, externalId || undefined);
         const data = action === primary ? outcome.data : also.get(action.id)?.data;
         report.pushed += 1;
-        report.deployed.push({ actionId: action.id, at, ...(externalId ? { externalId } : {}), ...(data !== undefined ? { data } : {}) });
+        report.deployed.push({ actionId: action.id, at, ...(externalId ? { externalId } : {}), ...(data !== undefined ? { data } : {}), ...(action === primary && outcome.response ? { response: outcome.response } : {}) });
       }
     } catch (error) {
       // a write the vendor refuses (a 4xx: it can never be sent as it is) settles the group refused, as a check's
@@ -475,7 +477,7 @@ export async function deferPerform<T>(request: string, fn: () => Promise<T>): Pr
 /** Under `auto`, perform the entries one request made as one call (the real-system adapters, "Perform"): the ids the
  *  vendor gave them by local id, or the vendor's refusal or failure, the request's entries reverted as performAtHead
  *  reverts one. Nothing when the head is not real and auto, or the request wrote nothing the vendor is offered. */
-export async function performRequestGroup(service: string, request: string, root?: string): Promise<{ ids: Map<string, string> } | RefusedWriteError | VendorWriteError> {
+export async function performRequestGroup(service: string, request: string, root?: string): Promise<{ ids: Map<string, string>; response?: RemoteExecuteResponse } | RefusedWriteError | VendorWriteError> {
   const head = headOf(service, root);
   const ids = new Map<string, string>();
   if (head.kind !== 'real' || head.deploy !== 'auto') return { ids };
@@ -492,7 +494,8 @@ export async function performRequestGroup(service: string, request: string, root
     const e = group.find((g) => g.id === d.actionId);
     if (e && d.externalId && d.externalId !== e.subject.id) ids.set(e.subject.id, d.externalId);
   }
-  return { ids };
+  const response = report.deployed.find((entry) => entry.response)?.response;
+  return { ids, ...(response ? { response } : {}) };
 }
 
 /** Wrap a pack's fetch: a `RefusedWriteError` or `VendorWriteError` the head raised becomes the

package/src/pack-fetch.ts

@@ -563,6 +563,12 @@ export function createPackFetch(parts: PackParts, options: PackFetchOptions = {}
     // the vendor's refusal, as its status and words (perform names them `<status>: <message>`), in the vendor's error body
     if (performed instanceof RefusedWriteError) { const said = /^(\d{3}): ([\s\S]*)$/.exec(performed.reason); return vendorError(m, { status: said ? Number(said[1]) : 400, message: said ? said[2]! : performed.reason }); }
     if (performed instanceof VendorWriteError) return vendorError(m, { status: 502, message: performed.message });
+    if (performed.response) {
+      const { status, headers: received, body, bodyBytes } = performed.response;
+      const headers = new Headers(received);
+      for (const name of ['content-length', 'content-encoding', 'transfer-encoding', 'connection', 'keep-alive']) headers.delete(name);
+      return new Response([204, 205, 304].includes(status) ? null : bodyBytes ? new Uint8Array(bodyBytes).buffer : body, { status, headers });
+    }
     if (!performed.ids.size || !(answer.headers.get('content-type') ?? '').includes('json')) return answer;
     let text = await answer.text();
     for (const [local, vendor] of performed.ids) text = text.split(JSON.stringify(local)).join(JSON.stringify(vendor));