feat(scloud): 610a08fc85eb0d6baa53ff27a577202b5462cac7

Author: serverpod_cloud

serverpod_cloud_cli/lib/command_logger/command_logger.dart

@@ -459,6 +459,7 @@ class CommandLogger {
     final bool? defaultValue,
   }) async {
     if (configuration?.skipConfirmation == true) {
+      info('$message: y');
       return true;
     }
 

serverpod_cloud_cli/lib/command_runner/cloud_cli_command_runner.dart

@@ -419,6 +419,15 @@ enum GlobalOption<V> implements OptionDefinition<V> {
       helpText: 'The timeout for the connection to the Serverpod Cloud API.',
     ),
   ),
+  skipConfirmation(
+    FlagOption(
+      argName: 'skip-confirmation',
+      helpText: 'Automatically accept confirmation prompts.'
+          ' For use in non-interactive environments.',
+      negatable: false,
+      defaultsTo: false,
+    ),
+  ),
 
   // Developer options and flags
   apiServer(
@@ -439,15 +448,6 @@ enum GlobalOption<V> implements OptionDefinition<V> {
       defaultsTo: HostConstants.serverpodCloudConsole,
     ),
   ),
-  skipConfirmation(
-    FlagOption(
-      argName: 'skip-confirmation',
-      helpText:
-          'Should be used in CI environment to bypass confirmation prompts.',
-      hide: true,
-      defaultsTo: false,
-    ),
-  ),
   authToken(
     StringOption(
       argName: 'auth-token',

serverpod_cloud_cli/lib/command_runner/commands/launch_command.dart

@@ -1,11 +1,19 @@
 import 'package:config/config.dart';
 import 'package:serverpod_cloud_cli/command_runner/cloud_cli_command.dart';
 import 'package:serverpod_cloud_cli/command_runner/commands/categories.dart';
-import 'package:serverpod_cloud_cli/command_runner/helpers/command_options.dart';
 import 'package:serverpod_cloud_cli/commands/launch/launch.dart';
 
 enum LaunchOption<V> implements OptionDefinition<V> {
-  projectId(ProjectIdOption.nonMandatory()),
+  projectId(StringOption(
+    argName: 'project',
+    helpText: 'The ID of an existing project to use.',
+    group: _projectGroup,
+  )),
+  newProjectId(StringOption(
+    argName: 'new-project',
+    helpText: 'The ID of a new project to create.',
+    group: _projectGroup,
+  )),
   enableDb(FlagOption(
     argName: 'enable-db',
     helpText: 'Flag to enable the database for the project.',
@@ -19,6 +27,9 @@ enum LaunchOption<V> implements OptionDefinition<V> {
 
   @override
   final ConfigOptionBase<V> option;
+
+  static const _projectGroup =
+      MutuallyExclusive('Project', mode: MutuallyExclusiveMode.noDefaults);
 }
 
 class CloudLaunchCommand extends CloudCliCommand<LaunchOption> {
@@ -41,7 +52,9 @@ class CloudLaunchCommand extends CloudCliCommand<LaunchOption> {
     final foundProjectDir =
         specifiedProjectDir == null ? runner.selectProjectDirectory() : null;
 
-    final projectId = commandConfig.optionalValue(LaunchOption.projectId);
+    final existingProjectId =
+        commandConfig.optionalValue(LaunchOption.projectId);
+    final newProjectId = commandConfig.optionalValue(LaunchOption.newProjectId);
     final enableDb = commandConfig.optionalValue(LaunchOption.enableDb);
     final deploy = commandConfig.optionalValue(LaunchOption.deploy);
 
@@ -51,7 +64,8 @@ class CloudLaunchCommand extends CloudCliCommand<LaunchOption> {
       logger: logger,
       specifiedProjectDir: specifiedProjectDir?.path,
       foundProjectDir: foundProjectDir,
-      projectId: projectId,
+      newProjectId: newProjectId,
+      existingProjectId: existingProjectId,
       enableDb: enableDb,
       performDeploy: deploy,
     );

serverpod_cloud_cli/lib/command_runner/completion/completion_script_carapace.dart

@@ -17,6 +17,7 @@ persistentFlags:
   --project-config-file=: "The path to the Serverpod Cloud project configuration file."
   --project-config-content=: "Override the scloud project configuration with a YAML string."
   --connection-timeout=: "The timeout for the connection to the Serverpod Cloud API."
+  --skip-confirmation: "Automatically accept confirmation prompts. For use in non-interactive environments."
 exclusiveFlags:
   - [analytics, no-analytics]
 completion:
@@ -246,7 +247,8 @@ commands:
 
   - name: launch
     flags:
-      -p, --project=: "The ID of the project."
+      --project=: "The ID of an existing project to use."
+      --new-project=: "The ID of a new project to create."
       --enable-db: "Flag to enable the database for the project."
       --no-enable-db: "Flag to enable the database for the project."
       --deploy: "Flag to immediately deploy the project."

serverpod_cloud_cli/lib/command_runner/completion/completion_script_completely.dart

@@ -11,6 +11,7 @@ import 'package:serverpod_cloud_cli/commands/project/project.dart';
 import 'package:serverpod_cloud_cli/commands/status/status.dart';
 import 'package:serverpod_cloud_cli/commands/status/status_feature.dart';
 import 'package:serverpod_cloud_cli/constants.dart';
+import 'package:serverpod_cloud_cli/shared/user_interaction/user_confirmations.dart';
 import 'package:serverpod_cloud_cli/util/common.dart';
 import 'package:serverpod_cloud_cli/util/printers/table_printer.dart';
 import 'package:serverpod_cloud_cli/util/project_id_validator.dart';
@@ -23,7 +24,8 @@ abstract class Launch {
     required final CommandLogger logger,
     required final String? specifiedProjectDir,
     required final String? foundProjectDir,
-    required final String? projectId,
+    required final String? newProjectId,
+    required final String? existingProjectId,
     required final bool? enableDb,
     required final bool? performDeploy,
   }) async {
@@ -32,12 +34,19 @@ abstract class Launch {
       logger: logger,
     );
 
+    if (newProjectId != null && existingProjectId != null) {
+      throw ArgumentError(
+        'Cannot specify both newProjectId and existingProjectId.',
+      );
+    }
+
     logger.init('Launching new Serverpod Cloud project.\n');
 
     final projectSetup = ProjectLaunch(
       projectDir: specifiedProjectDir,
-      projectId: projectId,
+      projectId: newProjectId ?? existingProjectId,
       enableDb: enableDb,
+      preexistingProject: existingProjectId != null,
       performDeploy: performDeploy,
     );
 
@@ -163,8 +172,8 @@ abstract class Launch {
 
     final specifiedProjectId = projectSetup.projectId;
     if (specifiedProjectId != null) {
-      if (isValidProjectIdFormat(specifiedProjectId)) {
-        projectSetup.projectId = specifiedProjectId;
+      if (projectSetup.preexistingProject == true ||
+          isValidProjectIdFormat(specifiedProjectId)) {
         return;
       }
 
@@ -178,6 +187,8 @@ abstract class Launch {
       return;
     }
 
+    await UserConfirmations.confirmNewProjectCostAcceptance(logger);
+
     final defaultProjectId = _getDefaultProjectId(projectSetup.projectDir);
 
     logger.raw(
@@ -246,7 +257,6 @@ The default API domain will be: <project-id>.api.serverpod.space
   ) async {
     logger.info(
       'Found an existing Cloud project: ${project.cloudProjectId}',
-      newParagraph: true,
     );
 
     final confirm = await logger.confirm(
@@ -264,7 +274,6 @@ The default API domain will be: <project-id>.api.serverpod.space
     logger.info(
       'Found existing Cloud projects.\n'
       'Do you want to deploy to one of them instead of creating a new one?',
-      newParagraph: true,
     );
     for (int i = 0; i < existingIds.length; i++) {
       logger.info('${i + 1}. ${existingIds[i]}');
@@ -386,6 +395,7 @@ The default API domain will be: <project-id>.api.serverpod.space
           projectDir,
           ProjectConfigFileConstants.defaultFileName,
         ),
+        skipConfirmation: true,
       );
     }
 
@@ -457,7 +467,7 @@ class ProjectLaunch {
       rows: [
         ['Project directory', projectDir],
         if (preexistingProject != true) ...[
-          ['Project id', projectId],
+          ['New project id', projectId],
           ['Enable DB', enableDb == true ? 'yes' : 'no'],
         ] else
           ['Existing project id', projectId],

serverpod_cloud_cli/lib/commands/launch/launch.dart

@@ -7,6 +7,7 @@ import 'package:serverpod_cloud_cli/command_logger/command_logger.dart';
 import 'package:serverpod_cloud_cli/shared/exceptions/exit_exceptions.dart';
 import 'package:serverpod_cloud_cli/commands/deploy/prepare_workspace.dart'
     show WorkspaceProject;
+import 'package:serverpod_cloud_cli/shared/user_interaction/user_confirmations.dart';
 import 'package:serverpod_cloud_cli/util/printers/table_printer.dart';
 import 'package:serverpod_cloud_cli/util/pubspec_validator.dart';
 import 'package:serverpod_cloud_cli/util/scloud_config/scloud_config_file.dart';
@@ -41,7 +42,12 @@ abstract class ProjectCommands {
     required final bool enableDb,
     required final String projectDir,
     required final String configFilePath,
+    final bool skipConfirmation = false,
   }) async {
+    if (!skipConfirmation) {
+      await UserConfirmations.confirmNewProjectCostAcceptance(logger);
+    }
+
     // Check that the user is on a plan and automatically procure one if not.
     // This behavior will be changed in the future.
     final planNames = await cloudApiClient.plans.listProcuredPlanNames();

serverpod_cloud_cli/lib/commands/project/project.dart

@@ -0,0 +1,24 @@
+import 'package:serverpod_cloud_cli/command_logger/command_logger.dart';
+
+import '../exceptions/exit_exceptions.dart';
+
+/// User interactions that may be reused across commands.
+abstract class UserConfirmations {
+  /// Asks the user for confirmation to continue with a new project setup
+  /// that may incur additional costs.
+  ///
+  /// Throws [UserAbortException] if the user does not confirm.
+  static Future<void> confirmNewProjectCostAcceptance(
+    final CommandLogger logger,
+  ) async {
+    final confirm = await logger.confirm(
+      'Depending on your subscription, a new project may incur additional costs. Continue?',
+      defaultValue: true,
+    );
+
+    if (!confirm) {
+      logger.info('Setup cancelled.');
+      throw UserAbortException();
+    }
+  }
+}

serverpod_cloud_cli/lib/shared/user_interaction/user_confirmations.dart

@@ -291,7 +291,7 @@ void main() {
       },
     );
 
-    expect(stdout.output, isEmpty);
+    expect(stdout.output, 'Are you sure?: y\n');
     expect(result, isTrue);
   });
 }