Merge 4c6e056261 into 7ec201d011

ui/components/ChatWindow.tsx

@@ -12,6 +12,7 @@ import { getSuggestions } from '@/lib/actions';
 import {Settings} from 'lucide-react';
 import SettingsDialog from './SettingsDialog';
 import NextError from 'next/error';
+import {Mcid} from "@/lib/mcid";
 
 export type Message = {
   messageId: string;
@@ -385,7 +386,7 @@ const loadMessages = async (
 const ChatWindow = ({id}: { id?: string }) => {
   const searchParams = useSearchParams();
   const initialMessage = searchParams.get('q');
-
+  const [userId, setUserId] = useState<string | undefined>();
   const [chatId, setChatId] = useState<string | undefined>(id);
   const [newChatCreated, setNewChatCreated] = useState(false);
 
@@ -410,6 +411,7 @@ const ChatWindow = ({ id }: { id?: string }) => {
 
   const [focusMode, setFocusMode] = useState('webSearch');
   const [optimizationMode, setOptimizationMode] = useState('speed');
+  const [copilotEnabled, setCopilotEnabled] = useState(true);
 
   const [isMessagesLoaded, setIsMessagesLoaded] = useState(false);
 
@@ -417,6 +419,33 @@ const ChatWindow = ({ id }: { id?: string }) => {
 
   const [isSettingsOpen, setIsSettingsOpen] = useState(false);
 
+  useEffect(() => {
+    const initializeUserId = () => {
+      try {
+        // 从 localStorage 读取现有用户 ID
+        const storedUserId = localStorage.getItem('userId');
+
+        if (storedUserId) {
+          setUserId(storedUserId);
+          console.debug('Using existing user ID:', storedUserId);
+        } else {
+          const newUserId = new Mcid().generate().toString();
+
+          localStorage.setItem('userId', newUserId);
+          setUserId(newUserId);
+          console.debug('Generated new user ID:', newUserId);
+        }
+      } catch (error) {
+        console.error('Error initializing user ID:', error);
+        const fallbackId = "1234567890";
+        localStorage.setItem('userId', fallbackId);
+        setUserId(fallbackId);
+      }
+    };
+
+    initializeUserId();
+  }, []);
+
   useEffect(() => {
     if (
       chatId &&
@@ -437,7 +466,7 @@ const ChatWindow = ({ id }: { id?: string }) => {
     } else if (!chatId) {
       setNewChatCreated(true);
       setIsMessagesLoaded(true);
-      setChatId(crypto.randomBytes(20).toString('hex'));
+      setChatId(new Mcid().generate().toString());
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -465,7 +494,7 @@ const ChatWindow = ({ id }: { id?: string }) => {
     } else {
       setIsReady(false);
     }
-  }, [isMessagesLoaded, isWSReady]);
+  }, [isMessagesLoaded, isWSReady, userId]);
 
   const sendMessage = async (message: string, messageId?: string) => {
     if (loading) return;
@@ -481,11 +510,12 @@ const ChatWindow = ({ id }: { id?: string }) => {
     let recievedMessage = '';
     let added = false;
 
-    messageId = messageId ?? crypto.randomBytes(7).toString('hex');
+    messageId = messageId ?? new Mcid().generate().toString();
 
     ws.send(
       JSON.stringify({
         type: 'message',
+        userId:userId,
         message: {
           messageId: messageId,
           chatId: chatId!,
@@ -493,6 +523,7 @@ const ChatWindow = ({ id }: { id?: string }) => {
         },
         files: fileIds,
         focusMode: focusMode,
+        copilotEnabled: copilotEnabled,
         optimizationMode: optimizationMode,
         history: [...chatHistory, ['human', message]],
       }),
@@ -668,6 +699,8 @@ const ChatWindow = ({ id }: { id?: string }) => {
           <EmptyChat
             sendMessage={sendMessage}
             focusMode={focusMode}
+            copilotEnabled={copilotEnabled}
+            setCopilotEnabled={setCopilotEnabled}
             setFocusMode={setFocusMode}
             optimizationMode={optimizationMode}
             setOptimizationMode={setOptimizationMode}

ui/components/EmptyChat.tsx

@@ -8,6 +8,8 @@ const EmptyChat = ({
   sendMessage,
   focusMode,
   setFocusMode,
+  copilotEnabled,
+  setCopilotEnabled,
   optimizationMode,
   setOptimizationMode,
   fileIds,
@@ -18,6 +20,8 @@ const EmptyChat = ({
   sendMessage: (message: string) => void;
   focusMode: string;
   setFocusMode: (mode: string) => void;
+  copilotEnabled: boolean;
+  setCopilotEnabled: (enabled: boolean) => void;
   optimizationMode: string;
   setOptimizationMode: (mode: string) => void;
   fileIds: string[];
@@ -44,6 +48,8 @@ const EmptyChat = ({
           sendMessage={sendMessage}
           focusMode={focusMode}
           setFocusMode={setFocusMode}
+          copilotEnabled={copilotEnabled}
+          setCopilotEnabled={setCopilotEnabled}
           optimizationMode={optimizationMode}
           setOptimizationMode={setOptimizationMode}
           fileIds={fileIds}

ui/components/EmptyChatMessageInput.tsx

@@ -11,6 +11,8 @@ const EmptyChatMessageInput = ({
   sendMessage,
   focusMode,
   setFocusMode,
+                                 copilotEnabled,
+                                 setCopilotEnabled,
   optimizationMode,
   setOptimizationMode,
   fileIds,
@@ -23,12 +25,13 @@ const EmptyChatMessageInput = ({
   setFocusMode: (mode: string) => void;
   optimizationMode: string;
   setOptimizationMode: (mode: string) => void;
+  copilotEnabled:boolean
+  setCopilotEnabled:(mode: boolean) => void;
   fileIds: string[];
   setFileIds: (fileIds: string[]) => void;
   files: File[];
   setFiles: (files: File[]) => void;
 }) => {
-  const [copilotEnabled, setCopilotEnabled] = useState(false);
   const [message, setMessage] = useState('');
 
   const inputRef = useRef<HTMLTextAreaElement | null>(null);
@@ -94,6 +97,7 @@ const EmptyChatMessageInput = ({
             />
           </div>
           <div className="flex flex-row items-center space-x-1 sm:space-x-4">
+            <CopilotToggle setCopilotEnabled={setCopilotEnabled} copilotEnabled={copilotEnabled}/>
             <Optimization
               optimizationMode={optimizationMode}
               setOptimizationMode={setOptimizationMode}

ui/components/theme/Provider.tsx

@@ -7,7 +7,7 @@ const ThemeProviderComponent = ({
   children: React.ReactNode;
 }) => {
   return (
-    <ThemeProvider attribute="class" enableSystem={false} defaultTheme="dark">
+    <ThemeProvider attribute="class" enableSystem={false} defaultTheme="light">
       {children}
     </ThemeProvider>
   );

ui/lib/mcid.ts

@@ -0,0 +1,36 @@
+// utils/mcid.ts
+export class Mcid {
+  private lastTimestamp = -1;
+  private sequence = 0;
+
+  constructor(private readonly machineId: number = 0) {
+    if (machineId < 0 || machineId > 255) {
+      throw new Error('Machine ID must be between 0 and 255');
+    }
+  }
+
+  generate(): number {
+    let now = Date.now();
+
+    if (now < this.lastTimestamp) {
+      throw new Error('Clock moved backwards');
+    }
+
+    if (now === this.lastTimestamp) {
+      this.sequence = (this.sequence + 1) & 0xf;
+      if (this.sequence === 0) {
+        while (now <= this.lastTimestamp) {
+          now = Date.now();
+        }
+      }
+    } else {
+      this.sequence = 0;
+    }
+
+    this.lastTimestamp = now;
+
+    return (
+      (now * 0x1000) + (this.machineId * 16) + this.sequence
+    );
+  }
+}