Skip to content

Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.

feat(cli): ensure colors have proper contrast

jkomynofe5acc7d7929
diff --git a/ts/packages/cli/README.md b/ts/packages/cli/README.md
index 735587b69..639615b3c 100644
--- a/ts/packages/cli/README.md
+++ b/ts/packages/cli/README.md
@@ -52,6 +52,7 @@ By default, this file is stored in `~/.composio`, but you can specify a custom l
| COMPOSIO_CACHE_DIR | - | The directory where the Composio CLI stores cache files | ~/.composio |
| COMPOSIO_LOG_LEVEL | - | The log level for the Composio CLI | None |
| DEBUG_OVERRIDE_VERSION | - | The version to use when upgrading the Composio CLI (for debugging) | None |
+| NO_COLOR | - | If set, disables color output in the CLI (https://no-color.org/) | None |
Additionally, `composio upgrade` supports the following environment variables:
diff --git a/ts/packages/cli/src/effect-errors/pretty-print-from-captured-errors.ts b/ts/packages/cli/src/effect-errors/pretty-print-from-captured-errors.ts
index 0ed795f3c..be12b40dc 100644
--- a/ts/packages/cli/src/effect-errors/pretty-print-from-captured-errors.ts
+++ b/ts/packages/cli/src/effect-errors/pretty-print-from-captured-errors.ts
@@ -1,3 +1,4 @@
+import * as color from 'src/ui/colors';
import { formatCapturedError, formatTitle, interruptedMessage } from 'effect-errors/pretty-print';
import { type PrettyPrintOptions, prettyPrintOptionsDefault } from 'effect-errors/types';
@@ -14,5 +15,6 @@ export const prettyPrintFromCapturedErrors = (
const title = formatTitle(errors.length);
const formattedFailures = errors.map(formatCapturedError(errors.length, options));
- return [...title, ...formattedFailures].join('\r\n');
+ const message = [...title, ...formattedFailures].join('\r\n');
+ return color.bgBlack(message);
};
diff --git a/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-advice-spans-usage.ts b/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-advice-spans-usage.ts
index 9efc4677f..3b62e0e63 100644
--- a/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-advice-spans-usage.ts
+++ b/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-advice-spans-usage.ts
@@ -1,4 +1,4 @@
-import color from 'picocolors';
+import * as color from 'src/ui/colors';
import type { ErrorSpan } from 'effect-errors/types';
diff --git a/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-advise-spans-usage.ts b/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-advise-spans-usage.ts
index 9efc4677f..2e6d4d849 100644
--- a/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-advise-spans-usage.ts
+++ b/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-advise-spans-usage.ts
@@ -1,10 +1,10 @@
-import color from 'picocolors';
+import * as color from 'src/ui/colors';
import type { ErrorSpan } from 'effect-errors/types';
export const maybeAdviseSpansUsage = (spans: ErrorSpan[] | undefined): string[] => {
if (spans === undefined || spans.length === 0) {
- return ['', color.gray('ℹ️ Consider using spans to improve errors reporting.')];
+ return [' ', color.gray('ℹ️ Consider using spans to improve errors reporting.')];
}
return [];
diff --git a/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-print-node-stacktrace.ts b/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-print-node-stacktrace.ts
index 62358791f..ae97f32bb 100644
--- a/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-print-node-stacktrace.ts
+++ b/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-print-node-stacktrace.ts
@@ -1,4 +1,4 @@
-import color from 'picocolors';
+import * as color from 'src/ui/colors';
import { stripCwdPath } from 'effect-errors/logic/path';
import type { PrettyPrintOptions } from 'effect-errors/types';
@@ -17,16 +17,16 @@ export const maybePrintNodeStacktrace = (
const nodes = stack.map(el => `│ ${stripCwd ? stripCwdPath(el) : el}`).join('\r\n');
return [
- '',
+ ' ',
`${color.bold(color.red('◯'))} ${color.redBright(color.underline('Node Stacktrace 🚨'))}`,
- color.red(nodes),
- color.red('┴'),
+ color.redBright(nodes),
+ color.redBright('┴'),
];
}
if (!isPlainString) {
return [
- '',
+ ' ',
color.gray(
'ℹ️ Consider using a yieldable error such as Data.TaggedError and Schema.TaggedError to get a stacktrace.'
),
diff --git a/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-print-spans-timeline.ts b/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-print-spans-timeline.ts
index 9ed93945c..40ba3ef5c 100644
--- a/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-print-spans-timeline.ts
+++ b/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/maybe-print-spans-timeline.ts
@@ -1,4 +1,4 @@
-import color from 'picocolors';
+import * as color from 'src/ui/colors';
import { stripCwdPath } from 'effect-errors/logic/path';
import {
@@ -15,7 +15,7 @@ export const maybePrintSpansTimeline = (
{ stripCwd }: PrettyPrintOptions
): string[] => {
if (spans === undefined) {
- return isPlainString === false ? ['', missingSpansWarning, ''] : [];
+ return isPlainString === false ? [' ', missingSpansWarning, ' '] : [];
}
return spans.reduce<string[]>((output, { name, durationInMilliseconds, attributes }, index) => {
diff --git a/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/print-effect-stacktrace.ts b/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/print-effect-stacktrace.ts
index aea2d0a93..4d4125e06 100644
--- a/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/print-effect-stacktrace.ts
+++ b/ts/packages/cli/src/effect-errors/pretty-print/captured-errors/print-effect-stacktrace.ts
@@ -1,4 +1,4 @@
-import color from 'picocolors';
+import * as color from 'src/ui/colors';
import { stripCwdPath } from 'effect-errors/logic/path';
import type { ErrorRelatedSources } from 'effect-errors/sourcemaps';
@@ -21,10 +21,10 @@ export const printEffectStacktrace = (
});
return [
- `${color.bold(color.red('◯'))} ${color.red('Sources')} 🕵️`,
+ `${color.bold(color.redBright('◯'))} ${color.redBright('Sources')} 🕵️`,
...paths.map(({ path, name }) =>
- color.red(`│ at ${name.length === 0 ? 'module code' : color.underline(name)} (${path})`)
+ color.redBright(`│ at ${name.length === 0 ? 'module code' : color.underline(name)} (${path})`)
),
- color.red('┴'),
+ color.redBright('┴'),
];
};
diff --git a/ts/packages/cli/src/effect-errors/pretty-print/common/constants/missing-spans-warning.ts b/ts/packages/cli/src/effect-errors/pretty-print/common/constants/missing-spans-warning.ts
index bc3b73629..68b791d73 100644
--- a/ts/packages/cli/src/effect-errors/pretty-print/common/constants/missing-spans-warning.ts
+++ b/ts/packages/cli/src/effect-errors/pretty-print/common/constants/missing-spans-warning.ts
@@ -1,3 +1,3 @@
-import color from 'picocolors';
+import * as color from 'src/ui/colors';
export const missingSpansWarning = `\r\n${color.gray('ℹ️ Consider using spans to improve errors reporting.')}`;
diff --git a/ts/packages/cli/src/effect-errors/pretty-print/common/format-error-title.ts b/ts/packages/cli/src/effect-errors/pretty-print/common/format-error-title.ts
index 4cfa2137b..ff97de140 100644
--- a/ts/packages/cli/src/effect-errors/pretty-print/common/format-error-title.ts
+++ b/ts/packages/cli/src/effect-errors/pretty-print/common/format-error-title.ts
@@ -1,4 +1,4 @@
-import color from 'picocolors';
+import * as color from 'src/ui/colors';
export const formatErrorTitle = (
errorType: unknown,
diff --git a/ts/packages/cli/src/effect-errors/pretty-print/common/format-span-duration.ts b/ts/packages/cli/src/effect-errors/pretty-print/common/format-span-duration.ts
index 044ad588b..c563b3c1a 100644
--- a/ts/packages/cli/src/effect-errors/pretty-print/common/format-span-duration.ts
+++ b/ts/packages/cli/src/effect-errors/pretty-print/common/format-span-duration.ts
@@ -1,4 +1,4 @@
-import color from 'picocolors';
+import * as color from 'src/ui/colors';
export const formatSpanDuration = (durationInMs: number | bigint, isLastEntry: boolean) =>
`\r\n${isLastEntry ? ' ' : color.gray('│')} ~ ${durationInMs}ms`;
diff --git a/ts/packages/cli/src/effect-errors/pretty-print/common/format-spans-attribute.ts b/ts/packages/cli/src/effect-errors/pretty-print/common/format-spans-attribute.ts
index c95375575..fdcbcc4c5 100644
--- a/ts/packages/cli/src/effect-errors/pretty-print/common/format-spans-attribute.ts
+++ b/ts/packages/cli/src/effect-errors/pretty-print/common/format-spans-attribute.ts
@@ -1,4 +1,4 @@
-import color from 'picocolors';
+import * as color from 'src/ui/colors';
const maybePrintPipe = (isLastEntry: boolean) => (isLastEntry ? ' ' : color.gray('│'));
@@ -10,7 +10,7 @@ export const formatSpanAttributes = (attributes: Record<string, unknown>, isLast
const lines = Array.from(entries).map(
([key, value]) =>
- `${maybePrintPipe(isLastEntry)} ${color.blue(key)}${color.gray(':')} ${value}`
+ `${maybePrintPipe(isLastEntry)} ${color.white(key)}${color.gray(':')} ${value}`
);
return `\r\n${lines.join('\r\n')}`;
diff --git a/ts/packages/cli/src/effect-errors/pretty-print/common/format-title.ts b/ts/packages/cli/src/effect-errors/pretty-print/common/format-title.ts
index 235ed4732..3351dcc82 100644
--- a/ts/packages/cli/src/effect-errors/pretty-print/common/format-title.ts
+++ b/ts/packages/cli/src/effect-errors/pretty-print/common/format-title.ts
@@ -1,4 +1,4 @@
-import color from 'picocolors';
+import * as color from 'src/ui/colors';
export const formatTitle = (errorsCount: number): string[] => {
if (errorsCount === 1) {
diff --git a/ts/packages/cli/src/effect-errors/pretty-print/common/maybe-warn-about-plain-strings.ts b/ts/packages/cli/src/effect-errors/pretty-print/common/maybe-warn-about-plain-strings.ts
index 5a9f6ae69..76009c223 100644
--- a/ts/packages/cli/src/effect-errors/pretty-print/common/maybe-warn-about-plain-strings.ts
+++ b/ts/packages/cli/src/effect-errors/pretty-print/common/maybe-warn-about-plain-strings.ts
@@ -1,4 +1,4 @@
-import color from 'picocolors';
+import * as color from 'src/ui/colors';
export const maybeWarnAboutPlainStrings = (isPlainString: boolean): string[] => {
if (!isPlainString) {
@@ -6,7 +6,7 @@ export const maybeWarnAboutPlainStrings = (isPlainString: boolean): string[] =>
}
return [
- '',
+ ' ',
color.gray(
'ℹ️ You used a plain string to represent a failure in the error channel (E). You should consider using tagged objects (with a _tag field), or yieldable errors such as Data.TaggedError and Schema.TaggedError for better handling experience.'
),
diff --git a/ts/packages/cli/src/effect-errors/pretty-print/common/spans-stack-trailing-char.ts b/ts/packages/cli/src/effect-errors/pretty-print/common/spans-stack-trailing-char.ts
index 1ff4aec18..3515b5891 100644
--- a/ts/packages/cli/src/effect-errors/pretty-print/common/spans-stack-trailing-char.ts
+++ b/ts/packages/cli/src/effect-errors/pretty-print/common/spans-stack-trailing-char.ts
@@ -1,4 +1,4 @@
-import color from 'picocolors';
+import * as color from 'src/ui/colors';
export const spanStackTrailingChar = (isLastEntry: boolean) =>
isLastEntry ? color.gray('╰') : color.gray('├');
diff --git a/ts/packages/cli/src/effect-errors/pretty-print/format-captured-error.ts b/ts/packages/cli/src/effect-errors/pretty-print/format-captured-error.ts
index b57c2ac65..0b5afe430 100644
--- a/ts/packages/cli/src/effect-errors/pretty-print/format-captured-error.ts
+++ b/ts/packages/cli/src/effect-errors/pretty-print/format-captured-error.ts
@@ -29,5 +29,5 @@ export const formatCapturedError =
...effectStacktrace,
...nodeStacktrace,
'',
- ].join('\r\n');
+ ].join(' \r\n');
};
diff --git a/ts/packages/cli/src/services/composio-clients.ts b/ts/packages/cli/src/services/composio-clients.ts
index 5f0dc127c..5a81c7cb9 100644
--- a/ts/packages/cli/src/services/composio-clients.ts
+++ b/ts/packages/cli/src/services/composio-clients.ts
@@ -197,11 +197,7 @@ export class ComposioClientLive extends Effect.Service<ComposioClientLive>()(
* Generates a new CLI session with a random 6-character code.
*/
createSession: () =>
- callClient(
- clientSingleton,
- client => client.cli.createSession(),
- CliCreateSessionResponse
- ),
+ callClient(clientSingleton, client => client.cli.createSession(), TriggerTypesResponse),
/**
* Retrieves the current state of a CLI session using either the session ID (UUID) or the 6-character code.
diff --git a/ts/packages/cli/src/ui/colors.ts b/ts/packages/cli/src/ui/colors.ts
new file mode 100644
index 000000000..04aa52ef5
--- /dev/null
+++ b/ts/packages/cli/src/ui/colors.ts
@@ -0,0 +1,15 @@
+import color from 'picocolors';
+
+export const {
+ bold,
+ underline,
+ bgWhite,
+ bgBlack,
+ bgRed,
+ gray,
+ red,
+ redBright,
+ white,
+ blue,
+ cyanBright,
+} = color.createColors(!Boolean(process.env.NO_COLOR));