@lvce-editor/chat-view 1.19.0 → 1.20.0

package/dist/chatViewWorkerMain.js

@@ -1386,11 +1386,16 @@ const getDefaultModels = () => {
 const createDefaultState = () => {
   const defaultSessionId = 'session-1';
   const defaultModelId = 'test';
+  const chatMessageFontSize = 13;
+  const chatMessageLineHeight = 20;
   const composerFontSize = 13;
   const composerLineHeight = 20;
   return {
     assetDir: '',
     chatListScrollTop: 0,
+    chatMessageFontFamily: 'system-ui',
+    chatMessageFontSize,
+    chatMessageLineHeight,
     composerFontFamily: 'system-ui',
     composerFontSize,
     composerHeight: composerLineHeight + 8,
@@ -1419,6 +1424,7 @@ const createDefaultState = () => {
     openRouterApiKeyInput: '',
     openRouterApiKeysSettingsUrl: 'https://openrouter.ai/settings/keys',
     openRouterApiKeyState: 'idle',
+    passIncludeObfuscation: false,
     platform: 0,
     renamingSessionId: '',
     selectedModelId: defaultModelId,
@@ -1466,7 +1472,7 @@ const create = (uid, x, y, width, height, platform, assetDir) => {
 };
 
 const isEqual$1 = (oldState, newState) => {
-  return oldState.initial === newState.initial && oldState.composerHeight === newState.composerHeight && oldState.composerLineHeight === newState.composerLineHeight && oldState.composerFontFamily === newState.composerFontFamily && oldState.composerFontSize === newState.composerFontSize;
+  return oldState.initial === newState.initial && oldState.chatMessageFontFamily === newState.chatMessageFontFamily && oldState.chatMessageFontSize === newState.chatMessageFontSize && oldState.chatMessageLineHeight === newState.chatMessageLineHeight && oldState.composerHeight === newState.composerHeight && oldState.composerLineHeight === newState.composerLineHeight && oldState.composerFontFamily === newState.composerFontFamily && oldState.composerFontSize === newState.composerFontSize && oldState.listItemHeight === newState.listItemHeight;
 };
 
 const diffFocus = (oldState, newState) => {
@@ -1883,18 +1889,12 @@ const getListIndex = (state, eventX, eventY) => {
     x,
     y
   } = state;
-  if (eventX < x || eventY < y) {
+  const relativeX = eventX - x;
+  const relativeY = eventY - y - headerHeight;
+  if (relativeX < 0 || relativeY < 0 || relativeX >= width || relativeY >= height - headerHeight) {
     return -1;
   }
-  if (eventX >= x + width || eventY >= y + height) {
-    return -1;
-  }
-  const listY = eventY - y - headerHeight;
-  if (listY < 0) {
-    return -1;
-  }
-  const itemHeight = listItemHeight > 0 ? listItemHeight : 40;
-  return Math.floor(listY / itemHeight);
+  return Math.floor(relativeY / listItemHeight);
 };
 
 const CHAT_LIST_ITEM_CONTEXT_MENU = 'ChatListItemContextMenu';
@@ -2207,6 +2207,63 @@ const getMockAiResponse = async userMessage => {
   return `Mock AI response: I received "${userMessage}".`;
 };
 
+let queue = [];
+let waiters = [];
+let finished = false;
+const reset$1 = () => {
+  queue = [];
+  waiters = [];
+  finished = false;
+};
+const pushChunk = chunk => {
+  if (waiters.length > 0) {
+    const resolve = waiters.shift();
+    resolve?.(chunk);
+    return;
+  }
+  queue.push(chunk);
+};
+const finish = () => {
+  finished = true;
+  if (waiters.length === 0) {
+    return;
+  }
+  const activeWaiters = waiters;
+  waiters = [];
+  for (const resolve of activeWaiters) {
+    resolve(undefined);
+  }
+};
+const readNextChunk = async () => {
+  if (queue.length > 0) {
+    return queue.shift();
+  }
+  if (finished) {
+    return undefined;
+  }
+  return new Promise(resolve => {
+    waiters.push(resolve);
+  });
+};
+
+const getMockOpenApiAssistantText = async (stream, onTextChunk) => {
+  let text = '';
+  while (true) {
+    const chunk = await readNextChunk();
+    if (typeof chunk !== 'string') {
+      break;
+    }
+    text += chunk;
+    if (stream && onTextChunk) {
+      await onTextChunk(chunk);
+    }
+  }
+  return {
+    text,
+    type: 'success'
+  };
+};
+
 const activateByEvent = (event, assetDir, platform) => {
   // @ts-ignore
   return activateByEvent$1(event, assetDir, platform);
@@ -2711,6 +2768,7 @@ const getOpenApiErrorDetails = async response => {
 };
 const getOpenApiAssistantText = async (messages, modelId, openApiApiKey, openApiApiBaseUrl, assetDir, platform, options) => {
   const {
+    includeObfuscation = false,
     onTextChunk,
     stream
   } = options ?? {
@@ -2732,6 +2790,9 @@ const getOpenApiAssistantText = async (messages, modelId, openApiApiKey, openApi
           ...(stream ? {
             stream: true
           } : {}),
+          ...(includeObfuscation ? {
+            include_obfuscation: true
+          } : {}),
           tool_choice: 'auto',
           tools
         }),
@@ -3187,6 +3248,7 @@ const getAiResponse = async ({
   openApiApiKey,
   openRouterApiBaseUrl,
   openRouterApiKey,
+  passIncludeObfuscation = false,
   platform,
   selectedModelId,
   streamingEnabled = false,
@@ -3197,8 +3259,19 @@ const getAiResponse = async ({
   const usesOpenApiModel = isOpenApiModel(selectedModelId, models);
   const usesOpenRouterModel = isOpenRouterModel(selectedModelId, models);
   if (usesOpenApiModel) {
-    if (openApiApiKey) {
+    if (useMockApi) {
+      const result = await getMockOpenApiAssistantText(streamingEnabled, onTextChunk);
+      if (result.type === 'success') {
+        const {
+          text: assistantText
+        } = result;
+        text = assistantText;
+      } else {
+        text = getOpenApiErrorMessage(result);
+      }
+    } else if (openApiApiKey) {
       const result = await getOpenApiAssistantText(messages, getOpenApiModelId(selectedModelId), openApiApiKey, openApiApiBaseUrl, assetDir, platform, {
+        includeObfuscation: passIncludeObfuscation,
         onTextChunk,
         stream: streamingEnabled
       });
@@ -3419,17 +3492,6 @@ const focusInput = state => {
   };
 };
 
-const appendMessageToSelectedSession = (sessions, selectedSessionId, message) => {
-  return sessions.map(session => {
-    if (session.id !== selectedSessionId) {
-      return session;
-    }
-    return {
-      ...session,
-      messages: [...session.messages, message]
-    };
-  });
-};
 const updateMessageTextInSelectedSession = (sessions, selectedSessionId, messageId, text, inProgress) => {
   return sessions.map(session => {
     if (session.id !== selectedSessionId) {
@@ -3450,6 +3512,47 @@ const updateMessageTextInSelectedSession = (sessions, selectedSessionId, message
     };
   });
 };
+const handleTextChunkFunction = async (uid, assistantMessageId, chunk, handleTextChunkState) => {
+  const selectedSession = handleTextChunkState.latestState.sessions.find(session => session.id === handleTextChunkState.latestState.selectedSessionId);
+  if (!selectedSession) {
+    return {
+      latestState: handleTextChunkState.latestState,
+      previousState: handleTextChunkState.previousState
+    };
+  }
+  const assistantMessage = selectedSession.messages.find(message => message.id === assistantMessageId);
+  if (!assistantMessage) {
+    return {
+      latestState: handleTextChunkState.latestState,
+      previousState: handleTextChunkState.previousState
+    };
+  }
+  const updatedText = assistantMessage.text + chunk;
+  const updatedSessions = updateMessageTextInSelectedSession(handleTextChunkState.latestState.sessions, handleTextChunkState.latestState.selectedSessionId, assistantMessageId, updatedText, true);
+  const nextState = {
+    ...handleTextChunkState.latestState,
+    sessions: updatedSessions
+  };
+  set(uid, handleTextChunkState.previousState, nextState);
+  // @ts-ignore
+  await invoke('Chat.rerender');
+  return {
+    latestState: nextState,
+    previousState: nextState
+  };
+};
+
+const appendMessageToSelectedSession = (sessions, selectedSessionId, message) => {
+  return sessions.map(session => {
+    if (session.id !== selectedSessionId) {
+      return session;
+    }
+    return {
+      ...session,
+      messages: [...session.messages, message]
+    };
+  });
+};
 const handleSubmit = async state => {
   const {
     assetDir,
@@ -3461,6 +3564,7 @@ const handleSubmit = async state => {
     openApiApiKey,
     openRouterApiBaseUrl,
     openRouterApiKey,
+    passIncludeObfuscation,
     platform,
     selectedModelId,
     selectedSessionId,
@@ -3547,30 +3651,14 @@ const handleSubmit = async state => {
   set(state.uid, state, optimisticState);
   // @ts-ignore
   await invoke('Chat.rerender');
-  let latestState = optimisticState;
-  let previousState = optimisticState;
-  const selectedOptimisticSession = latestState.sessions.find(session => session.id === latestState.selectedSessionId);
+  let handleTextChunkState = {
+    latestState: optimisticState,
+    previousState: optimisticState
+  };
+  const selectedOptimisticSession = optimisticState.sessions.find(session => session.id === optimisticState.selectedSessionId);
   const messages = (selectedOptimisticSession?.messages ?? []).filter(message => !message.inProgress);
-  const onTextChunk = streamingEnabled ? async chunk => {
-    const selectedSession = latestState.sessions.find(session => session.id === latestState.selectedSessionId);
-    if (!selectedSession) {
-      return;
-    }
-    const assistantMessage = selectedSession.messages.find(message => message.id === assistantMessageId);
-    if (!assistantMessage) {
-      return;
-    }
-    const updatedText = assistantMessage.text + chunk;
-    const updatedSessions = updateMessageTextInSelectedSession(latestState.sessions, latestState.selectedSessionId, assistantMessageId, updatedText, true);
-    const nextState = {
-      ...latestState,
-      sessions: updatedSessions
-    };
-    set(state.uid, previousState, nextState);
-    previousState = nextState;
-    latestState = nextState;
-    // @ts-ignore
-    await invoke('Chat.rerender');
+  const handleTextChunkFunctionRef = streamingEnabled ? async chunk => {
+    handleTextChunkState = await handleTextChunkFunction(state.uid, assistantMessageId, chunk, handleTextChunkState);
   } : undefined;
   const assistantMessage = await getAiResponse({
     assetDir,
@@ -3578,17 +3666,21 @@ const handleSubmit = async state => {
     mockApiCommandId,
     models,
     nextMessageId: optimisticState.nextMessageId,
-    onTextChunk,
+    onTextChunk: handleTextChunkFunctionRef,
     openApiApiBaseUrl,
     openApiApiKey,
     openRouterApiBaseUrl,
     openRouterApiKey,
+    passIncludeObfuscation,
     platform,
     selectedModelId,
     streamingEnabled,
     useMockApi,
     userText
   });
+  const {
+    latestState
+  } = handleTextChunkState;
   const updatedSessions = streamingEnabled ? updateMessageTextInSelectedSession(latestState.sessions, latestState.selectedSessionId, assistantMessageId, assistantMessage.text, false) : appendMessageToSelectedSession(latestState.sessions, latestState.selectedSessionId, assistantMessage);
   const selectedSession = updatedSessions.find(session => session.id === latestState.selectedSessionId);
   if (selectedSession) {
@@ -4037,6 +4129,7 @@ const loadOpenApiApiKey = async () => {
     return '';
   }
 };
+
 const loadOpenRouterApiKey = async () => {
   try {
     const savedOpenRouterApiKey = await get('secrets.openRouterApiKey');
@@ -4045,12 +4138,35 @@ const loadOpenRouterApiKey = async () => {
     return '';
   }
 };
+
+const loadPassIncludeObfuscation = async () => {
+  try {
+    const savedPassIncludeObfuscation = await get('chatView.passIncludeObfuscation');
+    return typeof savedPassIncludeObfuscation === 'boolean' ? savedPassIncludeObfuscation : false;
+  } catch {
+    return false;
+  }
+};
+
+const loadStreamingEnabled = async () => {
+  try {
+    const savedStreamingEnabled = await get('chatView.streamingEnabled');
+    return typeof savedStreamingEnabled === 'boolean' ? savedStreamingEnabled : false;
+  } catch {
+    return false;
+  }
+};
+
 const loadPreferences = async () => {
   const openApiApiKey = await loadOpenApiApiKey();
   const openRouterApiKey = await loadOpenRouterApiKey();
+  const streamingEnabled = await loadStreamingEnabled();
+  const passIncludeObfuscation = await loadPassIncludeObfuscation();
   return {
     openApiApiKey,
-    openRouterApiKey
+    openRouterApiKey,
+    passIncludeObfuscation,
+    streamingEnabled
   };
 };
 
@@ -4081,7 +4197,9 @@ const loadContent = async (state, savedState) => {
   const savedViewMode = getSavedViewMode(savedState);
   const {
     openApiApiKey,
-    openRouterApiKey
+    openRouterApiKey,
+    passIncludeObfuscation,
+    streamingEnabled
   } = await loadPreferences();
   const legacySavedSessions = getSavedSessions(savedState);
   const storedSessions = await listChatSessions();
@@ -4116,13 +4234,30 @@ const loadContent = async (state, savedState) => {
     openApiApiKeyInput: openApiApiKey,
     openRouterApiKey,
     openRouterApiKeyInput: openRouterApiKey,
+    passIncludeObfuscation,
     selectedModelId,
     selectedSessionId,
     sessions,
+    streamingEnabled,
     viewMode
   };
 };
 
+const mockOpenApiStreamFinish = state => {
+  finish();
+  return state;
+};
+
+const mockOpenApiStreamPushChunk = (state, chunk) => {
+  pushChunk(chunk);
+  return state;
+};
+
+const mockOpenApiStreamReset = state => {
+  reset$1();
+  return state;
+};
+
 const openMockSession = async (state, mockSessionId, mockChatMessages) => {
   const {
     sessions: currentSessions
@@ -4157,9 +4292,13 @@ const openMockSession = async (state, mockSessionId, mockChatMessages) => {
   };
 };
 
-const getCss = composerHeight => {
+const getCss = (composerHeight, listItemHeight, chatMessageFontSize, chatMessageLineHeight, chatMessageFontFamily) => {
   return `:root {
   --ChatInputBoxHeight: ${composerHeight}px;
+  --ChatListItemHeight: ${listItemHeight}px;
+  --ChatMessageFontSize: ${chatMessageFontSize}px;
+  --ChatMessageLineHeight: ${chatMessageLineHeight}px;
+  --ChatMessageFontFamily: ${chatMessageFontFamily};
 }`;
 };
 
@@ -4168,10 +4307,14 @@ const getCss = composerHeight => {
 
 const renderCss = (oldState, newState) => {
   const {
+    chatMessageFontFamily,
+    chatMessageFontSize,
+    chatMessageLineHeight,
     composerHeight,
+    listItemHeight,
     uid
   } = newState;
-  const css = getCss(composerHeight);
+  const css = getCss(composerHeight, listItemHeight, chatMessageFontSize, chatMessageLineHeight, chatMessageFontFamily);
   return [SetCss, uid, css];
 };
 
@@ -4831,8 +4974,10 @@ const reset = async state => {
     composerHeight: getMinComposerHeightForState(state),
     composerValue: '',
     openRouterApiKey: '',
+    selectedModelId: 'test',
     selectedSessionId: '',
     sessions: [],
+    streamingEnabled: false,
     viewMode: 'list'
   };
 };
@@ -4897,6 +5042,13 @@ const setChatList = state => {
   };
 };
 
+const setStreamingEnabled = (state, streamingEnabled) => {
+  return {
+    ...state,
+    streamingEnabled
+  };
+};
+
 const defaultMockApiCommandId = 'ChatE2e.mockApi';
 const useMockApi = (state, value, mockApiCommandId = defaultMockApiCommandId) => {
   if (!value) {
@@ -4938,6 +5090,9 @@ const commandMap = {
   'Chat.initialize': initialize,
   'Chat.loadContent': wrapCommand(loadContent),
   'Chat.loadContent2': wrapCommand(loadContent),
+  'Chat.mockOpenApiStreamFinish': wrapCommand(mockOpenApiStreamFinish),
+  'Chat.mockOpenApiStreamPushChunk': wrapCommand(mockOpenApiStreamPushChunk),
+  'Chat.mockOpenApiStreamReset': wrapCommand(mockOpenApiStreamReset),
   'Chat.openMockSession': wrapCommand(openMockSession),
   'Chat.render2': render2,
   'Chat.renderEventListeners': renderEventListeners,
@@ -4947,6 +5102,7 @@ const commandMap = {
   'Chat.saveState': wrapGetter(saveState),
   'Chat.setChatList': wrapCommand(setChatList),
   'Chat.setOpenRouterApiKey': wrapCommand(setOpenRouterApiKey),
+  'Chat.setStreamingEnabled': wrapCommand(setStreamingEnabled),
   'Chat.terminate': terminate,
   'Chat.useMockApi': wrapCommand(useMockApi)
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/chat-view",
-  "version": "1.19.0",
+  "version": "1.20.0",
   "description": "Chat View Worker",
   "repository": {
     "type": "git",