From 2f8ea41aeb4d674bd7a5457eaead3c8603246513 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 9 Apr 2026 18:04:33 +0000 Subject: [PATCH] continue tidying --- .../context/contextManager.barrier.test.ts | 3 +- packages/core/src/context/ir/graphUtils.ts | 2 + .../context/sidecar/environmentImpl.test.ts | 1 - .../src/context/sidecar/environmentImpl.ts | 2 - .../src/context/sidecar/orchestrator.test.ts | 39 +------------------ packages/core/src/context/sidecar/profiles.ts | 7 +--- packages/core/src/context/sidecar/schema.ts | 4 -- packages/core/src/context/sidecar/types.ts | 1 - .../system-tests/lifecycle.golden.test.ts | 2 - .../{sidecar => testing}/testProfile.ts | 3 +- 10 files changed, 7 insertions(+), 57 deletions(-) rename packages/core/src/context/{sidecar => testing}/testProfile.ts (84%) diff --git a/packages/core/src/context/contextManager.barrier.test.ts b/packages/core/src/context/contextManager.barrier.test.ts index 11715be444..3ce3c48956 100644 --- a/packages/core/src/context/contextManager.barrier.test.ts +++ b/packages/core/src/context/contextManager.barrier.test.ts @@ -5,8 +5,7 @@ */ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; - -import { testTruncateProfile } from './sidecar/testProfile.js'; +import { testTruncateProfile } from './testing/testProfile.js'; import { createSyntheticHistory, createMockContextConfig, diff --git a/packages/core/src/context/ir/graphUtils.ts b/packages/core/src/context/ir/graphUtils.ts index 455dede8b6..f6ccaf2218 100644 --- a/packages/core/src/context/ir/graphUtils.ts +++ b/packages/core/src/context/ir/graphUtils.ts @@ -49,9 +49,11 @@ export function isUserPrompt(node: IrNode): node is UserPrompt { export function isSystemEvent(node: IrNode): node is SystemEvent { return node.type === 'SYSTEM_EVENT'; } + export function isSnapshot(node: IrNode): node is Snapshot { return node.type === 'SNAPSHOT'; } + export function isRollingSummary(node: IrNode): node is RollingSummary { return node.type === 'ROLLING_SUMMARY'; } diff --git a/packages/core/src/context/sidecar/environmentImpl.test.ts b/packages/core/src/context/sidecar/environmentImpl.test.ts index 4636c5ccd2..eab5c32923 100644 --- a/packages/core/src/context/sidecar/environmentImpl.test.ts +++ b/packages/core/src/context/sidecar/environmentImpl.test.ts @@ -9,7 +9,6 @@ import { ContextTracer } from '../tracer.js'; import { ContextEventBus } from '../eventBus.js'; import { InMemoryFileSystem } from '../system/InMemoryFileSystem.js'; import { DeterministicIdGenerator } from '../system/DeterministicIdGenerator.js'; - import { createMockLlmClient } from '../testing/contextTestUtils.js'; describe('ContextEnvironmentImpl', () => { diff --git a/packages/core/src/context/sidecar/environmentImpl.ts b/packages/core/src/context/sidecar/environmentImpl.ts index 55a828021d..e7d43713d6 100644 --- a/packages/core/src/context/sidecar/environmentImpl.ts +++ b/packages/core/src/context/sidecar/environmentImpl.ts @@ -13,9 +13,7 @@ import type { IFileSystem } from '../system/IFileSystem.js'; import { NodeFileSystem } from '../system/NodeFileSystem.js'; import type { IIdGenerator } from '../system/IIdGenerator.js'; import { NodeIdGenerator } from '../system/NodeIdGenerator.js'; - import { LiveInbox } from './inbox.js'; - import { IrNodeBehaviorRegistry } from '../ir/behaviorRegistry.js'; import { registerBuiltInBehaviors } from '../ir/builtinBehaviors.js'; import { IrMapper } from '../ir/mapper.js'; diff --git a/packages/core/src/context/sidecar/orchestrator.test.ts b/packages/core/src/context/sidecar/orchestrator.test.ts index 70215353d7..47593ab020 100644 --- a/packages/core/src/context/sidecar/orchestrator.test.ts +++ b/packages/core/src/context/sidecar/orchestrator.test.ts @@ -136,7 +136,6 @@ describe('PipelineOrchestrator (Component)', () => { [ { name: 'SyncPipe', - execution: 'blocking', triggers: ['new_message'], processors: [ { processorId: 'ModifyingProcessor' } as unknown as ProcessorConfig, @@ -154,8 +153,8 @@ describe('PipelineOrchestrator (Component)', () => { registry, ); - // eslint-disable-next-line @typescript-eslint/no-explicit-any expect( + // eslint-disable-next-line @typescript-eslint/no-explicit-any (orchestrator as any).instantiatedProcessors.has('ModifyingProcessor'), ).toBe(true); // eslint-disable-next-line @typescript-eslint/no-explicit-any @@ -168,7 +167,6 @@ describe('PipelineOrchestrator (Component)', () => { const config = createConfig([ { name: 'ThrowPipe', - execution: 'blocking', triggers: ['new_message'], processors: [ { processorId: 'DoesNotExist' } as unknown as ProcessorConfig, @@ -186,7 +184,6 @@ describe('PipelineOrchestrator (Component)', () => { const config = createConfig([ { name: 'SyncPipe', - execution: 'blocking', triggers: ['new_message'], processors: [ { processorId: 'ModifyingProcessor' } as unknown as ProcessorConfig, @@ -235,7 +232,6 @@ describe('PipelineOrchestrator (Component)', () => { const config = createConfig([ { name: 'ThrowPipe', - execution: 'blocking', triggers: ['new_message'], processors: [ { processorId: 'ThrowingProcessor' } as unknown as ProcessorConfig, @@ -272,39 +268,6 @@ describe('PipelineOrchestrator (Component)', () => { expect(result).toStrictEqual(nodes); }); - it('automatically triggers background pipelines via EventBus', () => { - const config = createConfig([ - { - name: 'PressureRelief', - execution: 'background', - triggers: ['retained_exceeded'], - processors: [ - { processorId: 'ModifyingProcessor' } as unknown as ProcessorConfig, - ], - }, - ]); - - // Spy on the private method to see if the trigger fires it - const executeSpy = vi.spyOn( - // eslint-disable-next-line @typescript-eslint/no-explicit-any - PipelineOrchestrator.prototype as any, - 'executePipelineAsync', - ); - - new PipelineOrchestrator(config, env, eventBus, env.tracer, registry); - - const nodes = [createDummyNode('1', 'USER_PROMPT')]; - - // Emit the trigger - eventBus.emitConsolidationNeeded({ - nodes, - targetDeficit: 100, - targetNodeIds: new Set(), - }); - - expect(executeSpy).toHaveBeenCalled(); - }); - it('automatically dispatches workers when matching EventBus events occur', async () => { const config = createConfig([], [{ workerId: 'MockWorker' }]); diff --git a/packages/core/src/context/sidecar/profiles.ts b/packages/core/src/context/sidecar/profiles.ts index eefee516f4..49c1ee5a40 100644 --- a/packages/core/src/context/sidecar/profiles.ts +++ b/packages/core/src/context/sidecar/profiles.ts @@ -27,7 +27,6 @@ export const defaultSidecarProfile: SidecarConfig = { { name: 'Immediate Sanitization', triggers: ['new_message'], - execution: 'blocking', processors: [ { processorId: 'ToolMaskingProcessor', @@ -37,9 +36,8 @@ export const defaultSidecarProfile: SidecarConfig = { ], }, { - name: 'Deep Background Compression', - triggers: [{ type: 'timer', intervalMs: 5000 }, 'retained_exceeded'], - execution: 'background', + name: 'Normalization', + triggers: ['retained_exceeded'], processors: [ { processorId: 'NodeTruncationProcessor', @@ -54,7 +52,6 @@ export const defaultSidecarProfile: SidecarConfig = { { name: 'Emergency Backstop', triggers: ['gc_backstop'], - execution: 'blocking', processors: [ { processorId: 'StateSnapshotProcessor', diff --git a/packages/core/src/context/sidecar/schema.ts b/packages/core/src/context/sidecar/schema.ts index e5bab75aa9..d3d447a71e 100644 --- a/packages/core/src/context/sidecar/schema.ts +++ b/packages/core/src/context/sidecar/schema.ts @@ -78,10 +78,6 @@ export function getSidecarConfigSchema(registry: SidecarRegistry) { ], }, }, - execution: { - type: 'string', - enum: ['blocking', 'background'], - }, processors: { type: 'array', items: { diff --git a/packages/core/src/context/sidecar/types.ts b/packages/core/src/context/sidecar/types.ts index 6b7615e16c..ef2ccdb423 100644 --- a/packages/core/src/context/sidecar/types.ts +++ b/packages/core/src/context/sidecar/types.ts @@ -44,7 +44,6 @@ export type PipelineTrigger = export interface PipelineDef { name: string; triggers: PipelineTrigger[]; - execution: 'blocking' | 'background'; processors: ProcessorConfig[]; } 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 bdab334aa6..081b587a34 100644 --- a/packages/core/src/context/system-tests/lifecycle.golden.test.ts +++ b/packages/core/src/context/system-tests/lifecycle.golden.test.ts @@ -36,7 +36,6 @@ describe('System Lifecycle Golden Tests', () => { pipelines: [ { name: 'Pressure Relief', // Emits from eventBus 'retained_exceeded' - execution: 'background', triggers: ['retained_exceeded'], processors: [ { processorId: 'BlobDegradationProcessor' }, @@ -49,7 +48,6 @@ describe('System Lifecycle Golden Tests', () => { }, { name: 'Immediate Sanitization', // The magic string the projector is hardcoded to use - execution: 'blocking', triggers: ['retained_exceeded'], processors: [ { processorId: 'HistoryTruncationProcessor', options: {} }, diff --git a/packages/core/src/context/sidecar/testProfile.ts b/packages/core/src/context/testing/testProfile.ts similarity index 84% rename from packages/core/src/context/sidecar/testProfile.ts rename to packages/core/src/context/testing/testProfile.ts index 6d25a262af..7c5642b3d9 100644 --- a/packages/core/src/context/sidecar/testProfile.ts +++ b/packages/core/src/context/testing/testProfile.ts @@ -3,7 +3,7 @@ * Copyright 2026 Google LLC * SPDX-License-Identifier: Apache-2.0 */ -import type { SidecarConfig } from './types.js'; +import type { SidecarConfig } from '../sidecar/types.js'; export const testTruncateProfile: SidecarConfig = { budget: { @@ -14,7 +14,6 @@ export const testTruncateProfile: SidecarConfig = { { name: 'Emergency Backstop (Truncate Only)', triggers: ['gc_backstop', 'retained_exceeded'], - execution: 'blocking', processors: [{ processorId: 'HistoryTruncationProcessor', options: {} }], }, ],