5
import { encodingForModel } from 'js-tiktoken';
6
import { redact } from 'src/ui/redact';
7
import { parseJsonRecord } from 'src/utils/parse-json';
8
-import { toolkitFromToolSlug } from 'src/utils/toolkit-from-tool-slug';
8
+import { toolkitFromToolSlug } from 'src/effects/toolkit-from-tool-slug';
9
import { requireAuth } from 'src/effects/require-auth';
10
import { resolveOptionalTextInput } from 'src/effects/resolve-optional-text-input';
11
import {
245
return setNestedKey(params.args, targetPath, params.filePath);
246
});
247
248
-const connectionTips = (toolSlug: string, surface: 'root' | 'dev') => {
249
- const toolkit = toolkitFromToolSlug(toolSlug);
248
+const connectionTips = (params: {
249
+ readonly toolkit: string | undefined;
250
+ readonly toolSlug: string;
251
+ readonly surface: 'root' | 'dev';
252
+}) => {
253
+ const { toolkit, toolSlug, surface } = params;
254
const executeStep =
255
surface === 'dev'
256
? commandHintStep('Retry', 'dev.playgroundExecute', {
417
readonly mappedError?: ReturnType<typeof mapComposioError>;
418
}) =>
419
Effect.gen(function* () {
420
+ const toolkitSlug = yield* toolkitFromToolSlug(params.toolSlug);
421
const normalized = params.mappedError?.normalized ?? normalizeCliError(params.error);
422
const failureOrigin: 'fast_fail' | 'main_endpoint' =
423
normalized instanceof ToolInputValidationError || params.stage !== 'execution'
428
yield* trackCliEventEffect(
429
getToolExecuteValidationFailedEvent({
430
toolSlug: params.toolSlug,
431
+ toolkitSlug,
432
args: params.args,
433
error: normalized,
434
surface: params.surface,
441
yield* trackCliCodactFailureEffect({
442
failureType: 'wrong_tool_input_param',
443
toolInfo: {
438
- ...(toolkitFromToolSlug(params.toolSlug)
439
- ? { toolkit: toolkitFromToolSlug(params.toolSlug) }
440
- : {}),
444
+ ...(toolkitSlug ? { toolkit: toolkitSlug } : {}),
445
},
446
ctx: {
447
tool_slug: params.toolSlug,
464
params.mappedError ??
465
mapComposioError({
466
error: params.error,
467
+ toolkit: toolkitSlug,
468
toolSlug: params.toolSlug,
469
});
470
const apiDetails = mapped.apiDetails;
482
})
483
? getToolExecuteValidationFailedEvent({
484
toolSlug: params.toolSlug,
485
+ toolkitSlug,
486
args: params.args,
487
error: new ToolInputValidationError({
488
toolSlug: params.toolSlug,
508
})
509
? getToolExecuteToolNotFoundEvent({
510
toolSlug: params.toolSlug,
511
+ toolkitSlug,
512
args: params.args,
513
surface: params.surface,
514
projectMode: params.projectMode,
522
})
523
: getToolExecuteFailedEvent({
524
toolSlug: params.toolSlug,
525
+ toolkitSlug,
526
args: params.args,
527
surface: params.surface,
528
projectMode: params.projectMode,
553
yield* trackCliCodactFailureEffect({
554
failureType: 'wrong_tool_input_param',
555
toolInfo: {
548
- ...(toolkitFromToolSlug(params.toolSlug)
549
- ? { toolkit: toolkitFromToolSlug(params.toolSlug) }
550
- : {}),
556
+ ...(toolkitSlug ? { toolkit: toolkitSlug } : {}),
557
},
558
ctx: {
559
tool_slug: params.toolSlug,
586
yield* trackCliCodactFailureEffect({
587
failureType: 'wrong_tool_slug',
588
toolInfo: {
583
- ...(toolkitFromToolSlug(params.toolSlug)
584
- ? { toolkit: toolkitFromToolSlug(params.toolSlug) }
585
- : {}),
589
+ ...(toolkitSlug ? { toolkit: toolkitSlug } : {}),
590
},
591
ctx: {
592
invalid_tool_slug: params.toolSlug,
667
}
668
) =>
669
Effect.gen(function* () {
666
- const mapped = mapComposioError({ error, toolSlug: context.toolSlug });
670
+ const toolkit = yield* toolkitFromToolSlug(context.toolSlug);
671
+ const mapped = mapComposioError({ error, toolkit, toolSlug: context.toolSlug });
672
const normalized = mapped.normalized;
673
if (normalized instanceof ToolInputValidationError) {
674
yield* emitExecuteFailureTelemetry({
706
707
if (normalized instanceof ComposioNoActiveConnectionError) {
708
yield* ui.log.error(mapped.message);
704
- if (toolkitFromToolSlug(context.toolSlug)) {
705
- yield* ui.note(connectionTips(context.toolSlug, context.surface), 'Tips');
709
+ if (toolkit) {
710
+ yield* ui.note(
711
+ connectionTips({ toolkit, toolSlug: context.toolSlug, surface: context.surface }),
712
+ 'Tips'
713
+ );
714
}
715
return { error: mapped.message, slug: slugValue ?? context.toolSlug };
716
}
1054
orgId: resolvedProject.orgId,
1055
projectId: resolvedProject.projectId,
1056
});
1049
- const toolkitSlug = isLocalToolSlug(params.slug) ? undefined : toolkitFromToolSlug(params.slug);
1057
+ const toolkitSlug = isLocalToolSlug(params.slug)
1058
+ ? undefined
1059
+ : yield* toolkitFromToolSlug(params.slug);
1060
const selectedConnectedAccountId = yield* resolveConnectedAccountForToolkit({
1061
client,
1062
toolkitSlug,
1183
Effect.asVoid
1184
);
1185
1176
- const toolkit = toolkitFromToolSlug(params.slug);
1186
+ const toolkit = yield* toolkitFromToolSlug(params.slug);
1187
if (!toolkit) return;
1188
1189
const cachedToolkits = yield* getFreshConsumerConnectedToolkitsFromCache({
1212
});
1213
const message = `Toolkit "${toolkit}" is not connected for this user (cached within the last 5 minutes). If you just connected the account, use --skip-connection-check.`;
1214
yield* params.ui.log.error(message);
1205
- yield* params.ui.note(connectionTips(params.slug, params.surface), 'Tips');
1215
+ yield* params.ui.note(
1216
+ connectionTips({ toolkit, toolSlug: params.slug, surface: params.surface }),
1217
+ 'Tips'
1218
+ );
1219
yield* writeExecuteStdout(
1220
params.ui,
1221
JSON.stringify(
1784
Effect.asVoid
1785
);
1786
1774
- const toolkit = toolkitFromToolSlug(params.slug);
1787
+ const toolkit = yield* toolkitFromToolSlug(params.slug);
1788
if (!toolkit) return;
1789
1790
const cachedToolkits = yield* getFreshConsumerConnectedToolkitsFromCache({
1845
{ readonly inputSchema: Record<string, unknown> }
1846
>;
1847
}).pipe(
1835
- Effect.catchAll(error => {
1836
- const mapped = mapComposioError({ error, toolSlug: spec.slug });
1837
- return Effect.succeed({
1838
- slug: spec.slug,
1839
- successful: false,
1840
- error: mapped.message,
1841
- } satisfies Extract<ParallelExecuteResult, { readonly successful: false }>);
1842
- })
1848
+ Effect.catchAll(error =>
1849
+ toolkitFromToolSlug(spec.slug).pipe(
1850
+ Effect.map(toolkit => {
1851
+ const mapped = mapComposioError({ error, toolkit, toolSlug: spec.slug });
1852
+ return {
1853
+ slug: spec.slug,
1854
+ successful: false,
1855
+ error: mapped.message,
1856
+ } satisfies Extract<ParallelExecuteResult, { readonly successful: false }>;
1857
+ })
1858
+ )
1859
+ )
1860
),
1861
{ concurrency: 'unbounded' }
1862
);
1997
...result,
1998
};
1999
}).pipe(
1983
- Effect.catchAll(error => {
1984
- const mapped = mapComposioError({ error, toolSlug: spec.slug });
1985
- return Effect.succeed({
1986
- slug: spec.slug,
1987
- successful: false,
1988
- error: mapped.message,
1989
- } satisfies ParallelExecuteResult);
1990
- })
2000
+ Effect.catchAll(error =>
2001
+ toolkitFromToolSlug(spec.slug).pipe(
2002
+ Effect.map(toolkit => {
2003
+ const mapped = mapComposioError({ error, toolkit, toolSlug: spec.slug });
2004
+ return {
2005
+ slug: spec.slug,
2006
+ successful: false,
2007
+ error: mapped.message,
2008
+ } satisfies ParallelExecuteResult;
2009
+ })
2010
+ )
2011
+ )
2012
),
2013
{ concurrency: 'unbounded' }
2014
);