@catladder/cli 0.0.0-new-cli-81ed6546 → 0.0.0-new-cli-a65ec262

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-new-cli-81ed6546",
+  "version": "0.0.0-new-cli-a65ec262",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",

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/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

@@ -6,7 +6,7 @@ import {
 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: {

package/src/commands/security/commandSecurityAuditCiJob.ts

@@ -12,7 +12,7 @@ import {
 const GITLAB_HOST = "https://git.panter.ch";
 
 export const commandSecurityAuditCiJob = defineCommand({
-  name: "security-audit-ci-job",
+  name: "security audit ci-job",
   description:
     "Evaluates security audit document. Creates MR with template if missing.",
   group: "security",

package/src/commands/security/commandSecurityAuditCreate.ts

@@ -5,7 +5,7 @@ import { createSecurityAuditMergeRequest } from "../../security/createSecurityAu
 const GITLAB_HOST = "https://git.panter.ch";
 
 export const commandSecurityAuditCreate = defineCommand({
-  name: "security-audit-create",
+  name: "security audit create",
   description: "Creates a MR with the latest security audit template document",
   group: "security",
   inputs: {

package/src/commands/security/commandSecurityAuditEvaluate.ts

@@ -6,7 +6,7 @@ import {
 import { SECURITY_AUDIT_FILE_NAME } from "../../security/createSecurityAuditMergeRequest";
 
 export const commandSecurityAuditEvaluate = defineCommand({
-  name: "security-audit-evaluate",
+  name: "security audit evaluate",
   description: "Evaluates security audit document in given path",
   group: "security",
   inputs: {

package/src/completion.ts

@@ -16,60 +16,68 @@ export async function getCompletions(
   words: string[],
   cursorWord: string,
 ): Promise<string[]> {
-  // If no command yet, complete command names
-  if (words.length === 0) {
-    return allCommands
-      .map((c) => c.name)
-      .filter((name) => name.startsWith(cursorWord));
-  }
-
-  const commandName = words[0];
-  const command = allCommands.find((c) => c.name === commandName);
+  // Try to match words against command names (which can be multi-word)
+  // Walk through words, consuming them as command name parts until we find
+  // an exact command match or need to suggest the next subcommand level.
+
+  // Find all commands whose name starts with the words typed so far
+  const typed = words.join(" ");
+
+  // Exact match: we've typed a full command name, now complete its inputs
+  const exactCommand = allCommands.find((c) => c.name === typed);
+  if (exactCommand) {
+    // Check if cursor is a --flag
+    if (cursorWord.startsWith("--")) {
+      return getFlagCompletions(exactCommand, cursorWord);
+    }
 
-  // If the first word doesn't match a command, complete command names
-  if (!command) {
-    return allCommands
-      .map((c) => c.name)
-      .filter((name) => name.startsWith(commandName));
-  }
+    // Check if previous word was a --flag (complete its value)
+    const prevWord = words[words.length - 1];
+    if (prevWord?.startsWith("--")) {
+      const flagName = prevWord.replace(/^--/, "");
+      const inputName = flagNameToInputName(flagName);
+      const inputDef = exactCommand.inputs[inputName];
+      if (inputDef && "choices" in inputDef && inputDef.choices) {
+        return resolveChoicesForCompletion(inputDef, cursorWord);
+      }
+      return [];
+    }
 
-  // We have a valid command. Figure out what to complete.
-  const argsAfterCommand = words.slice(1);
-
-  // Check if we're completing a --flag value
-  const prevWord = argsAfterCommand[argsAfterCommand.length - 1];
-  if (prevWord?.startsWith("--")) {
-    // Previous word is a flag, complete its values
-    const flagName = prevWord.replace(/^--/, "");
-    const inputName = flagNameToInputName(flagName);
-    const inputDef = command.inputs[inputName];
-    if (inputDef && "choices" in inputDef && inputDef.choices) {
-      return resolveChoicesForCompletion(inputDef, cursorWord);
+    // Complete positional inputs
+    const positionalInputs = getPositionalInputs(exactCommand);
+    // Count non-flag args after the command name
+    const argsAfterCommand = words.slice(exactCommand.name.split(" ").length);
+    const positionalArgs = argsAfterCommand.filter((w) => !w.startsWith("--"));
+    const positionalIndex = positionalArgs.length;
+    const targetInput = positionalInputs[positionalIndex];
+
+    if (targetInput) {
+      const [, inputDef] = targetInput;
+      if ("choices" in inputDef && inputDef.choices) {
+        return resolveChoicesForCompletion(inputDef, cursorWord);
+      }
     }
     return [];
   }
 
-  // Check if we're typing a --flag name
-  if (cursorWord.startsWith("--")) {
-    return getFlagCompletions(command, cursorWord);
-  }
-
-  // Otherwise, complete positional inputs
-  const positionalInputs = getPositionalInputs(command);
-  const positionalArgs = argsAfterCommand.filter((w) => !w.startsWith("--"));
-
-  // Which positional index are we on?
-  const positionalIndex = positionalArgs.length;
-  const targetInput = positionalInputs[positionalIndex];
-
-  if (targetInput) {
-    const [, inputDef] = targetInput;
-    if ("choices" in inputDef && inputDef.choices) {
-      return resolveChoicesForCompletion(inputDef, cursorWord);
+  // No exact match. Complete the next level of subcommand names.
+  // The prefix is what's been typed so far (words joined with space).
+  const prefix = typed ? typed + " " : "";
+
+  // Find unique next-level subcommand names
+  const nextParts = new Set<string>();
+  for (const cmd of allCommands) {
+    if (cmd.name.startsWith(prefix)) {
+      // Get the next word after the prefix
+      const rest = cmd.name.slice(prefix.length);
+      const nextPart = rest.split(" ")[0];
+      if (nextPart && nextPart.startsWith(cursorWord)) {
+        nextParts.add(nextPart);
+      }
     }
   }
 
-  return [];
+  return [...nextParts].sort();
 }
 
 function getPositionalInputs(command: CommandDef): [string, InputDef][] {