From e548cd6b0ee387203abb0f559b66fba7440d5e27 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 7 Apr 2026 21:58:53 +0000 Subject: [PATCH] tidy triggers --- packages/core/src/context/sidecar/orchestrator.test.ts | 4 ++-- packages/core/src/context/sidecar/orchestrator.ts | 4 ++-- packages/core/src/context/sidecar/profiles.ts | 4 ++-- packages/core/src/context/sidecar/schema.ts | 2 +- packages/core/src/context/sidecar/types.ts | 5 ++--- .../core/src/context/system-tests/lifecycle.golden.test.ts | 6 +++--- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/packages/core/src/context/sidecar/orchestrator.test.ts b/packages/core/src/context/sidecar/orchestrator.test.ts index d0fb1acffb..f5d6a2ab27 100644 --- a/packages/core/src/context/sidecar/orchestrator.test.ts +++ b/packages/core/src/context/sidecar/orchestrator.test.ts @@ -262,12 +262,12 @@ describe('PipelineOrchestrator (Component)', () => { expect(result).toStrictEqual(episodes); }); - it('automatically binds to budget_exceeded trigger via EventBus', () => { + it('automatically binds to retained_exceeded trigger via EventBus', () => { const config = createConfig([ { name: 'PressureRelief', execution: 'background', - triggers: ['budget_exceeded'], + triggers: ['retained_exceeded'], processors: [ { processorId: 'DummyAsyncProcessor' } as unknown as ProcessorConfig, ], diff --git a/packages/core/src/context/sidecar/orchestrator.ts b/packages/core/src/context/sidecar/orchestrator.ts index 3241952329..7cae3b88e6 100644 --- a/packages/core/src/context/sidecar/orchestrator.ts +++ b/packages/core/src/context/sidecar/orchestrator.ts @@ -70,7 +70,7 @@ export class PipelineOrchestrator { // If needed, we will pass it via event bus. }, trigger.intervalMs); this.activeTimers.push(timer); - } else if (trigger === 'budget_exceeded') { + } else if (trigger === 'retained_exceeded') { this.eventBus.onConsolidationNeeded((event) => { const state: ContextAccountingState = { currentTokens: 0, @@ -83,7 +83,7 @@ export class PipelineOrchestrator { }; void this.executePipelineAsync(pipeline, event.episodes, state); }); - } else if (trigger === 'on_turn') { + } else if (trigger === 'new_message') { this.eventBus.onChunkReceived((event) => { const state: ContextAccountingState = { currentTokens: 0, diff --git a/packages/core/src/context/sidecar/profiles.ts b/packages/core/src/context/sidecar/profiles.ts index 8a40e939b3..1f7f0205e0 100644 --- a/packages/core/src/context/sidecar/profiles.ts +++ b/packages/core/src/context/sidecar/profiles.ts @@ -18,7 +18,7 @@ export const defaultSidecarProfile: SidecarConfig = { pipelines: [ { name: 'Immediate Sanitization', - triggers: ['on_turn'], + triggers: ['new_message'], execution: 'blocking', processors: [ { @@ -30,7 +30,7 @@ export const defaultSidecarProfile: SidecarConfig = { }, { name: 'Deep Background Compression', - triggers: [{ type: 'timer', intervalMs: 5000 }, 'budget_exceeded'], + triggers: [{ type: 'timer', intervalMs: 5000 }, 'retained_exceeded'], execution: 'background', processors: [ { diff --git a/packages/core/src/context/sidecar/schema.ts b/packages/core/src/context/sidecar/schema.ts index a7f6f185ff..b3fd83bd5d 100644 --- a/packages/core/src/context/sidecar/schema.ts +++ b/packages/core/src/context/sidecar/schema.ts @@ -48,7 +48,7 @@ export function getSidecarConfigSchema(registry: ProcessorRegistry) { anyOf: [ { type: 'string', - enum: ['on_turn', 'post_turn', 'budget_exceeded'], + enum: ['new_message', 'retained_exceeded', 'gc_backstop'], }, { type: 'object', diff --git a/packages/core/src/context/sidecar/types.ts b/packages/core/src/context/sidecar/types.ts index ab238bc863..eb75c24f9b 100644 --- a/packages/core/src/context/sidecar/types.ts +++ b/packages/core/src/context/sidecar/types.ts @@ -33,9 +33,8 @@ export type ProcessorConfig = }; export type PipelineTrigger = - | 'on_turn' - | 'post_turn' - | 'budget_exceeded' + | 'new_message' + | 'retained_exceeded' | 'gc_backstop' | { type: 'timer'; intervalMs: number }; diff --git a/packages/core/src/context/system-tests/lifecycle.golden.test.ts b/packages/core/src/context/system-tests/lifecycle.golden.test.ts index 2efe55d061..1209120983 100644 --- a/packages/core/src/context/system-tests/lifecycle.golden.test.ts +++ b/packages/core/src/context/system-tests/lifecycle.golden.test.ts @@ -35,9 +35,9 @@ describe('System Lifecycle Golden Tests', () => { budget: { maxTokens: 4000, retainedTokens: 2000 }, // Extremely tight limits pipelines: [ { - name: 'Pressure Relief', // Emits from eventBus 'budget_exceeded' + name: 'Pressure Relief', // Emits from eventBus 'retained_exceeded' execution: 'background', - triggers: ['budget_exceeded'], + triggers: ['retained_exceeded'], processors: [ { processorId: 'BlobDegradationProcessor' }, { @@ -50,7 +50,7 @@ describe('System Lifecycle Golden Tests', () => { { name: 'Immediate Sanitization', // The magic string the projector is hardcoded to use execution: 'blocking', - triggers: ['budget_exceeded'], + triggers: ['retained_exceeded'], processors: [ { processorId: 'EmergencyTruncationProcessor', options: {} }, ],