Revert " feat: Add internal builtin tools (read_file, list_files) with compa…"

This reverts commit 849faf5.

Author: lefarcen

apps/api/src/modules/skill/skill-engine.service.ts

@@ -248,13 +248,6 @@ export class SkillEngineService implements OnModuleInit {
         const result = await this.driveService.getDriveFileDetail(user, fileId);
         return result;
       },
-      listFiles: async (user, canvasId) => {
-        const result = await this.driveService.listDriveFiles(user, {
-          canvasId,
-          scope: 'present',
-        });
-        return result;
-      },
       writeFile: async (user, param) => {
         return await this.driveService.createDriveFile(user, param);
       },

apps/api/src/modules/skill/skill.service.ts

@@ -70,13 +70,11 @@ import { AutoModelRouter } from '../provider/auto-model-router.service';
 /**
  * Fixed builtin toolsets that are always available for node_agent mode.
  * These toolsets will be automatically appended to user-selected toolsets.
- * Internal tools (read_file, list_files) are system-level tools hidden from mentionList.
  * Note: IDs must match BuiltinToolsetDefinition.tools[].name for instantiateBuiltinToolsets to work.
  */
 const FIXED_BUILTIN_TOOLSETS: GenericToolset[] = [
   { type: 'regular', id: 'execute_code', name: 'execute_code', builtin: true },
   { type: 'regular', id: 'read_file', name: 'read_file', builtin: true },
-  { type: 'regular', id: 'list_files', name: 'list_files', builtin: true },
   { type: 'regular', id: 'get_time', name: 'get_time', builtin: true },
 ];
 

apps/api/src/modules/tool/tool.service.ts

@@ -78,17 +78,9 @@ export class ToolService {
     return key === 'web_search';
   }
 
-  /**
-   * Check if a toolset should be exposed to users in mentionList.
-   * Filters out deprecated and internal (system-level) toolsets.
-   * Internal toolsets are auto-included by the system and not user-selectable.
-   */
-  private shouldExposeToolset(key?: string, options?: { internal?: boolean }): boolean {
+  private shouldExposeToolset(key?: string): boolean {
     if (!key) return true;
-    if (this.isDeprecatedToolset(key)) return false;
-    // Filter out internal/system-level toolsets (e.g., read_file, list_files)
-    if (options?.internal) return false;
-    return true;
+    return !this.isDeprecatedToolset(key);
   }
 
   async getToolsetInventory(): Promise<
@@ -115,8 +107,6 @@ export class ToolService {
 
   /**
    * Load toolset inventory from sources (builtin + external)
-   * Note: This is for /tool/inventory/list API, which includes all tools for rendering.
-   * Internal tools are NOT filtered here as they need to be available for ToolCall rendering.
    */
   private async loadToolsetInventory(): Promise<ToolsetDefinition[]> {
     const builtinInventory = Object.values(builtinToolsetInventory).map((toolset) => ({
@@ -176,18 +166,11 @@ export class ToolService {
     return [...authorizedItems, ...unauthorizedItems];
   }
 
-  /**
-   * List builtin tools for mentionList.
-   * Filters out internal (system-level) tools that are auto-included.
-   */
   listBuiltinTools(): GenericToolset[] {
     return Object.values(builtinToolsetInventory)
       .filter(
         (toolset) =>
-          Boolean(toolset.definition) &&
-          this.shouldExposeToolset(toolset.definition.key, {
-            internal: toolset.definition.internal,
-          }),
+          Boolean(toolset.definition) && this.shouldExposeToolset(toolset.definition.key),
       )
       .map((toolset) => ({
         type: ToolsetType.REGULAR,

packages/agent-tools/src/builtin/index.ts

@@ -34,14 +34,6 @@ export const BuiltinToolsetDefinition: ToolsetDefinition = {
       },
       modelOnly: true,
     },
-    {
-      name: 'list_files',
-      descriptionDict: {
-        en: 'List all files in the current canvas.',
-        'zh-CN': '列出当前画布中的所有文件。',
-      },
-      modelOnly: true,
-    },
     {
       name: 'generate_doc',
       descriptionDict: {
@@ -147,7 +139,7 @@ export const BuiltinSendEmailDefinition: ToolsetDefinition = {
 
 export const BuiltinGetTimeDefinition: ToolsetDefinition = {
   key: 'get_time',
-  // internal: true - This tool should be visible in mentionList for user selection
+  internal: true,
   labelDict: {
     en: 'Get Time',
     'zh-CN': '获取时间',
@@ -160,7 +152,6 @@ export const BuiltinGetTimeDefinition: ToolsetDefinition = {
 
 export const BuiltinReadFileDefinition: ToolsetDefinition = {
   key: 'read_file',
-  //  System-level tool, auto-included, hidden from mentionList, uses compact rendering
   internal: true,
   labelDict: {
     en: 'Read File',
@@ -174,7 +165,7 @@ export const BuiltinReadFileDefinition: ToolsetDefinition = {
 
 export const BuiltinExecuteCodeDefinition: ToolsetDefinition = {
   key: 'execute_code',
-  // internal: true - This tool should be visible in mentionList for user selection
+  internal: true,
   labelDict: {
     en: 'Execute Code',
     'zh-CN': '执行代码',
@@ -185,20 +176,6 @@ export const BuiltinExecuteCodeDefinition: ToolsetDefinition = {
   },
 };
 
-export const BuiltinListFilesDefinition: ToolsetDefinition = {
-  key: 'list_files',
-  // System-level tool, auto-included, hidden from mentionList, uses compact rendering
-  internal: true,
-  labelDict: {
-    en: 'List Files',
-    'zh-CN': '列出文件',
-  },
-  descriptionDict: {
-    en: 'List all files in the current canvas.',
-    'zh-CN': '列出当前画布中的所有文件。',
-  },
-};
-
 export class BuiltinLibrarySearch extends AgentBaseTool<BuiltinToolParams> {
   name = 'library_search';
   toolsetKey = 'library_search';
@@ -764,10 +741,6 @@ export class BuiltinReadFile extends AgentBaseTool<BuiltinToolParams> {
 
   schema = z.object({
     fileId: z.string().describe('The ID of the file to read (format: df-xxx, from context)'),
-    fileName: z
-      .string()
-      .optional()
-      .describe('Optional file name for frontend display purpose only'),
   });
 
   description = `Read content from a file.
@@ -808,74 +781,6 @@ Latency: <2s`;
   }
 }
 
-export class BuiltinListFiles extends AgentBaseTool<BuiltinToolParams> {
-  name = 'list_files';
-  toolsetKey = 'list_files';
-
-  // No parameters needed - canvasId is obtained from context automatically
-  schema = z.object({});
-
-  description = `List all files in the current canvas.
-
-Returns a list of files with their IDs and names. Use the fileId with read_file tool to read file content.`;
-
-  protected params: BuiltinToolParams;
-
-  constructor(params: BuiltinToolParams) {
-    super(params);
-    this.params = params;
-  }
-
-  async _call(
-    _input: z.infer<typeof this.schema>,
-    _: unknown,
-    config: RunnableConfig,
-  ): Promise<ToolCallResult> {
-    try {
-      const { reflyService, user } = this.params;
-      const canvasId = config.configurable?.canvasId;
-
-      if (!canvasId) {
-        return {
-          status: 'error',
-          error: 'Canvas ID not found in context',
-          summary: 'Cannot list files: canvas context is not available',
-        };
-      }
-
-      const files = await reflyService.listFiles(user, canvasId);
-
-      if (!files || files.length === 0) {
-        return {
-          status: 'success',
-          data: [],
-          summary: 'No files found in the current canvas',
-        };
-      }
-
-      // Return simplified file info for LLM consumption
-      const fileList = files.map((f) => ({
-        fileId: f.fileId,
-        fileName: f.name,
-        type: f.type,
-      }));
-
-      return {
-        status: 'success',
-        data: fileList,
-        summary: `Found ${files.length} file(s) in the canvas: ${files.map((f) => f.name).join(', ')}`,
-      };
-    } catch (error) {
-      return {
-        status: 'error',
-        error: 'Error listing files',
-        summary:
-          error instanceof Error ? error.message : 'Unknown error occurred while listing files',
-      };
-    }
-  }
-}
-
 export class BuiltinLibrarySearchToolset extends AgentBaseToolset<BuiltinToolParams> {
   toolsetKey = BuiltinLibrarySearchDefinition.key;
   tools = [BuiltinLibrarySearch] satisfies readonly AgentToolConstructor<BuiltinToolParams>[];
@@ -913,11 +818,6 @@ export class BuiltinReadFileToolset extends AgentBaseToolset<BuiltinToolParams>
   tools = [BuiltinReadFile] satisfies readonly AgentToolConstructor<BuiltinToolParams>[];
 }
 
-export class BuiltinListFilesToolset extends AgentBaseToolset<BuiltinToolParams> {
-  toolsetKey = BuiltinListFilesDefinition.key;
-  tools = [BuiltinListFiles] satisfies readonly AgentToolConstructor<BuiltinToolParams>[];
-}
-
 export class BuiltinExecuteCodeToolset extends AgentBaseToolset<BuiltinToolParams> {
   toolsetKey = BuiltinExecuteCodeDefinition.key;
   tools = [BuiltinExecuteCode] satisfies readonly AgentToolConstructor<BuiltinToolParams>[];
@@ -932,7 +832,6 @@ export class BuiltinToolset extends AgentBaseToolset<BuiltinToolParams> {
     BuiltinSendEmail,
     BuiltinGetTime,
     BuiltinReadFile,
-    BuiltinListFiles,
     BuiltinExecuteCode,
   ] satisfies readonly AgentToolConstructor<BuiltinToolParams>[];
 }

packages/agent-tools/src/builtin/interface.ts

@@ -82,7 +82,6 @@ export interface ReflyService {
     options?: { topN?: number; relevanceThreshold?: number },
   ) => Promise<RerankResponse>;
   readFile: (user: User, fileId: string) => Promise<DriveFile>;
-  listFiles: (user: User, canvasId: string) => Promise<DriveFile[]>;
   writeFile: (user: User, param: UpsertDriveFileRequest) => Promise<DriveFile>;
   inMemorySearchWithIndexing: (
     user: User,

packages/agent-tools/src/inventory.ts

@@ -12,8 +12,6 @@ import {
   BuiltinGetTimeDefinition,
   BuiltinReadFileToolset,
   BuiltinReadFileDefinition,
-  BuiltinListFilesToolset,
-  BuiltinListFilesDefinition,
   BuiltinExecuteCodeToolset,
   BuiltinExecuteCodeDefinition,
 } from './builtin';
@@ -67,10 +65,6 @@ export const builtinToolsetInventory: Record<
     class: BuiltinReadFileToolset,
     definition: BuiltinReadFileDefinition,
   },
-  [BuiltinListFilesDefinition.key]: {
-    class: BuiltinListFilesToolset,
-    definition: BuiltinListFilesDefinition,
-  },
   [BuiltinExecuteCodeDefinition.key]: {
     class: BuiltinExecuteCodeToolset,
     definition: BuiltinExecuteCodeDefinition,