@vellumai/assistant 0.8.7-dev.202606052232.2ddc989 → 0.8.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bun.lock +2 -2
- package/docs/plugins.md +832 -0
- package/examples/plugins/echo/README.md +60 -61
- package/examples/plugins/echo/package.json +2 -1
- package/examples/plugins/echo/register.ts +143 -0
- package/node_modules/@vellumai/skill-host-contracts/src/skill-host.ts +6 -7
- package/openapi.yaml +5 -15
- package/package.json +2 -2
- package/src/__tests__/agent-loop-exit-reason.test.ts +56 -3
- package/src/__tests__/anthropic-provider.test.ts +1 -1
- package/src/__tests__/app-control-flow.test.ts +1 -1
- package/src/__tests__/app-dir-path-guard.test.ts +0 -1
- package/src/__tests__/approval-routes-http.test.ts +1 -4
- package/src/__tests__/channel-approval-routes.test.ts +1 -1
- package/src/__tests__/channel-approvals.test.ts +1 -1
- package/src/__tests__/circuit-breaker-pipeline.test.ts +405 -0
- package/src/__tests__/compaction-pipeline.test.ts +210 -0
- package/src/__tests__/compaction-timeout-recovery.test.ts +251 -0
- package/src/__tests__/conversation-agent-loop-disk-pressure.test.ts +3 -0
- package/src/__tests__/conversation-agent-loop-inference-profile.test.ts +3 -0
- package/src/__tests__/conversation-agent-loop-overflow.test.ts +7 -3
- package/src/__tests__/conversation-agent-loop.test.ts +39 -42
- package/src/__tests__/conversation-clean-command.test.ts +2 -5
- package/src/__tests__/conversation-provider-retry-repair.test.ts +5 -4
- package/src/__tests__/conversation-runtime-assembly.test.ts +71 -140
- package/src/__tests__/conversation-runtime-workspace.test.ts +27 -108
- package/src/__tests__/conversation-starter-routes.test.ts +6 -14
- package/src/__tests__/conversation-workspace-cache-state.test.ts +16 -17
- package/src/__tests__/conversation-workspace-injection.test.ts +1 -61
- package/src/__tests__/conversation-workspace-tool-tracking.test.ts +6 -7
- package/src/__tests__/db-acp-history.test.ts +0 -101
- package/src/__tests__/dynamic-page-surface.test.ts +0 -31
- package/src/__tests__/file-write-tool.test.ts +0 -63
- package/src/__tests__/gateway-only-guard.test.ts +2 -12
- package/src/__tests__/guardian-grant-minting.test.ts +1 -1
- package/src/__tests__/guardian-routing-invariants.test.ts +4 -2
- package/src/__tests__/handlers-user-message-approval-consumption.test.ts +1 -1
- package/src/__tests__/heartbeat-disk-pressure.test.ts +0 -1
- package/src/__tests__/heartbeat-service.test.ts +0 -1
- package/src/__tests__/host-app-control-routes.test.ts +1 -1
- package/src/__tests__/host-cu-routes-targeted.test.ts +3 -3
- package/src/__tests__/injector-background-turn.test.ts +1 -1
- package/src/__tests__/injector-chain.test.ts +6 -34
- package/src/__tests__/injector-disk-pressure.test.ts +34 -77
- package/src/__tests__/injector-document-comments.test.ts +1 -1
- package/src/__tests__/list-messages-hidden-metadata.test.ts +0 -38
- package/src/__tests__/memory-v2-static-injector.test.ts +1 -1
- package/src/__tests__/{overflow-reduction-loop.test.ts → overflow-reduce-pipeline.test.ts} +284 -64
- package/src/__tests__/pipeline-runner.test.ts +554 -0
- package/src/__tests__/plugin-api-shim.test.ts +6 -3
- package/src/__tests__/plugin-bootstrap.test.ts +23 -12
- package/src/__tests__/plugin-registry.test.ts +49 -3
- package/src/__tests__/plugin-types.test.ts +70 -0
- package/src/__tests__/reaction-persistence.test.ts +1 -1
- package/src/__tests__/send-endpoint-busy.test.ts +1 -4
- package/src/__tests__/skill-feature-flags-integration.test.ts +0 -33
- package/src/__tests__/subagent-call-site-routing.test.ts +1 -1
- package/src/__tests__/subagent-fork-notifications.test.ts +3 -1
- package/src/__tests__/subagent-fork-spawn.test.ts +1 -1
- package/src/__tests__/subagent-manager-notify.test.ts +3 -1
- package/src/__tests__/subagent-notify-parent.test.ts +3 -1
- package/src/__tests__/subagent-spawn-tool-fork.test.ts +1 -1
- package/src/__tests__/user-plugin-loader.test.ts +286 -54
- package/src/acp/__tests__/client-handler.test.ts +0 -40
- package/src/acp/__tests__/prepare-agent-env.test.ts +0 -137
- package/src/acp/__tests__/session-manager-persistence.test.ts +28 -95
- package/src/acp/agent-process.ts +1 -61
- package/src/acp/client-handler.ts +0 -31
- package/src/acp/prepare-agent-env.ts +29 -83
- package/src/acp/resolve-agent.test.ts +7 -320
- package/src/acp/resolve-agent.ts +18 -182
- package/src/acp/session-manager.ts +73 -495
- package/src/acp/types.ts +0 -8
- package/src/agent/compaction-circuit.ts +102 -60
- package/src/agent/loop.ts +59 -32
- package/src/api/responses/conversation-message.ts +1 -7
- package/src/approvals/guardian-request-resolvers.ts +1 -1
- package/src/background-wake/next-wake.ts +0 -1
- package/src/config/__tests__/feature-flag-registry-guard.test.ts +2 -2
- package/src/config/acp-defaults.test.ts +0 -10
- package/src/config/acp-defaults.ts +0 -6
- package/src/config/bundled-skills/acp/SKILL.md +31 -83
- package/src/config/bundled-skills/acp/TOOLS.json +4 -4
- package/src/config/bundled-skills/app-builder/SKILL.md +381 -224
- package/src/config/bundled-skills/app-builder/TOOLS.json +0 -29
- package/src/config/bundled-skills/document-editor/SKILL.md +23 -28
- package/src/config/bundled-skills/document-editor/TOOLS.json +1 -1
- package/src/config/bundled-tool-registry.ts +0 -2
- package/src/config/feature-flag-registry.json +5 -14
- package/src/config/schemas/heartbeat.ts +0 -9
- package/src/context/strip-injections.ts +2 -8
- package/src/context/window-manager.ts +1 -2
- package/src/daemon/conversation-agent-loop-handlers.ts +11 -0
- package/src/daemon/conversation-agent-loop.ts +279 -62
- package/src/daemon/conversation-runtime-assembly.ts +69 -106
- package/src/daemon/conversation-store.ts +90 -9
- package/src/daemon/conversation-workspace.ts +0 -17
- package/src/daemon/conversation.ts +6 -0
- package/src/daemon/external-plugins-bootstrap.ts +11 -11
- package/src/daemon/handlers/conversations.ts +1 -3
- package/src/daemon/handlers/skills.ts +1 -4
- package/src/daemon/lifecycle.ts +0 -21
- package/src/daemon/server.ts +0 -2
- package/src/heartbeat/__tests__/heartbeat-service.test.ts +0 -3
- package/src/heartbeat/heartbeat-run-store.ts +1 -23
- package/src/heartbeat/heartbeat-service.ts +0 -26
- package/src/ipc/__tests__/browser-ipc.test.ts +1 -1
- package/src/ipc/__tests__/ui-request-route.test.ts +3 -3
- package/src/ipc/skill-routes/__tests__/memory.test.ts +0 -15
- package/src/ipc/skill-routes/memory.ts +2 -4
- package/src/memory/conversation-starter-checkpoints.ts +0 -1
- package/src/memory/db-init.ts +0 -2
- package/src/memory/job-handlers/conversation-starters.ts +2 -13
- package/src/memory/jobs-worker.ts +1 -1
- package/src/memory/migrations/index.ts +0 -1
- package/src/memory/schema/acp.ts +0 -4
- package/src/memory/v2/__tests__/consolidation-job.test.ts +3 -3
- package/src/memory/v2/consolidation-job.ts +4 -13
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/assign.test.ts +4 -4
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/live-integration.test.ts +4 -4
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/maintain-job.test.ts +5 -5
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/orchestrate.test.ts +3 -3
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/reconcile.test.ts +2 -2
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/render-injection.test.ts +1 -1
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/router.test.ts +3 -3
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/selection-log-store.test.ts +8 -8
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/selector.test.ts +3 -3
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/shadow-plugin.test.ts +12 -12
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/assign.ts +5 -5
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/capabilities.ts +2 -2
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/maintain-job.ts +8 -8
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/page-content.ts +2 -2
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/provider-blocks.ts +1 -1
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/reconcile.ts +3 -3
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/render-injection.ts +1 -1
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/router.ts +3 -3
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/selection-log-store.ts +4 -4
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/selector.ts +4 -4
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/shadow-plugin.ts +90 -28
- package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/tree.ts +1 -1
- package/src/plugin-api/index.ts +5 -0
- package/src/plugins/defaults/circuit-breaker/middlewares/circuitBreaker.ts +93 -0
- package/src/plugins/defaults/{memory-v3-shadow → circuit-breaker}/package.json +2 -2
- package/src/plugins/defaults/circuit-breaker/register.ts +39 -0
- package/src/plugins/defaults/compaction/middlewares/compaction.ts +25 -0
- package/src/plugins/defaults/compaction/package.json +1 -1
- package/src/plugins/defaults/compaction/register.ts +19 -8
- package/src/plugins/defaults/compaction/terminal.ts +73 -0
- package/src/plugins/defaults/index.ts +5 -3
- package/src/plugins/defaults/{memory-retrieval/injectors.ts → injectors/register.ts} +7 -45
- package/src/plugins/defaults/memory-retrieval/hooks/post-compact.ts +7 -11
- package/src/plugins/defaults/memory-retrieval/injector-chain.ts +2 -2
- package/src/plugins/defaults/overflow-reduce/middlewares/overflowReduce.ts +126 -0
- package/src/plugins/defaults/overflow-reduce/package.json +15 -0
- package/src/plugins/defaults/overflow-reduce/register.ts +42 -0
- package/src/plugins/external-api.ts +2 -2
- package/src/plugins/pipeline.ts +293 -6
- package/src/plugins/registry.ts +37 -9
- package/src/plugins/types.ts +336 -32
- package/src/plugins/user-loader.ts +127 -30
- package/src/proactive-artifact/aux-message-injector.ts +1 -1
- package/src/proactive-artifact/job.test.ts +1 -1
- package/src/prompts/__tests__/system-prompt.test.ts +0 -6
- package/src/prompts/templates/BOOTSTRAP-ACTIVATION-RAIL.md +2 -4
- package/src/runtime/__tests__/agent-wake.test.ts +5 -5
- package/src/runtime/__tests__/interactive-ui.test.ts +1 -1
- package/src/runtime/agent-wake.ts +3 -0
- package/src/runtime/assistant-event-hub.ts +1 -1
- package/src/runtime/channel-approvals.ts +1 -1
- package/src/runtime/interactive-ui.ts +1 -1
- package/src/runtime/routes/__tests__/acp-routes.test.ts +55 -283
- package/src/runtime/routes/__tests__/conversation-list-routes.test.ts +1 -1
- package/src/runtime/routes/__tests__/surface-action-routes.test.ts +4 -5
- package/src/runtime/routes/__tests__/surface-content-routes.test.ts +1 -4
- package/src/runtime/routes/acp-routes.test.ts +25 -89
- package/src/runtime/routes/acp-routes.ts +29 -81
- package/src/runtime/routes/approval-routes.ts +1 -1
- package/src/runtime/routes/browser-routes.ts +1 -1
- package/src/runtime/routes/browser-tabs-routes.ts +10 -6
- package/src/runtime/routes/conversation-cli-routes.ts +1 -1
- package/src/runtime/routes/conversation-list-routes.ts +1 -1
- package/src/runtime/routes/conversation-query-routes.ts +1 -1
- package/src/runtime/routes/conversation-routes.ts +2 -15
- package/src/runtime/routes/conversation-starter-routes.ts +7 -13
- package/src/runtime/routes/conversations-import-routes.ts +7 -24
- package/src/runtime/routes/host-app-control-routes.ts +1 -1
- package/src/runtime/routes/host-cu-routes.ts +1 -1
- package/src/runtime/routes/identity-routes.ts +3 -18
- package/src/runtime/routes/inbound-message-handler.ts +1 -1
- package/src/runtime/routes/memory-v3-routes.ts +6 -16
- package/src/runtime/routes/playground/helpers.ts +1 -1
- package/src/runtime/routes/surface-conversation-resolver.ts +3 -4
- package/src/runtime/routes/work-items-routes.ts +4 -2
- package/src/runtime/services/conversation-serializer.ts +1 -1
- package/src/signals/cancel.ts +4 -2
- package/src/subagent/manager.ts +5 -17
- package/src/tools/acp/list-agents.test.ts +1 -7
- package/src/tools/acp/spawn.test.ts +55 -158
- package/src/tools/acp/spawn.ts +72 -47
- package/src/tools/acp/steer.test.ts +8 -105
- package/src/tools/acp/steer.ts +17 -48
- package/src/tools/apps/executors.ts +8 -13
- package/src/tools/filesystem/write.ts +0 -34
- package/src/tools/subagent/spawn.ts +4 -2
- package/src/tools/ui-surface/definitions.ts +4 -25
- package/src/workspace/migrations/051-seed-conversation-summarization-callsite.ts +5 -4
- package/src/workspace/migrations/097-enable-adaptive-thinking-managed-profiles.ts +45 -69
- package/examples/plugins/echo/hooks/post-tool-use.ts +0 -18
- package/examples/plugins/echo/hooks/stop.ts +0 -16
- package/examples/plugins/echo/hooks/user-prompt-submit.ts +0 -18
- package/examples/plugins/echo/src/emit.ts +0 -19
- package/src/__tests__/compaction-circuit.test.ts +0 -258
- package/src/__tests__/compaction-direct.test.ts +0 -132
- package/src/__tests__/conversations-import-system-filter.test.ts +0 -101
- package/src/acp/__tests__/agent-process.test.ts +0 -161
- package/src/acp/__tests__/helpers/acp-history-db.ts +0 -82
- package/src/acp/__tests__/helpers/exec-file-stub.ts +0 -101
- package/src/acp/__tests__/session-manager-resume.test.ts +0 -736
- package/src/acp/auto-install.test.ts +0 -196
- package/src/acp/auto-install.ts +0 -177
- package/src/acp/feature-gate.test.ts +0 -48
- package/src/acp/feature-gate.ts +0 -34
- package/src/acp/resume-hint.ts +0 -25
- package/src/config/bundled-skills/app-builder/references/DESIGN_SYSTEM.md +0 -48
- package/src/config/bundled-skills/app-builder/references/RESPONSIVE.md +0 -57
- package/src/config/bundled-skills/app-builder/references/SLIDES.md +0 -38
- package/src/config/bundled-skills/app-builder/tools/app-list.ts +0 -62
- package/src/daemon/conversation-registry.ts +0 -159
- package/src/daemon/overflow-reduction-loop.ts +0 -230
- package/src/memory/migrations/272-acp-session-history-cwd.ts +0 -36
- package/src/plugins/defaults/compaction/compact.ts +0 -59
- package/src/plugins/defaults/memory-v3-shadow/hooks/post-compact.ts +0 -14
- package/src/plugins/defaults/memory-v3-shadow/hooks/user-prompt-submit.ts +0 -19
- package/src/plugins/defaults/memory-v3-shadow/injector.ts +0 -75
- package/src/plugins/defaults/memory-v3-shadow/register.ts +0 -26
- package/src/tools/acp/context.ts +0 -20
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/capabilities.test.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/core.test.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/fixtures/eval-turns.json +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/fixtures/live-turns.json +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/health.test.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/needle.test.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/provider-blocks.test.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/snapshot.test.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/tree.test.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/types.test.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/working-set-eviction.test.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/__tests__/working-set-skeleton.test.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/core.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/data/README.md +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/data/assignments.json +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/data/core.json +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/data/leaves/domain-a/topic-x.md +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/data/leaves/domain-a/topic-y.md +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/data/leaves/domain-b/topic-z.md +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/health.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/llm-retry.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/needle.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/orchestrate.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/snapshot.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/types.ts +0 -0
- /package/src/{plugins/defaults/memory-v3-shadow → memory/v3}/working-set.ts +0 -0
|
@@ -0,0 +1,554 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Unit tests for `plugins/pipeline.ts`.
|
|
3
|
+
*
|
|
4
|
+
* Covers:
|
|
5
|
+
* - Onion composition order (outer → inner → terminal → inner → outer).
|
|
6
|
+
* - Short-circuit (middleware that omits `next` — terminal is skipped).
|
|
7
|
+
* - Error propagation (no internal try/catch — errors flow unchanged).
|
|
8
|
+
* - Timeout (breached budget rejects with `PluginTimeoutError`).
|
|
9
|
+
* - Log shape (one structured record per invocation, every field typed).
|
|
10
|
+
*/
|
|
11
|
+
|
|
12
|
+
import { beforeEach, describe, expect, test } from "bun:test";
|
|
13
|
+
|
|
14
|
+
import type { TrustContext } from "../daemon/trust-context.js";
|
|
15
|
+
import {
|
|
16
|
+
composeMiddleware,
|
|
17
|
+
DEFAULT_TIMEOUTS,
|
|
18
|
+
runPipeline,
|
|
19
|
+
} from "../plugins/pipeline.js";
|
|
20
|
+
import {
|
|
21
|
+
type Middleware,
|
|
22
|
+
PluginTimeoutError,
|
|
23
|
+
type TurnContext,
|
|
24
|
+
} from "../plugins/types.js";
|
|
25
|
+
|
|
26
|
+
// A minimal fake pino-compatible logger. The pipeline runner detects a
|
|
27
|
+
// `logger` slot on the context (shape `{ info(record, msg?) }`) and falls
|
|
28
|
+
// back to the module logger only when that slot is absent. Tests pass this
|
|
29
|
+
// fake in via `ctx.logger` so the runner emits into our capture buffer
|
|
30
|
+
// instead of real stderr.
|
|
31
|
+
type LogCall = [record: Record<string, unknown>, msg?: string];
|
|
32
|
+
|
|
33
|
+
function makeFakeLogger(): {
|
|
34
|
+
calls: LogCall[];
|
|
35
|
+
info: (record: Record<string, unknown>, msg?: string) => void;
|
|
36
|
+
warn: () => void;
|
|
37
|
+
error: () => void;
|
|
38
|
+
debug: () => void;
|
|
39
|
+
trace: () => void;
|
|
40
|
+
fatal: () => void;
|
|
41
|
+
} {
|
|
42
|
+
const calls: LogCall[] = [];
|
|
43
|
+
return {
|
|
44
|
+
calls,
|
|
45
|
+
info: (record, msg) => {
|
|
46
|
+
calls.push([record, msg]);
|
|
47
|
+
},
|
|
48
|
+
warn: () => {},
|
|
49
|
+
error: () => {},
|
|
50
|
+
debug: () => {},
|
|
51
|
+
trace: () => {},
|
|
52
|
+
fatal: () => {},
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
let fakeLogger = makeFakeLogger();
|
|
57
|
+
|
|
58
|
+
const trust: TrustContext = {
|
|
59
|
+
sourceChannel: "vellum",
|
|
60
|
+
trustClass: "guardian",
|
|
61
|
+
};
|
|
62
|
+
|
|
63
|
+
function makeCtx(overrides: Partial<TurnContext> = {}): TurnContext {
|
|
64
|
+
return {
|
|
65
|
+
requestId: "req-test",
|
|
66
|
+
conversationId: "conv-test",
|
|
67
|
+
turnIndex: 3,
|
|
68
|
+
trust,
|
|
69
|
+
// The runner reads `(ctx as { logger?: unknown }).logger` — we cast
|
|
70
|
+
// through the partial type to attach it without widening TurnContext.
|
|
71
|
+
...({ logger: fakeLogger } as Partial<TurnContext>),
|
|
72
|
+
...overrides,
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
beforeEach(() => {
|
|
77
|
+
fakeLogger = makeFakeLogger();
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
type Args = { value: number };
|
|
81
|
+
type Result = { value: number };
|
|
82
|
+
|
|
83
|
+
describe("composeMiddleware", () => {
|
|
84
|
+
test("invokes layers in outer→inner→terminal→inner→outer order", async () => {
|
|
85
|
+
const trace: string[] = [];
|
|
86
|
+
|
|
87
|
+
const outer: Middleware<Args, Result> = async (args, next) => {
|
|
88
|
+
trace.push("outer:before");
|
|
89
|
+
const result = await next(args);
|
|
90
|
+
trace.push("outer:after");
|
|
91
|
+
return result;
|
|
92
|
+
};
|
|
93
|
+
|
|
94
|
+
const inner: Middleware<Args, Result> = async (args, next) => {
|
|
95
|
+
trace.push("inner:before");
|
|
96
|
+
const result = await next(args);
|
|
97
|
+
trace.push("inner:after");
|
|
98
|
+
return result;
|
|
99
|
+
};
|
|
100
|
+
|
|
101
|
+
const terminal = async (args: Args): Promise<Result> => {
|
|
102
|
+
trace.push("terminal");
|
|
103
|
+
return { value: args.value * 2 };
|
|
104
|
+
};
|
|
105
|
+
|
|
106
|
+
const composed = composeMiddleware<Args, Result>([outer, inner], terminal);
|
|
107
|
+
const result = await composed({ value: 7 }, makeCtx());
|
|
108
|
+
|
|
109
|
+
expect(result).toEqual({ value: 14 });
|
|
110
|
+
expect(trace).toEqual([
|
|
111
|
+
"outer:before",
|
|
112
|
+
"inner:before",
|
|
113
|
+
"terminal",
|
|
114
|
+
"inner:after",
|
|
115
|
+
"outer:after",
|
|
116
|
+
]);
|
|
117
|
+
});
|
|
118
|
+
|
|
119
|
+
test("middleware that omits `next` short-circuits the chain", async () => {
|
|
120
|
+
const trace: string[] = [];
|
|
121
|
+
|
|
122
|
+
const shortCircuit: Middleware<Args, Result> = async (_args, _next) => {
|
|
123
|
+
trace.push("short-circuit");
|
|
124
|
+
return { value: 99 };
|
|
125
|
+
};
|
|
126
|
+
|
|
127
|
+
const inner: Middleware<Args, Result> = async (args, next) => {
|
|
128
|
+
trace.push("inner");
|
|
129
|
+
return next(args);
|
|
130
|
+
};
|
|
131
|
+
|
|
132
|
+
const terminal = async (_args: Args): Promise<Result> => {
|
|
133
|
+
trace.push("terminal");
|
|
134
|
+
return { value: 0 };
|
|
135
|
+
};
|
|
136
|
+
|
|
137
|
+
const composed = composeMiddleware<Args, Result>(
|
|
138
|
+
[shortCircuit, inner],
|
|
139
|
+
terminal,
|
|
140
|
+
);
|
|
141
|
+
const result = await composed({ value: 1 }, makeCtx());
|
|
142
|
+
|
|
143
|
+
expect(result).toEqual({ value: 99 });
|
|
144
|
+
expect(trace).toEqual(["short-circuit"]);
|
|
145
|
+
});
|
|
146
|
+
|
|
147
|
+
test("empty middleware list reduces to the terminal handler", async () => {
|
|
148
|
+
const terminal = async (args: Args): Promise<Result> => ({
|
|
149
|
+
value: args.value + 1,
|
|
150
|
+
});
|
|
151
|
+
const composed = composeMiddleware<Args, Result>([], terminal);
|
|
152
|
+
const result = await composed({ value: 10 }, makeCtx());
|
|
153
|
+
expect(result).toEqual({ value: 11 });
|
|
154
|
+
});
|
|
155
|
+
});
|
|
156
|
+
|
|
157
|
+
describe("runPipeline — error propagation", () => {
|
|
158
|
+
test("errors thrown by middleware bubble through unchanged", async () => {
|
|
159
|
+
class Boom extends Error {
|
|
160
|
+
override readonly name = "Boom";
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
const thrower: Middleware<Args, Result> = async () => {
|
|
164
|
+
throw new Boom("detonated");
|
|
165
|
+
};
|
|
166
|
+
|
|
167
|
+
const terminal = async (_args: Args): Promise<Result> => {
|
|
168
|
+
throw new Error("terminal should not run");
|
|
169
|
+
};
|
|
170
|
+
|
|
171
|
+
await expect(
|
|
172
|
+
runPipeline(
|
|
173
|
+
"circuitBreaker",
|
|
174
|
+
[thrower],
|
|
175
|
+
terminal,
|
|
176
|
+
{ value: 1 },
|
|
177
|
+
makeCtx(),
|
|
178
|
+
DEFAULT_TIMEOUTS.circuitBreaker,
|
|
179
|
+
),
|
|
180
|
+
).rejects.toBeInstanceOf(Boom);
|
|
181
|
+
});
|
|
182
|
+
|
|
183
|
+
test("errors thrown by the terminal handler bubble through unchanged", async () => {
|
|
184
|
+
const terminal = async (_args: Args): Promise<Result> => {
|
|
185
|
+
throw new TypeError("from terminal");
|
|
186
|
+
};
|
|
187
|
+
|
|
188
|
+
await expect(
|
|
189
|
+
runPipeline(
|
|
190
|
+
"circuitBreaker",
|
|
191
|
+
[],
|
|
192
|
+
terminal,
|
|
193
|
+
{ value: 1 },
|
|
194
|
+
makeCtx(),
|
|
195
|
+
DEFAULT_TIMEOUTS.circuitBreaker,
|
|
196
|
+
),
|
|
197
|
+
).rejects.toBeInstanceOf(TypeError);
|
|
198
|
+
});
|
|
199
|
+
});
|
|
200
|
+
|
|
201
|
+
describe("runPipeline — timeout", () => {
|
|
202
|
+
test("breached budget rejects with PluginTimeoutError carrying pipeline + plugin name", async () => {
|
|
203
|
+
const sleeper: Middleware<Args, Result> = async (_args, _next) =>
|
|
204
|
+
new Promise<Result>((resolve) => {
|
|
205
|
+
setTimeout(() => resolve({ value: 0 }), 200);
|
|
206
|
+
});
|
|
207
|
+
|
|
208
|
+
const terminal = async (_args: Args): Promise<Result> => ({ value: 0 });
|
|
209
|
+
|
|
210
|
+
let caught: unknown;
|
|
211
|
+
try {
|
|
212
|
+
await runPipeline(
|
|
213
|
+
"compaction",
|
|
214
|
+
[sleeper],
|
|
215
|
+
terminal,
|
|
216
|
+
{ value: 1 },
|
|
217
|
+
makeCtx({ pluginName: "slow-plugin" }),
|
|
218
|
+
20,
|
|
219
|
+
);
|
|
220
|
+
} catch (err) {
|
|
221
|
+
caught = err;
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
expect(caught).toBeInstanceOf(PluginTimeoutError);
|
|
225
|
+
const tErr = caught as PluginTimeoutError;
|
|
226
|
+
expect(tErr.pipeline).toBe("compaction");
|
|
227
|
+
expect(tErr.pluginName).toBe("slow-plugin");
|
|
228
|
+
expect(tErr.elapsedMs).toBeGreaterThanOrEqual(0);
|
|
229
|
+
expect(tErr.message).toContain("compaction");
|
|
230
|
+
expect(tErr.message).toContain("slow-plugin");
|
|
231
|
+
});
|
|
232
|
+
|
|
233
|
+
test("fast pipeline does not arm the timer redundantly", async () => {
|
|
234
|
+
const terminal = async (args: Args): Promise<Result> => ({
|
|
235
|
+
value: args.value,
|
|
236
|
+
});
|
|
237
|
+
const result = await runPipeline(
|
|
238
|
+
"compaction",
|
|
239
|
+
[],
|
|
240
|
+
terminal,
|
|
241
|
+
{ value: 42 },
|
|
242
|
+
makeCtx(),
|
|
243
|
+
DEFAULT_TIMEOUTS.compaction,
|
|
244
|
+
);
|
|
245
|
+
expect(result).toEqual({ value: 42 });
|
|
246
|
+
});
|
|
247
|
+
|
|
248
|
+
test("null timeout skips the race entirely", async () => {
|
|
249
|
+
// compaction has DEFAULT_TIMEOUTS.compaction === null — runner must
|
|
250
|
+
// not arm a timer. We verify by completing after an artificial 30ms wait
|
|
251
|
+
// and confirming success without interference.
|
|
252
|
+
const sleeper: Middleware<Args, Result> = async (args, next) =>
|
|
253
|
+
new Promise<Result>((resolve) => {
|
|
254
|
+
setTimeout(() => resolve(next(args)), 30);
|
|
255
|
+
});
|
|
256
|
+
const terminal = async (_args: Args): Promise<Result> => ({ value: 1 });
|
|
257
|
+
const result = await runPipeline(
|
|
258
|
+
"compaction",
|
|
259
|
+
[sleeper],
|
|
260
|
+
terminal,
|
|
261
|
+
{ value: 0 },
|
|
262
|
+
makeCtx(),
|
|
263
|
+
DEFAULT_TIMEOUTS.compaction,
|
|
264
|
+
);
|
|
265
|
+
expect(result).toEqual({ value: 1 });
|
|
266
|
+
});
|
|
267
|
+
});
|
|
268
|
+
|
|
269
|
+
describe("runPipeline — timeout aborts linked signal", () => {
|
|
270
|
+
test("abort signal on args is fired when the timeout trips", async () => {
|
|
271
|
+
const callerController = new AbortController();
|
|
272
|
+
type SignalArgs = { value: number; signal: AbortSignal };
|
|
273
|
+
|
|
274
|
+
let observedAbortedAtCallStart = false;
|
|
275
|
+
let observedAbortedAtCallEnd = false;
|
|
276
|
+
|
|
277
|
+
const sleeper: Middleware<SignalArgs, Result> = async (
|
|
278
|
+
innerArgs,
|
|
279
|
+
_next,
|
|
280
|
+
) => {
|
|
281
|
+
observedAbortedAtCallStart = innerArgs.signal.aborted;
|
|
282
|
+
return new Promise<Result>((resolve, reject) => {
|
|
283
|
+
innerArgs.signal.addEventListener("abort", () => {
|
|
284
|
+
observedAbortedAtCallEnd = innerArgs.signal.aborted;
|
|
285
|
+
reject(Object.assign(new Error("aborted"), { name: "AbortError" }));
|
|
286
|
+
});
|
|
287
|
+
// Keep running past the timeout if the signal doesn't fire.
|
|
288
|
+
setTimeout(() => resolve({ value: 0 }), 500);
|
|
289
|
+
});
|
|
290
|
+
};
|
|
291
|
+
|
|
292
|
+
const terminal = async (_args: SignalArgs): Promise<Result> => ({
|
|
293
|
+
value: 0,
|
|
294
|
+
});
|
|
295
|
+
|
|
296
|
+
await expect(
|
|
297
|
+
runPipeline<SignalArgs, Result>(
|
|
298
|
+
"compaction",
|
|
299
|
+
[sleeper],
|
|
300
|
+
terminal,
|
|
301
|
+
{ value: 1, signal: callerController.signal },
|
|
302
|
+
makeCtx(),
|
|
303
|
+
15,
|
|
304
|
+
),
|
|
305
|
+
).rejects.toBeInstanceOf(PluginTimeoutError);
|
|
306
|
+
|
|
307
|
+
expect(observedAbortedAtCallStart).toBe(false);
|
|
308
|
+
expect(observedAbortedAtCallEnd).toBe(true);
|
|
309
|
+
// Caller's own signal must not be touched — the runner only aborts
|
|
310
|
+
// its internal linked signal, not the caller-owned controller.
|
|
311
|
+
expect(callerController.signal.aborted).toBe(false);
|
|
312
|
+
|
|
313
|
+
// Log record still reports timeout outcome + correct fields even though
|
|
314
|
+
// the inner middleware rejected with AbortError; the outer race still
|
|
315
|
+
// wins with the PluginTimeoutError.
|
|
316
|
+
const [record] = fakeLogger.calls[0]!;
|
|
317
|
+
expect(record.outcome).toBe("timeout");
|
|
318
|
+
expect(record.errorName).toBe("PluginTimeoutError");
|
|
319
|
+
});
|
|
320
|
+
|
|
321
|
+
test("caller-side abort still propagates to the inner call", async () => {
|
|
322
|
+
const callerController = new AbortController();
|
|
323
|
+
type SignalArgs = { signal: AbortSignal };
|
|
324
|
+
|
|
325
|
+
let innerSignalAborted = false;
|
|
326
|
+
|
|
327
|
+
const sleeper: Middleware<SignalArgs, Result> = async (innerArgs) => {
|
|
328
|
+
return new Promise<Result>((_resolve, reject) => {
|
|
329
|
+
innerArgs.signal.addEventListener("abort", () => {
|
|
330
|
+
innerSignalAborted = innerArgs.signal.aborted;
|
|
331
|
+
reject(Object.assign(new Error("aborted"), { name: "AbortError" }));
|
|
332
|
+
});
|
|
333
|
+
});
|
|
334
|
+
};
|
|
335
|
+
|
|
336
|
+
const terminal = async (_args: SignalArgs): Promise<Result> => ({
|
|
337
|
+
value: 0,
|
|
338
|
+
});
|
|
339
|
+
|
|
340
|
+
// Fire a caller-side abort after a short delay.
|
|
341
|
+
setTimeout(() => callerController.abort(), 10);
|
|
342
|
+
|
|
343
|
+
await expect(
|
|
344
|
+
runPipeline<SignalArgs, Result>(
|
|
345
|
+
"compaction",
|
|
346
|
+
[sleeper],
|
|
347
|
+
terminal,
|
|
348
|
+
{ signal: callerController.signal },
|
|
349
|
+
makeCtx(),
|
|
350
|
+
10000,
|
|
351
|
+
),
|
|
352
|
+
).rejects.toMatchObject({ name: "AbortError" });
|
|
353
|
+
|
|
354
|
+
expect(innerSignalAborted).toBe(true);
|
|
355
|
+
expect(callerController.signal.aborted).toBe(true);
|
|
356
|
+
});
|
|
357
|
+
|
|
358
|
+
test("args without an AbortSignal property is passed through unchanged", async () => {
|
|
359
|
+
// Sanity — pipelines that don't carry a signal (circuitBreaker)
|
|
360
|
+
// see identical args identity as before the abort-linking change.
|
|
361
|
+
const args: Args = { value: 42 };
|
|
362
|
+
let seen: Args | undefined;
|
|
363
|
+
const terminal = async (innerArgs: Args): Promise<Result> => {
|
|
364
|
+
seen = innerArgs;
|
|
365
|
+
return { value: innerArgs.value };
|
|
366
|
+
};
|
|
367
|
+
await runPipeline(
|
|
368
|
+
"circuitBreaker",
|
|
369
|
+
[],
|
|
370
|
+
terminal,
|
|
371
|
+
args,
|
|
372
|
+
makeCtx(),
|
|
373
|
+
DEFAULT_TIMEOUTS.circuitBreaker,
|
|
374
|
+
);
|
|
375
|
+
expect(seen).toBe(args);
|
|
376
|
+
});
|
|
377
|
+
});
|
|
378
|
+
|
|
379
|
+
describe("runPipeline — structured log record", () => {
|
|
380
|
+
test("success emits one record with every documented field present", async () => {
|
|
381
|
+
const namedOuter: Middleware<Args, Result> = async function outerMw(
|
|
382
|
+
args,
|
|
383
|
+
next,
|
|
384
|
+
) {
|
|
385
|
+
return next(args);
|
|
386
|
+
};
|
|
387
|
+
const terminal = async (args: Args): Promise<Result> => ({
|
|
388
|
+
value: args.value,
|
|
389
|
+
});
|
|
390
|
+
|
|
391
|
+
await runPipeline(
|
|
392
|
+
"compaction",
|
|
393
|
+
[namedOuter],
|
|
394
|
+
terminal,
|
|
395
|
+
{ value: 7 },
|
|
396
|
+
makeCtx(),
|
|
397
|
+
DEFAULT_TIMEOUTS.compaction,
|
|
398
|
+
);
|
|
399
|
+
|
|
400
|
+
expect(fakeLogger.calls.length).toBe(1);
|
|
401
|
+
const [record, msg] = fakeLogger.calls[0]!;
|
|
402
|
+
expect(msg).toBe("plugin.pipeline");
|
|
403
|
+
expect(record.event).toBe("plugin.pipeline");
|
|
404
|
+
expect(record.pipeline).toBe("compaction");
|
|
405
|
+
expect(record.chain).toEqual(["outerMw"]);
|
|
406
|
+
expect(record.outcome).toBe("success");
|
|
407
|
+
expect(typeof record.durationMs).toBe("number");
|
|
408
|
+
expect(record.durationMs).toBeGreaterThanOrEqual(0);
|
|
409
|
+
expect(record.requestId).toBe("req-test");
|
|
410
|
+
expect(record.conversationId).toBe("conv-test");
|
|
411
|
+
expect(record.turnIndex).toBe(3);
|
|
412
|
+
// pluginName is only present when ctx carries one.
|
|
413
|
+
expect(record.pluginName).toBeUndefined();
|
|
414
|
+
// Error fields absent on success.
|
|
415
|
+
expect(record.errorName).toBeUndefined();
|
|
416
|
+
expect(record.errorMessage).toBeUndefined();
|
|
417
|
+
expect(record.errorStack).toBeUndefined();
|
|
418
|
+
});
|
|
419
|
+
|
|
420
|
+
test("error path records outcome=error + error fields + plugin name", async () => {
|
|
421
|
+
class Boom extends Error {
|
|
422
|
+
override readonly name = "BoomError";
|
|
423
|
+
}
|
|
424
|
+
const thrower: Middleware<Args, Result> = async () => {
|
|
425
|
+
throw new Boom("kaboom");
|
|
426
|
+
};
|
|
427
|
+
const terminal = async (_args: Args): Promise<Result> => ({ value: 0 });
|
|
428
|
+
|
|
429
|
+
await expect(
|
|
430
|
+
runPipeline(
|
|
431
|
+
"circuitBreaker",
|
|
432
|
+
[thrower],
|
|
433
|
+
terminal,
|
|
434
|
+
{ value: 1 },
|
|
435
|
+
makeCtx({ pluginName: "noisy-plugin" }),
|
|
436
|
+
DEFAULT_TIMEOUTS.circuitBreaker,
|
|
437
|
+
),
|
|
438
|
+
).rejects.toBeInstanceOf(Boom);
|
|
439
|
+
|
|
440
|
+
expect(fakeLogger.calls.length).toBe(1);
|
|
441
|
+
const [record] = fakeLogger.calls[0]!;
|
|
442
|
+
expect(record.outcome).toBe("error");
|
|
443
|
+
expect(record.pipeline).toBe("circuitBreaker");
|
|
444
|
+
expect(record.errorName).toBe("BoomError");
|
|
445
|
+
expect(record.errorMessage).toBe("kaboom");
|
|
446
|
+
expect(typeof record.errorStack).toBe("string");
|
|
447
|
+
expect(record.pluginName).toBe("noisy-plugin");
|
|
448
|
+
});
|
|
449
|
+
|
|
450
|
+
test("timeout path records outcome=timeout + PluginTimeoutError fields", async () => {
|
|
451
|
+
const sleeper: Middleware<Args, Result> = async (_args, _next) =>
|
|
452
|
+
new Promise<Result>((resolve) => {
|
|
453
|
+
setTimeout(() => resolve({ value: 0 }), 200);
|
|
454
|
+
});
|
|
455
|
+
const terminal = async (_args: Args): Promise<Result> => ({ value: 0 });
|
|
456
|
+
|
|
457
|
+
await expect(
|
|
458
|
+
runPipeline(
|
|
459
|
+
"circuitBreaker",
|
|
460
|
+
[sleeper],
|
|
461
|
+
terminal,
|
|
462
|
+
{ value: 1 },
|
|
463
|
+
makeCtx({ pluginName: "slow-plugin" }),
|
|
464
|
+
15,
|
|
465
|
+
),
|
|
466
|
+
).rejects.toBeInstanceOf(PluginTimeoutError);
|
|
467
|
+
|
|
468
|
+
expect(fakeLogger.calls.length).toBe(1);
|
|
469
|
+
const [record] = fakeLogger.calls[0]!;
|
|
470
|
+
expect(record.outcome).toBe("timeout");
|
|
471
|
+
expect(record.pipeline).toBe("circuitBreaker");
|
|
472
|
+
expect(record.errorName).toBe("PluginTimeoutError");
|
|
473
|
+
expect(String(record.errorMessage)).toContain("circuitBreaker");
|
|
474
|
+
expect(String(record.errorMessage)).toContain("slow-plugin");
|
|
475
|
+
expect(record.timeoutMs).toBe(15);
|
|
476
|
+
expect(record.pluginName).toBe("slow-plugin");
|
|
477
|
+
});
|
|
478
|
+
|
|
479
|
+
test("null timeout omits timeoutMs field from the log record", async () => {
|
|
480
|
+
const terminal = async (args: Args): Promise<Result> => ({
|
|
481
|
+
value: args.value,
|
|
482
|
+
});
|
|
483
|
+
await runPipeline(
|
|
484
|
+
"compaction",
|
|
485
|
+
[],
|
|
486
|
+
terminal,
|
|
487
|
+
{ value: 5 },
|
|
488
|
+
makeCtx(),
|
|
489
|
+
DEFAULT_TIMEOUTS.compaction,
|
|
490
|
+
);
|
|
491
|
+
|
|
492
|
+
expect(fakeLogger.calls.length).toBe(1);
|
|
493
|
+
const [record] = fakeLogger.calls[0]!;
|
|
494
|
+
expect(record.pipeline).toBe("compaction");
|
|
495
|
+
expect(record.outcome).toBe("success");
|
|
496
|
+
expect(record.timeoutMs).toBeUndefined();
|
|
497
|
+
});
|
|
498
|
+
|
|
499
|
+
test("turnIndex is omitted when unset on the context", async () => {
|
|
500
|
+
const terminal = async (_args: Args): Promise<Result> => ({ value: 0 });
|
|
501
|
+
const ctxNoTurn = {
|
|
502
|
+
requestId: "r",
|
|
503
|
+
conversationId: "c",
|
|
504
|
+
turnIndex: undefined as unknown as number,
|
|
505
|
+
trust,
|
|
506
|
+
logger: fakeLogger,
|
|
507
|
+
} as TurnContext;
|
|
508
|
+
await runPipeline(
|
|
509
|
+
"circuitBreaker",
|
|
510
|
+
[],
|
|
511
|
+
terminal,
|
|
512
|
+
{ value: 0 },
|
|
513
|
+
ctxNoTurn,
|
|
514
|
+
null,
|
|
515
|
+
);
|
|
516
|
+
const [record] = fakeLogger.calls[0]!;
|
|
517
|
+
expect(record.turnIndex).toBeUndefined();
|
|
518
|
+
});
|
|
519
|
+
|
|
520
|
+
test("chain list has one entry per middleware in registration order", async () => {
|
|
521
|
+
const a: Middleware<Args, Result> = async function outerA(args, next) {
|
|
522
|
+
return next(args);
|
|
523
|
+
};
|
|
524
|
+
const b: Middleware<Args, Result> = async function middleB(args, next) {
|
|
525
|
+
return next(args);
|
|
526
|
+
};
|
|
527
|
+
const c: Middleware<Args, Result> = async function innerC(args, next) {
|
|
528
|
+
return next(args);
|
|
529
|
+
};
|
|
530
|
+
const terminal = async (args: Args): Promise<Result> => ({
|
|
531
|
+
value: args.value,
|
|
532
|
+
});
|
|
533
|
+
await runPipeline(
|
|
534
|
+
"compaction",
|
|
535
|
+
[a, b, c],
|
|
536
|
+
terminal,
|
|
537
|
+
{ value: 0 },
|
|
538
|
+
makeCtx(),
|
|
539
|
+
DEFAULT_TIMEOUTS.compaction,
|
|
540
|
+
);
|
|
541
|
+
const [record] = fakeLogger.calls[0]!;
|
|
542
|
+
expect(record.chain).toEqual(["outerA", "middleB", "innerC"]);
|
|
543
|
+
});
|
|
544
|
+
});
|
|
545
|
+
|
|
546
|
+
describe("DEFAULT_TIMEOUTS", () => {
|
|
547
|
+
test("matches the design-doc table exactly", () => {
|
|
548
|
+
expect(DEFAULT_TIMEOUTS).toEqual({
|
|
549
|
+
compaction: null,
|
|
550
|
+
overflowReduce: null,
|
|
551
|
+
circuitBreaker: null,
|
|
552
|
+
});
|
|
553
|
+
});
|
|
554
|
+
});
|
|
@@ -44,7 +44,10 @@ describe("buildShimSource", () => {
|
|
|
44
44
|
});
|
|
45
45
|
|
|
46
46
|
test("handles an empty export list (today's types-only surface)", () => {
|
|
47
|
-
const source = buildShimSource(
|
|
47
|
+
const source = buildShimSource(
|
|
48
|
+
[],
|
|
49
|
+
Symbol.for("vellum.plugin-api.v1"),
|
|
50
|
+
);
|
|
48
51
|
expect(source).toBe(
|
|
49
52
|
`const api = globalThis[Symbol.for("vellum.plugin-api.v1")];\n`,
|
|
50
53
|
);
|
|
@@ -106,7 +109,7 @@ describe("ensurePluginApiShim", () => {
|
|
|
106
109
|
const pluginDir = join(workspaceDir, "plugins", "fake-plugin");
|
|
107
110
|
await mkdir(pluginDir, { recursive: true });
|
|
108
111
|
await writeFile(
|
|
109
|
-
join(pluginDir, "
|
|
112
|
+
join(pluginDir, "register.js"),
|
|
110
113
|
`import * as api from "@vellumai/plugin-api";\nexport { api };\n`,
|
|
111
114
|
);
|
|
112
115
|
|
|
@@ -115,7 +118,7 @@ describe("ensurePluginApiShim", () => {
|
|
|
115
118
|
// → plugin-api namespace. If any link in that chain is broken, this
|
|
116
119
|
// import throws.
|
|
117
120
|
const mod: { api: Record<string, unknown> } = await import(
|
|
118
|
-
join(pluginDir, "
|
|
121
|
+
join(pluginDir, "register.js")
|
|
119
122
|
);
|
|
120
123
|
expect(mod.api).toBeDefined();
|
|
121
124
|
});
|
|
@@ -38,11 +38,13 @@ import { RiskLevel } from "../permissions/types.js";
|
|
|
38
38
|
import { registerDefaultPlugins } from "../plugins/defaults/index.js";
|
|
39
39
|
import {
|
|
40
40
|
closeRegistration,
|
|
41
|
+
getMiddlewaresFor,
|
|
41
42
|
getRegisteredPlugins,
|
|
42
43
|
registerPlugin,
|
|
43
44
|
resetPluginRegistryForTests,
|
|
44
45
|
} from "../plugins/registry.js";
|
|
45
46
|
import {
|
|
47
|
+
type PipelineMiddlewareMap,
|
|
46
48
|
type Plugin,
|
|
47
49
|
PluginExecutionError,
|
|
48
50
|
type PluginInitContext,
|
|
@@ -483,24 +485,33 @@ describe("plugin bootstrap", () => {
|
|
|
483
485
|
expect(initFired).toBe(false);
|
|
484
486
|
});
|
|
485
487
|
|
|
486
|
-
test("requiresFlag disabled:
|
|
487
|
-
// Regression:
|
|
488
|
-
//
|
|
489
|
-
// `
|
|
490
|
-
|
|
491
|
-
|
|
488
|
+
test("requiresFlag disabled: plugin middleware is dropped from the registry", async () => {
|
|
489
|
+
// Regression: prior to the unregisterPlugin() call on the flag-gated skip
|
|
490
|
+
// path, `getMiddlewaresFor()` iterated over every entry in
|
|
491
|
+
// `registeredPlugins` — so a gated-off plugin's middleware still ran on
|
|
492
|
+
// every pipeline invocation even though `init()` had never fired to set up
|
|
493
|
+
// the state it depended on.
|
|
494
|
+
setOverridesForTesting({ "plugin-middleware-disabled": false });
|
|
495
|
+
|
|
496
|
+
const gatedMiddleware: PipelineMiddlewareMap["compaction"] = async (
|
|
497
|
+
args,
|
|
498
|
+
next,
|
|
499
|
+
) => next(args);
|
|
492
500
|
const plugin = buildPlugin(
|
|
493
|
-
"gated-
|
|
494
|
-
{
|
|
495
|
-
|
|
501
|
+
"gated-middleware",
|
|
502
|
+
{
|
|
503
|
+
middleware: { compaction: gatedMiddleware },
|
|
504
|
+
},
|
|
505
|
+
{ requiresFlag: ["plugin-middleware-disabled"] },
|
|
496
506
|
);
|
|
497
507
|
registerPlugin(plugin);
|
|
498
508
|
|
|
499
509
|
await bootstrapPlugins();
|
|
500
510
|
|
|
501
|
-
// The
|
|
502
|
-
|
|
503
|
-
|
|
511
|
+
// The middleware slot must not expose the flag-gated plugin's contribution.
|
|
512
|
+
// The default plugins also contribute compaction middleware, so we key on
|
|
513
|
+
// identity rather than asserting an empty list.
|
|
514
|
+
expect(getMiddlewaresFor("compaction")).not.toContain(gatedMiddleware);
|
|
504
515
|
});
|
|
505
516
|
|
|
506
517
|
test("requiresFlag disabled: no shutdown hook entry installed for the skipped plugin", async () => {
|