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 toolss.get to support scopes, remove cursor and important flags (#1666)
Musthaq Ahamaddeca04ed12e1
diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 6b74ffb06..2a625cb34 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -482,7 +482,7 @@ importers:version: 3.16.8effect-errors:specifier: ^1.10.11- version: 1.10.11(krha7h4zqwvrjoe7foerbk5wme)+ version: 1.10.11(ff5edfb43a1891ed491370151a2c33b9)indent-string:specifier: ^5.0.0version: 5.0.0@@ -527,8 +527,8 @@ importers:ts/packages/core:dependencies:'@composio/client':- specifier: 0.1.0-alpha.23- version: 0.1.0-alpha.23+ specifier: 0.1.0-alpha.24+ version: 0.1.0-alpha.24'@composio/json-schema-to-zod':specifier: 0.1.9version: 0.1.9@@ -650,7 +650,7 @@ importers:dependencies:'@langchain/core':specifier: ^0.3.44- version: 0.3.58([email protected]([email protected]))devDependencies:'@composio/core':specifier: workspace:*@@ -1027,8 +1027,8 @@ packages:'@composio/[email protected]':resolution: {integrity: sha512-b9KCO5gy0EsCG+nXikOdm17PiZZ85rw3vwu9aNRIse9rEj2FA1SScpP+P9GN4G0lQHl+QPyDuVvGa6U9AATFeg==}- '@composio/[email protected]':- resolution: {integrity: sha512-zDbOJZVR+Ug0a622mjMGsREELKOG6DLF3qKI7qJ9FLP/GpAT7xekyEE7DR0g37zs6ytCy0oV/KMi+KaxxNp+zA==}+ '@composio/[email protected]':+ resolution: {integrity: sha512-CC8drumVzTNZP6Hh9eR69MTwXR2UBmsPPgLgvTZUtBI5qVatjpEl018prMQXuWIzDa9eOKhQnUDNjU52cqo4sQ==}'@composio/[email protected]':resolution: {integrity: sha512-ehu0OdwAgjShWjRaXBVlFnaqykDj6rxWcH3GeE179luNqLIb1p0L+Nazb1IMJ1CFl+DQC/NWkI80K8lgRLBQNQ==}@@ -6434,7 +6434,7 @@ snapshots:'@composio/[email protected]': {}- '@composio/[email protected]': {}+ '@composio/[email protected]': {}'@composio/[email protected]([email protected])':dependencies:@@ -7023,14 +7023,14 @@ snapshots:transitivePeerDependencies:- openaidependencies:'@cfworker/json-schema': 4.1.1ansi-styles: 5.2.0camelcase: 6.3.0decamelize: 1.2.0js-tiktoken: 1.0.20- langsmith: 0.3.31([email protected]([email protected]))mustache: 4.2.0p-queue: 6.6.2p-retry: 4.6.2@@ -8827,7 +8827,7 @@ snapshots:sirv: 3.0.1tinyglobby: 0.2.14tinyrainbow: 2.0.0- vitest: 3.2.3(@types/[email protected])(@vitest/[email protected])([email protected])([email protected])([email protected])+ vitest: 3.2.3(@types/[email protected])(@vitest/[email protected])([email protected])([email protected])([email protected])'@vitest/[email protected]':dependencies:@@ -9314,7 +9314,7 @@ snapshots:- [email protected](krha7h4zqwvrjoe7foerbk5wme):+ [email protected](ff5edfb43a1891ed491370151a2c33b9):dependencies:'@effect/cluster': 0.39.2(@effect/[email protected]([email protected]))(@effect/[email protected](@effect/[email protected]([email protected]))([email protected]))(@effect/[email protected](@effect/[email protected](@effect/[email protected]([email protected]))([email protected]))(@effect/[email protected]([email protected]))([email protected]))(@effect/[email protected](@effect/[email protected]([email protected]))(@effect/[email protected](@effect/[email protected]([email protected]))([email protected]))([email protected]))([email protected])'@effect/platform': 0.84.11([email protected])@@ -10134,7 +10134,7 @@ snapshots:optionalDependencies:openai: 4.104.0([email protected])([email protected])dependencies:'@types/uuid': 10.0.0chalk: 4.1.2diff --git a/ts/packages/core/package.json b/ts/packages/core/package.jsonindex d205df739..812f99020 100644--- a/ts/packages/core/package.json+++ b/ts/packages/core/package.json@@ -37,7 +37,7 @@"vitest": "^3.1.4"},"dependencies": {- "@composio/client": "0.1.0-alpha.23",+ "@composio/client": "0.1.0-alpha.24","@composio/json-schema-to-zod": "0.1.9","chalk": "^5.4.1","openai": "^4.94.0",diff --git a/ts/packages/core/src/models/AuthScheme.ts b/ts/packages/core/src/models/AuthScheme.tsindex b8a1a6f1f..2d0d5af40 100644--- a/ts/packages/core/src/models/AuthScheme.ts+++ b/ts/packages/core/src/models/AuthScheme.ts@@ -190,20 +190,6 @@ export class AuthScheme {};}- /**- * Creates a ConnectionData object for Snowflake authentication- * @returns ConnectionData object- */- static Snowflake(params: BaseConnectionFields): ConnectionData {- return {- authScheme: AuthSchemeTypes.SNOWFLAKE,- val: {- status: ConnectionStatuses.ACTIVE,- ...params,- },- };- }-/*** Creates a ConnectionData object for Bill.com authentication* @param params The Bill.com auth parametersdiff --git a/ts/packages/core/src/models/ConnectedAccounts.ts b/ts/packages/core/src/models/ConnectedAccounts.tsindex 2be3682a7..9e28b4978 100644--- a/ts/packages/core/src/models/ConnectedAccounts.ts+++ b/ts/packages/core/src/models/ConnectedAccounts.ts@@ -178,7 +178,6 @@ export class ConnectedAccounts {id: authConfigId,},connection: {- state: options?.config,callback_url: options?.callbackUrl,user_id: userId,},diff --git a/ts/packages/core/src/models/Tools.ts b/ts/packages/core/src/models/Tools.tsindex 38a3b1780..b68876234 100644--- a/ts/packages/core/src/models/Tools.ts+++ b/ts/packages/core/src/models/Tools.ts@@ -20,6 +20,7 @@ import {ToolRetrieveResponse,ToolListResponse as ComposioToolListResponse,ToolExecuteResponse as ComposioToolExecuteResponse,+ ToolListParams as ComposioToolListParams,} from '@composio/client/resources/tools';import { CustomTools } from './CustomTools';import { CustomToolInputParameter, CustomToolOptions } from '../types/customTool.types';@@ -235,7 +236,7 @@ export class Tools<* // Get tools with filters* const githubTools = await composio.tools.getRawComposioTools({* toolkits: ['github'],- * important: true+ * limit: 10* });** // Get tools with schema transformation@@ -282,20 +283,20 @@ export class Tools<limit = '9999';}- const tools = await this.client.tools.list({- tool_slugs: 'tools' in queryParams.data ? queryParams.data.tools?.join(',') : undefined,- toolkit_slug:- 'toolkits' in queryParams.data ? queryParams.data.toolkits?.join(',') : undefined,- cursor: 'cursor' in queryParams.data ? queryParams.data.cursor : undefined,- important:- 'important' in queryParams.data- ? queryParams.data.important- ? 'true'- : 'false'- : undefined,- limit: limit,- search: 'search' in queryParams.data ? queryParams.data.search : undefined,- });+ const filters: ComposioToolListParams = {+ ...('tools' in queryParams.data ? { tool_slugs: queryParams.data.tools?.join(',') } : {}),+ ...('toolkits' in queryParams.data+ ? { toolkit_slug: queryParams.data.toolkits?.join(',') }+ : {}),+ ...(limit ? { limit } : {}),+ ...('tags' in queryParams.data ? { tags: queryParams.data.tags } : {}),+ ...('scopes' in queryParams.data ? { scopes: queryParams.data.scopes } : {}),+ ...('search' in queryParams.data ? { search: queryParams.data.search } : {}),+ };++ logger.info(`Fetching tools with filters: ${JSON.stringify(filters, null, 2)}`);++ const tools = await this.client.tools.list(filters);if (!tools) {return [];@@ -387,9 +388,20 @@ export class Tools<* });** // Get tools with search- * const tools = await composio.tools.get('default', {+ * const searchTools = await composio.tools.get('default', {* search: 'user',- * important: true+ * limit: 10+ * });+ *+ * // Get a specific tool by slug+ * const hackerNewsUserTool = await composio.tools.get('default', 'HACKERNEWS_GET_USER');+ *+ * // Get a tool with schema modifications+ * const tool = await composio.tools.get('default', 'GITHUB_GET_REPOS', {+ * modifySchema: (toolSlug, toolkitSlug, schema) => {+ * // Customize the tool schema+ * return {...schema, description: 'Custom description'};+ * }* });* ```*/diff --git a/ts/packages/core/src/types/authConfigs.types.ts b/ts/packages/core/src/types/authConfigs.types.tsindex 7acd673b5..2fc7660f3 100644--- a/ts/packages/core/src/types/authConfigs.types.ts+++ b/ts/packages/core/src/types/authConfigs.types.ts@@ -19,7 +19,6 @@ export const AuthSchemeTypes = {BASIC_WITH_JWT: 'BASIC_WITH_JWT',COMPOSIO_LINK: 'COMPOSIO_LINK',CALCOM_AUTH: 'CALCOM_AUTH',- SNOWFLAKE: 'SNOWFLAKE',} as const;export type AuthSchemeType = (typeof AuthSchemeTypes)[keyof typeof AuthSchemeTypes];@@ -35,7 +34,6 @@ export const AuthSchemeEnum = z.enum(['BASIC_WITH_JWT','COMPOSIO_LINK','CALCOM_AUTH',- 'SNOWFLAKE',]);export const CreateCustomAuthConfigParamsSchema = z.object({type: z.literal('use_custom_auth'),diff --git a/ts/packages/core/src/types/connectedAccountAuthStates.types.ts b/ts/packages/core/src/types/connectedAccountAuthStates.types.tsindex 28cff9ece..8d3f1a316 100644--- a/ts/packages/core/src/types/connectedAccountAuthStates.types.ts+++ b/ts/packages/core/src/types/connectedAccountAuthStates.types.ts@@ -352,21 +352,21 @@ const CalcomAuthConnectionDataSchema = z.discriminatedUnion('status', []);// SNOWFLAKE-const SnowflakeInitiatingSchema = BaseSchemeRaw.extend({- status: z.literal(ConnectionStatuses.ACTIVE),-}).catchall(z.unknown());-const SnowflakeConnectionDataSchema = z.discriminatedUnion('status', [- SnowflakeInitiatingSchema,- SnowflakeInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.FAILED),- error: z.string().optional(),- error_description: z.string().optional(),- }).catchall(z.unknown()),- SnowflakeInitiatingSchema.extend({- status: z.literal(ConnectionStatuses.EXPIRED),- expired_at: z.string().optional(),- }).catchall(z.unknown()),-]);+// const SnowflakeInitiatingSchema = BaseSchemeRaw.extend({+// status: z.literal(ConnectionStatuses.ACTIVE),+// }).catchall(z.unknown());+// const SnowflakeConnectionDataSchema = z.discriminatedUnion('status', [+// SnowflakeInitiatingSchema,+// SnowflakeInitiatingSchema.extend({+// status: z.literal(ConnectionStatuses.FAILED),+// error: z.string().optional(),+// error_description: z.string().optional(),+// }).catchall(z.unknown()),+// SnowflakeInitiatingSchema.extend({+// status: z.literal(ConnectionStatuses.EXPIRED),+// expired_at: z.string().optional(),+// }).catchall(z.unknown()),+// ]);export const ConnectionDataSchema = z.discriminatedUnion('authScheme', [z.object({@@ -432,13 +432,13 @@ export const ConnectionDataSchema = z.discriminatedUnion('authScheme', [*/val: CalcomAuthConnectionDataSchema,}),- z.object({- authScheme: z.literal(AuthSchemeTypes.SNOWFLAKE),- /**- * the main connection data discriminated by auth scheme- */- val: SnowflakeConnectionDataSchema,- }),+ // z.object({+ // authScheme: z.literal(AuthSchemeTypes.SNOWFLAKE),+ // /**+ // * the main connection data discriminated by auth scheme+ // */+ // val: SnowflakeConnectionDataSchema,+ // }),z.object({authScheme: z.literal(AuthSchemeTypes.BILLCOM_AUTH),/**diff --git a/ts/packages/core/src/types/connectedAccounts.types.ts b/ts/packages/core/src/types/connectedAccounts.types.tsindex 0dc49e6cc..6d286c9f2 100644--- a/ts/packages/core/src/types/connectedAccounts.types.ts+++ b/ts/packages/core/src/types/connectedAccounts.types.ts@@ -62,38 +62,6 @@ export const CreateConnectedAccountResponseSchema = z.object({});export type CreateConnectedAccountResponse = z.infer<typeof CreateConnectedAccountResponseSchema>;-export const ConnectedAccountAuthSchemes = {- OAUTH1: 'OAUTH1',- OAUTH2: 'OAUTH2',- COMPOSIO_LINK: 'COMPOSIO_LINK',- API_KEY: 'API_KEY',- BASIC: 'BASIC',- BEARER_TOKEN: 'BEARER_TOKEN',- GOOGLE_SERVICE_ACCOUNT: 'GOOGLE_SERVICE_ACCOUNT',- NO_AUTH: 'NO_AUTH',- CALCOM_AUTH: 'CALCOM_AUTH',- SNOWFLAKE: 'SNOWFLAKE',- BILLCOM_AUTH: 'BILLCOM_AUTH',- BASIC_WITH_JWT: 'BASIC_WITH_JWT',-} as const;-export const ConnectedAccountAuthSchemesSchema = z.enum([- ConnectedAccountAuthSchemes.OAUTH2,- ConnectedAccountAuthSchemes.OAUTH1,- ConnectedAccountAuthSchemes.API_KEY,- ConnectedAccountAuthSchemes.BASIC,- ConnectedAccountAuthSchemes.BILLCOM_AUTH,- ConnectedAccountAuthSchemes.BEARER_TOKEN,- ConnectedAccountAuthSchemes.GOOGLE_SERVICE_ACCOUNT,- ConnectedAccountAuthSchemes.NO_AUTH,- ConnectedAccountAuthSchemes.BASIC_WITH_JWT,- ConnectedAccountAuthSchemes.COMPOSIO_LINK,- ConnectedAccountAuthSchemes.CALCOM_AUTH,- ConnectedAccountAuthSchemes.SNOWFLAKE,-]);-export type ConnectedAccountAuthSchemesEnum = z.infer<typeof ConnectedAccountAuthSchemesSchema>;-export type ConnectedAccountAuthSchemes =- (typeof ConnectedAccountAuthSchemes)[keyof typeof ConnectedAccountAuthSchemes];-export const ConnectedAccountAuthConfigSchema = z.object({id: z.string(),isComposioManaged: z.boolean(),diff --git a/ts/packages/core/src/types/tool.types.ts b/ts/packages/core/src/types/tool.types.tsindex 85627b701..cd7162990 100644--- a/ts/packages/core/src/types/tool.types.ts+++ b/ts/packages/core/src/types/tool.types.ts@@ -108,6 +108,7 @@ export const ToolSchema = z.object({tags: z.optional(z.array(z.string())).describe('The tags of the tool. eg: Important').default([]),toolkit: z.optional(ToolkitSchema).describe('The toolkit of the tool'),version: z.optional(z.string()).describe('The version of the tool, e.g. "1.0.0"'),+ scopes: z.optional(z.array(z.string())).describe('The scopes of the tool. eg: ["task:add"]'),});export type Tool = z.infer<typeof ToolSchema>;@@ -126,65 +127,73 @@ export type ToolListResponse = z.infer<typeof ToolListResponseSchema>;*/export type ToolList = Array<Tool>;-export const ToolListFilterByToolsSchema = z.object({- tools: z.array(z.string()),-});-export type ToolListFilterByTools = z.infer<typeof ToolListFilterByToolsSchema>;--export const ToolListFilterByToolkitsSchema = z.object({- toolkits: z.array(z.string()),- important: z.boolean().optional(),- cursor: z.string().optional(),+export const ToolListParamsSchema = z.object({+ tools: z.array(z.string()).optional(),+ toolkits: z.array(z.string()).optional(),+ scopes: z.array(z.string()).optional(),+ tags: z.array(z.string()).optional(),limit: z.number().optional(),search: z.string().optional(),});-export type ToolListFilterByToolkits = z.infer<typeof ToolListFilterByToolkitsSchema>;-export const ToolListFilterBySearchSchema = z.object({- search: z.string(),- toolkits: z.array(z.string()).optional(),- cursor: z.string().optional(),- limit: z.number().optional(),-});-export type ToolListFilterBySearch = z.infer<typeof ToolListFilterBySearchSchema>;+type BaseParams = {+ limit?: number;+ search?: string;+ scopes?: string[];+ tags?: string[];+};+// tools onlytype ToolsOnlyParams = {tools: string[];toolkits?: never;- important?: never;- cursor?: never;- limit?: never;+ scopes?: never;search?: never;+ tags?: never;};+// toolkits onlytype ToolkitsOnlyParams = {+ toolkits: string[];+ tools?: never;+ scopes?: never;+} & Pick<BaseParams, 'limit' | 'search' | 'tags'>;++// toolkit + scopes (single toolkit only)+type ToolkitScopeOnlyParams = {+ toolkits: [string];tools?: never;+ scopes: string[];+} & Pick<BaseParams, 'limit' | 'search' | 'tags'>;++// tags only+type TagsOnlyParams = {toolkits?: string[];- important?: boolean;- cursor?: string;- limit?: number;+ tags: string[];+ tools?: never;search?: never;-};+} & Pick<BaseParams, 'limit'>;-type ToolkitSearchOnlyParams = {+// search only+type SearchOnlyParams = {tools?: never;- toolkits?: string[];- important?: never;- cursor?: string;- limit?: number;- search?: string;+ toolkits?: never;+ scopes?: never;+ limit?: never;+ search: string;+ tags?: never;};+/*** ToolListParams is the parameters for the list of tools.* You must provide either tools or toolkits, but not both.*/-export type ToolListParams = ToolsOnlyParams | ToolkitsOnlyParams | ToolkitSearchOnlyParams;--export const ToolListParamsSchema = z.union([- ToolListFilterByToolsSchema,- ToolListFilterByToolkitsSchema,- ToolListFilterBySearchSchema,-]);+export type ToolListParams =+ | ToolsOnlyParams+ | ToolkitsOnlyParams+ | ToolkitScopeOnlyParams+ | SearchOnlyParams+ | TagsOnlyParams;/*** CustomAuthParams is the parameters for the custom authentication.diff --git a/ts/packages/core/test/AuthConfigs/AuthScheme.test.ts b/ts/packages/core/test/AuthConfigs/AuthScheme.test.tsindex 37c75d6d5..0d7025361 100644--- a/ts/packages/core/test/AuthConfigs/AuthScheme.test.ts+++ b/ts/packages/core/test/AuthConfigs/AuthScheme.test.ts@@ -259,22 +259,6 @@ describe('AuthScheme', () => {});});- describe('Snowflake', () => {- it('should create Snowflake connection data', () => {- const result = AuthScheme.Snowflake();-- expect(result).toEqual({- authScheme: AuthSchemeTypes.SNOWFLAKE,- val: {- status: ConnectionStatuses.ACTIVE,- },- });-- // Verify Zod schema validation- expect(() => ConnectionDataSchema.parse(result)).not.toThrow();- });- });-describe('BillcomAuth', () => {it('should create BillcomAuth connection data', () => {const params = {diff --git a/ts/packages/core/test/connectedAccounts/connectedAccounts.test.ts b/ts/packages/core/test/connectedAccounts/connectedAccounts.test.tsindex fe16cf0de..d26cd4fa4 100644--- a/ts/packages/core/test/connectedAccounts/connectedAccounts.test.ts+++ b/ts/packages/core/test/connectedAccounts/connectedAccounts.test.ts@@ -5,12 +5,9 @@ import ComposioClient from '@composio/client';import { ConnectionRequest } from '../../src/models/ConnectionRequest';import { ConnectedAccountRetrieveResponse } from '@composio/client/resources/connected-accounts.mjs';import { ComposioConnectedAccountNotFoundError } from '../../src/errors';-import { ConnectionStatusEnum } from '../../src/types/connectedAccountAuthStates.types';-import {- ConnectedAccountAuthSchemes,- ConnectedAccountStatuses,-} from '../../src/types/connectedAccounts.types';+import { ConnectedAccountStatuses } from '../../src/types/connectedAccounts.types';import { ComposioMultipleConnectedAccountsError } from '../../src/errors';+import { AuthSchemeTypes } from '../../src/types/authConfigs.types';// Extend the mock client object for ConnectedAccounts testingconst extendedMockClient = {@@ -97,7 +94,7 @@ describe('ConnectedAccounts', () => {id: 'conn_123',connectionData: {val: {- authScheme: ConnectedAccountAuthSchemes.OAUTH2,+ authScheme: AuthSchemeTypes.OAUTH2,status: 'INITIALIZING',redirectUrl: 'https://auth.example.com/connect',},@@ -137,7 +134,7 @@ describe('ConnectedAccounts', () => {id: 'conn_123',connectionData: {val: {- authScheme: ConnectedAccountAuthSchemes.OAUTH2,+ authScheme: AuthSchemeTypes.OAUTH2,status: 'INITIALIZING',redirectUrl: 'https://auth.example.com/connect',},@@ -271,7 +268,7 @@ describe('ConnectedAccounts', () => {id: 'conn_123',connectionData: {val: {- authScheme: ConnectedAccountAuthSchemes.OAUTH2,+ authScheme: AuthSchemeTypes.OAUTH2,status: 'INITIALIZING',redirectUrl: 'https://auth.example.com/connect',},@@ -312,7 +309,7 @@ describe('ConnectedAccounts', () => {is_disabled: false,},state: {- authScheme: ConnectedAccountAuthSchemes.OAUTH2,+ authScheme: AuthSchemeTypes.OAUTH2,val: {status: 'ACTIVE',access_token: 'access_token_123',@@ -345,7 +342,7 @@ describe('ConnectedAccounts', () => {isDisabled: false,},state: {- authScheme: ConnectedAccountAuthSchemes.OAUTH2,+ authScheme: AuthSchemeTypes.OAUTH2,val: {status: 'ACTIVE',access_token: 'access_token_123',@@ -454,12 +451,12 @@ describe('ConnectedAccounts', () => {auth_scopes: ['read:user', 'write:user'],auth_config: {id: authConfigId,- auth_scheme: ConnectedAccountAuthSchemes.OAUTH2,+ auth_scheme: AuthSchemeTypes.OAUTH2,is_composio_managed: true,is_disabled: false,},state: {- authScheme: ConnectedAccountAuthSchemes.OAUTH2,+ authScheme: AuthSchemeTypes.OAUTH2,val: {status: ConnectedAccountStatuses.INITIALIZING,access_token: 'access_token_123',@@ -482,7 +479,7 @@ describe('ConnectedAccounts', () => {...mockGetResponse,status: ConnectedAccountStatuses.ACTIVE,state: {- authScheme: ConnectedAccountAuthSchemes.OAUTH2,+ authScheme: AuthSchemeTypes.OAUTH2,val: {status: ConnectedAccountStatuses.ACTIVE,access_token: 'access_token_123',@@ -508,7 +505,7 @@ describe('ConnectedAccounts', () => {isDisabled: false,},state: {- authScheme: ConnectedAccountAuthSchemes.OAUTH2,+ authScheme: AuthSchemeTypes.OAUTH2,val: {status: ConnectedAccountStatuses.ACTIVE,access_token: 'access_token_123',@@ -554,7 +551,7 @@ describe('ConnectedAccounts', () => {is_disabled: false,},state: {- authScheme: ConnectedAccountAuthSchemes.OAUTH2,+ authScheme: AuthSchemeTypes.OAUTH2,val: {status: ConnectedAccountStatuses.INITIALIZING,access_token: 'access_token_123',@@ -578,7 +575,7 @@ describe('ConnectedAccounts', () => {...mockGetResponse,status: 'ACTIVE',state: {- authScheme: ConnectedAccountAuthSchemes.OAUTH2,+ authScheme: AuthSchemeTypes.OAUTH2,val: {status: ConnectedAccountStatuses.ACTIVE,access_token: 'access_token_123',@@ -602,7 +599,7 @@ describe('ConnectedAccounts', () => {isDisabled: false,},state: {- authScheme: ConnectedAccountAuthSchemes.OAUTH2,+ authScheme: AuthSchemeTypes.OAUTH2,val: {status: ConnectedAccountStatuses.ACTIVE,access_token: 'access_token_123',diff --git a/ts/packages/core/test/connectedAccounts/connectionRequest.test.ts b/ts/packages/core/test/connectedAccounts/connectionRequest.test.tsindex d440edae6..2af7d7ed9 100644--- a/ts/packages/core/test/connectedAccounts/connectionRequest.test.ts+++ b/ts/packages/core/test/connectedAccounts/connectionRequest.test.ts@@ -2,10 +2,8 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';import { ConnectionRequest } from '../../src/models/ConnectionRequest';import ComposioClient, { ComposioError } from '@composio/client';import { ConnectionRequestTimeoutError } from '../../src/errors';-import {- ConnectedAccountAuthSchemes,- ConnectedAccountStatuses,-} from '../../src/types/connectedAccounts.types';+import { ConnectedAccountStatuses } from '../../src/types/connectedAccounts.types';+import { AuthSchemeTypes } from '../../src/types/authConfigs.types';// Mock ComposioClientconst mockClient = {@@ -71,7 +69,7 @@ describe('ConnectionRequest', () => {is_disabled: false,},state: {- authScheme: ConnectedAccountAuthSchemes.OAUTH2,+ authScheme: AuthSchemeTypes.OAUTH2,val: {status: 'ACTIVE',access_token: 'access_token_123',diff --git a/ts/packages/core/test/models/toolkits.test.ts b/ts/packages/core/test/models/toolkits.test.tsindex b2459422f..909e8864a 100644--- a/ts/packages/core/test/models/toolkits.test.ts+++ b/ts/packages/core/test/models/toolkits.test.ts@@ -5,7 +5,6 @@ import { telemetry } from '../../src/telemetry/Telemetry';import { ComposioAuthConfigNotFoundError } from '../../src/errors/AuthConfigErrors';import { AuthSchemeTypes } from '../../src/types/authConfigs.types';import { ConnectionRequest } from '../../src/models/ConnectionRequest';-import { ConnectedAccountAuthSchemes } from '../../src/types/connectedAccounts.types';// Mock dependenciesvi.mock('../../src/telemetry/Telemetry', () => ({@@ -389,7 +388,7 @@ describe('Toolkits', () => {id: 'conn_123',connectionData: {val: {- authScheme: ConnectedAccountAuthSchemes.OAUTH2,+ authScheme: AuthSchemeTypes.OAUTH2,status: 'INITIALIZING',redirectUrl: 'https://auth.example.com/connect',},diff --git a/ts/packages/core/test/tools/tools.test.ts b/ts/packages/core/test/tools/tools.test.tsindex a8aab2d48..1712968ca 100644--- a/ts/packages/core/test/tools/tools.test.ts+++ b/ts/packages/core/test/tools/tools.test.ts@@ -67,8 +67,6 @@ describe('Tools', () => {expect(mockClient.tools.list).toHaveBeenCalledWith({tool_slugs: 'TOOL1,TOOL2',limit: '9999',- cursor: undefined,- important: undefined,search: undefined,toolkit_slug: undefined,});@@ -79,7 +77,6 @@ describe('Tools', () => {const query = {toolkits: ['github'],limit: 10,- important: true,};mockClient.tools.list.mockResolvedValueOnce({@@ -93,8 +90,6 @@ describe('Tools', () => {tool_slugs: undefined,toolkit_slug: 'github',limit: '10',- cursor: undefined,- important: 'true',search: undefined,});});@@ -105,7 +100,6 @@ describe('Tools', () => {toolkits: ['github'],search: 'test',limit: 10,- cursor: 'next-page',};mockClient.tools.list.mockResolvedValueOnce({@@ -119,12 +113,70 @@ describe('Tools', () => {tool_slugs: undefined,toolkit_slug: 'github',limit: '10',- cursor: 'next-page',- important: undefined,search: 'test',});});+ it('should handle toolkit scopes parameters correctly', async () => {+ const userId = 'test-user';+ const query = {+ toolkits: ['todoist'],+ scopes: ['task:add', 'task:read'],+ limit: 10,+ };++ mockClient.tools.list.mockResolvedValueOnce({+ items: [toolMocks.rawTool],+ totalPages: 1,+ });++ await context.tools.getRawComposioTools(query);++ expect(mockClient.tools.list).toHaveBeenCalledWith({+ tool_slugs: undefined,+ toolkit_slug: 'todoist',+ limit: '10',+ search: undefined,+ scopes: ['task:add', 'task:read'],+ });+ });++ it('should handle toolkit scopes with search parameters correctly', async () => {+ const userId = 'test-user';+ const query = {+ toolkits: ['todoist'],+ scopes: ['task:add'],+ search: 'add task',+ limit: 10,+ };++ mockClient.tools.list.mockResolvedValueOnce({+ items: [toolMocks.rawTool],+ totalPages: 1,+ });++ await context.tools.getRawComposioTools(query);++ expect(mockClient.tools.list).toHaveBeenCalledWith({+ tool_slugs: undefined,+ toolkit_slug: 'todoist',+ limit: '10',+ search: 'add task',+ scopes: ['task:add'],+ });+ });++ it('should throw a validation error when scopes are provided without toolkits', async () => {+ const userId = 'test-user';+ const invalidQuery = {+ scopes: ['task:add'],+ } as any;++ await expect(context.tools.getRawComposioTools(invalidQuery)).rejects.toThrow(+ 'Invalid tool list parameters'+ );+ });+it('should transform tool case correctly', async () => {const userId = 'test-user';