Merge pull request #1894 from refly-ai/main

Staging Release 20251219

Author: mrcfps

.vscode/launch.json

@@ -35,60 +35,6 @@
       "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
       "outFiles": ["${workspaceFolder}/apps/api/dist/**/*.js"]
     },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Debug API (Direct)",
-      "program": "${workspaceFolder}/apps/api/src/main.ts",
-      "preLaunchTask": "npm: build:api",
-      "cwd": "${workspaceFolder}/apps/api",
-      "console": "integratedTerminal",
-      "runtimeArgs": ["--inspect-brk", "-r", "ts-node/register", "-r", "tsconfig-paths/register"],
-      "skipFiles": ["<node_internals>/**"],
-      "sourceMaps": true,
-      "outFiles": ["${workspaceFolder}/apps/api/dist/**/*.js"]
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Debug Fish TTS - Basic Usage",
-      "program": "${workspaceFolder}/scripts/demo/fish-tts/config-based-demo/examples/basic-usage.ts",
-      "cwd": "${workspaceFolder}/scripts/demo/fish-tts/config-based-demo",
-      "console": "integratedTerminal",
-      "runtimeArgs": ["-r", "ts-node/register"],
-      "skipFiles": ["<node_internals>/**"],
-      "sourceMaps": true,
-      "env": {
-        "TS_NODE_PROJECT": "${workspaceFolder}/tsconfig.json"
-      }
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Debug Fish TTS - Custom Handlers",
-      "program": "${workspaceFolder}/scripts/demo/fish-tts/config-based-demo/examples/custom-handlers.ts",
-      "cwd": "${workspaceFolder}/scripts/demo/fish-tts/config-based-demo",
-      "console": "integratedTerminal",
-      "runtimeArgs": ["-r", "ts-node/register"],
-      "skipFiles": ["<node_internals>/**"],
-      "sourceMaps": true,
-      "env": {
-        "TS_NODE_PROJECT": "${workspaceFolder}/tsconfig.json"
-      }
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Debug Tool Service Tests",
-      "program": "${workspaceFolder}/node_modules/.bin/jest",
-      "args": ["--runInBand", "--no-cache", "--watchAll=false", "tool.service.spec.ts"],
-      "cwd": "${workspaceFolder}/apps/api",
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "env": {
-        "NODE_ENV": "test"
-      }
-    },
     {
       "type": "node",
       "request": "launch",

.vscode/settings.json

@@ -5,7 +5,6 @@
   },
   "files.eol": "\n",
   "editor.formatOnSave": true,
-  "editor.defaultFormatter": "biomejs.biome",
   "typescript.preferences.importModuleSpecifier": "non-relative",
   "tailwindCSS.includeLanguages": {
     "typescript": "tsx",
@@ -15,10 +14,7 @@
     "scss": "scss"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "biomejs.biome"
-  },
-  "[typescriptreact]": {
-    "editor.defaultFormatter": "biomejs.biome"
+    "editor.defaultFormatter": "prettier.prettier-vscode"
   },
 
   "typescript.tsserver.maxTsServerMemory": 8192,
@@ -38,7 +34,5 @@
   },
   "typescript.tsdk": "node_modules/typescript/lib",
   "eslint.enable": false,
-  "[sql]": {
-    "editor.defaultFormatter": "cweijan.vscode-postgresql-client2"
-  }
+  "cSpell.words": ["Volcengine"]
 }

apps/api/package.json

@@ -21,6 +21,7 @@
     "sync-db-schema": "prisma format && prisma generate && node -r ts-node/register --env-file=.env src/scripts/sync-db-schema.ts",
     "dev": "prisma format && prisma generate && nodemon src/main.ts",
     "dev:debug": "nodemon --inspect src/main.ts",
+    "dev:node": "node --trace-warnings --inspect=0.0.0.0:9229 -r ts-node/register -r tsconfig-paths/register src/main.ts",
     "start": "node -r ./scripts/preload.js dist/main.js",
     "test": "jest",
     "test:watch": "jest --watch",

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

@@ -270,6 +270,7 @@ export class DriveService implements OnModuleInit {
 
           // Move object in storage
           await this.internalOss.moveObject(originalStorageKey, archiveStorageKey);
+          await this.externalOss.moveObject(originalStorageKey, archiveStorageKey);
 
           this.logger.debug(`Successfully archived file ${file.fileId} to ${archiveStorageKey}`);
           return { success: true, fileId: file.fileId };

apps/api/src/modules/share/share-duplication.service.ts

@@ -970,6 +970,30 @@ export class ShareDuplicationService {
 
     await Promise.all([...libDupPromises, ...skillDupPromises]);
 
+    // Update resultId for duplicated drive files
+    // The files were duplicated with old resultId, now we need to update them with new resultId
+    if (fileIdMap.size > 0) {
+      const newFileIds = Array.from(fileIdMap.values());
+      const driveFilesToUpdate = await this.prisma.driveFile.findMany({
+        where: { fileId: { in: newFileIds } },
+        select: { pk: true, fileId: true, resultId: true },
+      });
+
+      const updatePromises = driveFilesToUpdate
+        .filter((file) => file.resultId && replaceEntityMap[file.resultId])
+        .map((file) =>
+          this.prisma.driveFile.update({
+            where: { pk: file.pk },
+            data: { resultId: replaceEntityMap[file.resultId!] },
+          }),
+        );
+
+      if (updatePromises.length > 0) {
+        await Promise.all(updatePromises);
+        this.logger.log(`Updated resultId for ${updatePromises.length} duplicated drive files`);
+      }
+    }
+
     // Update canvas state and save
     state.nodes = nodes;
     state.edges = edges;

apps/api/src/modules/tool/dynamic-tooling/adapters/http-adapter.ts

@@ -14,6 +14,8 @@ import { supportedMimeTypes } from 'file-type';
 import { AdapterType, HttpMethod, AdapterError } from '../../constant/constant';
 import { BaseAdapter, type IHttpAdapter } from '../core/adapter';
 import { HttpClient } from './http-client';
+import { getToolName, getToolsetKey } from '../../tool-context';
+import { isVolcengineAuth, VolcenginePollingHelper, applyVolcengineSigning } from './volcengine';
 
 /**
  * HTTP adapter for making HTTP API calls with intelligent polling support
@@ -86,6 +88,22 @@ export class HttpAdapter extends BaseAdapter implements IHttpAdapter {
     initialResponse: AdapterResponse,
     request: AdapterRequest,
   ): Promise<AdapterResponse> {
+    const toolsetKey = getToolsetKey() || '';
+    // Use Volcengine-specific polling for Volcengine toolsets
+    // This handles task_id extraction from data.task_id (not request_id)
+    if (toolsetKey.startsWith('volcengine')) {
+      const volcengineHelper = new VolcenginePollingHelper();
+      return await volcengineHelper.handleVolcenginePolling(initialResponse, {
+        httpClient: this.httpClient,
+        pollingConfig: this.pollingConfig!,
+        credentials: request.credentials || {},
+        params: (request.params as Record<string, unknown>) || {},
+        headers: request.headers,
+        timeout: request.timeout,
+        toolName: getToolName() || undefined,
+      });
+    }
+
     // Auto-detect task ID from initial response
     const taskId = this.autoDetectTaskId(initialResponse.data);
     if (!taskId) {
@@ -119,10 +137,6 @@ export class HttpAdapter extends BaseAdapter implements IHttpAdapter {
         ...request.headers,
       };
 
-      // Add authentication headers from credentials
-      if (request.credentials) {
-        this.addAuthHeaders(headers, request.credentials);
-      }
       // Prepare request data
       let requestData: unknown;
       const contentType = headers['Content-Type'] || headers['content-type'];
@@ -144,11 +158,44 @@ export class HttpAdapter extends BaseAdapter implements IHttpAdapter {
         }
       }
 
-      // Execute request based on HTTP method
+      // Add authentication headers from credentials
+      // Skip addAuthHeaders for Volcengine auth since it has its own signing
+      const skipAuth =
+        getToolsetKey().startsWith('volcengine') ||
+        (request.credentials && isVolcengineAuth(request.credentials as Record<string, unknown>));
+
+      if (request.credentials && !skipAuth) {
+        this.addAuthHeaders(headers, request.credentials);
+      }
+
+      // Apply Volcengine HMAC-SHA256 signing for initial request
       const method = request.method?.toUpperCase() || HttpMethod.POST;
+      let finalEndpoint = request.endpoint;
+
+      if (skipAuth && request.credentials) {
+        const signResult = applyVolcengineSigning({
+          credentials: request.credentials as Record<string, unknown>,
+          params: (params as Record<string, unknown>) || {},
+          endpoint: request.endpoint,
+          method,
+          requestData,
+          headers,
+        });
+
+        if (signResult.signed) {
+          // Apply signed headers
+          for (const [key, value] of Object.entries(signResult.headers)) {
+            if (value !== undefined) {
+              headers[key] = value;
+            }
+          }
+          // Use the signed URL (includes Action, Version, and proper query string)
+          finalEndpoint = signResult.endpoint;
+        }
+      }
       const response = await this.sendHttpRequest(
         method,
-        request.endpoint,
+        finalEndpoint,
         params,
         requestData,
         headers,
@@ -526,31 +573,6 @@ export class HttpAdapter extends BaseAdapter implements IHttpAdapter {
     return null;
   }
 
-  /**
-   * Auto-download file if response contains URL pointing to binary content
-   * If URL returns non-binary content (like JSON), return original data
-   */
-  private async autoDownloadIfNeeded(data: any, taskId: string): Promise<any> {
-    // Recursively find all URLs
-    const urls = this.findAllUrls(data);
-
-    if (urls.length === 0) {
-      return data;
-    }
-
-    // Check if the URL points to downloadable binary content
-    const primaryUrl = urls[0];
-    const isDownloadable = await this.isDownloadableUrl(primaryUrl.value);
-
-    if (!isDownloadable) {
-      this.logger.log(`URL ${primaryUrl.path} does not point to binary content, skipping download`);
-      return data;
-    }
-
-    this.logger.log(`🔽 Downloading from: ${primaryUrl.path} = ${primaryUrl.value}`);
-    return await this.downloadFile(primaryUrl.value, data, taskId);
-  }
-
   /**
    * Check if URL points to downloadable binary content using HEAD request
    */