@springbrand/chat-client 0.1.3-alpha.31 → 0.1.3-alpha.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@springbrand/chat-client",
-  "version": "0.1.3-alpha.31",
+  "version": "0.1.3-alpha.34",
   "type": "module",
   "files": [
     "src",
@@ -25,7 +25,7 @@
     "@types/react-dom": "^19.2.3",
     "react-dom": "^19.2.7",
     "typescript": "^7.0.2",
-    "@springbrand/agent-runtime": "0.2.0-alpha.42"
+    "@springbrand/agent-runtime": "0.2.0-alpha.45"
   },
   "scripts": {
     "typecheck": "tsc --noEmit"

package/src/use-universal-agent-chat.ts

@@ -31,7 +31,9 @@ import { createSafeUIMessageAgentConnection } from "./ui-message-stream-guard";
 import { CURRENT_INBOX_AGENT_PATH } from "./chat-sessions";
 
 type ChatMessageMetadata = Record<string, unknown> & {
+  completedAt?: number;
   error?: string;
+  interruptedByUser?: boolean;
   requestedCapabilities?: readonly RequestedCapability[];
   turnId?: string;
   turnStatus?: string;
@@ -182,6 +184,8 @@ type SharedChatConnectionOptions = {
   skipInitialMessages?: boolean;
   /** Host projection used only until the selected Session sends its first state. */
   initialTurnActive?: boolean;
+  /** Optional Agent RPC method injected by the Host to receive Turn timings. */
+  performanceRpc?: string;
 };
 
 export type ChatConnectionOptions = SharedChatConnectionOptions & (
@@ -243,6 +247,7 @@ export function UniversalAgentChatProvider({
 type ChatTurnTiming = {
   chatId: string;
   messageId: string;
+  submissionId?: string;
   baselineAssistantIds: Set<string>;
   click: number;
   rpcReceipt?: number;
@@ -251,6 +256,37 @@ type ChatTurnTiming = {
   ready?: number;
 };
 
+type ClientPerformanceMetrics = {
+  clickToRpcMs: number;
+  rpcToStreamMs: number;
+  streamToFirstTextMs?: number;
+  firstTextToReadyMs?: number;
+  ttftMs?: number;
+  totalMs: number;
+};
+
+export function clientPerformanceMetrics(
+  timing: ChatTurnTiming,
+): ClientPerformanceMetrics | null {
+  if (
+    timing.rpcReceipt === undefined ||
+    timing.streamStart === undefined ||
+    timing.ready === undefined
+  ) return null;
+  return {
+    clickToRpcMs: timing.rpcReceipt - timing.click,
+    rpcToStreamMs: timing.streamStart - timing.rpcReceipt,
+    ...(timing.firstText === undefined
+      ? {}
+      : {
+          streamToFirstTextMs: timing.firstText - timing.streamStart,
+          firstTextToReadyMs: timing.ready - timing.firstText,
+          ttftMs: timing.firstText - timing.click,
+        }),
+    totalMs: timing.ready - timing.click,
+  };
+}
+
 const CHAT_TURN_SEGMENTS = {
   rpcReceipt: ["click", "universal-agent.chat.click_to_rpc_receipt"],
   streamStart: [
@@ -380,7 +416,7 @@ export function useUniversalAgentChat(): ChatRuntime {
   const [dispatchError, setDispatchError] = useState<string>();
   const [canRetry, setCanRetry] = useState(false);
   const failedDispatchRef = useRef<FailedDispatch | undefined>(undefined);
-  const activeSubmissionIdRef = useRef<string | undefined>(undefined);
+  const stopRevisionRef = useRef(0);
   // 轮询→推送:这条 chat 连接连的是 UniversalAgent facet,`agent.state` 即 facet 的
   // AgentState 广播(useAgent 内部 useState,收到 cf_agent_state 即 re-render)。待批项
   // 随它推来 —— 审批读侧复用这条已开的连接,不另开第二条 WebSocket。三态(原则 VII):
@@ -396,6 +432,7 @@ export function useUniversalAgentChat(): ChatRuntime {
     isStreaming,
     error,
     clearError,
+    setMessages,
     stop: stopChat,
     // autonomous responses 纪律(CF 文档采纳 2026-07-05):框架已提供三个流态标志,
     // 透出供 UI 区分「服务端主动流 vs 用户发起流」+「恢复态」(与 stall 看门狗配套)。
@@ -476,7 +513,8 @@ export function useUniversalAgentChat(): ChatRuntime {
     if (!timing) return;
     const assistant = messages.find((message) =>
       message.role === "assistant" &&
-      !timing.baselineAssistantIds.has(message.id)
+      !timing.baselineAssistantIds.has(message.id) &&
+      (!timing.submissionId || message.metadata?.turnId === timing.submissionId)
     );
     if (assistant) markChatTurnPhase(timing, "streamStart");
     if (
@@ -488,9 +526,18 @@ export function useUniversalAgentChat(): ChatRuntime {
     }
     if (status === "ready" && timing.streamStart !== undefined) {
       if (timing.firstText !== undefined) markChatTurnPhase(timing, "ready");
+      else timing.ready ??= now();
       turnTimingRef.current = null;
+      const metrics = clientPerformanceMetrics(timing);
+      if (connection.performanceRpc && timing.submissionId && metrics) {
+        void agentRef.current.call(connection.performanceRpc, [{
+          submissionId: timing.submissionId,
+          messageId: timing.messageId,
+          ...metrics,
+        }]).catch(() => {});
+      }
     }
-  }, [messages, status]);
+  }, [connection.performanceRpc, messages, status]);
 
   useEffect(() => {
     if (optimisticMessages.length === 0 || messages.length === 0) return;
@@ -601,6 +648,7 @@ export function useUniversalAgentChat(): ChatRuntime {
     delivery: MessageDelivery,
     projection: "message" | "queue",
   ): Promise<boolean> => {
+    const stopRevision = stopRevisionRef.current;
     setDispatchError(undefined);
     clearError();
     failedDispatchRef.current = undefined;
@@ -618,7 +666,6 @@ export function useUniversalAgentChat(): ChatRuntime {
       };
     }
     if (projection === "message") {
-      activeSubmissionIdRef.current = undefined;
       setOptimisticMessages((current) =>
         current.some(({ id }) => id === message.id)
           ? current
@@ -663,9 +710,20 @@ export function useUniversalAgentChat(): ChatRuntime {
         return false;
       }
       if (projection === "message") {
-        activeSubmissionIdRef.current = receipt.kind === "queued"
+        const submissionId = receipt.kind === "queued"
           ? receipt.submission.submissionId
           : receipt.submissionId;
+        if (stopRevision !== stopRevisionRef.current) {
+          await agentRef.current.call<{ ok: boolean }>(
+            "cancelSubmissionById",
+            [submissionId, USER_STOP_REASON],
+          );
+          rollback();
+          return true;
+        }
+        if (turnTimingRef.current?.messageId === message.id) {
+          turnTimingRef.current.submissionId = submissionId;
+        }
       }
       if (projection === "queue") {
         if (receipt.kind !== "queued" || receipt.position < 1) {
@@ -783,29 +841,49 @@ export function useUniversalAgentChat(): ChatRuntime {
   }, []);
 
   const stop = useCallback(async () => {
+    stopRevisionRef.current += 1;
     const requestId = authoritativeTurn?.activeRequestId;
-    const submissionId = authoritativeTurn?.activeSubmissionId ??
-      activeSubmissionIdRef.current;
+    const submissionId = authoritativeTurn?.activeSubmissionId;
+    const beforeStop = messagesRef.current;
+    const userIndex = beforeStop.findLastIndex(({ role }) => role === "user");
+    const assistantIndex = beforeStop.findLastIndex(
+      ({ role }, index) => index > userIndex && role === "assistant",
+    );
+    const marker = {
+      completedAt: Date.now(),
+      interruptedByUser: true,
+      turnStatus: "aborted",
+    } as const;
+    setMessages(assistantIndex < 0
+      ? [...beforeStop, {
+          id: `optimistic-stop:${submissionId ?? requestId ?? crypto.randomUUID()}`,
+          role: "assistant",
+          metadata: marker,
+          parts: [],
+        }]
+      : beforeStop.map((message, index) =>
+          index === assistantIndex
+            ? { ...message, metadata: { ...message.metadata, ...marker } }
+            : message
+        ));
+    const rollback = () => setMessages(beforeStop);
     setDispatchError(undefined);
     try {
+      await agentRef.current.call<{ ok: boolean }>(
+        "stopAllSubmissions",
+        [USER_STOP_REASON],
+      );
+      setOptimisticMessages([]);
+      setOptimisticQueued([]);
       if (requestId) {
         agentRef.current.send(JSON.stringify({
           type: MessageType.CF_AGENT_CHAT_REQUEST_CANCEL,
           id: requestId,
         }));
         await stopChat();
-        return;
       }
-      await (submissionId
-        ? agentRef.current.call<{ ok: boolean }>(
-          "cancelSubmissionById",
-          [submissionId, USER_STOP_REASON],
-        )
-        : agentRef.current.call<{ ok: boolean }>(
-          "stopTurn",
-          [undefined, USER_STOP_REASON],
-        ));
     } catch (cause) {
+      rollback();
       setDispatchError(
         cause instanceof Error ? cause.message : String(cause),
       );