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.

Fix composio link hanging after auth completes (#3009)

Rahul Tarak490a63765664
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 b59219f66..cc6f04496 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,7 +1,7 @@
import { Args, Command, Options } from '@effect/cli';
import { Effect, Option, Schedule } from 'effect';
+import type { Composio as RawComposioClient } from '@composio/client';
import open from 'open';
-import { ComposioToolkitsRepository } from 'src/services/composio-clients';
import { ComposioUserContext } from 'src/services/user-context';
import { TerminalUI } from 'src/services/terminal-ui';
import { requireAuth } from 'src/effects/require-auth';
@@ -48,7 +48,7 @@ const noWait = Options.boolean('no-wait').pipe(
const waitForActiveConnection = (
ui: TerminalUI,
- repo: ComposioToolkitsRepository,
+ client: RawComposioClient,
connectedAccountId: string,
redirectUrl: string,
noBrowser: boolean
@@ -84,7 +84,9 @@ const waitForActiveConnection = (
yield* ui.useMakeSpinner('Waiting for authentication...', spinner =>
Effect.retry(
Effect.gen(function* () {
- const account = yield* repo.getConnectedAccount(connectedAccountId);
+ const account = yield* Effect.tryPromise(() =>
+ client.connectedAccounts.retrieve(connectedAccountId)
+ );
if (account.status === 'ACTIVE') {
return account;
}
@@ -160,7 +162,6 @@ const runConnectedAccountsLink = (params: {
if (!(yield* requireAuth)) return;
const ui = yield* TerminalUI;
- const repo = yield* ComposioToolkitsRepository;
const clientSingleton = yield* ComposioClientSingleton;
const projectContext = yield* ProjectContext;
const userContext = yield* ComposioUserContext;
@@ -279,7 +280,7 @@ const runConnectedAccountsLink = (params: {
)
);
} else {
- yield* waitForActiveConnection(ui, repo, connId, redirectUrl, params.noBrowser);
+ yield* waitForActiveConnection(ui, client, connId, redirectUrl, params.noBrowser);
}
return;
}
@@ -371,7 +372,7 @@ const runConnectedAccountsLink = (params: {
},
}).pipe(Effect.catchAll(() => Effect.void));
} else {
- yield* waitForActiveConnection(ui, repo, connAccountId, redirectUrl, params.noBrowser);
+ yield* waitForActiveConnection(ui, client, connAccountId, redirectUrl, params.noBrowser);
yield* appendCliSessionHistory({
orgId: resolvedProject.projectType === 'CONSUMER' ? resolvedProject.orgId : undefined,
consumerUserId:
diff --git a/ts/packages/cli/test/__utils__/services/test-layer.ts b/ts/packages/cli/test/__utils__/services/test-layer.ts
index d67af21b2..8dd52cb29 100644
--- a/ts/packages/cli/test/__utils__/services/test-layer.ts
+++ b/ts/packages/cli/test/__utils__/services/test-layer.ts
@@ -931,6 +931,15 @@ export const TestLayer = (input?: TestLiveInput) =>
return response;
},
},
+ connectedAccounts: {
+ retrieve: async (nanoid: string) => {
+ const found = connectedAccountsData.items.find(item => item.id === nanoid);
+ if (!found) {
+ throw new Error(`Connected account "${nanoid}" not found`);
+ }
+ return found;
+ },
+ },
toolkits: {
retrieve: async (slug: string) => {
const detailed = toolkitsData.detailedToolkits.find(
diff --git a/ts/packages/cli/test/src/commands/tools/tools.execute.cmd.test.ts b/ts/packages/cli/test/src/commands/tools/tools.execute.cmd.test.ts
index ff539b65b..2cd83bef1 100644
--- a/ts/packages/cli/test/src/commands/tools/tools.execute.cmd.test.ts
+++ b/ts/packages/cli/test/src/commands/tools/tools.execute.cmd.test.ts
@@ -7,6 +7,7 @@ import { ComposioNoActiveConnectionError } from 'src/services/composio-error-ove
import { setupCacheDir } from 'src/effects/setup-cache-dir';
import { getOrFetchToolInputDefinition } from 'src/services/tool-input-validation';
import * as consumerShortTermCache from 'src/services/consumer-short-term-cache';
+import * as composioClients from 'src/services/composio-clients';
import * as redactModule from 'src/ui/redact';
import { cli, TestLive, MockConsole } from 'test/__utils__';
import type { TestLiveInput } from 'test/__utils__/services/test-layer';
@@ -42,6 +43,9 @@ describe('CLI: composio execute', () => {
beforeEach(() => {
savedCI = process.env.CI;
delete process.env.CI;
+ vi.spyOn(composioClients, 'getLatestToolVersion').mockImplementation(() =>
+ Effect.fail(new composioClients.HttpServerError({}))
+ );
vi.spyOn(consumerShortTermCache, 'getFreshConsumerConnectedToolkitsFromCache').mockReturnValue(
Effect.succeed(Option.some(['gmail', 'github']))
);