narraeon 0.5.1 → 0.5.3

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

@@ -473,7 +473,7 @@ function anthropicRequestBody(connection, request) {
         ...anthropicReasoningRequest(connection),
         system: request.bootstrap.provider.system,
         messages: [
-            ...request.bootstrap.provider.messages.filter(({ role }) => role !== "system"),
+            ...anthropicBootstrapMessages(request),
             ...anthropicAppend(request),
         ],
         ...(tools.length === 0
@@ -602,15 +602,94 @@ function providerToolStrategy(request, provider) {
 }
 function chatBootstrapMessages(connection, request) {
     const messages = request.bootstrap.provider.messages.map((message) => cloneProviderValue(message));
+    const prefixEnd = bootstrapPrefixEnd(request);
+    messages.splice(prefixEnd, 0, ...initialWorldContext(request, "chat_completions"));
     return connection.dialect === "cliproxyapi"
-        ? attachCacheControlToLastRole(messages, "system")
+        ? attachCacheControlToLastRole(messages, request.bootstrap.provider.preload === undefined ? "system" : "tool")
         : messages;
 }
 function responsesBootstrapMessages(connection, request) {
     const messages = request.bootstrap.provider.messages.map((message) => responsesBootstrapMessage(message, connection.dialect === "cliproxyapi"));
-    return connection.dialect === "cliproxyapi"
-        ? attachCacheControlToLastRole(messages, "system")
-        : messages;
+    const prefixEnd = bootstrapPrefixEnd(request);
+    // Legacy material arrays already mark their stable blocks, and may also contain
+    // player input. Only mark whole messages for the plain-text instruction prefix.
+    const cacheMessageIndex = request.bootstrap.provider.messages
+        .slice(0, prefixEnd)
+        .findLastIndex((message) => typeof message.content === "string");
+    const prefix = messages.map((message, index) => connection.dialect === "cliproxyapi" &&
+        index === cacheMessageIndex &&
+        isRecord(message)
+        ? { ...message, cache_control: { type: "ephemeral" } }
+        : message);
+    prefix.splice(prefixEnd, 0, ...initialWorldContext(request, "openai_responses"));
+    return prefix;
+}
+/** Configured User prompts are part of the prefix, not the player's first input. */
+function bootstrapPrefixEnd(request) {
+    return (request.bootstrap.provider.messages.length -
+        request.bootstrap.logicalMessages.filter(({ role }) => role === "player_input").length);
+}
+function anthropicBootstrapMessages(request) {
+    const messages = request.bootstrap.provider.messages.map((message) => cloneProviderValue(message));
+    messages.splice(bootstrapPrefixEnd(request), 0, ...initialWorldContext(request, "anthropic_messages"));
+    return messages.filter((message) => !isRecord(message) || message.role !== "system");
+}
+/** Synthetic bootstrap only: never manufacture a provider continuation or a story event. */
+function initialWorldContext(request, protocol) {
+    const preload = request.bootstrap.provider.preload;
+    if (preload === undefined)
+        return [];
+    const name = "runtime_load_context";
+    const notice = {
+        role: "user",
+        content: "Runtime preload: supply the initial world materials selected by the frame. This bootstrap-only read is not a player action or a callable tool. Later successful tool results update these initial values.",
+    };
+    if (protocol === "chat_completions")
+        return [
+            notice,
+            {
+                role: "assistant",
+                content: null,
+                tool_calls: [
+                    {
+                        id: preload.callId,
+                        type: "function",
+                        function: { name, arguments: "{}" },
+                    },
+                ],
+            },
+            { role: "tool", tool_call_id: preload.callId, content: preload.markdown },
+        ];
+    if (protocol === "openai_responses")
+        return [
+            notice,
+            { type: "function_call", call_id: preload.callId, name, arguments: "{}" },
+            {
+                type: "function_call_output",
+                call_id: preload.callId,
+                output: preload.markdown,
+            },
+        ];
+    return [
+        notice,
+        {
+            role: "assistant",
+            content: [{ type: "tool_use", id: preload.callId, name, input: {} }],
+        },
+        {
+            role: "user",
+            content: [
+                {
+                    type: "tool_result",
+                    tool_use_id: preload.callId,
+                    content: preload.markdown,
+                    ...(request.bootstrap.cache.strategy === "explicit_anthropic_blocks"
+                        ? { cache_control: { type: "ephemeral" } }
+                        : {}),
+                },
+            ],
+        },
+    ];
 }
 function attachCacheControlToLastRole(messages, role) {
     const result = cloneProviderValue(messages);
@@ -858,7 +937,7 @@ function responsesBootstrapMessage(message, preserveCacheControl = false) {
                     return [];
                 return [
                     {
-                        type: "input_text",
+                        type: message.role === "assistant" ? "output_text" : "input_text",
                         text: item.text,
                         ...(isRecord(item.cache_control)
                             ? { cache_control: cloneProviderValue(item.cache_control) }

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

@@ -138,6 +138,7 @@ export function defaultPlayPresetFilesForLocale(locale) {
     preset.set("format", "narraeon.play-preset/v2");
     preset.set("playPrompts", defaultOrderedPlayPrompts());
     preset.set("authorPrompts", defaultOrderedAuthorPrompts());
+    preset.set("mergeConsecutiveMessages", false);
     files["preset.yaml"] = stringify(preset.toJS());
     return files;
 }
@@ -676,6 +677,7 @@ function editorProjection(files, limits) {
 export function toPlayPresetStructuredEditor(definition) {
     return {
         name: definition.name,
+        mergeConsecutiveMessages: definition.mergeConsecutiveMessages ?? true,
         authorPrompts: structuredClone(definition.authorPrompts ?? legacyAuthorPrompts(definition)),
         playPrompts: structuredClone(definition.playPrompts ??
             migrateLegacyPlayPrompts(definition.files, definition.narrativePrompts, [
@@ -726,6 +728,8 @@ export function applyPlayPresetStructuredEditor(files, input) {
     if (preset.errors.length > 0 || callChain.errors.length > 0)
         throw new FileNativePlayPresetError("structured_editor_yaml_invalid", "Structured editing can be applied only to parseable preset/call-chain YAML");
     preset.set("name", input.name);
+    if (input.mergeConsecutiveMessages !== undefined)
+        preset.set("mergeConsecutiveMessages", parseMessageMerging(input.mergeConsecutiveMessages));
     if (input.authorPrompts !== undefined)
         preset.set("authorPrompts", parseOrderedAuthorPrompts(input.authorPrompts));
     if (input.playPrompts !== undefined) {
@@ -839,6 +843,11 @@ export function parsePlayPresetStructuredEditor(value) {
             ? {}
             : { followupItems: parseFollowupItems(value.followupItems, followups) }),
         name: value.name,
+        ...(value.mergeConsecutiveMessages === undefined
+            ? {}
+            : {
+                mergeConsecutiveMessages: parseMessageMerging(value.mergeConsecutiveMessages),
+            }),
         ...(value.authorPrompts === undefined
             ? {}
             : { authorPrompts: parseOrderedAuthorPrompts(value.authorPrompts) }),
@@ -873,6 +882,7 @@ export function parsePlayPresetFiles(files, limits = {}) {
             "settingImprovement",
             "playPrompts",
             "authorPrompts",
+            "mergeConsecutiveMessages",
             "mounts",
             "playerViewPanels",
             "extensions",
@@ -884,7 +894,9 @@ export function parsePlayPresetFiles(files, limits = {}) {
             preset.format !== "narraeon.play-preset/v2")
             invalid("preset_format_invalid", "preset.yaml format must be narraeon.play-preset/v1", "preset.yaml");
         if (preset.format === "narraeon.play-preset/v1" &&
-            (preset.playPrompts !== undefined || preset.authorPrompts !== undefined))
+            (preset.playPrompts !== undefined ||
+                preset.authorPrompts !== undefined ||
+                preset.mergeConsecutiveMessages !== undefined))
             invalid("preset_format_invalid", "Ordered prompts require v2", "preset.yaml");
         const name = stringValue(preset.name);
         if (!namePattern.test(name.trim()) || name.includes(String.fromCharCode(0)))
@@ -918,6 +930,11 @@ export function parsePlayPresetFiles(files, limits = {}) {
             definition: {
                 ...(followupItems === undefined ? {} : { followupItems }),
                 format: preset.format,
+                ...(preset.mergeConsecutiveMessages === undefined
+                    ? {}
+                    : {
+                        mergeConsecutiveMessages: parseMessageMerging(preset.mergeConsecutiveMessages),
+                    }),
                 ...(preset.format === "narraeon.play-preset/v2"
                     ? { playPrompts: parseOrderedPlayPrompts(preset.playPrompts) }
                     : {}),
@@ -1872,3 +1889,8 @@ export function legacyAuthorPrompts(definition) {
         };
     return entries;
 }
+function parseMessageMerging(value) {
+    if (typeof value !== "boolean")
+        throw new FileNativePlayPresetError("message_merging_invalid", "mergeConsecutiveMessages must be a boolean");
+    return value;
+}

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

@@ -1,6 +1,6 @@
 import { createHash } from "node:crypto";
 import { parseDocument } from "yaml";
-import { builtinPlayPrompts, } from "../../shared/ordered-play-prompts.js";
+import { builtinPlayPrompts, isPromptMessageRole, } from "../../shared/ordered-play-prompts.js";
 /** The same strict permission gate is used by portable imports and structured saves. */
 export function parseOrderedPlayPrompts(value, catalog = builtinPlayPrompts("en"), worldRequired = true) {
     const fail = () => {
@@ -20,11 +20,16 @@ export function parseOrderedPlayPrompts(value, catalog = builtinPlayPrompts("en"
             ids.has(item.id))
             return fail();
         ids.add(item.id);
-        const exact = (keys) => Object.keys(item).length === keys.length &&
+        if (item.messageRole !== undefined &&
+            !isPromptMessageRole(item.messageRole))
+            return fail();
+        const messageRole = item.messageRole === undefined ? {} : { messageRole: item.messageRole };
+        const exact = (keys) => Object.keys(item).length ===
+            keys.length + (item.messageRole === undefined ? 0 : 1) &&
             keys.every((key) => Object.hasOwn(item, key));
         if (item.kind === "world" && exact(["id", "kind"])) {
             worlds++;
-            return { id: item.id, kind: "world" };
+            return { id: item.id, kind: "world", ...messageRole };
         }
         if (item.kind === "user" &&
             exact(["id", "kind", "name", "enabled", "body"]) &&
@@ -39,6 +44,7 @@ export function parseOrderedPlayPrompts(value, catalog = builtinPlayPrompts("en"
                 name: item.name,
                 enabled: item.enabled,
                 body: item.body,
+                ...messageRole,
             };
         const builtin = catalog.find((entry) => entry.id === item.builtin);
         if (item.kind !== "builtin" ||
@@ -46,7 +52,9 @@ export function parseOrderedPlayPrompts(value, catalog = builtinPlayPrompts("en"
             !builtin ||
             builtins.has(builtin.id) ||
             typeof item.enabled !== "boolean" ||
-            (builtin.required && !item.enabled))
+            (builtin.required &&
+                (!item.enabled ||
+                    (item.messageRole !== undefined && item.messageRole !== "system"))))
             return fail();
         builtins.add(builtin.id);
         return {
@@ -54,6 +62,7 @@ export function parseOrderedPlayPrompts(value, catalog = builtinPlayPrompts("en"
             kind: "builtin",
             builtin: builtin.id,
             enabled: item.enabled,
+            ...messageRole,
         };
     });
     if (worlds !== (worldRequired ? 1 : 0) ||