@opensumi/ide-ai-native 3.8.3-next-1741848368.0 → 3.8.3-next-1741917543.0

package/src/browser/components/ChatHistory.tsx

@@ -163,22 +163,25 @@ const ChatHistory: FC<IChatHistoryProps> = memo(
       (item: IChatHistoryItem) => (
         <div
           key={item.id}
-          className={cls(styles.chat_history_item, item.id === currentId ? styles.chat_history_item_selected : '')}
+          className={cls(
+            styles['dm-chat-history-item'],
+            item.id === currentId ? styles['dm-chat-history-item-selected'] : '',
+          )}
           onClick={() => handleHistoryItemSelect(item)}
         >
-          <div className={styles.chat_history_item_content}>
+          <div className={styles['dm-chat-history-item-content']}>
             {item.loading ? (
               <Loading />
             ) : (
               <Icon icon='message' style={{ width: '16px', height: '16px', marginRight: 4 }} />
             )}
             {!historyTitleEditable?.[item.id] ? (
-              <span id={`chat-history-item-title-${item.id}`} className={styles.chat_history_item_title}>
+              <span id={`dm-chat-history-item-title-${item.id}`} className={styles['dm-chat-history-item-title']}>
                 {item.title}
               </span>
             ) : (
               <Input
-                className={styles.chat_history_item_title}
+                className={styles['dm-chat-history-item-title']}
                 defaultValue={item.title}
                 ref={inputRef}
                 onPressEnter={(e: any) => {
@@ -188,9 +191,18 @@ const ChatHistory: FC<IChatHistoryProps> = memo(
               />
             )}
           </div>
-          <div className={styles.chat_history_item_actions}>
+          <div className={styles['dm-chat-history-item-actions']}>
+            {/* <EditOutlined
+              title={localize('aiNative.operate.chatHistory.edit')}
+              style={{ marginRight: 8 }}
+              onClick={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                handleTitleEdit(item);
+              }}
+            /> */}
             <EnhanceIcon
-              className={cls(styles.chat_history_item_actions_delete, getIcon('delete'))}
+              className={cls(styles['dm-chat-history-item-actions-delete'], getIcon('delete'))}
               onClick={(e) => {
                 e.preventDefault();
                 e.stopPropagation();
@@ -225,14 +237,14 @@ const ChatHistory: FC<IChatHistoryProps> = memo(
         <div>
           <Input
             placeholder={localize('aiNative.operate.chatHistory.searchPlaceholder')}
-            className={styles.chat_history_search}
+            style={{ width: '100%', maxWidth: '100%' }}
             value={searchValue}
             onChange={handleSearchChange}
           />
-          <div className={styles.chat_history_list}>
+          <div className={styles['dm-chat-history-list']}>
             {groupedHistoryList.map((group) => (
               <div key={group.key} style={{ padding: '4px' }}>
-                <div className={styles.chat_history_time}>{group.key}</div>
+                <div className={styles['dm-chat-history-time']}>{group.key}</div>
                 {group.items.map(renderHistoryItem)}
               </div>
             ))}
@@ -245,13 +257,13 @@ const ChatHistory: FC<IChatHistoryProps> = memo(
     const getPopupContainer = useCallback((triggerNode: HTMLElement) => triggerNode.parentElement!, []);
 
     return (
-      <div className={cls(styles.chat_history_header, className)}>
-        <div className={styles.chat_history_header_title}>
+      <div className={cls(styles['dm-chat-history-header'], className)}>
+        <div className={styles['dm-chat-history-header-title']}>
           <span>{title}</span>
         </div>
-        <div className={styles.chat_history_header_actions}>
+        <div className={styles['dm-chat-history-header-actions']}>
           <Popover
-            id='chat-history-header-actions-history'
+            id='dm-chat-history-header-actions-history'
             content={renderHistory()}
             trigger={PopoverTriggerType.click}
             position={PopoverPosition.bottomRight}
@@ -259,10 +271,12 @@ const ChatHistory: FC<IChatHistoryProps> = memo(
             getPopupContainer={getPopupContainer}
           >
             <div
-              className={styles.chat_history_header_actions_history}
+              className={styles['dm-chat-history-header-actions-history']}
               title={localize('aiNative.operate.chatHistory.title')}
             >
-              <EnhanceIcon className={cls(styles.chat_history_header_actions_history, 'codicon codicon-history')} />
+              <EnhanceIcon
+                className={cls(styles['dm-chat-history-header-actions-history'], 'codicon codicon-history')}
+              />
             </div>
           </Popover>
           <Popover
@@ -271,7 +285,7 @@ const ChatHistory: FC<IChatHistoryProps> = memo(
             title={localize('aiNative.operate.newChat.title')}
           >
             <EnhanceIcon
-              className={cls(styles.chat_history_header_actions_new, getIcon('plus'))}
+              className={cls(styles['dm-chat-history-header-actions-new'], getIcon('plus'))}
               onClick={handleNewChat}
             />
           </Popover>

package/src/browser/components/ChatThinking.tsx

@@ -1,6 +1,7 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { useInjectable } from '@opensumi/ide-core-browser';
+import { Icon, getIcon } from '@opensumi/ide-core-browser/lib/components';
 import { EnhanceIcon, Thumbs } from '@opensumi/ide-core-browser/lib/components/ai-native';
 import { Progress } from '@opensumi/ide-core-browser/lib/progress/progress-bar';
 import { ChatRenderRegistryToken, isUndefined, localize } from '@opensumi/ide-core-common';
@@ -12,7 +13,7 @@ import { ChatRenderRegistry } from '../chat/chat.render.registry';
 import styles from './components.module.less';
 
 interface ITinkingProps {
-  children?: React.ReactNode | string | React.ReactNode[];
+  children?: React.ReactNode;
   hasMessage?: boolean;
   message?: string;
   onRegenerate?: () => void;
@@ -31,15 +32,8 @@ export const ChatThinking = (props: ITinkingProps) => {
     [chatRenderRegistry, chatRenderRegistry.chatThinkingRender],
   );
 
-  const isEmptyChildren = useMemo(() => {
-    if (Array.isArray(children)) {
-      return children.length === 0;
-    }
-    return !children;
-  }, [children]);
-
   const renderContent = useCallback(() => {
-    if (isEmptyChildren) {
+    if (!children) {
       if (CustomThinkingRender) {
         return <CustomThinkingRender thinkingText={thinkingText} />;
       }
@@ -58,7 +52,7 @@ export const ChatThinking = (props: ITinkingProps) => {
           {!CustomThinkingRender && (
             <span className={styles.progress_bar}>
               {/* 保持动画效果一致 */}
-              {isEmptyChildren && <Progress loading={true} wrapperClassName={styles.ai_native_progress_wrapper} />}
+              {!children && <Progress loading={true} wrapperClassName={styles.ai_native_progress_wrapper} />}
             </span>
           )}
           {/* {showStop && (

package/src/browser/components/change-list.module.less

@@ -103,8 +103,6 @@
 .fileStats {
   font-size: 12px;
   display: flex;
-  flex: 1;
-  justify-content: flex-end;
   align-items: center;
   gap: 4px;
 }

package/src/browser/components/chat-history.module.less

@@ -1,4 +1,4 @@
-.chat_history_header {
+.dm-chat-history-header {
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -8,7 +8,7 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 
-  .chat_history_header_title {
+  .dm-chat-history-header-title {
     opacity: 0.6;
     display: flex;
     align-items: center;
@@ -22,34 +22,22 @@
     }
   }
 
-  .chat_history_header_actions {
+  .dm-chat-history-header-actions {
     display: flex;
     align-items: center;
     font-size: 12px;
 
-    .chat_history_header_actions_history {
+    .dm-chat-history-header-actions-history {
       cursor: pointer;
     }
 
-    .chat_history_header_actions_new {
+    .dm-chat-history-header-actions-new {
       margin-left: 2px;
       cursor: pointer;
     }
 
-    :global {
-      .kt-popover-title {
-        margin-bottom: 8px;
-      }
-      .kt-popover-content {
-        background-color: var(--editor-background);
-        color: var(--editor-foreground);
-      }
-      .kt-popover-arrow {
-        border-bottom-color: var(--editor-background);
-      }
-      .kt-popover {
-        opacity: 1;
-      }
+    .kt-popover-title {
+      margin-bottom: 8px;
     }
   }
 
@@ -87,12 +75,7 @@
     }
   }
 
-  .chat_history_search {
-    width: 100%;
-    border-radius: 4px;
-  }
-
-  .chat_history_list {
+  .dm-chat-history-list {
     overflow: auto;
     max-height: 400px;
     width: 300px;
@@ -100,12 +83,12 @@
     font-size: 13px;
   }
 
-  .chat_history_time {
+  .dm-chat-history-time {
     opacity: 0.6;
     padding-left: 4px;
   }
 
-  .chat_history_item {
+  .dm-chat-history-item {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -114,7 +97,7 @@
     margin-top: 2px;
     border-radius: 3px;
 
-    .chat_history_item_content {
+    .dm-chat-history-item-content {
       display: flex;
       align-items: center;
       width: 100%;
@@ -122,28 +105,28 @@
       height: 24px;
     }
 
-    .chat_history_item_title {
+    .dm-chat-history-item-title {
       overflow: hidden;
       text-overflow: ellipsis;
       display: inline-block;
       white-space: nowrap;
     }
 
-    .chat_history_item_actions {
+    .dm-chat-history-item-actions {
       display: none;
     }
 
-    .chat_history_item_selected {
+    .dm-chat-history-item-selected {
       background: var(--textPreformat-background);
     }
 
     &:hover {
       background: var(--textPreformat-background);
 
-      .chat_history_item_actions {
+      .dm-chat-history-item-actions {
         display: block;
       }
-      .chat_history_item_content {
+      .dm-chat-history-item-content {
         max-width: calc(100% - 50px);
       }
     }

package/src/browser/components/components.module.less

@@ -4,9 +4,9 @@
   height: 100%;
   .stop {
     position: absolute;
-    bottom: -15px;
+    bottom: -38px;
     padding-top: 12px;
-    left: -9px;
+    left: -8px;
     width: 105%;
   }
 
@@ -519,7 +519,6 @@
     display: flex;
     font-size: 11px;
     align-items: center;
-    min-width: 150px;
   }
 
   .mcp_desc {
@@ -566,32 +565,3 @@
     color: var(--descriptionForeground);
   }
 }
-
-.attachment {
-  display: inline-flex;
-  align-items: center;
-  padding: 0 4px;
-  margin: 0 2px;
-  background: var(--badge-background);
-  color: var(--badge-foreground);
-  border-radius: 3px;
-  vertical-align: middle;
-  font-size: 12px;
-  cursor: pointer;
-  :global {
-    .kt-icon {
-      font-size: 12px;
-      margin-right: 3px;
-    }
-  }
-  &:hover {
-    background-color: var(--chat-slashCommandBackground);
-    color: var(--chat-slashCommandForeground);
-  }
-}
-
-.attachment_text {
-  line-height: 20px;
-  vertical-align: middle;
-  font-size: 12px;
-}

package/src/browser/context/llm-context.service.ts

@@ -10,7 +10,6 @@ import {
   IEditorDocumentModelService,
 } from '@opensumi/ide-editor/lib/browser/doc-model/types';
 import { EditorSelectionChangeEvent } from '@opensumi/ide-editor/lib/browser/types';
-import { FileType, IFileServiceClient } from '@opensumi/ide-file-service';
 import { IMarkerService } from '@opensumi/ide-markers/lib/common/types';
 import { Range } from '@opensumi/ide-monaco';
 
@@ -27,18 +26,13 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
   @Autowired(IMarkerService)
   protected readonly markerService: IMarkerService;
 
-  @Autowired(IFileServiceClient)
-  protected readonly fileService: IFileServiceClient;
-
   private isAutoCollecting = false;
 
   private contextVersion = 0;
 
   private readonly maxAttachFilesLimit = 10;
-  private readonly maxAttachFoldersLimit = 10;
   private readonly maxViewFilesLimit = 20;
-  private attachedFiles: FileContext[] = [];
-  private attachedFolders: FileContext[] = [];
+  private readonly attachedFiles: FileContext[] = [];
   private readonly recentlyViewFiles: FileContext[] = [];
   private readonly onDidContextFilesChangeEmitter = new Emitter<{
     viewed: FileContext[];
@@ -59,18 +53,6 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
     }
   }
 
-  private addFolderToList(folder: FileContext, list: FileContext[], maxLimit: number) {
-    const existingIndex = list.findIndex((f) => f.uri.toString() === folder.uri.toString());
-    if (existingIndex > -1) {
-      list.splice(existingIndex, 1);
-    }
-
-    list.push(folder);
-    if (list.length > maxLimit) {
-      list.shift();
-    }
-  }
-
   addFileToContext(uri: URI, selection?: [number, number], isManual = false): void {
     if (!uri) {
       return;
@@ -88,24 +70,12 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
     this.notifyContextChange();
   }
 
-  addFolderToContext(uri: URI): void {
-    if (!uri) {
-      return;
-    }
-
-    const file = { uri };
-
-    this.addFolderToList(file, this.attachedFolders, this.maxAttachFoldersLimit);
-    this.notifyContextChange();
-  }
-
   private notifyContextChange(): void {
     this.onDidContextFilesChangeEmitter.fire(this.getAllContextFiles());
   }
 
   cleanFileContext() {
-    this.attachedFiles = [];
-    this.attachedFolders = [];
+    this.attachedFiles.length = 0;
     this.notifyContextChange();
   }
 
@@ -113,7 +83,6 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
     return {
       viewed: this.recentlyViewFiles,
       attached: this.attachedFiles,
-      attachedFolders: this.attachedFolders,
       version: this.contextVersion++,
     };
   }
@@ -191,63 +160,16 @@ export class LLMContextServiceImpl extends WithEventBus implements LLMContextSer
     this.dispose();
   }
 
-  async serialize(): Promise<SerializedContext> {
+  serialize(): SerializedContext {
     const files = this.getAllContextFiles();
     const workspaceRoot = URI.file(this.appConfig.workspaceDir);
 
     return {
       recentlyViewFiles: this.serializeRecentlyViewFiles(files.viewed, workspaceRoot),
       attachedFiles: this.serializeAttachedFiles(files.attached, workspaceRoot),
-      attachedFolders: await this.serializeAttachedFolders(files.attachedFolders, workspaceRoot),
     };
   }
 
-  private async serializeAttachedFolders(folders: FileContext[], workspaceRoot: URI): Promise<string[]> {
-    // 去重
-    const folderPath = Array.from(new Set(folders.map((folder) => folder.uri.toString())));
-    return Promise.all(
-      folderPath.map(async (folder) => {
-        const folderUri = new URI(folder);
-        const root = workspaceRoot.relative(folderUri)?.toString() || '/';
-        return `\`\`\`\n${root}\n${(await this.getPartiaFolderStructure(folderUri.codeUri.fsPath))
-          .map((line) => `- ${line}`)
-          .join('\n')}\n\`\`\`\n`;
-      }),
-    );
-  }
-
-  private async getPartiaFolderStructure(folder: string, level = 2): Promise<string[]> {
-    const result: string[] = [];
-    const stat = await this.fileService.getFileStat(folder);
-
-    for (const child of stat?.children || []) {
-      const relativePath = new URI(folder).relative(new URI(child.uri))!.toString();
-
-      if (child.isSymbolicLink) {
-        // 处理软链接
-        const target = await this.fileService.getFileStat(child.realUri || child.uri);
-        if (target) {
-          result.push(`${relativePath} -> ${target} (symbolic link)`);
-        } else {
-          result.push(`${relativePath} (broken symbolic link)`);
-        }
-        continue;
-      }
-
-      if (child.type === FileType.Directory) {
-        result.push(`${relativePath}/`);
-        if (level > 1) {
-          const subDirStructure = await this.getPartiaFolderStructure(child.uri, level - 1);
-          result.push(...subDirStructure.map((subEntry) => `${relativePath}/${subEntry}`));
-        }
-      } else if (child.type === FileType.File) {
-        result.push(relativePath);
-      }
-    }
-
-    return result;
-  }
-
   private serializeRecentlyViewFiles(files: FileContext[], workspaceRoot: URI): string[] {
     return files
       .map((file) => workspaceRoot.relative(file.uri)?.toString() || file.uri.parent.toString())

package/src/browser/mcp/base-apply.service.ts

@@ -247,7 +247,7 @@ export abstract class BaseApplyService extends WithEventBus {
       originalCode: originalModelRef.instance.getText(),
     };
     if (uriCodeBlocks?.length) {
-      newBlock.version = uriCodeBlocks.length;
+      newBlock.version = uriCodeBlocks.length + 1;
       for (const block of uriCodeBlocks) {
         // 如果连续的上一个同文件apply结果存在LintError，则iterationCount++
         if (block.relativePath === relativePath && block.applyResult?.diagnosticInfos?.length) {
@@ -480,7 +480,7 @@ export abstract class BaseApplyService extends WithEventBus {
     }
   }
 
-  processAll(type: 'accept' | 'reject', uri?: URI): void {
+  async processAll(type: 'accept' | 'reject', uri?: URI): Promise<void> {
     const codeBlocks = uri
       ? this.getUriCodeBlocks(uri)?.filter((block) => block.status === 'pending')
       : this.getSessionCodeBlocks().filter((block) => block.status === 'pending');
@@ -498,6 +498,13 @@ export abstract class BaseApplyService extends WithEventBus {
             acc.push(cur);
             return acc;
           }, [] as string[]);
+    const openedEditor = this.editorService.getAllOpenedUris();
+    const unopenedUris = relativePaths
+      .filter((relativePath) => !openedEditor.some((editor) => editor.codeUri.fsPath.endsWith(relativePath)))
+      .map((relativePath) => URI.file(path.join(this.appConfig.workspaceDir, relativePath)));
+    if (unopenedUris.length) {
+      await this.editorService.openUris(unopenedUris);
+    }
     relativePaths.forEach((relativePath) => {
       this.doProcess(type, relativePath);
     });

package/src/common/llm-context.ts

@@ -1,14 +1,8 @@
 import { Event, URI } from '@opensumi/ide-core-common/lib/utils';
 
 export interface LLMContextService {
-  /**
-   * 开始自动收集
-   */
   startAutoCollection(): void;
 
-  /**
-   * 停止自动收集
-   */
   stopAutoCollection(): void;
 
   /**
@@ -16,19 +10,11 @@ export interface LLMContextService {
    */
   addFileToContext(uri: URI, selection?: [number, number], isManual?: boolean): void;
 
-  /**
-   * 添加文件夹到 context 中
-   */
-  addFolderToContext(uri: URI, isManual?: boolean): void;
-
   /**
    * 清除上下文
    */
   cleanFileContext(): void;
 
-  /**
-   * 上下文文件变化事件
-   */
   onDidContextFilesChangeEvent: Event<{ viewed: FileContext[]; attached: FileContext[]; version: number }>;
 
   /**
@@ -38,7 +24,7 @@ export interface LLMContextService {
   removeFileFromContext(uri: URI, isManual?: boolean): void;
 
   /** 导出为可序列化格式 */
-  serialize(): Promise<SerializedContext>;
+  serialize(): SerializedContext;
 }
 
 export interface FileContext {
@@ -58,5 +44,4 @@ export interface AttachFileContext {
 export interface SerializedContext {
   recentlyViewFiles: string[];
   attachedFiles: Array<AttachFileContext>;
-  attachedFolders: string[];
 }