hereya-cli 0.49.0 → 0.50.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g hereya-cli
 $ hereya COMMAND
 running command...
 $ hereya (--version)
-hereya-cli/0.49.0 linux-x64 node-v22.17.1
+hereya-cli/0.50.0 linux-x64 node-v22.17.1
 $ hereya --help [COMMAND]
 USAGE
   $ hereya COMMAND
@@ -98,7 +98,7 @@ EXAMPLES
   $ hereya add cloudy/docker_postgres
 ```
 
-_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/add/index.ts)_
+_See code: [src/commands/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/add/index.ts)_
 
 ## `hereya bootstrap INFRASTRUCTURETYPE`
 
@@ -123,7 +123,7 @@ EXAMPLES
   $ hereya bootstrap local
 ```
 
-_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/bootstrap/index.ts)_
+_See code: [src/commands/bootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/bootstrap/index.ts)_
 
 ## `hereya config export-backend [FILE]`
 
@@ -145,7 +145,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.49.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.50.0/src/commands/config/export-backend/index.ts)_
 
 ## `hereya config get-backend`
 
@@ -162,7 +162,7 @@ EXAMPLES
   $ hereya config get-backend
 ```
 
-_See code: [src/commands/config/get-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.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.50.0/src/commands/config/get-backend/index.ts)_
 
 ## `hereya config import-backend FILE`
 
@@ -182,7 +182,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.49.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.50.0/src/commands/config/import-backend/index.ts)_
 
 ## `hereya config use-backend TYPE`
 
@@ -204,7 +204,7 @@ EXAMPLES
   $ hereya config use-backend local
 ```
 
-_See code: [src/commands/config/use-backend/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.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.50.0/src/commands/config/use-backend/index.ts)_
 
 ## `hereya delete-state`
 
@@ -230,7 +230,7 @@ EXAMPLES
   $ hereya delete-state --workspace staging
 ```
 
-_See code: [src/commands/delete-state/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/delete-state/index.ts)_
+_See code: [src/commands/delete-state/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/delete-state/index.ts)_
 
 ## `hereya deploy`
 
@@ -255,7 +255,7 @@ EXAMPLES
   $ hereya deploy
 ```
 
-_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/deploy/index.ts)_
+_See code: [src/commands/deploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/deploy/index.ts)_
 
 ## `hereya down`
 
@@ -282,7 +282,7 @@ EXAMPLES
   $ hereya down
 ```
 
-_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/down/index.ts)_
+_See code: [src/commands/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/down/index.ts)_
 
 ## `hereya env [NAME]`
 
@@ -313,7 +313,7 @@ EXAMPLES
   $ hereya env -w dev -l
 ```
 
-_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/env/index.ts)_
+_See code: [src/commands/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/env/index.ts)_
 
 ## `hereya env set [NAME]`
 
@@ -340,7 +340,7 @@ 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.49.0/src/commands/env/set/index.ts)_
+_See code: [src/commands/env/set/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/env/set/index.ts)_
 
 ## `hereya flow add PACKAGE`
 
@@ -378,7 +378,7 @@ EXAMPLES
   $ hereya flow add cloudy/docker_postgres -p DB_NAME=mydb -p DB_USER=admin
 ```
 
-_See code: [src/commands/flow/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/flow/add/index.ts)_
+_See code: [src/commands/flow/add/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/flow/add/index.ts)_
 
 ## `hereya flow down`
 
@@ -412,7 +412,7 @@ EXAMPLES
   $ hereya flow down --pin
 ```
 
-_See code: [src/commands/flow/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/flow/down/index.ts)_
+_See code: [src/commands/flow/down/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/flow/down/index.ts)_
 
 ## `hereya flow env [NAME]`
 
@@ -446,7 +446,7 @@ EXAMPLES
   $ hereya flow env -l
 ```
 
-_See code: [src/commands/flow/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/flow/env/index.ts)_
+_See code: [src/commands/flow/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/flow/env/index.ts)_
 
 ## `hereya flow remove PACKAGE`
 
@@ -476,7 +476,7 @@ EXAMPLES
   $ hereya flow remove cloudy/docker_postgres --profile staging
 ```
 
-_See code: [src/commands/flow/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/flow/remove/index.ts)_
+_See code: [src/commands/flow/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/flow/remove/index.ts)_
 
 ## `hereya flow run CMD`
 
@@ -505,7 +505,7 @@ EXAMPLES
   $ hereya flow run --pin -- npm test
 ```
 
-_See code: [src/commands/flow/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/flow/run/index.ts)_
+_See code: [src/commands/flow/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/flow/run/index.ts)_
 
 ## `hereya flow up`
 
@@ -539,7 +539,7 @@ EXAMPLES
   $ hereya flow up --pin
 ```
 
-_See code: [src/commands/flow/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/flow/up/index.ts)_
+_See code: [src/commands/flow/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/flow/up/index.ts)_
 
 ## `hereya help [COMMAND]`
 
@@ -596,7 +596,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.49.0/src/commands/import/index.ts)_
+_See code: [src/commands/import/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/import/index.ts)_
 
 ## `hereya init PROJECT`
 
@@ -622,7 +622,7 @@ EXAMPLES
   $ hereya init myProject -w=defaultWorkspace --chdir=./myProject
 ```
 
-_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/init/index.ts)_
+_See code: [src/commands/init/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/init/index.ts)_
 
 ## `hereya login [URL]`
 
@@ -651,7 +651,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.49.0/src/commands/login/index.ts)_
+_See code: [src/commands/login/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/login/index.ts)_
 
 ## `hereya logout`
 
@@ -668,7 +668,7 @@ EXAMPLES
   $ hereya logout
 ```
 
-_See code: [src/commands/logout/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/logout/index.ts)_
+_See code: [src/commands/logout/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/logout/index.ts)_
 
 ## `hereya remove PACKAGE`
 
@@ -696,7 +696,7 @@ EXAMPLES
   $ hereya remove cloudy/docker_postgres
 ```
 
-_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/remove/index.ts)_
+_See code: [src/commands/remove/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/remove/index.ts)_
 
 ## `hereya run CMD`
 
@@ -722,7 +722,7 @@ EXAMPLES
   $ hereya run -w uat -- node index.js
 ```
 
-_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/run/index.ts)_
+_See code: [src/commands/run/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/run/index.ts)_
 
 ## `hereya unbootstrap INFRASTRUCTURETYPE`
 
@@ -747,7 +747,7 @@ EXAMPLES
   $ hereya unbootstrap local
 ```
 
-_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/unbootstrap/index.ts)_
+_See code: [src/commands/unbootstrap/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/unbootstrap/index.ts)_
 
 ## `hereya undeploy`
 
@@ -772,7 +772,7 @@ EXAMPLES
   $ hereya undeploy
 ```
 
-_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/undeploy/index.ts)_
+_See code: [src/commands/undeploy/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/undeploy/index.ts)_
 
 ## `hereya up`
 
@@ -799,7 +799,7 @@ EXAMPLES
   $ hereya up
 ```
 
-_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/up/index.ts)_
+_See code: [src/commands/up/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/up/index.ts)_
 
 ## `hereya workspace create NAME`
 
@@ -823,7 +823,7 @@ EXAMPLES
   $ hereya workspace create dev
 ```
 
-_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/workspace/create/index.ts)_
+_See code: [src/commands/workspace/create/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/workspace/create/index.ts)_
 
 ## `hereya workspace delete NAME`
 
@@ -843,7 +843,7 @@ EXAMPLES
   $ hereya workspace delete dev
 ```
 
-_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/workspace/delete/index.ts)_
+_See code: [src/commands/workspace/delete/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/workspace/delete/index.ts)_
 
 ## `hereya workspace env [NAME]`
 
@@ -869,7 +869,7 @@ EXAMPLES
   $ hereya workspace env myEnv -w dev
 ```
 
-_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/workspace/env/index.ts)_
+_See code: [src/commands/workspace/env/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/workspace/env/index.ts)_
 
 ## `hereya workspace env set`
 
@@ -893,7 +893,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.49.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.50.0/src/commands/workspace/env/set/index.ts)_
 
 ## `hereya workspace env unset`
 
@@ -914,7 +914,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.49.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.50.0/src/commands/workspace/env/unset/index.ts)_
 
 ## `hereya workspace install PACKAGE`
 
@@ -941,7 +941,7 @@ EXAMPLES
   $ hereya workspace install hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/workspace/install/index.ts)_
+_See code: [src/commands/workspace/install/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/workspace/install/index.ts)_
 
 ## `hereya workspace list`
 
@@ -958,7 +958,7 @@ EXAMPLES
   $ hereya workspace list
 ```
 
-_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/workspace/list/index.ts)_
+_See code: [src/commands/workspace/list/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/workspace/list/index.ts)_
 
 ## `hereya workspace set-profile PROFILE`
 
@@ -981,7 +981,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.49.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.50.0/src/commands/workspace/set-profile/index.ts)_
 
 ## `hereya workspace uninstall PACKAGE`
 
@@ -1008,5 +1008,5 @@ EXAMPLES
   $ hereya workspace uninstall hereya/aws-cognito
 ```
 
-_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.49.0/src/commands/workspace/uninstall/index.ts)_
+_See code: [src/commands/workspace/uninstall/index.ts](https://github.com/hereya/hereya-cli/blob/v0.50.0/src/commands/workspace/uninstall/index.ts)_
 <!-- commandsstop -->

package/dist/backend/cloud/cloud-backend.js

@@ -1,4 +1,4 @@
-import { addOrgPrefix, extractOrgPrefix } from '../../lib/org-utils.js';
+import { resolveWorkspaceName } from '../../lib/workspace-utils.js';
 export class CloudBackend {
     config;
     constructor(config) {
@@ -212,13 +212,7 @@ export class CloudBackend {
     }
     async getWorkspaceEnv(input) {
         // Apply org prefix if project has one and workspace doesn't
-        let workspaceName = input.workspace;
-        if (input.project) {
-            const { org: projectOrg } = extractOrgPrefix(input.project);
-            if (projectOrg) {
-                workspaceName = addOrgPrefix(projectOrg, input.workspace);
-            }
-        }
+        const workspaceName = resolveWorkspaceName(input.workspace, input.project);
         const workspace$ = await this.getWorkspace(workspaceName);
         if (!workspace$.found) {
             return {

package/dist/backend/file.js

@@ -1,6 +1,6 @@
 import { randomUUID } from 'node:crypto';
 import { stringify } from 'yaml';
-import { addOrgPrefix, extractOrgPrefix } from '../lib/org-utils.js';
+import { resolveWorkspaceName } from '../lib/workspace-utils.js';
 import { parseYaml } from '../lib/yaml-utils.js';
 import { WorkspaceSchema, } from './common.js';
 export class FileBackend {
@@ -292,13 +292,7 @@ export class FileBackend {
     }
     async getWorkspaceEnv(input) {
         // Apply org prefix if project has one and workspace doesn't
-        let workspaceName = input.workspace;
-        if (input.project) {
-            const { org: projectOrg } = extractOrgPrefix(input.project);
-            if (projectOrg) {
-                workspaceName = addOrgPrefix(projectOrg, input.workspace);
-            }
-        }
+        const workspaceName = resolveWorkspaceName(input.workspace, input.project);
         const workspace$ = await this.getWorkspace(workspaceName);
         if (!workspace$.found) {
             return {

package/dist/commands/add/index.js

@@ -83,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.workspace);
+                                const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                                 const parametersOutput = await parameterManager.getPackageParameters({
                                     package: ctx.package,
                                     profile,

package/dist/commands/deploy/index.js

@@ -55,7 +55,7 @@ export default class Deploy extends Command {
             {
                 async task(ctx) {
                     const backend = await getBackend();
-                    const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                    const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                     const envManager = getEnvManager();
                     const getProjectEnvOutput = await envManager.getProjectEnv({
                         markSecret: true,
@@ -106,7 +106,7 @@ export default class Deploy extends Command {
                         async task(_, task) {
                             const parameterManager = getParameterManager();
                             const backend = await getBackend();
-                            const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                            const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                             const { parameters } = await parameterManager.getPackageParameters({
                                 package: packageName,
                                 profile,
@@ -146,7 +146,7 @@ export default class Deploy extends Command {
                         async task(_, task) {
                             const parameterManager = getParameterManager();
                             const backend = await getBackend();
-                            const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                            const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                             const { parameters } = await parameterManager.getPackageParameters({
                                 package: packageName,
                                 profile,
@@ -192,7 +192,7 @@ export default class Deploy extends Command {
                         async task(_, task) {
                             const parameterManager = getParameterManager();
                             const backend = await getBackend();
-                            const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                            const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                             const { parameters } = await parameterManager.getPackageParameters({
                                 package: packageName,
                                 profile,
@@ -279,7 +279,7 @@ export default class Deploy extends Command {
                 skip: (ctx) => ctx.deployPackages.length === 0,
                 async task(ctx, task) {
                     const backend = await getBackend();
-                    const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                    const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                     const envManager = getEnvManager();
                     const getProjectEnvOutput = await envManager.getProjectEnv({
                         markSecret: true,
@@ -298,7 +298,7 @@ export default class Deploy extends Command {
                         async task(_, task) {
                             const parameterManager = getParameterManager();
                             const backend = await getBackend();
-                            const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                            const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                             const { parameters } = await parameterManager.getPackageParameters({
                                 package: packageName,
                                 profile,

package/dist/commands/down/index.js

@@ -96,7 +96,7 @@ export default class Down extends Command {
                                     async task(_, task) {
                                         const parameterManager = getParameterManager();
                                         const backend = await getBackend();
-                                        const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                                        const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                                         const { parameters } = await parameterManager.getPackageParameters({
                                             package: packageName,
                                             profile,

package/dist/commands/env/index.js

@@ -49,7 +49,7 @@ export default class Env extends Command {
             this.error('you must specify a workspace to print the env vars for');
         }
         const backend = await getBackend();
-        const profile = await getProfileFromWorkspace(backend, workspace);
+        const profile = await getProfileFromWorkspace(backend, workspace, config.project);
         const envManager = getEnvManager();
         const getProjectEnvOutput = await envManager.getProjectEnv({
             profile,

package/dist/commands/import/index.js

@@ -90,7 +90,7 @@ export default class Import extends Command {
                                 const userSpecifiedParameters = arrayOfStringToObject(ctx.userSpecifiedParameters);
                                 const parameterManager = getParameterManager();
                                 const backend = await getBackend();
-                                const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                                const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                                 const parametersOutput = await parameterManager.getPackageParameters({
                                     package: ctx.package,
                                     profile,

package/dist/commands/remove/index.js

@@ -72,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.workspace);
+                                const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                                 const parametersOutput = await parameterManager.getPackageParameters({
                                     package: ctx.package,
                                     profile,

package/dist/commands/run/index.js

@@ -43,7 +43,7 @@ export default class Run extends Command {
             this.error('you must specify a workspace to run the command in');
         }
         const backend = await getBackend();
-        const profile = await getProfileFromWorkspace(backend, workspace);
+        const profile = await getProfileFromWorkspace(backend, workspace, config.project);
         const envManager = getEnvManager();
         const getProjectEnvOutput = await envManager.getProjectEnv({
             profile,

package/dist/commands/undeploy/index.js

@@ -56,7 +56,7 @@ export default class Undeploy extends Command {
                         {
                             async task(ctx) {
                                 const backend = await getBackend();
-                                const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                                const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                                 const envManager = getEnvManager();
                                 const getProjectEnvOutput = await envManager.getProjectEnv({
                                     markSecret: true,
@@ -111,7 +111,7 @@ export default class Undeploy extends Command {
                                     async task(_, task) {
                                         const parameterManager = getParameterManager();
                                         const backend = await getBackend();
-                                        const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                                        const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                                         const { parameters } = await parameterManager.getPackageParameters({
                                             package: packageName,
                                             profile,
@@ -151,7 +151,7 @@ export default class Undeploy extends Command {
                                     async task(_, task) {
                                         const parameterManager = getParameterManager();
                                         const backend = await getBackend();
-                                        const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                                        const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                                         const { parameters } = await parameterManager.getPackageParameters({
                                             package: packageName,
                                             profile,

package/dist/commands/up/index.js

@@ -104,7 +104,7 @@ export default class Up extends Command {
                                     async task(_, task) {
                                         const parameterManager = getParameterManager();
                                         const backend = await getBackend();
-                                        const profile = await getProfileFromWorkspace(backend, workspace);
+                                        const profile = await getProfileFromWorkspace(backend, workspace, ctx.configOutput.config.project);
                                         const { parameters } = await parameterManager.getPackageParameters({
                                             package: packageName,
                                             profile,
@@ -150,7 +150,7 @@ export default class Up extends Command {
                                     async task(_, task) {
                                         const parameterManager = getParameterManager();
                                         const backend = await getBackend();
-                                        const profile = await getProfileFromWorkspace(backend, ctx.workspace);
+                                        const profile = await getProfileFromWorkspace(backend, ctx.workspace, ctx.configOutput.config.project);
                                         const { parameters } = await parameterManager.getPackageParameters({
                                             package: packageName,
                                             profile,

package/dist/lib/org-utils.js

@@ -9,7 +9,7 @@ export function extractOrgPrefix(name) {
     return { name };
 }
 export function addOrgPrefix(org, name) {
-    if (!org || name.includes('/')) {
+    if (!org || !name || name.includes('/')) {
         return name;
     }
     return `${org}/${name}`;

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

@@ -1,2 +1,2 @@
 import { Backend } from '../backend/common.js';
-export declare function getProfileFromWorkspace(backend: Backend, workspaceName: string): Promise<string>;
+export declare function getProfileFromWorkspace(backend: Backend, workspaceName: string, project?: string): Promise<string>;

package/dist/lib/profile-utils.js

@@ -1,5 +1,8 @@
-export async function getProfileFromWorkspace(backend, workspaceName) {
-    const workspace$ = await backend.getWorkspace(workspaceName);
+import { resolveWorkspaceName } from './workspace-utils.js';
+export async function getProfileFromWorkspace(backend, workspaceName, project) {
+    // Resolve workspace name with org prefix if needed
+    const resolvedWorkspaceName = resolveWorkspaceName(workspaceName, project);
+    const workspace$ = await backend.getWorkspace(resolvedWorkspaceName);
     if (!workspace$.found || workspace$.hasError) {
         // Fallback to workspace name if workspace not found
         return workspaceName;

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

@@ -0,0 +1,16 @@
+/**
+ * Resolves a workspace name by adding org prefix from project if needed.
+ *
+ * If the project has an org prefix and the workspace doesn't already have one,
+ * the org prefix from the project will be added to the workspace name.
+ *
+ * @param workspace - The workspace name
+ * @param project - Optional project name that may contain org prefix
+ * @returns The resolved workspace name
+ *
+ * @example
+ * resolveWorkspaceName('dev', 'myorg/myproject') // returns 'myorg/dev'
+ * resolveWorkspaceName('myorg/dev', 'myorg/myproject') // returns 'myorg/dev'
+ * resolveWorkspaceName('dev', 'myproject') // returns 'dev'
+ */
+export declare function resolveWorkspaceName(workspace: string, project?: string): string;

package/dist/lib/workspace-utils.js

@@ -0,0 +1,26 @@
+import { addOrgPrefix, extractOrgPrefix } from './org-utils.js';
+/**
+ * Resolves a workspace name by adding org prefix from project if needed.
+ *
+ * If the project has an org prefix and the workspace doesn't already have one,
+ * the org prefix from the project will be added to the workspace name.
+ *
+ * @param workspace - The workspace name
+ * @param project - Optional project name that may contain org prefix
+ * @returns The resolved workspace name
+ *
+ * @example
+ * resolveWorkspaceName('dev', 'myorg/myproject') // returns 'myorg/dev'
+ * resolveWorkspaceName('myorg/dev', 'myorg/myproject') // returns 'myorg/dev'
+ * resolveWorkspaceName('dev', 'myproject') // returns 'dev'
+ */
+export function resolveWorkspaceName(workspace, project) {
+    if (!project) {
+        return workspace;
+    }
+    const { org: projectOrg } = extractOrgPrefix(project);
+    if (!projectOrg) {
+        return workspace;
+    }
+    return addOrgPrefix(projectOrg, workspace);
+}

package/oclif.manifest.json

@@ -1770,5 +1770,5 @@
       ]
     }
   },
-  "version": "0.49.0"
+  "version": "0.50.0"
 }

package/package.json

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