@zuplo/cli 6.69.4 → 6.69.5

package/dist/common/middleware/get-environment-param.js

@@ -4,7 +4,7 @@ import { logger } from "../logger.js";
 import { printCriticalFailureToConsoleAndExit, textOrJson } from "../output.js";
 import settings from "../settings.js";
 import { isInteractiveTerminal } from "../terminal.js";
-import { prettyPrintEnvironmentPrompt } from "../utils/pretty-print-environment-prompt.js";
+import { buildEnvironmentPromptChoices } from "../utils/build-environment-prompt-choices.js";
 export async function fetchEnvironment(argv) {
     if (argv.environment && typeof argv.environment === "string") {
         return;
@@ -69,26 +69,10 @@ export async function fetchEnvironment(argv) {
             if (environmentJsonFromDeveloperAPI.data.length === 0) {
                 await printCriticalFailureToConsoleAndExit("Error: You don't have any environments for this project to link against. First, deploy this project using zuplo deploy and then link against that.");
             }
-            const environments = environmentJsonFromDeveloperAPI.data
-                .map((env) => {
-                return {
-                    [prettyPrintEnvironmentPrompt(env, false)]: env.name,
-                };
-            })
-                .reduce((acc, curr) => {
-                return { ...acc, ...curr };
-            });
             try {
                 argv.environment = await select({
                     message: "Select the environment",
-                    choices: Object.entries(environments)
-                        .map(([key, value]) => {
-                        return {
-                            name: key,
-                            value: value,
-                        };
-                    })
-                        .sort((a, b) => a.name.localeCompare(b.name)),
+                    choices: buildEnvironmentPromptChoices(environmentJsonFromDeveloperAPI.data),
                 });
             }
             catch (error) {

package/dist/common/middleware/get-environment-param.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-environment-param.js","sourceRoot":"","sources":["../../../src/common/middleware/get-environment-param.ts"],"names":[],"mappings":"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","sourcesContent":["import { select } from \"@inquirer/prompts\";\nimport { simpleGit } from \"simple-git\";\nimport { Environment } from \"../api/lib.js\";\nimport { logger } from \"../logger.js\";\nimport { printCriticalFailureToConsoleAndExit, textOrJson } from \"../output.js\";\nimport settings from \"../settings.js\";\nimport { isInteractiveTerminal } from \"../terminal.js\";\nimport { prettyPrintEnvironmentPrompt } from \"../utils/pretty-print-environment-prompt.js\";\n\n/**\n * Middleware that ensures a environment is provided in argv. If not, prompts the user.\n * Note: must be called after get account param and get project param.\n */\nexport async function fetchEnvironment(argv: { [key: string]: unknown }) {\n  if (argv.environment && typeof argv.environment === \"string\") {\n    return;\n  }\n\n  if (!argv.account || typeof argv.account !== \"string\") {\n    throw new Error(\"Invalid state: account is not set.\");\n  }\n  if (!argv.project || typeof argv.project !== \"string\") {\n    throw new Error(\"Invalid state: project is not set.\");\n  }\n\n  // 1. Check if the dir argument is set and if we are in a git repository\n  //    If we are, get the current branch and use that as the environment name.\n  const branch = await getGitBranch(argv);\n\n  if (branch && !argv[\"fetch-environments\"]) {\n    // If the branch is set, use that as the environment name\n    argv.environment = branch;\n  } else {\n    // In non-interactive environments, --environment must be passed explicitly.\n    // We check here, before the API calls, to avoid unnecessary network round-trips.\n    if (!isInteractiveTerminal()) {\n      await printCriticalFailureToConsoleAndExit(\n        \"Error: --environment is required in non-interactive environments (e.g. CI/CD).\\nUse the --environment flag to specify an environment name.\"\n      );\n      return;\n    }\n\n    const baseUrl = `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/environments`;\n\n    const queryParams: Record<string, string> = {\n      // This is safe because of the previous middleware where we set the account and project.\n      accountName: argv.account!,\n      projectName: argv.project!,\n    };\n\n    // Create the query string using URLSearchParams\n    const url = new URL(baseUrl);\n    url.search = new URLSearchParams(queryParams).toString();\n    const response = await fetch(url, {\n      method: \"GET\",\n      headers: {\n        // biome-ignore lint/style/useNamingConvention: External API property\n        Authorization: `Bearer ${argv.authToken}`,\n      },\n    });\n\n    if (response.ok) {\n      const environmentJsonFromDeveloperAPI = (await response.json()) as {\n        data: Environment[];\n      };\n\n      // Also fetch working-copy deployments, which are not returned by the\n      // /v1/environments endpoint (it only returns self-managed and deployer-owned environments).\n      const deploymentsUrl = new URL(\n        `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${argv.account}/projects/${argv.project}/deployments`\n      );\n      const deploymentsResponse = await fetch(deploymentsUrl, {\n        method: \"GET\",\n        headers: {\n          // biome-ignore lint/style/useNamingConvention: External API property\n          Authorization: `Bearer ${argv.authToken}`,\n        },\n      });\n\n      if (deploymentsResponse.ok) {\n        const { data: deployments } = (await deploymentsResponse.json()) as {\n          data: Array<{\n            name: string;\n            accountName: string;\n            projectName: string;\n            branchName: string;\n            environmentType: string;\n            createdOn: string;\n          }>;\n        };\n\n        const workingCopies: Environment[] = deployments\n          .filter((d) => d.environmentType === \"WORKING_COPY\")\n          .map((d) => ({\n            name: d.name,\n            accountName: d.accountName,\n            projectName: d.projectName,\n            branchName: d.branchName,\n            environmentType: \"working_copy\",\n            createdOn: new Date(d.createdOn),\n          }));\n\n        environmentJsonFromDeveloperAPI.data.push(...workingCopies);\n      } else {\n        logger.debug(\n          {\n            status: deploymentsResponse.status,\n            statusText: deploymentsResponse.statusText,\n          },\n          \"Failed to fetch working-copy deployments for project\"\n        );\n      }\n\n      if (environmentJsonFromDeveloperAPI.data.length === 0) {\n        await printCriticalFailureToConsoleAndExit(\n          \"Error: You don't have any environments for this project to link against. First, deploy this project using zuplo deploy and then link against that.\"\n        );\n      }\n\n      // TODO: This logic doesn't work for working copies anymore due to\n      // https://github.com/zuplo/core/blob/main/apps/tenant-api/prisma/migrations/v2_20250711155424_add-working-copy-main-check/migration.sql\n      // and https://github.com/zuplo/core/blob/6595268b9d2e5edfb3a20cbb086ccd363cf115f9/apps/tenant-api/src/routes/managed-dedicated/environments.ts#L96-L102\n      // Leaving this logic commented out for now since we may want to bring it back.\n      // let numDevelopmentEnvironments =\n      //   environmentJsonFromDeveloperAPI.data.filter((env) => {\n      //     return env.environmentType === \"development\";\n      //   }).length;\n\n      // if (numDevelopmentEnvironments <= 0) {\n      //   // Create one on-the-fly\n      //   const createDevelopmenEnvironmentResponse = await fetch(`${baseUrl}`, {\n      //     method: \"POST\",\n      //     headers: {\n      //       authorization: `Bearer ${argv.authToken}`,\n      //       \"Content-Type\": \"application/json\",\n      //     },\n      //     body: JSON.stringify({\n      //       accountName: argv.account,\n      //       projectName: argv.project,\n      //       environmentType: \"development\",\n      //     }),\n      //   });\n\n      //   if (!createDevelopmenEnvironmentResponse.ok) {\n      //     console.log(await createDevelopmenEnvironmentResponse.json());\n      //     logger.debug(\n      //       {\n      //         status: createDevelopmenEnvironmentResponse.status,\n      //         statusText: createDevelopmenEnvironmentResponse.statusText,\n      //       },\n      //       \"Failed to create a new instance of development environment\"\n      //     );\n      //     await printCriticalFailureToConsoleAndExit(\n      //       \"Failed to create a new development environment. Please try again later.\"\n      //     );\n      //   }\n\n      //   numDevelopmentEnvironments++;\n\n      //   // Re-fetch\n      //   const updatedResponse = await fetch(url, {\n      //     headers: {\n      //       authorization: `Bearer ${argv.authToken}`,\n      //     },\n      //   });\n\n      //   environmentJsonFromDeveloperAPI = (await updatedResponse.json()) as {\n      //     data: Environment[];\n      //   };\n      // }\n\n      const environments = environmentJsonFromDeveloperAPI.data\n        .map((env) => {\n          return {\n            // Pass false: we always show the real env name in the selection list,\n            // never collapse development instances to \"Default for local development\".\n            [prettyPrintEnvironmentPrompt(env, false)]: env.name,\n          };\n        })\n        .reduce((acc, curr) => {\n          // biome-ignore lint/performance/noAccumulatingSpread: Migrated from ESLint\n          return { ...acc, ...curr };\n        });\n\n      try {\n        argv.environment = await select({\n          message: \"Select the environment\",\n          choices: Object.entries(environments)\n            .map(([key, value]) => {\n              return {\n                name: key,\n                value: value,\n              };\n            })\n            .sort((a, b) => a.name.localeCompare(b.name)),\n        });\n      } catch (error) {\n        if (error.isTtyError || error.name === \"ExitPromptError\") {\n          process.exit(1);\n        }\n        logger.trace(\"Failed to select environment\", error);\n        process.exit(1);\n      }\n    } else {\n      logger.trace(\n        {\n          status: response.status,\n          statusText: response.statusText,\n          response: textOrJson(await response.text()),\n        },\n        \"Failed to request environments for project\"\n      );\n      await printCriticalFailureToConsoleAndExit(\n        \"Error: Failed to request environments for the project.\"\n      );\n    }\n  }\n}\nasync function getGitBranch(argv: { [key: string]: unknown }) {\n  let branch: string | undefined;\n  const dir = argv.dir;\n  if (dir && typeof dir === \"string\") {\n    const git = simpleGit({ baseDir: dir });\n    const isGitRepo = await git.checkIsRepo();\n    if (isGitRepo) {\n      // Get the current branch from Git\n      const status = await git.status();\n      if (!status.current) {\n        throw new Error(\"Invalid state: Directory is in detached head state.\");\n      }\n      branch = status.current.trim();\n\n      // @NOTE - gitlab returns HEAD as the current branch when running git.status()\n      // https://forum.gitlab.com/t/why-i-cant-get-the-branch-name/72462/6\n      if (branch === \"HEAD\") {\n        // Fetch remote branches to ensure the latest information\n        await git.fetch([\"--all\"]);\n\n        const branchCommit = await git.branch([\"-a\"]);\n        const branchRef = await git.branch([\n          \"-r\",\n          \"--contains\",\n          branchCommit.current,\n        ]);\n        if (branchRef?.all?.[0]) {\n          const originBranch = branchRef.all[0];\n          const cleanOriginBranch = originBranch.replace(/^origin\\//, \"\");\n          if (!cleanOriginBranch) {\n            throw new Error(\n              \"Invalid state: Directory is in detached head state.\"\n            );\n          }\n          branch = cleanOriginBranch.trim();\n        }\n      }\n    }\n  }\n  return branch;\n}\n"]}
+{"version":3,"file":"get-environment-param.js","sourceRoot":"","sources":["../../../src/common/middleware/get-environment-param.ts"],"names":[],"mappings":"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","sourcesContent":["import { select } from \"@inquirer/prompts\";\nimport { simpleGit } from \"simple-git\";\nimport { Environment } from \"../api/lib.js\";\nimport { logger } from \"../logger.js\";\nimport { printCriticalFailureToConsoleAndExit, textOrJson } from \"../output.js\";\nimport settings from \"../settings.js\";\nimport { isInteractiveTerminal } from \"../terminal.js\";\nimport { buildEnvironmentPromptChoices } from \"../utils/build-environment-prompt-choices.js\";\n\n/**\n * Middleware that ensures a environment is provided in argv. If not, prompts the user.\n * Note: must be called after get account param and get project param.\n */\nexport async function fetchEnvironment(argv: { [key: string]: unknown }) {\n  if (argv.environment && typeof argv.environment === \"string\") {\n    return;\n  }\n\n  if (!argv.account || typeof argv.account !== \"string\") {\n    throw new Error(\"Invalid state: account is not set.\");\n  }\n  if (!argv.project || typeof argv.project !== \"string\") {\n    throw new Error(\"Invalid state: project is not set.\");\n  }\n\n  // 1. Check if the dir argument is set and if we are in a git repository\n  //    If we are, get the current branch and use that as the environment name.\n  const branch = await getGitBranch(argv);\n\n  if (branch && !argv[\"fetch-environments\"]) {\n    // If the branch is set, use that as the environment name\n    argv.environment = branch;\n  } else {\n    // In non-interactive environments, --environment must be passed explicitly.\n    // We check here, before the API calls, to avoid unnecessary network round-trips.\n    if (!isInteractiveTerminal()) {\n      await printCriticalFailureToConsoleAndExit(\n        \"Error: --environment is required in non-interactive environments (e.g. CI/CD).\\nUse the --environment flag to specify an environment name.\"\n      );\n      return;\n    }\n\n    const baseUrl = `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/environments`;\n\n    const queryParams: Record<string, string> = {\n      // This is safe because of the previous middleware where we set the account and project.\n      accountName: argv.account!,\n      projectName: argv.project!,\n    };\n\n    // Create the query string using URLSearchParams\n    const url = new URL(baseUrl);\n    url.search = new URLSearchParams(queryParams).toString();\n    const response = await fetch(url, {\n      method: \"GET\",\n      headers: {\n        // biome-ignore lint/style/useNamingConvention: External API property\n        Authorization: `Bearer ${argv.authToken}`,\n      },\n    });\n\n    if (response.ok) {\n      const environmentJsonFromDeveloperAPI = (await response.json()) as {\n        data: Environment[];\n      };\n\n      // Also fetch working-copy deployments, which are not returned by the\n      // /v1/environments endpoint (it only returns self-managed and deployer-owned environments).\n      const deploymentsUrl = new URL(\n        `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${argv.account}/projects/${argv.project}/deployments`\n      );\n      const deploymentsResponse = await fetch(deploymentsUrl, {\n        method: \"GET\",\n        headers: {\n          // biome-ignore lint/style/useNamingConvention: External API property\n          Authorization: `Bearer ${argv.authToken}`,\n        },\n      });\n\n      if (deploymentsResponse.ok) {\n        const { data: deployments } = (await deploymentsResponse.json()) as {\n          data: Array<{\n            name: string;\n            accountName: string;\n            projectName: string;\n            branchName: string;\n            environmentType: string;\n            createdOn: string;\n          }>;\n        };\n\n        const workingCopies: Environment[] = deployments\n          .filter((d) => d.environmentType === \"WORKING_COPY\")\n          .map((d) => ({\n            name: d.name,\n            accountName: d.accountName,\n            projectName: d.projectName,\n            branchName: d.branchName,\n            environmentType: \"working_copy\",\n            createdOn: new Date(d.createdOn),\n          }));\n\n        environmentJsonFromDeveloperAPI.data.push(...workingCopies);\n      } else {\n        logger.debug(\n          {\n            status: deploymentsResponse.status,\n            statusText: deploymentsResponse.statusText,\n          },\n          \"Failed to fetch working-copy deployments for project\"\n        );\n      }\n\n      if (environmentJsonFromDeveloperAPI.data.length === 0) {\n        await printCriticalFailureToConsoleAndExit(\n          \"Error: You don't have any environments for this project to link against. First, deploy this project using zuplo deploy and then link against that.\"\n        );\n      }\n\n      // TODO: This logic doesn't work for working copies anymore due to\n      // https://github.com/zuplo/core/blob/main/apps/tenant-api/prisma/migrations/v2_20250711155424_add-working-copy-main-check/migration.sql\n      // and https://github.com/zuplo/core/blob/6595268b9d2e5edfb3a20cbb086ccd363cf115f9/apps/tenant-api/src/routes/managed-dedicated/environments.ts#L96-L102\n      // Leaving this logic commented out for now since we may want to bring it back.\n      // let numDevelopmentEnvironments =\n      //   environmentJsonFromDeveloperAPI.data.filter((env) => {\n      //     return env.environmentType === \"development\";\n      //   }).length;\n\n      // if (numDevelopmentEnvironments <= 0) {\n      //   // Create one on-the-fly\n      //   const createDevelopmenEnvironmentResponse = await fetch(`${baseUrl}`, {\n      //     method: \"POST\",\n      //     headers: {\n      //       authorization: `Bearer ${argv.authToken}`,\n      //       \"Content-Type\": \"application/json\",\n      //     },\n      //     body: JSON.stringify({\n      //       accountName: argv.account,\n      //       projectName: argv.project,\n      //       environmentType: \"development\",\n      //     }),\n      //   });\n\n      //   if (!createDevelopmenEnvironmentResponse.ok) {\n      //     console.log(await createDevelopmenEnvironmentResponse.json());\n      //     logger.debug(\n      //       {\n      //         status: createDevelopmenEnvironmentResponse.status,\n      //         statusText: createDevelopmenEnvironmentResponse.statusText,\n      //       },\n      //       \"Failed to create a new instance of development environment\"\n      //     );\n      //     await printCriticalFailureToConsoleAndExit(\n      //       \"Failed to create a new development environment. Please try again later.\"\n      //     );\n      //   }\n\n      //   numDevelopmentEnvironments++;\n\n      //   // Re-fetch\n      //   const updatedResponse = await fetch(url, {\n      //     headers: {\n      //       authorization: `Bearer ${argv.authToken}`,\n      //     },\n      //   });\n\n      //   environmentJsonFromDeveloperAPI = (await updatedResponse.json()) as {\n      //     data: Environment[];\n      //   };\n      // }\n\n      try {\n        argv.environment = await select({\n          message: \"Select the environment\",\n          choices: buildEnvironmentPromptChoices(\n            environmentJsonFromDeveloperAPI.data\n          ),\n        });\n      } catch (error) {\n        if (error.isTtyError || error.name === \"ExitPromptError\") {\n          process.exit(1);\n        }\n        logger.trace(\"Failed to select environment\", error);\n        process.exit(1);\n      }\n    } else {\n      logger.trace(\n        {\n          status: response.status,\n          statusText: response.statusText,\n          response: textOrJson(await response.text()),\n        },\n        \"Failed to request environments for project\"\n      );\n      await printCriticalFailureToConsoleAndExit(\n        \"Error: Failed to request environments for the project.\"\n      );\n    }\n  }\n}\nasync function getGitBranch(argv: { [key: string]: unknown }) {\n  let branch: string | undefined;\n  const dir = argv.dir;\n  if (dir && typeof dir === \"string\") {\n    const git = simpleGit({ baseDir: dir });\n    const isGitRepo = await git.checkIsRepo();\n    if (isGitRepo) {\n      // Get the current branch from Git\n      const status = await git.status();\n      if (!status.current) {\n        throw new Error(\"Invalid state: Directory is in detached head state.\");\n      }\n      branch = status.current.trim();\n\n      // @NOTE - gitlab returns HEAD as the current branch when running git.status()\n      // https://forum.gitlab.com/t/why-i-cant-get-the-branch-name/72462/6\n      if (branch === \"HEAD\") {\n        // Fetch remote branches to ensure the latest information\n        await git.fetch([\"--all\"]);\n\n        const branchCommit = await git.branch([\"-a\"]);\n        const branchRef = await git.branch([\n          \"-r\",\n          \"--contains\",\n          branchCommit.current,\n        ]);\n        if (branchRef?.all?.[0]) {\n          const originBranch = branchRef.all[0];\n          const cleanOriginBranch = originBranch.replace(/^origin\\//, \"\");\n          if (!cleanOriginBranch) {\n            throw new Error(\n              \"Invalid state: Directory is in detached head state.\"\n            );\n          }\n          branch = cleanOriginBranch.trim();\n        }\n      }\n    }\n  }\n  return branch;\n}\n"]}

package/dist/common/utils/build-environment-prompt-choices.d.ts

@@ -0,0 +1,13 @@
+import { Separator } from "@inquirer/prompts";
+import { Environment } from "../api/lib.js";
+interface EnvironmentChoice {
+  name: string;
+  value: string;
+  description?: string;
+}
+export type EnvironmentPromptChoice = EnvironmentChoice | Separator;
+export declare function buildEnvironmentPromptChoices(
+  envs: Environment[]
+): EnvironmentPromptChoice[];
+export {};
+//# sourceMappingURL=build-environment-prompt-choices.d.ts.map

package/dist/common/utils/build-environment-prompt-choices.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-environment-prompt-choices.d.ts","sourceRoot":"","sources":["../../../src/common/utils/build-environment-prompt-choices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAK5C,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG,SAAS,CAAC;AAiBpE,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,WAAW,EAAE,GAClB,uBAAuB,EAAE,CAoE3B"}

package/dist/common/utils/build-environment-prompt-choices.js

@@ -0,0 +1,66 @@
+import { Separator } from "@inquirer/prompts";
+import { formatEnvironmentTypeLabel } from "./format-environment-type.js";
+import { prettyPrintEnvironmentPrompt } from "./pretty-print-environment-prompt.js";
+import { sortEnvironmentsForPrompt } from "./sort-environments-for-prompt.js";
+export function buildEnvironmentPromptChoices(envs) {
+    const sorted = sortEnvironmentsForPrompt(envs);
+    const buckets = {
+        "working-copy": [],
+        preview: [],
+        production: [],
+    };
+    const other = [];
+    for (const env of sorted) {
+        const type = formatEnvironmentTypeLabel(env.environmentType);
+        if (type === "working-copy" ||
+            type === "preview" ||
+            type === "production") {
+            buckets[type].push(env);
+        }
+        else {
+            other.push(env);
+        }
+    }
+    const choices = [];
+    if (buckets["working-copy"].length > 0) {
+        choices.push(new Separator("── Working copy ──"));
+        for (const env of buckets["working-copy"]) {
+            choices.push({
+                name: prettyPrintEnvironmentPrompt(env),
+                value: env.name,
+            });
+        }
+    }
+    if (buckets.preview.length > 0) {
+        choices.push(new Separator("── Preview ──"));
+        for (const env of buckets.preview) {
+            choices.push({
+                name: prettyPrintEnvironmentPrompt(env),
+                value: env.name,
+                description: env.name,
+            });
+        }
+    }
+    if (buckets.production.length > 0) {
+        choices.push(new Separator("── Production ──"));
+        for (const env of buckets.production) {
+            choices.push({
+                name: prettyPrintEnvironmentPrompt(env),
+                value: env.name,
+                description: env.name,
+            });
+        }
+    }
+    if (other.length > 0) {
+        choices.push(new Separator("── Other ──"));
+        for (const env of other) {
+            choices.push({
+                name: prettyPrintEnvironmentPrompt(env),
+                value: env.name,
+                description: env.name,
+            });
+        }
+    }
+    return choices;
+}
+//# sourceMappingURL=build-environment-prompt-choices.js.map

package/dist/common/utils/build-environment-prompt-choices.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-environment-prompt-choices.js","sourceRoot":"","sources":["../../../src/common/utils/build-environment-prompt-choices.ts"],"names":[],"mappings":"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","sourcesContent":["import { Separator } from \"@inquirer/prompts\";\nimport { Environment } from \"../api/lib.js\";\nimport { formatEnvironmentTypeLabel } from \"./format-environment-type.js\";\nimport { prettyPrintEnvironmentPrompt } from \"./pretty-print-environment-prompt.js\";\nimport { sortEnvironmentsForPrompt } from \"./sort-environments-for-prompt.js\";\n\ninterface EnvironmentChoice {\n  name: string;\n  value: string;\n  description?: string;\n}\n\nexport type EnvironmentPromptChoice = EnvironmentChoice | Separator;\n\n/**\n * Builds the full inquirer choices array for the environment selection\n * prompt: working-copy first, preview alpha, production last, with a visible\n * `Separator` header introducing each non-empty bucket. The deployment slug\n * (`env.name`) is surfaced via the per-choice `description` field for\n * preview/production rows so it appears only when that row is active —\n * keeping the list itself tight while still letting users disambiguate two\n * envs that share a branch name.\n *\n * Any environment whose normalized type is not `working-copy`, `preview`, or\n * `production` falls into an `Other` bucket placed last. `formatEnvironmentTypeLabel`\n * passes unknown types through unchanged, so without this fallback a future\n * server-side type or a malformed value would silently drop the env from\n * the prompt and make it unselectable.\n */\nexport function buildEnvironmentPromptChoices(\n  envs: Environment[]\n): EnvironmentPromptChoice[] {\n  const sorted = sortEnvironmentsForPrompt(envs);\n\n  const buckets: Record<\n    \"working-copy\" | \"preview\" | \"production\",\n    Environment[]\n  > = {\n    \"working-copy\": [],\n    preview: [],\n    production: [],\n  };\n  const other: Environment[] = [];\n  for (const env of sorted) {\n    const type = formatEnvironmentTypeLabel(env.environmentType);\n    if (\n      type === \"working-copy\" ||\n      type === \"preview\" ||\n      type === \"production\"\n    ) {\n      buckets[type].push(env);\n    } else {\n      other.push(env);\n    }\n  }\n\n  const choices: EnvironmentPromptChoice[] = [];\n\n  if (buckets[\"working-copy\"].length > 0) {\n    choices.push(new Separator(\"── Working copy ──\"));\n    for (const env of buckets[\"working-copy\"]) {\n      choices.push({\n        name: prettyPrintEnvironmentPrompt(env),\n        value: env.name,\n      });\n    }\n  }\n  if (buckets.preview.length > 0) {\n    choices.push(new Separator(\"── Preview ──\"));\n    for (const env of buckets.preview) {\n      choices.push({\n        name: prettyPrintEnvironmentPrompt(env),\n        value: env.name,\n        description: env.name,\n      });\n    }\n  }\n  if (buckets.production.length > 0) {\n    choices.push(new Separator(\"── Production ──\"));\n    for (const env of buckets.production) {\n      choices.push({\n        name: prettyPrintEnvironmentPrompt(env),\n        value: env.name,\n        description: env.name,\n      });\n    }\n  }\n  if (other.length > 0) {\n    choices.push(new Separator(\"── Other ──\"));\n    for (const env of other) {\n      choices.push({\n        name: prettyPrintEnvironmentPrompt(env),\n        value: env.name,\n        description: env.name,\n      });\n    }\n  }\n\n  return choices;\n}\n"]}

package/dist/common/utils/build-environment-prompt-choices.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=build-environment-prompt-choices.test.d.ts.map

package/dist/common/utils/build-environment-prompt-choices.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-environment-prompt-choices.test.d.ts","sourceRoot":"","sources":["../../../src/common/utils/build-environment-prompt-choices.test.ts"],"names":[],"mappings":""}

package/dist/common/utils/build-environment-prompt-choices.test.js

@@ -0,0 +1,97 @@
+import assert from "node:assert";
+import { describe, it } from "node:test";
+import { buildEnvironmentPromptChoices } from "./build-environment-prompt-choices.js";
+function makeEnv(environmentType, name, branchName) {
+    return {
+        name,
+        accountName: "acme",
+        projectName: "my-project",
+        createdOn: null,
+        branchName,
+        environmentType,
+    };
+}
+function isSeparator(item) {
+    return (item != null &&
+        typeof item === "object" &&
+        item.type === "separator");
+}
+describe("buildEnvironmentPromptChoices", () => {
+    it("groups choices with a Separator header per non-empty bucket", () => {
+        const envs = [
+            makeEnv("preview", "env-test-staging-1", "staging"),
+            makeEnv("working_copy", "env-test-main-abc", "main"),
+            makeEnv("production", "env-test-prod-xyz", "main"),
+            makeEnv("preview", "env-test-feature-2", "feature-auth"),
+        ];
+        const choices = buildEnvironmentPromptChoices(envs);
+        assert.strictEqual(choices.length, 7);
+        assert.ok(isSeparator(choices[0]));
+        assert.ok(isSeparator(choices[2]));
+        assert.ok(isSeparator(choices[5]));
+        assert.deepStrictEqual(choices[1], {
+            name: "env-test-main-abc — recommended for local development",
+            value: "env-test-main-abc",
+        });
+        assert.deepStrictEqual(choices[3], {
+            name: "feature-auth",
+            value: "env-test-feature-2",
+            description: "env-test-feature-2",
+        });
+        assert.deepStrictEqual(choices[4], {
+            name: "staging",
+            value: "env-test-staging-1",
+            description: "env-test-staging-1",
+        });
+        assert.deepStrictEqual(choices[6], {
+            name: "main",
+            value: "env-test-prod-xyz",
+            description: "env-test-prod-xyz",
+        });
+    });
+    it("skips a Separator for an empty bucket", () => {
+        const envs = [
+            makeEnv("preview", "env-test-staging-1", "staging"),
+            makeEnv("preview", "env-test-feature-2", "feature-auth"),
+        ];
+        const choices = buildEnvironmentPromptChoices(envs);
+        const separators = choices.filter(isSeparator);
+        assert.strictEqual(separators.length, 1);
+        assert.strictEqual(choices.length, 3);
+    });
+    it("returns an empty array when there are no envs", () => {
+        assert.deepStrictEqual(buildEnvironmentPromptChoices([]), []);
+    });
+    it("normalizes all working-copy type spellings into the working-copy bucket", () => {
+        const envs = [
+            makeEnv("development", "env-test-main-1", "main"),
+            makeEnv("working_copy", "env-test-main-2", "main"),
+            makeEnv("working-copy", "env-test-main-3", "main"),
+        ];
+        const choices = buildEnvironmentPromptChoices(envs);
+        assert.strictEqual(choices.length, 4);
+        assert.ok(isSeparator(choices[0]));
+    });
+    it("places envs with unknown environmentType into an 'Other' bucket at the end", () => {
+        const envs = [
+            makeEnv("preview", "env-test-staging-1", "staging"),
+            makeEnv("staging", "env-test-mystery-zzz", "mystery-branch"),
+        ];
+        const choices = buildEnvironmentPromptChoices(envs);
+        assert.strictEqual(choices.length, 4);
+        assert.ok(isSeparator(choices[0]));
+        assert.deepStrictEqual(choices[1], {
+            name: "staging",
+            value: "env-test-staging-1",
+            description: "env-test-staging-1",
+        });
+        assert.ok(isSeparator(choices[2]));
+        assert.strictEqual(choices[2].separator, "── Other ──");
+        assert.deepStrictEqual(choices[3], {
+            name: "mystery-branch",
+            value: "env-test-mystery-zzz",
+            description: "env-test-mystery-zzz",
+        });
+    });
+});
+//# sourceMappingURL=build-environment-prompt-choices.test.js.map

package/dist/common/utils/build-environment-prompt-choices.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-environment-prompt-choices.test.js","sourceRoot":"","sources":["../../../src/common/utils/build-environment-prompt-choices.test.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from \"node:assert\";\nimport { describe, it } from \"node:test\";\nimport { Separator } from \"@inquirer/prompts\";\nimport { Environment } from \"../api/lib.js\";\nimport { buildEnvironmentPromptChoices } from \"./build-environment-prompt-choices.js\";\n\nfunction makeEnv(\n  environmentType: Environment[\"environmentType\"],\n  name: string,\n  branchName: string\n): Environment {\n  return {\n    name,\n    accountName: \"acme\",\n    projectName: \"my-project\",\n    createdOn: null,\n    branchName,\n    environmentType,\n  };\n}\n\nfunction isSeparator(item: unknown): item is Separator {\n  return (\n    item != null &&\n    typeof item === \"object\" &&\n    (item as { type?: unknown }).type === \"separator\"\n  );\n}\n\ndescribe(\"buildEnvironmentPromptChoices\", () => {\n  it(\"groups choices with a Separator header per non-empty bucket\", () => {\n    const envs: Environment[] = [\n      makeEnv(\"preview\", \"env-test-staging-1\", \"staging\"),\n      makeEnv(\"working_copy\", \"env-test-main-abc\", \"main\"),\n      makeEnv(\"production\", \"env-test-prod-xyz\", \"main\"),\n      makeEnv(\"preview\", \"env-test-feature-2\", \"feature-auth\"),\n    ];\n\n    const choices = buildEnvironmentPromptChoices(envs);\n\n    // Expected shape: [Sep(\"Working copy\"), wc, Sep(\"Preview\"), feat, staging, Sep(\"Production\"), prod]\n    assert.strictEqual(choices.length, 7);\n    assert.ok(isSeparator(choices[0]));\n    assert.ok(isSeparator(choices[2]));\n    assert.ok(isSeparator(choices[5]));\n\n    // Working copy bucket\n    assert.deepStrictEqual(\n      choices[1] as { name: string; value: string; description?: string },\n      {\n        name: \"env-test-main-abc — recommended for local development\",\n        value: \"env-test-main-abc\",\n      }\n    );\n\n    // Preview bucket — alpha sorted, branchName as visible name, slug as description\n    assert.deepStrictEqual(\n      choices[3] as { name: string; value: string; description?: string },\n      {\n        name: \"feature-auth\",\n        value: \"env-test-feature-2\",\n        description: \"env-test-feature-2\",\n      }\n    );\n    assert.deepStrictEqual(\n      choices[4] as { name: string; value: string; description?: string },\n      {\n        name: \"staging\",\n        value: \"env-test-staging-1\",\n        description: \"env-test-staging-1\",\n      }\n    );\n\n    // Production bucket\n    assert.deepStrictEqual(\n      choices[6] as { name: string; value: string; description?: string },\n      {\n        name: \"main\",\n        value: \"env-test-prod-xyz\",\n        description: \"env-test-prod-xyz\",\n      }\n    );\n  });\n\n  it(\"skips a Separator for an empty bucket\", () => {\n    const envs: Environment[] = [\n      makeEnv(\"preview\", \"env-test-staging-1\", \"staging\"),\n      makeEnv(\"preview\", \"env-test-feature-2\", \"feature-auth\"),\n    ];\n\n    const choices = buildEnvironmentPromptChoices(envs);\n\n    // Only one Separator — for the preview bucket\n    const separators = choices.filter(isSeparator);\n    assert.strictEqual(separators.length, 1);\n    assert.strictEqual(choices.length, 3);\n  });\n\n  it(\"returns an empty array when there are no envs\", () => {\n    assert.deepStrictEqual(buildEnvironmentPromptChoices([]), []);\n  });\n\n  it(\"normalizes all working-copy type spellings into the working-copy bucket\", () => {\n    const envs: Environment[] = [\n      makeEnv(\"development\", \"env-test-main-1\", \"main\"),\n      makeEnv(\"working_copy\", \"env-test-main-2\", \"main\"),\n      makeEnv(\"working-copy\", \"env-test-main-3\", \"main\"),\n    ];\n\n    const choices = buildEnvironmentPromptChoices(envs);\n\n    // 1 Separator + 3 entries\n    assert.strictEqual(choices.length, 4);\n    assert.ok(isSeparator(choices[0]));\n  });\n\n  // Regression: an env whose normalized type isn't one of the three known\n  // buckets must still be selectable. Without the \"Other\" fallback bucket a\n  // future server-side env type or a malformed `environmentType` value would\n  // silently disappear from the prompt.\n  it(\"places envs with unknown environmentType into an 'Other' bucket at the end\", () => {\n    const envs: Environment[] = [\n      makeEnv(\"preview\", \"env-test-staging-1\", \"staging\"),\n      // Cast through unknown to bypass the closed TS union — simulates the\n      // server returning a value the CLI doesn't yet know about.\n      makeEnv(\n        \"staging\" as unknown as Environment[\"environmentType\"],\n        \"env-test-mystery-zzz\",\n        \"mystery-branch\"\n      ),\n    ];\n\n    const choices = buildEnvironmentPromptChoices(envs);\n\n    assert.strictEqual(choices.length, 4);\n    assert.ok(isSeparator(choices[0]));\n    assert.deepStrictEqual(\n      choices[1] as { name: string; value: string; description?: string },\n      {\n        name: \"staging\",\n        value: \"env-test-staging-1\",\n        description: \"env-test-staging-1\",\n      }\n    );\n    assert.ok(isSeparator(choices[2]));\n    assert.strictEqual((choices[2] as Separator).separator, \"── Other ──\");\n    assert.deepStrictEqual(\n      choices[3] as { name: string; value: string; description?: string },\n      {\n        name: \"mystery-branch\",\n        value: \"env-test-mystery-zzz\",\n        description: \"env-test-mystery-zzz\",\n      }\n    );\n  });\n});\n"]}

package/dist/common/utils/pretty-print-environment-prompt.d.ts

@@ -1,6 +1,3 @@
 import { Environment } from "../api/lib.js";
-export declare function prettyPrintEnvironmentPrompt(
-  env: Environment,
-  hasSingleDevelopmentInstance: boolean
-): string;
+export declare function prettyPrintEnvironmentPrompt(env: Environment): string;
 //# sourceMappingURL=pretty-print-environment-prompt.d.ts.map

package/dist/common/utils/pretty-print-environment-prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pretty-print-environment-prompt.d.ts","sourceRoot":"","sources":["../../../src/common/utils/pretty-print-environment-prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE,WAAW,EAChB,4BAA4B,EAAE,OAAO,UAatC"}
+{"version":3,"file":"pretty-print-environment-prompt.d.ts","sourceRoot":"","sources":["../../../src/common/utils/pretty-print-environment-prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAoB5C,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,WAAW,GAAG,MAAM,CAOrE"}

package/dist/common/utils/pretty-print-environment-prompt.js

@@ -1,14 +1,9 @@
 import { formatEnvironmentTypeLabel } from "./format-environment-type.js";
-export function prettyPrintEnvironmentPrompt(env, hasSingleDevelopmentInstance) {
+export function prettyPrintEnvironmentPrompt(env) {
     const environmentType = formatEnvironmentTypeLabel(env.environmentType);
-    const branchName = env.branchName;
-    const name = env.name;
     if (environmentType === "working-copy") {
-        const displayName = hasSingleDevelopmentInstance
-            ? "Default for local development"
-            : name;
-        return `${displayName} (working-copy)`;
+        return `${env.name} — recommended for local development`;
     }
-    return `${name} (${environmentType}, ${branchName})`;
+    return env.branchName || env.name;
 }
 //# sourceMappingURL=pretty-print-environment-prompt.js.map

package/dist/common/utils/pretty-print-environment-prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"pretty-print-environment-prompt.js","sourceRoot":"","sources":["../../../src/common/utils/pretty-print-environment-prompt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAE1E,MAAM,UAAU,4BAA4B,CAC1C,GAAgB,EAChB,4BAAqC;IAErC,MAAM,eAAe,GAAG,0BAA0B,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;IAClC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IAEtB,IAAI,eAAe,KAAK,cAAc,EAAE,CAAC;QACvC,MAAM,WAAW,GAAG,4BAA4B;YAC9C,CAAC,CAAC,+BAA+B;YACjC,CAAC,CAAC,IAAI,CAAC;QACT,OAAO,GAAG,WAAW,iBAAiB,CAAC;IACzC,CAAC;IACD,OAAO,GAAG,IAAI,KAAK,eAAe,KAAK,UAAU,GAAG,CAAC;AACvD,CAAC","sourcesContent":["import { Environment } from \"../api/lib.js\";\nimport { formatEnvironmentTypeLabel } from \"./format-environment-type.js\";\n\nexport function prettyPrintEnvironmentPrompt(\n  env: Environment,\n  hasSingleDevelopmentInstance: boolean\n) {\n  const environmentType = formatEnvironmentTypeLabel(env.environmentType);\n  const branchName = env.branchName;\n  const name = env.name;\n\n  if (environmentType === \"working-copy\") {\n    const displayName = hasSingleDevelopmentInstance\n      ? \"Default for local development\"\n      : name;\n    return `${displayName} (working-copy)`;\n  }\n  return `${name} (${environmentType}, ${branchName})`;\n}\n"]}
+{"version":3,"file":"pretty-print-environment-prompt.js","sourceRoot":"","sources":["../../../src/common/utils/pretty-print-environment-prompt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAmB1E,MAAM,UAAU,4BAA4B,CAAC,GAAgB;IAC3D,MAAM,eAAe,GAAG,0BAA0B,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAExE,IAAI,eAAe,KAAK,cAAc,EAAE,CAAC;QACvC,OAAO,GAAG,GAAG,CAAC,IAAI,sCAAsC,CAAC;IAC3D,CAAC;IACD,OAAO,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,IAAI,CAAC;AACpC,CAAC","sourcesContent":["import { Environment } from \"../api/lib.js\";\nimport { formatEnvironmentTypeLabel } from \"./format-environment-type.js\";\n\n/**\n * The visible row label for one environment in the interactive selection\n * prompt. The leading characters drive `@inquirer/prompts/select`\n * type-to-jump matching (`name.toLowerCase().startsWith(searchTerm)`), so\n * what we put first determines how users search.\n *\n * - Working-copy items: lead with `env.name` (the only identifier they have)\n *   plus the inline call-to-action hint.\n * - Preview/production items: lead with `env.branchName` (what the user\n *   typed at deploy time, e.g. \"staging\") so keystrokes match. If\n *   `branchName` is missing or empty, fall back to `env.name` (the slug) —\n *   type-to-jump degrades to slug-prefix behavior in that case, which is\n *   strictly better than rendering an empty row.\n *\n * The slug is surfaced via inquirer's per-choice `description` field at the\n * call site, so it shows only for the active row.\n */\nexport function prettyPrintEnvironmentPrompt(env: Environment): string {\n  const environmentType = formatEnvironmentTypeLabel(env.environmentType);\n\n  if (environmentType === \"working-copy\") {\n    return `${env.name} — recommended for local development`;\n  }\n  return env.branchName || env.name;\n}\n"]}

package/dist/common/utils/pretty-print-environment-prompt.test.js

@@ -12,33 +12,31 @@ function makeEnv(environmentType, name = "my-env", branchName = "main") {
     };
 }
 describe("prettyPrintEnvironmentPrompt", () => {
-    describe("working-copy variants all display as 'working-copy'", () => {
+    describe("working-copy rendering", () => {
         const workingCopyVariants = [
             "working_copy",
             "working-copy",
             "development",
         ];
         for (const envType of workingCopyVariants) {
-            it(`shows working-copy label for environmentType="${envType}" (single instance)`, () => {
-                const result = prettyPrintEnvironmentPrompt(makeEnv(envType), true);
-                assert.ok(result.includes("(working-copy)"), `Expected "(working-copy)" in "${result}"`);
-                assert.ok(!result.includes("(development)"), `Expected no "(development)" in "${result}"`);
-            });
-            it(`shows working-copy label for environmentType="${envType}" (multiple instances)`, () => {
-                const result = prettyPrintEnvironmentPrompt(makeEnv(envType), false);
-                assert.ok(result.includes("(working-copy)"), `Expected "(working-copy)" in "${result}"`);
-                assert.ok(!result.includes("(development)"), `Expected no "(development)" in "${result}"`);
+            it(`uses env.name and the recommendation hint for environmentType="${envType}"`, () => {
+                const result = prettyPrintEnvironmentPrompt(makeEnv(envType, "wc-slug"));
+                assert.strictEqual(result, "wc-slug — recommended for local development");
             });
         }
     });
-    it("shows production label unchanged", () => {
-        const result = prettyPrintEnvironmentPrompt(makeEnv("production", "prod-env", "main"), false);
-        assert.ok(result.includes("production"), `Expected "production" in "${result}"`);
+    it("renders preview rows as the branch name only", () => {
+        const result = prettyPrintEnvironmentPrompt(makeEnv("preview", "env-test-staging-bb91e0b", "staging"));
+        assert.strictEqual(result, "staging");
+        assert.ok(result.startsWith("s"), `Expected "s" prefix in "${result}"`);
+    });
+    it("renders production rows as the branch name only", () => {
+        const result = prettyPrintEnvironmentPrompt(makeEnv("production", "env-test-prod-xyz789", "main"));
+        assert.strictEqual(result, "main");
     });
-    it("shows preview label unchanged", () => {
-        const result = prettyPrintEnvironmentPrompt(makeEnv("preview", "preview-env", "feature-branch"), false);
-        assert.ok(result.includes("preview"), `Expected "preview" in "${result}"`);
-        assert.ok(result.includes("feature-branch"), `Expected branch name in "${result}"`);
+    it("falls back to env.name when branchName is empty", () => {
+        const env = makeEnv("preview", "env-test-fallback-abc123", "");
+        assert.strictEqual(prettyPrintEnvironmentPrompt(env), "env-test-fallback-abc123");
     });
 });
 //# sourceMappingURL=pretty-print-environment-prompt.test.js.map

package/dist/common/utils/pretty-print-environment-prompt.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"pretty-print-environment-prompt.test.js","sourceRoot":"","sources":["../../../src/common/utils/pretty-print-environment-prompt.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEpF,SAAS,OAAO,CACd,eAA+C,EAC/C,IAAI,GAAG,QAAQ,EACf,UAAU,GAAG,MAAM;IAEnB,OAAO;QACL,IAAI;QACJ,WAAW,EAAE,MAAM;QACnB,WAAW,EAAE,YAAY;QACzB,SAAS,EAAE,IAAI;QACf,UAAU;QACV,eAAe;KAChB,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;IAC5C,QAAQ,CAAC,qDAAqD,EAAE,GAAG,EAAE;QACnE,MAAM,mBAAmB,GAAqC;YAC5D,cAAc;YACd,cAAc;YACd,aAAa;SACd,CAAC;QACF,KAAK,MAAM,OAAO,IAAI,mBAAmB,EAAE,CAAC;YAC1C,EAAE,CAAC,iDAAiD,OAAO,qBAAqB,EAAE,GAAG,EAAE;gBACrF,MAAM,MAAM,GAAG,4BAA4B,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;gBAEpE,MAAM,CAAC,EAAE,CACP,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EACjC,iCAAiC,MAAM,GAAG,CAC3C,CAAC;gBACF,MAAM,CAAC,EAAE,CACP,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,EACjC,mCAAmC,MAAM,GAAG,CAC7C,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,iDAAiD,OAAO,wBAAwB,EAAE,GAAG,EAAE;gBACxF,MAAM,MAAM,GAAG,4BAA4B,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;gBACrE,MAAM,CAAC,EAAE,CACP,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EACjC,iCAAiC,MAAM,GAAG,CAC3C,CAAC;gBACF,MAAM,CAAC,EAAE,CACP,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,EACjC,mCAAmC,MAAM,GAAG,CAC7C,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,MAAM,GAAG,4BAA4B,CACzC,OAAO,CAAC,YAAY,EAAE,UAAU,EAAE,MAAM,CAAC,EACzC,KAAK,CACN,CAAC;QACF,MAAM,CAAC,EAAE,CACP,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,EAC7B,6BAA6B,MAAM,GAAG,CACvC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACvC,MAAM,MAAM,GAAG,4BAA4B,CACzC,OAAO,CAAC,SAAS,EAAE,aAAa,EAAE,gBAAgB,CAAC,EACnD,KAAK,CACN,CAAC;QACF,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,0BAA0B,MAAM,GAAG,CAAC,CAAC;QAC3E,MAAM,CAAC,EAAE,CACP,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EACjC,4BAA4B,MAAM,GAAG,CACtC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["import assert from \"node:assert\";\nimport { describe, it } from \"node:test\";\nimport { Environment } from \"../api/lib.js\";\nimport { prettyPrintEnvironmentPrompt } from \"./pretty-print-environment-prompt.js\";\n\nfunction makeEnv(\n  environmentType: Environment[\"environmentType\"],\n  name = \"my-env\",\n  branchName = \"main\"\n): Environment {\n  return {\n    name,\n    accountName: \"acme\",\n    projectName: \"my-project\",\n    createdOn: null,\n    branchName,\n    environmentType,\n  };\n}\n\ndescribe(\"prettyPrintEnvironmentPrompt\", () => {\n  describe(\"working-copy variants all display as 'working-copy'\", () => {\n    const workingCopyVariants: Environment[\"environmentType\"][] = [\n      \"working_copy\",\n      \"working-copy\",\n      \"development\",\n    ];\n    for (const envType of workingCopyVariants) {\n      it(`shows working-copy label for environmentType=\"${envType}\" (single instance)`, () => {\n        const result = prettyPrintEnvironmentPrompt(makeEnv(envType), true);\n        // The type label in parentheses must be (working-copy), not (development)\n        assert.ok(\n          result.includes(\"(working-copy)\"),\n          `Expected \"(working-copy)\" in \"${result}\"`\n        );\n        assert.ok(\n          !result.includes(\"(development)\"),\n          `Expected no \"(development)\" in \"${result}\"`\n        );\n      });\n\n      it(`shows working-copy label for environmentType=\"${envType}\" (multiple instances)`, () => {\n        const result = prettyPrintEnvironmentPrompt(makeEnv(envType), false);\n        assert.ok(\n          result.includes(\"(working-copy)\"),\n          `Expected \"(working-copy)\" in \"${result}\"`\n        );\n        assert.ok(\n          !result.includes(\"(development)\"),\n          `Expected no \"(development)\" in \"${result}\"`\n        );\n      });\n    }\n  });\n\n  it(\"shows production label unchanged\", () => {\n    const result = prettyPrintEnvironmentPrompt(\n      makeEnv(\"production\", \"prod-env\", \"main\"),\n      false\n    );\n    assert.ok(\n      result.includes(\"production\"),\n      `Expected \"production\" in \"${result}\"`\n    );\n  });\n\n  it(\"shows preview label unchanged\", () => {\n    const result = prettyPrintEnvironmentPrompt(\n      makeEnv(\"preview\", \"preview-env\", \"feature-branch\"),\n      false\n    );\n    assert.ok(result.includes(\"preview\"), `Expected \"preview\" in \"${result}\"`);\n    assert.ok(\n      result.includes(\"feature-branch\"),\n      `Expected branch name in \"${result}\"`\n    );\n  });\n});\n"]}
+{"version":3,"file":"pretty-print-environment-prompt.test.js","sourceRoot":"","sources":["../../../src/common/utils/pretty-print-environment-prompt.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEpF,SAAS,OAAO,CACd,eAA+C,EAC/C,IAAI,GAAG,QAAQ,EACf,UAAU,GAAG,MAAM;IAEnB,OAAO;QACL,IAAI;QACJ,WAAW,EAAE,MAAM;QACnB,WAAW,EAAE,YAAY;QACzB,SAAS,EAAE,IAAI;QACf,UAAU;QACV,eAAe;KAChB,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;IAC5C,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,MAAM,mBAAmB,GAAqC;YAC5D,cAAc;YACd,cAAc;YACd,aAAa;SACd,CAAC;QACF,KAAK,MAAM,OAAO,IAAI,mBAAmB,EAAE,CAAC;YAC1C,EAAE,CAAC,kEAAkE,OAAO,GAAG,EAAE,GAAG,EAAE;gBACpF,MAAM,MAAM,GAAG,4BAA4B,CACzC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAC5B,CAAC;gBAEF,MAAM,CAAC,WAAW,CAChB,MAAM,EACN,6CAA6C,CAC9C,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAMH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,MAAM,GAAG,4BAA4B,CACzC,OAAO,CAAC,SAAS,EAAE,0BAA0B,EAAE,SAAS,CAAC,CAC1D,CAAC;QAEF,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACtC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,2BAA2B,MAAM,GAAG,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,MAAM,GAAG,4BAA4B,CACzC,OAAO,CAAC,YAAY,EAAE,sBAAsB,EAAE,MAAM,CAAC,CACtD,CAAC;QAEF,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,EAAE,0BAA0B,EAAE,EAAE,CAAC,CAAC;QAE/D,MAAM,CAAC,WAAW,CAChB,4BAA4B,CAAC,GAAG,CAAC,EACjC,0BAA0B,CAC3B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["import assert from \"node:assert\";\nimport { describe, it } from \"node:test\";\nimport { Environment } from \"../api/lib.js\";\nimport { prettyPrintEnvironmentPrompt } from \"./pretty-print-environment-prompt.js\";\n\nfunction makeEnv(\n  environmentType: Environment[\"environmentType\"],\n  name = \"my-env\",\n  branchName = \"main\"\n): Environment {\n  return {\n    name,\n    accountName: \"acme\",\n    projectName: \"my-project\",\n    createdOn: null,\n    branchName,\n    environmentType,\n  };\n}\n\ndescribe(\"prettyPrintEnvironmentPrompt\", () => {\n  describe(\"working-copy rendering\", () => {\n    const workingCopyVariants: Environment[\"environmentType\"][] = [\n      \"working_copy\",\n      \"working-copy\",\n      \"development\",\n    ];\n    for (const envType of workingCopyVariants) {\n      it(`uses env.name and the recommendation hint for environmentType=\"${envType}\"`, () => {\n        const result = prettyPrintEnvironmentPrompt(\n          makeEnv(envType, \"wc-slug\")\n        );\n\n        assert.strictEqual(\n          result,\n          \"wc-slug — recommended for local development\"\n        );\n      });\n    }\n  });\n\n  // The leading character MUST be the user-typed name (env.branchName for\n  // preview/production, env.name for working-copy). `@inquirer/prompts/select`\n  // matches type-to-jump as `name.toLowerCase().startsWith(searchTerm)`, so a\n  // leading slug like \"env-test-…\" or an ANSI escape silently breaks the filter.\n  it(\"renders preview rows as the branch name only\", () => {\n    const result = prettyPrintEnvironmentPrompt(\n      makeEnv(\"preview\", \"env-test-staging-bb91e0b\", \"staging\")\n    );\n\n    assert.strictEqual(result, \"staging\");\n    assert.ok(result.startsWith(\"s\"), `Expected \"s\" prefix in \"${result}\"`);\n  });\n\n  it(\"renders production rows as the branch name only\", () => {\n    const result = prettyPrintEnvironmentPrompt(\n      makeEnv(\"production\", \"env-test-prod-xyz789\", \"main\")\n    );\n\n    assert.strictEqual(result, \"main\");\n  });\n\n  it(\"falls back to env.name when branchName is empty\", () => {\n    const env = makeEnv(\"preview\", \"env-test-fallback-abc123\", \"\");\n\n    assert.strictEqual(\n      prettyPrintEnvironmentPrompt(env),\n      \"env-test-fallback-abc123\"\n    );\n  });\n});\n"]}

package/dist/common/utils/sort-environments-for-prompt.d.ts

@@ -0,0 +1,5 @@
+import { Environment } from "../api/lib.js";
+export declare function sortEnvironmentsForPrompt(
+  envs: Environment[]
+): Environment[];
+//# sourceMappingURL=sort-environments-for-prompt.d.ts.map

package/dist/common/utils/sort-environments-for-prompt.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sort-environments-for-prompt.d.ts","sourceRoot":"","sources":["../../../src/common/utils/sort-environments-for-prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAyB5C,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAa5E"}

package/dist/common/utils/sort-environments-for-prompt.js

@@ -0,0 +1,27 @@
+import { formatEnvironmentTypeLabel } from "./format-environment-type.js";
+const TYPE_ORDER = {
+    "working-copy": 0,
+    preview: 1,
+    production: 2,
+};
+const FALLBACK_ORDER = 3;
+export function sortEnvironmentsForPrompt(envs) {
+    return [...envs].sort((a, b) => {
+        const aOrder = TYPE_ORDER[formatEnvironmentTypeLabel(a.environmentType)] ??
+            FALLBACK_ORDER;
+        const bOrder = TYPE_ORDER[formatEnvironmentTypeLabel(b.environmentType)] ??
+            FALLBACK_ORDER;
+        if (aOrder !== bOrder) {
+            return aOrder - bOrder;
+        }
+        return visibleSortKey(a).localeCompare(visibleSortKey(b));
+    });
+}
+function visibleSortKey(env) {
+    const type = formatEnvironmentTypeLabel(env.environmentType);
+    if (type === "working-copy") {
+        return env.name;
+    }
+    return env.branchName || env.name;
+}
+//# sourceMappingURL=sort-environments-for-prompt.js.map

package/dist/common/utils/sort-environments-for-prompt.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sort-environments-for-prompt.js","sourceRoot":"","sources":["../../../src/common/utils/sort-environments-for-prompt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAE1E,MAAM,UAAU,GAA2B;IACzC,cAAc,EAAE,CAAC;IACjB,OAAO,EAAE,CAAC;IACV,UAAU,EAAE,CAAC;CACd,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,CAAC;AAgBzB,MAAM,UAAU,yBAAyB,CAAC,IAAmB;IAC3D,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC7B,MAAM,MAAM,GACV,UAAU,CAAC,0BAA0B,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;YACzD,cAAc,CAAC;QACjB,MAAM,MAAM,GACV,UAAU,CAAC,0BAA0B,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;YACzD,cAAc,CAAC;QACjB,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;YACtB,OAAO,MAAM,GAAG,MAAM,CAAC;QACzB,CAAC;QACD,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,GAAgB;IACtC,MAAM,IAAI,GAAG,0BAA0B,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAC7D,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;QAC5B,OAAO,GAAG,CAAC,IAAI,CAAC;IAClB,CAAC;IACD,OAAO,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,IAAI,CAAC;AACpC,CAAC","sourcesContent":["import { Environment } from \"../api/lib.js\";\nimport { formatEnvironmentTypeLabel } from \"./format-environment-type.js\";\n\nconst TYPE_ORDER: Record<string, number> = {\n  \"working-copy\": 0,\n  preview: 1,\n  production: 2,\n};\n\nconst FALLBACK_ORDER = 3;\n\n/**\n * Orders environments for display in the interactive selection prompt:\n * working-copy first, then preview envs alphabetically, then production\n * (alphabetically within each bucket).\n *\n * Working-copy is placed at the top because it is the recommended choice for\n * local development. Production is placed last to reduce the chance of an\n * accidental selection.\n *\n * Within-bucket ordering uses the same string the prompt actually displays:\n * `env.branchName` (the user-typed name) for preview/production, and\n * `env.name` (the slug) for working-copy. Sorting by anything else can let\n * the rendered list look non-alphabetical to the user.\n */\nexport function sortEnvironmentsForPrompt(envs: Environment[]): Environment[] {\n  return [...envs].sort((a, b) => {\n    const aOrder =\n      TYPE_ORDER[formatEnvironmentTypeLabel(a.environmentType)] ??\n      FALLBACK_ORDER;\n    const bOrder =\n      TYPE_ORDER[formatEnvironmentTypeLabel(b.environmentType)] ??\n      FALLBACK_ORDER;\n    if (aOrder !== bOrder) {\n      return aOrder - bOrder;\n    }\n    return visibleSortKey(a).localeCompare(visibleSortKey(b));\n  });\n}\n\nfunction visibleSortKey(env: Environment): string {\n  const type = formatEnvironmentTypeLabel(env.environmentType);\n  if (type === \"working-copy\") {\n    return env.name;\n  }\n  return env.branchName || env.name;\n}\n"]}

package/dist/common/utils/sort-environments-for-prompt.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=sort-environments-for-prompt.test.d.ts.map

package/dist/common/utils/sort-environments-for-prompt.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sort-environments-for-prompt.test.d.ts","sourceRoot":"","sources":["../../../src/common/utils/sort-environments-for-prompt.test.ts"],"names":[],"mappings":""}

package/dist/common/utils/sort-environments-for-prompt.test.js

@@ -0,0 +1,82 @@
+import assert from "node:assert";
+import { describe, it } from "node:test";
+import { sortEnvironmentsForPrompt } from "./sort-environments-for-prompt.js";
+function makeEnv(environmentType, name, branchName) {
+    return {
+        name,
+        accountName: "acme",
+        projectName: "my-project",
+        createdOn: null,
+        branchName: branchName ?? name,
+        environmentType,
+    };
+}
+describe("sortEnvironmentsForPrompt", () => {
+    it("orders working-copy first, then preview alpha, then production", () => {
+        const envs = [
+            makeEnv("production", "prod"),
+            makeEnv("preview", "staging-b"),
+            makeEnv("working_copy", "wc-1"),
+            makeEnv("preview", "staging-a"),
+        ];
+        const result = sortEnvironmentsForPrompt(envs).map((e) => e.name);
+        assert.deepStrictEqual(result, ["wc-1", "staging-a", "staging-b", "prod"]);
+    });
+    it("sorts alphabetically within the same bucket", () => {
+        const envs = [
+            makeEnv("preview", "charlie"),
+            makeEnv("preview", "alpha"),
+            makeEnv("preview", "bravo"),
+        ];
+        const result = sortEnvironmentsForPrompt(envs).map((e) => e.name);
+        assert.deepStrictEqual(result, ["alpha", "bravo", "charlie"]);
+    });
+    it("returns an empty array unchanged", () => {
+        assert.deepStrictEqual(sortEnvironmentsForPrompt([]), []);
+    });
+    it("treats every working-copy type spelling as the same bucket", () => {
+        const envs = [
+            makeEnv("production", "prod"),
+            makeEnv("development", "wc-c"),
+            makeEnv("working-copy", "wc-a"),
+            makeEnv("working_copy", "wc-b"),
+        ];
+        const result = sortEnvironmentsForPrompt(envs).map((e) => e.name);
+        assert.deepStrictEqual(result, ["wc-a", "wc-b", "wc-c", "prod"]);
+    });
+    it("does not mutate the input array", () => {
+        const envs = [
+            makeEnv("production", "prod"),
+            makeEnv("working_copy", "wc"),
+        ];
+        const before = envs.map((e) => e.name);
+        sortEnvironmentsForPrompt(envs);
+        assert.deepStrictEqual(envs.map((e) => e.name), before);
+    });
+    it("sorts preview/production rows by branchName (the visible label), not slug", () => {
+        const envs = [
+            makeEnv("preview", "env-test-zzz", "apple"),
+            makeEnv("preview", "env-test-aaa", "zebra"),
+            makeEnv("preview", "env-test-mmm", "mango"),
+        ];
+        const result = sortEnvironmentsForPrompt(envs).map((e) => e.branchName);
+        assert.deepStrictEqual(result, ["apple", "mango", "zebra"]);
+    });
+    it("falls back to env.name when a preview env has no branchName", () => {
+        const envs = [
+            makeEnv("preview", "alpha-slug", "zebra"),
+            makeEnv("preview", "bravo-slug", ""),
+        ];
+        const result = sortEnvironmentsForPrompt(envs).map((e) => e.name);
+        assert.deepStrictEqual(result, ["bravo-slug", "alpha-slug"]);
+    });
+    it("sorts working-copy rows by env.name (their visible label)", () => {
+        const envs = [
+            makeEnv("working_copy", "wc-zebra", "main"),
+            makeEnv("working_copy", "wc-apple", "main"),
+        ];
+        const result = sortEnvironmentsForPrompt(envs).map((e) => e.name);
+        assert.deepStrictEqual(result, ["wc-apple", "wc-zebra"]);
+    });
+});
+//# sourceMappingURL=sort-environments-for-prompt.test.js.map