Skip to content

πŸ™Œ OpenHands: AI-Driven Development

fix: keep confirmation prompt visible outside grouped events (#17134)

Juan Pedro Michelini Jorgec8c7c8ef83c7
diff --git a/__tests__/components/conversation-events/chat/messages-confirmation.test.tsx b/__tests__/components/conversation-events/chat/messages-confirmation.test.tsx
new file mode 100644
index 0000000000..7eb84db8aa
--- /dev/null
+++ b/__tests__/components/conversation-events/chat/messages-confirmation.test.tsx
@@ -0,0 +1,100 @@
+import { describe, expect, it, vi, beforeEach } from "vitest";
+import { screen } from "@testing-library/react";
+import { Messages } from "#/components/conversation-events/chat/messages";
+import { useEventStore } from "#/stores/use-event-store";
+import { AgentState } from "#/types/agent-state";
+import { ActionEvent, SecurityRisk } from "#/types/agent-server/core";
+import { ExecuteBashAction } from "#/types/agent-server/core/base/action";
+import { renderWithProviders } from "test-utils";
+
+vi.mock("#/hooks/query/use-config", () => ({
+ useConfig: () => ({ data: {} }),
+}));
+
+vi.mock("#/hooks/query/use-active-conversation", () => ({
+ useActiveConversation: () => ({
+ data: {
+ id: "test-conversation-id",
+ conversation_url: "",
+ session_api_key: null,
+ },
+ }),
+}));
+
+vi.mock("#/hooks/use-agent-state", () => ({
+ useAgentState: () => ({
+ curAgentState: AgentState.AWAITING_USER_CONFIRMATION,
+ }),
+}));
+
+vi.mock("#/hooks/mutation/use-respond-to-confirmation", () => ({
+ useRespondToConfirmation: () => ({ mutate: vi.fn() }),
+}));
+
+const createBashActionEvent = (
+ id: string,
+ command: string,
+): ActionEvent<ExecuteBashAction> => ({
+ id,
+ timestamp: new Date().toISOString(),
+ source: "agent",
+ thought: [],
+ thinking_blocks: [],
+ action: {
+ kind: "ExecuteBashAction",
+ command,
+ is_input: false,
+ timeout: null,
+ reset: false,
+ },
+ tool_name: "execute_bash",
+ tool_call_id: `call_bash_${id}`,
+ tool_call: {
+ id: `call_bash_${id}`,
+ type: "function",
+ function: {
+ name: "execute_bash",
+ arguments: JSON.stringify({ command }),
+ },
+ },
+ llm_response_id: `response_${id}`,
+ security_risk: SecurityRisk.HIGH,
+});
+
+describe("Messages confirmation prompt", () => {
+ beforeEach(() => {
+ useEventStore.setState({
+ events: [],
+ eventIds: new Set(),
+ uiEvents: [],
+ loadedConversationId: null,
+ });
+ });
+
+ it("keeps confirmation visible when the latest action is inside a collapsed event group", () => {
+ const events = [
+ createBashActionEvent("action-1", "echo first"),
+ createBashActionEvent("action-2", "echo second"),
+ ];
+
+ useEventStore.setState({
+ events,
+ eventIds: new Set(events.map((event) => event.id)),
+ uiEvents: events,
+ loadedConversationId: "test-conversation-id",
+ });
+
+ renderWithProviders(<Messages messages={events} allEvents={events} />);
+
+ expect(screen.getByTestId("event-group")).toBeInTheDocument();
+ expect(screen.getByTestId("event-group-toggle")).toHaveAttribute(
+ "aria-expanded",
+ "false",
+ );
+ expect(
+ screen.getByText("CHAT_INTERFACE$USER_ASK_CONFIRMATION"),
+ ).toBeInTheDocument();
+ expect(screen.getByTestId("action-reject-button")).toBeInTheDocument();
+ expect(screen.getByTestId("action-confirm-button")).toBeInTheDocument();
+ });
+});
diff --git a/src/components/conversation-events/chat/event-message-components/generic-event-message-wrapper.tsx b/src/components/conversation-events/chat/event-message-components/generic-event-message-wrapper.tsx
index ad684c1d6f..21c0bf270c 100644
--- a/src/components/conversation-events/chat/event-message-components/generic-event-message-wrapper.tsx
+++ b/src/components/conversation-events/chat/event-message-components/generic-event-message-wrapper.tsx
@@ -22,7 +22,6 @@ import {
isSkillReadyEvent,
} from "../event-content-helpers/create-skill-ready-event";
import { getInvokeSkillItems } from "../event-content-helpers/get-invoke-skill-items";
-import { ConversationConfirmationButtons } from "#/components/shared/buttons/conversation-confirmation-buttons";
import { SkillReadyContentList } from "./skill-ready-content-list";
import SkillsIcon from "#/icons/skills.svg?react";
import { isMarkdownFileEditorEvent } from "#/components/features/chat/tool-visualizers/primitives/markdown-file-preview";
@@ -67,7 +66,6 @@ function getSkillKnowledge(
export function GenericEventMessageWrapper({
event,
- isLastMessage,
correspondingAction,
}: GenericEventMessageWrapperProps) {
const { title, details } = getEventContent(event, correspondingAction);
@@ -124,7 +122,6 @@ export function GenericEventMessageWrapper({
) : undefined
}
/>
- {isLastMessage && <ConversationConfirmationButtons />}
</div>
);
}
diff --git a/src/components/conversation-events/chat/event-message-components/user-assistant-event-message.tsx b/src/components/conversation-events/chat/event-message-components/user-assistant-event-message.tsx
index 9d73e9d244..64d5e4b931 100644
--- a/src/components/conversation-events/chat/event-message-components/user-assistant-event-message.tsx
+++ b/src/components/conversation-events/chat/event-message-components/user-assistant-event-message.tsx
@@ -4,7 +4,6 @@ import { useNavigation } from "#/context/navigation-context";
import { MessageEvent } from "#/types/agent-server/core";
import { ChatMessage } from "../../../features/chat/chat-message";
import { ImageCarousel } from "../../../features/images/image-carousel";
-import { ConversationConfirmationButtons } from "#/components/shared/buttons/conversation-confirmation-buttons";
import { parseMessageFromEvent } from "../event-content-helpers/parse-message-from-event";
import { CriticResultDisplay } from "./critic-result-display";
import { CollapsibleThinking } from "./collapsible-thinking";
@@ -26,7 +25,6 @@ interface UserAssistantEventMessageProps {
export function UserAssistantEventMessage({
event,
- isLastMessage,
isFromPlanningAgent,
}: UserAssistantEventMessageProps) {
const { t } = useTranslation("openhands");
@@ -125,7 +123,6 @@ export function UserAssistantEventMessage({
{imageUrls.length > 0 && (
<ImageCarousel size="small" images={imageUrls} />
)}
- {isLastMessage && <ConversationConfirmationButtons />}
</ChatMessage>
{event.source === "agent" && event.critic_result != null && (
<CriticResultDisplay criticResult={event.critic_result} />
diff --git a/src/components/conversation-events/chat/messages.tsx b/src/components/conversation-events/chat/messages.tsx
index fe3b090786..367eb60574 100644
--- a/src/components/conversation-events/chat/messages.tsx
+++ b/src/components/conversation-events/chat/messages.tsx
@@ -8,6 +8,7 @@ import { ThoughtEventMessage } from "./event-message-components/thought-event-me
import { useModelStore } from "#/stores/model-store";
import { ModelMessages } from "#/components/features/chat/model-messages";
import { useOptionalConversationId } from "#/hooks/use-conversation-id";
+import { ConversationConfirmationButtons } from "#/components/shared/buttons/conversation-confirmation-buttons";
interface MessagesProps {
messages: OpenHandsEvent[]; // UI events (actions replaced by observations)
@@ -124,6 +125,7 @@ export const Messages: React.FC<MessagesProps> = React.memo(
</React.Fragment>
);
})}
+ <ConversationConfirmationButtons />
</>
);
},