tmp dir handling

Author: alexanderkirtzel

packages/cli/src/__tests__/bundle/bundler.test.ts

@@ -45,7 +45,6 @@ function createBuildOptions(
     minify: false,
     sourcemap: false,
     cache: true,
-    tempDir: '.tmp',
     packages: {},
     code: '',
     ...overrides,

packages/cli/src/__tests__/core/config.test.ts

@@ -1,10 +1,7 @@
 import fs from 'fs-extra';
 import path from 'path';
-import {
-  loadJsonConfig,
-  substituteEnvVariables,
-  getTempDir,
-} from '../../config/index.js';
+import { loadJsonConfig, substituteEnvVariables } from '../../config/index.js';
+import { getTmpPath, getDefaultTmpRoot } from '../../core/tmp.js';
 import { getId } from '@walkeros/core';
 
 describe('Config utilities', () => {
@@ -86,21 +83,30 @@ describe('Config utilities', () => {
     });
   });
 
-  describe('getTempDir', () => {
-    it('should generate unique temp directory', () => {
-      const dir1 = getTempDir();
-      const dir2 = getTempDir();
+  describe('getTmpPath', () => {
+    it('should return absolute tmp root when no arguments', () => {
+      const tmpPath = getTmpPath();
 
-      expect(dir1).not.toBe(dir2);
-      expect(dir1).toContain('cli-');
-      expect(dir2).toContain('cli-');
+      expect(tmpPath).toBe(path.resolve('.tmp'));
+      expect(path.isAbsolute(tmpPath)).toBe(true);
     });
 
-    it('should use custom temp directory name', () => {
-      const customDir = getTempDir('custom-temp');
+    it('should join path segments', () => {
+      const tmpPath = getTmpPath(undefined, 'cache', 'builds');
 
-      expect(customDir).toContain('custom-temp');
-      expect(customDir).toContain('cli-');
+      expect(tmpPath).toBe(path.resolve('.tmp', 'cache', 'builds'));
+      expect(path.isAbsolute(tmpPath)).toBe(true);
+    });
+
+    it('should use custom tmp directory', () => {
+      const tmpPath = getTmpPath('/custom', 'cache');
+
+      expect(tmpPath).toBe(path.join('/custom', 'cache'));
+      expect(path.isAbsolute(tmpPath)).toBe(true);
+    });
+
+    it('should return default tmp root from getDefaultTmpRoot', () => {
+      expect(getDefaultTmpRoot()).toBe('.tmp');
     });
   });
 });

packages/cli/src/commands/bundle/bundler.ts

@@ -6,7 +6,7 @@ import { packageNameToVariable } from '@walkeros/core';
 import type { BuildOptions } from '../../types/bundle.js';
 import { downloadPackages } from './package-manager.js';
 import type { Logger } from '../../core/index.js';
-import { getTempDir } from '../../config/index.js';
+import { getTmpPath } from '../../core/tmp.js';
 import {
   isBuildCached,
   getCachedBuild,
@@ -73,14 +73,8 @@ export async function bundleCore(
   showStats = false,
 ): Promise<BundleStats | void> {
   const bundleStartTime = Date.now();
-  // Only generate a new temp dir if one isn't explicitly provided
-  // This allows simulator to share its temp dir with the bundler
-  // Ensure TEMP_DIR is always absolute (esbuild requirement)
-  const TEMP_DIR = buildOptions.tempDir
-    ? path.isAbsolute(buildOptions.tempDir)
-      ? buildOptions.tempDir
-      : path.resolve(buildOptions.tempDir)
-    : getTempDir();
+  // Use provided temp dir or default .tmp/
+  const TEMP_DIR = buildOptions.tempDir || getTmpPath();
 
   // Check build cache if caching is enabled
   if (buildOptions.cache !== false) {
@@ -123,12 +117,8 @@ export async function bundleCore(
   }
 
   try {
-    // Step 1: Prepare temporary directory
-    // Only clean if we created a new temp dir (don't clean shared simulator temp)
-    if (!buildOptions.tempDir) {
-      await fs.emptyDir(TEMP_DIR);
-    }
-    logger.debug('Cleaned temporary directory');
+    // Step 1: Ensure temporary directory exists
+    await fs.ensureDir(TEMP_DIR);
 
     // Step 2: Download packages
     logger.info('📥 Downloading packages...');
@@ -245,19 +235,10 @@ export async function bundleCore(
       );
     }
 
-    // Step 8: Cleanup
-    // Only cleanup if we created our own temp dir (not shared with simulator)
-    if (!buildOptions.tempDir) {
-      await fs.remove(TEMP_DIR);
-      logger.debug('Cleaned up temporary files');
-    }
+    // No auto-cleanup - user runs `walkeros clean` explicitly
 
     return stats;
   } catch (error) {
-    // Cleanup on error (only if we created our own temp dir)
-    if (!buildOptions.tempDir) {
-      await fs.remove(TEMP_DIR).catch(() => {});
-    }
     throw error;
   }
 }

packages/cli/src/commands/bundle/package-manager.ts

@@ -7,6 +7,7 @@ import {
   copyLocalPackage,
 } from '../../core/index.js';
 import { getPackageCacheKey } from '../../core/cache-utils.js';
+import { getTmpPath } from '../../core/tmp.js';
 
 /** Timeout for individual package downloads (60 seconds) */
 const PACKAGE_DOWNLOAD_TIMEOUT_MS = 60000;
@@ -55,18 +56,18 @@ function getPackageDirectory(
 
 async function getCachedPackagePath(
   pkg: Package,
-  tempDir: string,
+  tmpDir?: string,
 ): Promise<string> {
-  const cacheDir = path.join('.tmp', 'cache', 'packages');
+  const cacheDir = getTmpPath(tmpDir, 'cache', 'packages');
   const cacheKey = await getPackageCacheKey(pkg.name, pkg.version);
   return path.join(cacheDir, cacheKey);
 }
 
 async function isPackageCached(
   pkg: Package,
-  tempDir: string,
+  tmpDir?: string,
 ): Promise<boolean> {
-  const cachedPath = await getCachedPackagePath(pkg, tempDir);
+  const cachedPath = await getCachedPackagePath(pkg, tmpDir);
   return fs.pathExists(cachedPath);
 }
 
@@ -204,9 +205,10 @@ export async function downloadPackages(
     const packageSpec = `${pkg.name}@${pkg.version}`;
     // Use proper node_modules structure: node_modules/@scope/package
     const packageDir = getPackageDirectory(targetDir, pkg.name, pkg.version);
-    const cachedPath = await getCachedPackagePath(pkg, targetDir);
+    // Cache always uses the default .tmp/cache/packages location
+    const cachedPath = await getCachedPackagePath(pkg);
 
-    if (useCache && (await isPackageCached(pkg, targetDir))) {
+    if (useCache && (await isPackageCached(pkg))) {
       logger.debug(`Using cached ${packageSpec}...`);
       try {
         // Ensure parent directories exist for scoped packages (@scope/package)

packages/cli/src/commands/cache.ts

@@ -1,8 +1,6 @@
 import fs from 'fs-extra';
-import path from 'path';
 import { Command } from 'commander';
-
-const CACHE_DIR = path.join('.tmp', 'cache');
+import { getTmpPath, getDefaultTmpRoot } from '../core/tmp.js';
 
 export function registerCacheCommand(program: Command): void {
   const cache = program.command('cache').description('Manage the CLI cache');
@@ -12,35 +10,54 @@ export function registerCacheCommand(program: Command): void {
     .description('Clear all cached packages and builds')
     .option('--packages', 'Clear only package cache')
     .option('--builds', 'Clear only build cache')
+    .option('--tmp-dir <dir>', 'Custom temp directory')
     .action(async (options) => {
+      const tmpDir = options.tmpDir;
       if (options.packages) {
-        await fs.remove(path.join(CACHE_DIR, 'packages'));
+        await fs.remove(getTmpPath(tmpDir, 'cache', 'packages'));
         console.log('Package cache cleared');
       } else if (options.builds) {
-        await fs.remove(path.join(CACHE_DIR, 'builds'));
+        await fs.remove(getTmpPath(tmpDir, 'cache', 'builds'));
         console.log('Build cache cleared');
       } else {
-        await fs.remove(CACHE_DIR);
+        await fs.remove(getTmpPath(tmpDir, 'cache'));
         console.log('All caches cleared');
       }
     });
 
   cache
     .command('info')
     .description('Show cache statistics')
-    .action(async () => {
-      const packagesDir = path.join(CACHE_DIR, 'packages');
-      const buildsDir = path.join(CACHE_DIR, 'builds');
+    .option('--tmp-dir <dir>', 'Custom temp directory')
+    .action(async (options) => {
+      const tmpDir = options.tmpDir;
+      const packagesDir = getTmpPath(tmpDir, 'cache', 'packages');
+      const buildsDir = getTmpPath(tmpDir, 'cache', 'builds');
 
       const packageCount = await countEntries(packagesDir);
       const buildCount = await countEntries(buildsDir);
 
-      console.log(`Cache directory: ${CACHE_DIR}`);
+      console.log(`Cache directory: ${getTmpPath(tmpDir, 'cache')}`);
       console.log(`Cached packages: ${packageCount}`);
       console.log(`Cached builds: ${buildCount}`);
     });
 }
 
+/**
+ * Register the clean command to clear entire temp directory
+ */
+export function registerCleanCommand(program: Command): void {
+  program
+    .command('clean')
+    .description('Clear the entire temp directory (.tmp/)')
+    .option('--tmp-dir <dir>', 'Custom temp directory')
+    .action(async (options) => {
+      const tmpDir = options.tmpDir || getDefaultTmpRoot();
+      await fs.remove(tmpDir);
+      console.log(`Temp directory cleared: ${tmpDir}`);
+    });
+}
+
 async function countEntries(dir: string): Promise<number> {
   if (!(await fs.pathExists(dir))) return 0;
   const entries = await fs.readdir(dir);

packages/cli/src/commands/simulate/simulator.ts

@@ -6,10 +6,10 @@ import { createLogger, getErrorMessage } from '../../core/index.js';
 import {
   loadJsonConfig,
   loadBundleConfig,
-  getTempDir,
   isObject,
   type BuildOptions,
 } from '../../config/index.js';
+import { getTmpPath } from '../../core/tmp.js';
 import { bundleCore } from '../bundle/bundler.js';
 import { CallTracker } from './tracker.js';
 import { executeInJSDOM } from './jsdom-executor.js';
@@ -102,7 +102,7 @@ export async function executeSimulation(
 ): Promise<SimulationResult> {
   const startTime = Date.now();
   let bundlePath: string | undefined;
-  const tempDir = getTempDir();
+  const tempDir = getTmpPath();
 
   try {
     // Validate event format

packages/cli/src/config/build-defaults.ts

@@ -20,7 +20,6 @@ export const WEB_BUILD_DEFAULTS: Omit<BuildOptions, 'output' | 'packages'> = {
   minify: true,
   sourcemap: false,
   cache: true,
-  tempDir: '.tmp',
   windowCollector: 'collector',
   windowElb: 'elb',
 };
@@ -39,7 +38,6 @@ export const SERVER_BUILD_DEFAULTS: Omit<BuildOptions, 'output' | 'packages'> =
     minify: true,
     sourcemap: false,
     cache: true,
-    tempDir: '.tmp',
   };
 
 /**

packages/cli/src/config/index.ts

@@ -28,7 +28,7 @@ export {
   substituteEnvVariables,
   loadJsonConfig,
   loadJsonFromSource,
-  getTempDir,
+  isUrl,
 } from './utils.js';
 
 // Loader

packages/cli/src/config/loader.ts

@@ -15,6 +15,7 @@ import {
   getAvailableFlows as getFlowNames,
 } from './validators.js';
 import { getBuildDefaults, getDefaultOutput } from './build-defaults.js';
+import { isUrl } from './utils.js';
 
 /** Default folder for includes if it exists */
 const DEFAULT_INCLUDE_FOLDER = './shared';
@@ -102,19 +103,15 @@ export function loadBundleConfig(
   // Extract packages from flowConfig (if present)
   const packages = flowConfig.packages || {};
 
-  // Resolve output path relative to config directory
-  let output = getDefaultOutput(platform);
-  if (options.buildOverrides?.output) {
-    output = options.buildOverrides.output;
-  }
-
-  // Get config directory for relative path resolution
-  const configDir = path.dirname(options.configPath);
+  // Output path: use --output if provided, otherwise default
+  // Always relative to cwd, no dynamic resolution
+  const output = options.buildOverrides?.output || getDefaultOutput(platform);
 
-  // Make output path absolute relative to config file
-  if (!path.isAbsolute(output)) {
-    output = path.resolve(configDir, output);
-  }
+  // Get config directory for resolving includes and local packages
+  // For URLs, use cwd since there's no local config directory
+  const configDir = isUrl(options.configPath)
+    ? process.cwd()
+    : path.dirname(options.configPath);
 
   // Get includes from config or use default if ./shared exists
   let includes = setup.include;

packages/cli/src/config/utils.ts

@@ -4,8 +4,8 @@
 
 import fs from 'fs-extra';
 import path from 'path';
-import os from 'os';
 import { getErrorMessage } from '../core/index.js';
+import { getTmpPath } from '../core/tmp.js';
 
 /**
  * Check if a string is a valid URL
@@ -51,15 +51,12 @@ export async function downloadFromUrl(url: string): Promise<string> {
 
     const content = await response.text();
 
-    // Extract filename from URL or generate one
-    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}`;
+    // Write to .tmp/downloads/ directory
+    const downloadsDir = getTmpPath(undefined, 'downloads');
+    await fs.ensureDir(downloadsDir);
 
-    // Write to system temp directory
-    const tempPath = path.join(os.tmpdir(), filename);
+    // Use a consistent filename - always re-downloaded fresh anyway
+    const tempPath = path.join(downloadsDir, 'flow.json');
     await fs.writeFile(tempPath, content, 'utf-8');
 
     return tempPath;
@@ -146,26 +143,6 @@ export async function loadJsonConfig<T>(configPath: string): Promise<T> {
   }
 }
 
-/**
- * Generate a unique temporary directory path.
- *
- * @param tempDir - Base temporary directory (default: ".tmp")
- * @returns Absolute path to unique temp directory
- *
- * @example
- * ```typescript
- * getTempDir() // "/workspaces/project/.tmp/cli-1647261462000-abc123"
- * getTempDir('/tmp') // "/tmp/cli-1647261462000-abc123"
- * ```
- */
-export function getTempDir(tempDir = '.tmp'): string {
-  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}`);
-}
-
 /**
  * Load JSON from inline string, file path, or URL.
  *