@catladder/cli 0.0.0-new-cli-80ac360a → 0.0.0-new-cli-a65ec262

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-new-cli-80ac360a",
+  "version": "0.0.0-new-cli-a65ec262",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
@@ -66,7 +66,6 @@
     "build:watch": "tsc-watch --onSuccess \"yarn dev:own-catenv\""
   },
   "bin": {
-    "catci": "./bin/catci",
     "catenv": "./bin/catenv",
     "catladder": "./bin/catladder"
   },
@@ -80,6 +79,7 @@
     "@babel/core": "^7.29.0",
     "@babel/plugin-syntax-typescript": "^7.28.6",
     "@gitbeaker/rest": "^39.28.0",
+    "@inquirer/prompts": "^8.4.3",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.4",
@@ -90,13 +90,13 @@
     "@types/request": "^2.48.12",
     "@types/tmp": "^0.2.3",
     "@types/update-notifier": "^2.5.0",
-    "@types/vorpal": "^1.12.0",
     "@types/websocket": "^0.0.40",
     "@types/yargs": "^17.0.33",
     "babel-plugin-transform-inline-environment-variables": "^0.4.4",
     "child-process-promise": "^2.2.1",
     "clipboardy": "^2.0.0",
     "command-exists-promise": "^2.0.2",
+    "commander": "^14.0.3",
     "common-tags": "^1.8.2",
     "connection-string-parser": "^1.0.4",
     "date-fns": "^3.6.0",
@@ -111,12 +111,9 @@
     "tsc-alias": "^1.8.16",
     "tsc-watch": "^7.2.0",
     "typescript": "^5.4.5",
-    "vorpal": "^1.12.0",
     "yaml": "^2.5.0"
   },
   "dependencies": {
-    "@inquirer/prompts": "^8.4.3",
-    "commander": "^14.0.3",
     "tsx": "^4.21.0"
   },
   "stableVersion": "0.0.0"

package/scripts/bundle

@@ -2,5 +2,3 @@
 ncc build dist/cli/src/catenv.js -o dist/bundles/catenv -e 'tsx/cjs/api' $( ((SHOULD_MINIFY == 1)) && printf %s '-m')
 
 ncc build dist/cli/src/cli.js -o dist/bundles/cli -e 'tsx/cjs/api' $( ((SHOULD_MINIFY == 1)) && printf %s '-m')
-
-ncc build dist/cli/src/catci.js -o dist/bundles/catci -e 'tsx/cjs/api' $( ((SHOULD_MINIFY == 1)) && printf %s '-m')

package/src/apps/catenv/catenv.ts

@@ -11,6 +11,7 @@ import {
 
 type Options = {
   verbose?: boolean;
+  printVariables?: boolean;
 };
 export default async (choice?: Choice, options?: Options) => {
   const config = await getProjectConfig();
@@ -28,7 +29,8 @@ export default async (choice?: Choice, options?: Options) => {
     writeDotEnvFiles(context, choice),
 
     writeDTsFiles(context, choice),
-
-    printVariables(context, choice),
+    options?.printVariables
+      ? printVariables(context, choice)
+      : Promise.resolve(),
   ]);
 };

package/src/apps/catenv/printVariables.ts

@@ -14,10 +14,6 @@ const getAllVariablesToPrint = async (config: Config, choice?: Choice) => {
   );
 
   if (currentComponent) {
-    // don't print vars if dotenv is enabled
-    if (config.components[currentComponent].dotEnv ?? true) {
-      return {};
-    }
     return await getEnvVarsResolved(null, env, currentComponent);
   } else {
     // when in a monorep and not in a subapp, merge all env vars.
@@ -25,10 +21,6 @@ const getAllVariablesToPrint = async (config: Config, choice?: Choice) => {
     // so we also add prefixed variants
     return await Object.keys(config.components).reduce(
       async (acc, componentName) => {
-        // don't print vars if dotenv is enabled
-        if (config.components[componentName].dotEnv ?? true) {
-          return await acc;
-        }
         const subappvars = await getEnvVarsResolved(null, env, componentName);
         delete subappvars["_ALL_ENV_VAR_KEYS"];
         return {

package/src/catenv.ts

@@ -1,24 +1,23 @@
+import { Command } from "commander";
 import catenv from "./apps/catenv/catenv";
-
 import { parseChoice } from "./config/parseChoice";
+import packageInfos from "./packageInfos";
 
-const args = process.argv.slice(2);
-
-const helpFlags = ["--help", "-h", "help"];
-if (args.some((arg) => helpFlags.includes(arg))) {
-  const docLink =
-    "https://git.panter.ch/catladder/catladder/-/blob/main/docs/1_VARS.md";
-  console.log(
-    `\nUsage: catenv [env|env:component] [-v|--verbose]\n\nEnv variable and catenv documentation:\n${docLink}`,
-  );
-  process.exit(0);
-}
+const program = new Command();
 
-const verbose = args.some((arg) => arg === "-v" || arg === "--verbose");
-// choise arg is deprecated and will be removed in the future
-const choiceArg = args.find((arg) => arg !== "-v" && arg !== "--verbose");
+program
+  .name("catenv")
+  .description("Environment variable and pipeline generation via direnv")
+  .version(packageInfos.version)
+  .argument("[envComponent]", "env or env:component")
+  .option("-v, --verbose", "verbose output")
+  .action((envComponent: string | undefined, opts: { verbose?: boolean }) => {
+    catenv(envComponent ? parseChoice(envComponent) : null, {
+      verbose: opts.verbose ?? false,
+    }).then(() => {
+      // we have to exit manually, because we have some file watches
+      process.exit();
+    });
+  });
 
-catenv(choiceArg ? parseChoice(choiceArg) : null, { verbose }).then(() => {
-  // we have to exit manually, because we have some file watches
-  process.exit();
-});
+program.parse();

package/src/cli.ts

@@ -24,8 +24,28 @@ program
 // Collect all command defs for completion
 const allCommandDefs: CommandDef[] = [];
 
+// Cache for intermediate subcommand groups (e.g., "project", "project cloudsql")
+const subcommandCache = new Map<string, Command>();
+
+/**
+ * Get or create a chain of nested subcommands.
+ * E.g., for ["project", "cloudsql"], ensures program.command("project").command("cloudsql") exists.
+ */
+function getOrCreateParent(parts: string[]): Command {
+  if (parts.length === 0) return program;
+
+  const key = parts.join(" ");
+  if (subcommandCache.has(key)) return subcommandCache.get(key)!;
+
+  const parent = getOrCreateParent(parts.slice(0, -1));
+  const cmd = parent.command(parts[parts.length - 1]);
+  subcommandCache.set(key, cmd);
+  return cmd;
+}
+
 /**
  * Register a CommandDef with Commander.js.
+ * - Command name can contain spaces for nesting (e.g., "project cloudsql proxy")
  * - Inputs with `positional: true` become Commander positional args
  * - Other inputs become optional --flags
  * - --inputs accepts JSON for programmatic use
@@ -45,15 +65,19 @@ function registerCommand(def: CommandDef): void {
     }
   }
 
-  // Build the command string with positional args.
-  // All positionals are registered as optional in Commander so that
-  // ctx.get() can prompt for them interactively when missing.
-  let cmdStr = def.name;
+  // Split name into parent groups + leaf command
+  const nameParts = def.name.split(" ");
+  const parentParts = nameParts.slice(0, -1);
+  const leafName = nameParts[nameParts.length - 1];
+
+  // Build leaf command string with positional args
+  let cmdStr = leafName;
   for (const [name] of positionalInputs) {
     cmdStr += ` [${name}]`;
   }
 
-  const cmd = program.command(cmdStr).description(def.description);
+  const parent = getOrCreateParent(parentParts);
+  const cmd = parent.command(cmdStr).description(def.description);
 
   // Add --flag for each non-positional input
   for (const [name, inputDef] of flagInputs) {

package/src/commands/cloudSQL/commandRestoreDb.ts

@@ -4,7 +4,7 @@ import type { CloudSqlBackgroundProxy } from "../../gcloud/cloudSql/startProxy";
 import { startCloudSqlProxyInBackground } from "../../gcloud/cloudSql/startProxy";
 
 export const commandRestoreDb = defineCommand({
-  name: "cloud-sql-restore-db",
+  name: "cloudsql restore-db",
   description: "restore a db from one source to another target",
   group: "cloudSQL",
   inputs: {

package/src/commands/fun/commandDadjoke.ts

@@ -2,7 +2,7 @@ import fetch from "node-fetch";
 import { defineCommand } from "../../core/defineCommand";
 
 export const commandDadjoke = defineCommand({
-  name: "dadjoke",
+  name: "fun dadjoke",
   description: "something for jonas.",
   group: "fun",
   inputs: {},

package/src/commands/fun/commandStarwars.ts

@@ -2,7 +2,7 @@ import { spawn } from "child-process-promise";
 import { defineCommand } from "../../core/defineCommand";
 
 export const commandStarwars = defineCommand({
-  name: "starwars",
+  name: "fun starwars",
   description: "Long time ago... in a galaxy far far away...",
   group: "fun",
   inputs: {},

package/src/commands/general/commandKubeCurrentContext.ts

@@ -2,7 +2,7 @@ import { defineCommand } from "../../core/defineCommand";
 import { getCurrentContext } from "../../utils/cluster";
 
 export const commandKubeCurrentContext = defineCommand({
-  name: "kube-current-context",
+  name: "kube current-context",
   description: "show current kubernetes context",
   group: "general",
   inputs: {},

package/src/commands/general/commandKubeGetShell.ts

@@ -4,7 +4,7 @@ import { getk8sApi } from "../../k8sApi";
 import { getShell } from "../../utils/shell";
 
 export const commandKubeGetShell = defineCommand({
-  name: "kube-get-shell",
+  name: "kube get-shell",
   description: "get a shell to a pod in the environment",
   group: "general",
   inputs: {

package/src/commands/general/commandKubeListNamespaces.ts

@@ -2,7 +2,7 @@ import { defineCommand } from "../../core/defineCommand";
 import { getk8sApi } from "../../k8sApi";
 
 export const commandKubeListNamespaces = defineCommand({
-  name: "kube-list-namespaces",
+  name: "kube list-namespaces",
   description: "list all namespaces",
   group: "general",
   inputs: {},

package/src/commands/general/commandKubeListPods.ts

@@ -2,7 +2,7 @@ import { defineCommand } from "../../core/defineCommand";
 import { getk8sApi } from "../../k8sApi";
 
 export const commandKubeListPods = defineCommand({
-  name: "kube-list-pods",
+  name: "kube list-pods",
   description: "list all pods of namespace",
   group: "general",
   inputs: {

package/src/commands/general/commandKubeListSecrets.ts

@@ -2,7 +2,7 @@ import { defineCommand } from "../../core/defineCommand";
 import { getk8sApi } from "../../k8sApi";
 
 export const commandKubeListSecrets = defineCommand({
-  name: "kube-list-secrets",
+  name: "kube list-secrets",
   description: "show secrets",
   group: "general",
   inputs: {

package/src/commands/general/commandKubePortForward.ts

@@ -3,7 +3,7 @@ import { getk8sApi } from "../../k8sApi";
 import { startKubePortForward } from "../../kubernetes/portForward";
 
 export const commandKubePortForward = defineCommand({
-  name: "kube-port-forward",
+  name: "kube port-forward",
   description: "start port-forwarding",
   group: "general",
   inputs: {

package/src/commands/general/commandKubeStopPortforward.ts

@@ -2,7 +2,7 @@ import { defineCommand } from "../../core/defineCommand";
 import { stopPortForward } from "../../utils/portForwards";
 
 export const commandKubeStopPortforward = defineCommand({
-  name: "kube-stop-portforward",
+  name: "kube stop-portforward",
   description: "stop a running port forward",
   group: "general",
   inputs: {

package/src/commands/index.ts

@@ -41,6 +41,11 @@ export { commandMongoDestroyMember } from "./mongodb/commandMongoDestroyMember";
 // CloudSQL commands
 export { commandRestoreDb } from "./cloudSQL/commandRestoreDb";
 
+// Security commands
+export { commandSecurityAuditCiJob } from "./security/commandSecurityAuditCiJob";
+export { commandSecurityAuditEvaluate } from "./security/commandSecurityAuditEvaluate";
+export { commandSecurityAuditCreate } from "./security/commandSecurityAuditCreate";
+
 // Fun commands
 export { commandDadjoke } from "./fun/commandDadjoke";
 export { commandStarwars } from "./fun/commandStarwars";

package/src/commands/mongodb/commandMongoDestroyMember.ts

@@ -34,7 +34,7 @@ const removeFinalizerAndDelete = async (
 };
 
 export const commandMongoDestroyMember = defineCommand({
-  name: "project-mongo-destroy-member",
+  name: "project mongo destroy-member",
   description: "DESTROY a member of a replicaset in order to reinitialize it",
   group: "mongodb",
   inputs: {

package/src/commands/mongodb/commandMongoGetShell.ts

@@ -9,7 +9,7 @@ import {
 import { envAndComponents } from "../../apps/cli/commands/project/utils/autocompletions";
 
 export const commandMongoGetShell = defineCommand({
-  name: "project-mongo-get-shell",
+  name: "project mongo get-shell",
   description: "get a shell to a mongodb in the environment",
   group: "mongodb",
   inputs: {

package/src/commands/mongodb/commandMongoPortForward.ts

@@ -9,7 +9,7 @@ import clipboard from "clipboardy";
 import { envAndComponents } from "../../apps/cli/commands/project/utils/autocompletions";
 
 export const commandMongoPortForward = defineCommand({
-  name: "project-mongo-port-forward",
+  name: "project mongo port-forward",
   description: "port forward to a mongodb",
   group: "mongodb",
   inputs: {

package/src/commands/project/commandCloudSqlProxy.ts

@@ -91,7 +91,7 @@ const getJdbcUrl = (
   `DATABASE_JDBC_URL="jdbc:postgresql://localhost:${localPort}/${DB_NAME}?schema=public&user=${DB_USER}&password=${DB_PASSWORD}"`;
 
 export const commandCloudSqlProxy = defineCommand({
-  name: "project-cloud-sql-proxy",
+  name: "project cloudsql proxy",
   description: "proxy to cloud sql db",
   group: "project",
   inputs: {

package/src/commands/project/commandConfigSecrets.ts

@@ -7,7 +7,7 @@ import { envAndComponents } from "../../apps/cli/commands/project/utils/autocomp
 // Full migration to CommandIO would require reworking the editor flow,
 // so for now we bridge it.
 export const commandConfigSecrets = defineCommand({
-  name: "project-config-secrets",
+  name: "project config-secrets",
   description: "setup/update secrets stored in pass",
   group: "project",
   inputs: {

package/src/commands/project/commandDeletePods.ts

@@ -7,7 +7,7 @@ import { ensureCluster } from "../../apps/cli/commands/project/utils/ensureClust
 import { envAndComponents } from "../../apps/cli/commands/project/utils/autocompletions";
 
 export const commandDeletePods = defineCommand({
-  name: "project-delete-pods",
+  name: "project delete-pods",
   description: "delete / restart pods",
   group: "project",
 

package/src/commands/project/commandDeleteProject.ts

@@ -4,7 +4,7 @@ import { getProjectNamespace } from "../../utils/projects";
 import { envAndComponents } from "../../apps/cli/commands/project/utils/autocompletions";
 
 export const commandDeleteProject = defineCommand({
-  name: "project-delete",
+  name: "project delete",
   description: "deletes a environment of a project (it deletes the namespace)",
   group: "project",
   inputs: {

package/src/commands/project/commandEnvVars.ts

@@ -3,7 +3,7 @@ import { getEnvVarsResolved, parseChoice } from "../../config/getProjectConfig";
 import { envAndComponents } from "../../apps/cli/commands/project/utils/autocompletions";
 
 export const commandEnvVars = defineCommand({
-  name: "project-env-vars",
+  name: "project env-vars",
   description: "list env vars",
   group: "project",
   inputs: {

package/src/commands/project/commandGetMyTotalWorktime.ts

@@ -2,7 +2,7 @@ import { spawn } from "child-process-promise";
 import { defineCommand } from "../../core/defineCommand";
 
 export const commandGetMyTotalWorktime = defineCommand({
-  name: "project-get-my-total-worktime",
+  name: "project worktime",
   description: "show the total worktime that you spent on a project",
   group: "project",
   inputs: {},

package/src/commands/project/commandGetShell.ts

@@ -7,7 +7,7 @@ import { ensureCluster } from "../../apps/cli/commands/project/utils/ensureClust
 import { envAndComponents } from "../../apps/cli/commands/project/utils/autocompletions";
 
 export const commandGetShell = defineCommand({
-  name: "project-get-shell",
+  name: "project get-shell",
   description: "get a shell to a pod in the environment",
   group: "project",
   inputs: {

package/src/commands/project/commandGitlabCi.ts

@@ -61,7 +61,7 @@ const findJobById = async (io: any, jobName: string) => {
 };
 
 export const commandCiJobOpen = defineCommand({
-  name: "project-ci-job-open",
+  name: "project ci job-open",
   description: "Open a Job",
   group: "project",
   inputs: {
@@ -79,7 +79,7 @@ export const commandCiJobOpen = defineCommand({
 });
 
 export const commandCiJobLog = defineCommand({
-  name: "project-ci-job-log",
+  name: "project ci job-log",
   description: "Show a job's log",
   group: "project",
   inputs: {

package/src/commands/project/commandListPods.ts

@@ -6,7 +6,7 @@ import { ensureCluster } from "../../apps/cli/commands/project/utils/ensureClust
 import { envAndComponents } from "../../apps/cli/commands/project/utils/autocompletions";
 
 export const commandListPods = defineCommand({
-  name: "project-list-pods",
+  name: "project list-pods",
   description: "list pods of local project",
   group: "project",
   inputs: {

package/src/commands/project/commandNamespace.ts

@@ -3,7 +3,7 @@ import { getProjectNamespace } from "../../utils/projects";
 import { envAndComponents } from "../../apps/cli/commands/project/utils/autocompletions";
 
 export const commandNamespace = defineCommand({
-  name: "project-namespace",
+  name: "project namespace",
   description: "show namespace of local project",
   group: "project",
   inputs: {

package/src/commands/project/commandOpenEnv.ts

@@ -5,7 +5,7 @@ import { ensureCluster } from "../../apps/cli/commands/project/utils/ensureClust
 import { envAndComponents } from "../../apps/cli/commands/project/utils/autocompletions";
 
 export const commandOpenEnv = defineCommand({
-  name: "project-open-env",
+  name: "project open env",
   description: "open the live environment",
   group: "project",
   inputs: {

package/src/commands/project/commandOpenGit.ts

@@ -2,7 +2,7 @@ import { exec } from "child-process-promise";
 import { defineCommand } from "../../core/defineCommand";
 
 export const commandOpenGit = defineCommand({
-  name: "project-open-git",
+  name: "project open git",
   description: "open the repo on gitlab / github in your browser",
   group: "project",
   inputs: {},

package/src/commands/project/commandOpenLogs.ts

@@ -7,7 +7,7 @@ import { openGoogleCloudLogs } from "../../kubernetes/openKubernetesDashboards";
 import { envAndComponents } from "../../apps/cli/commands/project/utils/autocompletions";
 
 export const commandOpenLogs = defineCommand({
-  name: "project-open-logs",
+  name: "project open logs",
   description: "open google cloud logs (stackdriver logs)",
   group: "project",
   inputs: {

package/src/commands/project/commandPauseProject.ts

@@ -4,7 +4,7 @@ import { getProjectNamespace } from "../../utils/projects";
 import { envAndComponents } from "../../apps/cli/commands/project/utils/autocompletions";
 
 export const commandPauseProject = defineCommand({
-  name: "project-pause",
+  name: "project pause",
   description: "halts all running pods (scales to 0)",
   group: "project",
   inputs: {

package/src/commands/project/commandPortForward.ts

@@ -12,7 +12,7 @@ import open from "open";
 import { envAndComponents } from "../../apps/cli/commands/project/utils/autocompletions";
 
 export const commandPortForward = defineCommand({
-  name: "project-port-forward",
+  name: "project port-forward",
   description: "start port-forwarding",
   group: "project",
   inputs: {

package/src/commands/project/commandProjectRestoreDb.ts

@@ -23,7 +23,7 @@ const hasCloudSql = (context: ComponentContext) => {
 };
 
 export const commandProjectRestoreDb = defineCommand({
-  name: "project-cloud-sql-restore-db",
+  name: "project cloudsql restore-db",
   description: "restores a project db from one source to another target",
   group: "project",
   inputs: {

package/src/commands/project/commandRenewToken.ts

@@ -2,7 +2,7 @@ import { defineCommand } from "../../core/defineCommand";
 import { setupAccessTokens } from "../../apps/cli/commands/project/setup/setupAccessTokens";
 
 export const commandRenewToken = defineCommand({
-  name: "project-renew-token",
+  name: "project renew-token",
   description: "Configures the project access token for semantic release.",
   group: "project",
   inputs: {},

package/src/commands/project/commandSecretsClearBackups.ts

@@ -2,7 +2,7 @@ import { defineCommand } from "../../core/defineCommand";
 import { clearBackups } from "../../utils/gitlab";
 
 export const commandSecretsClearBackups = defineCommand({
-  name: "project-secrets-clear-backups",
+  name: "project secrets-clear-backups",
   description: "clears all backups",
   group: "project",
   inputs: {

package/src/commands/project/commandSecurityEvaluate.ts

@@ -2,11 +2,11 @@ import { defineCommand } from "../../core/defineCommand";
 import {
   evaluateSecurityAudit,
   makeSecurityAuditOverview,
-} from "../../apps/catci/commands/security/evaluateSecurityAudit";
+} from "../../security/evaluateSecurityAudit";
 import { getGitRoot } from "../../utils/projects";
 
 export const commandSecurityEvaluate = defineCommand({
-  name: "project-security-evaluate",
+  name: "project security-evaluate",
   description: "evaluate project's security audit document",
   group: "project",
   inputs: {},

package/src/commands/project/commandSetup.ts

@@ -2,7 +2,7 @@ import { defineCommand } from "../../core/defineCommand";
 import { setupProject } from "../../apps/cli/commands/project/setup";
 
 export const commandSetup = defineCommand({
-  name: "project-setup",
+  name: "project setup",
   description:
     "Initializes all environments and creates required resources, service accounts, etc.",
   group: "project",

package/src/commands/project/commandTriggerCronjob.ts

@@ -46,7 +46,7 @@ const runCronjob = async (
 };
 
 export const commandTriggerCronjobGeneral = defineCommand({
-  name: "trigger-cronjob",
+  name: "kube trigger-cronjob",
   description: "trigger cronjob",
   group: "general",
   inputs: {
@@ -69,7 +69,7 @@ export const commandTriggerCronjobGeneral = defineCommand({
 });
 
 export const commandTriggerCronjobProject = defineCommand({
-  name: "project-trigger-cronjob",
+  name: "project trigger-cronjob",
   description: "trigger cronjob",
   group: "project",
   inputs: {