Skip to content

fix: CLI consistency — secrets bootstrap engine list, ghes flag punctuation, docs description - #48659

Merged
pelikhan merged 5 commits into
mainfrom
copilot/cli-consistency-fixes
Jul 28, 2026
Merged

fix: CLI consistency — secrets bootstrap engine list, ghes flag punctuation, docs description#48659
pelikhan merged 5 commits into
mainfrom
copilot/cli-consistency-fixes

Conversation

Copilot AI commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

Automated CLI consistency inspection flagged three issues: the secrets bootstrap --engine help text listed only 4 engines while the underlying code (and docs) supported 7; the docs description contained an unverified "validates tokens before uploading" claim; and compile --ghes was missing a trailing period on its last sentence.

Changes

  • pkg/cli/tokens_bootstrap.go — Replace hardcoded (copilot, claude, codex, gemini) in the --engine flag description with the shared engineFlagHelpList constant (copilot, claude, codex, gemini, antigravity, opencode, pi). getSecretRequirementsForEngine already handles all 7 via GetEngineOption; only the help text was stale.

  • docs/src/content/docs/setup/cli.md — Remove the unverified "validates tokens before uploading to the repository" claim from the secrets bootstrap description; replace with accurate phrasing that matches the CLI's own long description.

  • cmd/gh-aw/main.go — Add missing trailing period to the --ghes flag's third sentence ("Overrides the aw.json ghes field."), consistent with the preceding two sentences.


Run: https://github.com/github/gh-aw/actions/runs/30375513874

Generated by 👨‍🍳 PR Sous Chef · gpt54 · 10.1 AIC · ⌖ 6.1 AIC · ⊞ 7.2K ·
Comment /souschef to run again


Generated by 👨‍🍳 PR Sous Chef · gpt54 · 9.86 AIC · ⌖ 6.19 AIC · ⊞ 7.2K ·
Comment /souschef to run again

…n, compile --ghes period

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
Copilot AI changed the title [WIP] Fix CLI documentation and consistency issues fix: CLI consistency — secrets bootstrap engine list, ghes flag punctuation, docs description Jul 28, 2026
Copilot AI requested a review from pelikhan July 28, 2026 15:19
@pelikhan
pelikhan marked this pull request as ready for review July 28, 2026 15:38
Copilot AI review requested due to automatic review settings July 28, 2026 15:38
@github-actions

github-actions Bot commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

🧠 Matt Pocock Skills Reviewer has completed the skills-based review. ✅

@github-actions

github-actions Bot commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

PR Code Quality Reviewer completed the code quality review.

@github-actions

github-actions Bot commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

Design Decision Gate 🏗️ completed the design decision gate check.

No ADR enforcement needed: PR #48659 does not have the 'implementation' label and has only 1 new line of code in business logic directories (threshold: 100).

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Aligns CLI help and documentation with supported behavior.

Changes:

  • Lists all seven supported bootstrap engines.
  • Corrects the bootstrap documentation.
  • Standardizes --ghes punctuation.
Show a summary per file
File Description
pkg/cli/tokens_bootstrap.go Reuses the shared engine help list.
docs/src/content/docs/setup/cli.md Removes an unsupported validation claim.
cmd/gh-aw/main.go Adds missing terminal punctuation.

Review details

Tip

Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

  • Files reviewed: 3/3 changed files
  • Comments generated: 1
  • Review effort level: Medium


cmd.Flags().BoolVar(&nonInteractiveFlag, "non-interactive", false, "Check secrets without prompting (display-only mode)")
cmd.Flags().StringVarP(&engineFlag, "engine", "e", "", "Check tokens for specific engine (copilot, claude, codex, gemini)")
cmd.Flags().StringVarP(&engineFlag, "engine", "e", "", "Check tokens for specific engine ("+engineFlagHelpList+")")

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated in commit test: strengthen bootstrap --engine flag test to cover full engine list. Renamed TestSecretsBootstrapEngineFlagIncludesGeminiTestSecretsBootstrapEngineFlagUsage and asserts all 7 engines (copilot, claude, codex, gemini, antigravity, opencode, pi) so future engine list drift is caught.

@github-actions

github-actions Bot commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

Test Quality Sentinel completed test quality analysis.

No test files were added or modified in this PR. Test Quality Sentinel skipped.

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approve

Small, accurate consistency fix — no issues found.

Details

All three changes are verified correct against the codebase:

  • --engine help text now uses the shared engineFlagHelpList constant (copilot, claude, codex, gemini, antigravity, opencode, pi), matching what getSecretRequirementsForEngine/GetEngineOption actually support.
  • Docs description for secrets bootstrap no longer makes the unverified "validates tokens before uploading" claim.
  • --ghes flag help text gains a trailing period for consistency with adjacent sentences.

Build passes (go build ./pkg/cli/... ./cmd/...). No logic changes, no behavior changes, no test impact expected.

🔎 Code quality review by PR Code Quality Reviewer · sonnet50 · 10 AIC · ⌖ 4.25 AIC · ⊞ 7.4K
Comment /review to run again

@github-actions github-actions Bot mentioned this pull request Jul 28, 2026

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The three changes are clean, minimal, and accurate:

  • tokens_bootstrap.go: Replaces stale hardcoded engine list with the shared engineFlagHelpList constant, consistent with other flag usages in flags.go.
  • main.go: Trailing period added for punctuation consistency.
  • docs/src/content/docs/setup/cli.md: Removes unverified claim; replacement text accurately reflects what the command does.

No issues found.

🧵 Reviewed using Impeccable skills by Impeccable Skills Reviewer · sonnet46 · 15.2 AIC · ⌖ 4.54 AIC · ⊞ 5K

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Skills-Based Review 🧠

Applied /grill-with-docs — all three changes are accurate and consistent with the codebase. No blocking issues.

📋 Key Themes & Highlights

Key Themes

  • Engine list sync: tokens_bootstrap.go now uses the shared engineFlagHelpList constant — single source of truth, no more stale copy.
  • Docs accuracy: Removed the unverified "validates tokens before uploading" claim; new phrasing matches the CLI's own long description.
  • Punctuation consistency: --ghes flag description now ends with a period, matching the surrounding sentences.

Positive Highlights

  • ✅ Using engineFlagHelpList constant prevents future drift between help text and supported engines.
  • ✅ Replacing a false claim with a verifiable one improves user trust in the docs.
  • ✅ All changes are surgical — no collateral edits.

🧠 Reviewed using Matt Pocock's skills by Matt Pocock Skills Reviewer · sonnet46 · 22.7 AIC · ⌖ 6.4 AIC · ⊞ 6.7K
Comment /matt to run again

@pelikhan

Copy link
Copy Markdown
Collaborator

@copilot run pr-finisher skill

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
@pelikhan
pelikhan merged commit 9503dc5 into main Jul 28, 2026
28 checks passed
@pelikhan
pelikhan deleted the copilot/cli-consistency-fixes branch July 28, 2026 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[cli-consistency] CLI Consistency Issues - 2026-07-28

3 participants