refactor: inject CLI I/O and diagnostics

src/apps/cli/managers/CLIStorageEventManagerAdapter.ts

@@ -14,6 +14,7 @@ import type { NodeFile, NodeFolder } from "@/apps/cli/adapters/NodeTypes";
 import { watch as chokidarWatch, type FSWatcher } from "chokidar";
 import type { IgnoreRules } from "@/apps/cli/serviceModules/IgnoreRules";
 import { fsPromises as fs, path, type Stats } from "@vrtmrz/livesync-commonlib/node";
+import type { CliDiagnosticReporter } from "@/apps/cli/cliOutput";
 
 /**
  * CLI-specific type guard adapter
@@ -45,7 +46,10 @@ class CLITypeGuardAdapter implements IStorageEventTypeGuardAdapter<NodeFile, Nod
 class CLIPersistenceAdapter implements IStorageEventPersistenceAdapter {
     private snapshotPath: string;
 
-    constructor(basePath: string) {
+    constructor(
+        basePath: string,
+        private reportDiagnostic: CliDiagnosticReporter = () => undefined
+    ) {
         this.snapshotPath = path.join(basePath, ".livesync-snapshot.json");
     }
 
@@ -53,14 +57,14 @@ class CLIPersistenceAdapter implements IStorageEventPersistenceAdapter {
         try {
             await fs.writeFile(this.snapshotPath, JSON.stringify(snapshot, null, 2), "utf-8");
         } catch (error) {
-            console.error("Failed to save snapshot:", error);
+            this.reportDiagnostic("Failed to save snapshot:", error);
         }
     }
 
     async loadSnapshot(): Promise<(FileEventItem | FileEventItemSentinel)[] | null> {
         try {
             const content = await fs.readFile(this.snapshotPath, "utf-8");
-            return JSON.parse(content);
+            return JSON.parse(content) as (FileEventItem | FileEventItemSentinel)[];
         } catch {
             return null;
         }
@@ -109,7 +113,8 @@ class CLIWatchAdapter implements IStorageEventWatchAdapter {
     constructor(
         private basePath: string,
         private ignoreRules?: IgnoreRules,
-        private watchEnabled: boolean = false
+        private watchEnabled: boolean = false,
+        private reportDiagnostic: CliDiagnosticReporter = () => undefined
     ) {}
 
     private _toNodeFile(filePath: string, stats: Stats | undefined): NodeFile {
@@ -180,8 +185,8 @@ class CLIWatchAdapter implements IStorageEventWatchAdapter {
         });
 
         watcher.on("error", (err) => {
-            console.error("[CLIWatchAdapter] Fatal watcher error — file watching stopped:", err);
-            console.error("[CLIWatchAdapter] Exiting for systemd restart.");
+            this.reportDiagnostic("[CLIWatchAdapter] Fatal watcher error — file watching stopped:", err);
+            this.reportDiagnostic("[CLIWatchAdapter] Exiting for systemd restart.");
             void watcher.close();
             this._watcher = undefined;
             // Use exit(1) rather than SIGTERM so systemd Restart=on-failure engages.
@@ -210,10 +215,15 @@ export class CLIStorageEventManagerAdapter implements IStorageEventManagerAdapte
     readonly status: CLIStatusAdapter;
     readonly converter: CLIConverterAdapter;
 
-    constructor(basePath: string, ignoreRules?: IgnoreRules, watchEnabled: boolean = false) {
+    constructor(
+        basePath: string,
+        ignoreRules?: IgnoreRules,
+        watchEnabled: boolean = false,
+        reportDiagnostic: CliDiagnosticReporter = () => undefined
+    ) {
         this.typeGuard = new CLITypeGuardAdapter();
-        this.persistence = new CLIPersistenceAdapter(basePath);
-        this.watch = new CLIWatchAdapter(basePath, ignoreRules, watchEnabled);
+        this.persistence = new CLIPersistenceAdapter(basePath, reportDiagnostic);
+        this.watch = new CLIWatchAdapter(basePath, ignoreRules, watchEnabled, reportDiagnostic);
         this.status = new CLIStatusAdapter();
         this.converter = new CLIConverterAdapter();
     }

src/apps/cli/managers/CLIStorageEventManagerAdapter.unit.spec.ts

@@ -103,7 +103,8 @@ describe("CLIStorageEventManagerAdapter", () => {
     });
 
     it("error event triggers process.exit(1)", async () => {
-        const adapter = new CLIStorageEventManagerAdapter("/base", undefined, true);
+        const reportDiagnostic = vi.fn();
+        const adapter = new CLIStorageEventManagerAdapter("/base", undefined, true, reportDiagnostic);
         const handlers = makeHandlers();
 
         await adapter.watch.beginWatch(handlers);
@@ -117,6 +118,11 @@ describe("CLIStorageEventManagerAdapter", () => {
         errorCallback(new Error("disk failure"));
 
         expect(processExitSpy).toHaveBeenCalledWith(1);
+        expect(reportDiagnostic).toHaveBeenCalledWith(
+            "[CLIWatchAdapter] Fatal watcher error — file watching stopped:",
+            expect.any(Error)
+        );
+        expect(reportDiagnostic).toHaveBeenCalledWith("[CLIWatchAdapter] Exiting for systemd restart.");
 
         processExitSpy.mockRestore();
     });

src/apps/cli/managers/StorageEventManagerCLI.ts

@@ -3,6 +3,7 @@ import { CLIStorageEventManagerAdapter } from "./CLIStorageEventManagerAdapter";
 import type { IMinimumLiveSyncCommands, LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 import type { ServiceContext } from "@vrtmrz/livesync-commonlib/compat/services/base/ServiceBase";
 import type { IgnoreRules } from "@/apps/cli/serviceModules/IgnoreRules";
+import { LOG_LEVEL_NOTICE } from "octagonal-wheels/common/logger";
 // import type { IMinimumLiveSyncCommands } from "@vrtmrz/livesync-commonlib/compat/services/base/IService";
 
 export class StorageEventManagerCLI extends StorageEventManagerBase<CLIStorageEventManagerAdapter> {
@@ -15,7 +16,12 @@ export class StorageEventManagerCLI extends StorageEventManagerBase<CLIStorageEv
         ignoreRules?: IgnoreRules,
         watchEnabled?: boolean
     ) {
-        const adapter = new CLIStorageEventManagerAdapter(basePath, ignoreRules, watchEnabled);
+        const adapter = new CLIStorageEventManagerAdapter(basePath, ignoreRules, watchEnabled, (message, detail) => {
+            dependencies.APIService.addLog(message, LOG_LEVEL_NOTICE);
+            if (detail !== undefined) {
+                dependencies.APIService.addLog(detail, LOG_LEVEL_NOTICE);
+            }
+        });
         super(adapter, dependencies);
         this.core = core;
     }