narraeon 0.8.0 → 0.8.1

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

@@ -31,6 +31,9 @@ export class FileNativeSettingImprovementStore {
     createId() {
         return `setting-${randomUUID()}`;
     }
+    get sessionScope() {
+        return this.#sessionsRoot;
+    }
     recordGoogleHop(sessionId, requestId, hop) {
         assertSessionId(sessionId);
         return writeGoogleHop(join(this.#sessionsRoot, ".google-hops", sessionId), requestId, hop, () => stat(this.#path(sessionId)).then(() => true, () => false));
@@ -84,10 +87,65 @@ export class FileNativeSettingImprovementStore {
     save(session) {
         return this.#mutate(async () => {
             validateStoredSession(session);
+            await this.#preservePreviousSchema(session);
             await publishJson(this.#path(session.sessionId), session);
             await this.#recordSavedSession(session);
         });
     }
+    async preparePendingEdit(session) {
+        if (session.pendingEdit === undefined)
+            throw new Error("No pending setting conversation edit");
+        await publishJson(this.#pendingEditPath(session.packageId), {
+            schemaVersion: 1,
+            packageId: session.packageId,
+            sessionId: session.sessionId,
+        });
+        await this.save(session);
+    }
+    async recoverPendingEdits(packageId, lease) {
+        const path = this.#pendingEditPath(packageId);
+        let marker;
+        try {
+            marker = JSON.parse(await readFile(path, "utf8"));
+        }
+        catch (error) {
+            if (isNodeError(error) && error.code === "ENOENT")
+                return;
+            throw error;
+        }
+        if (!isRecord(marker) ||
+            !hasExactKeys(marker, ["schemaVersion", "packageId", "sessionId"]) ||
+            marker.schemaVersion !== 1 ||
+            marker.packageId !== packageId ||
+            typeof marker.sessionId !== "string")
+            throw new Error("Pending authoring edit marker is damaged");
+        assertSessionId(marker.sessionId);
+        const raw = JSON.parse(await readFile(this.#path(marker.sessionId), "utf8"));
+        const session = validateStoredSession(raw);
+        if (session.sessionId !== marker.sessionId ||
+            session.packageId !== packageId)
+            throw new Error("Pending edit identity does not match its package");
+        if (session.pendingEdit === undefined) {
+            await rm(path, { force: true });
+            return;
+        }
+        await this.finishPendingEdit(session, lease);
+    }
+    async finishPendingEdit(session, lease) {
+        const pending = session.pendingEdit;
+        if (pending === undefined)
+            throw new Error("No pending setting conversation edit");
+        const fingerprint = contentTreeFingerprint(lease.package.files);
+        if (fingerprint === pending.beforeFingerprint &&
+            fingerprint !== pending.afterFingerprint)
+            await lease.replace(pending.afterFiles);
+        else if (fingerprint !== pending.afterFingerprint)
+            throw new Error("Cannot recover the conversation edit because the content package changed; no further changes were made");
+        await publishJson(this.#path(session.sessionId), pending.next);
+        await rm(this.#pendingEditPath(session.packageId), { force: true });
+        await this.#recordSavedSession(pending.next);
+        return structuredClone(pending.next);
+    }
     saveIfUnchanged(expected, replacement) {
         return this.#mutate(async () => {
             if (expected.sessionId !== replacement.sessionId)
@@ -96,6 +154,7 @@ export class FileNativeSettingImprovementStore {
             const current = await this.#read(expected.sessionId);
             if (!isDeepStrictEqual(current, expected))
                 return false;
+            await this.#preservePreviousSchema(replacement);
             await publishJson(this.#path(replacement.sessionId), replacement);
             await this.#recordSavedSession(replacement);
             return true;
@@ -114,6 +173,8 @@ export class FileNativeSettingImprovementStore {
             await rm(join(this.#sessionsRoot, `${sessionId}.schema-v1.json`), {
                 force: true,
             });
+            for (const version of [2, 3, 4])
+                await rm(join(this.#sessionsRoot, `${sessionId}.schema-v${version}.json`), { force: true });
             await this.#recordDeletedSession(session);
         });
     }
@@ -184,7 +245,9 @@ export class FileNativeSettingImprovementStore {
             session.googleIdentity?.sessionId !== sessionId ||
             session.googleIdentity.packageId !== session.packageId ||
             session.googleIdentity.creationRequestId !== session.creationRequestId ||
-            session.requests?.[0]?.requestId !== session.creationRequestId ||
+            (session.requests?.[0]?.requestId !== session.creationRequestId &&
+                !(session.schemaVersion === 5 &&
+                    session.editReceipts?.some((receipt) => receipt.requestId === session.requests?.[0]?.requestId))) ||
             !/^package-[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/u.test(session.packageId) ||
             !/^[A-Za-z0-9][A-Za-z0-9._:-]{0,159}$/u.test(session.creationRequestId) ||
             hasPendingToolCalls(session))
@@ -292,6 +355,27 @@ export class FileNativeSettingImprovementStore {
                 request.wireRequest = await readGoogleHops(join(this.#sessionsRoot, ".google-hops", sessionId), request.requestId, request.wireRequest);
         return session;
     }
+    async #preservePreviousSchema(next) {
+        if (next.schemaVersion < 4)
+            return;
+        let source;
+        try {
+            source = await readFile(this.#path(next.sessionId), "utf8");
+        }
+        catch (error) {
+            if (isNodeError(error) && error.code === "ENOENT")
+                return;
+            throw error;
+        }
+        const previous = validateStoredSession(JSON.parse(source));
+        if (previous.sessionId !== next.sessionId)
+            throw new Error("Setting-improvement conversation identity does not match its file");
+        if (previous.schemaVersion === next.schemaVersion)
+            return;
+        if (previous.schemaVersion > next.schemaVersion)
+            throw new Error("Cannot downgrade a setting-improvement conversation");
+        await publishImmutableSource(join(this.#sessionsRoot, `${next.sessionId}.schema-v${previous.schemaVersion}.json`), source);
+    }
     async #migrateLegacy(sessionId, source, value) {
         if (!validLegacySession(value))
             throw new Error("Legacy setting-improvement conversation is damaged");
@@ -338,6 +422,11 @@ export class FileNativeSettingImprovementStore {
         assertSessionId(sessionId);
         return join(this.#sessionsRoot, `${sessionId}.json`);
     }
+    #pendingEditPath(packageId) {
+        if (!/^package-[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/u.test(packageId))
+            throw new Error("Invalid content package ID");
+        return join(this.#sessionsRoot, ".pending-edits", `${packageId}.json`);
+    }
 }
 function compareSummaries(left, right) {
     return (right.updatedAt - left.updatedAt ||
@@ -380,7 +469,8 @@ export function summarizeStoredSettingImprovementSession(session) {
         changedFileCount: changedPaths.size,
         exchange: session.exchange,
         toolCalls: session.toolCalls,
-        needsRecovery: session.pendingSettlement !== null ||
+        needsRecovery: session.pendingEdit !== undefined ||
+            session.pendingSettlement !== null ||
             session.runStatus === "running" ||
             hasPendingToolCalls(session),
     };
@@ -439,15 +529,43 @@ function validateStoredSession(value) {
             "requests",
             "googleOutcomeUnknown",
             "googleIdentity",
+            "retryDispatch",
+            "pendingEdit",
+            "editReceipts",
         ]) ||
-        (value.schemaVersion !== 2 && value.schemaVersion !== 3) ||
+        (value.schemaVersion !== 2 &&
+            value.schemaVersion !== 3 &&
+            value.schemaVersion !== 4 &&
+            value.schemaVersion !== 5) ||
+        (value.schemaVersion !== 4 &&
+            value.schemaVersion !== 5 &&
+            value.retryDispatch !== undefined) ||
+        (value.schemaVersion !== 5 && value.pendingEdit !== undefined) ||
+        (value.schemaVersion !== 5 && value.editReceipts !== undefined) ||
+        (value.editReceipts !== undefined &&
+            !validEditReceipts(value.editReceipts)) ||
+        (value.pendingEdit !== undefined &&
+            !validPendingEdit(value.pendingEdit, value)) ||
         (value.schemaVersion === 2
             ? value.requests !== undefined
-            : !validAuthoringRequests(value.requests, validPromptCompilation, {
-                modelItems: value.modelItems,
-                activeRequestId: value.activeRequestId,
-                completedRequestIds: value.completedRequestIds,
-            })) ||
+            : (value.schemaVersion === 4 || value.schemaVersion === 5) &&
+                Array.isArray(value.requests) &&
+                value.requests.length === 0 &&
+                ((value.schemaVersion === 5 && value.pendingEdit !== undefined) ||
+                    (value.runStatus === "ready" &&
+                        Array.isArray(value.modelItems) &&
+                        value.modelItems.length === 0 &&
+                        Array.isArray(value.messages) &&
+                        value.messages.length === 0 &&
+                        value.activeRequestId === null &&
+                        Array.isArray(value.completedRequestIds) &&
+                        value.completedRequestIds.length === 0))
+                ? false
+                : !validAuthoringRequests(value.requests, validPromptCompilation, {
+                    modelItems: value.modelItems,
+                    activeRequestId: value.activeRequestId,
+                    completedRequestIds: value.completedRequestIds,
+                })) ||
         typeof value.sessionId !== "string" ||
         typeof value.packageId !== "string" ||
         !validOptionalTitle(value.contentPackageTitle) ||
@@ -458,6 +576,27 @@ function validateStoredSession(value) {
         typeof value.creationRequestId !== "string" ||
         !validPromptCompilation(value.bootstrap) ||
         !validModelBinding(value.modelBinding) ||
+        (value.retryDispatch !== undefined &&
+            (!isRecord(value.retryDispatch) ||
+                !hasExactKeys(value.retryDispatch, [
+                    "requestId",
+                    "exchange",
+                    "modelItemCount",
+                    "state",
+                ]) ||
+                typeof value.retryDispatch.requestId !== "string" ||
+                !validCount(value.retryDispatch.exchange) ||
+                !validCount(value.retryDispatch.modelItemCount) ||
+                !["dispatching", "retryable", "blocked"].includes(String(value.retryDispatch.state)) ||
+                (value.schemaVersion !== 4 && value.schemaVersion !== 5) ||
+                lastRequestId(value.requests) !== value.retryDispatch.requestId ||
+                (value.runStatus !== "running" && value.runStatus !== "interrupted") ||
+                value.pendingSettlement !== null ||
+                !validCount(value.exchange) ||
+                (value.retryDispatch.exchange !== value.exchange &&
+                    value.retryDispatch.exchange !== Number(value.exchange) + 1) ||
+                !Array.isArray(value.modelItems) ||
+                value.retryDispatch.modelItemCount !== value.modelItems.length)) ||
         (value.playPreset !== undefined &&
             !isPlayPresetBinding(value.playPreset)) ||
         !Array.isArray(value.modelItems) ||
@@ -502,6 +641,69 @@ function validateStoredSession(value) {
         throw new Error("Setting-improvement transcript is damaged");
     return structuredClone(value);
 }
+function lastRequestId(requests) {
+    if (!Array.isArray(requests))
+        return undefined;
+    const last = requests.at(-1);
+    return isRecord(last) ? last.requestId : undefined;
+}
+function validEditReceipts(value) {
+    if (!Array.isArray(value))
+        return false;
+    const ids = new Set();
+    return value.every((entry) => {
+        if (!isRecord(entry) ||
+            !hasExactKeys(entry, [
+                "requestId",
+                "messageId",
+                "message",
+                "filePolicy",
+            ]) ||
+            typeof entry.requestId !== "string" ||
+            !/^[A-Za-z0-9][A-Za-z0-9._:-]{0,159}$/u.test(entry.requestId) ||
+            ids.has(entry.requestId) ||
+            typeof entry.messageId !== "string" ||
+            typeof entry.message !== "string" ||
+            entry.message.trim().length === 0 ||
+            entry.message.length > 64 * 1024 ||
+            (entry.filePolicy !== "keep" && entry.filePolicy !== "revert"))
+            return false;
+        ids.add(entry.requestId);
+        return true;
+    });
+}
+function validPendingEdit(value, original) {
+    if (!isRecord(value) ||
+        !hasExactKeys(value, [
+            "beforeFingerprint",
+            "afterFingerprint",
+            "afterFiles",
+            "next",
+        ]) ||
+        typeof value.beforeFingerprint !== "string" ||
+        !/^[0-9a-f]{64}$/u.test(value.beforeFingerprint) ||
+        typeof value.afterFingerprint !== "string" ||
+        !/^[0-9a-f]{64}$/u.test(value.afterFingerprint) ||
+        !validContentTreeFiles(value.afterFiles) ||
+        contentTreeFingerprint(value.afterFiles) !== value.afterFingerprint ||
+        !isRecord(value.next) ||
+        value.next.pendingEdit !== undefined ||
+        value.next.schemaVersion !== 5 ||
+        value.next.sessionId !== original.sessionId ||
+        value.next.packageId !== original.packageId ||
+        value.next.creationRequestId !== original.creationRequestId ||
+        value.next.runStatus !== "running" ||
+        value.next.activeRequestId === null ||
+        original.pendingSettlement !== null)
+        return false;
+    try {
+        validateStoredSession(value.next);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 function migrateLegacySession(value, applyOutcome) {
     if (!validLegacySession(value))
         throw new Error("Legacy setting-improvement conversation is damaged");