chore: refactor cli() function to reduce line count #6272
+773
−826
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Split the main CLI function into smaller, well-named helper functions: - get_command_name(): Extract command name for telemetry - handle_mcp_command(): MCP server dispatch - handle_session_subcommand(): Session list/remove/export/diagnostics - handle_interactive_session(): Interactive session with telemetry - log_session_completion(): Shared session completion logging - parse_run_input(): Parse run command input sources - handle_run_command(): Execute run command - handle_schedule_command(): Schedule subcommand dispatch - handle_bench_command(): Benchmark subcommand dispatch - handle_recipe_subcommand(): Recipe subcommand dispatch - handle_term_subcommand(): Terminal subcommand dispatch - handle_default_session(): Default session when no command Introduced structs to avoid too_many_arguments clippy warnings: - InteractiveSessionArgs - RunCommandArgs - ParseRunInputArgs The cli() function is now 131 lines, well under the 200 line target.
Contributor
There was a problem hiding this comment.
Pull request overview
This PR successfully refactors the monolithic cli() function from 557 lines to 131 lines by extracting command handling logic into focused helper functions. The refactoring maintains all existing behavior while significantly improving code maintainability.
Key changes:
- Extracted 12 helper functions for different command handlers (MCP, session, run, schedule, bench, recipe, term, etc.)
- Introduced 3 parameter structs (
InteractiveSessionArgs,RunCommandArgs,ParseRunInputArgs) to avoid clippy'stoo_many_argumentswarnings - Simplified the main
cli()function to a clean match statement that delegates to specialized handlers
Collaborator
Author
|
this PR is auto generated and will be refined. will move out of draft when ready for human review |
- Merge InputSource and RecipeOptions into InputOptions - Create shared SessionOptions and ExtensionOptions for Session/Run commands - Create Run-specific structs: OutputOptions, ModelOptions, RunBehavior - Remove internal-only structs: InteractiveSessionArgs, RunCommandArgs, ParseRunInputArgs - Reduce handle_run_command from 11 args to 7 struct args
baxen
changed the title
DOsinga
approved these changes
Jan 5, 2026
| retry_config: recipe_info.as_ref().and_then(|r| r.retry_config.clone()), | ||
| output_format: output_opts.output_format, | ||
| }) | ||
| .await; |
Collaborator
There was a problem hiding this comment.
probably not for now, but we should really use a, eh, builder pattern for build_session(SessionBuilderConfig
alexhancock
approved these changes
Jan 5, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Refactors the main
cli()function incrates/goose-cli/src/cli.rsby:#[command(flatten)]patternChanges
Helper Functions
Split the monolithic
cli()function into smaller, well-named helper functions:get_command_name(): Extract command name for telemetryhandle_mcp_command(): MCP server dispatchhandle_session_subcommand(): Session list/remove/export/diagnosticshandle_interactive_session(): Interactive session with telemetrylog_session_completion(): Shared session completion loggingparse_run_input(): Parse run command input sourceshandle_run_command(): Execute run commandhandle_schedule_command(): Schedule subcommand dispatchhandle_bench_command(): Benchmark subcommand dispatchhandle_recipe_subcommand(): Recipe subcommand dispatchhandle_term_subcommand(): Terminal subcommand dispatchhandle_default_session(): Default session when no commandOption Structs
Consolidated related arguments into logical groupings:
SessionOptionsdebug,max_tool_repetitions,max_turnsExtensionOptionsextensions,remote_extensions,streamable_http_extensions,builtinsInputOptionsinstructions,input_text,recipe,system,params,additional_sub_recipes,explain,render_recipeOutputOptionsquiet,output_formatModelOptionsprovider,modelRunBehaviorinteractive,no_session,resume,scheduled_job_idBenefits
SessionOptionsandExtensionOptionsare shared between Session and Run commandshandle_run_commandreduced from 11 args to 7 struct argsTesting
cargo test -p goose-cli)Related
Part of TSK-696: Simplify clippy baseline system