fix(chat): 重新生成前撤销旧消息

src/components/chat/AgentComposer.tsx

@@ -26,7 +26,9 @@ import KeyboardArrowUpRounded from "@mui/icons-material/KeyboardArrowUpRounded";
 import AttachFileRounded from "@mui/icons-material/AttachFileRounded";
 import BoltRounded from "@mui/icons-material/BoltRounded";
 import AutoAwesomeRounded from "@mui/icons-material/AutoAwesomeRounded";
-import type { AgentModel } from "@/lib/chatStream";
+import VerifiedUserRounded from "@mui/icons-material/VerifiedUserRounded";
+import AdminPanelSettingsRounded from "@mui/icons-material/AdminPanelSettingsRounded";
+import type { AgentApprovalMode, AgentModel } from "@/lib/chatStream";
 
 export type AgentComposerHandle = {
   focus: () => void;
@@ -48,6 +50,8 @@ type AgentComposerProps = {
   onStopListening: () => void;
   selectedModel: AgentModel;
   onModelChange: (model: AgentModel) => void;
+  approvalMode: AgentApprovalMode;
+  onApprovalModeChange: (mode: AgentApprovalMode) => void;
 };
 
 export const AgentComposer = React.forwardRef<AgentComposerHandle, AgentComposerProps>(function AgentComposer({
@@ -62,6 +66,8 @@ export const AgentComposer = React.forwardRef<AgentComposerHandle, AgentComposer
   onStopListening,
   selectedModel,
   onModelChange,
+  approvalMode,
+  onApprovalModeChange,
 }, ref) {
   const theme = useTheme();
   const inputRef = React.useRef<HTMLInputElement | HTMLTextAreaElement | null>(null);
@@ -245,6 +251,97 @@ export const AgentComposer = React.forwardRef<AgentComposerHandle, AgentComposer
                   </IconButton>
                 )
               ) : null}
+              <FormControl size="small" sx={{ minWidth: 96 }}>
+                <Select
+                  value={approvalMode}
+                  onChange={(event) =>
+                    onApprovalModeChange(event.target.value as AgentApprovalMode)
+                  }
+                  disabled={isHydrating || isStreaming}
+                  aria-label="权限批准模式"
+                  renderValue={(val) => (
+                    <Box sx={{ display: "flex", alignItems: "center", gap: 0.45 }}>
+                      {val === "always" ? (
+                        <AdminPanelSettingsRounded sx={{ fontSize: 18, color: "inherit" }} />
+                      ) : (
+                        <VerifiedUserRounded sx={{ fontSize: 18, color: "inherit" }} />
+                      )}
+                      <Typography sx={{ fontSize: "0.75rem", fontWeight: 600, color: "inherit" }}>
+                        {val === "always" ? "始终允许" : "请求批准"}
+                      </Typography>
+                    </Box>
+                  )}
+                  MenuProps={{
+                    anchorOrigin: { vertical: "top", horizontal: "left" },
+                    transformOrigin: { vertical: "bottom", horizontal: "left" },
+                    sx: { zIndex: (theme) => theme.zIndex.modal + 110 },
+                    PaperProps: {
+                      sx: {
+                        mb: 1.5,
+                        width: 210,
+                        borderRadius: 4,
+                        bgcolor: alpha("#fff", 0.9),
+                        backdropFilter: "blur(24px)",
+                        border: `1px solid ${alpha("#fff", 0.9)}`,
+                        boxShadow: `0 -12px 40px ${alpha("#000", 0.08)}`,
+                        "& .MuiList-root": { p: 1 },
+                        "& .MuiMenuItem-root": {
+                          px: 1.5,
+                          py: 1.2,
+                          mb: 0.5,
+                          borderRadius: 3,
+                          alignItems: "flex-start",
+                          "&:last-child": { mb: 0 },
+                          "&.Mui-selected": {
+                            bgcolor: alpha("#00acc1", 0.08),
+                            "&:hover": { bgcolor: alpha("#00acc1", 0.12) },
+                            "& .title": { color: "#00838f" },
+                            "& .icon": { color: "#00acc1" },
+                          },
+                        },
+                      },
+                    },
+                  }}
+                  sx={{
+                    height: 36,
+                    borderRadius: "18px",
+                    bgcolor: alpha("#fff", 0.6),
+                    color: "text.secondary",
+                    ".MuiOutlinedInput-notchedOutline": { border: "none" },
+                    ".MuiSelect-select": {
+                      py: 0,
+                      pl: 1,
+                      pr: "28px !important",
+                      minHeight: 36,
+                      display: "flex",
+                      alignItems: "center",
+                    },
+                    "&:hover, &:has(.MuiSelect-select[aria-expanded=\"true\"])": {
+                      bgcolor: alpha("#000", 0.06),
+                      color: "text.primary",
+                    },
+                    ".MuiSelect-icon": {
+                      color: "text.secondary",
+                      right: 4,
+                    },
+                  }}
+                >
+                  <MenuItem value="request">
+                    <VerifiedUserRounded className="icon" sx={{ mr: 1.5, mt: 0.15, fontSize: 18, color: "text.secondary" }} />
+                    <Box>
+                      <Typography className="title" sx={{ fontSize: "0.85rem", fontWeight: 700, color: "text.primary", mb: 0.2 }}>请求批准</Typography>
+                      <Typography sx={{ fontSize: "0.7rem", fontWeight: 500, color: "text.secondary", lineHeight: 1.3 }}>工具权限逐次确认</Typography>
+                    </Box>
+                  </MenuItem>
+                  <MenuItem value="always">
+                    <AdminPanelSettingsRounded className="icon" sx={{ mr: 1.5, mt: 0.15, fontSize: 18, color: "text.secondary" }} />
+                    <Box>
+                      <Typography className="title" sx={{ fontSize: "0.85rem", fontWeight: 700, color: "text.primary", mb: 0.2 }}>始终允许</Typography>
+                      <Typography sx={{ fontSize: "0.7rem", fontWeight: 500, color: "text.secondary", lineHeight: 1.3 }}>自动允许本轮权限请求</Typography>
+                    </Box>
+                  </MenuItem>
+                </Select>
+              </FormControl>
             </Stack>
 
             <Stack direction="row" spacing={1} alignItems="center">

src/components/chat/GlobalChatbox.tsx

@@ -10,7 +10,7 @@ import { Box, Drawer, alpha, useTheme } from "@mui/material";
 import { useNotification } from "@refinedev/core";
 
 import { getAccessToken } from "@/lib/authToken";
-import type { AgentModel } from "@/lib/chatStream";
+import type { AgentApprovalMode, AgentModel } from "@/lib/chatStream";
 import { useProjectStore } from "@/store/projectStore";
 import { AgentComposer, type AgentComposerHandle } from "./AgentComposer";
 import { AgentHeader } from "./AgentHeader";
@@ -31,6 +31,8 @@ export const GlobalChatbox: React.FC<Props> = ({ open, onClose }) => {
   const [selectedModel, setSelectedModel] = useState<AgentModel>(
     "deepseek/deepseek-v4-pro",
   );
+  const [approvalMode, setApprovalMode] =
+    useState<AgentApprovalMode>("request");
 
   const bottomRef = useRef<HTMLDivElement>(null);
   const composerRef = useRef<AgentComposerHandle | null>(null);
@@ -85,6 +87,7 @@ export const GlobalChatbox: React.FC<Props> = ({ open, onClose }) => {
     onToolCall: handleToolCall,
     onBeforeSend: stopListening,
     getModel: () => selectedModel,
+    getApprovalMode: () => approvalMode,
   });
 
   const scrollToBottom = useCallback((behavior: ScrollBehavior = "smooth") => {
@@ -371,6 +374,8 @@ export const GlobalChatbox: React.FC<Props> = ({ open, onClose }) => {
               onStopListening={stopListening}
               selectedModel={selectedModel}
               onModelChange={setSelectedModel}
+              approvalMode={approvalMode}
+              onApprovalModeChange={setApprovalMode}
             />
           </Box>
         </Box>

src/components/chat/hooks/useAgentChatSession.test.tsx

@@ -521,4 +521,33 @@ describe("useAgentChatSession", () => {
       expect.anything(),
     );
   });
+
+  it("asks the backend to undo the previous user turn before regenerating", async () => {
+    listChatSessions.mockResolvedValue([]);
+
+    const { result } = renderHook(() =>
+      useAgentChatSession({
+        projectId: "project-1",
+        onToolCall: jest.fn(),
+      }),
+    );
+
+    await waitFor(() => expect(result.current.isHydrating).toBe(false));
+
+    await act(async () => {
+      await result.current.sendPrompt("重新分析压力异常");
+    });
+
+    await act(async () => {
+      await result.current.regenerate();
+    });
+
+    expect(streamAgentChat).toHaveBeenNthCalledWith(
+      2,
+      expect.objectContaining({
+        message: "重新分析压力异常",
+        regenerateFromMessageIndex: 0,
+      }),
+    );
+  });
 });

src/components/chat/hooks/useAgentChatSession.ts

@@ -9,7 +9,12 @@ import {
   resumeAgentChatStream,
   streamAgentChat,
 } from "@/lib/chatStream";
-import type { AgentModel, PermissionReply, StreamEvent } from "@/lib/chatStream";
+import type {
+  AgentApprovalMode,
+  AgentModel,
+  PermissionReply,
+  StreamEvent,
+} from "@/lib/chatStream";
 import type {
   AgentArtifact,
   AgentPermissionRequest,
@@ -45,11 +50,13 @@ type UseAgentChatSessionOptions = {
   ) => void;
   onBeforeSend?: () => void;
   getModel?: () => AgentModel;
+  getApprovalMode?: () => AgentApprovalMode;
 };
 
 type PromptRunOptions = {
   prompt: string;
   sessionIdOverride?: string;
+  regenerateFromMessageIndex?: number;
   preparedMessages?: Message[];
   userMessage?: Message;
   assistantMessage?: Message;
@@ -210,6 +217,7 @@ export const useAgentChatSession = ({
   onToolCall,
   onBeforeSend,
   getModel,
+  getApprovalMode,
 }: UseAgentChatSessionOptions) => {
   const hydrationCompletedRef = useRef(false);
   const hydrationNonceRef = useRef(0);
@@ -602,6 +610,7 @@ export const useAgentChatSession = ({
     async ({
       prompt: rawPrompt,
       sessionIdOverride,
+      regenerateFromMessageIndex,
       preparedMessages,
       userMessage,
       assistantMessage,
@@ -636,6 +645,8 @@ export const useAgentChatSession = ({
           message: prompt,
           sessionId: sessionIdOverride ?? sessionIdRef.current,
           model: getModel?.(),
+          approvalMode: getApprovalMode?.(),
+          regenerateFromMessageIndex,
           signal: controller.signal,
           onEvent: (event) =>
             applyStreamEvent(event, {
@@ -686,7 +697,15 @@ export const useAgentChatSession = ({
         setIsStreaming(false);
       }
     },
-    [applyStreamEvent, getModel, isHydrating, isStreaming, messages, onBeforeSend],
+    [
+      applyStreamEvent,
+      getApprovalMode,
+      getModel,
+      isHydrating,
+      isStreaming,
+      messages,
+      onBeforeSend,
+    ],
   );
 
   const abort = useCallback(() => {
@@ -975,6 +994,7 @@ export const useAgentChatSession = ({
       setMessages(nextMessages);
       await runPrompt({
         prompt: lastUserContent,
+        regenerateFromMessageIndex: lastUserIndex,
         preparedMessages: [
           ...nextMessages,
           nextUserMessage,

src/lib/chatStream.test.ts

@@ -72,6 +72,8 @@ describe("streamAgentChat", () => {
           message: "hi",
           session_id: undefined,
           model: "deepseek/deepseek-v4-pro",
+          approval_mode: undefined,
+          regenerate_from_message_index: undefined,
         }),
       }),
     );

src/lib/chatStream.ts

@@ -6,6 +6,7 @@ export type AgentModel =
   | "deepseek/deepseek-v4-pro";
 
 export type PermissionReply = "once" | "always" | "reject";
+export type AgentApprovalMode = "request" | "always";
 
 export type StreamEvent =
   | {
@@ -69,6 +70,8 @@ type StreamOptions = {
   message: string;
   sessionId?: string;
   model?: AgentModel;
+  approvalMode?: AgentApprovalMode;
+  regenerateFromMessageIndex?: number;
   signal?: AbortSignal;
   onEvent: (event: StreamEvent) => void;
 };
@@ -283,6 +286,8 @@ export const streamAgentChat = async ({
   message,
   sessionId,
   model,
+  approvalMode,
+  regenerateFromMessageIndex,
   signal,
   onEvent,
 }: StreamOptions) => {
@@ -301,6 +306,8 @@ export const streamAgentChat = async ({
           message,
           session_id: sessionId,
           model,
+          approval_mode: approvalMode,
+          regenerate_from_message_index: regenerateFromMessageIndex,
         }),
         projectHeaderMode: "include",
         userHeaderMode: "include",