hereya-cli 0.46.0 → 0.47.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.46.0 linux-x64 node-v22.17.1
+hereya-cli/0.47.0 linux-x64 node-v22.17.1
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -40,6 +40,8 @@ USAGE
 * [`hereya down`](#hereya-down)
 * [`hereya env [NAME]`](#hereya-env-name)
 * [`hereya env set [NAME]`](#hereya-env-set-name)
+* [`hereya flow down`](#hereya-flow-down)
+* [`hereya flow up`](#hereya-flow-up)
 * [`hereya help [COMMAND]`](#hereya-help-command)
 * [`hereya import PACKAGE`](#hereya-import-package)
 * [`hereya init PROJECT`](#hereya-init-project)
@@ -66,7 +68,7 @@ Add a package to the project.
 
 ```
 USAGE
-  $ hereya add PACKAGE [--chdir <value>] [--debug] [-p <value>...]
+  $ hereya add PACKAGE [--chdir <value>] [--debug] [-p <value>...] [-w <value>]
 
 ARGUMENTS
   PACKAGE  The package to add, specified as a GitHub repository in the format owner/repository.
@@ -78,6 +80,7 @@ ARGUMENTS
 FLAGS
   -p, --parameter=<value>...  [default: ] parameter for the package, in the form of 'key=value'. Can be specified
                               multiple times.
+  -w, --workspace=<value>     name of the workspace to add the package to (defaults to current workspace)
       --chdir=<value>         Directory where the command will be executed.
                               If not specified, it defaults to the current working directory.
                               Alternatively, you can define the project root by setting the HEREYA_PROJECT_ROOT_DIR
@@ -91,7 +94,7 @@ EXAMPLES
   $ hereya add cloudy/docker_postgres
 ```
 
-_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/add/index.ts)_
+_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/add/index.ts)_
 
 ## `hereya bootstrap INFRASTRUCTURETYPE`
 
@@ -116,7 +119,7 @@ EXAMPLES
   $ hereya bootstrap local
 ```
 
-_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/bootstrap/index.ts)_
+_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/bootstrap/index.ts)_
 
 ## `hereya config export-backend [FILE]`
 
@@ -138,7 +141,7 @@ EXAMPLES
   $ hereya config export-backend ./path/to/export.json
 ```
 
-_See code: [src/commands/config/export-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/config/export-backend/index.ts)_
+_See code: [src/commands/config/export-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/config/export-backend/index.ts)_
 
 ## `hereya config get-backend`
 
@@ -155,7 +158,7 @@ EXAMPLES
   $ hereya config get-backend
 ```
 
-_See code: [src/commands/config/get-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/config/get-backend/index.ts)_
+_See code: [src/commands/config/get-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/config/get-backend/index.ts)_
 
 ## `hereya config import-backend FILE`
 
@@ -175,7 +178,7 @@ EXAMPLES
   $ hereya config import-backend ./path/to/cloud-backend.json
 ```
 
-_See code: [src/commands/config/import-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/config/import-backend/index.ts)_
+_See code: [src/commands/config/import-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/config/import-backend/index.ts)_
 
 ## `hereya config use-backend TYPE`
 
@@ -197,7 +200,7 @@ EXAMPLES
   $ hereya config use-backend local
 ```
 
-_See code: [src/commands/config/use-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/config/use-backend/index.ts)_
+_See code: [src/commands/config/use-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/config/use-backend/index.ts)_
 
 ## `hereya delete-state`
 
@@ -223,7 +226,7 @@ EXAMPLES
   $ hereya delete-state --workspace staging
 ```
 
-_See code: [src/commands/delete-state/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/delete-state/index.ts)_
+_See code: [src/commands/delete-state/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/delete-state/index.ts)_
 
 ## `hereya deploy`
 
@@ -248,7 +251,7 @@ EXAMPLES
   $ hereya deploy
 ```
 
-_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/deploy/index.ts)_
+_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/deploy/index.ts)_
 
 ## `hereya down`
 
@@ -275,7 +278,7 @@ EXAMPLES
   $ hereya down
 ```
 
-_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/down/index.ts)_
+_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/down/index.ts)_
 
 ## `hereya env [NAME]`
 
@@ -306,7 +309,7 @@ EXAMPLES
   $ hereya env -w dev -l
 ```
 
-_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/env/index.ts)_
+_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/env/index.ts)_
 
 ## `hereya env set [NAME]`
 
@@ -333,7 +336,75 @@ EXAMPLES
   $ hereya env set FOO -v bar -w dev
 ```
 
-_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/env/set/index.ts)_
+_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/env/set/index.ts)_
+
+## `hereya flow down`
+
+Create a git branch-based workspace and destroy all packages
+
+```
+USAGE
+  $ hereya flow down [--chdir <value>] [--debug] [--deploy] [--pin] [--profile <value>] [-s <value>...]
+
+FLAGS
+  -s, --select=<value>...  [default: ] select the packages to destroy
+      --chdir=<value>      Directory where the command will be executed.
+                           If not specified, it defaults to the current working directory.
+                           Alternatively, you can define the project root by setting the HEREYA_PROJECT_ROOT_DIR
+                           environment variable.
+      --debug              enable debug mode
+      --deploy             destroy deployment companion packages
+      --pin                append git commit SHA to workspace name for commit-specific isolation
+      --profile=<value>    profile to use for the workspace (will be appended to workspace name)
+
+DESCRIPTION
+  Create a git branch-based workspace and destroy all packages
+
+EXAMPLES
+  $ hereya flow down
+
+  $ hereya flow down --debug
+
+  $ hereya flow down --profile staging
+
+  $ hereya flow down --pin
+```
+
+_See code: [src/commands/flow/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/flow/down/index.ts)_
+
+## `hereya flow up`
+
+Create a git branch-based workspace and provision all packages
+
+```
+USAGE
+  $ hereya flow up [--chdir <value>] [--debug] [--deploy] [--pin] [--profile <value>] [-s <value>...]
+
+FLAGS
+  -s, --select=<value>...  [default: ] select the packages to provision
+      --chdir=<value>      Directory where the command will be executed.
+                           If not specified, it defaults to the current working directory.
+                           Alternatively, you can define the project root by setting the HEREYA_PROJECT_ROOT_DIR
+                           environment variable.
+      --debug              enable debug mode
+      --deploy             provision deployment companion packages
+      --pin                append git commit SHA to workspace name for commit-specific isolation
+      --profile=<value>    profile to use for the workspace (will be appended to workspace name)
+
+DESCRIPTION
+  Create a git branch-based workspace and provision all packages
+
+EXAMPLES
+  $ hereya flow up
+
+  $ hereya flow up --debug
+
+  $ hereya flow up --profile staging
+
+  $ hereya flow up --pin
+```
+
+_See code: [src/commands/flow/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/flow/up/index.ts)_
 
 ## `hereya help [COMMAND]`
 
@@ -390,7 +461,7 @@ EXAMPLES
   $ hereya import org/my-package -f state.tfstate -w my-workspace
 ```
 
-_See code: [src/commands/import/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/import/index.ts)_
+_See code: [src/commands/import/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/import/index.ts)_
 
 ## `hereya init PROJECT`
 
@@ -416,7 +487,7 @@ EXAMPLES
   $ hereya init myProject -w=defaultWorkspace --chdir=./myProject
 ```
 
-_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/init/index.ts)_
 
 ## `hereya login [URL]`
 
@@ -445,7 +516,7 @@ EXAMPLES
   $ hereya login --token=your-token https://cloud.hereya.dev
 ```
 
-_See code: [src/commands/login/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/login/index.ts)_
+_See code: [src/commands/login/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/login/index.ts)_
 
 ## `hereya logout`
 
@@ -462,7 +533,7 @@ EXAMPLES
   $ hereya logout
 ```
 
-_See code: [src/commands/logout/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/logout/index.ts)_
+_See code: [src/commands/logout/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/logout/index.ts)_
 
 ## `hereya remove PACKAGE`
 
@@ -470,17 +541,18 @@ Remove a package from the project.
 
 ```
 USAGE
-  $ hereya remove PACKAGE [--chdir <value>] [--debug]
+  $ hereya remove PACKAGE [--chdir <value>] [--debug] [-w <value>]
 
 ARGUMENTS
   PACKAGE  Remove a previously added package.
 
 FLAGS
-  --chdir=<value>  Directory where the command will be executed.
-                   If not specified, it defaults to the current working directory.
-                   Alternatively, you can define the project root by setting the HEREYA_PROJECT_ROOT_DIR environment
-                   variable.
-  --debug          enable debug mode
+  -w, --workspace=<value>  name of the workspace to remove the package from (defaults to current workspace)
+      --chdir=<value>      Directory where the command will be executed.
+                           If not specified, it defaults to the current working directory.
+                           Alternatively, you can define the project root by setting the HEREYA_PROJECT_ROOT_DIR
+                           environment variable.
+      --debug              enable debug mode
 
 DESCRIPTION
   Remove a package from the project.
@@ -489,7 +561,7 @@ EXAMPLES
   $ hereya remove cloudy/docker_postgres
 ```
 
-_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/remove/index.ts)_
+_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/remove/index.ts)_
 
 ## `hereya run CMD`
 
@@ -515,7 +587,7 @@ EXAMPLES
   $ hereya run -w uat -- node index.js
 ```
 
-_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/run/index.ts)_
 
 ## `hereya unbootstrap INFRASTRUCTURETYPE`
 
@@ -540,7 +612,7 @@ EXAMPLES
   $ hereya unbootstrap local
 ```
 
-_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/unbootstrap/index.ts)_
+_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/unbootstrap/index.ts)_
 
 ## `hereya undeploy`
 
@@ -565,7 +637,7 @@ EXAMPLES
   $ hereya undeploy
 ```
 
-_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/undeploy/index.ts)_
+_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/undeploy/index.ts)_
 
 ## `hereya up`
 
@@ -592,7 +664,7 @@ EXAMPLES
   $ hereya up
 ```
 
-_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/up/index.ts)_
+_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/up/index.ts)_
 
 ## `hereya workspace create NAME`
 
@@ -616,7 +688,7 @@ EXAMPLES
   $ hereya workspace create dev
 ```
 
-_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/workspace/create/index.ts)_
+_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/workspace/create/index.ts)_
 
 ## `hereya workspace delete NAME`
 
@@ -636,7 +708,7 @@ EXAMPLES
   $ hereya workspace delete dev
 ```
 
-_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/workspace/delete/index.ts)_
+_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/workspace/delete/index.ts)_
 
 ## `hereya workspace env [NAME]`
 
@@ -662,7 +734,7 @@ EXAMPLES
   $ hereya workspace env myEnv -w dev
 ```
 
-_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/workspace/env/index.ts)_
+_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/workspace/env/index.ts)_
 
 ## `hereya workspace env set`
 
@@ -686,7 +758,7 @@ EXAMPLES
   $ hereya workspace env set -w my-workspace -n myVar -v my-value -i aws -s
 ```
 
-_See code: [src/commands/workspace/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/workspace/env/set/index.ts)_
+_See code: [src/commands/workspace/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/workspace/env/set/index.ts)_
 
 ## `hereya workspace env unset`
 
@@ -707,7 +779,7 @@ EXAMPLES
   $ hereya workspace env unset -w my-workspace -n myVar
 ```
 
-_See code: [src/commands/workspace/env/unset/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/workspace/env/unset/index.ts)_
+_See code: [src/commands/workspace/env/unset/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/workspace/env/unset/index.ts)_
 
 ## `hereya workspace install PACKAGE`
 
@@ -734,7 +806,7 @@ EXAMPLES
   $ hereya workspace install hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/workspace/install/index.ts)_
+_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/workspace/install/index.ts)_
 
 ## `hereya workspace list`
 
@@ -751,7 +823,7 @@ EXAMPLES
   $ hereya workspace list
 ```
 
-_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/workspace/list/index.ts)_
+_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/workspace/list/index.ts)_
 
 ## `hereya workspace set-profile PROFILE`
 
@@ -774,7 +846,7 @@ EXAMPLES
   $ hereya workspace set-profile prod-profile -w production
 ```
 
-_See code: [src/commands/workspace/set-profile/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/workspace/set-profile/index.ts)_
+_See code: [src/commands/workspace/set-profile/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/workspace/set-profile/index.ts)_
 
 ## `hereya workspace uninstall PACKAGE`
 
@@ -801,5 +873,5 @@ EXAMPLES
   $ hereya workspace uninstall hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.46.0/src/commands/workspace/uninstall/index.ts)_
+_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.47.0/src/commands/workspace/uninstall/index.ts)_
 <!-- commandsstop -->

package/dist/commands/add/index.d.ts

@@ -9,6 +9,7 @@ export default class Add extends Command {
         chdir: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         parameter: import("@oclif/core/interfaces").OptionFlag<string[], import("@oclif/core/interfaces").CustomOptions>;
+        workspace: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/add/index.js

@@ -42,6 +42,11 @@ export default class Add extends Command {
             description: "parameter for the package, in the form of 'key=value'. Can be specified multiple times.",
             multiple: true,
         }),
+        workspace: Flags.string({
+            char: 'w',
+            description: 'name of the workspace to add the package to (defaults to current workspace)',
+            required: false,
+        }),
     };
     async run() {
         const { args, flags } = await this.parse(Add);
@@ -66,6 +71,8 @@ export default class Add extends Command {
                                     throw new Error("Project not initialized. Run 'hereya init' first.");
                                 }
                                 ctx.configOutput = loadConfigOutput;
+                                // Use workspace from flag if provided, otherwise use config workspace
+                                ctx.workspace = flags.workspace || loadConfigOutput.config.workspace;
                                 task.output = `Loaded project config`;
                                 await delay(500);
                             },
@@ -76,7 +83,7 @@ export default class Add extends Command {
                                 const userSpecifiedParameters = arrayOfStringToObject(ctx.userSpecifiedParameters);
                                 const parameterManager = getParameterManager();
                                 const backend = await getBackend();
-                                const profile = await getProfileFromWorkspace(backend, ctx.configOutput.config.workspace);
+                                const profile = await getProfileFromWorkspace(backend, ctx.workspace);
                                 const parametersOutput = await parameterManager.getPackageParameters({
                                     package: ctx.package,
                                     profile,
@@ -105,7 +112,7 @@ export default class Add extends Command {
                                     project: ctx.configOutput.config.project,
                                     projectRootDir,
                                     skipDeploy: true,
-                                    workspace: ctx.configOutput.config.workspace,
+                                    workspace: ctx.workspace,
                                 });
                                 if (!provisionOutput.success) {
                                     throw new Error(provisionOutput.reason);
@@ -122,7 +129,7 @@ export default class Add extends Command {
                                     env,
                                     infra: metadata.originalInfra ?? metadata.infra,
                                     projectRootDir,
-                                    workspace: ctx.configOutput.config.workspace,
+                                    workspace: ctx.workspace,
                                 });
                                 await delay(500);
                             },
@@ -145,13 +152,13 @@ export default class Add extends Command {
                                 const backend = await getBackend();
                                 const configManager = getConfigManager();
                                 const { config: newConfig } = await configManager.loadConfig({ projectRootDir });
-                                await backend.saveState(newConfig);
+                                await backend.saveState(newConfig, ctx.workspace);
                                 const parameterManager = getParameterManager();
                                 const { filePath, saved } = await parameterManager.savePackageParameters({
                                     package: ctx.package,
                                     parameters: ctx.parametersOutput.parameters,
                                     projectRootDir,
-                                    workspace: ctx.configOutput.config.workspace,
+                                    workspace: ctx.workspace,
                                 });
                                 await delay(500);
                                 if (saved) {

package/dist/commands/env/set/index.js

@@ -3,6 +3,7 @@ import path from 'node:path';
 import { getConfigManager } from '../../../lib/config/index.js';
 import { getEnvManager } from '../../../lib/env/index.js';
 import { getAnyPath } from '../../../lib/filesystem.js';
+import { stripOrgPrefix } from '../../../lib/org-utils.js';
 import { load, save } from '../../../lib/yaml-utils.js';
 export default class EnvSet extends Command {
     static args = {
@@ -43,8 +44,9 @@ export default class EnvSet extends Command {
         }
         const envManager = getEnvManager();
         const envDir = await envManager.getStaticEnvDir(projectRootDir);
-        const candidates = flags.workspace
-            ? [path.join(envDir, `env.${flags.workspace}.yaml`), path.join(envDir, `env.${flags.workspace}.yml`)]
+        const workspaceName = flags.workspace ? stripOrgPrefix(flags.workspace) : null;
+        const candidates = workspaceName
+            ? [path.join(envDir, `env.${workspaceName}.yaml`), path.join(envDir, `env.${workspaceName}.yml`)]
             : [path.join(envDir, `env.yaml`), path.join(envDir, `env.yml`)];
         const envFile = await getAnyPath(...candidates);
         const { data: env } = await load(envFile);

package/dist/commands/flow/down/index.d.ts

@@ -0,0 +1,14 @@
+import { Command } from '@oclif/core';
+export default class FlowDown extends Command {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        chdir: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        deploy: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        pin: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        select: import("@oclif/core/interfaces").OptionFlag<string[], import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/flow/down/index.js

@@ -0,0 +1,110 @@
+import { Command, Flags } from '@oclif/core';
+import { getConfigManager } from '../../../lib/config/index.js';
+import { gitUtils } from '../../../lib/git-utils.js';
+import { setDebug } from '../../../lib/log.js';
+import DeleteState from '../../delete-state/index.js';
+import Down from '../../down/index.js';
+import WorkspaceCreate from '../../workspace/create/index.js';
+import WorkspaceDelete from '../../workspace/delete/index.js';
+export default class FlowDown extends Command {
+    static description = 'Create a git branch-based workspace and destroy all packages';
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> --debug',
+        '<%= config.bin %> <%= command.id %> --profile staging',
+        '<%= config.bin %> <%= command.id %> --pin',
+    ];
+    static flags = {
+        chdir: Flags.string({
+            description: `
+        Directory where the command will be executed.
+        If not specified, it defaults to the current working directory.
+        Alternatively, you can define the project root by setting the HEREYA_PROJECT_ROOT_DIR environment variable.
+      `,
+            required: false,
+        }),
+        debug: Flags.boolean({
+            default: false,
+            description: 'enable debug mode',
+        }),
+        deploy: Flags.boolean({
+            description: 'destroy deployment companion packages',
+            required: false,
+        }),
+        pin: Flags.boolean({
+            description: 'append git commit SHA to workspace name for commit-specific isolation',
+            required: false,
+        }),
+        profile: Flags.string({
+            description: 'profile to use for the workspace (will be appended to workspace name)',
+            required: false,
+        }),
+        select: Flags.string({
+            char: 's',
+            default: [],
+            description: 'select the packages to destroy',
+            multiple: true,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(FlowDown);
+        setDebug(flags.debug);
+        const projectRootDir = flags.chdir || process.env.HEREYA_PROJECT_ROOT_DIR;
+        // Load project config
+        const configManager = getConfigManager();
+        const loadConfigOutput = await configManager.loadConfig({ projectRootDir });
+        if (!loadConfigOutput.found) {
+            this.error("Project not initialized. Run 'hereya init' first.");
+        }
+        // Get current git branch
+        const gitBranch = await gitUtils.getCurrentGitBranch(projectRootDir);
+        // Sanitize branch name
+        const sanitizedBranch = gitUtils.sanitizeBranchName(gitBranch);
+        if (!sanitizedBranch) {
+            this.error('Branch name contains only special characters and cannot be used for workspace name');
+        }
+        // Get commit SHA if pin flag is set
+        const commitSHA = flags.pin ? await gitUtils.getShortCommitSHA(projectRootDir) : null;
+        // Build workspace name parts
+        const parts = [loadConfigOutput.config.project, sanitizedBranch];
+        if (flags.profile)
+            parts.push(flags.profile);
+        if (commitSHA)
+            parts.push(commitSHA);
+        const workspaceName = parts.join('---');
+        // Create workspace with mirror
+        const createArgs = [workspaceName, '--mirror', loadConfigOutput.config.workspace];
+        if (projectRootDir) {
+            createArgs.push('--chdir', projectRootDir);
+        }
+        if (flags.debug) {
+            createArgs.push('--debug');
+        }
+        if (flags.profile) {
+            createArgs.push('--profile', flags.profile);
+        }
+        await WorkspaceCreate.run(createArgs);
+        // Run down command with the new workspace and all flags
+        const downArgs = ['--workspace', workspaceName];
+        // Pass through all flags
+        if (flags.chdir)
+            downArgs.push('--chdir', flags.chdir);
+        if (flags.debug)
+            downArgs.push('--debug');
+        if (flags.deploy)
+            downArgs.push('--deploy');
+        for (const pkg of flags.select) {
+            downArgs.push('--select', pkg);
+        }
+        await Down.run(downArgs);
+        // Delete state
+        const deleteStateArgs = ['--workspace', workspaceName];
+        if (projectRootDir) {
+            deleteStateArgs.push('--chdir', projectRootDir);
+        }
+        await DeleteState.run(deleteStateArgs);
+        // Delete workspace
+        const deleteWorkspaceArgs = [workspaceName];
+        await WorkspaceDelete.run(deleteWorkspaceArgs);
+    }
+}

package/dist/commands/flow/up/index.d.ts

@@ -0,0 +1,14 @@
+import { Command } from '@oclif/core';
+export default class FlowUp extends Command {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        chdir: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        deploy: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        pin: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        select: import("@oclif/core/interfaces").OptionFlag<string[], import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/flow/up/index.js

@@ -0,0 +1,99 @@
+import { Command, Flags } from '@oclif/core';
+import { getConfigManager } from '../../../lib/config/index.js';
+import { gitUtils } from '../../../lib/git-utils.js';
+import { setDebug } from '../../../lib/log.js';
+import Up from '../../up/index.js';
+import WorkspaceCreate from '../../workspace/create/index.js';
+export default class FlowUp extends Command {
+    static description = 'Create a git branch-based workspace and provision all packages';
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> --debug',
+        '<%= config.bin %> <%= command.id %> --profile staging',
+        '<%= config.bin %> <%= command.id %> --pin',
+    ];
+    static flags = {
+        chdir: Flags.string({
+            description: `
+        Directory where the command will be executed.
+        If not specified, it defaults to the current working directory.
+        Alternatively, you can define the project root by setting the HEREYA_PROJECT_ROOT_DIR environment variable.
+      `,
+            required: false,
+        }),
+        debug: Flags.boolean({
+            default: false,
+            description: 'enable debug mode',
+        }),
+        deploy: Flags.boolean({
+            description: 'provision deployment companion packages',
+            required: false,
+        }),
+        pin: Flags.boolean({
+            description: 'append git commit SHA to workspace name for commit-specific isolation',
+            required: false,
+        }),
+        profile: Flags.string({
+            description: 'profile to use for the workspace (will be appended to workspace name)',
+            required: false,
+        }),
+        select: Flags.string({
+            char: 's',
+            default: [],
+            description: 'select the packages to provision',
+            multiple: true,
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(FlowUp);
+        setDebug(flags.debug);
+        const projectRootDir = flags.chdir || process.env.HEREYA_PROJECT_ROOT_DIR;
+        // Load project config
+        const configManager = getConfigManager();
+        const loadConfigOutput = await configManager.loadConfig({ projectRootDir });
+        if (!loadConfigOutput.found) {
+            this.error("Project not initialized. Run 'hereya init' first.");
+        }
+        // Get current git branch
+        const gitBranch = await gitUtils.getCurrentGitBranch(projectRootDir);
+        // Sanitize branch name
+        const sanitizedBranch = gitUtils.sanitizeBranchName(gitBranch);
+        if (!sanitizedBranch) {
+            this.error('Branch name contains only special characters and cannot be used for workspace name');
+        }
+        // Get commit SHA if pin flag is set
+        const commitSHA = flags.pin ? await gitUtils.getShortCommitSHA(projectRootDir) : null;
+        // Build workspace name parts
+        const parts = [loadConfigOutput.config.project, sanitizedBranch];
+        if (flags.profile)
+            parts.push(flags.profile);
+        if (commitSHA)
+            parts.push(commitSHA);
+        const workspaceName = parts.join('---');
+        // Create workspace with mirror
+        const createArgs = [workspaceName, '--mirror', loadConfigOutput.config.workspace];
+        if (projectRootDir) {
+            createArgs.push('--chdir', projectRootDir);
+        }
+        if (flags.debug) {
+            createArgs.push('--debug');
+        }
+        if (flags.profile) {
+            createArgs.push('--profile', flags.profile);
+        }
+        await WorkspaceCreate.run(createArgs);
+        // Run up command with the new workspace and all flags
+        const upArgs = ['--workspace', workspaceName];
+        // Pass through all flags
+        if (flags.chdir)
+            upArgs.push('--chdir', flags.chdir);
+        if (flags.debug)
+            upArgs.push('--debug');
+        if (flags.deploy)
+            upArgs.push('--deploy');
+        for (const pkg of flags.select) {
+            upArgs.push('--select', pkg);
+        }
+        await Up.run(upArgs);
+    }
+}

package/dist/commands/remove/index.d.ts

@@ -8,6 +8,7 @@ export default class Remove extends Command {
     static flags: {
         chdir: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        workspace: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/remove/index.js

@@ -30,6 +30,11 @@ export default class Remove extends Command {
             default: false,
             description: 'enable debug mode',
         }),
+        workspace: Flags.string({
+            char: 'w',
+            description: 'name of the workspace to remove the package from (defaults to current workspace)',
+            required: false,
+        }),
     };
     async run() {
         const { args, flags } = await this.parse(Remove);
@@ -53,6 +58,8 @@ export default class Remove extends Command {
                                     throw new Error("Project not initialized. Run 'hereya init' first.");
                                 }
                                 ctx.configOutput = loadConfigOutput;
+                                // Use workspace from flag if provided, otherwise use config workspace
+                                ctx.workspace = flags.workspace || loadConfigOutput.config.workspace;
                                 const { config } = loadConfigOutput;
                                 if (!(ctx.package in (config.packages ?? {})) && !(ctx.package in (config.deploy ?? {}))) {
                                     throw new Error(`Package ${ctx.package} not found in the project.`);
@@ -65,7 +72,7 @@ export default class Remove extends Command {
                             async task(ctx) {
                                 const parameterManager = getParameterManager();
                                 const backend = await getBackend();
-                                const profile = await getProfileFromWorkspace(backend, ctx.configOutput.config.workspace);
+                                const profile = await getProfileFromWorkspace(backend, ctx.workspace);
                                 const parametersOutput = await parameterManager.getPackageParameters({
                                     package: ctx.package,
                                     profile,
@@ -93,7 +100,7 @@ export default class Remove extends Command {
                                     project: ctx.configOutput.config.project,
                                     projectRootDir,
                                     skipDeploy: true,
-                                    workspace: ctx.configOutput.config.workspace,
+                                    workspace: ctx.workspace,
                                 });
                                 if (!destroyOutput.success) {
                                     throw new Error(destroyOutput.reason);
@@ -109,7 +116,7 @@ export default class Remove extends Command {
                                     env: ctx.destroyOutput.env,
                                     infra: ctx.destroyOutput.metadata.infra,
                                     projectRootDir,
-                                    workspace: ctx.configOutput.config.workspace,
+                                    workspace: ctx.workspace,
                                 });
                                 await delay(500);
                             },
@@ -128,11 +135,11 @@ export default class Remove extends Command {
                             title: 'Removing package from hereya manifest',
                         },
                         {
-                            async task() {
+                            async task(ctx) {
                                 const backend = await getBackend();
                                 const configManager = getConfigManager();
                                 const { config: newConfig } = await configManager.loadConfig({ projectRootDir });
-                                await backend.saveState(newConfig);
+                                await backend.saveState(newConfig, ctx.workspace);
                                 await delay(500);
                             },
                             title: 'Saving state',

package/dist/lib/env/index.js

@@ -2,6 +2,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { getExecutor } from '../../executor/index.js';
 import { getAnyPath } from '../filesystem.js';
+import { stripOrgPrefix } from '../org-utils.js';
 import { load, parseYaml, save } from '../yaml-utils.js';
 export class EnvManager {
     async addProjectEnv(input) {
@@ -92,7 +93,8 @@ export class EnvManager {
         return null;
     }
     async getEnvPath(input) {
-        return getAnyPath(path.join(input.projectRootDir ?? process.cwd(), '.hereya', `env.${input.workspace}.yaml`), path.join(input.projectRootDir ?? process.cwd(), '.hereya', `env.${input.workspace}.yml`));
+        const workspaceName = stripOrgPrefix(input.workspace);
+        return getAnyPath(path.join(input.projectRootDir ?? process.cwd(), '.hereya', `env.${workspaceName}.yaml`), path.join(input.projectRootDir ?? process.cwd(), '.hereya', `env.${workspaceName}.yml`));
     }
     async getUserEnvPaths(profile, projectRootDir) {
         const paths = await Promise.all([

package/dist/lib/git-utils.d.ts

@@ -0,0 +1,29 @@
+export declare const gitUtils: {
+    /**
+     * Gets the current git branch name.
+     * @param cwd The working directory to execute git command in
+     * @returns The current branch name
+     * @throws Error if not in a git repository or git command fails
+     */
+    getCurrentGitBranch(cwd?: string): Promise<string>;
+    /**
+     * Gets the short commit SHA of the current HEAD.
+     * @param cwd The working directory to execute git command in
+     * @returns The short commit SHA (7 characters by default)
+     * @throws Error if not in a git repository or git command fails
+     */
+    getShortCommitSHA(cwd?: string): Promise<string>;
+    /**
+     * Checks if the current directory is a git repository.
+     * @param cwd The working directory to check
+     * @returns true if in a git repository, false otherwise
+     */
+    isGitRepository(cwd?: string): Promise<boolean>;
+    /**
+     * Sanitizes a git branch name for use in workspace names.
+     * Keeps only alphanumeric characters, hyphens (-), and underscores (_).
+     * @param branch The branch name to sanitize
+     * @returns The sanitized branch name
+     */
+    sanitizeBranchName(branch: string): string;
+};

package/dist/lib/git-utils.js

@@ -0,0 +1,62 @@
+import { runShell } from './shell.js';
+export const gitUtils = {
+    /**
+     * Gets the current git branch name.
+     * @param cwd The working directory to execute git command in
+     * @returns The current branch name
+     * @throws Error if not in a git repository or git command fails
+     */
+    async getCurrentGitBranch(cwd) {
+        try {
+            const { stdout } = await runShell('git', ['rev-parse', '--abbrev-ref', 'HEAD'], { directory: cwd });
+            return stdout.trim();
+        }
+        catch (error) {
+            if (error.message.includes('not a git repository') || error.message.includes('exit code "128"')) {
+                throw new Error('Not in a git repository. The flow commands require git integration.');
+            }
+            throw new Error(`Failed to get current git branch: ${error.message}`);
+        }
+    },
+    /**
+     * Gets the short commit SHA of the current HEAD.
+     * @param cwd The working directory to execute git command in
+     * @returns The short commit SHA (7 characters by default)
+     * @throws Error if not in a git repository or git command fails
+     */
+    async getShortCommitSHA(cwd) {
+        try {
+            const { stdout } = await runShell('git', ['rev-parse', '--short', 'HEAD'], { directory: cwd });
+            return stdout.trim();
+        }
+        catch (error) {
+            if (error.message.includes('not a git repository') || error.message.includes('exit code "128"')) {
+                throw new Error('Not in a git repository. The flow commands require git integration.');
+            }
+            throw new Error(`Failed to get commit SHA: ${error.message}`);
+        }
+    },
+    /**
+     * Checks if the current directory is a git repository.
+     * @param cwd The working directory to check
+     * @returns true if in a git repository, false otherwise
+     */
+    async isGitRepository(cwd) {
+        try {
+            await runShell('git', ['rev-parse', '--git-dir'], { directory: cwd });
+            return true;
+        }
+        catch {
+            return false;
+        }
+    },
+    /**
+     * Sanitizes a git branch name for use in workspace names.
+     * Keeps only alphanumeric characters, hyphens (-), and underscores (_).
+     * @param branch The branch name to sanitize
+     * @returns The sanitized branch name
+     */
+    sanitizeBranchName(branch) {
+        return branch.replaceAll(/[^a-zA-Z0-9_-]/g, '');
+    }
+};

package/oclif.manifest.json

@@ -36,6 +36,15 @@
           "hasDynamicHelp": false,
           "multiple": true,
           "type": "option"
+        },
+        "workspace": {
+          "char": "w",
+          "description": "name of the workspace to add the package to (defaults to current workspace)",
+          "name": "workspace",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -525,6 +534,15 @@
           "name": "debug",
           "allowNo": false,
           "type": "boolean"
+        },
+        "workspace": {
+          "char": "w",
+          "description": "name of the workspace to remove the package from (defaults to current workspace)",
+          "name": "workspace",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -921,6 +939,154 @@
         "index.js"
       ]
     },
+    "flow:down": {
+      "aliases": [],
+      "args": {},
+      "description": "Create a git branch-based workspace and destroy all packages",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> --debug",
+        "<%= config.bin %> <%= command.id %> --profile staging",
+        "<%= config.bin %> <%= command.id %> --pin"
+      ],
+      "flags": {
+        "chdir": {
+          "description": "\n        Directory where the command will be executed.\n        If not specified, it defaults to the current working directory.\n        Alternatively, you can define the project root by setting the HEREYA_PROJECT_ROOT_DIR environment variable.\n      ",
+          "name": "chdir",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "debug": {
+          "description": "enable debug mode",
+          "name": "debug",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "deploy": {
+          "description": "destroy deployment companion packages",
+          "name": "deploy",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "pin": {
+          "description": "append git commit SHA to workspace name for commit-specific isolation",
+          "name": "pin",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "profile": {
+          "description": "profile to use for the workspace (will be appended to workspace name)",
+          "name": "profile",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "select": {
+          "char": "s",
+          "description": "select the packages to destroy",
+          "name": "select",
+          "default": [],
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "flow:down",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "flow",
+        "down",
+        "index.js"
+      ]
+    },
+    "flow:up": {
+      "aliases": [],
+      "args": {},
+      "description": "Create a git branch-based workspace and provision all packages",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> --debug",
+        "<%= config.bin %> <%= command.id %> --profile staging",
+        "<%= config.bin %> <%= command.id %> --pin"
+      ],
+      "flags": {
+        "chdir": {
+          "description": "\n        Directory where the command will be executed.\n        If not specified, it defaults to the current working directory.\n        Alternatively, you can define the project root by setting the HEREYA_PROJECT_ROOT_DIR environment variable.\n      ",
+          "name": "chdir",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "debug": {
+          "description": "enable debug mode",
+          "name": "debug",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "deploy": {
+          "description": "provision deployment companion packages",
+          "name": "deploy",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "pin": {
+          "description": "append git commit SHA to workspace name for commit-specific isolation",
+          "name": "pin",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "profile": {
+          "description": "profile to use for the workspace (will be appended to workspace name)",
+          "name": "profile",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "select": {
+          "char": "s",
+          "description": "select the packages to provision",
+          "name": "select",
+          "default": [],
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "flow:up",
+      "pluginAlias": "hereya-cli",
+      "pluginName": "hereya-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "flow",
+        "up",
+        "index.js"
+      ]
+    },
     "workspace:create": {
       "aliases": [],
       "args": {
@@ -1360,5 +1526,5 @@
       ]
     }
   },
-  "version": "0.46.0"
+  "version": "0.47.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hereya-cli",
   "description": "Infrastructure as Package",
-  "version": "0.46.0",
+  "version": "0.47.0",
   "author": "Hereya Developers",
   "bin": {
     "hereya": "./bin/run.js"