fix(app): hide rewind for attachment-only prompts

Keep the Command Center and message menu eligibility aligned. Rewinding an attachment-only prompt removes the turn without a prompt the composer can restore.
This commit is contained in:
Mohamed Boudra
2026-11-18 16:53:05 +01:00
parent 3f1ab46c37
commit ba95039103
7 changed files with 57 additions and 24 deletions
@@ -2,9 +2,11 @@ import type { Locator } from "@playwright/test";
import { expect, test, type Page } from "../support/fixtures";
import { expectAgentIdle, expectAgentReadyToInterrupt } from "../support/helpers/agent-stream";
import {
blurComposerInput,
cancelAgent,
fillComposerDraft,
expectComposerDraft,
expectComposerNotFocused,
expectComposerVisible,
submitMessage,
} from "../support/helpers/composer";
@@ -71,6 +73,7 @@ test.describe("Agent message rewind", () => {
minDistanceFromBottom: 300,
});
await fillComposerDraft(page, preservedDraft);
await blurComposerInput(page);
rewindCompletion.clearTimelineStreamCount();
const rewind = rewindConversation(page, userMessage, rewoundPrompt);
@@ -84,6 +87,7 @@ test.describe("Agent message rewind", () => {
0,
);
await expectComposerDraft(page, preservedDraft);
await expectComposerNotFocused(page);
await expectNearBottom(page);
} finally {
await agent.cleanup();
@@ -1,10 +1,14 @@
import type { Locator } from "@playwright/test";
import { expect, test, type Page } from "../support/fixtures";
import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
import { openCommandCenter, selectCommandCenterTab } from "../support/helpers/command-center";
import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
import { scrollChatAwayFromBottom } from "../support/helpers/agent-bottom-anchor";
import {
closeCommandCenter,
openCommandCenter,
selectCommandCenterTab,
} from "../support/helpers/command-center";
import { installDaemonWebSocketGate } from "../support/helpers/daemon-websocket-gate";
import {
attachComposerTestImage,
composerLocator,
expectComposerDraft,
expectComposerFocused,
@@ -12,6 +16,7 @@ import {
expectComposerVisible,
fillComposerDraft,
submitMessage,
submitMessageWithButton,
} from "../support/helpers/composer";
import { readReplicaCache, writeReplicaCache } from "../support/helpers/replica-cache-storage";
@@ -213,10 +218,6 @@ test.describe("Rewind sheet", () => {
await expectUserMessageCount(page, 2);
await session.client.waitForFinish(session.agentId);
await scrollChatAwayFromBottom(page, {
deltaY: -900,
minDistanceFromBottom: 300,
});
await userMessage(page, firstPrompt).hover();
await page.getByTestId("rewind-menu-trigger").first().click();
const rewindSheet = page.getByTestId("rewind-menu-content");
@@ -250,17 +251,6 @@ test.describe("Rewind sheet", () => {
await expectComposerNotFocused(page);
await expectUserMessageCount(page, 2);
const preservedDraft = "Keep this human draft after rewind.";
await fillComposerDraft(page, preservedDraft);
await composerLocator(page).evaluate((element) => element.blur());
await userMessage(page, replacementPrompt).hover();
await page.getByTestId("rewind-menu-trigger").last().click();
await expect(page.getByTestId("rewind-menu-content")).toBeVisible();
await selectRewindOption(page, "Rewind files");
await expect(page.getByTestId("rewind-menu-content")).toHaveCount(0);
await expectComposerDraft(page, preservedDraft);
await expectUserMessageCount(page, 2);
await fillComposerDraft(page, "");
await composerLocator(page).evaluate((element) => element.blur());
await userMessage(page, replacementPrompt).hover();
@@ -269,6 +259,7 @@ test.describe("Rewind sheet", () => {
await selectRewindOption(page, "Rewind conversation and files");
await expect(page.getByTestId("rewind-menu-content")).toHaveCount(0);
await expectComposerDraft(page, replacementPrompt);
await expectComposerFocused(page);
await expectUserMessageCount(page, 1);
} finally {
await session.cleanup();
@@ -305,6 +296,35 @@ test.describe("Rewind sheet", () => {
}
});
test("hides rewind when the latest prompt only contains an attachment", async ({ page }) => {
const session = await seedMockAgentWorkspace({
repoPrefix: "rewind-image-only-e2e-",
title: "Rewind image-only prompt",
initialPrompt: "Earlier text prompt.",
});
try {
await openAgentRoute(page, session);
await expectComposerVisible(page);
const palette = await searchRewindActions(page);
await expect(rewindAction(palette, "Rewind conversation")).toBeVisible();
await closeCommandCenter(page);
await attachComposerTestImage(page);
await submitMessageWithButton(page, "");
const imagePrompt = page.getByTestId("user-message").filter({
has: page.getByRole("button", { name: "Open image attachment" }),
});
await expect(imagePrompt).toHaveAttribute("aria-busy", "false");
await session.client.waitForFinish(session.agentId);
const reopened = await searchRewindActions(page);
await expect(reopened.getByText("No matches", { exact: true })).toBeVisible();
} finally {
await session.cleanup();
}
});
test("surfaces rewind failures without crashing the page", async ({ page }) => {
const firstPrompt = "emit 1 coalesced agent stream updates for failed rewind turn.";
const rewindError = "No file checkpoint found for message rewind-failure-e2e.";
+7 -2
View File
@@ -11,7 +11,12 @@ import {
} from "@/components/attachment-pill";
import { MarkdownRenderer } from "@/components/markdown/renderer";
import { useRetainedPanelActive } from "@/components/retained-panel";
import { RewindMenu, useRewindAgentMutation, type RewindMode } from "@/components/rewind";
import {
isRewindableMessage,
RewindMenu,
useRewindAgentMutation,
type RewindMode,
} from "@/components/rewind";
import { TaskListRow } from "@/components/task-list-row";
import { LoadingSpinner } from "@/components/ui/loading-spinner";
import { useIsCompactFormFactor } from "@/constants/layout";
@@ -529,7 +534,7 @@ export const UserMessage = memo(function UserMessage({
<Text style={userMessageStylesheet.timestampText} testID="user-message-timestamp">
{formattedTimestamp}
</Text>
{capabilities && messageId ? (
{capabilities && isRewindableMessage(messageId, message) ? (
<RewindMenu
capabilities={capabilities}
isPending={rewindMutation.isPending}
@@ -10,7 +10,7 @@ import { useToast } from "@/contexts/toast-context";
import { useHostRuntimeIsConnected } from "@/runtime/host-runtime";
import { useSessionStore } from "@/stores/session-store";
import { useRewindAgentMutation } from "./use-rewind-agent-mutation";
import { useRewindMenuItems } from "./use-rewind-capabilities";
import { isRewindableMessage, useRewindMenuItems } from "./use-rewind-capabilities";
export function RewindCommandCenterRegistration({
serverId,
@@ -49,7 +49,7 @@ export function RewindCommandCenterRegistration({
});
const items = useRewindMenuItems(capabilities);
const actions = useMemo<CommandCenterContribution[]>(() => {
if (!message?.messageId) return [];
if (!message || !isRewindableMessage(message.messageId, message.text)) return [];
return items.map((item, rank) => ({
id: `rewind:${item.mode}`,
group: "rewind",
+1 -1
View File
@@ -2,4 +2,4 @@ export { RewindCommandCenterRegistration } from "./command-center-registration";
export { RewindComposerRestoreProvider } from "./composer-restore";
export { RewindMenu } from "./rewind-menu";
export { useRewindAgentMutation } from "./use-rewind-agent-mutation";
export type { RewindMode } from "./use-rewind-capabilities";
export { isRewindableMessage, type RewindMode } from "./use-rewind-capabilities";
@@ -22,6 +22,10 @@ const DEFAULT_REWIND_MENU_LABELS: RewindMenuLabels = {
both: "Rewind conversation and files",
};
export function isRewindableMessage(messageId: string | undefined, text: string): boolean {
return Boolean(messageId) && text.trim().length > 0;
}
export function resolveRewindMenuItems(
capabilities:
| Pick<
+1 -1
View File
@@ -1108,7 +1108,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
(restoredComposerText: boolean) => {
streamViewRef.current?.scrollToBottom("rewind");
if (restoredComposerText) {
// Let the rewind menu close and the editor apply the restored draft before focusing.
// Defer focus so the editor can apply the restored draft and the menu can start closing.
requestAnimationFrame(focusRestoredComposer);
}
},