narraeon 0.2.0 → 0.3.0

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

@@ -1,3 +1,4 @@
+import { ModelHostCancelledError } from "../model/ModelHost.js";
 import { errorDescription, } from "../model/AiFailureLog.js";
 /**
  * Run every follow-up declared by the frozen play preset exactly once after the
@@ -24,11 +25,15 @@ export async function runPlayFollowupRequests(input) {
     const completed = [];
     let failure;
     for (const followup of input.followups) {
-        if (input.signal?.aborted === true) {
+        if (signalWasAborted(input.signal)) {
             failure ??= "The follow-up request was cancelled.";
             break;
         }
         const outcome = await runOne(input, followup, prefix);
+        if (signalWasAborted(input.signal)) {
+            failure ??= "The follow-up request was cancelled.";
+            break;
+        }
         outcomes.push(outcome);
         input.observer?.onOutcome?.(outcome);
         if (outcome.failure === undefined)
@@ -58,27 +63,39 @@ async function runOne(input, followup, prefix) {
     let responseDiagnostics;
     try {
         await input.artifacts.beginRequestAttempt(requestContext);
-        const response = await input.modelHost.exchange({
-            bootstrap: structuredClone(input.bootstrap),
-            tools: structuredClone(followup.tools),
-            toolUniverse: structuredClone(followup.tools),
-            allowedTools: [...followup.allowedTools],
-            toolStrategy: input.toolStrategy,
-            // The prompt replaces the previous followup's prompt instead of being
-            // appended after it: every request sees exactly the main-chain prefix.
-            appended: [
-                ...structuredClone(prefix),
-                {
-                    kind: "prompt_delta",
-                    logicalMessages: structuredClone(followup.logicalMessages),
-                },
-            ],
-            requestId: followup.id,
-            operationId: input.context.operationId,
-            requestAttempt: 1,
-            exchange: 1,
-            maxOutputTokens: input.maxOutputTokens,
-        });
+        input.observer?.onProviderDispatch?.();
+        let response;
+        try {
+            response = await input.modelHost.exchange({
+                bootstrap: structuredClone(input.bootstrap),
+                tools: structuredClone(followup.tools),
+                toolUniverse: structuredClone(followup.tools),
+                allowedTools: [...followup.allowedTools],
+                toolStrategy: input.toolStrategy,
+                // The prompt replaces the previous followup's prompt instead of being
+                // appended after it: every request sees exactly the main-chain prefix.
+                appended: [
+                    ...structuredClone(prefix),
+                    {
+                        kind: "prompt_delta",
+                        logicalMessages: structuredClone(followup.logicalMessages),
+                    },
+                ],
+                requestId: followup.id,
+                operationId: input.context.operationId,
+                requestAttempt: 1,
+                exchange: 1,
+                maxOutputTokens: input.maxOutputTokens,
+            }, {
+                ...(input.signal === undefined ? {} : { signal: input.signal }),
+                onDelta: (delta) => input.observer?.onProviderDelta?.(delta),
+            });
+            if (input.signal?.aborted === true)
+                throw new ModelHostCancelledError("The player cancelled the follow-up model request; its response was not committed.");
+        }
+        finally {
+            input.observer?.onProviderSettled?.();
+        }
         responseDiagnostics = response.diagnostics;
         if (response.diagnostics !== undefined)
             await input.failureLog?.recordExchangeIfActive(response.diagnostics);
@@ -153,6 +170,9 @@ async function runOne(input, followup, prefix) {
     }
     return outcome;
 }
+function signalWasAborted(signal) {
+    return signal?.aborted === true;
+}
 async function executeArtifactCall(input, context, call) {
     if (call.name !== "artifact_emit" && call.name !== "artifact_clear")
         return {

package/dist/node/runtime/prompt/FileNativePromptCompiler.js

@@ -333,7 +333,7 @@ function withoutAppendedContextGenesis(input) {
     if (input.playerInputPlacement !== "append")
         return input;
     const additionalMaterials = input.world.additionalMaterials.filter((material) => material.kind !== "history_message" ||
-        !material.message.endsWith(".message.genesis.narrator"));
+        !material.message.endsWith("message.genesis.narrator"));
     if (additionalMaterials.length === input.world.additionalMaterials.length)
         return input;
     return {
@@ -886,7 +886,7 @@ function resolveRecentHistory(slot, history, selected, coverage, locale) {
     // in commit order. Its keys are semantic message IDs, not sortable file
     // names: lexical sorting would put `message.genesis` after every numbered
     // message and `message.9` after `message.15`.
-    const ordered = Object.entries(history).filter(([ref]) => !ref.endsWith(".message.genesis.narrator"));
+    const ordered = Object.entries(history).filter(([ref]) => !ref.endsWith("message.genesis.narrator"));
     const chosen = ordered.slice(-recent);
     if (chosen.length === 0) {
         selected.push({
@@ -975,11 +975,11 @@ function renderHistoryMessage(ref, text, locale) {
     return `## ${historyMessageLabel(ref, locale)}\n\n${text.trim()}`;
 }
 function historyMessageLabel(ref, locale) {
-    if (ref.endsWith(".message.genesis.narrator"))
+    if (ref.endsWith("message.genesis.narrator"))
         return locale === "zh-CN" ? "开场白" : "Opening";
-    if (/(?:\.message\.[^.]+(?:\.[0-9]+)?\.|-)(player)(?:-|$)/u.test(ref))
+    if (/(?:^|\.)message\.[^.]+(?:\.[0-9]+)?\.player$|(?:^|-)player(?:-|$)/u.test(ref))
         return locale === "zh-CN" ? "玩家原文" : "Player input";
-    if (/(?:\.message\.[^.]+(?:\.[0-9]+)?\.|-)(narrator)(?:-|$)/u.test(ref))
+    if (/(?:^|\.)message\.[^.]+(?:\.[0-9]+)?\.narrator$|(?:^|-)narrator(?:-|$)/u.test(ref))
         return locale === "zh-CN" ? "主持叙事" : "Host narrative";
     return locale === "zh-CN" ? "已提交消息" : "Committed message";
 }