narraeon 0.6.0 → 0.6.2

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

@@ -1,8 +1,8 @@
+import { createHash } from "node:crypto";
 import { HistoryQuery, historyInputs } from "../history/HistoryQuery.js";
 import { renderHistoryResult } from "../history/HistoryRendering.js";
 import { stateDirectoryHandle, parseStateDirectoryHandle, } from "../world/StateDirectoryHandles.js";
 import { renderDocumentWritePosition } from "../prompt/WorldMaintenanceReport.js";
-import { createHash } from "node:crypto";
 import { stringify } from "yaml";
 import { renderPlayerViewBindings } from "../world/PlayerViewBindings.js";
 import { PromptCompilationError, } from "../prompt/FileNativePromptCompiler.js";
@@ -56,66 +56,16 @@ export class FileNativePlayDocuments {
     get committedSnapshot() {
         return this.#committedSnapshot;
     }
-    bindBootstrap(bootstrap, previousAuthorization) {
-        const injected = bootstrapAuthorizations(bootstrap, this.#candidate.snapshot);
-        this.#reads = injected;
-        // Refreshing a prefix retains the native conversation. Its exact reads
-        // remain valid only on the identical state tree, including our own writes.
-        if (previousAuthorization?.stateFingerprint ===
-            fingerprintStateFiles(this.#candidate.files)) {
-            this.restoreAuthorizationCheckpoint(previousAuthorization);
-            for (const [ref, locators] of injected.documents) {
-                for (const locator of locators ?? [null])
-                    authorizeRead(this.#reads, this.#candidate.snapshot.id, ref, locator);
-            }
-        }
+    /**
+     * Read authorizations live only in memory (ADR-0044). A fresh binding starts
+     * from the bootstrap's own reads; writes are guarded at commit time by the
+     * previous-content hash of each changed file.
+     */
+    bindBootstrap(bootstrap) {
+        this.#reads = bootstrapAuthorizations(bootstrap, this.#candidate.snapshot);
         // Creation capabilities come from this prefix, not past directory slots.
         this.#declaredDirectories = declaredStateDirectories(bootstrap);
     }
-    authorizationCheckpoint() {
-        return {
-            schemaVersion: 1,
-            kind: "play_document_authorizations",
-            stateFingerprint: fingerprintStateFiles(this.#candidate.files),
-            documents: [...this.#reads.documents.entries()]
-                .sort(([left], [right]) => left.localeCompare(right))
-                .map(([shortRef, locators]) => ({
-                shortRef,
-                locators: locators === null
-                    ? null
-                    : locators
-                        .filter((locator, index, all) => all.findIndex((candidate) => sameLocator(candidate, locator)) === index)
-                        .map((locator) => structuredClone(locator)),
-            })),
-        };
-    }
-    restoreAuthorizationCheckpoint(checkpoint) {
-        if (!isPlayDocumentAuthorizationCheckpoint(checkpoint))
-            throw new TypeError("The play-document authorization checkpoint has an invalid format");
-        if (checkpoint.stateFingerprint !==
-            fingerprintStateFiles(this.#candidate.files))
-            throw new TypeError("The play-document authorization checkpoint does not match the current state");
-        const documents = new Map();
-        for (const { shortRef, locators } of checkpoint.documents) {
-            if (documentDescriptorByRef(this.#candidate.snapshot, shortRef) === null)
-                throw new TypeError(`The play-document authorization checkpoint refers to missing @${shortRef}`);
-            const restoredLocators = locators?.map((locator) => {
-                const selected = this.#candidate.snapshot.query({
-                    kind: "select_node",
-                    document: { shortRef },
-                    locator,
-                });
-                if (selected.kind !== "select_node" || !selected.ok)
-                    throw new TypeError(`The play-document authorization checkpoint refers to a missing node in @${shortRef}`);
-                return structuredClone(selected.node.locator);
-            });
-            documents.set(shortRef, restoredLocators ?? null);
-        }
-        this.#reads = {
-            snapshotId: this.#candidate.snapshot.id,
-            documents,
-        };
-    }
     execute(call, history, options = {}) {
         let historyQuery;
         const query = () => (historyQuery ??= new HistoryQuery(options.historyScope ?? "local-document-context", historyInputs(history)));
@@ -254,15 +204,6 @@ function authorizeToolRead(authorizations, snapshot, result) {
         return;
     authorizeRead(authorizations, snapshot.id, authorization.shortRef, authorization.locator);
 }
-function sameLocator(left, right) {
-    if (left === null || right === null)
-        return left === right;
-    const leftPath = "yaml" in left ? left.yaml : left.markdown;
-    const rightPath = "yaml" in right ? right.yaml : right.markdown;
-    return ("yaml" in left === "yaml" in right &&
-        leftPath.length === rightPath.length &&
-        leftPath.every((segment, index) => segment === rightPath[index]));
-}
 function parseYamlHandleSegment(segment) {
     return /^(?:0|[1-9][0-9]*)$/u.test(segment) ? Number(segment) : segment;
 }
@@ -914,64 +855,6 @@ export function fingerprintControl(files) {
         hash.update(path).update("\0").update(contents).update("\0");
     return `sha256:${hash.digest("hex")}`;
 }
-export function isPlayDocumentAuthorizationCheckpoint(value) {
-    if (!record(value) ||
-        !hasExactKeys(value, [
-            "schemaVersion",
-            "kind",
-            "stateFingerprint",
-            "documents",
-        ]) ||
-        value.schemaVersion !== 1 ||
-        value.kind !== "play_document_authorizations" ||
-        typeof value.stateFingerprint !== "string" ||
-        !/^sha256:[0-9a-f]{64}$/u.test(value.stateFingerprint) ||
-        !Array.isArray(value.documents) ||
-        value.documents.length > 100_000)
-        return false;
-    const refs = new Set();
-    for (const document of value.documents) {
-        if (!record(document) ||
-            !hasExactKeys(document, ["shortRef", "locators"]) ||
-            typeof document.shortRef !== "string" ||
-            !/^[a-z][a-z0-9-]*$/u.test(document.shortRef) ||
-            refs.has(document.shortRef) ||
-            (document.locators !== null &&
-                (!Array.isArray(document.locators) ||
-                    document.locators.length > 100_000 ||
-                    !document.locators.every(isPersistedAuthorizedLocator))))
-            return false;
-        refs.add(document.shortRef);
-    }
-    return true;
-}
-function fingerprintStateFiles(files) {
-    const hash = createHash("sha256");
-    for (const [path, contents] of Object.entries(files)
-        .filter(([path]) => path.startsWith("state/"))
-        .sort(([left], [right]) => left.localeCompare(right)))
-        hash.update(path).update("\0").update(contents).update("\0");
-    return `sha256:${hash.digest("hex")}`;
-}
-function isPersistedAuthorizedLocator(value) {
-    if (!record(value))
-        return false;
-    if (hasExactKeys(value, ["yaml"]))
-        return (Array.isArray(value.yaml) &&
-            value.yaml.length <= 64 &&
-            value.yaml.every((segment) => typeof segment === "string" ||
-                (Number.isSafeInteger(segment) && Number(segment) >= 0)));
-    if (hasExactKeys(value, ["markdown"]))
-        return (Array.isArray(value.markdown) &&
-            value.markdown.length <= 64 &&
-            value.markdown.every((segment) => typeof segment === "string"));
-    return false;
-}
-function hasExactKeys(value, expected) {
-    const keys = Object.keys(value);
-    return (keys.length === expected.length &&
-        expected.every((key) => Object.hasOwn(value, key)));
-}
 function record(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }

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

@@ -59,8 +59,8 @@ export async function runPlayFollowupRequests(input) {
             failure ??= outcome.failure;
     }
     const extension = failure === undefined
-        ? await input.artifacts.completeExtension(input.context.operationId, completed)
-        : await input.artifacts.failExtension(input.context.operationId, "recovery_required", failure, completed);
+        ? await input.artifacts.completeExtension(input.context.worldId, input.context.operationId, completed)
+        : await input.artifacts.failExtension(input.context.worldId, input.context.operationId, "recovery_required", failure, completed);
     return { outcomes, extension };
 }
 async function runOne(input, followup, prefix, requestSignal) {

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

@@ -1,18 +1,18 @@
 import { captureNarrativeOrigin } from "../history/HistoryBackground.js";
-import { FileNativePlayDocuments, } from "./PlayDocumentTools.js";
+import { FileNativePlayDocuments } from "./PlayDocumentTools.js";
 import { currentPlayPrompt, playPromptRunsThroughEvents, } from "./PlayPromptRun.js";
 import { isPlayerRoundMarker, playerInputAppend } from "./PlayContinuity.js";
 import { PlayCallChainError } from "./PlayCallChainError.js";
 /**
- * Prepare the selected player's prefix at the existing pre-commit seam.
- * Endpoint reads, revision submission and publication belong to the operation.
+ * Split a context at a selected player message for an edit: the prefix before
+ * it is kept, and the replacement is appended once the world has rewound and
+ * committed it (PlayCallChain.revisePlayer).
  */
 export function preparePlayerRevisionTrace(source, eventIndex) {
     const prefix = structuredClone(source.events.slice(0, eventIndex));
     const transcript = transcriptThroughEvents(source.transcript, prefix);
     const player = source.events[eventIndex];
     return {
-        // This append precedes the operation's materialization check, as before.
         withReplacement(replacement) {
             const events = [
                 ...prefix,
@@ -46,7 +46,7 @@ export function preparePlayerRevisionTrace(source, eventIndex) {
         pagePrefixAtEndpoint(endpoint) {
             if (prefix.length === 0)
                 return null;
-            // Preserve the fresh path's post-commit prefix reconstruction seam.
+            // A fresh context keeps the page before the edit as a detached prefix.
             const prefixTranscript = transcriptThroughEvents(source.transcript, prefix);
             return assembleRetainedTrace(source, endpoint, {
                 events: prefix,
@@ -119,7 +119,6 @@ function assembleRetainedTrace(source, endpoint, selection) {
         completedTools: source.completedTools
             .filter(({ key }) => completedKeys === null || completedKeys.has(key))
             .map((item) => structuredClone(item)),
-        documentAuthorizationCheckpoints: authorizationCheckpointsThroughEvents(source, selection.events, documents.authorizationCheckpoint()),
         changedDocuments: changedDocumentsAtHead(source.changedDocuments, endpoint.baseline.state, endpoint.selected.state),
         nextMaterials: structuredClone(selection.materials),
         nextEventId: Math.max(0, ...selection.events.map(({ id }) => id)) + 1,
@@ -132,29 +131,16 @@ function assembleRetainedTrace(source, endpoint, selection) {
 export function restorePlayDocuments(files, context, events) {
     const documents = new FileNativePlayDocuments(files);
     try {
-        const checkpoint = documentAuthorizationThroughEvents(context, events);
+        // Read authorizations are memory-only: a restored prefix always starts from
+        // its bootstrap, and stale write authority is caught by the commit's hash.
         const runs = playPromptRunsThroughEvents(context, events);
-        if (checkpoint === undefined || runs.length > 0)
-            documents.bindBootstrap(currentPlayPrompt({ ...context, promptRuns: runs }).bootstrap);
-        if (checkpoint !== undefined)
-            documents.restoreAuthorizationCheckpoint(checkpoint.authorization);
+        documents.bindBootstrap(currentPlayPrompt({ ...context, promptRuns: runs }).bootstrap);
     }
     catch (error) {
         throw new PlayCallChainError(`Call-chain document authorization could not be restored: ${error instanceof Error ? error.message : "invalid checkpoint"}。`);
     }
     return documents;
 }
-function documentAuthorizationThroughEvents(context, events) {
-    const checkpoints = context.documentAuthorizationCheckpoints;
-    if (checkpoints === undefined || checkpoints.length === 0)
-        return undefined;
-    const selectedEventIds = new Set(events.map(({ id }) => id));
-    const selected = checkpoints.findLast(({ afterEventId }) => afterEventId === 0 || selectedEventIds.has(afterEventId));
-    // Legacy V1 records had no durable dynamic authorization. If the selected
-    // prefix predates their first lazily-written checkpoint, retain the exact
-    // old recovery behavior and rebuild only bootstrap authorization.
-    return selected === undefined ? undefined : structuredClone(selected);
-}
 export function independentContextCopy(source) {
     const context = structuredClone(source);
     context.continuityContextId ??= source.chainId;
@@ -162,20 +148,6 @@ export function independentContextCopy(source) {
     delete context.branchedBeforePlayer;
     return context;
 }
-function authorizationCheckpointsThroughEvents(context, events, fallback) {
-    const eventIds = new Set(events.map(({ id }) => id));
-    const selected = (context.documentAuthorizationCheckpoints ?? [])
-        .filter(({ afterEventId }) => afterEventId === 0 || eventIds.has(afterEventId))
-        .map((checkpoint) => structuredClone(checkpoint));
-    if (selected.length > 0)
-        return selected;
-    return [
-        {
-            afterEventId: Math.max(0, ...events.map(({ id }) => id)),
-            authorization: structuredClone(fallback),
-        },
-    ];
-}
 function transcriptThroughEvents(transcript, events) {
     const result = [];
     let cursor = 0;

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

@@ -236,16 +236,48 @@ export function renderDocumentWritePosition(shortRef, fact, locale) {
         ? `最近写入位置 @${shortRef}：\n正文：${worldWritePositionText(fact.lastBodyWrite, locale)}\n元信息：${worldWritePositionText(fact.lastMetadataWrite, locale)}`
         : `Last committed write @${shortRef}:\nBody: ${worldWritePositionText(fact.lastBodyWrite, locale)}\nMetadata: ${worldWritePositionText(fact.lastMetadataWrite, locale)}`;
 }
-export function renderWorldMaintenanceReport(report, locale) {
+/**
+ * Lists only documents the current tool response changed or that exceed their
+ * advisory limit, so the report stays proportional to the edit rather than to
+ * the package size.
+ */
+export function renderWorldMaintenanceReport(report, changedShortRefs, locale) {
     if (report === undefined)
         return "";
     const zh = locale === "zh-CN";
+    const heading = zh
+        ? "# 文档整理报告（UTF-8 字节；超限仅提示）"
+        : "# Document maintenance (UTF-8 bytes; advisory only)";
+    const documents = report.documents.filter((document) => document.overAdvisory || changedShortRefs.has(document.shortRef));
+    const slots = report.slots.filter((slot) => slot.overAdvisory ||
+        slot.documents.some((shortRef) => changedShortRefs.has(shortRef)));
+    if (documents.length === 0 && slots.length === 0)
+        return `${heading}\n${zh ? "本次没有改动世界文档，也没有文档或材料槽超过建议上限。" : "No world document changed in this response, and no document or slot exceeds its advisory limit."}`;
+    const allColumns = [
+        { label: zh ? "正文" : "body", value: (d) => d.bodyBytes },
+        {
+            label: zh ? "注入贡献" : "injection contribution",
+            value: (d) => d.injectedBytes,
+        },
+        { label: zh ? "建议上限" : "advisory", value: (d) => d.advisoryBytes },
+        { label: zh ? "基准" : "baseline", value: (d) => d.baselineBytes },
+        { label: zh ? "增长" : "growth", value: (d) => d.growthBytes },
+    ];
+    // Columns that are unset for every listed document carry no information.
+    const columns = allColumns.filter(({ value }) => documents.some((document) => value(document) !== null));
+    const overAdvisory = report.documents.some(({ overAdvisory }) => overAdvisory) ||
+        report.slots.some(({ overAdvisory }) => overAdvisory);
     return [
-        zh
-            ? "# 文档整理报告（UTF-8 字节；超限仅提示）"
-            : "# Document maintenance (UTF-8 bytes; advisory only)",
-        `${zh ? "世界材料 / 其中检查点历史 / 作者提示 / Runtime 提示 / 工具定义" : "World materials / checkpoint history subset / author instructions / Runtime instructions / tool definitions"}: ${report.worldMaterialsBytes} / ${report.checkpointHistoryBytes} / ${report.authorInstructionBytes} / ${report.runtimeInstructionBytes} / ${report.toolDefinitionBytes}`,
-        ...report.documents.map((document) => `@${document.shortRef}: ${zh ? "正文 / 注入贡献 / 建议上限 / 基准 / 增长" : "body / injection contribution / advisory / baseline / growth"}: ${document.bodyBytes} / ${document.injectedBytes} / ${document.advisoryBytes ?? "—"} / ${document.baselineBytes ?? "—"} / ${document.growthBytes ?? "—"}${document.overAdvisory ? (zh ? "（超过建议）" : " (over advisory)") : ""}`),
-        ...report.slots.map((slot) => `${zh ? "材料槽" : "Slot"} ${slot.id}: ${slot.bytes} / ${slot.advisoryBytes ?? "—"}${slot.overAdvisory ? (zh ? "（超过建议）" : " (over advisory)") : ""}`),
+        heading,
+        ...(overAdvisory
+            ? [
+                `${zh ? "世界材料 / 其中检查点历史 / 作者提示 / Runtime 提示 / 工具定义" : "World materials / checkpoint history subset / author instructions / Runtime instructions / tool definitions"}: ${report.worldMaterialsBytes} / ${report.checkpointHistoryBytes} / ${report.authorInstructionBytes} / ${report.runtimeInstructionBytes} / ${report.toolDefinitionBytes}`,
+            ]
+            : []),
+        ...(documents.length > 0
+            ? [columns.map(({ label }) => label).join(" / ")]
+            : []),
+        ...documents.map((document) => `@${document.shortRef}: ${columns.map(({ value }) => value(document) ?? "—").join(" / ")}${document.overAdvisory ? (zh ? "（超过建议）" : " (over advisory)") : ""}`),
+        ...slots.map((slot) => `${zh ? "材料槽" : "Slot"} ${slot.id}: ${slot.bytes} / ${slot.advisoryBytes ?? "—"}${slot.overAdvisory ? (zh ? "（超过建议）" : " (over advisory)") : ""}`),
     ].join("\n");
 }

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

@@ -1,7 +1,8 @@
 import { validPromptCompilation, validLogicalMessages, validPromptTools, validPlayFollowup, validProviderKind, validCacheStrategy, validToolStrategy, } from "../prompt/PromptCompilationCodec.js";
 import { validAuthoringRequests, } from "../authoring/AuthoringRequestSnapshot.js";
 import { randomUUID } from "node:crypto";
-import { link, mkdir, open, readFile, readdir, rename, rm, stat, } from "node:fs/promises";
+import { mkdir, open, readFile, readdir, rename, rm, stat, } from "node:fs/promises";
+import { linkExclusive } from "../FileNativeExclusiveLink.js";
 import { dirname, join } from "node:path";
 import { isDeepStrictEqual } from "node:util";
 import { fictionGameplay } from "../../protocol/gameplay.js";
@@ -486,7 +487,10 @@ function validOptionalTitle(value) {
             !/[\r\n]/u.test(value)));
 }
 function validRunStatus(value) {
-    return value === "ready" || value === "running" || value === "interrupted";
+    return (value === "ready" ||
+        value === "running" ||
+        value === "paused" ||
+        value === "interrupted");
 }
 function validCount(value) {
     return Number.isSafeInteger(value) && Number(value) >= 0;
@@ -969,13 +973,11 @@ async function publishJson(path, value) {
         const handle = await open(temporary, "wx", 0o600);
         try {
             await handle.writeFile(`${JSON.stringify(value, null, 2)}\n`, "utf8");
-            await handle.sync();
         }
         finally {
             await handle.close();
         }
         await rename(temporary, path);
-        await syncDirectory(dirname(path));
     }
     finally {
         await rm(temporary, { force: true });
@@ -988,14 +990,12 @@ async function publishImmutableSource(path, contents) {
         const handle = await open(temporary, "wx", 0o600);
         try {
             await handle.writeFile(contents, "utf8");
-            await handle.sync();
         }
         finally {
             await handle.close();
         }
         try {
-            await link(temporary, path);
-            await syncDirectory(dirname(path));
+            await linkExclusive(temporary, path);
         }
         catch (error) {
             if (!isNodeError(error) || error.code !== "EEXIST")
@@ -1008,15 +1008,6 @@ async function publishImmutableSource(path, contents) {
         await rm(temporary, { force: true });
     }
 }
-async function syncDirectory(path) {
-    const handle = await open(path, "r");
-    try {
-        await handle.sync();
-    }
-    finally {
-        await handle.close();
-    }
-}
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }

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

@@ -329,6 +329,7 @@ export class SettingAuthoringTransaction {
     execute(calls) {
         const normalized = calls.map(normalizeCall);
         const results = [];
+        const responseBase = this.files();
         let lastSuccessfulWrite = -1;
         for (const call of normalized) {
             const before = this.files();
@@ -344,7 +345,9 @@ export class SettingAuthoringTransaction {
         if (lastSuccessfulWrite >= 0) {
             this.#review = this.#inspect();
             const settled = results[lastSuccessfulWrite];
-            settled.markdown = `${settled.markdown}\n\n${renderAutomaticReview(this.#review, this.#locale)}`;
+            // The stored review stays cumulative for the whole user request; the
+            // 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.#locale)}`;
         }
         return results;
     }
@@ -450,9 +453,16 @@ export class SettingAuthoringTransaction {
         }
     }
 }
-function renderAutomaticReview(review, locale) {
-    if (review.status === "usable")
-        return `${localized(locale, `# Current-tree review passed\n\nContent-tree validation and the real Prompt Preview both passed. This tool response changes ${review.diff.length} file(s) directly in the content package. Use this review and the coverage below to decide whether the current user request is satisfied or further edits are needed.`, `# 当前树自动检查通过\n\n内容树校验和真实 Prompt Preview 均已通过；本次工具响应直接修改内容包中的 ${review.diff.length} 个文件。请根据本次检查与下方覆盖报告判断当前用户要求是否已经满足，或是否还需修改。`)}\n\n${renderPlayCoverage(review.playCoverage, locale)}\n\n${renderWorldMaintenanceReport(review.preview?.compilation.maintenance, locale)}`;
+function renderAutomaticReview(review, responseDiff, snapshot, locale) {
+    if (review.status === "usable" && review.preview !== null) {
+        const changed = responseDiff.length;
+        const cumulative = review.diff.length;
+        const changedPaths = new Set(responseDiff.map(({ path }) => path));
+        const changedShortRefs = new Set(listQueryableWorldDocuments(snapshot)
+            .filter(({ logicalPath }) => changedPaths.has(logicalPath))
+            .map(({ shortRef }) => shortRef));
+        return `${localized(locale, `# Current-tree review passed\n\nContent-tree validation and the real Prompt Preview both passed. This tool response changed ${changed} file(s) in the content package${cumulative === changed ? "" : `; ${cumulative} file(s) changed so far in this user request`}. Use this review and the coverage below to decide whether the current user request is satisfied or further edits are needed.`, `# 当前树自动检查通过\n\n内容树校验和真实 Prompt Preview 均已通过；本次工具响应修改内容包中的 ${changed} 个文件${cumulative === changed ? "" : `，本次用户请求累计改动 ${cumulative} 个文件`}。请根据本次检查与下方覆盖报告判断当前用户要求是否已经满足，或是否还需修改。`)}\n\n${renderPlayCoverage(buildSettingAuthoringPlayCoverage(snapshot, review.preview, responseDiff), locale)}\n\n${renderWorldMaintenanceReport(review.preview.compilation.maintenance, changedShortRefs, locale)}`;
+    }
     return [
         localized(locale, "# Current-tree review needs repair", "# 当前树自动检查需要修复"),
         "",
@@ -561,8 +571,6 @@ function playAccessDetail(access) {
     return details[access];
 }
 function renderPlayCoverage(coverage, locale) {
-    if (coverage === null)
-        return localized(locale, "# Play-consumption coverage\n\nCoverage is unavailable until the real Prompt Preview succeeds.", "# 游玩读取覆盖\n\n真实 Prompt Preview 通过后才会提供覆盖报告。");
     const labels = locale === "zh-CN"
         ? {
             full_injected: "全文注入",

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

@@ -4,7 +4,7 @@ import { InvalidContentTreeError, } from "../content/ContentWorkspace.js";
 import { contentTreeFingerprint } from "../content/ContentTreeFingerprint.js";
 import { equalModelHostBinding } from "../model/ModelHost.js";
 import { settingImprovementPromptForBinding, } from "../play/FileNativePlayPresetStore.js";
-import { appendAuthoringUserMessage, ModelToolConversation, rememberAuthoringRequest, } from "../authoring/ModelToolConversation.js";
+import { appendAuthoringUserMessage, ModelToolConversation, rememberAuthoringRequest, resumePausedAuthoringConversation, } from "../authoring/ModelToolConversation.js";
 import { summarizeStoredSettingImprovementSession, } from "./FileNativeSettingImprovementStore.js";
 import { SettingAuthoringTransaction, settingImprovementRuntimeContract, settingImprovementToolDefinitions, } from "./SettingAuthoringTransaction.js";
 class RecoveryWriteConflictError extends Error {
@@ -185,33 +185,48 @@ export class SettingImprovementSession {
                 session = await this.#store.read(input.continuation.sessionId);
                 assertPackage(session, input.packageId);
             }
-            session = await this.#recoverIfNeeded(session);
-            if (session.completedRequestIds.includes(requestId))
-                return { session, run: null };
-            const running = this.#conversation.running(session.sessionId);
-            if (running !== null) {
-                if (running.requestId !== requestId)
-                    throw new Error("Another message in this setting-improvement conversation is still running");
-                return { session, run: running.promise };
-            }
-            const host = await this.#bindExistingModelHost(session.modelBinding);
-            if (!equalModelHostBinding(session.modelBinding, host.binding()))
-                throw new Error("No saved model connection matches this setting-improvement conversation");
-            const { playPreset, bootstrap } = await this.#compileCurrent(input.packageId, session.modelBinding);
-            session.schemaVersion = 3;
-            session.requests ??= [];
-            session.requests.push({
-                requestId,
-                modelItemStart: session.modelItems.length,
-                bootstrap,
-                playPreset: structuredClone(playPreset),
+            return this.#startRequest(session, requestId, async (next) => {
+                const { playPreset, bootstrap } = await this.#compileCurrent(input.packageId, next.modelBinding);
+                next.schemaVersion = 3;
+                next.requests ??= [];
+                next.requests.push({
+                    requestId,
+                    modelItemStart: next.modelItems.length,
+                    bootstrap,
+                    playPreset: structuredClone(playPreset),
+                });
+                appendAuthoringUserMessage(next, message, requestId);
             });
-            appendAuthoringUserMessage(session, message, requestId);
-            await this.#store.save(session);
-            return { session, run: this.#startRun(session, host, requestId) };
         });
         return prepared.run ?? this.#view(prepared.session);
     }
+    /** Continues a paused conversation with the frozen request it paused in. */
+    async resume(input) {
+        const requestId = requiredRequestId(input.requestId);
+        const prepared = await this.#mutate(async () => {
+            const session = await this.#store.read(input.sessionId);
+            assertPackage(session, input.packageId);
+            return this.#startRequest(session, requestId, (next) => resumePausedAuthoringConversation(next));
+        });
+        return prepared.run ?? this.#view(prepared.session);
+    }
+    async #startRequest(stored, requestId, prepare) {
+        const session = await this.#recoverIfNeeded(stored);
+        if (session.completedRequestIds.includes(requestId))
+            return { session, run: null };
+        const running = this.#conversation.running(session.sessionId);
+        if (running !== null) {
+            if (running.requestId !== requestId)
+                throw new Error("Another message in this setting-improvement conversation is still running");
+            return { session, run: running.promise };
+        }
+        const host = await this.#bindExistingModelHost(session.modelBinding);
+        if (!equalModelHostBinding(session.modelBinding, host.binding()))
+            throw new Error("No saved model connection matches this setting-improvement conversation");
+        await prepare(session);
+        await this.#store.save(session);
+        return { session, run: this.#startRun(session, host, requestId) };
+    }
     async preview(packageId, sessionId) {
         const session = sessionId === undefined ? null : await this.#store.read(sessionId);
         if (session !== null)
@@ -307,7 +322,6 @@ export class SettingImprovementSession {
             view: (next) => this.#view(next),
             failure: {
                 emptyResponse: "The model returned an empty tool-free authoring response",
-                exchangeLimit: "Setting improvement exceeded 64 model exchanges for one user message",
                 cancelled: "The setting-improvement response was cancelled. Complete tool responses already published to the current tree were retained.",
                 interrupted: "The setting-improvement response was interrupted",
             },