mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-11-21 23:43:35 +00:00
🧺 fix: Bound Background Completion Batches (#16102)
* 🧺 fix: Coalesce Durable Background Wakeups
* fix: Bound replayed background result claims
* fix: Harden background result coalescing controls
* fix: Reconcile background result claims
* fix: close background batch ownership races
* fix: Keep completion batching atomic and bound serialized metadata
* refactor: Reuse canonical background claim contracts
* fix: Expose serialized claim budget in the persistence contract
* test: Preserve claimed V1 results across later background batches
This commit is contained in:
parent
8a3ab43965
commit
36efc7b4e2
13 changed files with 305 additions and 50 deletions
|
|
@ -705,7 +705,11 @@ if (cluster.isMaster) {
|
|||
await initializeMCPs();
|
||||
await initializeOAuthReconnectManager();
|
||||
await checkMigrations();
|
||||
await initializeAgentTriggerService({ address: server.address() });
|
||||
await initializeAgentTriggerService({
|
||||
address: server.address(),
|
||||
completionResultBatchSize:
|
||||
baseAppConfig?.endpoints?.agents?.backgroundTasks?.completionResultBatchSize,
|
||||
});
|
||||
} catch (initErr) {
|
||||
logger.error(`Worker ${process.pid} post-listen initialization failed:`, initErr);
|
||||
process.exit(1);
|
||||
|
|
|
|||
|
|
@ -498,7 +498,11 @@ const startServer = async () => {
|
|||
if (inspectFlags || isEnabled(process.env.MEM_DIAG)) {
|
||||
memoryDiagnostics.start();
|
||||
}
|
||||
await initializeAgentTriggerService({ address: server.address() });
|
||||
await initializeAgentTriggerService({
|
||||
address: server.address(),
|
||||
completionResultBatchSize:
|
||||
appConfig?.endpoints?.agents?.backgroundTasks?.completionResultBatchSize,
|
||||
});
|
||||
const scheduleEngineArmed = (await initializeScheduleEngine()) != null;
|
||||
scheduleEngineState = scheduleEngineArmed ? 'armed' : 'unavailable';
|
||||
if (!scheduleEngineArmed) {
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ const subagentCompletionAdapter = createSubagentCompletionWakeupResolver({
|
|||
const backgroundToolCompletionAdapter = createBackgroundToolCompletionWakeupResolver({
|
||||
methods,
|
||||
getGenerationJob: (conversationId) => GenerationJobManager.getJob(conversationId),
|
||||
getResultBatchSize: () => service.getBackgroundCompletionResultBatchSize(),
|
||||
});
|
||||
const eventActorAdapter = createAgentEventContinueResolver({
|
||||
methods,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
const mockCreateAgentTriggerService = jest.fn();
|
||||
const mockCreateBackgroundToolCompletionWakeupResolver = jest.fn(() => jest.fn());
|
||||
const mockGenerationJobManager = {
|
||||
supportsDetachedAgentEventActions: true,
|
||||
getJob: jest.fn(),
|
||||
|
|
@ -21,7 +22,8 @@ jest.mock('@librechat/api', () => ({
|
|||
createAgentTriggerService: (...args) => mockCreateAgentTriggerService(...args),
|
||||
createAgentContinuationResolver: jest.fn(() => jest.fn()),
|
||||
createAgentEventContinueResolver: jest.fn(() => jest.fn()),
|
||||
createBackgroundToolCompletionWakeupResolver: jest.fn(() => jest.fn()),
|
||||
createBackgroundToolCompletionWakeupResolver: (...args) =>
|
||||
mockCreateBackgroundToolCompletionWakeupResolver(...args),
|
||||
createSubagentCompletionWakeupResolver: jest.fn(() => jest.fn()),
|
||||
createAgentQueuedTurnLifecycle: jest.fn(() => mockQueuedTurnLifecycle),
|
||||
BACKGROUND_TOOL_COMPLETION_SOURCE: 'background-tool-completion',
|
||||
|
|
@ -39,8 +41,11 @@ describe('agent trigger service composition', () => {
|
|||
jest.resetModules();
|
||||
jest.clearAllMocks();
|
||||
mockGenerationJobManager.supportsDetachedAgentEventActions = true;
|
||||
let completionResultBatchSize = 8;
|
||||
mockCreateAgentTriggerService.mockReturnValue({
|
||||
initialize: jest.fn(),
|
||||
initialize: jest.fn(async (options) => {
|
||||
completionResultBatchSize = options.completionResultBatchSize ?? 8;
|
||||
}),
|
||||
stop: jest.fn(),
|
||||
dispatch: jest.fn(),
|
||||
enqueue: jest.fn(),
|
||||
|
|
@ -52,6 +57,7 @@ describe('agent trigger service composition', () => {
|
|||
prepareUserPurge: jest.fn(),
|
||||
cancelUserPurge: jest.fn(),
|
||||
purgeUser: jest.fn(),
|
||||
getBackgroundCompletionResultBatchSize: () => completionResultBatchSize,
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -73,4 +79,16 @@ describe('agent trigger service composition', () => {
|
|||
mockGenerationJobManager.supportsDetachedAgentEventActions = false;
|
||||
expect(supportsDetachedActionCompletion()).toBe(false);
|
||||
});
|
||||
|
||||
it('injects the configured background completion batch size', async () => {
|
||||
const { initializeAgentTriggerService } = require('./triggers');
|
||||
await initializeAgentTriggerService({ address: 'local', completionResultBatchSize: 12 });
|
||||
|
||||
const resolverDeps = mockCreateBackgroundToolCompletionWakeupResolver.mock.calls[0][0];
|
||||
expect(resolverDeps.getResultBatchSize()).toBe(12);
|
||||
expect(mockCreateAgentTriggerService.mock.results[0].value.initialize).toHaveBeenCalledWith({
|
||||
address: 'local',
|
||||
completionResultBatchSize: 12,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue