narraeon 0.7.6 → 0.7.9

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

@@ -4,9 +4,10 @@ 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 { WorldDocumentStore } from "../world/WorldDocumentStore.js";
 import { appendAuthoringUserMessage, ModelToolConversation, rememberAuthoringRequest, resumePausedAuthoringConversation, } from "../authoring/ModelToolConversation.js";
 import { summarizeStoredSettingImprovementSession, } from "./FileNativeSettingImprovementStore.js";
-import { SettingAuthoringTransaction, settingImprovementRuntimeContract, settingImprovementToolDefinitions, } from "./SettingAuthoringTransaction.js";
+import { SettingAuthoringTransaction, settingImprovementRuntimeContract, settingImprovementToolDefinitions, authoringPreloadAuthorization, buildAuthoringPreload, contentPackageAuthoringSurface, } from "./SettingAuthoringTransaction.js";
 class RecoveryWriteConflictError extends Error {
 }
 export class SettingImprovementRollbackError extends Error {
@@ -186,7 +187,7 @@ export class SettingImprovementSession {
                 assertPackage(session, input.packageId);
             }
             return this.#startRequest(session, requestId, async (next) => {
-                const { playPreset, bootstrap } = await this.#compileCurrent(input.packageId, next.modelBinding);
+                const { playPreset, bootstrap, preload } = await this.#compileCurrent(input.packageId, next.modelBinding);
                 next.schemaVersion = 3;
                 next.requests ??= [];
                 next.requests.push({
@@ -194,7 +195,9 @@ export class SettingImprovementSession {
                     modelItemStart: next.modelItems.length,
                     bootstrap,
                     playPreset: structuredClone(playPreset),
+                    preload: structuredClone(preload.record),
                 });
+                next.authorization = authoringPreloadAuthorization(next.authorization, preload.record);
                 appendAuthoringUserMessage(next, message, requestId);
             });
         });
@@ -244,6 +247,7 @@ export class SettingImprovementSession {
         const playPreset = await this.#bindPlayPreset();
         const locale = this.#locale();
         const package_ = await this.#content.readCurrentTreeContentPackage(packageId);
+        const preload = this.#preload(package_.files, modelBinding, playPreset, locale);
         const bootstrap = this.#compiler.compileSettingImprovement({
             contentPackageTitle: package_.title,
             gameplay: package_.gameplay,
@@ -252,8 +256,41 @@ export class SettingImprovementSession {
             playPreset,
             modelBinding: modelBinding,
             tools: settingImprovementToolDefinitions(locale, package_.gameplay),
+            preload: preload.blocks,
+        });
+        return { bootstrap, playPreset, preload };
+    }
+    /**
+     * Preloads the control documents and the documents the package frame injects.
+     * A preview that cannot be built degrades to the directory and control files.
+     */
+    #preload(files, modelBinding, playPreset, locale) {
+        const revision = contentTreeFingerprint(files);
+        const snapshot = WorldDocumentStore.open({
+            layout: "content_package",
+            files: [...files],
+        });
+        let injected = [];
+        let injectedUnavailable;
+        try {
+            const preview = this.#preview(snapshot, modelBinding, playPreset);
+            injected = preview.compilation.coverage.flatMap(({ slot, status, readAuthorization }) => status === "resolved" && readAuthorization !== undefined
+                ? [{ shortRef: readAuthorization.shortRef, slot }]
+                : []);
+        }
+        catch (error) {
+            injectedUnavailable =
+                error instanceof Error ? error.message : "unknown preview failure";
+        }
+        return buildAuthoringPreload({
+            snapshot,
+            surface: contentPackageAuthoringSurface,
+            locale,
+            revision,
+            sourcePrefix: "content-package:preload",
+            injected,
+            ...(injectedUnavailable === undefined ? {} : { injectedUnavailable }),
         });
-        return { bootstrap, playPreset };
     }
     async cancel(sessionId) {
         const running = this.#conversation.cancel(sessionId);

package/dist/node/runtime/world/FileNativeWorldStore.js

@@ -1114,10 +1114,20 @@ export class FileNativeWorldStore {
                     assertRelativePath(change.relativePath);
                     const previous = candidateState.get(change.relativePath);
                     const previousHash = previous === undefined ? null : sha256(previous);
-                    if (previousHash !== change.expectedPreviousHash ||
-                        sha256(change.canonicalNextBytes) !== change.nextHash)
+                    const nextBytes = change.canonicalNextBytes;
+                    const consistent = change.kind === "delete"
+                        ? previous !== undefined &&
+                            nextBytes === null &&
+                            change.nextHash === null
+                        : nextBytes !== null &&
+                            change.nextHash !== null &&
+                            sha256(nextBytes) === change.nextHash;
+                    if (previousHash !== change.expectedPreviousHash || !consistent)
                         throw new FileNativeWorldCreationError("operation_conflict", `State-change hash conflicts: ${change.relativePath}`);
-                    candidateState.set(change.relativePath, change.canonicalNextBytes);
+                    if (nextBytes === null)
+                        candidateState.delete(change.relativePath);
+                    else
+                        candidateState.set(change.relativePath, nextBytes);
                 }
                 const inspection = inspectContentPackageCurrentTree([
                     ...[...candidateState].map(([path, contents]) => ({

package/dist/node/runtime/world/WorldDocumentMaintenance.js

@@ -87,10 +87,15 @@ export async function readDocumentMaintenanceFacts(authority, head, cache) {
             continue;
         const changed = await Promise.all(commit.stateChanges.map(async (change) => ({
             change,
-            contents: await authority.readStateChangeContents(commit, change),
+            contents: change.kind === "delete"
+                ? null
+                : await authority.readStateChangeContents(commit, change),
         })));
         for (const { change, contents } of changed)
-            files.set(change.relativePath, contents);
+            if (contents === null)
+                files.delete(change.relativePath);
+            else
+                files.set(change.relativePath, contents);
         const next = snapshot();
         const position = {
             kind: isCorrectionCommit(commit.mode)
@@ -103,6 +108,8 @@ export async function readDocumentMaintenanceFacts(authority, head, cache) {
             worldTime: commit.worldClock ?? null,
         };
         for (const { change } of changed) {
+            if (change.kind === "delete")
+                continue;
             const ref = change.stableShortRef;
             const before = previous.query({
                 kind: "read_document",