Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.
TypeScript agentic-aiagentsaiai-agentsaiagentsdeveloper-toolsfunction-callinggpt-4javascriptjsllmllmopsmcppythonremote-mcp-serverssetypescript
Fix no-browser link flow to print raw redirect URLs (#3030)
Rahul Tarak691de3c8935c
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.tsindex 86ffbc36f..efa099836 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@@ -46,6 +46,25 @@ const noWait = Options.boolean('no-wait').pipe(Options.withDescription('Do not wait for authorization; only print link info'));+const showRedirectUrl = (+ ui: TerminalUI,+ redirectUrl: string,+ noBrowser: boolean,+ options?: { readonly emitRaw?: boolean }+) =>+ Effect.gen(function* () {+ if (noBrowser) {+ yield* ui.log.info('Please authorize using the following URL:');+ } else {+ yield* ui.log.step('Redirecting you to the authorization page');+ }++ yield* ui.note(redirectUrl, 'Redirect URL');+ if (options?.emitRaw) {+ yield* ui.output(redirectUrl, noBrowser ? { force: true } : undefined);+ }+ });+const waitForActiveConnection = (ui: TerminalUI,client: RawComposioClient,@@ -54,7 +73,7 @@ const waitForActiveConnection = (noBrowser: boolean) =>Effect.gen(function* () {- yield* ui.note(redirectUrl, 'Redirect URL');+ yield* showRedirectUrl(ui, redirectUrl, noBrowser, { emitRaw: noBrowser });if (!noBrowser) {let urlSchemeValid = false;@@ -265,7 +284,7 @@ const runConnectedAccountsLink = (params: {const { connectedAccountId: connId, redirectUrl } = validatedLink.value;if (params.noWait) {- yield* ui.note(redirectUrl, 'Redirect URL');+ yield* showRedirectUrl(ui, redirectUrl, params.noBrowser);yield* ui.output(JSON.stringify({@@ -277,7 +296,8 @@ const runConnectedAccountsLink = (params: {},null,2- )+ ),+ { force: true });} else {yield* waitForActiveConnection(ui, client, connId, redirectUrl, params.noBrowser);@@ -344,7 +364,7 @@ const runConnectedAccountsLink = (params: {yield* invalidateConsumerConnectedToolkitsCache().pipe(Effect.catchAll(() => Effect.void));if (params.noWait) {- yield* ui.note(redirectUrl, 'Redirect URL');+ yield* showRedirectUrl(ui, redirectUrl, params.noBrowser);yield* ui.output(JSON.stringify({@@ -357,7 +377,8 @@ const runConnectedAccountsLink = (params: {},null,2- )+ ),+ { force: true });yield* appendCliSessionHistory({orgId: resolvedProject.projectType === 'CONSUMER' ? resolvedProject.orgId : undefined,diff --git a/ts/packages/cli/src/services/terminal-ui.ts b/ts/packages/cli/src/services/terminal-ui.tsindex f644fb61c..3421ee445 100644--- a/ts/packages/cli/src/services/terminal-ui.ts+++ b/ts/packages/cli/src/services/terminal-ui.ts@@ -30,7 +30,10 @@ export interface TerminalUI {** Use this for values that scripts should capture (API keys, version strings, etc.).*/- readonly output: (data: string) => Effect.Effect<void>;+ readonly output: (+ data: string,+ options?: { readonly force?: boolean }+ ) => Effect.Effect<void>;/** Display a session start marker (e.g., `┌ title`). Writes to stderr. */readonly intro: (title: string) => Effect.Effect<void>;@@ -153,9 +156,9 @@ const silentSpinnerHandle: SpinnerHandle = {};const makeLive: TerminalUI = {- output: data =>+ output: (data, options) =>Effect.sync(() => {- if (!isInteractive) {+ if (options?.force || !isInteractive) {process.stdout.write(`${data}\n`);}}),diff --git a/ts/packages/cli/test/src/commands/connected-accounts/connected-accounts.link.cmd.test.ts b/ts/packages/cli/test/src/commands/connected-accounts/connected-accounts.link.cmd.test.tsindex fd51c12f5..b4493b5e7 100644--- a/ts/packages/cli/test/src/commands/connected-accounts/connected-accounts.link.cmd.test.ts+++ b/ts/packages/cli/test/src/commands/connected-accounts/connected-accounts.link.cmd.test.ts@@ -1,9 +1,10 @@import { describe, expect, layer } from '@effect/vitest';-import { ConfigProvider, Effect } from 'effect';+import { ConfigProvider, Console, Effect } from 'effect';import { extendConfigProvider } from 'src/services/config';import { cli, TestLive, MockConsole } from 'test/__utils__';import type { TestLiveInput } from 'test/__utils__/services/test-layer';import type { ConnectedAccountItem } from 'src/models/connected-accounts';+import { TerminalUI } from 'src/services/terminal-ui';const extractJsonObject = (output: string): Record<string, unknown> | null => {const jsonMatch = output.match(/\{[\s\S]*"status"[\s\S]*\}/);@@ -38,6 +39,36 @@ const testConfigProvider = ConfigProvider.fromMap(new Map([['COMPOSIO_USER_API_KEY', 'test_api_key']])).pipe(extendConfigProvider);+const RecordingTerminalUI = TerminalUI.of({+ output: (data, options) =>+ Console.log(+ JSON.stringify({+ channel: options?.force ? 'FORCED' : 'NORMAL',+ data,+ })+ ),+ intro: title => Console.log(title),+ outro: message => Console.log(message),+ log: {+ info: message => Console.log(message),+ success: message => Console.log(message),+ warn: message => Console.log(message),+ error: message => Console.log(message),+ step: message => Console.log(message),+ message: message => Console.log(message),+ },+ note: (message, title) => Console.log(title ? `[${title}] ${message}` : message),+ confirm: () => Effect.succeed(true),+ select: (_message, options) => Effect.succeed(options[0].value),+ withSpinner: (_message, effect) => effect,+ useMakeSpinner: (_message, use) =>+ use({+ message: () => Effect.void,+ stop: () => Effect.void,+ error: () => Effect.void,+ }),+});+describe('CLI: composio dev connected-accounts link', () => {layer(TestLive({@@ -60,6 +91,55 @@ describe('CLI: composio dev connected-accounts link', () => {);});+ layer(+ TestLive({+ baseConfigProvider: testConfigProvider,+ connectedAccountsData,+ fixture: 'global-test-user-id',+ terminalUI: RecordingTerminalUI,+ })+ )('[Given] --no-browser [Then] emits a forced raw redirect URL for merged-stream shells', it => {+ it.scoped('forces the redirect URL through output()', () =>+ Effect.gen(function* () {+ yield* cli(['link', 'gmail', '--no-browser']);+ const lines = yield* MockConsole.getLines({ stripAnsi: true });+ const output = lines.join('\n');++ expect(output).toContain('"channel":"FORCED"');+ expect(output).toContain('https://app.composio.dev/link?token=lt_test_token');+ })+ );+ });++ layer(+ TestLive({+ baseConfigProvider: testConfigProvider,+ connectedAccountsData,+ fixture: 'global-test-user-id',+ terminalUI: RecordingTerminalUI,+ })+ )('[Given] --no-browser --no-wait [Then] stdout remains JSON-only', it => {+ it.scoped('does not emit the raw redirect URL before the pending JSON payload', () =>+ Effect.gen(function* () {+ yield* cli(['link', 'gmail', '--no-browser', '--no-wait']);+ const lines = yield* MockConsole.getLines({ stripAnsi: true });+ const forcedLines = lines+ .map(line => {+ try {+ return JSON.parse(line) as { channel?: string; data?: string };+ } catch {+ return null;+ }+ })+ .filter(line => line?.channel === 'FORCED');++ expect(forcedLines).toHaveLength(1);+ expect(forcedLines[0]?.data).toContain('"status": "pending"');+ expect(forcedLines[0]?.data?.trim().startsWith('{')).toBe(true);+ })+ );+ });+layer(TestLive({baseConfigProvider: testConfigProvider,