narraeon 0.7.4 → 0.7.6

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

@@ -5,6 +5,8 @@ import { stateDirectoryHandle, parseStateDirectoryHandle, } from "../world/State
 import { renderDocumentWritePosition } from "../prompt/WorldMaintenanceReport.js";
 import { stringify } from "yaml";
 import { renderPlayerViewBindings } from "../world/PlayerViewBindings.js";
+import { coerceToolArguments, renderCoercionNote, } from "../model/ToolArgumentCoercion.js";
+import { runtimeToolInputSchema } from "../prompt/FileNativeToolRegistry.js";
 import { PromptCompilationError, } from "../prompt/FileNativePromptCompiler.js";
 import {} from "../world/WorldDocumentStore.js";
 import { acceptWorldStateRevision, beginWorldStateRevision, fileNativeStateChanges, worldDocumentRevisionFailureMessage, } from "../world/WorldStateRevision.js";
@@ -76,6 +78,19 @@ export class FileNativePlayDocuments {
         return authorizeResolvedRead(this.#reads, this.#candidate.snapshot, shortRef, locator);
     }
     execute(call, history, options = {}) {
+        const schema = runtimeToolInputSchema(call.name);
+        if (schema === null)
+            return this.#dispatch(call, history, options);
+        const repaired = coerceToolArguments(schema, call.arguments);
+        const result = this.#dispatch({ ...call, arguments: repaired.arguments }, history, options);
+        if (repaired.coerced.length === 0 || result.markdown === undefined)
+            return result;
+        return {
+            ...result,
+            markdown: `${result.markdown}\n\n${renderCoercionNote(repaired.coerced, options.locale ?? "en")}`,
+        };
+    }
+    #dispatch(call, history, options) {
         let historyQuery;
         const query = () => (historyQuery ??= new HistoryQuery(options.historyScope ?? "local-document-context", historyInputs(history)));
         const render = (result) => renderHistoryResult(result, options.locale ?? "en");
@@ -232,6 +247,8 @@ function documentDescriptorByRef(snapshot, ref) {
     return result.kind === "read_document" && result.ok ? result.document : null;
 }
 function applyPlayCandidatePatch(candidate, reads, args) {
+    if (record(args) && typeof args.edits === "string")
+        return toolFailure("world_patch.edits must be a JSON array of 1 to 32 edits, not a string.");
     if (!record(args) ||
         typeof args.target !== "string" ||
         !Array.isArray(args.edits) ||
@@ -419,6 +436,8 @@ function applyPlayCandidateCreate(candidate, authorizations, args, declaredDirec
         const parentDirectory = record(args) && typeof args.parent === "string"
             ? parseStateDirectoryHandle(args.parent)
             : null;
+        if (record(args) && typeof args.aliases === "string")
+            throw new PlayDocumentToolFailure("world_create.aliases must be a JSON array of strings, not a string");
         if (!record(args) ||
             typeof args.parent !== "string" ||
             parentDirectory === null ||

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

@@ -6,7 +6,7 @@ import { effectiveFollowupDefinitions } from "../play/OrderedFollowups.js";
 import { legacyAuthorPrompts } from "../play/FileNativePlayPresetStore.js";
 import { builtinAuthorPrompts, authoringMechanics, } from "../../shared/ordered-author-prompts.js";
 import { builtinPlayPrompts, orderedPromptScope, orderedPromptTurnGuide, promptScopeApplies, } from "../../shared/ordered-play-prompts.js";
-import { turnGuideHeader, turnGuideText, } from "../../shared/turn-guide.js";
+import { turnGuideHeader, turnGuideText, turnGuideWithTurnNote, } from "../../shared/turn-guide.js";
 import { parseOrderedPlayPrompts } from "../play/OrderedPlayPrompts.js";
 import { renderDocumentWritePosition } from "./WorldMaintenanceReport.js";
 import { parseDocument } from "yaml";
@@ -568,12 +568,12 @@ export class FileNativePromptCompiler {
             append("player_input", [
                 { source: "player:input", markdown: effective.playerInput },
             ]);
-        const turnGuide = turnGuideLines.length === 0
+        const turnGuide = turnGuideWithTurnNote(this.#locale, turnGuideLines.length === 0
             ? undefined
             : {
                 text: turnGuideText(this.#locale, turnGuideLines),
                 lines: turnGuideLines,
-            };
+            }, effective.turnNote);
         scanRuntimeLeakage([
             ...logicalMessages,
             ...(turnGuide === undefined

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

@@ -11,6 +11,11 @@ import { resolutionCheckToolForScheme, resolutionToolDefinition, resolutionToolN
  * Tools that every current play and authoring surface may expose. Resolution
  * tools are registered below but never enter a surface until a per-world
  * selection (Phase 2) includes them.
+ *
+ * No declared name may end in `_<another declared name>`: a provider-mangled
+ * `mcp__<server>__<word>_<name>` is restored by that suffix (see
+ * ToolNameAlias.ts), so such a pair would make the restoration ambiguous.
+ * tests/runtime/tool-name-alias.test.ts enforces this across all surfaces.
  */
 export const baseRuntimeToolNames = [
     "state_list",
@@ -70,6 +75,16 @@ export function runtimeToolsForNames(names, locale = defaultAppLocale) {
         inputSchema: toolDefinitions[name].inputSchema,
     }));
 }
+/**
+ * The original Runtime input schema of a registered tool. Argument repair reads
+ * this, not the portable wire projection, so every array or object position is
+ * exactly what Runtime validates.
+ */
+export function runtimeToolInputSchema(name, locale = defaultAppLocale) {
+    if (!isRegisteredRuntimeToolName(name))
+        return null;
+    return createToolDefinitions(locale)[name].inputSchema;
+}
 /**
  * Return a Provider-portable root-object schema for a Runtime-owned tool.
  *

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

@@ -0,0 +1,14 @@
+export function resolveToolName(called, provided) {
+    if (provided.includes(called))
+        return { kind: "exact", name: called };
+    const candidates = provided.filter((name) => called.length > name.length && called.endsWith(`_${name}`));
+    if (candidates.length === 1)
+        return { kind: "alias", name: candidates[0], declared: called };
+    return { kind: "rejected", candidates };
+}
+/** The Runtime note appended to a result whose call was restored by alias. */
+export function renderToolAliasNote(declared, name, locale) {
+    return locale === "zh-CN"
+        ? `Runtime 说明："${declared}" 不是本次提供的工具，已按 "${name}" 执行。请使用声明的工具名。`
+        : `Runtime note: "${declared}" is not a declared tool; it was executed as "${name}". Call tools by their declared names.`;
+}