Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.
Revert "fix(cli): avoid refreshing consumer cache on every search"
This reverts commit 95967764657368572b9fc96f8851917df3f85516.
shams haroon committed
Aug 20, 2026 at 15:46 UTC
e19b998a9fe7d7e842783a1f299cd44750cdd939
1 file changed
+76
-129
ts/packages/cli/src/commands/tools/commands/tools.search.cmd.ts
+76
-129
@@ -18,7 +18,6 @@ import {
18
} from 'src/services/command-project';
19
import { commandHintExample, commandHintStep } from 'src/services/command-hints';
20
import {
21
- getFreshConsumerConnectedToolkitsFromCache,
21
invalidateConsumerConnectedToolkitsCache,
22
refreshConsumerConnectedToolkitsCache,
23
writeConsumerConnectedToolkitsCache,
@@ -100,24 +99,6 @@ const TOOL_SCHEMA_PATH_FORMAT = '~/.composio/tool_definitions/<TOOL_SLUG>.json';
99
const isRemoteCustomToolSlug = (slug: string): boolean =>
100
slug.toUpperCase().startsWith('CUSTOM_');
101
103
-const includesToolkit = (toolkits: ReadonlyArray<string>, toolkit: string): boolean =>
104
- toolkits.some(cachedToolkit => cachedToolkit.toLowerCase() === toolkit.toLowerCase());
105
-
106
-const searchResponseIncludesToolkit = (
107
- searchResponse: SearchResponseRecord,
108
- toolkit: string
109
-): boolean => {
110
- const normalizedToolkit = toolkit.toLowerCase();
111
- return (
112
- searchResponse.results.some(result =>
113
- result.toolkits.some(resultToolkit => resultToolkit.toLowerCase() === normalizedToolkit)
114
- ) ||
115
- Object.values(searchResponse.tool_schemas).some(
116
- schema => schema.toolkit.toLowerCase() === normalizedToolkit
117
- )
118
- );
119
-};
120
-
102
const toHomeRelativePath = (cacheDir: string, absolutePath: string) =>
103
absolutePath.startsWith(cacheDir) ? absolutePath.replace(cacheDir, '~/.composio') : absolutePath;
104
@@ -351,124 +332,90 @@ const runToolsSearch = (params: {
332
.filter(Boolean)
333
: undefined;
334
354
- const runSearchRequest = (forceRefresh = false) =>
355
- Effect.gen(function* () {
356
- const resolvedProject = yield* resolveCommandProject({
357
- mode: 'consumer',
358
- projectName: params.rootOnly ? undefined : Option.getOrUndefined(params.projectName),
359
- }).pipe(Effect.mapError(formatResolveCommandProjectError));
360
- const resolvedUserId =
361
- resolvedProject.projectType === 'CONSUMER'
362
- ? Option.fromNullable(resolvedProject.consumerUserId)
363
- : Option.match(params.userId, {
364
- onSome: value => Option.some(value),
365
- onNone: () => userContext.data.testUserId,
366
- });
367
- if (Option.isNone(resolvedUserId)) {
368
- return yield* new ToolsSearchInputError({
369
- reason: 'missing_user_id',
370
- message:
371
- 'Missing user id. Provide --user-id or run composio login to set global test_user_id.',
372
- });
373
- }
374
- const clientSingleton = yield* ComposioClientSingleton;
375
- const client = yield* clientSingleton.getFor({
376
- orgId: resolvedProject.orgId,
377
- projectId: resolvedProject.projectId,
335
+ const runSearchRequest = Effect.gen(function* () {
336
+ const resolvedProject = yield* resolveCommandProject({
337
+ mode: 'consumer',
338
+ projectName: params.rootOnly ? undefined : Option.getOrUndefined(params.projectName),
339
+ }).pipe(Effect.mapError(formatResolveCommandProjectError));
340
+ const resolvedUserId =
341
+ resolvedProject.projectType === 'CONSUMER'
342
+ ? Option.fromNullable(resolvedProject.consumerUserId)
343
+ : Option.match(params.userId, {
344
+ onSome: value => Option.some(value),
345
+ onNone: () => userContext.data.testUserId,
346
+ });
347
+ if (Option.isNone(resolvedUserId)) {
348
+ return yield* new ToolsSearchInputError({
349
+ reason: 'missing_user_id',
350
+ message:
351
+ 'Missing user id. Provide --user-id or run composio login to set global test_user_id.',
352
});
379
- let cacheRefreshAttempted = false;
380
- if (resolvedProject.projectType === 'CONSUMER') {
381
- const cachedToolkits = yield* getFreshConsumerConnectedToolkitsFromCache({
382
- orgId: resolvedProject.orgId,
383
- consumerUserId: resolvedUserId.value,
384
- });
385
- const requestedCustomToolkitMissing =
386
- toolkitList?.some(
387
- toolkit =>
388
- isRemoteCustomToolSlug(toolkit) &&
389
- (Option.isNone(cachedToolkits) || !includesToolkit(cachedToolkits.value, toolkit))
390
- ) ?? false;
391
- const shouldRefresh =
392
- forceRefresh || Option.isNone(cachedToolkits) || requestedCustomToolkitMissing;
393
-
394
- if (shouldRefresh) {
395
- cacheRefreshAttempted = true;
396
- yield* refreshConsumerConnectedToolkitsCache({
397
- orgId: resolvedProject.orgId,
398
- consumerUserId: resolvedUserId.value,
399
- }).pipe(
400
- Effect.catchAll(() => invalidateConsumerConnectedToolkitsCache().pipe(Effect.ignore))
401
- );
402
- }
403
- }
404
- const { sessionId, localExperimentalPayload } = yield* resolveToolRouterSession(
405
- client,
406
- resolvedUserId.value,
407
- {
408
- toolkits: toolkitList,
409
- cacheScope:
410
- resolvedProject.projectType === 'CONSUMER' && resolvedProject.consumerUserId
411
- ? {
412
- orgId: resolvedProject.orgId,
413
- projectId: resolvedProject.projectId,
414
- consumerUserId: resolvedProject.consumerUserId,
415
- }
416
- : undefined,
417
- }
353
+ }
354
+ const clientSingleton = yield* ComposioClientSingleton;
355
+ const client = yield* clientSingleton.getFor({
356
+ orgId: resolvedProject.orgId,
357
+ projectId: resolvedProject.projectId,
358
+ });
359
+ if (resolvedProject.projectType === 'CONSUMER') {
360
+ yield* refreshConsumerConnectedToolkitsCache({
361
+ orgId: resolvedProject.orgId,
362
+ consumerUserId: resolvedUserId.value,
363
+ }).pipe(
364
+ Effect.catchAll(() => invalidateConsumerConnectedToolkitsCache().pipe(Effect.ignore))
365
);
419
- const searchPayload = {
420
- queries: queries.map(query => ({ use_case: query })),
421
- ...(localExperimentalPayload ? { experimental: localExperimentalPayload } : {}),
422
- };
423
- const searchResponse = yield* Effect.tryPromise({
424
- try: () => client.toolRouter.session.search(sessionId, searchPayload),
425
- catch: cause =>
426
- new ToolsSearchRequestError({
427
- message: 'Failed to search tools.',
428
- cause,
429
- }),
430
- });
431
- return {
432
- searchResponse,
433
- projectScope: {
434
- orgId: resolvedProject.orgId,
435
- projectId: resolvedProject.projectId,
436
- },
437
- historyScope:
438
- resolvedProject.projectType === 'CONSUMER'
366
+ }
367
+ const { sessionId, localExperimentalPayload } = yield* resolveToolRouterSession(
368
+ client,
369
+ resolvedUserId.value,
370
+ {
371
+ toolkits: toolkitList,
372
+ cacheScope:
373
+ resolvedProject.projectType === 'CONSUMER' && resolvedProject.consumerUserId
374
? {
375
orgId: resolvedProject.orgId,
441
- consumerUserId: resolvedUserId.value,
442
- toolRouterSessionId: sessionId,
376
+ projectId: resolvedProject.projectId,
377
+ consumerUserId: resolvedProject.consumerUserId,
378
}
379
: undefined,
445
- cacheRefreshAttempted,
446
- };
447
- });
448
-
449
- const runSearchRequestWithSpinner = (forceRefresh = false) =>
450
- Effect.gen(function* () {
451
- return yield* emitHuman
452
- ? ui.withSpinner(
453
- queries.length === 1
454
- ? `Searching tools for "${queries[0]}"...`
455
- : `Searching tools for ${queries.length} queries...`,
456
- runSearchRequest(forceRefresh)
457
- )
458
- : runSearchRequest(forceRefresh);
380
+ }
381
+ );
382
+ const searchPayload = {
383
+ queries: queries.map(query => ({ use_case: query })),
384
+ ...(localExperimentalPayload ? { experimental: localExperimentalPayload } : {}),
385
+ };
386
+ const searchResponse = yield* Effect.tryPromise({
387
+ try: () => client.toolRouter.session.search(sessionId, searchPayload),
388
+ catch: cause =>
389
+ new ToolsSearchRequestError({
390
+ message: 'Failed to search tools.',
391
+ cause,
392
+ }),
393
});
394
+ return {
395
+ searchResponse,
396
+ projectScope: {
397
+ orgId: resolvedProject.orgId,
398
+ projectId: resolvedProject.projectId,
399
+ },
400
+ historyScope:
401
+ resolvedProject.projectType === 'CONSUMER'
402
+ ? {
403
+ orgId: resolvedProject.orgId,
404
+ consumerUserId: resolvedUserId.value,
405
+ toolRouterSessionId: sessionId,
406
+ }
407
+ : undefined,
408
+ };
409
+ });
410
461
- const firstSearchResult = yield* runSearchRequestWithSpinner();
462
- const customToolkitFilters = (toolkitList ?? []).filter(isRemoteCustomToolSlug);
463
- const shouldRetryAfterCustomToolkitMiss =
464
- customToolkitFilters.length > 0 &&
465
- !firstSearchResult.cacheRefreshAttempted &&
466
- customToolkitFilters.some(
467
- toolkit => !searchResponseIncludesToolkit(firstSearchResult.searchResponse, toolkit)
468
- );
469
- const searchResult = shouldRetryAfterCustomToolkitMiss
470
- ? yield* runSearchRequestWithSpinner(true)
471
- : firstSearchResult;
411
+ const searchResult = emitHuman
412
+ ? yield* ui.withSpinner(
413
+ queries.length === 1
414
+ ? `Searching tools for "${queries[0]}"...`
415
+ : `Searching tools for ${queries.length} queries...`,
416
+ runSearchRequest
417
+ )
418
+ : yield* runSearchRequest;
419
const searchResponse = searchResult.searchResponse;
420
421
const toolkitSet = toolkitList && toolkitList.length > 0 ? new Set(toolkitList) : undefined;