windmill-cli 1.658.0 → 1.659.1

package/esm/main.js

@@ -11785,7 +11785,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv2("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.658.0",
+    VERSION: "1.659.1",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -12220,6 +12220,7 @@ __export(exports_services_gen, {
   logout: () => logout,
   loginWithOauth: () => loginWithOauth,
   login: () => login,
+  logAiChat: () => logAiChat,
   loadTableRowCount: () => loadTableRowCount,
   loadParquetPreview: () => loadParquetPreview,
   loadGitRepoFilePreview: () => loadGitRepoFilePreview,
@@ -14242,6 +14243,16 @@ var backendVersion = () => {
       404: "protection rule not found"
     }
   });
+}, logAiChat = (data2) => {
+  return request(OpenAPI, {
+    method: "POST",
+    url: "/w/{workspace}/workspaces/log_chat",
+    path: {
+      workspace: data2.workspace
+    },
+    body: data2.requestBody,
+    mediaType: "application/json"
+  });
 }, setPublicAppRateLimit = (data2) => {
   return request(OpenAPI, {
     method: "POST",
@@ -24318,6 +24329,29 @@ function isRawAppMetadataFile(p) {
 function isRawAppFolderMetadataFile(p) {
   return p.endsWith(getMetadataPathSuffix("raw_app", "yaml")) || p.endsWith(getMetadataPathSuffix("raw_app", "json"));
 }
+function getModuleFolderSuffix() {
+  return MODULE_SUFFIX;
+}
+function isScriptModulePath(p) {
+  return normalizeSep(p).includes(MODULE_SUFFIX + "/");
+}
+function isModuleEntryPoint(p) {
+  const norm = normalizeSep(p);
+  const suffix = MODULE_SUFFIX + "/";
+  const idx = norm.indexOf(suffix);
+  if (idx === -1)
+    return false;
+  const rest = norm.slice(idx + suffix.length);
+  return rest.startsWith("script.") && !rest.includes("/");
+}
+function getScriptBasePathFromModulePath(p) {
+  const norm = normalizeSep(p);
+  const suffix = MODULE_SUFFIX + "/";
+  const idx = norm.indexOf(suffix);
+  if (idx === -1)
+    return;
+  return norm.slice(0, idx);
+}
 function getDeleteSuffix(type, format6) {
   return getFolderSuffixes()[type] + "/" + METADATA_FILES[type][format6];
 }
@@ -24333,7 +24367,7 @@ function transformJsonPathToDir(p, type) {
   }
   return p;
 }
-var DOTTED_SUFFIXES, NON_DOTTED_SUFFIXES, _nonDottedPaths = false, _nonDottedPathsLogged = false, METADATA_FILES;
+var DOTTED_SUFFIXES, NON_DOTTED_SUFFIXES, _nonDottedPaths = false, _nonDottedPathsLogged = false, METADATA_FILES, MODULE_SUFFIX = "__mod";
 var init_resource_folders = __esm(() => {
   init_log();
   init_yaml();
@@ -24959,6 +24993,14 @@ async function readConfigFile() {
         migrationMessages.push("ℹ️  Removing empty 'overrides: {}' from wmill.yaml (migrated to gitBranches format)");
       }
     }
+    if (conf && "environments" in conf) {
+      if (!conf.gitBranches) {
+        conf.gitBranches = conf.environments;
+      } else {
+        warn("⚠️  Both 'environments' and 'gitBranches' found in wmill.yaml. Using 'gitBranches' and ignoring 'environments'.");
+      }
+      delete conf.environments;
+    }
     if (conf && "git_branches" in conf) {
       if (!conf.gitBranches) {
         conf.gitBranches = JSON.parse(JSON.stringify(conf.git_branches));
@@ -25503,7 +25545,7 @@ var init_workspace = __esm(async () => {
   ]);
   command = new Command().alias("profile").description("workspace related commands").action(list).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(list).command("list-remote").description("List workspaces on the remote server that you have access to").action(listRemote).command("bind").description("Bind the current Git branch to the active workspace").option("--branch <branch:string>", "Specify branch (defaults to current)").action((opts) => bind(opts, true)).command("unbind").description("Remove workspace binding from the current Git branch").option("--branch <branch:string>", "Specify branch (defaults to current)").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.").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);
+  }).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(list).command("list-remote").description("List workspaces on the remote server that you have access to").action(listRemote).command("bind").description("Bind the current Git branch to the active workspace").option("--branch, --env <branch:string>", "Specify branch/environment (defaults to current)").action((opts) => bind(opts, true)).command("unbind").description("Remove workspace binding from the current Git branch").option("--branch, --env <branch:string>", "Specify branch/environment (defaults to current)").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.").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);
   workspace_default = command;
 });
 
@@ -58802,6 +58844,7 @@ var init_tar = __esm(() => {
 import { readFile as readFile5, writeFile as writeFile4, stat as stat3 } from "node:fs/promises";
 import { Buffer as Buffer4 } from "node:buffer";
 import { sep as SEP4 } from "node:path";
+import * as path5 from "node:path";
 import fs8 from "node:fs";
 import { execSync as execSync3 } from "node:child_process";
 function isRawAppBackendPath2(filePath) {
@@ -58831,8 +58874,8 @@ async function push(opts, filePath) {
   await handleFile(filePath, workspace, [], undefined, opts, await getRawWorkspaceDependencies(), codebases);
   info(colors.bold.underline.green(`Script ${filePath} pushed`));
 }
-async function findResourceFile(path5) {
-  const splitPath = path5.split(".");
+async function findResourceFile(path6) {
+  const splitPath = path6.split(".");
   let contentBasePathJSON = splitPath[0] + "." + splitPath[1] + ".json";
   let contentBasePathYAML = splitPath[0] + "." + splitPath[1] + ".yaml";
   const currentBranch = getCurrentGitBranch();
@@ -58853,45 +58896,48 @@ async function findResourceFile(path5) {
     throw new Error("Found two resource files for the same resource" + validCandidates.join(", "));
   }
   if (validCandidates.length < 1) {
-    throw new Error(`No resource matching file resource: ${path5}.`);
+    throw new Error(`No resource matching file resource: ${path6}.`);
   }
   return validCandidates[0];
 }
-async function handleScriptMetadata(path5, workspace, alreadySynced, message, rawWorkspaceDependencies, codebases, opts) {
-  if (path5.endsWith(".script.json") || path5.endsWith(".script.yaml") || path5.endsWith(".script.lock")) {
-    const contentPath = await findContentFile(path5);
+async function handleScriptMetadata(path6, workspace, alreadySynced, message, rawWorkspaceDependencies, codebases, opts) {
+  const isFlatMeta = path6.endsWith(".script.json") || path6.endsWith(".script.yaml") || path6.endsWith(".script.lock");
+  const isFolderMeta = !isFlatMeta && isScriptModulePath(path6) && (path6.endsWith("/script.yaml") || path6.endsWith("/script.json") || path6.endsWith("/script.lock"));
+  if (isFlatMeta || isFolderMeta) {
+    const contentPath = await findContentFile(path6);
     return handleFile(contentPath, workspace, alreadySynced, message, opts, rawWorkspaceDependencies, codebases);
   } else {
     return false;
   }
 }
-async function handleFile(path5, workspace, alreadySynced, message, opts, rawWorkspaceDependencies, codebases) {
-  if (!isAppInlineScriptPath2(path5) && !isFlowInlineScriptPath2(path5) && !isRawAppBackendPath2(path5) && exts.some((exts) => path5.endsWith(exts))) {
-    if (alreadySynced.includes(path5)) {
+async function handleFile(path6, workspace, alreadySynced, message, opts, rawWorkspaceDependencies, codebases) {
+  const moduleEntryPoint = isModuleEntryPoint(path6);
+  if (!isAppInlineScriptPath2(path6) && !isFlowInlineScriptPath2(path6) && !isRawAppBackendPath2(path6) && (!isScriptModulePath(path6) || moduleEntryPoint) && exts.some((exts) => path6.endsWith(exts))) {
+    if (alreadySynced.includes(path6)) {
       return true;
     }
-    debug(`Processing local script ${path5}`);
-    alreadySynced.push(path5);
-    const remotePath = path5.substring(0, path5.indexOf(".")).replaceAll(SEP4, "/");
-    const language = inferContentTypeFromFilePath(path5, opts?.defaultTs);
-    const codebase = language == "bun" ? findCodebase(path5, codebases) : undefined;
+    debug(`Processing local script ${path6}`);
+    alreadySynced.push(path6);
+    const remotePath = moduleEntryPoint ? getScriptBasePathFromModulePath(path6).replaceAll(SEP4, "/") : path6.substring(0, path6.indexOf(".")).replaceAll(SEP4, "/");
+    const language = inferContentTypeFromFilePath(path6, opts?.defaultTs);
+    const codebase = language == "bun" ? findCodebase(path6, codebases) : undefined;
     let bundleContent = undefined;
     let forceTar = false;
     if (codebase) {
       let outputFiles = [];
       if (codebase.customBundler) {
-        info(`Using custom bundler ${codebase.customBundler} for ${path5}`);
-        bundleContent = execSync3(codebase.customBundler + " " + path5, {
+        info(`Using custom bundler ${codebase.customBundler} for ${path6}`);
+        bundleContent = execSync3(codebase.customBundler + " " + path6, {
           maxBuffer: 1024 * 1024 * 50
         }).toString();
-        info("Custom bundler executed for " + path5);
+        info("Custom bundler executed for " + path6);
       } else {
         const esbuild = await import("esbuild");
-        info(`Started bundling ${path5} ...`);
+        info(`Started bundling ${path6} ...`);
         const startTime = performance.now();
         const format6 = codebase.format ?? "cjs";
         const out = await esbuild.build({
-          entryPoints: [path5],
+          entryPoints: [path6],
           format: format6,
           bundle: true,
           write: false,
@@ -58909,15 +58955,15 @@ async function handleFile(path5, workspace, alreadySynced, message, opts, rawWor
         bundleContent = out.outputFiles[0].text;
         outputFiles = out.outputFiles ?? [];
         if (outputFiles.length == 0) {
-          throw new Error(`No output files found for ${path5}`);
+          throw new Error(`No output files found for ${path6}`);
         }
-        info(`Finished bundling ${path5}: ${(bundleContent.length / 1024).toFixed(0)}kB (${(endTime - startTime).toFixed(0)}ms)`);
+        info(`Finished bundling ${path6}: ${(bundleContent.length / 1024).toFixed(0)}kB (${(endTime - startTime).toFixed(0)}ms)`);
       }
       if (outputFiles.length > 1) {
-        info(`Found multiple output files for ${path5}, creating a tarball... ${outputFiles.map((file) => file.path).join(", ")}`);
+        info(`Found multiple output files for ${path6}, creating a tarball... ${outputFiles.map((file) => file.path).join(", ")}`);
         forceTar = true;
         const startTime = performance.now();
-        const mainPath = path5.split(SEP4).pop()?.split(".")[0] + ".js";
+        const mainPath = path6.split(SEP4).pop()?.split(".")[0] + ".js";
         const mainContent = outputFiles.find((file) => file.path == "/" + mainPath)?.text ?? "";
         info(`Main content: ${mainContent.length}chars`);
         const entries = [
@@ -58932,10 +58978,10 @@ async function handleFile(path5, workspace, alreadySynced, message, opts, rawWor
         }
         bundleContent = await createTarBlob(entries);
         const endTime = performance.now();
-        info(`Finished creating tarball for ${path5}: ${(bundleContent.size / 1024).toFixed(0)}kB (${(endTime - startTime).toFixed(0)}ms)`);
+        info(`Finished creating tarball for ${path6}: ${(bundleContent.size / 1024).toFixed(0)}kB (${(endTime - startTime).toFixed(0)}ms)`);
       } else {
         if (Array.isArray(codebase.assets) && codebase.assets.length > 0) {
-          info(`Using the following asset configuration for ${path5}: ${JSON.stringify(codebase.assets)}`);
+          info(`Using the following asset configuration for ${path6}: ${JSON.stringify(codebase.assets)}`);
           const startTime = performance.now();
           const entries = [
             { name: "main.js", content: bundleContent }
@@ -58946,13 +58992,13 @@ async function handleFile(path5, workspace, alreadySynced, message, opts, rawWor
           }
           bundleContent = await createTarBlob(entries);
           const endTime = performance.now();
-          info(`Finished creating tarball for ${path5}: ${(bundleContent.size / 1024).toFixed(0)}kB (${(endTime - startTime).toFixed(0)}ms)`);
+          info(`Finished creating tarball for ${path6}: ${(bundleContent.size / 1024).toFixed(0)}kB (${(endTime - startTime).toFixed(0)}ms)`);
         }
       }
     }
     let typed = opts?.skipScriptsMetadata ? undefined : (await parseMetadataFile(remotePath, opts ? {
       ...opts,
-      path: path5,
+      path: path6,
       workspaceRemote: workspace,
       schemaOnly: codebase ? true : undefined,
       rawWorkspaceDependencies,
@@ -58969,13 +59015,16 @@ async function handleFile(path5, workspace, alreadySynced, message, opts, rawWor
     } catch {
       debug(`Script ${remotePath} does not exist on remote`);
     }
-    const content = await readFile5(path5, "utf-8");
+    const content = await readFile5(path6, "utf-8");
     if (opts?.skipScriptsMetadata) {
       typed = structuredClone(remote);
     }
     if (typed && codebase) {
       typed.codebase = await codebase.getDigest(forceTar);
     }
+    const scriptBasePath = moduleEntryPoint ? getScriptBasePathFromModulePath(path6) : path6.substring(0, path6.indexOf("."));
+    const moduleFolderPath = scriptBasePath + getModuleFolderSuffix();
+    const modules = await readModulesFromDisk(moduleFolderPath, opts?.defaultTs, moduleEntryPoint);
     const requestBodyCommon = {
       content,
       description: typed?.description ?? "",
@@ -58994,7 +59043,6 @@ async function handleFile(path5, workspace, alreadySynced, message, opts, rawWor
       deployment_message: message,
       restart_unless_cancelled: typed?.restart_unless_cancelled,
       visible_to_runner_only: typed?.visible_to_runner_only,
-      no_main_func: typed?.no_main_func,
       has_preprocessor: typed?.has_preprocessor,
       priority: typed?.priority,
       concurrency_key: typed?.concurrency_key,
@@ -59003,12 +59051,13 @@ async function handleFile(path5, workspace, alreadySynced, message, opts, rawWor
       codebase: await codebase?.getDigest(forceTar),
       timeout: typed?.timeout,
       on_behalf_of_email: typed?.on_behalf_of_email,
-      envs: typed?.envs
+      envs: typed?.envs,
+      modules
     };
     if (remote) {
       if (content === remote.content) {
         if (typed == undefined || typed.description === remote.description && typed.summary === remote.summary && typed.kind == remote.kind && !remote.archived && (Array.isArray(remote?.lock) ? remote?.lock?.join(`
-`) : remote?.lock ?? "").trim() == (typed?.lock ?? "").trim() && deepEqual(typed.schema, remote.schema) && typed.tag == remote.tag && (typed.ws_error_handler_muted ?? false) == remote.ws_error_handler_muted && typed.dedicated_worker == remote.dedicated_worker && typed.cache_ttl == remote.cache_ttl && typed.concurrency_time_window_s == remote.concurrency_time_window_s && typed.concurrent_limit == remote.concurrent_limit && Boolean(typed.restart_unless_cancelled) == Boolean(remote.restart_unless_cancelled) && Boolean(typed.visible_to_runner_only) == Boolean(remote.visible_to_runner_only) && Boolean(typed.no_main_func) == Boolean(remote.no_main_func) && Boolean(typed.has_preprocessor) == Boolean(remote.has_preprocessor) && typed.priority == Boolean(remote.priority) && typed.timeout == remote.timeout && typed.concurrency_key == remote["concurrency_key"] && typed.debounce_key == remote["debounce_key"] && typed.debounce_delay_s == remote["debounce_delay_s"] && typed.codebase == remote.codebase && typed.on_behalf_of_email == remote.on_behalf_of_email && deepEqual(typed.envs, remote.envs)) {
+`) : remote?.lock ?? "").trim() == (typed?.lock ?? "").trim() && deepEqual(typed.schema, remote.schema) && typed.tag == remote.tag && (typed.ws_error_handler_muted ?? false) == remote.ws_error_handler_muted && typed.dedicated_worker == remote.dedicated_worker && typed.cache_ttl == remote.cache_ttl && typed.concurrency_time_window_s == remote.concurrency_time_window_s && typed.concurrent_limit == remote.concurrent_limit && Boolean(typed.restart_unless_cancelled) == Boolean(remote.restart_unless_cancelled) && Boolean(typed.visible_to_runner_only) == Boolean(remote.visible_to_runner_only) && Boolean(typed.has_preprocessor) == Boolean(remote.has_preprocessor) && typed.priority == Boolean(remote.priority) && typed.timeout == remote.timeout && typed.concurrency_key == remote["concurrency_key"] && typed.debounce_key == remote["debounce_key"] && typed.debounce_delay_s == remote["debounce_delay_s"] && typed.codebase == remote.codebase && typed.on_behalf_of_email == remote.on_behalf_of_email && deepEqual(typed.envs, remote.envs) && deepEqual(modules ?? null, remote.modules ?? null)) {
           info(colors.green(`Script ${remotePath} is up to date`));
           return true;
         }
@@ -59033,6 +59082,50 @@ async function handleFile(path5, workspace, alreadySynced, message, opts, rawWor
   }
   return false;
 }
+async function readModulesFromDisk(moduleFolderPath, defaultTs, folderLayout = false) {
+  if (!fs8.existsSync(moduleFolderPath) || !fs8.statSync(moduleFolderPath).isDirectory()) {
+    return;
+  }
+  const modules = {};
+  const isEntryPointFile = (name, isTopLevel) => {
+    if (!folderLayout || !isTopLevel)
+      return false;
+    return name.startsWith("script.") || name === "script.lock" || name === "script.yaml" || name === "script.json";
+  };
+  function readDir2(dirPath, relPrefix) {
+    const entries = fs8.readdirSync(dirPath, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = path5.join(dirPath, entry.name);
+      const relPath = relPrefix ? relPrefix + "/" + entry.name : entry.name;
+      const isTopLevel = relPrefix === "";
+      if (entry.isDirectory()) {
+        readDir2(fullPath, relPath);
+      } else if (entry.isFile() && !entry.name.endsWith(".lock") && !isEntryPointFile(entry.name, isTopLevel)) {
+        if (exts.some((ext2) => entry.name.endsWith(ext2))) {
+          const content = fs8.readFileSync(fullPath, "utf-8");
+          const language = inferContentTypeFromFilePath(entry.name, defaultTs);
+          const baseName = entry.name.replace(/\.[^.]+$/, "");
+          const lockPath = path5.join(dirPath, baseName + ".lock");
+          let lock;
+          if (fs8.existsSync(lockPath)) {
+            lock = fs8.readFileSync(lockPath, "utf-8");
+          }
+          modules[relPath] = {
+            content,
+            language,
+            lock: lock ?? undefined
+          };
+        }
+      }
+    }
+  }
+  readDir2(moduleFolderPath, "");
+  if (Object.keys(modules).length === 0) {
+    return;
+  }
+  debug(`Found ${Object.keys(modules).length} module(s) in ${moduleFolderPath}`);
+  return modules;
+}
 async function createScript2(bundleContent, workspaceId, body, workspace) {
   const start = performance.now();
   if (!bundleContent) {
@@ -59061,7 +59154,8 @@ async function createScript2(bundleContent, workspaceId, body, workspace) {
   return performance.now() - start;
 }
 async function findContentFile(filePath) {
-  const candidates = filePath.endsWith("script.json") ? exts.map((x) => filePath.replace(".script.json", x)) : filePath.endsWith("script.lock") ? exts.map((x) => filePath.replace(".script.lock", x)) : exts.map((x) => filePath.replace(".script.yaml", x));
+  const isModuleFolderMeta = filePath.endsWith("/script.yaml") || filePath.endsWith("/script.json") || filePath.endsWith("/script.lock");
+  const candidates = isModuleFolderMeta ? exts.map((x) => filePath.replace(/\/script\.(yaml|json|lock)$/, "/script" + x)) : filePath.endsWith("script.json") ? exts.map((x) => filePath.replace(".script.json", x)) : filePath.endsWith("script.lock") ? exts.map((x) => filePath.replace(".script.lock", x)) : exts.map((x) => filePath.replace(".script.yaml", x));
   const validCandidates = (await Promise.all(candidates.map((x) => {
     return stat3(x).catch(() => {
       return;
@@ -59134,13 +59228,13 @@ function filePathExtensionFromContentType(language, defaultTs) {
     throw new Error("Invalid language: " + language);
   }
 }
-function removeExtensionToPath(path5) {
+function removeExtensionToPath(path6) {
   for (const ext2 of exts) {
-    if (path5.endsWith(ext2)) {
-      return path5.substring(0, path5.length - ext2.length);
+    if (path6.endsWith(ext2)) {
+      return path6.substring(0, path6.length - ext2.length);
     }
   }
-  throw new Error("Invalid extension: " + path5);
+  throw new Error("Invalid extension: " + path6);
 }
 async function list2(opts) {
   const workspace = await resolveWorkspace(opts);
@@ -59189,13 +59283,13 @@ async function resolve6(input) {
     throw e;
   }
 }
-async function run2(opts, path5) {
+async function run2(opts, path6) {
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
   const input = opts.data ? await resolve6(opts.data) : {};
   const id = await runScriptByPath({
     workspace: workspace.workspaceId,
-    path: path5,
+    path: path6,
     requestBody: input
   });
   if (!opts.silent) {
@@ -59287,12 +59381,12 @@ async function track_job(workspace, id) {
     info("Job appears to have completed, but no data can be retrieved");
   }
 }
-async function show(opts, path5) {
+async function show(opts, path6) {
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
   const s = await getScriptByPath({
     workspace: workspace.workspaceId,
-    path: path5
+    path: path6
   });
   info(colors.underline(s.path));
   if (s.description)
@@ -59300,12 +59394,12 @@ async function show(opts, path5) {
   info("");
   info(s.content);
 }
-async function get(opts, path5) {
+async function get(opts, path6) {
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
   const s = await getScriptByPath({
     workspace: workspace.workspaceId,
-    path: path5
+    path: path6
   });
   if (opts.json) {
     console.log(JSON.stringify(s));
@@ -59381,7 +59475,7 @@ async function generateMetadata(opts, scriptPath) {
   } else {
     const ignore = await ignoreF(opts);
     const elems = await elementsToMap(await FSFSElement(process.cwd(), codebases, false), (p, isD) => {
-      return !isD && !exts.some((ext2) => p.endsWith(ext2)) || ignore(p, isD) || isFlowPath(p) || isAppPath(p) || isRawAppPath(p);
+      return !isD && !exts.some((ext2) => p.endsWith(ext2)) || ignore(p, isD) || isFlowPath(p) || isAppPath(p) || isRawAppPath(p) || isScriptModulePath(p) && !isModuleEntryPoint(p);
     }, false, {});
     let hasAny = false;
     info("Generating metadata for all stale scripts:");
@@ -59430,6 +59524,9 @@ async function preview(opts, filePath) {
   const language = inferContentTypeFromFilePath(filePath, opts?.defaultTs);
   const content = await readFile5(filePath, "utf-8");
   const input = opts.data ? await resolve6(opts.data) : {};
+  const isFolderLayout = isModuleEntryPoint(filePath);
+  const moduleFolderPath = isFolderLayout ? path5.dirname(filePath) : filePath.substring(0, filePath.indexOf(".")) + getModuleFolderSuffix();
+  const modules = await readModulesFromDisk(moduleFolderPath, opts?.defaultTs, isFolderLayout);
   const codebase = language == "bun" ? findCodebase(filePath, codebases) : undefined;
   let bundledContent = undefined;
   let isTar = false;
@@ -59553,7 +59650,8 @@ async function preview(opts, filePath) {
         content,
         path: filePath.substring(0, filePath.indexOf(".")).replaceAll(SEP4, "/"),
         args: input,
-        language
+        language,
+        modules: modules ?? undefined
       }
     });
     if (opts.silent) {
@@ -59623,7 +59721,7 @@ var init_script = __esm(async () => {
 // src/commands/lint/lint.ts
 import { stat as stat4, readdir as readdir2 } from "node:fs/promises";
 import process12 from "node:process";
-import * as path5 from "node:path";
+import * as path6 from "node:path";
 import { sep as SEP5 } from "node:path";
 function normalizePath(p) {
   return p.replaceAll(SEP5, "/");
@@ -59682,7 +59780,7 @@ async function isLockResolved(lockValue, baseDir) {
   return true;
 }
 async function checkInlineFile(relativePath, baseDir) {
-  const fullPath = path5.join(baseDir, relativePath.trim());
+  const fullPath = path6.join(baseDir, relativePath.trim());
   try {
     const s = await stat4(fullPath);
     return s.size > 0;
@@ -59772,7 +59870,7 @@ async function checkRawAppRunnables(backendDir, rawAppYamlPath, defaultTs) {
       continue;
     const runnableId = fileName.replace(".yaml", "");
     processedIds.add(runnableId);
-    const filePath = path5.join(backendDir, fileName);
+    const filePath = path6.join(backendDir, fileName);
     let runnable;
     try {
       runnable = await yamlParseFile(filePath);
@@ -59790,7 +59888,7 @@ async function checkRawAppRunnables(backendDir, rawAppYamlPath, defaultTs) {
     }
     if (!language || !languageNeedsLock(language))
       continue;
-    const lockFile = path5.join(backendDir, `${runnableId}.lock`);
+    const lockFile = path6.join(backendDir, `${runnableId}.lock`);
     let hasLock = false;
     try {
       const s = await stat4(lockFile);
@@ -59837,7 +59935,7 @@ async function checkRawAppRunnables(backendDir, rawAppYamlPath, defaultTs) {
     }
     if (!languageNeedsLock(language))
       continue;
-    const lockFile = path5.join(backendDir, `${runnableId}.lock`);
+    const lockFile = path6.join(backendDir, `${runnableId}.lock`);
     let hasLock = false;
     try {
       const s = await stat4(lockFile);
@@ -59857,7 +59955,7 @@ async function checkRawAppRunnables(backendDir, rawAppYamlPath, defaultTs) {
 }
 async function checkMissingLocks(opts, directory) {
   const initialCwd = process12.cwd();
-  const targetDirectory = directory ? path5.resolve(initialCwd, directory) : process12.cwd();
+  const targetDirectory = directory ? path6.resolve(initialCwd, directory) : process12.cwd();
   const { ...syncOpts } = opts;
   const mergedOpts = await mergeConfigWithConfigFile(syncOpts);
   const ignore = await ignoreF(mergedOpts);
@@ -59881,19 +59979,19 @@ async function checkMissingLocks(opts, directory) {
     if (normalizedPath.endsWith("/flow.yaml") && normalizedPath.includes(flowSuffix + "/")) {
       flowYamls.push({
         normalizedPath,
-        fullPath: path5.join(targetDirectory, entry.path)
+        fullPath: path6.join(targetDirectory, entry.path)
       });
     }
     if (normalizedPath.endsWith("/app.yaml") && normalizedPath.includes(appSuffix + "/")) {
       appYamls.push({
         normalizedPath,
-        fullPath: path5.join(targetDirectory, entry.path)
+        fullPath: path6.join(targetDirectory, entry.path)
       });
     }
     if (normalizedPath.endsWith("/raw_app.yaml") && normalizedPath.includes(rawAppSuffix + "/")) {
       rawAppYamls.push({
         normalizedPath,
-        fullPath: path5.join(targetDirectory, entry.path)
+        fullPath: path6.join(targetDirectory, entry.path)
       });
     }
   }
@@ -59902,14 +60000,14 @@ async function checkMissingLocks(opts, directory) {
     let language = null;
     for (const ext2 of exts) {
       try {
-        await stat4(path5.join(targetDirectory, basePath + ext2));
+        await stat4(path6.join(targetDirectory, basePath + ext2));
         language = inferContentTypeFromFilePath(basePath + ext2, defaultTs);
         break;
       } catch {}
     }
     if (language && languageNeedsLock(language)) {
       try {
-        const metadata = await yamlParseFile(path5.join(targetDirectory, yamlPath));
+        const metadata = await yamlParseFile(path6.join(targetDirectory, yamlPath));
         const lockResolved = await isLockResolved(metadata?.lock, targetDirectory);
         if (!lockResolved) {
           issues.push({
@@ -59926,7 +60024,7 @@ async function checkMissingLocks(opts, directory) {
     }
   }
   for (const { normalizedPath: flowYamlPath, fullPath } of flowYamls) {
-    const flowDir = path5.dirname(fullPath);
+    const flowDir = path6.dirname(fullPath);
     try {
       const flowFile = await yamlParseFile(fullPath);
       if (!flowFile?.value?.modules)
@@ -59951,7 +60049,7 @@ async function checkMissingLocks(opts, directory) {
     }
   }
   for (const { normalizedPath: appYamlPath, fullPath } of appYamls) {
-    const appDir = path5.dirname(fullPath);
+    const appDir = path6.dirname(fullPath);
     try {
       const appFile = await yamlParseFile(fullPath);
       if (!appFile?.value)
@@ -59976,8 +60074,8 @@ async function checkMissingLocks(opts, directory) {
     }
   }
   for (const { normalizedPath: rawAppYamlPath, fullPath } of rawAppYamls) {
-    const rawAppDir = path5.dirname(fullPath);
-    const backendDir = path5.join(rawAppDir, "backend");
+    const rawAppDir = path6.dirname(fullPath);
+    const backendDir = path6.join(rawAppDir, "backend");
     try {
       await stat4(backendDir);
     } catch {
@@ -59994,7 +60092,7 @@ async function checkMissingLocks(opts, directory) {
 }
 async function runLint(opts, directory) {
   const initialCwd = process12.cwd();
-  const explicitTargetDirectory = directory ? path5.resolve(initialCwd, directory) : undefined;
+  const explicitTargetDirectory = directory ? path6.resolve(initialCwd, directory) : undefined;
   const { json: _json, ...syncOpts } = opts;
   const mergedOpts = await mergeConfigWithConfigFile(syncOpts);
   const targetDirectory = explicitTargetDirectory ?? process12.cwd();
@@ -60256,11 +60354,11 @@ async function list3(opts) {
     new Table2().header(["Path", "Resource Type"]).padding(2).border(true).body(total.map((x) => [x.path, x.resource_type])).render();
   }
 }
-async function newResource(opts, path6) {
-  if (!validatePath(path6)) {
+async function newResource(opts, path7) {
+  if (!validatePath(path7)) {
     return;
   }
-  const filePath = path6 + ".resource.yaml";
+  const filePath = path7 + ".resource.yaml";
   try {
     await stat5(filePath);
     throw new Error("File already exists: " + filePath);
@@ -60279,12 +60377,12 @@ async function newResource(opts, path6) {
   });
   info(colors.green(`Created ${filePath}`));
 }
-async function get2(opts, path6) {
+async function get2(opts, path7) {
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
   const r = await getResource({
     workspace: workspace.workspaceId,
-    path: path6
+    path: path7
   });
   if (opts.json) {
     console.log(JSON.stringify(r));
@@ -60436,11 +60534,11 @@ var init_path_assigner = __esm(() => {
 // windmill-utils-internal/src/inline-scripts/extractor.ts
 function extractRawscriptInline(id, summary, rawscript, mapping, separator, assigner) {
   const [basePath, ext2] = assigner.assignPath(summary ?? id, rawscript.language);
-  const path6 = mapping[id] ?? basePath + ext2;
+  const path7 = mapping[id] ?? basePath + ext2;
   const language = rawscript.language;
   const content = rawscript.content;
-  const r = [{ path: path6, content, language, is_lock: false }];
-  rawscript.content = "!inline " + path6.replaceAll(separator, "/");
+  const r = [{ path: path7, content, language, is_lock: false }];
+  rawscript.content = "!inline " + path7.replaceAll(separator, "/");
   const lock = rawscript.lock;
   if (lock && lock != "") {
     const lockPath = basePath + "lock";
@@ -60487,13 +60585,13 @@ async function replaceRawscriptInline(id, rawscript, fileReader, logger, separat
   if (!rawscript.content || !rawscript.content.startsWith("!inline")) {
     return;
   }
-  const path6 = rawscript.content.split(" ")[1];
-  const pathSuffix = path6.split(".").slice(1).join(".");
+  const path7 = rawscript.content.split(" ")[1];
+  const pathSuffix = path7.split(".").slice(1).join(".");
   const newPath = id + "." + pathSuffix;
   try {
-    rawscript.content = await fileReader(path6);
+    rawscript.content = await fileReader(path7);
   } catch {
-    logger.error(`Script file ${path6} not found`);
+    logger.error(`Script file ${path7} not found`);
     try {
       rawscript.content = await fileReader(newPath);
     } catch {
@@ -60501,7 +60599,7 @@ async function replaceRawscriptInline(id, rawscript, fileReader, logger, separat
     }
   }
   const lock = rawscript.lock;
-  if (removeLocks && removeLocks.includes(path6)) {
+  if (removeLocks && removeLocks.includes(path7)) {
     rawscript.lock = undefined;
   } else if (lock && typeof lock === "string" && lock.trimStart().startsWith("!inline ")) {
     const lockPath = lock.split(" ")[1];
@@ -60547,11 +60645,11 @@ async function replaceInlineScripts(modules, fileReader, logger = {
 }
 
 // src/commands/flow/flow_metadata.ts
-import * as path6 from "node:path";
+import * as path7 from "node:path";
 import { sep as SEP7 } from "node:path";
 import { readFile as readFile7 } from "node:fs/promises";
 async function generateFlowHash(rawWorkspaceDependencies, folder, defaultTs) {
-  const elems = await FSFSElement(path6.join(process.cwd(), folder), [], true);
+  const elems = await FSFSElement(path7.join(process.cwd(), folder), [], true);
   const hashes = {};
   for await (const f of elems.getChildren()) {
     if (exts.some((e) => f.path.endsWith(e))) {
@@ -60587,18 +60685,18 @@ async function generateFlowLockInternal(folder, dryRun, workspace, opts, justUpd
   }
   let changedScripts = [];
   if (!justUpdateMetadataLock) {
-    for (const [path7, hash2] of Object.entries(hashes)) {
-      if (path7 == TOP_HASH) {
+    for (const [path8, hash2] of Object.entries(hashes)) {
+      if (path8 == TOP_HASH) {
         continue;
       }
-      if (!await checkifMetadataUptodate(folder, hash2, conf, path7)) {
-        changedScripts.push(path7);
+      if (!await checkifMetadataUptodate(folder, hash2, conf, path8)) {
+        changedScripts.push(path8);
       }
     }
     if (!noStaleMessage) {
       info(`Recomputing locks of ${changedScripts.join(", ")} in ${folder}`);
     }
-    const fileReader = async (path7) => await readFile7(folder + SEP7 + path7, "utf-8");
+    const fileReader = async (path8) => await readFile7(folder + SEP7 + path8, "utf-8");
     await replaceInlineScripts(flowValue.value.modules, fileReader, exports_log, folder + SEP7, SEP7, changedScripts);
     if (flowValue.value.failure_module) {
       await replaceInlineScripts([flowValue.value.failure_module], fileReader, exports_log, folder + SEP7, SEP7, changedScripts);
@@ -60624,8 +60722,8 @@ async function generateFlowLockInternal(folder, dryRun, workspace, opts, justUpd
   }
   hashes = await generateFlowHash(filteredDeps, folder, opts.defaultTs);
   await clearGlobalLock(folder);
-  for (const [path7, hash2] of Object.entries(hashes)) {
-    await updateMetadataGlobalLock(folder, hash2, path7);
+  for (const [path8, hash2] of Object.entries(hashes)) {
+    await updateMetadataGlobalLock(folder, hash2, path8);
   }
   if (!noStaleMessage) {
     info(colors.green(`Flow ${remote_path} lockfiles updated`));
@@ -60740,7 +60838,7 @@ __export(exports_sync, {
   FSFSElement: () => FSFSElement
 });
 import { readFile as readFile8, writeFile as writeFile6, readdir as readdir4, stat as stat6, rm, copyFile, mkdir as mkdir3 } from "node:fs/promises";
-import * as path7 from "node:path";
+import * as path8 from "node:path";
 import { sep as SEP8 } from "node:path";
 function mergeCliWithEffectiveOptions(cliOpts, effectiveOpts) {
   return Object.assign({}, effectiveOpts, cliOpts);
@@ -60748,8 +60846,8 @@ function mergeCliWithEffectiveOptions(cliOpts, effectiveOpts) {
 async function resolveEffectiveSyncOptions(workspace, localConfig, promotion, branchOverride) {
   return await getEffectiveSettings(localConfig, promotion, false, false, branchOverride);
 }
-function findCodebase(path8, codebases) {
-  if (!path8.endsWith(".ts")) {
+function findCodebase(path9, codebases) {
+  if (!path9.endsWith(".ts")) {
     return;
   }
   for (const c of codebases) {
@@ -60765,7 +60863,7 @@ function findCodebase(path8, codebases) {
       if (included) {
         break;
       }
-      if (minimatch(path8, r)) {
+      if (minimatch(path9, r)) {
         included = true;
       }
     }
@@ -60773,7 +60871,7 @@ function findCodebase(path8, codebases) {
       c.excludes = [c.excludes];
     }
     for (const r of c.excludes ?? []) {
-      if (minimatch(path8, r)) {
+      if (minimatch(path9, r)) {
         excluded = true;
       }
     }
@@ -60782,13 +60880,13 @@ function findCodebase(path8, codebases) {
     }
   }
 }
-async function addCodebaseDigestIfRelevant(path8, content, codebases, ignoreCodebaseChanges) {
-  const isScript = path8.endsWith(".script.yaml");
+async function addCodebaseDigestIfRelevant(path9, content, codebases, ignoreCodebaseChanges) {
+  const isScript = path9.endsWith(".script.yaml");
   if (!isScript) {
     return content;
   }
   let isTs = true;
-  const replacedPath = path8.replace(".script.yaml", ".ts");
+  const replacedPath = path9.replace(".script.yaml", ".ts");
   try {
     await stat6(replacedPath);
   } catch {
@@ -60802,9 +60900,9 @@ async function addCodebaseDigestIfRelevant(path8, content, codebases, ignoreCode
     if (c) {
       let parsed;
       try {
-        parsed = yamlParseContent(path8, content);
+        parsed = yamlParseContent(path9, content);
       } catch (error2) {
-        error(`Failed to parse YAML content for codebase digest at path: ${path8}`);
+        error(`Failed to parse YAML content for codebase digest at path: ${path9}`);
         throw error2;
       }
       if (parsed && typeof parsed == "object") {
@@ -60816,7 +60914,7 @@ async function addCodebaseDigestIfRelevant(path8, content, codebases, ignoreCode
         parsed["lock"] = "";
         return import_yaml10.stringify(parsed, yamlOptions);
       } else {
-        throw Error(`Expected local yaml ${path8} to be an object, found: ${content} instead`);
+        throw Error(`Expected local yaml ${path9} to be an object, found: ${content} instead`);
       }
     }
   }
@@ -60833,7 +60931,7 @@ async function FSFSElement(p, codebases, ignoreCodebaseChanges) {
         try {
           const entries = await readdir4(localP, { withFileTypes: true });
           for (const e of entries) {
-            yield _internal_element(path7.join(localP, e.name), e.isDirectory(), codebases2);
+            yield _internal_element(path8.join(localP, e.name), e.isDirectory(), codebases2);
           }
         } catch (e) {
           warn(`Error reading dir: ${localP}, ${e}`);
@@ -61071,6 +61169,24 @@ async function findFilesetResourceFile(changePath) {
   throw new Error(`No resource metadata file found for fileset resource: ${changePath}`);
 }
 function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, resourceTypeToIsFileset, ignoreCodebaseChanges) {
+  let _moduleScriptPaths = null;
+  async function getModuleScriptPaths() {
+    if (_moduleScriptPaths === null) {
+      _moduleScriptPaths = new Set;
+      for (const filename in zip.files) {
+        if (filename.endsWith(".script.json") && !zip.files[filename].dir) {
+          try {
+            const content = await zip.files[filename].async("text");
+            const parsed = JSON.parse(content);
+            if (parsed.modules && Object.keys(parsed.modules).length > 0) {
+              _moduleScriptPaths.add(filename.slice(0, -".script.json".length));
+            }
+          } catch {}
+        }
+      }
+    }
+    return _moduleScriptPaths;
+  }
   async function _internal_file(p, f) {
     const kind = isFlowMetadataFile(p) ? "flow" : isAppMetadataFile(p) ? "app" : isRawAppMetadataFile(p) ? "raw_app" : p.endsWith(".script.json") ? "script" : p.endsWith(".resource.json") ? "resource" : p.startsWith("dependencies/") ? "dependencies" : "other";
     const isJson = p.endsWith(".json");
@@ -61087,7 +61203,20 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
         return useYaml && isJson ? p.replaceAll(".json", ".yaml") : p;
       }
     }
-    const finalPath = transformPath();
+    let finalPath = transformPath();
+    if (kind == "other" && exts.some((ext2) => p.endsWith(ext2))) {
+      const normalizedP = p.replace(/^\.[\\/]/, "");
+      const moduleScripts = await getModuleScriptPaths();
+      for (const basePath of moduleScripts) {
+        if (normalizedP.startsWith(basePath + ".")) {
+          const ext2 = normalizedP.slice(basePath.length);
+          const dir = path8.dirname(finalPath);
+          const base = path8.basename(basePath);
+          finalPath = path8.join(dir, base + getModuleFolderSuffix(), "script" + ext2);
+          break;
+        }
+      }
+    }
     const r = [
       {
         isDirectory: kind == "flow" || kind == "app" || kind == "raw_app",
@@ -61118,7 +61247,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
             for (const s of inlineScripts) {
               yield {
                 isDirectory: false,
-                path: path7.join(finalPath, s.path),
+                path: path8.join(finalPath, s.path),
                 async* getChildren() {},
                 async getContentText() {
                   return s.content;
@@ -61127,7 +61256,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
             }
             yield {
               isDirectory: false,
-              path: path7.join(finalPath, "flow.yaml"),
+              path: path8.join(finalPath, "flow.yaml"),
               async* getChildren() {},
               async getContentText() {
                 return import_yaml10.stringify(flow, yamlOptions);
@@ -61151,7 +61280,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
             for (const s of inlineScripts) {
               yield {
                 isDirectory: false,
-                path: path7.join(finalPath, s.path),
+                path: path8.join(finalPath, s.path),
                 async* getChildren() {},
                 async getContentText() {
                   return s.content;
@@ -61164,7 +61293,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
             app.policy = undefined;
             yield {
               isDirectory: false,
-              path: path7.join(finalPath, "app.yaml"),
+              path: path8.join(finalPath, "app.yaml"),
               async* getChildren() {},
               async getContentText() {
                 return import_yaml10.stringify(app, yamlOptions);
@@ -61219,7 +61348,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
                 }
                 yield {
                   isDirectory: false,
-                  path: path7.join(finalPath, filePath.substring(1)),
+                  path: path8.join(finalPath, filePath.substring(1)),
                   async* getChildren() {},
                   async getContentText() {
                     if (typeof content !== "string") {
@@ -61236,7 +61365,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
             for (const s of inlineScripts) {
               yield {
                 isDirectory: false,
-                path: path7.join(finalPath, APP_BACKEND_FOLDER, s.path),
+                path: path8.join(finalPath, APP_BACKEND_FOLDER, s.path),
                 async* getChildren() {},
                 async getContentText() {
                   return s.content;
@@ -61272,7 +61401,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
               }
               yield {
                 isDirectory: false,
-                path: path7.join(finalPath, APP_BACKEND_FOLDER, `${runnableId}.yaml`),
+                path: path8.join(finalPath, APP_BACKEND_FOLDER, `${runnableId}.yaml`),
                 async* getChildren() {},
                 async getContentText() {
                   return import_yaml10.stringify(simplifiedRunnable, yamlOptions);
@@ -61286,7 +61415,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
             delete rawApp?.["value"];
             yield {
               isDirectory: false,
-              path: path7.join(finalPath, "raw_app.yaml"),
+              path: path8.join(finalPath, "raw_app.yaml"),
               async* getChildren() {},
               async getContentText() {
                 return import_yaml10.stringify(rawApp, yamlOptions);
@@ -61294,7 +61423,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
             };
             yield {
               isDirectory: false,
-              path: path7.join(finalPath, "DATATABLES.md"),
+              path: path8.join(finalPath, "DATATABLES.md"),
               async* getChildren() {},
               async getContentText() {
                 return generateDatatablesDocumentation(data3);
@@ -61312,8 +61441,14 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
               error(`Failed to parse script.yaml at path: ${p}`);
               throw error2;
             }
+            const hasModules = parsed["modules"] && Object.keys(parsed["modules"]).length > 0;
             if (parsed["lock"] && parsed["lock"] != "" && parsed["codebase"] == undefined) {
-              parsed["lock"] = "!inline " + removeSuffix(p.replaceAll(SEP8, "/"), ".json") + ".lock";
+              if (hasModules) {
+                const scriptBase = removeSuffix(removeSuffix(p.replaceAll(SEP8, "/"), ".json"), ".script");
+                parsed["lock"] = "!inline " + scriptBase + getModuleFolderSuffix() + "/script.lock";
+              } else {
+                parsed["lock"] = "!inline " + removeSuffix(p.replaceAll(SEP8, "/"), ".json") + ".lock";
+              }
             } else if (parsed["lock"] == "") {
               parsed["lock"] = "";
             } else {
@@ -61322,6 +61457,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
             if (ignoreCodebaseChanges && parsed["codebase"]) {
               parsed["codebase"] = undefined;
             }
+            delete parsed["modules"];
             return useYaml ? import_yaml10.stringify(parsed, yamlOptions) : JSON.stringify(parsed, null, 2);
           }
           if (kind == "resource") {
@@ -61364,16 +61500,56 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
         throw error2;
       }
       const lock = parsed["lock"];
+      const scriptModules = parsed["modules"];
+      const hasModules = scriptModules && Object.keys(scriptModules).length > 0;
+      const metaExt = useYaml ? ".yaml" : ".json";
+      const scriptBasePath = removeSuffix(removeSuffix(finalPath, metaExt), ".script");
+      const moduleFolderPath = scriptBasePath + getModuleFolderSuffix();
+      if (hasModules) {
+        r[0].path = path8.join(moduleFolderPath, "script" + metaExt);
+      }
       if (lock && lock != "") {
         r.push({
           isDirectory: false,
-          path: removeSuffix(finalPath, ".json") + ".lock",
+          path: hasModules ? path8.join(moduleFolderPath, "script.lock") : removeSuffix(finalPath, metaExt) + ".lock",
           async* getChildren() {},
           async getContentText() {
             return lock;
           }
         });
       }
+      if (hasModules) {
+        r.push({
+          isDirectory: true,
+          path: moduleFolderPath,
+          async* getChildren() {
+            for (const [relPath, mod] of Object.entries(scriptModules)) {
+              yield {
+                isDirectory: false,
+                path: path8.join(moduleFolderPath, relPath),
+                async* getChildren() {},
+                async getContentText() {
+                  return mod.content;
+                }
+              };
+              if (mod.lock) {
+                const baseName = relPath.replace(/\.[^.]+$/, "");
+                yield {
+                  isDirectory: false,
+                  path: path8.join(moduleFolderPath, baseName + ".lock"),
+                  async* getChildren() {},
+                  async getContentText() {
+                    return mod.lock;
+                  }
+                };
+              }
+            }
+          },
+          async getContentText() {
+            throw new Error("Cannot get content of directory");
+          }
+        });
+      }
     }
     if (kind == "resource") {
       const content = await f.async("text");
@@ -61397,7 +61573,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
               if (typeof fileContent === "string") {
                 yield {
                   isDirectory: false,
-                  path: path7.join(filesetBasePath, relPath),
+                  path: path8.join(filesetBasePath, relPath),
                   async* getChildren() {},
                   async getContentText() {
                     return fileContent;
@@ -61433,7 +61609,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, re
       async* getChildren() {
         for (const filename in zip2.files) {
           const file = zip2.files[filename];
-          const totalPath = path7.join(p, filename);
+          const totalPath = path8.join(p, filename);
           if (file.dir) {
             const e = zip2.folder(file.name);
             yield _internal_folder(totalPath, e);
@@ -61492,11 +61668,15 @@ async function elementsToMap(els, ignore, json, skips, specificItems, branchOver
     if (entry.isDirectory || entry.ignored) {
       continue;
     }
-    const path8 = entry.path;
-    if (!isFileResource(path8) && !isFilesetResource(path8) && !isRawAppFile(path8) && !isWorkspaceDependencies(path8)) {
-      if (json && path8.endsWith(".yaml"))
+    const path9 = entry.path;
+    if (isScriptModulePath(path9)) {
+      map[path9] = await entry.getContentText();
+      continue;
+    }
+    if (!isFileResource(path9) && !isFilesetResource(path9) && !isRawAppFile(path9) && !isWorkspaceDependencies(path9)) {
+      if (json && path9.endsWith(".yaml"))
         continue;
-      if (!json && path8.endsWith(".json"))
+      if (!json && path9.endsWith(".json"))
         continue;
       if (![
         "json",
@@ -61517,39 +61697,39 @@ async function elementsToMap(els, ignore, json, skips, specificItems, branchOver
         "nu",
         "java",
         "rb"
-      ].includes(path8.split(".").pop() ?? "")) {
+      ].includes(path9.split(".").pop() ?? "")) {
         continue;
       }
     }
-    if (isRawAppFile(path8)) {
-      const suffix = path8.split(getFolderSuffix("raw_app") + SEP8).pop();
+    if (isRawAppFile(path9)) {
+      const suffix = path9.split(getFolderSuffix("raw_app") + SEP8).pop();
       if (suffix?.startsWith("dist/") || suffix == "wmill.d.ts" || suffix == "package-lock.json" || suffix == "DATATABLES.md") {
         continue;
       }
     }
-    if (skips.skipResources && (isFileResource(path8) || isFilesetResource(path8)))
+    if (skips.skipResources && (isFileResource(path9) || isFilesetResource(path9)))
       continue;
     const ext2 = json ? ".json" : ".yaml";
-    if (!skips.includeSchedules && path8.endsWith(".schedule" + ext2))
+    if (!skips.includeSchedules && path9.endsWith(".schedule" + ext2))
       continue;
-    if (!skips.includeTriggers && (path8.endsWith(".http_trigger" + ext2) || path8.endsWith(".websocket_trigger" + ext2) || path8.endsWith(".kafka_trigger" + ext2) || path8.endsWith(".nats_trigger" + ext2) || path8.endsWith(".postgres_trigger" + ext2) || path8.endsWith(".mqtt_trigger" + ext2) || path8.endsWith(".sqs_trigger" + ext2) || path8.endsWith(".gcp_trigger" + ext2) || path8.endsWith(".email_trigger" + ext2) || path8.endsWith("_native_trigger" + ext2))) {
+    if (!skips.includeTriggers && (path9.endsWith(".http_trigger" + ext2) || path9.endsWith(".websocket_trigger" + ext2) || path9.endsWith(".kafka_trigger" + ext2) || path9.endsWith(".nats_trigger" + ext2) || path9.endsWith(".postgres_trigger" + ext2) || path9.endsWith(".mqtt_trigger" + ext2) || path9.endsWith(".sqs_trigger" + ext2) || path9.endsWith(".gcp_trigger" + ext2) || path9.endsWith(".email_trigger" + ext2) || path9.endsWith("_native_trigger" + ext2))) {
       continue;
     }
-    if (!skips.includeUsers && path8.endsWith(".user" + ext2))
+    if (!skips.includeUsers && path9.endsWith(".user" + ext2))
       continue;
-    if (!skips.includeGroups && path8.endsWith(".group" + ext2))
+    if (!skips.includeGroups && path9.endsWith(".group" + ext2))
       continue;
-    if (!skips.includeSettings && path8 === "settings" + ext2)
+    if (!skips.includeSettings && path9 === "settings" + ext2)
       continue;
-    if (!skips.includeKey && path8 === "encryption_key")
+    if (!skips.includeKey && path9 === "encryption_key")
       continue;
-    if (skips.skipResources && path8.endsWith(".resource" + ext2))
+    if (skips.skipResources && path9.endsWith(".resource" + ext2))
       continue;
-    if (skips.skipResourceTypes && path8.endsWith(".resource-type" + ext2)) {
+    if (skips.skipResourceTypes && path9.endsWith(".resource-type" + ext2)) {
       continue;
     }
     try {
-      const fileType = getTypeStrFromPath(path8);
+      const fileType = getTypeStrFromPath(path9);
       if (skips.skipVariables && fileType === "variable")
         continue;
       if (skips.skipScripts && fileType === "script")
@@ -61563,27 +61743,27 @@ async function elementsToMap(els, ignore, json, skips, specificItems, branchOver
       if (skips.skipWorkspaceDependencies && fileType === "workspace_dependencies")
         continue;
     } catch {}
-    if (specificItems && isBranchSpecificFile(path8)) {
-      if (!isCurrentBranchFile(path8, cachedBranch)) {
+    if (specificItems && isBranchSpecificFile(path9)) {
+      if (!isCurrentBranchFile(path9, cachedBranch)) {
         continue;
       }
     }
     const content = await entry.getContentText();
-    if (skips.skipSecrets && path8.endsWith(".variable" + ext2)) {
+    if (skips.skipSecrets && path9.endsWith(".variable" + ext2)) {
       try {
         let o;
         if (json) {
           try {
             o = JSON.parse(content);
           } catch (error2) {
-            error(`Failed to parse JSON variable content at path: ${path8}`);
+            error(`Failed to parse JSON variable content at path: ${path9}`);
             throw error2;
           }
         } else {
           try {
-            o = yamlParseContent(path8, content);
+            o = yamlParseContent(path9, content);
           } catch (error2) {
-            error(`Failed to parse YAML variable content at path: ${path8}`);
+            error(`Failed to parse YAML variable content at path: ${path9}`);
             throw error2;
           }
         }
@@ -61591,12 +61771,12 @@ async function elementsToMap(els, ignore, json, skips, specificItems, branchOver
           continue;
         }
       } catch (e) {
-        warn(`Error reading variable ${path8} to check for secrets`);
+        warn(`Error reading variable ${path9} to check for secrets`);
       }
     }
-    if (cachedBranch && isCurrentBranchFile(path8, cachedBranch)) {
+    if (cachedBranch && isCurrentBranchFile(path9, cachedBranch)) {
       const currentBranch = cachedBranch;
-      const basePath = fromBranchSpecificPath(path8, currentBranch);
+      const basePath = fromBranchSpecificPath(path9, currentBranch);
       if (!isItemTypeConfigured(basePath, specificItems)) {
         continue;
       }
@@ -61605,14 +61785,14 @@ async function elementsToMap(els, ignore, json, skips, specificItems, branchOver
       }
       map[basePath] = content;
       processedBasePaths.add(basePath);
-    } else if (!isBranchSpecificFile(path8)) {
-      if (processedBasePaths.has(path8)) {
+    } else if (!isBranchSpecificFile(path9)) {
+      if (processedBasePaths.has(path9)) {
         continue;
       }
-      if (!isRemote && isSpecificItem(path8, specificItems)) {
+      if (!isRemote && isSpecificItem(path9, specificItems)) {
         continue;
       }
-      map[path8] = content;
+      map[path9] = content;
     }
   }
   return map;
@@ -61869,6 +62049,31 @@ async function addToChangedIfNotExists(p, tracker) {
       if (!tracker.rawApps.includes(folder)) {
         tracker.rawApps.push(folder);
       }
+    } else if (isScriptModulePath(p)) {
+      if (isModuleEntryPoint(p)) {
+        if (!tracker.scripts.includes(p)) {
+          tracker.scripts.push(p);
+        }
+      } else {
+        const moduleSuffix = getModuleFolderSuffix() + "/";
+        const idx = p.indexOf(moduleSuffix);
+        if (idx !== -1) {
+          const scriptBasePath = p.substring(0, idx);
+          try {
+            const contentPath = await findContentFile(scriptBasePath + getModuleFolderSuffix() + "/script.yaml");
+            if (contentPath && !tracker.scripts.includes(contentPath)) {
+              tracker.scripts.push(contentPath);
+            }
+          } catch {
+            try {
+              const contentPath = await findContentFile(scriptBasePath + ".script.yaml");
+              if (contentPath && !tracker.scripts.includes(contentPath)) {
+                tracker.scripts.push(contentPath);
+              }
+            } catch {}
+          }
+        }
+      }
     } else {
       if (!tracker.scripts.includes(p)) {
         tracker.scripts.push(p);
@@ -61899,6 +62104,29 @@ async function buildTracker(changes) {
   }
   return tracker;
 }
+async function pushParentScriptForModule(modulePath, workspace, alreadySynced, message, opts, rawWorkspaceDependencies, codebases) {
+  const moduleSuffix = getModuleFolderSuffix() + "/";
+  const idx = modulePath.indexOf(moduleSuffix);
+  if (idx === -1)
+    return;
+  const scriptBasePath = modulePath.substring(0, idx);
+  const moduleFolderPath = scriptBasePath + getModuleFolderSuffix();
+  try {
+    const entryPoint = await findContentFile(moduleFolderPath + "/script.yaml");
+    if (entryPoint) {
+      await handleFile(entryPoint, workspace, alreadySynced, message, opts, rawWorkspaceDependencies, codebases);
+      return;
+    }
+  } catch {}
+  try {
+    const contentPath = await findContentFile(scriptBasePath + ".script.yaml");
+    if (contentPath) {
+      await handleFile(contentPath, workspace, alreadySynced, message, opts, rawWorkspaceDependencies, codebases);
+    }
+  } catch {
+    debug(`Could not find parent script for module: ${modulePath}`);
+  }
+}
 async function pull(opts) {
   const originalCliOpts = { ...opts };
   opts = await mergeConfigWithConfigFile(opts);
@@ -61912,7 +62140,7 @@ async function pull(opts) {
     throw error2;
   }
   if (opts.stateful) {
-    await mkdir3(path7.join(process.cwd(), ".wmill"), { recursive: true });
+    await mkdir3(path8.join(process.cwd(), ".wmill"), { recursive: true });
   }
   const workspace = await resolveWorkspace(opts, opts.branch);
   await requireLogin(opts);
@@ -61933,7 +62161,7 @@ async function pull(opts) {
   } catch {}
   const zipFile = await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipResourceTypes, opts.skipSecrets, opts.includeSchedules, opts.includeTriggers, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.skipWorkspaceDependencies, opts.defaultTs);
   const remote = ZipFSElement(zipFile, !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension, resourceTypeToIsFileset, true);
-  const local = !opts.stateful ? await FSFSElement(process.cwd(), codebases, true) : await FSFSElement(path7.join(process.cwd(), ".wmill"), [], true);
+  const local = !opts.stateful ? await FSFSElement(process.cwd(), codebases, true) : await FSFSElement(path8.join(process.cwd(), ".wmill"), [], true);
   const changes = await compareDynFSElement(remote, local, await ignoreF(opts), opts.json ?? false, opts, false, codebases, true, specificItems, opts.branch, true);
   info(`remote (${workspace.name}) -> local: ${changes.length} changes to apply`);
   if (opts.dryRun && opts.jsonOutput) {
@@ -61977,8 +62205,8 @@ async function pull(opts) {
           targetPath = branchSpecificPath;
         }
       }
-      const target = path7.join(process.cwd(), targetPath);
-      const stateTarget = path7.join(process.cwd(), ".wmill", targetPath);
+      const target = path8.join(process.cwd(), targetPath);
+      const stateTarget = path8.join(process.cwd(), ".wmill", targetPath);
       if (change.name === "edited") {
         if (opts.stateful) {
           try {
@@ -62011,13 +62239,13 @@ Both local and remote have been modified.`));
         }
         await writeFile6(target, change.after, "utf-8");
         if (opts.stateful) {
-          await mkdir3(path7.dirname(stateTarget), { recursive: true });
+          await mkdir3(path8.dirname(stateTarget), { recursive: true });
           await copyFile(target, stateTarget);
         }
       } else if (change.name === "added") {
-        await mkdir3(path7.dirname(target), { recursive: true });
+        await mkdir3(path8.dirname(target), { recursive: true });
         if (opts.stateful) {
-          await mkdir3(path7.dirname(stateTarget), { recursive: true });
+          await mkdir3(path8.dirname(stateTarget), { recursive: true });
           info(`Adding ${getTypeStrFromPath(change.path)} ${targetPath}${targetPath !== change.path ? colors.gray(` (branch-specific override for ${change.path})`) : ""}`);
         }
         await writeFile6(target, change.content, "utf-8");
@@ -62199,7 +62427,7 @@ Push aborted: ${lockIssues.length} script(s) missing locks.`));
     resourceTypeToIsFileset = parsed.filesetMap;
   } catch {}
   const remote = ZipFSElement(await downloadZip(workspace, opts.plainSecrets, opts.skipVariables, opts.skipResources, opts.skipResourceTypes, opts.skipSecrets, opts.includeSchedules, opts.includeTriggers, opts.includeUsers, opts.includeGroups, opts.includeSettings, opts.includeKey, opts.skipWorkspaceDependencies, opts.defaultTs), !opts.json, opts.defaultTs ?? "bun", resourceTypeToFormatExtension, resourceTypeToIsFileset, false);
-  const local = await FSFSElement(path7.join(process.cwd(), ""), codebases, false);
+  const local = await FSFSElement(path8.join(process.cwd(), ""), codebases, false);
   const changes = await compareDynFSElement(local, remote, await ignoreF(opts), opts.json ?? false, opts, true, codebases, false, specificItems, opts.branch, false);
   const rawWorkspaceDependencies = await getRawWorkspaceDependencies();
   const tracker = await buildTracker(changes);
@@ -62265,7 +62493,7 @@ Push aborted: ${lockIssues.length} script(s) missing locks.`));
     }
     for (const folderName of folderNames) {
       try {
-        await stat6(path7.join("f", folderName, "folder.meta.yaml"));
+        await stat6(path8.join("f", folderName, "folder.meta.yaml"));
       } catch {
         missingFolders.push(folderName);
       }
@@ -62327,7 +62555,7 @@ ${folderList}
     let stateful = opts.stateful;
     if (stateful) {
       try {
-        await stat6(path7.join(process.cwd(), ".wmill"));
+        await stat6(path8.join(process.cwd(), ".wmill"));
       } catch {
         stateful = false;
       }
@@ -62371,7 +62599,7 @@ ${folderList}
             let stateTarget = undefined;
             if (stateful) {
               try {
-                stateTarget = path7.join(process.cwd(), ".wmill", change.path);
+                stateTarget = path8.join(process.cwd(), ".wmill", change.path);
                 await stat6(stateTarget);
               } catch {
                 stateTarget = undefined;
@@ -62388,9 +62616,15 @@ ${folderList}
                   await writeFile6(stateTarget, change.after, "utf-8");
                 }
                 continue;
+              } else if (isScriptModulePath(change.path)) {
+                await pushParentScriptForModule(change.path, workspace, alreadySynced, opts.message, opts, rawWorkspaceDependencies, codebases);
+                if (stateTarget) {
+                  await writeFile6(stateTarget, change.after, "utf-8");
+                }
+                continue;
               }
               if (stateTarget) {
-                await mkdir3(path7.dirname(stateTarget), { recursive: true });
+                await mkdir3(path8.dirname(stateTarget), { recursive: true });
                 info(`Editing ${getTypeStrFromPath(change.path)} ${change.path}`);
               }
               if (isFileResource(change.path)) {
@@ -62442,9 +62676,12 @@ ${folderList}
                 continue;
               } else if (await handleFile(change.path, workspace, alreadySynced, opts.message, opts, rawWorkspaceDependencies, codebases)) {
                 continue;
+              } else if (isScriptModulePath(change.path)) {
+                await pushParentScriptForModule(change.path, workspace, alreadySynced, opts.message, opts, rawWorkspaceDependencies, codebases);
+                continue;
               }
               if (stateTarget) {
-                await mkdir3(path7.dirname(stateTarget), { recursive: true });
+                await mkdir3(path8.dirname(stateTarget), { recursive: true });
                 info(`Adding ${getTypeStrFromPath(change.path)} ${change.path}`);
               }
               const obj = parseFromPath(change.path, change.content);
@@ -62463,6 +62700,10 @@ ${folderList}
               if (change.path.endsWith(".lock")) {
                 continue;
               }
+              if (isScriptModulePath(change.path)) {
+                await pushParentScriptForModule(change.path, workspace, alreadySynced, opts.message, opts, rawWorkspaceDependencies, codebases);
+                continue;
+              }
               const typ = getTypeStrFromPath(change.path);
               if (typ == "script") {
                 info(`Archiving ${typ} ${change.path}`);
@@ -62721,6 +62962,9 @@ var import_yaml10, yamlOptions, isNotWmillFile = (p, isDirectory2) => {
   if (isDirectory2) {
     return !p.startsWith("u" + SEP8) && !p.startsWith("f" + SEP8) && !p.startsWith("g" + SEP8) && !p.startsWith("users" + SEP8) && !p.startsWith("groups" + SEP8) && !p.startsWith("dependencies" + SEP8);
   }
+  if (isScriptModulePath(p)) {
+    return false;
+  }
   try {
     const typ = getTypeStrFromPath(p);
     if (typ == "resource-type" || typ == "settings" || typ == "encryption_key") {
@@ -62773,7 +63017,7 @@ var init_sync = __esm(async () => {
     aliasDuplicateObjects: false,
     singleQuote: true
   };
-  command6 = new Command().description("sync local with a remote workspaces or the opposite (push or pull)").action(() => info("2 actions available, pull and push. Use -h to display help.")).command("pull").description("Pull any remote changes and apply them locally.").option("--yes", "Pull without needing confirmation").option("--dry-run", "Show changes that would be pulled without actually pushing").option("--plain-secrets", "Pull secrets as plain text").option("--json", "Use JSON instead of YAML").option("--skip-variables", "Skip syncing variables (including secrets)").option("--skip-secrets", "Skip syncing only secrets variables").option("--skip-resources", "Skip syncing  resources").option("--skip-resource-types", "Skip syncing  resource types").option("--skip-scripts", "Skip syncing scripts").option("--skip-flows", "Skip syncing flows").option("--skip-apps", "Skip syncing apps").option("--skip-folders", "Skip syncing folders").option("--skip-workspace-dependencies", "Skip syncing workspace dependencies").option("--include-schedules", "Include syncing  schedules").option("--include-triggers", "Include syncing triggers").option("--include-users", "Include syncing users").option("--include-groups", "Include syncing groups").option("--include-settings", "Include syncing workspace settings").option("--include-key", "Include workspace encryption key").option("--skip-branch-validation", "Skip git branch validation and prompts").option("--json-output", "Output results in JSON format").option("-i --includes <patterns:file[]>", "Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string). Overrides wmill.yaml includes").option("-e --excludes <patterns:file[]>", "Comma separated patterns to specify which file to NOT take into account. Overrides wmill.yaml excludes").option("--extra-includes <patterns:file[]>", "Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string). Useful to still take wmill.yaml into account and act as a second pattern to satisfy").option("--repository <repo:string>", "Specify repository path (e.g., u/user/repo) when multiple repositories exist").option("--promotion <branch:string>", "Use promotionOverrides from the specified branch instead of regular overrides").option("--branch <branch:string>", "Override the current git branch (works even outside a git repository)").action(pull).command("push").description("Push any local changes and apply them remotely.").option("--yes", "Push without needing confirmation").option("--dry-run", "Show changes that would be pushed without actually pushing").option("--plain-secrets", "Push secrets as plain text").option("--json", "Use JSON instead of YAML").option("--skip-variables", "Skip syncing variables (including secrets)").option("--skip-secrets", "Skip syncing only secrets variables").option("--skip-resources", "Skip syncing  resources").option("--skip-resource-types", "Skip syncing  resource types").option("--skip-scripts", "Skip syncing scripts").option("--skip-flows", "Skip syncing flows").option("--skip-apps", "Skip syncing apps").option("--skip-folders", "Skip syncing folders").option("--skip-workspace-dependencies", "Skip syncing workspace dependencies").option("--include-schedules", "Include syncing schedules").option("--include-triggers", "Include syncing triggers").option("--include-users", "Include syncing users").option("--include-groups", "Include syncing groups").option("--include-settings", "Include syncing workspace settings").option("--include-key", "Include workspace encryption key").option("--skip-branch-validation", "Skip git branch validation and prompts").option("--json-output", "Output results in JSON format").option("-i --includes <patterns:file[]>", "Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string)").option("-e --excludes <patterns:file[]>", "Comma separated patterns to specify which file to NOT take into account.").option("--extra-includes <patterns:file[]>", "Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string). Useful to still take wmill.yaml into account and act as a second pattern to satisfy").option("--message <message:string>", "Include a message that will be added to all scripts/flows/apps updated during this push").option("--parallel <number>", "Number of changes to process in parallel").option("--repository <repo:string>", "Specify repository path (e.g., u/user/repo) when multiple repositories exist").option("--branch <branch:string>", "Override the current git branch (works even outside a git repository)").option("--lint", "Run lint validation before pushing").option("--locks-required", "Fail if scripts or flow inline scripts that need locks have no locks").action(push3);
+  command6 = new Command().description("sync local with a remote workspaces or the opposite (push or pull)").action(() => info("2 actions available, pull and push. Use -h to display help.")).command("pull").description("Pull any remote changes and apply them locally.").option("--yes", "Pull without needing confirmation").option("--dry-run", "Show changes that would be pulled without actually pushing").option("--plain-secrets", "Pull secrets as plain text").option("--json", "Use JSON instead of YAML").option("--skip-variables", "Skip syncing variables (including secrets)").option("--skip-secrets", "Skip syncing only secrets variables").option("--skip-resources", "Skip syncing  resources").option("--skip-resource-types", "Skip syncing  resource types").option("--skip-scripts", "Skip syncing scripts").option("--skip-flows", "Skip syncing flows").option("--skip-apps", "Skip syncing apps").option("--skip-folders", "Skip syncing folders").option("--skip-workspace-dependencies", "Skip syncing workspace dependencies").option("--include-schedules", "Include syncing  schedules").option("--include-triggers", "Include syncing triggers").option("--include-users", "Include syncing users").option("--include-groups", "Include syncing groups").option("--include-settings", "Include syncing workspace settings").option("--include-key", "Include workspace encryption key").option("--skip-branch-validation", "Skip git branch validation and prompts").option("--json-output", "Output results in JSON format").option("-i --includes <patterns:file[]>", "Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string). Overrides wmill.yaml includes").option("-e --excludes <patterns:file[]>", "Comma separated patterns to specify which file to NOT take into account. Overrides wmill.yaml excludes").option("--extra-includes <patterns:file[]>", "Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string). Useful to still take wmill.yaml into account and act as a second pattern to satisfy").option("--repository <repo:string>", "Specify repository path (e.g., u/user/repo) when multiple repositories exist").option("--promotion <branch:string>", "Use promotionOverrides from the specified branch instead of regular overrides").option("--branch, --env <branch:string>", "Override the current git branch/environment (works even outside a git repository)").action(pull).command("push").description("Push any local changes and apply them remotely.").option("--yes", "Push without needing confirmation").option("--dry-run", "Show changes that would be pushed without actually pushing").option("--plain-secrets", "Push secrets as plain text").option("--json", "Use JSON instead of YAML").option("--skip-variables", "Skip syncing variables (including secrets)").option("--skip-secrets", "Skip syncing only secrets variables").option("--skip-resources", "Skip syncing  resources").option("--skip-resource-types", "Skip syncing  resource types").option("--skip-scripts", "Skip syncing scripts").option("--skip-flows", "Skip syncing flows").option("--skip-apps", "Skip syncing apps").option("--skip-folders", "Skip syncing folders").option("--skip-workspace-dependencies", "Skip syncing workspace dependencies").option("--include-schedules", "Include syncing schedules").option("--include-triggers", "Include syncing triggers").option("--include-users", "Include syncing users").option("--include-groups", "Include syncing groups").option("--include-settings", "Include syncing workspace settings").option("--include-key", "Include workspace encryption key").option("--skip-branch-validation", "Skip git branch validation and prompts").option("--json-output", "Output results in JSON format").option("-i --includes <patterns:file[]>", "Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string)").option("-e --excludes <patterns:file[]>", "Comma separated patterns to specify which file to NOT take into account.").option("--extra-includes <patterns:file[]>", "Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string). Useful to still take wmill.yaml into account and act as a second pattern to satisfy").option("--message <message:string>", "Include a message that will be added to all scripts/flows/apps updated during this push").option("--parallel <number>", "Number of changes to process in parallel").option("--repository <repo:string>", "Specify repository path (e.g., u/user/repo) when multiple repositories exist").option("--branch, --env <branch:string>", "Override the current git branch/environment (works even outside a git repository)").option("--lint", "Run lint validation before pushing").option("--locks-required", "Fail if scripts or flow inline scripts that need locks have no locks").action(push3);
   sync_default = command6;
 });
 
@@ -63004,7 +63248,8 @@ __export(exports_metadata, {
 });
 import { sep as SEP9 } from "node:path";
 import { readFile as readFile9, writeFile as writeFile7, stat as stat7, rm as rm2, readdir as readdir5 } from "node:fs/promises";
-import { readFileSync as readFileSync3 } from "node:fs";
+import { readFileSync as readFileSync3, existsSync as existsSync4, readdirSync, statSync, writeFileSync as writeFileSync2 } from "node:fs";
+import * as path9 from "node:path";
 import { createRequire as createRequire2 } from "node:module";
 function loadParser(pkgName) {
   let p = _parserCache.get(pkgName);
@@ -63042,8 +63287,8 @@ async function getRawWorkspaceDependencies() {
   } catch {}
   return rawWorkspaceDeps;
 }
-function workspaceDependenciesPathToLanguageAndFilename(path8) {
-  const relativePath = path8.replace("dependencies/", "");
+function workspaceDependenciesPathToLanguageAndFilename(path10) {
+  const relativePath = path10.replace("dependencies/", "");
   for (const { filename, language } of workspaceDependenciesLanguages) {
     if (relativePath.endsWith(filename)) {
       return {
@@ -63090,20 +63335,48 @@ async function blueColor() {
   return isWin2 ? colors.black : colors.blue;
 }
 async function generateScriptMetadataInternal(scriptPath, workspace, opts, dryRun, noStaleMessage, rawWorkspaceDependencies, codebases, justUpdateMetadataLock) {
-  const remotePath = scriptPath.substring(0, scriptPath.indexOf(".")).replaceAll(SEP9, "/");
+  const isFolderLayout = isModuleEntryPoint(scriptPath);
+  const remotePath = isFolderLayout ? getScriptBasePathFromModulePath(scriptPath).replaceAll(SEP9, "/") : scriptPath.substring(0, scriptPath.indexOf(".")).replaceAll(SEP9, "/");
   const language = inferContentTypeFromFilePath(scriptPath, opts.defaultTs);
   const metadataWithType = await parseMetadataFile(remotePath, undefined);
   const scriptContent = await readFile9(scriptPath, "utf-8");
   const metadataContent = await readFile9(metadataWithType.path, "utf-8");
   const filteredRawWorkspaceDependencies = filterWorkspaceDependencies(rawWorkspaceDependencies, scriptContent, language);
+  const moduleFolderPath = isFolderLayout ? path9.dirname(scriptPath) : scriptPath.substring(0, scriptPath.indexOf(".")) + getModuleFolderSuffix();
+  const hasModules = existsSync4(moduleFolderPath) && statSync(moduleFolderPath).isDirectory();
   let hash2 = await generateScriptHash(filteredRawWorkspaceDependencies, scriptContent, metadataContent);
-  if (await checkifMetadataUptodate(remotePath, hash2, undefined)) {
+  let moduleHashes = {};
+  if (hasModules) {
+    moduleHashes = await computeModuleHashes(moduleFolderPath, opts.defaultTs, rawWorkspaceDependencies, isFolderLayout);
+  }
+  const hasModuleHashes = Object.keys(moduleHashes).length > 0;
+  let checkHash = hash2;
+  let checkSubpath;
+  if (hasModuleHashes) {
+    const sortedEntries = Object.entries(moduleHashes).sort(([a], [b]) => a.localeCompare(b));
+    checkHash = await generateHash(hash2 + JSON.stringify(sortedEntries));
+    checkSubpath = SCRIPT_TOP_HASH;
+  }
+  const conf = await readLockfile();
+  if (await checkifMetadataUptodate(remotePath, checkHash, conf, checkSubpath)) {
     if (!noStaleMessage) {
       info(colors.green(`Script ${remotePath} metadata is up-to-date, skipping`));
     }
     return;
   } else if (dryRun) {
-    return `${remotePath} (${language})`;
+    let detail = `${remotePath} (${language})`;
+    if (hasModuleHashes) {
+      const changed = [];
+      for (const [modulePath, moduleHash] of Object.entries(moduleHashes)) {
+        if (!await checkifMetadataUptodate(remotePath, moduleHash, conf, modulePath)) {
+          changed.push(modulePath);
+        }
+      }
+      if (changed.length > 0) {
+        detail += ` [changed modules: ${changed.join(", ")}]`;
+      }
+    }
+    return detail;
   }
   if (!justUpdateMetadataLock && !noStaleMessage) {
     info(colors.gray(`Generating metadata for ${scriptPath}`));
@@ -63115,40 +63388,79 @@ async function generateScriptMetadataInternal(scriptPath, workspace, opts, dryRu
   if (!opts.schemaOnly && !justUpdateMetadataLock) {
     const hasCodebase = findCodebase(scriptPath, codebases) != null;
     if (!hasCodebase) {
-      await updateScriptLock(workspace, scriptContent, language, remotePath, metadataParsedContent, filteredRawWorkspaceDependencies);
+      const lockPathOverride = isFolderLayout ? path9.dirname(scriptPath) + "/script.lock" : undefined;
+      await updateScriptLock(workspace, scriptContent, language, remotePath, metadataParsedContent, filteredRawWorkspaceDependencies, lockPathOverride);
     } else {
       metadataParsedContent.lock = "";
     }
+    if (hasModules) {
+      let changedModules;
+      if (hasModuleHashes) {
+        changedModules = [];
+        for (const [modulePath, moduleHash] of Object.entries(moduleHashes)) {
+          if (!await checkifMetadataUptodate(remotePath, moduleHash, conf, modulePath)) {
+            changedModules.push(modulePath);
+          }
+        }
+        if (changedModules.length === 0) {
+          changedModules = undefined;
+        }
+      }
+      await updateModuleLocks(workspace, moduleFolderPath, "", remotePath, rawWorkspaceDependencies, opts.defaultTs, changedModules);
+    }
   } else {
-    metadataParsedContent.lock = "!inline " + remotePath.replaceAll(SEP9, "/") + ".script.lock";
+    if (isFolderLayout) {
+      metadataParsedContent.lock = "!inline " + remotePath.replaceAll(SEP9, "/") + getModuleFolderSuffix() + "/script.lock";
+    } else {
+      metadataParsedContent.lock = "!inline " + remotePath.replaceAll(SEP9, "/") + ".script.lock";
+    }
   }
-  let metaPath = remotePath + ".script.yaml";
-  let newMetadataContent = import_yaml12.stringify(metadataParsedContent, yamlOptions);
-  if (metadataWithType.isJson) {
-    metaPath = remotePath + ".script.json";
-    newMetadataContent = JSON.stringify(metadataParsedContent);
+  let metaPath;
+  let newMetadataContent;
+  if (isFolderLayout) {
+    if (metadataWithType.isJson) {
+      metaPath = path9.dirname(scriptPath) + "/script.json";
+      newMetadataContent = JSON.stringify(metadataParsedContent);
+    } else {
+      metaPath = path9.dirname(scriptPath) + "/script.yaml";
+      newMetadataContent = import_yaml12.stringify(metadataParsedContent, yamlOptions);
+    }
+  } else {
+    if (metadataWithType.isJson) {
+      metaPath = remotePath + ".script.json";
+      newMetadataContent = JSON.stringify(metadataParsedContent);
+    } else {
+      metaPath = remotePath + ".script.yaml";
+      newMetadataContent = import_yaml12.stringify(metadataParsedContent, yamlOptions);
+    }
   }
   const metadataContentUsedForHash = newMetadataContent;
   hash2 = await generateScriptHash(filteredRawWorkspaceDependencies, scriptContent, metadataContentUsedForHash);
-  await updateMetadataGlobalLock(remotePath, hash2);
+  if (hasModuleHashes) {
+    const sortedEntries = Object.entries(moduleHashes).sort(([a], [b]) => a.localeCompare(b));
+    const metaHash = await generateHash(hash2 + JSON.stringify(sortedEntries));
+    await clearGlobalLock(remotePath);
+    await updateMetadataGlobalLock(remotePath, metaHash, SCRIPT_TOP_HASH);
+    for (const [modulePath, moduleHash] of Object.entries(moduleHashes)) {
+      await updateMetadataGlobalLock(remotePath, moduleHash, modulePath);
+    }
+  } else {
+    await updateMetadataGlobalLock(remotePath, hash2);
+  }
   if (!justUpdateMetadataLock) {
     await writeFile7(metaPath, newMetadataContent, "utf-8");
   }
   return `${remotePath} (${language})`;
 }
-async function updateScriptSchema(scriptContent, language, metadataContent, path8) {
-  const result = await inferSchema(language, scriptContent, metadataContent.schema, path8);
+async function updateScriptSchema(scriptContent, language, metadataContent, path10) {
+  const result = await inferSchema(language, scriptContent, metadataContent.schema, path10);
   metadataContent.schema = result.schema;
   if (result.has_preprocessor) {
     metadataContent.has_preprocessor = result.has_preprocessor;
   } else {
     delete metadataContent.has_preprocessor;
   }
-  if (result.no_main_func) {
-    metadataContent.no_main_func = result.no_main_func;
-  } else {
-    delete metadataContent.no_main_func;
-  }
+  delete metadataContent.auto_kind;
 }
 function extractWorkspaceDepsAnnotation(scriptContent, language) {
   const config = LANG_ANNOTATION_CONFIG[language];
@@ -63268,7 +63580,7 @@ async function fetchScriptLock(workspace, scriptContent, language, remotePath, r
     throw new LockfileGenerationError(`Failed to generate lockfile:${rawResponse.statusText}, ${responseText}, ${e}`);
   }
 }
-async function updateScriptLock(workspace, scriptContent, language, remotePath, metadataContent, rawWorkspaceDependencies) {
+async function updateScriptLock(workspace, scriptContent, language, remotePath, metadataContent, rawWorkspaceDependencies, lockPathOverride) {
   if (!(workspaceDependenciesLanguages.some((l) => l.language == language) && language !== "powershell" || language == "deno" || language == "rust" || language == "ansible")) {
     return;
   }
@@ -63277,7 +63589,7 @@ async function updateScriptLock(workspace, scriptContent, language, remotePath,
     info(`Generating script lock for ${remotePath} with raw workspace dependencies: ${dependencyPaths}`);
   }
   const lock = await fetchScriptLock(workspace, scriptContent, language, remotePath, rawWorkspaceDependencies);
-  const lockPath = remotePath + ".script.lock";
+  const lockPath = lockPathOverride ?? remotePath + ".script.lock";
   if (lock != "") {
     await writeFile7(lockPath, lock, "utf-8");
     metadataContent.lock = "!inline " + lockPath.replaceAll(SEP9, "/");
@@ -63292,7 +63604,51 @@ async function updateScriptLock(workspace, scriptContent, language, remotePath,
     metadataContent.lock = "";
   }
 }
-async function inferSchema(language, content, currentSchema, path8) {
+async function updateModuleLocks(workspace, dirPath, relPrefix, scriptRemotePath, rawWorkspaceDependencies, defaultTs, changedModules) {
+  const entries = readdirSync(dirPath, { withFileTypes: true });
+  for (const entry of entries) {
+    const fullPath = path9.join(dirPath, entry.name);
+    const relPath = relPrefix ? relPrefix + "/" + entry.name : entry.name;
+    if (entry.isDirectory()) {
+      await updateModuleLocks(workspace, fullPath, relPath, scriptRemotePath, rawWorkspaceDependencies, defaultTs, changedModules);
+    } else if (entry.isFile() && !entry.name.endsWith(".lock") && !(relPrefix === "" && entry.name.startsWith("script."))) {
+      let modLanguage;
+      try {
+        modLanguage = inferContentTypeFromFilePath(entry.name, defaultTs);
+      } catch {
+        continue;
+      }
+      if (!languageNeedsLock(modLanguage))
+        continue;
+      if (changedModules) {
+        const normalizedRelPath = normalizeLockPath(relPath);
+        if (!changedModules.includes(normalizedRelPath))
+          continue;
+      }
+      const moduleContent = readFileSync3(fullPath, "utf-8");
+      const moduleRemotePath = scriptRemotePath + "/" + relPath;
+      info(colors.gray(`Generating lock for module ${relPath}`));
+      try {
+        const lock = await fetchScriptLock(workspace, moduleContent, modLanguage, moduleRemotePath, rawWorkspaceDependencies);
+        const baseName = entry.name.replace(/\.[^.]+$/, "");
+        const lockPath = path9.join(dirPath, baseName + ".lock");
+        if (lock != "") {
+          writeFileSync2(lockPath, lock, "utf-8");
+        } else {
+          try {
+            if (existsSync4(lockPath)) {
+              const { rm: rmAsync } = await import("node:fs/promises");
+              await rmAsync(lockPath);
+            }
+          } catch {}
+        }
+      } catch (e) {
+        info(colors.yellow(`Failed to generate lock for module ${relPath}: ${e}`));
+      }
+    }
+  }
+}
+async function inferSchema(language, content, currentSchema, path10) {
   let inferedSchema;
   if (language === "python3") {
     const { parse_python } = await loadParser("windmill-parser-wasm-py");
@@ -63392,11 +63748,11 @@ async function inferSchema(language, content, currentSchema, path8) {
     throw new Error("Invalid language: " + language);
   }
   if (inferedSchema.type == "Invalid") {
-    info(colors.yellow(`Script ${path8} invalid, it cannot be parsed to infer schema.`));
+    info(colors.yellow(`Script ${path10} invalid, it cannot be parsed to infer schema.`));
     return {
       schema: defaultScriptMetadata().schema,
       has_preprocessor: false,
-      no_main_func: false
+      auto_kind: undefined
     };
   }
   if (!currentSchema) {
@@ -63424,7 +63780,7 @@ async function inferSchema(language, content, currentSchema, path8) {
   return {
     schema: currentSchema,
     has_preprocessor: inferedSchema.has_preprocessor,
-    no_main_func: inferedSchema.no_main_func
+    auto_kind: inferedSchema.auto_kind
   };
 }
 function sortObject(obj) {
@@ -63469,33 +63825,55 @@ async function parseMetadataFile(scriptPath, generateMetadataIfMissing) {
         isJson: false
       };
     } catch {
-      info((await blueColor())(`Creating script metadata file for ${metadataFilePath}`));
-      metadataFilePath = scriptPath + ".script.yaml";
-      let scriptInitialMetadata = defaultScriptMetadata();
-      const lockPath = scriptPath + ".script.lock";
-      scriptInitialMetadata.lock = "!inline " + lockPath;
-      const scriptInitialMetadataYaml = import_yaml12.stringify(scriptInitialMetadata, yamlOptions);
-      await writeFile7(metadataFilePath, scriptInitialMetadataYaml, { flag: "wx", encoding: "utf-8" });
-      await writeFile7(lockPath, "", { flag: "wx", encoding: "utf-8" });
-      if (generateMetadataIfMissing) {
-        info((await blueColor())(`Generating lockfile and schema for ${metadataFilePath}`));
+      const moduleFolderMeta = scriptPath + getModuleFolderSuffix();
+      try {
+        metadataFilePath = moduleFolderMeta + "/script.json";
+        await stat7(metadataFilePath);
+        return {
+          path: metadataFilePath,
+          payload: JSON.parse(await readFile9(metadataFilePath, "utf-8")),
+          isJson: true
+        };
+      } catch {
         try {
-          await generateScriptMetadataInternal(generateMetadataIfMissing.path, generateMetadataIfMissing.workspaceRemote, generateMetadataIfMissing, false, false, generateMetadataIfMissing.rawWorkspaceDependencies, generateMetadataIfMissing.codebases, false);
-          scriptInitialMetadata = await yamlParseFile(metadataFilePath);
-          if (!generateMetadataIfMissing.schemaOnly) {
-            replaceLock(scriptInitialMetadata);
-          }
-        } catch (e) {
-          info(colors.yellow(`Failed to generate lockfile and schema for ${metadataFilePath}: ${e}`));
-        }
+          metadataFilePath = moduleFolderMeta + "/script.yaml";
+          await stat7(metadataFilePath);
+          const payload = await yamlParseFile(metadataFilePath);
+          replaceLock(payload);
+          return {
+            path: metadataFilePath,
+            payload,
+            isJson: false
+          };
+        } catch {}
       }
-      return {
-        path: metadataFilePath,
-        payload: scriptInitialMetadata,
-        isJson: false
-      };
     }
   }
+  info((await blueColor())(`Creating script metadata file for ${metadataFilePath}`));
+  metadataFilePath = scriptPath + ".script.yaml";
+  let scriptInitialMetadata = defaultScriptMetadata();
+  const lockPath = scriptPath + ".script.lock";
+  scriptInitialMetadata.lock = "!inline " + lockPath;
+  const scriptInitialMetadataYaml = import_yaml12.stringify(scriptInitialMetadata, yamlOptions);
+  await writeFile7(metadataFilePath, scriptInitialMetadataYaml, { flag: "wx", encoding: "utf-8" });
+  await writeFile7(lockPath, "", { flag: "wx", encoding: "utf-8" });
+  if (generateMetadataIfMissing) {
+    info((await blueColor())(`Generating lockfile and schema for ${metadataFilePath}`));
+    try {
+      await generateScriptMetadataInternal(generateMetadataIfMissing.path, generateMetadataIfMissing.workspaceRemote, generateMetadataIfMissing, false, false, generateMetadataIfMissing.rawWorkspaceDependencies, generateMetadataIfMissing.codebases, false);
+      scriptInitialMetadata = await yamlParseFile(metadataFilePath);
+      if (!generateMetadataIfMissing.schemaOnly) {
+        replaceLock(scriptInitialMetadata);
+      }
+    } catch (e) {
+      info(colors.yellow(`Failed to generate lockfile and schema for ${metadataFilePath}: ${e}`));
+    }
+  }
+  return {
+    path: metadataFilePath,
+    payload: scriptInitialMetadata,
+    isJson: false
+  };
 }
 function normalizeLockPath(p) {
   return p.replace(/\\/g, "/");
@@ -63515,15 +63893,15 @@ async function readLockfile() {
     return lock;
   }
 }
-function v2LockPath(path8, subpath) {
-  const normalizedPath = normalizeLockPath(path8);
+function v2LockPath(path10, subpath) {
+  const normalizedPath = normalizeLockPath(path10);
   if (subpath) {
     return `${normalizedPath}+${normalizeLockPath(subpath)}`;
   } else {
     return normalizedPath;
   }
 }
-async function checkifMetadataUptodate(path8, hash2, conf, subpath) {
+async function checkifMetadataUptodate(path10, hash2, conf, subpath) {
   if (!conf) {
     conf = await readLockfile();
   }
@@ -63532,10 +63910,10 @@ async function checkifMetadataUptodate(path8, hash2, conf, subpath) {
   }
   const isV2 = conf?.version == "v2";
   if (isV2) {
-    const current = conf.locks?.[v2LockPath(path8, subpath)];
+    const current = conf.locks?.[v2LockPath(path10, subpath)];
     return current == hash2;
   } else {
-    const obj = conf.locks?.[path8];
+    const obj = conf.locks?.[path10];
     const current = subpath && typeof obj == "object" ? obj?.[subpath] : obj;
     return current == hash2;
   }
@@ -63543,14 +63921,39 @@ async function checkifMetadataUptodate(path8, hash2, conf, subpath) {
 async function generateScriptHash(rawWorkspaceDependencies, scriptContent, newMetadataContent) {
   return await generateHash(JSON.stringify(rawWorkspaceDependencies) + scriptContent + newMetadataContent);
 }
-async function clearGlobalLock(path8) {
+async function computeModuleHashes(moduleFolderPath, defaultTs, rawWorkspaceDependencies, isFolderLayout) {
+  const hashes = {};
+  async function readDir2(dirPath, relPrefix) {
+    const entries = readdirSync(dirPath, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = path9.join(dirPath, entry.name);
+      const relPath = relPrefix ? relPrefix + "/" + entry.name : entry.name;
+      const isTopLevel = relPrefix === "";
+      if (entry.isDirectory()) {
+        await readDir2(fullPath, relPath);
+      } else if (entry.isFile() && !entry.name.endsWith(".lock") && !(isFolderLayout && isTopLevel && entry.name.startsWith("script."))) {
+        try {
+          inferContentTypeFromFilePath(entry.name, defaultTs);
+        } catch {
+          continue;
+        }
+        const content = readFileSync3(fullPath, "utf-8");
+        const normalizedPath = normalizeLockPath(relPath);
+        hashes[normalizedPath] = await generateHash(content + JSON.stringify(rawWorkspaceDependencies));
+      }
+    }
+  }
+  await readDir2(moduleFolderPath, "");
+  return hashes;
+}
+async function clearGlobalLock(path10) {
   const conf = await readLockfile();
   if (!conf?.locks) {
     conf.locks = {};
   }
   const isV2 = conf?.version == "v2";
   if (isV2) {
-    const key = v2LockPath(path8);
+    const key = v2LockPath(path10);
     if (conf.locks) {
       Object.keys(conf.locks).forEach((k) => {
         if (conf.locks) {
@@ -63563,29 +63966,29 @@ async function clearGlobalLock(path8) {
     await writeFile7(WMILL_LOCKFILE, import_yaml12.stringify(conf, yamlOptions), "utf-8");
   }
 }
-async function updateMetadataGlobalLock(path8, hash2, subpath) {
+async function updateMetadataGlobalLock(path10, hash2, subpath) {
   const conf = await readLockfile();
   if (!conf?.locks) {
     conf.locks = {};
   }
   const isV2 = conf?.version == "v2";
   if (isV2) {
-    conf.locks[v2LockPath(path8, subpath)] = hash2;
+    conf.locks[v2LockPath(path10, subpath)] = hash2;
   } else {
     if (subpath) {
-      let prev = conf.locks[path8];
+      let prev = conf.locks[path10];
       if (!prev || typeof prev != "object") {
         prev = {};
-        conf.locks[path8] = prev;
+        conf.locks[path10] = prev;
       }
       prev[subpath] = hash2;
     } else {
-      conf.locks[path8] = hash2;
+      conf.locks[path10] = hash2;
     }
   }
   await writeFile7(WMILL_LOCKFILE, import_yaml12.stringify(conf, yamlOptions), "utf-8");
 }
-var import_yaml12, _require, _parserCache, LockfileGenerationError, LANG_ANNOTATION_CONFIG, lockCache, WMILL_LOCKFILE = "wmill-lock.yaml";
+var import_yaml12, _require, _parserCache, LockfileGenerationError, LANG_ANNOTATION_CONFIG, lockCache, WMILL_LOCKFILE = "wmill-lock.yaml", SCRIPT_TOP_HASH = "__script_hash";
 var init_metadata = __esm(async () => {
   init_colors2();
   init_log();
@@ -63593,6 +63996,7 @@ var init_metadata = __esm(async () => {
   init_script_bootstrap();
   init_script_common();
   init_script_common();
+  init_resource_folders();
   init_parse_schema();
   await __promiseAll([
     init_sync(),
@@ -63621,7 +64025,7 @@ var init_metadata = __esm(async () => {
 
 // src/commands/app/raw_apps.ts
 import { sep as SEP10 } from "node:path";
-import path8 from "node:path";
+import path10 from "node:path";
 import { readFile as readFile10, readdir as readdir6 } from "node:fs/promises";
 async function findRunnableContentFile(backendPath, runnableId, allFiles) {
   for (const fileName of allFiles) {
@@ -63634,7 +64038,7 @@ async function findRunnableContentFile(backendPath, runnableId, allFiles) {
     const ext2 = fileName.substring(runnableId.length + 1);
     if (EXTENSION_TO_LANGUAGE[ext2]) {
       try {
-        const content = await readFile10(path8.join(backendPath, fileName), "utf-8");
+        const content = await readFile10(path10.join(backendPath, fileName), "utf-8");
         return { ext: ext2, content };
       } catch {
         continue;
@@ -63671,7 +64075,7 @@ async function loadRunnablesFromBackend(backendPath, defaultTs = "bun") {
       }
       const runnableId = fileName.replace(".yaml", "");
       processedIds.add(runnableId);
-      const filePath = path8.join(backendPath, fileName);
+      const filePath = path10.join(backendPath, fileName);
       const runnable = await yamlParseFile(filePath);
       if (runnable?.type === "inline") {
         const contentFile = await findRunnableContentFile(backendPath, runnableId, allFiles);
@@ -63679,7 +64083,7 @@ async function loadRunnablesFromBackend(backendPath, defaultTs = "bun") {
           const language = getLanguageFromExtension(contentFile.ext, defaultTs);
           let lock;
           try {
-            lock = await readFile10(path8.join(backendPath, `${runnableId}.lock`), "utf-8");
+            lock = await readFile10(path10.join(backendPath, `${runnableId}.lock`), "utf-8");
           } catch {}
           runnable.inlineScript = {
             content: contentFile.content,
@@ -63710,7 +64114,7 @@ async function loadRunnablesFromBackend(backendPath, defaultTs = "bun") {
         const language = getLanguageFromExtension(contentFile.ext, defaultTs);
         let lock;
         try {
-          lock = await readFile10(path8.join(backendPath, `${runnableId}.lock`), "utf-8");
+          lock = await readFile10(path10.join(backendPath, `${runnableId}.lock`), "utf-8");
         } catch {}
         runnables[runnableId] = {
           type: "inline",
@@ -63738,7 +64142,7 @@ function writeRunnableToBackend(backendPath, runnableId, runnable) {
       ...rest
     };
   }
-  const filePath = path8.join(backendPath, `${runnableId}.yaml`);
+  const filePath = path10.join(backendPath, `${runnableId}.yaml`);
   writeIfChanged(filePath, import_yaml15.stringify(runnableToWrite, yamlOptions));
 }
 async function collectAppFiles(localPath) {
@@ -63789,7 +64193,7 @@ async function pushRawApp(workspace, remotePath, localPath, message) {
   }
   const appFilePath = localPath + "raw_app.yaml";
   const localApp = await yamlParseFile(appFilePath);
-  const backendPath = path8.join(localPath, APP_BACKEND_FOLDER);
+  const backendPath = path10.join(localPath, APP_BACKEND_FOLDER);
   const runnablesFromBackend = await loadRunnablesFromBackend(backendPath);
   let runnables;
   if (Object.keys(runnablesFromBackend).length > 0) {
@@ -63865,13 +64269,13 @@ async function pushRawApp(workspace, remotePath, localPath, message) {
     });
   }
 }
-async function generatingPolicy(app, path9, publicApp) {
-  info(colors.gray(`Generating fresh policy for app ${path9}...`));
+async function generatingPolicy(app, path11, publicApp) {
+  info(colors.gray(`Generating fresh policy for app ${path11}...`));
   try {
     app.policy = await updateRawAppPolicy(app.runnables, app.policy);
     app.policy.execution_mode = publicApp ? "anonymous" : "publisher";
   } catch (e) {
-    error(colors.red(`Error generating policy for app ${path9}: ${e}`));
+    error(colors.red(`Error generating policy for app ${path11}: ${e}`));
     throw e;
   }
 }
@@ -63908,11 +64312,11 @@ __export(exports_app_metadata, {
   filterWorkspaceDependenciesForApp: () => filterWorkspaceDependenciesForApp,
   APP_BACKEND_FOLDER: () => APP_BACKEND_FOLDER
 });
-import path9 from "node:path";
+import path11 from "node:path";
 import { readFile as readFile11, mkdir as mkdir4 } from "node:fs/promises";
 import { sep as SEP11 } from "node:path";
 async function generateAppHash(rawReqs, folder, rawApp, defaultTs) {
-  const runnablesFolder = rawApp ? path9.join(folder, APP_BACKEND_FOLDER) : folder;
+  const runnablesFolder = rawApp ? path11.join(folder, APP_BACKEND_FOLDER) : folder;
   const hashes = {};
   try {
     const elems = await FSFSElement(runnablesFolder, [], true);
@@ -63944,7 +64348,7 @@ async function generateAppLocksInternal(appFolder, rawApp, dryRun, workspace, op
     info(`Generating locks for app ${appFolder} at ${remote_path}`);
   }
   const rawWorkspaceDependencies = await getRawWorkspaceDependencies();
-  const appFilePath = path9.join(appFolder, rawApp ? "raw_app.yaml" : "app.yaml");
+  const appFilePath = path11.join(appFolder, rawApp ? "raw_app.yaml" : "app.yaml");
   const appFile = await yamlParseFile(appFilePath);
   const appValue = rawApp ? appFile.runnables : appFile.value;
   const filteredDeps = await filterWorkspaceDependenciesForApp(appValue, rawWorkspaceDependencies, appFolder);
@@ -63977,7 +64381,7 @@ async function generateAppLocksInternal(appFolder, rawApp, dryRun, workspace, op
         info(`Recomputing locks of ${changedScripts.join(", ")} in ${appFolder}`);
       }
       if (rawApp) {
-        const runnablesPath = path9.join(appFolder, APP_BACKEND_FOLDER);
+        const runnablesPath = path11.join(appFolder, APP_BACKEND_FOLDER);
         const rawAppFile = appFile;
         let runnables = await loadRunnablesFromBackend(runnablesPath);
         if (Object.keys(runnables).length === 0 && rawAppFile.runnables) {
@@ -64049,7 +64453,7 @@ async function traverseAndProcessInlineScripts(obj, processor, currentPath = [])
 }
 async function updateRawAppRunnables(workspace, runnables, remotePath, appFolder, rawDeps, defaultTs = "bun", noStaleMessage) {
   const updatedRunnables = [];
-  const runnablesFolder = path9.join(appFolder, APP_BACKEND_FOLDER);
+  const runnablesFolder = path11.join(appFolder, APP_BACKEND_FOLDER);
   try {
     await mkdir4(runnablesFolder, { recursive: true });
   } catch {}
@@ -64074,7 +64478,7 @@ async function updateRawAppRunnables(workspace, runnables, remotePath, appFolder
     if (language === "frontend") {
       const [basePathO, ext2] = pathAssigner.assignPath(runnable.name ?? runnableId, language);
       const basePath = basePathO.replaceAll(SEP11, "/");
-      const contentPath = path9.join(runnablesFolder, `${basePath}${ext2}`);
+      const contentPath = path11.join(runnablesFolder, `${basePath}${ext2}`);
       writeIfChanged(contentPath, content);
       const simplifiedRunnable = { type: "inline" };
       for (const [key, value] of Object.entries(runnable)) {
@@ -64092,8 +64496,8 @@ async function updateRawAppRunnables(workspace, runnables, remotePath, appFolder
       const lock = await generateInlineScriptLock(workspace, content, language, `${remotePath}/${runnableId}`, rawDeps);
       const [basePathO, ext2] = pathAssigner.assignPath(runnable.name ?? runnableId, language);
       const basePath = basePathO.replaceAll(SEP11, "/");
-      const contentPath = path9.join(runnablesFolder, `${basePath}${ext2}`);
-      const lockPath = path9.join(runnablesFolder, `${basePath}lock`);
+      const contentPath = path11.join(runnablesFolder, `${basePath}${ext2}`);
+      const lockPath = path11.join(runnablesFolder, `${basePath}lock`);
       writeIfChanged(contentPath, content);
       if (lock && lock !== "") {
         writeIfChanged(lockPath, lock);
@@ -64141,8 +64545,8 @@ async function updateAppInlineScripts(workspace, appValue, remotePath, appFolder
       }
       const [basePathO, ext2] = pathAssigner.assignPath(scriptName, language);
       const basePath = basePathO.replaceAll(SEP11, "/");
-      const contentPath = path9.join(appFolder, `${basePath}${ext2}`);
-      const lockPath = path9.join(appFolder, `${basePath}lock`);
+      const contentPath = path11.join(appFolder, `${basePath}${ext2}`);
+      const lockPath = path11.join(appFolder, `${basePath}lock`);
       writeIfChanged(contentPath, content);
       if (lock && lock !== "") {
         writeIfChanged(lockPath, lock);
@@ -64212,7 +64616,7 @@ ${text}`);
   }
 }
 async function inferRunnableSchemaFromFile(appFolder, runnableFilePath) {
-  const fileName = path9.basename(runnableFilePath);
+  const fileName = path11.basename(runnableFilePath);
   if (fileName.endsWith(".lock") || fileName.endsWith(".yaml")) {
     return;
   }
@@ -64221,13 +64625,13 @@ async function inferRunnableSchemaFromFile(appFolder, runnableFilePath) {
     return;
   }
   const runnableId = match2[1];
-  const runnableFilePath2 = path9.join(appFolder, APP_BACKEND_FOLDER, `${runnableId}.yaml`);
+  const runnableFilePath2 = path11.join(appFolder, APP_BACKEND_FOLDER, `${runnableId}.yaml`);
   let runnable;
   try {
     runnable = await yamlParseFile(runnableFilePath2);
   } catch {
     try {
-      const appFilePath = path9.join(appFolder, "raw_app.yaml");
+      const appFilePath = path11.join(appFolder, "raw_app.yaml");
       const appFile = await yamlParseFile(appFilePath);
       if (!appFile.runnables?.[runnableId]) {
         warn(colors.yellow(`Runnable ${runnableId} not found in backend folder or raw_app.yaml`));
@@ -64244,7 +64648,7 @@ async function inferRunnableSchemaFromFile(appFolder, runnableFilePath) {
   }
   const inlineScript = runnable.inlineScript;
   const language = inlineScript.language;
-  const fullFilePath = path9.join(appFolder, APP_BACKEND_FOLDER, runnableFilePath);
+  const fullFilePath = path11.join(appFolder, APP_BACKEND_FOLDER, runnableFilePath);
   let content;
   try {
     content = await readFile11(fullFilePath, "utf-8");
@@ -64353,7 +64757,7 @@ var init_app_metadata = __esm(async () => {
 // src/commands/app/generate_agents.ts
 import * as fs9 from "node:fs";
 import { writeFile as writeFile8 } from "node:fs/promises";
-import path10 from "node:path";
+import path12 from "node:path";
 import process13 from "node:process";
 function generateDatatablesMarkdown(schemas, localData) {
   const defaultDatatable = localData?.datatable;
@@ -64453,7 +64857,7 @@ Configure datatables in Workspace Settings > Windmill Data Tables.
   return content;
 }
 async function regenerateAgentDocs(workspaceId, targetDir, silent = false) {
-  const rawAppPath = path10.join(targetDir, "raw_app.yaml");
+  const rawAppPath = path12.join(targetDir, "raw_app.yaml");
   if (!fs9.existsSync(rawAppPath)) {
     if (!silent) {
       error(colors.red(`Error: raw_app.yaml not found in ${targetDir}`));
@@ -64480,11 +64884,11 @@ async function regenerateAgentDocs(workspaceId, targetDir, silent = false) {
     }
   } catch {}
   const agentsContent = generateAgentsDocumentation(localData);
-  await writeFile8(path10.join(targetDir, "AGENTS.md"), agentsContent, "utf-8");
-  await writeFile8(path10.join(targetDir, "CLAUDE.md"), `Instructions are in @AGENTS.md
+  await writeFile8(path12.join(targetDir, "AGENTS.md"), agentsContent, "utf-8");
+  await writeFile8(path12.join(targetDir, "CLAUDE.md"), `Instructions are in @AGENTS.md
 `, "utf-8");
   const datatablesContent = generateDatatablesMarkdown(schemas, localData);
-  await writeFile8(path10.join(targetDir, "DATATABLES.md"), datatablesContent, "utf-8");
+  await writeFile8(path12.join(targetDir, "DATATABLES.md"), datatablesContent, "utf-8");
   if (!silent) {
     info(colors.green(`✓ Generated AGENTS.md, CLAUDE.md, and DATATABLES.md`));
     const datatableCount = schemas.length;
@@ -64505,18 +64909,18 @@ async function generateAgents(opts, appFolder) {
   const cwd = process13.cwd();
   let targetDir = cwd;
   if (appFolder) {
-    targetDir = path10.isAbsolute(appFolder) ? appFolder : path10.join(cwd, appFolder);
+    targetDir = path12.isAbsolute(appFolder) ? appFolder : path12.join(cwd, appFolder);
   }
   await loadNonDottedPathsSetting();
-  const dirName = path10.basename(targetDir);
+  const dirName = path12.basename(targetDir);
   if (!hasFolderSuffix(dirName, "raw_app")) {
-    if (!hasFolderSuffix(path10.basename(cwd), "raw_app") && !appFolder) {
+    if (!hasFolderSuffix(path12.basename(cwd), "raw_app") && !appFolder) {
       error(colors.red(`Error: Must be run inside a ${getFolderSuffix("raw_app")} folder or specify one as argument.`));
       info(colors.gray("Usage: wmill app generate-agents [app_folder]"));
       process13.exit(1);
     }
   }
-  const rawAppPath = path10.join(targetDir, "raw_app.yaml");
+  const rawAppPath = path12.join(targetDir, "raw_app.yaml");
   if (!fs9.existsSync(rawAppPath)) {
     error(colors.red(`Error: raw_app.yaml not found in ${targetDir}`));
     process13.exit(1);
@@ -64546,9 +64950,9 @@ var init_generate_agents = __esm(async () => {
 import { sep as SEP12 } from "node:path";
 import * as http2 from "node:http";
 import * as fs10 from "node:fs";
-import * as path11 from "node:path";
+import * as path13 from "node:path";
 import process14 from "node:process";
-import { writeFileSync as writeFileSync2 } from "node:fs";
+import { writeFileSync as writeFileSync3 } from "node:fs";
 import { readFile as readFile12 } from "node:fs/promises";
 async function dev(opts, appFolder) {
   GLOBAL_CONFIG_OPT.noCdToRoot = true;
@@ -64556,20 +64960,20 @@ async function dev(opts, appFolder) {
   const originalCwd = process14.cwd();
   let targetDir = originalCwd;
   if (appFolder) {
-    targetDir = path11.isAbsolute(appFolder) ? appFolder : path11.join(originalCwd, appFolder);
+    targetDir = path13.isAbsolute(appFolder) ? appFolder : path13.join(originalCwd, appFolder);
     if (!fs10.existsSync(targetDir)) {
       error(colors.red(`Error: Directory not found: ${targetDir}`));
       process14.exit(1);
     }
   }
-  const targetDirName = path11.basename(targetDir);
+  const targetDirName = path13.basename(targetDir);
   if (!hasFolderSuffix(targetDirName, "raw_app")) {
     error(colors.red(`Error: The dev command must be run inside a ${getFolderSuffix("raw_app")} folder.
 ` + `Target directory: ${targetDirName}
 ` + `Please navigate to a folder ending with '${getFolderSuffix("raw_app")}' or specify one as argument.`));
     process14.exit(1);
   }
-  const rawAppPath = path11.join(targetDir, "raw_app.yaml");
+  const rawAppPath = path13.join(targetDir, "raw_app.yaml");
   if (!fs10.existsSync(rawAppPath)) {
     error(colors.red(`Error: raw_app.yaml not found in ${targetDir}.
 ` + `The dev command requires a ${getFolderSuffix("raw_app")} folder containing a raw_app.yaml file.`));
@@ -64596,11 +65000,11 @@ async function dev(opts, appFolder) {
     error(colors.red(`Entry point "${entryPoint}" not found. Please specify a valid entry point with --entry.`));
     process14.exit(1);
   }
-  const appDir = path11.dirname(entryPoint) || process14.cwd();
+  const appDir = path13.dirname(entryPoint) || process14.cwd();
   await ensureNodeModules(appDir);
   const inferredSchemas = {};
   genRunnablesTs(inferredSchemas);
-  const distDir = path11.join(process14.cwd(), "dist");
+  const distDir = path13.join(process14.cwd(), "dist");
   if (!fs10.existsSync(distDir)) {
     fs10.mkdirSync(distDir);
   }
@@ -64663,7 +65067,7 @@ data: reload
   info(colors.blue(`\uD83D\uDC40 Watching for file changes...
 `));
   await ctx.rebuild();
-  const runnablesPath = path11.join(process14.cwd(), APP_BACKEND_FOLDER);
+  const runnablesPath = path13.join(process14.cwd(), APP_BACKEND_FOLDER);
   let runnablesWatcher;
   if (fs10.existsSync(runnablesPath)) {
     info(colors.blue(`\uD83D\uDC41️  Watching runnables folder at: ${runnablesPath}
@@ -64675,8 +65079,8 @@ data: reload
       if (!filename)
         return;
       const fileStr = typeof filename === "string" ? filename : filename.toString();
-      const changedPath = path11.join(runnablesPath, fileStr);
-      const relativePath = path11.relative(process14.cwd(), changedPath);
+      const changedPath = path13.join(runnablesPath, fileStr);
+      const relativePath = path13.relative(process14.cwd(), changedPath);
       const relativeToRunnables = fileStr;
       if (changedPath.endsWith(".lock")) {
         return;
@@ -64727,7 +65131,7 @@ data: reload
       return;
     }
     if (url === "/dist/bundle.js" || url === "/bundle.js") {
-      const jsPath = path11.join(process14.cwd(), "dist/bundle.js");
+      const jsPath = path13.join(process14.cwd(), "dist/bundle.js");
       if (fs10.existsSync(jsPath)) {
         res.writeHead(200, { "Content-Type": "application/javascript" });
         res.end(fs10.readFileSync(jsPath));
@@ -64738,7 +65142,7 @@ data: reload
       return;
     }
     if (url === "/dist/bundle.css" || url === "/bundle.css") {
-      const cssPath = path11.join(process14.cwd(), "dist/bundle.css");
+      const cssPath = path13.join(process14.cwd(), "dist/bundle.css");
       if (fs10.existsSync(cssPath)) {
         res.writeHead(200, { "Content-Type": "text/css" });
         res.end(fs10.readFileSync(cssPath));
@@ -64749,7 +65153,7 @@ data: reload
       return;
     }
     if (url === "/dist/bundle.js.map" || url === "/bundle.js.map") {
-      const mapPath = path11.join(process14.cwd(), "dist/bundle.js.map");
+      const mapPath = path13.join(process14.cwd(), "dist/bundle.js.map");
       if (fs10.existsSync(mapPath)) {
         res.writeHead(200, { "Content-Type": "application/json" });
         res.end(fs10.readFileSync(mapPath));
@@ -64760,7 +65164,7 @@ data: reload
       return;
     }
     if (url === "/dist/bundle.css.map" || url === "/bundle.css.map") {
-      const mapPath = path11.join(process14.cwd(), "dist/bundle.css.map");
+      const mapPath = path13.join(process14.cwd(), "dist/bundle.css.map");
       if (fs10.existsSync(mapPath)) {
         res.writeHead(200, { "Content-Type": "application/json" });
         res.end(fs10.readFileSync(mapPath));
@@ -64774,12 +65178,12 @@ data: reload
     res.end(createHTML("/dist/bundle.js", "/dist/bundle.css"));
   });
   const wss = new import_websocket_server.default({ server });
-  const sqlToApplyPath = path11.join(process14.cwd(), "sql_to_apply");
+  const sqlToApplyPath = path13.join(process14.cwd(), "sql_to_apply");
   const sqlFileQueue = [];
   let currentSqlFile = null;
   async function getDatatableConfig() {
     try {
-      const rawApp2 = await yamlParseFile(path11.join(process14.cwd(), "raw_app.yaml"));
+      const rawApp2 = await yamlParseFile(path13.join(process14.cwd(), "raw_app.yaml"));
       return rawApp2?.data?.datatable;
     } catch {
       return;
@@ -64816,12 +65220,12 @@ data: reload
     }
     const filePath = sqlFileQueue.shift();
     if (!fs10.existsSync(filePath)) {
-      info(colors.gray(`File no longer exists: ${path11.basename(filePath)}`));
+      info(colors.gray(`File no longer exists: ${path13.basename(filePath)}`));
       await processNextSqlFile();
       return;
     }
     currentSqlFile = filePath;
-    const fileName = path11.basename(filePath);
+    const fileName = path13.basename(filePath);
     try {
       const sqlContent = await readFile12(filePath, "utf-8");
       if (!sqlContent.trim()) {
@@ -64843,9 +65247,9 @@ data: reload
     if (deleteFile && fs10.existsSync(filePath)) {
       try {
         fs10.unlinkSync(filePath);
-        info(colors.green(`✓ Deleted: ${path11.basename(filePath)}`));
+        info(colors.green(`✓ Deleted: ${path13.basename(filePath)}`));
       } catch (error2) {
-        error(colors.red(`Failed to delete ${path11.basename(filePath)}: ${error2.message}`));
+        error(colors.red(`Failed to delete ${path13.basename(filePath)}: ${error2.message}`));
       }
     }
     currentSqlFile = null;
@@ -64857,7 +65261,7 @@ data: reload
       try {
         const sqlContent = await readFile12(currentSqlFile, "utf-8");
         const datatable = await getDatatableConfig();
-        const fileName = path11.basename(currentSqlFile);
+        const fileName = path13.basename(currentSqlFile);
         ws.send(JSON.stringify({
           type: "sqlMigration",
           fileName,
@@ -64871,7 +65275,7 @@ data: reload
       const sqlFiles = entries.filter((entry) => entry.endsWith(".sql"));
       if (sqlFiles.length > 0 && sqlFileQueue.length === 0) {
         for (const sqlFile of sqlFiles.sort()) {
-          queueSqlFile(path11.join(sqlToApplyPath, sqlFile));
+          queueSqlFile(path13.join(sqlToApplyPath, sqlFile));
         }
         await processNextSqlFile();
       }
@@ -65050,7 +65454,7 @@ data: reload
       }
       info(colors.blue(`\uD83D\uDD0D Found ${sqlFiles.length} SQL file(s) in sql_to_apply/`));
       for (const sqlFile of sqlFiles) {
-        const filePath = path11.join(sqlToApplyPath, sqlFile);
+        const filePath = path13.join(sqlToApplyPath, sqlFile);
         queueSqlFile(filePath);
       }
       await processNextSqlFile();
@@ -65068,11 +65472,11 @@ data: reload
       if (!filename)
         return;
       const fileStr = typeof filename === "string" ? filename : filename.toString();
-      const changedPath = path11.join(sqlToApplyPath, fileStr);
+      const changedPath = path13.join(sqlToApplyPath, fileStr);
       if (!changedPath.endsWith(".sql")) {
         return;
       }
-      const fileName = path11.basename(changedPath);
+      const fileName = path13.basename(changedPath);
       if (sqlDebounceTimeouts[changedPath]) {
         clearTimeout(sqlDebounceTimeouts[changedPath]);
       }
@@ -65130,11 +65534,11 @@ data: reload
 async function genRunnablesTs(schemaOverrides = {}) {
   info(colors.blue("\uD83D\uDD04 Generating wmill.d.ts..."));
   const localPath = process14.cwd();
-  const backendPath = path11.join(localPath, APP_BACKEND_FOLDER);
+  const backendPath = path13.join(localPath, APP_BACKEND_FOLDER);
   let runnables = await loadRunnablesFromBackend(backendPath);
   if (Object.keys(runnables).length === 0) {
     try {
-      const rawApp = await yamlParseFile(path11.join(localPath, "raw_app.yaml"));
+      const rawApp = await yamlParseFile(path13.join(localPath, "raw_app.yaml"));
       runnables = rawApp?.["runnables"] ?? {};
     } catch {
       runnables = {};
@@ -65150,7 +65554,7 @@ async function genRunnablesTs(schemaOverrides = {}) {
   }
   try {
     const newWmillTs = genWmillTs(runnables);
-    writeFileSync2(path11.join(process14.cwd(), "wmill.d.ts"), newWmillTs);
+    writeFileSync3(path13.join(process14.cwd(), "wmill.d.ts"), newWmillTs);
   } catch (error2) {
     error(colors.red(`Failed to generate wmill.d.ts: ${error2.message}`));
   }
@@ -65168,10 +65572,10 @@ function convertRunnablesToApiFormat(runnables) {
 async function loadRunnables() {
   try {
     const localPath = process14.cwd();
-    const backendPath = path11.join(localPath, APP_BACKEND_FOLDER);
+    const backendPath = path13.join(localPath, APP_BACKEND_FOLDER);
     let runnables = await loadRunnablesFromBackend(backendPath);
     if (Object.keys(runnables).length === 0) {
-      const rawApp = await yamlParseFile(path11.join(localPath, "raw_app.yaml"));
+      const rawApp = await yamlParseFile(path13.join(localPath, "raw_app.yaml"));
       runnables = rawApp?.runnables ?? {};
     }
     convertRunnablesToApiFormat(runnables);
@@ -65652,7 +66056,7 @@ var init_dev = __esm(async () => {
 
 // src/commands/app/lint.ts
 import * as fs11 from "node:fs";
-import * as path12 from "node:path";
+import * as path14 from "node:path";
 import process15 from "node:process";
 function validateRawAppYaml(appData) {
   const errors = [];
@@ -65667,7 +66071,7 @@ function validateRawAppYaml(appData) {
 async function validateRunnables(appDir, appData) {
   const errors = [];
   const warnings = [];
-  const backendPath = path12.join(appDir, APP_BACKEND_FOLDER);
+  const backendPath = path14.join(appDir, APP_BACKEND_FOLDER);
   const runnablesFromBackend = await loadRunnablesFromBackend(backendPath);
   const hasBackendRunnables = Object.keys(runnablesFromBackend).length > 0;
   const hasYamlRunnables = appData.runnables && typeof appData.runnables === "object" && !Array.isArray(appData.runnables) && Object.keys(appData.runnables).length > 0;
@@ -65701,12 +66105,12 @@ async function validateBuild(appDir) {
 async function lintRawApp(appDir, opts) {
   const errors = [];
   const warnings = [];
-  const currentDirName = path12.basename(appDir);
+  const currentDirName = path14.basename(appDir);
   if (!hasFolderSuffix(currentDirName, "raw_app")) {
     errors.push(`Not a raw app folder: '${currentDirName}' does not end with '${getFolderSuffix("raw_app")}'`);
     return { valid: false, errors, warnings };
   }
-  const rawAppPath = path12.join(appDir, "raw_app.yaml");
+  const rawAppPath = path14.join(appDir, "raw_app.yaml");
   if (!fs11.existsSync(rawAppPath)) {
     errors.push("Missing raw_app.yaml file");
     return { valid: false, errors, warnings };
@@ -65790,7 +66194,7 @@ var init_lint2 = __esm(async () => {
 
 // src/commands/app/new.ts
 import { stat as stat8, writeFile as writeFile9, mkdir as mkdir5 } from "node:fs/promises";
-import path13 from "node:path";
+import path15 from "node:path";
 function validateAppPath(appPath) {
   if (!appPath.startsWith("u/") && !appPath.startsWith("f/")) {
     return {
@@ -65995,7 +66399,7 @@ CREATE SCHEMA IF NOT EXISTS ${schemaName};
   }
   await loadNonDottedPathsSetting();
   const folderName = buildFolderPath(appPath, "raw_app");
-  const appDir = path13.join(process.cwd(), folderName);
+  const appDir = path15.join(process.cwd(), folderName);
   try {
     await stat8(appDir);
     const overwrite = await Confirm.prompt({
@@ -66008,17 +66412,17 @@ CREATE SCHEMA IF NOT EXISTS ${schemaName};
     }
   } catch {}
   await mkdir5(appDir, { recursive: true });
-  await mkdir5(path13.join(appDir, "backend"), { recursive: true });
-  await mkdir5(path13.join(appDir, "sql_to_apply"), { recursive: true });
+  await mkdir5(path15.join(appDir, "backend"), { recursive: true });
+  await mkdir5(path15.join(appDir, "sql_to_apply"), { recursive: true });
   const rawAppConfig = {
     summary
   };
   if (dataConfig.datatable) {
     rawAppConfig.data = dataConfig;
   }
-  await writeFile9(path13.join(appDir, "raw_app.yaml"), import_yaml21.stringify(rawAppConfig, yamlOptions), "utf-8");
+  await writeFile9(path15.join(appDir, "raw_app.yaml"), import_yaml21.stringify(rawAppConfig, yamlOptions), "utf-8");
   for (const [filePath, content] of Object.entries(template.files)) {
-    const fullPath = path13.join(appDir, filePath.slice(1));
+    const fullPath = path15.join(appDir, filePath.slice(1));
     await writeFile9(fullPath, content.trim() + `
 `, "utf-8");
   }
@@ -66028,21 +66432,21 @@ CREATE SCHEMA IF NOT EXISTS ${schemaName};
     schema: dataConfig.schema
   } : undefined;
   const agentsContent = generateAgentsDocumentation(dataForDocs);
-  await writeFile9(path13.join(appDir, "AGENTS.md"), agentsContent, "utf-8");
-  await writeFile9(path13.join(appDir, "CLAUDE.md"), `Instructions are in @AGENTS.md
+  await writeFile9(path15.join(appDir, "AGENTS.md"), agentsContent, "utf-8");
+  await writeFile9(path15.join(appDir, "CLAUDE.md"), `Instructions are in @AGENTS.md
 `, "utf-8");
   const datatablesContent = generateDatatablesDocumentation(dataForDocs);
-  await writeFile9(path13.join(appDir, "DATATABLES.md"), datatablesContent, "utf-8");
+  await writeFile9(path15.join(appDir, "DATATABLES.md"), datatablesContent, "utf-8");
   const exampleRunnable = {
     type: "inline",
     path: undefined
   };
-  await writeFile9(path13.join(appDir, "backend", "a.yaml"), import_yaml21.stringify(exampleRunnable, yamlOptions), "utf-8");
-  await writeFile9(path13.join(appDir, "backend", "a.ts"), `export async function main(x: number): Promise<string> {
+  await writeFile9(path15.join(appDir, "backend", "a.yaml"), import_yaml21.stringify(exampleRunnable, yamlOptions), "utf-8");
+  await writeFile9(path15.join(appDir, "backend", "a.ts"), `export async function main(x: number): Promise<string> {
   return \`Hello from backend! x = \${x}\`;
 }
 `, "utf-8");
-  await writeFile9(path13.join(appDir, "sql_to_apply", "README.md"), `# SQL Migrations Folder
+  await writeFile9(path15.join(appDir, "sql_to_apply", "README.md"), `# SQL Migrations Folder
 
 This folder is for SQL migration files that will be applied to datatables during development.
 
@@ -66070,7 +66474,7 @@ This folder is for SQL migration files that will be applied to datatables during
 - Use idempotent SQL (\`CREATE TABLE IF NOT EXISTS\`, etc.)
 `);
   if (createSchemaSQL && schemaName) {
-    await writeFile9(path13.join(appDir, "sql_to_apply", `000_create_schema_${schemaName}.sql`), createSchemaSQL, "utf-8");
+    await writeFile9(path15.join(appDir, "sql_to_apply", `000_create_schema_${schemaName}.sql`), createSchemaSQL, "utf-8");
   }
   info("");
   info(colors.bold.green(`App created successfully at ${folderName}/`));
@@ -66364,8 +66768,8 @@ async function pushApp(workspace, remotePath, localPath, message) {
   if (!localPath.endsWith(SEP13)) {
     localPath += SEP13;
   }
-  const path14 = localPath + "app.yaml";
-  const localApp = await yamlParseFile(path14);
+  const path16 = localPath + "app.yaml";
+  const localApp = await yamlParseFile(path16);
   replaceInlineScripts2(localApp.value, localPath, true);
   await generatingPolicy2(localApp, remotePath, localApp?.["public"] ?? localApp?.["policy"]?.["execution_mode"] == "anonymous");
   if (app) {
@@ -66394,13 +66798,13 @@ async function pushApp(workspace, remotePath, localPath, message) {
     });
   }
 }
-async function generatingPolicy2(app, path14, publicApp) {
-  info(colors.gray(`Generating fresh policy for app ${path14}...`));
+async function generatingPolicy2(app, path16, publicApp) {
+  info(colors.gray(`Generating fresh policy for app ${path16}...`));
   try {
     app.policy = await updatePolicy(app.value, undefined);
     app.policy.execution_mode = publicApp ? "anonymous" : "publisher";
   } catch (e) {
-    error(colors.red(`Error generating policy for app ${path14}: ${e}`));
+    error(colors.red(`Error generating policy for app ${path16}: ${e}`));
     throw e;
   }
 }
@@ -66429,12 +66833,12 @@ async function list4(opts) {
     new Table2().header(["path", "summary"]).padding(2).border(true).body(total.map((x) => [x.path, x.summary])).render();
   }
 }
-async function get3(opts, path14) {
+async function get3(opts, path16) {
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
   const a = await getAppByPath({
     workspace: workspace.workspaceId,
-    path: path14
+    path: path16
   });
   if (opts.json) {
     console.log(JSON.stringify(a));
@@ -66695,9 +67099,9 @@ function compileResourceTypeToTsType(schema) {
 }
 
 // src/commands/resource-type/resource-type.ts
-import { writeFileSync as writeFileSync3 } from "node:fs";
+import { writeFileSync as writeFileSync4 } from "node:fs";
 import { stat as stat10, writeFile as writeFile11 } from "node:fs/promises";
-import path14 from "node:path";
+import path16 from "node:path";
 import process16 from "node:process";
 async function pushResourceType(workspace, remotePath, resource, localResource) {
   remotePath = removeType(remotePath, "resource-type");
@@ -66777,12 +67181,12 @@ async function newResourceType(opts, name) {
   });
   info(colors.green(`Created ${filePath}`));
 }
-async function get5(opts, path15) {
+async function get5(opts, path17) {
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
   const rt = await getResourceType({
     workspace: workspace.workspaceId,
-    path: path15
+    path: path17
   });
   if (opts.json) {
     console.log(JSON.stringify(rt));
@@ -66812,7 +67216,7 @@ async function generateRTNamespace(opts) {
 `);
   namespaceContent += `
 }`;
-  writeFileSync3(path14.join(process16.cwd(), "rt.d.ts"), namespaceContent);
+  writeFileSync4(path16.join(process16.cwd(), "rt.d.ts"), namespaceContent);
   info(colors.green("Created rt.d.ts with resource types namespace (RT) for TypeScript."));
 }
 var import_yaml24, command13, resource_type_default;
@@ -66853,11 +67257,11 @@ async function list7(opts) {
     ])).render();
   }
 }
-async function newVariable(opts, path15) {
-  if (!validatePath(path15)) {
+async function newVariable(opts, path17) {
+  if (!validatePath(path17)) {
     return;
   }
-  const filePath = path15 + ".variable.yaml";
+  const filePath = path17 + ".variable.yaml";
   try {
     await stat11(filePath);
     throw new Error("File already exists: " + filePath);
@@ -66876,12 +67280,12 @@ async function newVariable(opts, path15) {
   });
   info(colors.green(`Created ${filePath}`));
 }
-async function get6(opts, path15) {
+async function get6(opts, path17) {
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
   const v = await getVariable({
     workspace: workspace.workspaceId,
-    path: path15
+    path: path17
   });
   if (opts.json) {
     console.log(JSON.stringify(v));
@@ -67007,11 +67411,11 @@ async function list8(opts) {
     new Table2().header(["Path", "Schedule"]).padding(2).border(true).body(schedules.map((x) => [x.path, x.schedule])).render();
   }
 }
-async function newSchedule(opts, path15) {
-  if (!validatePath(path15)) {
+async function newSchedule(opts, path17) {
+  if (!validatePath(path17)) {
     return;
   }
-  const filePath = path15 + ".schedule.yaml";
+  const filePath = path17 + ".schedule.yaml";
   try {
     await stat12(filePath);
     throw new Error("File already exists: " + filePath);
@@ -67034,12 +67438,12 @@ async function newSchedule(opts, path15) {
   });
   info(colors.green(`Created ${filePath}`));
 }
-async function get7(opts, path15) {
+async function get7(opts, path17) {
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
   const s = await getSchedule({
     workspace: workspace.workspaceId,
-    path: path15
+    path: path17
   });
   if (opts.json) {
     console.log(JSON.stringify(s));
@@ -67052,35 +67456,35 @@ async function get7(opts, path15) {
     console.log(colors.bold("Enabled:") + " " + (s.enabled ? "true" : "false"));
   }
 }
-async function pushSchedule(workspace, path15, schedule, localSchedule) {
-  path15 = removeType(path15, "schedule").replaceAll(SEP16, "/");
-  debug(`Processing local schedule ${path15}`);
+async function pushSchedule(workspace, path17, schedule, localSchedule) {
+  path17 = removeType(path17, "schedule").replaceAll(SEP16, "/");
+  debug(`Processing local schedule ${path17}`);
   try {
-    schedule = await getSchedule({ workspace, path: path15 });
-    debug(`Schedule ${path15} exists on remote`);
+    schedule = await getSchedule({ workspace, path: path17 });
+    debug(`Schedule ${path17} exists on remote`);
   } catch {
-    debug(`Schedule ${path15} does not exist on remote`);
+    debug(`Schedule ${path17} does not exist on remote`);
   }
   if (schedule) {
     if (isSuperset(localSchedule, schedule)) {
-      debug(`Schedule ${path15} is up to date`);
+      debug(`Schedule ${path17} is up to date`);
       return;
     }
-    debug(`Updating schedule ${path15}`);
+    debug(`Updating schedule ${path17}`);
     try {
-      info(colors.bold.yellow(`Updating schedule ${path15}`));
+      info(colors.bold.yellow(`Updating schedule ${path17}`));
       await updateSchedule({
         workspace,
-        path: path15,
+        path: path17,
         requestBody: {
           ...localSchedule
         }
       });
       if (localSchedule.enabled != schedule.enabled) {
-        info(colors.bold.yellow(`Schedule ${path15} is ${localSchedule.enabled ? "enabled" : "disabled"} locally but not on remote, updating remote`));
+        info(colors.bold.yellow(`Schedule ${path17} is ${localSchedule.enabled ? "enabled" : "disabled"} locally but not on remote, updating remote`));
         await setScheduleEnabled({
           workspace,
-          path: path15,
+          path: path17,
           requestBody: {
             enabled: localSchedule.enabled
           }
@@ -67091,12 +67495,12 @@ async function pushSchedule(workspace, path15, schedule, localSchedule) {
       throw e;
     }
   } else {
-    console.log(colors.bold.yellow("Creating new schedule " + path15));
+    console.log(colors.bold.yellow("Creating new schedule " + path17));
     try {
       await createSchedule({
         workspace,
         requestBody: {
-          path: path15,
+          path: path17,
           ...localSchedule
         }
       });
@@ -67764,7 +68168,7 @@ var init_settings = __esm(async () => {
 // src/commands/instance/instance.ts
 import { readFile as readFile13, writeFile as writeFile15, readdir as readdir8, mkdir as mkdir7, rm as rm3, stat as stat13 } from "node:fs/promises";
 import { appendFile } from "node:fs/promises";
-import * as path15 from "node:path";
+import * as path17 from "node:path";
 async function allInstances() {
   try {
     const file = await getInstancesConfigFilePath();
@@ -67941,7 +68345,7 @@ async function instancePull(opts) {
     if (confirm) {
       if (uChanges > 0) {
         if (opts.folderPerInstance && opts.prefixSettings) {
-          await mkdir7(path15.join(rootDir, opts.prefix), {
+          await mkdir7(path17.join(rootDir, opts.prefix), {
             recursive: true
           });
         }
@@ -67975,10 +68379,10 @@ Pulling all workspaces`);
       info(`
 Pulling workspace ` + remoteWorkspace.id);
       const workspaceName = opts?.folderPerInstance ? instance.prefix + "/" + remoteWorkspace.id : instance.prefix + "_" + remoteWorkspace.id;
-      await mkdir7(path15.join(rootDir, workspaceName), {
+      await mkdir7(path17.join(rootDir, workspaceName), {
         recursive: true
       });
-      process.chdir(path15.join(rootDir, workspaceName));
+      process.chdir(path17.join(rootDir, workspaceName));
       await addWorkspace({
         remote: instance.remote,
         name: workspaceName,
@@ -68013,7 +68417,7 @@ Pulling workspace ` + remoteWorkspace.id);
       if (confirmDelete) {
         for (const workspace of localWorkspacesToDelete) {
           await removeWorkspace(workspace.id, false, {});
-          await rm3(path15.join(rootDir, workspace.dir), {
+          await rm3(path17.join(rootDir, workspace.dir), {
             recursive: true
           });
         }
@@ -68102,12 +68506,12 @@ Pushing all workspaces: ${localWorkspaces.map((x) => x.id).join(", ")}`);
       info(`
 Pushing workspace ` + localWorkspace.id);
       try {
-        process.chdir(path15.join(rootDir, localWorkspace.dir));
+        process.chdir(path17.join(rootDir, localWorkspace.dir));
       } catch (_) {
         throw new Error("Workspace folder not found, are you in the right directory?");
       }
       try {
-        const workspaceSettings = await yamlParseFile(path15.join(process.cwd(), "settings.yaml"));
+        const workspaceSettings = await yamlParseFile(path17.join(process.cwd(), "settings.yaml"));
         await add({
           token: instance.token,
           workspace: undefined,
@@ -68355,8 +68759,8 @@ async function createToken2(opts) {
   }
   info("Token: " + await createToken({ requestBody: {} }));
 }
-async function pushWorkspaceUser(workspace, path16, user, localUser) {
-  const email = removePathPrefix(removeType(path16, "user"), "users");
+async function pushWorkspaceUser(workspace, path18, user, localUser) {
+  const email = removePathPrefix(removeType(path18, "user"), "users");
   debug(`Processing local user ${email}`);
   if (!["operator", "developer", "admin"].includes(localUser.role)) {
     throw new Error(`Invalid role for user ${email}: ${localUser.role}`);
@@ -68419,8 +68823,8 @@ async function pushWorkspaceUser(workspace, path16, user, localUser) {
     }
   }
 }
-async function pushGroup(workspace, path16, group, localGroup) {
-  const name = removePathPrefix(removeType(path16, "group"), "groups");
+async function pushGroup(workspace, path18, group, localGroup) {
+  const name = removePathPrefix(removeType(path18, "group"), "groups");
   debug(`Processing local group ${name}`);
   try {
     const remoteGroup = await getGroup({
@@ -68671,11 +69075,11 @@ async function push9(opts, filePath) {
   const content = fs12.readFileSync(filePath, "utf8");
   await pushWorkspaceDependencies(workspace.workspaceId, filePath, null, content);
 }
-async function pushWorkspaceDependencies(workspace, path16, _befObj, newDependenciesContent) {
+async function pushWorkspaceDependencies(workspace, path18, _befObj, newDependenciesContent) {
   try {
-    const res = workspaceDependenciesPathToLanguageAndFilename(path16);
+    const res = workspaceDependenciesPathToLanguageAndFilename(path18);
     if (!res) {
-      throw new Error(`Unknown workspace dependencies file format: ${path16}`);
+      throw new Error(`Unknown workspace dependencies file format: ${path18}`);
     }
     const { language, name } = res;
     const displayName = name ? `named dependencies "${name}"` : `workspace default dependencies`;
@@ -68729,7 +69133,7 @@ var init_dependencies = __esm(async () => {
 // src/commands/trigger/trigger.ts
 import { stat as stat14, writeFile as writeFile17 } from "node:fs/promises";
 import { sep as SEP17 } from "node:path";
-async function getTrigger(triggerType, workspace, path16) {
+async function getTrigger(triggerType, workspace, path18) {
   const triggerFunctions = {
     http: getHttpTrigger,
     websocket: getWebsocketTrigger,
@@ -68742,10 +69146,10 @@ async function getTrigger(triggerType, workspace, path16) {
     email: getEmailTrigger
   };
   const triggerFunction = triggerFunctions[triggerType];
-  const trigger = await triggerFunction({ workspace, path: path16 });
+  const trigger = await triggerFunction({ workspace, path: path18 });
   return trigger;
 }
-async function updateTrigger(triggerType, workspace, path16, trigger) {
+async function updateTrigger(triggerType, workspace, path18, trigger) {
   const triggerFunctions = {
     http: updateHttpTrigger,
     websocket: updateWebsocketTrigger,
@@ -68758,9 +69162,9 @@ async function updateTrigger(triggerType, workspace, path16, trigger) {
     email: updateEmailTrigger
   };
   const triggerFunction = triggerFunctions[triggerType];
-  await triggerFunction({ workspace, path: path16, requestBody: trigger });
+  await triggerFunction({ workspace, path: path18, requestBody: trigger });
 }
-async function createTrigger(triggerType, workspace, path16, trigger) {
+async function createTrigger(triggerType, workspace, path18, trigger) {
   const triggerFunctions = {
     http: createHttpTrigger,
     websocket: createWebsocketTrigger,
@@ -68773,38 +69177,38 @@ async function createTrigger(triggerType, workspace, path16, trigger) {
     email: createEmailTrigger
   };
   const triggerFunction = triggerFunctions[triggerType];
-  await triggerFunction({ workspace, path: path16, requestBody: trigger });
+  await triggerFunction({ workspace, path: path18, requestBody: trigger });
 }
-async function pushTrigger(triggerType, workspace, path16, trigger, localTrigger) {
-  path16 = removeType(path16, triggerType + "_trigger").replaceAll(SEP17, "/");
-  debug(`Processing local ${triggerType} trigger ${path16}`);
+async function pushTrigger(triggerType, workspace, path18, trigger, localTrigger) {
+  path18 = removeType(path18, triggerType + "_trigger").replaceAll(SEP17, "/");
+  debug(`Processing local ${triggerType} trigger ${path18}`);
   try {
-    trigger = await getTrigger(triggerType, workspace, path16);
-    debug(`${triggerType} trigger ${path16} exists on remote`);
+    trigger = await getTrigger(triggerType, workspace, path18);
+    debug(`${triggerType} trigger ${path18} exists on remote`);
   } catch {
-    debug(`${triggerType} trigger ${path16} does not exist on remote`);
+    debug(`${triggerType} trigger ${path18} does not exist on remote`);
   }
   if (trigger) {
     if (isSuperset(localTrigger, trigger)) {
-      debug(`${triggerType} trigger ${path16} is up to date`);
+      debug(`${triggerType} trigger ${path18} is up to date`);
       return;
     }
-    debug(`${triggerType} trigger ${path16} is not up-to-date, updating...`);
+    debug(`${triggerType} trigger ${path18} is not up-to-date, updating...`);
     try {
-      await updateTrigger(triggerType, workspace, path16, {
+      await updateTrigger(triggerType, workspace, path18, {
         ...localTrigger,
-        path: path16
+        path: path18
       });
     } catch (e) {
       console.error(e.body);
       throw e;
     }
   } else {
-    console.log(colors.bold.yellow(`Creating new ${triggerType} trigger: ${path16}`));
+    console.log(colors.bold.yellow(`Creating new ${triggerType} trigger: ${path18}`));
     try {
-      await createTrigger(triggerType, workspace, path16, {
+      await createTrigger(triggerType, workspace, path18, {
         ...localTrigger,
-        path: path16
+        path: path18
       });
     } catch (e) {
       console.error(e.body);
@@ -68885,8 +69289,8 @@ async function pushNativeTrigger(workspace, filePath, _remoteTrigger, localTrigg
     }
   }
 }
-async function newTrigger(opts, path16) {
-  if (!validatePath(path16)) {
+async function newTrigger(opts, path18) {
+  if (!validatePath(path18)) {
     return;
   }
   if (!opts.kind) {
@@ -68896,7 +69300,7 @@ async function newTrigger(opts, path16) {
     throw new Error("Invalid trigger kind: " + opts.kind + ". Valid kinds: " + TRIGGER_TYPES.join(", "));
   }
   const kind = opts.kind;
-  const filePath = `${path16}.${kind}_trigger.yaml`;
+  const filePath = `${path18}.${kind}_trigger.yaml`;
   try {
     await stat14(filePath);
     throw new Error("File already exists: " + filePath);
@@ -68911,14 +69315,14 @@ async function newTrigger(opts, path16) {
   });
   info(colors.green(`Created ${filePath}`));
 }
-async function get8(opts, path16) {
+async function get8(opts, path18) {
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
   if (opts.kind) {
     if (!checkIfValidTrigger(opts.kind)) {
       throw new Error("Invalid trigger kind: " + opts.kind + ". Valid kinds: " + TRIGGER_TYPES.join(", "));
     }
-    const trigger = await getTrigger(opts.kind, workspace.workspaceId, path16);
+    const trigger = await getTrigger(opts.kind, workspace.workspaceId, path18);
     if (opts.json) {
       console.log(JSON.stringify(trigger));
     } else {
@@ -68933,12 +69337,12 @@ async function get8(opts, path16) {
   const matches = [];
   for (const kind of TRIGGER_TYPES) {
     try {
-      const trigger = await getTrigger(kind, workspace.workspaceId, path16);
+      const trigger = await getTrigger(kind, workspace.workspaceId, path18);
       matches.push({ kind, trigger });
     } catch {}
   }
   if (matches.length === 0) {
-    throw new Error("No trigger found at path: " + path16);
+    throw new Error("No trigger found at path: " + path18);
   }
   if (matches.length === 1) {
     const { kind, trigger } = matches[0];
@@ -68953,7 +69357,7 @@ async function get8(opts, path16) {
     }
     return;
   }
-  console.log("Multiple triggers found at path " + path16 + ":");
+  console.log("Multiple triggers found at path " + path18 + ":");
   for (const m of matches) {
     console.log("  - " + m.kind);
   }
@@ -69131,7 +69535,7 @@ var init_trigger = __esm(async () => {
 });
 
 // src/types.ts
-import * as path16 from "node:path";
+import * as path18 from "node:path";
 import { sep as SEP18 } from "node:path";
 import { readFileSync as readFileSync5 } from "node:fs";
 function isSuperset(subset, superset) {
@@ -69176,8 +69580,8 @@ function showDiff(local, remote) {
   }
   info(finalString);
 }
-function showConflict(path17, local, remote) {
-  info(colors.yellow(`- ${path17}`));
+function showConflict(path19, local, remote) {
+  info(colors.yellow(`- ${path19}`));
   showDiff(local, remote);
   info("\x1B[31mlocal\x1B[31m - \x1B[32mremote\x1B[32m");
   info(`
@@ -69254,6 +69658,9 @@ function parseFromFile(p) {
   }
 }
 function getTypeStrFromPath(p) {
+  if (isScriptModulePath(p)) {
+    return "script";
+  }
   if (isFlowPath(p)) {
     return "flow";
   }
@@ -69266,7 +69673,7 @@ function getTypeStrFromPath(p) {
   if (p.startsWith("dependencies" + SEP18)) {
     return "workspace_dependencies";
   }
-  const parsed = path16.parse(p);
+  const parsed = path18.parse(p);
   if (parsed.ext == ".go" || parsed.ext == ".ts" || parsed.ext == ".sh" || parsed.ext == ".py" || parsed.ext == ".sql" || parsed.ext == ".gql" || parsed.ext == ".ps1" || parsed.ext == ".js" || parsed.ext == ".php" || parsed.ext == ".rs" || parsed.ext == ".cs" || parsed.ext == ".nu" || parsed.ext == ".java" || parsed.ext == ".rb" || parsed.ext == ".yml" && parsed.name.split(".").pop() == "playbook") {
     return "script";
   }
@@ -69293,14 +69700,14 @@ function getTypeStrFromPath(p) {
   }
 }
 function removeType(str, type) {
-  const normalizedStr = path16.normalize(str).replaceAll(SEP18, "/");
+  const normalizedStr = path18.normalize(str).replaceAll(SEP18, "/");
   if (!normalizedStr.endsWith("." + type + ".yaml") && !normalizedStr.endsWith("." + type + ".json")) {
     throw new Error(str + " does not end with ." + type + ".(yaml|json)");
   }
   return normalizedStr.slice(0, normalizedStr.length - type.length - 6);
 }
 function extractNativeTriggerInfo(p) {
-  const normalizedPath = path16.normalize(p).replaceAll(SEP18, "/");
+  const normalizedPath = path18.normalize(p).replaceAll(SEP18, "/");
   const withoutExt = normalizedPath.replace(/\.(json|yaml)$/, "");
   const match2 = withoutExt.match(/^(.+)\.(flow|script)\.([^.]+)\.(\w+)_native_trigger$/);
   if (!match2) {
@@ -69314,8 +69721,8 @@ function extractNativeTriggerInfo(p) {
   };
 }
 function removePathPrefix(str, prefix) {
-  const normalizedStr = path16.normalize(str).replaceAll(SEP18, "/");
-  const normalizedPrefix = path16.normalize(prefix).replaceAll(SEP18, "/");
+  const normalizedStr = path18.normalize(str).replaceAll(SEP18, "/");
+  const normalizedPrefix = path18.normalize(prefix).replaceAll(SEP18, "/");
   if (normalizedStr === normalizedPrefix) {
     return "";
   }
@@ -69385,7 +69792,7 @@ function defaultFlowDefinition() {
 // src/commands/flow/flow.ts
 import { sep as SEP19 } from "node:path";
 import { readFile as readFile14 } from "node:fs/promises";
-import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync4 } from "node:fs";
+import { mkdirSync as mkdirSync4, writeFileSync as writeFileSync5 } from "node:fs";
 async function pushFlow(workspace, remotePath, localPath, message) {
   if (alreadySynced3.includes(localPath)) {
     return;
@@ -69403,7 +69810,7 @@ async function pushFlow(workspace, remotePath, localPath, message) {
     localPath += SEP19;
   }
   const localFlow = await yamlParseFile(localPath + "flow.yaml");
-  const fileReader = async (path17) => await readFile14(localPath + path17, "utf-8");
+  const fileReader = async (path19) => await readFile14(localPath + path19, "utf-8");
   await replaceInlineScripts(localFlow.value.modules, fileReader, exports_log, localPath, SEP19);
   if (localFlow.value.failure_module) {
     await replaceInlineScripts([localFlow.value.failure_module], fileReader, exports_log, localPath, SEP19);
@@ -69477,12 +69884,12 @@ async function list11(opts) {
     new Table2().header(["path", "summary", "edited by"]).padding(2).border(true).body(total.map((x) => [x.path, x.summary, x.edited_by])).render();
   }
 }
-async function get9(opts, path17) {
+async function get9(opts, path19) {
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
   const f = await getFlowByPath({
     workspace: workspace.workspaceId,
-    path: path17
+    path: path19
   });
   if (opts.json) {
     console.log(JSON.stringify(f));
@@ -69494,13 +69901,13 @@ async function get9(opts, path17) {
     console.log(colors.bold("Edited at:") + " " + (f.edited_at ?? ""));
   }
 }
-async function run3(opts, path17) {
+async function run3(opts, path19) {
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
   const input = opts.data ? await resolve6(opts.data) : {};
   const id = await runFlowByPath({
     workspace: workspace.workspaceId,
-    path: path17,
+    path: path19,
     requestBody: input
   });
   let i = 0;
@@ -69552,7 +69959,7 @@ async function preview2(opts, flowPath) {
     flowPath += SEP19;
   }
   const localFlow = await yamlParseFile(flowPath + "flow.yaml");
-  const fileReader = async (path17) => await readFile14(flowPath + path17, "utf-8");
+  const fileReader = async (path19) => await readFile14(flowPath + path19, "utf-8");
   await replaceInlineScripts(localFlow.value.modules, fileReader, exports_log, flowPath, SEP19);
   if (localFlow.value.failure_module) {
     await replaceInlineScripts([localFlow.value.failure_module], fileReader, exports_log, flowPath, SEP19);
@@ -69629,7 +70036,7 @@ function bootstrap2(opts, flowPath) {
     return;
   }
   const flowDirFullPath = `${flowPath}.flow`;
-  mkdirSync3(flowDirFullPath, { recursive: false });
+  mkdirSync4(flowDirFullPath, { recursive: false });
   const newFlowDefinition = defaultFlowDefinition();
   if (opts.summary !== undefined) {
     newFlowDefinition.summary = opts.summary;
@@ -69639,7 +70046,7 @@ function bootstrap2(opts, flowPath) {
   }
   const newFlowDefinitionYaml = import_yaml36.stringify(newFlowDefinition);
   const flowYamlPath = `${flowDirFullPath}/flow.yaml`;
-  writeFileSync4(flowYamlPath, newFlowDefinitionYaml, { flag: "wx", encoding: "utf-8" });
+  writeFileSync5(flowYamlPath, newFlowDefinitionYaml, { flag: "wx", encoding: "utf-8" });
 }
 var import_yaml36, alreadySynced3, command21, flow_default;
 var init_flow = __esm(async () => {
@@ -69960,8 +70367,8 @@ function outputResult(opts, result) {
     error(colors.red(result.error));
   }
 }
-function normalizeRepoPath(path17) {
-  return path17.replace(/^\$res:/, "");
+function normalizeRepoPath(path19) {
+  return path19.replace(/^\$res:/, "");
 }
 function getOrCreateBranchConfig(config, branchName) {
   if (!config.gitBranches) {
@@ -71958,7 +72365,7 @@ async function dev2(opts) {
   const flowFolderSuffix = getFolderSuffixWithSep("flow");
   const flowMetadataFile = getMetadataFileName("flow", "yaml");
   async function loadPaths(pathsToLoad) {
-    const paths = pathsToLoad.filter((path17) => exts.some((ext2) => path17.endsWith(ext2) || path17.endsWith(flowFolderSuffix + flowMetadataFile)));
+    const paths = pathsToLoad.filter((path19) => exts.some((ext2) => path19.endsWith(ext2) || path19.endsWith(flowFolderSuffix + flowMetadataFile)));
     if (paths.length == 0) {
       return;
     }
@@ -71970,7 +72377,7 @@ async function dev2(opts) {
       if (typ == "flow") {
         const localPath = extractFolderPath(cpath, "flow");
         const localFlow = await yamlParseFile(localPath + "flow.yaml");
-        await replaceInlineScripts(localFlow.value.modules, async (path17) => await readFile15(localPath + path17, "utf-8"), exports_log, localPath, SEP20, undefined);
+        await replaceInlineScripts(localFlow.value.modules, async (path19) => await readFile15(localPath + path19, "utf-8"), exports_log, localPath, SEP20, undefined);
         currentLastEdit = {
           type: "flow",
           flow: localFlow,
@@ -77617,7 +78024,7 @@ sync local with a remote workspaces or the opposite (push or pull)
   - \`--extra-includes <patterns:file[]>\` - Comma separated patterns to specify which file to take into account (among files that are compatible with windmill). Patterns can include * (any string until '/') and ** (any string). Useful to still take wmill.yaml into account and act as a second pattern to satisfy
   - \`--repository <repo:string>\` - Specify repository path (e.g., u/user/repo) when multiple repositories exist
   - \`--promotion <branch:string>\` - Use promotionOverrides from the specified branch instead of regular overrides
-  - \`--branch <branch:string>\` - Override the current git branch (works even outside a git repository)
+  - \`--branch, --env <branch:string>\` - Override the current git branch/environment (works even outside a git repository)
 - \`sync push\` - Push any local changes and apply them remotely.
   - \`--yes\` - Push without needing confirmation
   - \`--dry-run\` - Show changes that would be pushed without actually pushing
@@ -77647,7 +78054,7 @@ sync local with a remote workspaces or the opposite (push or pull)
   - \`--message <message:string>\` - Include a message that will be added to all scripts/flows/apps updated during this push
   - \`--parallel <number>\` - Number of changes to process in parallel
   - \`--repository <repo:string>\` - Specify repository path (e.g., u/user/repo) when multiple repositories exist
-  - \`--branch <branch:string>\` - Override the current git branch (works even outside a git repository)
+  - \`--branch, --env <branch:string>\` - Override the current git branch/environment (works even outside a git repository)
   - \`--lint\` - Run lint validation before pushing
   - \`--locks-required\` - Fail if scripts or flow inline scripts that need locks have no locks
 
@@ -77749,9 +78156,9 @@ workspace related commands
 - \`workspace list\` - List local workspace profiles
 - \`workspace list-remote\` - List workspaces on the remote server that you have access to
 - \`workspace bind\` - Bind the current Git branch to the active workspace
-  - \`--branch <branch:string>\` - Specify branch (defaults to current)
+  - \`--branch, --env <branch:string>\` - Specify branch/environment (defaults to current)
 - \`workspace unbind\` - Remove workspace binding from the current Git branch
-  - \`--branch <branch:string>\` - Specify branch (defaults to current)
+  - \`--branch, --env <branch:string>\` - Specify branch/environment (defaults to current)
 - \`workspace fork [workspace_name:string] [workspace_id:string]\` - Create a forked workspace
   - \`--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.
 - \`workspace delete-fork <fork_name:string>\` - Delete a forked workspace and git branch
@@ -79063,7 +79470,7 @@ async function generateMetadata2(opts, folder) {
   info(colors.gray(`Checking ${checking.join(", ")}...`));
   if (!skipScripts) {
     const scriptElems = await elementsToMap(await FSFSElement(process.cwd(), codebases, false), (p, isD) => {
-      return !isD && !exts.some((ext2) => p.endsWith(ext2)) || ignore(p, isD) || isFlowPath(p) || isAppPath(p) || isRawAppPath(p);
+      return !isD && !exts.some((ext2) => p.endsWith(ext2)) || ignore(p, isD) || isFlowPath(p) || isAppPath(p) || isRawAppPath(p) || isScriptModulePath(p) && !isModuleEntryPoint(p);
     }, false, {});
     for (const e of Object.keys(scriptElems)) {
       const candidate = await generateScriptMetadataInternal(e, workspace, opts, true, true, rawWorkspaceDependencies, codebases, false);
@@ -79256,7 +79663,7 @@ var docs_default = command30;
 
 // src/main.ts
 await init_context();
-var VERSION = "1.658.0";
+var VERSION = "1.659.1";
 var command31 = new Command().name("wmill").action(() => info(`Welcome to Windmill CLI ${VERSION}. Use -h for help.`)).description("Windmill CLI").globalOption("--workspace <workspace:string>", "Specify the target workspace. This overrides the default workspace.").globalOption("--debug --verbose", "Show debug/verbose logs").globalOption("--show-diffs", "Show diff informations when syncing (may show sensitive informations)").globalOption("--token <token:string>", "Specify an API token. This will override any stored token.").globalOption("--base-url <baseUrl:string>", "Specify the base URL of the API. If used, --token and --workspace are required and no local remote/workspace already set will be used.").globalOption("--config-dir <configDir:string>", "Specify a custom config directory. Overrides WMILL_CONFIG_DIR environment variable and default ~/.config location.").env("HEADERS <headers:string>", `Specify headers to use for all requests. e.g: "HEADERS='h1: v1, h2: v2'"`).version(VERSION).versionOption(false).command("init", init_default).command("app", app_default).command("flow", flow_default).command("script", script_default).command("workspace", workspace_default).command("resource", resource_default).command("resource-type", resource_type_default).command("user", user_default).command("variable", variable_default).command("hub", hub_default).command("folder", folder_default).command("schedule", schedule_default).command("trigger", trigger_default).command("dev", dev_default2).command("sync", sync_default).command("lint", lint_default).command("gitsync-settings", gitsync_settings_default).command("instance", instance_default).command("worker-groups", worker_groups_default).command("workers", workers_default).command("queues", queues_default).command("dependencies", dependencies_default).command("jobs", jobs_default).command("generate-metadata", generate_metadata_default).command("docs", docs_default).command("version --version", "Show version information").action(async (opts) => {
   console.log("CLI version: " + VERSION);
   try {