snail-ai测试版本提交

src/api/ai/agent/index.ts

@@ -50,6 +50,13 @@ export const registerCurrentSnailUser = (): AxiosPromise<SnailOpenApiUser> => {
   });
 };
 
+export const fetchChatMode = (): AxiosPromise<{ mode?: 'stream' | 'sync' }> => {
+  return request({
+    url: '/snail-ai/chat/mode',
+    method: 'get'
+  });
+};
+
 export const fetchAgentChat = (
   agentId: number,
   data: AgentChatRequest,
@@ -131,3 +138,11 @@ export const fetchAgentChat = (
       }
     });
 };
+
+export const fetchAgentChatSync = (agentId: number, data: AgentChatRequest): AxiosPromise<any> => {
+  return request({
+    url: `/snail-ai/agent/${agentId}/chat/sync`,
+    method: 'post',
+    data
+  });
+};

src/views/ai/chat/index.vue

@@ -13,6 +13,33 @@ const currentAgent = ref<AgentItem | null>(null);
 const currentConversationId = ref('');
 const currentNickname = ref('');
 
+function normalizeConversationList(payload: any): ConversationSummaryItem[] {
+  const container = payload?.data ?? payload;
+  const source =
+    (Array.isArray(container) && container) ||
+    (Array.isArray(container?.rows) && container.rows) ||
+    (Array.isArray(container?.list) && container.list) ||
+    (Array.isArray(container?.records) && container.records) ||
+    (Array.isArray(payload?.rows) && payload.rows) ||
+    (Array.isArray(payload?.list) && payload.list) ||
+    (Array.isArray(payload?.records) && payload.records) ||
+    [];
+
+  return source
+    .map((item: any) => ({
+      conversationId: String(item?.conversationId ?? item?.id ?? ''),
+      title: String(item?.title ?? item?.name ?? ''),
+      lastMessageDt: item?.lastMessageDt ?? item?.updateTime ?? item?.updateDt,
+      createDt: item?.createDt ?? item?.createTime
+    }))
+    .filter((item: ConversationSummaryItem) => !!item.conversationId)
+    .sort((a: ConversationSummaryItem, b: ConversationSummaryItem) => {
+      const ta = new Date(a.lastMessageDt || a.createDt || 0).getTime();
+      const tb = new Date(b.lastMessageDt || b.createDt || 0).getTime();
+      return tb - ta;
+    });
+}
+
 async function loadAgents() {
   const { data: user } = await registerCurrentSnailUser();
   currentNickname.value = user?.nickname || '';
@@ -24,8 +51,7 @@ async function loadAgents() {
 async function loadConversations(agentId: number) {
   try {
     const { data } = await fetchAgentConversations(agentId, { page: 1, size: 50 });
-    const list = Array.isArray(data?.data) ? data.data : [];
-    conversations.value = list;
+    conversations.value = normalizeConversationList(data);
   } catch {
     conversations.value = [];
   }
@@ -78,9 +104,10 @@ onMounted(() => {
 .ai-chat-page {
   display: flex;
   flex-direction: column;
-  height: 100%;
-  min-height: calc(100vh - 84px);
+  height: calc(100vh - 84px);
+  min-height: 0;
   background: #f5f6f8;
+  overflow: hidden;
 }
 
 .chat-header {
@@ -112,5 +139,6 @@ onMounted(() => {
   flex: 1;
   display: flex;
   overflow: hidden;
+  min-height: 0;
 }
 </style>

src/views/ai/chat/modules/chat-input.vue

@@ -21,19 +21,14 @@ function submit() {
 <template>
   <div class="chat-input-wrap">
     <div class="chat-input-box">
-      <el-input
-        v-model="content"
-        type="textarea"
-        :autosize="{ minRows: 1, maxRows: 4 }"
-        placeholder="给智能体发消息"
-        @keydown.enter.exact.prevent="submit"
-      />
-      <div class="tool-row">
-        <div class="left-tools">
-          <el-button size="small" round>深度规划</el-button>
-          <el-button size="small" type="primary" round>联网</el-button>
-          <el-button size="small" round>工具</el-button>
-        </div>
+      <div class="input-row">
+        <el-input
+          v-model="content"
+          type="textarea"
+          :autosize="{ minRows: 1, maxRows: 4 }"
+          placeholder="给智能体发消息"
+          @keydown.enter.exact.prevent="submit"
+        />
         <el-button type="primary" circle :disabled="sending" @click="submit">
           <el-icon><Promotion /></el-icon>
         </el-button>
@@ -56,15 +51,13 @@ function submit() {
   padding: 12px;
 }
 
-.tool-row {
-  margin-top: 10px;
+.input-row {
   display: flex;
-  justify-content: space-between;
-  align-items: center;
+  align-items: flex-end;
+  gap: 10px;
 }
 
-.left-tools {
-  display: flex;
-  gap: 8px;
+.input-row :deep(.el-textarea) {
+  flex: 1;
 }
 </style>

src/views/ai/chat/modules/chat-main.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue';
-import { createConversation, fetchAgentChat, fetchConversationMessages } from '@/api/ai/agent';
+import { createConversation, fetchAgentChat, fetchAgentChatSync, fetchChatMode, fetchConversationMessages } from '@/api/ai/agent';
 import { ElMessage } from 'element-plus';
 import ChatInput from './chat-input.vue';
 
@@ -28,35 +28,152 @@ interface ChatMessage {
 
 const messages = ref<ChatMessage[]>([]);
 const sending = ref(false);
+const sendMode = ref<'stream' | 'sync'>('stream');
+let sendingTimer: ReturnType<typeof setTimeout> | null = null;
 
 const showWelcome = computed(() => !!props.agent && !props.conversationId && !messages.value.length);
 const displayQuestions = computed(() => {
   return (props.agent?.presetQuestions || []).filter(Boolean);
 });
 
+function normalizeMessageList(payload: any): ChatMessage[] {
+  const container = payload?.data ?? payload;
+  const source =
+    (Array.isArray(container) && container) ||
+    (Array.isArray(container?.rows) && container.rows) ||
+    (Array.isArray(container?.list) && container.list) ||
+    (Array.isArray(container?.records) && container.records) ||
+    (Array.isArray(payload?.rows) && payload.rows) ||
+    (Array.isArray(payload?.list) && payload.list) ||
+    (Array.isArray(payload?.records) && payload.records) ||
+    [];
+
+  return source
+    .map((item: any) => {
+      const role = String(item?.role || item?.messageType || item?.senderType || '').toLowerCase();
+      return {
+        role: role === 'user' ? 'user' : 'assistant',
+        content: String(item?.content ?? item?.message ?? item?.text ?? '')
+      } as ChatMessage;
+    })
+    .filter(item => !!item.content);
+}
+
+function normalizeStreamChunk(chunk: string): string {
+  const text = String(chunk ?? '');
+  if (!text.trim()) return '';
+
+  const tryParseJsonContent = (raw: string): string | null => {
+    try {
+      const obj = JSON.parse(raw);
+      if (obj && typeof obj === 'object' && typeof obj.content === 'string') {
+        return obj.content;
+      }
+    } catch {}
+    return null;
+  };
+
+  const single = tryParseJsonContent(text);
+  if (single !== null) return single;
+
+  const normalized = text.replace(/}\s*{/g, '}\n{');
+  const lines = normalized
+    .split('\n')
+    .map(line => line.trim())
+    .filter(Boolean);
+
+  if (!lines.length) return text;
+  let merged = '';
+  for (const line of lines) {
+    const parsed = tryParseJsonContent(line);
+    if (parsed === null) return text;
+    merged += parsed;
+  }
+  return merged;
+}
+
+function extractSyncReply(payload: any): string {
+  const container = payload?.data ?? payload;
+  const normalizeChunkedJsonText = (raw: string): string => {
+    const text = String(raw || '').trim();
+    if (!text) return '';
+    if (!text.includes('\n') && !(text.startsWith('{') && text.endsWith('}'))) {
+      return text;
+    }
+
+    const lines = text.split('\n').map(line => line.trim()).filter(Boolean);
+    if (!lines.length) return text;
+
+    let merged = '';
+    for (const line of lines) {
+      try {
+        const item = JSON.parse(line);
+        if (item?.type === 'text' || typeof item?.content === 'string') {
+          merged += String(item.content ?? '');
+        }
+      } catch {
+        return text;
+      }
+    }
+    return merged || text;
+  };
+
+  const candidates = [
+    container?.content,
+    container?.text,
+    container?.message,
+    container?.answer,
+    container?.reply,
+    container?.outputText,
+    container?.result
+  ];
+  const hit = candidates.find(item => typeof item === 'string' && item.trim());
+  if (hit) return normalizeChunkedJsonText(String(hit));
+  if (Array.isArray(container?.messages)) {
+    const list = normalizeMessageList(container.messages).filter(item => item.role === 'assistant');
+    return list[list.length - 1]?.content || '';
+  }
+  return '';
+}
+
+async function loadSendMode() {
+  try {
+    const { data } = await fetchChatMode();
+    sendMode.value = data?.mode === 'sync' ? 'sync' : 'stream';
+  } catch {
+    sendMode.value = 'stream';
+  }
+}
+
 async function loadMessages() {
   if (!props.agent || !props.conversationId) {
     messages.value = [];
     return;
   }
   const { data } = await fetchConversationMessages(props.agent.id, props.conversationId);
-  if (Array.isArray(data)) {
-    messages.value = data.map(item => ({
-      role: String(item.role).toLowerCase() === 'user' ? 'user' : 'assistant',
-      content: item.content || ''
-    }));
-  }
+  messages.value = normalizeMessageList(data);
 }
 
 async function onSend(content: string) {
   if (!props.agent || !content.trim() || sending.value) return;
   sending.value = true;
+  if (sendingTimer) clearTimeout(sendingTimer);
+  sendingTimer = setTimeout(() => {
+    if (sending.value) {
+      sending.value = false;
+      ElMessage.warning('响应超时，已恢复发送按钮，请重试');
+    }
+  }, 60000);
   let targetConversationId = props.conversationId;
   if (!targetConversationId) {
     messages.value = [];
     const { data } = await createConversation(props.agent.id, { title: content.slice(0, 20) });
     if (!data?.conversationId) {
       sending.value = false;
+      if (sendingTimer) {
+        clearTimeout(sendingTimer);
+        sendingTimer = null;
+      }
       ElMessage.error('创建会话失败，请稍后重试');
       return;
     }
@@ -65,41 +182,77 @@ async function onSend(content: string) {
   }
 
   messages.value.push({ role: 'user', content });
-  messages.value.push({ role: 'assistant', content: '' });
-  const assistantIndex = messages.value.length - 1;
-
-  fetchAgentChat(
-    props.agent.id,
-    {
-      conversationId: targetConversationId,
-      content,
-      webSearchEnabled: props.agent.webSearchEnabled
-    },
-    {
-      onMessage(chunk) {
-        const msg = messages.value[assistantIndex];
-        if (msg) msg.content += chunk;
-      },
-      onThinking() {},
-      onDone() {
-        const msg = messages.value[assistantIndex];
-        if (msg && !msg.content.trim()) {
-          msg.content = '（后端已返回空消息）';
-        }
-        sending.value = false;
-      },
-      onError(error) {
-        messages.value.splice(assistantIndex, 1);
-        sending.value = false;
-        ElMessage.error(error.message || '对话失败，请稍后重试');
+  if (sendMode.value === 'sync') {
+    try {
+      const { data } = await fetchAgentChatSync(props.agent.id, {
+        conversationId: targetConversationId,
+        content,
+        webSearchEnabled: props.agent.webSearchEnabled
+      });
+      const reply = extractSyncReply(data) || '（后端已返回空消息）';
+      messages.value.push({ role: 'assistant', content: reply });
+    } catch (error: any) {
+      ElMessage.error(error?.message || '对话失败，请稍后重试');
+    } finally {
+      sending.value = false;
+      if (sendingTimer) {
+        clearTimeout(sendingTimer);
+        sendingTimer = null;
       }
     }
-  );
+    return;
+  }
+
+  messages.value.push({ role: 'assistant', content: '' });
+  const assistantIndex = messages.value.length - 1;
+  fetchAgentChat(
+      props.agent.id,
+      {
+        conversationId: targetConversationId,
+        content,
+        webSearchEnabled: props.agent.webSearchEnabled
+      },
+      {
+        onMessage(chunk) {
+          const msg = messages.value[assistantIndex];
+          if (msg) msg.content += normalizeStreamChunk(chunk);
+        },
+        onThinking() {},
+        onDone() {
+          const msg = messages.value[assistantIndex];
+          if (msg && !msg.content.trim()) {
+            msg.content = '（后端已返回空消息）';
+          }
+          sending.value = false;
+          if (sendingTimer) {
+            clearTimeout(sendingTimer);
+            sendingTimer = null;
+          }
+        },
+        onError(error) {
+          messages.value.splice(assistantIndex, 1);
+          sending.value = false;
+          if (sendingTimer) {
+            clearTimeout(sendingTimer);
+            sendingTimer = null;
+          }
+          ElMessage.error(error.message || '对话失败，请稍后重试');
+        }
+      }
+    );
 }
 
 watch(
   () => [props.agent?.id, props.conversationId] as const,
   async ([agentId, convId]) => {
+    if (sending.value && convId) {
+      return;
+    }
+    sending.value = false;
+    if (sendingTimer) {
+      clearTimeout(sendingTimer);
+      sendingTimer = null;
+    }
     if (agentId && convId) {
       await loadMessages();
     } else if (agentId && !convId) {
@@ -108,6 +261,8 @@ watch(
   },
   { immediate: true }
 );
+
+loadSendMode();
 </script>
 
 <template>
@@ -154,6 +309,8 @@ watch(
   display: flex;
   flex-direction: column;
   min-width: 0;
+  min-height: 0;
+  overflow: hidden;
 }
 
 .empty-state {
@@ -167,10 +324,11 @@ watch(
 .chat-scroll {
   flex: 1;
   padding: 16px 18px 0;
+  min-height: 0;
 }
 
 .chat-content {
-  max-width: 980px;
+  max-width: 920px;
   margin: 0 auto;
   width: 100%;
 }

src/views/ai/chat/modules/chat-sidebar.vue

@@ -54,7 +54,6 @@ const avatarText = computed(() => (displayNickname.value ? displayNickname.value
 
       <div class="sidebar-block">
         <div class="block-title">对话记录</div>
-        <div class="sub-title">昨日</div>
         <div
           v-for="conv in conversations"
           :key="conv.conversationId"