1
import { Args, Command, Options } from '@effect/cli';
2
import { Effect, Option, Schedule } from 'effect';
3
+import type { Composio as RawComposioClient } from '@composio/client';
4
import open from 'open';
4
-import { ComposioToolkitsRepository } from 'src/services/composio-clients';
5
import { ComposioUserContext } from 'src/services/user-context';
6
import { TerminalUI } from 'src/services/terminal-ui';
7
import { requireAuth } from 'src/effects/require-auth';
48
49
const waitForActiveConnection = (
50
ui: TerminalUI,
51
- repo: ComposioToolkitsRepository,
51
+ client: RawComposioClient,
52
connectedAccountId: string,
53
redirectUrl: string,
54
noBrowser: boolean
84
yield* ui.useMakeSpinner('Waiting for authentication...', spinner =>
85
Effect.retry(
86
Effect.gen(function* () {
87
- const account = yield* repo.getConnectedAccount(connectedAccountId);
87
+ const account = yield* Effect.tryPromise(() =>
88
+ client.connectedAccounts.retrieve(connectedAccountId)
89
+ );
90
if (account.status === 'ACTIVE') {
91
return account;
92
}
162
if (!(yield* requireAuth)) return;
163
164
const ui = yield* TerminalUI;
163
- const repo = yield* ComposioToolkitsRepository;
165
const clientSingleton = yield* ComposioClientSingleton;
166
const projectContext = yield* ProjectContext;
167
const userContext = yield* ComposioUserContext;
280
)
281
);
282
} else {
282
- yield* waitForActiveConnection(ui, repo, connId, redirectUrl, params.noBrowser);
283
+ yield* waitForActiveConnection(ui, client, connId, redirectUrl, params.noBrowser);
284
}
285
return;
286
}
372
},
373
}).pipe(Effect.catchAll(() => Effect.void));
374
} else {
374
- yield* waitForActiveConnection(ui, repo, connAccountId, redirectUrl, params.noBrowser);
375
+ yield* waitForActiveConnection(ui, client, connAccountId, redirectUrl, params.noBrowser);
376
yield* appendCliSessionHistory({
377
orgId: resolvedProject.projectType === 'CONSUMER' ? resolvedProject.orgId : undefined,
378
consumerUserId: