@markusylisiurunen/tau 0.3.59 → 0.3.61

package/dist/diff_tool/review_state.js

@@ -34,6 +34,35 @@ export class DiffToolReviewStateStore {
             brief: cloneBrief(this.state.brief),
         };
     }
+    clone() {
+        const clone = new DiffToolReviewStateStore();
+        clone.replaceState(this.state);
+        return clone;
+    }
+    replaceState(state) {
+        this.state.diffStyle = state.diffStyle;
+        this.state.overflowMode = state.overflowMode;
+        this.state.codeTheme = state.codeTheme;
+        this.state.sidebarOpen = state.sidebarOpen;
+        this.state.collapsedFileIds = [...state.collapsedFileIds];
+        this.state.viewedFileIds = [...state.viewedFileIds];
+        this.state.threads = state.threads.map(cloneThread);
+        this.state.brief = cloneBrief(state.brief);
+    }
+    replaceStatePreservingConcurrentLoading(state, previousState) {
+        const currentThreadLoading = new Map(this.state.threads.map((thread) => [thread.id, thread.loading]));
+        const previousThreadLoading = new Map(previousState.threads.map((thread) => [thread.id, thread.loading]));
+        const currentBriefLoading = this.state.brief.loading;
+        this.replaceState(state);
+        for (const thread of this.state.threads) {
+            if (thread.loading === previousThreadLoading.get(thread.id)) {
+                thread.loading = currentThreadLoading.get(thread.id) ?? thread.loading;
+            }
+        }
+        if (this.state.brief.loading === previousState.brief.loading) {
+            this.state.brief.loading = currentBriefLoading;
+        }
+    }
     updateState(patch) {
         if (patch.diffStyle === "split" || patch.diffStyle === "stacked") {
             this.state.diffStyle = patch.diffStyle;
@@ -168,10 +197,20 @@ export class DiffToolReviewStateStore {
         if (!userText) {
             return "";
         }
-        const locationPrefix = thread.threadId || thread.anchor.kind !== "line"
-            ? ""
-            : `[${thread.anchor.filePath}:${thread.anchor.lineNumber} (${thread.anchor.side === "additions" ? "new" : "old"})]\n\n`;
-        return `${locationPrefix}${userText}`;
+        if (thread.threadId) {
+            return userText;
+        }
+        const locationPrefix = thread.anchor.kind === "line"
+            ? `[${thread.anchor.filePath}:${thread.anchor.lineNumber} (${thread.anchor.side === "additions" ? "new" : "old"})]\n\n`
+            : "";
+        const hasAssistantMessage = thread.messages.some((message) => message.role === "assistant");
+        if (!hasAssistantMessage) {
+            return `${locationPrefix}${userText}`;
+        }
+        const transcript = thread.messages
+            .map((message) => `**${message.role === "assistant" ? "agent" : "user"}**\n\n${message.text}`)
+            .join("\n\n");
+        return `${locationPrefix}Continue this restored review conversation. Its previous transcript is included below.\n\n${transcript}`;
     }
     buildReviewText(submissionMessage) {
         const trimmedSubmissionMessage = submissionMessage?.trim();

package/dist/diff_tool/review_state.js.map

@@ -1 +1 @@
-{"version":3,"file":"review_state.js","sourceRoot":"","sources":["../../src/diff_tool/review_state.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"review_state.js","sourceRoot":"","sources":["../../src/diff_tool/review_state.ts"],"names":[],"mappings":"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"}

package/dist/diff_tool/review_state_persistence.js

@@ -0,0 +1,152 @@
+import { createHash } from "node:crypto";
+import { z } from "zod";
+import { DIFF_TOOL_CODE_THEMES } from "./shared_types.js";
+const DIFF_TOOL_REVIEW_STATE_VERSION = 1;
+const MAX_PERSISTED_REVIEW_STATE_BYTES = 2 * 1024 * 1024;
+const MAX_THREADS = 1_000;
+const MAX_MESSAGES_PER_THREAD = 1_000;
+const MAX_TEXT_LENGTH = 512 * 1024;
+const MAX_ID_LENGTH = 1_024;
+const MAX_FILE_IDS = 10_000;
+const idSchema = z.string().min(1).max(MAX_ID_LENGTH);
+const textSchema = z.string().max(MAX_TEXT_LENGTH);
+const lineAnchorSchema = z
+    .object({
+    kind: z.literal("line"),
+    fileId: idSchema,
+    filePath: idSchema,
+    lineNumber: z.number().int().nonnegative(),
+    side: z.enum(["additions", "deletions"]),
+})
+    .strict();
+const detachedAnchorSchema = z.object({ kind: z.literal("detached") }).strict();
+const persistedThreadSchema = z
+    .object({
+    id: idSchema,
+    anchor: z.union([lineAnchorSchema, detachedAnchorSchema]),
+    messages: z
+        .array(z
+        .object({
+        role: z.enum(["user", "assistant"]),
+        text: textSchema,
+    })
+        .strict())
+        .min(1)
+        .max(MAX_MESSAGES_PER_THREAD),
+    resolved: z.boolean(),
+    collapsed: z.boolean(),
+})
+    .strict()
+    .refine((thread) => thread.messages[0]?.role === "user", {
+    message: "thread must start with a user message",
+});
+const persistedStateSchema = z
+    .object({
+    diffStyle: z.enum(["stacked", "split"]),
+    overflowMode: z.enum(["wrap", "scroll"]),
+    codeTheme: z.enum(DIFF_TOOL_CODE_THEMES),
+    sidebarOpen: z.boolean(),
+    collapsedFileIds: z.array(idSchema).max(MAX_FILE_IDS),
+    viewedFileIds: z.array(idSchema).max(MAX_FILE_IDS),
+    threads: z
+        .array(persistedThreadSchema)
+        .max(MAX_THREADS)
+        .refine((threads) => new Set(threads.map((thread) => thread.id)).size === threads.length, {
+        message: "thread ids must be unique",
+    }),
+    brief: z.object({ content: textSchema }).strict(),
+})
+    .strict();
+const persistedDocumentSchema = z
+    .object({
+    version: z.literal(DIFF_TOOL_REVIEW_STATE_VERSION),
+    scopeFingerprint: z.string().regex(/^[0-9a-f]{64}$/),
+    state: persistedStateSchema,
+})
+    .strict();
+export function createDiffReviewScopeFingerprint(context, files, patch) {
+    return createHash("sha256")
+        .update(JSON.stringify({
+        repoRoot: context.repoRoot,
+        cwd: context.cwd,
+        diffArgs: context.diffArgs,
+        diffCommand: context.diffCommand,
+        files,
+        patch,
+    }))
+        .digest("hex");
+}
+export function createDiffToolPersistedReviewStateDocument(scopeFingerprint, state) {
+    const document = {
+        version: DIFF_TOOL_REVIEW_STATE_VERSION,
+        scopeFingerprint,
+        state: {
+            diffStyle: state.diffStyle,
+            overflowMode: state.overflowMode,
+            codeTheme: state.codeTheme,
+            sidebarOpen: state.sidebarOpen,
+            collapsedFileIds: [...state.collapsedFileIds],
+            viewedFileIds: [...state.viewedFileIds],
+            threads: state.threads.map((thread) => ({
+                id: thread.id,
+                anchor: thread.anchor.kind === "line" ? { ...thread.anchor } : { kind: "detached" },
+                messages: thread.messages.map((message) => ({ ...message })),
+                resolved: thread.resolved,
+                collapsed: thread.collapsed,
+            })),
+            brief: { content: state.brief.content },
+        },
+    };
+    assertDocumentSize(document);
+    const parsed = persistedDocumentSchema.safeParse(document);
+    if (!parsed.success) {
+        throw new Error(`diff review state cannot be persisted: ${z.prettifyError(parsed.error)}`);
+    }
+    return parsed.data;
+}
+export function parseDiffToolPersistedReviewStateDocument(document, scopeFingerprint) {
+    assertDocumentSize(document);
+    const parsed = persistedDocumentSchema.safeParse(document);
+    if (!parsed.success) {
+        throw new Error(`stored diff review state is invalid: ${z.prettifyError(parsed.error)}`);
+    }
+    if (parsed.data.scopeFingerprint !== scopeFingerprint) {
+        throw new Error("stored diff review state belongs to a different diff snapshot");
+    }
+    return {
+        diffStyle: parsed.data.state.diffStyle,
+        overflowMode: parsed.data.state.overflowMode,
+        codeTheme: parsed.data.state.codeTheme,
+        sidebarOpen: parsed.data.state.sidebarOpen,
+        collapsedFileIds: [...parsed.data.state.collapsedFileIds],
+        viewedFileIds: [...parsed.data.state.viewedFileIds],
+        threads: parsed.data.state.threads.map((thread) => ({
+            id: thread.id,
+            anchor: thread.anchor.kind === "line" ? { ...thread.anchor } : { kind: "detached" },
+            messages: thread.messages.map((message) => ({ ...message })),
+            loading: false,
+            resolved: thread.resolved,
+            collapsed: thread.collapsed,
+        })),
+        brief: {
+            content: parsed.data.state.brief.content,
+            loading: false,
+        },
+    };
+}
+function assertDocumentSize(document) {
+    let serialized;
+    try {
+        serialized = JSON.stringify(document);
+    }
+    catch (error) {
+        throw new Error(`diff review state document is not JSON serializable: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    if (serialized === undefined) {
+        throw new Error("diff review state document is not JSON serializable");
+    }
+    if (Buffer.byteLength(serialized, "utf8") > MAX_PERSISTED_REVIEW_STATE_BYTES) {
+        throw new Error(`diff review state document exceeds ${MAX_PERSISTED_REVIEW_STATE_BYTES} bytes`);
+    }
+}
+//# sourceMappingURL=review_state_persistence.js.map

package/dist/diff_tool/review_state_persistence.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"review_state_persistence.js","sourceRoot":"","sources":["../../src/diff_tool/review_state_persistence.ts"],"names":[],"mappings":"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"}

package/dist/host/local_session_host.js

@@ -85,9 +85,7 @@ export class LocalSessionHost {
                     ? { usageCheckpoint: { ...recovered.snapshot.agentState.usageCheckpoint } }
                     : {}),
             });
-            if (recovered.changed || agentRecovery.recoveredToolResults.length > 0) {
-                await hostedSession.persistRecoveredAgentState(agentRecovery);
-            }
+            await hostedSession.reconcileRecoveredState(agentRecovery);
             return hostedSession;
         }
         catch (error) {
@@ -415,6 +413,7 @@ class LocalHostedSessionHandle {
     goal;
     pendingGoalCommit;
     forceNextSnapshotRevision;
+    projectionFailure;
     disposed = false;
     constructor(runtime, promptBootstrap, catalog, bootstrap, remoteCatalog, getLatestRemoteModelCatalog, includeAgentContext, executionEnvironment, store, history, historyRemote, attributes, createdAt, committedSnapshot, forceNextSnapshotRevision, recordUsage, removeFromHost = () => { }) {
         this.runtime = runtime;
@@ -433,15 +432,15 @@ class LocalHostedSessionHandle {
         this.recordUsage = recordUsage;
         this.removeFromHost = removeFromHost;
         this.session = runtime;
-        this.committedSnapshot = committedSnapshot
-            ? cloneSessionProtocolSnapshot(committedSnapshot)
-            : undefined;
         this.persistedSnapshot = committedSnapshot
             ? cloneSessionProtocolSnapshot(committedSnapshot)
             : undefined;
         this.goal = structuredClone(committedSnapshot?.goal ?? null);
         this.forceNextSnapshotRevision = forceNextSnapshotRevision;
         this.restoreProtocolState(committedSnapshot);
+        this.committedSnapshot = committedSnapshot
+            ? cloneSessionProtocolSnapshot(committedSnapshot)
+            : { ...this.buildSnapshotDraft(), revision: 1 };
     }
     getRemoteModelCatalog() {
         return this.remoteCatalog;
@@ -869,15 +868,12 @@ class LocalHostedSessionHandle {
     }
     async setReasoning(reasoning) {
         this.assertActive();
-        return await this.enqueueMutation(async () => {
-            const fromRevision = this.committedSnapshot?.revision;
+        return await this.enqueueConfigurationMutation(async () => {
+            const fromRevision = this.committedSnapshot.revision;
             this.runtime.setReasoning(reasoning);
             this.bootstrap.persona.settings.reasoning = reasoning;
             const snapshot = await this.commitSnapshot();
-            if (fromRevision === undefined) {
-                this.emitSnapshotReset("configuration", snapshot);
-            }
-            else if (snapshot.revision !== fromRevision) {
+            if (snapshot.revision !== fromRevision) {
                 this.emitDelta(createSessionProtocolDeltaMessage({
                     sessionId: snapshot.sessionId,
                     fromRevision,
@@ -908,7 +904,7 @@ class LocalHostedSessionHandle {
             includeAgentContext: this.includeAgentContext,
             agentContextFiles: runtimeConfig.config.agentContextFiles ?? [],
         });
-        return await this.enqueueMutation(async () => {
+        return await this.enqueueConfigurationMutation(async () => {
             this.runtime.setRuntimeConfig(runtimeConfig.config, runtimeConfig.bootstrap.modelResolver.resolveModel);
             this.runtime.updatePromptContext(runtimeContext.promptBootstrap.promptContext);
             this.runtime.setPersona(selectedPersona, {
@@ -945,7 +941,7 @@ class LocalHostedSessionHandle {
             includeAgentContext: this.includeAgentContext,
             agentContextFiles: runtimeConfig.config.agentContextFiles ?? [],
         });
-        return await this.enqueueMutation(async () => {
+        return await this.enqueueConfigurationMutation(async () => {
             this.runtime.setRuntimeConfig(runtimeConfig.config, runtimeConfig.bootstrap.modelResolver.resolveModel);
             this.runtime.updatePromptContext(runtimeContext.promptBootstrap.promptContext);
             this.runtime.setPersona(nextPersona, {
@@ -1019,7 +1015,7 @@ class LocalHostedSessionHandle {
         return await this.pathAutocompleteLoad;
     }
     async compact(options) {
-        return await this.runMaintenance(async (signal) => {
+        return await this.runAgentStateMutation(() => this.runMaintenance(async (signal) => {
             const result = await this.session.compact({
                 mode: options.mode === "summary-only" ? "only-summary" : "with-last-assistant",
                 ...(options.guidance !== undefined ? { guidance: options.guidance } : {}),
@@ -1031,7 +1027,7 @@ class LocalHostedSessionHandle {
                 compactionMessage: result.compactionMessage,
                 includedLastAssistant: result.includedLastAssistant,
             };
-        });
+        }));
     }
     async runMaintenance(operation) {
         this.assertActive();
@@ -1077,14 +1073,16 @@ class LocalHostedSessionHandle {
         if (!this.timeline.items.some((item) => item.type === "message" && item.messageId === historyEntryId)) {
             throw new Error("rewind failed");
         }
-        const result = await this.session.rewindToHistoryEntryId(historyEntryId);
-        if (!result) {
-            throw new Error("rewind failed");
-        }
-        return {
-            snapshot: await this.snapshot(),
-            ...result,
-        };
+        return await this.runAgentStateMutation(async () => {
+            const result = await this.session.rewindToHistoryEntryId(historyEntryId);
+            if (!result) {
+                throw new Error("rewind failed");
+            }
+            return {
+                snapshot: await this.snapshot(),
+                ...result,
+            };
+        });
     }
     async interruptSubagent(subagentId) {
         this.assertActive();
@@ -1139,11 +1137,9 @@ class LocalHostedSessionHandle {
     }
     async snapshot() {
         this.assertActive();
-        return await this.enqueueMutation(async () => this.runtime.isTurnRunning && this.committedSnapshot
-            ? await this.commitProjectedSnapshot()
-            : await this.commitSnapshot());
+        return await this.enqueueMutation(() => this.commitProjectedSnapshot());
     }
-    async persistRecoveredAgentState(recovery) {
+    async reconcileRecoveredState(recovery) {
         this.assertActive();
         await this.enqueueMutation(async () => {
             const recoveredTools = [];
@@ -1347,7 +1343,7 @@ class LocalHostedSessionHandle {
             if (options.removeMissingAgents) {
                 this.removeMissingSubagentActivities();
             }
-            return cloneSessionProtocolSnapshot(this.committedSnapshot ?? snapshot);
+            return cloneSessionProtocolSnapshot(this.committedSnapshot);
         }
         await this.store.commitSessionSnapshot(snapshot, {
             expectedRevision: this.persistedSnapshot?.revision ?? 0,
@@ -1361,11 +1357,7 @@ class LocalHostedSessionHandle {
     }
     async commitProjectedSnapshot() {
         this.assertNotDisposed();
-        const current = this.committedSnapshot;
-        if (!current) {
-            return await this.commitSnapshot();
-        }
-        const snapshot = cloneSessionProtocolSnapshot(current);
+        const snapshot = cloneSessionProtocolSnapshot(this.committedSnapshot);
         if (this.persistedSnapshot && isDeepStrictEqual(this.persistedSnapshot, snapshot)) {
             return snapshot;
         }
@@ -1378,9 +1370,6 @@ class LocalHostedSessionHandle {
     async commitSnapshotPatch(cause, changes) {
         this.assertNotDisposed();
         const current = this.committedSnapshot;
-        if (!current) {
-            throw new Error("cannot persist a session patch without a committed snapshot");
-        }
         const delta = createSessionProtocolDeltaMessage({
             sessionId: current.sessionId,
             fromRevision: current.revision,
@@ -1613,38 +1602,67 @@ class LocalHostedSessionHandle {
             }
         }
     }
+    async enqueueConfigurationMutation(mutation) {
+        try {
+            return await this.enqueueMutation(mutation);
+        }
+        catch (error) {
+            this.invalidateProjection(error);
+            throw error;
+        }
+    }
+    async runAgentStateMutation(mutation) {
+        const runtimeState = this.runtime.snapshot();
+        try {
+            return await mutation();
+        }
+        catch (error) {
+            if (!isDeepStrictEqual(this.runtime.snapshot(), runtimeState)) {
+                this.invalidateProjection(error);
+            }
+            throw error;
+        }
+    }
     enqueueMutation(mutation) {
         const result = this.mutationQueue
             .catch(() => undefined)
             .then(async () => {
+            this.assertProjectionValid();
             try {
                 return await mutation();
             }
             catch (error) {
-                if (this.committedSnapshot) {
-                    this.goal = structuredClone(this.committedSnapshot.goal);
-                    this.restoreProtocolState(this.committedSnapshot);
-                }
+                this.goal = structuredClone(this.committedSnapshot.goal);
+                this.restoreProtocolState(this.committedSnapshot);
                 throw error;
             }
         });
         this.mutationQueue = result.then(() => undefined, () => undefined);
         return result;
     }
+    invalidateProjection(error) {
+        this.projectionFailure ??= new Error("session state is inconsistent after a failed mutation", {
+            cause: error,
+        });
+    }
+    assertProjectionValid() {
+        if (this.projectionFailure) {
+            throw this.projectionFailure;
+        }
+    }
     assertActive() {
         if (this.disposing || this.disposed) {
             throw new Error(`session is shut down: ${this.sessionId}`);
         }
+        this.assertProjectionValid();
     }
     assertNotDisposed() {
         if (this.disposed) {
             throw new Error(`session is shut down: ${this.sessionId}`);
         }
+        this.assertProjectionValid();
     }
     nextSnapshotRevision(next) {
-        if (!this.committedSnapshot) {
-            return 1;
-        }
         if (this.forceNextSnapshotRevision) {
             this.forceNextSnapshotRevision = false;
             return this.committedSnapshot.revision + 1;
@@ -1688,7 +1706,7 @@ class LocalHostedSessionHandle {
         ]);
     }
     async appendToolHistory(tool, resultHistoryEntryId, result) {
-        const callMessage = this.committedSnapshot?.messages.find((message) => message.id === tool.call.messageId);
+        const callMessage = this.committedSnapshot.messages.find((message) => message.id === tool.call.messageId);
         const call = callMessage?.message.role === "assistant"
             ? callMessage.message.content[tool.call.contentIndex]
             : undefined;
@@ -1928,7 +1946,7 @@ class LocalHostedSessionHandle {
                             message: event.message,
                         },
                     },
-                    ...(this.committedSnapshot?.lifecycle !== lifecycle
+                    ...(this.committedSnapshot.lifecycle !== lifecycle
                         ? [{ type: "lifecycle.set", lifecycle }]
                         : []),
                     ...toolChanges,
@@ -2295,17 +2313,6 @@ class LocalHostedSessionHandle {
         if (changes.length === 0) {
             return;
         }
-        if (!this.committedSnapshot) {
-            if (options.persist === false) {
-                const snapshot = { ...this.buildSnapshotDraft(), revision: 1 };
-                this.committedSnapshot = snapshot;
-                this.emitSnapshotReset(cause, snapshot);
-                return;
-            }
-            const snapshot = await this.commitSnapshot();
-            this.emitSnapshotReset(cause, snapshot);
-            return;
-        }
         if (options.persist !== false) {
             this.emitDelta(await this.commitSnapshotPatch(cause, changes));
             return;
@@ -2333,7 +2340,7 @@ class LocalHostedSessionHandle {
         await this.enqueueMutation(() => this.emitSnapshotResetIfChanged(cause));
     }
     async emitSnapshotResetIfChanged(cause) {
-        const previousRevision = this.committedSnapshot?.revision;
+        const previousRevision = this.committedSnapshot.revision;
         const snapshot = await this.commitSnapshot();
         if (snapshot.revision !== previousRevision) {
             this.emitSnapshotReset(cause, snapshot);
@@ -2399,7 +2406,7 @@ class LocalHostedSessionHandle {
             return;
         }
         const interruptedMessage = createInterruptedAssistantMessage(draft, this.runtime.persona.model);
-        await this.session.commitInterruptedAssistant(interruptedMessage, draft.id);
+        await this.runAgentStateMutation(() => this.session.commitInterruptedAssistant(interruptedMessage, draft.id));
     }
     async cleanupFailedTurn(rootHistoryEntryId, error) {
         if (this.draftAssistantMessage) {