Skip to content

Commit 53ebc0f

Browse files
committed
fix(tui): tighten undo cancel and message probe
Keep /undo pending cancel on mutatePending for single-flight and toasts. Treat only MessageNotFoundError from message.get as withdrawn.
1 parent db245dd commit 53ebc0f

5 files changed

Lines changed: 76 additions & 17 deletions

File tree

‎packages/app/src/session/revert.ts‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { SessionMessageUser } from "@opencode/client/promise"
1+
import { isMessageNotFoundError, type SessionMessageUser } from "@opencode/client/promise"
22
import { useComposerState } from "@/composer/persistence"
33
import { useData } from "@/runtime/server/current"
44
import { useServerSDK } from "@/runtime/server/client"
@@ -61,9 +61,20 @@ export function createSessionRevert(input: {
6161
const promoted = await server.api.session.message
6262
.get({ sessionID, messageID: message.id })
6363
.then(
64-
() => true,
65-
() => false,
64+
() => true as const,
65+
(error) => {
66+
if (isMessageNotFoundError(error)) return false as const
67+
throw error
68+
},
6669
)
70+
.catch((error) => {
71+
showToast({
72+
title: language.t("common.requestFailed"),
73+
description: error instanceof Error ? error.message : String(error),
74+
})
75+
return "failed" as const
76+
})
77+
if (promoted === "failed") return
6778
if (!promoted) {
6879
restore(target, message)
6980
owner.run(() => input.setActiveMessage(previous))

‎packages/tui/src/routes/session/dialog-message.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ export function DialogMessage(props: {
4747
messageID: props.messageID,
4848
}),
4949
})
50-
.then(() => {
51-
if (value?.type !== "user") return
50+
.then((result) => {
51+
if (result === "aborted" || value?.type !== "user") return
5252
props.setPrompt?.({
5353
...projectedPromptInput(value),
5454
pasted: [],

‎packages/tui/src/routes/session/index.tsx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,11 +1118,17 @@ export function Session(props: {
11181118
}
11191119
const sessionID = route.sessionID
11201120
const target = prompt()
1121+
const api = revertUserMessageApi(client.api.session, { sessionID, messageID: message.id })
11211122
void revertUserMessage({
11221123
pending: data.session.input.has(sessionID, message.id),
1123-
api: revertUserMessageApi(client.api.session, { sessionID, messageID: message.id }),
1124+
api: {
1125+
...api,
1126+
// Keep the single-flight guard and failure toast from mutatePending.
1127+
cancel: () => mutatePending("cancel", message.id, "undo"),
1128+
},
11241129
})
1125-
.then(() => {
1130+
.then((result) => {
1131+
if (result === "aborted") return
11261132
target?.set({
11271133
...projectedPromptInput(message),
11281134
pasted: [],

‎packages/tui/src/routes/session/undo.ts‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import type { OpenCodeClient } from "@opencode/client"
1+
import { isMessageNotFoundError, type OpenCodeClient } from "@opencode/client"
22

33
export type RevertUserMessageApi = {
4-
cancel: () => Promise<void>
4+
/** Returns false when cancel was declined locally (already toasted). */
5+
cancel: () => Promise<boolean>
56
messageExists: () => Promise<boolean>
67
interrupt: () => Promise<void>
78
wait: () => Promise<void>
@@ -18,7 +19,7 @@ export type RevertUserMessageApi = {
1819
*/
1920
export async function revertUserMessage(input: { pending: boolean; api: RevertUserMessageApi }) {
2021
if (input.pending) {
21-
await input.api.cancel()
22+
if (!(await input.api.cancel())) return "aborted" as const
2223
if (!(await input.api.messageExists())) return "cancelled" as const
2324
}
2425
await input.api.interrupt()
@@ -27,17 +28,25 @@ export async function revertUserMessage(input: { pending: boolean; api: RevertUs
2728
return "staged" as const
2829
}
2930

31+
/** True when the message is projected; false only for MessageNotFoundError. */
32+
export async function projectedMessageExists(get: () => Promise<unknown>) {
33+
try {
34+
await get()
35+
return true
36+
} catch (error) {
37+
if (isMessageNotFoundError(error)) return false
38+
throw error
39+
}
40+
}
41+
3042
export function revertUserMessageApi(
3143
session: OpenCodeClient["session"],
3244
input: { sessionID: string; messageID: string },
3345
): RevertUserMessageApi {
3446
return {
35-
cancel: () => session.inbox.cancel({ sessionID: input.sessionID, inboxID: input.messageID }).then(() => undefined),
47+
cancel: () => session.inbox.cancel({ sessionID: input.sessionID, inboxID: input.messageID }).then(() => true),
3648
messageExists: () =>
37-
session.message.get({ sessionID: input.sessionID, messageID: input.messageID }).then(
38-
() => true,
39-
() => false,
40-
),
49+
projectedMessageExists(() => session.message.get({ sessionID: input.sessionID, messageID: input.messageID })),
4150
interrupt: () => session.interrupt({ sessionID: input.sessionID }).then(() => undefined),
4251
wait: () => session.wait({ sessionID: input.sessionID }).then(() => undefined),
4352
stage: () =>

‎packages/tui/test/cli/tui/undo.test.ts‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
import { expect, test } from "bun:test"
2-
import { revertUserMessage, type RevertUserMessageApi } from "../../../src/routes/session/undo"
2+
import {
3+
projectedMessageExists,
4+
revertUserMessage,
5+
type RevertUserMessageApi,
6+
} from "../../../src/routes/session/undo"
37

48
function api(handlers: Partial<RevertUserMessageApi> & { calls?: string[] }): RevertUserMessageApi {
59
const calls = handlers.calls ?? []
610
return {
711
cancel: async () => {
812
calls.push("cancel")
9-
await handlers.cancel?.()
13+
return (await handlers.cancel?.()) ?? true
1014
},
1115
messageExists: async () => {
1216
calls.push("messageExists")
@@ -63,6 +67,19 @@ test.each([
6367
expect(outcome).toBe(result)
6468
})
6569

70+
test("revertUserMessage stops when cancel is declined locally", async () => {
71+
const calls: string[] = []
72+
const outcome = await revertUserMessage({
73+
pending: true,
74+
api: api({
75+
calls,
76+
cancel: async () => false,
77+
}),
78+
})
79+
expect(calls).toEqual(["cancel"])
80+
expect(outcome).toBe("aborted")
81+
})
82+
6683
test("revertUserMessage surfaces cancel failures without staging", async () => {
6784
const calls: string[] = []
6885
await expect(
@@ -95,3 +112,19 @@ test("revertUserMessage surfaces stage failures after a promotion race", async (
95112
).rejects.toMatchObject({ message: "Message not found" })
96113
expect(calls).toEqual(["cancel", "messageExists", "interrupt", "wait", "stage"])
97114
})
115+
116+
test("projectedMessageExists treats only MessageNotFoundError as missing", async () => {
117+
expect(
118+
await projectedMessageExists(async () => {
119+
throw Object.assign(new Error("Message not found"), { _tag: "MessageNotFoundError" })
120+
}),
121+
).toBe(false)
122+
123+
await expect(
124+
projectedMessageExists(async () => {
125+
throw Object.assign(new Error("offline"), { _tag: "UnknownError" })
126+
}),
127+
).rejects.toMatchObject({ message: "offline", _tag: "UnknownError" })
128+
129+
expect(await projectedMessageExists(async () => ({ id: "msg_1" }))).toBe(true)
130+
})

0 commit comments

Comments
 (0)