Skip to content

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

jkomyno96a9fcdee1cf
diff --git a/ts/packages/cli/src/commands/connected-accounts/commands/connected-accounts.link.cmd.ts b/ts/packages/cli/src/commands/connected-accounts/commands/connected-accounts.link.cmd.ts
index 6bb1ae0f7..3879a9419 100644
--- a/ts/packages/cli/src/commands/connected-accounts/commands/connected-accounts.link.cmd.ts
+++ b/ts/packages/cli/src/commands/connected-accounts/commands/connected-accounts.link.cmd.ts
@@ -1,11 +1,12 @@
import { Args, Command, Options } from '@effect/cli';
import { Effect, Option, Schedule } from 'effect';
import open from 'open';
-import { ComposioClientSingleton, ComposioToolkitsRepository } from 'src/services/composio-clients';
+import { ComposioToolkitsRepository } from 'src/services/composio-clients';
import { TerminalUI } from 'src/services/terminal-ui';
import { requireAuth } from 'src/effects/require-auth';
import { handleHttpServerError } from 'src/effects/handle-http-error';
-import { createToolRouterSession } from 'src/effects/create-tool-router-session';
+import { resolveToolRouterSession } from 'src/effects/create-tool-router-session';
+import { extractMessage } from 'src/utils/api-error-extraction';
const toolkit = Args.text({ name: 'toolkit' }).pipe(
Args.withDescription('Toolkit slug to link (e.g. "github", "gmail")'),
@@ -180,14 +181,12 @@ export const connectedAccountsCmd$Link = Command.make(
} else {
// Path B: Tool Router flow — toolkit is guaranteed Some (validated above)
const toolkitSlug = Option.getOrThrow(toolkit);
- const clientSingleton = yield* ComposioClientSingleton;
- const client = yield* clientSingleton.get();
const linkOpt = yield* ui
.withSpinner(
`Linking ${toolkitSlug}...`,
Effect.gen(function* () {
- const sessionId = yield* createToolRouterSession(client, userId, {
+ const { client, sessionId } = yield* resolveToolRouterSession(userId, {
manageConnections: true,
});
return yield* Effect.tryPromise(() =>
@@ -199,14 +198,8 @@ export const connectedAccountsCmd$Link = Command.make(
Effect.asSome,
Effect.catchAll(error =>
Effect.gen(function* () {
- // Surface the API error message when available
const message =
- error instanceof Error
- ? error.message
- : typeof error === 'object' && error !== null && 'message' in error
- ? String((error as { message: unknown }).message)
- : `Failed to create link for toolkit "${toolkitSlug}".`;
-
+ extractMessage(error) ?? `Failed to create link for toolkit "${toolkitSlug}".`;
yield* ui.log.error(message);
yield* Effect.logDebug('Link error:', error);
yield* ui.log.step('Browse available toolkits:\n> composio toolkits list');
diff --git a/ts/packages/cli/src/commands/toolkits/commands/toolkits.info.cmd.ts b/ts/packages/cli/src/commands/toolkits/commands/toolkits.info.cmd.ts
index bea4ba643..755ddc4f1 100644
--- a/ts/packages/cli/src/commands/toolkits/commands/toolkits.info.cmd.ts
+++ b/ts/packages/cli/src/commands/toolkits/commands/toolkits.info.cmd.ts
@@ -1,9 +1,10 @@
import { Args, Command, Options } from '@effect/cli';
import { Effect, Option } from 'effect';
-import { ComposioClientSingleton, ComposioToolkitsRepository } from 'src/services/composio-clients';
+import { ComposioToolkitsRepository } from 'src/services/composio-clients';
import { TerminalUI } from 'src/services/terminal-ui';
import { requireAuth } from 'src/effects/require-auth';
-import { createToolRouterSession } from 'src/effects/create-tool-router-session';
+import { resolveToolRouterSession } from 'src/effects/create-tool-router-session';
+import { extractMessage } from 'src/utils/api-error-extraction';
import { formatToolkitInfo, formatToolkitInfoJson } from '../format';
const slug = Args.text({ name: 'slug' }).pipe(
@@ -40,14 +41,11 @@ export const toolkitsCmd$Info = Command.make('info', { slug, userId }, ({ slug,
const slugValue = slug.value;
- const clientSingleton = yield* ComposioClientSingleton;
- const client = yield* clientSingleton.get();
-
const resultOpt = yield* ui
.withSpinner(
`Fetching toolkit "${slugValue}"...`,
Effect.gen(function* () {
- const sessionId = yield* createToolRouterSession(client, userId);
+ const { client, sessionId } = yield* resolveToolRouterSession(userId);
return yield* Effect.tryPromise(() =>
client.toolRouter.session.toolkits(sessionId, {
toolkits: [slugValue],
@@ -59,9 +57,9 @@ export const toolkitsCmd$Info = Command.make('info', { slug, userId }, ({ slug,
Effect.asSome,
Effect.catchAll(error =>
Effect.gen(function* () {
- const message =
- error instanceof Error ? error.message : `Failed to fetch toolkit "${slugValue}".`;
+ const message = extractMessage(error) ?? `Failed to fetch toolkit "${slugValue}".`;
yield* ui.log.error(message);
+ yield* Effect.logDebug('Toolkit info error:', error);
yield* ui.log.step('Browse available toolkits:\n> composio toolkits list');
return Option.none();
})
@@ -73,8 +71,7 @@ export const toolkitsCmd$Info = Command.make('info', { slug, userId }, ({ slug,
}
const result = resultOpt.value;
- const items = Array.isArray(result.items) ? result.items : [];
- const toolkit = items[0];
+ const toolkit = result.items[0];
if (!toolkit) {
yield* ui.log.warn(`Toolkit "${slugValue}" not found.`);
diff --git a/ts/packages/cli/src/commands/toolkits/commands/toolkits.list.cmd.ts b/ts/packages/cli/src/commands/toolkits/commands/toolkits.list.cmd.ts
index 3faa29145..6b82382f2 100644
--- a/ts/packages/cli/src/commands/toolkits/commands/toolkits.list.cmd.ts
+++ b/ts/packages/cli/src/commands/toolkits/commands/toolkits.list.cmd.ts
@@ -1,9 +1,8 @@
import { Command, Options } from '@effect/cli';
import { Effect, Option } from 'effect';
-import { ComposioClientSingleton } from 'src/services/composio-clients';
import { TerminalUI } from 'src/services/terminal-ui';
import { requireAuth } from 'src/effects/require-auth';
-import { createToolRouterSession } from 'src/effects/create-tool-router-session';
+import { resolveToolRouterSession } from 'src/effects/create-tool-router-session';
import { clampLimit } from 'src/ui/clamp-limit';
import { formatToolkitsTable, formatToolkitsJson } from '../format';
@@ -46,15 +45,13 @@ export const toolkitsCmd$List = Command.make(
if (!(yield* requireAuth)) return;
const ui = yield* TerminalUI;
- const clientSingleton = yield* ComposioClientSingleton;
- const client = yield* clientSingleton.get();
const clampedLimit = clampLimit(limit);
const result = yield* ui.withSpinner(
'Fetching toolkits...',
Effect.gen(function* () {
- const sessionId = yield* createToolRouterSession(client, userId);
+ const { client, sessionId } = yield* resolveToolRouterSession(userId);
return yield* Effect.tryPromise(() =>
client.toolRouter.session.toolkits(sessionId, {
search: Option.getOrUndefined(query),
@@ -65,7 +62,7 @@ export const toolkitsCmd$List = Command.make(
})
);
- const items = Array.isArray(result.items) ? result.items : [];
+ const { items } = result;
if (items.length === 0) {
yield* ui.log.warn('No toolkits found. Try broadening your search.');
diff --git a/ts/packages/cli/src/effects/create-tool-router-session.ts b/ts/packages/cli/src/effects/create-tool-router-session.ts
index 7f45fb735..7b8baf2c2 100644
--- a/ts/packages/cli/src/effects/create-tool-router-session.ts
+++ b/ts/packages/cli/src/effects/create-tool-router-session.ts
@@ -1,5 +1,6 @@
import { Effect } from 'effect';
import type { Composio } from '@composio/client';
+import { ComposioClientSingleton } from 'src/services/composio-clients';
export interface CreateToolRouterSessionOptions {
/** Enable auto connection management. Default: false. */
@@ -12,6 +13,7 @@ export interface CreateToolRouterSessionOptions {
*
* Accepts a pre-resolved client instance (from ComposioClientSingleton)
* so callers can resolve the dependency at layer construction time.
+ * Used by `ToolsExecutorLive` which already holds the client reference.
*/
export const createToolRouterSession = (
client: Composio,
@@ -24,3 +26,19 @@ export const createToolRouterSession = (
manage_connections: { enable: options?.manageConnections ?? false },
})
).pipe(Effect.map(session => session.session_id));
+
+/**
+ * Resolve the Composio client and create a Tool Router session in one step.
+ * Returns `{ client, sessionId }` — eliminates the 3-step boilerplate
+ * (resolve singleton, get client, create session) repeated across commands.
+ */
+export const resolveToolRouterSession = (
+ userId: string,
+ options?: CreateToolRouterSessionOptions
+) =>
+ Effect.gen(function* () {
+ const clientSingleton = yield* ComposioClientSingleton;
+ const client = yield* clientSingleton.get();
+ const sessionId = yield* createToolRouterSession(client, userId, options);
+ return { client, sessionId };
+ });