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

package/cloud-os/README.md

@@ -46,10 +46,10 @@ pnpm dev:cloud-os        # http://localhost:9992
    shadcn 主题正面冲突。
 4. **作用域化主题**。只有 kumo 命名空间的 token 进 `@theme`;通用 token(字体 /
    圆角 / 字号 / 缓动)挂在 `.cloud-os-root` 上靠继承生效,宿主主题分毫不动。
-5. **删掉的东西**:capsule(URL → 资源胶囊)、行内 slash picker、ComposerMirror、
-   GatekeeperModal、Yjs 草稿 / 「接受改动」那一整套。它们都直挂 gadgets 的 capnweb
-   RPC,UIMessage 协议下没有对应物。slash 命令退成「+」菜单里的一组条目 —— 能力
-   保住,但没有边打字边过滤的行内补全。
+5. **删掉的东西**:capsule(URL → 资源胶囊)、ComposerMirror、GatekeeperModal、
+   Yjs 草稿 / 「接受改动」那一整套。它们都直挂 gadgets 的 capnweb RPC,
+   UIMessage 协议下没有对应物。命令补全使用 package 内的 assistant-ui
+   `ComposerTriggerPopover`,宿主只传命令数据。
 6. **窄栏适配**。授权卡 / 提问卡 / 定时卡在上游是「图标 + 正文 + 右侧动作」一行到底;
    聊天栏默认只有 420px,一行放不下会把正文挤成 0 宽,所以改成允许换行。
 

package/cloud-os/capability-chip.tsx

@@ -0,0 +1,35 @@
+import { Diamond, X } from "@phosphor-icons/react";
+
+export interface CapabilityChipProps {
+  kind: "skill" | "plan";
+  label: string;
+  removable?: boolean;
+  onRemove?: () => void;
+}
+
+export function CapabilityChip({
+  kind,
+  label,
+  removable = false,
+  onRemove,
+}: CapabilityChipProps) {
+  return (
+    <span
+      data-capability-kind={kind}
+      className="inline-flex max-w-full items-center gap-1 rounded-full border border-kumo-line bg-kumo-elevated px-2 py-1 text-[12px] leading-4 text-kumo-subtle"
+    >
+      <Diamond size={11} weight="duotone" className="shrink-0 text-kumo-brand" />
+      <span className="truncate">{label}</span>
+      {removable && onRemove && (
+        <button
+          type="button"
+          onClick={onRemove}
+          aria-label={`Remove ${label}`}
+          className="-mr-1 grid size-5 shrink-0 cursor-pointer place-items-center rounded-full text-kumo-inactive hover:bg-kumo-tint hover:text-kumo-default focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-kumo-brand/40"
+        >
+          <X size={10} weight="bold" />
+        </button>
+      )}
+    </span>
+  );
+}

package/cloud-os/chat/activity-indicator.tsx

@@ -0,0 +1,29 @@
+import { ThinkingOrb } from "thinking-orbs";
+import { useCloudOsMode } from "../internal/theme-context";
+import type { CloudOsActivity } from "./transcript-model";
+
+/**
+ * 回合还在跑、但屏幕上没有任何东西在动时的活动指示。
+ *
+ * 用 thinking-orbs 的 canvas 球而不是一行 shimmer 文字:动画本身就是「还活着」
+ * 的信号,文案只负责说清在干什么(`deriveTurnActivity` 给出的四种之一)。
+ *
+ * 和 `src/status.tsx` 的 `ThinkingIndicator` 是同一个上游球、同一套 role/aria
+ * 形状,但**不共用实现** —— cloud-os 不 import `../src`(见 cloud-os/README.md,
+ * 由 check-chat-presentation-boundary.mjs 守着),文案也走 cloud-os 自己的
+ * 工具种类表,不是 src 那套工具名正则。
+ */
+export function CloudOsActivityIndicator({ state, label }: CloudOsActivity) {
+  // 必须显式传 theme,不能用它的 `auto`:auto 先扫祖先的 data-theme / .dark / .light,
+  // 而本仓的浅色**是「没有 .dark」**,扫不到任何标记 → 它回落到
+  // prefers-color-scheme,也就是**操作系统**的深浅。系统深色 + 应用浅色时,
+  // 球会在浅底上画浅墨,几乎看不见。cloud-os 子树的深浅事实源是这个 context
+  // (CloudOsRoot 从宿主的 useThemeMode() 拿到),直接用它。
+  const mode = useCloudOsMode();
+  return (
+    <div className="cos-activity" role="status" aria-label={label}>
+      <ThinkingOrb state={state} size={20} theme={mode} aria-hidden="true" />
+      <span>{label}</span>
+    </div>
+  );
+}

package/cloud-os/chat/cloud-os-chat-messages.tsx

@@ -9,11 +9,13 @@ import {
   Terminal,
 } from "@phosphor-icons/react";
 import {
+  Fragment,
   useCallback,
   useEffect,
   useMemo,
   useRef,
   useState,
+  type ReactNode,
 } from "react";
 import { Tooltip } from "../primitives/tooltip";
 import { WorkshopIconButton } from "../primitives/workshop-controls";
@@ -33,8 +35,11 @@ import {
   type ApprovalDecision,
 } from "./rich-blocks";
 import { ThinkingTraceRow, ToolGroupRow } from "./tool-rows";
+import { CloudOsActivityIndicator } from "./activity-indicator";
+import { CapabilityChip } from "../capability-chip";
 import {
   buildCloudOsEntries,
+  deriveTurnActivity,
   formatClockTime,
   formatFullTimestamp,
   rhythmTopClass,
@@ -58,6 +63,18 @@ export interface CloudOsChatMessagesProps {
   /** 把某个 part 映射成待授权 id;返回 undefined 表示不在此处渲染授权。 */
   approvalIdOf?: (part: unknown) => string | undefined;
   approvalsDisabled?: boolean;
+  /**
+   * 用宿主自己的卡片渲染某条待授权。返回 undefined 就退回内置的通用授权行。
+   *
+   * 存在的理由：授权行只认得工具名和入参，说不出「这次要花多少钱、买的是什么」。
+   * 需要在决定之前把这些摆到人面前的宿主，得自己画那张卡。
+   */
+  renderApproval?: (approval: {
+    approvalId: string;
+    toolName: string;
+    input: Record<string, unknown>;
+    disabled: boolean;
+  }) => ReactNode;
   /** 把消息里的 `sandbox:/workspace/...` 之类地址翻译成可访问 URL。 */
   resolveUrl?: CloudOsUrlResolver;
   /** 消息区宽度是否收敛到 920px 居中(GadgetEditor 里叫 constrainChatWidth)。 */
@@ -66,7 +83,11 @@ export interface CloudOsChatMessagesProps {
   onRetry?: () => void;
   onApprove?: (approvalId: string, decision: ApprovalDecision) => void;
   onSuggestion?: (text: string) => void;
-  onAnswer?: (payload: unknown) => void;
+  /**
+   * 把交互卡片上的操作回写成那次工具调用的结果(缺省 → 卡片不可操作)。
+   * 卡片不再知道「答案怎么变成消息」—— 它只认自己的 toolCallId。
+   */
+  onRespond?: (toolCallId: string, response: unknown) => Promise<boolean>;
   /** 点击定时任务卡片:宿主决定跳到哪(缺省 → 卡片不可点)。 */
   onOpenSchedule?: (scheduleId: string) => void;
   onCopy?: (text: string) => void;
@@ -107,6 +128,17 @@ function UserBubble({
 }) {
   return (
     <div className="group/message relative flex flex-col items-end">
+      {entry.capabilities.length > 0 && (
+        <div className="mb-1.5 flex max-w-[min(680px,78%)] flex-wrap justify-end gap-1.5">
+          {entry.capabilities.map((capability) => (
+            <CapabilityChip
+              key={`${capability.kind}:${capability.name}`}
+              kind={capability.kind}
+              label={capability.label}
+            />
+          ))}
+        </div>
+      )}
       {entry.attachments.length > 0 && (
         <div className="mb-1.5 flex max-w-[min(680px,78%)] flex-wrap justify-end gap-2">
           {entry.attachments.map((attachment, index) =>
@@ -173,13 +205,14 @@ export function CloudOsChatMessages({
   showThinkingTraces = true,
   approvalIdOf,
   approvalsDisabled = false,
+  renderApproval,
   resolveUrl,
   constrainWidth = true,
   emptyTitle = "What are we working on?",
   onRetry,
   onApprove,
   onSuggestion,
-  onAnswer,
+  onRespond,
   onOpenSchedule,
   onCopy,
 }: CloudOsChatMessagesProps) {
@@ -246,14 +279,10 @@ export function CloudOsChatMessages({
     element.scrollTo({ top: element.scrollHeight });
   }, [isRecovering, messages, status, showScrollButton]);
 
-  // 只有在「本回合还没吐出任何可见内容」时才显示 Thinking 占位;一旦有真实输出,
-  // 输出自己会说话(照搬原文件的 showThinking 判据)。
-  const lastEntry = entries.at(-1) ?? null;
-  const awaitingFirstOutput =
-    isActive &&
-    (lastEntry === null ||
-      lastEntry.type === "user" ||
-      lastEntry.type === "slashCommand");
+  // 判据是「尾巴有没有活口」,不是原文件的「本回合有没有出过内容」——
+  // 后者会让「答完 ask_user 之后到模型下一个 chunk」这段完全没有指示,
+  // 而卡片此时写着 Submitted,读起来就是卡死了。见 deriveTurnActivity。
+  const activity = deriveTurnActivity(entries, { isActive, hasPendingSteer });
   const copyText = (text: string) => {
     copy(text);
     onCopy?.(text);
@@ -432,8 +461,7 @@ export function CloudOsChatMessages({
                           <AskUserBlock
                             key={block.key}
                             call={block.call}
-                            answeredText={block.answeredText}
-                            onAnswer={(payload) => onAnswer?.(payload)}
+                            onRespond={onRespond}
                           />
                         );
                       case "suggestions":
@@ -452,7 +480,18 @@ export function CloudOsChatMessages({
                             onOpen={onOpenSchedule}
                           />
                         );
-                      case "approval":
+                      case "approval": {
+                        const custom = renderApproval?.({
+                          approvalId: block.approvalId,
+                          toolName: block.call.toolName,
+                          input: block.call.input,
+                          disabled: approvalsDisabled,
+                        });
+                        if (custom !== undefined && custom !== null) {
+                          return (
+                            <Fragment key={block.key}>{custom}</Fragment>
+                          );
+                        }
                         return (
                           <ApprovalBlock
                             key={block.key}
@@ -462,6 +501,7 @@ export function CloudOsChatMessages({
                             onApprove={(id, decision) => onApprove?.(id, decision)}
                           />
                         );
+                      }
                       case "parallel":
                         return (
                           <ParallelBlock
@@ -551,11 +591,9 @@ export function CloudOsChatMessages({
             </div>
           )}
 
-          {awaitingFirstOutput && (
+          {activity && (
             <div className="mt-5 inline-flex px-1.5 py-1 text-[14px] leading-5 tracking-[-0.25px]">
-              <span className="cos-thinking-shimmer">
-                {hasPendingSteer ? "Waiting for the current step to finish…" : "Thinking"}
-              </span>
+              <CloudOsActivityIndicator {...activity} />
             </div>
           )}
 

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

@@ -18,7 +18,7 @@ import type {
   PlanStep,
   SubAgentView,
 } from "./transcript-model";
-import type { CloudOsToolCall } from "./tool-presentation";
+import { askUserOutcome, type CloudOsToolCall } from "./tool-presentation";
 
 /**
  * UIMessage 协议里存在、gadgets 那套没有的几类 part —— 计划快照、原位提问、
@@ -149,99 +149,131 @@ function questionsOf(input: Record<string, unknown>): AskQuestion[] {
 
 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),
-  );
-  const resolved = submitted || Boolean(external);
-  const valid = questions.every(
+  // 不能用 `useState(() => questions.map(() => []))` 初始化:工具入参是**流式**到达的,
+  // 首帧 questions 往往还是空数组,那之后每次 setSelections 都在空数组上 map,
+  // 选择永远存不进去 → Submit 永久禁用。改成稀疏存 + 按当前 questions 补齐。
+  const [selections, setSelections] = useState<string[][]>([]);
+  const selectionAt = (index: number) => selections[index] ?? [];
+  const toggle = (questionIndex: number, option: string, multi: boolean) =>
+    setSelections((current) => {
+      const next = questions.map((_, index) => current[index] ?? []);
+      const values = next[questionIndex] ?? [];
+      next[questionIndex] = !multi
+        ? [option]
+        : values.includes(option)
+          ? values.filter((value) => value !== option)
+          : [...values, option];
+      return next;
+    });
+  // 在途只用于按钮转圈；权威状态永远是 part 的 state。
+  const [inFlight, setInFlight] = useState(false);
+  const outcome = askUserOutcome(call);
+  const answer = outcome.kind === "answered" ? outcome : null;
+  const answeredSelections = new Set(answer?.selections ?? []);
+  const answeredText = [
+    ...(answer?.selections ?? []),
+    ...(answer?.text.trim() ? [answer.text.trim()] : []),
+  ].join(" / ");
+  // 服务端已经结算 = 这张卡永久不可操作，不管结算成什么。
+  const resolved = outcome.kind !== "pending" || inFlight;
+  const valid = questions.length > 0 && questions.every(
     (question, index) =>
-      question.options.length === 0 || (selections[index]?.length ?? 0) > 0,
+      question.options.length === 0 || selectionAt(index).length > 0,
+  );
+  const buttonLabel = outcome.kind === "answered"
+    ? "Submitted"
+    : outcome.kind === "closed"
+      ? "Closed"
+      : inFlight
+        ? "Submitting…"
+        : "Submit";
+  const footnote = outcome.kind === "answered"
+    ? answeredText && `Answered: ${answeredText}`
+    : outcome.kind === "closed"
+      ? outcome.reason === "user_replied_freeform"
+        ? "Answered in the chat instead."
+        : "Closed without an answer."
+      : "";
+
+  // 提交按钮固定在卡片右下角,和脚注同一行 —— 脚注不再单独占一行,多问题时
+  // 按钮也不会卡在某一题的选项中间。选项没到(流式首帧 questions 为空)时这行
+  // 照样渲染,否则用户看到的是一张空卡。
+  const submit = (
+    <WorkshopButton
+      tone="primary"
+      disabled={resolved || !valid || !onRespond}
+      onClick={() => {
+        if (!onRespond) return;
+        setInFlight(true);
+        // 失败就把按钮放回可点：权威状态由 part 决定，这里只管别把用户锁死。
+        void onRespond(call.toolCallId, {
+          selections: questions.flatMap((_, index) => selectionAt(index)),
+          text: "",
+        }).then((ok) => {
+          if (!ok) setInFlight(false);
+        });
+      }}
+      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"
+    // 收成 w-fit：短问题不该撑成一条横贯全栏的长条,长问题到 560px 再换行。
+    <div className="w-fit min-w-[15rem] max-w-[560px]">
+      {/* 组内(问题↔选项)10px、组间(题与题、题与按钮行)12px —— 组间必须比组内
+          松,否则多问题时上一题的选项会看起来像下一题的。
+          用 flex+gap 而不是 space-y-*:Tailwind v4 的 space-y 选择器裹在
+          `:where()` 里,特异性被抹平,会被子元素自己的 `m-0` 压掉 → 不生效。 */}
+      <div className="flex flex-col gap-3 rounded-xl border border-kumo-line bg-kumo-base px-3 py-2.5">
+        {questions.map((question, questionIndex) => (
+          <div
+            key={`${question.prompt}:${questionIndex}`}
+            className="flex flex-col gap-2.5"
           >
-            <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>
-                    );
-                  })}
-                </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>
+            <p className="m-0 text-[13px] leading-[18px] font-medium tracking-[-0.25px] text-kumo-default">
+              {question.prompt}
+            </p>
+            <div className="flex flex-wrap items-center gap-1.5">
+              {question.options.map((option) => {
+                const selected = answer
+                  ? answeredSelections.has(option)
+                  : selectionAt(questionIndex).includes(option);
+                return (
+                  <button
+                    key={option}
+                    type="button"
+                    disabled={resolved || !onRespond}
+                    onClick={() => toggle(questionIndex, option, question.multi)}
+                    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>
+                );
+              })}
+            </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>
+          )}
+          {submit}
         </div>
-        {external && (
-          <p className="mt-2 mb-0 pl-12 text-[12px] leading-4 text-kumo-inactive">
-            Answered: {external}
-          </p>
-        )}
       </div>
     </div>
   );

package/cloud-os/chat/tool-presentation.ts

@@ -489,6 +489,48 @@ export function toCloudOsToolCall(
   };
 }
 
+// ── ask_user 的终局 ─────────────────────────────────────────────────────────
+
+/**
+ * `ask_user` 这次调用的三种终局,全部只看它自己的 state 和 output。
+ *
+ * - `pending`:还等着用户操作,选项可点。**只有 input 态才算 pending** ——
+ *   服务端一旦结算,这次 interaction 就不再接受响应。
+ * - `answered`:`ask_user` 的 settle 写了 `{ selections, text }`。
+ * - `closed`:被结算掉了但不是一个答案 —— 用户改成直接发言(`{ cancelled: true }`)、
+ *   Turn 提前结束、或工具出错。必须和 pending 分开,否则卡片会留一个点了拿
+ *   `{ ok: false }` 的假 Submit,读起来就是「点了没反应」。
+ *
+ * 判据放在这里而不是卡片里:卡片(能不能点)和底部活动指示器(还在不在等人)
+ * 都要用它,两处各判一次迟早会分叉。
+ */
+export type AskUserOutcome =
+  | { kind: "pending" }
+  | { kind: "answered"; selections: string[]; text: string }
+  | { kind: "closed"; reason: "user_replied_freeform" | "other" };
+
+export function askUserOutcome(call: CloudOsToolCall): AskUserOutcome {
+  if (call.state === "input-streaming" || call.state === "input-available") {
+    return { kind: "pending" };
+  }
+  const record = recordOf(call.output);
+  if (Array.isArray(record.selections)) {
+    return {
+      kind: "answered",
+      selections: record.selections.filter(
+        (value): value is string => typeof value === "string",
+      ),
+      text: typeof record.text === "string" ? record.text : "",
+    };
+  }
+  return {
+    kind: "closed",
+    reason: record.reason === "user_replied_freeform"
+      ? "user_replied_freeform"
+      : "other",
+  };
+}
+
 // ── 分组(逐行对应原 buildToolCallGroups)────────────────────────────────────
 
 export function buildToolCallGroups(calls: CloudOsToolCall[]): ToolCallGroup[] {