@customclaw/composio 0.0.8 → 0.0.10

package/README.md

@@ -96,7 +96,7 @@ may look disconnected.
 Tips:
 
 - Set `defaultUserId` in plugin config for your app's primary identity.
-- Use `--user-id` explicitly when checking status/connect/disconnect.
+- Prefer passing `user_id`/`--user-id` explicitly when checking status, connecting, disconnecting, or executing tools.
 - Use `openclaw composio accounts <toolkit>` to discover which `user_id` owns active connections.
 
 ## Updating

package/dist/cli.js

@@ -271,9 +271,11 @@ export function registerComposioCli({ program, getClient, config, logger }) {
         try {
             const toolkitSlug = toolkit ? normalizeToolkitSlug(toolkit) : undefined;
             const toolkits = toolkitSlug ? [toolkitSlug] : undefined;
+            const currentUserId = options.userId || config.defaultUserId || "default";
             const statuses = await composioClient.getConnectionStatus(toolkits, options.userId);
             console.log("\nComposio Connection Status:");
             console.log("─".repeat(40));
+            console.log(`  Scope user_id: ${currentUserId}${options.userId ? " (explicit)" : " (default)"}`);
             if (statuses.length === 0) {
                 console.log("  No connections found");
             }
@@ -285,7 +287,6 @@ export function registerComposioCli({ program, getClient, config, logger }) {
                 }
             }
             if (toolkitSlug && statuses.length === 1 && !statuses[0]?.connected) {
-                const currentUserId = options.userId || config.defaultUserId || "default";
                 const activeUserIds = await composioClient.findActiveUserIdsForToolkit(toolkitSlug);
                 const otherUserIds = activeUserIds.filter((uid) => uid !== currentUserId);
                 if (otherUserIds.length > 0) {

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/dist/tools/connections.d.ts

@@ -87,7 +87,14 @@ export declare function createComposioConnectionsTool(client: ComposioClient, _c
             text: string;
         }[];
         details: {
+            hints?: {
+                toolkit: string;
+                connected_user_ids: string[];
+                message: string;
+            }[] | undefined;
             action: string;
+            checked_user_id: string | undefined;
+            user_id_explicit: boolean;
             count: number;
             connections: {
                 toolkit: string;

package/dist/tools/connections.js

@@ -13,7 +13,7 @@ export const ComposioManageConnectionsToolSchema = Type.Object({
         description: "Multiple toolkits to check status for",
     })),
     user_id: Type.Optional(Type.String({
-        description: "User ID for session scoping (uses default if not provided)",
+        description: "User ID for session scoping. Strongly recommended to avoid checking the wrong scope.",
     })),
     statuses: Type.Optional(Type.Array(Type.String(), {
         description: "Optional connection statuses filter for 'accounts' (e.g., ['ACTIVE'])",
@@ -34,6 +34,7 @@ export function createComposioConnectionsTool(client, _config) {
         async execute(_toolCallId, params) {
             const action = String(params.action || "status");
             const userId = typeof params.user_id === "string" ? params.user_id : undefined;
+            const userIdWasExplicit = typeof params.user_id === "string" && params.user_id.trim().length > 0;
             try {
                 switch (action) {
                     case "list": {
@@ -119,13 +120,32 @@ export function createComposioConnectionsTool(client, _config) {
                             toolkitsToCheck = params.toolkits.filter((t) => typeof t === "string" && t.trim() !== "");
                         }
                         const statuses = await client.getConnectionStatus(toolkitsToCheck, userId);
+                        const disconnectedToolkits = statuses.filter((s) => !s.connected).map((s) => s.toolkit);
+                        const hints = [];
+                        if (!userIdWasExplicit) {
+                            for (const toolkit of disconnectedToolkits) {
+                                const activeUserIds = await client.findActiveUserIdsForToolkit(toolkit);
+                                if (activeUserIds.length === 0)
+                                    continue;
+                                hints.push({
+                                    toolkit,
+                                    connected_user_ids: activeUserIds,
+                                    message: `No user_id was provided, so status checked the default scope. ` +
+                                        `'${toolkit}' has ACTIVE accounts under: ${activeUserIds.join(", ")}. ` +
+                                        "Pass user_id explicitly for deterministic results.",
+                                });
+                            }
+                        }
                         const response = {
                             action: "status",
+                            checked_user_id: statuses[0]?.userId,
+                            user_id_explicit: userIdWasExplicit,
                             count: statuses.length,
                             connections: statuses.map((s) => ({
                                 toolkit: s.toolkit,
                                 connected: s.connected,
                             })),
+                            ...(hints.length > 0 ? { hints } : {}),
                         };
                         return {
                             content: [{ type: "text", text: JSON.stringify(response, null, 2) }],

package/dist/tools/execute.js

@@ -10,7 +10,7 @@ export const ComposioExecuteToolSchema = Type.Object({
         description: "Tool arguments matching the tool's parameter schema",
     }),
     user_id: Type.Optional(Type.String({
-        description: "User ID for session scoping (uses default if not provided)",
+        description: "User ID for session scoping. Strongly recommended to avoid executing in the wrong scope.",
     })),
     connected_account_id: Type.Optional(Type.String({
         description: "Optional connected account ID to pin execution to a specific account when multiple are connected",

package/package.json

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