Develop

.github/workflows/cd.yml

@@ -94,6 +94,7 @@ jobs:
   deploy-staging:
     name: Deploy to Staging
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     needs: build-and-push
     if: >
       (github.event_name == 'push' && github.ref == 'refs/heads/develop')
@@ -132,6 +133,7 @@ jobs:
           username: ${{ secrets.SSH_USERNAME }}
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           port: 22
+          command_timeout: 45m
           script: |
             DEPLOY_DIR="/home/flandern/youdaonotelm"
 
@@ -214,6 +216,7 @@ jobs:
   deploy-production:
     name: Deploy to Production
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     needs: build-and-push
     if: >
       (github.event_name == 'push' && github.ref == 'refs/heads/main')
@@ -245,6 +248,7 @@ jobs:
           username: ${{ secrets.PRODUCTION_SSH_USERNAME }}
           key: ${{ secrets.PRODUCTION_SSH_PRIVATE_KEY }}
           port: 22
+          command_timeout: 45m
           script: |
             DEPLOY_DIR="/home/flandern/youdaonotelm"
 

.gitignore

@@ -151,3 +151,5 @@ frontend/test-screenshots/
 # Docker (仅排除构建产物，不排除源文件)
 # configs/config.docker.yaml.example
 /configs/docker_config.yaml
+/chat_Agent.md
+/rag.md

cmd/server/main.go

@@ -1,24 +1,24 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-
-	"YoudaoNoteLm/internal/app"
-)
-
-func main() {
-	// 定义命令行参数
-	flag.Parse()
-
-	// 创建应用实例  创建应用实例
-	application := app.NewApp()
-
-	// 初始化应用
-	if err := application.Initialize(); err != nil {
-		panic(fmt.Sprintf("应用初始化失败: %v", err))
-	}
-
-	// 运行应用
-	application.Run()
-}
+package main
+
+import (
+	"flag"
+	"fmt"
+
+	"YoudaoNoteLm/internal/app"
+)
+
+func main() {
+	// 定义命令行参数
+	flag.Parse()
+
+	// 创建应用实例  创建应用实例
+	application := app.NewApp()
+
+	// 初始化应用
+	if err := application.Initialize(); err != nil {
+		panic(fmt.Sprintf("应用初始化失败: %v", err))
+	}
+
+	// 运行应用
+	application.Run()
+}

frontend/nginx.conf

@@ -24,7 +24,10 @@ server {
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
     }
 
     # 静态资源缓存

frontend/package.json

@@ -6,8 +6,9 @@
   "scripts": {
     "dev": "vite",
     "build": "tsc -b && vite build",
-    "lint": "eslint .",
-    "preview": "vite preview"
+    "lint": "eslint .",
+    "test:generation": "node --experimental-strip-types --test src/stores/generationTaskHelpers.test.ts",
+    "preview": "vite preview"
   },
   "dependencies": {
     "axios": "^1.17.0",

frontend/src/api/chat.ts

@@ -1,5 +1,6 @@
 import client, { doRefreshToken } from './client';
 import type { ApiResponse } from './auth';
+import type { SearchResultItem } from './search';
 import { getChatErrorMessage } from '../utils/error';
 
 // ============ Request/Response Types ============
@@ -31,9 +32,12 @@ export interface ReferenceData {
 }
 
 export interface StreamEvent {
-  type: 'token' | 'reference' | 'done' | 'error' | 'message' | 'title' | 'tool_call' | 'tool_result';
+  type:
+    | 'token' | 'reference' | 'done' | 'error' | 'message' | 'title' | 'tool_call' | 'tool_result'
+    | 'search_started' | 'search_results' | 'search_busy'
+    | 'generation_started' | 'generation_result';
   content: string;
-  data: ReferenceData[] | number | null;
+  data: ReferenceData[] | number | string | null;
 }
 
 // ============ API Functions ============
@@ -117,13 +121,15 @@ async function isTokenErrorResponse(response: Response): Promise<boolean> {
   return false;
 }
 
-// 7. Send message (streaming) - returns a ReadableStream
+// 7. Send message (streaming) - returns Response and AbortController
 export async function sendMessage(
   conversationId: number,
   content: string,
   sourceIds?: number[],
   llmConfigId?: number
-): Promise<Response> {
+): Promise<{ response: Response; abortController: AbortController }> {
+  const abortController = new AbortController();
+
   const makeRequest = (token: string) =>
     fetch(`/api/v1/chat/conversations/${conversationId}/messages`, {
       method: 'POST',
@@ -136,6 +142,7 @@ export async function sendMessage(
         source_ids: sourceIds || [],
         llm_config_id: llmConfigId || 0,
       }),
+      signal: abortController.signal,
     });
 
   let token = sessionStorage.getItem('access_token') || '';
@@ -149,7 +156,7 @@ export async function sendMessage(
     }
   }
 
-  return response;
+  return { response, abortController };
 }
 
 // 8. Stop generation
@@ -168,16 +175,20 @@ export function parseSSEStream(
     onToken?: (content: string) => void;
     onReference?: (references: ReferenceData[]) => void;
     onTitle?: (title: string) => void;
-    onDone?: (content: string) => void;
+    onDone?: (data?: ReferenceData[] | string) => void;
     onError?: (error: string) => void;
-  }
-): AbortController {
-  const abortController = new AbortController();
-
+    onSearchStarted?: () => void;
+    onSearchResults?: (results: SearchResultItem[], summary: string) => void;
+    onSearchBusy?: (message: string) => void;
+    onGenerationStarted?: (type: string) => void;
+    onGenerationResult?: (type: string, content: string) => void;
+  },
+  abortController?: AbortController
+): void {
   const reader = response.body?.getReader();
   if (!reader) {
     callbacks.onError?.('无法读取响应流');
-    return abortController;
+    return;
   }
 
   const decoder = new TextDecoder();
@@ -243,7 +254,8 @@ export function parseSSEStream(
                   callbacks.onTitle?.(data.content);
                   break;
                 case 'done':
-                  callbacks.onDone?.(data.content);
+                  // 后端将引用附加到 done 事件的 data 字段（原子发送，消除竞态）
+                  callbacks.onDone?.(Array.isArray(data.data) ? data.data as ReferenceData[] : data.content);
                   break;
                 case 'error':
                   callbacks.onError?.(data.content);
@@ -253,6 +265,30 @@ export function parseSSEStream(
                   // 工具调用中间事件，不需要展示给用户，静默忽略
                   console.log('Tool event:', eventType, data.content);
                   break;
+                case 'search_started':
+                  callbacks.onSearchStarted?.();
+                  break;
+                case 'search_results': {
+                  const searchData = data.data as { results?: SearchResultItem[]; summary?: string } | null;
+                  if (searchData?.results) {
+                    callbacks.onSearchResults?.(searchData.results, searchData.summary || '');
+                  }
+                  break;
+                }
+                case 'search_busy':
+                  callbacks.onSearchBusy?.(data.content || '请等待当前搜索任务完成');
+                  break;
+                case 'generation_started':
+                  console.log('[Generation] started:', data.data);
+                  callbacks.onGenerationStarted?.((data.data as string) || 'note');
+                  break;
+                case 'generation_result': {
+                  const genData = data.data as { type?: string; content?: string } | null;
+                  if (genData?.content) {
+                    callbacks.onGenerationResult?.(genData.type || 'note', genData.content);
+                  }
+                  break;
+                }
                 default:
                   console.log('Unknown event type:', eventType);
                   // 未知事件类型，不作为 token 显示
@@ -273,17 +309,18 @@ export function parseSSEStream(
       console.log('Stream ended, calling onDone');
       callbacks.onDone?.('');
     } catch (error) {
-      console.error('Stream parsing error:', error);
-      if (abortController.signal.aborted) {
-        // Stream was intentionally aborted (user clicked stop)
+      const isAborted = abortController?.signal.aborted ?? false;
+      console.log('[parseSSEStream] catch 触发, isAborted:', isAborted, 'error:', error);
+      if (isAborted) {
+        // Stream was intentionally aborted (user clicked stop or switched conversation)
         // Call onDone to preserve the accumulated content
+        console.log('[parseSSEStream] 检测到 abort，调用 onDone 保存已累积内容');
         callbacks.onDone?.('');
       } else {
         const rawMessage = error instanceof Error ? error.message : '流读取错误';
+        console.log('[parseSSEStream] 非 abort 错误，调用 onError:', rawMessage);
         callbacks.onError?.(getChatErrorMessage(rawMessage));
       }
     }
   })();
-
-  return abortController;
 }

frontend/src/api/client.ts

@@ -19,11 +19,11 @@ function onTokenRefreshed(newToken: string) {
   refreshSubscribers = [];
 }
 
-function clearAuth() {
+function clearAuth(reason?: string) {
   sessionStorage.removeItem('access_token');
   localStorage.removeItem('refresh_token');
   localStorage.removeItem('user');
-  window.location.href = '/login';
+  window.location.href = reason ? `/login?reason=${reason}` : '/login';
 }
 
 // Request: attach access_token
@@ -40,6 +40,11 @@ function isTokenError(data: any): boolean {
   return data && (data.code === 1005 || data.code === 1006);
 }
 
+// Check if response indicates the user has been disabled (1004)
+function isUserDisabled(data: any): boolean {
+  return data && data.code === 1004;
+}
+
 export async function doRefreshToken(): Promise<string | null> {
   const refreshToken = localStorage.getItem('refresh_token');
   if (!refreshToken) return null;
@@ -62,6 +67,12 @@ client.interceptors.response.use(
   (response: AxiosResponse) => {
     const data = response.data;
 
+    // 用户被禁用 → 立即强制退出,不尝试刷新 token
+    if (isUserDisabled(data)) {
+      clearAuth('disabled');
+      return Promise.reject(new Error('user_disabled'));
+    }
+
     // Backend returns HTTP 200 but code 1005/1006 → token issue
     if (isTokenError(data)) {
       const originalRequest = response.config as InternalAxiosRequestConfig & { _retry?: boolean };
@@ -107,6 +118,11 @@ client.interceptors.response.use(
   async (error) => {
     // HTTP 4xx/5xx errors - check if it's a token issue in the response body
     const data = error.response?.data;
+    // 用户被禁用 → 立即强制退出
+    if (isUserDisabled(data)) {
+      clearAuth('disabled');
+      return Promise.reject(error);
+    }
     if (isTokenError(data)) {
       const originalRequest = error.config;
       if (originalRequest._retry) {