Skip to content

Fix trial_confirmation.go sub-step bullets to use console.FormatListItemStderr #43588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelikhan merged 6 commits into from
Jul 5, 2026
+33 −27
Merged

Fix trial_confirmation.go sub-step bullets to use console.FormatListItemStderr #43588

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb8583d
Initial plan
Copilot Jul 5, 2026
92c6e89
fix: replace raw fmt.Fprintf sub-step bullets with console.FormatList…
Copilot Jul 5, 2026
c981672
Merge branch 'main' into copilot/fix-trial-confirmation-sub-steps
github-actions[bot] Jul 5, 2026
936f59c
fix stderr-aware trial confirmation steps
Copilot Jul 5, 2026
be29992
Plan PR finish-up
Copilot Jul 5, 2026
f386186
Merge remote-tracking branch 'origin/main' into copilot/fix-trial-con…
Copilot Jul 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 33 additions & 27 deletions pkg/cli/trial_confirmation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ import (

var trialConfirmationLog = logger.New("cli:trial_confirmation")

const trialNestedListIndent = " "

func formatTrialNestedListItem(item string) string {
return trialNestedListIndent + console.FormatListItemStderr(item)
}

// trialConfirmationOptions holds parameters for showTrialConfirmation.
type trialConfirmationOptions struct {
parsedSpecs []*WorkflowSpec
Expand Down Expand Up @@ -132,93 +138,93 @@ func showTrialConfirmation(opts trialConfirmationOptions) error {
// Step 1: Repository creation/reuse
stepNum := 1
if hostRepoExists && opts.forceDeleteHostRepo {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Delete and recreate host repository\n"), stepNum)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Delete and recreate host repository\n"), stepNum)
} else if hostRepoExists {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Reuse existing host repository\n"), stepNum)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Reuse existing host repository\n"), stepNum)
} else {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Create a private host repository\n"), stepNum)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Create a private host repository\n"), stepNum)
}
stepNum++

// Step 2: Clone contents (only in clone-repo mode)
if opts.cloneRepoSlug != "" {
if hostRepoExists && !opts.forceDeleteHostRepo {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Force push contents from %s (overwriting existing content)\n"), stepNum, opts.cloneRepoSlug)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Force push contents from %s (overwriting existing content)\n"), stepNum, opts.cloneRepoSlug)
} else {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Clone contents from %s\n"), stepNum, opts.cloneRepoSlug)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Clone contents from %s\n"), stepNum, opts.cloneRepoSlug)
}
stepNum++

// Show that workflows will be disabled
if len(opts.parsedSpecs) == 1 {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Disable all workflows in cloned repository except %s\n"), stepNum, opts.parsedSpecs[0].WorkflowName)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Disable all workflows in cloned repository except %s\n"), stepNum, opts.parsedSpecs[0].WorkflowName)
} else {
workflowNames := sliceutil.Map(opts.parsedSpecs, func(spec *WorkflowSpec) string { return spec.WorkflowName })
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Disable all workflows in cloned repository except: %s\n"), stepNum, strings.Join(workflowNames, ", "))
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Disable all workflows in cloned repository except: %s\n"), stepNum, strings.Join(workflowNames, ", "))
}
stepNum++
}

// Step 3/2: Install and compile workflows
if len(opts.parsedSpecs) == 1 {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Install and compile %s\n"), stepNum, opts.parsedSpecs[0].WorkflowName)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Install and compile %s\n"), stepNum, opts.parsedSpecs[0].WorkflowName)
} else {
workflowNames := sliceutil.Map(opts.parsedSpecs, func(spec *WorkflowSpec) string { return spec.WorkflowName })
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Install and compile: %s\n"), stepNum, strings.Join(workflowNames, ", "))
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Install and compile: %s\n"), stepNum, strings.Join(workflowNames, ", "))
}
stepNum++

// Step: Configure secrets (only when engine override is specified)
if opts.engineOverride != "" {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Ensure %s API key secret is configured\n"), stepNum, opts.engineOverride)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Ensure %s API key secret is configured\n"), stepNum, opts.engineOverride)
stepNum++
}

// Step 5/4: Execute workflows and auto-merge (repeated if --repeat is used)
if len(opts.parsedSpecs) == 1 {
workflowName := opts.parsedSpecs[0].WorkflowName
if opts.repeatCount > 0 && opts.autoMergePRs {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. For each of %d executions:\n"), stepNum, opts.repeatCount+1)
fmt.Fprintf(os.Stderr, " a. Execute %s\n", workflowName)
fmt.Fprintf(os.Stderr, " b. Auto-merge any pull requests created during execution\n")
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. For each of %d executions:\n"), stepNum, opts.repeatCount+1)
fmt.Fprintln(os.Stderr, formatTrialNestedListItem("Execute "+workflowName))
fmt.Fprintln(os.Stderr, formatTrialNestedListItem("Auto-merge any pull requests created during execution"))
} else if opts.repeatCount > 0 {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Execute %s %d times\n"), stepNum, workflowName, opts.repeatCount+1)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Execute %s %d times\n"), stepNum, workflowName, opts.repeatCount+1)
} else if opts.autoMergePRs {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Execute %s\n"), stepNum, workflowName)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Execute %s\n"), stepNum, workflowName)
stepNum++
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Auto-merge any pull requests created during execution\n"), stepNum)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Auto-merge any pull requests created during execution\n"), stepNum)
} else {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Execute %s\n"), stepNum, workflowName)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Execute %s\n"), stepNum, workflowName)
}
} else {
workflowNames := sliceutil.Map(opts.parsedSpecs, func(spec *WorkflowSpec) string { return spec.WorkflowName })
workflowList := strings.Join(workflowNames, ", ")

if opts.repeatCount > 0 && opts.autoMergePRs {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. For each of %d executions:\n"), stepNum, opts.repeatCount+1)
fmt.Fprintf(os.Stderr, " a. Execute: %s\n", workflowList)
fmt.Fprintf(os.Stderr, " b. Auto-merge any pull requests created during execution\n")
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. For each of %d executions:\n"), stepNum, opts.repeatCount+1)
fmt.Fprintln(os.Stderr, formatTrialNestedListItem("Execute: "+workflowList))
fmt.Fprintln(os.Stderr, formatTrialNestedListItem("Auto-merge any pull requests created during execution"))
} else if opts.repeatCount > 0 {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Execute %d times: %s\n"), stepNum, opts.repeatCount+1, workflowList)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Execute %d times: %s\n"), stepNum, opts.repeatCount+1, workflowList)
} else if opts.autoMergePRs {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Execute: %s\n"), stepNum, workflowList)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Execute: %s\n"), stepNum, workflowList)
stepNum++
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Auto-merge any pull requests created during execution\n"), stepNum)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Auto-merge any pull requests created during execution\n"), stepNum)
} else {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Execute: %s\n"), stepNum, workflowList)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Execute: %s\n"), stepNum, workflowList)
}
}
stepNum++

// Final step: Delete/preserve repository
if opts.deleteHostRepo {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Delete the host repository\n"), stepNum)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Delete the host repository\n"), stepNum)
} else {
fmt.Fprintf(os.Stderr, console.FormatInfoMessage(" %d. Preserve the host repository for inspection\n"), stepNum)
fmt.Fprintf(os.Stderr, console.FormatInfoMessageStderr(" %d. Preserve the host repository for inspection\n"), stepNum)
}

fmt.Fprintln(os.Stderr, "")
fmt.Fprintln(os.Stderr, console.FormatInfoMessage("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"))
fmt.Fprintln(os.Stderr, console.FormatInfoMessageStderr("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"))
fmt.Fprintln(os.Stderr, "")

// Ask for confirmation using console helper
Expand Down
Loading