@mittwald/cli 1.9.1 → 1.11.0

package/bin/run.js

@@ -5,5 +5,8 @@ import handleError from "../dist/lib/error/handleError.js";
 
 oclif
   .run(process.argv.slice(2), import.meta.url)
-  .then(oclif.flush)
+  .then(async () => {
+    await oclif.flush();
+    process.exit(0);
+  })
   .catch(handleError);

package/dist/commands/app/create/node.d.ts

@@ -5,8 +5,6 @@ export declare const nodeInstaller: AppInstaller<"site-title" | "entrypoint">;
 export default class InstallNode extends ExecRenderBaseCommand<typeof InstallNode, AppInstallationResult> {
     static description: string;
     static flags: import("@oclif/core/interfaces").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("entrypoint" | ("wait" | "wait-timeout" | "site-title"))[]>>;
-    protected exec(): Promise<{
-        appInstallationId: string;
-    }>;
+    protected exec(): Promise<AppInstallationResult>;
     protected render(result: AppInstallationResult): React.ReactNode;
 }

package/dist/commands/app/create/php-worker.d.ts

@@ -5,8 +5,6 @@ export declare const phpWorkerInstaller: AppInstaller<"site-title" | "entrypoint
 export default class InstallPhpWorker extends ExecRenderBaseCommand<typeof InstallPhpWorker, AppInstallationResult> {
     static description: string;
     static flags: import("@oclif/core/interfaces").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("entrypoint" | ("wait" | "wait-timeout" | "site-title"))[]>>;
-    protected exec(): Promise<{
-        appInstallationId: string;
-    }>;
+    protected exec(): Promise<AppInstallationResult>;
     protected render(result: AppInstallationResult): React.ReactNode;
 }

package/dist/commands/app/create/php.d.ts

@@ -5,8 +5,6 @@ export declare const phpInstaller: AppInstaller<"site-title" | "document-root">;
 export default class InstallPhp extends ExecRenderBaseCommand<typeof InstallPhp, AppInstallationResult> {
     static description: string;
     static flags: import("@oclif/core/interfaces").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("document-root" | ("wait" | "wait-timeout" | "site-title"))[]>>;
-    protected exec(): Promise<{
-        appInstallationId: string;
-    }>;
+    protected exec(): Promise<AppInstallationResult>;
     protected render(result: AppInstallationResult): React.ReactNode;
 }

package/dist/commands/app/create/python.d.ts

@@ -5,8 +5,6 @@ export declare const pythonInstaller: AppInstaller<"site-title" | "entrypoint">;
 export default class InstallPython extends ExecRenderBaseCommand<typeof InstallPython, AppInstallationResult> {
     static description: string;
     static flags: import("@oclif/core/interfaces").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("entrypoint" | ("wait" | "wait-timeout" | "site-title"))[]>>;
-    protected exec(): Promise<{
-        appInstallationId: string;
-    }>;
+    protected exec(): Promise<AppInstallationResult>;
     protected render(result: AppInstallationResult): React.ReactNode;
 }

package/dist/commands/app/create/static.d.ts

@@ -5,8 +5,6 @@ export declare const staticInstaller: AppInstaller<"site-title" | "document-root
 export default class InstallStatic extends ExecRenderBaseCommand<typeof InstallStatic, AppInstallationResult> {
     static description: string;
     static flags: import("@oclif/core/interfaces").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("document-root" | ("wait" | "wait-timeout" | "site-title"))[]>>;
-    protected exec(): Promise<{
-        appInstallationId: string;
-    }>;
+    protected exec(): Promise<AppInstallationResult>;
     protected render(result: AppInstallationResult): React.ReactNode;
 }

package/dist/commands/app/dependency/update.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { ExecRenderBaseCommand } from "../../../lib/basecommands/ExecRenderBaseCommand.js";
 import { appInstallationArgs } from "../../../lib/resources/app/flags.js";
 import { makeProcessRenderer, processFlags, } from "../../../rendering/process/process_flags.js";
@@ -6,8 +6,6 @@ import { Flags } from "@oclif/core";
 import { assertStatus } from "@mittwald/api-client-commons";
 import { Success } from "../../../rendering/react/components/Success.js";
 import { Range, SemVer } from "semver";
-import { Value } from "../../../rendering/react/components/Value.js";
-import { Text } from "ink";
 export default class Update extends ExecRenderBaseCommand {
     static summary = "Update the dependencies of an app";
     static args = { ...appInstallationArgs };
@@ -69,7 +67,7 @@ export default class Update extends ExecRenderBaseCommand {
                 }
                 return versions[versions.length - 1];
             });
-            process.addInfo(_jsxs(Text, { children: ["selected ", _jsx(Value, { children: systemSoftware.name }), " version:", " ", _jsx(Value, { children: version.externalVersion })] }));
+            process.addInfo(`selected ${systemSoftware.name} version: ${version.externalVersion}`);
             versionsToUpdate[systemSoftware.id] = {
                 systemSoftwareVersion: version.id,
                 updatePolicy,

package/dist/commands/app/download.js

@@ -33,11 +33,11 @@ export class Download extends ExecRenderBaseCommand {
     static examples = [
         {
             description: "Download entire app to current working directory",
-            command: "$ <%= config.bin %> <%= command.id %> .",
+            command: "$ <%= config.bin %> <%= command.id %> --target .",
         },
         {
             description: "Download only shared dir from a deployer-managed app",
-            command: "<%= config.bin %> <%= command.id %> --remote-sub-directory=shared .",
+            command: "<%= config.bin %> <%= command.id %> --remote-sub-directory=shared --target .",
         },
     ];
     async exec() {

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

@@ -0,0 +1,17 @@
+import { ExtendedBaseCommand } from "../../lib/basecommands/ExtendedBaseCommand.js";
+export default class Exec extends ExtendedBaseCommand<typeof Exec> {
+    static summary: string;
+    static description: string;
+    static args: {
+        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>;
+        quiet: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        "installation-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/app/exec.js

@@ -0,0 +1,71 @@
+import * as child_process from "child_process";
+import { Args, Flags } from "@oclif/core";
+import { ExtendedBaseCommand } from "../../lib/basecommands/ExtendedBaseCommand.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 { appInstallationFlags } from "../../lib/resources/app/flags.js";
+import { getSSHConnectionForAppInstallation } from "../../lib/resources/ssh/appinstall.js";
+import shellEscape from "shell-escape";
+import { prepareEnvironmentVariables } from "../../lib/resources/ssh/environment.js";
+export default class Exec extends ExtendedBaseCommand {
+    static summary = "Execute a command in an app installation via SSH non-interactively.";
+    static description = sshUsageDocumentation;
+    static args = {
+        command: Args.string({
+            description: "Command to execute in the app installation",
+            required: true,
+        }),
+    };
+    static flags = {
+        ...sshConnectionFlags,
+        ...appInstallationFlags,
+        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,
+            multipleNonGreedy: true,
+        }),
+        quiet: Flags.boolean({
+            char: "q",
+            summary: "disable informational output, only show command results",
+            default: false,
+        }),
+    };
+    async run() {
+        const { args, flags } = await this.parse(Exec);
+        const appInstallationId = await this.withAppInstallationId(Exec);
+        const { host, user, directory } = await getSSHConnectionForAppInstallation(this.apiClient, appInstallationId, flags["ssh-user"]);
+        if (!flags.quiet) {
+            this.log("executing command on %s as %s", host, user);
+        }
+        const command = args.command;
+        const workdir = flags.workdir ?? directory;
+        // Build the command to execute
+        let execCommand = "";
+        // Add environment variables if provided
+        if (flags.env && flags.env.length > 0) {
+            execCommand += prepareEnvironmentVariables(flags.env);
+        }
+        // Change to working directory if specified, otherwise use app directory
+        execCommand += `cd ${shellEscape([workdir])} && `;
+        // Add the actual command
+        execCommand += command;
+        const sshArgs = buildSSHClientFlags(user, host, flags, {
+            interactive: false,
+        });
+        const wrappedExecCommand = shellEscape(["/bin/bash", "-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/app/install/contao.d.ts

@@ -4,8 +4,6 @@ import { AppInstallationResult } from "../../../lib/resources/app/Installer.js";
 export default class InstallContao extends ExecRenderBaseCommand<typeof InstallContao, AppInstallationResult> {
     static description: string;
     static flags: import("@oclif/core/interfaces").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | ("wait" | "wait-timeout" | "site-title"))[]>>;
-    protected exec(): Promise<{
-        appInstallationId: string;
-    }>;
+    protected exec(): Promise<AppInstallationResult>;
     protected render(result: AppInstallationResult): React.ReactNode;
 }

package/dist/commands/app/install/joomla.d.ts

@@ -4,8 +4,6 @@ import { AppInstallationResult } from "../../../lib/resources/app/Installer.js";
 export default class InstallJoomla extends ExecRenderBaseCommand<typeof InstallJoomla, AppInstallationResult> {
     static description: string;
     static flags: import("@oclif/core/interfaces").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | ("wait" | "wait-timeout" | "site-title"))[]>>;
-    protected exec(): Promise<{
-        appInstallationId: string;
-    }>;
+    protected exec(): Promise<AppInstallationResult>;
     protected render(result: AppInstallationResult): React.ReactNode;
 }

package/dist/commands/app/install/matomo.d.ts

@@ -4,8 +4,6 @@ import { AppInstallationResult } from "../../../lib/resources/app/Installer.js";
 export default class InstallMatomo extends ExecRenderBaseCommand<typeof InstallMatomo, AppInstallationResult> {
     static description: string;
     static flags: import("@oclif/core/interfaces").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | ("wait" | "wait-timeout" | "site-title"))[]>>;
-    protected exec(): Promise<{
-        appInstallationId: string;
-    }>;
+    protected exec(): Promise<AppInstallationResult>;
     protected render(result: AppInstallationResult): React.ReactNode;
 }

package/dist/commands/app/install/nextcloud.d.ts

@@ -4,8 +4,6 @@ import { AppInstallationResult } from "../../../lib/resources/app/Installer.js";
 export default class InstallNextcloud extends ExecRenderBaseCommand<typeof InstallNextcloud, AppInstallationResult> {
     static description: string;
     static flags: import("@oclif/core/interfaces").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | ("wait" | "wait-timeout" | "site-title"))[]>>;
-    protected exec(): Promise<{
-        appInstallationId: string;
-    }>;
+    protected exec(): Promise<AppInstallationResult>;
     protected render(result: AppInstallationResult): React.ReactNode;
 }

package/dist/commands/app/install/shopware5.d.ts

@@ -4,8 +4,6 @@ import { AppInstallationResult } from "../../../lib/resources/app/Installer.js";
 export default class InstallShopware5 extends ExecRenderBaseCommand<typeof InstallShopware5, AppInstallationResult> {
     static description: string;
     static flags: import("@oclif/core/interfaces").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | "shop-email" | "shop-lang" | "shop-currency" | ("wait" | "wait-timeout" | "site-title"))[]>>;
-    protected exec(): Promise<{
-        appInstallationId: string;
-    }>;
+    protected exec(): Promise<AppInstallationResult>;
     protected render(result: AppInstallationResult): React.ReactNode;
 }

package/dist/commands/app/install/shopware6.d.ts

@@ -5,8 +5,6 @@ export declare const shopware6Installer: AppInstaller<"version" | "host" | "admi
 export default class InstallShopware6 extends ExecRenderBaseCommand<typeof InstallShopware6, AppInstallationResult> {
     static description: string;
     static flags: import("@oclif/core/interfaces").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "admin-firstname" | "admin-lastname" | "shop-email" | "shop-lang" | "shop-currency" | ("wait" | "wait-timeout" | "site-title"))[]>>;
-    protected exec(): Promise<{
-        appInstallationId: string;
-    }>;
+    protected exec(): Promise<AppInstallationResult>;
     protected render(result: AppInstallationResult): React.ReactNode;
 }

package/dist/commands/app/install/typo3.d.ts

@@ -5,8 +5,6 @@ export declare const typo3Installer: AppInstaller<"version" | "host" | "admin-us
 export default class InstallTYPO3 extends ExecRenderBaseCommand<typeof InstallTYPO3, AppInstallationResult> {
     static description: string;
     static flags: import("@oclif/core/interfaces").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | "install-mode" | ("wait" | "wait-timeout" | "site-title"))[]>>;
-    protected exec(): Promise<{
-        appInstallationId: string;
-    }>;
+    protected exec(): Promise<AppInstallationResult>;
     protected render(result: AppInstallationResult): React.ReactNode;
 }

package/dist/commands/app/install/wordpress.d.ts

@@ -5,8 +5,6 @@ export declare const wordpressInstaller: AppInstaller<"version" | "host" | "admi
 export default class InstallWordPress extends ExecRenderBaseCommand<typeof InstallWordPress, AppInstallationResult> {
     static description: string;
     static flags: import("@oclif/core/interfaces").FlagInput<import("../../../lib/resources/app/flags.js").RelevantFlags<readonly ("version" | "host" | "admin-user" | "admin-email" | "admin-pass" | ("wait" | "wait-timeout" | "site-title"))[]>>;
-    protected exec(): Promise<{
-        appInstallationId: string;
-    }>;
+    protected exec(): Promise<AppInstallationResult>;
     protected render(result: AppInstallationResult): React.ReactNode;
 }

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

@@ -9,6 +9,7 @@ export default class Ssh extends ExtendedBaseCommand<typeof Ssh> {
         cd: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         info: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         test: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        "generate-intellij-config": import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "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>;
     };

package/dist/commands/app/ssh.js

@@ -6,6 +6,7 @@ import { getSSHConnectionForAppInstallation } from "../../lib/resources/ssh/appi
 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 { generateIntellijConfigs } from "../../lib/intellij/config.js";
 export default class Ssh extends ExtendedBaseCommand {
     static summary = "Connect to an app via SSH";
     static description = "Establishes an interactive SSH connection to an app installation.\n\n" +
@@ -24,11 +25,24 @@ export default class Ssh extends ExtendedBaseCommand {
         test: Flags.boolean({
             summary: "test connection and exit",
         }),
+        "generate-intellij-config": Flags.boolean({
+            summary: "generate IntelliJ IDEA SSH and deployment configuration files",
+        }),
     };
     async run() {
         const { flags } = await this.parse(Ssh);
         const appInstallationId = await this.withAppInstallationId(Ssh);
-        const { host, user, directory } = await getSSHConnectionForAppInstallation(this.apiClient, appInstallationId, flags["ssh-user"]);
+        const { host, user, directory, appShortId } = await getSSHConnectionForAppInstallation(this.apiClient, appInstallationId, flags["ssh-user"]);
+        if (flags["generate-intellij-config"]) {
+            generateIntellijConfigs({
+                host,
+                user,
+                directory,
+                appShortId,
+            });
+            this.log("IntelliJ IDEA configuration files generated in .idea/ directory");
+            return;
+        }
         if (flags.info) {
             this.log("hostname: %o", host);
             this.log("username: %o", user);

package/dist/commands/app/update.js

@@ -1,9 +1,8 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
 import { appInstallationArgs, withAppInstallationId, } from "../../lib/resources/app/flags.js";
 import { makeProcessRenderer, processFlags, } from "../../rendering/process/process_flags.js";
 import { Success } from "../../rendering/react/components/Success.js";
-import { Value } from "../../rendering/react/components/Value.js";
 import { Flags } from "@oclif/core";
 export class Update extends ExecRenderBaseCommand {
     static summary = "Update properties of an app installation (use 'upgrade' to update the app version)";
@@ -56,7 +55,7 @@ function buildUpdateBodyFromFlags(flags) {
     const updateBody = {};
     const info = [];
     if (flags.entrypoint) {
-        info.push(_jsx(UpdateFieldInfo, { name: "entrypoint", value: flags.entrypoint }));
+        info.push(`setting entrypoint to ${flags.entrypoint}`);
         updateBody.userInputs = [
             ...(updateBody.userInputs || []),
             {
@@ -66,15 +65,12 @@ function buildUpdateBodyFromFlags(flags) {
         ];
     }
     if (flags["document-root"]) {
-        info.push(_jsx(UpdateFieldInfo, { name: "document root", value: flags["document-root"] }));
+        info.push(`setting document root to ${flags["document-root"]}`);
         updateBody.customDocumentRoot = flags["document-root"];
     }
     if (flags.description !== undefined) {
-        info.push(_jsx(UpdateFieldInfo, { name: "description", value: flags.description }));
+        info.push(`setting description to ${flags.description}`);
         updateBody.description = flags.description;
     }
     return [updateBody, info];
 }
-function UpdateFieldInfo({ name, value }) {
-    return (_jsxs(_Fragment, { children: ["setting ", name, " to ", _jsx(Value, { children: value })] }));
-}

package/dist/commands/app/upgrade.js

@@ -1,4 +1,4 @@
-import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs, Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
 import { appInstallationArgs, withAppInstallationId, } from "../../lib/resources/app/flags.js";
 import { projectFlags } from "../../lib/resources/project/flags.js";
@@ -51,15 +51,15 @@ export class UpgradeApp extends ExecRenderBaseCommand {
             ux.exit(1);
         }
         if (!this.flags.force) {
-            const confirmed = await process.addConfirmation(_jsxs(Text, { children: ["Confirm upgrading ", currentApp.name, " ", currentAppVersion.externalVersion, " (", currentAppInstallation.description, ") to version", " ", targetAppVersion.externalVersion] }));
+            const confirmed = await process.addConfirmation(`Confirm upgrading ${currentApp.name} ${currentAppVersion.externalVersion} (${currentAppInstallation.description}) to version ${targetAppVersion.externalVersion}`);
             if (!confirmed) {
-                process.addInfo(_jsx(Text, { children: "Upgrade will not be triggered." }));
+                process.addInfo("Upgrade will not be triggered.");
                 process.complete(_jsx(_Fragment, {}));
                 ux.exit(1);
             }
         }
         else {
-            process.addInfo(_jsxs(Text, { children: ["Commencing upgrade of ", currentApp.name, " ", currentAppVersion.externalVersion, " (", currentAppInstallation.description, ") to Version", " ", targetAppVersion.externalVersion, "."] }));
+            process.addInfo(`Commencing upgrade of ${currentApp.name} ${currentAppVersion.externalVersion} (${currentAppInstallation.description}) to Version ${targetAppVersion.externalVersion}.`);
         }
         const appUpgradePayload = {
             appVersionId: targetAppVersion.id,
@@ -72,7 +72,7 @@ export class UpgradeApp extends ExecRenderBaseCommand {
         });
         if (missingDependencies.data.missingSystemSoftwareDependencies) {
             appUpgradePayload.systemSoftware = {};
-            process.addStep(_jsxs(Text, { children: ["In order to upgrade your ", currentApp.name, " to Version", " ", targetAppVersion.externalVersion, " some dependencies need to be upgraded too."] }));
+            process.addStep(`In order to upgrade your ${currentApp.name} to Version ${targetAppVersion.externalVersion} some dependencies need to be upgraded too.`);
             for (const missingSystemSoftwareDependency of missingDependencies.data
                 .missingSystemSoftwareDependencies) {
                 const dependencyUpdateData = await updateMissingSystemSoftwareDependency(process, this.apiClient, missingSystemSoftwareDependency);
@@ -81,9 +81,9 @@ export class UpgradeApp extends ExecRenderBaseCommand {
                 };
             }
             if (!this.flags.force) {
-                const confirmed = await process.addConfirmation(_jsx(Text, { children: "Do you want to continue?" }));
+                const confirmed = await process.addConfirmation("Do you want to continue?");
                 if (!confirmed) {
-                    process.addInfo(_jsx(Text, { children: "Upgrade will not be triggered." }));
+                    process.addInfo("Upgrade will not be triggered.");
                     process.complete(_jsx(_Fragment, {}));
                     ux.exit(1);
                 }
@@ -136,7 +136,7 @@ export class UpgradeApp extends ExecRenderBaseCommand {
             if (semverMatch) {
                 return semverMatch;
             }
-            process.addInfo(_jsx(Text, { children: "The given target upgrade version does not seem to be a valid upgrade candidate." }));
+            process.addInfo("The given target upgrade version does not seem to be a valid upgrade candidate.");
         }
         return await forceTargetVersionSelection(process, this.apiClient, targetAppVersionCandidates, currentApp, currentAppVersion);
     }
@@ -182,7 +182,7 @@ async function updateMissingSystemSoftwareDependency(process, apiClient, depende
             " could not be determined");
     }
     else {
-        process.addInfo(_jsxs(Text, { children: [dependencySoftware.data.name, " will be upgraded to Version", " ", dependencyTargetVersion.externalVersion, "."] }));
+        process.addInfo(`${dependencySoftware.data.name} will be upgraded to Version ${dependencyTargetVersion.externalVersion}.`);
         return {
             dependencySoftwareId: dependencySoftware.data.id,
             dependencyTargetVersionId: dependencyTargetVersion.id,

package/dist/commands/backup/create.js

@@ -6,7 +6,6 @@ import { Flags } from "@oclif/core";
 import { assertStatus } from "@mittwald/api-client-commons";
 import { Success } from "../../rendering/react/components/Success.js";
 import { waitFlags, waitUntil } from "../../lib/wait.js";
-import { Text } from "ink";
 import { expireFlags } from "../../lib/flags/expireFlags.js";
 export class Create extends ExecRenderBaseCommand {
     static summary = "Create a new backup of a project";
@@ -37,7 +36,7 @@ export class Create extends ExecRenderBaseCommand {
             return r.data;
         });
         if (this.flags.wait) {
-            const stepWaiting = p.addStep(_jsx(Text, { children: "waiting for backup to be complete" }));
+            const stepWaiting = p.addStep("waiting for backup to be complete");
             await waitUntil(async () => {
                 const backupResponse = await this.apiClient.backup.getProjectBackup({
                     projectBackupId: backup.id,

package/dist/commands/backup/download.js

@@ -3,7 +3,6 @@ import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseComm
 import { Flags } from "@oclif/core";
 import { makeProcessRenderer, processFlags, } from "../../rendering/process/process_flags.js";
 import crypto from "crypto";
-import { Text } from "ink";
 import { Value } from "../../rendering/react/components/Value.js";
 import { assertStatus, } from "@mittwald/api-client-commons";
 import { waitUntil } from "../../lib/wait.js";
@@ -58,11 +57,11 @@ export class Download extends ExecRenderBaseCommand {
             const password = await p.runStep("generating password", async () => {
                 return crypto.randomBytes(32).toString("ascii").substring(0, 32);
             });
-            p.addInfo(_jsxs(Text, { children: ["generated password: ", _jsx(Value, { children: password })] }));
+            p.addInfo(`generated password: ${password}`);
             return password;
         }
         if (this.flags["prompt-password"]) {
-            return await p.addInput(_jsx(Text, { children: "enter backup password" }), true);
+            return await p.addInput("enter backup password", true);
         }
         return undefined;
     }
@@ -79,7 +78,7 @@ export class Download extends ExecRenderBaseCommand {
             return r.data;
         });
         if (backup.export && backup.export.phase !== "Expired") {
-            p.addInfo(_jsx(Text, { children: "backup download is already prepared" }));
+            p.addInfo("backup download is already prepared");
         }
         else {
             await p.runStep("preparing backup download", async () => {
@@ -115,7 +114,7 @@ export class Download extends ExecRenderBaseCommand {
             const stat = fs.statSync(this.flags.output);
             const range = `bytes=${stat.size}-`;
             reqConfig.headers = { Range: range };
-            p.addInfo(_jsxs(Text, { children: ["resuming download starting at ", _jsx(Value, { children: stat.size }), " bytes"] }));
+            p.addInfo(`resuming download starting at ${stat.size} bytes`);
         }
         const downloadStep = p.addStep("downloading backup");
         const resp = await axios(backupExport.downloadURL, reqConfig);

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

@@ -10,16 +10,10 @@ export default class Exec extends ExtendedBaseCommand<typeof Exec> {
         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>;
+        quiet: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         "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

@@ -8,6 +8,7 @@ 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";
+import { prepareEnvironmentVariables } from "../../lib/resources/ssh/environment.js";
 export default class Exec extends ExtendedBaseCommand {
     static summary = "Execute a command in a container via SSH non-interactively.";
     static description = sshUsageDocumentation;
@@ -33,44 +34,32 @@ export default class Exec extends ExtendedBaseCommand {
             char: "e",
             summary: "environment variables to set for the command (format: KEY=VALUE)",
             multiple: true,
+            multipleNonGreedy: true,
         }),
         shell: Flags.string({
             summary: "shell to use for the SSH connection",
             default: "/bin/sh",
         }),
+        quiet: Flags.boolean({
+            char: "q",
+            summary: "disable informational output, only show command results",
+            default: false,
+        }),
     };
-    /**
-     * 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);
+        if (!flags.quiet) {
+            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);
+            execCommand += prepareEnvironmentVariables(flags.env);
         }
         // Change to working directory if specified
         if (workdir !== undefined) {

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

@@ -1,7 +1,9 @@
 import { ReactNode } from "react";
 import { ExecRenderBaseCommand } from "../../lib/basecommands/ExecRenderBaseCommand.js";
+import { MittwaldAPIV2 } from "@mittwald/api-client";
+type ContainerServiceResponse = MittwaldAPIV2.Components.Schemas.ContainerServiceResponse;
 type Result = {
-    serviceId: string;
+    service: ContainerServiceResponse;
 };
 export declare class Run extends ExecRenderBaseCommand<typeof Run, Result> {
     static summary: string;
@@ -56,6 +58,6 @@ export declare class Run extends ExecRenderBaseCommand<typeof Run, Result> {
     private buildServiceRequest;
     private getImageAndMeta;
     private getServiceName;
-    protected render({ serviceId }: Result): ReactNode;
+    protected render({ service }: Result): ReactNode;
 }
 export {};