narraeon 0.4.0 → 0.5.0

package/dist/node/runtime/model/ModelHostStream.js

@@ -16,8 +16,8 @@ export async function aggregateChatModelStream(body, onDelta) {
         }
         const payload = streamRecord(event.data);
         sawPayload = true;
-        if (isRecord(payload.error))
-            throw new ModelHostFailureError("Provider SSE returned an explicit error");
+        if (isPresent(payload.error))
+            throw providerSseFailure("chat_completions", "Chat Completions", event.event ?? "error", payload, payload.error);
         if (!Array.isArray(payload.choices))
             throw new Error("Chat SSE choices are invalid");
         if (payload.choices.length > 1)
@@ -280,7 +280,7 @@ export async function aggregateAnthropicModelStream(body, onDelta) {
             case "ping":
                 break;
             case "error":
-                throw new ModelHostFailureError("Anthropic SSE returned an explicit error");
+                throw providerSseFailure("anthropic_messages", "Anthropic", payload.type, payload, payload.error);
             default:
                 // Anthropic may add top-level event types. Unknown events do not alter
                 // the content blocks that form the final continuation.
@@ -388,15 +388,47 @@ function parseStreamJson(source) {
         throw new Error("Provider SSE data is not valid JSON");
     }
 }
+function providerSseFailure(provider, label, eventType, payload, errorValue) {
+    const error = isRecord(errorValue) ? errorValue : {};
+    const type = boundedNonEmptyString(error.type, 256);
+    const code = boundedStringOrNumber(error.code, 256);
+    const message = boundedNonEmptyString(error.message, 4096) ??
+        boundedNonEmptyString(payload.message, 4096) ??
+        boundedStringOrNumber(errorValue, 4096);
+    const requestId = boundedNonEmptyString(payload.request_id, 256) ??
+        boundedNonEmptyString(error.request_id, 256);
+    const identity = [...new Set([type, code].filter(isDefined))].join("/");
+    const summary = identity !== "" && message !== undefined
+        ? `${identity}: ${message}`
+        : identity !== ""
+            ? identity
+            : message;
+    const details = {
+        provider,
+        eventType,
+        ...(type === undefined ? {} : { type }),
+        ...(code === undefined ? {} : { code }),
+        ...(message === undefined ? {} : { message }),
+        ...(requestId === undefined ? {} : { requestId }),
+    };
+    const requestSuffix = requestId === undefined ? "" : ` (request_id: ${requestId})`;
+    return new ModelHostFailureError(summary === undefined
+        ? `${label} SSE returned an explicit error${requestSuffix}`
+        : `${label} SSE error: ${summary}${requestSuffix}`, { details });
+}
 function streamIndex(value) {
     if (!Number.isSafeInteger(value) || value < 0)
         throw new Error("Provider SSE content index is invalid");
     return value;
 }
 function appendBlockString(block, field, delta, expectedType) {
-    if (block.type !== expectedType || typeof block[field] !== "string")
+    // Some streams introduce the signature only in signature_delta. Retain
+    // exactly that returned value; do not require an empty start placeholder.
+    const firstSignature = field === "signature" && block[field] === undefined;
+    if (block.type !== expectedType ||
+        (typeof block[field] !== "string" && !firstSignature))
         throw new Error("Anthropic SSE content block does not match its delta");
-    block[field] += delta;
+    block[field] = firstSignature ? delta : String(block[field]) + delta;
 }
 function mergeUsage(target, value) {
     if (!isRecord(value))
@@ -425,6 +457,20 @@ function mergeUsage(target, value) {
 function stringOrUndefined(value) {
     return typeof value === "string" ? value : undefined;
 }
+function boundedNonEmptyString(value, maximumLength) {
+    if (typeof value !== "string")
+        return undefined;
+    const trimmed = value.trim();
+    return trimmed === "" ? undefined : trimmed.slice(0, maximumLength);
+}
+function boundedStringOrNumber(value, maximumLength) {
+    if (typeof value === "number" && Number.isFinite(value))
+        return String(value).slice(0, maximumLength);
+    return boundedNonEmptyString(value, maximumLength);
+}
+function isDefined(value) {
+    return value !== undefined;
+}
 function isPresent(value) {
     return value !== undefined && value !== null;
 }

package/dist/node/runtime/play/FileNativeContinuityCorrection.js

@@ -1,3 +1,4 @@
+import { readDeclaredWorldClock } from "../prompt/WorldMaintenanceReport.js";
 import { createHash, randomUUID } from "node:crypto";
 import { FileNativePromptCompiler, } from "../prompt/FileNativePromptCompiler.js";
 import { validateMaterialList } from "../prompt/MaterialSelection.js";
@@ -68,28 +69,41 @@ export class FileNativeContinuityCorrection {
                 .catch(() => undefined);
         }, claimHeartbeatIntervalMilliseconds);
         claimHeartbeat.unref();
-        const candidate = {
-            ...revision,
-            id: `correction-${randomUUID()}`,
-            operationId: input.operationId,
-            worldId: input.worldId,
-            parentHead: binding.parentHead,
-            mode: input.mode,
-            version: 1,
-            materials: structuredClone(binding.additionalMaterials),
-            originalMaterials: structuredClone(binding.additionalMaterials),
-            history: structuredClone(binding.history),
-            reads: new Map(),
-            previewedVersion: null,
-            stateOperationClaim: claimed.handle,
-            claimHeartbeat,
-        };
-        this.#candidates.set(candidate.id, candidate);
-        return {
-            candidateId: candidate.id,
-            version: candidate.version,
-            parentHead: candidate.parentHead,
-        };
+        try {
+            const candidate = {
+                ...revision,
+                ...(await this.#worlds.inspectDocumentMaintenance(input.worldId, binding.parentHead)),
+                narrativeCheckpoint: binding.narrativeCheckpoint,
+                id: `correction-${randomUUID()}`,
+                operationId: input.operationId,
+                worldId: input.worldId,
+                parentHead: binding.parentHead,
+                mode: input.mode,
+                version: 1,
+                materials: structuredClone(binding.additionalMaterials),
+                originalMaterials: structuredClone(binding.additionalMaterials),
+                history: structuredClone(binding.history),
+                reads: new Map(),
+                previewedVersion: null,
+                stateOperationClaim: claimed.handle,
+                claimHeartbeat,
+            };
+            this.#candidates.set(candidate.id, candidate);
+            return {
+                candidateId: candidate.id,
+                version: candidate.version,
+                parentHead: candidate.parentHead,
+            };
+        }
+        catch (error) {
+            clearInterval(claimHeartbeat);
+            this.#worlds.releaseControl(input.worldId, input.operationId);
+            await Promise.allSettled([
+                this.#worlds.releaseOperationReservation(input.operationId),
+                this.#worlds.operations.releaseCorrectionWorld(claimed.handle),
+            ]);
+            throw error;
+        }
     }
     readDocument(candidateId, handle) {
         const candidate = this.#candidate(candidateId);
@@ -173,7 +187,9 @@ export class FileNativeContinuityCorrection {
         if (candidate.snapshot.status !== "usable")
             throw new Error("Only a usable revision can commit a correction");
         try {
+            const worldClock = readDeclaredWorldClock(candidate.snapshot);
             return await this.#worlds.commitCorrection({
+                ...(worldClock === undefined ? {} : { worldClock }),
                 operationId: candidate.operationId,
                 worldId: candidate.worldId,
                 parentHead: candidate.parentHead,
@@ -220,11 +236,14 @@ export class FileNativeContinuityCorrection {
                 documentSnapshot: candidate.snapshot,
                 additionalMaterials: materials,
                 history: candidate.history,
+                documentMaintenance: candidate.documentMaintenance,
+                documentMaintenanceUnavailableReason: candidate.documentMaintenanceUnavailableReason,
+                narrativeCheckpoint: candidate.narrativeCheckpoint,
             },
-            playerInputPlacement: "bootstrap",
+            playerInputPlacement: "append",
             playerInput: "",
             modelBinding: prompt.modelBinding,
-        });
+        }, prompt.playPreset);
     }
     #candidate(id) {
         const candidate = this.#candidates.get(id);
@@ -267,27 +286,18 @@ function readCompleteDocument(snapshot, handle) {
         ? [{ shortRef: requested }]
         : [{ documentId: requested }, { shortRef: requested }];
     for (const selector of selectors) {
-        let cursor = null;
-        let descriptor = null;
-        do {
-            const result = snapshot.query({
-                kind: "read_document",
-                document: selector,
-                maxBytes: 65_536,
-                cursor,
-            });
-            if (result.kind === "error") {
-                if (result.diagnostics.every(({ code }) => code === "document_not_found"))
-                    break;
-                throw new Error(worldDocumentRevisionFailureMessage(result.diagnostics));
-            }
-            if (result.kind !== "read_document")
-                throw new Error("The correction document's exact read returned the wrong query result");
-            descriptor = result.document;
-            cursor = result.page.nextCursor;
-        } while (cursor !== null);
-        if (descriptor !== null)
-            return descriptor;
+        const result = snapshot.query({
+            kind: "read_document",
+            document: selector,
+        });
+        if (result.kind === "error") {
+            if (result.diagnostics.every(({ code }) => code === "document_not_found"))
+                continue;
+            throw new Error(worldDocumentRevisionFailureMessage(result.diagnostics));
+        }
+        if (result.kind !== "read_document")
+            throw new Error("The correction document's exact read returned the wrong query result");
+        return result.document;
     }
     throw new Error(`Correction document ${handle} does not exist`);
 }