@alfe.ai/openclaw-google-chat 0.0.28 → 0.0.29

package/dist/plugin2.cjs

@@ -1,8 +1,9 @@
 let node_module = require("node:module");
-let node_path = require("node:path");
 let _alfe_ai_config = require("@alfe.ai/config");
 let _alfe_ai_agent_api_client = require("@alfe.ai/agent-api-client");
+let _alfe_ai_openclaw_plugin_kit = require("@alfe.ai/openclaw-plugin-kit");
 let node_fs_promises = require("node:fs/promises");
+let node_path = require("node:path");
 let node_os = require("node:os");
 //#region src/gchat-state.ts
 /**
@@ -532,34 +533,9 @@ function isTokenRevokedError(err) {
 *       → dispatchInboundDirectDmWithRuntime() → Agent pipeline
 *       ← deliver() callback → Google Chat API (reply as user)
 */
-const require$1 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
-const pkg = require$1("../package.json");
+const pkg = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href)("../package.json");
 let dispatchInbound = null;
-/**
-* Resolve OpenClaw SDK from the running process.
-* Copied from @alfe.ai/openclaw-chat's resolution strategy.
-*/
-function resolveOpenClawSdk(log) {
-	const anchors = [require$1.main?.filename, process.argv[1]].filter(Boolean);
-	for (const anchor of anchors) try {
-		const channelInbound = (0, node_module.createRequire)(anchor)("openclaw/plugin-sdk/channel-inbound");
-		if (channelInbound.dispatchInboundDirectDmWithRuntime) {
-			dispatchInbound = channelInbound.dispatchInboundDirectDmWithRuntime;
-			log.info(`Resolved OpenClaw SDK from ${anchor}`);
-			return;
-		}
-	} catch {}
-	try {
-		const derivedPath = (0, node_path.join)((0, node_path.resolve)((0, node_path.dirname)(process.execPath), ".."), "lib", "node_modules", "openclaw", "package.json");
-		const channelInbound = (0, node_module.createRequire)(derivedPath)("openclaw/plugin-sdk/channel-inbound");
-		if (channelInbound.dispatchInboundDirectDmWithRuntime) {
-			dispatchInbound = channelInbound.dispatchInboundDirectDmWithRuntime;
-			log.info(`Resolved OpenClaw SDK from ${derivedPath}`);
-			return;
-		}
-	} catch {}
-	log.warn("OpenClaw SDK not resolvable — Google Chat dispatch will not work");
-}
+const GCHAT_ACTIVATION_KEY = (0, _alfe_ai_openclaw_plugin_kit.getActivationKey)("google-chat");
 let pluginRuntime = null;
 let poller = null;
 const plugin = {
@@ -569,66 +545,60 @@ const plugin = {
 	version: pkg.version,
 	activate(api) {
 		const log = api.logger;
-		const startService = async () => {
-			if (globalThis.__alfeGoogleChatActivated) {
-				log.debug("Google Chat plugin already activated — skipping duplicate");
-				return;
-			}
-			globalThis.__alfeGoogleChatActivated = true;
-			log.info("Google Chat plugin starting...");
-			resolveOpenClawSdk(log);
-			pluginRuntime = api.runtime ?? null;
-			let client;
-			try {
-				const cfg = (0, _alfe_ai_config.resolveConfig)();
-				client = new _alfe_ai_agent_api_client.AgentApiClient({
-					apiKey: cfg.apiKey,
-					apiUrl: cfg.apiUrl
-				});
-			} catch (err) {
-				globalThis.__alfeGoogleChatActivated = false;
-				log.error(`Failed to resolve config: ${err instanceof Error ? err.message : String(err)}`);
-				return;
-			}
-			let creds;
-			try {
-				creds = await client.getGoogleChatCredentials();
-			} catch (err) {
-				globalThis.__alfeGoogleChatActivated = false;
-				log.info(`Google Chat not connected — polling disabled (${err instanceof Error ? err.message : String(err)})`);
-				return;
-			}
-			const init = {
-				tokenManager: new (await (Promise.resolve().then(() => require("./gchat-token.cjs")))).TokenManager({
-					refreshToken: creds.refreshToken,
-					clientId: creds.clientId,
-					clientSecret: creds.clientSecret
-				}, log),
-				dispatchInbound,
-				runtime: pluginRuntime,
-				log,
-				agentEmail: creds.email
-			};
-			init.agentClient = client;
-			poller = new GChatPoller(init);
-			await poller.start();
-			log.info(`Google Chat poller started (account: ${creds.email})`);
+		const startService = () => {
+			(0, _alfe_ai_openclaw_plugin_kit.guardedStart)(GCHAT_ACTIVATION_KEY, log, async () => {
+				log.info("Google Chat plugin starting...");
+				dispatchInbound = (0, _alfe_ai_openclaw_plugin_kit.resolveOpenClawSdk)(log, { unresolvableNote: "OpenClaw SDK not resolvable — Google Chat dispatch will not work" });
+				pluginRuntime = api.runtime ?? null;
+				let client;
+				try {
+					const cfg = (0, _alfe_ai_config.resolveConfig)();
+					client = new _alfe_ai_agent_api_client.AgentApiClient({
+						apiKey: cfg.apiKey,
+						apiUrl: cfg.apiUrl
+					});
+				} catch (err) {
+					(0, _alfe_ai_openclaw_plugin_kit.resetActivation)(GCHAT_ACTIVATION_KEY);
+					log.error(`Failed to resolve config: ${err instanceof Error ? err.message : String(err)}`);
+					return;
+				}
+				let creds;
+				try {
+					creds = await client.getGoogleChatCredentials();
+				} catch (err) {
+					(0, _alfe_ai_openclaw_plugin_kit.resetActivation)(GCHAT_ACTIVATION_KEY);
+					log.info(`Google Chat not connected — polling disabled (${err instanceof Error ? err.message : String(err)})`);
+					return;
+				}
+				const init = {
+					tokenManager: new (await (Promise.resolve().then(() => require("./gchat-token.cjs")))).TokenManager({
+						refreshToken: creds.refreshToken,
+						clientId: creds.clientId,
+						clientSecret: creds.clientSecret
+					}, log),
+					dispatchInbound,
+					runtime: pluginRuntime,
+					log,
+					agentEmail: creds.email
+				};
+				init.agentClient = client;
+				poller = new GChatPoller(init);
+				await poller.start();
+				log.info(`Google Chat poller started (account: ${creds.email})`);
+			});
 		};
 		const stopService = () => {
-			globalThis.__alfeGoogleChatActivated = false;
 			poller?.stop();
 			poller = null;
 			pluginRuntime = null;
 			dispatchInbound = null;
+			(0, _alfe_ai_openclaw_plugin_kit.resetActivation)(GCHAT_ACTIVATION_KEY);
 			log.info("Google Chat plugin stopped");
 		};
 		api.registerService({
 			id: "google-chat-poller",
 			start: () => {
-				startService().catch((err) => {
-					globalThis.__alfeGoogleChatActivated = false;
-					log.error(`Google Chat service start failed: ${err instanceof Error ? err.message : String(err)}`);
-				});
+				startService();
 			},
 			stop: () => {
 				stopService();
@@ -637,12 +607,12 @@ const plugin = {
 		log.info("Google Chat plugin registered");
 	},
 	deactivate(api) {
-		globalThis.__alfeGoogleChatActivated = false;
 		const log = api.logger;
 		poller?.stop();
 		poller = null;
 		pluginRuntime = null;
 		dispatchInbound = null;
+		(0, _alfe_ai_openclaw_plugin_kit.resetActivation)(GCHAT_ACTIVATION_KEY);
 		log.info("Google Chat plugin deactivated");
 	}
 };

package/dist/plugin2.js

@@ -1,8 +1,9 @@
 import { createRequire } from "node:module";
-import { dirname, join, resolve } from "node:path";
 import { resolveConfig } from "@alfe.ai/config";
 import { AgentApiClient } from "@alfe.ai/agent-api-client";
+import { getActivationKey, guardedStart, resetActivation, resolveOpenClawSdk } from "@alfe.ai/openclaw-plugin-kit";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { join } from "node:path";
 import { homedir } from "node:os";
 //#region src/gchat-state.ts
 /**
@@ -532,34 +533,9 @@ function isTokenRevokedError(err) {
 *       → dispatchInboundDirectDmWithRuntime() → Agent pipeline
 *       ← deliver() callback → Google Chat API (reply as user)
 */
-const require = createRequire(import.meta.url);
-const pkg = require("../package.json");
+const pkg = createRequire(import.meta.url)("../package.json");
 let dispatchInbound = null;
-/**
-* Resolve OpenClaw SDK from the running process.
-* Copied from @alfe.ai/openclaw-chat's resolution strategy.
-*/
-function resolveOpenClawSdk(log) {
-	const anchors = [require.main?.filename, process.argv[1]].filter(Boolean);
-	for (const anchor of anchors) try {
-		const channelInbound = createRequire(anchor)("openclaw/plugin-sdk/channel-inbound");
-		if (channelInbound.dispatchInboundDirectDmWithRuntime) {
-			dispatchInbound = channelInbound.dispatchInboundDirectDmWithRuntime;
-			log.info(`Resolved OpenClaw SDK from ${anchor}`);
-			return;
-		}
-	} catch {}
-	try {
-		const derivedPath = join(resolve(dirname(process.execPath), ".."), "lib", "node_modules", "openclaw", "package.json");
-		const channelInbound = createRequire(derivedPath)("openclaw/plugin-sdk/channel-inbound");
-		if (channelInbound.dispatchInboundDirectDmWithRuntime) {
-			dispatchInbound = channelInbound.dispatchInboundDirectDmWithRuntime;
-			log.info(`Resolved OpenClaw SDK from ${derivedPath}`);
-			return;
-		}
-	} catch {}
-	log.warn("OpenClaw SDK not resolvable — Google Chat dispatch will not work");
-}
+const GCHAT_ACTIVATION_KEY = getActivationKey("google-chat");
 let pluginRuntime = null;
 let poller = null;
 const plugin = {
@@ -569,66 +545,60 @@ const plugin = {
 	version: pkg.version,
 	activate(api) {
 		const log = api.logger;
-		const startService = async () => {
-			if (globalThis.__alfeGoogleChatActivated) {
-				log.debug("Google Chat plugin already activated — skipping duplicate");
-				return;
-			}
-			globalThis.__alfeGoogleChatActivated = true;
-			log.info("Google Chat plugin starting...");
-			resolveOpenClawSdk(log);
-			pluginRuntime = api.runtime ?? null;
-			let client;
-			try {
-				const cfg = resolveConfig();
-				client = new AgentApiClient({
-					apiKey: cfg.apiKey,
-					apiUrl: cfg.apiUrl
-				});
-			} catch (err) {
-				globalThis.__alfeGoogleChatActivated = false;
-				log.error(`Failed to resolve config: ${err instanceof Error ? err.message : String(err)}`);
-				return;
-			}
-			let creds;
-			try {
-				creds = await client.getGoogleChatCredentials();
-			} catch (err) {
-				globalThis.__alfeGoogleChatActivated = false;
-				log.info(`Google Chat not connected — polling disabled (${err instanceof Error ? err.message : String(err)})`);
-				return;
-			}
-			const init = {
-				tokenManager: new (await (import("./gchat-token.js"))).TokenManager({
-					refreshToken: creds.refreshToken,
-					clientId: creds.clientId,
-					clientSecret: creds.clientSecret
-				}, log),
-				dispatchInbound,
-				runtime: pluginRuntime,
-				log,
-				agentEmail: creds.email
-			};
-			init.agentClient = client;
-			poller = new GChatPoller(init);
-			await poller.start();
-			log.info(`Google Chat poller started (account: ${creds.email})`);
+		const startService = () => {
+			guardedStart(GCHAT_ACTIVATION_KEY, log, async () => {
+				log.info("Google Chat plugin starting...");
+				dispatchInbound = resolveOpenClawSdk(log, { unresolvableNote: "OpenClaw SDK not resolvable — Google Chat dispatch will not work" });
+				pluginRuntime = api.runtime ?? null;
+				let client;
+				try {
+					const cfg = resolveConfig();
+					client = new AgentApiClient({
+						apiKey: cfg.apiKey,
+						apiUrl: cfg.apiUrl
+					});
+				} catch (err) {
+					resetActivation(GCHAT_ACTIVATION_KEY);
+					log.error(`Failed to resolve config: ${err instanceof Error ? err.message : String(err)}`);
+					return;
+				}
+				let creds;
+				try {
+					creds = await client.getGoogleChatCredentials();
+				} catch (err) {
+					resetActivation(GCHAT_ACTIVATION_KEY);
+					log.info(`Google Chat not connected — polling disabled (${err instanceof Error ? err.message : String(err)})`);
+					return;
+				}
+				const init = {
+					tokenManager: new (await (import("./gchat-token.js"))).TokenManager({
+						refreshToken: creds.refreshToken,
+						clientId: creds.clientId,
+						clientSecret: creds.clientSecret
+					}, log),
+					dispatchInbound,
+					runtime: pluginRuntime,
+					log,
+					agentEmail: creds.email
+				};
+				init.agentClient = client;
+				poller = new GChatPoller(init);
+				await poller.start();
+				log.info(`Google Chat poller started (account: ${creds.email})`);
+			});
 		};
 		const stopService = () => {
-			globalThis.__alfeGoogleChatActivated = false;
 			poller?.stop();
 			poller = null;
 			pluginRuntime = null;
 			dispatchInbound = null;
+			resetActivation(GCHAT_ACTIVATION_KEY);
 			log.info("Google Chat plugin stopped");
 		};
 		api.registerService({
 			id: "google-chat-poller",
 			start: () => {
-				startService().catch((err) => {
-					globalThis.__alfeGoogleChatActivated = false;
-					log.error(`Google Chat service start failed: ${err instanceof Error ? err.message : String(err)}`);
-				});
+				startService();
 			},
 			stop: () => {
 				stopService();
@@ -637,12 +607,12 @@ const plugin = {
 		log.info("Google Chat plugin registered");
 	},
 	deactivate(api) {
-		globalThis.__alfeGoogleChatActivated = false;
 		const log = api.logger;
 		poller?.stop();
 		poller = null;
 		pluginRuntime = null;
 		dispatchInbound = null;
+		resetActivation(GCHAT_ACTIVATION_KEY);
 		log.info("Google Chat plugin deactivated");
 	}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alfe.ai/openclaw-google-chat",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "description": "OpenClaw Google Chat plugin — DM polling and auto-reply via connected Google account",
   "type": "module",
   "main": "./dist/plugin.js",
@@ -27,8 +27,9 @@
     "openclaw.plugin.json"
   ],
   "dependencies": {
-    "@alfe.ai/agent-api-client": "^0.13.0",
-    "@alfe.ai/config": "^0.3.0"
+    "@alfe.ai/agent-api-client": "^0.14.0",
+    "@alfe.ai/config": "^0.4.0",
+    "@alfe.ai/openclaw-plugin-kit": "0.1.0"
   },
   "peerDependencies": {
     "openclaw": ">=2026.3.0"