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")'),
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(() =>
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');