narraeon 0.7.5 → 0.7.6

package/dist/node/runtime/setting/SettingAuthoringTransaction.js

@@ -2,10 +2,12 @@ import { isPackageFollowupControlPath } from "../content/PackageFollowups.js";
 import { renderWorldMaintenanceReport } from "../prompt/WorldMaintenanceReport.js";
 import { listWorldDocuments as listQueryableWorldDocuments } from "../prompt/WorldMaintenanceReport.js";
 import { defaultAppLocale } from "../../protocol/appPreferences.js";
-import { gameplayLabel, gameplayPath, readGameplay, } from "../../protocol/gameplay.js";
+import { fictionGameplay, gameplayLabel, gameplayPath, readGameplay, } from "../../protocol/gameplay.js";
 import { isScalar, isSeq, parseDocument, stringify } from "yaml";
 import { tabletopSchemeReceipt } from "../play/TabletopRules.js";
 import { inspectContentPackageCurrentTree } from "../content/FileNativeContentTree.js";
+import { coerceToolArguments, renderCoercionNote, } from "../model/ToolArgumentCoercion.js";
+import { renderToolAliasNote, resolveToolName, } from "../prompt/ToolNameAlias.js";
 import { worldMaterialCoverage } from "../prompt/WorldMaterialCoverage.js";
 import { WorldDocumentStore, } from "../world/WorldDocumentStore.js";
 export const settingImprovementToolNames = [
@@ -434,11 +436,20 @@ export class SettingAuthoringTransaction {
         };
     }
     execute(calls) {
-        const normalized = calls.map((call) => normalizeCall(call, this.#surface));
+        const normalized = calls.map((call) => normalizeCall(call, this.#surface, this.#locale));
         const results = [];
         const responseBase = this.files();
         let lastSuccessfulWrite = -1;
         for (const call of normalized) {
+            if (call.rejection !== undefined) {
+                results.push({
+                    toolCallId: call.id,
+                    markdown: `# Runtime tool rejected\n\n${call.rejection}`,
+                    isError: true,
+                    changes: [],
+                });
+                continue;
+            }
             const before = this.files();
             const unavailable = unavailableArgument(this.#surface, call.arguments, this.#locale);
             if (unavailable !== null) {
@@ -466,6 +477,20 @@ export class SettingAuthoringTransaction {
             // model only needs what this tool response changed.
             settled.markdown = `${settled.markdown}\n\n${renderAutomaticReview(this.#review, fileDiff(responseBase, this.#snapshot.files), this.#snapshot, this.#surface, this.#locale)}`;
         }
+        normalized.forEach((call, index) => {
+            const notes = [
+                ...(call.coerced.length === 0
+                    ? []
+                    : [renderCoercionNote(call.coerced, this.#locale)]),
+                ...(call.alias === undefined
+                    ? []
+                    : [renderToolAliasNote(call.alias, call.name, this.#locale)]),
+            ];
+            if (notes.length === 0)
+                return;
+            const result = results[index];
+            result.markdown = `${result.markdown}\n\n${notes.join("\n\n")}`;
+        });
         return results;
     }
     #executeRead(call) {
@@ -758,14 +783,41 @@ class SettingAuthoringError extends Error {
         this.name = "SettingAuthoringError";
     }
 }
-function normalizeCall(call, surface) {
+function normalizeCall(call, surface, locale) {
+    const cloned = isRecord(call.arguments)
+        ? structuredClone(call.arguments)
+        : {};
+    const definitions = authoringToolDefinitions(surface, locale, fictionGameplay);
+    const provided = definitions.map(({ name }) => name);
+    const resolved = resolveToolName(call.name, provided);
+    if (resolved.kind === "rejected")
+        return {
+            id: call.id,
+            name: call.name,
+            operation: null,
+            arguments: cloned,
+            coerced: [],
+            rejection: unknownToolMessage(call.name, provided, locale),
+        };
+    const name = resolved.name;
+    const schema = definitions.find((definition) => definition.name === name)?.inputSchema;
+    const repaired = schema === undefined
+        ? { arguments: cloned, coerced: [] }
+        : coerceToolArguments(schema, cloned);
     return {
         id: call.id,
-        name: call.name,
-        operation: authoringOperation(surface, call.name),
-        arguments: isRecord(call.arguments) ? structuredClone(call.arguments) : {},
+        name,
+        operation: authoringOperation(surface, name),
+        arguments: repaired.arguments,
+        coerced: repaired.coerced,
+        ...(resolved.kind === "alias" ? { alias: resolved.declared } : {}),
     };
 }
+function unknownToolMessage(name, provided, locale) {
+    return locale === "zh-CN"
+        ? `${name} 不是本界面提供的工具。可用工具：${provided.join(", ")}。`
+        : `${name} is not a tool on this surface. Available tools: ${provided.join(", ")}.`;
+}
 function isReadOperation(operation) {
     return operation === "list" || operation === "search" || operation === "read";
 }
@@ -1474,6 +1526,8 @@ function requiredSettingRef(value, locale) {
     return value;
 }
 function requiredAliases(value) {
+    if (typeof value === "string")
+        throw new SettingAuthoringError("aliases must be a JSON array of at most 16 strings, not a string");
     if (!Array.isArray(value) ||
         value.length > 16 ||
         !value.every((item) => typeof item === "string" &&
@@ -1508,6 +1562,8 @@ function assertNoLiteralUnicodeEscapes(value, locale) {
     walk(value);
 }
 function requiredYamlLocatorPath(value, name) {
+    if (typeof value === "string")
+        throw new SettingAuthoringError(`${name} must be a JSON array of map keys or zero-based array indexes, not a string`);
     if (!Array.isArray(value) ||
         value.length === 0 ||
         !value.every((item) => (typeof item === "string" && item.length > 0) ||

package/dist/node/shared/ordered-play-prompts.js

@@ -16,6 +16,11 @@ export function isPromptGroup(value) {
 /** Soft limits for the turn guide; exceeding them warns without rejecting. */
 export const turnGuideLineSoftLimit = 120;
 export const turnGuideLinesSoftLimit = 10;
+/** One turn-guide line: no line breaks, bounded length; empty clears a builtin default. */
+const turnGuideLinePattern = /^[^\r\n\0]{0,1000}$/u;
+export function isTurnGuideLine(value) {
+    return turnGuideLinePattern.test(value);
+}
 /**
  * Unscoped prompts always apply. A scoped prompt applies only when the compiled
  * world or package is tabletop, so fiction requests never see it.

package/dist/node/shared/turn-guide.js

@@ -1,12 +1,37 @@
 import { turnGuideLineSoftLimit, turnGuideLinesSoftLimit, } from "./ordered-play-prompts.js";
+/** The source of the player's one-turn request line. */
+export const turnNoteSource = "player:turn";
 /**
  * The fixed Runtime header. It is mechanical: it tells the model what the
  * suffix is and that the prose, not a reply to the suffix, is wanted.
  */
 export function turnGuideHeader(locale) {
     return locale === "zh-CN"
-        ? "[Runtime 本轮提示]\n以下是本轮写正文时最容易丢的要求，不要回应本提示，直接写正文。"
-        : "[Runtime turn guide]\nThese are the requirements most easily lost while writing this turn's prose. Do not reply to this notice; write the prose.";
+        ? "[Runtime 本轮提示]\n以下是对这一轮正文的提示，来自预设、世界设定和玩家的临时要求。不要回应本提示，直接写正文。"
+        : "[Runtime turn guide]\nThese are notes for this turn's prose, from the preset, the world, and the player's requests for this turn. Do not reply to this notice; write the prose.";
+}
+/**
+ * The player's one-turn request as a turn-guide line. The prefix only names
+ * the source; it adds no constraint of its own.
+ */
+export function turnNoteLine(locale, turnNote) {
+    return {
+        source: turnNoteSource,
+        text: locale === "zh-CN"
+            ? `玩家本轮要求：${turnNote}`
+            : `Player's request for this turn: ${turnNote}`,
+    };
+}
+/**
+ * Appends the player's request line to a compiled turn guide, creating the
+ * suffix when no preset or world line exists. Without a request the guide is
+ * returned unchanged.
+ */
+export function turnGuideWithTurnNote(locale, guide, turnNote) {
+    if (turnNote === undefined)
+        return guide;
+    const lines = [...(guide?.lines ?? []), turnNoteLine(locale, turnNote)];
+    return { text: turnGuideText(locale, lines), lines };
 }
 /** The complete suffix text: header, then one line per enabled entry in list order. */
 export function turnGuideText(locale, lines) {