diff --git a/.github/scripts/playwright-matrix.test.mjs b/.github/scripts/playwright-matrix.test.mjs index 346741a6d8..2a5d578ff8 100644 --- a/.github/scripts/playwright-matrix.test.mjs +++ b/.github/scripts/playwright-matrix.test.mjs @@ -100,6 +100,16 @@ test('nightly and default manual runs retain full-suite coverage on both stores' assertPartition(defaults[1], 'redis', 'full', 2); }); +test('PR and nightly matrices preserve both registered-email change modes on one memory shard', () => { + for (const matrix of [prMatrix, ...defaults]) { + const emailLanes = matrix.include.filter((lane) => lane.email_change === 'true'); + assert.equal(emailLanes.length, 1); + assert.equal(emailLanes[0].stream_store, 'memory'); + assert.match(emailLanes[0].shard, /^1\//); + } + assert.equal(shards.steps.filter((step) => step.if === "matrix.email_change == 'true'").length, 2); +}); + test('manual PR coverage opts into the PR fallback matrix without bypassing the PR author gate', () => { assert.deepEqual(workflow.on.workflow_dispatch.inputs.coverage.options, ['full', 'pr']); assert.match( @@ -188,11 +198,12 @@ test('graduated spec skips keep the same pool across shards and remain opt-in', test('the required gate still waits for all shards and rejects failures without fighting cancellation', () => { const gate = workflow.jobs.e2e; assert.equal(gate.name, 'e2e'); - assert.deepEqual(gate.needs, ['codegraph_select', 'e2e_shards', 'mcp_tool_list_changed']); + assert.deepEqual(gate.needs, ['codegraph_select', 'e2e_shards', 'mcp_tool_list_changed', 'mcp_apps']); assert.equal(shards.strategy['fail-fast'], false); assert.match(gate.if, /!cancelled\(\)/); assert.match(shards.if, /!cancelled\(\)/); assert.match(gate.steps[0].if, /needs\.e2e_shards\.result != 'success'/); + assert.match(gate.steps[0].if, /needs\.mcp_apps\.result != 'success'/); assert.match(gate.steps[0].if, /needs\.mcp_tool_list_changed\.result != 'success'/); assert.match(gate.steps[0].if, /needs\.codegraph_select\.outputs\.mcp_run == 'false'/); assert.equal(gate.steps[0].run, 'exit 1'); diff --git a/.github/workflows/playwright-mock.yml b/.github/workflows/playwright-mock.yml index eb28e256ce..ccfeac169a 100644 --- a/.github/workflows/playwright-mock.yml +++ b/.github/workflows/playwright-mock.yml @@ -70,7 +70,7 @@ jobs: HEAD_SHA: ${{ github.event.pull_request.head.sha }} CHANGED: ${{ github.event.pull_request.changed_files }} E2E_SKIP_ARMED: ${{ vars.CODEGRAPH_E2E_SKIP }} - FULL_INCLUDE: '{"include":[{"name":"memory, shard 1/3","stream_store":"memory","redis_image":"","suite":"full","shard":"1/3","artifact":"memory-1-of-3","email_change":"true"},{"name":"memory, shard 2/3","stream_store":"memory","redis_image":"","suite":"full","shard":"2/3","artifact":"memory-2-of-3"},{"name":"memory, shard 3/3","stream_store":"memory","redis_image":"","suite":"full","shard":"3/3","artifact":"memory-3-of-3"},{"name":"redis transport","stream_store":"redis","redis_image":"redis:7-alpine","suite":"transport","shard":"","artifact":"redis-transport"}]}' + FULL_INCLUDE: '{"include":[{"name":"memory, shard 1/6","stream_store":"memory","redis_image":"","suite":"full","shard":"1/6","artifact":"memory-1-of-6","email_change":"true"},{"name":"memory, shard 2/6","stream_store":"memory","redis_image":"","suite":"full","shard":"2/6","artifact":"memory-2-of-6"},{"name":"memory, shard 3/6","stream_store":"memory","redis_image":"","suite":"full","shard":"3/6","artifact":"memory-3-of-6"},{"name":"memory, shard 4/6","stream_store":"memory","redis_image":"","suite":"full","shard":"4/6","artifact":"memory-4-of-6"},{"name":"memory, shard 5/6","stream_store":"memory","redis_image":"","suite":"full","shard":"5/6","artifact":"memory-5-of-6"},{"name":"memory, shard 6/6","stream_store":"memory","redis_image":"","suite":"full","shard":"6/6","artifact":"memory-6-of-6"},{"name":"redis transport, shard 1/2","stream_store":"redis","redis_image":"redis:7-alpine","suite":"transport","shard":"1/2","artifact":"redis-transport-1-of-2"},{"name":"redis transport, shard 2/2","stream_store":"redis","redis_image":"redis:7-alpine","suite":"transport","shard":"2/2","artifact":"redis-transport-2-of-2"}]}' run: | set +e note() { echo "$1" >> "$GITHUB_STEP_SUMMARY"; } @@ -177,8 +177,8 @@ jobs: ${{ (github.event_name == 'pull_request' && needs.codegraph_select.outputs.e2e_include != '' && fromJSON(needs.codegraph_select.outputs.e2e_include)) || - (github.event_name == 'pull_request' && - fromJSON('{"include":[{"name":"memory, shard 1/3","stream_store":"memory","redis_image":"","suite":"full","shard":"1/3","artifact":"memory-1-of-3","email_change":"true"},{"name":"memory, shard 2/3","stream_store":"memory","redis_image":"","suite":"full","shard":"2/3","artifact":"memory-2-of-3"},{"name":"memory, shard 3/3","stream_store":"memory","redis_image":"","suite":"full","shard":"3/3","artifact":"memory-3-of-3"},{"name":"redis transport","stream_store":"redis","redis_image":"redis:7-alpine","suite":"transport","shard":"","artifact":"redis-transport"}]}')) || + ((github.event_name == 'pull_request' || inputs.coverage == 'pr') && + fromJSON('{"include":[{"name":"memory, shard 1/6","stream_store":"memory","redis_image":"","suite":"full","shard":"1/6","artifact":"memory-1-of-6","email_change":"true"},{"name":"memory, shard 2/6","stream_store":"memory","redis_image":"","suite":"full","shard":"2/6","artifact":"memory-2-of-6"},{"name":"memory, shard 3/6","stream_store":"memory","redis_image":"","suite":"full","shard":"3/6","artifact":"memory-3-of-6"},{"name":"memory, shard 4/6","stream_store":"memory","redis_image":"","suite":"full","shard":"4/6","artifact":"memory-4-of-6"},{"name":"memory, shard 5/6","stream_store":"memory","redis_image":"","suite":"full","shard":"5/6","artifact":"memory-5-of-6"},{"name":"memory, shard 6/6","stream_store":"memory","redis_image":"","suite":"full","shard":"6/6","artifact":"memory-6-of-6"},{"name":"redis transport, shard 1/2","stream_store":"redis","redis_image":"redis:7-alpine","suite":"transport","shard":"1/2","artifact":"redis-transport-1-of-2"},{"name":"redis transport, shard 2/2","stream_store":"redis","redis_image":"redis:7-alpine","suite":"transport","shard":"2/2","artifact":"redis-transport-2-of-2"}]}')) || fromJSON('{"include":[{"name":"memory, shard 1/2","stream_store":"memory","redis_image":"","suite":"full","shard":"1/2","artifact":"memory-1-of-2","email_change":"true"},{"name":"memory, shard 2/2","stream_store":"memory","redis_image":"","suite":"full","shard":"2/2","artifact":"memory-2-of-2"},{"name":"redis, shard 1/2","stream_store":"redis","redis_image":"redis:7-alpine","suite":"full","shard":"1/2","artifact":"redis-1-of-2"},{"name":"redis, shard 2/2","stream_store":"redis","redis_image":"redis:7-alpine","suite":"full","shard":"2/2","artifact":"redis-2-of-2"}]}') }} services: @@ -639,7 +639,7 @@ jobs: # run superseded by `cancel-in-progress` has nothing to adjudicate. Under `always()` it was # still dispatched onto a fresh runner while every other job went `cancelled`, then read # `needs.e2e_shards.result == 'cancelled'` and exited 1 — so each superseded push left this - # required check red instead of cancelled. Matches the two lanes it gates. + # required check red instead of cancelled. Matches all three lanes it gates. if: >- !cancelled() && (github.event_name == 'schedule' || diff --git a/api/app/clients/tools/util/handleTools.js b/api/app/clients/tools/util/handleTools.js index a247f71323..0613f4df0d 100644 --- a/api/app/clients/tools/util/handleTools.js +++ b/api/app/clients/tools/util/handleTools.js @@ -666,89 +666,35 @@ const loadTools = async ({ }), }); - for (const [serverName, toolConfigs] of Object.entries(requestedMCPTools)) { - index++; - /** @type {LCAvailableTools} */ - let availableTools = options.mcpAvailableTools?.[serverName]; - for (const config of toolConfigs) { - try { - if (failedMCPServers.has(serverName)) { - continue; - } - const mcpParams = { - mcpPermissionContext, - index, - signal, - user: safeUser, - userMCPAuthMap, - configServers, - requestBody: options.requestBody ?? options.req?.body, - requestScopedConnections, - res: options.res, - upstreamTokenProvider, - mcpApps: admittedMCPAppsPolicy, - upstreamTokenProviderResolver, - oboIdentityContext, - streamId: options.req?._resumableStreamId || null, - jobCreatedAt: options.jobCreatedAt, - model: agent?.model ?? model, - serverName: config.serverName, - provider: agent?.provider ?? endpoint, - config: config.config, - }; - - if (config.type === 'all' && toolConfigs.length === 1) { - /** Handle async loading for single 'all' tool config */ - mcpToolPromises.push( - createMCPTools(mcpParams).catch((error) => { - logger.error(`Error loading ${serverName} tools:`, error); - return null; - }), - ); - continue; - } - if (!availableTools) { - try { - availableTools = await getMCPServerTools( - safeUser.id, - serverName, - config.config, - capabilityProfile, - ); - } catch (error) { - logger.error(`Error fetching available tools for MCP server ${serverName}:`, error); - } - } - - /** Handle synchronous loading */ - const mcpTool = - config.type === 'all' - ? await createMCPTools(mcpParams) - : await createMCPTool({ - ...mcpParams, - availableTools, - toolKey: config.toolKey, - onAvailableTools: (tools) => { - availableTools = tools; - }, - }); - - if (Array.isArray(mcpTool)) { - loadedTools.push(...mcpTool); - } else if (mcpTool) { - loadedTools.push(mcpTool); - } else { - failedMCPServers.add(serverName); - logger.warn( - `MCP tool creation failed for "${config.toolKey}", server may be unavailable or unauthenticated.`, - ); - } - } catch (error) { - logger.error(`Error loading MCP tool for server ${serverName}:`, error); - } - } - } - loadedTools.push(...(await Promise.all(mcpToolPromises)).flatMap((plugin) => plugin || [])); + loadedTools.push( + ...(await loadMCPTools({ + userId: user, + requestedTools: requestedMCPTools, + availableTools: options.mcpAvailableTools, + createTools: createMCPTools, + createTool: createMCPTool, + getAvailableTools: (userId, serverName, config) => + getMCPServerTools(userId, serverName, config, capabilityProfile), + context: { + mcpPermissionContext, + signal, + user: safeUser, + userMCPAuthMap, + mcpApps: admittedMCPAppsPolicy, + configServers, + requestBody: options.requestBody ?? options.req?.body, + requestScopedConnections, + res: options.res, + upstreamTokenProvider, + upstreamTokenProviderResolver, + oboIdentityContext, + streamId: options.req?._resumableStreamId || null, + jobCreatedAt: options.jobCreatedAt, + model: agent?.model ?? model, + provider: agent?.provider ?? endpoint, + }, + })), + ); return { loadedTools, toolContextMap, dynamicToolContextMap, primedCodeFiles }; }; diff --git a/api/server/controllers/agents/v1.js b/api/server/controllers/agents/v1.js index 1e3dd11f14..bfa486c102 100644 --- a/api/server/controllers/agents/v1.js +++ b/api/server/controllers/agents/v1.js @@ -17,10 +17,7 @@ const { replaceEdgeSourceId, mergeDeploymentSkillIds, getAgentListAccess, - isFullAgentListAvatarCacheEntry, getAgentListAvatarRefreshKey, - refreshAgentListAvatarsBeforePage, - refreshManagedAgentListPageAvatars, mergeAgentOcrConversion, sanitizeModelParameters, collectToolResourceFileIds, @@ -1841,16 +1838,6 @@ const getListAgentsHandler = async (req, res) => { return res.json(data); } - const cachedRefresh = await refreshManagedAgentListPageAvatars({ - accessibleIds, - agents, - cachedEntry: cachedRefreshBeforePage, - refreshS3Url, - cacheSet: cache.set.bind(cache), - cacheKey: refreshKey, - ttl: Time.THIRTY_MINUTES, - }); - const accessibleSkillSet = canReturnSkillConfig ? null : new Set(mergeDeploymentSkillIds(accessibleSkillIds).map((oid) => oid.toString())); diff --git a/api/server/controllers/agents/v1.spec.js b/api/server/controllers/agents/v1.spec.js index 80b71d7aa6..73fc387d96 100644 --- a/api/server/controllers/agents/v1.spec.js +++ b/api/server/controllers/agents/v1.spec.js @@ -4204,6 +4204,68 @@ describe('Agent Controllers - Mass Assignment Protection', () => { }); }); + test('refreshes only manager search results without writing or losing later cursor pages', async () => { + const db = require('~/models'); + const name = 'Paged Manager Avatar'; + const firstAgent = await Agent.create({ + id: `agent_${nanoid(12)}`, + name, + provider: 'openai', + model: 'gpt-4', + author: userA, + avatar: { source: FileSources.s3, filepath: 'first.jpg' }, + }); + const secondAgent = await Agent.create({ + id: `agent_${nanoid(12)}`, + name, + provider: 'openai', + model: 'gpt-4', + author: userA, + avatar: { source: FileSources.s3, filepath: 'second.jpg' }, + }); + await db.grantCapability({ + principalType: PrincipalType.ROLE, + principalId: 'LIST_AVATAR_MANAGER', + capability: SystemCapabilities.MANAGE_AGENTS, + }); + const mockReq = { + user: { id: userB.toString(), role: 'LIST_AVATAR_MANAGER', idOnTheSource: null }, + query: { search: name, limit: '1' }, + }; + const mockRes = { status: jest.fn().mockReturnThis(), json: jest.fn().mockReturnThis() }; + const listSpy = jest.spyOn(db, 'getListAgentsByAccess'); + const updateSpy = jest.spyOn(db, 'updateAgent'); + findAccessibleResources.mockResolvedValue([]); + findPubliclyAccessibleResources.mockResolvedValue([]); + refreshS3Url.mockImplementation(async ({ filepath }) => `signed:${filepath}`); + + try { + await getListAgentsHandler(mockReq, mockRes); + const pageOne = mockRes.json.mock.calls[0][0]; + expect(pageOne.data).toHaveLength(1); + expect(pageOne.after).toBeTruthy(); + expect(pageOne.data[0].avatar.filepath).toMatch(/^signed:/); + expect(listSpy).toHaveBeenCalledTimes(1); + expect(refreshS3Url).toHaveBeenCalledTimes(1); + expect(updateSpy).not.toHaveBeenCalled(); + + mockRes.json.mockClear(); + mockReq.query.cursor = pageOne.after; + await getListAgentsHandler(mockReq, mockRes); + const pageTwo = mockRes.json.mock.calls[0][0]; + expect(pageTwo.data).toHaveLength(1); + expect([pageOne.data[0].id, pageTwo.data[0].id].sort()).toEqual( + [firstAgent.id, secondAgent.id].sort(), + ); + expect(pageTwo.data[0].avatar.filepath).toMatch(/^signed:/); + expect(refreshS3Url).toHaveBeenCalledTimes(2); + expect(updateSpy).not.toHaveBeenCalled(); + } finally { + listSpy.mockRestore(); + updateSpy.mockRestore(); + } + }); + test('should skip avatar refresh if cache already covers the page', async () => { /* Coverage is only coverage while it names the filepath it was taken for: a cached URL for a replaced avatar is a link to a file the agent no longer shows. */ @@ -4332,8 +4394,7 @@ describe('Agent Controllers - Mass Assignment Protection', () => { const responseData = mockRes.json.mock.calls[0][0]; const agent = responseData.data.find((a) => a.id === agentId); - /** The refresh runs alongside the list query, so the refreshed path must reach the - * response through `urlCache` rather than through what the list query read. */ + /** The page was read before avatar refresh, so the new path must be applied from the cache. */ expect(agent.avatar.filepath).toBe('new-s3-path.jpg'); }); diff --git a/api/server/routes/config.js b/api/server/routes/config.js index 38bfd4ee7f..6a585bfb2d 100644 --- a/api/server/routes/config.js +++ b/api/server/routes/config.js @@ -15,10 +15,11 @@ const { isFileSnapshotEnabled, getEndpointsDropParamsMap, resolveCodeEnvironmentDecisionVersion, - resolveCodeEnvironmentMoveVersion, isPasskeyEnabled, buildPreLoginInterface, resolveMaxPasskeysPerUser, + resolveCodeEnvironmentMoveCapabilities, + resolveCodeEnvironmentTransitionVersion, loadConversationListLimits, } = require('@librechat/api'); const { @@ -335,8 +336,10 @@ router.get('/', async function (req, res) { appConfig?.mcpAppSandbox?.url, appConfig?.mcpAppSandbox?.maxActiveViews, appConfig?.mcpAppSandbox?.maxActionPreviewChars, + appConfig?.mcpAppSandbox?.operationLimits, ), - ...(codeEnvironmentMoveVersion != null ? { codeEnvironmentMoveVersion } : {}), + ...codeEnvironmentMoveCapabilities, + ...(codeEnvironmentTransitionVersion != null ? { codeEnvironmentTransitionVersion } : {}), ...(cloudFront ? { cloudFront } : {}), ...(rum ? { rum } : {}), fileUploadSseEnabled: isEnabled(process.env.FILE_UPLOAD_SSE_ENABLED), diff --git a/api/server/routes/convos.js b/api/server/routes/convos.js index dd2eb0249d..f901e48dbf 100644 --- a/api/server/routes/convos.js +++ b/api/server/routes/convos.js @@ -159,6 +159,14 @@ const markConvoSeenHandler = createMarkConvoSeenHandler({ markConvoSeen: db.mark const markConvoUnreadHandler = createMarkConvoUnreadHandler({ markConvoUnread: db.markConvoUnread, }); +const backgroundTaskPolicy = createBackgroundTaskPolicyMiddleware({ getAppConfig }); +const backgroundTaskIndexHandler = createBackgroundTaskIndexHandler({ + registry: backgroundTaskRegistry, + pending: pendingBackgroundToolCompletions, +}); +const backgroundTaskCancelHandler = createBackgroundTaskCancelHandler({ + registry: backgroundTaskRegistry, +}); router.use(requireJwtAuth); const isValidProjectFilter = (projectId) => diff --git a/api/server/services/MCP.spec.js b/api/server/services/MCP.spec.js index 622de2c12f..b1fc7814d3 100644 --- a/api/server/services/MCP.spec.js +++ b/api/server/services/MCP.spec.js @@ -1664,6 +1664,44 @@ describe('User parameter passing tests', () => { ).resolves.toBe('ordinary output'); }); + it('records a typed OBO failure against the scheduled generation before returning an error', async () => { + const user = { id: 'scheduled-owner', role: 'USER' }; + const missing = new Error('Unattended provider not configured'); + const error = Object.assign(new Error('MCP tool error'), { cause: missing }); + const receipt = require('~/server/services/Schedules').recordMCPToolAuthFailure; + require('~/models').getRoleByName.mockResolvedValue({ + permissions: { [PermissionTypes.MCP_SERVERS]: { [Permissions.USE]: true } }, + }); + mockGetMCPManager.mockReturnValue({ callTool: jest.fn().mockRejectedValue(error) }); + const tool = await createMCPTool({ + user, + toolKey: `test-tool${D}test-server`, + provider: 'openai', + streamId: 'scheduled-conversation', + jobCreatedAt: 42, + config: { type: 'streamable-http', url: 'https://mcp.example.com' }, + availableTools: { + [`test-tool${D}test-server`]: { + function: { description: 'Test MCP', parameters: { type: 'object', properties: {} } }, + }, + }, + }); + await expect( + tool.func({}, undefined, { + configurable: { user }, + metadata: { provider: 'openai', thread_id: 'scheduled-conversation', run_id: 'run-1' }, + toolCall: {}, + }), + ).rejects.toThrow(); + expect(receipt).toHaveBeenCalledWith({ + error, + streamId: 'scheduled-conversation', + jobCreatedAt: 42, + userId: 'scheduled-owner', + serverName: 'test-server', + }); + }); + it('keeps shared OAuth recovery alive when one tool caller aborts', async () => { const mockUser = { id: 'shared-recovery-user', role: 'USER' }; const mockRes = { write: jest.fn(), flush: jest.fn() }; diff --git a/api/server/services/Tools/mcp.js b/api/server/services/Tools/mcp.js index 35dfeac193..8c721bf158 100644 --- a/api/server/services/Tools/mcp.js +++ b/api/server/services/Tools/mcp.js @@ -10,6 +10,7 @@ const { isMCPInitializationError, prepareMCPAuthorizationMutation, resolveMCPClientCapabilityProfile, + recordScheduledMCPToolAuthFailure, } = require('@librechat/api'); const { CacheKeys, Constants } = require('librechat-data-provider'); const { getMCPManager, getMCPServersRegistry, getFlowStateManager } = require('~/config'); @@ -159,6 +160,8 @@ async function reinitMCPServer({ oauthEnd, recoveryPolicy, mcpApps, + streamId, + jobCreatedAt, }) { const capabilityProfile = resolveMCPClientCapabilityProfile(mcpApps); /** @type {MCPConnection | null} */ diff --git a/client/src/components/Chat/BackgroundTasks/Button.tsx b/client/src/components/Chat/BackgroundTasks/Button.tsx index d6b102a1dc..f304526827 100644 --- a/client/src/components/Chat/BackgroundTasks/Button.tsx +++ b/client/src/components/Chat/BackgroundTasks/Button.tsx @@ -109,7 +109,12 @@ function BackgroundTasksButton({ {(activeCount > 0 || awaitingCount > 0 || failedCount > 0 || incomplete) && (