Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.
Python agent-contextagent-memoryagent-pluginsagentic-ragcontext-databasedsh-pluginknowledge-basememorymemory-managementself-evolvingvector-database
fix(studio): align pending labels and cover task page status / 统一等待文案并补齐任务页回归 (#4856)
chenyu00e5e79da8ca
diff --git a/web-studio/src/routes/tasks/-lib/task-list.test.ts b/web-studio/src/routes/tasks/-lib/task-list.test.tsindex 5ca9af663..c0e67008e 100644--- a/web-studio/src/routes/tasks/-lib/task-list.test.ts+++ b/web-studio/src/routes/tasks/-lib/task-list.test.ts@@ -1,6 +1,6 @@import { beforeEach, describe, expect, it, vi } from 'vitest'-import { fetchTasks, getEffectiveTaskStatus, MAX_TASKS } from './task-list'+import { fetchTasks, MAX_TASKS } from './task-list'const clientMocks = vi.hoisted(() => ({getTasks: vi.fn(),@@ -51,39 +51,43 @@ describe('task list requests', () => {})})- it('sends status to the API before the result limit is applied', async () => {- clientMocks.getTasks.mockResolvedValue([- {- created_at: 1,- status: 'failed',- task_id: 'old-failed',- },- ])+ it('finds matching tasks before the server applies its result limit', async () => {+ const failedTask = {+ task_id: 'old-failure',+ task_type: 'session_commit',+ status: 'failed',+ created_at: 1,+ }+ const records = [+ ...Array.from({ length: MAX_TASKS }, (_, index) => ({+ task_id: `completed-${index}`,+ task_type: 'session_commit',+ status: 'completed',+ created_at: MAX_TASKS + 1 - index,+ })),+ failedTask,+ ]+ clientMocks.getTasks.mockImplementation(({ query }) =>+ records+ .filter((task) => !query.status || task.status === query.status)+ .filter(+ (task) => !query.task_type || task.task_type === query.task_type,+ )+ .slice(0, query.limit),+ )await expect(fetchTasks('session_commit', 'failed')).resolves.toEqual([- expect.objectContaining({ task_id: 'old-failed' }),+ failedTask,])expect(clientMocks.getTasks).toHaveBeenCalledWith({query: {limit: MAX_TASKS,- status: 'failed',task_type: 'session_commit',+ status: 'failed',},})})- it('does not reclassify surplus running tasks as pending', () => {- const tasks = Array.from({ length: 12 }, (_, index) => ({- created_at: index + 1,- status: 'running' as const,- task_id: `task-${index + 1}`,- }))-- expect(tasks.map((task) => getEffectiveTaskStatus(task, tasks))).toEqual(- Array.from({ length: 12 }, () => 'running'),- )- })-it('propagates request failures to the query error state', async () => {clientMocks.getTasks.mockRejectedValue(new Error('request failed'))diff --git a/web-studio/src/routes/tasks/-lib/task-list.ts b/web-studio/src/routes/tasks/-lib/task-list.tsindex 19488be19..58e3dd183 100644--- a/web-studio/src/routes/tasks/-lib/task-list.ts+++ b/web-studio/src/routes/tasks/-lib/task-list.ts@@ -1,8 +1,5 @@import { getOvResult, getTasks } from '#/lib/ov-client'-import {- normalizeTasks,- normalizeTaskStatus,-} from '#/routes/tasks/-lib/task-record'+import { normalizeTasks } from '#/routes/tasks/-lib/task-record'import type { TaskRecord, TaskStatus } from '#/routes/tasks/-lib/task-record'export type TaskStatusFilter = Exclude<TaskStatus, 'unknown'> | 'all'@@ -20,14 +17,6 @@ export type TaskTypeFilter =export const MAX_TASKS = 200-/** Prefer the API status; do not invent pending from a running-slot cap. */-export function getEffectiveTaskStatus(- taskItem: TaskRecord,- _list?: TaskRecord[],-): TaskStatus {- return normalizeTaskStatus(taskItem.status)-}-export async function fetchTasks(taskType: TaskTypeFilter,status: TaskStatusFilter,diff --git a/web-studio/src/routes/tasks/route.test.tsx b/web-studio/src/routes/tasks/route.test.tsxnew file mode 100644index 000000000..a0899491d--- /dev/null+++ b/web-studio/src/routes/tasks/route.test.tsx@@ -0,0 +1,195 @@+// @vitest-environment jsdom++import * as React from 'react'+import { createInstance } from 'i18next'+import { I18nextProvider } from 'react-i18next'+import type { ComponentType } from 'react'+import en from '#/i18n/locales/en/workspace'+import zh from '#/i18n/locales/zh-CN/workspace'+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'+import { cleanup, render, screen, within } from '@testing-library/react'+import userEvent from '@testing-library/user-event'+import {+ afterEach,+ beforeAll,+ beforeEach,+ describe,+ expect,+ it,+ vi,+} from 'vitest'++import { Route } from './route'+import type { TaskRecord } from './-lib/task-record'++const clientMocks = vi.hoisted(() => ({ getTasks: vi.fn() }))++vi.mock('#/lib/ov-client', () => ({+ getOvResult: async (value: unknown) => value,+ getTasks: clientMocks.getTasks,+ ovClient: { instance: { post: vi.fn() } },+}))++vi.mock('#/gen/ov-client', () => ({ postResources: vi.fn() }))+vi.mock('#/lib/sessions/api', () => ({ commitSession: vi.fn() }))+vi.mock('#/hooks/use-app-connection', () => ({+ useAppConnection: () => ({ identityScopeKey: 'test/test' }),+}))+vi.mock('#/routes/monitoring/-components/queue-status-card', () => ({+ QueueStatusCard: () => null,+}))+vi.mock('#/routes/tasks/-components/task-detail-sheet', () => ({+ TaskDetailSheet: () => null,+}))++const TaskPage = Route.options.component as ComponentType & {+ preload?: () => Promise<void>+}+beforeAll(async () => {+ await TaskPage.preload?.()+})++let records: TaskRecord[]+const queryClients: QueryClient[] = []++function runningTasks(count: number): TaskRecord[] {+ return Array.from({ length: count }, (_, index) => ({+ task_id: `task-${index + 1}`,+ task_type: index < 8 ? 'session_commit' : 'add_resource',+ resource_id: `resource-${index + 1}`,+ status: 'running',+ created_at: 100 + index,+ }))+}++async function renderPage(lng = 'en') {+ const i18n = createInstance()+ await i18n.init({+ lng,+ resources: { en, 'zh-CN': zh },+ interpolation: { escapeValue: false },+ })+ const queryClient = new QueryClient({+ defaultOptions: { queries: { retry: false } },+ })+ queryClients.push(queryClient)+ render(+ <QueryClientProvider client={queryClient}>+ <I18nextProvider i18n={i18n}>+ <TaskPage />+ </I18nextProvider>+ </QueryClientProvider>,+ )+ return userEvent.setup()+}++function taskRows() {+ return screen.queryAllByRole('row', {+ name: /^(View details for task |查看任务 )/,+ })+}++function expectRunningRows(count: number) {+ expect(taskRows()).toHaveLength(count)+ for (const row of taskRows()) {+ expect(within(row).getByText('Running')).toBeDefined()+ }+}++beforeEach(() => {+ records = runningTasks(12)+ clientMocks.getTasks.mockReset()+ // Model the API contract: filtering precedes ordering and the result limit.+ clientMocks.getTasks.mockImplementation(({ query }) =>+ records+ .filter((task) => !query.status || task.status === query.status)+ .filter((task) => !query.task_type || task.task_type === query.task_type)+ .sort((left, right) => Number(right.created_at) - Number(left.created_at))+ .slice(0, query.limit),+ )+})++afterEach(() => {+ cleanup()+ for (const client of queryClients.splice(0)) client.clear()+})++describe('task status presentation', () => {+ it('keeps all twelve running tasks running in both rows and the count', async () => {+ await renderPage()+ await screen.findByRole('row', { name: 'View details for task task-12' })++ expectRunningRows(12)+ expect(screen.getByText('12 / 0')).toBeDefined()+ })++ it('shows no pending tasks when all tasks are running, including after type filtering', async () => {+ const user = await renderPage()+ await screen.findByRole('row', { name: 'View details for task task-12' })++ await user.click(screen.getByRole('combobox', { name: 'Task status' }))+ await user.click(await screen.findByRole('option', { name: 'Pending' }))+ await screen.findByText('No matching tasks')+ expect(taskRows()).toHaveLength(0)+ expect(screen.getByText('0 / 0')).toBeDefined()++ await user.click(screen.getByRole('button', { name: 'Clear filters' }))+ await screen.findByRole('row', { name: 'View details for task task-12' })+ await user.click(screen.getByRole('combobox', { name: 'Task type' }))+ await user.click(+ await screen.findByRole('option', { name: 'Resource processing' }),+ )+ await screen.findByText('4 / 0')+ expectRunningRows(4)+ })++ it.each([+ ['en', 'Pending', 'Task status'],+ ['zh-CN', '等待中', '任务状态'],+ ])(+ 'renders and filters actual pending tasks in %s',+ async (lng, pendingLabel, filterLabel) => {+ records.push(+ ...[1, 2].map((index) => ({+ task_id: `pending-${index}`,+ task_type: 'add_resource',+ resource_id: `pending-resource-${index}`,+ status: 'pending',+ created_at: 200 + index,+ })),+ )+ const user = await renderPage(lng)+ await screen.findByRole('row', { name: /pending-2/ })+ expect(screen.getByText('12 / 2')).toBeDefined()++ await user.click(screen.getByRole('combobox', { name: filterLabel }))+ await user.click(+ await screen.findByRole('option', { name: pendingLabel }),+ )+ await screen.findByText('0 / 2')+ expect(taskRows()).toHaveLength(2)+ for (const row of taskRows()) {+ expect(within(row).getByText(pendingLabel)).toBeDefined()+ }+ },+ )++ it('preserves task statuses when grouping and pagination change the visible rows', async () => {+ records = runningTasks(26)+ records[25].resource_id = records[0].resource_id+ const user = await renderPage()+ await screen.findByRole('row', { name: 'View details for task task-26' })+ expectRunningRows(20)+ expect(screen.getByText('25 / 0')).toBeDefined()++ await user.click(+ screen.getByRole('button', { name: 'Latest per Resource' }),+ )+ expect(screen.getByText('26 / 0')).toBeDefined()+ expectRunningRows(20)++ await user.click(screen.getByRole('button', { name: 'Go to next page' }))+ expectRunningRows(6)+ expect(screen.getByText('26 / 0')).toBeDefined()+ })+})diff --git a/web-studio/src/routes/tasks/route.tsx b/web-studio/src/routes/tasks/route.tsxindex d0a523753..fc1402150 100644--- a/web-studio/src/routes/tasks/route.tsx+++ b/web-studio/src/routes/tasks/route.tsx@@ -295,11 +295,7 @@ function TasksRoute() {: 'size-3.5'}/>- <span>- {status === 'pending'- ? (i18n.language.startsWith('zh') ? '队首等待中' : 'Queued')- : t(`status.${status}`)}- </span>+ <span>{t(`status.${status}`)}</span>{status === 'running' && (<span className="font-mono font-semibold ml-0.5">{pct}%