windmill-cli 1.690.0 → 1.691.0

package/esm/main.js

@@ -16701,7 +16701,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv3("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.690.0",
+    VERSION: "1.691.0",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -17637,8 +17637,10 @@ __export(exports_services_gen, {
   countCompletedJobs: () => countCompletedJobs,
   convertUserToGroup: () => convertUserToGroup,
   connectTeams: () => connectTeams,
+  connectSlackInstance: () => connectSlackInstance,
   connectSlackCallbackInstance: () => connectSlackCallbackInstance,
   connectSlackCallback: () => connectSlackCallback,
+  connectSlack: () => connectSlack,
   connectClientCredentials: () => connectClientCredentials,
   connectCallback: () => connectCallback,
   computeObjectStorageUsage: () => computeObjectStorageUsage,
@@ -18833,6 +18835,16 @@ var backendVersion = () => {
     body: data3.requestBody,
     mediaType: "application/json"
   });
+}, connectSlack = (data3) => {
+  return request(OpenAPI, {
+    method: "POST",
+    url: "/w/{workspace}/workspaces/connect_slack",
+    path: {
+      workspace: data3.workspace
+    },
+    body: data3.requestBody,
+    mediaType: "application/json"
+  });
 }, runSlackMessageTestJob = (data3) => {
   return request(OpenAPI, {
     method: "POST",
@@ -19594,6 +19606,13 @@ var backendVersion = () => {
     body: data3.requestBody,
     mediaType: "application/json"
   });
+}, connectSlackInstance = (data3) => {
+  return request(OpenAPI, {
+    method: "POST",
+    url: "/oauth/connect_slack_instance",
+    body: data3.requestBody,
+    mediaType: "application/json"
+  });
 }, connectCallback = (data3) => {
   return request(OpenAPI, {
     method: "POST",
@@ -26134,6 +26153,36 @@ var init_merge = __esm(async () => {
   };
 });
 
+// src/commands/workspace/slack.ts
+async function connectSlack2(opts) {
+  await requireLogin(opts);
+  const workspace = await resolveWorkspace(opts);
+  await connectSlack({
+    workspace: workspace.workspaceId,
+    requestBody: {
+      bot_token: opts.botToken,
+      team_id: opts.teamId,
+      team_name: opts.teamName
+    }
+  });
+  info(colors.bold.underline.green(`Slack connected to workspace ${workspace.workspaceId} (team ${opts.teamName} / ${opts.teamId})`));
+}
+async function disconnectSlack2(opts) {
+  await requireLogin(opts);
+  const workspace = await resolveWorkspace(opts);
+  await disconnectSlack({ workspace: workspace.workspaceId });
+  info(colors.bold.underline.green(`Slack disconnected from workspace ${workspace.workspaceId} (slack_team_id / slack_name cleared). ` + `To also remove the bot token variable/resource/folder/group, delete the corresponding files from the local sync folder and run 'wmill sync push'. ` + `To remove the workspace-level OAuth override (if any), set slack_oauth_client_id/_secret to '' in settings.yaml and push.`));
+}
+var init_slack = __esm(async () => {
+  init_colors2();
+  init_log();
+  init_services_gen();
+  await __promiseAll([
+    init_auth(),
+    init_context()
+  ]);
+});
+
 // src/utils/resource_folders.ts
 import { sep as SEP2 } from "node:path";
 import * as fs6 from "node:fs";
@@ -27475,11 +27524,12 @@ var init_workspace = __esm(async () => {
     init_input(),
     init_auth(),
     init_fork(),
-    init_merge()
+    init_merge(),
+    init_slack()
   ]);
   command2 = new Command().alias("profile").description("workspace related commands").action(list3).command("switch").complete("workspace", async () => (await allWorkspaces()).map((x) => x.name)).description("Switch to another workspace").arguments("<workspace_name:string:workspace>").action(switchC).command("add").description("Add a workspace").arguments("[workspace_name:string] [workspace_id:string] [remote:string]").option("-c --create", "Create the workspace if it does not exist").option("--create-workspace-name <workspace_name:string>", "Specify the workspace name. Ignored if --create is not specified or the workspace already exists. Will default to the workspace id.").option("--create-username <username:string>", "Specify your own username in the newly created workspace. Ignored if --create is not specified, the workspace already exists or automatic username creation is enabled on the instance.", {
     default: "admin"
-  }).action(add).command("remove").description("Remove a workspace").arguments("<workspace_name:string>").action(remove).command("whoami").description("Show the currently active user").action(whoami2).command("list").description("List local workspace profiles").action(list3).command("list-remote").description("List workspaces on the remote server that you have access to").action(listRemote).command("list-forks").description("List forked workspaces on the remote server").action(listForks).command("bind").description("Create or update a workspace entry in wmill.yaml from the active profile").option("--workspace <name:string>", "Workspace name (default: current branch or workspaceId)").option("--branch <branch:string>", "Git branch to associate (default: workspace name)").action((opts) => bind(opts, true)).command("unbind").description("Remove baseUrl and workspaceId from a workspace entry").option("--workspace <name:string>", "Workspace to unbind").action((opts) => bind(opts, false)).command("fork").description("Create a forked workspace").arguments("[workspace_name:string] [workspace_id:string]").option("--create-workspace-name <workspace_name:string>", "Specify the workspace name. Ignored if --create is not specified or the workspace already exists. Will default to the workspace id.").option("--color <color:string>", "Workspace color (hex code, e.g. #ff0000)").option("--datatable-behavior <behavior:string>", "How to handle datatables: skip, schema_only, or schema_and_data (default: interactive prompt)").option("-y --yes", "Skip interactive prompts (defaults datatable behavior to 'skip')").action(createWorkspaceFork2).command("delete-fork").description("Delete a forked workspace and git branch").arguments("<fork_name:string>").option("-y --yes", "Skip confirmation prompt").action(deleteWorkspaceFork).command("merge").description("Compare and deploy changes between a fork and its parent workspace").option("--direction <direction:string>", "Deploy direction: to-parent or to-fork").option("--all", "Deploy all changed items including conflicts").option("--skip-conflicts", "Skip items modified in both workspaces").option("--include <items:string>", "Comma-separated kind:path items to include (e.g. script:f/test/main,flow:f/my/flow)").option("--exclude <items:string>", "Comma-separated kind:path items to exclude").option("--preserve-on-behalf-of", "Preserve original on_behalf_of/permissioned_as values").option("-y --yes", "Non-interactive mode (deploy without prompts)").action(mergeWorkspaces);
+  }).action(add).command("remove").description("Remove a workspace").arguments("<workspace_name:string>").action(remove).command("whoami").description("Show the currently active user").action(whoami2).command("list").description("List local workspace profiles").action(list3).command("list-remote").description("List workspaces on the remote server that you have access to").action(listRemote).command("list-forks").description("List forked workspaces on the remote server").action(listForks).command("bind").description("Create or update a workspace entry in wmill.yaml from the active profile").option("--workspace <name:string>", "Workspace name (default: current branch or workspaceId)").option("--branch <branch:string>", "Git branch to associate (default: workspace name)").action((opts) => bind(opts, true)).command("unbind").description("Remove baseUrl and workspaceId from a workspace entry").option("--workspace <name:string>", "Workspace to unbind").action((opts) => bind(opts, false)).command("fork").description("Create a forked workspace").arguments("[workspace_name:string] [workspace_id:string]").option("--create-workspace-name <workspace_name:string>", "Specify the workspace name. Ignored if --create is not specified or the workspace already exists. Will default to the workspace id.").option("--color <color:string>", "Workspace color (hex code, e.g. #ff0000)").option("--datatable-behavior <behavior:string>", "How to handle datatables: skip, schema_only, or schema_and_data (default: interactive prompt)").option("-y --yes", "Skip interactive prompts (defaults datatable behavior to 'skip')").action(createWorkspaceFork2).command("delete-fork").description("Delete a forked workspace and git branch").arguments("<fork_name:string>").option("-y --yes", "Skip confirmation prompt").action(deleteWorkspaceFork).command("merge").description("Compare and deploy changes between a fork and its parent workspace").option("--direction <direction:string>", "Deploy direction: to-parent or to-fork").option("--all", "Deploy all changed items including conflicts").option("--skip-conflicts", "Skip items modified in both workspaces").option("--include <items:string>", "Comma-separated kind:path items to include (e.g. script:f/test/main,flow:f/my/flow)").option("--exclude <items:string>", "Comma-separated kind:path items to exclude").option("--preserve-on-behalf-of", "Preserve original on_behalf_of/permissioned_as values").option("-y --yes", "Non-interactive mode (deploy without prompts)").action(mergeWorkspaces).command("connect-slack").description("Non-interactively connect Slack to the active workspace using a pre-minted bot token (xoxb-...). Produces the same artifacts as the UI OAuth flow: workspace_settings fields, g/slack group, f/slack_bot folder, and the encrypted bot token variable + resource at f/slack_bot/bot_token.").option("--bot-token <bot_token:string>", "Slack bot token (xoxb-...)", { required: true }).option("--team-id <team_id:string>", "Slack team id", { required: true }).option("--team-name <team_name:string>", "Slack team name", { required: true }).action(connectSlack2).command("disconnect-slack").description("Clear slack_team_id / slack_name on the active workspace (marks the workspace as disconnected). Does NOT remove the bot token variable/resource/folder/group — delete those from the local sync folder and run 'wmill sync push' to tear them down. Does NOT remove the workspace-level OAuth override — set slack_oauth_client_id/_secret to '' in settings.yaml and push.").action(disconnectSlack2);
   workspace_default = command2;
 });
 
@@ -61646,12 +61696,21 @@ async function readModulesFromDisk(moduleFolderPath, defaultTs, folderLayout = f
 }
 async function createScript2(bundleContent, workspaceId, body, workspace) {
   const start = performance.now();
+  const skipIfNoop = "skip_if_noop=true";
   if (!bundleContent) {
     try {
-      await createScript({
-        workspace: workspaceId,
-        requestBody: body
+      const url = workspace.remote + "api/w/" + workspaceId + "/scripts/create?" + skipIfNoop;
+      const req = await fetch(url, {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${workspace.token}`,
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify(body)
       });
+      if (req.status != 201) {
+        throw Error(`${req.status} - ${req.statusText} - ${await req.text()}`);
+      }
     } catch (e) {
       throw Error(`Script creation for ${body.path} with parent ${body.parent_hash}  was not successful: ${e.body ?? e.message} `);
     }
@@ -61659,7 +61718,7 @@ async function createScript2(bundleContent, workspaceId, body, workspace) {
     const form = new FormData;
     form.append("script", JSON.stringify(body));
     form.append("file", typeof bundleContent == "string" ? bundleContent : bundleContent);
-    const url = workspace.remote + "api/w/" + workspace.workspaceId + "/scripts/create_snapshot";
+    const url = workspace.remote + "api/w/" + workspace.workspaceId + "/scripts/create_snapshot?" + skipIfNoop;
     const req = await fetch(url, {
       method: "POST",
       headers: { Authorization: `Bearer ${workspace.token} ` },
@@ -65025,6 +65084,12 @@ async function compareDynFSElement(els1, els2, ignore, json, skips, ignoreMetada
         if (o["is_template"] != null) {
           delete o["is_template"];
         }
+        if (o["no_main_func"] != null) {
+          delete o["no_main_func"];
+        }
+        if (o["auto_kind"] != null) {
+          delete o["auto_kind"];
+        }
       }
       return o;
     } else {
@@ -66875,6 +66940,7 @@ async function updateScriptSchema(scriptContent, language, metadataContent, path
     delete metadataContent.has_preprocessor;
   }
   delete metadataContent.auto_kind;
+  delete metadataContent.no_main_func;
 }
 function extractWorkspaceDepsAnnotation(scriptContent, language) {
   const config = LANG_ANNOTATION_CONFIG[language];
@@ -71162,6 +71228,45 @@ var init_schedule = __esm(async () => {
   schedule_default = command15;
 });
 
+// src/commands/instance/slack.ts
+async function resolveInstance(instanceName) {
+  if (instanceName) {
+    const match3 = (await allInstances()).find((i) => i.name === instanceName);
+    if (!match3) {
+      throw new Error(`No local instance profile named ${instanceName}`);
+    }
+    return match3;
+  }
+  const activeName = await getActiveInstance({});
+  if (!activeName) {
+    throw new Error("No active instance. Run 'wmill instance add' or pass --instance.");
+  }
+  const match2 = (await allInstances()).find((i) => i.name === activeName);
+  if (!match2) {
+    throw new Error(`Active instance ${activeName} not found in config`);
+  }
+  return match2;
+}
+async function connectSlackInstance2(opts) {
+  const instance = await resolveInstance(opts.instance);
+  setClient(instance.token, instance.remote.substring(0, instance.remote.length - 1));
+  await connectSlackInstance({
+    requestBody: {
+      bot_token: opts.botToken,
+      team_id: opts.teamId,
+      team_name: opts.teamName
+    }
+  });
+  info(colors.bold.underline.green(`Slack connected at instance ${instance.name} (team ${opts.teamName} / ${opts.teamId})`));
+}
+var init_slack2 = __esm(async () => {
+  init_colors2();
+  init_log();
+  init_client();
+  init_services_gen();
+  await init_instance();
+});
+
 // src/utils/local_encryption.ts
 import crypto3 from "node:crypto";
 function encode2(input) {
@@ -71242,6 +71347,10 @@ function migrateToGroupedFormat(settings) {
     result.slack_name = settings.slack_name;
   if (settings.slack_command_script !== undefined)
     result.slack_command_script = settings.slack_command_script;
+  if (settings.slack_oauth_client_id !== undefined)
+    result.slack_oauth_client_id = settings.slack_oauth_client_id;
+  if (settings.slack_oauth_client_secret !== undefined)
+    result.slack_oauth_client_secret = settings.slack_oauth_client_secret;
   if (settings.auto_invite && typeof settings.auto_invite === "object") {
     result.auto_invite = settings.auto_invite;
   } else if (settings.auto_invite_enabled !== undefined) {
@@ -71251,7 +71360,9 @@ function migrateToGroupedFormat(settings) {
       mode: settings.auto_invite_mode ?? "invite"
     };
   }
-  if (settings.error_handler && typeof settings.error_handler === "object") {
+  if (settings.error_handler === null) {
+    result.error_handler = null;
+  } else if (settings.error_handler && typeof settings.error_handler === "object") {
     result.error_handler = settings.error_handler;
   } else if (typeof settings.error_handler === "string") {
     result.error_handler = {
@@ -71260,7 +71371,9 @@ function migrateToGroupedFormat(settings) {
       muted_on_cancel: settings.error_handler_muted_on_cancel ?? false
     };
   }
-  if (settings.success_handler && typeof settings.success_handler === "object") {
+  if (settings.success_handler === null) {
+    result.success_handler = null;
+  } else if (settings.success_handler && typeof settings.success_handler === "object") {
     result.success_handler = settings.success_handler;
   } else if (typeof settings.success_handler === "string") {
     result.success_handler = {
@@ -71307,7 +71420,9 @@ async function pushWorkspaceSettings(workspace, _path, settings, localSettings)
       datatable: remoteSettings.datatable,
       slack_team_id: remoteSettings.slack_team_id,
       slack_name: remoteSettings.slack_name,
-      slack_command_script: remoteSettings.slack_command_script
+      slack_command_script: remoteSettings.slack_command_script,
+      slack_oauth_client_id: remoteSettings.slack_oauth_client_id,
+      slack_oauth_client_secret: remoteSettings.slack_oauth_client_secret
     };
   } catch (err) {
     throw new Error(`Failed to get workspace settings: ${err}`);
@@ -71479,6 +71594,20 @@ async function pushWorkspaceSettings(workspace, _path, settings, localSettings)
       }
     });
   }
+  if (localSettings.slack_oauth_client_id != settings.slack_oauth_client_id || localSettings.slack_oauth_client_secret != settings.slack_oauth_client_secret) {
+    debug(`Updating slack oauth config...`);
+    if (localSettings.slack_oauth_client_id && localSettings.slack_oauth_client_secret) {
+      await setWorkspaceSlackOauthConfig({
+        workspace,
+        requestBody: {
+          slack_oauth_client_id: localSettings.slack_oauth_client_id,
+          slack_oauth_client_secret: localSettings.slack_oauth_client_secret
+        }
+      });
+    } else {
+      await deleteWorkspaceSlackOauthConfig({ workspace });
+    }
+  }
 }
 async function pushWorkspaceKey(workspace, _path, key, localKey) {
   try {
@@ -72208,6 +72337,7 @@ var init_instance = __esm(async () => {
     init_sync(),
     init_types(),
     init_user(),
+    init_slack2(),
     init_workspace(),
     init_settings(),
     init_utils(),
@@ -72239,7 +72369,7 @@ var init_instance = __esm(async () => {
     });
     await removeInstance(choice);
     info(colors.green.underline(`Removed instance ${choice}`));
-  }).command("switch").complete("instance", async () => (await allInstances()).map((x) => x.name)).arguments("<instance:string:instance>").description("Switch the current instance").action(switchI).command("pull").description("Pull instance settings, users, configs, instance groups and overwrite local").option("--yes", "Pull without needing confirmation").option("--dry-run", "Perform a dry run without making changes").option("--skip-users", "Skip pulling users").option("--skip-settings", "Skip pulling settings").option("--skip-configs", "Skip pulling configs (worker groups)").option("--skip-groups", "Skip pulling instance groups").option("--include-workspaces", "Also pull workspaces").option("--folder-per-instance", "Create a folder per instance").option("--instance <instance:string>", "Name of the instance to pull from, override the active instance").option("--prefix <prefix:string>", "Prefix of the local workspaces to pull, used to create the folders when using --include-workspaces").option("--prefix-settings", "Store instance yamls inside prefixed folders when using --prefix and --folder-per-instance").action(instancePull).command("push").description("Push instance settings, users, configs, group and overwrite remote").option("--yes", "Push without needing confirmation").option("--dry-run", "Perform a dry run without making changes").option("--skip-users", "Skip pushing users").option("--skip-settings", "Skip pushing settings").option("--skip-configs", "Skip pushing configs (worker groups)").option("--skip-groups", "Skip pushing instance groups").option("--include-workspaces", "Also push workspaces").option("--folder-per-instance", "Create a folder per instance").option("--instance <instance:string>", "Name of the instance to push to, override the active instance").option("--prefix <prefix:string>", "Prefix of the local workspaces folders to push").option("--prefix-settings", "Store instance yamls inside prefixed folders when using --prefix and --folder-per-instance").action(instancePush).command("whoami").description("Display information about the currently logged-in user").action(whoami3).command("get-config").description("Dump the current instance config (global settings + worker configs) as YAML").option("-o, --output-file <file:string>", "Write YAML to a file instead of stdout").option("--show-secrets", "Include sensitive fields (license key, JWT secret) without prompting").option("--instance <instance:string>", "Name of the instance, override the active instance").action(getConfig2);
+  }).command("switch").complete("instance", async () => (await allInstances()).map((x) => x.name)).arguments("<instance:string:instance>").description("Switch the current instance").action(switchI).command("pull").description("Pull instance settings, users, configs, instance groups and overwrite local").option("--yes", "Pull without needing confirmation").option("--dry-run", "Perform a dry run without making changes").option("--skip-users", "Skip pulling users").option("--skip-settings", "Skip pulling settings").option("--skip-configs", "Skip pulling configs (worker groups)").option("--skip-groups", "Skip pulling instance groups").option("--include-workspaces", "Also pull workspaces").option("--folder-per-instance", "Create a folder per instance").option("--instance <instance:string>", "Name of the instance to pull from, override the active instance").option("--prefix <prefix:string>", "Prefix of the local workspaces to pull, used to create the folders when using --include-workspaces").option("--prefix-settings", "Store instance yamls inside prefixed folders when using --prefix and --folder-per-instance").action(instancePull).command("push").description("Push instance settings, users, configs, group and overwrite remote").option("--yes", "Push without needing confirmation").option("--dry-run", "Perform a dry run without making changes").option("--skip-users", "Skip pushing users").option("--skip-settings", "Skip pushing settings").option("--skip-configs", "Skip pushing configs (worker groups)").option("--skip-groups", "Skip pushing instance groups").option("--include-workspaces", "Also push workspaces").option("--folder-per-instance", "Create a folder per instance").option("--instance <instance:string>", "Name of the instance to push to, override the active instance").option("--prefix <prefix:string>", "Prefix of the local workspaces folders to push").option("--prefix-settings", "Store instance yamls inside prefixed folders when using --prefix and --folder-per-instance").action(instancePush).command("whoami").description("Display information about the currently logged-in user").action(whoami3).command("get-config").description("Dump the current instance config (global settings + worker configs) as YAML").option("-o, --output-file <file:string>", "Write YAML to a file instead of stdout").option("--show-secrets", "Include sensitive fields (license key, JWT secret) without prompting").option("--instance <instance:string>", "Name of the instance, override the active instance").action(getConfig2).command("connect-slack").description("Non-interactively connect Slack at the instance level using a pre-minted bot token (xoxb-...). Produces the same artifacts as the UI OAuth flow: global_settings 'slack' row + encrypted f/slack_bot/global_bot_token variable and resource in the admins workspace.").option("--bot-token <bot_token:string>", "Slack bot token (xoxb-...)", { required: true }).option("--team-id <team_id:string>", "Slack team id", { required: true }).option("--team-name <team_name:string>", "Slack team name", { required: true }).option("--instance <instance:string>", "Instance profile to connect against (defaults to the active instance)").action((opts) => connectSlackInstance2(opts));
   instance_default = command16;
 });
 
@@ -82712,6 +82842,11 @@ sync local with a remote instance or the opposite (push or pull)
   - \`-o, --output-file <file:string>\` - Write YAML to a file instead of stdout
   - \`--show-secrets\` - Include sensitive fields (license key, JWT secret) without prompting
   - \`--instance <instance:string>\` - Name of the instance, override the active instance
+- \`instance connect-slack\`
+  - \`--bot-token <bot_token:string>\` - Slack bot token (xoxb-...)
+  - \`--team-id <team_id:string>\` - Slack team id
+  - \`--team-name <team_name:string>\` - Slack team name
+  - \`--instance <instance:string>\` - Instance profile to connect against (defaults to the active instance)
 
 ### job
 
@@ -83060,6 +83195,11 @@ workspace related commands
   - \`--exclude <items:string>\` - Comma-separated kind:path items to exclude
   - \`--preserve-on-behalf-of\` - Preserve original on_behalf_of/permissioned_as values
   - \`-y --yes\` - Non-interactive mode (deploy without prompts)
+- \`workspace connect-slack\` - Non-interactively connect Slack to the active workspace using a pre-minted bot token (xoxb-...). Produces the same artifacts as the UI OAuth flow: workspace_settings fields, g/slack group, f/slack_bot folder, and the encrypted bot token variable + resource at f/slack_bot/bot_token.
+  - \`--bot-token <bot_token:string>\` - Slack bot token (xoxb-...)
+  - \`--team-id <team_id:string>\` - Slack team id
+  - \`--team-name <team_name:string>\` - Slack team name
+- \`workspace disconnect-slack\`
 
 `
 };
@@ -86001,7 +86141,7 @@ var config_default = command35;
 
 // src/main.ts
 await init_context();
-var VERSION = "1.690.0";
+var VERSION = "1.691.0";
 async function checkVersionSafe(cmd) {
   const mainCommand = cmd.getMainCommand();
   const upgradeCommand = mainCommand.getCommand("upgrade");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.690.0",
+  "version": "1.691.0",
   "description": "CLI for Windmill",
   "license": "Apache 2.0",
   "type": "module",