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
refactor(cli): extract decodeConnectedAccountListWithFallback helper
jkomynod0fb8ed312f4
diff --git a/ts/packages/cli/src/commands/connected-accounts/commands/connected-accounts.list.cmd.ts b/ts/packages/cli/src/commands/connected-accounts/commands/connected-accounts.list.cmd.tsindex 9f6c78ac8..d91389a33 100644--- a/ts/packages/cli/src/commands/connected-accounts/commands/connected-accounts.list.cmd.ts+++ b/ts/packages/cli/src/commands/connected-accounts/commands/connected-accounts.list.cmd.ts@@ -1,11 +1,9 @@import { Command, Options } from '@effect/cli';-import { Effect, Option, Schema } from 'effect';+import { Effect, Option } from 'effect';import type { ConnectedAccountListParams } from '@composio/client/resources/connected-accounts';-import {- ComposioClientSingleton,- ConnectedAccountListResponse,-} from 'src/services/composio-clients';+import { ComposioClientSingleton } from 'src/services/composio-clients';import { TerminalUI } from 'src/services/terminal-ui';+import { decodeConnectedAccountListWithFallback } from 'src/effects/decode-connected-account-list';import { requireAuth } from 'src/effects/require-auth';import { clampLimit } from 'src/ui/clamp-limit';import { redact } from 'src/ui/redact';@@ -88,23 +86,7 @@ export const connectedAccountsCmd$List = Command.make(})));- // Forward-compat: a future Apollo status would otherwise brick the- // command via the closed `Schema.Literal(...)`. Degrade to raw on- // ParseError; formatters only read non-credential-bearing fields.- const result = yield* Schema.decodeUnknown(ConnectedAccountListResponse)(rawResult).pipe(- Effect.catchTag('ParseError', error =>- Effect.gen(function* () {- yield* ui.log.warn(- `Server returned a connection field this CLI does not recognize ` +- `(likely a newly-added status). Run "composio upgrade" to pick up ` +- `the latest schema. Continuing with raw response.\n\n` +- `Decode error: ${error.message}`- );- // Safe: formatters only read non-credential fields.- return rawResult as ConnectedAccountListResponse;- })- )- );+ const result = yield* decodeConnectedAccountListWithFallback(rawResult);if (result.items.length === 0) {let hint: string;diff --git a/ts/packages/cli/src/commands/connections/commands/connections.list.cmd.ts b/ts/packages/cli/src/commands/connections/commands/connections.list.cmd.tsindex 76d4bff0d..e8ee0da0f 100644--- a/ts/packages/cli/src/commands/connections/commands/connections.list.cmd.ts+++ b/ts/packages/cli/src/commands/connections/commands/connections.list.cmd.ts@@ -1,11 +1,9 @@import { Command, Options } from '@effect/cli';-import { Effect, Option, Schema } from 'effect';+import { Effect, Option } from 'effect';+import { decodeConnectedAccountListWithFallback } from 'src/effects/decode-connected-account-list';import { requireAuth } from 'src/effects/require-auth';import type { ConnectedAccountItem } from 'src/models/connected-accounts';-import {- ComposioClientSingleton,- ConnectedAccountListResponse,-} from 'src/services/composio-clients';+import { ComposioClientSingleton } from 'src/services/composio-clients';import {formatResolveCommandProjectError,resolveCommandProject,@@ -73,21 +71,7 @@ export const connectionsCmd$List = Command.make('list', { toolkit }, ({ toolkitlimit: 1000,}));- // Same forward-compat guard as `connected-accounts.list.cmd.ts`.- const result = yield* Schema.decodeUnknown(ConnectedAccountListResponse)(rawResult).pipe(- Effect.catchTag('ParseError', error =>- Effect.gen(function* () {- yield* ui.log.warn(- `Server returned a connection field this CLI does not recognize ` +- `(likely a newly-added status). Run "composio upgrade" to pick up ` +- `the latest schema. Continuing with raw response.\n\n` +- `Decode error: ${error.message}`- );- // Safe: `formatConnectionsJson` only reads non-credential fields.- return rawResult as ConnectedAccountListResponse;- })- )- );+ const result = yield* decodeConnectedAccountListWithFallback(rawResult);yield* ui.output(formatConnectionsJson(result.items), { force: true });})diff --git a/ts/packages/cli/src/commands/connections/commands/connections.remove.cmd.ts b/ts/packages/cli/src/commands/connections/commands/connections.remove.cmd.tsindex 3c56544f7..307e8dfaa 100644--- a/ts/packages/cli/src/commands/connections/commands/connections.remove.cmd.ts+++ b/ts/packages/cli/src/commands/connections/commands/connections.remove.cmd.ts@@ -1,11 +1,9 @@import { Args, Command } from '@effect/cli';-import { Effect, Schema } from 'effect';+import { Effect } from 'effect';+import { decodeConnectedAccountListWithFallback } from 'src/effects/decode-connected-account-list';import { requireAuth } from 'src/effects/require-auth';import type { ConnectedAccountItem } from 'src/models/connected-accounts';-import {- ComposioClientSingleton,- ConnectedAccountListResponse,-} from 'src/services/composio-clients';+import { ComposioClientSingleton } from 'src/services/composio-clients';import {formatResolveCommandProjectError,resolveCommandProject,@@ -109,21 +107,7 @@ export const connectionsCmd$Remove = Command.make('remove', { account }, ({ acco})));- // Same forward-compat guard as `connected-accounts.list.cmd.ts`.- const result = yield* Schema.decodeUnknown(ConnectedAccountListResponse)(rawResult).pipe(- Effect.catchTag('ParseError', error =>- Effect.gen(function* () {- yield* ui.log.warn(- `Server returned a connection field this CLI does not recognize ` +- `(likely a newly-added status). Run "composio upgrade" to pick up ` +- `the latest schema. Continuing with raw response.\n\n` +- `Decode error: ${error.message}`- );- // Safe: `resolveAccount` / `formatAccountSummary` only read non-credential fields.- return rawResult as ConnectedAccountListResponse;- })- )- );+ const result = yield* decodeConnectedAccountListWithFallback(rawResult);const resolved = resolveAccount({ accounts: result.items, selector: account });if ('error' in resolved) {diff --git a/ts/packages/cli/src/effects/decode-connected-account-list.ts b/ts/packages/cli/src/effects/decode-connected-account-list.tsnew file mode 100644index 000000000..5906870f5--- /dev/null+++ b/ts/packages/cli/src/effects/decode-connected-account-list.ts@@ -0,0 +1,39 @@+import { Effect, Schema } from 'effect';+import {+ ConnectedAccountListResponse,+ type ConnectedAccountListResponse as ConnectedAccountListResponseType,+} from 'src/services/composio-clients';+import { TerminalUI } from 'src/services/terminal-ui';++/**+ * Decodes a raw `client.connectedAccounts.list(...)` response against+ * `ConnectedAccountListResponse`, falling back to the raw payload on+ * `ParseError`.+ *+ * Forward-compat: a future Apollo status would otherwise brick the caller+ * via the closed `Schema.Literal(...)`. On decode failure we warn via+ * `ui.log.warn` (pointing the user at `composio upgrade`) and return the+ * unvalidated raw response — safe because the three current call sites+ * only render non-credential fields (`id`, `alias`, `word_id`,+ * `toolkit.slug`, `status`, ...).+ */+export const decodeConnectedAccountListWithFallback = (+ rawResult: unknown+): Effect.Effect<ConnectedAccountListResponseType, never, TerminalUI> =>+ Effect.gen(function* () {+ const ui = yield* TerminalUI;+ return yield* Schema.decodeUnknown(ConnectedAccountListResponse)(rawResult).pipe(+ Effect.catchTag('ParseError', error =>+ Effect.gen(function* () {+ yield* ui.log.warn(+ `Server returned a connection field this CLI does not recognize ` ++ `(likely a newly-added status). Run "composio upgrade" to pick up ` ++ `the latest schema. Continuing with raw response.\n\n` ++ `Decode error: ${error.message}`+ );+ // Safe: callers only read non-credential fields.+ return rawResult as ConnectedAccountListResponseType;+ })+ )+ );+ });