@composio/client 0.1.0-alpha.6 → 0.1.0-alpha.61

package/src/client.ts

@@ -5,14 +5,13 @@ import type { HTTPMethod, PromiseOrValue, MergedRequestInit, FinalizedRequestIni
 import { uuid4 } from './internal/utils/uuid';
 import { validatePositiveInteger, isAbsoluteURL, safeJSON } from './internal/utils/values';
 import { sleep } from './internal/utils/sleep';
-import { type Logger, type LogLevel, parseLogLevel } from './internal/utils/log';
 export type { Logger, LogLevel } from './internal/utils/log';
 import { castToError, isAbortError } from './internal/errors';
 import type { APIResponseProps } from './internal/parse';
 import { getPlatformHeaders } from './internal/detect-platform';
 import * as Shims from './internal/shims';
 import * as Opts from './internal/request-options';
-import * as qs from './internal/qs';
+import { stringifyQuery } from './internal/utils/query';
 import { VERSION } from './version';
 import * as Errors from './core/error';
 import * as Uploads from './core/uploads';
@@ -21,13 +20,6 @@ import { APIPromise } from './core/api-promise';
 import { type Fetch } from './internal/builtin-types';
 import { HeadersLike, NullableHeaders, buildHeaders } from './internal/headers';
 import { FinalRequestOptions, RequestOptions } from './internal/request-options';
-import {
-  ActionExecution,
-  ActionExecutionLogParams,
-  ActionExecutionLogResponse,
-  ActionExecutionRetrieveFieldsResponse,
-  ActionExecutionRetrieveLogResponse,
-} from './resources/action-execution';
 import {
   AuthConfigCreateParams,
   AuthConfigCreateResponse,
@@ -41,20 +33,13 @@ import {
   AuthConfigUpdateStatusResponse,
   AuthConfigs,
 } from './resources/auth-configs';
-import {
-  Cli,
-  CliCreateSessionResponse,
-  CliLinkSessionParams,
-  CliLinkSessionResponse,
-  CliRetrieveSessionParams,
-  CliRetrieveSessionResponse,
-} from './resources/cli';
 import {
   ConnectedAccountCreateParams,
   ConnectedAccountCreateResponse,
   ConnectedAccountDeleteResponse,
   ConnectedAccountListParams,
   ConnectedAccountListResponse,
+  ConnectedAccountRefreshParams,
   ConnectedAccountRefreshResponse,
   ConnectedAccountRetrieveResponse,
   ConnectedAccountUpdateStatusParams,
@@ -62,18 +47,23 @@ import {
   ConnectedAccounts,
 } from './resources/connected-accounts';
 import {
-  TeamMemberInviteParams,
-  TeamMemberInviteResponse,
-  TeamMemberListResponse,
-  TeamMemberRemoveResponse,
-  TeamMemberUpdateParams,
-  TeamMemberUpdateResponse,
-  TeamMembers,
-} from './resources/team-members';
+  FileCreatePresignedURLParams,
+  FileCreatePresignedURLResponse,
+  FileListParams,
+  FileListResponse,
+  Files,
+} from './resources/files';
+import { Link, LinkCreateParams, LinkCreateResponse } from './resources/link';
+import {
+  Migration,
+  MigrationRetrieveNanoidParams,
+  MigrationRetrieveNanoidResponse,
+} from './resources/migration';
 import {
   ToolkitListParams,
   ToolkitListResponse,
   ToolkitRetrieveCategoriesResponse,
+  ToolkitRetrieveParams,
   ToolkitRetrieveResponse,
   Toolkits,
 } from './resources/toolkits';
@@ -87,20 +77,35 @@ import {
   ToolProxyParams,
   ToolProxyResponse,
   ToolRetrieveEnumResponse,
+  ToolRetrieveParams,
   ToolRetrieveResponse,
   Tools,
 } from './resources/tools';
-import { Trigger, TriggerLogParams, TriggerLogResponse } from './resources/trigger';
 import {
   TriggersTypeListParams,
   TriggersTypeListResponse,
   TriggersTypeRetrieveEnumResponse,
+  TriggersTypeRetrieveParams,
   TriggersTypeRetrieveResponse,
   TriggersTypes,
 } from './resources/triggers-types';
 import { readEnv } from './internal/utils/env';
-import { formatRequestDetails, loggerFor } from './internal/utils/log';
+import {
+  type LogLevel,
+  type Logger,
+  formatRequestDetails,
+  loggerFor,
+  parseLogLevel,
+} from './internal/utils/log';
 import { isEmptyObj } from './internal/utils/values';
+import {
+  Cli,
+  CliCreateSessionParams,
+  CliCreateSessionResponse,
+  CliGetSessionParams,
+  CliGetSessionResponse,
+} from './resources/cli/cli';
+import { Logs } from './resources/logs/logs';
 import {
   Mcp,
   McpCreateParams,
@@ -108,20 +113,21 @@ import {
   McpDeleteResponse,
   McpListParams,
   McpListResponse,
+  McpRetrieveAppParams,
   McpRetrieveAppResponse,
   McpRetrieveResponse,
   McpUpdateParams,
   McpUpdateResponse,
-  McpValidateParams,
-  McpValidateResponse,
 } from './resources/mcp/mcp';
-import { Org } from './resources/org/org';
+import { Project } from './resources/project/project';
+import {
+  ToolRouter,
+  ToolRouterCreateSessionParams,
+  ToolRouterCreateSessionResponse,
+} from './resources/tool-router/tool-router';
 import {
   TriggerInstanceListActiveParams,
   TriggerInstanceListActiveResponse,
-  TriggerInstanceRemoveUpsertResponse,
-  TriggerInstanceUpdateStatusParams,
-  TriggerInstanceUpdateStatusResponse,
   TriggerInstanceUpsertParams,
   TriggerInstanceUpsertResponse,
   TriggerInstances,
@@ -130,15 +136,15 @@ import {
 const environments = {
   production: 'https://backend.composio.dev',
   staging: 'https://staging-backend.composio.dev',
-  local: 'http://localhost:9901',
+  local: 'http://localhost:9900',
 };
 type Environment = keyof typeof environments;
 
 export interface ClientOptions {
   /**
-   * Defaults to process.env['COMPOSIO_API_KEY'].
+   * API key authentication
    */
-  apiKey?: string | undefined;
+  apiKey?: string | null | undefined;
 
   /**
    * Specifies the environment to use for the API.
@@ -146,7 +152,7 @@ export interface ClientOptions {
    * Each environment maps to a different base URL:
    * - `production` corresponds to `https://backend.composio.dev`
    * - `staging` corresponds to `https://staging-backend.composio.dev`
-   * - `local` corresponds to `http://localhost:9901`
+   * - `local` corresponds to `http://localhost:9900`
    */
   environment?: Environment | undefined;
 
@@ -163,6 +169,8 @@ export interface ClientOptions {
    *
    * Note that request timeouts are retried by default, so in a worst-case scenario you may wait
    * much longer than this timeout before the promise succeeds or fails.
+   *
+   * @unit milliseconds
    */
   timeout?: number | undefined;
   /**
@@ -221,12 +229,12 @@ export interface ClientOptions {
  * API Client for interfacing with the Composio API.
  */
 export class Composio {
-  apiKey: string;
+  apiKey: string | null;
 
   baseURL: string;
   maxRetries: number;
   timeout: number;
-  logger: Logger | undefined;
+  logger: Logger;
   logLevel: LogLevel | undefined;
   fetchOptions: MergedRequestInit | undefined;
 
@@ -238,7 +246,7 @@ export class Composio {
   /**
    * API Client for interfacing with the Composio API.
    *
-   * @param {string | undefined} [opts.apiKey=process.env['COMPOSIO_API_KEY'] ?? undefined]
+   * @param {string | null | undefined} [opts.apiKey=process.env['COMPOSIO_API_KEY'] ?? null]
    * @param {Environment} [opts.environment=production] - Specifies the environment URL to use for the API.
    * @param {string} [opts.baseURL=process.env['COMPOSIO_BASE_URL'] ?? https://backend.composio.dev] - Override the default base URL for the API.
    * @param {number} [opts.timeout=1 minute] - The maximum amount of time (in milliseconds) the client will wait for a response before timing out.
@@ -250,15 +258,9 @@ export class Composio {
    */
   constructor({
     baseURL = readEnv('COMPOSIO_BASE_URL'),
-    apiKey = readEnv('COMPOSIO_API_KEY'),
+    apiKey = readEnv('COMPOSIO_API_KEY') ?? null,
     ...opts
   }: ClientOptions = {}) {
-    if (apiKey === undefined) {
-      throw new Errors.ComposioError(
-        "The COMPOSIO_API_KEY environment variable is missing or empty; either provide it, or instantiate the Composio client with an apiKey option, like new Composio({ apiKey: 'My API Key' }).",
-      );
-    }
-
     const options: ClientOptions = {
       apiKey,
       ...opts,
@@ -292,6 +294,33 @@ export class Composio {
     this.apiKey = apiKey;
   }
 
+  /**
+   * Create a new client instance re-using the same options given to the current client with optional overriding.
+   */
+  withOptions(options: Partial<ClientOptions>): this {
+    const client = new (this.constructor as any as new (props: ClientOptions) => typeof this)({
+      ...this._options,
+      environment: options.environment ? options.environment : undefined,
+      baseURL: options.environment ? undefined : this.baseURL,
+      maxRetries: this.maxRetries,
+      timeout: this.timeout,
+      logger: this.logger,
+      logLevel: this.logLevel,
+      fetch: this.fetch,
+      fetchOptions: this.fetchOptions,
+      apiKey: this.apiKey,
+      ...options,
+    });
+    return client;
+  }
+
+  /**
+   * Check whether the base URL is set to its default.
+   */
+  #baseURLOverridden(): boolean {
+    return this.baseURL !== environments[this._options.environment || 'production'];
+  }
+
   protected defaultQuery(): Record<string, string | undefined> | undefined {
     return this._options.defaultQuery;
   }
@@ -300,12 +329,15 @@ export class Composio {
     return;
   }
 
-  protected authHeaders(opts: FinalRequestOptions): NullableHeaders | undefined {
+  protected async authHeaders(opts: FinalRequestOptions): Promise<NullableHeaders | undefined> {
+    if (this.apiKey == null) {
+      return undefined;
+    }
     return buildHeaders([{ 'x-api-key': this.apiKey }]);
   }
 
-  protected stringifyQuery(query: Record<string, unknown>): string {
-    return qs.stringify(query, { arrayFormat: 'comma' });
+  protected stringifyQuery(query: object | Record<string, unknown>): string {
+    return stringifyQuery(query);
   }
 
   private getUserAgent(): string {
@@ -325,19 +357,25 @@ export class Composio {
     return Errors.APIError.generate(status, error, message, headers);
   }
 
-  buildURL(path: string, query: Record<string, unknown> | null | undefined): string {
+  buildURL(
+    path: string,
+    query: Record<string, unknown> | null | undefined,
+    defaultBaseURL?: string | undefined,
+  ): string {
+    const baseURL = (!this.#baseURLOverridden() && defaultBaseURL) || this.baseURL;
     const url =
       isAbsoluteURL(path) ?
         new URL(path)
-      : new URL(this.baseURL + (this.baseURL.endsWith('/') && path.startsWith('/') ? path.slice(1) : path));
+      : new URL(baseURL + (baseURL.endsWith('/') && path.startsWith('/') ? path.slice(1) : path));
 
     const defaultQuery = this.defaultQuery();
-    if (!isEmptyObj(defaultQuery)) {
-      query = { ...defaultQuery, ...query };
+    const pathQuery = Object.fromEntries(url.searchParams);
+    if (!isEmptyObj(defaultQuery) || !isEmptyObj(pathQuery)) {
+      query = { ...pathQuery, ...defaultQuery, ...query };
     }
 
     if (typeof query === 'object' && query && !Array.isArray(query)) {
-      url.search = this.stringifyQuery(query as Record<string, unknown>);
+      url.search = this.stringifyQuery(query);
     }
 
     return url.toString();
@@ -411,7 +449,9 @@ export class Composio {
 
     await this.prepareOptions(options);
 
-    const { req, url, timeout } = this.buildRequest(options, { retryCount: maxRetries - retriesRemaining });
+    const { req, url, timeout } = await this.buildRequest(options, {
+      retryCount: maxRetries - retriesRemaining,
+    });
 
     await this.prepareRequest(req, { url, options });
 
@@ -439,7 +479,7 @@ export class Composio {
     const response = await this.fetchWithTimeout(url, req, timeout, controller).catch(castToError);
     const headersTime = Date.now();
 
-    if (response instanceof Error) {
+    if (response instanceof globalThis.Error) {
       const retryMessage = `retrying, ${retriesRemaining} attempts remaining`;
       if (options.signal?.aborted) {
         throw new Errors.APIUserAbortError();
@@ -489,7 +529,7 @@ export class Composio {
     } with status ${response.status} in ${headersTime - startTime}ms`;
 
     if (!response.ok) {
-      const shouldRetry = this.shouldRetry(response);
+      const shouldRetry = await this.shouldRetry(response);
       if (retriesRemaining && shouldRetry) {
         const retryMessage = `retrying, ${retriesRemaining} attempts remaining`;
 
@@ -519,7 +559,7 @@ export class Composio {
       loggerFor(this).info(`${responseInfo} - ${retryMessage}`);
 
       const errText = await response.text().catch((err: any) => castToError(err).message);
-      const errJSON = safeJSON(errText);
+      const errJSON = safeJSON(errText) as any;
       const errMessage = errJSON ? undefined : errText;
 
       loggerFor(this).debug(
@@ -560,9 +600,10 @@ export class Composio {
     controller: AbortController,
   ): Promise<Response> {
     const { signal, method, ...options } = init || {};
-    if (signal) signal.addEventListener('abort', () => controller.abort());
+    const abort = this._makeAbort(controller);
+    if (signal) signal.addEventListener('abort', abort, { once: true });
 
-    const timeout = setTimeout(() => controller.abort(), ms);
+    const timeout = setTimeout(abort, ms);
 
     const isReadableBody =
       ((globalThis as any).ReadableStream && options.body instanceof (globalThis as any).ReadableStream) ||
@@ -580,15 +621,15 @@ export class Composio {
       fetchOptions.method = method.toUpperCase();
     }
 
-    return (
+    try {
       // use undefined this binding; fetch errors if bound to something else in browser/cloudflare
-      this.fetch.call(undefined, url, fetchOptions).finally(() => {
-        clearTimeout(timeout);
-      })
-    );
+      return await this.fetch.call(undefined, url, fetchOptions);
+    } finally {
+      clearTimeout(timeout);
+    }
   }
 
-  private shouldRetry(response: Response): boolean {
+  private async shouldRetry(response: Response): Promise<boolean> {
     // Note this is not a standard header.
     const shouldRetryHeader = response.headers.get('x-should-retry');
 
@@ -639,9 +680,9 @@ export class Composio {
       }
     }
 
-    // If the API asks us to wait a certain amount of time (and it's a reasonable amount),
-    // just do what it says, but otherwise calculate a default
-    if (!(timeoutMillis && 0 <= timeoutMillis && timeoutMillis < 60 * 1000)) {
+    // If the API asks us to wait a certain amount of time, just do what it
+    // says, but otherwise calculate a default
+    if (timeoutMillis === undefined) {
       const maxRetries = options.maxRetries ?? this.maxRetries;
       timeoutMillis = this.calculateDefaultRetryTimeoutMillis(retriesRemaining, maxRetries);
     }
@@ -665,18 +706,18 @@ export class Composio {
     return sleepSeconds * jitter * 1000;
   }
 
-  buildRequest(
+  async buildRequest(
     inputOptions: FinalRequestOptions,
     { retryCount = 0 }: { retryCount?: number } = {},
-  ): { req: FinalizedRequestInit; url: string; timeout: number } {
+  ): Promise<{ req: FinalizedRequestInit; url: string; timeout: number }> {
     const options = { ...inputOptions };
-    const { method, path, query } = options;
+    const { method, path, query, defaultBaseURL } = options;
 
-    const url = this.buildURL(path!, query as Record<string, unknown>);
+    const url = this.buildURL(path!, query as Record<string, unknown>, defaultBaseURL);
     if ('timeout' in options) validatePositiveInteger('timeout', options.timeout);
     options.timeout = options.timeout ?? this.timeout;
     const { bodyHeaders, body } = this.buildBody({ options });
-    const reqHeaders = this.buildHeaders({ options: inputOptions, method, bodyHeaders, retryCount });
+    const reqHeaders = await this.buildHeaders({ options: inputOptions, method, bodyHeaders, retryCount });
 
     const req: FinalizedRequestInit = {
       method,
@@ -692,7 +733,7 @@ export class Composio {
     return { req, url, timeout: options.timeout };
   }
 
-  private buildHeaders({
+  private async buildHeaders({
     options,
     method,
     bodyHeaders,
@@ -702,7 +743,7 @@ export class Composio {
     method: HTTPMethod;
     bodyHeaders: HeadersLike;
     retryCount: number;
-  }): Headers {
+  }): Promise<Headers> {
     let idempotencyHeaders: HeadersLike = {};
     if (this.idempotencyHeader && method !== 'get') {
       if (!options.idempotencyKey) options.idempotencyKey = this.defaultIdempotencyKey();
@@ -718,7 +759,7 @@ export class Composio {
         ...(options.timeout ? { 'X-Stainless-Timeout': String(Math.trunc(options.timeout / 1000)) } : {}),
         ...getPlatformHeaders(),
       },
-      this.authHeaders(options),
+      await this.authHeaders(options),
       this._options.defaultHeaders,
       bodyHeaders,
       options.headers,
@@ -729,6 +770,12 @@ export class Composio {
     return headers.values;
   }
 
+  private _makeAbort(controller: AbortController) {
+    // note: we can't just inline this method inside `fetchWithTimeout()` because then the closure
+    //       would capture all request options, and cause a memory leak.
+    return () => controller.abort();
+  }
+
   private buildBody({ options: { body, headers: rawHeaders } }: { options: FinalRequestOptions }): {
     bodyHeaders: HeadersLike;
     body: BodyInit | undefined;
@@ -746,7 +793,7 @@ export class Composio {
         // Preserve legacy string encoding behavior for now
         headers.values.has('content-type')) ||
       // `Blob` is superset of `File`
-      body instanceof Blob ||
+      ((globalThis as any).Blob && body instanceof (globalThis as any).Blob) ||
       // `FormData` -> `multipart/form-data`
       body instanceof FormData ||
       // `URLSearchParams` -> `application/x-www-form-urlencoded`
@@ -761,6 +808,14 @@ export class Composio {
         (Symbol.iterator in body && 'next' in body && typeof body.next === 'function'))
     ) {
       return { bodyHeaders: undefined, body: Shims.ReadableStreamFrom(body as AsyncIterable<Uint8Array>) };
+    } else if (
+      typeof body === 'object' &&
+      headers.values.get('content-type') === 'application/x-www-form-urlencoded'
+    ) {
+      return {
+        bodyHeaders: { 'content-type': 'application/x-www-form-urlencoded' },
+        body: this.stringifyQuery(body),
+      };
     } else {
       return this.#encoder({ body, headers });
     }
@@ -785,31 +840,70 @@ export class Composio {
 
   static toFile = Uploads.toFile;
 
+  /**
+   * Authentication configuration management
+   */
   authConfigs: API.AuthConfigs = new API.AuthConfigs(this);
+  /**
+   * Connected account management
+   */
   connectedAccounts: API.ConnectedAccounts = new API.ConnectedAccounts(this);
-  trigger: API.Trigger = new API.Trigger(this);
-  actionExecution: API.ActionExecution = new API.ActionExecution(this);
-  org: API.Org = new API.Org(this);
-  teamMembers: API.TeamMembers = new API.TeamMembers(this);
+  /**
+   * Connected account management
+   */
+  link: API.Link = new API.Link(this);
+  /**
+   * Toolkit and tool management
+   */
   toolkits: API.Toolkits = new API.Toolkits(this);
+  /**
+   * Tool execution endpoints
+   */
   tools: API.Tools = new API.Tools(this);
+  /**
+   * Trigger management and execution
+   */
   triggerInstances: API.TriggerInstances = new API.TriggerInstances(this);
+  /**
+   * Trigger management and execution
+   */
   triggersTypes: API.TriggersTypes = new API.TriggersTypes(this);
-  cli: API.Cli = new API.Cli(this);
+  /**
+   * MCP server management
+   */
   mcp: API.Mcp = new API.Mcp(this);
+  /**
+   * File management
+   */
+  files: API.Files = new API.Files(this);
+  /**
+   * Endpoints to help with migration from v1 to v3
+   */
+  migration: API.Migration = new API.Migration(this);
+  cli: API.Cli = new API.Cli(this);
+  project: API.Project = new API.Project(this);
+  logs: API.Logs = new API.Logs(this);
+  /**
+   * (Labs) Tool router endpoints
+   */
+  toolRouter: API.ToolRouter = new API.ToolRouter(this);
 }
+
 Composio.AuthConfigs = AuthConfigs;
 Composio.ConnectedAccounts = ConnectedAccounts;
-Composio.Trigger = Trigger;
-Composio.ActionExecution = ActionExecution;
-Composio.Org = Org;
-Composio.TeamMembers = TeamMembers;
+Composio.Link = Link;
 Composio.Toolkits = Toolkits;
 Composio.Tools = Tools;
 Composio.TriggerInstances = TriggerInstances;
 Composio.TriggersTypes = TriggersTypes;
-Composio.Cli = Cli;
 Composio.Mcp = Mcp;
+Composio.Files = Files;
+Composio.Migration = Migration;
+Composio.Cli = Cli;
+Composio.Project = Project;
+Composio.Logs = Logs;
+Composio.ToolRouter = ToolRouter;
+
 export declare namespace Composio {
   export type RequestOptions = Opts.RequestOptions;
 
@@ -837,33 +931,14 @@ export declare namespace Composio {
     type ConnectedAccountUpdateStatusResponse as ConnectedAccountUpdateStatusResponse,
     type ConnectedAccountCreateParams as ConnectedAccountCreateParams,
     type ConnectedAccountListParams as ConnectedAccountListParams,
+    type ConnectedAccountRefreshParams as ConnectedAccountRefreshParams,
     type ConnectedAccountUpdateStatusParams as ConnectedAccountUpdateStatusParams,
   };
 
   export {
-    Trigger as Trigger,
-    type TriggerLogResponse as TriggerLogResponse,
-    type TriggerLogParams as TriggerLogParams,
-  };
-
-  export {
-    ActionExecution as ActionExecution,
-    type ActionExecutionLogResponse as ActionExecutionLogResponse,
-    type ActionExecutionRetrieveFieldsResponse as ActionExecutionRetrieveFieldsResponse,
-    type ActionExecutionRetrieveLogResponse as ActionExecutionRetrieveLogResponse,
-    type ActionExecutionLogParams as ActionExecutionLogParams,
-  };
-
-  export { Org as Org };
-
-  export {
-    TeamMembers as TeamMembers,
-    type TeamMemberUpdateResponse as TeamMemberUpdateResponse,
-    type TeamMemberListResponse as TeamMemberListResponse,
-    type TeamMemberInviteResponse as TeamMemberInviteResponse,
-    type TeamMemberRemoveResponse as TeamMemberRemoveResponse,
-    type TeamMemberUpdateParams as TeamMemberUpdateParams,
-    type TeamMemberInviteParams as TeamMemberInviteParams,
+    Link as Link,
+    type LinkCreateResponse as LinkCreateResponse,
+    type LinkCreateParams as LinkCreateParams,
   };
 
   export {
@@ -871,6 +946,7 @@ export declare namespace Composio {
     type ToolkitRetrieveResponse as ToolkitRetrieveResponse,
     type ToolkitListResponse as ToolkitListResponse,
     type ToolkitRetrieveCategoriesResponse as ToolkitRetrieveCategoriesResponse,
+    type ToolkitRetrieveParams as ToolkitRetrieveParams,
     type ToolkitListParams as ToolkitListParams,
   };
 
@@ -882,6 +958,7 @@ export declare namespace Composio {
     type ToolGetInputResponse as ToolGetInputResponse,
     type ToolProxyResponse as ToolProxyResponse,
     type ToolRetrieveEnumResponse as ToolRetrieveEnumResponse,
+    type ToolRetrieveParams as ToolRetrieveParams,
     type ToolListParams as ToolListParams,
     type ToolExecuteParams as ToolExecuteParams,
     type ToolGetInputParams as ToolGetInputParams,
@@ -891,11 +968,8 @@ export declare namespace Composio {
   export {
     TriggerInstances as TriggerInstances,
     type TriggerInstanceListActiveResponse as TriggerInstanceListActiveResponse,
-    type TriggerInstanceRemoveUpsertResponse as TriggerInstanceRemoveUpsertResponse,
-    type TriggerInstanceUpdateStatusResponse as TriggerInstanceUpdateStatusResponse,
     type TriggerInstanceUpsertResponse as TriggerInstanceUpsertResponse,
     type TriggerInstanceListActiveParams as TriggerInstanceListActiveParams,
-    type TriggerInstanceUpdateStatusParams as TriggerInstanceUpdateStatusParams,
     type TriggerInstanceUpsertParams as TriggerInstanceUpsertParams,
   };
 
@@ -904,18 +978,10 @@ export declare namespace Composio {
     type TriggersTypeRetrieveResponse as TriggersTypeRetrieveResponse,
     type TriggersTypeListResponse as TriggersTypeListResponse,
     type TriggersTypeRetrieveEnumResponse as TriggersTypeRetrieveEnumResponse,
+    type TriggersTypeRetrieveParams as TriggersTypeRetrieveParams,
     type TriggersTypeListParams as TriggersTypeListParams,
   };
 
-  export {
-    Cli as Cli,
-    type CliCreateSessionResponse as CliCreateSessionResponse,
-    type CliLinkSessionResponse as CliLinkSessionResponse,
-    type CliRetrieveSessionResponse as CliRetrieveSessionResponse,
-    type CliLinkSessionParams as CliLinkSessionParams,
-    type CliRetrieveSessionParams as CliRetrieveSessionParams,
-  };
-
   export {
     Mcp as Mcp,
     type McpCreateResponse as McpCreateResponse,
@@ -924,10 +990,41 @@ export declare namespace Composio {
     type McpListResponse as McpListResponse,
     type McpDeleteResponse as McpDeleteResponse,
     type McpRetrieveAppResponse as McpRetrieveAppResponse,
-    type McpValidateResponse as McpValidateResponse,
     type McpCreateParams as McpCreateParams,
     type McpUpdateParams as McpUpdateParams,
     type McpListParams as McpListParams,
-    type McpValidateParams as McpValidateParams,
+    type McpRetrieveAppParams as McpRetrieveAppParams,
+  };
+
+  export {
+    Files as Files,
+    type FileListResponse as FileListResponse,
+    type FileCreatePresignedURLResponse as FileCreatePresignedURLResponse,
+    type FileListParams as FileListParams,
+    type FileCreatePresignedURLParams as FileCreatePresignedURLParams,
+  };
+
+  export {
+    Migration as Migration,
+    type MigrationRetrieveNanoidResponse as MigrationRetrieveNanoidResponse,
+    type MigrationRetrieveNanoidParams as MigrationRetrieveNanoidParams,
+  };
+
+  export {
+    Cli as Cli,
+    type CliCreateSessionResponse as CliCreateSessionResponse,
+    type CliGetSessionResponse as CliGetSessionResponse,
+    type CliCreateSessionParams as CliCreateSessionParams,
+    type CliGetSessionParams as CliGetSessionParams,
+  };
+
+  export { Project as Project };
+
+  export { Logs as Logs };
+
+  export {
+    ToolRouter as ToolRouter,
+    type ToolRouterCreateSessionResponse as ToolRouterCreateSessionResponse,
+    type ToolRouterCreateSessionParams as ToolRouterCreateSessionParams,
   };
 }

package/src/core/resource.ts

@@ -2,7 +2,7 @@
 
 import type { Composio } from '../client';
 
-export class APIResource {
+export abstract class APIResource {
   protected _client: Composio;
 
   constructor(client: Composio) {