From 41359e268a7db4d43f962661fa366b6d2e534b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?= Date: Fri, 9 Oct 2026 01:43:41 -0400 Subject: [PATCH] Q155: batch approval decides one request at a time and reports each result Co-Authored-By: Claude Opus 5.5 --- src/renderer/src/i18n/zh.ts | 4 + src/renderer/src/pages/ApprovalsPage.tsx | 90 ++++++++++++++++--- .../src/pages/approvals/decide-each.ts | 24 +++++ tests/e2e/ceo-chat.spec.ts | 14 +++ tests/unit/decide-each.test.ts | 20 +++++ 5 files changed, 138 insertions(+), 14 deletions(-) create mode 100644 src/renderer/src/pages/approvals/decide-each.ts create mode 100644 tests/unit/decide-each.test.ts diff --git a/src/renderer/src/i18n/zh.ts b/src/renderer/src/i18n/zh.ts index c0aae448..d00e348f 100644 --- a/src/renderer/src/i18n/zh.ts +++ b/src/renderer/src/i18n/zh.ts @@ -41,6 +41,10 @@ export const zh: Record = { "Back to backlog": "退回待办", "Delete this task?": "删除这个任务？", "Review": "审阅", + "Approving {done} of {total}…": "正在批准第 {done}/{total} 项…", + "Approved {n} of {total}.": "已批准 {total} 项中的 {n} 项。", + "Not decided: {reason}": "未能决定：{reason}", + "Dismiss": "关闭", "Edit the task": "编辑任务", "Changing the task replaces this request with a fresh one.": "修改任务会用新的申请替换这一项。", "Delete task": "删除任务", diff --git a/src/renderer/src/pages/ApprovalsPage.tsx b/src/renderer/src/pages/ApprovalsPage.tsx index fd6f165a..223039fb 100644 --- a/src/renderer/src/pages/ApprovalsPage.tsx +++ b/src/renderer/src/pages/ApprovalsPage.tsx @@ -1,3 +1,4 @@ +import { decideEach, type BatchResult } from "./approvals/decide-each"; import { decidedWindow } from "./approvals/decided-window"; import { useEffect, useMemo, useRef, useState } from "react"; import { Avatar, Button, Icon, IconButton, Pill } from "../shared/ui"; @@ -73,9 +74,8 @@ export function ApprovalsPage({ snapshot, actions, navigate, focus }: PageProps) }; }, [orgId, approvals]); - const decide = (approval: ApprovalRecord, state: "approved" | "declined", notes?: string) => { - setEditingId(null); - void actions.run(() => window.agentCompany.decideApproval({ + const decide = async (approval: ApprovalRecord, state: "approved" | "declined", notes?: string) => { + await actions.run(() => window.agentCompany.decideApproval({ orgId, approvalId: approval.id, state, @@ -83,17 +83,38 @@ export function ApprovalsPage({ snapshot, actions, navigate, focus }: PageProps) notes, })); }; + // A row decision shows its own refusal; the request stays listed until it is decided. + const [rowErrors, setRowErrors] = useState>({}); + const [busyRows, setBusyRows] = useState>(new Set()); + const decideRow = (approval: ApprovalRecord, state: "approved" | "declined") => { + setBusyRows((current) => new Set(current).add(approval.id)); + setRowErrors(({ [approval.id]: _old, ...rest }) => rest); + decide(approval, state) + .catch((error: unknown) => setRowErrors((current) => ({ ...current, [approval.id]: error instanceof Error ? error.message : String(error) }))) + .finally(() => setBusyRows((current) => { + const next = new Set(current); + next.delete(approval.id); + return next; + })); + }; + const [batch, setBatch] = useState<{ total: number; done: number; result: BatchResult | null } | null>(null); const approveAllLowRisk = () => { const lows = filteredPending.filter((approval) => approval.risk === RISK_LEVEL.LOW); - for (const approval of lows) decide(approval, "approved"); + if (lows.length === 0) return; + setBatch({ total: lows.length, done: 0, result: null }); + void decideEach(lows, (approval) => decide(approval, "approved"), (done) => setBatch((current) => current && { ...current, done })) + .then((result) => setBatch({ total: lows.length, done: lows.length, result })); }; + const batchRunning = batch !== null && batch.result === null; return (
- +

{t("Approvals")}

@@ -107,6 +128,7 @@ export function ApprovalsPage({ snapshot, actions, navigate, focus }: PageProps)

+ {batch?.result && setBatch(null)} />} {filteredPending.length > 0 &&
{t("Pending")}
} {filteredPending.map((approval) => ( decide(approval, "approved")} - onDecline={() => decide(approval, "declined")} + busy={busyRows.has(approval.id) || batchRunning} + error={rowErrors[approval.id] ?? null} + onApprove={() => decideRow(approval, "approved")} + onDecline={() => decideRow(approval, "declined")} onReview={() => setEditingId(approval.id)} /> ))} @@ -147,7 +171,13 @@ export function ApprovalsPage({ snapshot, actions, navigate, focus }: PageProps) approval={editing} requester={editing ? resolveRequester(editing, employees, agents) : ""} onClose={() => setEditingId(null)} - onDecide={(state, notes) => editing && decide(editing, state, notes)} + onDecide={async (state, notes) => { + if (!editing) return; + const decidedId = editing.id; + await decide(editing, state, notes); + // Close only the request that was decided; another opened meanwhile stays open. + setEditingId((current) => (current === decidedId ? null : current)); + }} onOpenTask={openTask} /> @@ -164,10 +194,21 @@ function ApprovalDetailDialog({ approval: ApprovalRecord | null; requester: string; onClose: () => void; - onDecide: (state: "approved" | "declined", notes?: string) => void; + /** Resolves once the decision is saved; the dialog stays open until then and shows a refusal. */ + onDecide: (state: "approved" | "declined", notes?: string) => Promise; onOpenTask: (taskId: string) => void; }) { const [notes, setNotes] = useState(""); + const [saving, setSaving] = useState(false); + const [error, setError] = useState(null); + const submit = (state: "approved" | "declined") => { + setSaving(true); + setError(null); + onDecide(state, notes || undefined).catch((reason: unknown) => { + setSaving(false); + setError(reason instanceof Error ? reason.message : String(reason)); + }); + }; if (!approval) return null; const tone = RISK_TONES[approval.risk]; if (!tone) throw new Error("Approval risk tone is missing."); @@ -213,9 +254,10 @@ function ApprovalDetailDialog({ rows={2} style={{ marginTop: 14 }} /> + {error &&
{t("Not decided: {reason}", { reason: error })}
}
- - + +
@@ -262,10 +304,14 @@ function ApprovalRow({ onApprove, onDecline, onReview, + busy, + error, }: { approval: ApprovalRecord; requester: string; isBot: boolean; + busy: boolean; + error: string | null; onApprove: () => void; onDecline: () => void; /** Opens the request to read it in full and decide with notes; what is requested is changed at its source. */ @@ -304,9 +350,10 @@ function ApprovalRow({
- - - + + + + {error &&
{t("Not decided: {reason}", { reason: error })}
}
); @@ -406,3 +453,18 @@ function formatMinutes(minutes: number): string { const remaining = minutes % 60; return remaining === 0 ? `${hours}h` : `${hours}h ${remaining}m`; } + +/** What a batch approval did: how many were approved, and each that was not, with why. */ +function BatchSummary({ total, result, onDismiss }: { total: number; result: BatchResult; onDismiss: () => void }) { + return ( +
+
+ {t("Approved {n} of {total}.", { n: result.approved.length, total })} + +
+ {result.failed.map((failure) => ( +
{failure.title}: {failure.reason}
+ ))} +
+ ); +} diff --git a/src/renderer/src/pages/approvals/decide-each.ts b/src/renderer/src/pages/approvals/decide-each.ts new file mode 100644 index 00000000..ff33bfe7 --- /dev/null +++ b/src/renderer/src/pages/approvals/decide-each.ts @@ -0,0 +1,24 @@ +/** What a batch of decisions did: the requests decided, and each that failed with why. */ +export interface BatchResult { + approved: string[]; + failed: Array<{ id: string; title: string; reason: string }>; +} + +/** Decides the requests one at a time, so each result is known and none races another; a failure does not stop the rest. */ +export async function decideEach( + items: T[], + decideOne: (item: T) => Promise, + onProgress: (done: number) => void, +): Promise { + const result: BatchResult = { approved: [], failed: [] }; + for (const item of items) { + try { + await decideOne(item); + result.approved.push(item.id); + } catch (error) { + result.failed.push({ id: item.id, title: item.title, reason: error instanceof Error ? error.message : String(error) }); + } + onProgress(result.approved.length + result.failed.length); + } + return result; +} diff --git a/tests/e2e/ceo-chat.spec.ts b/tests/e2e/ceo-chat.spec.ts index 3239655c..741bb23d 100644 --- a/tests/e2e/ceo-chat.spec.ts +++ b/tests/e2e/ceo-chat.spec.ts @@ -118,6 +118,20 @@ test("the pinned CEO conversation is the Messages front door", async () => { await page.getByRole("button", { name: "Review" }).first().click(); await expect(review.getByRole("textbox", { name: "Decision notes" })).toHaveValue(""); await review.getByRole("button", { name: "Close" }).click(); + // A batch approval says how far it got, item by item. + await page.evaluate(async () => { + const api = (window as unknown as { agentCompany: { + loadSnapshot: () => Promise<{ ok: true; data: { activeOrgId: string } }>; + createApproval: (input: unknown) => Promise<{ ok: boolean }>; + } }).agentCompany; + const orgId = (await api.loadSnapshot()).data.activeOrgId; + for (const title of ["Order stickers", "Renew the domain"]) { + await api.createApproval({ orgId, kind: "purchase", title, details: "Small spend.", risk: "low", requestedByType: "system", requestedById: null }); + } + }); + await expect(page.getByText("Renew the domain")).toBeVisible(); + await page.getByRole("button", { name: "Approve all low risk" }).click(); + await expect(page.getByRole("status").filter({ hasText: "Approved" })).toContainText("Approved 2 of 2."); await page.getByRole("button", { name: "Work" }).click(); await page.getByRole("button", { name: /Operationalize goal: Ship the FlowPilot MVP\./ }).first().click(); // Blocking says why on the task and stops it; work can also move backwards. diff --git a/tests/unit/decide-each.test.ts b/tests/unit/decide-each.test.ts new file mode 100644 index 00000000..368f7bd2 --- /dev/null +++ b/tests/unit/decide-each.test.ts @@ -0,0 +1,20 @@ +import { describe, expect, test } from "vitest"; +import { decideEach } from "../../src/renderer/src/pages/approvals/decide-each"; + +describe("deciding several requests", () => { + test("decides one at a time, reports progress, and returns each result", async () => { + const order: string[] = []; + const progress: number[] = []; + const result = await decideEach( + [{ id: "a", title: "A" }, { id: "b", title: "B" }, { id: "c", title: "C" }], + async (item) => { + order.push(item.id); + if (item.id === "b") throw new Error("Approval was already decided."); + }, + (done) => progress.push(done), + ); + expect(order).toEqual(["a", "b", "c"]); + expect(progress).toEqual([1, 2, 3]); + expect(result).toEqual({ approved: ["a", "c"], failed: [{ id: "b", title: "B", reason: "Approval was already decided." }] }); + }); +});