Merge pull request #532 from refly-ai/fix/skill-rerun

fix: skill rerun issues and node preview truncation

Author: mrcfps

.github/workflows/build-image.yml

@@ -2,12 +2,6 @@ name: Build and Push Docker Images
 
 on:
   workflow_dispatch:
-  push:
-    branches: [ main ]
-    paths:
-      - 'apps/api/**'
-      - 'apps/web/**'
-      - 'packages/**'
 
 jobs:
   build-and-push:

.github/workflows/e2e.yml

@@ -1,11 +1,12 @@
 name: End-to-End Tests
 
 on:
-  pull_request:
-    types: [opened, synchronize]
+  pull_request_review:
+    types: [submitted]
 
 jobs:
   e2e:
+    if: github.event.review.state == 'approved'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false # https://github.com/cypress-io/github-action/issues/48

packages/ai-workspace-common/src/components/canvas/node-preview/skill-response/index.tsx

@@ -173,6 +173,10 @@ const SkillResponseNodePreviewComponent = ({ node, resultId }: SkillResponseNode
       {
         resultId,
         query: title,
+        selectedSkill: {
+          name: actionMeta?.name || 'CommonQnA',
+        },
+        contextItems,
       },
       {
         entityId: canvasId,

packages/ai-workspace-common/src/components/canvas/nodes/document.tsx

@@ -244,8 +244,6 @@ export const DocumentNode = memo(
                   content={data.contentPreview || t('canvas.nodePreview.document.noContentPreview')}
                   sizeMode={sizeMode}
                   isOperating={isOperating}
-                  isLoading={data.metadata?.status === 'executing' && !data.contentPreview}
-                  maxCompactLength={20}
                   className="min-h-8"
                 />
               </div>

packages/ai-workspace-common/src/components/canvas/nodes/resource.tsx

@@ -34,6 +34,7 @@ import { useCreateDocument } from '@refly-packages/ai-workspace-common/hooks/can
 import { message, Result } from 'antd';
 import getClient from '@refly-packages/ai-workspace-common/requests/proxiedRequest';
 import { useEditorPerformance } from '@refly-packages/ai-workspace-common/context/editor-performance';
+import { useSubscriptionUsage } from '@refly-packages/ai-workspace-common/hooks/use-subscription-usage';
 
 const NodeContent = memo(
   ({ data, isOperating }: { data: CanvasNodeData<ResourceNodeMeta>; isOperating: boolean }) => {
@@ -65,7 +66,6 @@ const NodeContent = memo(
         content={data.contentPreview || t('canvas.nodePreview.resource.noContentPreview')}
         sizeMode={sizeMode}
         isOperating={isOperating}
-        maxCompactLength={10}
       />
     );
   },
@@ -97,6 +97,8 @@ export const ResourceNode = memo(
     const isDragging = draggingNodeId === id;
     const node = useMemo(() => getNode(id), [id, getNode]);
 
+    const { refetchUsage } = useSubscriptionUsage();
+
     const { containerStyle, handleResize } = useNodeSize({
       id,
       node,
@@ -252,6 +254,10 @@ export const ResourceNode = memo(
             },
           },
         );
+
+        if (indexStatus === 'finish' && resourceType === 'file') {
+          refetchUsage();
+        }
       }
     }, [data.entityId, remoteResult, setNodeDataByEntity]);
 

packages/ai-workspace-common/src/components/canvas/nodes/shared/content-preview.tsx

@@ -7,43 +7,33 @@ interface ContentPreviewProps {
   sources?: Source[];
   sizeMode: 'compact' | 'adaptive';
   isOperating: boolean;
-  maxCompactLength?: number;
   className?: string;
 }
 
 export const ContentPreview = memo(
-  ({
-    content,
-    sources,
-    sizeMode,
-    isOperating,
-    maxCompactLength = 10,
-    className = '',
-  }: ContentPreviewProps) => {
-    const previewContent = useMemo(() => {
-      if (sizeMode === 'compact') {
-        return `${content?.slice(0, maxCompactLength)}...` || '';
-      }
-      return content || '';
-    }, [content, sizeMode, maxCompactLength]);
+  ({ content, sources, sizeMode, isOperating, className = '' }: ContentPreviewProps) => {
+    const previewContent = content ?? '';
 
     // Memoize className to prevent re-renders when only isOperating changes
     const markdownClassName = useMemo(
       () =>
-        `text-xs overflow-hidden ${isOperating ? 'pointer-events-auto cursor-text select-text' : 'pointer-events-none select-none'} ${className}`,
-      [isOperating, className],
+        `text-xs overflow-hidden ${sizeMode === 'compact' ? 'max-h-[1.5rem] line-clamp-1' : ''} ${
+          isOperating
+            ? 'pointer-events-auto cursor-text select-text'
+            : 'pointer-events-none select-none'
+        } ${className}`,
+      [isOperating, sizeMode, className],
     );
 
     return (
-      <Markdown className={markdownClassName} content={previewContent} sources={sources || []} />
+      <Markdown className={markdownClassName} content={previewContent} sources={sources ?? []} />
     );
   },
   (prevProps, nextProps) => {
     return (
       prevProps.content === nextProps.content &&
       prevProps.sizeMode === nextProps.sizeMode &&
       prevProps.isOperating === nextProps.isOperating &&
-      prevProps.maxCompactLength === nextProps.maxCompactLength &&
       prevProps.className === nextProps.className &&
       JSON.stringify(prevProps.sources) === JSON.stringify(nextProps.sources)
     );

packages/ai-workspace-common/src/components/canvas/nodes/shared/types.ts

@@ -8,6 +8,7 @@ import {
   IndexError,
   IndexStatus,
   ModelInfo,
+  ResourceType,
   Skill,
   SkillTemplateConfig,
   TokenUsageItem,
@@ -39,7 +40,7 @@ export interface DocumentNodeMeta {
 }
 
 export interface ResourceNodeMeta {
-  resourceType?: string;
+  resourceType?: ResourceType;
   indexStatus?: IndexStatus;
   indexError?: IndexError;
   sizeMode?: 'compact' | 'adaptive';

packages/ai-workspace-common/src/components/canvas/nodes/skill-response.tsx

@@ -240,7 +240,7 @@ export const SkillResponseNode = memo(
       : '';
 
     const skill = {
-      name: actionMeta?.name || '',
+      name: actionMeta?.name || 'CommonQnA',
       icon: actionMeta?.icon,
     };
     const skillName = actionMeta?.name;
@@ -288,6 +288,7 @@ export const SkillResponseNode = memo(
         {
           resultId: entityId,
           query: title,
+          selectedSkill: skill,
           contextItems: data?.metadata?.contextItems,
         },
         {
@@ -598,7 +599,6 @@ export const SkillResponseNode = memo(
                       content={content || t('canvas.nodePreview.resource.noContentPreview')}
                       sizeMode={sizeMode}
                       isOperating={isOperating}
-                      maxCompactLength={10}
                       sources={sources}
                     />
                   )}

packages/ai-workspace-common/src/hooks/use-subscription-usage.ts

@@ -1,16 +1,19 @@
 import { useGetSubscriptionUsage } from '@refly-packages/ai-workspace-common/queries/queries';
+import { subscriptionEnabled } from '@refly-packages/ai-workspace-common/utils/env';
 
 export const useSubscriptionUsage = () => {
   const {
     data,
     isLoading: isUsageLoading,
     refetch,
   } = useGetSubscriptionUsage({}, [], {
-    refetchOnWindowFocus: false,
-    refetchOnMount: false,
-    refetchOnReconnect: false,
-    staleTime: 60 * 1000, // Consider data fresh for 1 minute
-    gcTime: 60 * 1000, // Cache for 1 minute
+    refetchOnWindowFocus: true,
+    refetchOnMount: true,
+    refetchOnReconnect: true,
+    refetchInterval: 15 * 1000, // Refetch every 15 seconds
+    staleTime: 15 * 1000,
+    gcTime: 15 * 1000,
+    enabled: subscriptionEnabled,
   });
   const { token, storage, fileParsing } = data?.data ?? {};
 

packages/ai-workspace-common/src/utils/env.ts

@@ -4,5 +4,5 @@ export const wsServerOrigin =
   (typeof window !== 'undefined' && window.ENV?.COLLAB_URL) || import.meta.env.VITE_COLLAB_URL;
 
 export const subscriptionEnabled =
-  (typeof window !== 'undefined' && window.ENV?.SUBSCRIPTION_ENABLED) ||
-  import.meta.env.VITE_SUBSCRIPTION_ENABLED;
+  Boolean(typeof window !== 'undefined' && window.ENV?.SUBSCRIPTION_ENABLED) ||
+  Boolean(import.meta.env.VITE_SUBSCRIPTION_ENABLED);