windmill-cli 1.723.0 → 1.724.0

package/esm/main.js

@@ -16772,7 +16772,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv3("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.723.0",
+    VERSION: "1.724.0",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -25304,7 +25304,7 @@ var init_auth = __esm(async () => {
 });
 
 // src/core/constants.ts
-var WM_FORK_PREFIX = "wm-fork", VERSION = "1.723.0";
+var WM_FORK_PREFIX = "wm-fork", VERSION = "1.724.0";
 
 // src/utils/git.ts
 var exports_git = {};
@@ -62847,14 +62847,27 @@ function extractRawscriptInline(id, summary, rawscript, mapping, separator, assi
   rawscript.content = "!inline " + path6.replaceAll(separator, "/");
   const lock = rawscript.lock;
   if (lock && lock != "") {
-    const dotIdx = mappedPath ? mappedPath.lastIndexOf(".") : -1;
-    const lockBasePath = mappedPath ? dotIdx > 0 ? mappedPath.substring(0, dotIdx + 1) : mappedPath + "." : basePath;
+    const lockBasePath = mappedPath ? lockBasePathForContent(mappedPath, language) : basePath;
     const lockPath = lockBasePath + "lock";
     rawscript.lock = "!inline " + lockPath.replaceAll(separator, "/");
     r.push({ path: lockPath, content: lock, language, is_lock: true });
   }
   return r;
 }
+function lockBasePathForContent(contentPath, language) {
+  const langExt = LANGUAGE_EXTENSIONS[language];
+  if (langExt && contentPath.endsWith("." + langExt)) {
+    return contentPath.substring(0, contentPath.length - langExt.length);
+  }
+  const dotIdx = contentPath.lastIndexOf(".");
+  return dotIdx > 0 ? contentPath.substring(0, dotIdx + 1) : contentPath + ".";
+}
+function legacyLockPathForContent(contentPath, language) {
+  const dotIdx = contentPath.lastIndexOf(".");
+  const legacy = (dotIdx > 0 ? contentPath.substring(0, dotIdx + 1) : contentPath + ".") + "lock";
+  const canonical = lockBasePathForContent(contentPath, language) + "lock";
+  return legacy === canonical ? undefined : legacy;
+}
 function extractInlineScripts(modules, mapping = {}, separator = "/", defaultTs, pathAssigner, options) {
   const assigner = pathAssigner ?? newPathAssigner(defaultTs ?? "bun", { skipInlineScriptSuffix: options?.skipInlineScriptSuffix });
   const failOnInlineDirective = options?.failOnInlineDirective ?? false;
@@ -63103,6 +63116,8 @@ function collectPathScriptPaths(flowValue) {
 }
 
 // src/commands/flow/flow_metadata.ts
+import { existsSync as existsSync4 } from "node:fs";
+import { rm } from "node:fs/promises";
 import * as path6 from "node:path";
 import { sep as SEP4 } from "node:path";
 async function isFlowDirectlyStale(folder, hashes, conf) {
@@ -63260,6 +63275,22 @@ async function generateFlowLockInternal(folder, dryRun, workspace, opts, justUpd
     inlineScripts.forEach((s) => {
       writeIfChanged(process.cwd() + SEP4 + folder + SEP4 + s.path, s.content);
     });
+    for (const s of inlineScripts) {
+      if (s.is_lock)
+        continue;
+      const legacyRelPath = legacyLockPathForContent(s.path, s.language);
+      if (!legacyRelPath)
+        continue;
+      const legacyAbsPath = process.cwd() + SEP4 + folder + SEP4 + legacyRelPath;
+      if (existsSync4(legacyAbsPath)) {
+        try {
+          await rm(legacyAbsPath);
+          info(colors.gray(`Removed legacy lock file ${legacyRelPath} (renamed to canonical name)`));
+        } catch (e) {
+          info(colors.yellow(`Failed to remove legacy lock file ${legacyRelPath}: ${e}`));
+        }
+      }
+    }
     writeIfChanged(process.cwd() + SEP4 + folder + SEP4 + "flow.yaml", import_yaml6.stringify(flowValue, yamlOptions));
   }
   const depsForHash = tree ? {} : filteredDeps;
@@ -65916,7 +65947,7 @@ __export(exports_sync, {
   canonicalizeCaseInsensitiveKeys: () => canonicalizeCaseInsensitiveKeys,
   FSFSElement: () => FSFSElement
 });
-import { writeFile as writeFile7, readdir as readdir4, stat as stat7, rm, copyFile, mkdir as mkdir5 } from "node:fs/promises";
+import { writeFile as writeFile7, readdir as readdir4, stat as stat7, rm as rm2, copyFile, mkdir as mkdir5 } from "node:fs/promises";
 import * as path10 from "node:path";
 import { sep as SEP9 } from "node:path";
 function configKeyForItemKind(kind) {
@@ -67219,8 +67250,8 @@ async function isCaseInsensitiveFilesystem(dir) {
     } catch {
       result = false;
     }
-    await rm(upper).catch(() => {});
-    await rm(lower).catch(() => {});
+    await rm2(upper).catch(() => {});
+    await rm2(lower).catch(() => {});
   } catch {
     result = false;
   }
@@ -67794,13 +67825,13 @@ Both local and remote have been modified.`));
       } else if (change.name === "deleted") {
         try {
           info(`Deleting ${getTypeStrFromPath(change.path)} ${change.path}`);
-          await rm(target);
+          await rm2(target);
           if (opts.stateful) {
-            await rm(stateTarget);
+            await rm2(stateTarget);
           }
         } catch {
           if (opts.stateful) {
-            await rm(stateTarget);
+            await rm2(stateTarget);
           }
         }
       }
@@ -68770,7 +68801,7 @@ Run 'wmill folder add-missing' to create them locally, then push again.`;
               }
               if (stateTarget) {
                 try {
-                  await rm(stateTarget);
+                  await rm2(stateTarget);
                 } catch {}
               }
             } else if (change.name === "ws_specific_flag") {
@@ -69116,8 +69147,8 @@ var init_parse_schema = __esm(() => {
 
 // src/utils/metadata.ts
 import { sep as SEP10 } from "node:path";
-import { writeFile as writeFile8, stat as stat8, rm as rm2, readdir as readdir5 } from "node:fs/promises";
-import { readFileSync as readFileSync2, existsSync as existsSync5, readdirSync, statSync, writeFileSync as writeFileSync4 } from "node:fs";
+import { writeFile as writeFile8, stat as stat8, rm as rm3, readdir as readdir5 } from "node:fs/promises";
+import { readFileSync as readFileSync2, existsSync as existsSync6, readdirSync, statSync, writeFileSync as writeFileSync4 } from "node:fs";
 import * as path11 from "node:path";
 import { createRequire as createRequire2 } from "node:module";
 function loadParser(pkgName) {
@@ -69216,7 +69247,7 @@ async function generateScriptMetadataInternal(scriptPath, workspace, opts, dryRu
   const metadataContent = await readTextFile(metadataWithType.path);
   const filteredRawWorkspaceDependencies = filterWorkspaceDependencies(rawWorkspaceDependencies, scriptContent, language);
   const moduleFolderPath = isFolderLayout ? path11.dirname(scriptPath) : scriptPath.substring(0, scriptPath.indexOf(".")) + getModuleFolderSuffix();
-  const hasModules = existsSync5(moduleFolderPath) && statSync(moduleFolderPath).isDirectory();
+  const hasModules = existsSync6(moduleFolderPath) && statSync(moduleFolderPath).isDirectory();
   const depsForHash = tree ? {} : filteredRawWorkspaceDependencies;
   let hash2 = await generateScriptHash(depsForHash, scriptContent, metadataContent);
   let moduleHashes = {};
@@ -69521,7 +69552,7 @@ async function updateScriptLock(workspace, scriptContent, language, remotePath,
   } else {
     try {
       if (await stat8(lockPath)) {
-        await rm2(lockPath);
+        await rm3(lockPath);
       }
     } catch (e) {
       info(colors.yellow(`Error removing lock file ${lockPath}: ${e}`));
@@ -69561,7 +69592,7 @@ async function updateModuleLocks(workspace, dirPath, relPrefix, scriptRemotePath
           writeFileSync4(lockPath, lock, "utf-8");
         } else {
           try {
-            if (existsSync5(lockPath)) {
+            if (existsSync6(lockPath)) {
               const { rm: rmAsync } = await import("node:fs/promises");
               await rmAsync(lockPath);
             }
@@ -72442,7 +72473,7 @@ var init_lint2 = __esm(async () => {
 });
 
 // src/commands/app/new.ts
-import { stat as stat9, writeFile as writeFile10, mkdir as mkdir7, rm as rm3 } from "node:fs/promises";
+import { stat as stat9, writeFile as writeFile10, mkdir as mkdir7, rm as rm4 } from "node:fs/promises";
 import path17 from "node:path";
 import { execSync as execSync5, exec, execFile as execFile6 } from "node:child_process";
 function validateAppPath(appPath) {
@@ -72721,7 +72752,7 @@ CREATE SCHEMA IF NOT EXISTS ${schemaName};
         return;
       }
     }
-    await rm3(appDir, { recursive: true, force: true });
+    await rm4(appDir, { recursive: true, force: true });
   }
   await mkdir7(appDir, { recursive: true });
   await mkdir7(path17.join(appDir, "backend"), { recursive: true });
@@ -73740,24 +73771,51 @@ async function add2(opts, value, remotePath) {
   if (!validatePath(remotePath)) {
     return;
   }
+  const isSecret = opts.secret ?? (opts.public ? false : undefined);
   if (await existsVariable({
     workspace: workspace.workspaceId,
     path: remotePath
   })) {
-    if (!await Confirm.prompt({
+    if (!opts.yes && !await Confirm.prompt({
       message: `Variable already exist, do you want to update its value?`,
       default: true
     })) {
       return;
     }
+    if (isSecret === false) {
+      const existing = await getVariable({
+        workspace: workspace.workspaceId,
+        path: remotePath,
+        decryptSecret: false
+      });
+      if (existing.is_secret) {
+        warn(colors.yellow(`Variable ${remotePath} is currently secret and will be downgraded to non-secret: its value will be stored in plaintext`));
+      }
+    }
     info(colors.bold.yellow("Updating variable..."));
+    await updateVariable({
+      workspace: workspace.workspaceId,
+      path: remotePath,
+      alreadyEncrypted: false,
+      requestBody: {
+        value,
+        ...isSecret !== undefined ? { is_secret: isSecret } : {},
+        ...opts.description !== undefined ? { description: opts.description } : {}
+      }
+    });
+  } else {
+    info(colors.bold.yellow("Creating variable..."));
+    await createVariable({
+      workspace: workspace.workspaceId,
+      alreadyEncrypted: false,
+      requestBody: {
+        path: remotePath,
+        value,
+        is_secret: isSecret ?? true,
+        description: opts.description ?? ""
+      }
+    });
   }
-  info(colors.bold.yellow("Pushing variable..."));
-  await pushVariable(workspace.workspaceId, remotePath + ".variable.yaml", undefined, {
-    value,
-    is_secret: !opts.public,
-    description: ""
-  }, true);
   info(colors.bold.underline.green(`Variable ${remotePath} pushed`));
 }
 var import_yaml25, command15, variable_default;
@@ -73774,7 +73832,7 @@ var init_variable = __esm(async () => {
     init_confirm()
   ]);
   import_yaml25 = __toESM(require_dist(), 1);
-  command15 = new Command().description("variable related commands").option("--json", "Output as JSON (for piping to jq)").action(list8).command("list", "list all variables").option("--json", "Output as JSON (for piping to jq)").action(list8).command("get", "get a variable's details").arguments("<path:string>").option("--json", "Output as JSON (for piping to jq)").action(get6).command("new", "create a new variable locally").arguments("<path:string>").action(newVariable).command("push", "Push a local variable spec. This overrides any remote versions.").arguments("<file_path:string> <remote_path:string>").option("--plain-secrets", "Push secrets as plain text").action(push7).command("add", "Create a new variable on the remote. This will update the variable if it already exists.").arguments("<value:string> <remote_path:string>").option("--plain-secrets", "Push secrets as plain text").option("--public", "Legacy option, use --plain-secrets instead").action(add2);
+  command15 = new Command().description("variable related commands").option("--json", "Output as JSON (for piping to jq)").action(list8).command("list", "list all variables").option("--json", "Output as JSON (for piping to jq)").action(list8).command("get", "get a variable's details").arguments("<path:string>").option("--json", "Output as JSON (for piping to jq)").action(get6).command("new", "create a new variable locally").arguments("<path:string>").action(newVariable).command("push", "Push a local variable spec. This overrides any remote versions.").arguments("<file_path:string> <remote_path:string>").option("--plain-secrets", "Push secrets as plain text").action(push7).command("add", "Create a new variable on the remote. This will update the variable if it already exists.").arguments("<value:string> <remote_path:string>").option("--yes", "Skip confirmation prompt when updating an existing variable").option("--secret", "Mark the variable as secret (default when creating a new variable)").option("--no-secret", "Mark the variable as non-secret (when updating, the existing setting is preserved if neither --secret nor --no-secret is passed)").option("--description <description:string>", "Set the variable description (when updating, the existing description is preserved if not passed)").option("--plain-secrets", "Push secrets as plain text").option("--public", "Legacy option, use --no-secret instead").action(add2);
   variable_default = command15;
 });
 
@@ -74607,7 +74665,7 @@ var init_settings = __esm(async () => {
 });
 
 // src/commands/instance/instance.ts
-import { writeFile as writeFile15, readdir as readdir9, mkdir as mkdir11, rm as rm4, stat as stat14 } from "node:fs/promises";
+import { writeFile as writeFile15, readdir as readdir9, mkdir as mkdir11, rm as rm5, stat as stat14 } from "node:fs/promises";
 import { appendFile } from "node:fs/promises";
 import * as path18 from "node:path";
 async function allInstances() {
@@ -74873,7 +74931,7 @@ Pulling workspace ` + remoteWorkspace.id);
       if (confirmDelete) {
         for (const workspace of localWorkspacesToDelete) {
           await removeWorkspace(workspace.id, false, {});
-          await rm4(path18.join(rootDir, workspace.dir), {
+          await rm5(path18.join(rootDir, workspace.dir), {
             recursive: true
           });
         }
@@ -85054,8 +85112,12 @@ variable related commands
 - \`variable push <file_path:string> <remote_path:string>\` - Push a local variable spec. This overrides any remote versions.
   - \`--plain-secrets\` - Push secrets as plain text
 - \`variable add <value:string> <remote_path:string>\` - Create a new variable on the remote. This will update the variable if it already exists.
+  - \`--yes\` - Skip confirmation prompt when updating an existing variable
+  - \`--secret\` - Mark the variable as secret (default when creating a new variable)
+  - \`--no-secret\` - Mark the variable as non-secret (when updating, the existing setting is preserved if neither --secret nor --no-secret is passed)
+  - \`--description <description:string>\` - Set the variable description (when updating, the existing description is preserved if not passed)
   - \`--plain-secrets\` - Push secrets as plain text
-  - \`--public\` - Legacy option, use --plain-secrets instead
+  - \`--public\` - Legacy option, use --no-secret instead
 
 ### version
 
@@ -86531,7 +86593,7 @@ __export(exports_tsconfig, {
 });
 import { execSync as execSync6 } from "node:child_process";
 import { createHash as createHash2 } from "node:crypto";
-import { existsSync as existsSync12, readFileSync as readFileSync4, writeFileSync as writeFileSync7 } from "node:fs";
+import { existsSync as existsSync13, readFileSync as readFileSync4, writeFileSync as writeFileSync7 } from "node:fs";
 import path21 from "node:path";
 import process23 from "node:process";
 function buildManagedTsconfig() {
@@ -86658,7 +86720,7 @@ async function refreshManagedDenoImportMap(mode) {
   });
 }
 async function ensureUserReferencesManaged(opts) {
-  const existing = [opts.file, ...opts.altFiles ?? []].map((f) => path21.join(process23.cwd(), f)).find((p) => existsSync12(p));
+  const existing = [opts.file, ...opts.altFiles ?? []].map((f) => path21.join(process23.cwd(), f)).find((p) => existsSync13(p));
   if (!existing) {
     const userPath = path21.join(process23.cwd(), opts.file);
     writeFileSync7(userPath, JSON.stringify(opts.create, null, 2) + `
@@ -86710,7 +86772,7 @@ async function ensureUserReferencesManaged(opts) {
 }
 function ensureBunTypesAvailable() {
   const cwd = process23.cwd();
-  if (existsSync12(path21.join(cwd, "node_modules", "bun-types"))) {
+  if (existsSync13(path21.join(cwd, "node_modules", "bun-types"))) {
     return true;
   }
   try {
@@ -86733,7 +86795,7 @@ function ensureBunTypesAvailable() {
 async function warnIfTsconfigStale(opts) {
   const cwd = opts?.cwd ?? process23.cwd();
   const managedPath = path21.join(cwd, MANAGED_TSCONFIG);
-  if (!existsSync12(managedPath))
+  if (!existsSync13(managedPath))
     return;
   let managedText;
   try {
@@ -88172,7 +88234,7 @@ await __promiseAll([
   init_context()
 ]);
 var import_yaml39 = __toESM(require_dist(), 1);
-import { existsSync as existsSync9 } from "node:fs";
+import { existsSync as existsSync10 } from "node:fs";
 import { writeFile as writeFile19 } from "node:fs/promises";
 import { dirname as dirname18, join as join18 } from "node:path";
 var PROTECTION_RULES_FILENAME = "protection-rules.yaml";
@@ -88183,7 +88245,7 @@ function getProtectionRulesPath() {
   return join18(dirname18(wmillPath), PROTECTION_RULES_FILENAME);
 }
 async function readProtectionRulesFile(path20) {
-  if (!existsSync9(path20))
+  if (!existsSync10(path20))
     return {};
   const parsed = await yamlParseFile(path20);
   return parsed ?? {};
@@ -88394,7 +88456,7 @@ await __promiseAll([
   init_conf()
 ]);
 import process22 from "node:process";
-import { existsSync as existsSync10 } from "node:fs";
+import { existsSync as existsSync11 } from "node:fs";
 async function pushProtectionRules(opts, workspaceArg) {
   if (opts.jsonOutput)
     setSilent(true);
@@ -88404,7 +88466,7 @@ async function pushProtectionRules(opts, workspaceArg) {
       error: "No wmill.yaml found. Run 'wmill init' first — protection-rules.yaml lives next to it."
     });
   }
-  if (!existsSync10(prPath)) {
+  if (!existsSync11(prPath)) {
     fail(opts, {
       error: "No protection-rules.yaml found. Run 'wmill protection-rules pull' first."
     });
@@ -89609,7 +89671,7 @@ await __promiseAll([
   init_workspace(),
   init_resource_type()
 ]);
-import { stat as stat20, writeFile as writeFile22, rm as rm6 } from "node:fs/promises";
+import { stat as stat20, writeFile as writeFile22, rm as rm7 } from "node:fs/promises";
 
 // src/commands/init/template.ts
 var NON_SCHEMA_KEYS = new Set([
@@ -90090,7 +90152,7 @@ await __promiseAll([
   init_utils(),
   init_freshness()
 ]);
-import { cp, mkdir as mkdir13, readdir as readdir11, rm as rm5, stat as stat19, writeFile as writeFile21 } from "node:fs/promises";
+import { cp, mkdir as mkdir13, readdir as readdir11, rm as rm6, stat as stat19, writeFile as writeFile21 } from "node:fs/promises";
 import { join as join20 } from "node:path";
 var WMILL_INIT_AI_SKILLS_SOURCE_ENV = "WMILL_INIT_AI_SKILLS_SOURCE";
 var WMILL_INIT_AI_AGENTS_SOURCE_ENV = "WMILL_INIT_AI_AGENTS_SOURCE";
@@ -90151,7 +90213,7 @@ async function migrateLegacyManagedFile(targetDir) {
   const legacyPath = join20(targetDir, LEGACY_AGENTS_CLI_FILENAME);
   const legacyExists = await stat19(legacyPath).catch(() => null) != null;
   if (legacyExists) {
-    await rm5(legacyPath, { force: true });
+    await rm6(legacyPath, { force: true });
   }
   return legacyExists;
 }
@@ -90555,8 +90617,8 @@ async function initAction(opts) {
             });
             if (choice === "cancel") {
               try {
-                await rm6("wmill.yaml");
-                await rm6("wmill-lock.yaml");
+                await rm7("wmill.yaml");
+                await rm7("wmill-lock.yaml");
               } catch {}
               info("Init cancelled");
               process.exit(0);

package/package.json

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