[DO NOT MERGE]: HSM Sync Engine

.gitignore

@@ -24,6 +24,7 @@ data.json
 .igitignore
 
 # developer harness
+.mcp.json
 AGENTS.md
 CLAUDE.md
 AGENTS.md

__tests__/ObservableMap.test.ts

@@ -12,7 +12,7 @@ class TestTimeProvider implements TimeProvider {
 	private pendingCallbacks: Array<{ id: number; callback: () => void }> = [];
 	private nextId = 1;
 
-	getTime(): number {
+	now(): number {
 		return Date.now();
 	}
 

__tests__/TestSettingsStorage.ts

@@ -63,7 +63,7 @@ describe("NamespacedSettings", () => {
 		 */
 		const nested = new NamespacedSettings(settings, "deeply/nested/path");
 		await nested.set({ foo: "test", count: 1 });
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		expect(settings.get()).toEqual({
 			deeply: {
@@ -86,7 +86,7 @@ describe("NamespacedSettings", () => {
 		};
 
 		await namespaced.set(testData);
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		expect(namespaced.get()).toEqual(testData);
 		expect(settings.get()).toEqual({
@@ -105,10 +105,10 @@ describe("NamespacedSettings", () => {
 		const path2 = new NamespacedSettings(settings, "a/b/d");
 
 		await path1.set({ foo: "path1", count: 1 });
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		await path2.set({ foo: "path2", count: 2 });
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		expect(settings.get()).toEqual({
 			a: {
@@ -127,13 +127,13 @@ describe("NamespacedSettings", () => {
 		 */
 		const namespaced = new NamespacedSettings(settings, "test/path");
 		await namespaced.set({ foo: "initial", count: 1 });
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		await namespaced.update((current) => ({
 			...current,
 			count: current.count + 1,
 		}));
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		expect(namespaced.get()).toEqual({
 			foo: "initial",
@@ -150,7 +150,7 @@ describe("NamespacedSettings", () => {
 		const parent = child.getParent();
 
 		await child.set({ foo: "test", count: 1 });
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		expect(parent.get()).toEqual({
 			child: { foo: "test", count: 1 },
@@ -166,7 +166,7 @@ describe("NamespacedSettings", () => {
 		const child = parent.getChild<TestData>("child");
 
 		await child.set({ foo: "test", count: 1 });
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		expect(settings.get()).toEqual({
 			parent: {
@@ -181,7 +181,7 @@ describe("NamespacedSettings", () => {
 		 */
 		const namespaced = new NamespacedSettings(settings, "test/path");
 		await namespaced.set({ foo: "test", count: 1 });
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		expect(namespaced.exists()).toBe(true);
 	});
@@ -202,10 +202,10 @@ describe("NamespacedSettings", () => {
 		 */
 		const namespaced = new NamespacedSettings(settings, "test/path");
 		await namespaced.set({ foo: "test", count: 1 });
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		await namespaced.delete();
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		expect(namespaced.exists()).toBe(false);
 		expect(namespaced.get()).toEqual({});
@@ -228,7 +228,7 @@ describe("NamespacedSettings", () => {
 			foo: "new",
 			count: 2,
 		});
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		// Called once upon subscription and once after setting a new value
 		expect(listener).toHaveBeenCalledTimes(2);
@@ -250,12 +250,12 @@ describe("NamespacedSettings", () => {
 		await namespaced.set({
 			debugging: true,
 		});
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		await namespaced.set({
 			debugging: false,
 		});
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 		// Called once upon subscription and once after setting a new value
 		expect(listener).toHaveBeenCalledTimes(3);
 		expect(namespaced.get()).toEqual({
@@ -276,7 +276,7 @@ describe("NamespacedSettings", () => {
 			foo: "new",
 			count: 42,
 		});
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		// Only called once upon initial subscription
 		expect(listener).toHaveBeenCalledTimes(1);
@@ -303,7 +303,7 @@ describe("NamespacedSettings", () => {
 
 		// Force update notification
 		await settings.update((current) => ({ ...current }));
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		// Now check both the raw settings and the namespaced view
 		expect(settings.get()).toEqual({
@@ -343,7 +343,7 @@ describe("NamespacedSettings", () => {
 			],
 		}));
 		await settings.save();
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		const listItem = new NamespacedSettings(
 			settings,
@@ -356,7 +356,7 @@ describe("NamespacedSettings", () => {
 
 		// Force update notification
 		await settings.update((current) => ({ ...current }));
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		// Check both raw settings and namespaced view
 		expect(settings.get()).toEqual({
@@ -385,12 +385,12 @@ describe("NamespacedSettings", () => {
 				{ guid: "456", foo: "other", count: 2 },
 			],
 		}));
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		const listItem = new NamespacedSettings(settings, "folders/[guid=123]");
 
 		await listItem.delete();
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		expect(settings.get()).toEqual({
 			folders: [{ guid: "456", foo: "other", count: 2 }],
@@ -408,7 +408,7 @@ describe("NamespacedSettings", () => {
 			"test-2": 4,
 			other: 5,
 		}));
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		const testSettings = new NamespacedSettings(settings, "(test-*)");
 		expect(testSettings.get()).toEqual({
@@ -428,7 +428,7 @@ describe("NamespacedSettings", () => {
 			"feature-2": false,
 			"not-matching": "should be ignored",
 		});
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		expect(settings.get()).toEqual({
 			"feature-1": true,
@@ -445,7 +445,7 @@ describe("NamespacedSettings", () => {
 		const child = parent.getChild<TestData>("child");
 
 		await child.set({ foo: "value", count: 10 });
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		expect(settings.get()).toEqual({
 			parent: {
@@ -503,7 +503,7 @@ describe("NamespacedSettings", () => {
 		namespaced.subscribe(listener);
 
 		await namespaced.flush();
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		// Called once upon subscription and once after flush
 		expect(listener).toHaveBeenCalledTimes(2);
@@ -526,11 +526,11 @@ describe("NamespacedSettings", () => {
 				data: true,
 			},
 		}));
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		const namespaced = new NamespacedSettings(settings, "new/namespace");
 		await namespaced.set({ foo: "test", count: 1 });
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		expect(settings.get()).toEqual({
 			existing: {
@@ -558,7 +558,7 @@ describe("NamespacedSettings", () => {
 				path: { foo: "external", count: 99 },
 			},
 		}));
-		mockTime.setTime(mockTime.getTime() + 30);
+		mockTime.setTime(mockTime.now() + 30);
 
 		expect(listener).toHaveBeenCalledTimes(2);
 		expect(namespaced.get()).toEqual({

__tests__/TestTimeProvider.ts

@@ -14,11 +14,11 @@ describe("MockTimeProvider debounce", () => {
 		expect(mockFn).not.toHaveBeenCalled();
 
 		// Advance time by 500ms
-		mockTime.setTime(mockTime.getTime() + 500);
+		mockTime.setTime(mockTime.now() + 500);
 		expect(mockFn).not.toHaveBeenCalled();
 
 		// Advance time to just after the delay
-		mockTime.setTime(mockTime.getTime() + 501);
+		mockTime.setTime(mockTime.now() + 501);
 		expect(mockFn).toHaveBeenCalledTimes(1);
 	});
 
@@ -31,15 +31,15 @@ describe("MockTimeProvider debounce", () => {
 		debouncedFn();
 
 		// Advance 300ms and call again
-		mockTime.setTime(mockTime.getTime() + 300);
+		mockTime.setTime(mockTime.now() + 300);
 		debouncedFn();
 
 		// Advance another 300ms and call again
-		mockTime.setTime(mockTime.getTime() + 300);
+		mockTime.setTime(mockTime.now() + 300);
 		debouncedFn();
 
 		// Advance time to trigger the last debounced call
-		mockTime.setTime(mockTime.getTime() + 1000);
+		mockTime.setTime(mockTime.now() + 1000);
 
 		expect(mockFn).toHaveBeenCalledTimes(1);
 	});
@@ -53,7 +53,7 @@ describe("MockTimeProvider debounce", () => {
 		debouncedFn("test", 123);
 
 		// Advance time past delay
-		mockTime.setTime(mockTime.getTime() + 1001);
+		mockTime.setTime(mockTime.now() + 1001);
 
 		// Check if function was called with correct arguments
 		expect(mockFn).toHaveBeenCalledWith("test", 123);
@@ -68,17 +68,17 @@ describe("MockTimeProvider debounce", () => {
 		debouncedFn();
 
 		// Advance time almost to delay
-		mockTime.setTime(mockTime.getTime() + 900);
+		mockTime.setTime(mockTime.now() + 900);
 
 		// Second call - should reset timer
 		debouncedFn();
 
 		// Advance time past first delay but not second
-		mockTime.setTime(mockTime.getTime() + 200);
+		mockTime.setTime(mockTime.now() + 200);
 		expect(mockFn).not.toHaveBeenCalled();
 
 		// Advance time past second delay
-		mockTime.setTime(mockTime.getTime() + 801);
+		mockTime.setTime(mockTime.now() + 801);
 		expect(mockFn).toHaveBeenCalledTimes(1);
 	});
 
@@ -90,11 +90,11 @@ describe("MockTimeProvider debounce", () => {
 		debouncedFn();
 
 		// Advance time by 400ms
-		mockTime.setTime(mockTime.getTime() + 400);
+		mockTime.setTime(mockTime.now() + 400);
 		expect(mockFn).not.toHaveBeenCalled();
 
 		// Advance time past default delay
-		mockTime.setTime(mockTime.getTime() + 101);
+		mockTime.setTime(mockTime.now() + 101);
 		expect(mockFn).toHaveBeenCalledTimes(1);
 	});
 });

__tests__/TestTokenStore.ts

@@ -17,7 +17,7 @@ async function _testTokenStore() {
 	) => {
 		testTimeProvider.setTimeout(() => {
 			callback({
-				token: (testTimeProvider.getTime() + 30 * 60 * 1000).toString(),
+				token: (testTimeProvider.now() + 30 * 60 * 1000).toString(),
 			});
 		}, 100);
 	};
@@ -49,23 +49,23 @@ async function _testTokenStore() {
 	]);
 
 	// Advance time for response to happen
-	testTimeProvider.setTime(testTimeProvider.getTime() + 1000); // Advance time by 1 second
+	testTimeProvider.setTime(testTimeProvider.now() + 1000); // Advance time by 1 second
 
 	await tokenPromise;
 
 	tokenStore.log(tokenStore.report());
 
 	// Advance time to trigger refresh of tokens close to expiry
-	testTimeProvider.setTime(testTimeProvider.getTime() + 5 * 60 * 1000); // Advance time by 5 minutes
+	testTimeProvider.setTime(testTimeProvider.now() + 5 * 60 * 1000); // Advance time by 5 minutes
 	tokenStore.log(tokenStore.report());
 
-	testTimeProvider.setTime(testTimeProvider.getTime() + 20 * 60 * 1000); // Advance time by 20 minutes
+	testTimeProvider.setTime(testTimeProvider.now() + 20 * 60 * 1000); // Advance time by 20 minutes
 	tokenStore.log(tokenStore.report());
 	// Stop the TokenStore processing to clean up
 	tokenStore.stop();
 
-	testTimeProvider.setTime(testTimeProvider.getTime() + 1000); // Advance time by 1 second
-	testTimeProvider.setTime(testTimeProvider.getTime() + 1000); // Advance time by 1 second
+	testTimeProvider.setTime(testTimeProvider.now() + 1000); // Advance time by 1 second
+	testTimeProvider.setTime(testTimeProvider.now() + 1000); // Advance time by 1 second
 	tokenStore.log(tokenStore.report());
 
 	tokenStore.clearState();
@@ -88,7 +88,7 @@ describe("token store", () => {
 				log: () => undefined,
 				refresh: failingRefresh,
 				getTimeProvider: () => tp,
-				getJwtExpiry: () => tp.getTime() + 1000,
+				getJwtExpiry: () => tp.now() + 1000,
 			},
 			1,
 		);

__tests__/mocks/MockTimeProvider.ts

@@ -13,13 +13,11 @@ export class MockTimeProvider implements TimeProvider {
 		this.currentTime = Date.now();
 	}
 
-	getTime(): number {
+	now(): number {
 		return this.currentTime;
 	}
 
 	setTime(newTime: number): void {
-		const diff = (newTime - this.currentTime) / 1000;
-		console.log(`setting time to ${newTime} (+${diff}s)`);
 		this.currentTime = newTime;
 		this.checkTimers();
 	}
@@ -97,10 +95,8 @@ export class MockTimeProvider implements TimeProvider {
 	}
 
 	private checkTimers(): void {
-		console.log(this.timers);
 		this.timers.forEach((timer) => {
 			if (this.currentTime >= timer.triggerTime) {
-				console.log("timer triggered");
 				timer.callback();
 				// eslint-disable-next-line @typescript-eslint/no-explicit-any
 				const id = <any>timer.id;