Use base -e/--environment flag as clone source instead of separate --from

Drop the redundant --from flag on b2c mrt env clone. Every MrtCommand already
has a base --environment / -e flag (with MRT_ENVIRONMENT and dw.json
mrtEnvironment fallbacks) that selects the working environment; using it as
the source for clone keeps the behavior consistent with the rest of the env
commands. The positional argument is the new slug. Also reject identical
source and destination slugs.

Author: clavery

docs/cli/mrt.md

@@ -318,21 +318,23 @@ b2c mrt env delete old-env -p my-storefront --force
 
 Clone an environment from an existing source environment. The new target receives the source's configuration (excluding proxies and the production flag) and is automatically deployed with the source target's current bundle (if any). Optionally clones redirects, environment variables, and B2C target info.
 
+The source environment is the one selected by `--environment` / `-e` (or `MRT_ENVIRONMENT` / `mrtEnvironment` in `dw.json`). The positional argument is the **new** environment's slug.
+
 ```bash
-# Clone an environment with default settings
-b2c mrt env clone staging-copy --from staging --project my-storefront
+# Clone the configured environment into a new slug
+b2c mrt env clone staging-copy -p my-storefront -e staging
 
 # Clone with redirects and environment variables
-b2c mrt env clone qa --from staging -p my-storefront --clone-redirects --clone-env-vars
+b2c mrt env clone qa -p my-storefront -e staging --clone-redirects --clone-env-vars
 
 # Clone using a custom domain certificate
-b2c mrt env clone qa --from staging -p my-storefront \
+b2c mrt env clone qa -p my-storefront -e staging \
   --external-hostname qa.example.com --certificate-id 123 --wait
 ```
 
 | Flag | Description |
 |------|-------------|
-| `--from`, `-f` | Source environment slug to clone from (required) |
+| `--environment`, `-e` | Source environment slug (defaults to `mrtEnvironment` / `MRT_ENVIRONMENT`) |
 | `--external-hostname` | Full external hostname (required for non-MRT-managed certificates) |
 | `--external-domain` | External domain for Universal PWA SSR |
 | `--certificate-id` | Certificate ID for custom domain (use `b2c mrt org cert list` to find) |

packages/b2c-cli/src/commands/mrt/env/clone.ts

@@ -54,18 +54,13 @@ export default class MrtEnvClone extends MrtCommand<typeof MrtEnvClone> {
   static enableJsonFlag = true;
 
   static examples = [
-    '<%= config.bin %> <%= command.id %> staging-copy --from staging --project my-storefront',
-    '<%= config.bin %> <%= command.id %> qa --from staging -p my-storefront --clone-redirects --clone-env-vars',
-    '<%= config.bin %> <%= command.id %> qa --from staging -p my-storefront --external-hostname qa.example.com --certificate-id 123 --wait',
+    '<%= config.bin %> <%= command.id %> staging-copy -p my-storefront -e staging',
+    '<%= config.bin %> <%= command.id %> qa -p my-storefront -e staging --clone-redirects --clone-env-vars',
+    '<%= config.bin %> <%= command.id %> qa -p my-storefront -e staging --external-hostname qa.example.com --certificate-id 123 --wait',
   ];
 
   static flags = {
     ...MrtCommand.baseFlags,
-    from: Flags.string({
-      char: 'f',
-      description: 'Source environment slug to clone from',
-      required: true,
-    }),
     'external-hostname': Flags.string({
       description: 'Full external hostname for the new environment (required for non-MRT-managed certs)',
     }),
@@ -113,14 +108,21 @@ export default class MrtEnvClone extends MrtCommand<typeof MrtEnvClone> {
     this.requireMrtCredentials();
 
     const {slug} = this.args;
-    const {mrtProject: project} = this.resolvedConfig.values;
+    const {mrtProject: project, mrtEnvironment: fromSlug} = this.resolvedConfig.values;
 
     if (!project) {
       this.error('MRT project is required. Provide --project flag, set MRT_PROJECT, or set mrtProject in dw.json.');
     }
+    if (!fromSlug) {
+      this.error(
+        'Source environment is required. Provide --environment / -e, set MRT_ENVIRONMENT, or set mrtEnvironment in dw.json.',
+      );
+    }
+    if (fromSlug === slug) {
+      this.error(`Source and destination environment slugs must differ (both are "${slug}").`);
+    }
 
     const {
-      from: fromSlug,
       'external-hostname': externalHostname,
       'external-domain': externalDomain,
       'certificate-id': certificateId,

packages/b2c-cli/test/commands/mrt/env/clone.test.ts

@@ -35,10 +35,10 @@ describe('mrt env clone', () => {
 
   it('errors when project is missing', async () => {
     const command = createCommand();
-    stubParse(command, {from: 'staging'}, {slug: 'staging-copy'});
+    stubParse(command, {}, {slug: 'staging-copy'});
     await command.init();
     stubCommonAuth(command);
-    sinon.stub(command, 'resolvedConfig').get(() => ({values: {mrtProject: undefined}}));
+    sinon.stub(command, 'resolvedConfig').get(() => ({values: {mrtProject: undefined, mrtEnvironment: 'staging'}}));
     const errorStub = sinon.stub(command, 'error').throws(new Error('expected'));
 
     try {
@@ -49,12 +49,11 @@ describe('mrt env clone', () => {
     }
   });
 
-  it('passes flags through to cloneEnv and returns the new env', async () => {
+  it('uses mrtEnvironment as the source and passes flags through to cloneEnv', async () => {
     const command = createCommand();
     stubParse(
       command,
       {
-        from: 'staging',
         'external-hostname': 'qa.example.com',
         'certificate-id': 123,
         'clone-redirects': true,
@@ -68,7 +67,9 @@ describe('mrt env clone', () => {
     stubCommonAuth(command);
     sinon.stub(command, 'jsonEnabled').returns(true);
     sinon.stub(command, 'log').returns(void 0);
-    sinon.stub(command, 'resolvedConfig').get(() => ({values: {mrtProject: 'p', mrtOrigin: 'https://example.com'}}));
+    sinon
+      .stub(command, 'resolvedConfig')
+      .get(() => ({values: {mrtProject: 'p', mrtEnvironment: 'staging', mrtOrigin: 'https://example.com'}}));
 
     const cloneStub = sinon.stub().resolves({slug: 'qa', name: 'qa', state: 'CREATE_IN_PROGRESS'} as any);
     const waitStub = sinon.stub();
@@ -90,12 +91,43 @@ describe('mrt env clone', () => {
     expect(result.slug).to.equal('qa');
   });
 
+  it('errors when mrtEnvironment is not set', async () => {
+    const command = createCommand();
+    stubParse(command, {'clone-redirects': false, 'clone-env-vars': false, 'clone-b2c-info': false}, {slug: 'qa'});
+    await command.init();
+    stubCommonAuth(command);
+    sinon.stub(command, 'resolvedConfig').get(() => ({values: {mrtProject: 'p'}}));
+    const errorStub = sinon.stub(command, 'error').throws(new Error('expected'));
+
+    try {
+      await command.run();
+      expect.fail('expected error');
+    } catch {
+      expect(errorStub.firstCall.args[0]).to.include('Source environment is required');
+    }
+  });
+
+  it('errors when source and destination slugs are equal', async () => {
+    const command = createCommand();
+    stubParse(command, {'clone-redirects': false, 'clone-env-vars': false, 'clone-b2c-info': false}, {slug: 'staging'});
+    await command.init();
+    stubCommonAuth(command);
+    sinon.stub(command, 'resolvedConfig').get(() => ({values: {mrtProject: 'p', mrtEnvironment: 'staging'}}));
+    const errorStub = sinon.stub(command, 'error').throws(new Error('expected'));
+
+    try {
+      await command.run();
+      expect.fail('expected error');
+    } catch {
+      expect(errorStub.firstCall.args[0]).to.include('must differ');
+    }
+  });
+
   it('waits for env when --wait is set', async () => {
     const command = createCommand();
     stubParse(
       command,
       {
-        from: 'staging',
         wait: true,
         'poll-interval': 1,
         timeout: 30,
@@ -109,7 +141,7 @@ describe('mrt env clone', () => {
     stubCommonAuth(command);
     sinon.stub(command, 'jsonEnabled').returns(true);
     sinon.stub(command, 'log').returns(void 0);
-    sinon.stub(command, 'resolvedConfig').get(() => ({values: {mrtProject: 'p'}}));
+    sinon.stub(command, 'resolvedConfig').get(() => ({values: {mrtProject: 'p', mrtEnvironment: 'staging'}}));
 
     const cloneStub = sinon.stub().resolves({slug: 'qa', state: 'CREATE_IN_PROGRESS'} as any);
     const waitStub = sinon.stub().resolves({slug: 'qa', state: 'ACTIVE'} as any);

skills/b2c-cli/skills/b2c-mrt/SKILL.md

@@ -51,8 +51,8 @@ b2c mrt env list -p my-storefront
 # Create a new environment
 b2c mrt env create qa -p my-storefront --name "QA Environment"
 
-# Clone an existing environment (optionally copy redirects, env vars, B2C info)
-b2c mrt env clone qa -p my-storefront --from staging --clone-redirects --clone-env-vars
+# Clone an existing environment (-e is the source; positional arg is the new slug)
+b2c mrt env clone qa -p my-storefront -e staging --clone-redirects --clone-env-vars
 
 # Get environment details
 b2c mrt env get -p my-storefront -e production