@customclaw/composio 0.0.8 → 0.0.9

package/dist/client.js

@@ -290,7 +290,7 @@ export class ComposioClient {
      * Execute a single tool using COMPOSIO_MULTI_EXECUTE_TOOL
      */
     async executeTool(toolSlug, args, userId, connectedAccountId) {
-        const uid = this.getUserId(userId);
+        const requestedUid = this.getUserId(userId);
         const normalizedToolSlug = normalizeToolSlug(toolSlug);
         const toolRestrictionError = this.getToolSlugRestrictionError(normalizedToolSlug);
         if (toolRestrictionError) {
@@ -305,13 +305,15 @@ export class ComposioClient {
         }
         const accountResolution = await this.resolveConnectedAccountForExecution({
             toolkit,
-            userId: uid,
+            userId: requestedUid,
             connectedAccountId,
+            userIdWasExplicit: typeof userId === "string" && userId.trim().length > 0,
         });
         if ("error" in accountResolution) {
             return { success: false, error: accountResolution.error };
         }
-        const session = await this.getSession(uid, accountResolution.connectedAccountId
+        const effectiveUid = accountResolution.userId || requestedUid;
+        const session = await this.getSession(effectiveUid, accountResolution.connectedAccountId
             ? { [toolkit]: accountResolution.connectedAccountId }
             : undefined);
         try {
@@ -321,7 +323,7 @@ export class ComposioClient {
             });
             if (!response.successful) {
                 const recovered = await this.tryExecutionRecovery({
-                    uid,
+                    uid: effectiveUid,
                     toolSlug: normalizedToolSlug,
                     args,
                     connectedAccountId: accountResolution.connectedAccountId,
@@ -341,7 +343,7 @@ export class ComposioClient {
             const toolResponse = result.response;
             if (!toolResponse.successful) {
                 const recovered = await this.tryExecutionRecovery({
-                    uid,
+                    uid: effectiveUid,
                     toolSlug: normalizedToolSlug,
                     args,
                     connectedAccountId: accountResolution.connectedAccountId,
@@ -483,9 +485,23 @@ export class ComposioClient {
         const explicitId = params.connectedAccountId?.trim();
         if (explicitId) {
             try {
-                const account = await this.client.connectedAccounts.get(explicitId);
+                let rawAccount;
+                const retrieve = this.client?.client?.connectedAccounts?.retrieve;
+                if (typeof retrieve === "function") {
+                    try {
+                        rawAccount = await retrieve.call(this.client.client.connectedAccounts, explicitId);
+                    }
+                    catch {
+                        // Best-effort: fall through to SDK get() which may omit user_id.
+                    }
+                }
+                if (!rawAccount) {
+                    rawAccount = await this.client.connectedAccounts.get(explicitId);
+                }
+                const account = rawAccount;
                 const accountToolkit = normalizeToolkitSlug(String(account?.toolkit?.slug || ""));
                 const accountStatus = String(account?.status || "").toUpperCase();
+                const accountUserId = String(account?.user_id || account?.userId || "").trim();
                 if (accountToolkit && accountToolkit !== toolkit) {
                     return {
                         error: `Connected account '${explicitId}' belongs to toolkit '${accountToolkit}', but tool '${toolkit}' was requested.`,
@@ -496,7 +512,13 @@ export class ComposioClient {
                         error: `Connected account '${explicitId}' is '${accountStatus}', not ACTIVE.`,
                     };
                 }
-                return { connectedAccountId: explicitId };
+                if (params.userIdWasExplicit && accountUserId && accountUserId !== userId) {
+                    return {
+                        error: `Connected account '${explicitId}' belongs to user_id '${accountUserId}', ` +
+                            `but '${userId}' was requested. Use matching user_id or omit user_id when providing connected_account_id.`,
+                    };
+                }
+                return { connectedAccountId: explicitId, userId: accountUserId || undefined };
             }
             catch (err) {
                 return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@customclaw/composio",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "type": "module",
   "description": "Composio Tool Router plugin for OpenClaw — access 1000+ third-party integrations",
   "main": "dist/index.js",