⚡ fix: Deliver Waiting Completion Wake-ups the Moment They Are Ready (#16339)

* 🐢 fix: Back Off Waiting Completion Wake-ups and Deliver Them When Ready

* fix: Signal every readiness path and make the completion wait cap configurable

* fix: Mark held completion deliveries instead of pipeline expedite, and announce store-won approval expiry

* fix: Scope settle expedites to the resumed conversation and close the remaining signal gaps

* fix: Announce a won approval expiry once and release subagent wake-up registrations

* 🧪 ci: Count System Instructions in Mock Model Usage (#16350)

The e2e fake model reported input tokens for the chat messages alone, because the SDK hands a test override model the pruned messages without the systemRunnable pipe. Once #16301 gave every memory-enabled chat a system prompt, the calibrated context snapshot put used tokens below the instructions and the gauge dropped its Messages row. Count input over the complete prompt, as a real provider bills it.

---------

Co-authored-by: Lia <lia@librechat.ai>
This commit is contained in:
Danny Avila 2026-09-24 22:28:28 -04:00 • committed by GitHub
parent 402c19ce32
commit 7238be3e5e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 1374 additions and 163 deletions

View file

@ -53,6 +53,7 @@ service = createAgentTriggerService({
),
isPrincipalActive: methods.isAgentTriggerPrincipalActive,
supportsDetachedActionCompletion: () => GenerationJobManager.supportsDetachedAgentEventActions,
subscribeGenerationSettled: (listener) => GenerationJobManager.onGenerationSettled(listener),
settleSourceBeforeDeadLetter: queuedTurnLifecycle.settleBeforeDeadLetter,
prepareContinue: createAgentContinuationResolver({
eventActor: eventActorAdapter,
@ -92,6 +93,7 @@ module.exports = {
retireAgentTrigger: service.retire,
renewAgentTriggerProducerLease: service.renewProducerLease,
persistAgentBackgroundToolResult: service.persistBackgroundToolResult,
expediteCompletionWakeups: service.expediteCompletionWakeups,
getAgentBackgroundToolResultClaim: service.getBackgroundToolResultClaim,
releaseAgentBackgroundToolResultClaims: service.releaseBackgroundToolResultClaims,
drainAgentTriggerDeliveriesForUser: service.drainUser,

View file

@ -11,6 +11,7 @@ const {
releaseAgentBackgroundToolResultClaims,
renewAgentTriggerProducerLease,
retireAgentTrigger,
expediteCompletionWakeups,
} = require('../../Agents/triggers');
const preregisterBackgroundToolCompletion = createBackgroundToolCompletionWakeupHandler(
@ -19,6 +20,7 @@ const preregisterBackgroundToolCompletion = createBackgroundToolCompletionWakeup
renewAgentTriggerProducerLease,
(deliveryKey, sourceId, result) =>
persistAgentBackgroundToolResult({ deliveryKey, sourceId, result }),
(deliveryKey) => expediteCompletionWakeups({ deliveryKeys: [deliveryKey] }),
);
function createBackgroundToolResultPersistence({ req, updateToolCallResult }) {

View file

@ -12,7 +12,7 @@ const {
SubagentActivityStream,
} = require('@librechat/api');
const db = require('~/models');
const { enqueueAgentTrigger } = require('../../Agents/triggers');
const { enqueueAgentTrigger, expediteCompletionWakeups } = require('../../Agents/triggers');
const GENERATION_DRAIN_TIMEOUT_MS = 45_000;
const GENERATION_DRAIN_POLL_MS = 100;
@ -78,6 +78,8 @@ const subagentThreadTaskStore = createSubagentThreadTaskStore(
releaseOwnerAdmission: db.releaseSubagentAdmission,
cancelUnroutedTask: cancelUnroutedGeneration,
onTaskPrepared: completionWakeupHandler,
onTaskSettled: (userId, conversationId, taskIds) =>
expediteCompletionWakeups({ user: userId, conversationId, taskIds }),
},
);

View file

@ -45,6 +45,7 @@ jest.mock('~/models', () => ({
jest.mock('../../Agents/triggers', () => ({
enqueueAgentTrigger: jest.fn(),
expediteCompletionWakeups: jest.fn(),
}));
const {
@ -80,6 +81,16 @@ describe('subagent thread Redis lifecycle', () => {
expect(mockCompletionWakeupHandler).toHaveBeenCalledWith({ taskId: 'task-1' });
});
it('expedites only the settled task identities in their parent conversation', () => {
const { expediteCompletionWakeups } = require('../../Agents/triggers');
taskStoreOptions.onTaskSettled('user-1', 'parent-1', ['task-1', 'recovered-task']);
expect(expediteCompletionWakeups).toHaveBeenCalledWith({
user: 'user-1',
conversationId: 'parent-1',
taskIds: ['task-1', 'recovered-task'],
});
});
it('registers local task-store quiescence independently of optional Redis setup', () => {
expect(taskStoreShutdownRegistration).toEqual([
'subagent task store',