@remit/mailbox-service 0.0.36 → 0.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/mailbox-service",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/filters/match.test.ts

@@ -228,14 +228,17 @@ describe("cosineSimilarity", () => {
 });
 
 describe("selectMoveWinner", () => {
-	const filter = (filterId: string, ruleChangedAt: number): FilterItem =>
-		({ filterId, ruleChangedAt }) as FilterItem;
+	const filter = (
+		filterId: string,
+		actionChangedAt: number,
+		ruleChangedAt = actionChangedAt,
+	): FilterItem => ({ filterId, actionChangedAt, ruleChangedAt }) as FilterItem;
 
 	it("returns undefined with no candidates", () => {
 		assert.equal(selectMoveWinner([]), undefined);
 	});
 
-	it("picks the most-recently-changed filter", () => {
+	it("picks the most-recently action-changed filter", () => {
 		const winner = selectMoveWinner([
 			filter("a", 100),
 			filter("b", 300),
@@ -244,7 +247,7 @@ describe("selectMoveWinner", () => {
 		assert.equal(winner?.filterId, "b");
 	});
 
-	it("tie-breaks on filterId when ruleChangedAt is identical", () => {
+	it("tie-breaks on filterId when actionChangedAt is identical", () => {
 		const winner = selectMoveWinner([
 			filter("a", 100),
 			filter("c", 100),
@@ -252,6 +255,23 @@ describe("selectMoveWinner", () => {
 		]);
 		assert.equal(winner?.filterId, "c");
 	});
+
+	it("ignores a ruleChangedAt-only bump — extending scope/expiry alone must not promote a filter to move-winner (reader #384)", () => {
+		// filter A's predicate/action last changed at 10:00 (actionChangedAt).
+		// filter B was created at 09:00 and never had its predicate/action
+		// touched since, but a user extended its expiry at 11:00 — bumping only
+		// its ruleChangedAt (RFC 034 Decision 3.2 / #294), not what it matches or
+		// does. B must not out-rank A.
+		const filterA = filter("filter-a", 10_00);
+		const filterB = filter("filter-b", 9_00, 11_00);
+
+		const winner = selectMoveWinner([filterA, filterB]);
+		assert.equal(
+			winner?.filterId,
+			"filter-a",
+			"A still wins: its actionChangedAt (10:00) beats B's (09:00), even though B's ruleChangedAt (11:00) is later",
+		);
+	});
 });
 
 describe("buildMatchText", () => {

package/src/filters/match.ts

@@ -134,10 +134,14 @@ export const cosineSimilarity = (
 };
 
 /**
- * The move a message ends in when several filters matched: the most-recently
- * *changed* filter wins (RFC 034 Decision 3.2), tie-broken on `filterId` for the
- * unreachable identical-timestamp case. `ruleChangedAt` — not `updatedAt` — is
- * the signal, so a cosmetic rename never flips an exclusive move.
+ * The move a message ends in when several filters matched: the filter whose
+ * predicate or action was most recently *changed* wins (RFC 034 Decision 3.2),
+ * tie-broken on `filterId` for the unreachable identical-timestamp case.
+ * `actionChangedAt` — not `ruleChangedAt` — is the signal: `ruleChangedAt` also
+ * bumps on a scope/expiry-only edit (reader #266), which changes a filter's
+ * lifecycle, not what it matches or does, and must not reorder exclusive-move
+ * precedence (reader #384). Nor is it `updatedAt`, so a cosmetic rename never
+ * flips an exclusive move either.
  */
 export const selectMoveWinner = (
 	candidates: readonly FilterItem[],
@@ -148,12 +152,12 @@ export const selectMoveWinner = (
 			winner = candidate;
 			continue;
 		}
-		if (candidate.ruleChangedAt > winner.ruleChangedAt) {
+		if (candidate.actionChangedAt > winner.actionChangedAt) {
 			winner = candidate;
 			continue;
 		}
 		if (
-			candidate.ruleChangedAt === winner.ruleChangedAt &&
+			candidate.actionChangedAt === winner.actionChangedAt &&
 			candidate.filterId > winner.filterId
 		) {
 			winner = candidate;