windmill-cli 1.614.0 → 1.615.0

package/README.md

@@ -107,3 +107,29 @@ To enable zsh completions add the following line to your `~/.zshrc`:
 ```
 source <(wmill completions zsh)
 ```
+
+## Development
+
+### Running Tests
+
+**Prerequisites:**
+- PostgreSQL running locally (default: `postgres://postgres:changeme@localhost:5432`)
+- Rust toolchain installed
+
+**Run tests locally (full features):**
+
+```bash
+deno test --allow-all --no-check
+```
+
+**Run tests in CI mode (minimal features, skips EE tests):**
+
+```bash
+CI_MINIMAL_FEATURES=true deno test --allow-all --no-check
+```
+
+| Variable | Description |
+|----------|-------------|
+| `CI_MINIMAL_FEATURES` | Set to `true` to skip EE-dependent tests |
+| `DATABASE_URL` | PostgreSQL connection string |
+| `EE_LICENSE_KEY` | Enterprise license key for EE features |

package/esm/gen/core/OpenAPI.js

@@ -32,7 +32,7 @@ export const OpenAPI = {
     PASSWORD: undefined,
     TOKEN: getEnv("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: '1.614.0',
+    VERSION: '1.615.0',
     WITH_CREDENTIALS: true,
     interceptors: {
         request: new Interceptors(),

package/esm/src/commands/app/raw_apps.js

@@ -6,6 +6,7 @@ import { colors, log, SEP, windmillUtils, yamlParseFile, yamlStringify, } from "
 import * as wmill from "../../../gen/services.gen.js";
 import path from "node:path";
 import { isSuperset } from "../../types.js";
+import { deepEqual } from "../../utils/utils.js";
 import { replaceInlineScripts, repopulateFields } from "./app.js";
 import { createBundle, detectFrameworks } from "./bundle.js";
 import { APP_BACKEND_FOLDER } from "./app_metadata.js";
@@ -220,7 +221,7 @@ async function collectAppFiles(localPath) {
                     entry.name === "sql_to_apply") {
                     continue;
                 }
-                await readDirRecursive(fullPath + SEP, relativePath + SEP);
+                await readDirRecursive(fullPath + SEP, relativePath + "/");
             }
             else if (entry.isFile) {
                 // Skip generated/metadata files that shouldn't be part of the app
@@ -296,7 +297,9 @@ export async function pushRawApp(workspace, remotePath, localPath, message) {
         log.info(colors.yellow.bold(`Creating raw app ${remotePath} bundle...`));
         // Detect frameworks to determine entry point
         const frameworks = detectFrameworks(localPath);
-        const entryFile = frameworks.svelte || frameworks.vue ? "index.ts" : "index.tsx";
+        const entryFile = frameworks.svelte || frameworks.vue
+            ? "index.ts"
+            : "index.tsx";
         const entryPoint = localPath + entryFile;
         return await createBundle({
             entryPoint: entryPoint,
@@ -310,7 +313,11 @@ export async function pushRawApp(workspace, remotePath, localPath, message) {
         value.data = localApp.data;
     }
     if (app) {
-        if (isSuperset({ ...localApp, runnables }, app)) {
+        // Check both metadata/runnables AND files for changes
+        // Files need separate comparison because isSuperset only checks if local keys exist in remote
+        const metadataUpToDate = isSuperset({ ...localApp, runnables }, app);
+        const filesUpToDate = deepEqual(files, app.value?.files);
+        if (metadataUpToDate && filesUpToDate) {
             log.info(colors.green(`App ${remotePath} is up to date`));
             return;
         }
@@ -326,7 +333,9 @@ export async function pushRawApp(workspace, remotePath, localPath, message) {
                     summary: localApp.summary,
                     policy: appForPolicy.policy,
                     deployment_message: message,
-                    ...(localApp.custom_path ? { custom_path: localApp.custom_path } : {}),
+                    ...(localApp.custom_path
+                        ? { custom_path: localApp.custom_path }
+                        : {}),
                 },
                 js,
                 css,
@@ -344,7 +353,9 @@ export async function pushRawApp(workspace, remotePath, localPath, message) {
                     summary: localApp.summary,
                     policy: appForPolicy.policy,
                     deployment_message: message,
-                    ...(localApp.custom_path ? { custom_path: localApp.custom_path } : {}),
+                    ...(localApp.custom_path
+                        ? { custom_path: localApp.custom_path }
+                        : {}),
                 },
                 js,
                 css,

package/esm/src/commands/sync/pull.js

@@ -14,7 +14,7 @@ export async function downloadZip(workspace, plainSecrets, skipVariables, skipRe
     const url = workspace.remote +
         "api/w/" +
         workspace.workspaceId +
-        `/workspaces/tarball?archive_type=zip&plain_secret=${plainSecrets ?? false}&skip_variables=${skipVariables ?? false}&skip_resources=${skipResources ?? false}&skip_secrets=${skipSecrets ?? false}&include_schedules=${includeSchedules ?? false}&include_triggers=${includeTriggers ?? false}&include_users=${includeUsers ?? false}&include_groups=${includeGroups ?? false}&include_settings=${includeSettings ?? false}&include_key=${includeKey ?? false}&include_workspace_dependencies=${includeWorkspaceDependenciesValue}&default_ts=${defaultTs ?? "bun"}&skip_resource_types=${skipResourceTypes ?? false}`;
+        `/workspaces/tarball?archive_type=zip&plain_secret=${plainSecrets ?? false}&skip_variables=${skipVariables ?? false}&skip_resources=${skipResources ?? false}&skip_secrets=${skipSecrets ?? false}&include_schedules=${includeSchedules ?? false}&include_triggers=${includeTriggers ?? false}&include_users=${includeUsers ?? false}&include_groups=${includeGroups ?? false}&include_settings=${includeSettings ?? false}&include_key=${includeKey ?? false}&include_workspace_dependencies=${includeWorkspaceDependenciesValue}&default_ts=${defaultTs ?? "bun"}&skip_resource_types=${skipResourceTypes ?? false}&settings_version=v2`;
     const zipResponse = await fetch(url, {
         headers: requestHeaders,
         method: "GET",

package/esm/src/commands/sync/sync.js

@@ -2220,11 +2220,18 @@ export async function push(opts) {
                                     break;
                                 case "raw_app":
                                     if (isRawAppFolderMetadataFile(target)) {
+                                        // Delete the entire raw app
                                         await wmill.deleteApp({
                                             workspace: workspaceId,
                                             path: removeSuffix(target, getDeleteSuffix("raw_app", "json")),
                                         });
                                     }
+                                    else {
+                                        // For individual file deletions within a raw app,
+                                        // re-push the entire raw app so the backend gets the updated file list
+                                        // (the deleted file won't be included in the push)
+                                        await pushObj(workspaceId, target, undefined, undefined, opts.plainSecrets ?? false, alreadySynced, opts.message);
+                                    }
                                     break;
                                 case "schedule":
                                     await wmill.deleteSchedule({

package/esm/src/core/settings.js

@@ -7,6 +7,67 @@ import { isSuperset } from "../types.js";
 import { deepEqual } from "../utils/utils.js";
 import { removeWorkerPrefix } from "../commands/worker-groups/worker-groups.js";
 import { decrypt, encrypt } from "../utils/local_encryption.js";
+// Helper to convert legacy flat settings to new grouped format
+export function migrateToGroupedFormat(settings) {
+    const result = { name: settings.name ?? "" };
+    // Copy non-legacy fields
+    if (settings.webhook !== undefined)
+        result.webhook = settings.webhook;
+    if (settings.deploy_to !== undefined)
+        result.deploy_to = settings.deploy_to;
+    if (settings.ai_config !== undefined)
+        result.ai_config = settings.ai_config;
+    if (settings.large_file_storage !== undefined)
+        result.large_file_storage = settings.large_file_storage;
+    if (settings.git_sync !== undefined)
+        result.git_sync = settings.git_sync;
+    if (settings.default_app !== undefined)
+        result.default_app = settings.default_app;
+    if (settings.default_scripts !== undefined)
+        result.default_scripts = settings.default_scripts;
+    if (settings.mute_critical_alerts !== undefined)
+        result.mute_critical_alerts = settings.mute_critical_alerts;
+    if (settings.color !== undefined)
+        result.color = settings.color;
+    if (settings.operator_settings !== undefined)
+        result.operator_settings = settings.operator_settings;
+    // Handle auto_invite: check if already grouped or needs migration
+    if (settings.auto_invite && typeof settings.auto_invite === "object") {
+        result.auto_invite = settings.auto_invite;
+    }
+    else if (settings.auto_invite_enabled !== undefined) {
+        // Legacy format
+        result.auto_invite = {
+            enabled: settings.auto_invite_enabled,
+            operator: settings.auto_invite_as === "operator",
+            mode: settings.auto_invite_mode ?? "invite",
+        };
+    }
+    // Handle error_handler: check if already grouped or needs migration
+    if (settings.error_handler && typeof settings.error_handler === "object") {
+        result.error_handler = settings.error_handler;
+    }
+    else if (typeof settings.error_handler === "string") {
+        // Legacy format (error_handler was a string path)
+        result.error_handler = {
+            path: settings.error_handler,
+            extra_args: settings.error_handler_extra_args,
+            muted_on_cancel: settings.error_handler_muted_on_cancel ?? false,
+        };
+    }
+    // Handle success_handler: check if already grouped or needs migration
+    if (settings.success_handler && typeof settings.success_handler === "object") {
+        result.success_handler = settings.success_handler;
+    }
+    else if (typeof settings.success_handler === "string") {
+        // Legacy format (success_handler was a string path)
+        result.success_handler = {
+            path: settings.success_handler,
+            extra_args: settings.success_handler_extra_args,
+        };
+    }
+    return result;
+}
 const INSTANCE_SETTINGS_PATH = "instance_settings.yaml";
 let instanceSettingsPath = INSTANCE_SETTINGS_PATH;
 async function checkInstanceSettingsPath(opts) {
@@ -22,6 +83,8 @@ async function checkInstanceConfigPath(opts) {
     }
 }
 export async function pushWorkspaceSettings(workspace, _path, settings, localSettings) {
+    // Migrate local settings from legacy format if needed
+    localSettings = migrateToGroupedFormat(localSettings);
     try {
         const remoteSettings = await wmill.getSettings({
             workspace,
@@ -29,21 +92,13 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
         const workspaceName = await wmill.getWorkspaceName({
             workspace,
         });
+        // Build settings from remote (now using grouped format)
         settings = {
-            // slack_team_id: remoteSettings.slack_team_id,
-            // slack_name: remoteSettings.slack_name,
-            // slack_command_script: remoteSettings.slack_command_script,
-            // slack_email: remoteSettings.slack_email,
-            auto_invite_enabled: remoteSettings.auto_invite_domain !== null,
-            auto_invite_as: remoteSettings.auto_invite_operator
-                ? "operator"
-                : "developer",
-            auto_invite_mode: remoteSettings.auto_add ? "add" : "invite",
+            auto_invite: remoteSettings.auto_invite,
+            error_handler: remoteSettings.error_handler,
+            success_handler: remoteSettings.success_handler,
             webhook: remoteSettings.webhook,
             deploy_to: remoteSettings.deploy_to,
-            error_handler: remoteSettings.error_handler,
-            error_handler_extra_args: remoteSettings.error_handler_extra_args,
-            error_handler_muted_on_cancel: remoteSettings.error_handler_muted_on_cancel ?? false,
             ai_config: remoteSettings.ai_config,
             large_file_storage: remoteSettings.large_file_storage,
             git_sync: remoteSettings.git_sync,
@@ -64,7 +119,7 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
     }
     log.debug(`Workspace settings are not up-to-date, updating...`);
     if (localSettings.webhook !== settings.webhook) {
-        log.debug(`Updateing webhook...`);
+        log.debug(`Updating webhook...`);
         await wmill.editWebhook({
             workspace,
             requestBody: {
@@ -72,24 +127,21 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
             },
         });
     }
-    if (localSettings.auto_invite_as !== settings.auto_invite_as ||
-        localSettings.auto_invite_enabled !== settings.auto_invite_enabled ||
-        localSettings.auto_invite_mode !== settings.auto_invite_mode) {
+    // Handle auto_invite using grouped format
+    if (!deepEqual(localSettings.auto_invite, settings.auto_invite)) {
         log.debug(`Updating auto invite...`);
-        if (!["operator", "developer"].includes(settings.auto_invite_as)) {
-            throw new Error(`Invalid value for auto_invite_as. Valid values are "operator" and "developer"`);
-        }
-        if (!["add", "invite"].includes(settings.auto_invite_mode)) {
-            throw new Error(`Invalid value for auto_invite_mode. Valid values are "invite" and "add"`);
+        const localAutoInvite = localSettings.auto_invite;
+        if (localAutoInvite?.mode && !["add", "invite"].includes(localAutoInvite.mode)) {
+            throw new Error(`Invalid value for auto_invite.mode. Valid values are "invite" and "add"`);
         }
         try {
             await wmill.editAutoInvite({
                 workspace,
-                requestBody: localSettings.auto_invite_enabled
+                requestBody: localAutoInvite?.enabled
                     ? {
-                        operator: localSettings.auto_invite_as === "operator",
+                        operator: localAutoInvite.operator ?? false,
                         invite_all: true,
-                        auto_add: localSettings.auto_invite_mode === "add",
+                        auto_add: localAutoInvite.mode === "add",
                     }
                     : {},
             });
@@ -99,11 +151,11 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
             log.debug(`Auto invite is not possible on cloud, only auto-inviting same domain...`);
             await wmill.editAutoInvite({
                 workspace,
-                requestBody: localSettings.auto_invite_enabled
+                requestBody: localAutoInvite?.enabled
                     ? {
-                        operator: localSettings.auto_invite_as === "operator",
+                        operator: localAutoInvite.operator ?? false,
                         invite_all: false,
-                        auto_add: localSettings.auto_invite_mode === "add",
+                        auto_add: localAutoInvite.mode === "add",
                     }
                     : {},
             });
@@ -116,17 +168,29 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
             requestBody: localSettings.ai_config ?? {},
         });
     }
-    if (localSettings.error_handler != settings.error_handler ||
-        !deepEqual(localSettings.error_handler_extra_args, settings.error_handler_extra_args) ||
-        (localSettings.error_handler_muted_on_cancel ?? false) !=
-            (settings.error_handler_muted_on_cancel ?? false)) {
+    // Handle error_handler using grouped format
+    if (!deepEqual(localSettings.error_handler, settings.error_handler)) {
         log.debug(`Updating error handler...`);
+        const localErrorHandler = localSettings.error_handler;
         await wmill.editErrorHandler({
             workspace,
             requestBody: {
-                error_handler: localSettings.error_handler,
-                error_handler_extra_args: localSettings.error_handler_extra_args,
-                error_handler_muted_on_cancel: localSettings.error_handler_muted_on_cancel ?? false,
+                path: localErrorHandler?.path,
+                extra_args: localErrorHandler?.extra_args,
+                muted_on_cancel: localErrorHandler?.muted_on_cancel ?? false,
+                muted_on_user_path: localErrorHandler?.muted_on_user_path ?? false,
+            },
+        });
+    }
+    // Handle success_handler using grouped format
+    if (!deepEqual(localSettings.success_handler, settings.success_handler)) {
+        log.debug(`Updating success handler...`);
+        const localSuccessHandler = localSettings.success_handler;
+        await wmill.editSuccessHandler({
+            workspace,
+            requestBody: {
+                path: localSuccessHandler?.path,
+                extra_args: localSuccessHandler?.extra_args,
             },
         });
     }
@@ -200,7 +264,7 @@ export async function pushWorkspaceSettings(workspace, _path, settings, localSet
             },
         });
     }
-    if (localSettings.operator_settings != settings.operator_settings) {
+    if (!deepEqual(localSettings.operator_settings, settings.operator_settings)) {
         log.debug(`Updating operator settings...`);
         await wmill.updateOperatorSettings({
             workspace,

package/esm/src/main.js

@@ -40,7 +40,7 @@ export { flow, app, script, workspace, resource, resourceType, user, variable, h
 //     console.error(JSON.stringify(event.error, null, 4));
 //   }
 // });
-export const VERSION = "1.614.0";
+export const VERSION = "1.615.0";
 // Re-exported from constants.ts to maintain backwards compatibility
 export { WM_FORK_PREFIX } from "./core/constants.js";
 const command = new Command()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.614.0",
+  "version": "1.615.0",
   "description": "CLI for Windmill",
   "repository": {
     "type": "git",

package/types/gen/types.gen.d.ts

@@ -730,6 +730,96 @@ export type FlowNote = {
  * Type of note - 'free' for standalone notes, 'group' for notes that group other nodes
  */
 export type type2 = 'free' | 'group';
+/**
+ * Configuration for auto-inviting users to the workspace
+ */
+export type AutoInviteConfig = {
+    enabled?: boolean;
+    domain?: string;
+    /**
+     * If true, auto-invited users are added as operators. If false, they are added as developers.
+     */
+    operator?: boolean;
+    mode?: 'invite' | 'add';
+    instance_groups?: Array<(string)>;
+    instance_groups_roles?: {
+        [key: string]: (string);
+    };
+};
+export type mode = 'invite' | 'add';
+/**
+ * Configuration for the workspace error handler
+ */
+export type ErrorHandlerConfig = {
+    /**
+     * Path to the error handler script or flow
+     */
+    path?: string;
+    extra_args?: ScriptArgs;
+    muted_on_cancel?: boolean;
+    muted_on_user_path?: boolean;
+};
+/**
+ * Configuration for the workspace success handler
+ */
+export type SuccessHandlerConfig = {
+    /**
+     * Path to the success handler script or flow
+     */
+    path?: string;
+    extra_args?: ScriptArgs;
+};
+/**
+ * Request body for editing the workspace error handler. Accepts both new grouped format and legacy flat format for backward compatibility.
+ */
+export type EditErrorHandler = EditErrorHandlerNew | EditErrorHandlerLegacy;
+/**
+ * New grouped format for editing error handler
+ */
+export type EditErrorHandlerNew = {
+    /**
+     * Path to the error handler script or flow
+     */
+    path?: string;
+    extra_args?: ScriptArgs;
+    muted_on_cancel?: boolean;
+    muted_on_user_path?: boolean;
+};
+/**
+ * Legacy flat format for editing error handler (deprecated, use new format)
+ */
+export type EditErrorHandlerLegacy = {
+    /**
+     * Path to the error handler script or flow
+     */
+    error_handler?: string;
+    error_handler_extra_args?: ScriptArgs;
+    error_handler_muted_on_cancel?: boolean;
+};
+/**
+ * Request body for editing the workspace success handler. Accepts both new grouped format and legacy flat format for backward compatibility.
+ */
+export type EditSuccessHandler = EditSuccessHandlerNew | EditSuccessHandlerLegacy;
+/**
+ * New grouped format for editing success handler
+ */
+export type EditSuccessHandlerNew = {
+    /**
+     * Path to the success handler script or flow
+     */
+    path?: string;
+    extra_args?: ScriptArgs;
+};
+/**
+ * Legacy flat format for editing success handler (deprecated, use new format)
+ */
+export type EditSuccessHandlerLegacy = {
+    /**
+     * Path to the success handler script or flow
+     */
+    success_handler?: string;
+    success_handler_extra_args?: ScriptArgs;
+};
 export type VaultSettings = {
     /**
      * HashiCorp Vault server address (e.g., https://vault.company.com:8200)
@@ -4064,23 +4154,14 @@ export type GetSettingsResponse = ({
     teams_command_script?: string;
     teams_team_name?: string;
     teams_team_guid?: string;
-    auto_invite_domain?: string;
-    auto_invite_operator?: boolean;
-    auto_add?: boolean;
-    auto_add_instance_groups?: Array<(string)>;
-    auto_add_instance_groups_roles?: {
-        [key: string]: (string);
-    };
+    auto_invite?: AutoInviteConfig;
     plan?: string;
     customer_id?: string;
     webhook?: string;
     deploy_to?: string;
     ai_config?: AIConfig;
-    error_handler?: string;
-    error_handler_extra_args?: ScriptArgs;
-    error_handler_muted_on_cancel: boolean;
-    success_handler?: string;
-    success_handler_extra_args?: ScriptArgs;
+    error_handler?: ErrorHandlerConfig;
+    success_handler?: SuccessHandlerConfig;
     large_file_storage?: LargeFileStorage;
     ducklake?: DucklakeSettings;
     datatable?: DataTableSettings;
@@ -4343,11 +4424,7 @@ export type EditErrorHandlerData = {
     /**
      * WorkspaceErrorHandler
      */
-    requestBody: {
-        error_handler?: string;
-        error_handler_extra_args?: ScriptArgs;
-        error_handler_muted_on_cancel?: boolean;
-    };
+    requestBody: EditErrorHandler;
     workspace: string;
 };
 export type EditErrorHandlerResponse = (string);
@@ -4355,10 +4432,7 @@ export type EditSuccessHandlerData = {
     /**
      * WorkspaceSuccessHandler
      */
-    requestBody: {
-        success_handler?: string;
-        success_handler_extra_args?: ScriptArgs;
-    };
+    requestBody: EditSuccessHandler;
     workspace: string;
 };
 export type EditSuccessHandlerResponse = (string);