narraeon 0.7.10 → 0.8.0

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

@@ -49,6 +49,8 @@ export async function runPlayFollowupRequests(input) {
         }
         if (signalWasAborted(input.signal)) {
             failure ??= "The follow-up request was cancelled.";
+            outcomes.push(outcome);
+            input.observer?.onOutcome?.(outcome);
             break;
         }
         outcomes.push(outcome);
@@ -91,10 +93,9 @@ async function runOne(input, followup, prefix, requestSignal) {
     try {
         await input.artifacts.beginRequestAttempt(requestContext);
         requestSignal?.throwIfAborted();
-        input.observer?.onProviderDispatch?.();
         let response;
         try {
-            response = await input.modelHost.exchange({
+            const request = {
                 bootstrap: structuredClone(input.bootstrap),
                 tools: structuredClone(followup.tools),
                 toolUniverse: structuredClone(followup.tools),
@@ -114,8 +115,23 @@ async function runOne(input, followup, prefix, requestSignal) {
                 requestAttempt: 1,
                 exchange: 1,
                 maxOutputTokens: input.maxOutputTokens,
-            }, {
+            };
+            try {
+                outcome.requestPreviewRecorded =
+                    (await input.observer?.onRequest?.(followup.id, request)) ?? false;
+            }
+            catch {
+                // Diagnostic recording must not change the provider request.
+            }
+            requestSignal?.throwIfAborted();
+            outcome.requestPreviewStatus = "attempted";
+            input.observer?.onProviderDispatch?.();
+            response = await input.modelHost.exchange(request, {
                 ...(requestSignal === undefined ? {} : { signal: requestSignal }),
+                onGoogleHop: (evidence) => input.observer?.onGoogleHop?.(followup.id, evidence),
+                ...(input.controls !== undefined
+                    ? { retainLateExtensionResponse: true }
+                    : {}),
                 onDelta: (delta) => input.observer?.onProviderDelta?.(delta),
             });
             if (input.signal?.aborted === true)
@@ -124,6 +140,7 @@ async function runOne(input, followup, prefix, requestSignal) {
         finally {
             input.observer?.onProviderSettled?.();
         }
+        outcome.requestPreviewStatus = "completed";
         responseDiagnostics = response.diagnostics;
         if (response.diagnostics !== undefined)
             await input.failureLog?.recordExchangeIfActive(response.diagnostics);
@@ -182,6 +199,9 @@ async function runOne(input, followup, prefix, requestSignal) {
             });
     }
     catch (error) {
+        if (outcome.requestPreviewStatus !== undefined &&
+            error instanceof ModelHostCancelledError)
+            outcome.requestPreviewStatus = "cancelled";
         outcome.failure =
             error instanceof Error
                 ? error.message

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

@@ -315,7 +315,8 @@ function validPromptCache(value) {
 export function validProviderKind(value) {
     return (value === "chat_completions" ||
         value === "openai_responses" ||
-        value === "anthropic_messages");
+        value === "anthropic_messages" ||
+        value === "google_interactions");
 }
 export function validCacheStrategy(value) {
     return (value === "explicit_anthropic_blocks" ||

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

@@ -1,11 +1,14 @@
 import { validPromptCompilation, validLogicalMessages, validPromptTools, validPlayFollowup, validProviderKind, validCacheStrategy, validToolStrategy, } from "../prompt/PromptCompilationCodec.js";
 import { validAuthoringRequests, } from "../authoring/AuthoringRequestSnapshot.js";
 import { randomUUID } from "node:crypto";
+import { readGoogleHops, writeGoogleHop } from "../model/GoogleHopJournal.js";
 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";
+import { validGoogleInteractionsSteps } from "../model/ProviderExchangeState.js";
+import { hasDamagedGoogleSteps, withoutDamagedGoogleSteps, } from "../authoring/DamagedGoogleContinuation.js";
 import { ContentWorkspace } from "../content/ContentWorkspace.js";
 import { contentTreeFingerprint } from "../content/ContentTreeFingerprint.js";
 import { isPlayPresetBinding, } from "../play/FileNativePlayPresetStore.js";
@@ -28,19 +31,35 @@ export class FileNativeSettingImprovementStore {
     createId() {
         return `setting-${randomUUID()}`;
     }
+    recordGoogleHop(sessionId, requestId, hop) {
+        assertSessionId(sessionId);
+        return writeGoogleHop(join(this.#sessionsRoot, ".google-hops", sessionId), requestId, hop, () => stat(this.#path(sessionId)).then(() => true, () => false));
+    }
     async read(sessionId) {
         await this.#mutationTail;
-        return this.#read(sessionId);
+        try {
+            const session = await this.#read(sessionId);
+            if (hasDamagedGoogleSteps(session) &&
+                (await this.#damagedSummary(sessionId)))
+                throw new Error("The historical conversation has damaged Google continuation; start a fresh model context");
+            return session;
+        }
+        catch (error) {
+            if (await this.#damagedSummary(sessionId))
+                throw new Error("The historical conversation has damaged Google continuation; start a fresh model context", { cause: error });
+            throw error;
+        }
     }
     async findLatestByPackage(packageId) {
         const summaries = await this.listSummariesByPackage(packageId);
-        return summaries[0] === undefined
-            ? null
-            : this.read(summaries[0].sessionId);
+        const latest = summaries.find((summary) => !summary.damagedContinuation);
+        return latest === undefined ? null : this.read(latest.sessionId);
     }
     async findByCreationRequest(packageId, requestId) {
         const summaries = await this.listSummariesByPackage(packageId);
         const match = summaries.find(({ creationRequestId }) => creationRequestId === requestId);
+        if (match?.damagedContinuation)
+            throw new Error("The historical conversation has damaged Google continuation; start a fresh model context with a new request ID");
         return match === undefined ? null : this.read(match.sessionId);
     }
     async listSummariesByPackage(packageId) {
@@ -88,6 +107,10 @@ export class FileNativeSettingImprovementStore {
             if (session.packageId !== packageId)
                 throw new Error("The setting-improvement conversation does not belong to this content package");
             await rm(this.#path(sessionId));
+            await rm(join(this.#sessionsRoot, ".google-hops", sessionId), {
+                recursive: true,
+                force: true,
+            });
             await rm(join(this.#sessionsRoot, `${sessionId}.schema-v1.json`), {
                 force: true,
             });
@@ -117,8 +140,20 @@ export class FileNativeSettingImprovementStore {
             for (const entry of entries) {
                 if (!entry.isFile() || !sessionFilePattern.test(entry.name))
                     continue;
-                const session = await this.#read(entry.name.slice(0, -5));
-                summaries.set(session.sessionId, summarizeStoredSettingImprovementSession(session));
+                const sessionId = entry.name.slice(0, -5);
+                try {
+                    const session = await this.#read(sessionId);
+                    summaries.set(session.sessionId, (!hasDamagedGoogleSteps(session)
+                        ? null
+                        : await this.#damagedSummary(sessionId)) ??
+                        summarizeStoredSettingImprovementSession(session));
+                }
+                catch (error) {
+                    const summary = await this.#damagedSummary(sessionId);
+                    if (summary === null)
+                        throw error;
+                    summaries.set(sessionId, summary);
+                }
             }
             const completedRevision = await directoryRevision(this.#sessionsRoot);
             if (completedRevision !== revision)
@@ -127,6 +162,39 @@ export class FileNativeSettingImprovementStore {
             return;
         }
     }
+    async #damagedSummary(sessionId) {
+        let session;
+        try {
+            const raw = JSON.parse(await readFile(this.#path(sessionId), "utf8"));
+            const copy = withoutDamagedGoogleSteps(raw);
+            if (copy === null) {
+                if (hasDamagedGoogleSteps(raw))
+                    throw new Error("Cannot safely identify the damaged historical conversation; settlement or identity is unverified");
+                return null;
+            }
+            session = validateStoredSession(copy);
+        }
+        catch (error) {
+            if (error instanceof Error &&
+                error.message.startsWith("Cannot safely identify"))
+                throw error;
+            return null;
+        }
+        if (session.sessionId !== sessionId ||
+            session.googleIdentity?.sessionId !== sessionId ||
+            session.googleIdentity.packageId !== session.packageId ||
+            session.googleIdentity.creationRequestId !== session.creationRequestId ||
+            session.requests?.[0]?.requestId !== session.creationRequestId ||
+            !/^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))
+            throw new Error("Cannot safely identify the damaged historical conversation; its owner or creation identity is unverified");
+        return {
+            ...summarizeStoredSettingImprovementSession(session),
+            runStatus: "interrupted",
+            damagedContinuation: true,
+        };
+    }
     async #recordSavedSession(session) {
         if (this.#summaryIndex !== null)
             this.#cacheSummary(summarizeStoredSettingImprovementSession(session));
@@ -219,6 +287,9 @@ export class FileNativeSettingImprovementStore {
         const session = validateStoredSession(value);
         if (session.sessionId !== sessionId)
             throw new Error("Setting-improvement conversation identity does not match its file");
+        for (const request of session.requests ?? [])
+            if (request.wireRequest !== undefined)
+                request.wireRequest = await readGoogleHops(join(this.#sessionsRoot, ".google-hops", sessionId), request.requestId, request.wireRequest);
         return session;
     }
     async #migrateLegacy(sessionId, source, value) {
@@ -362,7 +433,13 @@ function validateStoredSession(value) {
             "authorization",
             "pendingSettlement",
             "legacyDraft",
-        ], ["contentPackageTitle", "playPreset", "requests"]) ||
+        ], [
+            "contentPackageTitle",
+            "playPreset",
+            "requests",
+            "googleOutcomeUnknown",
+            "googleIdentity",
+        ]) ||
         (value.schemaVersion !== 2 && value.schemaVersion !== 3) ||
         (value.schemaVersion === 2
             ? value.requests !== undefined
@@ -392,12 +469,33 @@ function validateStoredSession(value) {
             typeof value.activeRequestId !== "string") ||
         !Array.isArray(value.completedRequestIds) ||
         (value.lastFailure !== null && typeof value.lastFailure !== "string") ||
+        (value.googleOutcomeUnknown !== undefined &&
+            (typeof value.googleOutcomeUnknown !== "boolean" ||
+                !isRecord(value.modelBinding) ||
+                value.modelBinding.provider !== "google_interactions")) ||
+        (value.googleIdentity !== undefined &&
+            (!isRecord(value.googleIdentity) ||
+                !hasExactKeys(value.googleIdentity, [
+                    "sessionId",
+                    "packageId",
+                    "creationRequestId",
+                ]) ||
+                typeof value.googleIdentity.sessionId !== "string" ||
+                typeof value.googleIdentity.packageId !== "string" ||
+                typeof value.googleIdentity.creationRequestId !== "string" ||
+                !isRecord(value.modelBinding) ||
+                value.modelBinding.provider !== "google_interactions")) ||
         !validAuthorization(value.authorization) ||
         !validPendingSettlement(value.pendingSettlement) ||
         !validPendingSettlementForTranscript(value.pendingSettlement, value.modelItems, value.runStatus) ||
         !validLegacyDraft(value.legacyDraft))
         throw new Error("Setting-improvement conversation does not match its durable schema");
     assertSessionId(value.sessionId);
+    if (isRecord(value.googleIdentity) &&
+        (value.googleIdentity.sessionId !== value.sessionId ||
+            value.googleIdentity.packageId !== value.packageId ||
+            value.googleIdentity.creationRequestId !== value.creationRequestId))
+        throw new Error("Cannot safely identify the historical conversation; its owner or creation identity is inconsistent");
     if (!value.completedRequestIds.every((id) => typeof id === "string") ||
         !value.messages.every(validMessage) ||
         !value.modelItems.every(validModelItem))
@@ -823,6 +921,9 @@ function validModelToolCall(value) {
 function validProviderState(value) {
     if (!isRecord(value))
         return false;
+    if (value.protocol === "google_interactions")
+        return (hasExactKeys(value, ["protocol", "steps"]) &&
+            validGoogleInteractionsSteps(value.steps));
     if (value.protocol === "chat_completions")
         return (hasExactKeys(value, ["protocol", "assistantMessage"]) &&
             Object.hasOwn(value, "assistantMessage"));
@@ -850,7 +951,10 @@ function validModelUsage(value) {
         "totalTokens",
     ];
     if (!isRecord(value) ||
-        !hasExactKeys(value, [...fields, "provenance"]) ||
+        !hasExactKeys(value, [...fields, "provenance"], ["providerRaw", "accounting"]) ||
+        (value.providerRaw !== undefined && !isRecord(value.providerRaw)) ||
+        (value.accounting !== undefined &&
+            value.accounting !== "google_interactions") ||
         !fields.every((field) => validNullableCount(value[field])) ||
         !isRecord(value.provenance) ||
         !hasExactKeys(value.provenance, fields))

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

@@ -5,7 +5,7 @@ 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 { appendAuthoringUserMessage, authoringExchange, ModelToolConversation, rememberAuthoringRequest, resumePausedAuthoringConversation, } from "../authoring/ModelToolConversation.js";
 import { summarizeStoredSettingImprovementSession, } from "./FileNativeSettingImprovementStore.js";
 import { SettingAuthoringTransaction, settingImprovementRuntimeContract, settingImprovementToolDefinitions, authoringPreloadAuthorization, buildAuthoringPreload, contentPackageAuthoringSurface, } from "./SettingAuthoringTransaction.js";
 class RecoveryWriteConflictError extends Error {
@@ -62,7 +62,7 @@ export class SettingImprovementSession {
     async overview(packageId) {
         return this.#mutate(async () => {
             let summaries = await this.#store.listSummariesByPackage(packageId);
-            const latestSummary = summaries[0];
+            const latestSummary = summaries.find((summary) => !summary.damagedContinuation);
             const latest = latestSummary === undefined
                 ? null
                 : await this.#recoverIfNeeded(await this.#store.read(latestSummary.sessionId));
@@ -187,6 +187,8 @@ export class SettingImprovementSession {
                 assertPackage(session, input.packageId);
             }
             return this.#startRequest(session, requestId, async (next) => {
+                if (next.runStatus === "paused")
+                    throw new Error("Resume the paused authoring request before sending another message");
                 const { playPreset, bootstrap, preload } = await this.#compileCurrent(input.packageId, next.modelBinding);
                 next.schemaVersion = 3;
                 next.requests ??= [];
@@ -199,6 +201,8 @@ export class SettingImprovementSession {
                 });
                 next.authorization = authoringPreloadAuthorization(next.authorization, preload.record);
                 appendAuthoringUserMessage(next, message, requestId);
+                if (next.modelBinding.provider === "google_interactions")
+                    next.googleOutcomeUnknown = false;
             });
         });
         return prepared.run ?? this.#view(prepared.session);
@@ -223,10 +227,16 @@ export class SettingImprovementSession {
                 throw new Error("Another message in this setting-improvement conversation is still running");
             return { session, run: running.promise };
         }
+        if (session.googleOutcomeUnknown)
+            throw new Error("The Google request outcome is unknown; start a fresh model context.");
         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);
+        if (session.modelBinding.provider === "google_interactions" &&
+            host.previewAuthoringRequest !== undefined &&
+            session.requests?.at(-1)?.requestId === requestId)
+            session.requests.at(-1).wireRequest = host.previewAuthoringRequest(authoringExchange(session, requestId));
         await this.#store.save(session);
         return { session, run: this.#startRun(session, host, requestId) };
     }
@@ -317,9 +327,10 @@ export class SettingImprovementSession {
             tools,
         });
         const now = Date.now();
+        const sessionId = this.#store.createId();
         const session = {
             schemaVersion: 2,
-            sessionId: this.#store.createId(),
+            sessionId,
             packageId,
             contentPackageTitle: package_.title,
             locale,
@@ -327,6 +338,9 @@ export class SettingImprovementSession {
             createdAt: now,
             updatedAt: now,
             creationRequestId,
+            ...(modelBinding.provider === "google_interactions"
+                ? { googleIdentity: { sessionId, packageId, creationRequestId } }
+                : {}),
             bootstrap,
             modelBinding,
             playPreset: structuredClone(playPreset),
@@ -353,6 +367,7 @@ export class SettingImprovementSession {
             host,
             requestId,
             save: (next) => this.#store.save(next),
+            recordGoogleHop: (id, hop) => this.#store.recordGoogleHop(session.sessionId, id, hop),
             settleToolResponse: async (next, assistantItemIndex, toolCalls) => {
                 activeTransaction = await this.#settleToolResponse(next, assistantItemIndex, toolCalls, activeTransaction);
             },
@@ -451,6 +466,8 @@ export class SettingImprovementSession {
             return this.#recoverIfNeeded(await this.#store.read(session.sessionId));
         }
         if (session.pendingSettlement !== null) {
+            if (session.modelBinding.provider === "google_interactions")
+                session.googleOutcomeUnknown = false;
             const lease = await this.#content.beginCurrentTreeContentPackageOperation(session.packageId);
             let retry = false;
             try {
@@ -510,7 +527,21 @@ export class SettingImprovementSession {
                 return this.#recoverIfNeeded(await this.#store.read(session.sessionId));
             return session;
         }
-        if (session.runStatus === "running") {
+        const lastItem = session.modelItems.at(-1);
+        const legacyUnknown = session.modelBinding.provider === "google_interactions" &&
+            session.runStatus === "interrupted" &&
+            session.googleOutcomeUnknown === undefined &&
+            (lastItem?.kind === "user" || lastItem?.kind === "tool");
+        if (legacyUnknown) {
+            session.googleOutcomeUnknown = true;
+            session.lastFailure =
+                "The Google request outcome is unknown; start a fresh model context.";
+            session.updatedAt = Date.now();
+        }
+        else if (session.runStatus === "running") {
+            if (session.modelBinding.provider === "google_interactions" &&
+                session.googleOutcomeUnknown !== false)
+                session.googleOutcomeUnknown = true;
             markInterruptedAfterRestart(session);
             session.updatedAt = Date.now();
         }
@@ -606,12 +637,17 @@ function lastPendingAssistant(session) {
 }
 function markInterruptedAfterRestart(session) {
     const requestId = session.activeRequestId;
-    session.runStatus = "interrupted";
+    session.runStatus =
+        session.modelBinding.provider === "google_interactions" &&
+            session.googleOutcomeUnknown === false
+            ? "paused"
+            : "interrupted";
     session.activeRequestId = null;
     if (requestId !== null)
         session.completedRequestIds = rememberAuthoringRequest(session.completedRequestIds, requestId);
-    session.lastFailure =
-        "The previous model request stopped before its next complete response. Every settled current-tree change and complete tool result was retained; continue this conversation when ready.";
+    session.lastFailure = session.googleOutcomeUnknown
+        ? "The Google request outcome is unknown; start a fresh model context."
+        : "The previous model request stopped before its next complete response. Every settled current-tree change and complete tool result was retained; continue this conversation when ready.";
 }
 function requiredMessage(message) {
     if (message.trim().length === 0)
@@ -750,6 +786,11 @@ function diffForRollback(files, change) {
 function settingImprovementHistoryItem(summary) {
     return {
         sessionId: summary.sessionId,
+        ...(summary.damagedContinuation
+            ? {
+                unavailableReason: "Google continuation is damaged; start a fresh model context.",
+            }
+            : {}),
         runStatus: summary.runStatus,
         createdAt: summary.createdAt,
         updatedAt: summary.updatedAt,

package/dist/node/runtime/world-revision/FileNativeWorldRevisionStore.js

@@ -3,9 +3,12 @@ import { upgradeLegacyEpochs } from "./LegacyWorldRevisionEpochUpgrade.js";
 import { isPackageFollowupControlPath } from "../content/PackageFollowups.js";
 import { validAuthoringRequests, } from "../authoring/AuthoringRequestSnapshot.js";
 import { createHash, randomUUID } from "node:crypto";
-import { mkdir, open, readFile, readdir, rename, rm } from "node:fs/promises";
+import { readGoogleHops, writeGoogleHop } from "../model/GoogleHopJournal.js";
+import { mkdir, open, readFile, readdir, rename, rm, stat, } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
 import { gameplayPath } from "../../protocol/gameplay.js";
+import { validGoogleInteractionsSteps } from "../model/ProviderExchangeState.js";
+import { hasDamagedGoogleSteps, withoutDamagedGoogleSteps, } from "../authoring/DamagedGoogleContinuation.js";
 import { contentTreeFingerprint } from "../content/ContentTreeFingerprint.js";
 import { isPlayPresetBinding, } from "../play/FileNativePlayPresetStore.js";
 const uuidV4Pattern = "[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}";
@@ -46,6 +49,10 @@ export class FileNativeWorldRevisionStore {
     createSessionId() {
         return `world-session-${randomUUID()}`;
     }
+    recordGoogleHop(sessionId, requestId, hop) {
+        assertSessionId(sessionId);
+        return writeGoogleHop(join(this.#sessionsRoot, ".google-hops", sessionId), requestId, hop, () => stat(this.#sessionPath(sessionId)).then(() => true, () => false));
+    }
     createChangeSetId() {
         return `change-set:${randomUUID()}`;
     }
@@ -89,7 +96,20 @@ export class FileNativeWorldRevisionStore {
         });
     }
     readSession(sessionId) {
-        return this.#afterMutations(() => this.#readSession(sessionId));
+        return this.#afterMutations(async () => {
+            try {
+                const session = await this.#readSession(sessionId);
+                if (hasDamagedGoogleSteps(session) &&
+                    (await this.#damagedSession(sessionId)))
+                    throw new Error("The historical conversation has damaged Google continuation; start a fresh model context");
+                return session;
+            }
+            catch (error) {
+                if (await this.#damagedSession(sessionId))
+                    throw new Error("The historical conversation has damaged Google continuation; start a fresh model context", { cause: error });
+                throw error;
+            }
+        });
     }
     saveSession(session) {
         return this.#mutate(async () => {
@@ -110,7 +130,19 @@ export class FileNativeWorldRevisionStore {
             for (const entry of entries) {
                 if (!entry.isFile() || !sessionName.test(entry.name))
                     continue;
-                const session = await this.#readSession(entry.name.slice(0, -5));
+                const sessionId = entry.name.slice(0, -5);
+                let session;
+                try {
+                    session = await this.#readSession(sessionId);
+                    if (hasDamagedGoogleSteps(session))
+                        session = (await this.#damagedSession(sessionId)) ?? session;
+                }
+                catch (error) {
+                    const damaged = await this.#damagedSession(sessionId);
+                    if (damaged === null)
+                        throw error;
+                    session = damaged;
+                }
                 if (session.worldId === worldId)
                     sessions.push(session);
             }
@@ -118,7 +150,10 @@ export class FileNativeWorldRevisionStore {
         });
     }
     async findByCreationRequest(worldId, requestId) {
-        return ((await this.listSessions(worldId)).find(({ creationRequestId }) => creationRequestId === requestId) ?? null);
+        const match = (await this.listSessions(worldId)).find(({ creationRequestId }) => creationRequestId === requestId);
+        if (match?.damagedContinuation)
+            throw new Error("The historical conversation has damaged Google continuation; start a fresh model context with a new request ID");
+        return match ?? null;
     }
     deleteSession(worldId, sessionId) {
         return this.#mutate(async () => {
@@ -126,6 +161,10 @@ export class FileNativeWorldRevisionStore {
             if (session.worldId !== worldId)
                 throw new Error("World-revision conversation belongs to another world");
             await rm(this.#sessionPath(sessionId));
+            await rm(join(this.#sessionsRoot, ".google-hops", sessionId), {
+                recursive: true,
+                force: true,
+            });
         });
     }
     async #readEpoch(epochId) {
@@ -155,8 +194,34 @@ export class FileNativeWorldRevisionStore {
         const session = validateSession(value);
         if (session.sessionId !== sessionId)
             throw new Error("World-revision conversation identity does not match its file");
+        for (const request of session.requests ?? [])
+            if (request.wireRequest !== undefined)
+                request.wireRequest = await readGoogleHops(join(this.#sessionsRoot, ".google-hops", sessionId), request.requestId, request.wireRequest);
         return session;
     }
+    async #damagedSession(sessionId) {
+        const raw = JSON.parse(await readFile(this.#sessionPath(sessionId), "utf8"));
+        const copy = withoutDamagedGoogleSteps(raw);
+        if (copy === null) {
+            if (hasDamagedGoogleSteps(raw))
+                throw new Error("Cannot safely identify the damaged historical conversation; settlement or identity is unverified");
+            return null;
+        }
+        const session = validateSession(copy);
+        if (session.sessionId !== sessionId ||
+            session.requests?.[0]?.requestId !== session.creationRequestId ||
+            !/^[A-Za-z0-9][A-Za-z0-9._:-]{0,159}$/u.test(session.creationRequestId))
+            throw new Error("Cannot safely identify the damaged historical conversation; its creation identity is unverified");
+        const epoch = await this.#readEpoch(session.epochId);
+        if (epoch.worldId !== session.worldId)
+            throw new Error("Cannot safely identify the damaged historical conversation; its world is inconsistent");
+        return {
+            ...session,
+            damagedContinuation: true,
+            runStatus: "interrupted",
+            lastFailure: "Google continuation is damaged; start a fresh model context.",
+        };
+    }
     async #afterMutations(read) {
         await this.#mutationTail;
         return read();
@@ -274,7 +339,7 @@ function validateSession(value) {
             "lastFailure",
             "authorization",
             "pendingSettlement",
-        ], ["requests"]) ||
+        ], ["requests", "googleOutcomeUnknown"]) ||
         (value.schemaVersion !== 1 && value.schemaVersion !== 2) ||
         (value.schemaVersion === 1
             ? value.requests !== undefined
@@ -311,6 +376,10 @@ function validateSession(value) {
         !Array.isArray(value.completedRequestIds) ||
         !value.completedRequestIds.every((item) => typeof item === "string") ||
         (value.lastFailure !== null && typeof value.lastFailure !== "string") ||
+        (value.googleOutcomeUnknown !== undefined &&
+            (typeof value.googleOutcomeUnknown !== "boolean" ||
+                !isRecord(value.modelBinding) ||
+                value.modelBinding.provider !== "google_interactions")) ||
         !validAuthorization(value.authorization) ||
         !validPendingSettlement(value.pendingSettlement) ||
         !validPendingForSession(value.pendingSettlement, value.epochId, value.runStatus) ||
@@ -452,6 +521,9 @@ function validModelToolCall(value) {
 function validProviderState(value) {
     if (!isRecord(value))
         return false;
+    if (value.protocol === "google_interactions")
+        return (hasExactKeys(value, ["protocol", "steps"]) &&
+            validGoogleInteractionsSteps(value.steps));
     if (value.protocol === "chat_completions")
         return hasExactKeys(value, ["protocol", "assistantMessage"]);
     if (value.protocol === "openai_responses")
@@ -509,7 +581,8 @@ function validModelBinding(value) {
         ], ["cacheStrategy"]) &&
         (value.provider === "chat_completions" ||
             value.provider === "openai_responses" ||
-            value.provider === "anthropic_messages") &&
+            value.provider === "anthropic_messages" ||
+            value.provider === "google_interactions") &&
         typeof value.endpointFingerprint === "string" &&
         typeof value.modelId === "string" &&
         count(value.contextWindowTokens) &&
@@ -531,7 +604,10 @@ function validModelUsage(value) {
         "totalTokens",
     ];
     if (!isRecord(value) ||
-        !hasExactKeys(value, [...fields, "provenance"]) ||
+        !hasExactKeys(value, [...fields, "provenance"], ["providerRaw", "accounting"]) ||
+        (value.providerRaw !== undefined && !isRecord(value.providerRaw)) ||
+        (value.accounting !== undefined &&
+            value.accounting !== "google_interactions") ||
         !fields.every((field) => value[field] === null || count(value[field])) ||
         !isRecord(value.provenance) ||
         !hasExactKeys(value.provenance, fields))
@@ -594,7 +670,7 @@ function validPendingSettlement(value) {
 function validPendingForSession(pending, epochId, runStatus) {
     return (pending === null ||
         (isRecord(pending) &&
-            runStatus === "running" &&
+            (runStatus === "running" || runStatus === "interrupted") &&
             pending.epochId === epochId));
 }
 function validToolResult(value) {