refactor: organise source files by ownership

Separate host-independent helpers under common/core and colocate feature
support code with its owners. Update imports, tests, and source-layout
guidance while preserving runtime behaviour.

src/LiveSyncBaseCore.ts

@@ -28,7 +28,7 @@ import type { ServiceModules } from "@vrtmrz/livesync-commonlib/compat/interface
 import { usePrepareDatabaseForUse } from "@vrtmrz/livesync-commonlib/compat/serviceFeatures/prepareDatabaseForUse";
 import type { Constructor } from "@vrtmrz/livesync-commonlib/compat/common/utils.type";
 import { useReplicationScheduling, type ReplicationSchedulingControl } from "./serviceFeatures/replicationScheduling";
-import { createCentralReplicatorProviderDefinitions } from "./common/replicatorProviders";
+import { createCentralReplicatorProviderDefinitions } from "./common/core/replication/providers";
 import { useReplicationFeature } from "./serviceFeatures/replication";
 import { useConflictResolutionFeature } from "./serviceFeatures/conflictResolution";
 import { createInstanceLogFunction } from "@vrtmrz/livesync-commonlib/compat/services/lib/logUtils";

src/apps/cli/cliSettingsDefaults.ts

@@ -1,5 +1,5 @@
 import type { ObsidianLiveSyncSettings } from "@vrtmrz/livesync-commonlib/compat/common/types";
-import { createNewVaultSettings } from "@/common/newVaultSettings.ts";
+import { createNewVaultSettings } from "@/common/core/settings/newVaultSettings.ts";
 
 export function createDefaultCliSettings(): ObsidianLiveSyncSettings {
     return {

src/apps/cli/commands/runCommand.ts

@@ -27,7 +27,7 @@ import {
     REMOTE_RESOURCE_KINDS,
     USER_INITIATED_REPLICATION_AUTHORITY,
 } from "@vrtmrz/livesync-commonlib/replication";
-import { withOwnedRemoteResource } from "@/common/ownedRemoteResource";
+import { withOwnedRemoteResource } from "@/common/core/replication/ownedRemoteResource";
 import { runJournalSkipCommand } from "./journalSkip";
 import {
     isCentralRemoteAdministrationCommand,

src/apps/cli/initialFetchPathIdentity.ts

@@ -4,7 +4,7 @@ import {
     type ObsidianLiveSyncSettings,
 } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import type { RemoteConnectionProbe } from "@vrtmrz/livesync-commonlib/replication";
-import { resolveInitialPathIdentity } from "@/common/initialPathIdentity";
+import { resolveInitialPathIdentity } from "@/common/core/replication/initialPathIdentity";
 
 /** Adopt an existing central remote only for the first explicit Fetch. */
 export async function resolveInitialFetchPathIdentity(

src/common/core/replication/configurationIdentity.unit.spec.ts

@@ -4,7 +4,7 @@ import { createNewVaultSettings } from "@vrtmrz/livesync-commonlib/settings";
 import {
     getCouchDBReplicatorConfigurationIdentity,
     getObjectStorageReplicatorConfigurationIdentity,
-} from "./replicatorConfigurationIdentity";
+} from "./configurationIdentity";
 
 describe("active Replicator configuration identity", () => {
     it("treats an absent headers-only CouchDB cache switch as off and leaves Object Storage unaffected", () => {

src/common/core/replication/providers.ts

@@ -26,7 +26,7 @@ import { LiveSyncJournalReplicator } from "@vrtmrz/livesync-commonlib/compat/rep
 import {
     getCouchDBReplicatorConfigurationIdentity,
     getObjectStorageReplicatorConfigurationIdentity,
-} from "./replicatorConfigurationIdentity";
+} from "./configurationIdentity";
 import {
     createCouchDBJoinedDevicesResourceFactory,
     createObjectStorageJoinedDevicesResourceFactory,
@@ -38,7 +38,7 @@ import {
     createObjectStorageConnectionProbeFactory,
     createObjectStoragePreferredTweakProbeFactory,
     createObjectStorageSecuritySeedResourceFactory,
-} from "./replicatorResources";
+} from "./resources";
 import {
     COUCHDB_CENTRAL_REMOTE_ADMINISTRATION_CAPABILITY,
     OBJECT_STORAGE_CENTRAL_REMOTE_ADMINISTRATION_CAPABILITY,

src/common/core/replication/providers.unit.spec.ts

@@ -38,7 +38,7 @@ vi.mock("@vrtmrz/livesync-commonlib/compat/replication/journal/LiveSyncJournalRe
     },
 }));
 
-import { createCentralReplicatorProviderDefinitions } from "./replicatorProviders";
+import { createCentralReplicatorProviderDefinitions } from "./providers";
 
 describe("central Replicator provider definitions", () => {
     it("keeps the retained remote-resource catalogue bounded", () => {

src/common/core/replication/resources.unit.spec.ts

@@ -91,7 +91,7 @@ import {
     createObjectStorageJoinedDevicesResourceFactory,
     createObjectStoragePreferredTweakProbeFactory,
     createObjectStorageSecuritySeedResourceFactory,
-} from "./replicatorResources";
+} from "./resources";
 
 function createSettings(overrides: Partial<ObsidianLiveSyncSettings> = {}): ObsidianLiveSyncSettings {
     return Object.assign(createNewVaultSettings(), {

src/common/core/settings/turnPrivacy.unit.spec.ts

@@ -16,7 +16,7 @@ import {
     omitManagedTurnProfilesFromMarkdown,
     preserveManagedTurnProfilesOnMarkdownImport,
     redactTurnSettingsForReport,
-} from "./turnSettingsPrivacy";
+} from "./turnPrivacy";
 
 class MemorySettingService extends SettingService {
     saved?: ObsidianLiveSyncSettings;

src/features/ConfigSync/CmdConfigSync.applyContent.unit.spec.ts

@@ -47,7 +47,7 @@ vi.mock("@/common/events.ts", () => ({
 vi.mock("@/common/translation", () => ({
     $msg: vi.fn((message: string) => message),
 }));
-vi.mock("@/common/obsidianCommunityPlugins.ts", () => ({
+vi.mock("@/features/HiddenFileCommon/obsidianCommunityPlugins.ts", () => ({
     getObsidianCommunityPluginManager: vi.fn(),
 }));
 

src/features/ConfigSync/CmdConfigSync.applySettings.unit.spec.ts

@@ -43,7 +43,7 @@ vi.mock("@/common/events.ts", () => ({
 vi.mock("@/common/translation", () => ({
     $msg: vi.fn((message: string) => message),
 }));
-vi.mock("@/common/obsidianCommunityPlugins.ts", () => ({
+vi.mock("@/features/HiddenFileCommon/obsidianCommunityPlugins.ts", () => ({
     getObsidianCommunityPluginManager: vi.fn(),
 }));
 

src/features/ConfigSync/CmdConfigSync.catalogue.unit.spec.ts

@@ -26,7 +26,7 @@ vi.mock("@/common/events.ts", () => ({
     eventHub: { onEvent: vi.fn() },
 }));
 vi.mock("@/common/translation", () => ({ $msg: (message: string) => message }));
-vi.mock("@/common/obsidianCommunityPlugins.ts", () => ({ getObsidianCommunityPluginManager: vi.fn() }));
+vi.mock("@/features/HiddenFileCommon/obsidianCommunityPlugins.ts", () => ({ getObsidianCommunityPluginManager: vi.fn() }));
 
 import type { FilePathWithPrefix } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { createOptionalFileSyncDatabase, optionalFileEntry } from "../../../test/fixtures/optionalFileSyncDatabase";

src/features/ConfigSync/CmdConfigSync.command.unit.spec.ts

@@ -47,7 +47,7 @@ vi.mock("@/common/events.ts", () => ({
 vi.mock("@/common/translation", () => ({
     $msg: vi.fn((message: string) => message),
 }));
-vi.mock("@/common/obsidianCommunityPlugins.ts", () => ({
+vi.mock("@/features/HiddenFileCommon/obsidianCommunityPlugins.ts", () => ({
     getObsidianCommunityPluginManager: vi.fn(),
 }));
 

src/features/ConfigSync/CmdConfigSync.completion.unit.spec.ts

@@ -43,7 +43,7 @@ vi.mock("@/common/events.ts", () => ({
 vi.mock("@/common/translation", () => ({
     $msg: vi.fn((message: string) => message),
 }));
-vi.mock("@/common/obsidianCommunityPlugins.ts", () => ({
+vi.mock("@/features/HiddenFileCommon/obsidianCommunityPlugins.ts", () => ({
     getObsidianCommunityPluginManager: vi.fn(),
 }));
 

src/features/ConfigSync/CmdConfigSync.queue.unit.spec.ts

@@ -30,7 +30,7 @@ vi.mock("@/common/events.ts", () => ({
     eventHub: { onEvent: vi.fn() },
 }));
 vi.mock("@/common/translation", () => ({ $msg: (message: string) => message }));
-vi.mock("@/common/obsidianCommunityPlugins.ts", () => ({ getObsidianCommunityPluginManager: vi.fn() }));
+vi.mock("@/features/HiddenFileCommon/obsidianCommunityPlugins.ts", () => ({ getObsidianCommunityPluginManager: vi.fn() }));
 
 import { get } from "svelte/store";
 import { getDocData } from "@vrtmrz/livesync-commonlib/compat/common/utils";

src/features/ConfigSync/CmdConfigSync.readiness.unit.spec.ts

@@ -43,7 +43,7 @@ vi.mock("@/common/events.ts", () => ({
 vi.mock("@/common/translation", () => ({
     $msg: vi.fn((message: string) => message),
 }));
-vi.mock("@/common/obsidianCommunityPlugins.ts", () => ({
+vi.mock("@/features/HiddenFileCommon/obsidianCommunityPlugins.ts", () => ({
     getObsidianCommunityPluginManager: vi.fn(),
 }));
 

src/features/ConfigSync/CmdConfigSync.scanAllConfigFiles.unit.spec.ts

@@ -50,7 +50,7 @@ vi.mock("@/common/events.ts", () => ({
 vi.mock("@/common/translation", () => ({
     $msg: vi.fn((message: string) => message),
 }));
-vi.mock("@/common/obsidianCommunityPlugins.ts", () => ({
+vi.mock("@/features/HiddenFileCommon/obsidianCommunityPlugins.ts", () => ({
     getObsidianCommunityPluginManager: vi.fn(),
 }));
 

src/features/ConfigSync/CmdConfigSync.ts

@@ -67,7 +67,7 @@ import type { InjectableServiceHub } from "@vrtmrz/livesync-commonlib/compat/ser
 import type { LiveSyncCore } from "@/main.ts";
 import { LiveSyncError } from "@vrtmrz/livesync-commonlib/compat/common/LSError";
 import type { OptionalSyncFeatureMode } from "@/features/optionalSyncFeatures.ts";
-import { getObsidianCommunityPluginManager } from "@/common/obsidianCommunityPlugins.ts";
+import { getObsidianCommunityPluginManager } from "@/features/HiddenFileCommon/obsidianCommunityPlugins.ts";
 import { createModificationHandler } from "octagonal-wheels/modification";
 
 import type { HandlerOutcome } from "@vrtmrz/livesync-commonlib/compat/services/lib/HandlerUtils";

src/features/HiddenFileSync/CmdHiddenFileSync.ts

@@ -59,7 +59,7 @@ import type { OptionalFileEventOptions } from "@vrtmrz/livesync-commonlib/compat
 import { configureHiddenFileSyncMode, type ConfigureHiddenFileSyncResult } from "./configureHiddenFileSyncMode.ts";
 import { performBatchWithProgress } from "./performBatchWithProgress.ts";
 import type { OptionalSyncFeatureMode } from "@/features/optionalSyncFeatures.ts";
-import { getObsidianCommunityPluginManager } from "@/common/obsidianCommunityPlugins.ts";
+import { getObsidianCommunityPluginManager } from "@/features/HiddenFileCommon/obsidianCommunityPlugins.ts";
 import { $msg } from "@/common/translation";
 type SyncDirection = "push" | "pull" | "safe" | "pullForce" | "pushForce";
 

src/features/P2PSync/P2PReplicator/P2PReplicatorPaneView.ts

@@ -1,7 +1,7 @@
 import { Menu, WorkspaceLeaf } from "@/deps.ts";
 import ReplicatorPaneComponent from "./P2PReplicatorPane.svelte";
 import { mount } from "svelte";
-import { SvelteItemView } from "@/common/SvelteItemView.ts";
+import { SvelteItemView } from "@/modules/coreObsidian/UI/SvelteItemView.ts";
 
 import { unique } from "octagonal-wheels/collection";
 import { LOG_LEVEL_NOTICE, REMOTE_P2P } from "@vrtmrz/livesync-commonlib/compat/common/types";

src/features/P2PSync/P2PReplicator/P2PServerStatusPaneView.ts

@@ -1,6 +1,6 @@
 import { WorkspaceLeaf } from "@/deps.ts";
 import { mount } from "svelte";
-import { SvelteItemView } from "@/common/SvelteItemView.ts";
+import { SvelteItemView } from "@/modules/coreObsidian/UI/SvelteItemView.ts";
 import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore.ts";
 import type { P2PServiceViews } from "@vrtmrz/livesync-commonlib/p2p";
 import P2PServerStatusPane from "./P2PServerStatusPane.svelte";

src/features/ReviewHarness/reviewHarnessContract.ts

@@ -1,5 +1,5 @@
 import type { ObsidianLiveSyncSettings, SettingsMigrationState } from "@vrtmrz/livesync-commonlib/settings";
-import type { CompatibilityPause } from "@/common/databaseCompatibility.ts";
+import type { CompatibilityPause } from "@/serviceFeatures/compatibilityReview.evaluation.ts";
 import type { ReviewHarnessScenarioResult, ReviewHarnessScenarioStatus } from "./reviewHarnessTypes";
 
 export type { ReviewHarnessScenarioResult, ReviewHarnessScenarioStatus } from "./reviewHarnessTypes";

src/features/ReviewHarness/reviewHarnessContract.unit.spec.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { NEW_VAULT_SETTINGS, type SettingsMigrationState } from "@vrtmrz/livesync-commonlib/settings";
-import type { CompatibilityPause } from "@/common/databaseCompatibility.ts";
+import type { CompatibilityPause } from "@/serviceFeatures/compatibilityReview.evaluation.ts";
 import {
     REVIEW_HARNESS_SCENARIOS,
     REVIEW_HARNESS_SCENARIO_IDS,

src/features/ReviewHarness/reviewHarnessController.ts

@@ -1,5 +1,5 @@
 import type { ObsidianLiveSyncSettings, SettingsMigrationState } from "@vrtmrz/livesync-commonlib/settings";
-import type { CompatibilityPause } from "@/common/databaseCompatibility.ts";
+import type { CompatibilityPause } from "@/serviceFeatures/compatibilityReview.evaluation.ts";
 import {
     REVIEW_HARNESS_SCENARIOS,
     REVIEW_HARNESS_STATE_KEY,

src/features/ReviewHarness/reviewHarnessController.unit.spec.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from "vitest";
 import { NEW_VAULT_SETTINGS, type SettingsMigrationState } from "@vrtmrz/livesync-commonlib/settings";
-import type { CompatibilityPause } from "@/common/databaseCompatibility.ts";
+import type { CompatibilityPause } from "@/serviceFeatures/compatibilityReview.evaluation.ts";
 import { ReviewHarnessController, type ReviewHarnessRuntime } from "./reviewHarnessController";
 
 function migration(): SettingsMigrationState {

src/managers/ObsidianStorageEventManagerAdapter.ts

@@ -14,7 +14,7 @@ import type { FileEventItemSentinel } from "@vrtmrz/livesync-commonlib/compat/ma
 import type ObsidianLiveSyncPlugin from "@/main";
 import type { LiveSyncCore } from "@/main";
 import type { FileProcessingService } from "@vrtmrz/livesync-commonlib/compat/services/base/FileProcessingService";
-import { InternalFileToUXFileInfoStub, TFileToUXFileInfoStub } from "@/modules/coreObsidian/storageLib/utilObsidian";
+import { InternalFileToUXFileInfoStub, TFileToUXFileInfoStub } from "@/modules/coreObsidian/storage/utilObsidian";
 
 /**
  * Obsidian-specific type guard adapter

src/modules/coreFeatures/ModuleResolveMismatchedTweaks.ts

@@ -17,7 +17,7 @@ import { $msg, translateIfAvailable } from "@/common/translation";
 import type { InjectableServiceHub } from "@vrtmrz/livesync-commonlib/compat/services/implements/injectable/InjectableServiceHub";
 import type { LiveSyncCore } from "@/main.ts";
 import { REMOTE_COUCHDB, REMOTE_P2P } from "@vrtmrz/livesync-commonlib/compat/common/models/setting.const";
-import { withOwnedRemoteResource } from "@/common/ownedRemoteResource";
+import { withOwnedRemoteResource } from "@/common/core/replication/ownedRemoteResource";
 import {
     CENTRAL_COMPATIBILITY_REJECTION_REASONS,
     REMOTE_RESOURCE_KINDS,

src/modules/features/GlobalHistory/GlobalHistoryView.ts

@@ -1,7 +1,7 @@
 import { WorkspaceLeaf } from "@/deps.ts";
 import GlobalHistoryComponent from "./GlobalHistory.svelte";
 import type ObsidianLiveSyncPlugin from "@/main.ts";
-import { SvelteItemView } from "@/common/SvelteItemView.ts";
+import { SvelteItemView } from "@/modules/coreObsidian/UI/SvelteItemView.ts";
 import { mount } from "svelte";
 
 export const VIEW_TYPE_GLOBAL_HISTORY = "global-history";

src/modules/features/Log/LogPaneView.ts

@@ -1,7 +1,7 @@
 import { WorkspaceLeaf } from "@/deps.ts";
 import LogPaneComponent from "./LogPane.svelte";
 import type ObsidianLiveSyncPlugin from "@/main.ts";
-import { SvelteItemView } from "@/common/SvelteItemView.ts";
+import { SvelteItemView } from "@/modules/coreObsidian/UI/SvelteItemView.ts";
 import { $msg } from "@/common/translation";
 import { mount } from "svelte";
 export const VIEW_TYPE_LOG = "log-log";

src/modules/features/ModuleLog.diagnostics.unit.spec.ts

@@ -8,7 +8,7 @@ vi.mock("@/deps.ts", () => ({
     stringifyYaml: vi.fn(),
 }));
 vi.mock("./Log/LogPaneView.ts", () => ({ LogPaneView: class {}, VIEW_TYPE_LOG: "log" }));
-vi.mock("@/common/reportTool.ts", () => ({ generateReport: vi.fn() }));
+vi.mock("@/modules/features/ModuleLog/diagnostics/reportTool.ts", () => ({ generateReport: vi.fn() }));
 vi.mock("@/common/utils.ts", () => ({ isValidPath: () => true }));
 vi.mock("@/common/translation", () => ({ $msg: (key: string) => key }));
 vi.mock("@/common/events.ts", () => ({

src/modules/features/ModuleLog.ts

@@ -65,11 +65,11 @@ import {
 } from "@vrtmrz/livesync-commonlib/compat/services/lib/logUtils";
 import { NetworkWarningStyles } from "@vrtmrz/livesync-commonlib/compat/common/models/setting.const";
 import { compatGlobal } from "@vrtmrz/livesync-commonlib/compat/common/coreEnvFunctions";
-import { generateReport } from "@/common/reportTool.ts";
+import { generateReport } from "./ModuleLog/diagnostics/reportTool.ts";
 import {
     ANDROID_LINUX_PATH_COMPONENT_UTF8_WARNING_BOUNDARY,
     findPathComponentsExceedingUtf8Limit,
-} from "@/common/pathCompatibility.ts";
+} from "./ModuleLog/diagnostics/pathCompatibility.ts";
 
 // This module cannot be a core module because it depends on the Obsidian UI.
 

src/modules/features/ModuleLog.unit.spec.ts

@@ -11,7 +11,7 @@ vi.mock("./Log/LogPaneView.ts", () => ({ LogPaneView: class {}, VIEW_TYPE_LOG: "
 vi.mock("./StatusBarRenderer.ts", () => ({
     createStatusBarRenderer: vi.fn(() => ({ dispose: vi.fn() })),
 }));
-vi.mock("@/common/reportTool.ts", () => ({ generateReport: vi.fn() }));
+vi.mock("@/modules/features/ModuleLog/diagnostics/reportTool.ts", () => ({ generateReport: vi.fn() }));
 vi.mock("@/common/utils.ts", () => ({ isValidPath: () => true }));
 vi.mock("@/common/translation", () => ({ $msg: (key: string) => key }));
 vi.mock("@/common/events.ts", () => ({

src/modules/features/ModuleLog/diagnostics/reportTool.ts

@@ -1,9 +1,9 @@
-import { redactTurnSettingsForReport } from "./turnSettingsPrivacy";
+import { redactTurnSettingsForReport } from "@/common/core/settings/turnPrivacy";
 import { REMOTE_COUCHDB, REMOTE_MINIO } from "@vrtmrz/livesync-commonlib/compat/common/models/setting.const";
 import { DEFAULT_SETTINGS, type ObsidianLiveSyncSettings } from "@vrtmrz/livesync-commonlib/settings";
 import { generateCredentialObject } from "@vrtmrz/livesync-commonlib/compat/replication/httplib";
 import { parseHeaderValues } from "@vrtmrz/livesync-commonlib/compat/common/utils";
-import { requestToCouchDBWithCredentials } from "./utils";
+import { requestToCouchDBWithCredentials } from "@/common/utils";
 import { LOG_LEVEL_VERBOSE, Logger } from "@vrtmrz/livesync-commonlib/compat/common/logger";
 import { isCloudantURI } from "@vrtmrz/livesync-commonlib/compat/pouchdb/utils_couchdb";
 import { compatGlobal } from "@vrtmrz/livesync-commonlib/compat/common/coreEnvFunctions";

src/modules/features/ModuleLog/diagnostics/reportTool.unit.spec.ts

@@ -4,7 +4,7 @@ import { REMOTE_P2P } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 import { generateReport } from "./reportTool";
 
-vi.mock("./utils", () => ({ requestToCouchDBWithCredentials: vi.fn() }));
+vi.mock("../../../../common/utils", () => ({ requestToCouchDBWithCredentials: vi.fn() }));
 vi.mock("@vrtmrz/livesync-commonlib/compat/common/coreEnvFunctions", () => ({
     compatGlobal: { origin: "test", navigator: { userAgent: "test" } },
 }));

src/modules/features/ModuleObsidianDocumentHistory.ts

@@ -1,6 +1,6 @@
 import { type TFile } from "@/deps.ts";
 import { eventHub } from "@/common/events.ts";
-import { EVENT_REQUEST_SHOW_HISTORY } from "@/common/obsidianEvents.ts";
+import { EVENT_REQUEST_SHOW_HISTORY } from "./DocumentHistory/events.ts";
 import type { FilePathWithPrefix, LoadedEntry, DocumentID } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
 import { DocumentHistoryModal } from "./DocumentHistory/DocumentHistoryModal.ts";

src/modules/features/ModuleObsidianSettingAsMarkdown.ts

@@ -2,7 +2,7 @@ import {
     hasManagedTurnSettings,
     omitManagedTurnProfilesFromMarkdown,
     preserveManagedTurnProfilesOnMarkdownImport,
-} from "@/common/turnSettingsPrivacy";
+} from "@/common/core/settings/turnPrivacy";
 // import { PouchDB } from "../../lib/src/pouchdb/pouchdb-browser";
 import { isObjectDifferent } from "octagonal-wheels/object";
 import { EVENT_SETTING_SAVED, eventHub } from "@/common/events";

src/modules/features/ModuleObsidianSettingTab.ts

@@ -3,7 +3,7 @@ import { AbstractObsidianModule } from "@/modules/AbstractObsidianModule.ts";
 // import { PouchDB } from "../../lib/src/pouchdb/pouchdb-browser";
 import { EVENT_REQUEST_OPEN_SETTINGS, eventHub } from "@/common/events.ts";
 import type { LiveSyncCore } from "@/main.ts";
-import { openObsidianSettings } from "@/common/obsidianSettings.ts";
+import { openObsidianSettings } from "@/modules/coreObsidian/UI/obsidianSettings.ts";
 
 export class ModuleObsidianSettingDialogue extends AbstractObsidianModule {
     settingTab!: ObsidianLiveSyncSettingTab;

src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts

@@ -54,7 +54,7 @@ import {
 } from "./SettingPane.ts";
 import { JournalSyncCore } from "@vrtmrz/livesync-commonlib/compat/replication/journal/JournalSyncCore";
 import { MinioStorageAdapter } from "@vrtmrz/livesync-commonlib/compat/replication/journal/objectstore/MinioStorageAdapter";
-import { closeObsidianSettings } from "@/common/obsidianSettings.ts";
+import { closeObsidianSettings } from "@/modules/coreObsidian/UI/obsidianSettings.ts";
 import {
     createAdvancedSettingDefinitionGroups,
     createExtraMenuSettingDefinitions,
@@ -75,8 +75,8 @@ import type {
 } from "obsidian";
 import { createExtraMenuSettingSpecGroup, createGeneralSettingSpecGroups } from "./GeneralSettingSpecs.ts";
 import { SetupManager } from "@/modules/features/SetupManager.ts";
-import { isP2PMainRemote } from "@/common/remoteConfiguration.ts";
-import { withOwnedRemoteResource } from "@/common/ownedRemoteResource.ts";
+import { isP2PMainRemote } from "@/common/core/settings/remoteConfiguration.ts";
+import { withOwnedRemoteResource } from "@/common/core/replication/ownedRemoteResource.ts";
 import {
     getSyncGuardSettings,
     isSyncGuardSettingKey,

src/modules/features/SettingDialogue/PaneHatch.ts

@@ -23,7 +23,7 @@ import {
     eventHub,
 } from "@/common/events.ts";
 import { HiddenFileSync } from "@/features/HiddenFileSync/CmdHiddenFileSync.ts";
-import { EVENT_REQUEST_SHOW_HISTORY } from "@/common/obsidianEvents.ts";
+import { EVENT_REQUEST_SHOW_HISTORY } from "@/modules/features/DocumentHistory/events.ts";
 import type { ObsidianLiveSyncSettingTab } from "./ObsidianLiveSyncSettingTab.ts";
 import type { PageFunctions } from "./SettingPane.ts";
 import { setButtonDestructiveState } from "./settingComponentStyles.ts";

src/modules/features/SettingDialogue/PanePatches.ts

@@ -14,7 +14,7 @@ import { setButtonAdditionalActionState, setSettingAdditionalActionsState } from
 import { PouchDB } from "@vrtmrz/livesync-commonlib/compat/pouchdb/pouchdb-browser";
 import { ExtraSuffixIndexedDB } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { migrateDatabases } from "./settingUtils.ts";
-import { usesLegacyIndexedDBAdapter } from "@/common/compatibilitySettings.ts";
+import { usesLegacyIndexedDBAdapter } from "@/common/core/settings/compatibilitySettings.ts";
 import { $msg } from "@/common/translation";
 
 export function panePatches(this: ObsidianLiveSyncSettingTab, paneEl: HTMLElement, { addPanel }: PageFunctions): void {

src/modules/features/SettingDialogue/PaneRemoteConfig.ts

@@ -7,7 +7,7 @@ import {
     type ObsidianLiveSyncSettings,
     LOG_LEVEL_VERBOSE,
 } from "@vrtmrz/livesync-commonlib/compat/common/types";
-import { OPEN_JOINED_DEVICES } from "@/serviceFeatures/joinedDevicesCommand";
+import { OPEN_JOINED_DEVICES } from "@/serviceFeatures/joinedDevices/command";
 import { Menu, type ButtonComponent } from "@/deps.ts";
 import { $msg } from "@/common/translation";
 import { LiveSyncSetting as Setting } from "./LiveSyncSetting.ts";

src/modules/features/SettingDialogue/PaneRemoteConfig.unit.spec.ts

@@ -111,7 +111,7 @@ vi.mock("./remoteConfigBuffer.ts", () => ({
     syncActivatedRemoteSettings: vi.fn(),
 }));
 
-import { OPEN_JOINED_DEVICES } from "@/serviceFeatures/joinedDevicesCommand";
+import { OPEN_JOINED_DEVICES } from "@/serviceFeatures/joinedDevices/command";
 import { paneRemoteConfig } from "./PaneRemoteConfig.ts";
 
 function createPanelElement(): HTMLElement {

src/modules/features/SettingDialogue/utilFixCouchDBSetting.ts

@@ -12,8 +12,8 @@ import { isCloudantURI } from "@vrtmrz/livesync-commonlib/compat/pouchdb/utils_c
 import { generateCredentialObject } from "@vrtmrz/livesync-commonlib/compat/replication/httplib";
 import { compatGlobal } from "@vrtmrz/livesync-commonlib/compat/common/coreEnvFunctions";
 import { isUnauthorizedError } from "@vrtmrz/livesync-commonlib/compat/common/utils.doc";
-import { normaliseCouchDBConfiguration } from "@/common/couchdbConfiguration";
-import { isCouchDBVersionAtLeast, normaliseResponseHeaderKeys } from "@/modules/features/couchDBDiagnosticValues";
+import { normaliseCouchDBConfiguration } from "@/modules/features/SetupWizard/connection/couchdbConfiguration";
+import { isCouchDBVersionAtLeast, normaliseResponseHeaderKeys } from "@/modules/features/SetupWizard/connection/couchDBDiagnosticValues";
 
 export const checkConfig = async (
     checkResultDiv: HTMLDivElement | undefined,

src/modules/features/SetupManager.ts

@@ -8,7 +8,7 @@ import {
     REMOTE_MINIO,
 } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { normaliseAcceptUnencryptedContent } from "@vrtmrz/livesync-commonlib/settings";
-import { createNewVaultSettings } from "@/common/newVaultSettings";
+import { createNewVaultSettings } from "@/common/core/settings/newVaultSettings";
 import { upsertRemoteConfigurationInPlace } from "@vrtmrz/livesync-commonlib/remote-configurations";
 import { isObjectDifferent } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import Intro from "./SetupWizard/dialogs/Intro.svelte";
@@ -50,9 +50,9 @@ import {
     applySettingsWithScheduledInitialisation,
     type SetupInitialisationMode,
 } from "@/serviceFeatures/setupObsidian/setupActivationLifecycle.ts";
-import { isP2PMainRemote } from "@/common/remoteConfiguration.ts";
+import { isP2PMainRemote } from "@/common/core/settings/remoteConfiguration.ts";
 import { REMOTE_RESOURCE_KINDS } from "@vrtmrz/livesync-commonlib/replication";
-import { resolveInitialPathIdentity } from "@/common/initialPathIdentity";
+import { resolveInitialPathIdentity } from "@/common/core/replication/initialPathIdentity";
 import type { P2PConnectionProbeAdmission } from "@vrtmrz/livesync-commonlib/p2p";
 
 function copySettingsForRemoteProfileUpdate(settings: ObsidianLiveSyncSettings): ObsidianLiveSyncSettings {

src/modules/features/SetupManager.unit.spec.ts

@@ -9,7 +9,7 @@ import {
 } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { SettingService } from "@vrtmrz/livesync-commonlib/compat/services/base/SettingService";
 import { ServiceContext } from "@vrtmrz/livesync-commonlib/context";
-import { createNewVaultSettings } from "@/common/newVaultSettings";
+import { createNewVaultSettings } from "@/common/core/settings/newVaultSettings";
 import type {
     P2PConnectionProbeAdmission,
     P2PConnectionProbeAdmissionResult,

src/modules/features/SetupWizard/connection/couchDBChecks.ts

@@ -7,8 +7,8 @@ import { isCloudantURI } from "@vrtmrz/livesync-commonlib/compat/pouchdb/utils_c
 import { generateCredentialObject } from "@vrtmrz/livesync-commonlib/compat/replication/httplib";
 import { compatGlobal } from "@vrtmrz/livesync-commonlib/compat/common/coreEnvFunctions";
 import { isUnauthorizedError } from "@vrtmrz/livesync-commonlib/compat/common/utils.doc";
-import { normaliseCouchDBConfiguration } from "@/common/couchdbConfiguration";
-import { isCouchDBVersionAtLeast, normaliseResponseHeaderKeys } from "@/modules/features/couchDBDiagnosticValues";
+import { normaliseCouchDBConfiguration } from "./couchdbConfiguration";
+import { isCouchDBVersionAtLeast, normaliseResponseHeaderKeys } from "./couchDBDiagnosticValues";
 
 export type ResultMessage = { message: string; classes: string[] };
 export type ResultErrorMessage = { message: string; result: "error"; classes: string[] };

src/modules/features/SetupWizard/connection/couchDBConnectionProbe.ts

@@ -1,5 +1,5 @@
 import type { RemoteConnectionProbe, RemoteConnectionProbeResult } from "@vrtmrz/livesync-commonlib/replication";
-import { withOwnedRemoteResource } from "@/common/ownedRemoteResource";
+import { withOwnedRemoteResource } from "@/common/core/replication/ownedRemoteResource";
 
 /** Run the selected CouchDB setup mode within one owned probe lifetime. */
 export async function probeCouchDBConnection(

src/modules/features/SetupWizard/dialogs/PanelCouchDBCheck.svelte

@@ -5,11 +5,11 @@
     import type { ObsidianLiveSyncSettings } from "@vrtmrz/livesync-commonlib/compat/common/types";
     import Decision from "@/modules/services/LiveSyncUI/components/Decision.svelte";
     import UserDecisions from "@/modules/services/LiveSyncUI/components/UserDecisions.svelte";
-    import { checkConfig, type ConfigCheckResult, type ResultError, type ResultErrorMessage } from "./utilCheckCouchDB";
+    import { checkConfig, type ConfigCheckResult, type ResultError, type ResultErrorMessage } from "@/modules/features/SetupWizard/connection/couchDBChecks";
     import { LOG_LEVEL_VERBOSE, Logger } from "octagonal-wheels/common/logger";
     import { $msg as translateMessage } from "@/common/translation";
     import { getDialogContext } from "@/modules/services/LiveSyncUI/svelteDialog";
-    import { getCouchDBServerFixConfirmation } from "./couchDBServerFixConfirmation";
+    import { getCouchDBServerFixConfirmation } from "@/modules/features/SetupWizard/connection/couchDBServerFixConfirmation";
     type Props = {
         trialRemoteSetting: ObsidianLiveSyncSettings;
     };

src/modules/features/SetupWizard/dialogs/SetupRemoteBucket.svelte

@@ -20,7 +20,7 @@
     import { copyTo, pickBucketSyncSettings } from "@vrtmrz/livesync-commonlib/compat/common/utils";
     import { TYPE_CANCELLED, type SetupRemoteBucketResultType } from "./setupDialogTypes";
     import { $msg as translateMessage } from "@/common/translation";
-    import { withOwnedRemoteResource } from "@/common/ownedRemoteResource";
+    import { withOwnedRemoteResource } from "@/common/core/replication/ownedRemoteResource";
     import { REMOTE_RESOURCE_KINDS } from "@vrtmrz/livesync-commonlib/replication";
 
     const default_setting = pickBucketSyncSettings(DEFAULT_SETTINGS);

src/modules/features/SetupWizard/dialogs/SetupRemoteCouchDB.svelte

@@ -27,7 +27,7 @@
         type SetupRemoteCouchDBInitialData,
         type SetupRemoteCouchDBResultType,
     } from "./setupDialogTypes";
-    import { isValidCouchDBServerURL, probeCouchDBConnection } from "./couchDBConnectionProbe";
+    import { isValidCouchDBServerURL, probeCouchDBConnection } from "@/modules/features/SetupWizard/connection/couchDBConnectionProbe";
     import { $msg as translateMessage } from "@/common/translation";
     import { REMOTE_RESOURCE_KINDS } from "@vrtmrz/livesync-commonlib/replication";
 

src/modules/features/SetupWizard/dialogs/SetupRemoteP2P.svelte

@@ -44,7 +44,7 @@
     } from "./setupDialogTypes";
     import { LOG_LEVEL_VERBOSE, Logger } from "octagonal-wheels/common/logger";
     import { $msg as translateMessage } from "@/common/translation";
-    import { coordinateP2PSetupConnectionProbe, probeP2PSetupConnection } from "./p2pSetupConnectionProbe";
+    import { coordinateP2PSetupConnectionProbe, probeP2PSetupConnection } from "@/modules/features/SetupWizard/connection/p2pSetupConnectionProbe";
 
     const default_setting = pickP2PSyncSettings(DEFAULT_SETTINGS);
     let syncSetting = $state<P2PConnectionInfo>({ ...default_setting });

src/modules/services/ObsidianConfirm.ts

@@ -5,7 +5,7 @@ import { $msg } from "@/common/translation";
 import type { Confirm, ConfirmActionLayout } from "@vrtmrz/livesync-commonlib/compat/interfaces/Confirm";
 import { confirmAction, pickOne, promptPassword, promptText } from "@vrtmrz/obsidian-plugin-kit";
 import type { ObsidianServiceContext } from "@/modules/services/ObsidianServiceContext";
-import { confirmWithMessageWithWideButton } from "@/modules/coreObsidian/UILib/dialogs";
+import { confirmWithMessageWithWideButton } from "@/modules/coreObsidian/UI/dialogs";
 
 export class ObsidianConfirm<T extends ObsidianServiceContext = ObsidianServiceContext> implements Confirm {
     private _context: T;

src/modules/services/ObsidianConfirm.unit.spec.ts

@@ -19,7 +19,7 @@ vi.mock("@vrtmrz/obsidian-plugin-kit", () => ({
     promptText: mocks.promptText,
 }));
 
-vi.mock("@/modules/coreObsidian/UILib/dialogs", () => ({
+vi.mock("@/modules/coreObsidian/UI/dialogs", () => ({
     askSelectString: mocks.legacyAskSelectString,
     askString: mocks.legacyAskString,
     askYesNo: mocks.legacyAskYesNo,

src/serviceFeatures/compatibilityReview.evaluation.unit.spec.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from "vitest";
 import { InjectableReplicationService } from "@vrtmrz/livesync-commonlib/compat/services/implements/injectable/InjectableReplicationService";
 import { ServiceContext } from "@vrtmrz/livesync-commonlib/compat/services/base/ServiceBase";
-import { evaluateCompatibilityPause, legacyDatabaseCompatibilityVersionKey } from "./databaseCompatibility.ts";
+import { evaluateCompatibilityPause, legacyDatabaseCompatibilityVersionKey } from "./compatibilityReview.evaluation.ts";
 
 function migrationState(overrides: Record<string, unknown> = {}) {
     return {

src/serviceFeatures/compatibilityReview.ts

@@ -10,7 +10,7 @@ import {
     evaluateCompatibilityPause,
     legacyDatabaseCompatibilityVersionKey,
     type CompatibilityPause,
-} from "@/common/databaseCompatibility.ts";
+} from "./compatibilityReview.evaluation.ts";
 
 export type CompatibilityReviewSummaryAction = "details" | "resume" | "keep-paused" | false;
 export type CompatibilityReviewDetailsAction = "back" | false;

src/serviceFeatures/compatibilityReview.unit.spec.ts

@@ -7,7 +7,7 @@ import {
     COMPATIBILITY_PAUSE_SETTING_MESSAGE,
     DATABASE_COMPATIBILITY_VERSION_KEY,
     legacyDatabaseCompatibilityVersionKey,
-} from "@/common/databaseCompatibility.ts";
+} from "./compatibilityReview.evaluation.ts";
 import {
     CompatibilityReviewController,
     type CompatibilityReviewUi,

src/serviceFeatures/compatibilityReviewMarkdown.ts

@@ -1,4 +1,4 @@
-import type { CompatibilityPause, CompatibilityPauseReason } from "@/common/databaseCompatibility.ts";
+import type { CompatibilityPause, CompatibilityPauseReason } from "./compatibilityReview.evaluation.ts";
 
 export function compatibilityReviewSummaryMarkdown(pause: CompatibilityPause): string {
     const action = !pause.resumable

src/serviceFeatures/compatibilityReviewObsidian.ts

@@ -1,6 +1,6 @@
 import { Notice } from "@/deps.ts";
 import type { Confirm } from "@vrtmrz/livesync-commonlib/compat/interfaces/Confirm";
-import type { CompatibilityPause } from "@/common/databaseCompatibility.ts";
+import type { CompatibilityPause } from "./compatibilityReview.evaluation.ts";
 import type {
     CompatibilityReviewDetailsAction,
     CompatibilityReviewSummaryAction,

src/serviceFeatures/compatibilityReviewObsidian.unit.spec.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from "vitest";
-import type { CompatibilityPause } from "@/common/databaseCompatibility.ts";
+import type { CompatibilityPause } from "./compatibilityReview.evaluation.ts";
 import { compatibilityReviewDetailsMarkdown } from "./compatibilityReviewMarkdown.ts";
 import { ObsidianCompatibilityReviewUi } from "./compatibilityReviewObsidian.ts";
 

src/serviceFeatures/joinedDevices/JoinedDevicesDialog.svelte

@@ -8,7 +8,7 @@
         JoinedDeviceRow,
         JoinedDevicesDialogOptions,
         JoinedDevicesView,
-    } from "@/serviceFeatures/joinedDevicesDialogTypes";
+    } from "./types";
 
     const { setResult, getInitialData }: GuestDialogProps<"close", JoinedDevicesDialogOptions> = $props();
     let options = $state<JoinedDevicesDialogOptions>();