Merge commit '657eeb65' into sandboxed-agent-rebase

Made-with: Cursor

# Conflicts:
#	api/core/agent/cot_chat_agent_runner.py
#	api/core/agent/fc_agent_runner.py
#	api/core/memory/token_buffer_memory.py
#	api/core/variables/segments.py
#	api/core/workflow/file/file_manager.py
#	api/core/workflow/nodes/agent/agent_node.py
#	api/core/workflow/nodes/llm/llm_utils.py
#	api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py
#	api/core/workflow/workflow_entry.py
#	api/factories/variable_factory.py
#	api/pyproject.toml
#	api/services/variable_truncator.py
#	api/uv.lock
#	web/app/components/app/app-publisher/index.tsx
#	web/app/components/app/overview/settings/index.tsx
#	web/app/components/apps/app-card.tsx
#	web/app/components/apps/index.tsx
#	web/app/components/apps/list.tsx
#	web/app/components/base/chat/chat-with-history/header-in-mobile.tsx
#	web/app/components/base/features/new-feature-panel/conversation-opener/modal.tsx
#	web/app/components/base/features/new-feature-panel/file-upload/setting-content.tsx
#	web/app/components/base/features/new-feature-panel/moderation/moderation-setting-modal.tsx
#	web/app/components/base/features/new-feature-panel/text-to-speech/param-config-content.tsx
#	web/app/components/base/message-log-modal/index.tsx
#	web/app/components/base/switch/index.tsx
#	web/app/components/base/tab-slider-plain/index.tsx
#	web/app/components/explore/try-app/app-info/index.tsx
#	web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.tsx
#	web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/required-switch.tsx
#	web/app/components/workflow/nodes/llm/panel.tsx
#	web/contract/router.ts
#	web/eslint-suppressions.json
#	web/i18n/fa-IR/workflow.json

web/__tests__/apps/app-card-operations-flow.test.tsx

@@ -278,7 +278,10 @@ describe('App Card Operations Flow', () => {
     }
   })
 
-  // -- Basic rendering --
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
   describe('Card Rendering', () => {
     it('should render app name and description', () => {
       renderAppCard({ name: 'My AI Bot', description: 'An intelligent assistant' })

web/__tests__/apps/app-list-browsing-flow.test.tsx

@@ -188,7 +188,10 @@ describe('App List Browsing Flow', () => {
     mockShowTagManagementModal = false
   })
 
-  // -- Loading and Empty states --
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
   describe('Loading and Empty States', () => {
     it('should show skeleton cards during initial loading', () => {
       mockIsLoading = true
@@ -388,13 +391,13 @@ describe('App List Browsing Flow', () => {
     })
   })
 
-  // -- Dataset operator redirect --
-  describe('Dataset Operator Redirect', () => {
-    it('should redirect dataset operators to /datasets', () => {
+  // -- Dataset operator behavior --
+  describe('Dataset Operator Behavior', () => {
+    it('should not redirect at list component level for dataset operators', () => {
       mockIsCurrentWorkspaceDatasetOperator = true
       renderList()
 
-      expect(mockRouterReplace).toHaveBeenCalledWith('/datasets')
+      expect(mockRouterReplace).not.toHaveBeenCalled()
     })
   })
 

web/__tests__/apps/create-app-flow.test.tsx

@@ -238,7 +238,6 @@ describe('Create App Flow', () => {
     mockShowTagManagementModal = false
   })
 
-  // -- NewAppCard rendering --
   describe('NewAppCard Rendering', () => {
     it('should render the "Create App" card with all options', () => {
       renderList()

web/__tests__/check-i18n.test.ts

@@ -588,7 +588,7 @@ export default translation
           const trimmedKeyLine = keyLine.trim()
 
           // If key line ends with ":" (not complete value), it's likely multiline
-          if (trimmedKeyLine.endsWith(':') && !trimmedKeyLine.includes('{') && !trimmedKeyLine.match(/:\s*['"`]/)) {
+          if (trimmedKeyLine.endsWith(':') && !trimmedKeyLine.includes('{') && !/:\s*['"`]/.exec(trimmedKeyLine)) {
             // Find the value lines that belong to this key
             let currentLine = targetLineIndex + 1
             let foundValue = false
@@ -604,7 +604,7 @@ export default translation
               }
 
               // Check if this line starts a new key (indicates end of current value)
-              if (trimmed.match(/^\w+\s*:/))
+              if (/^\w+\s*:/.exec(trimmed))
                 break
 
               // Check if this line is part of the value

web/__tests__/develop/develop-page-flow.test.tsx

@@ -12,7 +12,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import DevelopMain from '@/app/components/develop'
 import { AppModeEnum, Theme } from '@/types/app'
 
-// ---------- fake timers ----------
 beforeEach(() => {
   vi.useFakeTimers({ shouldAdvanceTime: true })
 })
@@ -28,8 +27,6 @@ async function flushUI() {
   })
 }
 
-// ---------- store mock ----------
-
 let storeAppDetail: unknown
 
 vi.mock('@/app/components/app/store', () => ({
@@ -38,8 +35,6 @@ vi.mock('@/app/components/app/store', () => ({
   },
 }))
 
-// ---------- Doc dependencies ----------
-
 vi.mock('@/context/i18n', () => ({
   useLocale: () => 'en-US',
 }))
@@ -48,11 +43,12 @@ vi.mock('@/hooks/use-theme', () => ({
   default: () => ({ theme: Theme.light }),
 }))
 
-vi.mock('@/i18n-config/language', () => ({
-  LanguagesSupported: ['en-US', 'zh-Hans', 'zh-Hant', 'pt-BR', 'es-ES', 'fr-FR', 'de-DE', 'ja-JP'],
-}))
-
-// ---------- SecretKeyModal dependencies ----------
+vi.mock('@/i18n-config/language', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/i18n-config/language')>()
+  return {
+    ...actual,
+  }
+})
 
 vi.mock('@/context/app-context', () => ({
   useAppContext: () => ({

web/__tests__/explore/explore-app-list-flow.test.tsx

@@ -9,8 +9,9 @@ import type { CreateAppModalProps } from '@/app/components/explore/create-app-mo
 import type { App } from '@/models/explore'
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import AppList from '@/app/components/explore/app-list'
-import ExploreContext from '@/context/explore-context'
+import { useAppContext } from '@/context/app-context'
 import { fetchAppDetail } from '@/service/explore'
+import { useMembers } from '@/service/use-common'
 import { AppModeEnum } from '@/types/app'
 
 const allCategoriesEn = 'explore.apps.allCategories:{"lng":"en"}'
@@ -57,6 +58,14 @@ vi.mock('@/service/explore', () => ({
   fetchAppList: vi.fn(),
 }))
 
+vi.mock('@/context/app-context', () => ({
+  useAppContext: vi.fn(),
+}))
+
+vi.mock('@/service/use-common', () => ({
+  useMembers: vi.fn(),
+}))
+
 vi.mock('@/hooks/use-import-dsl', () => ({
   useImportDSL: () => ({
     handleImportDSL: mockHandleImportDSL,
@@ -126,26 +135,25 @@ const createApp = (overrides: Partial<App> = {}): App => ({
   is_agent: overrides.is_agent ?? false,
 })
 
-const createContextValue = (hasEditPermission = true) => ({
-  controlUpdateInstalledApps: 0,
-  setControlUpdateInstalledApps: vi.fn(),
-  hasEditPermission,
-  installedApps: [] as never[],
-  setInstalledApps: vi.fn(),
-  isFetchingInstalledApps: false,
-  setIsFetchingInstalledApps: vi.fn(),
-  isShowTryAppPanel: false,
-  setShowTryAppPanel: vi.fn(),
-})
+const mockMemberRole = (hasEditPermission: boolean) => {
+  ;(useAppContext as Mock).mockReturnValue({
+    userProfile: { id: 'user-1' },
+  })
+  ;(useMembers as Mock).mockReturnValue({
+    data: {
+      accounts: [{ id: 'user-1', role: hasEditPermission ? 'admin' : 'normal' }],
+    },
+  })
+}
 
-const wrapWithContext = (hasEditPermission = true, onSuccess?: () => void) => (
-  <ExploreContext.Provider value={createContextValue(hasEditPermission)}>
-    <AppList onSuccess={onSuccess} />
-  </ExploreContext.Provider>
-)
+const renderAppList = (hasEditPermission = true, onSuccess?: () => void) => {
+  mockMemberRole(hasEditPermission)
+  return render(<AppList onSuccess={onSuccess} />)
+}
 
-const renderWithContext = (hasEditPermission = true, onSuccess?: () => void) => {
-  return render(wrapWithContext(hasEditPermission, onSuccess))
+const appListElement = (hasEditPermission = true, onSuccess?: () => void) => {
+  mockMemberRole(hasEditPermission)
+  return <AppList onSuccess={onSuccess} />
 }
 
 describe('Explore App List Flow', () => {
@@ -165,7 +173,7 @@ describe('Explore App List Flow', () => {
 
   describe('Browse and Filter Flow', () => {
     it('should display all apps when no category filter is applied', () => {
-      renderWithContext()
+      renderAppList()
 
       expect(screen.getByText('Writer Bot')).toBeInTheDocument()
       expect(screen.getByText('Translator')).toBeInTheDocument()
@@ -174,7 +182,7 @@ describe('Explore App List Flow', () => {
 
     it('should filter apps by selected category', () => {
       mockTabValue = 'Writing'
-      renderWithContext()
+      renderAppList()
 
       expect(screen.getByText('Writer Bot')).toBeInTheDocument()
       expect(screen.queryByText('Translator')).not.toBeInTheDocument()
@@ -182,7 +190,7 @@ describe('Explore App List Flow', () => {
     })
 
     it('should filter apps by search keyword', async () => {
-      renderWithContext()
+      renderAppList()
 
       const input = screen.getByPlaceholderText('common.operation.search')
       fireEvent.change(input, { target: { value: 'trans' } })
@@ -207,7 +215,7 @@ describe('Explore App List Flow', () => {
         options.onSuccess?.()
       })
 
-      renderWithContext(true, onSuccess)
+      renderAppList(true, onSuccess)
 
       // Step 2: Click add to workspace button - opens create modal
       fireEvent.click(screen.getAllByText('explore.appCard.addToWorkspace')[0])
@@ -240,7 +248,7 @@ describe('Explore App List Flow', () => {
       // Step 1: Loading state
       mockIsLoading = true
       mockExploreData = undefined
-      const { rerender } = render(wrapWithContext())
+      const { unmount } = render(appListElement())
 
       expect(screen.getByRole('status')).toBeInTheDocument()
 
@@ -250,7 +258,8 @@ describe('Explore App List Flow', () => {
         categories: ['Writing'],
         allList: [createApp()],
       }
-      rerender(wrapWithContext())
+      unmount()
+      renderAppList()
 
       expect(screen.queryByRole('status')).not.toBeInTheDocument()
       expect(screen.getByText('Alpha')).toBeInTheDocument()
@@ -259,13 +268,13 @@ describe('Explore App List Flow', () => {
 
   describe('Permission-Based Behavior', () => {
     it('should hide add-to-workspace button when user has no edit permission', () => {
-      renderWithContext(false)
+      renderAppList(false)
 
       expect(screen.queryByText('explore.appCard.addToWorkspace')).not.toBeInTheDocument()
     })
 
     it('should show add-to-workspace button when user has edit permission', () => {
-      renderWithContext(true)
+      renderAppList(true)
 
       expect(screen.getAllByText('explore.appCard.addToWorkspace').length).toBeGreaterThan(0)
     })

web/__tests__/explore/installed-app-flow.test.tsx

@@ -8,20 +8,13 @@
 import type { Mock } from 'vitest'
 import type { InstalledApp as InstalledAppModel } from '@/models/explore'
 import { render, screen, waitFor } from '@testing-library/react'
-import { useContext } from 'use-context-selector'
 import InstalledApp from '@/app/components/explore/installed-app'
 import { useWebAppStore } from '@/context/web-app-context'
 import { AccessMode } from '@/models/access-control'
 import { useGetUserCanAccessApp } from '@/service/access-control'
-import { useGetInstalledAppAccessModeByAppId, useGetInstalledAppMeta, useGetInstalledAppParams } from '@/service/use-explore'
+import { useGetInstalledAppAccessModeByAppId, useGetInstalledAppMeta, useGetInstalledAppParams, useGetInstalledApps } from '@/service/use-explore'
 import { AppModeEnum } from '@/types/app'
 
-// Mock external dependencies
-vi.mock('use-context-selector', () => ({
-  useContext: vi.fn(),
-  createContext: vi.fn(() => ({})),
-}))
-
 vi.mock('@/context/web-app-context', () => ({
   useWebAppStore: vi.fn(),
 }))
@@ -34,6 +27,7 @@ vi.mock('@/service/use-explore', () => ({
   useGetInstalledAppAccessModeByAppId: vi.fn(),
   useGetInstalledAppParams: vi.fn(),
   useGetInstalledAppMeta: vi.fn(),
+  useGetInstalledApps: vi.fn(),
 }))
 
 vi.mock('@/app/components/share/text-generation', () => ({
@@ -86,18 +80,21 @@ describe('Installed App Flow', () => {
   }
 
   type MockOverrides = {
-    context?: { installedApps?: InstalledAppModel[], isFetchingInstalledApps?: boolean }
-    accessMode?: { isFetching?: boolean, data?: unknown, error?: unknown }
-    params?: { isFetching?: boolean, data?: unknown, error?: unknown }
-    meta?: { isFetching?: boolean, data?: unknown, error?: unknown }
+    installedApps?: { apps?: InstalledAppModel[], isPending?: boolean, isFetching?: boolean }
+    accessMode?: { isPending?: boolean, data?: unknown, error?: unknown }
+    params?: { isPending?: boolean, data?: unknown, error?: unknown }
+    meta?: { isPending?: boolean, data?: unknown, error?: unknown }
     userAccess?: { data?: unknown, error?: unknown }
   }
 
   const setupDefaultMocks = (app?: InstalledAppModel, overrides: MockOverrides = {}) => {
-    ;(useContext as Mock).mockReturnValue({
-      installedApps: app ? [app] : [],
-      isFetchingInstalledApps: false,
-      ...overrides.context,
+    const installedApps = overrides.installedApps?.apps ?? (app ? [app] : [])
+
+    ;(useGetInstalledApps as Mock).mockReturnValue({
+      data: { installed_apps: installedApps },
+      isPending: false,
+      isFetching: false,
+      ...overrides.installedApps,
     })
 
     ;(useWebAppStore as unknown as Mock).mockImplementation((selector: (state: Record<string, Mock>) => unknown) => {
@@ -111,21 +108,21 @@ describe('Installed App Flow', () => {
     })
 
     ;(useGetInstalledAppAccessModeByAppId as Mock).mockReturnValue({
-      isFetching: false,
+      isPending: false,
       data: { accessMode: AccessMode.PUBLIC },
       error: null,
       ...overrides.accessMode,
     })
 
     ;(useGetInstalledAppParams as Mock).mockReturnValue({
-      isFetching: false,
+      isPending: false,
       data: mockAppParams,
       error: null,
       ...overrides.params,
     })
 
     ;(useGetInstalledAppMeta as Mock).mockReturnValue({
-      isFetching: false,
+      isPending: false,
       data: { tool_icons: {} },
       error: null,
       ...overrides.meta,
@@ -182,7 +179,7 @@ describe('Installed App Flow', () => {
   describe('Data Loading Flow', () => {
     it('should show loading spinner when params are being fetched', () => {
       const app = createInstalledApp()
-      setupDefaultMocks(app, { params: { isFetching: true, data: null } })
+      setupDefaultMocks(app, { params: { isPending: true, data: null } })
 
       const { container } = render(<InstalledApp id="installed-app-1" />)
 
@@ -190,6 +187,17 @@ describe('Installed App Flow', () => {
       expect(screen.queryByTestId('chat-with-history')).not.toBeInTheDocument()
     })
 
+    it('should defer 404 while installed apps are refetching without a match', () => {
+      setupDefaultMocks(undefined, {
+        installedApps: { apps: [], isPending: false, isFetching: true },
+      })
+
+      const { container } = render(<InstalledApp id="nonexistent" />)
+
+      expect(container.querySelector('svg.spin-animation')).toBeInTheDocument()
+      expect(screen.queryByText(/404/)).not.toBeInTheDocument()
+    })
+
     it('should render content when all data is available', () => {
       const app = createInstalledApp()
       setupDefaultMocks(app)

web/__tests__/explore/sidebar-lifecycle-flow.test.tsx

@@ -1,4 +1,3 @@
-import type { IExplore } from '@/context/explore-context'
 /**
  * Integration test: Sidebar Lifecycle Flow
  *
@@ -10,14 +9,12 @@ import type { InstalledApp } from '@/models/explore'
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import Toast from '@/app/components/base/toast'
 import SideBar from '@/app/components/explore/sidebar'
-import ExploreContext from '@/context/explore-context'
 import { MediaType } from '@/hooks/use-breakpoints'
 import { AppModeEnum } from '@/types/app'
 
 let mockMediaType: string = MediaType.pc
 const mockSegments = ['apps']
 const mockPush = vi.fn()
-const mockRefetch = vi.fn()
 const mockUninstall = vi.fn()
 const mockUpdatePinStatus = vi.fn()
 let mockInstalledApps: InstalledApp[] = []
@@ -40,9 +37,8 @@ vi.mock('@/hooks/use-breakpoints', () => ({
 
 vi.mock('@/service/use-explore', () => ({
   useGetInstalledApps: () => ({
-    isFetching: false,
+    isPending: false,
     data: { installed_apps: mockInstalledApps },
-    refetch: mockRefetch,
   }),
   useUninstallApp: () => ({
     mutateAsync: mockUninstall,
@@ -69,24 +65,8 @@ const createInstalledApp = (overrides: Partial<InstalledApp> = {}): InstalledApp
   },
 })
 
-const createContextValue = (installedApps: InstalledApp[] = []): IExplore => ({
-  controlUpdateInstalledApps: 0,
-  setControlUpdateInstalledApps: vi.fn(),
-  hasEditPermission: true,
-  installedApps,
-  setInstalledApps: vi.fn(),
-  isFetchingInstalledApps: false,
-  setIsFetchingInstalledApps: vi.fn(),
-  isShowTryAppPanel: false,
-  setShowTryAppPanel: vi.fn(),
-})
-
-const renderSidebar = (installedApps: InstalledApp[] = []) => {
-  return render(
-    <ExploreContext.Provider value={createContextValue(installedApps)}>
-      <SideBar controlUpdateInstalledApps={0} />
-    </ExploreContext.Provider>,
-  )
+const renderSidebar = () => {
+  return render(<SideBar />)
 }
 
 describe('Sidebar Lifecycle Flow', () => {
@@ -104,7 +84,7 @@ describe('Sidebar Lifecycle Flow', () => {
       // Step 1: Start with an unpinned app and pin it
       const unpinnedApp = createInstalledApp({ is_pinned: false })
       mockInstalledApps = [unpinnedApp]
-      const { unmount } = renderSidebar(mockInstalledApps)
+      const { unmount } = renderSidebar()
 
       fireEvent.click(screen.getByTestId('item-operation-trigger'))
       fireEvent.click(await screen.findByText('explore.sidebar.action.pin'))
@@ -123,7 +103,7 @@ describe('Sidebar Lifecycle Flow', () => {
 
       const pinnedApp = createInstalledApp({ is_pinned: true })
       mockInstalledApps = [pinnedApp]
-      renderSidebar(mockInstalledApps)
+      renderSidebar()
 
       fireEvent.click(screen.getByTestId('item-operation-trigger'))
       fireEvent.click(await screen.findByText('explore.sidebar.action.unpin'))
@@ -141,7 +121,7 @@ describe('Sidebar Lifecycle Flow', () => {
       mockInstalledApps = [app]
       mockUninstall.mockResolvedValue(undefined)
 
-      renderSidebar(mockInstalledApps)
+      renderSidebar()
 
       // Step 1: Open operation menu and click delete
       fireEvent.click(screen.getByTestId('item-operation-trigger'))
@@ -167,7 +147,7 @@ describe('Sidebar Lifecycle Flow', () => {
       const app = createInstalledApp()
       mockInstalledApps = [app]
 
-      renderSidebar(mockInstalledApps)
+      renderSidebar()
 
       // Open delete flow
       fireEvent.click(screen.getByTestId('item-operation-trigger'))
@@ -188,7 +168,7 @@ describe('Sidebar Lifecycle Flow', () => {
         createInstalledApp({ id: 'unpinned-1', is_pinned: false, app: { ...createInstalledApp().app, name: 'Regular App' } }),
       ]
 
-      const { container } = renderSidebar(mockInstalledApps)
+      const { container } = renderSidebar()
 
       // Both apps are rendered
       const pinnedApp = screen.getByText('Pinned App')
@@ -210,14 +190,14 @@ describe('Sidebar Lifecycle Flow', () => {
   describe('Empty State', () => {
     it('should show NoApps component when no apps are installed on desktop', () => {
       mockMediaType = MediaType.pc
-      renderSidebar([])
+      renderSidebar()
 
       expect(screen.getByText('explore.sidebar.noApps.title')).toBeInTheDocument()
     })
 
     it('should hide NoApps on mobile', () => {
       mockMediaType = MediaType.mobile
-      renderSidebar([])
+      renderSidebar()
 
       expect(screen.queryByText('explore.sidebar.noApps.title')).not.toBeInTheDocument()
     })