Merge pull request #1270 from refly-ai/main

Release v0.10.0

Author: mrcfps

apps/api/prisma/schema.prisma

@@ -253,6 +253,8 @@ model PilotStep {
   status     String   @default("init") @map("status")
   /// Raw step output from LLM
   rawOutput  String?  @map("raw_output")
+  /// Divergent node fields
+  mode       String?  @default("subtask") @map("mode")
   /// Create timestamp
   createdAt  DateTime @default(now()) @map("created_at") @db.Timestamptz()
   /// Update timestamp
@@ -271,25 +273,29 @@ enum ActionStatus {
 
 model TokenUsage {
   /// Primary key
-  pk            BigInt   @id @default(autoincrement())
+  pk             BigInt   @id @default(autoincrement())
   /// UID
-  uid           String   @map("uid")
+  uid            String   @map("uid")
   /// Action result id
-  resultId      String?  @map("result_id")
+  resultId       String?  @map("result_id")
   /// Model tier
-  tier          String   @map("tier")
+  tier           String   @map("tier")
   /// Model provider
-  modelProvider String   @default("") @map("model_provider")
+  modelProvider  String   @default("") @map("model_provider")
   /// Model name
-  modelName     String   @default("") @map("model_name")
+  modelName      String   @default("") @map("model_name")
+  /// Model label
+  modelLabel     String   @default("") @map("model_label")
+  /// Provider item id
+  providerItemId String?  @map("provider_item_id")
   /// Input tokens
-  inputTokens   Int      @default(0) @map("input_tokens")
+  inputTokens    Int      @default(0) @map("input_tokens")
   /// Output tokens
-  outputTokens  Int      @default(0) @map("output_tokens")
+  outputTokens   Int      @default(0) @map("output_tokens")
   /// Create timestamp
-  createdAt     DateTime @default(now()) @map("created_at") @db.Timestamptz()
+  createdAt      DateTime @default(now()) @map("created_at") @db.Timestamptz()
   /// Update timestamp
-  updatedAt     DateTime @default(now()) @updatedAt @map("updated_at") @db.Timestamptz()
+  updatedAt      DateTime @default(now()) @updatedAt @map("updated_at") @db.Timestamptz()
 
   @@index([uid, createdAt])
   @@map("token_usages")
@@ -330,37 +336,40 @@ model StaticFile {
 
 model Canvas {
   /// Primary key
-  pk                BigInt    @id @default(autoincrement())
+  pk                BigInt         @id @default(autoincrement())
   /// Canvas id
-  canvasId          String    @unique @map("canvas_id")
+  canvasId          String         @unique @map("canvas_id")
   /// Owner UID
-  uid               String    @map("uid")
+  uid               String         @map("uid")
   /// Canvas title
-  title             String    @default("Untitled") @map("title")
+  title             String         @default("Untitled") @map("title")
   /// Canvas yjs doc storage size (in bytes)
-  storageSize       BigInt    @default(0) @map("storage_size")
+  storageSize       BigInt         @default(0) @map("storage_size")
   /// Canvas version
-  version           String    @default("") @map("version")
+  version           String         @default("") @map("version")
   /// Canvas yjs doc storage key (deprecated, use `dataStorageKey` instead)
-  stateStorageKey   String?   @map("state_storage_key")
+  stateStorageKey   String?        @map("state_storage_key")
   /// Minimap storage key
-  minimapStorageKey String?   @map("minimap_storage_key")
+  minimapStorageKey String?        @map("minimap_storage_key")
   /// Whether this canvas is readonly
-  readOnly          Boolean   @default(false) @map("read_only")
+  readOnly          Boolean        @default(false) @map("read_only")
   /// Whether this canvas is public
-  isPublic          Boolean   @default(false) @map("is_public")
+  isPublic          Boolean        @default(false) @map("is_public")
   /// Canvas status
-  status            String    @default("ready") @map("status")
+  status            String         @default("ready") @map("status")
   /// Create timestamp
-  createdAt         DateTime  @default(now()) @map("created_at") @db.Timestamptz()
+  createdAt         DateTime       @default(now()) @map("created_at") @db.Timestamptz()
   /// Update timestamp
-  updatedAt         DateTime  @default(now()) @updatedAt @map("updated_at") @db.Timestamptz()
+  updatedAt         DateTime       @default(now()) @updatedAt @map("updated_at") @db.Timestamptz()
   /// Soft delete timestamp
-  deletedAt         DateTime? @map("deleted_at") @db.Timestamptz()
+  deletedAt         DateTime?      @map("deleted_at") @db.Timestamptz()
   /// Project id
-  projectId         String?   @map("project_id")
+  projectId         String?        @map("project_id")
   /// Project
-  project           Project?  @relation(fields: [projectId], references: [projectId])
+  project           Project?       @relation(fields: [projectId], references: [projectId])
+  Resource          Resource[]
+  Document          Document[]
+  CodeArtifact      CodeArtifact[]
 
   @@index([uid, updatedAt])
   @@map("canvases")
@@ -510,6 +519,10 @@ model Resource {
   wordCount      Int       @default(0) @map("word_count")
   /// Content preview
   contentPreview String?   @map("content_preview")
+  /// Canvas id
+  canvasId       String?   @map("canvas_id")
+  /// Canvas
+  canvas         Canvas?   @relation(fields: [canvasId], references: [canvasId])
   /// Content storage key
   storageKey     String?   @map("storage_key")
   /// Content storage size (in bytes)
@@ -572,6 +585,10 @@ model Document {
   updatedAt       DateTime  @default(now()) @updatedAt @map("updated_at") @db.Timestamptz()
   /// Soft delete timestamp
   deletedAt       DateTime? @map("deleted_at") @db.Timestamptz()
+  /// Canvas id
+  canvasId        String?   @map("canvas_id")
+  /// Canvas
+  canvas          Canvas?   @relation(fields: [canvasId], references: [canvasId])
   /// Project id
   projectId       String?   @map("project_id")
   /// Project
@@ -602,6 +619,10 @@ model CodeArtifact {
   resultId          String?   @map("result_id")
   /// Action result version
   resultVersion     Int       @default(0) @map("result_version")
+  /// Canvas id
+  canvasId          String?   @map("canvas_id")
+  /// Canvas
+  canvas            Canvas?   @relation(fields: [canvasId], references: [canvasId])
   /// Create timestamp
   createdAt         DateTime  @default(now()) @map("created_at") @db.Timestamptz()
   /// Update timestamp
@@ -926,6 +947,8 @@ model ProviderItem {
   order         Int       @default(0) @map("order")
   /// Group name
   groupName     String    @default("") @map("group_name")
+  /// Related global provider item ID
+  globalItemId  String?   @map("global_item_id")
   /// Create timestamp
   createdAt     DateTime  @default(now()) @map("created_at") @db.Timestamptz()
   /// Update timestamp
@@ -937,6 +960,7 @@ model ProviderItem {
 
   @@index([providerId])
   @@index([uid, deletedAt])
+  @@index([globalItemId])
   @@map("provider_items")
 }
 

apps/api/src/main.ts

@@ -36,16 +36,23 @@ async function bootstrap() {
     rawBody: true,
     bufferLogs: false,
   });
-  app.useLogger(app.get(Logger));
+  const logger = app.get(Logger);
+  app.useLogger(logger);
 
   const configService = app.get(ConfigService);
 
   process.on('uncaughtException', (err) => {
+    const stack = (err as Error)?.stack ?? String(err);
+    logger.error(`main process uncaughtException: ${stack}`);
     Sentry.captureException(err);
+    // Do not exit; keep the process alive. Investigate recurring errors via Sentry logs.
   });
 
   process.on('unhandledRejection', (err) => {
-    Sentry.captureException(err);
+    const message = (err as Error)?.stack ?? String(err);
+    logger.error(`main process unhandledRejection: ${message}`);
+    Sentry.captureException(err as any);
+    // Do not exit; keep the process alive. Investigate recurring errors via Sentry logs.
   });
 
   app.useBodyParser('json', { limit: '10mb' });

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

@@ -39,7 +39,14 @@ export class ActionService {
       throw new ActionResultNotFoundError();
     }
 
-    const item = await this.providerService.findLLMProviderItemByModelID(user, result.modelName);
+    const item =
+      (result.providerItemId
+        ? await this.providerService.findProviderItemById(user, result.providerItemId)
+        : null) ||
+      (result.modelName
+        ? (await this.providerService.findLLMProviderItemByModelID(user, result.modelName)) ||
+          (await this.providerService.findMediaProviderItemByModelID(user, result.modelName))
+        : null);
     const modelInfo = item ? providerItem2ModelInfo(item) : null;
 
     const steps = await this.prisma.actionStep.findMany({

apps/api/src/modules/app.module.ts

@@ -70,10 +70,6 @@ class CustomThrottlerGuard extends ThrottlerGuard {
         },
         autoLogging: false,
         genReqId: () => api.trace.getSpan(api.context.active())?.spanContext()?.traceId,
-        customSuccessObject: (req) => ({
-          env: process.env.NODE_ENV,
-          uid: (req as any).user?.uid || 'anonymous',
-        }),
         transport: process.env.NODE_ENV !== 'production' ? { target: 'pino-pretty' } : undefined,
         formatters: {
           level: (level) => ({ level }),

apps/api/src/modules/canvas/canvas-sync.service.ts

@@ -22,6 +22,7 @@ import {
   CanvasConflictException,
   purgeContextItems,
   calculateCanvasStateDiff,
+  shouldCreateNewVersion,
 } from '@refly/canvas-common';
 import {
   CanvasNotFoundError,
@@ -380,6 +381,20 @@ export class CanvasSyncService {
       throw new CanvasNotFoundError();
     }
 
+    // If no need to create new version, return the current state
+    if (!shouldCreateNewVersion(state)) {
+      this.logger.log(
+        `[createCanvasVersion] no need to create version for canvas ${canvasId}, current version: ${canvas.version}`,
+      );
+      return {
+        canvasId,
+        newState: state,
+      };
+    }
+
+    this.logger.log(
+      `[createCanvasVersion] create version for canvas ${canvasId}, current version: ${canvas.version}`,
+    );
     const releaseLock = await this.lockState(canvasId);
 
     try {
@@ -443,6 +458,10 @@ export class CanvasSyncService {
         createdAt: Date.now(),
         updatedAt: Date.now(),
       };
+      this.logger.log(
+        `[createCanvasVersion] create version for canvas ${canvasId}, new version: ${newState.version}`,
+      );
+
       const stateStorageKey = await this.saveState(canvasId, newState);
 
       await this.prisma.$transaction([

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

@@ -194,6 +194,7 @@ export class CanvasService {
                 const doc = await this.knowledgeService.duplicateDocument(user, {
                   docId: entityId,
                   title: node.data?.title,
+                  canvasId: newCanvasId,
                 });
                 if (doc) {
                   node.data.entityId = doc.docId;
@@ -205,6 +206,7 @@ export class CanvasService {
                 const resource = await this.knowledgeService.duplicateResource(user, {
                   resourceId: entityId,
                   title: node.data?.title,
+                  canvasId: newCanvasId,
                 });
                 if (resource) {
                   node.data.entityId = resource.resourceId;
@@ -213,10 +215,10 @@ export class CanvasService {
                 break;
               }
               case 'codeArtifact': {
-                const codeArtifact = await this.codeArtifactService.duplicateCodeArtifact(
-                  user,
-                  entityId,
-                );
+                const codeArtifact = await this.codeArtifactService.duplicateCodeArtifact(user, {
+                  artifactId: entityId,
+                  canvasId: newCanvasId,
+                });
                 if (codeArtifact) {
                   node.data.entityId = codeArtifact.artifactId;
                   replaceEntityMap[entityId] = codeArtifact.artifactId;
@@ -357,24 +359,27 @@ export class CanvasService {
    * @param canvasId - The id of the canvas to add the node to
    * @param node - The node to add
    * @param connectTo - The nodes to connect to
+   * @param options - Additional options including autoLayout
    */
   async addNodeToCanvas(
     user: User,
     canvasId: string,
     node: Pick<CanvasNode, 'type' | 'data'>,
     connectTo?: CanvasNodeFilter[],
+    options?: { autoLayout?: boolean },
   ) {
     const releaseLock = await this.canvasSyncService.lockState(canvasId);
     const { nodes, edges } = await this.canvasSyncService.getCanvasData(user, { canvasId });
 
     this.logger.log(
-      `[addNodeToCanvas] add node to canvas ${canvasId}, node: ${JSON.stringify(node)}, nodes: ${JSON.stringify(nodes)}, edges: ${JSON.stringify(edges)}`,
+      `[addNodeToCanvas] add node to canvas ${canvasId}, node: ${JSON.stringify(node)}, autoLayout: ${options?.autoLayout}`,
     );
     const { newNode, newEdges } = prepareAddNode({
       node,
       nodes,
       edges,
       connectTo,
+      autoLayout: options?.autoLayout, // Pass autoLayout parameter
     });
 
     await this.canvasSyncService.syncState(
@@ -834,8 +839,7 @@ export class CanvasService {
       user,
       'titleGeneration',
     );
-    const modelConfig = JSON.parse(defaultModel.config);
-    const model = await this.providerService.prepareChatModel(user, modelConfig.modelId);
+    const model = await this.providerService.prepareChatModel(user, defaultModel.itemId);
     this.logger.log(`Using default model for auto naming: ${model.name}`);
 
     // Use the new structured title generation approach