fix: prevent subcommands from showing root-level commands in help output#730
Merged
Merged
Conversation
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Contributor
🤖 Devin AI EngineerI'll be helping with this pull request! Here's what you should know: ✅ I will automatically:
Note: I can only respond to comments from users who have write access to this repository. ⚙️ Control Options:
|
erangeles
approved these changes
Jun 30, 2026
erangeles
approved these changes
Jun 30, 2026
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
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.
Requirements
Related issues
Subcommands (
config,login,signup,setup) display root-level commands in their--helpoutput instead of their own subcommands/flags.Describe the solution you've provided
The root usage template in
getUsageTemplate()was hardcoded with all root-level commands and unconditionally inherited by child commands that didn't set their ownSetUsageTemplate().The fix adds a
{{if not .HasParent}}conditional so the hardcoded root commands list only renders for the root command. Child commands now get a dynamic template that:{{range .Commands}}(if any exist)Use "... [command] --help"footer only when subcommands existBefore:
After:
Describe alternatives you've considered
Setting
SubcommandUsageTemplate()explicitly on each affected command (config,login,signup,setup). This would work but is fragile — any new command added without its own template would have the same bug. The conditional approach in the root template is more robust.Additional context
The pre-existing
TestWhoAmI/without_configured_token_returns_helpful_errortest failure (nil pointer dereference inwhoami.go:93) is unrelated to this change — it reproduces onmain.Link to Devin session: https://app.devin.ai/sessions/f4752d6ac05c455ba24e7bfe270effb9
Requested by: @ffantl-ld
Note
Low Risk
Help text formatting only; no runtime behavior, auth, or API changes.
Overview
Subcommand
--helpno longer lists the root CLI’s hardcoded commands (setup,config,login, etc.) when you run help on children likeldcli config.getUsageTemplate()now renders the curated root command list only when{{if not .HasParent}}. Child commands use a separate branch that shows Available Commands from Cobra’s.Commands, local flags, global inherited flags, and the standard “use … --help” hint only when subcommands exist.Reviewed by Cursor Bugbot for commit f7c6d22. Bugbot is set up for automated code reviews on this repo. Configure here.