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): move py and ts under generate command

Rahul Tarake706fe576377
diff --git a/ts/packages/cli/src/commands/generate/generate-py.cmd.ts b/ts/packages/cli/src/commands/generate/generate-py.cmd.ts
new file mode 100644
index 000000000..5c23e51b0
--- /dev/null
+++ b/ts/packages/cli/src/commands/generate/generate-py.cmd.ts
@@ -0,0 +1,10 @@
+import { Command } from '@effect/cli';
+import { generatePythonTypeStubs, outputOpt, toolkitsOpt } from '../py/commands/py.generate.cmd';
+
+/**
+ * `composio generate py` — Generate Python type stubs.
+ */
+export const generateCmd$Py = Command.make('py', { outputOpt, toolkitsOpt }).pipe(
+ Command.withDescription('Generate Python type stubs for toolkits, tools, and triggers.'),
+ Command.withHandler(generatePythonTypeStubs)
+);
diff --git a/ts/packages/cli/src/commands/generate/generate-ts.cmd.ts b/ts/packages/cli/src/commands/generate/generate-ts.cmd.ts
new file mode 100644
index 000000000..a77eed7f2
--- /dev/null
+++ b/ts/packages/cli/src/commands/generate/generate-ts.cmd.ts
@@ -0,0 +1,31 @@
+import { Command } from '@effect/cli';
+import { Option } from 'effect';
+import {
+ generateTypescriptTypeStubs,
+ outputOpt,
+ compact,
+ transpiled,
+ typeTools,
+ toolkitsOpt,
+} from '../ts/commands/ts.generate.cmd';
+
+/**
+ * `composio generate ts` — Generate TypeScript type stubs.
+ */
+export const generateCmd$Ts = Command.make('ts', {
+ outputOpt,
+ compact,
+ transpiled,
+ typeTools,
+ toolkitsOpt,
+}).pipe(
+ Command.withDescription('Generate TypeScript type stubs for toolkits, tools, and triggers.'),
+ Command.withHandler(params => {
+ const shouldCompile = params.transpiled || !Option.isSome(params.outputOpt);
+ return generateTypescriptTypeStubs({
+ ...params,
+ compact: params.compact,
+ transpiled: shouldCompile,
+ });
+ })
+);
diff --git a/ts/packages/cli/src/commands/generate.cmd.ts b/ts/packages/cli/src/commands/generate/generate.cmd.ts
similarity index 77%
rename from ts/packages/cli/src/commands/generate.cmd.ts
rename to ts/packages/cli/src/commands/generate/generate.cmd.ts
index 4a8329060..bbf3c2694 100644
--- a/ts/packages/cli/src/commands/generate.cmd.ts
+++ b/ts/packages/cli/src/commands/generate/generate.cmd.ts
@@ -3,8 +3,10 @@ import { Effect, Match } from 'effect';
import { ProjectEnvironmentDetector } from 'src/services/project-environment-detector';
import { NodeProcess } from 'src/services/node-process';
import { TerminalUI } from 'src/services/terminal-ui';
-import { generateTypescriptTypeStubs } from './ts/commands/ts.generate.cmd';
-import { generatePythonTypeStubs } from './py/commands/py.generate.cmd';
+import { generateTypescriptTypeStubs } from '../ts/commands/ts.generate.cmd';
+import { generatePythonTypeStubs } from '../py/commands/py.generate.cmd';
+import { generateCmd$Py } from './generate-py.cmd';
+import { generateCmd$Ts } from './generate-ts.cmd';
export const outputOpt = Options.optional(
Options.directory('output-dir', {
@@ -27,9 +29,17 @@ export const toolkitsOpt = Options.text('toolkits').pipe(
);
/**
+ * CLI entry point for code generation commands.
+ *
+ * When invoked without a subcommand, auto-detects the project language.
+ * Subcommands `py` and `ts` allow explicit language selection.
+ *
* @example
* ```bash
- * composio generate <command>
+ * composio generate
+ * composio generate py
+ * composio generate ts
+ * composio generate ts --type-tools
* ```
*/
export const generateCmd = Command.make('generate', { outputOpt, typeTools, toolkitsOpt }).pipe(
@@ -48,7 +58,6 @@ export const generateCmd = Command.make('generate', { outputOpt, typeTools, tool
const displayLang = env.kind === 'js' ? 'TypeScript' : 'Python';
yield* ui.log.step(`Project type detected: ${displayLang}`);
- // Redirect to either `ts generate` or `py generate` commands
yield* Match.value(env.kind).pipe(
Match.when('js', () =>
generateTypescriptTypeStubs({
@@ -63,5 +72,6 @@ export const generateCmd = Command.make('generate', { outputOpt, typeTools, tool
Match.exhaustive
);
})
- )
+ ),
+ Command.withSubcommands([generateCmd$Py, generateCmd$Ts])
);
diff --git a/ts/packages/cli/src/commands/index.ts b/ts/packages/cli/src/commands/index.ts
index 443f3a194..298fc622e 100644
--- a/ts/packages/cli/src/commands/index.ts
+++ b/ts/packages/cli/src/commands/index.ts
@@ -10,9 +10,7 @@ import { loginCmd } from './login.cmd';
import { logoutCmd } from './logout.cmd';
import { installCmd } from './install.cmd';
import { initCmd } from './init.cmd';
-import { pyCmd } from './py/py.cmd';
-import { tsCmd } from './ts/ts.cmd';
-import { generateCmd } from './generate.cmd';
+import { generateCmd } from './generate/generate.cmd';
import { manageCmd } from './manage/manage.cmd';
import { showToolsExecuteInputHelp } from './tools/commands/tools.execute.cmd';
import { printRootHelp } from './root-help';
@@ -27,12 +25,9 @@ const $cmd = $defaultCmd.pipe(
installCmd,
initCmd,
generateCmd,
- pyCmd,
- tsCmd,
manageCmd,
])
);
-
export const rootCommand = $cmd;
const parseExecuteInputHelpSlug = (argv: ReadonlyArray<string>): string | undefined => {