A desktop coding agent with free access to frontier models.
TypeScript
fix: nothing sends into a reverted chat unasked, undo key per chat
ogsamrat7429c1a70a0d
diff --git a/apps/app/src/react-app/domains/session/commands/session-command-controls.tsx b/apps/app/src/react-app/domains/session/commands/session-command-controls.tsxindex a9fa80fe..fb574df2 100644--- a/apps/app/src/react-app/domains/session/commands/session-command-controls.tsx+++ b/apps/app/src/react-app/domains/session/commands/session-command-controls.tsx@@ -63,7 +63,7 @@ export function SessionCommandControls(props: SessionCommandControlsProps) {}, [canRedo, canUndo, props.sessionId, redo, setHeaderActions, undo]);useEffect(() => {const onKey = (event: KeyboardEvent) => {- const action = chatUndoKey(event, isMac());+ const action = chatUndoKey(event, isMac(), props.sessionId);if (!action) return;// Only with the chat on screen: no dialog or menu in front of it.if (document.querySelector("[role=dialog][data-open], [role=alertdialog], [role=menu]")) return;@@ -82,7 +82,7 @@ export function SessionCommandControls(props: SessionCommandControlsProps) {};window.addEventListener("keydown", onKey, true);return () => window.removeEventListener("keydown", onKey, true);- }, [canRedo, canUndo, redo, running, undo]);+ }, [canRedo, canUndo, props.sessionId, redo, running, undo]);const mod = isMac() ? "⌘" : "Ctrl+";return (diff --git a/apps/app/src/react-app/domains/session/commands/undo-key.ts b/apps/app/src/react-app/domains/session/commands/undo-key.tsindex 53db2b2f..5d6ed325 100644--- a/apps/app/src/react-app/domains/session/commands/undo-key.ts+++ b/apps/app/src/react-app/domains/session/commands/undo-key.ts@@ -3,7 +3,7 @@type KeyTarget = {tagName?: string;isContentEditable?: boolean;- closest?: (selector: string) => unknown;+ closest?: (selector: string) => { getAttribute?: (name: string) => string | null } | null;};/** Anything with a key meaning of its own: fields, editors, terminals, buttons, links, lists, trees, menus. */@@ -18,8 +18,9 @@ const OWN_KEYS = [* (`[data-chat-transcript]`, focused by a click in it), never from anything with its own keys (a field,* the composer, a code editor, the IDE's file tree, tabs, search or problems lists, a button), never from* the page itself (nothing focused), and never a held key's auto-repeat: one press is one turn at most.+ * With `sessionId`, only this chat's own transcript (a split view shows a second chat beside it).*/-export function chatUndoKey(event: Pick<KeyboardEvent, "key" | "metaKey" | "ctrlKey" | "altKey" | "shiftKey" | "target" | "defaultPrevented"> & { repeat?: boolean }, mac: boolean): "undo" | "redo" | null {+export function chatUndoKey(event: Pick<KeyboardEvent, "key" | "metaKey" | "ctrlKey" | "altKey" | "shiftKey" | "target" | "defaultPrevented"> & { repeat?: boolean }, mac: boolean, sessionId?: string): "undo" | "redo" | null {if (event.defaultPrevented || event.altKey || event.repeat) return null;if (!(mac ? event.metaKey && !event.ctrlKey : event.ctrlKey && !event.metaKey)) return null;if (event.key?.toLowerCase() !== "z") return null;@@ -28,5 +29,6 @@ export function chatUndoKey(event: Pick<KeyboardEvent, "key" | "metaKey" | "ctrlif (target.isContentEditable) return null;if (target.closest(OWN_KEYS)) return null;if (!target.closest("[data-chat-transcript]")) return null;+ if (sessionId !== undefined && target.closest("[data-session-surface-id]")?.getAttribute?.("data-session-surface-id") !== sessionId) return null;return event.shiftKey ? "redo" : "undo";}diff --git a/apps/app/src/react-app/domains/session/surface/revert-scope.ts b/apps/app/src/react-app/domains/session/surface/revert-scope.tsindex 3120563c..13532fc4 100644--- a/apps/app/src/react-app/domains/session/surface/revert-scope.ts+++ b/apps/app/src/react-app/domains/session/surface/revert-scope.ts@@ -59,8 +59,10 @@ export function editTargetText(turns: number | null): string {}/** The question before an edit of an earlier message goes out. */-export function editConfirmText(turns: number | null): string {- return `Send this in place of the earlier message? It removes ${laterTurns(turns)} for good and undoes their file changes.`;+export function editConfirmText(turns: number | null, hidden = 0): string {+ const hiddenToo = hidden > 0 ? ` The ${hidden} hidden message${hidden === 1 ? " goes" : "s go"} for good too.` : "";+ if (turns === 1) return `Send this in place of your last message? It undoes that turn's file changes.${hiddenToo}`;+ return `Send this in place of the earlier message? It removes ${laterTurns(turns)} for good and undoes their file changes.${hiddenToo}`;}/** The question before a send that would delete hidden (reverted) messages for good. */diff --git a/apps/app/src/react-app/domains/session/surface/session-surface.tsx b/apps/app/src/react-app/domains/session/surface/session-surface.tsxindex 40af85a7..e0e75d52 100644--- a/apps/app/src/react-app/domains/session/surface/session-surface.tsx+++ b/apps/app/src/react-app/domains/session/surface/session-surface.tsx@@ -2296,7 +2296,8 @@ export function SessionSurface(props: SessionSurfaceProps) {// An edited earlier message replaces every turn after it, and their file changes, for good: ask first.if (nextDraft.revertMessageId) {const turns = turnsFromRevertPoint(baseRenderedMessages, nextDraft.revertMessageId);- if (revertNeedsConfirm(turns) && !window.confirm(editConfirmText(turns))) return;+ const hidden = revertMessageId ? revertedMessageCount : 0;+ if ((revertNeedsConfirm(turns) || hidden > 0) && !window.confirm(editConfirmText(turns, hidden))) return;} else if (revertMessageId && !window.confirm(hiddenDeleteConfirmText(revertedMessageCount))) {// The engine deletes hidden (reverted) turns on the next prompt: never as a side effect of a send.return;@@ -2477,6 +2478,7 @@ export function SessionSurface(props: SessionSurfaceProps) {const item = getComposerQueuedDrafts(useComposerStateStore.getState(), props.sessionId).find((queued) => queued.id === id);const target = withoutRevertTarget(item?.draft ?? null);if (!item || !target) return;+ if (revertMessageId && !window.confirm(hiddenDeleteConfirmText(revertedMessageCount))) return;if (!claimQueuedSend(props.sessionId, item.id, true)) return;const generation = getQueuedSendGeneration(props.sessionId);setSendingQueued(true);@@ -2503,6 +2505,8 @@ export function SessionSurface(props: SessionSurfaceProps) {prependQueuedDrafts,props.sessionId,removeQueuedDraftFromStore,+ revertMessageId,+ revertedMessageCount,sendDraft,sendingQueued,]);@@ -2625,6 +2629,8 @@ export function SessionSurface(props: SessionSurfaceProps) {if (cloudQueueBlockedRef.current) return;if (queuedItems.length === 0) return;if (chatStreaming || liveStatus.type !== "idle") return;+ // A reverted chat: this send would delete its hidden turns. Held until Restore or a confirmed send.+ if (revertMessageId) return;if (!canAdmitNextQueuedItem(queuedDrainState)) return;const nextItem = getComposerQueuedDrafts(useComposerStateStore.getState(), props.sessionId)[0];if (!nextItem) return;@@ -2662,7 +2668,7 @@ export function SessionSurface(props: SessionSurfaceProps) {drainingQueueRef.current = false;}})();- }, [chatStreaming, cloudQueueRetryVersion, liveStatus.type, prependQueuedDrafts, props.sessionId, queuedDrainState, queuedItems, removeQueuedDraftFromStore, sendDraft, sendingQueued]);+ }, [chatStreaming, cloudQueueRetryVersion, liveStatus.type, prependQueuedDrafts, props.sessionId, queuedDrainState, queuedItems, removeQueuedDraftFromStore, revertMessageId, sendDraft, sendingQueued]);useEffect(() => {if (props.cloudMcpSubmissionState.status !== "failed") {@@ -3060,6 +3066,7 @@ export function SessionSurface(props: SessionSurfaceProps) {const [resuming, setResuming] = useState(false);const handleResumeInterrupted = useCallback(async (recoveryPrompt: string) => {await resumeGuardRef.current.run(async () => {+ if (revertMessageId && !window.confirm(hiddenDeleteConfirmText(revertedMessageCount))) return;const messageID = createPromptMessageID();dispatchQueuedDrain(props.sessionId, { type: "user_retry" });if (!claimQueuedSend(props.sessionId, messageID, true)) return;@@ -3078,7 +3085,7 @@ export function SessionSurface(props: SessionSurfaceProps) {setResuming(false);}});- }, [props.sessionId, sendDraft]);+ }, [props.sessionId, revertMessageId, revertedMessageCount, sendDraft]);const handleAutoRetry = useCallback((prompt: string) => {void handleResumeInterrupted(prompt);}, [handleResumeInterrupted]);@@ -3519,7 +3526,7 @@ export function SessionSurface(props: SessionSurfaceProps) {onRestore={handleRestoreRevertedSession}/>) : null}- {composerEditTarget && !revertMessageId ? (+ {composerEditTarget ? (<divclassName="mx-3 mb-2 flex items-center gap-3 rounded-xl border border-amber-7/40 bg-amber-2/30 px-3 py-2 text-xs text-warning"data-testid="composer-edit-target"diff --git a/apps/app/src/react-app/domains/session/sync/global-queue-drainer.ts b/apps/app/src/react-app/domains/session/sync/global-queue-drainer.tsindex 3deb7263..4503cea5 100644--- a/apps/app/src/react-app/domains/session/sync/global-queue-drainer.ts+++ b/apps/app/src/react-app/domains/session/sync/global-queue-drainer.ts@@ -1,5 +1,6 @@import type { SessionStatus } from "@opencode-ai/sdk/v2/client";+import { isSessionReverted } from "./reverted-sessions";import { markTaskRunStart } from "@/app/lib/analytics";import { createClient, createPromptMessageID, hasAcceptedPromptMessage, isPromptAdmissionUnknown } from "@/app/lib/opencode";import { shellInSession } from "@/app/lib/opencode-session";@@ -344,6 +345,8 @@ async function attemptDrain(sessionId: string) {const nextItem = getComposerQueuedDrafts(useComposerStateStore.getState(), sessionId)[0];if (!context || !nextItem || watched.lastObservedStatus?.type !== "idle") return;if (!canAdmitNextQueuedItem(getQueuedDrainState(sessionId))) return;+ // A reverted chat: the engine would delete its hidden turns on this send. Held until Restore or a confirmed send.+ if (isSessionReverted(sessionId)) return;const draft = { ...withoutRevertTarget(nextItem.draft), messageId: nextItem.draft.messageId ?? createPromptMessageID() };// Claim synchronously before any await so a mounted surface cannot win thediff --git a/apps/app/src/react-app/domains/session/sync/reverted-sessions.ts b/apps/app/src/react-app/domains/session/sync/reverted-sessions.tsnew file mode 100644index 00000000..eefe5e65--- /dev/null+++ b/apps/app/src/react-app/domains/session/sync/reverted-sessions.ts@@ -0,0 +1,22 @@+/**+ * Chats with turns hidden by a revert (the engine's `session.revert`). The+ * engine deletes hidden turns for good on the next prompt, so nothing may send+ * into such a chat on its own (a queued draft, a background drain): only a send+ * the person confirmed. Kept in step with every place the app learns the+ * revert cursor: snapshots, session.updated events, revert and restore.+ */+const reverted = new Set<string>();++export function markSessionReverted(sessionId: string, revertMessageId: string | null | undefined): void {+ if (!sessionId) return;+ if (revertMessageId) reverted.add(sessionId);+ else reverted.delete(sessionId);+}++export function isSessionReverted(sessionId: string): boolean {+ return reverted.has(sessionId);+}++export function __resetRevertedSessionsForTest(): void {+ reverted.clear();+}diff --git a/apps/app/src/react-app/domains/session/sync/session-sync.ts b/apps/app/src/react-app/domains/session/sync/session-sync.tsindex 157a3d23..054fa202 100644--- a/apps/app/src/react-app/domains/session/sync/session-sync.ts+++ b/apps/app/src/react-app/domains/session/sync/session-sync.ts@@ -32,6 +32,7 @@ import {} from "./parse-tool-parts";import type { OmniRushSessionSnapshot } from "@/app/lib/omnirush-server";import { applyRevertCursor, reconcileTranscriptMessages } from "./transcript-reconcile";+import { markSessionReverted } from "./reverted-sessions";import {useSessionActivityStore,} from "../status/session-activity-store";@@ -926,6 +927,8 @@ function applyEvent(entry: SyncEntry, workspaceId: string, event: OpencodeEvent)return { ...current, session: { ...current.session, revert } };},);+ // Same rule as the cache above: an update without a cursor clears it (the engine sends the whole session).+ markSessionReverted(update.sessionId, (update.info as { revert?: { messageID?: string } | null }).revert?.messageID);return;}@@ -1829,6 +1832,7 @@ export function seedSessionState(workspaceId: string, snapshot: OmniRushSessionS}}+ markSessionReverted(snapshot.session.id, snapshot.session.revert?.messageID);// The snapshot's revert cursor is authoritative: messages at/after it are// reverted server-side, so the cache must not keep them alive (a later// merge would resurrect them once the server deletes them on next prompt).@@ -1866,6 +1870,7 @@ export function seedSessionState(workspaceId: string, snapshot: OmniRushSessionSexport function applySessionRevert(workspaceId: string, session: Session) {const queryClient = getReactQueryClient();const revertMessageId = session.revert?.messageID ?? null;+ markSessionReverted(session.id, revertMessageId);queryClient.setQueryData<OmniRushSessionSnapshot>(snapshotKey(workspaceId, session.id),@@ -1881,6 +1886,7 @@ export function applySessionRevert(workspaceId: string, session: Session) {/** Clear a server-confirmed revert cursor without discarding cached history. */export function applySessionUnrevert(workspaceId: string, sessionId: string) {const queryClient = getReactQueryClient();+ markSessionReverted(sessionId, null);void queryClient.cancelQueries({ queryKey: snapshotKey(workspaceId, sessionId) });queryClient.setQueryData<OmniRushSessionSnapshot>(snapshotKey(workspaceId, sessionId),diff --git a/apps/app/tests/revert-scope.test.ts b/apps/app/tests/revert-scope.test.tsindex e060e478..00e1abb8 100644--- a/apps/app/tests/revert-scope.test.ts+++ b/apps/app/tests/revert-scope.test.ts@@ -46,6 +46,8 @@ describe("revertNeedsConfirm", () => {expect(editTargetText(3)).toBe("Editing an earlier message: sending will remove the 2 later turns and undo their file changes.");expect(editTargetText(1)).toBe("Editing your last message: sending replaces it and undoes its file changes.");expect(editConfirmText(4)).toBe("Send this in place of the earlier message? It removes the 3 later turns for good and undoes their file changes.");+ expect(editConfirmText(1, 20)).toBe("Send this in place of your last message? It undoes that turn's file changes. The 20 hidden messages go for good too.");+ expect(editConfirmText(3, 1)).toContain("The 1 hidden message goes for good too.");expect(hiddenDeleteConfirmText(6)).toBe("Sending removes the 6 hidden messages for good; their file changes stay undone. Send and remove them? (Cancel keeps them: Restore brings them back.)");});});diff --git a/apps/app/tests/reverted-sessions.test.ts b/apps/app/tests/reverted-sessions.test.tsnew file mode 100644index 00000000..f184c649--- /dev/null+++ b/apps/app/tests/reverted-sessions.test.ts@@ -0,0 +1,19 @@+import { afterEach, describe, expect, test } from "bun:test";++import { __resetRevertedSessionsForTest, isSessionReverted, markSessionReverted } from "../src/react-app/domains/session/sync/reverted-sessions";++afterEach(() => __resetRevertedSessionsForTest());++describe("reverted sessions", () => {+ test("a revert cursor holds the chat, its clearing releases it", () => {+ expect(isSessionReverted("ses_a")).toBe(false);+ markSessionReverted("ses_a", "msg_1");+ expect(isSessionReverted("ses_a")).toBe(true);+ expect(isSessionReverted("ses_b")).toBe(false);+ markSessionReverted("ses_a", undefined);+ expect(isSessionReverted("ses_a")).toBe(false);+ markSessionReverted("ses_a", "msg_2");+ markSessionReverted("ses_a", null);+ expect(isSessionReverted("ses_a")).toBe(false);+ });+});diff --git a/apps/app/tests/session-commands.test.ts b/apps/app/tests/session-commands.test.tsindex b77377e2..89d1327e 100644--- a/apps/app/tests/session-commands.test.ts+++ b/apps/app/tests/session-commands.test.ts@@ -215,6 +215,18 @@ describe("chatUndoKey", () => {expect(chatUndoKey(key({ metaKey: true, target: null }), true)).toBeNull();});+ test("only this chat's own transcript, not a split view's other chat", () => {+ const inSurface = (id: string) => ({+ tagName: "DIV",+ isContentEditable: false,+ closest: (selector: string) => selector === "[data-chat-transcript]" ? {}+ : selector === "[data-session-surface-id]" ? { getAttribute: () => id } : null,+ });+ expect(chatUndoKey(key({ metaKey: true, target: inSurface("ses_a") }), true, "ses_a")).toBe("undo");+ expect(chatUndoKey(key({ metaKey: true, target: inSurface("ses_b") }), true, "ses_a")).toBeNull();+ expect(chatUndoKey(key({ metaKey: true, target: transcript }), true, "ses_a")).toBeNull();+ });+test("a held key undoes one turn at most, not one per auto-repeat", () => {expect(chatUndoKey(key({ metaKey: true, target: transcript, repeat: true }), true)).toBeNull();expect(chatUndoKey(key({ metaKey: true, shiftKey: true, target: transcript, repeat: true }), true)).toBeNull();