Skip to content

AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.

fix(frontend/copilot): a held call's chain row shows the answer at the click (#14982)

Reinier van der Leere23dc0f0e8eb
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ApprovalQueue/ApprovalQueue.stories.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ApprovalQueue/ApprovalQueue.stories.tsx
index d7ee783c8f..a2f46cd0d6 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ApprovalQueue/ApprovalQueue.stories.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ApprovalQueue/ApprovalQueue.stories.tsx
@@ -10,6 +10,7 @@ import { toChainRow } from "../ToolChain/helpers";
import { AttentionRow } from "../../../home/components/NeedsYou/components/AttentionRow";
import { ApprovalQueue } from "./ApprovalQueue";
import { toApprovalItem } from "./helpers";
+import { useHeldAnswersStore } from "./heldAnswersStore";
import {
createAgent,
deleteFolder,
@@ -287,6 +288,25 @@ export const ChainRows: StoryObj = {
},
};
+// Approve the card: the row above it shows the answer at the click.
+export const RowFlipsAtTheClick: StoryObj = {
+ parameters: { msw: { handlers: [answerAfter(0)] } },
+ render: function Render() {
+ const answers = useHeldAnswersStore((state) => state.answers);
+ const row = applyHeldOutcome(
+ toChainRow(HELD_PART("a", "Q3 reports"), 0)!,
+ new Map(),
+ answers,
+ );
+ return (
+ <div className="flex flex-col gap-4">
+ <ChainRowView row={row} isLast />
+ <ApprovalQueue {...queueOf([folder("a", "Q3 reports")])} />
+ </div>
+ );
+ },
+};
+
export const HeldRead: Story = {
args: queueOf([heldRead("r", "docs.northwind.io/billing")]),
};
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ApprovalQueue/__tests__/ApprovalQueue.test.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ApprovalQueue/__tests__/ApprovalQueue.test.tsx
index b438e55ef0..fde2473c7e 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ApprovalQueue/__tests__/ApprovalQueue.test.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ApprovalQueue/__tests__/ApprovalQueue.test.tsx
@@ -1,6 +1,6 @@
import userEvent from "@testing-library/user-event";
import { http, HttpResponse } from "msw";
-import { expect, test, vi } from "vitest";
+import { afterEach, expect, test, vi } from "vitest";
import { getPostV2ProcessReviewActionMockHandler200 } from "@/app/api/__generated__/endpoints/executions/executions.msw";
import type { PendingHumanReviewModel } from "@/app/api/__generated__/models/pendingHumanReviewModel";
import { server } from "@/mocks/mock-server";
@@ -12,6 +12,9 @@ import {
} from "@/tests/integrations/test-utils";
import { CopilotChatActionsProvider } from "../../CopilotChatActionsProvider/CopilotChatActionsProvider";
import { CopilotPendingReviews } from "../../CopilotPendingReviews/CopilotPendingReviews";
+import type { MessagePart } from "../../ChatMessagesContainer/helpers";
+import { ToolChain } from "../../ToolChain/ToolChain";
+import { useHeldAnswersStore } from "../heldAnswersStore";
import {
deleteFolder,
folder,
@@ -46,6 +49,34 @@ function renderQueue() {
);
}
+afterEach(() => {
+ useHeldAnswersStore.setState({ answers: {} });
+});
+
+// The held call's row in the chain, for the card folder("a", "Q3 reports").
+const HELD_ROW = {
+ type: "tool-create_folder",
+ state: "output-available",
+ toolCallId: "call-a",
+ input: { name: "Q3 reports" },
+ output: {
+ type: "approval_required",
+ tool_name: "create_folder",
+ review_id: "copilot-node-gate-create_folder:a",
+ ask: "Create library folder",
+ object: "Q3 reports",
+ },
+} as MessagePart;
+
+function renderQueueAndRow() {
+ return render(
+ <CopilotChatActionsProvider onSend={vi.fn()} onBackendTurn={vi.fn()}>
+ <ToolChain parts={[HELD_ROW]} isStreaming={false} />
+ <CopilotPendingReviews chatSessionId={CHAT_SESSION} />
+ </CopilotChatActionsProvider>,
+ );
+}
+
async function queue() {
return screen.findByRole("region", { name: "Waiting for you" });
}
@@ -278,3 +309,30 @@ test("a folder delete, which moves its agents to the root, stays unmarked", asyn
expect(await screen.findByText("f-111")).toBeDefined();
expect(screen.queryByText("Can't be undone")).toBeNull();
});
+
+test("approving a card flips its chain row to Approved at once", async () => {
+ serve([folder("a", "Q3 reports")]);
+ renderQueueAndRow();
+ const region = await queue();
+ expect(screen.getAllByText("Waiting for you").length).toBeGreaterThan(1);
+
+ await userEvent.click(
+ await within(region).findByRole("button", { name: "Approve" }),
+ );
+
+ expect(await screen.findByText("Approved")).toBeDefined();
+});
+
+test("a failed send leaves the chain row waiting", async () => {
+ serve([folder("a", "Q3 reports")], 500);
+ renderQueueAndRow();
+ const region = await queue();
+
+ await userEvent.click(
+ await within(region).findByRole("button", { name: "Approve" }),
+ );
+
+ await screen.findByRole("alert");
+ expect(useHeldAnswersStore.getState().answers).toEqual({});
+ expect(screen.queryByText("Approved")).toBeNull();
+});
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ApprovalQueue/heldAnswersStore.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ApprovalQueue/heldAnswersStore.ts
new file mode 100644
index 0000000000..0668388e40
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ApprovalQueue/heldAnswersStore.ts
@@ -0,0 +1,24 @@
+import { create } from "zustand";
+
+export type HeldAnswer = "approved" | "rejected";
+
+// Answers given on this page, by review id, so a held call's row shows the
+// answer at the click; the late result that the continuation turn persists
+// supersedes it.
+interface HeldAnswersState {
+ answers: Readonly<Record<string, HeldAnswer>>;
+ record(reviewIds: string[], approved: boolean): void;
+}
+
+export const useHeldAnswersStore = create<HeldAnswersState>((set) => ({
+ answers: {},
+ record: (reviewIds, approved) =>
+ set((state) => ({
+ answers: {
+ ...state.answers,
+ ...Object.fromEntries(
+ reviewIds.map((id) => [id, approved ? "approved" : "rejected"]),
+ ),
+ },
+ })),
+}));
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ApprovalQueue/useApprovalQueue.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ApprovalQueue/useApprovalQueue.ts
index e979b8ce70..f8e0129105 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ApprovalQueue/useApprovalQueue.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ApprovalQueue/useApprovalQueue.ts
@@ -1,6 +1,7 @@
import { useContext, useEffect, useRef, useState } from "react";
import { useProcessReviews } from "@/hooks/useProcessReviews";
import { HeldOutcomesContext } from "../ChatMessagesContainer/HeldOutcomesContext";
+import { useHeldAnswersStore } from "./heldAnswersStore";
import type { CardStatus } from "./components/ApprovalCard/ApprovalCard";
import {
type ApprovalItem,
@@ -22,6 +23,7 @@ interface Args {
export function useApprovalQueue({ items, onAnswered }: Args) {
const outcomes = useContext(HeldOutcomesContext);
const { processReviews } = useProcessReviews();
+ const recordAnswers = useHeldAnswersStore((state) => state.record);
const [statuses, setStatuses] = useState<Record<string, CardStatus>>({});
const [failed, setFailed] = useState<string[]>([]);
const [receipts, setReceipts] = useState<Receipt[]>([]);
@@ -77,6 +79,7 @@ export function useApprovalQueue({ items, onAnswered }: Args) {
ok = false;
}
if (ok) {
+ recordAnswers(ids, approved);
setReceipts((prev) => [
...prev,
...batch.map((item) => ({
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ToolChain/ToolChain.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ToolChain/ToolChain.tsx
index bc04b35e1b..289c299c0f 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ToolChain/ToolChain.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ToolChain/ToolChain.tsx
@@ -39,6 +39,7 @@ import { useCredentialFailureCounters } from "./useCredentialFailureCounters";
import { HeldOutcomesContext } from "../ChatMessagesContainer/HeldOutcomesContext";
import { ChainRowView } from "./ChainRowView";
import { applyHeldOutcome } from "./heldRow";
+import { useHeldAnswersStore } from "../ApprovalQueue/heldAnswersStore";
import {
type ChainRow,
getChainHeading,
@@ -68,6 +69,7 @@ export function ToolChain({ parts, isStreaming, readOnly = false }: Props) {
const pendingQuestions = useContext(PendingQuestionsContext);
const heldOutcomes = useContext(HeldOutcomesContext);
+ const heldAnswers = useHeldAnswersStore((state) => state.answers);
const { onSend } = useCopilotChatActions();
// The ref latches against a double effect run; the state re-renders Proceed.
const autoSentRef = useRef(false);
@@ -170,7 +172,7 @@ export function ToolChain({ parts, isStreaming, readOnly = false }: Props) {
parts
.map((part, i) => toChainRow(part, i))
.filter((row): row is ChainRow => row !== null)
- .map((row) => applyHeldOutcome(row, heldOutcomes))
+ .map((row) => applyHeldOutcome(row, heldOutcomes, heldAnswers))
// Unanswered clarifying questions and setup cards render their work
// in the card below the chain — their rows are lifted out of view.
.map((row) =>
@@ -181,7 +183,7 @@ export function ToolChain({ parts, isStreaming, readOnly = false }: Props) {
: row,
),
),
- [parts, pendingQuestions, heldOutcomes],
+ [parts, pendingQuestions, heldOutcomes, heldAnswers],
);
if (rows.length === 0) return null;
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ToolChain/__tests__/heldRow.test.tsx b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ToolChain/__tests__/heldRow.test.tsx
index afb547c040..1a7bc1a875 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ToolChain/__tests__/heldRow.test.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ToolChain/__tests__/heldRow.test.tsx
@@ -1,10 +1,16 @@
-import { expect, test, vi } from "vitest";
+import { afterEach, expect, test, vi } from "vitest";
+import { act } from "@testing-library/react";
import { render, screen } from "@/tests/integrations/test-utils";
import { CopilotChatActionsProvider } from "../../CopilotChatActionsProvider/CopilotChatActionsProvider";
import type { MessagePart } from "../../ChatMessagesContainer/helpers";
import type { HeldOutcome } from "../../ChatMessagesContainer/heldCallRows";
import { HeldOutcomesContext } from "../../ChatMessagesContainer/HeldOutcomesContext";
import { ToolChain } from "../ToolChain";
+import { useHeldAnswersStore } from "../../ApprovalQueue/heldAnswersStore";
+
+afterEach(() => {
+ useHeldAnswersStore.setState({ answers: {} });
+});
const HELD: MessagePart = {
type: "tool-create_folder",
@@ -160,3 +166,86 @@ test("a held read whose release is unclear stays a read, not an action that may
).toBeGreaterThan(0);
expect(screen.queryByText(/It may have run/)).toBeNull();
});
+
+test("a row flips to Approved at the click, before the late result lands", async () => {
+ render(chain(new Map()));
+ expect(await screen.findByText("Waiting for you")).toBeDefined();
+
+ act(() =>
+ useHeldAnswersStore
+ .getState()
+ .record(["copilot-node-gate-create_folder:abc"], true),
+ );
+
+ expect(await screen.findByText("Approved")).toBeDefined();
+ expect(screen.queryByText("Waiting for you")).toBeNull();
+ // Not run yet: it still names the action, not its done label.
+ expect(
+ screen.getAllByText('Create library folder "Q3 reports"').length,
+ ).toBeGreaterThan(0);
+ expect(screen.queryByText('Created folder "Q3 reports"')).toBeNull();
+ // The open row does not fall back to showing the held marker's fields.
+ expect(screen.queryByText("copilot-node-gate-create_folder:abc")).toBeNull();
+});
+
+test("a row flips to Rejected at the click", async () => {
+ useHeldAnswersStore
+ .getState()
+ .record(["copilot-node-gate-create_folder:abc"], false);
+ render(chain(new Map()));
+ expect(await screen.findByText("Rejected")).toBeDefined();
+ expect(
+ screen.getAllByText(/Didn't create library folder/).length,
+ ).toBeGreaterThan(0);
+});
+
+test("a held read's row reads Released at the click", async () => {
+ useHeldAnswersStore
+ .getState()
+ .record(["copilot-node-gate-read-web_fetch:abc"], true);
+ render(readChain(new Map()));
+ expect(await screen.findByText("Released")).toBeDefined();
+ expect(screen.queryByText("Held")).toBeNull();
+});
+
+test("the late result wins over the click: approved but failed shows its error", async () => {
+ useHeldAnswersStore
+ .getState()
+ .record(["copilot-node-gate-create_folder:abc"], true);
+ render(
+ chain(
+ new Map([
+ [
+ "call-7",
+ {
+ outcome: "approved",
+ output: { type: "error", message: "Folder exists" },
+ },
+ ],
+ ]),
+ ),
+ );
+ expect(await screen.findByText("Approved")).toBeDefined();
+ const errorLine = screen
+ .getAllByText("Folder exists")
+ .find((el) => el.className.includes("text-red"));
+ expect(errorLine).toBeDefined();
+});
+
+test("the late result wins over the click: an approval that expired says Expired", async () => {
+ useHeldAnswersStore
+ .getState()
+ .record(["copilot-node-gate-create_folder:abc"], true);
+ render(chain(new Map([["call-7", { outcome: "expired", output: "" }]])));
+ expect(await screen.findByText("Expired")).toBeDefined();
+ expect(screen.queryByText("Approved")).toBeNull();
+});
+
+test("an answer to another card leaves the row waiting", async () => {
+ useHeldAnswersStore
+ .getState()
+ .record(["copilot-node-gate-create_folder:other"], true);
+ render(chain(new Map()));
+ expect(await screen.findByText("Waiting for you")).toBeDefined();
+ expect(screen.queryByText("Approved")).toBeNull();
+});
diff --git a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ToolChain/heldRow.ts b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ToolChain/heldRow.ts
index 713547af20..a991165427 100644
--- a/autogpt_platform/frontend/src/app/(platform)/copilot/components/ToolChain/heldRow.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/copilot/components/ToolChain/heldRow.ts
@@ -1,4 +1,5 @@
import type { HeldOutcome } from "../ChatMessagesContainer/heldCallRows";
+import type { HeldAnswer } from "../ApprovalQueue/heldAnswersStore";
import { COPILOT_GATE_NODE_PREFIX } from "@/components/organisms/PendingReviewsList/PendingReviewsList";
import { fallbackAsk } from "../ApprovalQueue/helpers";
import type { ChainRow } from "./helpers";
@@ -25,6 +26,7 @@ export interface HeldRowInfo {
export function applyHeldOutcome(
row: ChainRow,
outcomes: ReadonlyMap<string, HeldOutcome>,
+ answers: Readonly<Record<string, HeldAnswer>> = {},
): ChainRow {
const data = asObject(row.output);
if (!row.tool || data?.type !== "approval_required") return row;
@@ -42,6 +44,13 @@ export function applyHeldOutcome(
);
}
const outcome = outcomes.get(row.key);
+ // Answered here and not yet run: the tag flips now, the result lands later.
+ const answer = outcome ? undefined : answers[reviewId];
+ if (answer === "rejected") return settle(row, didnt, answer, reviewId, read);
+ // Approved but not run: nothing to show until its result lands.
+ if (answer === "approved") {
+ return { ...settle(row, ask, answer, reviewId, read), output: undefined };
+ }
if (!outcome) {
return {
...row,