@meetploy/cli 1.14.0 → 1.15.0

package/dist/index.js

@@ -54,30 +54,22 @@ async function detectMonorepo(projectDir) {
   const hasLerna = await fileExists(join(projectDir, "lerna.json"));
   if (hasLerna) {
     indicators.push("lerna.json");
-    if (!type) {
-      type = "lerna";
-    }
+    type ??= "lerna";
   }
   const hasNx = await fileExists(join(projectDir, "nx.json"));
   if (hasNx) {
     indicators.push("nx.json");
-    if (!type) {
-      type = "nx";
-    }
+    type ??= "nx";
   }
   const hasTurbo = await fileExists(join(projectDir, "turbo.json"));
   if (hasTurbo) {
     indicators.push("turbo.json");
-    if (!type) {
-      type = "turbo";
-    }
+    type ??= "turbo";
   }
   const hasRush = await fileExists(join(projectDir, "rush.json"));
   if (hasRush) {
     indicators.push("rush.json");
-    if (!type) {
-      type = "rush";
-    }
+    type ??= "rush";
   }
   return {
     isMonorepo: indicators.length > 0,
@@ -191,6 +183,19 @@ function validatePloyConfig(config, configFile = "ploy.yaml", options = {}) {
   validatedConfig.out = validateRelativePath(config.out, "out", configFile);
   validatedConfig.base = validateRelativePath(config.base, "base", configFile);
   validatedConfig.main = validateRelativePath(config.main, "main", configFile);
+  if (config.env !== void 0) {
+    if (typeof config.env !== "object" || config.env === null) {
+      throw new Error(`'env' in ${configFile} must be a map of KEY: value`);
+    }
+    for (const [key, value] of Object.entries(config.env)) {
+      if (!BINDING_NAME_REGEX.test(key)) {
+        throw new Error(`Invalid env key '${key}' in ${configFile}. Env keys must be uppercase with underscores (e.g., FOO, MY_VAR)`);
+      }
+      if (typeof value !== "string") {
+        throw new Error(`Env key '${key}' in ${configFile} must have a string value`);
+      }
+    }
+  }
   validateBindings(config.db, "db", configFile);
   validateBindings(config.queue, "queue", configFile);
   validateBindings(config.cache, "cache", configFile);
@@ -271,7 +276,50 @@ function readAndValidatePloyConfigSync(projectDir, configPath, validationOptions
   return validatePloyConfig(config, configFile, validationOptions);
 }
 function hasBindings(config) {
-  return !!(config.db || config.queue || config.cache || config.state || config.workflow || config.ai || config.auth);
+  return !!(config.env ?? config.db ?? config.queue ?? config.cache ?? config.state ?? config.workflow ?? config.ai ?? config.auth);
+}
+function parseDotEnv(content) {
+  const result = {};
+  for (const line of content.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) {
+      continue;
+    }
+    const eqIndex = trimmed.indexOf("=");
+    if (eqIndex === -1) {
+      continue;
+    }
+    const key = trimmed.slice(0, eqIndex).trim();
+    let value = trimmed.slice(eqIndex + 1).trim();
+    if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
+      value = value.slice(1, -1);
+    }
+    result[key] = value;
+  }
+  return result;
+}
+function loadDotEnvSync(projectDir) {
+  const envPath = join(projectDir, ".env");
+  if (!existsSync(envPath)) {
+    return {};
+  }
+  const content = readFileSync(envPath, "utf-8");
+  return parseDotEnv(content);
+}
+function resolveEnvVars(configEnv, dotEnv, processEnv) {
+  const result = {};
+  for (const [key, value] of Object.entries(configEnv)) {
+    if (value.startsWith("$")) {
+      const refName = value.slice(1);
+      const resolved = dotEnv[refName] ?? processEnv[refName];
+      if (resolved !== void 0) {
+        result[key] = resolved;
+      }
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
 }
 function getWorkerEntryPoint(projectDir, config) {
   if (config.main) {
@@ -314,10 +362,13 @@ __export(cli_exports, {
   getWorkerEntryPoint: () => getWorkerEntryPoint,
   hasBindings: () => hasBindings,
   isPnpmWorkspace: () => isPnpmWorkspace,
+  loadDotEnvSync: () => loadDotEnvSync,
+  parseDotEnv: () => parseDotEnv,
   readAndValidatePloyConfig: () => readAndValidatePloyConfig,
   readAndValidatePloyConfigSync: () => readAndValidatePloyConfigSync,
   readPloyConfig: () => readPloyConfig,
   readPloyConfigSync: () => readPloyConfigSync,
+  resolveEnvVars: () => resolveEnvVars,
   validatePloyConfig: () => validatePloyConfig
 });
 var init_cli = __esm({
@@ -1043,7 +1094,7 @@ export async function executeWorkflow<TInput, TOutput, TEnv>(
 `;
   }
 });
-function generateWrapperCode(config, mockServiceUrl) {
+function generateWrapperCode(config, mockServiceUrl, envVars) {
   const imports = [];
   const bindings = [];
   if (config.db) {
@@ -1133,6 +1184,11 @@ function generateWrapperCode(config, mockServiceUrl) {
       }
     }
   }` : "";
+  const envVarsEntries = envVars && Object.keys(envVars).length > 0 ? Object.entries(envVars).map(([key, value]) => `    ${JSON.stringify(key)}: ${JSON.stringify(value)}`).join(",\n") : "";
+  const envVarsCode = envVarsEntries ? `
+    injectedEnv.vars = {
+${envVarsEntries}
+    };` : "";
   return `${imports.join("\n")}
 
 const ployBindings = {
@@ -1141,7 +1197,7 @@ ${bindings.join("\n")}
 
 export default {
   async fetch(request, env, ctx) {
-    const injectedEnv = { ...env, ...ployBindings };
+    const injectedEnv = { ...env, ...ployBindings };${envVarsCode}
     ${workflowHandlerCode}
     ${queueHandlerCode}
 
@@ -1154,7 +1210,7 @@ export default {
 
   async scheduled(event, env, ctx) {
     if (userWorker.scheduled) {
-      const injectedEnv = { ...env, ...ployBindings };
+      const injectedEnv = { ...env, ...ployBindings };${envVarsCode}
       return userWorker.scheduled(event, injectedEnv, ctx);
     }
   }
@@ -1209,8 +1265,8 @@ function createRuntimePlugin(_config) {
   };
 }
 async function bundleWorker(options) {
-  const { projectDir, tempDir, entryPoint, config, mockServiceUrl } = options;
-  const wrapperCode = generateWrapperCode(config, mockServiceUrl);
+  const { projectDir, tempDir, entryPoint, config, mockServiceUrl, envVars } = options;
+  const wrapperCode = generateWrapperCode(config, mockServiceUrl, envVars);
   const wrapperPath = join(tempDir, "wrapper.ts");
   writeFileSync(wrapperPath, wrapperCode);
   const bundlePath = join(tempDir, "worker.bundle.js");
@@ -1352,16 +1408,15 @@ function createFileWatcher(srcDir, onRebuild) {
     if (debounceTimer) {
       clearTimeout(debounceTimer);
     }
-    debounceTimer = setTimeout(async () => {
+    debounceTimer = setTimeout(() => {
       if (isRebuilding) {
         return;
       }
       isRebuilding = true;
-      try {
-        await onRebuild();
-      } finally {
+      onRebuild().finally(() => {
         isRebuilding = false;
-      }
+      }).catch(() => {
+      });
     }, 100);
   }
   return {
@@ -1402,7 +1457,7 @@ function createFileWatcher(srcDir, onRebuild) {
         debounceTimer = null;
       }
       if (watcher) {
-        watcher.close();
+        void watcher.close();
         watcher = null;
       }
     }
@@ -1421,14 +1476,28 @@ var init_watcher = __esm({
   }
 });
 
+// ../emulator/dist/config/env.js
+function resolveEnvVars2(projectDir, config) {
+  if (!config.env) {
+    return {};
+  }
+  const dotEnv = loadDotEnvSync(projectDir);
+  return resolveEnvVars(config.env, dotEnv, process.env);
+}
+var init_env = __esm({
+  "../emulator/dist/config/env.js"() {
+    init_cli();
+  }
+});
+
 // ../emulator/dist/config/ploy-config.js
 function readPloyConfig2(projectDir, configPath) {
   const config = readPloyConfigSync(projectDir, configPath);
   if (!config.kind) {
-    throw new Error(`Missing required field 'kind' in ${configPath || "ploy.yaml"}`);
+    throw new Error(`Missing required field 'kind' in ${configPath ?? "ploy.yaml"}`);
   }
   if (config.kind !== "dynamic" && config.kind !== "worker") {
-    throw new Error(`Invalid kind '${config.kind}' in ${configPath || "ploy.yaml"}. Must be 'dynamic' or 'worker'`);
+    throw new Error(`Invalid kind '${config.kind}' in ${configPath ?? "ploy.yaml"}. Must be 'dynamic' or 'worker'`);
   }
   return config;
 }
@@ -1444,7 +1513,7 @@ function generateWorkerdConfig(options) {
   const { port, mockServicePort } = options;
   const services = [
     '(name = "main", worker = .worker)',
-    `(name = "mock", external = (address = "localhost:${mockServicePort}", http = ()))`,
+    `(name = "mock", external = (address = "localhost:${String(mockServicePort)}", http = ()))`,
     '(name = "internet", network = (allow = ["public", "private", "local"], tlsOptions = (trustBrowserCas = true)))'
   ];
   const bindings = [
@@ -1458,7 +1527,7 @@ const config :Workerd.Config = (
     ${services.join(",\n    ")}
   ],
   sockets = [
-    (name = "http", address = "*:${port}", http = (), service = "main")
+    (name = "http", address = "*:${String(port)}", http = (), service = "main")
   ]
 );
 
@@ -1664,7 +1733,7 @@ function createAuthHandlers(db) {
       return c.json({ error: message }, 500);
     }
   };
-  const meHandler = async (c) => {
+  const meHandler = (c) => {
     try {
       const cookieToken = getCookie(c, "ploy_session");
       const authHeader = c.req.header("Authorization");
@@ -1708,7 +1777,7 @@ function createAuthHandlers(db) {
       return c.json({ error: message }, 500);
     }
   };
-  const signoutHandler = async (c) => {
+  const signoutHandler = (c) => {
     try {
       const sessionToken = getCookie(c, "ploy_session");
       if (sessionToken) {
@@ -1823,8 +1892,8 @@ function createDashboardRoutes(app, dbManager2, config) {
       if (tableName !== "auth_users" && tableName !== "auth_sessions") {
         return c.json({ error: "Table not found" }, 404);
       }
-      const limit = parseInt(c.req.query("limit") || "50", 10);
-      const offset = parseInt(c.req.query("offset") || "0", 10);
+      const limit = parseInt(c.req.query("limit") ?? "50", 10);
+      const offset = parseInt(c.req.query("offset") ?? "0", 10);
       try {
         const db = dbManager2.emulatorDb;
         const columnsResult = db.prepare(`PRAGMA table_info("${tableName}")`).all();
@@ -2036,8 +2105,8 @@ function createDashboardRoutes(app, dbManager2, config) {
       return c.json({ error: `Database binding '${binding}' not found` }, 404);
     }
     const tableName = c.req.param("tableName");
-    const limit = parseInt(c.req.query("limit") || "50", 10);
-    const offset = parseInt(c.req.query("offset") || "0", 10);
+    const limit = parseInt(c.req.query("limit") ?? "50", 10);
+    const offset = parseInt(c.req.query("offset") ?? "0", 10);
     try {
       const db = dbManager2.getD1Database(resourceName);
       const columnsResult = db.prepare(`PRAGMA table_info("${tableName}")`).all();
@@ -2118,7 +2187,7 @@ function createDashboardRoutes(app, dbManager2, config) {
   app.get("/api/queue/:binding/messages", (c) => {
     const binding = c.req.param("binding");
     const queueName = config.queue?.[binding];
-    const limit = parseInt(c.req.query("limit") || "10", 10);
+    const limit = parseInt(c.req.query("limit") ?? "10", 10);
     if (!queueName) {
       return c.json({ error: "Queue not found" }, 404);
     }
@@ -2145,8 +2214,8 @@ function createDashboardRoutes(app, dbManager2, config) {
   app.get("/api/cache/:binding/entries", (c) => {
     const binding = c.req.param("binding");
     const cacheName = config.cache?.[binding];
-    const limit = parseInt(c.req.query("limit") || "20", 10);
-    const offset = parseInt(c.req.query("offset") || "0", 10);
+    const limit = parseInt(c.req.query("limit") ?? "20", 10);
+    const offset = parseInt(c.req.query("offset") ?? "0", 10);
     const now = Math.floor(Date.now() / 1e3);
     if (!cacheName) {
       return c.json({ error: "Cache binding not found" }, 404);
@@ -2178,9 +2247,9 @@ function createDashboardRoutes(app, dbManager2, config) {
   app.get("/api/state/:binding/entries", (c) => {
     const binding = c.req.param("binding");
     const stateName = config.state?.[binding];
-    const limit = parseInt(c.req.query("limit") || "20", 10);
-    const offset = parseInt(c.req.query("offset") || "0", 10);
-    const search = c.req.query("search") || "";
+    const limit = parseInt(c.req.query("limit") ?? "20", 10);
+    const offset = parseInt(c.req.query("offset") ?? "0", 10);
+    const search = c.req.query("search") ?? "";
     if (!stateName) {
       return c.json({ error: "State binding not found" }, 404);
     }
@@ -2210,7 +2279,7 @@ function createDashboardRoutes(app, dbManager2, config) {
   app.get("/api/workflow/:binding/executions", (c) => {
     const binding = c.req.param("binding");
     const workflowConfig = config.workflow?.[binding];
-    const limit = parseInt(c.req.query("limit") || "20", 10);
+    const limit = parseInt(c.req.query("limit") ?? "20", 10);
     if (!workflowConfig) {
       return c.json({ error: "Workflow not found" }, 404);
     }
@@ -2473,7 +2542,7 @@ function createQueueHandlers(db) {
       const transaction = db.transaction(() => {
         for (const msg of messages) {
           const id = randomUUID();
-          const visibleAt = now + (msg.delaySeconds || 0);
+          const visibleAt = now + (msg.delaySeconds ?? 0);
           insert.run(id, queueName, JSON.stringify(msg.payload), visibleAt);
           messageIds.push(id);
         }
@@ -3102,6 +3171,7 @@ var init_emulator = __esm({
   "../emulator/dist/emulator.js"() {
     init_bundler();
     init_watcher();
+    init_env();
     init_ploy_config2();
     init_workerd_config();
     init_mock_server();
@@ -3119,6 +3189,7 @@ var init_emulator = __esm({
       workerdProcess = null;
       fileWatcher = null;
       queueProcessor = null;
+      resolvedEnvVars = {};
       constructor(options = {}) {
         const port = options.port ?? 8787;
         this.options = {
@@ -3136,20 +3207,24 @@ var init_emulator = __esm({
         try {
           this.config = readPloyConfig2(this.projectDir, this.options.configPath);
           debug(`Loaded config: ${JSON.stringify(this.config)}`, this.options.verbose);
+          this.resolvedEnvVars = resolveEnvVars2(this.projectDir, this.config);
+          if (Object.keys(this.resolvedEnvVars).length > 0) {
+            debug(`Resolved env vars: ${Object.keys(this.resolvedEnvVars).join(", ")}`, this.options.verbose);
+          }
           this.tempDir = ensureTempDir(this.projectDir);
           ensureDataDir(this.projectDir);
           debug(`Temp dir: ${this.tempDir}`, this.options.verbose);
           this.dbManager = initializeDatabases(this.projectDir);
           debug("Initialized databases", this.options.verbose);
-          const workerUrl = `http://${this.options.host}:${this.options.port}`;
+          const workerUrl = `http://${this.options.host}:${String(this.options.port)}`;
           const dashboardPort = this.options.dashboardPort;
           this.mockServer = await startMockServer(this.dbManager, this.config, {
             workerUrl,
             port: dashboardPort,
             dashboardEnabled: true
           });
-          debug(`Mock server started on port ${this.mockServer.port}`, this.options.verbose);
-          const mockServiceUrl = `http://localhost:${this.mockServer.port}`;
+          debug(`Mock server started on port ${String(this.mockServer.port)}`, this.options.verbose);
+          const mockServiceUrl = `http://localhost:${String(this.mockServer.port)}`;
           const entryPoint = getWorkerEntryPoint2(this.projectDir, this.config);
           debug(`Entry point: ${entryPoint}`, this.options.verbose);
           await this.bundle(entryPoint, mockServiceUrl);
@@ -3176,13 +3251,16 @@ var init_emulator = __esm({
             debug(`Watching ${srcDir} for changes`, this.options.verbose);
           }
           if (this.config.queue) {
-            const workerUrl2 = `http://${this.options.host}:${this.options.port}`;
+            const workerUrl2 = `http://${this.options.host}:${String(this.options.port)}`;
             this.queueProcessor = createQueueProcessor(this.dbManager.emulatorDb, this.config.queue, workerUrl2);
             this.queueProcessor.start();
             debug("Queue processor started", this.options.verbose);
           }
-          success(`Emulator running at http://${this.options.host}:${this.options.port}`);
-          log(`  Dashboard: http://${this.options.host}:${this.mockServer.port}`);
+          success(`Emulator running at http://${this.options.host}:${String(this.options.port)}`);
+          log(`  Dashboard: http://${this.options.host}:${String(this.mockServer.port)}`);
+          if (Object.keys(this.resolvedEnvVars).length > 0) {
+            log(`  Env vars: ${Object.keys(this.resolvedEnvVars).join(", ")}`);
+          }
           if (this.config.db) {
             log(`  DB bindings: ${Object.keys(this.config.db).join(", ")}`);
           }
@@ -3211,7 +3289,8 @@ var init_emulator = __esm({
           tempDir: this.tempDir,
           entryPoint,
           config: this.config,
-          mockServiceUrl
+          mockServiceUrl,
+          envVars: this.resolvedEnvVars
         });
       }
       async startWorkerd(configPath) {
@@ -3230,16 +3309,14 @@ var init_emulator = __esm({
             shell: true,
             env: {
               ...process.env,
-              PATH: `${workerdBinDir}:${process.env.PATH || ""}`
+              PATH: `${workerdBinDir}:${process.env.PATH ?? ""}`
             }
           });
           let started = false;
           let stderrOutput = "";
           this.workerdProcess.stdout?.on("data", (data) => {
             const output = data.toString();
-            if (this.options.verbose) {
-              process.stdout.write(output);
-            }
+            log(`[workerd stdout] ${output.trim()}`);
             if (!started && (output.includes("Listening") || output.includes("running"))) {
               started = true;
               resolve(void 0);
@@ -3267,13 +3344,13 @@ var init_emulator = __esm({
           });
           this.workerdProcess.on("exit", (code) => {
             if (code !== 0 && code !== null) {
-              error(`workerd exited with code ${code}`);
+              error(`workerd exited with code ${String(code)}`);
               if (stderrOutput) {
                 error(`workerd stderr: ${stderrOutput.trim()}`);
               }
             }
             if (!started) {
-              reject(new Error(`workerd exited with code ${code}`));
+              reject(new Error(`workerd exited with code ${String(code)}`));
             }
           });
           setTimeout(() => {
@@ -3310,10 +3387,11 @@ var init_emulator = __esm({
         return this.projectDir;
       }
       setupSignalHandlers() {
-        const handler = async () => {
+        const handler = () => {
           log("\nShutting down...");
-          await this.stop();
-          process.exit(0);
+          void this.stop().then(() => {
+            process.exit(0);
+          });
         };
         process.on("SIGINT", handler);
         process.on("SIGTERM", handler);
@@ -3428,7 +3506,7 @@ function createDevD1(databaseId, apiUrl) {
     async batch(statements) {
       const stmts = statements.map((s) => {
         const data = s.__db_data;
-        return data || s;
+        return data ?? s;
       });
       const response = await fetch(`${apiUrl}/db`, {
         method: "POST",
@@ -3488,7 +3566,7 @@ async function initPloyForDev(config) {
   globalThis.__PLOY_DEV_INITIALIZED__ = true;
   const cliMockServerUrl = process.env.PLOY_MOCK_SERVER_URL;
   if (cliMockServerUrl) {
-    const configPath2 = config?.configPath || "./ploy.yaml";
+    const configPath2 = config?.configPath ?? "./ploy.yaml";
     const projectDir2 = process.cwd();
     let ployConfig2;
     try {
@@ -3536,7 +3614,7 @@ async function initPloyForDev(config) {
     console.log(`[Ploy] Using CLI mock server at ${cliMockServerUrl} (${features2.join(", ")})`);
     return;
   }
-  const configPath = config?.configPath || "./ploy.yaml";
+  const configPath = config?.configPath ?? "./ploy.yaml";
   const projectDir = process.cwd();
   let ployConfig;
   try {
@@ -3559,7 +3637,7 @@ async function initPloyForDev(config) {
   ensureDataDir(projectDir);
   dbManager = initializeDatabases(projectDir);
   mockServer = await startMockServer(dbManager, ployConfig, {});
-  const apiUrl = `http://localhost:${mockServer.port}`;
+  const apiUrl = `http://localhost:${String(mockServer.port)}`;
   const env = {};
   if (hasDbBindings && ployConfig.db) {
     for (const [bindingName, databaseId] of Object.entries(ployConfig.db)) {
@@ -3607,13 +3685,15 @@ async function initPloyForDev(config) {
       dbManager.close();
     }
   });
-  process.on("SIGINT", async () => {
-    await cleanup();
-    process.exit(0);
+  process.on("SIGINT", () => {
+    void cleanup().then(() => {
+      process.exit(0);
+    });
   });
-  process.on("SIGTERM", async () => {
-    await cleanup();
-    process.exit(0);
+  process.on("SIGTERM", () => {
+    void cleanup().then(() => {
+      process.exit(0);
+    });
   });
 }
 var PLOY_CONTEXT_SYMBOL, mockServer, dbManager;
@@ -3650,7 +3730,7 @@ async function startDevDashboard(options = {}) {
     port,
     dashboardEnabled: true
   });
-  debug(`Mock server started on port ${mockServer2.port}`, verbose);
+  debug(`Mock server started on port ${String(mockServer2.port)}`, verbose);
   if (config.db) {
     log(`  DB bindings: ${Object.keys(config.db).join(", ")}`);
   }
@@ -3945,8 +4025,8 @@ async function listTables(options) {
     );
     if (error2 || !data) {
       throw new ApiClientError(
-        error2?.message || "Failed to fetch tables",
-        response?.status || 500
+        error2?.message ?? "Failed to fetch tables",
+        response.status
       );
     }
     const tablesResult = data;
@@ -3967,13 +4047,13 @@ async function listTables(options) {
       });
       if (schemaError || !schemaData) {
         throw new ApiClientError(
-          schemaError?.message || "Failed to fetch schema",
-          schemaResponse?.status || 500
+          schemaError?.message ?? "Failed to fetch schema",
+          schemaResponse.status
         );
       }
       const schemaResult = schemaData;
       for (const table of schemaResult.tables) {
-        console.log(`Table: ${table.name}`);
+        console.log(`Table: ${String(table.name)}`);
         console.log("-".repeat(40));
         console.log(
           "  " + "COLUMN".padEnd(20) + "TYPE".padEnd(15) + "NULLABLE".padEnd(10) + "PK"
@@ -3983,7 +4063,7 @@ async function listTables(options) {
           const nullable = col.notNull ? "NO" : "YES";
           const pk = col.primaryKey ? "YES" : "";
           console.log(
-            "  " + col.name.padEnd(20) + col.type.padEnd(15) + nullable.padEnd(10) + pk
+            "  " + String(col.name).padEnd(20) + String(col.type).padEnd(15) + nullable.padEnd(10) + pk
           );
         }
         console.log("");
@@ -3992,7 +4072,7 @@ async function listTables(options) {
       console.log("NAME".padEnd(30) + "ROWS".padEnd(12) + "SIZE");
       console.log("-".repeat(55));
       for (const table of tablesResult.tables) {
-        console.log(table.name.padEnd(30) + "-".padEnd(12) + "-");
+        console.log(String(table.name).padEnd(30) + "-".padEnd(12) + "-");
       }
     }
     console.log("");
@@ -4044,23 +4124,23 @@ async function viewAnalytics(options) {
     );
     if (error2 || !data) {
       throw new ApiClientError(
-        error2?.message || "Failed to fetch analytics",
-        response?.status || 500
+        error2?.message ?? "Failed to fetch analytics",
+        response.status
       );
     }
     const insightsResult = data;
     console.log("Database Analytics");
     console.log("==================");
     console.log("");
-    console.log(`  Period:            ${insightsResult.timeRange}`);
+    console.log(`  Period:            ${String(insightsResult.timeRange)}`);
     console.log(
-      `  Total Queries:     ${insightsResult.summary.totalQueries.toLocaleString()}`
+      `  Total Queries:     ${String(insightsResult.summary.totalQueries.toLocaleString())}`
     );
     console.log(
-      `  Total Rows Read:   ${insightsResult.summary.totalRowsRead.toLocaleString()}`
+      `  Total Rows Read:   ${String(insightsResult.summary.totalRowsRead.toLocaleString())}`
     );
     console.log(
-      `  Total Rows Written: ${insightsResult.summary.totalRowsWritten.toLocaleString()}`
+      `  Total Rows Written: ${String(insightsResult.summary.totalRowsWritten.toLocaleString())}`
     );
     const avgDuration = insightsResult.summary.totalQueries > 0 ? insightsResult.summary.totalDurationMs / insightsResult.summary.totalQueries : 0;
     console.log(`  Avg Query Duration: ${avgDuration.toFixed(2)}ms`);
@@ -4071,15 +4151,21 @@ async function viewAnalytics(options) {
       console.log("");
       for (let i = 0; i < insightsResult.topQueries.length; i++) {
         const insight = insightsResult.topQueries[i];
-        console.log(`${i + 1}. ${truncateQuery(insight.queryText, 60)}`);
-        console.log(`   Calls: ${insight.totalCalls.toLocaleString()}`);
-        console.log(`   Avg Duration: ${insight.avgDurationMs.toFixed(2)}ms`);
         console.log(
-          `   Total Duration: ${insight.totalDurationMs.toFixed(2)}ms`
+          `${String(i + 1)}. ${truncateQuery(String(insight.queryText), 60)}`
+        );
+        console.log(`   Calls: ${String(insight.totalCalls.toLocaleString())}`);
+        console.log(
+          `   Avg Duration: ${String(insight.avgDurationMs.toFixed(2))}ms`
+        );
+        console.log(
+          `   Total Duration: ${String(insight.totalDurationMs.toFixed(2))}ms`
         );
-        console.log(`   Rows Read: ${insight.totalRowsRead.toLocaleString()}`);
         console.log(
-          `   Rows Written: ${insight.totalRowsWritten.toLocaleString()}`
+          `   Rows Read: ${String(insight.totalRowsRead.toLocaleString())}`
+        );
+        console.log(
+          `   Rows Written: ${String(insight.totalRowsWritten.toLocaleString())}`
         );
         console.log("");
       }
@@ -4118,8 +4204,8 @@ async function listDatabases(options) {
     );
     if (error2 || !data) {
       throw new ApiClientError(
-        error2?.message || "Failed to list databases",
-        response?.status || 500
+        error2?.message ?? "Failed to list databases",
+        response.status
       );
     }
     const databases = data.databases;
@@ -4136,10 +4222,10 @@ async function listDatabases(options) {
     );
     console.log("-".repeat(80));
     for (const db of databases) {
-      const id = db.id.substring(0, Math.min(24, db.id.length));
-      const name = db.name.substring(0, Math.min(23, db.name.length)).padEnd(25);
-      const region = (db.region || "-").padEnd(15);
-      const created = db.createdAt ? new Date(db.createdAt).toLocaleDateString() : "-";
+      const id = String(db.id).substring(0, Math.min(24, String(db.id).length));
+      const name = String(db.name).substring(0, Math.min(23, String(db.name).length)).padEnd(25);
+      const region = (String(db.region) || "-").padEnd(15);
+      const created = db.createdAt ? new Date(String(db.createdAt)).toLocaleDateString() : "-";
       console.log(`${id}  ${name}${region}${created}`);
     }
     console.log("");
@@ -4286,8 +4372,8 @@ async function retryDeployment(deploymentId) {
     );
     if (error2 || !data) {
       throw new ApiClientError(
-        error2?.message || "Failed to retry deployment",
-        response?.status || 500
+        error2?.message ?? "Failed to retry deployment",
+        response.status
       );
     }
     const retryResult = data;
@@ -4325,8 +4411,8 @@ async function viewDeploymentLogs(deploymentId, _options) {
     );
     if (error2 || !data) {
       throw new ApiClientError(
-        error2?.message || "Failed to fetch logs",
-        response?.status || 500
+        error2?.message ?? "Failed to fetch logs",
+        response.status
       );
     }
     const logsResult = data;
@@ -4363,8 +4449,8 @@ async function viewDeployment(deploymentId, _options) {
     );
     if (error2 || !data) {
       throw new ApiClientError(
-        error2?.message || "Failed to fetch deployment",
-        response?.status || 500
+        error2?.message ?? "Failed to fetch deployment",
+        response.status
       );
     }
     const deployment = data.deployment;
@@ -4426,14 +4512,14 @@ async function listDeployments(options) {
         query: {
           projectId: options.projectId,
           branch: options.branch,
-          limit: options.limit?.toString() || "20"
+          limit: options.limit?.toString() ?? "20"
         }
       }
     });
     if (error2 || !data) {
       throw new ApiClientError(
-        error2?.message || "Failed to list deployments",
-        response?.status || 500
+        error2?.message ?? "Failed to list deployments",
+        response.status
       );
     }
     const deployments = data.deployments;
@@ -4452,7 +4538,7 @@ async function listDeployments(options) {
     for (const d of deployments) {
       const id = d.id.substring(0, Math.min(10, d.id.length));
       const status = d.status.padEnd(10);
-      const branchSource = d.branch || "-";
+      const branchSource = d.branch ?? "-";
       const branch = branchSource.substring(0, Math.min(18, branchSource.length)).padEnd(20);
       const commit = d.commitSha ? d.commitSha.substring(0, Math.min(8, d.commitSha.length)) : "-";
       const created = new Date(d.createdAt).toLocaleDateString();
@@ -4705,7 +4791,9 @@ async function exchangeCodeForToken(apiUrl, code, redirectUri) {
   });
   if (!response.ok) {
     const errorBody = await response.text();
-    throw new Error(`Token exchange failed: ${response.status} - ${errorBody}`);
+    throw new Error(
+      `Token exchange failed: ${String(response.status)} - ${errorBody}`
+    );
   }
   return await response.json();
 }
@@ -4729,43 +4817,46 @@ function createCallbackServer(expectedState, apiUrl) {
       },
       5 * 60 * 1e3
     );
-    server = createServer(async (req, res) => {
-      const reqUrl = new URL(
-        req.url || "/",
-        `http://${CALLBACK_HOST}:${CALLBACK_PORT}`
-      );
-      if (reqUrl.pathname !== "/callback") {
-        res.writeHead(404);
-        res.end("Not found");
-        return;
-      }
-      const code = reqUrl.searchParams.get("code");
-      const state = reqUrl.searchParams.get("state");
-      const error2 = reqUrl.searchParams.get("error");
-      const errorDescription = reqUrl.searchParams.get("error_description");
-      if (error2) {
-        clearTimeout(timeout);
-        res.writeHead(400, { "Content-Type": "text/html" });
-        res.end(`
+    server = createServer((req, res) => {
+      void (async () => {
+        const reqUrl = new URL(
+          req.url ?? "/",
+          `http://${CALLBACK_HOST}:${String(CALLBACK_PORT)}`
+        );
+        if (reqUrl.pathname !== "/callback") {
+          res.writeHead(404);
+          res.end("Not found");
+          return;
+        }
+        const code = reqUrl.searchParams.get("code");
+        const state = reqUrl.searchParams.get("state");
+        const error2 = reqUrl.searchParams.get("error");
+        const errorDescription = reqUrl.searchParams.get("error_description");
+        if (error2) {
+          clearTimeout(timeout);
+          res.writeHead(400, { "Content-Type": "text/html" });
+          res.end(`
 					<!DOCTYPE html>
 					<html>
 						<head><title>Login Failed</title></head>
 						<body style="font-family: system-ui; padding: 40px; text-align: center;">
 							<h1>Login Failed</h1>
 							<p>Error: ${error2}</p>
-							<p>${errorDescription || ""}</p>
+							<p>${errorDescription ?? ""}</p>
 							<p>You can close this window.</p>
 						</body>
 					</html>
 				`);
-        server?.close();
-        reject(new Error(`OAuth error: ${error2} - ${errorDescription || ""}`));
-        return;
-      }
-      if (!code) {
-        clearTimeout(timeout);
-        res.writeHead(400, { "Content-Type": "text/html" });
-        res.end(`
+          server?.close();
+          reject(
+            new Error(`OAuth error: ${error2} - ${errorDescription ?? ""}`)
+          );
+          return;
+        }
+        if (!code) {
+          clearTimeout(timeout);
+          res.writeHead(400, { "Content-Type": "text/html" });
+          res.end(`
 					<!DOCTYPE html>
 					<html>
 						<head><title>Login Failed</title></head>
@@ -4776,14 +4867,14 @@ function createCallbackServer(expectedState, apiUrl) {
 						</body>
 					</html>
 				`);
-        server?.close();
-        reject(new Error("No authorization code received"));
-        return;
-      }
-      if (state !== expectedState) {
-        clearTimeout(timeout);
-        res.writeHead(400, { "Content-Type": "text/html" });
-        res.end(`
+          server?.close();
+          reject(new Error("No authorization code received"));
+          return;
+        }
+        if (state !== expectedState) {
+          clearTimeout(timeout);
+          res.writeHead(400, { "Content-Type": "text/html" });
+          res.end(`
 					<!DOCTYPE html>
 					<html>
 						<head><title>Login Failed</title></head>
@@ -4794,20 +4885,20 @@ function createCallbackServer(expectedState, apiUrl) {
 						</body>
 					</html>
 				`);
-        server?.close();
-        reject(new Error("State mismatch - possible CSRF attack"));
-        return;
-      }
-      try {
-        const redirectUri = `http://${CALLBACK_HOST}:${CALLBACK_PORT}/callback`;
-        const tokenResponse = await exchangeCodeForToken(
-          apiUrl,
-          code,
-          redirectUri
-        );
-        clearTimeout(timeout);
-        res.writeHead(200, { "Content-Type": "text/html" });
-        res.end(`
+          server?.close();
+          reject(new Error("State mismatch - possible CSRF attack"));
+          return;
+        }
+        try {
+          const redirectUri = `http://${CALLBACK_HOST}:${String(CALLBACK_PORT)}/callback`;
+          const tokenResponse = await exchangeCodeForToken(
+            apiUrl,
+            code,
+            redirectUri
+          );
+          clearTimeout(timeout);
+          res.writeHead(200, { "Content-Type": "text/html" });
+          res.end(`
 					<!DOCTYPE html>
 					<html>
 						<head><title>Login Successful</title></head>
@@ -4818,12 +4909,12 @@ function createCallbackServer(expectedState, apiUrl) {
 						</body>
 					</html>
 				`);
-        server?.close();
-        resolve(tokenResponse);
-      } catch (err) {
-        clearTimeout(timeout);
-        res.writeHead(500, { "Content-Type": "text/html" });
-        res.end(`
+          server?.close();
+          resolve(tokenResponse);
+        } catch (err) {
+          clearTimeout(timeout);
+          res.writeHead(500, { "Content-Type": "text/html" });
+          res.end(`
 					<!DOCTYPE html>
 					<html>
 						<head><title>Login Failed</title></head>
@@ -4835,15 +4926,16 @@ function createCallbackServer(expectedState, apiUrl) {
 						</body>
 					</html>
 				`);
-        server?.close();
-        reject(err instanceof Error ? err : new Error(String(err)));
-      }
+          server?.close();
+          reject(err instanceof Error ? err : new Error(String(err)));
+        }
+      })();
     });
     server.on("error", (err) => {
       clearTimeout(timeout);
       if (err.code === "EADDRINUSE") {
         const portError = new Error(
-          `Port ${CALLBACK_PORT} is already in use. Please close any other process using this port and try again.`
+          `Port ${String(CALLBACK_PORT)} is already in use. Please close any other process using this port and try again.`
         );
         reject(portError);
         rejectListening(portError);
@@ -4862,9 +4954,9 @@ function createCallbackServer(expectedState, apiUrl) {
   return { tokenPromise, waitForListening };
 }
 async function loginCommand(options = {}) {
-  const apiUrl = options.apiUrl || await getApiUrl();
+  const apiUrl = options.apiUrl ?? await getApiUrl();
   const state = generateState();
-  const redirectUri = `http://${CALLBACK_HOST}:${CALLBACK_PORT}/callback`;
+  const redirectUri = `http://${CALLBACK_HOST}:${String(CALLBACK_PORT)}/callback`;
   console.log("Starting login flow...");
   console.log("");
   const authUrl = new URL(`${apiUrl}/oauth/authorize`);
@@ -5160,6 +5252,12 @@ async function updateTsConfigInclude(cwd, outputPath) {
 function generateEnvType(config) {
   const imports = [];
   const properties = [];
+  if (config.env && Object.keys(config.env).length > 0) {
+    const varProps = Object.keys(config.env).map((key) => `		${key}: string;`).join("\n");
+    properties.push(`	vars: {
+${varProps}
+	};`);
+  }
   if (config.ai) {
     properties.push("	AI_URL: string;");
     properties.push("	AI_TOKEN: string;");
@@ -5235,7 +5333,7 @@ async function typesCommand(options = {}) {
     console.error("Error: ploy.yaml not found in current directory");
     process.exit(1);
   }
-  const hasBindings2 = config.ai || config.db || config.queue || config.cache || config.state || config.workflow;
+  const hasBindings2 = config.env || config.ai || config.db || config.queue || config.cache || config.state || config.workflow;
   if (!hasBindings2) {
     console.log("No bindings found in ploy.yaml. Generating empty Env.");
   }