extended automation command to include Space

benPearce1 · benPearce1 · commit 275d213fa077 · 2026-04-07T14:51:11.000+10:00
diff --git a/pkg/cmd/account/aws/create/create.go b/pkg/cmd/account/aws/create/create.go
@@ -130,7 +130,7 @@ func CreateRun(opts *CreateOptions) error {
 	link := output.Bluef("%s/app#/%s/infrastructure/accounts/%s", opts.Host, opts.Space.GetID(), createdAccount.GetID())
 	fmt.Fprintf(opts.Out, "\nView this account on Octopus Deploy: %s\n", link)
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.AccessKey, opts.SecretKey, opts.Region, opts.Description, opts.Environments)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.AccessKey, opts.SecretKey, opts.Region, opts.Description, opts.Environments)
 		fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)
 	}
 
diff --git a/pkg/cmd/account/azure-oidc/create/create.go b/pkg/cmd/account/azure-oidc/create/create.go
@@ -215,6 +215,7 @@ func CreateRun(opts *CreateOptions) error {
 	if !opts.NoPrompt {
 		autoCmd := flag.GenerateAutomationCmd(
 			opts.CmdPath,
+			opts.GetSpaceNameOrEmpty(),
 			opts.Name,
 			opts.Description,
 			opts.Environments,
diff --git a/pkg/cmd/account/azure/create/create.go b/pkg/cmd/account/azure/create/create.go
@@ -203,6 +203,7 @@ func CreateRun(opts *CreateOptions) error {
 	if !opts.NoPrompt {
 		autoCmd := flag.GenerateAutomationCmd(
 			opts.CmdPath,
+			opts.GetSpaceNameOrEmpty(),
 			opts.Name,
 			opts.Description,
 			opts.Environments,
diff --git a/pkg/cmd/account/gcp/create/create.go b/pkg/cmd/account/gcp/create/create.go
@@ -139,7 +139,7 @@ func CreateRun(opts *CreateOptions) error {
 	link := output.Bluef("%s/app#/%s/infrastructure/accounts/%s", opts.Host, opts.Space.GetID(), createdAccount.GetID())
 	_, _ = fmt.Fprintf(opts.Out, "\nView this account on Octopus Deploy: %s\n", link)
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.KeyFilePath, opts.Description, opts.Environments)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.KeyFilePath, opts.Description, opts.Environments)
 		_, _ = fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)
 	}
 	return nil
diff --git a/pkg/cmd/account/generic-oidc/create/create.go b/pkg/cmd/account/generic-oidc/create/create.go
@@ -132,6 +132,7 @@ func CreateRun(opts *CreateOptions) error {
 	if !opts.NoPrompt {
 		autoCmd := flag.GenerateAutomationCmd(
 			opts.CmdPath,
+			opts.GetSpaceNameOrEmpty(),
 			opts.Name,
 			opts.Description,
 			opts.Environments,
diff --git a/pkg/cmd/account/ssh/create/create.go b/pkg/cmd/account/ssh/create/create.go
@@ -148,7 +148,7 @@ func CreateRun(opts *CreateOptions) error {
 	link := output.Bluef("%s/app#/%s/infrastructure/accounts/%s", opts.Host, opts.Space.GetID(), createdAccount.GetID())
 	_, _ = fmt.Fprintf(opts.Out, "\nView this account on Octopus Deploy: %s\n", link)
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.KeyFilePath, opts.Passphrase, opts.Description, opts.Environments)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.KeyFilePath, opts.Passphrase, opts.Description, opts.Environments)
 		_, _ = fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)
 	}
 	return nil
diff --git a/pkg/cmd/account/token/create/create.go b/pkg/cmd/account/token/create/create.go
@@ -126,7 +126,7 @@ func CreateRun(opts *CreateOptions) error {
 	link := output.Bluef("%s/app#/%s/infrastructure/accounts/%s", opts.Host, opts.Space.GetID(), createdAccount.GetID())
 	_, _ = fmt.Fprintf(opts.Out, "\nView this account on Octopus Deploy: %s\n", link)
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.Token, opts.Description, opts.Environments)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.Token, opts.Description, opts.Environments)
 		_, _ = fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)
 	}
 	return nil
diff --git a/pkg/cmd/account/username/create/create.go b/pkg/cmd/account/username/create/create.go
@@ -131,7 +131,7 @@ func CreateRun(opts *CreateOptions) error {
 	link := output.Bluef("%s/app#/%s/infrastructure/accounts/%s", opts.Host, opts.Space.GetID(), createdAccount.GetID())
 	_, _ = fmt.Fprintf(opts.Out, "\nView this account on Octopus Deploy: %s\n", link)
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.Username, opts.Password, opts.Description, opts.Environments)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.Username, opts.Password, opts.Description, opts.Environments)
 		_, _ = fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)
 	}
 	return nil
diff --git a/pkg/cmd/buildinformation/upload/upload.go b/pkg/cmd/buildinformation/upload/upload.go
@@ -158,7 +158,7 @@ func uploadRun(opts *UploadOptions) error {
 	}
 
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.PackageId, opts.Version, opts.File, opts.OverwriteMode)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.PackageId, opts.Version, opts.File, opts.OverwriteMode)
 		fmt.Fprintf(opts.Out, "%s\n", autoCmd)
 	}
 
diff --git a/pkg/cmd/channel/create/create.go b/pkg/cmd/channel/create/create.go
@@ -123,7 +123,7 @@ func createRun(opts *CreateOptions) error {
 	fmt.Fprintf(opts.Out, "View this channel on Octopus Deploy: %s\n", link)
 
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.Project, opts.Description, opts.Default, opts.Lifecycle)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.Project, opts.Description, opts.Default, opts.Lifecycle)
 		fmt.Fprintf(opts.Out, "%s\n", autoCmd)
 	}
 
diff --git a/pkg/cmd/dependencies.go b/pkg/cmd/dependencies.go
@@ -56,6 +56,13 @@ func newDependencies(f factory.Factory, cmd *cobra.Command, client *client.Clien
 	}
 }
 
+func (d *Dependencies) GetSpaceNameOrEmpty() string {
+	if d.Space != nil {
+		return d.Space.GetName()
+	}
+	return ""
+}
+
 func NewDependenciesFromExisting(opts *Dependencies, cmdPath string) *Dependencies {
 	return &Dependencies{
 		Ask:               opts.Ask,
diff --git a/pkg/cmd/environment/create/create.go b/pkg/cmd/environment/create/create.go
@@ -124,7 +124,7 @@ func createRun(opts *CreateOptions) error {
 	fmt.Fprintf(opts.Out, "View this environment on Octopus Deploy: %s\n", link)
 
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.Description, opts.GuidedFailureMode, opts.DynamicInfrastructure, opts.Tag)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.Description, opts.GuidedFailureMode, opts.DynamicInfrastructure, opts.Tag)
 		fmt.Fprintf(opts.Out, "%s\n", autoCmd)
 	}
 
diff --git a/pkg/cmd/environment/tag/tag_opts.go b/pkg/cmd/environment/tag/tag_opts.go
@@ -61,7 +61,7 @@ func (to *TagOptions) Commit() error {
 
 func (to *TagOptions) GenerateAutomationCmd() {
 	if !to.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(to.CmdPath, to.Environment, to.Tag)
+		autoCmd := flag.GenerateAutomationCmd(to.CmdPath, to.GetSpaceNameOrEmpty(), to.Environment, to.Tag)
 		fmt.Fprintf(to.Out, "%s\n", autoCmd)
 	}
 }
diff --git a/pkg/cmd/ephemeralenvironment/create/create.go b/pkg/cmd/ephemeralenvironment/create/create.go
@@ -132,7 +132,7 @@ func createRun(opts *CreateOptions) error {
 	fmt.Fprintf(opts.Out, "View this ephemeral environment for project `%s` on Octopus Deploy: %s\n", opts.Project.Value, link)
 
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.Project)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.Project)
 		fmt.Fprintf(opts.Out, "%s\n", autoCmd)
 	}
 
diff --git a/pkg/cmd/ephemeralenvironment/deprovision-environment/deprovision_environment.go b/pkg/cmd/ephemeralenvironment/deprovision-environment/deprovision_environment.go
@@ -110,7 +110,7 @@ func DeprovisionEnvironmentRun(deprovisionEnvironmentOptions *DeprovisionEnviron
 	util.OutputDeprovisionResult(message, command, response.DeprovisioningRuns)
 
 	if !deprovisionEnvironmentOptions.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(deprovisionEnvironmentOptions.CmdPath, deprovisionEnvironmentOptions.Name)
+		autoCmd := flag.GenerateAutomationCmd(deprovisionEnvironmentOptions.CmdPath, deprovisionEnvironmentOptions.GetSpaceNameOrEmpty(), deprovisionEnvironmentOptions.Name)
 		fmt.Fprintf(command.OutOrStdout(), "\nAutomation Command: %s\n", autoCmd)
 	}
 
diff --git a/pkg/cmd/ephemeralenvironment/deprovision-project/deprovision_project.go b/pkg/cmd/ephemeralenvironment/deprovision-project/deprovision_project.go
@@ -170,7 +170,7 @@ func DeprovisionEphemeralEnvironmentProject(cmd *cobra.Command, opts *Deprovisio
 	util.OutputDeprovisionResult(message, cmd, runs)
 
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.Project)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.Project)
 		fmt.Fprintf(cmd.OutOrStdout(), "\nAutomation Command: %s\n", autoCmd)
 	}
 
diff --git a/pkg/cmd/package/nuget/create/create.go b/pkg/cmd/package/nuget/create/create.go
@@ -133,7 +133,7 @@ func createRun(cmd *cobra.Command, opts *NuPkgCreateOptions) error {
 
 	if !opts.NoPrompt {
 		autoCmd := flag.GenerateAutomationCmd(
-			opts.CmdPath,
+			opts.CmdPath, "",
 			opts.Author,
 			opts.Title,
 			opts.Description,
diff --git a/pkg/cmd/package/zip/create/create.go b/pkg/cmd/package/zip/create/create.go
@@ -63,7 +63,7 @@ func createRun(cmd *cobra.Command, opts *pack.PackageCreateOptions) error {
 
 	if !opts.NoPrompt {
 		autoCmd := flag.GenerateAutomationCmd(
-			opts.CmdPath,
+			opts.CmdPath, "",
 			opts.Id,
 			opts.Version,
 			opts.BasePath,
diff --git a/pkg/cmd/project/branch/create/create.go b/pkg/cmd/project/branch/create/create.go
@@ -104,7 +104,7 @@ func CreateRun(opts *CreateOptions) error {
 	_, err = fmt.Fprintf(opts.Out, "Successfully created branch '%s' (%s) in project '%s'\n", opts.Name.Value, newBranch.CanonicalName, project.GetName())
 
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Project, opts.Name, opts.BaseBranch)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Project, opts.Name, opts.BaseBranch)
 		fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)
 	}
 
diff --git a/pkg/cmd/project/clone/clone.go b/pkg/cmd/project/clone/clone.go
@@ -193,7 +193,7 @@ func (co *CloneOptions) Commit() error {
 
 func (co *CloneOptions) GenerateAutomationCmd() {
 	if !co.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(co.CmdPath, co.Name, co.Source, co.Group, co.Lifecycle)
+		autoCmd := flag.GenerateAutomationCmd(co.CmdPath, co.GetSpaceNameOrEmpty(), co.Name, co.Source, co.Group, co.Lifecycle)
 		fmt.Fprintf(co.Out, "%s\n", autoCmd)
 	}
 }
diff --git a/pkg/cmd/project/convert/convert.go b/pkg/cmd/project/convert/convert.go
@@ -220,7 +220,7 @@ func check(value string, defaultValue string) string {
 
 func (co *ConvertOptions) GenerateAutomationCmd() {
 	if !co.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(co.CmdPath, co.Project, co.GitStorage, co.GitBasePath, co.GitUrl, co.GitBranch, co.GitInitialCommitMessage, co.GitCredentials, co.GitUsername, co.GitPassword, co.GitInitialCommitBranch, co.GitProtectedBranchPatterns)
+		autoCmd := flag.GenerateAutomationCmd(co.CmdPath, co.GetSpaceNameOrEmpty(), co.Project, co.GitStorage, co.GitBasePath, co.GitUrl, co.GitBranch, co.GitInitialCommitMessage, co.GitCredentials, co.GitUsername, co.GitPassword, co.GitInitialCommitBranch, co.GitProtectedBranchPatterns)
 		fmt.Fprintf(co.Out, "%s\n", autoCmd)
 	}
 }
diff --git a/pkg/cmd/project/create/create_opts.go b/pkg/cmd/project/create/create_opts.go
@@ -83,7 +83,7 @@ func (co *CreateOptions) Commit() error {
 
 func (co *CreateOptions) GenerateAutomationCmd() {
 	if !co.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(co.CmdPath, co.Name, co.Description, co.Group, co.Lifecycle, co.Tag)
+		autoCmd := flag.GenerateAutomationCmd(co.CmdPath, co.GetSpaceNameOrEmpty(), co.Name, co.Description, co.Group, co.Lifecycle, co.Tag)
 		fmt.Fprintf(co.Out, "%s\n", autoCmd)
 	}
 }
diff --git a/pkg/cmd/project/tag/tag_opts.go b/pkg/cmd/project/tag/tag_opts.go
@@ -61,7 +61,7 @@ func (to *TagOptions) Commit() error {
 
 func (to *TagOptions) GenerateAutomationCmd() {
 	if !to.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(to.CmdPath, to.Project, to.Tag)
+		autoCmd := flag.GenerateAutomationCmd(to.CmdPath, to.GetSpaceNameOrEmpty(), to.Project, to.Tag)
 		fmt.Fprintf(to.Out, "%s\n", autoCmd)
 	}
 }
diff --git a/pkg/cmd/project/variables/create/create.go b/pkg/cmd/project/variables/create/create.go
@@ -212,7 +212,7 @@ func CreateRun(opts *CreateOptions) error {
 	_, err = fmt.Fprintf(opts.Out, "Successfully created variable '%s' in project '%s'\n", opts.Name.Value, project.GetName())
 
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Project, opts.Name, opts.Value, opts.Description, opts.Type, opts.EnvironmentsScopes, opts.ChannelScopes, opts.StepScopes, opts.TargetScopes, opts.TagScopes, opts.RoleScopes, opts.ProcessScopes, opts.IsPrompted, opts.PromptType, opts.PromptLabel, opts.PromptDescription, opts.PromptSelectOptions, opts.PromptRequired, opts.GitRef)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Project, opts.Name, opts.Value, opts.Description, opts.Type, opts.EnvironmentsScopes, opts.ChannelScopes, opts.StepScopes, opts.TargetScopes, opts.TagScopes, opts.RoleScopes, opts.ProcessScopes, opts.IsPrompted, opts.PromptType, opts.PromptLabel, opts.PromptDescription, opts.PromptSelectOptions, opts.PromptRequired, opts.GitRef)
 		fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)
 	}
 
diff --git a/pkg/cmd/project/variables/exclude/exclude.go b/pkg/cmd/project/variables/exclude/exclude.go
@@ -130,7 +130,7 @@ func excludeRun(opts *ExcludeOptions) error {
 	}
 
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Project, opts.VariableSets)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Project, opts.VariableSets)
 		fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)
 	}
 
diff --git a/pkg/cmd/project/variables/include/include.go b/pkg/cmd/project/variables/include/include.go
@@ -130,7 +130,7 @@ func includeRun(opts *IncludeOptions) error {
 	}
 
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Project, opts.VariableSets)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Project, opts.VariableSets)
 		fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)
 	}
 
diff --git a/pkg/cmd/project/variables/update/update.go b/pkg/cmd/project/variables/update/update.go
@@ -171,7 +171,7 @@ func updateRun(opts *UpdateOptions) error {
 	_, err = fmt.Fprintf(opts.Out, "Successfully updated variable '%s' in project '%s'\n", variable.Name, project.GetName())
 
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Id, opts.Name, opts.Value, opts.Project, opts.EnvironmentsScopes, opts.ChannelScopes, opts.StepScopes, opts.TargetScopes, opts.TagScopes, opts.RoleScopes, opts.ProcessScopes, opts.Unscoped, opts.GitRef)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Id, opts.Name, opts.Value, opts.Project, opts.EnvironmentsScopes, opts.ChannelScopes, opts.StepScopes, opts.TargetScopes, opts.TagScopes, opts.RoleScopes, opts.ProcessScopes, opts.Unscoped, opts.GitRef)
 		fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)
 	}
 
diff --git a/pkg/cmd/projectgroup/create/create.go b/pkg/cmd/projectgroup/create/create.go
@@ -56,7 +56,7 @@ func (co *CreateOptions) Commit() error {
 
 func (co *CreateOptions) GenerateAutomationCmd() {
 	if !co.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(co.CmdPath, co.Name, co.Description)
+		autoCmd := flag.GenerateAutomationCmd(co.CmdPath, co.GetSpaceNameOrEmpty(), co.Name, co.Description)
 		fmt.Fprintf(co.Out, "%s\n", autoCmd)
 	}
 }
diff --git a/pkg/cmd/release/create/create.go b/pkg/cmd/release/create/create.go
@@ -283,7 +283,11 @@ func createRun(cmd *cobra.Command, f factory.Factory, flags *CreateFlags) error
 				}
 			}
 
-			autoCmd := flag.GenerateAutomationCmd(constants.ExecutableName+" release create",
+			spaceName := ""
+			if s := f.GetCurrentSpace(); s != nil {
+				spaceName = s.GetName()
+			}
+			autoCmd := flag.GenerateAutomationCmd(constants.ExecutableName+" release create", spaceName,
 				resolvedFlags.Project,
 				resolvedFlags.GitCommit,
 				resolvedFlags.GitRef,
diff --git a/pkg/cmd/release/deploy/deploy.go b/pkg/cmd/release/deploy/deploy.go
@@ -283,7 +283,11 @@ func deployRun(cmd *cobra.Command, f factory.Factory, flags *DeployFlags) error
 			// but that's fine
 			resolvedFlags.ForcePackageDownload.Value = options.ForcePackageDownload
 
-			autoCmd := flag.GenerateAutomationCmd(constants.ExecutableName+" release deploy",
+			spaceName := ""
+			if s := f.GetCurrentSpace(); s != nil {
+				spaceName = s.GetName()
+			}
+			autoCmd := flag.GenerateAutomationCmd(constants.ExecutableName+" release deploy", spaceName,
 				resolvedFlags.Project,
 				resolvedFlags.ReleaseVersion,
 				resolvedFlags.Environments,
diff --git a/pkg/cmd/release/deploy/deploy_test.go b/pkg/cmd/release/deploy/deploy_test.go
@@ -2205,7 +2205,7 @@ func TestDeployCreate_GenerationOfAutomationCommand_MasksSensitiveVariables(t *t
 		  Package Download: Use cached packages (if available)
 		  Deployment Targets: All included
 		
-		Automation Command: octopus release deploy --project 'Fire Project' --version '2.0' --environment 'dev' --variable 'Boring Variable:BORING' --variable 'Nuclear Launch Codes:*****' --variable 'Secret Password:*****' --no-prompt
+		Automation Command: octopus release deploy --space 'Default Space' --project 'Fire Project' --version '2.0' --environment 'dev' --variable 'Boring Variable:BORING' --variable 'Nuclear Launch Codes:*****' --variable 'Secret Password:*****' --no-prompt
 		Warning: Command includes some sensitive variable values which have been replaced with placeholders.
 		Successfully started 2 deployment(s)
 
diff --git a/pkg/cmd/release/progression/allow/allow.go b/pkg/cmd/release/progression/allow/allow.go
@@ -127,7 +127,7 @@ func resolveReleaseDefectRun(opts *AllowOptions) error {
 	}
 
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Project, opts.Version)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Project, opts.Version)
 		_, _ = fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)
 	}
 
diff --git a/pkg/cmd/release/progression/prevent/prevent.go b/pkg/cmd/release/progression/prevent/prevent.go
@@ -145,7 +145,7 @@ func createReleaseDefectRun(opts *PreventOptions) error {
 	}
 
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Project, opts.Version, opts.Reason)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Project, opts.Version, opts.Reason)
 		_, _ = fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)
 	}
 
diff --git a/pkg/cmd/runbook/run/run.go b/pkg/cmd/runbook/run/run.go
@@ -348,7 +348,11 @@ func runDbRunbook(cmd *cobra.Command, f factory.Factory, flags *RunFlags, octopu
 			// but that's fine
 			resolvedFlags.ForcePackageDownload.Value = options.ForcePackageDownload
 
-			autoCmd := flag.GenerateAutomationCmd(constants.ExecutableName+" runbook run",
+			spaceName := ""
+			if s := f.GetCurrentSpace(); s != nil {
+				spaceName = s.GetName()
+			}
+			autoCmd := flag.GenerateAutomationCmd(constants.ExecutableName+" runbook run", spaceName,
 				resolvedFlags.Project,
 				resolvedFlags.RunbookName,
 				resolvedFlags.Snapshot,
@@ -482,7 +486,11 @@ func runGitRunbook(cmd *cobra.Command, f factory.Factory, flags *RunFlags, octop
 			// but that's fine
 			resolvedFlags.ForcePackageDownload.Value = options.ForcePackageDownload
 
-			autoCmd := flag.GenerateAutomationCmd(constants.ExecutableName+" runbook run",
+			spaceName := ""
+			if s := f.GetCurrentSpace(); s != nil {
+				spaceName = s.GetName()
+			}
+			autoCmd := flag.GenerateAutomationCmd(constants.ExecutableName+" runbook run", spaceName,
 				resolvedFlags.Project,
 				resolvedFlags.GitRef,
 				resolvedFlags.RunbookName,
diff --git a/pkg/cmd/runbook/run/run_by_tag.go b/pkg/cmd/runbook/run/run_by_tag.go
@@ -325,9 +325,13 @@ func runRunbooksByTag(cmd *cobra.Command, f factory.Factory, flags *RunFlags, oc
 		resolvedFlags.Tenants.Value = flags.Tenants.Value
 		resolvedFlags.TenantTags.Value = flags.TenantTags.Value
 
+		spaceName := ""
+		if s := f.GetCurrentSpace(); s != nil {
+			spaceName = s.GetName()
+		}
 		if isGit {
 			resolvedFlags.GitRef.Value = flags.GitRef.Value
-			autoCmd := flag.GenerateAutomationCmd(constants.ExecutableName+" runbook run",
+			autoCmd := flag.GenerateAutomationCmd(constants.ExecutableName+" runbook run", spaceName,
 				resolvedFlags.Project,
 				resolvedFlags.RunbookTags,
 				resolvedFlags.GitRef,
@@ -337,7 +341,7 @@ func runRunbooksByTag(cmd *cobra.Command, f factory.Factory, flags *RunFlags, oc
 			)
 			cmd.Printf("\nAutomation Command: %s\n", autoCmd)
 		} else {
-			autoCmd := flag.GenerateAutomationCmd(constants.ExecutableName+" runbook run",
+			autoCmd := flag.GenerateAutomationCmd(constants.ExecutableName+" runbook run", spaceName,
 				resolvedFlags.Project,
 				resolvedFlags.RunbookTags,
 				resolvedFlags.Environments,
diff --git a/pkg/cmd/runbook/snapshot/publish/publish.go b/pkg/cmd/runbook/snapshot/publish/publish.go
@@ -122,7 +122,7 @@ func publishRun(opts *PublishOptions) error {
 	fmt.Fprintf(opts.Out, "View this snapshot on Octopus Deploy: %s\n", link)
 
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Project, opts.Runbook, opts.Snapshot)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Project, opts.Runbook, opts.Snapshot)
 		fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)
 	}
 	return nil
diff --git a/pkg/cmd/space/create/create.go b/pkg/cmd/space/create/create.go
@@ -142,7 +142,7 @@ func createRun(opts *CreateOptions) error {
 	fmt.Printf("%s The space, \"%s\" %s was created successfully.\n", output.Green("✔"), createdSpace.Name, output.Dimf("(%s)", createdSpace.ID))
 
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.Description, opts.Teams, opts.Users)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, "", opts.Name, opts.Description, opts.Teams, opts.Users)
 		fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)
 	}
 	return nil
diff --git a/pkg/cmd/target/azure-web-app/create/create.go b/pkg/cmd/target/azure-web-app/create/create.go
@@ -173,7 +173,7 @@ func createRun(opts *CreateOptions) error {
 
 	fmt.Fprintf(opts.Out, "Successfully created Azure web app '%s'.\n", deploymentTarget.Name)
 	if !opts.NoPrompt {
-		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.Account, opts.WebApp, opts.ResourceGroup, opts.Slot, opts.Environments, opts.Roles, opts.Tags, opts.TenantedDeploymentMode, opts.Tenants, opts.TenantTags)
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.Account, opts.WebApp, opts.ResourceGroup, opts.Slot, opts.Environments, opts.Roles, opts.Tags, opts.TenantedDeploymentMode, opts.Tenants, opts.TenantTags)
 		fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)
 	}
 
diff --git a/pkg/cmd/target/cloud-region/create/create.go b/pkg/cmd/target/cloud-region/create/create.go
diff --git a/pkg/cmd/target/kubernetes/create/create.go b/pkg/cmd/target/kubernetes/create/create.go
diff --git a/pkg/cmd/target/listening-tentacle/create/create.go b/pkg/cmd/target/listening-tentacle/create/create.go
diff --git a/pkg/cmd/target/ssh/create/create.go b/pkg/cmd/target/ssh/create/create.go
diff --git a/pkg/cmd/tenant/clone/clone.go b/pkg/cmd/tenant/clone/clone.go
diff --git a/pkg/cmd/tenant/connect/connect.go b/pkg/cmd/tenant/connect/connect.go
diff --git a/pkg/cmd/tenant/create/create_opts.go b/pkg/cmd/tenant/create/create_opts.go
diff --git a/pkg/cmd/tenant/disconnect/disconnect.go b/pkg/cmd/tenant/disconnect/disconnect.go
diff --git a/pkg/cmd/tenant/tag/tag_opts.go b/pkg/cmd/tenant/tag/tag_opts.go
diff --git a/pkg/cmd/tenant/variables/update/update.go b/pkg/cmd/tenant/variables/update/update.go
diff --git a/pkg/cmd/worker/listening-tentacle/create/create.go b/pkg/cmd/worker/listening-tentacle/create/create.go
diff --git a/pkg/cmd/worker/ssh/create/create.go b/pkg/cmd/worker/ssh/create/create.go
diff --git a/pkg/cmd/workerpool/dynamic/create/create.go b/pkg/cmd/workerpool/dynamic/create/create.go
diff --git a/pkg/cmd/workerpool/static/create/create.go b/pkg/cmd/workerpool/static/create/create.go
diff --git a/pkg/util/flag/flag.go b/pkg/util/flag/flag.go

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func CreateRun(opts *CreateOptions) error {`
`130`	`130`	`link := output.Bluef("%s/app#/%s/infrastructure/accounts/%s", opts.Host, opts.Space.GetID(), createdAccount.GetID())`
`131`	`131`	`fmt.Fprintf(opts.Out, "\nView this account on Octopus Deploy: %s\n", link)`
`132`	`132`	`if !opts.NoPrompt {`
`133`		`- autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.AccessKey, opts.SecretKey, opts.Region, opts.Description, opts.Environments)`
	`133`	`+ autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.AccessKey, opts.SecretKey, opts.Region, opts.Description, opts.Environments)`
`134`	`134`	`fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)`
`135`	`135`	`}`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func CreateRun(opts *CreateOptions) error {`
`139`	`139`	`link := output.Bluef("%s/app#/%s/infrastructure/accounts/%s", opts.Host, opts.Space.GetID(), createdAccount.GetID())`
`140`	`140`	`_, _ = fmt.Fprintf(opts.Out, "\nView this account on Octopus Deploy: %s\n", link)`
`141`	`141`	`if !opts.NoPrompt {`
`142`		`- autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.KeyFilePath, opts.Description, opts.Environments)`
	`142`	`+ autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.KeyFilePath, opts.Description, opts.Environments)`
`143`	`143`	`_, _ = fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)`
`144`	`144`	`}`
`145`	`145`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ func CreateRun(opts *CreateOptions) error {`
`148`	`148`	`link := output.Bluef("%s/app#/%s/infrastructure/accounts/%s", opts.Host, opts.Space.GetID(), createdAccount.GetID())`
`149`	`149`	`_, _ = fmt.Fprintf(opts.Out, "\nView this account on Octopus Deploy: %s\n", link)`
`150`	`150`	`if !opts.NoPrompt {`
`151`		`- autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.KeyFilePath, opts.Passphrase, opts.Description, opts.Environments)`
	`151`	`+ autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.KeyFilePath, opts.Passphrase, opts.Description, opts.Environments)`
`152`	`152`	`_, _ = fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)`
`153`	`153`	`}`
`154`	`154`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ func CreateRun(opts *CreateOptions) error {`
`126`	`126`	`link := output.Bluef("%s/app#/%s/infrastructure/accounts/%s", opts.Host, opts.Space.GetID(), createdAccount.GetID())`
`127`	`127`	`_, _ = fmt.Fprintf(opts.Out, "\nView this account on Octopus Deploy: %s\n", link)`
`128`	`128`	`if !opts.NoPrompt {`
`129`		`- autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.Token, opts.Description, opts.Environments)`
	`129`	`+ autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.Token, opts.Description, opts.Environments)`
`130`	`130`	`_, _ = fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)`
`131`	`131`	`}`
`132`	`132`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func CreateRun(opts *CreateOptions) error {`
`131`	`131`	`link := output.Bluef("%s/app#/%s/infrastructure/accounts/%s", opts.Host, opts.Space.GetID(), createdAccount.GetID())`
`132`	`132`	`_, _ = fmt.Fprintf(opts.Out, "\nView this account on Octopus Deploy: %s\n", link)`
`133`	`133`	`if !opts.NoPrompt {`
`134`		`- autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.Username, opts.Password, opts.Description, opts.Environments)`
	`134`	`+ autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.Username, opts.Password, opts.Description, opts.Environments)`
`135`	`135`	`_, _ = fmt.Fprintf(opts.Out, "\nAutomation Command: %s\n", autoCmd)`
`136`	`136`	`}`
`137`	`137`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ func uploadRun(opts *UploadOptions) error {`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`if !opts.NoPrompt {`
`161`		`- autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.PackageId, opts.Version, opts.File, opts.OverwriteMode)`
	`161`	`+ autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.PackageId, opts.Version, opts.File, opts.OverwriteMode)`
`162`	`162`	`fmt.Fprintf(opts.Out, "%s\n", autoCmd)`
`163`	`163`	`}`
`164`	`164`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ func createRun(opts *CreateOptions) error {`
`123`	`123`	`fmt.Fprintf(opts.Out, "View this channel on Octopus Deploy: %s\n", link)`
`124`	`124`
`125`	`125`	`if !opts.NoPrompt {`
`126`		`- autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.Project, opts.Description, opts.Default, opts.Lifecycle)`
	`126`	`+ autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.GetSpaceNameOrEmpty(), opts.Name, opts.Project, opts.Description, opts.Default, opts.Lifecycle)`
`127`	`127`	`fmt.Fprintf(opts.Out, "%s\n", autoCmd)`
`128`	`128`	`}`
`129`	`129`