@alfe.ai/openclaw-sync 0.3.4 → 0.3.6

package/dist/plugin2.cjs

@@ -5,6 +5,7 @@ let node_path = require("node:path");
 let chokidar = require("chokidar");
 let node_module = require("node:module");
 let _alfe_ai_config = require("@alfe.ai/config");
+let _alfe_ai_openclaw_plugin_kit = require("@alfe.ai/openclaw-plugin-kit");
 let _alfe_ai_agent_api_client = require("@alfe.ai/agent-api-client");
 //#region src/watcher.ts
 /**
@@ -301,6 +302,7 @@ const SYNC_CAPABILITIES = [
 	"sync.pull",
 	"sync.fullSync"
 ];
+const SYNC_ACTIVATION_KEY = (0, _alfe_ai_openclaw_plugin_kit.getActivationKey)("sync");
 const SYNC_RELAY_RECONNECT_BASE_MS = 1e3;
 const SYNC_RELAY_RECONNECT_MAX_MS = 3e4;
 const SYNC_RELAY_DEBOUNCE_MS = 500;
@@ -358,64 +360,34 @@ function setupSchedule(schedule, log) {
 	}, intervalMs);
 	scheduledInterval.unref();
 }
-async function connectToDaemon(socketPath, log) {
-	try {
-		const ipc = new (await (import("@alfe.ai/openclaw"))).IPCClient(socketPath, log);
-		ipc.on("connected", () => {
+function handleDaemonMessage(msg, log) {
+	if (msg.type === "SYNC_NOW" || msg.command === "SYNC_NOW") {
+		log.info("Received SYNC_NOW command — triggering immediate sync...");
+		if (syncEngine) {
+			const engine = syncEngine;
 			(async () => {
-				log.info("Connected to Alfe daemon — registering sync capabilities...");
-				const response = await ipc.request("capability.register", {
-					plugin: "@alfe.ai/openclaw-sync",
-					capabilities: [...SYNC_CAPABILITIES]
-				});
-				if (response.ok) log.info("Sync capabilities registered with daemon");
-				else log.warn(`Failed to register sync capabilities: ${response.error?.message ?? "unknown"}`);
-			})();
-		});
-		ipc.on("disconnected", (...args) => {
-			const reason = typeof args[0] === "string" ? args[0] : String(args[0]);
-			log.warn(`Disconnected from Alfe daemon: ${reason}`);
-		});
-		ipc.on("message", (...args) => {
-			const msg = args[0];
-			if (msg?.type === "SYNC_NOW" || msg?.command === "SYNC_NOW") {
-				log.info("Received SYNC_NOW command — triggering immediate sync...");
-				if (syncEngine) {
-					const engine = syncEngine;
-					(async () => {
-						try {
-							lastSyncResult = await engine.fullSync({ quiet: true });
-							log.info(`SYNC_NOW complete: ${String(lastSyncResult.pushed)} pushed, ${String(lastSyncResult.pulled)} pulled`);
-						} catch (err) {
-							log.error(`SYNC_NOW failed: ${err instanceof Error ? err.message : String(err)}`);
-						}
-					})();
+				try {
+					lastSyncResult = await engine.fullSync({ quiet: true });
+					log.info(`SYNC_NOW complete: ${String(lastSyncResult.pushed)} pushed, ${String(lastSyncResult.pulled)} pulled`);
+				} catch (err) {
+					log.error(`SYNC_NOW failed: ${err instanceof Error ? err.message : String(err)}`);
 				}
-			}
-			if (msg?.type === "SHARED_SCOPES") {
-				const scopes = msg.scopes;
-				const engine = sharedSyncEngine;
-				if (scopes && engine) {
-					log.info(`Received SHARED_SCOPES update: ${String(scopes.length)} scope(s)`);
-					(async () => {
-						try {
-							await engine.updateScopes(scopes);
-						} catch (err) {
-							log.error(`SHARED_SCOPES update failed: ${err instanceof Error ? err.message : String(err)}`);
-						}
-					})();
+			})();
+		}
+	}
+	if (msg.type === "SHARED_SCOPES") {
+		const scopes = msg.scopes;
+		const engine = sharedSyncEngine;
+		if (scopes && engine) {
+			log.info(`Received SHARED_SCOPES update: ${String(scopes.length)} scope(s)`);
+			(async () => {
+				try {
+					await engine.updateScopes(scopes);
+				} catch (err) {
+					log.error(`SHARED_SCOPES update failed: ${err instanceof Error ? err.message : String(err)}`);
 				}
-			}
-		});
-		ipc.on("error", (...args) => {
-			const err = args[0];
-			log.debug(`Daemon IPC error: ${err instanceof Error ? err.message : String(err)}`);
-		});
-		ipc.start();
-		return ipc;
-	} catch {
-		log.info("Alfe daemon not available — Sync plugin running standalone");
-		return null;
+			})();
+		}
 	}
 }
 function clearSyncRelayReconnect() {
@@ -581,118 +553,123 @@ const plugin = {
 		];
 		const syncSchedule = pluginConfig.syncSchedule ?? "realtime";
 		const socketPath = pluginConfig.socketPath ?? alfeConfig?.socketPath ?? _alfe_ai_config.DEFAULT_SOCKET_PATH;
-		const startSyncService = async () => {
-			if (globalThis.__alfeSyncPluginActivated === true) {
-				log.debug("Alfe Sync plugin already activated — skipping duplicate");
-				return;
-			}
-			globalThis.__alfeSyncPluginActivated = true;
-			log.info("Alfe Sync plugin activating...");
-			log.info(`Sync scope: ${syncScope.join(", ")}`);
-			log.info(`Sync schedule: ${syncSchedule}`);
-			log.info(`Workspace: ${workspacePath}`);
-			if (!(0, _alfe_ai_config.configExists)()) {
-				log.info("Sync skipped — no Alfe config found. Run `alfe login` to enable.");
-				return;
-			}
-			let syncCfg;
-			try {
-				syncCfg = (0, _alfe_ai_config.resolveConfig)();
-			} catch (err) {
-				log.warn(`Sync skipped — failed to resolve credentials from ~/.alfe/config.toml: ${err instanceof Error ? err.message : String(err)}`);
-				return;
-			}
-			client = new _alfe_ai_agent_api_client.AgentApiClient({
-				apiKey: syncCfg.apiKey,
-				apiUrl: syncCfg.apiUrl
-			});
-			syncEngine = require_sync_engine.createSyncEngine({
-				workspacePath,
-				client,
-				runtime
-			});
-			log.info("Sync engine initialized");
-			if (syncSchedule === "realtime") {
+		const startSyncService = () => {
+			(0, _alfe_ai_openclaw_plugin_kit.guardedStart)(SYNC_ACTIVATION_KEY, log, async () => {
+				log.info("Alfe Sync plugin activating...");
+				log.info(`Sync scope: ${syncScope.join(", ")}`);
+				log.info(`Sync schedule: ${syncSchedule}`);
+				log.info(`Workspace: ${workspacePath}`);
+				if (!(0, _alfe_ai_config.configExists)()) {
+					log.info("Sync skipped — no Alfe config found. Run `alfe login` to enable.");
+					(0, _alfe_ai_openclaw_plugin_kit.resetActivation)(SYNC_ACTIVATION_KEY);
+					return;
+				}
+				let syncCfg;
 				try {
-					lastSyncResult = await syncEngine.firstRunReconcile({ quiet: true });
-					if (lastSyncResult.conflicts > 0) log.info(`Initial workspace reconcile complete — ${String(lastSyncResult.conflicts)} diverged local file(s) handled (see RECOVERY-*.md in the agent workspace)`);
-					else log.info("Initial workspace reconcile complete");
+					syncCfg = (0, _alfe_ai_config.resolveConfig)();
 				} catch (err) {
-					log.warn(`Initial workspace reconcile failed: ${err instanceof Error ? err.message : String(err)}`);
+					log.warn(`Sync skipped — failed to resolve credentials from ~/.alfe/config.toml: ${err instanceof Error ? err.message : String(err)}`);
+					(0, _alfe_ai_openclaw_plugin_kit.resetActivation)(SYNC_ACTIVATION_KEY);
+					return;
 				}
-				syncEngine.pruneIgnored({ quiet: true }).then((pruned) => {
-					if (pruned.pushed > 0) log.info(`Pruned ${String(pruned.pushed)} ignored file(s) from cloud`);
-				}).catch((err) => {
-					log.warn(`Ignored-file prune failed: ${err instanceof Error ? err.message : String(err)}`);
+				client = new _alfe_ai_agent_api_client.AgentApiClient({
+					apiKey: syncCfg.apiKey,
+					apiUrl: syncCfg.apiUrl
 				});
-				deleteBrake = createDeleteBrake();
-				try {
-					stopWatcher = await startWatcher({
-						workspacePath,
-						runtime,
-						debounceMs: 2e3,
-						onChanges: async (paths) => {
-							if (!syncEngine) return;
-							const existing = [];
-							const missing = [];
-							for (const p of paths) if ((0, node_fs.existsSync)((0, node_path.join)(workspacePath, p))) existing.push(p);
-							else missing.push(p);
-							log.debug(`Realtime sync: ${String(existing.length)} upload(s), ${String(missing.length)} delete(s)`);
-							if (existing.length > 0) try {
-								lastSyncResult = await syncEngine.push(existing, { quiet: true });
-							} catch (err) {
-								log.error(`Realtime push failed: ${err instanceof Error ? err.message : String(err)}`);
-							}
-							if (missing.length > 0) {
-								const artifactDeletes = missing.filter((p) => require_sync_engine.isRecoveryArtifact(p));
-								const regularDeletes = missing.filter((p) => !require_sync_engine.isRecoveryArtifact(p));
-								const manifest = await require_sync_engine.readManifest(workspacePath);
-								const manifestSize = Object.keys(manifest.files).length;
-								let toDelete = missing;
-								if (deleteBrake && !deleteBrake.check(regularDeletes.length, manifestSize)) {
-									log.error(`Sync delete brake tripped: ${String(deleteBrake.windowSum() + regularDeletes.length)} deletes in last 60s vs manifest size ${String(manifestSize)} (threshold 30%). Refusing batch — investigate the workspace state.`);
-									toDelete = artifactDeletes;
-								}
-								if (toDelete.length > 0) try {
-									lastSyncResult = await syncEngine.pushDeletes(toDelete, { quiet: true });
+				syncEngine = require_sync_engine.createSyncEngine({
+					workspacePath,
+					client,
+					runtime
+				});
+				log.info("Sync engine initialized");
+				if (syncSchedule === "realtime") {
+					try {
+						lastSyncResult = await syncEngine.firstRunReconcile({ quiet: true });
+						if (lastSyncResult.conflicts > 0) log.info(`Initial workspace reconcile complete — ${String(lastSyncResult.conflicts)} diverged local file(s) handled (see RECOVERY-*.md in the agent workspace)`);
+						else log.info("Initial workspace reconcile complete");
+					} catch (err) {
+						log.warn(`Initial workspace reconcile failed: ${err instanceof Error ? err.message : String(err)}`);
+					}
+					syncEngine.pruneIgnored({ quiet: true }).then((pruned) => {
+						if (pruned.pushed > 0) log.info(`Pruned ${String(pruned.pushed)} ignored file(s) from cloud`);
+					}).catch((err) => {
+						log.warn(`Ignored-file prune failed: ${err instanceof Error ? err.message : String(err)}`);
+					});
+					deleteBrake = createDeleteBrake();
+					try {
+						stopWatcher = await startWatcher({
+							workspacePath,
+							runtime,
+							debounceMs: 2e3,
+							onChanges: async (paths) => {
+								if (!syncEngine) return;
+								const existing = [];
+								const missing = [];
+								for (const p of paths) if ((0, node_fs.existsSync)((0, node_path.join)(workspacePath, p))) existing.push(p);
+								else missing.push(p);
+								log.debug(`Realtime sync: ${String(existing.length)} upload(s), ${String(missing.length)} delete(s)`);
+								if (existing.length > 0) try {
+									lastSyncResult = await syncEngine.push(existing, { quiet: true });
 								} catch (err) {
-									log.error(`Realtime delete failed: ${err instanceof Error ? err.message : String(err)}`);
+									log.error(`Realtime push failed: ${err instanceof Error ? err.message : String(err)}`);
+								}
+								if (missing.length > 0) {
+									const artifactDeletes = missing.filter((p) => require_sync_engine.isRecoveryArtifact(p));
+									const regularDeletes = missing.filter((p) => !require_sync_engine.isRecoveryArtifact(p));
+									const manifest = await require_sync_engine.readManifest(workspacePath);
+									const manifestSize = Object.keys(manifest.files).length;
+									let toDelete = missing;
+									if (deleteBrake && !deleteBrake.check(regularDeletes.length, manifestSize)) {
+										log.error(`Sync delete brake tripped: ${String(deleteBrake.windowSum() + regularDeletes.length)} deletes in last 60s vs manifest size ${String(manifestSize)} (threshold 30%). Refusing batch — investigate the workspace state.`);
+										toDelete = artifactDeletes;
+									}
+									if (toDelete.length > 0) try {
+										lastSyncResult = await syncEngine.pushDeletes(toDelete, { quiet: true });
+									} catch (err) {
+										log.error(`Realtime delete failed: ${err instanceof Error ? err.message : String(err)}`);
+									}
 								}
 							}
-						}
-					});
-					log.info("File watcher started for realtime sync");
-				} catch (err) {
-					log.warn(`Failed to start file watcher: ${err instanceof Error ? err.message : String(err)}`);
-				}
-			} else setupSchedule(syncSchedule, log);
-			daemonIpcClient = await connectToDaemon(socketPath, log);
-			let registered = null;
-			try {
-				registered = (await client.syncRegister()).agent;
-				agentId = registered.agentId;
-			} catch (err) {
-				log.warn(`Sync register failed: ${err instanceof Error ? err.message : String(err)}`);
-			}
-			if (registered) {
+						});
+						log.info("File watcher started for realtime sync");
+					} catch (err) {
+						log.warn(`Failed to start file watcher: ${err instanceof Error ? err.message : String(err)}`);
+					}
+				} else setupSchedule(syncSchedule, log);
+				daemonIpcClient = await (0, _alfe_ai_openclaw_plugin_kit.connectToDaemon)(socketPath, log, {
+					pluginId: "@alfe.ai/openclaw-sync",
+					capabilities: SYNC_CAPABILITIES,
+					onMessage: (msg) => {
+						handleDaemonMessage(msg, log);
+					},
+					standaloneNote: "Alfe daemon not available — Sync plugin running standalone"
+				});
+				let registered = null;
 				try {
-					syncRelayWs = await connectToSyncRelay(pluginConfig.syncRelayUrl ?? deriveRelayUrl(syncCfg.apiUrl), syncCfg.apiKey, registered.agentId, log);
+					registered = (await client.syncRegister()).agent;
+					agentId = registered.agentId;
 				} catch (err) {
-					log.debug(`Sync Relay connection skipped: ${err instanceof Error ? err.message : String(err)}`);
+					log.warn(`Sync register failed: ${err instanceof Error ? err.message : String(err)}`);
 				}
-				if (pluginConfig.sharedSync !== false) try {
-					sharedSyncEngine = createSharedSyncEngine({
-						workspacePath,
-						client
-					}, log);
-					log.info("Shared sync engine created — waiting for SHARED_SCOPES from gateway");
-				} catch (err) {
-					log.debug(`Shared sync engine skipped: ${err instanceof Error ? err.message : String(err)}`);
+				if (registered) {
+					try {
+						syncRelayWs = await connectToSyncRelay(pluginConfig.syncRelayUrl ?? deriveRelayUrl(syncCfg.apiUrl), syncCfg.apiKey, registered.agentId, log);
+					} catch (err) {
+						log.debug(`Sync Relay connection skipped: ${err instanceof Error ? err.message : String(err)}`);
+					}
+					if (pluginConfig.sharedSync !== false) try {
+						sharedSyncEngine = createSharedSyncEngine({
+							workspacePath,
+							client
+						}, log);
+						log.info("Shared sync engine created — waiting for SHARED_SCOPES from gateway");
+					} catch (err) {
+						log.debug(`Shared sync engine skipped: ${err instanceof Error ? err.message : String(err)}`);
+					}
 				}
-			}
+			});
 		};
 		const stopSyncService = async () => {
-			globalThis.__alfeSyncPluginActivated = false;
 			clearSchedule();
 			disconnectSyncRelay();
 			if (stopWatcher) {
@@ -720,6 +697,7 @@ const plugin = {
 			sharedSyncEngine = null;
 			lastSyncResult = null;
 			currentConfig = {};
+			(0, _alfe_ai_openclaw_plugin_kit.resetActivation)(SYNC_ACTIVATION_KEY);
 			log.info("Alfe Sync plugin deactivated");
 		};
 		if (typeof api.registerGatewayMethod === "function") {
@@ -759,13 +737,14 @@ const plugin = {
 		}
 		api.registerService({
 			id: "alfe-sync-engine",
-			start: () => startSyncService(),
+			start: () => {
+				startSyncService();
+			},
 			stop: () => stopSyncService()
 		});
 		log.info("Alfe Sync plugin activated");
 	},
 	async deactivate(api) {
-		globalThis.__alfeSyncPluginActivated = false;
 		const log = api.logger;
 		log.info("Alfe Sync plugin deactivating...");
 		clearSchedule();
@@ -794,6 +773,7 @@ const plugin = {
 		sharedSyncEngine = null;
 		lastSyncResult = null;
 		currentConfig = {};
+		(0, _alfe_ai_openclaw_plugin_kit.resetActivation)(SYNC_ACTIVATION_KEY);
 		log.info("Alfe Sync plugin deactivated");
 	},
 	async configure(api, config) {