refactor: consume Commonlib as a package

test/contracts/serviceContext.ts

@@ -0,0 +1,75 @@
+import type { ServiceContextContract } from "@vrtmrz/livesync-commonlib/context";
+import type { ServiceHub } from "@vrtmrz/livesync-commonlib/compat/services/ServiceHub";
+
+export const SERVICE_CONTEXT_MEMBERS = [
+    "API",
+    "path",
+    "database",
+    "databaseEvents",
+    "replicator",
+    "fileProcessing",
+    "replication",
+    "remote",
+    "conflict",
+    "appLifecycle",
+    "setting",
+    "tweakValue",
+    "vault",
+    "test",
+    "UI",
+    "config",
+    "keyValueDB",
+    "control",
+] as const satisfies readonly Exclude<keyof ServiceHub, "context">[];
+
+export type ServiceContextMember = (typeof SERVICE_CONTEXT_MEMBERS)[number];
+type MissingServiceContextMember = Exclude<Exclude<keyof ServiceHub, "context">, ServiceContextMember>;
+const serviceContextMembersAreExhaustive: [MissingServiceContextMember] extends [never] ? true : never = true;
+void serviceContextMembersAreExhaustive;
+
+export type ServiceContextResult = {
+    translation: string;
+    receivedEvents: string[];
+};
+
+export type ServiceCompositionResult = {
+    hubUsesExpectedContext: boolean;
+    servicesUsingExpectedContext: Record<ServiceContextMember, boolean>;
+};
+
+/**
+ * Observe the host-neutral results promised by ServiceContextContract.
+ *
+ * The caller chooses the translation key because translated text is
+ * host-configured. Event delivery itself is shared behaviour.
+ */
+export function observeServiceContext(context: ServiceContextContract, translationKey: string): ServiceContextResult {
+    const receivedEvents: string[] = [];
+    const unsubscribe = context.events.onEvent("hello", (value) => receivedEvents.push(value));
+    try {
+        context.events.emitEvent("hello", "context-contract-event");
+    } finally {
+        unsubscribe();
+    }
+    return {
+        translation: context.translate(translationKey),
+        receivedEvents,
+    };
+}
+
+/**
+ * Inspect whether a Service Hub and all public services preserve one exact
+ * context object instead of silently constructing or substituting another.
+ */
+export function observeServiceComposition(
+    hub: { readonly context: ServiceContextContract },
+    expectedContext: ServiceContextContract
+): ServiceCompositionResult {
+    const members = hub as unknown as Record<ServiceContextMember, { readonly context: ServiceContextContract }>;
+    return {
+        hubUsesExpectedContext: hub.context === expectedContext,
+        servicesUsingExpectedContext: Object.fromEntries(
+            SERVICE_CONTEXT_MEMBERS.map((member) => [member, members[member].context === expectedContext])
+        ) as Record<ServiceContextMember, boolean>,
+    };
+}

test/e2e-obsidian/README.md

@@ -4,7 +4,7 @@ This directory contains the experimental real Obsidian end-to-end runner.
 
 The generic application discovery, isolated-vault, plug-in installation, process lifecycle, CLI, CDP, and readiness implementation comes from `@vrtmrz/obsidian-test-session`. The small modules under `runner/` preserve LiveSync's existing imports and supply its plug-in ID and artefact location. LiveSync-specific fixtures, services, settings, workflows, and assertions remain in this repository.
 
-The current smoke runner verifies only the launch path:
+The current smoke runner verifies the launch path and the loaded plug-in's Service Context composition:
 
 1. create a temporary vault,
 2. install the built Self-hosted LiveSync plug-in artifacts,
@@ -13,8 +13,10 @@ The current smoke runner verifies only the launch path:
 5. enable Obsidian community plug-ins for the temporary app profile,
 6. reload Self-hosted LiveSync through `obsidian-cli`,
 7. verify through `obsidian-cli eval` that the plug-in is loaded,
-8. optionally drive a real vault or CouchDB workflow through Obsidian's own API,
-9. terminate Obsidian and remove the temporary vault.
+8. observe event and translation results from the actual `ObsidianServiceContext`,
+9. verify that the Service Hub and every exposed service retain that exact Context,
+10. optionally drive a real vault or CouchDB workflow through Obsidian's own API, and
+11. terminate Obsidian and remove the temporary vault.
 
 The runner does not require Self-hosted LiveSync to expose an E2E-only bridge. Readiness is checked from outside the plug-in through Obsidian's own CLI.
 
@@ -45,6 +47,10 @@ These tests are intended for local verification, not the default CI gate. Reuse
 ## Commands
 
 ```bash
+npm run test:contract:contexts
+npm run test:contract:context:webapp
+npm run test:contract:context:cli
+npm run test:contract:context:obsidian
 npm run test:e2e:obsidian:install-appimage
 npm run test:e2e:obsidian:discover
 npm run test:e2e:obsidian:cli-help -- vaults verbose
@@ -62,6 +68,10 @@ npm run test:e2e:obsidian:local-suite
 npm run test:e2e:obsidian:local-suite:services
 ```
 
+`test:contract:contexts` runs the directly observable host contract against the Obsidian, CLI, and Webapp compositions. It verifies event and translation results, host-specific capabilities, and that the CLI and Webapp Service Hubs pass one exact Context to all exposed services. `test:contract:context:webapp` runs only the Webapp part.
+
+`test:contract:context:cli` builds the Node CLI and runs its existing Deno setup, put, read, list, information, remove, conflict-resolution, and revision workflow. `test:contract:context:obsidian` builds the plug-in and runs the real-Obsidian smoke test, including the Context inspection. These runtime scripts are local validation entry points and are not added to the default CI gate by this change.
+
 `test:e2e:obsidian:local-suite` builds the plug-in and, unless `LIVESYNC_CLI_COMMAND` selects an external CLI, the local LiveSync CLI. It then runs discovery, smoke, vault reflection, CouchDB upload, CLI-to-Obsidian synchronisation, Object Storage upload, startup scan, two-vault synchronisation, Hidden File Sync, Customisation Sync, and setting Markdown export in sequence. Start the local CouchDB and MinIO fixtures before running it, or use `test:e2e:obsidian:local-suite:services` to let the wrapper stop leftover fixtures, start fresh fixtures, and stop them again after the run.
 
 `test:e2e:obsidian:couchdb-upload` reuses the CouchDB variables from `.test.env` or the process environment. It expects a reachable CouchDB service, creates a unique database, configures Self-hosted LiveSync through `obsidian-cli eval`, creates a note in real Obsidian, commits the note into the local database, runs one-shot synchronisation, and verifies that the remote database contains both the metadata document and its chunk documents.

test/e2e-obsidian/runner/liveSyncWorkflow.ts

@@ -1,4 +1,5 @@
 import { evalObsidianJson } from "./cli.ts";
+import { SERVICE_CONTEXT_MEMBERS } from "../../contracts/serviceContext.ts";
 import type { CouchDbConfig } from "./couchdb.ts";
 import type { ObjectStorageConfig } from "./objectStorage.ts";
 
@@ -20,6 +21,17 @@ export type CoreReadiness = {
     appReady: boolean;
 };
 
+export type ObsidianServiceContextContractResult = {
+    contextType: string;
+    eventResult: string[];
+    translationResult: string;
+    hubUsesContext: boolean;
+    serviceContextMismatches: string[];
+    appCapabilityMatches: boolean;
+    pluginCapabilityMatches: boolean;
+    liveSyncPluginCapabilityMatches: boolean;
+};
+
 export type LocalDatabaseEntry = {
     id: string;
     rev: string;
@@ -172,6 +184,68 @@ export async function waitForLiveSyncCoreReady(
     throw new Error(`Timed out waiting for Self-hosted LiveSync core readiness: ${JSON.stringify(lastReadiness)}`);
 }
 
+/**
+ * Inspect the actual Obsidian composition through Obsidian's CLI.
+ *
+ * This observes public Context results and verifies that the Hub and every
+ * exposed service retain the exact Context created by the plug-in host.
+ */
+export async function inspectObsidianServiceContextContract(
+    cliBinary: string,
+    env: NodeJS.ProcessEnv
+): Promise<ObsidianServiceContextContractResult> {
+    return await evalObsidianJson<ObsidianServiceContextContractResult>(
+        cliBinary,
+        [
+            "(async()=>{",
+            "const plugin=app.plugins.plugins['obsidian-livesync'];",
+            "const services=plugin.core.services;",
+            "const context=services.context;",
+            `const serviceNames=${JSON.stringify(SERVICE_CONTEXT_MEMBERS)};`,
+            "const eventResult=[];",
+            "const unsubscribe=context.events.onEvent('hello',(value)=>eventResult.push(value));",
+            "try{context.events.emitEvent('hello','context-contract-event');}finally{unsubscribe();}",
+            "return JSON.stringify({",
+            "contextType:context.constructor.name,",
+            "eventResult,",
+            "translationResult:context.translate('Replicator.Message.InitialiseFatalError'),",
+            "hubUsesContext:services.context===context,",
+            "serviceContextMismatches:serviceNames.filter((name)=>services[name].context!==context),",
+            "appCapabilityMatches:context.app===app,",
+            "pluginCapabilityMatches:context.plugin===plugin,",
+            "liveSyncPluginCapabilityMatches:context.liveSyncPlugin===plugin,",
+            "});",
+            "})()",
+        ].join(""),
+        env
+    );
+}
+
+export function assertObsidianServiceContextContract(result: ObsidianServiceContextContractResult): void {
+    assertEqual(result.contextType, "ObsidianServiceContext", "Unexpected Obsidian service Context type.");
+    assertEqual(result.hubUsesContext, true, "The Obsidian Service Hub substituted its host Context.");
+    assertEqual(
+        result.serviceContextMismatches.length,
+        0,
+        `Services used a different Context: ${result.serviceContextMismatches.join(", ")}`
+    );
+    assertEqual(
+        JSON.stringify(result.eventResult),
+        JSON.stringify(["context-contract-event"]),
+        "The Obsidian Context event API returned an unexpected result."
+    );
+    if (result.translationResult.length === 0) {
+        throw new Error("The Obsidian Context translator returned an empty result.");
+    }
+    assertEqual(result.appCapabilityMatches, true, "The Obsidian Context lost its App capability.");
+    assertEqual(result.pluginCapabilityMatches, true, "The Obsidian Context lost its Plugin capability.");
+    assertEqual(
+        result.liveSyncPluginCapabilityMatches,
+        true,
+        "The Obsidian Context lost its Self-hosted LiveSync plug-in capability."
+    );
+}
+
 export async function prepareRemote(cliBinary: string, env: NodeJS.ProcessEnv): Promise<void> {
     await evalObsidianJson<unknown>(
         cliBinary,

test/e2e-obsidian/scripts/smoke.ts

@@ -1,4 +1,8 @@
 import { discoverObsidianCli, requireObsidianBinary } from "../runner/environment.ts";
+import {
+    assertObsidianServiceContextContract,
+    inspectObsidianServiceContextContract,
+} from "../runner/liveSyncWorkflow.ts";
 import { startObsidianLiveSyncSession, type ObsidianLiveSyncSession } from "../runner/session.ts";
 import { createTemporaryVault } from "../runner/vault.ts";
 
@@ -25,6 +29,11 @@ async function main(): Promise<void> {
         console.log(
             `Obsidian plug-in ready: ${readiness.pluginId}@${readiness.pluginVersion} in ${readiness.vaultName}`
         );
+        const contextContract = await inspectObsidianServiceContextContract(cli.binary, session.cliEnv);
+        assertObsidianServiceContextContract(contextContract);
+        console.log(
+            `Obsidian service Context contract passed: ${contextContract.contextType}, ${contextContract.serviceContextMismatches.length} mismatches.`
+        );
         await new Promise((resolve) => setTimeout(resolve, Number(process.env.E2E_OBSIDIAN_SMOKE_TIMEOUT_MS ?? 1000)));
         console.log("Obsidian stayed alive after the plug-in readiness check.");
     } finally {

test/harness/harness.ts

@@ -1,10 +1,10 @@
 import { App } from "@/deps.ts";
 import ObsidianLiveSyncPlugin from "@/main";
-import { DEFAULT_SETTINGS, type ObsidianLiveSyncSettings } from "@/lib/src/common/types";
-import { LOG_LEVEL_VERBOSE, setGlobalLogFunction } from "@lib/common/logger";
+import { DEFAULT_SETTINGS, type ObsidianLiveSyncSettings } from "@vrtmrz/livesync-commonlib/compat/common/types";
+import { LOG_LEVEL_VERBOSE, setGlobalLogFunction } from "@vrtmrz/livesync-commonlib/compat/common/logger";
 import { SettingCache } from "./obsidian-mock";
 import { delay, fireAndForget, promiseWithResolvers } from "octagonal-wheels/promises";
-import { EVENT_PLATFORM_UNLOADED } from "@lib/events/coreEvents";
+import { EVENT_PLATFORM_UNLOADED } from "@vrtmrz/livesync-commonlib/compat/events/coreEvents";
 import { EVENT_LAYOUT_READY, eventHub } from "@/common/events";
 
 import { env } from "../suite/variables";

test/lib/commands.ts

@@ -1,4 +1,4 @@
-import type { P2PSyncSetting } from "@/lib/src/common/types";
+import type { P2PSyncSetting } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { delay } from "octagonal-wheels/promises";
 import type { BrowserContext, Page } from "playwright";
 import type { Plugin } from "vitest/config";

test/lib/ui.ts

@@ -1,5 +1,5 @@
 import { page } from "vitest/browser";
-import { delay } from "@/lib/src/common/utils";
+import { delay } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 
 export async function waitForDialogShown(dialogText: string, timeout = 500) {
     const ttl = Date.now() + timeout;

test/lib/util.ts

@@ -1,4 +1,4 @@
-import { delay } from "@/lib/src/common/utils";
+import { delay } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 
 export async function waitTaskWithFollowups<T>(
     task: Promise<T>,

test/suite/db_common.ts

@@ -1,7 +1,7 @@
 import { compareMTime, EVEN } from "@/common/utils";
 import { TFile, type DataWriteOptions } from "@/deps";
-import type { FilePath } from "@/lib/src/common/types";
-import { isDocContentSame, readContent } from "@/lib/src/common/utils";
+import type { FilePath } from "@vrtmrz/livesync-commonlib/compat/common/types";
+import { isDocContentSame, readContent } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import { waitForIdle, type LiveSyncHarness } from "../harness/harness";
 import { expect } from "vitest";
 

test/suite/onlylocaldb.test.ts

@@ -1,8 +1,8 @@
 import { beforeAll, describe, expect, it, test } from "vitest";
 import { generateHarness, waitForIdle, waitForReady, type LiveSyncHarness } from "../harness/harness";
 import { TFile } from "@/deps.ts";
-import { DEFAULT_SETTINGS, type FilePath, type ObsidianLiveSyncSettings } from "@/lib/src/common/types";
-import { isDocContentSame, readContent } from "@/lib/src/common/utils";
+import { DEFAULT_SETTINGS, type FilePath, type ObsidianLiveSyncSettings } from "@vrtmrz/livesync-commonlib/compat/common/types";
+import { isDocContentSame, readContent } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import { DummyFileSourceInisialised, generateBinaryFile, generateFile, init } from "../utils/dummyfile";
 
 const localdb_test_setting = {

test/suite/sync.senario.basic.ts

@@ -3,7 +3,7 @@
 // and edge, resolving conflicts, etc. will be covered in separate test suites.
 import { afterAll, beforeAll, describe, expect, it, test } from "vitest";
 import { generateHarness, waitForIdle, waitForReady, type LiveSyncHarness } from "../harness/harness";
-import { RemoteTypes, type FilePath, type ObsidianLiveSyncSettings } from "@/lib/src/common/types";
+import { RemoteTypes, type FilePath, type ObsidianLiveSyncSettings } from "@vrtmrz/livesync-commonlib/compat/common/types";
 
 import {
     DummyFileSourceInisialised,
@@ -13,7 +13,7 @@ import {
     generateFile,
 } from "../utils/dummyfile";
 import { checkStoredFileInDB, testFileRead, testFileWrite } from "./db_common";
-import { delay } from "@/lib/src/common/utils";
+import { delay } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import { commands } from "vitest/browser";
 import { closeReplication, performReplication, prepareRemote } from "./sync_common";
 import type { DataWriteOptions } from "@/deps.ts";

test/suite/sync.single.test.ts

@@ -7,7 +7,7 @@ import {
     PREFERRED_SETTING_SELF_HOSTED,
     RemoteTypes,
     type ObsidianLiveSyncSettings,
-} from "@/lib/src/common/types";
+} from "@vrtmrz/livesync-commonlib/compat/common/types";
 
 import { defaultFileOption } from "./db_common";
 import { syncBasicCase } from "./sync.senario.basic.ts";

test/suite/sync.test.ts

@@ -7,7 +7,7 @@ import {
     PREFERRED_SETTING_SELF_HOSTED,
     RemoteTypes,
     type ObsidianLiveSyncSettings,
-} from "@/lib/src/common/types";
+} from "@vrtmrz/livesync-commonlib/compat/common/types";
 
 import { defaultFileOption } from "./db_common";
 import { syncBasicCase } from "./sync.senario.basic.ts";

test/suite/sync_common.ts

@@ -1,10 +1,10 @@
 import { expect } from "vitest";
 import { waitForIdle, type LiveSyncHarness } from "../harness/harness";
-import { RemoteTypes, type ObsidianLiveSyncSettings } from "@/lib/src/common/types";
+import { RemoteTypes, type ObsidianLiveSyncSettings } from "@vrtmrz/livesync-commonlib/compat/common/types";
 
-import { delay, fireAndForget } from "@/lib/src/common/utils";
+import { delay, fireAndForget } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import { commands } from "vitest/browser";
-import { LiveSyncTrysteroReplicator } from "@/lib/src/replication/trystero/LiveSyncTrysteroReplicator";
+import { LiveSyncTrysteroReplicator } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/LiveSyncTrysteroReplicator";
 import { waitTaskWithFollowups } from "../lib/util";
 async function waitForP2PPeers(harness: LiveSyncHarness) {
     if (harness.plugin.core.settings.remoteType === RemoteTypes.REMOTE_P2P) {

test/suite/variables.ts

@@ -1,10 +1,10 @@
-import { DoctorRegulation } from "@/lib/src/common/configForDoc";
+import { DoctorRegulation } from "@vrtmrz/livesync-commonlib/compat/common/configForDoc";
 import {
     DEFAULT_SETTINGS,
     ChunkAlgorithms,
     AutoAccepting,
     type ObsidianLiveSyncSettings,
-} from "@/lib/src/common/types";
+} from "@vrtmrz/livesync-commonlib/compat/common/types";
 export const env = (import.meta as any).env;
 export const settingBase = {
     ...DEFAULT_SETTINGS,

test/suitep2p/sync_common_p2p.ts

@@ -7,9 +7,9 @@
  */
 import { expect } from "vitest";
 import { waitForIdle, type LiveSyncHarness } from "../harness/harness";
-import { RemoteTypes, type ObsidianLiveSyncSettings } from "@/lib/src/common/types";
-import { delay } from "@/lib/src/common/utils";
-import { LiveSyncTrysteroReplicator } from "@/lib/src/replication/trystero/LiveSyncTrysteroReplicator";
+import { RemoteTypes, type ObsidianLiveSyncSettings } from "@vrtmrz/livesync-commonlib/compat/common/types";
+import { delay } from "@vrtmrz/livesync-commonlib/compat/common/utils";
+import { LiveSyncTrysteroReplicator } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/LiveSyncTrysteroReplicator";
 import { waitTaskWithFollowups } from "../lib/util";
 
 const P2P_REPLICATION_TIMEOUT_MS = 180000;

test/suitep2p/syncp2p.p2p-down.test.ts

@@ -15,10 +15,10 @@ import {
     type FilePath,
     type ObsidianLiveSyncSettings,
     AutoAccepting,
-} from "@/lib/src/common/types";
+} from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { DummyFileSourceInisialised, generateBinaryFile, generateFile } from "../utils/dummyfile";
 import { defaultFileOption, testFileRead } from "../suite/db_common";
-import { delay } from "@/lib/src/common/utils";
+import { delay } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import { closeReplication, performReplication } from "./sync_common_p2p";
 import { settingBase } from "../suite/variables";
 

test/suitep2p/syncp2p.p2p-up.test.ts

@@ -17,7 +17,7 @@ import {
     RemoteTypes,
     type ObsidianLiveSyncSettings,
     AutoAccepting,
-} from "@/lib/src/common/types";
+} from "@vrtmrz/livesync-commonlib/compat/common/types";
 import {
     DummyFileSourceInisialised,
     FILE_SIZE_BINS,
@@ -26,7 +26,7 @@ import {
     generateFile,
 } from "../utils/dummyfile";
 import { checkStoredFileInDB, defaultFileOption, testFileWrite } from "../suite/db_common";
-import { delay } from "@/lib/src/common/utils";
+import { delay } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import { closeReplication, performReplication } from "./sync_common_p2p";
 import { settingBase } from "../suite/variables";
 

test/suitep2p/syncp2p.test.ts

@@ -7,7 +7,7 @@ import {
     PREFERRED_SETTING_SELF_HOSTED,
     RemoteTypes,
     type ObsidianLiveSyncSettings,
-} from "@/lib/src/common/types";
+} from "@vrtmrz/livesync-commonlib/compat/common/types";
 
 import { settingBase } from "../suite/variables.ts";
 import { defaultFileOption } from "../suite/db_common";

test/unit/dialog.test.ts

@@ -3,12 +3,12 @@ import { beforeAll, describe, expect, it } from "vitest";
 import { commands } from "vitest/browser";
 
 import { generateHarness, waitForIdle, waitForReady, type LiveSyncHarness } from "../harness/harness";
-import { ChunkAlgorithms, DEFAULT_SETTINGS, type ObsidianLiveSyncSettings } from "@/lib/src/common/types";
+import { ChunkAlgorithms, DEFAULT_SETTINGS, type ObsidianLiveSyncSettings } from "@vrtmrz/livesync-commonlib/compat/common/types";
 
 import { DummyFileSourceInisialised } from "../utils/dummyfile";
 
 import { page } from "vitest/browser";
-import { DoctorRegulation } from "@/lib/src/common/configForDoc";
+import { DoctorRegulation } from "@vrtmrz/livesync-commonlib/compat/common/configForDoc";
 import { waitForDialogHidden, waitForDialogShown } from "../lib/ui";
 const env = (import.meta as any).env;
 const dialog_setting_base = {

test/utils/dummyfile.ts

@@ -1,4 +1,4 @@
-import { DEFAULT_SETTINGS } from "@/lib/src/common/types.ts";
+import { DEFAULT_SETTINGS } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { readFile } from "../utils/fileapi.vite.ts";
 let charset = "";
 export async function init() {