@walkeros/cli 0.3.4 → 0.3.6

package/dist/index.js

@@ -2,9 +2,9 @@
 
 // src/index.ts
 import { Command } from "commander";
-
-// src/commands/bundle/index.ts
-import path7 from "path";
+import { readFileSync as readFileSync2 } from "fs";
+import { fileURLToPath as fileURLToPath3 } from "url";
+import { dirname, join } from "path";
 
 // src/core/logger.ts
 import chalk from "chalk";
@@ -123,14 +123,106 @@ function formatBytes(bytes) {
 
 // src/core/docker.ts
 import { spawn } from "child_process";
+import path2 from "path";
+import { readFileSync } from "fs";
+import { fileURLToPath } from "url";
+import { VERSION as DOCKER_VERSION } from "@walkeros/docker";
+
+// src/config/utils.ts
+import fs from "fs-extra";
 import path from "path";
-var CLI_DOCKER_IMAGE = process.env.WALKEROS_CLI_DOCKER_IMAGE || "walkeros/cli:latest";
-var RUNTIME_DOCKER_IMAGE = process.env.WALKEROS_RUNTIME_DOCKER_IMAGE || "walkeros/docker:latest";
+import os from "os";
+function isUrl(str) {
+  try {
+    const url = new URL(str);
+    return url.protocol === "http:" || url.protocol === "https:";
+  } catch {
+    return false;
+  }
+}
+async function downloadFromUrl(url) {
+  if (!isUrl(url)) {
+    throw new Error(`Invalid URL: ${url}`);
+  }
+  try {
+    const response = await fetch(url);
+    if (!response.ok) {
+      throw new Error(
+        `Failed to download ${url}: ${response.status} ${response.statusText}`
+      );
+    }
+    const content = await response.text();
+    const urlObj = new URL(url);
+    const urlFilename = path.basename(urlObj.pathname);
+    const extension = path.extname(urlFilename) || ".json";
+    const randomId = Math.random().toString(36).substring(2, 11);
+    const filename = `walkeros-download-${Date.now()}-${randomId}${extension}`;
+    const tempPath = path.join(os.tmpdir(), filename);
+    await fs.writeFile(tempPath, content, "utf-8");
+    return tempPath;
+  } catch (error) {
+    if (error instanceof Error) {
+      throw new Error(`Failed to download from URL: ${error.message}`);
+    }
+    throw error;
+  }
+}
+async function loadJsonConfig(configPath) {
+  let absolutePath;
+  let isTemporary = false;
+  if (isUrl(configPath)) {
+    absolutePath = await downloadFromUrl(configPath);
+    isTemporary = true;
+  } else {
+    absolutePath = path.resolve(configPath);
+    if (!await fs.pathExists(absolutePath)) {
+      throw new Error(`Configuration file not found: ${absolutePath}`);
+    }
+  }
+  try {
+    const rawConfig = await fs.readJson(absolutePath);
+    return rawConfig;
+  } catch (error) {
+    throw new Error(
+      `Invalid JSON in config file: ${configPath}. ${error instanceof Error ? error.message : error}`
+    );
+  } finally {
+    if (isTemporary) {
+      try {
+        await fs.remove(absolutePath);
+      } catch {
+      }
+    }
+  }
+}
+function getTempDir(tempDir = ".tmp") {
+  const randomId = Math.random().toString(36).substring(2, 11);
+  const basePath = path.isAbsolute(tempDir) ? tempDir : path.join(process.cwd(), tempDir);
+  return path.join(basePath, `cli-${Date.now()}-${randomId}`);
+}
+
+// src/core/docker.ts
+function readPackageVersion() {
+  const moduleFilename = fileURLToPath(import.meta.url);
+  const moduleDir = path2.dirname(moduleFilename);
+  const prodPath = path2.join(moduleDir, "../package.json");
+  try {
+    const pkg = JSON.parse(readFileSync(prodPath, "utf-8"));
+    return pkg.version;
+  } catch {
+    const devPath = path2.join(moduleDir, "../../package.json");
+    const pkg = JSON.parse(readFileSync(devPath, "utf-8"));
+    return pkg.version;
+  }
+}
+var CLI_VERSION = readPackageVersion();
+var CLI_DOCKER_IMAGE = process.env.WALKEROS_CLI_DOCKER_IMAGE || `walkeros/cli:${CLI_VERSION}`;
+var RUNTIME_DOCKER_IMAGE = process.env.WALKEROS_RUNTIME_DOCKER_IMAGE || `walkeros/docker:${DOCKER_VERSION}`;
 function buildDockerCommand(command, args, options = {}, configFile) {
   const cwd = process.cwd();
   const cmd = ["docker", "run", "--rm"];
-  if (configFile) {
-    const configPath = path.resolve(cwd, configFile);
+  if (configFile && !isUrl(configFile)) {
+    const configPath = path2.resolve(cwd, configFile);
     cmd.push("-v", `${configPath}:/config/flow.json:ro`);
     args = args.map((arg) => arg === configFile ? "/config/flow.json" : arg);
   }
@@ -164,7 +256,7 @@ async function executeInDocker(command, args, options = {}, configFile) {
     options,
     configFile
   );
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve, reject) => {
     const proc = spawn(dockerCmd[0], dockerCmd.slice(1), {
       stdio: options.silent ? "ignore" : "inherit",
       shell: false
@@ -174,7 +266,7 @@ async function executeInDocker(command, args, options = {}, configFile) {
     });
     proc.on("exit", (code) => {
       if (code === 0) {
-        resolve2();
+        resolve();
       } else {
         reject(new Error(`Docker command exited with code ${code}`));
       }
@@ -182,12 +274,12 @@ async function executeInDocker(command, args, options = {}, configFile) {
   });
 }
 async function isDockerAvailable() {
-  return new Promise((resolve2) => {
+  return new Promise((resolve) => {
     const proc = spawn("docker", ["--version"], {
       stdio: "ignore"
     });
-    proc.on("error", () => resolve2(false));
-    proc.on("exit", (code) => resolve2(code === 0));
+    proc.on("error", () => resolve(false));
+    proc.on("exit", (code) => resolve(code === 0));
   });
 }
 function buildDockerRunCommand(mode, flowPath, options = {}) {
@@ -195,21 +287,26 @@ function buildDockerRunCommand(mode, flowPath, options = {}) {
   const cmd = ["docker", "run", "--rm"];
   cmd.push("-e", `MODE=${mode}`);
   if (mode === "collect" && flowPath) {
-    const absoluteFlowPath = path.resolve(cwd, flowPath);
+    const absoluteFlowPath = path2.resolve(cwd, flowPath);
     cmd.push("-v", `${absoluteFlowPath}:/app/flow.mjs:ro`);
     cmd.push("-e", "FLOW=/app/flow.mjs");
   }
-  if (options.port !== void 0) {
-    cmd.push("-p", `${options.port}:${options.port}`);
-    cmd.push("-e", `PORT=${options.port}`);
+  if (mode === "serve" && flowPath) {
+    const absoluteFilePath = path2.resolve(cwd, flowPath);
+    cmd.push("-v", `${absoluteFilePath}:/app/bundle.mjs:ro`);
+    cmd.push("-e", "FILE_PATH=/app/bundle.mjs");
   }
+  const port = options.port !== void 0 ? options.port : 8080;
+  cmd.push("-p", `${port}:${port}`);
+  cmd.push("-e", `PORT=${port}`);
   if (options.host) {
     cmd.push("-e", `HOST=${options.host}`);
   }
-  if (mode === "serve" && options.staticDir) {
-    const absoluteStaticDir = path.resolve(cwd, options.staticDir);
-    cmd.push("-v", `${absoluteStaticDir}:/app/dist:ro`);
-    cmd.push("-e", "STATIC_DIR=/app/dist");
+  if (options.serveName) {
+    cmd.push("-e", `SERVE_NAME=${options.serveName}`);
+  }
+  if (options.servePath) {
+    cmd.push("-e", `SERVE_PATH=${options.servePath}`);
   }
   if (process.platform !== "win32") {
     try {
@@ -226,7 +323,7 @@ function buildDockerRunCommand(mode, flowPath, options = {}) {
 }
 async function executeRunInDocker(mode, flowPath, options = {}) {
   const dockerCmd = buildDockerRunCommand(mode, flowPath, options);
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve, reject) => {
     const proc = spawn(dockerCmd[0], dockerCmd.slice(1), {
       stdio: options.silent ? "ignore" : "inherit",
       shell: false
@@ -236,7 +333,7 @@ async function executeRunInDocker(mode, flowPath, options = {}) {
     });
     proc.on("exit", (code) => {
       if (code === 0) {
-        resolve2();
+        resolve();
       } else {
         reject(new Error(`Docker command exited with code ${code}`));
       }
@@ -283,6 +380,32 @@ async function executeCommand(localHandler, dockerCommand, dockerArgs, options,
   }
 }
 
+// src/core/asset-resolver.ts
+import { fileURLToPath as fileURLToPath2 } from "url";
+import path3 from "path";
+function getPackageRoot() {
+  const currentFile = fileURLToPath2(import.meta.url);
+  if (currentFile.includes("/src/")) {
+    const srcIndex = currentFile.indexOf("/src/");
+    return currentFile.substring(0, srcIndex);
+  }
+  return path3.resolve(currentFile, "../..");
+}
+function resolveAsset(assetPath, assetType, baseDir) {
+  const packageRoot = getPackageRoot();
+  if (!assetPath.includes("/") && !assetPath.includes("\\")) {
+    if (assetType === "template") {
+      return path3.join(packageRoot, "templates", assetPath);
+    }
+    return path3.join(packageRoot, "examples", assetPath);
+  }
+  if (path3.isAbsolute(assetPath)) {
+    return assetPath;
+  }
+  const resolveBase = baseDir || process.cwd();
+  return path3.resolve(resolveBase, assetPath);
+}
+
 // src/config/validators.ts
 function isObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value) && Object.prototype.toString.call(value) === "[object Object]";
@@ -297,29 +420,6 @@ function isSingleEnvConfig(data) {
   return isObject(data) && "flow" in data && "build" in data && isObject(data.flow) && isObject(data.build) && "platform" in data.flow && validatePlatform(data.flow.platform);
 }
 
-// src/config/utils.ts
-import fs from "fs-extra";
-import path2 from "path";
-async function loadJsonConfig(configPath) {
-  const absolutePath = path2.resolve(configPath);
-  if (!await fs.pathExists(absolutePath)) {
-    throw new Error(`Configuration file not found: ${absolutePath}`);
-  }
-  try {
-    const rawConfig = await fs.readJson(absolutePath);
-    return rawConfig;
-  } catch (error) {
-    throw new Error(
-      `Invalid JSON in config file: ${configPath}. ${error instanceof Error ? error.message : error}`
-    );
-  }
-}
-function getTempDir(tempDir = ".tmp") {
-  const randomId = Math.random().toString(36).substring(2, 11);
-  const basePath = path2.isAbsolute(tempDir) ? tempDir : path2.join(process.cwd(), tempDir);
-  return path2.join(basePath, `cli-${Date.now()}-${randomId}`);
-}
-
 // src/config/defaults.ts
 function getDefaultBuildOptions(platform, code, output) {
   const common = {
@@ -353,23 +453,20 @@ function ensureBuildOptions(buildOptions, flowPlatform) {
     buildOptions.code || "",
     buildOptions.output
   );
-  if (!buildOptions.code && !defaults.code) {
-    throw new Error("BuildOptions.code is required");
-  }
   if (!buildOptions.output && !defaults.output) {
     throw new Error("BuildOptions.output is required");
   }
   return {
     ...defaults,
     ...buildOptions,
-    code: buildOptions.code || defaults.code,
+    code: buildOptions.code || defaults.code || "",
     output: buildOptions.output || defaults.output,
     packages: buildOptions.packages || defaults.packages
   };
 }
 
 // src/config/parser.ts
-import path3 from "path";
+import path4 from "path";
 function parseBundleConfig(data) {
   if (!isObject(data)) {
     throw new Error(`Invalid config: expected object, got ${typeof data}`);
@@ -428,10 +525,13 @@ function normalizeConfigs(config, configPath) {
     ...buildDefaults,
     ...config.build
   };
-  if (configPath && buildConfig.template && !path3.isAbsolute(buildConfig.template)) {
+  if (buildConfig.template === void 0) {
+    buildConfig.template = platform === "server" ? "server.hbs" : "web.hbs";
+  }
+  if (configPath && buildConfig.template && !path4.isAbsolute(buildConfig.template)) {
     if (buildConfig.template.startsWith("./") || buildConfig.template.startsWith("../")) {
-      const configDir = path3.dirname(configPath);
-      buildConfig.template = path3.resolve(configDir, buildConfig.template);
+      const configDir = path4.dirname(configPath);
+      buildConfig.template = path4.resolve(configDir, buildConfig.template);
     }
   }
   const buildOptions = ensureBuildOptions(buildConfig, platform);
@@ -538,15 +638,15 @@ import fs4 from "fs-extra";
 
 // src/commands/bundle/package-manager.ts
 import pacote from "pacote";
-import path4 from "path";
+import path5 from "path";
 import fs2 from "fs-extra";
 function getPackageDirectory(baseDir, packageName, version) {
-  return path4.join(baseDir, "node_modules", packageName);
+  return path5.join(baseDir, "node_modules", packageName);
 }
 function getCachedPackagePath(pkg, tempDir) {
-  const cacheDir = path4.join(".tmp", "cache", "packages");
+  const cacheDir = path5.join(".tmp", "cache", "packages");
   const safeName = pkg.name.replace(/\//g, "-").replace(/@/g, "");
-  return path4.join(cacheDir, `${safeName}-${pkg.version}`);
+  return path5.join(cacheDir, `${safeName}-${pkg.version}`);
 }
 async function isPackageCached(pkg, tempDir) {
   const cachedPath = getCachedPackagePath(pkg, tempDir);
@@ -584,12 +684,12 @@ async function resolveDependencies(pkg, packageDir, logger, visited = /* @__PURE
   }
   visited.add(pkgKey);
   try {
-    const packageJsonPath = path4.join(packageDir, "package.json");
+    const packageJsonPath = path5.join(packageDir, "package.json");
     if (await fs2.pathExists(packageJsonPath)) {
-      const packageJson = await fs2.readJson(packageJsonPath);
+      const packageJson2 = await fs2.readJson(packageJsonPath);
       const deps = {
-        ...packageJson.dependencies,
-        ...packageJson.peerDependencies
+        ...packageJson2.dependencies,
+        ...packageJson2.peerDependencies
       };
       for (const [name, versionSpec] of Object.entries(deps)) {
         if (typeof versionSpec === "string") {
@@ -621,7 +721,7 @@ async function downloadPackages(packages, targetDir, logger, useCache = true) {
     if (useCache && await isPackageCached(pkg, targetDir)) {
       logger.debug(`Using cached ${packageSpec}...`);
       try {
-        await fs2.ensureDir(path4.dirname(packageDir));
+        await fs2.ensureDir(path5.dirname(packageDir));
         await fs2.copy(cachedPath, packageDir);
         packagePaths.set(pkg.name, packageDir);
         const deps = await resolveDependencies(pkg, packageDir, logger);
@@ -640,8 +740,8 @@ async function downloadPackages(packages, targetDir, logger, useCache = true) {
     }
     logger.debug(`Downloading ${packageSpec}...`);
     try {
-      await fs2.ensureDir(path4.dirname(packageDir));
-      const cacheDir = process.env.NPM_CACHE_DIR || path4.join(process.cwd(), ".npm-cache");
+      await fs2.ensureDir(path5.dirname(packageDir));
+      const cacheDir = process.env.NPM_CACHE_DIR || path5.join(process.cwd(), ".npm-cache");
       await pacote.extract(packageSpec, packageDir, {
         // Force npm registry download, prevent workspace resolution
         registry: "https://registry.npmjs.org",
@@ -654,7 +754,7 @@ async function downloadPackages(packages, targetDir, logger, useCache = true) {
       });
       if (useCache) {
         try {
-          await fs2.ensureDir(path4.dirname(cachedPath));
+          await fs2.ensureDir(path5.dirname(cachedPath));
           await fs2.copy(packageDir, cachedPath);
           logger.debug(`Cached ${packageSpec} for future use`);
         } catch (cacheError) {
@@ -678,7 +778,6 @@ async function downloadPackages(packages, targetDir, logger, useCache = true) {
 
 // src/commands/bundle/template-engine.ts
 import fs3 from "fs-extra";
-import path5 from "path";
 import Handlebars from "handlebars";
 
 // src/commands/bundle/serializer.ts
@@ -789,9 +888,11 @@ var TemplateEngine = class {
   }
   /**
    * Load template content from file path
+   *
+   * @param templatePath - Template path (bare name, relative, or absolute)
    */
   async loadTemplate(templatePath) {
-    const resolvedPath = path5.resolve(templatePath);
+    const resolvedPath = resolveAsset(templatePath, "template");
     if (!await fs3.pathExists(resolvedPath)) {
       throw new Error(`Template file not found: ${resolvedPath}`);
     }
@@ -894,7 +995,10 @@ async function bundleCore(flowConfig, buildOptions, logger, showStats = false) {
     try {
       await esbuild.build(esbuildOptions);
     } catch (buildError) {
-      throw createBuildError(buildError, buildOptions.code);
+      throw createBuildError(
+        buildError,
+        buildOptions.code || ""
+      );
     }
     logger.gray(`Output: ${outputPath}`);
     let stats;
@@ -1110,8 +1214,8 @@ ${examplesMappings.join(",\n")}
     const flowWithProps = flowConfig;
     templatedCode = await templateEngine.process(
       buildOptions.template,
-      buildOptions.code,
-      // Pass user code as parameter
+      buildOptions.code || "",
+      // Pass user code as parameter (empty if undefined)
       flowWithProps.sources || {},
       flowWithProps.destinations || {},
       flowWithProps.collector || {},
@@ -1119,7 +1223,7 @@ ${examplesMappings.join(",\n")}
       // Pass build config to template
     );
   } else {
-    templatedCode = buildOptions.code;
+    templatedCode = buildOptions.code || "";
   }
   let wrappedCode = templatedCode;
   const hasExport = /^\s*export\s/m.test(templatedCode);
@@ -1211,7 +1315,7 @@ async function bundleCommand(options) {
           throw new Error("Cannot use both --env and --all flags together");
         }
         logger.info("\u{1F4E6} Reading configuration...");
-        const configPath = path7.resolve(options.config);
+        const configPath = options.config;
         const rawConfig = await loadJsonConfig(configPath);
         const configsToBundle = options.all ? loadAllEnvironments(rawConfig, { configPath, logger }) : [
           loadBundleConfig(rawConfig, {
@@ -1348,7 +1452,7 @@ async function bundle(configOrPath, options = {}) {
 }
 
 // src/commands/simulate/simulator.ts
-import path8 from "path";
+import path7 from "path";
 import fs5 from "fs-extra";
 
 // src/commands/simulate/tracker.ts
@@ -1385,9 +1489,9 @@ var CallTracker = class {
     }
     for (const fullPath of paths) {
       const [destKey, ...pathParts] = fullPath.split(":");
-      const path10 = pathParts.join(":");
-      if (!path10) continue;
-      const cleanPath = path10.replace(/^call:/, "");
+      const path9 = pathParts.join(":");
+      if (!path9) continue;
+      const cleanPath = path9.replace(/^call:/, "");
       const parts = cleanPath.split(".");
       let current = wrapped;
       let source = env;
@@ -1442,7 +1546,7 @@ async function simulateCore(configPath, event, options = {}) {
   try {
     logger.info("\u{1F3AF} Starting walkerOS simulation...");
     logger.info("\u{1F4E6} Loading bundle configuration...");
-    const fullConfigPath = path8.resolve(configPath);
+    const fullConfigPath = path7.resolve(configPath);
     const rawConfig = await loadJsonConfig(fullConfigPath);
     parseBundleConfig(rawConfig);
     logger.info(`\u{1F680} Executing simulation with event: ${JSON.stringify(event)}`);
@@ -1537,7 +1641,7 @@ ${envSetupCode.join("\n")}
 
 ${buildOptions.code || ""}
 `;
-    const tempOutput = path8.join(
+    const tempOutput = path7.join(
       tempDir,
       `simulation-bundle-${generateId()}.mjs`
     );
@@ -1693,8 +1797,8 @@ async function simulate(configOrPath, event, options = {}) {
 }
 
 // src/commands/run/index.ts
-import path9 from "path";
-import os from "os";
+import path8 from "path";
+import os2 from "os";
 import {
   runFlow,
   runServeMode
@@ -1702,7 +1806,6 @@ import {
 
 // src/commands/run/validators.ts
 import { existsSync } from "fs";
-import { resolve } from "path";
 var VALID_MODES = ["collect", "serve"];
 function validateMode(mode) {
   if (!VALID_MODES.includes(mode)) {
@@ -1714,7 +1817,7 @@ function validateMode(mode) {
   }
 }
 function validateFlowFile(filePath) {
-  const absolutePath = resolve(filePath);
+  const absolutePath = resolveAsset(filePath, "bundle");
   if (!existsSync(absolutePath)) {
     throw new Error(
       `Flow file not found: ${filePath}
@@ -1753,17 +1856,17 @@ async function runCommand(mode, options) {
     let flowPath = null;
     if (mode === "collect") {
       if (isPreBuilt) {
-        flowPath = path9.resolve(configPath);
+        flowPath = path8.resolve(configPath);
         if (!options.json && !options.silent) {
-          logger.info(`\u{1F4E6} Using pre-built flow: ${path9.basename(flowPath)}`);
+          logger.info(`\u{1F4E6} Using pre-built flow: ${path8.basename(flowPath)}`);
         }
       } else {
         if (!options.json && !options.silent) {
           logger.info("\u{1F528} Building flow bundle...");
         }
         const rawConfig = await loadJsonConfig(configPath);
-        const tempPath = path9.join(
-          os.tmpdir(),
+        const tempPath = path8.join(
+          os2.tmpdir(),
           `walkeros-${Date.now()}-${Math.random().toString(36).slice(2, 9)}.mjs`
         );
         const existingBuild = typeof rawConfig === "object" && rawConfig !== null && "build" in rawConfig && typeof rawConfig.build === "object" ? rawConfig.build : {};
@@ -1799,7 +1902,8 @@ async function runCommand(mode, options) {
       await executeRunInDocker(mode, flowPath, {
         port: options.port,
         host: options.host,
-        staticDir: options.staticDir,
+        serveName: options.serveName,
+        servePath: options.servePath,
         silent: options.silent
       });
     } else {
@@ -1823,7 +1927,9 @@ async function runCommand(mode, options) {
           const config = {
             port: options.port,
             host: options.host,
-            staticDir: options.staticDir
+            serveName: options.serveName,
+            servePath: options.servePath,
+            filePath: flowPath || void 0
           };
           await runServeMode(config);
           break;
@@ -1866,11 +1972,11 @@ async function run(mode, options) {
     const isPreBuilt = flowFile.endsWith(".mjs") || flowFile.endsWith(".js") || flowFile.endsWith(".cjs");
     let flowPath;
     if (isPreBuilt) {
-      flowPath = path9.resolve(flowFile);
+      flowPath = path8.resolve(flowFile);
     } else {
       const rawConfig = await loadJsonConfig(flowFile);
-      const tempPath = path9.join(
-        os.tmpdir(),
+      const tempPath = path8.join(
+        os2.tmpdir(),
         `walkeros-${Date.now()}-${Math.random().toString(36).slice(2, 9)}.mjs`
       );
       const existingBuild = typeof rawConfig === "object" && rawConfig !== null && "build" in rawConfig && typeof rawConfig.build === "object" ? rawConfig.build : {};
@@ -1901,7 +2007,9 @@ async function run(mode, options) {
         const config = {
           port: options.port,
           host: options.host,
-          staticDir: options.staticDir
+          serveName: options.serveName,
+          servePath: options.servePath,
+          filePath: flowPath
         };
         await runServeMode(config);
         break;
@@ -1925,8 +2033,14 @@ async function run(mode, options) {
 }
 
 // src/index.ts
+var __filename = fileURLToPath3(import.meta.url);
+var __dirname = dirname(__filename);
+var packageJson = JSON.parse(
+  readFileSync2(join(__dirname, "../package.json"), "utf-8")
+);
+var VERSION = packageJson.version;
 var program = new Command();
-program.name("walkeros").description("walkerOS CLI - Bundle and deploy walkerOS components").version("0.3.3");
+program.name("walkeros").description("walkerOS CLI - Bundle and deploy walkerOS components").version(VERSION);
 program.command("bundle [file]").description("Bundle NPM packages with custom code").option(
   "-e, --env <name>",
   "environment to build (for multi-environment configs)"
@@ -1956,9 +2070,11 @@ program.command("simulate [file]").description("Simulate event processing and ca
   });
 });
 var runCmd = program.command("run").description("Run walkerOS flows in collect or serve mode");
-runCmd.command("collect <file>").description("Run collector mode (event collection endpoint)").option("-p, --port <number>", "Port to listen on (default: 8080)", parseInt).option("-h, --host <address>", "Host address (default: 0.0.0.0)").option("--json", "Output results as JSON").option("-v, --verbose", "Verbose output").option("--local", "execute in local Node.js instead of Docker").option("--dry-run", "preview command without executing").option("--silent", "suppress output").action(async (file, options) => {
+runCmd.command("collect [file]").description(
+  "Run collector mode (event collection endpoint). Defaults to server-collect.mjs if no file specified."
+).option("-p, --port <number>", "Port to listen on (default: 8080)", parseInt).option("-h, --host <address>", "Host address (default: 0.0.0.0)").option("--json", "Output results as JSON").option("-v, --verbose", "Verbose output").option("--local", "execute in local Node.js instead of Docker").option("--dry-run", "preview command without executing").option("--silent", "suppress output").action(async (file, options) => {
   await runCommand("collect", {
-    config: file,
+    config: file || "server-collect.mjs",
     port: options.port,
     host: options.host,
     json: options.json,
@@ -1968,12 +2084,15 @@ runCmd.command("collect <file>").description("Run collector mode (event collecti
     silent: options.silent
   });
 });
-runCmd.command("serve <file>").description("Run serve mode (static file server for browser bundles)").option("-p, --port <number>", "Port to listen on (default: 8080)", parseInt).option("-h, --host <address>", "Host address (default: 0.0.0.0)").option("--static-dir <dir>", "Static directory for serve mode").option("--json", "Output results as JSON").option("-v, --verbose", "Verbose output").option("--local", "execute in local Node.js instead of Docker").option("--dry-run", "preview command without executing").option("--silent", "suppress output").action(async (file, options) => {
+runCmd.command("serve [file]").description(
+  "Run serve mode (single-file server for browser bundles). Defaults to baked-in web-serve.mjs if no file specified."
+).option("-p, --port <number>", "Port to listen on (default: 8080)", parseInt).option("-h, --host <address>", "Host address (default: 0.0.0.0)").option("--name <filename>", "Filename in URL (default: walker.js)").option("--path <directory>", "URL directory path (e.g., libs/v1)").option("--json", "Output results as JSON").option("-v, --verbose", "Verbose output").option("--local", "execute in local Node.js instead of Docker").option("--dry-run", "preview command without executing").option("--silent", "suppress output").action(async (file, options) => {
   await runCommand("serve", {
-    config: file,
+    config: file || "web-serve.mjs",
     port: options.port,
     host: options.host,
-    staticDir: options.staticDir,
+    serveName: options.name,
+    servePath: options.path,
     json: options.json,
     verbose: options.verbose,
     local: options.local,