@alfe.ai/openclaw-google-chat 0.0.7 → 0.0.9

package/dist/plugin2.cjs

@@ -55,6 +55,17 @@ var StateManager = class {
 	getLastSeenTimestamp(spaceName) {
 		return this.state.spaces[spaceName]?.lastSeenTimestamp;
 	}
+	/** Get cached agent user ID, but only if it was resolved for the same email. */
+	getCachedAgentUserId(currentEmail) {
+		if (this.state.agentEmail !== currentEmail) return void 0;
+		return this.state.agentUserId;
+	}
+	/** Cache the agent's global user ID and the email it was resolved from. */
+	setAgentIdentity(userId, email) {
+		this.state.agentUserId = userId;
+		this.state.agentEmail = email;
+		this.dirty = true;
+	}
 	/** Get the agent's userId for a space (if previously resolved). */
 	getAgentUserId(spaceName) {
 		return this.state.spaces[spaceName]?.agentUserId;
@@ -143,6 +154,10 @@ async function sendMessage(token, spaceName, text) {
 		body: JSON.stringify({ text })
 	});
 }
+/** Get a specific member of a space by user resource name or email alias. */
+async function getMember(token, spaceName, userId) {
+	return request(token, `/${spaceName}/members/${userId}`);
+}
 /** List members of a space. */
 async function listMembers(token, spaceName) {
 	const allMembers = [];
@@ -207,6 +222,7 @@ var GChatPoller = class {
 	log;
 	stateManager;
 	agentEmail;
+	agentClient;
 	spaces = /* @__PURE__ */ new Map();
 	seenMessages = /* @__PURE__ */ new Map();
 	discoveryTimer = null;
@@ -217,6 +233,7 @@ var GChatPoller = class {
 		this.runtime = init.runtime;
 		this.log = init.log;
 		this.agentEmail = init.agentEmail;
+		this.agentClient = init.agentClient ?? null;
 		this.stateManager = new StateManager(init.log);
 	}
 	/** Start the polling engine. */
@@ -272,8 +289,7 @@ var GChatPoller = class {
 		let peerUserId = this.stateManager.getPeerUserId(spaceName) ?? "";
 		let peerDisplayName = null;
 		if (!agentUserId || !peerUserId) try {
-			const members = await listMembers(token, spaceName);
-			const resolved = this.resolveMembers(members);
+			const resolved = await this.resolveMembers(token, spaceName);
 			agentUserId = resolved.agentUserId;
 			peerUserId = resolved.peerUserId;
 			peerDisplayName = resolved.peerDisplayName;
@@ -299,22 +315,28 @@ var GChatPoller = class {
 		this.seenMessages.set(spaceName, /* @__PURE__ */ new Set());
 		this.scheduleSpacePoll(state);
 	}
-	resolveMembers(members) {
-		let agentUserId = "";
+	async resolveMembers(token, spaceName) {
+		let agentUserId = this.stateManager.getCachedAgentUserId(this.agentEmail) ?? "";
+		if (!agentUserId && this.agentEmail) try {
+			agentUserId = (await getMember(token, spaceName, `users/${this.agentEmail}`)).member.name;
+			this.stateManager.setAgentIdentity(agentUserId, this.agentEmail);
+			this.log.info(`Resolved agent user ID: ${agentUserId}`);
+		} catch (err) {
+			this.log.warn(`Failed to look up agent by email: ${err instanceof Error ? err.message : String(err)}`);
+		}
+		const humans = (await listMembers(token, spaceName)).filter((m) => m.member.type === "HUMAN");
 		let peerUserId = "";
 		let peerDisplayName = null;
-		for (const m of members) {
-			if (m.member.type !== "HUMAN") continue;
-			if (this.agentEmail && m.member.displayName?.toLowerCase().includes(this.agentEmail.split("@")[0].toLowerCase())) agentUserId = m.member.name;
-			else {
-				peerUserId = m.member.name;
-				peerDisplayName = m.member.displayName || null;
-			}
+		if (agentUserId) for (const m of humans) {
+			if (m.member.name === agentUserId) continue;
+			peerUserId = m.member.name;
+			peerDisplayName = m.member.displayName || null;
+			break;
 		}
-		if (!agentUserId && members.length >= 2) {
-			agentUserId = members[0].member.name;
-			peerUserId = members[1].member.name;
-			peerDisplayName = members[1].member.displayName || null;
+		else if (humans.length >= 2) {
+			agentUserId = humans[0].member.name;
+			peerUserId = humans[1].member.name;
+			peerDisplayName = humans[1].member.displayName || null;
 		}
 		return {
 			agentUserId,
@@ -379,6 +401,23 @@ var GChatPoller = class {
 		const senderDisplayName = message.sender.displayName;
 		const peerLabel = senderDisplayName || state.peerDisplayName || "User";
 		this.log.info(`Dispatching message from ${peerLabel} in ${state.spaceName}`);
+		let resolvedIdentityId;
+		let accessAllowed = true;
+		if (this.agentClient) try {
+			const senderUserId = senderName.startsWith("users/") ? senderName.slice(6) : senderName;
+			const result = await this.agentClient.resolveGoogleChatSender({
+				senderUserId,
+				spaceId: state.spaceName
+			});
+			resolvedIdentityId = result.identityId ?? void 0;
+			accessAllowed = result.accessAllowed;
+			if (!accessAllowed) {
+				this.log.info(`Skipping dispatch — access denied for sender ${peerLabel} (${senderUserId})`);
+				return;
+			}
+		} catch (err) {
+			this.log.warn(`Sender resolve failed; dispatching without IdentityId: ${err instanceof Error ? err.message : String(err)}`);
+		}
 		try {
 			const cfg = this.runtime.config.loadConfig();
 			await this.dispatchInbound({
@@ -401,7 +440,8 @@ var GChatPoller = class {
 				extraContext: {
 					ChannelMode: "gchat",
 					ConversationId: conversationId,
-					...senderDisplayName ? { SenderName: senderDisplayName } : {}
+					...senderDisplayName ? { SenderName: senderDisplayName } : {},
+					...resolvedIdentityId ? { IdentityId: resolvedIdentityId } : {}
 				},
 				deliver: async (payload) => {
 					const raw = payload.text ?? "";
@@ -549,7 +589,7 @@ const plugin = {
 				log.info("Google Chat not connected — polling disabled");
 				return;
 			}
-			poller = new GChatPoller({
+			const init = {
 				tokenManager: new (await (Promise.resolve().then(() => require("./gchat-token.cjs")))).TokenManager({
 					refreshToken: creds.refreshToken,
 					clientId: creds.clientId,
@@ -559,7 +599,9 @@ const plugin = {
 				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})`);
 		};

package/dist/plugin2.js

@@ -55,6 +55,17 @@ var StateManager = class {
 	getLastSeenTimestamp(spaceName) {
 		return this.state.spaces[spaceName]?.lastSeenTimestamp;
 	}
+	/** Get cached agent user ID, but only if it was resolved for the same email. */
+	getCachedAgentUserId(currentEmail) {
+		if (this.state.agentEmail !== currentEmail) return void 0;
+		return this.state.agentUserId;
+	}
+	/** Cache the agent's global user ID and the email it was resolved from. */
+	setAgentIdentity(userId, email) {
+		this.state.agentUserId = userId;
+		this.state.agentEmail = email;
+		this.dirty = true;
+	}
 	/** Get the agent's userId for a space (if previously resolved). */
 	getAgentUserId(spaceName) {
 		return this.state.spaces[spaceName]?.agentUserId;
@@ -143,6 +154,10 @@ async function sendMessage(token, spaceName, text) {
 		body: JSON.stringify({ text })
 	});
 }
+/** Get a specific member of a space by user resource name or email alias. */
+async function getMember(token, spaceName, userId) {
+	return request(token, `/${spaceName}/members/${userId}`);
+}
 /** List members of a space. */
 async function listMembers(token, spaceName) {
 	const allMembers = [];
@@ -207,6 +222,7 @@ var GChatPoller = class {
 	log;
 	stateManager;
 	agentEmail;
+	agentClient;
 	spaces = /* @__PURE__ */ new Map();
 	seenMessages = /* @__PURE__ */ new Map();
 	discoveryTimer = null;
@@ -217,6 +233,7 @@ var GChatPoller = class {
 		this.runtime = init.runtime;
 		this.log = init.log;
 		this.agentEmail = init.agentEmail;
+		this.agentClient = init.agentClient ?? null;
 		this.stateManager = new StateManager(init.log);
 	}
 	/** Start the polling engine. */
@@ -272,8 +289,7 @@ var GChatPoller = class {
 		let peerUserId = this.stateManager.getPeerUserId(spaceName) ?? "";
 		let peerDisplayName = null;
 		if (!agentUserId || !peerUserId) try {
-			const members = await listMembers(token, spaceName);
-			const resolved = this.resolveMembers(members);
+			const resolved = await this.resolveMembers(token, spaceName);
 			agentUserId = resolved.agentUserId;
 			peerUserId = resolved.peerUserId;
 			peerDisplayName = resolved.peerDisplayName;
@@ -299,22 +315,28 @@ var GChatPoller = class {
 		this.seenMessages.set(spaceName, /* @__PURE__ */ new Set());
 		this.scheduleSpacePoll(state);
 	}
-	resolveMembers(members) {
-		let agentUserId = "";
+	async resolveMembers(token, spaceName) {
+		let agentUserId = this.stateManager.getCachedAgentUserId(this.agentEmail) ?? "";
+		if (!agentUserId && this.agentEmail) try {
+			agentUserId = (await getMember(token, spaceName, `users/${this.agentEmail}`)).member.name;
+			this.stateManager.setAgentIdentity(agentUserId, this.agentEmail);
+			this.log.info(`Resolved agent user ID: ${agentUserId}`);
+		} catch (err) {
+			this.log.warn(`Failed to look up agent by email: ${err instanceof Error ? err.message : String(err)}`);
+		}
+		const humans = (await listMembers(token, spaceName)).filter((m) => m.member.type === "HUMAN");
 		let peerUserId = "";
 		let peerDisplayName = null;
-		for (const m of members) {
-			if (m.member.type !== "HUMAN") continue;
-			if (this.agentEmail && m.member.displayName?.toLowerCase().includes(this.agentEmail.split("@")[0].toLowerCase())) agentUserId = m.member.name;
-			else {
-				peerUserId = m.member.name;
-				peerDisplayName = m.member.displayName || null;
-			}
+		if (agentUserId) for (const m of humans) {
+			if (m.member.name === agentUserId) continue;
+			peerUserId = m.member.name;
+			peerDisplayName = m.member.displayName || null;
+			break;
 		}
-		if (!agentUserId && members.length >= 2) {
-			agentUserId = members[0].member.name;
-			peerUserId = members[1].member.name;
-			peerDisplayName = members[1].member.displayName || null;
+		else if (humans.length >= 2) {
+			agentUserId = humans[0].member.name;
+			peerUserId = humans[1].member.name;
+			peerDisplayName = humans[1].member.displayName || null;
 		}
 		return {
 			agentUserId,
@@ -379,6 +401,23 @@ var GChatPoller = class {
 		const senderDisplayName = message.sender.displayName;
 		const peerLabel = senderDisplayName || state.peerDisplayName || "User";
 		this.log.info(`Dispatching message from ${peerLabel} in ${state.spaceName}`);
+		let resolvedIdentityId;
+		let accessAllowed = true;
+		if (this.agentClient) try {
+			const senderUserId = senderName.startsWith("users/") ? senderName.slice(6) : senderName;
+			const result = await this.agentClient.resolveGoogleChatSender({
+				senderUserId,
+				spaceId: state.spaceName
+			});
+			resolvedIdentityId = result.identityId ?? void 0;
+			accessAllowed = result.accessAllowed;
+			if (!accessAllowed) {
+				this.log.info(`Skipping dispatch — access denied for sender ${peerLabel} (${senderUserId})`);
+				return;
+			}
+		} catch (err) {
+			this.log.warn(`Sender resolve failed; dispatching without IdentityId: ${err instanceof Error ? err.message : String(err)}`);
+		}
 		try {
 			const cfg = this.runtime.config.loadConfig();
 			await this.dispatchInbound({
@@ -401,7 +440,8 @@ var GChatPoller = class {
 				extraContext: {
 					ChannelMode: "gchat",
 					ConversationId: conversationId,
-					...senderDisplayName ? { SenderName: senderDisplayName } : {}
+					...senderDisplayName ? { SenderName: senderDisplayName } : {},
+					...resolvedIdentityId ? { IdentityId: resolvedIdentityId } : {}
 				},
 				deliver: async (payload) => {
 					const raw = payload.text ?? "";
@@ -549,7 +589,7 @@ const plugin = {
 				log.info("Google Chat not connected — polling disabled");
 				return;
 			}
-			poller = new GChatPoller({
+			const init = {
 				tokenManager: new (await (import("./gchat-token.js"))).TokenManager({
 					refreshToken: creds.refreshToken,
 					clientId: creds.clientId,
@@ -559,7 +599,9 @@ const plugin = {
 				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})`);
 		};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alfe.ai/openclaw-google-chat",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "OpenClaw Google Chat plugin — DM polling and auto-reply via connected Google account",
   "type": "module",
   "main": "./dist/plugin.js",
@@ -27,7 +27,7 @@
     "openclaw.plugin.json"
   ],
   "dependencies": {
-    "@alfe.ai/agent-api-client": "^0.0.12",
+    "@alfe.ai/agent-api-client": "^0.1.0",
     "@alfe.ai/config": "^0.0.8"
   },
   "peerDependencies": {