@devries-cameron20 / composio-1 / commits / 96a9fcdee
Fork 0

Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.

refactor(cli): extract resolveToolRouterSession, use extractMessage for error handling

- Add resolveToolRouterSession() that resolves ComposioClientSingleton and creates a session in one step, eliminating 3-step boilerplate repeated across toolkits info, toolkits list, and connected-accounts link - Replace inline error message extraction with the existing extractMessage() utility from api-error-extraction.ts - Remove direct ComposioClientSingleton import from commands that only need it for session creation (toolkits info, toolkits list, connected-accounts link) - Remove defensive Array.isArray(result.items) checks on typed responses

jkomyno committed Feb 26, 2026 at 01:47 UTC 96a9fcdee1cf4c975d334ed3deca25aa28047e5b
4 files changed +33 -28
ts/packages/cli/src/commands/connected-accounts/commands/connected-accounts.link.cmd.ts
+5 -12
@@ -1,11 +1,12 @@
1 import { Args, Command, Options } from '@effect/cli';
2 import { Effect, Option, Schedule } from 'effect';
3 import open from 'open';
4 -import { ComposioClientSingleton, ComposioToolkitsRepository } from 'src/services/composio-clients';
4 +import { ComposioToolkitsRepository } from 'src/services/composio-clients';
5 import { TerminalUI } from 'src/services/terminal-ui';
6 import { requireAuth } from 'src/effects/require-auth';
7 import { handleHttpServerError } from 'src/effects/handle-http-error';
8 -import { createToolRouterSession } from 'src/effects/create-tool-router-session';
8 +import { resolveToolRouterSession } from 'src/effects/create-tool-router-session';
9 +import { extractMessage } from 'src/utils/api-error-extraction';
10
11 const toolkit = Args.text({ name: 'toolkit' }).pipe(
12 Args.withDescription('Toolkit slug to link (e.g. "github", "gmail")'),
@@ -180,14 +181,12 @@ export const connectedAccountsCmd$Link = Command.make(
181 } else {
182 // Path B: Tool Router flow — toolkit is guaranteed Some (validated above)
183 const toolkitSlug = Option.getOrThrow(toolkit);
183 - const clientSingleton = yield* ComposioClientSingleton;
184 - const client = yield* clientSingleton.get();
184
185 const linkOpt = yield* ui
186 .withSpinner(
187 `Linking ${toolkitSlug}...`,
188 Effect.gen(function* () {
190 - const sessionId = yield* createToolRouterSession(client, userId, {
189 + const { client, sessionId } = yield* resolveToolRouterSession(userId, {
190 manageConnections: true,
191 });
192 return yield* Effect.tryPromise(() =>
@@ -199,14 +198,8 @@ export const connectedAccountsCmd$Link = Command.make(
198 Effect.asSome,
199 Effect.catchAll(error =>
200 Effect.gen(function* () {
202 - // Surface the API error message when available
201 const message =
204 - error instanceof Error
205 - ? error.message
206 - : typeof error === 'object' && error !== null && 'message' in error
207 - ? String((error as { message: unknown }).message)
208 - : `Failed to create link for toolkit "${toolkitSlug}".`;
209 -
202 + extractMessage(error) ?? `Failed to create link for toolkit "${toolkitSlug}".`;
203 yield* ui.log.error(message);
204 yield* Effect.logDebug('Link error:', error);
205 yield* ui.log.step('Browse available toolkits:\n> composio toolkits list');
ts/packages/cli/src/commands/toolkits/commands/toolkits.info.cmd.ts
+7 -10
@@ -1,9 +1,10 @@
1 import { Args, Command, Options } from '@effect/cli';
2 import { Effect, Option } from 'effect';
3 -import { ComposioClientSingleton, ComposioToolkitsRepository } from 'src/services/composio-clients';
3 +import { ComposioToolkitsRepository } from 'src/services/composio-clients';
4 import { TerminalUI } from 'src/services/terminal-ui';
5 import { requireAuth } from 'src/effects/require-auth';
6 -import { createToolRouterSession } from 'src/effects/create-tool-router-session';
6 +import { resolveToolRouterSession } from 'src/effects/create-tool-router-session';
7 +import { extractMessage } from 'src/utils/api-error-extraction';
8 import { formatToolkitInfo, formatToolkitInfoJson } from '../format';
9
10 const slug = Args.text({ name: 'slug' }).pipe(
@@ -40,14 +41,11 @@ export const toolkitsCmd$Info = Command.make('info', { slug, userId }, ({ slug,
41
42 const slugValue = slug.value;
43
43 - const clientSingleton = yield* ComposioClientSingleton;
44 - const client = yield* clientSingleton.get();
45 -
44 const resultOpt = yield* ui
45 .withSpinner(
46 `Fetching toolkit "${slugValue}"...`,
47 Effect.gen(function* () {
50 - const sessionId = yield* createToolRouterSession(client, userId);
48 + const { client, sessionId } = yield* resolveToolRouterSession(userId);
49 return yield* Effect.tryPromise(() =>
50 client.toolRouter.session.toolkits(sessionId, {
51 toolkits: [slugValue],
@@ -59,9 +57,9 @@ export const toolkitsCmd$Info = Command.make('info', { slug, userId }, ({ slug,
57 Effect.asSome,
58 Effect.catchAll(error =>
59 Effect.gen(function* () {
62 - const message =
63 - error instanceof Error ? error.message : `Failed to fetch toolkit "${slugValue}".`;
60 + const message = extractMessage(error) ?? `Failed to fetch toolkit "${slugValue}".`;
61 yield* ui.log.error(message);
62 + yield* Effect.logDebug('Toolkit info error:', error);
63 yield* ui.log.step('Browse available toolkits:\n> composio toolkits list');
64 return Option.none();
65 })
@@ -73,8 +71,7 @@ export const toolkitsCmd$Info = Command.make('info', { slug, userId }, ({ slug,
71 }
72
73 const result = resultOpt.value;
76 - const items = Array.isArray(result.items) ? result.items : [];
77 - const toolkit = items[0];
74 + const toolkit = result.items[0];
75
76 if (!toolkit) {
77 yield* ui.log.warn(`Toolkit "${slugValue}" not found.`);
ts/packages/cli/src/commands/toolkits/commands/toolkits.list.cmd.ts
+3 -6
@@ -1,9 +1,8 @@
1 import { Command, Options } from '@effect/cli';
2 import { Effect, Option } from 'effect';
3 -import { ComposioClientSingleton } from 'src/services/composio-clients';
3 import { TerminalUI } from 'src/services/terminal-ui';
4 import { requireAuth } from 'src/effects/require-auth';
6 -import { createToolRouterSession } from 'src/effects/create-tool-router-session';
5 +import { resolveToolRouterSession } from 'src/effects/create-tool-router-session';
6 import { clampLimit } from 'src/ui/clamp-limit';
7 import { formatToolkitsTable, formatToolkitsJson } from '../format';
8
@@ -46,15 +45,13 @@ export const toolkitsCmd$List = Command.make(
45 if (!(yield* requireAuth)) return;
46
47 const ui = yield* TerminalUI;
49 - const clientSingleton = yield* ComposioClientSingleton;
50 - const client = yield* clientSingleton.get();
48
49 const clampedLimit = clampLimit(limit);
50
51 const result = yield* ui.withSpinner(
52 'Fetching toolkits...',
53 Effect.gen(function* () {
57 - const sessionId = yield* createToolRouterSession(client, userId);
54 + const { client, sessionId } = yield* resolveToolRouterSession(userId);
55 return yield* Effect.tryPromise(() =>
56 client.toolRouter.session.toolkits(sessionId, {
57 search: Option.getOrUndefined(query),
@@ -65,7 +62,7 @@ export const toolkitsCmd$List = Command.make(
62 })
63 );
64
68 - const items = Array.isArray(result.items) ? result.items : [];
65 + const { items } = result;
66
67 if (items.length === 0) {
68 yield* ui.log.warn('No toolkits found. Try broadening your search.');
ts/packages/cli/src/effects/create-tool-router-session.ts
+18
@@ -1,5 +1,6 @@
1 import { Effect } from 'effect';
2 import type { Composio } from '@composio/client';
3 +import { ComposioClientSingleton } from 'src/services/composio-clients';
4
5 export interface CreateToolRouterSessionOptions {
6 /** Enable auto connection management. Default: false. */
@@ -12,6 +13,7 @@ export interface CreateToolRouterSessionOptions {
13 *
14 * Accepts a pre-resolved client instance (from ComposioClientSingleton)
15 * so callers can resolve the dependency at layer construction time.
16 + * Used by `ToolsExecutorLive` which already holds the client reference.
17 */
18 export const createToolRouterSession = (
19 client: Composio,
@@ -24,3 +26,19 @@ export const createToolRouterSession = (
26 manage_connections: { enable: options?.manageConnections ?? false },
27 })
28 ).pipe(Effect.map(session => session.session_id));
29 +
30 +/**
31 + * Resolve the Composio client and create a Tool Router session in one step.
32 + * Returns `{ client, sessionId }` — eliminates the 3-step boilerplate
33 + * (resolve singleton, get client, create session) repeated across commands.
34 + */
35 +export const resolveToolRouterSession = (
36 + userId: string,
37 + options?: CreateToolRouterSessionOptions
38 +) =>
39 + Effect.gen(function* () {
40 + const clientSingleton = yield* ComposioClientSingleton;
41 + const client = yield* clientSingleton.get();
42 + const sessionId = yield* createToolRouterSession(client, userId, options);
43 + return { client, sessionId };
44 + });