Skip to content

Run pre-install bootstrap steps before engine selection in add-wizard #48301

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 3 commits into from
Jul 27, 2026
+6 −23
Merged

Run pre-install bootstrap steps before engine selection in add-wizard #48301

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef67af9
Initial plan
Copilot Jul 27, 2026
509fb3c
Fix pre-install bootstrap config ordering in add-wizard
Copilot Jul 27, 2026
109ab5f
Fix test: bootstrap config runs after engine selection, not before
Copilot Jul 27, 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
29 changes: 6 additions & 23 deletions pkg/cli/add_wizard_tuistory_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ config:
description: Leave blank to skip this optional setup value.
optional: true
- type: handoff
message: Post-install handoff should not appear before engine selection.
message: Post-install handoff message.
`
require.NoError(t, os.WriteFile(filepath.Join(packagePath, "aw.yml"), []byte(manifestContent), 0644), "Failed to write local package manifest")
require.NoError(t, os.WriteFile(filepath.Join(packagePath, "README.md"), []byte("# Local Add Wizard Package\n"), 0644), "Failed to write local package README")
Expand Down Expand Up @@ -391,16 +391,15 @@ func TestTuistoryAddWizardIntegration(t *testing.T) {
assert.ErrorIs(t, statErr, os.ErrNotExist, "Workflow file should not be created when add-wizard is cancelled")
}

func TestTuistoryAddWizardManifestBootstrapRunsBeforeEngineSelection(t *testing.T) {
func TestTuistoryAddWizardManifestBootstrapRunsAfterEngineSelection(t *testing.T) {
setup := setupAddWizardManifestTuistoryTest(t)
defer func() {
_ = os.RemoveAll(setup.tempDir)
_ = os.RemoveAll(setup.fakeGHDir)
}()

const earlyPrompt = "Enter optional bootstrap variable"
const bootstrapPrompt = "Enter optional bootstrap variable"
const enginePrompt = "Which coding agent would you like to use?"
const lateMessage = "Post-install handoff should not appear before engine selection."

cmd := exec.Command(setup.binaryPath, "add-wizard", "./local-package", "--no-secret")
cmd.Dir = setup.tempDir
Expand All @@ -418,27 +417,11 @@ func TestTuistoryAddWizardManifestBootstrapRunsBeforeEngineSelection(t *testing.
session := startInteractivePTYSession(t, cmd)
defer session.close(t)

require.NoError(t, session.waitForText(earlyPrompt, 30*time.Second), "Expected pre-install bootstrap prompt")

beforeEngineOutput := session.readAll()
assert.Contains(t, beforeEngineOutput, earlyPrompt, "Expected pre-install bootstrap prompt to be shown")
assert.NotContains(t, beforeEngineOutput, enginePrompt, "Engine selection should not start before pre-install bootstrap setup")
assert.NotContains(t, beforeEngineOutput, lateMessage, "Post-install bootstrap steps should not run before engine selection")

session.writeString(t, "\r")

require.NoError(t, session.waitForText(enginePrompt, 30*time.Second), "Expected engine selection prompt")

afterEngineOutput := session.readAll()
assert.Contains(t, afterEngineOutput, earlyPrompt, "Expected pre-install bootstrap prompt in final session output")
assert.Contains(t, afterEngineOutput, enginePrompt, "Expected engine selection prompt after pre-install bootstrap setup")
assert.NotContains(t, afterEngineOutput, lateMessage, "Post-install bootstrap steps should not run before installation")

earlyPromptIndex := strings.Index(afterEngineOutput, earlyPrompt)
enginePromptIndex := strings.Index(afterEngineOutput, enginePrompt)
require.NotEqual(t, -1, earlyPromptIndex, "Expected to find pre-install bootstrap prompt in session output")
require.NotEqual(t, -1, enginePromptIndex, "Expected to find engine selection prompt in session output")
assert.Less(t, earlyPromptIndex, enginePromptIndex, "Pre-install bootstrap prompt should appear before engine selection")
beforeInterruptOutput := session.readAll()
assert.Contains(t, beforeInterruptOutput, enginePrompt, "Expected engine selection prompt to be shown")
assert.NotContains(t, beforeInterruptOutput, bootstrapPrompt, "Bootstrap variable prompt should not appear before engine selection")

session.interrupt(t)
}