@mittwald/cli 1.5.1 → 1.7.0

package/README.md

@@ -107,7 +107,7 @@ USAGE
 * [`mw app`](docs/app.md) - Manage apps, and app installations in your projects
 * [`mw autocomplete`](docs/autocomplete.md) - Display autocomplete installation instructions.
 * [`mw backup`](docs/backup.md) - Manage backups of your projects
-* [`mw container`](docs/container.md) - Delete a container
+* [`mw container`](docs/container.md) - Manage containers
 * [`mw context`](docs/context.md) - Save certain environment parameters for later use
 * [`mw conversation`](docs/conversation.md) - Manage your support cases
 * [`mw cronjob`](docs/cronjob.md) - Manage cronjobs of your projects

package/dist/commands/app/dependency/list.d.ts

@@ -14,6 +14,7 @@ export declare class List extends ListBaseCommand<typeof List, ResponseItem, Res
         "no-truncate": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "no-relative-dates": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "csv-separator": import("@oclif/core/interfaces").OptionFlag<"," | ";">;
+        token: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     protected sorter: SorterFunction<ResponseItem>;
     getData(): Promise<Response>;

package/dist/commands/app/dependency/versions.d.ts

@@ -16,6 +16,7 @@ export declare class Versions extends ListBaseCommand<typeof Versions, ResponseI
         "no-truncate": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "no-relative-dates": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "csv-separator": import("@oclif/core/interfaces").OptionFlag<"," | ";">;
+        token: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     sorter: SorterFunction<ResponseItem>;
     getData(): Promise<Response>;

package/dist/commands/app/get.js

@@ -1,13 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { RenderBaseCommand } from "../../lib/basecommands/RenderBaseCommand.js";
 import { RenderJson } from "../../rendering/react/json/RenderJson.js";
-import { GetBaseCommand } from "../../lib/basecommands/GetBaseCommand.js";
 import { AppInstallationDetails } from "../../rendering/react/components/AppInstallation/AppInstallationDetails.js";
 import { useApp, useAppInstallation } from "../../lib/resources/app/hooks.js";
 import { appInstallationArgs } from "../../lib/resources/app/flags.js";
 export default class Get extends RenderBaseCommand {
     static description = "Get details about an app installation";
-    static flags = { ...GetBaseCommand.baseFlags };
+    static flags = { ...RenderBaseCommand.buildFlags() };
     static args = { ...appInstallationArgs };
     render() {
         const appInstallationId = this.useAppInstallationId(Get);

package/dist/commands/app/list-upgrade-candidates.d.ts

@@ -16,6 +16,7 @@ export default class List extends ListBaseCommand<typeof List, ResponseItem, Res
         "no-truncate": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "no-relative-dates": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "csv-separator": import("@oclif/core/interfaces").OptionFlag<"," | ";">;
+        token: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     protected getData(): Promise<Response>;
     protected mapData(data: ResponseItem[]): Promise<ResponseItem[]>;

package/dist/commands/app/list.d.ts

@@ -22,6 +22,7 @@ export default class List extends ListBaseCommand<typeof List, ResponseItem, Res
         "no-truncate": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "no-relative-dates": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "csv-separator": import("@oclif/core/interfaces").OptionFlag<"," | ";">;
+        token: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     protected getData(): Promise<Response>;
     protected mapData(data: SuccessfulResponse<Response, 200>["data"]): Promise<ExtendedResponseItem[]>;

package/dist/commands/app/upgrade.d.ts

@@ -14,5 +14,19 @@ export declare class UpgradeApp extends ExecRenderBaseCommand<typeof UpgradeApp,
         force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     protected exec(): Promise<void>;
+    /**
+     * Determines the target application version based on the provided input and
+     * available upgrade candidates.
+     *
+     * @param currentApp The current application instance.
+     * @param currentAppVersion The current version of the application.
+     * @param targetAppVersionCandidates List of potential target application
+     *   versions.
+     * @param process The process renderer to handle user interactions and display
+     *   information.
+     * @returns The determined target application version, or undefined if not
+     *   resolved.
+     */
+    private determineTargetAppVersion;
     protected render(): ReactNode;
 }

package/dist/commands/app/upgrade.js

@@ -11,7 +11,7 @@ import { Success } from "../../rendering/react/components/Success.js";
 import { waitUntilAppStateHasNormalized } from "../../lib/resources/app/wait.js";
 import { assertStatus } from "@mittwald/api-client-commons";
 import { waitFlags } from "../../lib/wait.js";
-import semver from "semver/preload.js";
+import semver from "semver";
 export class UpgradeApp extends ExecRenderBaseCommand {
     static description = "Upgrade app installation to target version";
     static args = {
@@ -19,11 +19,11 @@ export class UpgradeApp extends ExecRenderBaseCommand {
     };
     static flags = {
         "target-version": Flags.string({
-            description: "target version to upgrade app to; if omitted, target version will be prompted interactively",
+            description: "target version to upgrade app to; if omitted, target version will be prompted interactively. May also be a semantic versioning range, e.g. ^1.0.0. If set to 'latest', the latest available version will be used.",
         }),
         force: Flags.boolean({
             char: "f",
-            description: "Do not ask for confirmation.",
+            summary: "do not ask for confirmation.",
         }),
         ...projectFlags,
         ...processFlags,
@@ -43,25 +43,7 @@ export class UpgradeApp extends ExecRenderBaseCommand {
             process.complete(_jsxs(Text, { children: ["Your ", currentApp.name, " ", currentAppVersion.externalVersion, " is already Up-To-Date. \u2705"] }));
             return;
         }
-        let targetAppVersion;
-        if (this.flags["target-version"] == "latest") {
-            targetAppVersion =
-                (await getLatestAvailableTargetAppVersionForAppVersionUpgradeCandidates(this.apiClient, currentApp.id, currentAppVersion.id));
-        }
-        else if (this.flags["target-version"]) {
-            const targetVersionMatchFromCandidates = targetAppVersionCandidates.find((targetAppVersionCandidate) => targetAppVersionCandidate.externalVersion ===
-                this.flags["target-version"]);
-            if (targetVersionMatchFromCandidates) {
-                targetAppVersion = targetVersionMatchFromCandidates;
-            }
-            else {
-                process.addInfo(_jsx(Text, { children: "The given target upgrade version does not seem to be a valid upgrade candidate." }));
-                targetAppVersion = (await forceTargetVersionSelection(process, this.apiClient, targetAppVersionCandidates, currentApp, currentAppVersion));
-            }
-        }
-        else {
-            targetAppVersion = (await forceTargetVersionSelection(process, this.apiClient, targetAppVersionCandidates, currentApp, currentAppVersion));
-        }
+        const targetAppVersion = await this.determineTargetAppVersion(currentApp, currentAppVersion, targetAppVersionCandidates, process);
         if (!targetAppVersion) {
             process.error("Target app version could not be determined properly.");
             ux.exit(1);
@@ -121,6 +103,37 @@ export class UpgradeApp extends ExecRenderBaseCommand {
         }
         await process.complete(_jsx(Success, { children: successText }));
     }
+    /**
+     * Determines the target application version based on the provided input and
+     * available upgrade candidates.
+     *
+     * @param currentApp The current application instance.
+     * @param currentAppVersion The current version of the application.
+     * @param targetAppVersionCandidates List of potential target application
+     *   versions.
+     * @param process The process renderer to handle user interactions and display
+     *   information.
+     * @returns The determined target application version, or undefined if not
+     *   resolved.
+     */
+    async determineTargetAppVersion(currentApp, currentAppVersion, targetAppVersionCandidates, process) {
+        const targetAppVersionString = this.flags["target-version"];
+        if (targetAppVersionString == "latest") {
+            return await getLatestAvailableTargetAppVersionForAppVersionUpgradeCandidates(this.apiClient, currentApp.id, currentAppVersion.id);
+        }
+        if (targetAppVersionString) {
+            const exactVersionMatch = targetAppVersionCandidates.find((v) => v.externalVersion === targetAppVersionString);
+            if (exactVersionMatch) {
+                return exactVersionMatch;
+            }
+            const semverMatch = targetAppVersionCandidates.findLast((v) => semver.satisfies(v.externalVersion, targetAppVersionString));
+            if (semverMatch) {
+                return semverMatch;
+            }
+            process.addInfo(_jsx(Text, { children: "The given target upgrade version does not seem to be a valid upgrade candidate." }));
+        }
+        return await forceTargetVersionSelection(process, this.apiClient, targetAppVersionCandidates, currentApp, currentAppVersion);
+    }
     render() {
         return true;
     }

package/dist/commands/backup/delete.d.ts

@@ -5,6 +5,7 @@ export declare class Delete extends DeleteBaseCommand<typeof Delete> {
     static flags: {
         force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         quiet: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        token: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static args: {
         "backup-id": import("@oclif/core/interfaces").Arg<string>;

package/dist/commands/backup/get.js

@@ -3,7 +3,6 @@ import { RenderBaseCommand } from "../../lib/basecommands/RenderBaseCommand.js";
 import { useProjectBackup } from "../../lib/resources/projectbackup/hooks.js";
 import { ProjectBackupDetails } from "../../rendering/react/components/ProjectBackup/ProjectBackupDetails.js";
 import { RenderJson } from "../../rendering/react/json/RenderJson.js";
-import { GetBaseCommand } from "../../lib/basecommands/GetBaseCommand.js";
 import { Box } from "ink";
 import { backupArgs, withBackupId } from "../../lib/resources/backup/flags.js";
 import { usePromise } from "@mittwald/react-use-promise";
@@ -11,7 +10,7 @@ export default class Get extends RenderBaseCommand {
     static description = "Show details of a backup.";
     static args = { ...backupArgs };
     static flags = {
-        ...GetBaseCommand.baseFlags,
+        ...RenderBaseCommand.buildFlags(),
     };
     static aliases = ["project:backup:get"];
     static deprecateAliases = true;

package/dist/commands/backup/list.d.ts

@@ -16,6 +16,7 @@ export declare class List extends ListBaseCommand<typeof List, ListItem, ListRes
         "no-truncate": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "no-relative-dates": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "csv-separator": import("@oclif/core/interfaces").OptionFlag<"," | ";">;
+        token: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static aliases: string[];
     static deprecateAliases: boolean;

package/dist/commands/backup/schedule/list.d.ts

@@ -16,6 +16,7 @@ export declare class List extends ListBaseCommand<typeof List, ResponseItem, Res
         "no-truncate": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "no-relative-dates": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "csv-separator": import("@oclif/core/interfaces").OptionFlag<"," | ";">;
+        token: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static aliases: string[];
     static deprecateAliases: boolean;

package/dist/commands/container/delete.d.ts

@@ -7,6 +7,7 @@ export default class Delete extends DeleteBaseCommand<typeof Delete> {
         "project-id": import("@oclif/core/interfaces").OptionFlag<string>;
         force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         quiet: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        token: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static args: {
         "container-id": import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;

package/dist/commands/container/exec.d.ts

@@ -0,0 +1,25 @@
+import { ExtendedBaseCommand } from "../../lib/basecommands/ExtendedBaseCommand.js";
+export default class Exec extends ExtendedBaseCommand<typeof Exec> {
+    static summary: string;
+    static description: string;
+    static args: {
+        "container-id": import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+        command: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static flags: {
+        workdir: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        env: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        shell: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        "project-id": import("@oclif/core/interfaces").OptionFlag<string>;
+        "ssh-user": import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        "ssh-identity-file": import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    /**
+     * Prepare environment variables for the SSH command
+     *
+     * @param envVars Array of environment variables in KEY=VALUE format
+     * @returns Formatted string with export commands
+     */
+    private prepareEnvironmentVariables;
+    run(): Promise<void>;
+}

package/dist/commands/container/exec.js

@@ -0,0 +1,93 @@
+import * as child_process from "child_process";
+import { Args, Flags } from "@oclif/core";
+import { ExtendedBaseCommand } from "../../lib/basecommands/ExtendedBaseCommand.js";
+import { getSSHConnectionForContainer } from "../../lib/resources/ssh/container.js";
+import { sshConnectionFlags } from "../../lib/resources/ssh/flags.js";
+import { sshUsageDocumentation } from "../../lib/resources/ssh/doc.js";
+import { buildSSHClientFlags } from "../../lib/resources/ssh/connection.js";
+import { withContainerAndStackId } from "../../lib/resources/container/flags.js";
+import { projectFlags } from "../../lib/resources/project/flags.js";
+import shellEscape from "shell-escape";
+export default class Exec extends ExtendedBaseCommand {
+    static summary = "Execute a command in a container via SSH non-interactively.";
+    static description = sshUsageDocumentation;
+    static args = {
+        "container-id": Args.string({
+            description: "ID or short ID of the container to connect to",
+            required: true,
+        }),
+        command: Args.string({
+            description: "Command to execute in the container",
+            required: true,
+        }),
+    };
+    static flags = {
+        ...sshConnectionFlags,
+        ...projectFlags,
+        workdir: Flags.string({
+            char: "w",
+            summary: "working directory where the command will be executed",
+            default: undefined,
+        }),
+        env: Flags.string({
+            char: "e",
+            summary: "environment variables to set for the command (format: KEY=VALUE)",
+            multiple: true,
+        }),
+        shell: Flags.string({
+            summary: "shell to use for the SSH connection",
+            default: "/bin/sh",
+        }),
+    };
+    /**
+     * Prepare environment variables for the SSH command
+     *
+     * @param envVars Array of environment variables in KEY=VALUE format
+     * @returns Formatted string with export commands
+     */
+    prepareEnvironmentVariables(envVars) {
+        return (envVars
+            .map((env) => {
+            const eqIdx = env.indexOf("=");
+            if (eqIdx === -1) {
+                // If no '=', treat the whole string as key with empty value
+                return `export ${shellEscape([env])}=`;
+            }
+            const key = env.slice(0, eqIdx);
+            const value = env.slice(eqIdx + 1);
+            return `export ${shellEscape([key])}=${shellEscape([value])}`;
+        })
+            .join("; ") + "; ");
+    }
+    async run() {
+        const { args, flags } = await this.parse(Exec);
+        const [containerId, stackId] = await withContainerAndStackId(this.apiClient, Exec, flags, this.args, this.config);
+        const { host, user } = await getSSHConnectionForContainer(this.apiClient, containerId, stackId, flags["ssh-user"]);
+        this.log("executing command on %s as %s", host, user);
+        const command = args.command;
+        const workdir = flags.workdir;
+        // Build the command to execute
+        let execCommand = "";
+        // Add environment variables if provided
+        if (flags.env && flags.env.length > 0) {
+            execCommand += this.prepareEnvironmentVariables(flags.env);
+        }
+        // Change to working directory if specified
+        if (workdir !== undefined) {
+            execCommand += `cd ${shellEscape([workdir])} && `;
+        }
+        // Add the actual command
+        execCommand += command;
+        const sshArgs = buildSSHClientFlags(user, host, flags, {
+            interactive: false,
+        });
+        const wrappedExecCommand = shellEscape([flags.shell, "-c", execCommand]);
+        this.debug("running ssh %o, with command %o", sshArgs, wrappedExecCommand);
+        const result = child_process.spawnSync("/usr/bin/ssh", [...sshArgs, wrappedExecCommand], {
+            stdio: "inherit",
+        });
+        if (result.status !== 0) {
+            this.error(`Command failed with exit code ${result.status}`);
+        }
+    }
+}

package/dist/commands/container/list.d.ts

@@ -16,6 +16,7 @@ export declare class List extends ListBaseCommand<typeof List, ResponseItem, Res
         "no-truncate": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "no-relative-dates": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "csv-separator": import("@oclif/core/interfaces").OptionFlag<"," | ";">;
+        token: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     getData(): Promise<Response>;
     protected getColumns(data: ResponseItem[]): ListColumns<ResponseItem>;

package/dist/commands/container/logs.d.ts

@@ -6,6 +6,7 @@ export declare class Logs extends BaseCommand {
     static flags: {
         "no-pager": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "project-id": import("@oclif/core/interfaces").OptionFlag<string>;
+        token: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static args: {
         "container-id": import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;

package/dist/commands/container/port-forward.d.ts

@@ -0,0 +1,20 @@
+import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
+import { ReactNode } from "react";
+import PortMapping from "../../lib/units/PortMapping.js";
+export declare class PortForward extends ExecRenderBaseCommand<typeof PortForward, Record<string, never>> {
+    static summary: string;
+    static description: string;
+    static flags: {
+        "project-id": import("@oclif/core/interfaces").OptionFlag<string>;
+        "ssh-user": import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        "ssh-identity-file": import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        quiet: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
+    static args: {
+        "container-id": import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+        port: import("@oclif/core/interfaces").Arg<PortMapping | undefined, Record<string, unknown>>;
+    };
+    protected exec(): Promise<Record<string, never>>;
+    private getPortMappings;
+    protected render(): ReactNode;
+}

package/dist/commands/container/port-forward.js

@@ -0,0 +1,68 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
+import { makeProcessRenderer, processFlags, } from "../../rendering/process/process_flags.js";
+import * as cp from "child_process";
+import { Box, Text } from "ink";
+import { Value } from "../../rendering/react/components/Value.js";
+import { Args } from "@oclif/core";
+import { sshConnectionFlags } from "../../lib/resources/ssh/flags.js";
+import { sshUsageDocumentation } from "../../lib/resources/ssh/doc.js";
+import { buildSSHClientFlags } from "../../lib/resources/ssh/connection.js";
+import { withContainerAndStackId } from "../../lib/resources/container/flags.js";
+import { getSSHConnectionForContainer } from "../../lib/resources/ssh/container.js";
+import { projectFlags } from "../../lib/resources/project/flags.js";
+import PortMapping from "../../lib/units/PortMapping.js";
+import { assertStatus } from "@mittwald/api-client";
+export class PortForward extends ExecRenderBaseCommand {
+    static summary = "Forward a container port to a local port";
+    static description = "This command forwards a TCP port from a container to a local port on your machine. This allows you to connect to services running in the container as if they were running on your local machine.\n\n" +
+        sshUsageDocumentation;
+    static flags = {
+        ...processFlags,
+        ...sshConnectionFlags,
+        ...projectFlags,
+    };
+    static args = {
+        "container-id": Args.string({
+            description: "ID or short ID of the container to connect to",
+            required: true,
+        }),
+        port: PortMapping.arg({
+            summary: "Port mapping in the format 'local-port:container-port'",
+            description: "Specifies the port mapping between your local machine and the container. Format: 'local-port:container-port'. If not specified, available ports will be detected automatically.",
+            required: false,
+        }),
+    };
+    async exec() {
+        const [serviceId, stackId] = await withContainerAndStackId(this.apiClient, PortForward, this.flags, this.args, this.config);
+        const p = makeProcessRenderer(this.flags, "Port-forwarding a container");
+        const { host, user } = await getSSHConnectionForContainer(this.apiClient, serviceId, stackId, this.flags["ssh-user"]);
+        const portMappings = await this.getPortMappings(stackId, serviceId);
+        await p.complete(_jsxs(Box, { flexDirection: "column", children: [portMappings.map((p, idx) => (_jsxs(Text, { children: ["Forwarding container port ", _jsx(Value, { children: p.remotePort }), " to local port ", _jsx(Value, { children: p.localPort }), "."] }, idx))), _jsx(Text, { children: "Use CTRL+C to cancel." })] }));
+        const sshArgs = buildSSHClientFlags(user, host, this.flags, {
+            interactive: false,
+            additionalFlags: portMappings
+                .map((p) => ["-L", `${p.localPort}:localhost:${p.remotePort}`])
+                .flat(),
+        });
+        cp.spawnSync("ssh", [...sshArgs, "cat", "/dev/zero"], {
+            stdio: ["ignore", process.stdout, process.stderr],
+        });
+        return {};
+    }
+    async getPortMappings(stackId, serviceId) {
+        if (this.args.port) {
+            return [this.args.port];
+        }
+        const containerResponse = await this.apiClient.container.getService({
+            stackId,
+            serviceId,
+        });
+        assertStatus(containerResponse, 200);
+        const ports = containerResponse.data.deployedState.ports ?? [];
+        return ports.map((p) => PortMapping.fromPortAndProtocol(p));
+    }
+    render() {
+        return undefined;
+    }
+}

package/dist/commands/container/run.d.ts

@@ -5,6 +5,8 @@ type Result = {
 };
 export declare class Run extends ExecRenderBaseCommand<typeof Run, Result> {
     static summary: string;
+    static strict: boolean;
+    static usage: string;
     static flags: {
         env: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
         "env-file": import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
@@ -24,6 +26,16 @@ export declare class Run extends ExecRenderBaseCommand<typeof Run, Result> {
     };
     protected exec(): Promise<Result>;
     private addServiceToStack;
+    /**
+     * Builds and returns the container command based on the provided image
+     * metadata and arguments.
+     *
+     * @param imageMeta The configuration object containing the metadata of the
+     *   container image, including the default command.
+     * @returns An array of strings representing the container command to execute,
+     *   or undefined if no specific command is set.
+     */
+    private buildContainerCommand;
     /**
      * Builds a container service request from command line arguments and image
      * metadata

package/dist/commands/container/run.js

@@ -3,13 +3,16 @@ import { Args, Flags } from "@oclif/core";
 import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
 import { makeProcessRenderer, processFlags, } from "../../rendering/process/process_flags.js";
 import { projectFlags } from "../../lib/resources/project/flags.js";
+import dockerNames from "docker-names";
+import { assertStatus } from "@mittwald/api-client";
+import { getImageMeta, getPortMappings, parseEnvironmentVariables, } from "../../lib/resources/container/containerconfig.js";
 import { Success } from "../../rendering/react/components/Success.js";
 import { Value } from "../../rendering/react/components/Value.js";
-import * as dockerNames from "docker-names";
-import { assertStatus } from "@mittwald/api-client";
-import { parseEnvironmentVariables, getPortMappings, getImageMeta, } from "../../lib/resources/container/containerconfig.js";
 export class Run extends ExecRenderBaseCommand {
     static summary = "Creates and starts a new container.";
+    static strict = false;
+    // Usage needs to be overwritten because the autogenerated one is incorrect due to the variadic arguments.
+    static usage = "container run [--token <value>] [-q] [-p <value>] [-e <value>...] [--env-file <value>...] [--description <value>] [--entrypoint <value>] [--name <value>] [-p <value>...] [-P] [-v <value>...] IMAGE [COMMAND] [ARGS...]";
     static flags = {
         ...processFlags,
         ...projectFlags,
@@ -45,11 +48,11 @@ export class Run extends ExecRenderBaseCommand {
             summary: "publish a container's port(s) to the host",
             description: "Map a container's port to a port on the host system. " +
                 "Format: <host-port>:<container-port> or just <container-port> (in which case the host port will be automatically assigned). " +
-                "For example, -p 8080:80 maps port 80 in the container to port 8080 on the host. " +
-                "Use multiple -p flags to publish multiple ports.",
+                "For example, --publish 8080:80 maps port 80 in the container to port 8080 on the host. " +
+                "Use multiple --publish flags to publish multiple ports.\n\n" +
+                "NOTE: Please note that the usual shorthand -p is not supported for this flag, as it would conflict with the --project flag.",
             required: false,
             multiple: true,
-            char: "p",
         }),
         "publish-all": Flags.boolean({
             summary: "publish all ports that are defined in the image",
@@ -85,7 +88,6 @@ export class Run extends ExecRenderBaseCommand {
             summary: "arguments to pass to the command",
             description: "These are the runtime arguments passed to the command specified by the command parameter or the container's default command, not to the container itself. For example, if the command is 'echo', the args might be 'hello world'.",
             required: false,
-            variadic: true,
         }),
     };
     async exec() {
@@ -116,6 +118,23 @@ export class Run extends ExecRenderBaseCommand {
         assertStatus(resp, 200);
         return resp.data;
     }
+    /**
+     * Builds and returns the container command based on the provided image
+     * metadata and arguments.
+     *
+     * @param imageMeta The configuration object containing the metadata of the
+     *   container image, including the default command.
+     * @returns An array of strings representing the container command to execute,
+     *   or undefined if no specific command is set.
+     */
+    buildContainerCommand(imageMeta) {
+        if (!this.args.command) {
+            return imageMeta.command;
+        }
+        const firstArg = (this.argv.lastIndexOf(this.args.command) ?? Infinity) + 1;
+        const command = [this.args.command, ...this.argv.slice(firstArg)];
+        return command;
+    }
     /**
      * Builds a container service request from command line arguments and image
      * metadata
@@ -126,7 +145,7 @@ export class Run extends ExecRenderBaseCommand {
      * @returns A properly formatted container service request
      */
     async buildServiceRequest(image, imageMeta, serviceName) {
-        const command = this.args.command ? [this.args.command] : imageMeta.command;
+        const command = this.buildContainerCommand(imageMeta);
         const entrypoint = this.flags.entrypoint
             ? [this.flags.entrypoint]
             : imageMeta.entrypoint;

package/dist/commands/container/ssh.d.ts

@@ -0,0 +1,17 @@
+import { ExtendedBaseCommand } from "../../lib/basecommands/ExtendedBaseCommand.js";
+export default class Ssh extends ExtendedBaseCommand<typeof Ssh> {
+    static summary: string;
+    static description: string;
+    static args: {
+        "container-id": import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static flags: {
+        info: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        test: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        shell: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        "project-id": import("@oclif/core/interfaces").OptionFlag<string>;
+        "ssh-user": import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        "ssh-identity-file": import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/container/ssh.js

@@ -0,0 +1,61 @@
+import * as child_process from "child_process";
+import { Args, Flags } from "@oclif/core";
+import { ExtendedBaseCommand } from "../../lib/basecommands/ExtendedBaseCommand.js";
+import { getSSHConnectionForContainer } from "../../lib/resources/ssh/container.js";
+import { sshConnectionFlags, } from "../../lib/resources/ssh/flags.js";
+import { sshWrapperDocumentation } from "../../lib/resources/ssh/doc.js";
+import { buildSSHClientFlags } from "../../lib/resources/ssh/connection.js";
+import { withContainerAndStackId } from "../../lib/resources/container/flags.js";
+import { projectFlags } from "../../lib/resources/project/flags.js";
+export default class Ssh extends ExtendedBaseCommand {
+    static summary = "Connect to a container via SSH";
+    static description = "Establishes an interactive SSH connection to a container.\n\n" +
+        sshWrapperDocumentation;
+    static args = {
+        "container-id": Args.string({
+            description: "ID or short ID of the container to connect to",
+            required: true,
+        }),
+    };
+    static flags = {
+        ...sshConnectionFlags,
+        ...projectFlags,
+        info: Flags.boolean({
+            summary: "only print connection information, without actually connecting",
+        }),
+        test: Flags.boolean({
+            summary: "test connection and exit",
+        }),
+        shell: Flags.string({
+            summary: "shell to use for the SSH connection",
+            default: "/bin/sh",
+        }),
+    };
+    async run() {
+        const { flags } = await this.parse(Ssh);
+        const [containerId, stackId] = await withContainerAndStackId(this.apiClient, Ssh, flags, this.args, this.config);
+        const { host, user, directory } = await getSSHConnectionForContainer(this.apiClient, containerId, stackId, flags["ssh-user"]);
+        if (flags.info) {
+            this.log("hostname: %o", host);
+            this.log("username: %o", user);
+            this.log("directory: %o", directory);
+            return;
+        }
+        this.log("connecting to %o as %o", host, user);
+        const [cmd, args] = buildSSHCmdAndFlags(user, host, flags);
+        this.debug("running ssh %o, with command %o", args, cmd);
+        child_process.spawnSync("/usr/bin/ssh", [...args, cmd], {
+            stdio: "inherit",
+        });
+    }
+}
+function buildSSHCmdAndFlags(user, host, flags) {
+    const args = buildSSHClientFlags(user, host, flags, {
+        interactive: true,
+        additionalFlags: flags.test ? ["-q"] : [],
+    });
+    if (flags.test) {
+        return ["/bin/true", args];
+    }
+    return [flags.shell, args];
+}