@remit/imap-worker 0.0.70 → 0.0.72

package/src/handlers/message-delete.test.ts

@@ -3,6 +3,7 @@ import { beforeEach, describe, it, mock } from "node:test";
 import type { ThreadMessageItem } from "@remit/data-ports";
 import type { Logger } from "@remit/logger-lambda";
 import { renderMetrics, resetMetrics } from "@remit/logger-lambda";
+import { noopLogger } from "@remit/logger-lambda/noop-logger";
 import type { MessageDeleteEvent } from "../events.js";
 import {
 	deleteAllThreadMessagesForMessage,
@@ -256,16 +257,6 @@ describe("deleteAllThreadMessagesForMessage (#212)", () => {
 	});
 });
 
-const noopLog = {
-	info: () => {},
-	warn: () => {},
-	error: () => {},
-	debug: () => {},
-	fatal: () => {},
-	trace: () => {},
-	child: () => noopLog,
-} as unknown as Logger;
-
 interface Call {
 	method: string;
 	args: unknown[];
@@ -543,7 +534,7 @@ describe("handleMessageDelete", () => {
 	});
 
 	it("moves to trash, rewrites the uid, and flips the thread row to deleted", async () => {
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.deepEqual(called("message.updateUid")[0]?.args, [
 			"msg-1",
@@ -569,7 +560,7 @@ describe("handleMessageDelete", () => {
 			sourceNoLongerHoldsTheUid();
 			h.destinationSearchUids = [77];
 
-			await handleMessageDelete(moveEvent, noopLog, 1, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 			assert.deepEqual(called("message.updateUid")[0]?.args, [
 				"msg-1",
@@ -598,7 +589,7 @@ describe("handleMessageDelete", () => {
 			sourceNoLongerHoldsTheUid();
 			h.destinationSearchUids = [12, 77];
 
-			await handleMessageDelete(moveEvent, noopLog, 1, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 			assert.deepEqual(called("message.updateUid")[0]?.args, [
 				"msg-1",
@@ -623,7 +614,7 @@ describe("handleMessageDelete", () => {
 				return { uidvalidity: 1 };
 			}) as Connection["openBox"];
 
-			await handleMessageDelete(moveEvent, noopLog, 1, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 			assert.deepEqual(
 				opened,
@@ -650,7 +641,7 @@ describe("handleMessageDelete", () => {
 			h.destinationSearchUids = [];
 
 			await assert.rejects(
-				handleMessageDelete(moveEvent, noopLog, 1, deps()),
+				handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 				/unconfirmed/,
 			);
 
@@ -683,7 +674,7 @@ describe("handleMessageDelete", () => {
 			sourceNoLongerHoldsTheUid();
 			h.destinationSearchUids = [];
 
-			await handleMessageDelete(moveEvent, noopLog, 3, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 3, deps());
 
 			assert.equal(
 				called("threadMessage.deleteMany").length,
@@ -710,7 +701,7 @@ describe("handleMessageDelete", () => {
 			sourceNoLongerHoldsTheUid();
 			h.messageRow = {};
 
-			await handleMessageDelete(moveEvent, noopLog, 1, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 			assert.equal(
 				called("connection.search").filter((c) =>
@@ -739,7 +730,7 @@ describe("handleMessageDelete", () => {
 			sourceNoLongerHoldsTheUid();
 			h.messageRow = undefined;
 
-			await handleMessageDelete(moveEvent, noopLog, 1, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 			assert.equal(called("message.update").length, 0);
 			assert.equal(called("message.delete").length, 0);
@@ -757,7 +748,7 @@ describe("handleMessageDelete", () => {
 			h.destinationSearchUids = [100];
 
 			await assert.rejects(
-				handleMessageDelete(moveEvent, noopLog, 1, deps()),
+				handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 				/unconfirmed/,
 			);
 
@@ -797,7 +788,7 @@ describe("handleMessageDelete", () => {
 				},
 			];
 
-			await handleMessageDelete(moveEvent, noopLog, 3, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 3, deps());
 
 			assert.equal(called("message.delete").length, 0);
 			assert.equal(called("threadMessage.deleteMany").length, 0);
@@ -845,7 +836,7 @@ describe("handleMessageDelete", () => {
 			h.connection.moveMessages = async () => ({ uidMap: new Map() });
 			h.destinationSearchUids = [100];
 
-			await handleMessageDelete(moveEvent, noopLog, 3, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 3, deps());
 
 			assert.deepEqual(
 				called("emitEvent").map((c) => c.args[0]),
@@ -874,7 +865,7 @@ describe("handleMessageDelete", () => {
 				moveThrows();
 
 				await assert.rejects(
-					handleMessageDelete(moveEvent, noopLog, 1, deps()),
+					handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 					/UID MOVE failed/,
 				);
 
@@ -891,7 +882,7 @@ describe("handleMessageDelete", () => {
 				moveThrows();
 				sourceNoLongerHoldsTheUid();
 
-				await handleMessageDelete(moveEvent, noopLog, 3, deps());
+				await handleMessageDelete(moveEvent, noopLogger, 3, deps());
 
 				assert.equal(
 					called("threadMessage.deleteMany").length,
@@ -905,7 +896,7 @@ describe("handleMessageDelete", () => {
 			it("settles a still-present message at the ceiling back onto its source", async () => {
 				moveThrows();
 
-				await handleMessageDelete(moveEvent, noopLog, 3, deps());
+				await handleMessageDelete(moveEvent, noopLogger, 3, deps());
 
 				assert.deepEqual(
 					called("message.updateForMove").at(-1)?.args,
@@ -927,7 +918,7 @@ describe("handleMessageDelete", () => {
 			}) as Connection["openBox"];
 
 			await assert.rejects(
-				handleMessageDelete(moveEvent, noopLog, 1, deps()),
+				handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 				/unconfirmed/,
 			);
 
@@ -958,7 +949,7 @@ describe("handleMessageDelete", () => {
 				operation,
 			} as unknown as MessageDeleteEvent;
 
-			await handleMessageDelete(malformed, noopLog, 1, deps());
+			await handleMessageDelete(malformed, noopLogger, 1, deps());
 
 			assert.equal(
 				called("connection.deleteMessages").length,
@@ -991,7 +982,7 @@ describe("handleMessageDelete", () => {
 			destinationMailboxPath: undefined,
 		} as MessageDeleteEvent;
 
-		await handleMessageDelete(destinationless, noopLog, 1, deps());
+		await handleMessageDelete(destinationless, noopLogger, 1, deps());
 
 		assert.equal(called("connection.deleteMessages").length, 0);
 		assert.equal(called("message.delete").length, 0);
@@ -1002,7 +993,7 @@ describe("handleMessageDelete", () => {
 	});
 
 	it("expunges on the server and removes every thread row before the message row", async () => {
-		await handleMessageDelete(permanentEvent, noopLog, 1, deps());
+		await handleMessageDelete(permanentEvent, noopLogger, 1, deps());
 
 		assert.deepEqual(called("connection.deleteMessages")[0]?.args, [[10]]);
 		assert.equal(called("threadMessage.delete").length, 2);
@@ -1021,7 +1012,7 @@ describe("handleMessageDelete", () => {
 		};
 		sourceNoLongerHoldsTheUid();
 
-		await handleMessageDelete(permanentEvent, noopLog, 1, deps());
+		await handleMessageDelete(permanentEvent, noopLogger, 1, deps());
 
 		assert.equal(called("message.delete").length, 1);
 		assert.equal(called("threadMessage.delete").length, 2);
@@ -1042,7 +1033,7 @@ describe("handleMessageDelete", () => {
 		sourceNoLongerHoldsTheUid();
 
 		await assert.rejects(
-			handleMessageDelete(moveEvent, noopLog, 1, deps()),
+			handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 			/not found/,
 		);
 
@@ -1070,7 +1061,7 @@ describe("handleMessageDelete", () => {
 		};
 
 		await assert.rejects(
-			handleMessageDelete(moveEvent, noopLog, 1, deps()),
+			handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 			/NONEXISTENT/,
 		);
 
@@ -1092,7 +1083,7 @@ describe("handleMessageDelete", () => {
 		h.connection.fetchMessages = async () => [];
 
 		await assert.rejects(
-			handleMessageDelete(permanentEvent, noopLog, 1, deps()),
+			handleMessageDelete(permanentEvent, noopLogger, 1, deps()),
 			/NONEXISTENT/,
 		);
 
@@ -1117,7 +1108,7 @@ describe("handleMessageDelete", () => {
 		};
 
 		await assert.rejects(
-			handleMessageDelete(permanentEvent, noopLog, 1, deps()),
+			handleMessageDelete(permanentEvent, noopLogger, 1, deps()),
 			/NONEXISTENT mailbox does not exist/,
 		);
 
@@ -1138,7 +1129,7 @@ describe("handleMessageDelete", () => {
 			throw new Error("TRYCREATE: no such mailbox");
 		};
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.equal(called("connection.createMailbox").length, 0);
 		assert.deepEqual(
@@ -1158,7 +1149,7 @@ describe("handleMessageDelete", () => {
 			schemaVersion: undefined,
 		} as unknown as MessageDeleteEvent;
 
-		await handleMessageDelete(unversioned, noopLog, 1, deps());
+		await handleMessageDelete(unversioned, noopLogger, 1, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 		assert.equal(called("connection.deleteMessages").length, 0);
@@ -1179,7 +1170,7 @@ describe("handleMessageDelete", () => {
 			schemaVersion: undefined,
 		} as unknown as MessageDeleteEvent;
 
-		await handleMessageDelete(unversioned, noopLog, 1, deps());
+		await handleMessageDelete(unversioned, noopLogger, 1, deps());
 
 		assert.deepEqual(
 			called("threadMessage.update").map((c) => c.args[1]),
@@ -1198,7 +1189,7 @@ describe("handleMessageDelete", () => {
 			schemaVersion: undefined,
 		} as unknown as MessageDeleteEvent;
 
-		await handleMessageDelete(unversioned, noopLog, 1, deps());
+		await handleMessageDelete(unversioned, noopLogger, 1, deps());
 
 		assert.equal(called("connection.deleteMessages").length, 0);
 		assert.deepEqual(called("message.delete")[0]?.args, ["msg-1"]);
@@ -1215,7 +1206,7 @@ describe("handleMessageDelete", () => {
 		};
 
 		await assert.rejects(
-			handleMessageDelete(moveEvent, noopLog, 1, deps()),
+			handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 			/server exploded/,
 		);
 
@@ -1234,7 +1225,7 @@ describe("handleMessageDelete", () => {
 	it("hands the optimistic trash move back when openBox trips a UIDVALIDITY mismatch", async () => {
 		h.connection.openBox = async () => ({ uidvalidity: 999 });
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.equal(
 			(called("mailbox.update")[0]?.args[2] as { cursorState?: string })
@@ -1269,7 +1260,7 @@ describe("handleMessageDelete", () => {
 
 		await handleMessageDelete(
 			moveEvent,
-			noopLog,
+			noopLogger,
 			MESSAGE_DELETE_MAX_ATTEMPTS,
 			deps(),
 		);
@@ -1403,7 +1394,7 @@ describe("handleMessageDelete", () => {
 			cursorState: "rebuilding",
 		};
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.equal(called("threadMessage.findAllByMessageId").length, 1);
 	});
@@ -1487,7 +1478,7 @@ describe("handleMessageDelete", () => {
 		h.sourceSearchUids = [4];
 		h.destinationSearchUids = [12];
 
-		await handleMessageDelete(moveEvent, noopLog, 2, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 2, deps());
 
 		assert.equal(called("message.updateUid").length, 0);
 		assert.deepEqual(
@@ -1507,7 +1498,7 @@ describe("handleMessageDelete", () => {
 			cursorState: "rebuilding",
 		};
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.deepEqual(
 			called("emitEvent").map((c) => c.args[0]),
@@ -1525,7 +1516,7 @@ describe("handleMessageDelete", () => {
 			cursorState: "rebuilding",
 		};
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 		assert.deepEqual(
@@ -1549,7 +1540,7 @@ describe("handleMessageDelete", () => {
 		};
 		h.allThreadMessages = [];
 
-		await handleMessageDelete(permanentEvent, noopLog, 1, deps());
+		await handleMessageDelete(permanentEvent, noopLogger, 1, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 		assert.deepEqual(called("message.delete")[0]?.args, ["msg-1"]);
@@ -1568,7 +1559,7 @@ describe("handleMessageDelete", () => {
 		};
 		h.allThreadMessages = [];
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.deepEqual(called("message.delete")[0]?.args, ["msg-1"]);
 		assert.equal(
@@ -1583,7 +1574,7 @@ describe("handleMessageDelete", () => {
 			name: "NotFoundError",
 		});
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 		assert.equal(called("message.updateUid").length, 0);
@@ -1597,7 +1588,7 @@ describe("handleMessageDelete", () => {
 			deletedAt: Date.now(),
 		};
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 	});
@@ -1606,7 +1597,7 @@ describe("handleMessageDelete", () => {
 		h.account = null;
 
 		await assert.rejects(
-			handleMessageDelete(moveEvent, noopLog, 1, deps()),
+			handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 			/not found/,
 		);
 	});

package/src/handlers/sync-message-body.ts

@@ -11,6 +11,7 @@ import {
 	QuarantineService,
 	resolveExhaustedBodySyncFailures,
 } from "@remit/mailbox-service";
+import { buildFilterConfig } from "@remit/mailbox-service/filter-config";
 import { attemptBudget } from "@remit/sqs-client/attempt-budget";
 import { env } from "expect-env";
 import { isAccountDeleted } from "../account-check.js";
@@ -20,7 +21,6 @@ import {
 	createConnectionScopeWithCredentials,
 } from "../connection-scope.js";
 import type { SyncMessageBodyEvent } from "../events.js";
-import { buildFilterConfig } from "../filter-config.js";
 import { isNotFoundError } from "../is-not-found.js";
 import { withOAuthLifecycle } from "../with-oauth-lifecycle.js";
 import { buildLifecycleDeps } from "../with-oauth-lifecycle-deps.js";

package/src/filter-config.test.ts

@@ -1,171 +0,0 @@
-import assert from "node:assert/strict";
-import { describe, it } from "node:test";
-import type {
-	FilterItem,
-	IFilterAnchorRepository,
-	IFilterRepository,
-	IMessageLabelRepository,
-} from "@remit/data-ports";
-import { FilterMatchOperator, FilterState } from "@remit/domain-enums";
-import {
-	type FilterMessage,
-	FilterPipeline,
-	type MessageEmbedder,
-	NO_ACTION,
-	type PlacementMoveService,
-} from "@remit/mailbox-service";
-import { buildFilterConfig, type FilterConfigDeps } from "./filter-config.js";
-import { _resetMessageEmbedderForTest } from "./message-embedder.js";
-
-const anchorOnlyFilter = (destinationMailboxId: string): FilterItem =>
-	({
-		filterId: "flt-semantic",
-		accountConfigId: "cfg-1",
-		name: "receipts",
-		scope: "Standing",
-		state: FilterState.Active,
-		hasAnchor: true,
-		ruleChangedAt: 1,
-		matchOperator: FilterMatchOperator.Or,
-		literalClauses: [],
-		actionLabelId: NO_ACTION,
-		actionMailboxId: destinationMailboxId,
-		createdAt: 1,
-		updatedAt: 1,
-	}) as unknown as FilterItem;
-
-const CURRENT_MODEL = "test-model@3";
-
-const repos = (filter: FilterItem): FilterConfigDeps => ({
-	filterService: {
-		listByAccountAndState: async () => [filter],
-		refreshExpiry: async (f: FilterItem) => f,
-	} as unknown as IFilterRepository,
-	filterAnchorService: {
-		get: async () => ({
-			anchorEmbedding: [1, 0, 0],
-			anchorEmbeddingId: CURRENT_MODEL,
-		}),
-	} as unknown as IFilterAnchorRepository,
-	messageLabelService: {} as unknown as IMessageLabelRepository,
-	placementMoveService: {} as unknown as PlacementMoveService,
-});
-
-const message: FilterMessage = {
-	from: "billing@stripe.com",
-	fromName: "Stripe",
-	subject: "Your receipt",
-	text: "Thanks for your payment",
-	listId: "",
-};
-
-describe("buildFilterConfig", () => {
-	it("returns undefined without a placement mover — no move path, filters stay off", () => {
-		const deps = repos(anchorOnlyFilter("mbx-archive"));
-		deps.placementMoveService = undefined;
-
-		assert.equal(buildFilterConfig(deps), undefined);
-	});
-
-	it("wires an embedder into the config", () => {
-		const config = buildFilterConfig(repos(anchorOnlyFilter("mbx-archive")));
-
-		assert.ok(config);
-		assert.ok(config.embedder);
-	});
-
-	it("lights up a semantic anchor-only filter on the body-sync pass", async () => {
-		let embedCalls = 0;
-		const embedder: MessageEmbedder = {
-			embed: async () => {
-				embedCalls += 1;
-				return [1, 0, 0];
-			},
-			embeddingId: CURRENT_MODEL,
-		};
-		const config = buildFilterConfig(
-			repos(anchorOnlyFilter("mbx-archive")),
-			embedder,
-		);
-		assert.ok(config);
-
-		const decision = await new FilterPipeline(config, {
-			info: () => {},
-		}).evaluate("cfg-1", "m-1", message);
-
-		assert.deepEqual(decision.move, {
-			destinationMailboxId: "mbx-archive",
-			filterId: "flt-semantic",
-		});
-		assert.equal(embedCalls, 1);
-	});
-
-	it("does not match when the message embedding diverges from the anchor", async () => {
-		const embedder: MessageEmbedder = {
-			embed: async () => [0, 1, 0],
-			embeddingId: CURRENT_MODEL,
-		};
-		const config = buildFilterConfig(
-			repos(anchorOnlyFilter("mbx-archive")),
-			embedder,
-		);
-		assert.ok(config);
-
-		const decision = await new FilterPipeline(config, {
-			info: () => {},
-		}).evaluate("cfg-1", "m-2", message);
-
-		assert.equal(decision.move, undefined);
-	});
-});
-
-// An instance with semantic search off (issue #1068). `off` selects an embedder
-// that throws by design, and the throw lands in the pipeline's per-filter catch:
-// one error-level `filter_anchor_match_failed` for every semantic filter on
-// every message it syncs. The pipeline already has a designed skip for a
-// missing embedder, so the config passes none.
-describe("buildFilterConfig with semantic search off", () => {
-	const withProviderOff = async (body: () => Promise<void>): Promise<void> => {
-		const previous = process.env.SEARCH_EMBEDDING_PROVIDER;
-		process.env.SEARCH_EMBEDDING_PROVIDER = "off";
-		_resetMessageEmbedderForTest();
-		try {
-			await body();
-		} finally {
-			if (previous === undefined) {
-				delete process.env.SEARCH_EMBEDDING_PROVIDER;
-			} else {
-				process.env.SEARCH_EMBEDDING_PROVIDER = previous;
-			}
-			_resetMessageEmbedderForTest();
-		}
-	};
-
-	it("wires no embedder", async () => {
-		await withProviderOff(async () => {
-			const config = buildFilterConfig(repos(anchorOnlyFilter("mbx-archive")));
-
-			assert.ok(config);
-			assert.equal(config.embedder, undefined);
-		});
-	});
-
-	it("skips the semantic filter without logging an error", async () => {
-		await withProviderOff(async () => {
-			const config = buildFilterConfig(repos(anchorOnlyFilter("mbx-archive")));
-			assert.ok(config);
-
-			const errors: unknown[] = [];
-			const decision = await new FilterPipeline(config, {
-				info: () => {},
-				debug: () => {},
-				warn: () => {},
-				error: (fields) => errors.push(fields.alert),
-			}).evaluate("cfg-1", "m-off", message);
-
-			assert.deepEqual(decision.labels, []);
-			assert.equal(decision.move, undefined);
-			assert.deepEqual(errors, []);
-		});
-	});
-});

package/src/filter-config.ts

@@ -1,63 +0,0 @@
-import type {
-	IFilterAnchorRepository,
-	IFilterRepository,
-	IMessageLabelRepository,
-} from "@remit/data-ports";
-import type {
-	FilterConfig,
-	MessageEmbedder,
-	PlacementMoveService,
-} from "@remit/mailbox-service";
-import {
-	EMBEDDING_PROVIDER_OFF,
-	readEmbeddingProviderFromEnv,
-} from "@remit/search-service/from-env";
-import { getMessageEmbedder } from "./message-embedder.js";
-
-export interface FilterConfigDeps {
-	filterService: IFilterRepository;
-	filterAnchorService: IFilterAnchorRepository;
-	messageLabelService: IMessageLabelRepository;
-	placementMoveService?: PlacementMoveService;
-}
-
-/**
- * The env-selected embedder, or none on an instance with semantic search off.
- *
- * `off` embeds nothing by design, and its embedder says so by throwing
- * (EmbeddingDisabledError). The pipeline has a designed skip for a *missing*
- * embedder — semantic filters are passed over and logged at debug — but a
- * present embedder that throws lands in the per-filter catch instead, which is
- * an error-level `filter_anchor_match_failed` for every semantic filter on
- * every synced message. Same outcome, a log nobody can read.
- */
-const embedderFromEnv = (): MessageEmbedder | undefined =>
-	readEmbeddingProviderFromEnv() === EMBEDDING_PROVIDER_OFF
-		? undefined
-		: getMessageEmbedder();
-
-/**
- * Assemble the index-time filter config the body-sync pass runs (RFC 034). The
- * embedder is provisioned from env exactly as the backend read-path and
- * search-index worker provision theirs, so a semantic (anchor-only) filter is
- * evaluated on incoming mail instead of silently skipped.
- *
- * Absent the placement mover there is no move path, so filters stay off — a
- * matched filter's actions reuse the same enqueue plumbing the placement mover
- * owns.
- */
-export const buildFilterConfig = (
-	deps: FilterConfigDeps,
-	embedder?: MessageEmbedder,
-): FilterConfig | undefined => {
-	const { placementMoveService } = deps;
-	if (!placementMoveService) return undefined;
-	const resolved = embedder ?? embedderFromEnv();
-	return {
-		filterService: deps.filterService,
-		filterAnchorService: deps.filterAnchorService,
-		messageLabelService: deps.messageLabelService,
-		placementMoveService,
-		...(resolved ? { embedder: resolved } : {}),
-	};
-};

package/src/message-embedder.test.ts

@@ -1,39 +0,0 @@
-import assert from "node:assert/strict";
-import { afterEach, describe, it } from "node:test";
-import {
-	_resetMessageEmbedderForTest,
-	getMessageEmbedder,
-} from "./message-embedder.js";
-
-describe("getMessageEmbedder", () => {
-	afterEach(() => {
-		_resetMessageEmbedderForTest();
-	});
-
-	it("adapts the batch embedding service into a single-text message embedder", async () => {
-		const vector = await getMessageEmbedder().embed("invoice from stripe");
-
-		assert.ok(Array.isArray(vector));
-		assert.ok(vector.length > 0);
-		assert.ok(vector.every((value) => typeof value === "number"));
-	});
-
-	it("embeds the same text deterministically", async () => {
-		const embedder = getMessageEmbedder();
-		const a = await embedder.embed("your monthly receipt");
-		const b = await embedder.embed("your monthly receipt");
-
-		assert.deepEqual(a, b);
-	});
-
-	it("memoizes the embedder across calls", () => {
-		assert.strictEqual(getMessageEmbedder(), getMessageEmbedder());
-	});
-
-	it("rebuilds after a reset", () => {
-		const first = getMessageEmbedder();
-		_resetMessageEmbedderForTest();
-
-		assert.notStrictEqual(getMessageEmbedder(), first);
-	});
-});

package/src/message-embedder.ts

@@ -1,33 +0,0 @@
-import type { MessageEmbedder } from "@remit/mailbox-service";
-import { buildEmbeddingServiceFromEnv } from "@remit/search-service/from-env";
-
-/**
- * Adapt the batch {@link EmbeddingService} the rest of the stack composes from
- * env into the single-text {@link MessageEmbedder} the filter pipeline needs: one
- * incoming message becomes one message-level vector to compare against a filter's
- * persisted anchor (RFC 034 Decision 2.1/2.3).
- *
- * The embedder is selected by the same `SEARCH_EMBEDDING_*` env the backend and
- * search-index worker read, so the worker embeds under the identical model the
- * anchors were built with. The instance is memoized across warm invocations so a
- * local Transformers.js model loads once per container rather than per event.
- */
-let cached: MessageEmbedder | undefined;
-
-export const getMessageEmbedder = (): MessageEmbedder => {
-	if (cached) return cached;
-	const service = buildEmbeddingServiceFromEnv();
-	cached = {
-		embed: async (text: string): Promise<number[]> => {
-			const [vector] = await service.embed([text]);
-			return vector;
-		},
-		embeddingId: service.embeddingId,
-	};
-	return cached;
-};
-
-/** Reset the singleton — test use only. */
-export const _resetMessageEmbedderForTest = (): void => {
-	cached = undefined;
-};