@springbrand/message-panel 0.1.3-alpha.2 → 0.1.3-alpha.21

package/cloud-os/chat/rich-blocks.tsx

@@ -1,14 +1,17 @@
 import {
+  ArrowLeft,
+  ArrowRight,
   Bell,
   CaretRight,
   Check,
   CircleNotch,
+  Clock,
+  Key,
   ListChecks,
-  ShieldCheck,
   UsersThree,
   WarningCircle,
 } from "@phosphor-icons/react";
-import { useState } from "react";
+import { useRef, useState } from "react";
 import { Tooltip } from "../primitives/tooltip";
 import { WorkshopButton } from "../primitives/workshop-controls";
 import { MarkdownMessage } from "./markdown-message";
@@ -18,7 +21,12 @@ import type {
   PlanStep,
   SubAgentView,
 } from "./transcript-model";
-import type { CloudOsToolCall } from "./tool-presentation";
+import {
+  askUserOutcome,
+  humanizeToolName,
+  safeStringify,
+  type CloudOsToolCall,
+} from "./tool-presentation";
 
 /**
  * UIMessage 协议里存在、gadgets 那套没有的几类 part —— 计划快照、原位提问、
@@ -118,129 +126,316 @@ interface AskQuestion {
   prompt: string;
   options: string[];
   multi: boolean;
+  allowCustom: boolean;
 }
 
 function questionsOf(input: Record<string, unknown>): AskQuestion[] {
-  if (Array.isArray(input.questions)) {
-    return input.questions.map((item) => {
-      const question = (item ?? {}) as Record<string, unknown>;
-      return {
-        prompt: String(question.prompt ?? question.question ?? "Choose an option"),
-        options: Array.isArray(question.options)
-          ? question.options.filter((o): o is string => typeof o === "string")
-          : [],
-        multi: question.kind === "multi" || question.multiSelect === true,
-      };
-    });
-  }
-  if (typeof input.question === "string") {
-    return [
-      {
-        prompt: input.question,
-        options: Array.isArray(input.options)
-          ? input.options.filter((o): o is string => typeof o === "string")
-          : [],
-        multi: input.multiSelect === true,
-      },
-    ];
-  }
-  return [];
+  if (!Array.isArray(input.questions)) return [];
+  return input.questions.map((item) => {
+    const question = (item ?? {}) as Record<string, unknown>;
+    const options = Array.isArray(question.options)
+      ? question.options.filter((option): option is string =>
+        typeof option === "string"
+      )
+      : [];
+    return {
+      prompt: typeof question.question === "string"
+        ? question.question
+        : "Choose an option",
+      options,
+      multi: question.multiSelect === true,
+      allowCustom: question.allowCustom === true || options.length === 0,
+    };
+  });
+}
+
+interface DraftAnswer {
+  selections: string[];
+  text: string;
 }
 
 export function AskUserBlock({
   call,
-  answeredText,
-  onAnswer,
+  onRespond,
 }: {
   call: CloudOsToolCall;
-  answeredText?: string;
-  onAnswer: (payload: unknown) => void;
+  /** 缺省（宿主没接）时选项不可点 —— 形状对齐 ScheduleBlock 的 onOpen。 */
+  onRespond?: (toolCallId: string, response: unknown) => Promise<boolean>;
 }) {
   const questions = questionsOf(call.input);
-  const [selections, setSelections] = useState<string[][]>(() =>
-    questions.map(() => []),
-  );
-  const [submitted, setSubmitted] = useState(false);
-  const external = answeredText?.trim() ?? "";
-  const externalSelections = new Set(
-    external.split("、").map((value) => value.trim()).filter(Boolean),
+  // 不能用 `useState(() => questions.map(...))` 初始化:工具入参是**流式**到达的,
+  // 首帧 questions 往往还是空数组,那之后每次 setAnswers 都在空数组上 map,
+  // 选择永远存不进去 → Submit 永久禁用。改成稀疏存 + 按当前 questions 补齐。
+  const [answers, setAnswers] = useState<DraftAnswer[]>([]);
+  const [current, setCurrent] = useState(0);
+  const direction = useRef<"back" | "forward">("forward");
+  const answerAt = (index: number): DraftAnswer =>
+    answers[index] ?? { selections: [], text: "" };
+  const toggle = (questionIndex: number, option: string, multi: boolean) =>
+    setAnswers((current) => {
+      const next = questions.map((_, index) =>
+        current[index] ?? { selections: [], text: "" }
+      );
+      const answer = next[questionIndex]!;
+      next[questionIndex] = {
+        ...answer,
+        selections: !multi
+          ? [option]
+          : answer.selections.includes(option)
+            ? answer.selections.filter((value) => value !== option)
+            : [...answer.selections, option],
+      };
+      return next;
+    });
+  const setText = (questionIndex: number, text: string) =>
+    setAnswers((current) => {
+      const next = questions.map((_, index) =>
+        current[index] ?? { selections: [], text: "" }
+      );
+      next[questionIndex] = { ...next[questionIndex]!, text };
+      return next;
+    });
+  // 在途只用于按钮转圈；权威状态永远是 part 的 state。
+  const [inFlight, setInFlight] = useState(false);
+  const outcome = askUserOutcome(call);
+  const settledAnswers = outcome.kind === "answered" ? outcome.answers : [];
+  // 服务端已经结算 = 这张卡永久不可操作，不管结算成什么。
+  const resolved = outcome.kind !== "pending" || inFlight;
+  const valid = questions.length > 0 && questions.every(
+    (_question, index) =>
+      answerAt(index).selections.length > 0 || answerAt(index).text.trim(),
   );
-  const resolved = submitted || Boolean(external);
-  const valid = questions.every(
-    (question, index) =>
-      question.options.length === 0 || (selections[index]?.length ?? 0) > 0,
+  const currentIndex = Math.min(current, Math.max(questions.length - 1, 0));
+  const currentQuestion = questions[currentIndex];
+  const currentAnswer = answerAt(currentIndex);
+  const currentValid = currentAnswer.selections.length > 0 ||
+    Boolean(currentAnswer.text.trim());
+  const isLast = currentIndex === questions.length - 1;
+  const buttonLabel = outcome.kind === "answered"
+    ? "Submitted"
+    : outcome.kind === "closed"
+      ? "Closed"
+      : inFlight
+        ? "Submitting…"
+        : "Submit";
+  const footnote = outcome.kind === "closed"
+      ? outcome.reason === "user_replied_freeform"
+        ? "Answered in the chat instead."
+        : "Closed without an answer."
+      : "";
+
+  const submit = () => {
+    if (!onRespond) return;
+    setInFlight(true);
+    // 失败就把按钮放回可点：权威状态由 part 决定，这里只管别把用户锁死。
+    void onRespond(call.toolCallId, {
+      answers: questions.map((_, index) => ({
+        selections: answerAt(index).selections,
+        text: answerAt(index).text.trim(),
+      })),
+    }).then((ok) => {
+      if (!ok) setInFlight(false);
+    }, () => setInFlight(false));
+  };
+
+  const settledButton = (
+    <WorkshopButton
+      tone="primary"
+      disabled
+      className="ml-auto !h-7 flex-shrink-0 gap-1 !rounded-lg px-2.5 text-[12px]"
+    >
+      {buttonLabel}
+    </WorkshopButton>
   );
 
   return (
-    <div className="max-w-[860px]">
-      <div className="rounded-2xl border border-kumo-line bg-kumo-base px-4 py-3">
-        {/* 同 ApprovalBlock:窄栏下让提交按钮整体换行,别把问题正文挤没。 */}
-        <div className="flex flex-wrap items-start gap-3">
-          <span
-            className="flex h-9 w-9 flex-shrink-0 items-center justify-center rounded-lg bg-kumo-tint text-kumo-brand"
-            aria-hidden="true"
-          >
-            <Bell size={18} weight="fill" />
-          </span>
-          <div className="min-w-[12rem] flex-1 space-y-2.5">
-            {questions.map((question, questionIndex) => (
-              <div key={`${question.prompt}:${questionIndex}`} className="space-y-1.5">
-                <p className="m-0 text-[14px] leading-5 font-medium tracking-[-0.25px] text-kumo-default">
-                  {question.prompt}
-                </p>
-                <div className="flex flex-wrap gap-1.5">
-                  {question.options.map((option) => {
-                    const selected = external
-                      ? externalSelections.has(option)
-                      : selections[questionIndex]?.includes(option);
-                    return (
-                      <button
-                        key={option}
-                        type="button"
-                        disabled={resolved}
-                        onClick={() =>
-                          setSelections((current) =>
-                            current.map((values, index) => {
-                              if (index !== questionIndex) return values;
-                              if (!question.multi) return [option];
-                              return values.includes(option)
-                                ? values.filter((value) => value !== option)
-                                : [...values, option];
-                            }),
-                          )
-                        }
-                        className={`inline-flex h-7 cursor-pointer items-center rounded-lg border px-2.5 text-[13px] leading-none tracking-[-0.25px] transition-colors duration-150 ease-out disabled:cursor-default ${
-                          selected
-                            ? "border-kumo-brand/45 bg-kumo-brand/10 text-kumo-default"
-                            : "border-kumo-line bg-kumo-base text-kumo-subtle hover:bg-kumo-tint hover:text-kumo-default"
-                        }`}
-                      >
-                        {option}
-                      </button>
-                    );
-                  })}
+    // 收成 w-fit：短问题不该撑成一条横贯全栏的长条,长问题到 560px 再换行。
+    <div
+      className="w-fit min-w-[15rem] max-w-[560px]"
+      data-part-type="ask_user"
+      data-state={outcome.kind === "answered" ? "submitted" : outcome.kind}
+    >
+      <div className="flex flex-col gap-3 rounded-xl border border-kumo-line bg-kumo-base px-3 py-2.5">
+        {outcome.kind === "pending" ? (
+          <>
+            {questions.length > 1 && (
+              <div className="flex flex-col gap-2">
+                <div className="flex items-center justify-between text-[11px] font-medium leading-4 text-kumo-inactive">
+                  <span>Clarifying questions</span>
+                  <span className="tabular-nums">
+                    {currentIndex + 1}/{questions.length}
+                  </span>
+                </div>
+                <div className="flex gap-1" aria-hidden="true">
+                  {questions.map((question, index) => (
+                    <span
+                      key={`${question.prompt}:${index}`}
+                      className={`h-1 flex-1 rounded-full ${
+                        index < currentIndex
+                          ? "bg-kumo-brand"
+                          : index === currentIndex
+                            ? "bg-kumo-brand/60"
+                            : "bg-kumo-fill"
+                      }`}
+                    />
+                  ))}
                 </div>
               </div>
-            ))}
-          </div>
-          <div className="ml-auto flex flex-shrink-0 items-center self-center">
-            <WorkshopButton
-              tone="primary"
-              disabled={resolved || !valid}
-              onClick={() => {
-                onAnswer({ selections, text: "" });
-                setSubmitted(true);
-              }}
-              className="!h-8 gap-1 !rounded-lg text-[12px]"
-            >
-              {resolved ? "Submitted" : "Submit"}
-            </WorkshopButton>
-          </div>
-        </div>
-        {external && (
-          <p className="mt-2 mb-0 pl-12 text-[12px] leading-4 text-kumo-inactive">
-            Answered: {external}
-          </p>
+            )}
+            {currentQuestion && (
+              <div className="overflow-hidden">
+                <div
+                  key={currentIndex}
+                  className="cos-ask-user-question flex flex-col gap-2.5"
+                  data-direction={direction.current}
+                >
+                  <p className="m-0 text-[13px] leading-[18px] font-medium tracking-[-0.25px] text-kumo-default">
+                    {currentQuestion.prompt}
+                  </p>
+                  {currentQuestion.options.length > 0 && (
+                    <ul className="m-0 flex list-none flex-col gap-1.5 p-0">
+                      {currentQuestion.options.map((option) => {
+                        const selected = currentAnswer.selections.includes(
+                          option,
+                        );
+                        return (
+                          <li key={option} className="m-0 p-0">
+                            <label
+                              className={`flex min-h-8 items-center gap-2 rounded-lg border px-2.5 py-1.5 text-[13px] leading-[18px] tracking-[-0.25px] transition-colors duration-150 ease-out ${
+                                resolved || !onRespond
+                                  ? "cursor-default text-kumo-inactive"
+                                  : "cursor-pointer text-kumo-subtle hover:bg-kumo-tint hover:text-kumo-default"
+                              } ${
+                                selected
+                                  ? "border-kumo-brand/45 bg-kumo-brand/10 text-kumo-default"
+                                  : "border-kumo-line bg-kumo-base"
+                              }`}
+                            >
+                              <input
+                                type={currentQuestion.multi
+                                  ? "checkbox"
+                                  : "radio"}
+                                name={`${call.toolCallId}-${currentIndex}`}
+                                checked={selected}
+                                disabled={resolved || !onRespond}
+                                onChange={() =>
+                                  toggle(
+                                    currentIndex,
+                                    option,
+                                    currentQuestion.multi,
+                                  )}
+                                className="h-4 w-4 shrink-0 accent-[var(--color-kumo-brand)]"
+                              />
+                              <span>{option}</span>
+                            </label>
+                          </li>
+                        );
+                      })}
+                    </ul>
+                  )}
+                  {currentQuestion.allowCustom && (
+                    <label className="flex flex-col gap-1 text-[12px] leading-4 text-kumo-subtle">
+                      <span>
+                        {currentQuestion.options.length > 0 ? "Other" : "Answer"}
+                      </span>
+                      <input
+                        type="text"
+                        value={currentAnswer.text}
+                        maxLength={2_000}
+                        disabled={resolved || !onRespond}
+                        aria-label={`自定义回答：${currentQuestion.prompt}`}
+                        placeholder={currentQuestion.options.length > 0
+                          ? "Add a custom answer"
+                          : "Type your answer"}
+                        onChange={(event) =>
+                          setText(currentIndex, event.currentTarget.value)}
+                        className="h-8 rounded-lg border border-kumo-line bg-kumo-base px-2.5 text-[13px] text-kumo-default outline-none placeholder:text-kumo-inactive focus:border-kumo-brand focus:ring-2 focus:ring-kumo-brand/20 disabled:cursor-default"
+                      />
+                    </label>
+                  )}
+                </div>
+              </div>
+            )}
+            <div className="flex items-center gap-2">
+              {questions.length > 1 && (
+                <WorkshopButton
+                  disabled={currentIndex === 0 || resolved}
+                  onClick={() => {
+                    direction.current = "back";
+                    setCurrent((index) => Math.max(0, index - 1));
+                  }}
+                  className="!h-7 gap-1 !rounded-lg px-2.5 text-[12px]"
+                >
+                  <ArrowLeft size={13} weight="bold" />
+                  Back
+                </WorkshopButton>
+              )}
+              <WorkshopButton
+                tone="primary"
+                disabled={
+                  resolved || !onRespond ||
+                  (questions.length > 1 && !isLast ? !currentValid : !valid)
+                }
+                onClick={() => {
+                  if (questions.length > 1 && !isLast) {
+                    direction.current = "forward";
+                    setCurrent((index) =>
+                      Math.min(questions.length - 1, index + 1)
+                    );
+                    return;
+                  }
+                  submit();
+                }}
+                className="ml-auto !h-7 gap-1 !rounded-lg px-2.5 text-[12px]"
+              >
+                {questions.length > 1 && !isLast ? (
+                  <>
+                    Next
+                    <ArrowRight size={13} weight="bold" />
+                  </>
+                ) : buttonLabel}
+              </WorkshopButton>
+            </div>
+          </>
+        ) : (
+          <>
+            {outcome.kind === "answered" &&
+              questions.map((question, questionIndex) => (
+                <div
+                  key={`${question.prompt}:${questionIndex}`}
+                  className="flex flex-col gap-1.5"
+                >
+                  <p className="m-0 text-[13px] leading-[18px] font-medium tracking-[-0.25px] text-kumo-default">
+                    {question.prompt}
+                  </p>
+                  {settledAnswers[questionIndex] && (
+                    <div className="flex flex-col gap-1 text-[12px] leading-4 text-kumo-inactive">
+                      {settledAnswers[questionIndex]!.selections.length > 0 && (
+                        <p className="m-0">
+                          Answered: {settledAnswers[questionIndex]!.selections
+                            .join(" / ")}
+                        </p>
+                      )}
+                      {settledAnswers[questionIndex]!.text.trim() && (
+                        <p className="m-0">
+                          {settledAnswers[questionIndex]!.selections.length > 0
+                            ? `补充：${settledAnswers[questionIndex]!.text.trim()}`
+                            : `Answered: ${settledAnswers[questionIndex]!.text.trim()}`}
+                        </p>
+                      )}
+                    </div>
+                  )}
+                </div>
+              ))}
+            <div className="flex items-center gap-3">
+              {footnote && (
+                <p className="m-0 min-w-0 text-[12px] leading-4 text-kumo-inactive">
+                  {footnote}
+                </p>
+              )}
+              {settledButton}
+            </div>
+          </>
         )}
       </div>
     </div>
@@ -257,23 +452,26 @@ export function SuggestionsBlock({
   onSuggestion: (text: string) => void;
 }) {
   return (
-    <div className="max-w-[860px] space-y-2 pt-1">
-      <div className="flex items-center gap-2 px-1.5 text-[13px] leading-[18px] text-kumo-success">
-        <Check size={14} weight="bold" />
-        <span>Task complete</span>
-      </div>
-      <div className="flex flex-wrap gap-1.5 px-1.5">
-        {items.map((item) => (
-          <button
-            key={item}
-            type="button"
-            onClick={() => onSuggestion(item)}
-            className="inline-flex h-7 cursor-pointer items-center rounded-full border border-kumo-line bg-kumo-base px-3 text-[13px] leading-none tracking-[-0.25px] text-kumo-subtle transition-colors duration-150 ease-out hover:bg-kumo-tint hover:text-kumo-default focus-visible:outline-none active:scale-[0.98]"
-          >
-            {item}
-          </button>
-        ))}
-      </div>
+    <div className="flex max-w-[860px] flex-col items-start gap-3">
+      {items.map((item) => (
+        <button
+          key={item}
+          type="button"
+          onClick={() => onSuggestion(item)}
+          className="inline-flex cursor-pointer items-center gap-2 text-[14px] leading-[1.4] text-kumo-inactive transition-colors duration-150 ease-out hover:text-kumo-brand focus-visible:text-kumo-brand focus-visible:outline-none active:scale-[0.98]"
+        >
+          <span className="grid size-5 flex-shrink-0 place-items-center" aria-hidden="true">
+            <span className="rotate-180 -scale-y-100">
+              <img
+                src={new URL("../assets/followup-arrow.svg", import.meta.url).href}
+                alt=""
+                className="h-[8.33333px] w-[11.6667px]"
+              />
+            </span>
+          </span>
+          <span className="whitespace-nowrap">{item}</span>
+        </button>
+      ))}
     </div>
   );
 }
@@ -318,13 +516,73 @@ function scheduleCadence(input: Record<string, unknown>): string {
   return timezone ? `${cadence} · ${timezone}` : cadence;
 }
 
-/** `schedule` 工具的 details 是 `{ scheduled: true, id }`,id 即任务在 SchedulerAgent 里的主键。 */
+/** `schedule` 工具的 details 是 `{ scheduled: true, id }`,id 即 Inbox Schedule Definition 主键。 */
 function scheduleIdOf(output: unknown): string {
   if (typeof output !== "object" || output === null) return "";
   const id = (output as Record<string, unknown>).id;
   return typeof id === "string" ? id : "";
 }
 
+export function ScheduleConfirmation({
+  input,
+  disabled = false,
+  onCancel,
+  onConfirm,
+}: {
+  input: Record<string, unknown>;
+  disabled?: boolean;
+  onCancel: () => void;
+  onConfirm: () => void;
+}) {
+  const name = String(input.label ?? input.title ?? "Scheduled task");
+  const prompt = typeof input.prompt === "string" && input.prompt.trim()
+    ? input.prompt.trim()
+    : "Run the scheduled task";
+
+  return (
+    <section
+      data-slot="schedule-card"
+      aria-label={`Confirm scheduled task: ${name}`}
+      className="themed-surface-inset flex w-full max-w-sm flex-col gap-3 rounded-2xl border border-kumo-line/70 bg-kumo-elevated p-4 text-kumo-default shadow-[0_1px_2px_rgba(0,0,0,0.04),0_12px_32px_-16px_rgba(0,0,0,0.12)]"
+    >
+      <div className="flex items-center gap-2.5">
+        <span
+          className="flex size-7 shrink-0 items-center justify-center rounded-lg bg-kumo-fill/70 text-kumo-subtle"
+          aria-hidden="true"
+        >
+          <Clock size={14} />
+        </span>
+        <div className="flex min-w-0 flex-1 flex-col">
+          <span className="truncate text-[13.5px] leading-[18px] font-medium">
+            {name}
+          </span>
+          <span className="truncate font-mono text-[11px] leading-4 tracking-tight text-kumo-inactive">
+            {scheduleCadence(input)}
+          </span>
+        </div>
+      </div>
+
+      <div className="flex items-start gap-2 rounded-xl bg-kumo-fill/50 px-3 py-2">
+        <span className="shrink-0 font-mono text-[11px] leading-[18px] tracking-tight text-kumo-inactive">
+          task
+        </span>
+        <span className="min-w-0 flex-1 text-[13px] leading-[18px] text-kumo-subtle">
+          {prompt}
+        </span>
+      </div>
+
+      <div className="flex items-center justify-end gap-2">
+        <WorkshopButton disabled={disabled} onClick={onCancel}>
+          Cancel
+        </WorkshopButton>
+        <WorkshopButton tone="primary" disabled={disabled} onClick={onConfirm}>
+          {disabled ? "Confirming…" : "Confirm schedule"}
+        </WorkshopButton>
+      </div>
+    </section>
+  );
+}
+
 export function ScheduleBlock({
   call,
   onOpen,
@@ -333,6 +591,8 @@ export function ScheduleBlock({
   /** 有 id 且宿主给了回调时,整张卡变成跳到「已安排」详情的按钮。 */
   onOpen?: (scheduleId: string) => void;
 }) {
+  // 待确认时由宿主把持久化审批渲染在输入框上方；这里不重复画第二张卡。
+  if (call.awaitingApproval) return null;
   const state = call.failed ? "failed" : call.running ? "running" : "scheduled";
   const scheduleId = state === "scheduled" ? scheduleIdOf(call.output) : "";
   const clickable = Boolean(scheduleId && onOpen);
@@ -400,10 +660,109 @@ export function ScheduleBlock({
   );
 }
 
-// ── 原位授权(照搬 renderActionCard 的 blocking callout)────────────────────
+// ── 原位授权 ──────────────────────────────────────────────
 
 export type ApprovalDecision = "deny" | "allow_once" | "allow_level";
 
+export function PermissionGrant({
+  capability,
+  requester,
+  reach,
+  disabled = false,
+  onGrant,
+  "aria-label": ariaLabel = `${capability} permission request`,
+}: {
+  capability: string;
+  requester: string;
+  reach: readonly string[];
+  disabled?: boolean;
+  onGrant: (decision: ApprovalDecision) => void;
+  "aria-label"?: string;
+}) {
+  const actionClassName =
+    "inline-flex h-10 w-[120px] items-center justify-center rounded-lg border border-kumo-line px-4 text-[14px] leading-[1.4] font-medium transition-[background-color,color,opacity,transform] duration-150 ease-out active:scale-[0.96] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-kumo-ring/40 disabled:cursor-not-allowed disabled:opacity-40 disabled:active:scale-100";
+
+  return (
+    <section
+      aria-label={ariaLabel}
+      className="themed-surface-inset w-full rounded-xl border border-kumo-line bg-kumo-elevated p-4 text-kumo-default"
+    >
+      <div className="flex items-center gap-2">
+        <span
+          className="flex size-8 shrink-0 items-center justify-center rounded-lg bg-kumo-fill text-kumo-subtle"
+          aria-hidden="true"
+        >
+          <Key size={14} weight="bold" />
+        </span>
+        <div className="flex min-w-0 flex-1 flex-col">
+          <span className="truncate text-[14px] leading-[1.4] font-medium">
+            {capability}
+          </span>
+          <span className="truncate text-[12px] leading-4 text-kumo-inactive">
+            requested by {requester}
+          </span>
+        </div>
+      </div>
+
+      <div className="mt-4 flex max-h-[200px] flex-col gap-2 overflow-y-auto">
+        <span className="text-[12px] leading-4 text-kumo-inactive">
+          this grants
+        </span>
+        {reach.map((item, index) => (
+          <span
+            key={`${index}:${item}`}
+            className="flex items-baseline gap-2 text-[14px] leading-[1.4] text-kumo-subtle"
+          >
+            <span aria-hidden="true">•</span>
+            <span className="min-w-0 break-words whitespace-pre-wrap">{item}</span>
+          </span>
+        ))}
+      </div>
+
+      <div className="mt-4 flex flex-wrap items-center gap-2">
+        <Tooltip
+          content="Allow every action at this execution level, without future prompts."
+          asChild
+        >
+          <button
+            type="button"
+            disabled={disabled}
+            onClick={() => onGrant("allow_level")}
+            className={`${actionClassName} border-0 bg-[linear-gradient(90deg,#ffd077_0%,#ff9938_100%)] text-kumo-inverse enabled:hover:brightness-95`}
+          >
+            Allow level
+          </button>
+        </Tooltip>
+        <button
+          type="button"
+          disabled={disabled}
+          onClick={() => onGrant("allow_once")}
+          className={`${actionClassName} text-kumo-subtle enabled:hover:bg-kumo-fill enabled:hover:text-kumo-default`}
+        >
+          Allow once
+        </button>
+        <button
+          type="button"
+          disabled={disabled}
+          onClick={() => onGrant("deny")}
+          className={`${actionClassName} text-kumo-subtle enabled:hover:bg-kumo-fill enabled:hover:text-kumo-default`}
+        >
+          Deny
+        </button>
+      </div>
+    </section>
+  );
+}
+
+function approvalReach(call: CloudOsToolCall): string[] {
+  const entries = Object.entries(call.input);
+  return entries.length > 0
+    ? entries.map(
+        ([name, value]) => `${humanizeToolName(name)}: ${safeStringify(value)}`,
+      )
+    : ["Run this tool without arguments"];
+}
+
 export function ApprovalBlock({
   call,
   approvalId,
@@ -415,70 +774,15 @@ export function ApprovalBlock({
   disabled?: boolean;
   onApprove: (approvalId: string, decision: ApprovalDecision) => void;
 }) {
-  const title = `${call.toolName} needs approval`;
-  const description =
-    Object.keys(call.input).length > 0
-      ? "```json\n" + JSON.stringify(call.input, null, 2) + "\n```"
-      : "This action pauses the turn until you decide.";
-
   return (
     <div className="group/work max-w-[860px] text-[14px] leading-5 tracking-[-0.25px] text-kumo-subtle">
-      {/* 原文件的 blocking callout 是「图标 + 正文 + 右侧动作」一行到底。聊天栏默认
-          只有 420px 宽,一行放不下三段,正文会被挤成 0 宽 —— 所以外层允许换行,
-          动作组在挤不下时整体落到下一行右对齐。 */}
-      <div className="rounded-2xl border border-kumo-brand/40 bg-kumo-brand/10 px-4 py-3">
-        <div className="flex flex-wrap items-start gap-3">
-          <span
-            className="flex h-9 w-9 flex-shrink-0 items-center justify-center rounded-lg bg-kumo-tint text-kumo-brand"
-            aria-hidden="true"
-          >
-            <ShieldCheck size={20} weight="fill" />
-          </span>
-          <div className="min-w-[12rem] flex-1">
-            <div className="flex flex-wrap items-center gap-x-2 gap-y-0.5">
-              <span className="min-w-0 truncate font-medium text-kumo-default">
-                {title}
-              </span>
-            </div>
-            <div className="cos-chat-panel cos-markdown mt-1 max-h-[200px] overflow-y-auto pr-1 text-[13px] leading-[18px] text-kumo-subtle">
-              <MarkdownMessage message={description} />
-            </div>
-          </div>
-          <div className="ml-auto flex flex-wrap items-center justify-end gap-1 self-center">
-            <Tooltip content="Reject this action and let the agent continue without it." asChild>
-              <WorkshopButton
-                tone="secondary"
-                disabled={disabled}
-                onClick={() => onApprove(approvalId, "deny")}
-                className="!h-8 !rounded-lg text-[12px]"
-              >
-                Deny
-              </WorkshopButton>
-            </Tooltip>
-            <Tooltip content="Allow just this call." asChild>
-              <WorkshopButton
-                tone="secondary"
-                disabled={disabled}
-                onClick={() => onApprove(approvalId, "allow_once")}
-                className="!h-8 !rounded-lg text-[12px]"
-              >
-                Allow once
-              </WorkshopButton>
-            </Tooltip>
-            <Tooltip content="Allow every action at this execution level, without future prompts." asChild>
-              <WorkshopButton
-                tone="primary"
-                disabled={disabled}
-                onClick={() => onApprove(approvalId, "allow_level")}
-                className="!h-8 gap-1 !rounded-lg text-[12px]"
-              >
-                <Check size={11} weight="bold" />
-                Allow level
-              </WorkshopButton>
-            </Tooltip>
-          </div>
-        </div>
-      </div>
+      <PermissionGrant
+        capability={humanizeToolName(call.toolName)}
+        requester="the agent"
+        reach={approvalReach(call)}
+        disabled={disabled}
+        onGrant={(decision) => onApprove(approvalId, decision)}
+      />
     </div>
   );
 }