@alfe.ai/openclaw-sync 0.0.16 → 0.0.18

package/dist/plugin2.cjs

@@ -1,10 +1,10 @@
-const require_ignore = require("./ignore.cjs");
 const require_sync_engine = require("./sync-engine.cjs");
-let node_path = require("node:path");
-let _alfe_ai_config = require("@alfe.ai/config");
 let node_fs_promises = require("node:fs/promises");
+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_agent_api_client = require("@alfe.ai/agent-api-client");
 //#region src/watcher.ts
 /**
 * AlfeSync watcher — recursive file watcher with debounce and ignore support.
@@ -19,7 +19,7 @@ let node_module = require("node:module");
 */
 async function startWatcher(options) {
 	const { workspacePath, debounceMs = 2e3, onChanges } = options;
-	const ignorePatterns = await require_ignore.loadIgnorePatterns(workspacePath);
+	const ignorePatterns = await require_sync_engine.loadIgnorePatterns(workspacePath);
 	const pending = /* @__PURE__ */ new Map();
 	let batchPaths = /* @__PURE__ */ new Set();
 	let flushTimer = null;
@@ -35,7 +35,7 @@ async function startWatcher(options) {
 	}
 	function handleChange(absolutePath) {
 		const relativePath = (0, node_path.relative)(workspacePath, absolutePath);
-		if (require_ignore.shouldIgnore(relativePath, ignorePatterns)) return;
+		if (require_sync_engine.shouldIgnore(relativePath, ignorePatterns)) return;
 		const existingTimer = pending.get(relativePath);
 		if (existingTimer) clearTimeout(existingTimer);
 		const timer = setTimeout(() => {
@@ -73,36 +73,23 @@ async function startWatcher(options) {
 //#endregion
 //#region src/shared-sync.ts
 /**
-* Shared file sync engine for org/team/project scoped files.
+* Shared file sync — mirrors org/team/project files to a `shared/`
+* directory in the agent's workspace, organised by scope:
 *
-* Syncs shared files to a `shared/` directory in the agent's workspace,
-* organized by scope: shared/org/, shared/teams/{id}/, shared/projects/{id}/
+*   shared/org/<files…>
+*   shared/teams/<scopeId>/<files…>
+*   shared/projects/<scopeId>/<files…>
 *
-* Uses the agent self-service API (/agents/org/...) with the agent's API key.
+* Backed by the agent self-service API (`AgentApiClient.sharedListFiles`,
+* `AgentApiClient.sharedDownloadUrl`).
 */
 const MAX_SHARED_FILE_SIZE = 100 * 1024 * 1024;
-/** Verify that resolvedPath stays within baseDir. Prevents path traversal. */
+/** Throw if `resolvedPath` would escape `baseDir`. */
 function assertContained(baseDir, resolvedPath) {
 	const normalizedBase = (0, node_path.normalize)(baseDir) + node_path.sep;
 	const normalizedPath = (0, node_path.normalize)(resolvedPath);
 	if (!normalizedPath.startsWith(normalizedBase) && normalizedPath !== (0, node_path.normalize)(baseDir)) throw new Error(`Path traversal blocked: ${resolvedPath} escapes ${baseDir}`);
 }
-async function fetchJson(url, token) {
-	const response = await fetch(url, { headers: {
-		"Authorization": `Bearer ${token}`,
-		"Content-Type": "application/json"
-	} });
-	if (!response.ok) {
-		let errorBody = "";
-		try {
-			errorBody = await response.text();
-		} catch {
-			errorBody = "(unable to read error body)";
-		}
-		throw new Error(`HTTP ${String(response.status)}: ${errorBody}`);
-	}
-	return response.json();
-}
 function createSharedSyncEngine(config, log) {
 	let activeScopes = [];
 	const sharedDir = (0, node_path.join)(config.workspacePath, "shared");
@@ -110,16 +97,14 @@ function createSharedSyncEngine(config, log) {
 		if (scope.scopeType === "org") return (0, node_path.join)(sharedDir, "org");
 		return (0, node_path.join)(sharedDir, scope.scopeType === "team" ? "teams" : "projects", scope.scopeId);
 	}
-	function apiBase() {
-		return `${config.apiUrl}/agents/org`;
-	}
-	async function listRemoteFiles(scope) {
-		return (await fetchJson(`${apiBase()}/files/${scope.scopeType}/${scope.scopeId}`, config.token)).files;
-	}
 	async function downloadFile(scope, filePath, localPath) {
 		assertContained(scopeDir(scope), localPath);
-		const result = await fetchJson(`${apiBase()}/files/${scope.scopeType}/${scope.scopeId}/${encodeURIComponent(filePath)}/download`, config.token);
-		const response = await fetch(result.downloadUrl);
+		const { downloadUrl } = await config.client.sharedDownloadUrl({
+			scope: scope.scopeType,
+			scopeId: scope.scopeId,
+			filePath
+		});
+		const response = await fetch(downloadUrl);
 		if (!response.ok) throw new Error(`Download failed: HTTP ${String(response.status)}`);
 		const contentLength = parseInt(response.headers.get("content-length") ?? "0", 10);
 		if (contentLength > MAX_SHARED_FILE_SIZE) throw new Error(`File too large: ${String(contentLength)} bytes exceeds ${String(MAX_SHARED_FILE_SIZE)} limit`);
@@ -132,8 +117,11 @@ function createSharedSyncEngine(config, log) {
 		const dir = scopeDir(scope);
 		await (0, node_fs_promises.mkdir)(dir, { recursive: true });
 		try {
-			const remoteFiles = await listRemoteFiles(scope);
-			for (const file of remoteFiles) {
+			const { files } = await config.client.sharedListFiles({
+				scope: scope.scopeType,
+				scopeId: scope.scopeId
+			});
+			for (const file of files) {
 				const localPath = (0, node_path.join)(dir, file.filePath);
 				try {
 					await downloadFile(scope, file.filePath, localPath);
@@ -251,16 +239,19 @@ function createSharedSyncEngine(config, log) {
 /**
 * @alfe.ai/openclaw-sync — OpenClaw Sync plugin.
 *
-* Wraps the existing sync engine as a lifecycle-managed integration,
-* following the same plugin pattern as @alfe.ai/openclaw-mobile and
-* @alfe.ai/openclaw-discord.
+* Wraps the sync engine as a lifecycle-managed integration. Same shape as
+* @alfe.ai/openclaw-memory-cloud / -secrets / -google: one AgentApiClient
+* is constructed in `activate()` and reused for every API call. The agent's
+* identity is resolved server-side from the API key — the plugin never
+* touches `/auth/validate`, never plumbs an `agentId` around, never writes
+* a `.alfesync/` directory.
 *
 * Lifecycle:
-*   - activate(api): start the sync engine + watcher based on config
-*   - deactivate(api): stop the watcher, clean up resources
-*   - configure(api, config): update scope/schedule at runtime
+*   - activate(api): construct client, start sync engine + watcher
+*   - deactivate(api): stop watcher, drop relay connections, clean up
+*   - configure(api, config): swap schedule/scope at runtime
 *
-* Registers 'sync.now' and 'sync.status' gateway RPC methods.
+* Registers gateway RPC methods: `sync.now`, `sync.status`.
 */
 const pkg = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href)("../package.json");
 const SYNC_CAPABILITIES = [
@@ -271,6 +262,8 @@ const SYNC_CAPABILITIES = [
 const SYNC_RELAY_RECONNECT_BASE_MS = 1e3;
 const SYNC_RELAY_RECONNECT_MAX_MS = 3e4;
 const SYNC_RELAY_DEBOUNCE_MS = 500;
+let client = null;
+let agentId = null;
 let syncEngine = null;
 let sharedSyncEngine = null;
 let stopWatcher = null;
@@ -323,12 +316,11 @@ function setupSchedule(schedule, log) {
 }
 async function connectToDaemon(socketPath, log) {
 	try {
-		const IPCClient = (await import("@alfe.ai/openclaw")).IPCClient;
-		const client = new IPCClient(socketPath, log);
-		client.on("connected", () => {
+		const ipc = new (await (import("@alfe.ai/openclaw"))).IPCClient(socketPath, log);
+		ipc.on("connected", () => {
 			(async () => {
 				log.info("Connected to Alfe daemon — registering sync capabilities...");
-				const response = await client.request("capability.register", {
+				const response = await ipc.request("capability.register", {
 					plugin: "@alfe.ai/openclaw-sync",
 					capabilities: [...SYNC_CAPABILITIES]
 				});
@@ -336,11 +328,11 @@ async function connectToDaemon(socketPath, log) {
 				else log.warn(`Failed to register sync capabilities: ${response.error?.message ?? "unknown"}`);
 			})();
 		});
-		client.on("disconnected", (...args) => {
+		ipc.on("disconnected", (...args) => {
 			const reason = typeof args[0] === "string" ? args[0] : String(args[0]);
 			log.warn(`Disconnected from Alfe daemon: ${reason}`);
 		});
-		client.on("message", (...args) => {
+		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...");
@@ -371,12 +363,12 @@ async function connectToDaemon(socketPath, log) {
 				}
 			}
 		});
-		client.on("error", (...args) => {
+		ipc.on("error", (...args) => {
 			const err = args[0];
 			log.debug(`Daemon IPC error: ${err instanceof Error ? err.message : String(err)}`);
 		});
-		client.start();
-		return client;
+		ipc.start();
+		return ipc;
 	} catch {
 		log.info("Alfe daemon not available — Sync plugin running standalone");
 		return null;
@@ -428,7 +420,7 @@ async function processPendingNotifications(log) {
 		}
 	}
 }
-async function connectToSyncRelay(relayUrl, token, agentId, log) {
+async function connectToSyncRelay(relayUrl, token, agentIdForSubscribe, log) {
 	try {
 		const { default: WebSocket } = await import("ws");
 		const ws = new WebSocket(`${relayUrl}?token=${encodeURIComponent(token)}`);
@@ -437,7 +429,7 @@ async function connectToSyncRelay(relayUrl, token, agentId, log) {
 			syncRelayReconnectAttempt = 0;
 			ws.send(JSON.stringify({
 				type: "SUBSCRIBE",
-				agentId
+				agentId: agentIdForSubscribe
 			}));
 		});
 		ws.on("message", (data) => {
@@ -450,7 +442,7 @@ async function connectToSyncRelay(relayUrl, token, agentId, log) {
 			switch (message.type) {
 				case "SUBSCRIBE_ACK":
 					if (message.status === "ok") {
-						log.info(`Subscribed to sync notifications for agent ${message.agentId ?? agentId}`);
+						log.info(`Subscribed to sync notifications for agent ${message.agentId ?? agentIdForSubscribe}`);
 						const sharedEngine = sharedSyncEngine;
 						if (sharedEngine) (async () => {
 							try {
@@ -468,9 +460,7 @@ async function connectToSyncRelay(relayUrl, token, agentId, log) {
 						eventType: message.eventType === "deleted" ? "deleted" : "created"
 					});
 					clearSyncRelayDebounce();
-					syncRelayDebounceTimer = setTimeout(() => {
-						processPendingNotifications(log);
-					}, SYNC_RELAY_DEBOUNCE_MS);
+					syncRelayDebounceTimer = setTimeout(() => void processPendingNotifications(log), SYNC_RELAY_DEBOUNCE_MS);
 					break;
 				case "PING":
 					try {
@@ -482,7 +472,7 @@ async function connectToSyncRelay(relayUrl, token, agentId, log) {
 		ws.on("close", (code) => {
 			log.info(`Sync Relay disconnected (code=${String(code)})`);
 			syncRelayWs = null;
-			scheduleSyncRelayReconnect(relayUrl, token, agentId, log);
+			scheduleSyncRelayReconnect(relayUrl, token, agentIdForSubscribe, log);
 		});
 		ws.on("error", (err) => {
 			log.debug(`Sync Relay error: ${err.message}`);
@@ -490,18 +480,18 @@ async function connectToSyncRelay(relayUrl, token, agentId, log) {
 		return ws;
 	} catch (err) {
 		log.debug(`Failed to connect to Sync Relay: ${err instanceof Error ? err.message : String(err)}`);
-		scheduleSyncRelayReconnect(relayUrl, token, agentId, log);
+		scheduleSyncRelayReconnect(relayUrl, token, agentIdForSubscribe, log);
 		return null;
 	}
 }
-function scheduleSyncRelayReconnect(relayUrl, token, agentId, log) {
+function scheduleSyncRelayReconnect(relayUrl, token, agentIdForSubscribe, log) {
 	clearSyncRelayReconnect();
 	const delay = Math.min(SYNC_RELAY_RECONNECT_BASE_MS * Math.pow(2, syncRelayReconnectAttempt), SYNC_RELAY_RECONNECT_MAX_MS);
 	syncRelayReconnectAttempt++;
 	log.debug(`Reconnecting to Sync Relay in ${String(delay)}ms (attempt ${String(syncRelayReconnectAttempt)})`);
 	syncRelayReconnectTimer = setTimeout(() => {
 		(async () => {
-			syncRelayWs = await connectToSyncRelay(relayUrl, token, agentId, log);
+			syncRelayWs = await connectToSyncRelay(relayUrl, token, agentIdForSubscribe, log);
 		})();
 	}, delay);
 }
@@ -517,6 +507,12 @@ function disconnectSyncRelay() {
 		syncRelayWs = null;
 	}
 }
+function deriveRelayUrl(apiUrl) {
+	if (apiUrl.includes("dev.alfe.ai")) return "wss://sync.dev.alfe.ai/ws";
+	if (apiUrl.includes("demo.alfe.ai")) return "wss://sync.demo.alfe.ai/ws";
+	if (apiUrl.includes("test.alfe.ai")) return "wss://sync.test.alfe.ai/ws";
+	return "wss://sync.alfe.ai/ws";
+}
 const plugin = {
 	id: "@alfe.ai/openclaw-sync",
 	name: "Alfe Sync Plugin",
@@ -548,14 +544,27 @@ const plugin = {
 			log.info(`Sync scope: ${syncScope.join(", ")}`);
 			log.info(`Sync schedule: ${syncSchedule}`);
 			log.info(`Workspace: ${workspacePath}`);
-			if (require_sync_engine.isInitialized()) try {
-				syncEngine = await require_sync_engine.createSyncEngine(workspacePath);
-				log.info("Sync engine initialized");
+			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(`Failed to initialize sync engine: ${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)}`);
+				return;
 			}
-			else log.info("Sync skipped — no Alfe config found. Run `alfe login` to enable.");
-			if (syncSchedule === "realtime" && syncEngine) try {
+			client = new _alfe_ai_agent_api_client.AgentApiClient({
+				apiKey: syncCfg.apiKey,
+				apiUrl: syncCfg.apiUrl
+			});
+			syncEngine = require_sync_engine.createSyncEngine({
+				workspacePath,
+				client
+			});
+			log.info("Sync engine initialized");
+			if (syncSchedule === "realtime") try {
 				stopWatcher = await startWatcher({
 					workspacePath,
 					debounceMs: 2e3,
@@ -573,28 +582,29 @@ const plugin = {
 			} catch (err) {
 				log.warn(`Failed to start file watcher: ${err instanceof Error ? err.message : String(err)}`);
 			}
-			if (syncSchedule !== "realtime" && syncEngine) setupSchedule(syncSchedule, log);
+			else setupSchedule(syncSchedule, log);
 			daemonIpcClient = await connectToDaemon(socketPath, log);
-			if (syncEngine) {
-				const config = await require_sync_engine.resolveSyncConfig();
-				if (config) {
-					try {
-						const defaultRelayUrl = config.apiUrl.includes("dev.alfe.ai") ? "wss://sync.dev.alfe.ai/ws" : "wss://sync.alfe.ai/ws";
-						syncRelayWs = await connectToSyncRelay(pluginConfig.syncRelayUrl ?? defaultRelayUrl, config.token, config.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,
-							apiUrl: config.apiUrl,
-							token: config.token,
-							agentId: config.agentId
-						}, 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)}`);
-					}
+			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) {
+				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)}`);
 				}
 			}
 		};
@@ -620,6 +630,8 @@ const plugin = {
 				}
 				daemonIpcClient = null;
 			}
+			client = null;
+			agentId = null;
 			syncEngine = null;
 			sharedSyncEngine = null;
 			lastSyncResult = null;
@@ -630,7 +642,7 @@ const plugin = {
 			api.registerGatewayMethod("sync.now", async () => {
 				if (!syncEngine) return {
 					ok: false,
-					error: "Sync engine not initialized — run alfesync init"
+					error: "Sync engine not initialized — run `alfe login`"
 				};
 				try {
 					lastSyncResult = await syncEngine.fullSync({ quiet: true });
@@ -646,20 +658,19 @@ const plugin = {
 				}
 			});
 			log.info("Registered gateway RPC method: sync.now");
-			api.registerGatewayMethod("sync.status", () => {
-				return Promise.resolve({
-					ok: true,
-					initialized: !!syncEngine,
-					schedule: currentConfig.syncSchedule ?? "daily",
-					scope: currentConfig.syncScope ?? [
-						"config",
-						"conversations",
-						"memory"
-					],
-					lastResult: lastSyncResult,
-					watcherActive: !!stopWatcher
-				});
-			});
+			api.registerGatewayMethod("sync.status", () => Promise.resolve({
+				ok: true,
+				initialized: !!syncEngine,
+				agentId,
+				schedule: currentConfig.syncSchedule ?? "daily",
+				scope: currentConfig.syncScope ?? [
+					"config",
+					"conversations",
+					"memory"
+				],
+				lastResult: lastSyncResult,
+				watcherActive: !!stopWatcher
+			}));
 			log.info("Registered gateway RPC method: sync.status");
 		}
 		if (api.registerService) api.registerService({
@@ -696,6 +707,8 @@ const plugin = {
 			}
 			daemonIpcClient = null;
 		}
+		client = null;
+		agentId = null;
 		syncEngine = null;
 		sharedSyncEngine = null;
 		lastSyncResult = null;
@@ -711,12 +724,8 @@ const plugin = {
 		};
 		if (config.syncSchedule) {
 			if (config.syncSchedule === "realtime" && syncEngine && !stopWatcher) {
-				let cfgForWorkspace = null;
-				try {
-					cfgForWorkspace = (0, _alfe_ai_config.resolveConfig)();
-				} catch {}
 				stopWatcher = await startWatcher({
-					workspacePath: currentConfig.workspacePath ?? cfgForWorkspace?.workspacePath ?? "",
+					workspacePath: currentConfig.workspacePath ?? syncEngine.workspacePath,
 					debounceMs: 2e3,
 					onChanges: async (paths) => {
 						if (!syncEngine) return;