confirm before stop

johnstcn · johnstcn · commit 4476b6a72245 · 2025-06-18T16:17:27.000+01:00
diff --git a/cli/update.go b/cli/update.go
@@ -39,13 +39,22 @@ func (r *RootCmd) update() *serpent.Command {
 			// updating. Simply performing a new start transition may not work if the
 			// template specifies ignore_changes.
 			if workspace.LatestBuild.Transition == codersdk.WorkspaceTransitionStart {
-				build, err := stopWorkspace(inv, client, workspace, bflags)
-				if err != nil {
-					return xerrors.Errorf("stop workspace: %w", err)
-				}
-				// Wait for the stop to complete.
-				if err := cliui.WorkspaceBuild(inv.Context(), inv.Stdout, client, build.ID); err != nil {
-					return xerrors.Errorf("wait for stop: %w", err)
+				// It's polite to ask the user before stopping their workspace.
+				cliui.Info(inv.Stdout, "Your workspace is currently running. We recommend stopping it before proceeding.")
+				if _, err := cliui.Prompt(inv, cliui.PromptOptions{
+					Text:      "Confirm stop workspace?",
+					IsConfirm: true,
+				}); err != nil {
+					cliui.Warnf(inv.Stderr, "Updating without stop.")
+				} else {
+					build, err := stopWorkspace(inv, client, workspace, bflags)
+					if err != nil {
+						return xerrors.Errorf("stop workspace: %w", err)
+					}
+					// Wait for the stop to complete.
+					if err := cliui.WorkspaceBuild(inv.Context(), inv.Stdout, client, build.ID); err != nil {
+						return xerrors.Errorf("wait for stop: %w", err)
+					}
 				}
 			}
 
diff --git a/cli/update_test.go b/cli/update_test.go
@@ -71,8 +71,16 @@ func TestUpdate(t *testing.T) {
 		inv, root := clitest.New(t, "update", ws.Name)
 		clitest.SetupConfig(t, member, root)
 
-		err = inv.Run()
-		require.NoError(t, err, "update command failed")
+		doneCh := make(chan error)
+		pty := ptytest.New(t).Attach(inv)
+		go func() {
+			defer close(doneCh)
+			doneCh <- inv.Run()
+		}()
+
+		pty.ExpectMatch("Confirm stop workspace?")
+		pty.WriteLine("yes")
+		require.NoError(t, testutil.TryReceive(ctx, t, doneCh), "update command failed to run")
 
 		// Then: the workspace is no longer 'outdated'
 		ws, err = member.WorkspaceByOwnerAndName(ctx, codersdk.Me, "my-workspace", codersdk.WorkspaceOptions{})
