tova 0.2.9 → 0.3.1

package/bin/tova.js

@@ -9,11 +9,13 @@ import { Parser } from '../src/parser/parser.js';
 import { Analyzer } from '../src/analyzer/analyzer.js';
 import { Program } from '../src/parser/ast.js';
 import { CodeGenerator } from '../src/codegen/codegen.js';
-import { richError, formatDiagnostics, DiagnosticFormatter } from '../src/diagnostics/formatter.js';
+import { richError, formatDiagnostics, DiagnosticFormatter, formatSummary } from '../src/diagnostics/formatter.js';
+import { getExplanation, lookupCode } from '../src/diagnostics/error-codes.js';
 import { getFullStdlib, buildSelectiveStdlib, BUILTIN_NAMES, PROPAGATE } from '../src/stdlib/inline.js';
 import { Formatter } from '../src/formatter/formatter.js';
 import { REACTIVITY_SOURCE, RPC_SOURCE, ROUTER_SOURCE } from '../src/runtime/embedded.js';
 import '../src/runtime/string-proto.js';
+import '../src/runtime/array-proto.js';
 import { resolveConfig } from '../src/config/resolve.js';
 import { writePackageJson } from '../src/config/package-json.js';
 import { addToSection, removeFromSection } from '../src/config/edit-toml.js';
@@ -35,6 +37,8 @@ Usage:
 Commands:
   run <file>       Compile and execute a .tova file
   build [dir]      Compile .tova files to JavaScript (default: current dir)
+  check [dir]      Type-check .tova files without generating code
+  clean            Delete .tova-out build artifacts
   dev              Start development server with live reload
   new <name>       Create a new Tova project
   install          Install npm dependencies from tova.toml
@@ -43,17 +47,25 @@ Commands:
   repl             Start interactive Tova REPL
   lsp              Start Language Server Protocol server
   fmt <file>      Format a .tova file (--check to verify only)
-  test [dir]      Run test blocks in .tova files (--filter, --watch)
+  test [dir]      Run test blocks in .tova files (--filter, --watch, --coverage, --serial)
+  bench [dir]     Run bench blocks in .tova files
+  doc [dir]       Generate documentation from /// docstrings
+  init             Initialize a Tova project in the current directory
   migrate:create <name>   Create a new migration file
   migrate:up [file.tova]   Run pending migrations
   migrate:status [file.tova] Show migration status
+  upgrade          Upgrade Tova to the latest version
+  info             Show Tova version, Bun version, project config, and installed dependencies
+  explain <code>   Show detailed explanation for an error/warning code (e.g., tova explain E202)
 
 Options:
   --help, -h       Show this help message
   --version, -v    Show version
   --output, -o     Output directory (default: .tova-out)
   --production     Production build (minify, bundle, hash)
-  --watch          Watch for file changes
+  --watch          Watch for file changes and rebuild
+  --verbose        Show detailed output during compilation
+  --quiet          Suppress non-error output
   --debug          Show verbose error output
   --strict         Enable strict type checking
 `;
@@ -75,14 +87,26 @@ async function main() {
 
   const isStrict = args.includes('--strict');
   switch (command) {
-    case 'run':
-      await runFile(args.filter(a => a !== '--strict')[1], { strict: isStrict });
+    case 'run': {
+      const runArgs = args.filter(a => a !== '--strict');
+      const filePath = runArgs[1];
+      const restArgs = runArgs.slice(2);
+      const ddIdx = restArgs.indexOf('--');
+      const scriptArgs = ddIdx !== -1 ? restArgs.slice(ddIdx + 1) : restArgs;
+      await runFile(filePath, { strict: isStrict, scriptArgs });
       break;
+    }
     case 'build':
-      buildProject(args.slice(1));
+      await buildProject(args.slice(1));
+      break;
+    case 'check':
+      await checkProject(args.slice(1));
+      break;
+    case 'clean':
+      cleanBuild(args.slice(1));
       break;
     case 'dev':
-      devServer(args.slice(1));
+      await devServer(args.slice(1));
       break;
     case 'repl':
       await startRepl();
@@ -93,6 +117,9 @@ async function main() {
     case 'new':
       newProject(args[1]);
       break;
+    case 'init':
+      initProject();
+      break;
     case 'install':
       await installDeps();
       break;
@@ -108,18 +135,62 @@ async function main() {
     case 'test':
       await runTests(args.slice(1));
       break;
+    case 'bench':
+      await runBench(args.slice(1));
+      break;
+    case 'doc':
+      await generateDocs(args.slice(1));
+      break;
     case 'migrate:create':
       migrateCreate(args[1]);
       break;
     case 'migrate:up':
       await migrateUp(args.slice(1));
       break;
+    case 'migrate:down':
+      await migrateDown(args.slice(1));
+      break;
+    case 'migrate:reset':
+      await migrateReset(args.slice(1));
+      break;
+    case 'migrate:fresh':
+      await migrateFresh(args.slice(1));
+      break;
     case 'migrate:status':
       await migrateStatus(args.slice(1));
       break;
+    case 'explain': {
+      const code = args[1];
+      if (!code) {
+        console.error('Usage: tova explain <error-code>  (e.g., tova explain E202)');
+        process.exit(1);
+      }
+      const info = lookupCode(code);
+      if (!info) {
+        console.error(`Unknown error code: ${code}`);
+        process.exit(1);
+      }
+      const explanation = getExplanation(code);
+      console.log(`\n  ${code}: ${info.title} [${info.category}]\n`);
+      if (explanation) {
+        console.log(explanation);
+      } else {
+        console.log(`  No detailed explanation available yet for ${code}.\n`);
+      }
+      break;
+    }
+    case 'upgrade':
+      await upgradeCommand();
+      break;
+    case 'info':
+      await infoCommand();
+      break;
     default:
       if (command.endsWith('.tova')) {
-        await runFile(command, { strict: isStrict });
+        const directArgs = args.filter(a => a !== '--strict').slice(1);
+        const ddIdx = directArgs.indexOf('--');
+        const scriptArgs = ddIdx !== -1 ? directArgs.slice(ddIdx + 1) : directArgs;
+        await runFile(command, { strict: isStrict, scriptArgs });
       } else {
         console.error(`Unknown command: ${command}`);
         console.log(HELP);
@@ -143,7 +214,7 @@ function compileTova(source, filename, options = {}) {
   if (warnings.length > 0) {
     const formatter = new DiagnosticFormatter(source, filename);
     for (const w of warnings) {
-      console.warn(formatter.formatWarning(w.message, { line: w.line, column: w.column }));
+      console.warn(formatter.formatWarning(w.message, { line: w.line, column: w.column }, { hint: w.hint, code: w.code, length: w.length, fix: w.fix }));
     }
   }
 
@@ -205,15 +276,23 @@ function formatFile(args) {
 async function runTests(args) {
   const filterPattern = args.find((a, i) => args[i - 1] === '--filter') || null;
   const watchMode = args.includes('--watch');
+  const coverageMode = args.includes('--coverage');
+  const serialMode = args.includes('--serial');
   const targetDir = args.find(a => !a.startsWith('--') && a !== filterPattern) || '.';
 
-  // Find all .tova files with test blocks
+  // Find all .tova files with test blocks + dedicated test files (*.test.tova, *_test.tova)
   const tovaFiles = findTovaFiles(resolve(targetDir));
   const testFiles = [];
 
   for (const file of tovaFiles) {
+    const base = basename(file);
+    // Dedicated test files are always included
+    if (base.endsWith('.test.tova') || base.endsWith('_test.tova')) {
+      testFiles.push(file);
+      continue;
+    }
     const source = readFileSync(file, 'utf-8');
-    // Quick check for test blocks
+    // Quick check for inline test blocks
     if (/\btest\s+["'{]/m.test(source) || /\btest\s*\{/m.test(source)) {
       testFiles.push(file);
     }
@@ -235,7 +314,17 @@ async function runTests(args) {
   for (const file of testFiles) {
     try {
       const source = readFileSync(file, 'utf-8');
-      const lexer = new Lexer(source, file);
+      const base = basename(file);
+      const isDedicatedTestFile = base.endsWith('.test.tova') || base.endsWith('_test.tova');
+
+      // For dedicated test files without explicit test blocks, wrap entire file in one
+      let sourceToCompile = source;
+      if (isDedicatedTestFile && !/\btest\s+["'{]/m.test(source) && !/\btest\s*\{/m.test(source)) {
+        const testName = base.replace(/\.(test|_test)\.tova$/, '').replace(/_test\.tova$/, '');
+        sourceToCompile = `test "${testName}" {\n${source}\n}`;
+      }
+
+      const lexer = new Lexer(sourceToCompile, file);
       const tokens = lexer.tokenize();
       const parser = new Parser(tokens, file);
       const ast = parser.parse();
@@ -273,6 +362,13 @@ async function runTests(args) {
   if (filterPattern) {
     bunArgs.push('-t', filterPattern);
   }
+  if (coverageMode) {
+    bunArgs.push('--coverage');
+  }
+  if (serialMode) {
+    // Force sequential execution (bun runs files in parallel by default)
+    bunArgs.push('--concurrency', '1');
+  }
 
   const runBunTest = () => {
     return new Promise((res) => {
@@ -299,6 +395,113 @@ async function runTests(args) {
   }
 }
 
+async function runBench(args) {
+  const targetDir = args.find(a => !a.startsWith('--')) || '.';
+  const tovaFiles = findTovaFiles(resolve(targetDir));
+  const benchFiles = [];
+
+  for (const file of tovaFiles) {
+    const source = readFileSync(file, 'utf-8');
+    if (/\bbench\s+["'{]/m.test(source) || /\bbench\s*\{/m.test(source)) {
+      benchFiles.push(file);
+    }
+  }
+
+  if (benchFiles.length === 0) {
+    console.log('No bench files found.');
+    return;
+  }
+
+  console.log(`Found ${benchFiles.length} bench file(s)\n`);
+
+  const tmpDir = resolve('.tova-bench-out');
+  if (!existsSync(tmpDir)) mkdirSync(tmpDir, { recursive: true });
+
+  for (const file of benchFiles) {
+    try {
+      const source = readFileSync(file, 'utf-8');
+      const lexer = new Lexer(source, file);
+      const tokens = lexer.tokenize();
+      const parser = new Parser(tokens, file);
+      const ast = parser.parse();
+
+      const codegen = new CodeGenerator(ast, file);
+      const result = codegen.generate();
+
+      if (result.bench) {
+        const relPath = relative(resolve(targetDir), file).replace(/\.tova$/, '.bench.js');
+        const outPath = join(tmpDir, relPath);
+        const outDir = dirname(outPath);
+        if (!existsSync(outDir)) mkdirSync(outDir, { recursive: true });
+
+        const stdlib = getFullStdlib();
+        const fullBench = stdlib + '\n' + result.bench;
+        writeFileSync(outPath, fullBench);
+        console.log(`  Compiled: ${relative('.', file)}`);
+
+        // Run the bench file
+        console.log('');
+        const proc = spawn('bun', ['run', outPath], { stdio: 'inherit' });
+        await new Promise(res => proc.on('close', res));
+        console.log('');
+      }
+    } catch (err) {
+      console.error(`  Error compiling ${relative('.', file)}: ${err.message}`);
+    }
+  }
+}
+
+async function generateDocs(args) {
+  const { DocGenerator } = await import('../src/docs/generator.js');
+  const outputDir = args.find((a, i) => args[i - 1] === '--output' || args[i - 1] === '-o') || 'docs-out';
+  const format = args.find((a, i) => args[i - 1] === '--format') || 'html';
+  const targetDir = args.find(a => !a.startsWith('--') && a !== outputDir && a !== format) || '.';
+
+  const tovaFiles = findTovaFiles(resolve(targetDir));
+  if (tovaFiles.length === 0) {
+    console.log('No .tova files found.');
+    return;
+  }
+
+  const modules = [];
+  for (const file of tovaFiles) {
+    try {
+      const source = readFileSync(file, 'utf-8');
+      // Quick check: skip files without docstrings
+      if (!source.includes('///')) continue;
+
+      const lexer = new Lexer(source, file);
+      const tokens = lexer.tokenize();
+      const parser = new Parser(tokens, file);
+      const ast = parser.parse();
+      const name = relative(resolve(targetDir), file).replace(/\.tova$/, '').replace(/[/\\]/g, '.');
+      modules.push({ name, ast });
+    } catch (err) {
+      console.error(`  Error parsing ${relative('.', file)}: ${err.message}`);
+    }
+  }
+
+  if (modules.length === 0) {
+    console.log('No documented .tova files found (add /// docstrings to your code).');
+    return;
+  }
+
+  const generator = new DocGenerator(modules);
+  const pages = generator.generate(format);
+
+  const outDir = resolve(outputDir);
+  if (!existsSync(outDir)) mkdirSync(outDir, { recursive: true });
+
+  let count = 0;
+  for (const [filename, content] of Object.entries(pages)) {
+    const outPath = join(outDir, filename);
+    writeFileSync(outPath, content);
+    count++;
+  }
+
+  console.log(`Generated ${count} documentation file(s) in ${relative('.', outDir)}/`);
+}
+
 function findTovaFiles(dir) {
   const files = [];
   if (!existsSync(dir) || !statSync(dir).isDirectory()) return files;
@@ -347,16 +550,48 @@ async function runFile(filePath, options = {}) {
   const source = readFileSync(resolved, 'utf-8');
 
   try {
+    // Check if file has .tova imports — if so, compile dependencies and inline them
+    const hasTovaImports = /import\s+(?:\{[^}]*\}|[\w$]+|\*\s+as\s+[\w$]+)\s+from\s+['"][^'"]*\.tova['"]/m.test(source);
+
     const output = compileTova(source, filePath, { strict: options.strict });
 
     // Execute the generated JavaScript (with stdlib)
     const AsyncFunction = Object.getPrototypeOf(async function(){}).constructor;
     const stdlib = getRunStdlib();
-    let code = stdlib + '\n' + (output.shared || '') + '\n' + (output.server || output.client || '');
+
+    // Compile .tova dependencies and inline them
+    let depCode = '';
+    if (hasTovaImports) {
+      const importRegex = /import\s+(?:\{[^}]*\}|[\w$]+|\*\s+as\s+[\w$]+)\s+from\s+['"]([^'"]*\.tova)['"]/gm;
+      let match;
+      const compiled = new Set();
+      while ((match = importRegex.exec(source)) !== null) {
+        const depPath = resolve(dirname(resolved), match[1]);
+        if (compiled.has(depPath)) continue;
+        compiled.add(depPath);
+        if (existsSync(depPath)) {
+          const depSource = readFileSync(depPath, 'utf-8');
+          const dep = compileTova(depSource, depPath, { strict: options.strict });
+          let depShared = dep.shared || '';
+          // Strip export keywords for inlining
+          depShared = depShared.replace(/^export /gm, '');
+          depCode += depShared + '\n';
+        }
+      }
+    }
+
+    let code = stdlib + '\n' + depCode + (output.shared || '') + '\n' + (output.server || output.client || '');
     // Strip 'export ' keywords — not valid inside AsyncFunction (used in tova build only)
     code = code.replace(/^export /gm, '');
-    const fn = new AsyncFunction(code);
-    await fn();
+    // Strip import lines for .tova files (already inlined above)
+    code = code.replace(/^import\s+(?:\{[^}]*\}|[\w$]+|\*\s+as\s+[\w$]+)\s+from\s+['"][^'"]*\.(?:tova|(?:shared\.)?js)['"];?\s*$/gm, '');
+    // Auto-call main() if the compiled code defines a main function
+    const scriptArgs = options.scriptArgs || [];
+    if (/\bfunction\s+main\s*\(/.test(code)) {
+      code += '\nconst __tova_exit = await main(__tova_args); if (typeof __tova_exit === "number") process.exitCode = __tova_exit;\n';
+    }
+    const fn = new AsyncFunction('__tova_args', '__tova_filename', '__tova_dirname', code);
+    await fn(scriptArgs, resolved, dirname(resolved));
   } catch (err) {
     console.error(richError(source, err, filePath));
     if (process.argv.includes('--debug') || process.env.DEBUG) {
@@ -372,6 +607,9 @@ async function buildProject(args) {
   const config = resolveConfig(process.cwd());
   const isProduction = args.includes('--production');
   const buildStrict = args.includes('--strict');
+  const isVerbose = args.includes('--verbose');
+  const isQuiet = args.includes('--quiet');
+  const isWatch = args.includes('--watch');
   const explicitSrc = args.filter(a => !a.startsWith('--'))[0];
   const srcDir = resolve(explicitSrc || config.project.entry || '.');
   const outIdx = args.indexOf('--output');
@@ -397,18 +635,56 @@ async function buildProject(args) {
   writeFileSync(join(runtimeDest, 'rpc.js'), RPC_SOURCE);
   writeFileSync(join(runtimeDest, 'router.js'), ROUTER_SOURCE);
 
-  console.log(`\n  Building ${tovaFiles.length} file(s)...\n`);
+  if (!isQuiet) console.log(`\n  Building ${tovaFiles.length} file(s)...\n`);
 
   let errorCount = 0;
+  const buildStart = Date.now();
   compilationCache.clear();
 
+  // Load incremental build cache
+  const noCache = args.includes('--no-cache');
+  const buildCache = new BuildCache(join(outDir, '.cache'));
+  if (!noCache) buildCache.load();
+  let skippedCount = 0;
+
   // Group files by directory for multi-file merging
   const dirGroups = groupFilesByDirectory(tovaFiles);
 
   for (const [dir, files] of dirGroups) {
     const dirName = basename(dir) === '.' ? 'app' : basename(dir);
     const relDir = relative(srcDir, dir) || '.';
+    const groupStart = Date.now();
     try {
+      // Check incremental cache: skip if all files in this group are unchanged
+      if (!noCache) {
+        if (files.length === 1) {
+          const absFile = files[0];
+          const sourceContent = readFileSync(absFile, 'utf-8');
+          if (buildCache.isUpToDate(absFile, sourceContent)) {
+            const cached = buildCache.getCached(absFile);
+            if (cached) {
+              skippedCount++;
+              if (isVerbose && !isQuiet) {
+                console.log(`  ○ ${relative(srcDir, absFile)} (cached)`);
+              }
+              continue;
+            }
+          }
+        } else {
+          const dirKey = `dir:${dir}`;
+          if (buildCache.isGroupUpToDate(dirKey, files)) {
+            const cached = buildCache.getCached(dirKey);
+            if (cached) {
+              skippedCount++;
+              if (isVerbose && !isQuiet) {
+                console.log(`  ○ ${relative(srcDir, dir)}/ (${files.length} files, cached)`);
+              }
+              continue;
+            }
+          }
+        }
+      }
+
       const result = mergeDirectory(dir, srcDir, { strict: buildStrict });
       if (!result) continue;
 
@@ -416,6 +692,8 @@ async function buildProject(args) {
       // Use single-file basename for single-file dirs, directory name for multi-file
       const outBaseName = single ? basename(files[0], '.tova') : dirName;
       const relLabel = single ? relative(srcDir, files[0]) : `${relDir}/ (${files.length} files merged)`;
+      const elapsed = Date.now() - groupStart;
+      const timing = isVerbose ? ` (${elapsed}ms)` : '';
 
       // Helper to generate source maps
       const generateSourceMap = (code, jsFile) => {
@@ -433,44 +711,80 @@ async function buildProject(args) {
         return code;
       };
 
-      // Write shared
-      if (output.shared && output.shared.trim()) {
-        const sharedPath = join(outDir, `${outBaseName}.shared.js`);
-        writeFileSync(sharedPath, generateSourceMap(output.shared, sharedPath));
-        console.log(`  ✓ ${relLabel} → ${relative('.', sharedPath)}`);
-      }
+      // Module files: write single <name>.js (not .shared.js)
+      if (output.isModule) {
+        if (output.shared && output.shared.trim()) {
+          const modulePath = join(outDir, `${outBaseName}.js`);
+          writeFileSync(modulePath, generateSourceMap(output.shared, modulePath));
+          if (!isQuiet) console.log(`  ✓ ${relLabel} → ${relative('.', modulePath)}${timing}`);
+        }
+        // Update incremental build cache
+        if (!noCache) {
+          const outputPaths = {};
+          if (output.shared && output.shared.trim()) outputPaths.shared = join(outDir, `${outBaseName}.js`);
+          if (single) {
+            const absFile = files[0];
+            const sourceContent = readFileSync(absFile, 'utf-8');
+            buildCache.set(absFile, sourceContent, outputPaths);
+          } else {
+            buildCache.setGroup(`dir:${dir}`, files, outputPaths);
+          }
+        }
+      } else {
+        // Write shared
+        if (output.shared && output.shared.trim()) {
+          const sharedPath = join(outDir, `${outBaseName}.shared.js`);
+          writeFileSync(sharedPath, generateSourceMap(output.shared, sharedPath));
+          if (!isQuiet) console.log(`  ✓ ${relLabel} → ${relative('.', sharedPath)}${timing}`);
+        }
 
-      // Write default server
-      if (output.server) {
-        const serverPath = join(outDir, `${outBaseName}.server.js`);
-        writeFileSync(serverPath, generateSourceMap(output.server, serverPath));
-        console.log(`  ✓ ${relLabel} → ${relative('.', serverPath)}`);
-      }
+        // Write default server
+        if (output.server) {
+          const serverPath = join(outDir, `${outBaseName}.server.js`);
+          writeFileSync(serverPath, generateSourceMap(output.server, serverPath));
+          if (!isQuiet) console.log(`  ✓ ${relLabel} → ${relative('.', serverPath)}${timing}`);
+        }
 
-      // Write default client
-      if (output.client) {
-        const clientPath = join(outDir, `${outBaseName}.client.js`);
-        writeFileSync(clientPath, generateSourceMap(output.client, clientPath));
-        console.log(`  ✓ ${relLabel} → ${relative('.', clientPath)}`);
-      }
-
-      // Write named server blocks (multi-block)
-      if (output.multiBlock && output.servers) {
-        for (const [name, code] of Object.entries(output.servers)) {
-          if (name === 'default') continue;
-          const path = join(outDir, `${outBaseName}.server.${name}.js`);
-          writeFileSync(path, code);
-          console.log(`  ✓ ${relLabel} → ${relative('.', path)} [server:${name}]`);
+        // Write default client
+        if (output.client) {
+          const clientPath = join(outDir, `${outBaseName}.client.js`);
+          writeFileSync(clientPath, generateSourceMap(output.client, clientPath));
+          if (!isQuiet) console.log(`  ✓ ${relLabel} → ${relative('.', clientPath)}${timing}`);
         }
-      }
 
-      // Write named client blocks (multi-block)
-      if (output.multiBlock && output.clients) {
-        for (const [name, code] of Object.entries(output.clients)) {
-          if (name === 'default') continue;
-          const path = join(outDir, `${outBaseName}.client.${name}.js`);
-          writeFileSync(path, code);
-          console.log(`  ✓ ${relLabel} → ${relative('.', path)} [client:${name}]`);
+        // Write named server blocks (multi-block)
+        if (output.multiBlock && output.servers) {
+          for (const [name, code] of Object.entries(output.servers)) {
+            if (name === 'default') continue;
+            const path = join(outDir, `${outBaseName}.server.${name}.js`);
+            writeFileSync(path, code);
+            if (!isQuiet) console.log(`  ✓ ${relLabel} → ${relative('.', path)} [server:${name}]${timing}`);
+          }
+        }
+
+        // Write named client blocks (multi-block)
+        if (output.multiBlock && output.clients) {
+          for (const [name, code] of Object.entries(output.clients)) {
+            if (name === 'default') continue;
+            const path = join(outDir, `${outBaseName}.client.${name}.js`);
+            writeFileSync(path, code);
+            if (!isQuiet) console.log(`  ✓ ${relLabel} → ${relative('.', path)} [client:${name}]${timing}`);
+          }
+        }
+
+        // Update incremental build cache
+        if (!noCache) {
+          const outputPaths = {};
+          if (output.shared && output.shared.trim()) outputPaths.shared = join(outDir, `${outBaseName}.shared.js`);
+          if (output.server) outputPaths.server = join(outDir, `${outBaseName}.server.js`);
+          if (output.client) outputPaths.client = join(outDir, `${outBaseName}.client.js`);
+          if (single) {
+            const absFile = files[0];
+            const sourceContent = readFileSync(absFile, 'utf-8');
+            buildCache.set(absFile, sourceContent, outputPaths);
+          } else {
+            buildCache.setGroup(`dir:${dir}`, files, outputPaths);
+          }
         }
       }
     } catch (err) {
@@ -479,9 +793,150 @@ async function buildProject(args) {
     }
   }
 
+  // Save incremental build cache and prune stale entries
+  if (!noCache) {
+    const dirKeys = [...dirGroups.keys()].map(d => `dir:${d}`);
+    buildCache.prune(tovaFiles, dirKeys);
+    buildCache.save();
+  }
+
   const dirCount = dirGroups.size;
-  console.log(`\n  Build complete. ${dirCount - errorCount}/${dirCount} directory group(s) succeeded.\n`);
+  const totalElapsed = Date.now() - buildStart;
+  if (!isQuiet) {
+    const timingStr = isVerbose ? ` in ${totalElapsed}ms` : '';
+    const cachedStr = skippedCount > 0 ? ` (${skippedCount} cached)` : '';
+    console.log(`\n  Build complete. ${dirCount - errorCount}/${dirCount} directory group(s) succeeded${cachedStr}${timingStr}.\n`);
+  }
   if (errorCount > 0) process.exit(1);
+
+  // Watch mode for build command
+  if (isWatch) {
+    console.log('  Watching for changes...\n');
+    let debounceTimer = null;
+    const watcher = fsWatch(srcDir, { recursive: true }, (event, filename) => {
+      if (!filename || !filename.endsWith('.tova')) return;
+      if (debounceTimer) clearTimeout(debounceTimer);
+      debounceTimer = setTimeout(async () => {
+        compilationCache.clear();
+        if (!isQuiet) console.log(`  Rebuilding (${filename} changed)...`);
+        await buildProject(args.filter(a => a !== '--watch'));
+        if (!isQuiet) console.log('  Watching for changes...\n');
+      }, 100);
+    });
+    // Keep process alive
+    await new Promise(() => {});
+  }
+}
+
+// ─── Check (type-check only, no codegen) ────────────────────
+
+async function checkProject(args) {
+  const checkStrict = args.includes('--strict');
+  const isVerbose = args.includes('--verbose');
+  const isQuiet = args.includes('--quiet');
+
+  // --explain <code>: show explanation for a specific error code inline with check output
+  const explainIdx = args.indexOf('--explain');
+  const explainCode = explainIdx >= 0 ? args[explainIdx + 1] : null;
+  if (explainCode) {
+    // If --explain is used standalone, just show the explanation
+    const info = lookupCode(explainCode);
+    if (!info) {
+      console.error(`Unknown error code: ${explainCode}`);
+      process.exit(1);
+    }
+    const explanation = getExplanation(explainCode);
+    console.log(`\n  ${explainCode}: ${info.title} [${info.category}]\n`);
+    if (explanation) {
+      console.log(explanation);
+    } else {
+      console.log(`  No detailed explanation available yet for ${explainCode}.\n`);
+    }
+    process.exit(0);
+  }
+
+  const explicitSrc = args.filter(a => !a.startsWith('--'))[0];
+  const srcDir = resolve(explicitSrc || '.');
+
+  const tovaFiles = findFiles(srcDir, '.tova');
+  if (tovaFiles.length === 0) {
+    console.error('No .tova files found');
+    process.exit(1);
+  }
+
+  let totalErrors = 0;
+  let totalWarnings = 0;
+  const seenCodes = new Set();
+
+  for (const file of tovaFiles) {
+    const relPath = relative(srcDir, file);
+    const start = Date.now();
+    try {
+      const source = readFileSync(file, 'utf-8');
+      const lexer = new Lexer(source, file);
+      const tokens = lexer.tokenize();
+      const parser = new Parser(tokens, file);
+      const ast = parser.parse();
+      const analyzer = new Analyzer(ast, file, { strict: checkStrict, tolerant: true });
+      const result = analyzer.analyze();
+
+      const errors = result.errors || [];
+      const warnings = result.warnings || [];
+      totalErrors += errors.length;
+      totalWarnings += warnings.length;
+
+      if (errors.length > 0 || warnings.length > 0) {
+        const formatter = new DiagnosticFormatter(source, file);
+        for (const e of errors) {
+          console.error(formatter.formatError(e.message, { line: e.line, column: e.column }, { hint: e.hint, code: e.code, length: e.length, fix: e.fix }));
+          if (e.code) seenCodes.add(e.code);
+        }
+        for (const w of warnings) {
+          console.warn(formatter.formatWarning(w.message, { line: w.line, column: w.column }, { hint: w.hint, code: w.code, length: w.length, fix: w.fix }));
+          if (w.code) seenCodes.add(w.code);
+        }
+      }
+
+      if (isVerbose) {
+        const elapsed = Date.now() - start;
+        console.log(`  ✓ ${relPath} (${elapsed}ms)`);
+      }
+    } catch (err) {
+      totalErrors++;
+      if (err.errors) {
+        const source = readFileSync(file, 'utf-8');
+        console.error(richError(source, err, file));
+      } else {
+        console.error(`  ✗ ${relPath}: ${err.message}`);
+      }
+    }
+  }
+
+  if (!isQuiet) {
+    console.log(`\n  ${tovaFiles.length} file${tovaFiles.length === 1 ? '' : 's'} checked, ${formatSummary(totalErrors, totalWarnings)}`);
+    // Show explain hint for encountered error codes
+    if (seenCodes.size > 0 && (totalErrors > 0 || totalWarnings > 0)) {
+      const codes = [...seenCodes].sort().slice(0, 5).join(', ');
+      const more = seenCodes.size > 5 ? ` and ${seenCodes.size - 5} more` : '';
+      console.log(`\n  Run \`tova explain <code>\` for details on: ${codes}${more}`);
+    }
+    console.log('');
+  }
+  if (totalErrors > 0) process.exit(1);
+}
+
+// ─── Clean (delete build artifacts) ─────────────────────────
+
+function cleanBuild(args) {
+  const config = resolveConfig(process.cwd());
+  const outDir = resolve(config.build?.output || '.tova-out');
+
+  if (existsSync(outDir)) {
+    rmSync(outDir, { recursive: true, force: true });
+    console.log(`  Cleaned ${relative('.', outDir)}/`);
+  } else {
+    console.log(`  Nothing to clean (${relative('.', outDir)}/ does not exist)`);
+  }
 }
 
 // ─── Dev Server ─────────────────────────────────────────────
@@ -1025,6 +1480,98 @@ tova add prettier --dev
   console.log(`    tova dev\n`);
 }
 
+// ─── Init (in-place) ────────────────────────────────────────
+
+function initProject() {
+  const projectDir = process.cwd();
+  const name = basename(projectDir);
+
+  if (existsSync(join(projectDir, 'tova.toml'))) {
+    console.error('Error: tova.toml already exists in this directory');
+    process.exit(1);
+  }
+
+  console.log(`\n  Initializing Tova project: ${name}\n`);
+
+  // tova.toml
+  const tomlContent = stringifyTOML({
+    project: {
+      name,
+      version: '0.1.0',
+      description: '',
+      entry: 'src',
+    },
+    build: {
+      output: '.tova-out',
+    },
+    dev: {
+      port: 3000,
+    },
+    dependencies: {},
+    npm: {},
+  });
+  writeFileSync(join(projectDir, 'tova.toml'), tomlContent);
+  console.log('  ✓ Created tova.toml');
+
+  // src/ directory
+  mkdirSync(join(projectDir, 'src'), { recursive: true });
+
+  // .gitignore (only if missing)
+  const gitignorePath = join(projectDir, '.gitignore');
+  if (!existsSync(gitignorePath)) {
+    writeFileSync(gitignorePath, `node_modules/
+.tova-out/
+package.json
+bun.lock
+*.db
+*.db-shm
+*.db-wal
+`);
+    console.log('  ✓ Created .gitignore');
+  }
+
+  // Starter app.tova (only if src/ has no .tova files)
+  const srcDir = join(projectDir, 'src');
+  const existingTova = existsSync(srcDir) ? readdirSync(srcDir).filter(f => f.endsWith('.tova')) : [];
+  if (existingTova.length === 0) {
+    writeFileSync(join(srcDir, 'app.tova'), `// ${name} — Built with Tova
+
+shared {
+  type Message {
+    text: String
+  }
+}
+
+server {
+  fn get_message() -> Message {
+    Message("Hello from Tova!")
+  }
+
+  route GET "/api/message" => get_message
+}
+
+client {
+  state message = ""
+
+  effect {
+    result = server.get_message()
+    message = result.text
+  }
+
+  component App {
+    <div class="app">
+      <h1>"{message}"</h1>
+      <p>"Edit src/app.tova to get started."</p>
+    </div>
+  }
+}
+`);
+    console.log('  ✓ Created src/app.tova');
+  }
+
+  console.log(`\n  Project initialized. Run 'tova dev' to start.\n`);
+}
+
 // ─── Package Management ─────────────────────────────────────
 
 async function installDeps() {
@@ -1059,6 +1606,8 @@ async function addDep(args) {
   if (!pkg) {
     console.error('Error: No package specified');
     console.error('Usage: tova add <package> [--dev]');
+    console.error('       tova add npm:<package>   — add an npm package');
+    console.error('       tova add <tova-package>  — add a Tova package (local path or git URL)');
     process.exit(1);
   }
 
@@ -1071,44 +1620,100 @@ async function addDep(args) {
     process.exit(1);
   }
 
-  // Parse package name and version
-  let name = pkg;
-  let version = 'latest';
-  if (pkg.includes('@') && !pkg.startsWith('@')) {
-    const atIdx = pkg.lastIndexOf('@');
-    name = pkg.slice(0, atIdx);
-    version = pkg.slice(atIdx + 1);
-  } else if (pkg.startsWith('@') && pkg.includes('@', 1)) {
-    // Scoped package with version: @scope/name@version
-    const atIdx = pkg.lastIndexOf('@');
-    name = pkg.slice(0, atIdx);
-    version = pkg.slice(atIdx + 1);
+  // Determine if this is an npm package or a Tova native dependency
+  const isNpm = pkg.startsWith('npm:');
+  const actualPkg = isNpm ? pkg.slice(4) : pkg;
+
+  if (isNpm) {
+    // npm package handling (existing behavior)
+    let name = actualPkg;
+    let version = 'latest';
+    if (actualPkg.includes('@') && !actualPkg.startsWith('@')) {
+      const atIdx = actualPkg.lastIndexOf('@');
+      name = actualPkg.slice(0, atIdx);
+      version = actualPkg.slice(atIdx + 1);
+    } else if (actualPkg.startsWith('@') && actualPkg.includes('@', 1)) {
+      const atIdx = actualPkg.lastIndexOf('@');
+      name = actualPkg.slice(0, atIdx);
+      version = actualPkg.slice(atIdx + 1);
+    }
+
+    if (version === 'latest') {
+      try {
+        const proc = spawn('npm', ['view', name, 'version'], { stdio: ['pipe', 'pipe', 'pipe'] });
+        let out = '';
+        proc.stdout.on('data', d => out += d);
+        const code = await new Promise(res => proc.on('close', res));
+        if (code === 0 && out.trim()) {
+          version = `^${out.trim()}`;
+        } else {
+          version = '*';
+        }
+      } catch {
+        version = '*';
+      }
+    }
+
+    const section = isDev ? 'npm.dev' : 'npm';
+    addToSection(tomlPath, section, name, version);
+    console.log(`  Added ${name}@${version} to [${section}] in tova.toml`);
+    await installDeps();
+  } else {
+    // Tova native dependency
+    let name = actualPkg;
+    let source = actualPkg;
+
+    // Detect source type
+    if (actualPkg.startsWith('file:') || actualPkg.startsWith('./') || actualPkg.startsWith('../') || actualPkg.startsWith('/')) {
+      // Local path dependency
+      source = actualPkg.startsWith('file:') ? actualPkg : `file:${actualPkg}`;
+      name = basename(actualPkg.replace(/^file:/, ''));
+    } else if (actualPkg.startsWith('git:') || actualPkg.includes('github.com/') || actualPkg.includes('.git')) {
+      // Git dependency
+      source = actualPkg.startsWith('git:') ? actualPkg : `git:${actualPkg}`;
+      name = basename(actualPkg.replace(/\.git$/, '').replace(/^git:/, ''));
+    } else {
+      // Tova registry package (future: for now, just store the name)
+      source = `*`;
+    }
+
+    addToSection(tomlPath, 'dependencies', name, source);
+    console.log(`  Added ${name} = "${source}" to [dependencies] in tova.toml`);
+
+    // Generate lock file
+    generateLockFile(cwd);
+  }
+}
+
+function generateLockFile(cwd) {
+  const config = resolveConfig(cwd);
+  const deps = config.dependencies || {};
+  const npmProd = config.npm?.prod || {};
+  const npmDev = config.npm?.dev || {};
+
+  const lock = {
+    version: 1,
+    generated: new Date().toISOString(),
+    dependencies: {},
+    npm: {},
+  };
+
+  for (const [name, source] of Object.entries(deps)) {
+    lock.dependencies[name] = {
+      source,
+      resolved: source, // For now, resolved = source
+    };
   }
 
-  // If version is 'latest', resolve it via npm registry
-  if (version === 'latest') {
-    try {
-      const proc = spawn('npm', ['view', name, 'version'], { stdio: ['pipe', 'pipe', 'pipe'] });
-      let out = '';
-      proc.stdout.on('data', d => out += d);
-      const code = await new Promise(res => proc.on('close', res));
-      if (code === 0 && out.trim()) {
-        version = `^${out.trim()}`;
-      } else {
-        version = '*';
-      }
-    } catch {
-      version = '*';
-    }
+  for (const [name, version] of Object.entries(npmProd)) {
+    lock.npm[name] = { version, dev: false };
+  }
+  for (const [name, version] of Object.entries(npmDev)) {
+    lock.npm[name] = { version, dev: true };
   }
 
-  const section = isDev ? 'npm.dev' : 'npm';
-  addToSection(tomlPath, section, name, version);
-
-  console.log(`  Added ${name}@${version} to [${section}] in tova.toml`);
-
-  // Run install
-  await installDeps();
+  const lockPath = join(cwd, 'tova.lock');
+  writeFileSync(lockPath, JSON.stringify(lock, null, 2) + '\n');
 }
 
 async function removeDep(pkg) {
@@ -1126,8 +1731,9 @@ async function removeDep(pkg) {
     process.exit(1);
   }
 
-  // Try removing from [npm] first, then [npm.dev]
-  const removed = removeFromSection(tomlPath, 'npm', pkg) ||
+  // Try removing from [dependencies], [npm], or [npm.dev]
+  const removed = removeFromSection(tomlPath, 'dependencies', pkg) ||
+                  removeFromSection(tomlPath, 'npm', pkg) ||
                   removeFromSection(tomlPath, 'npm.dev', pkg);
 
   if (removed) {
@@ -1302,7 +1908,7 @@ async function migrateUp(args) {
         await db.exec(sql);
       }
       const ph = db.driver === 'postgres' ? '$1' : '?';
-      await db.exec(`INSERT INTO __migrations (name) VALUES ('${file.replace(/'/g, "''")}')`);
+      await db.query(`INSERT INTO __migrations (name) VALUES (${ph})`, file);
       console.log(`  ✓ ${file}`);
     }
 
@@ -1312,6 +1918,170 @@ async function migrateUp(args) {
   }
 }
 
+async function migrateDown(args) {
+  const tovaFile = findTovaFile(args[0]);
+  const cfg = discoverDbConfig(tovaFile);
+  const db = await connectDb(cfg);
+
+  try {
+    await db.exec(`CREATE TABLE IF NOT EXISTS __migrations (
+      id INTEGER PRIMARY KEY ${db.driver === 'postgres' ? 'GENERATED ALWAYS AS IDENTITY' : 'AUTOINCREMENT'},
+      name TEXT NOT NULL UNIQUE,
+      applied_at TEXT DEFAULT (${db.driver === 'postgres' ? "NOW()::TEXT" : "datetime('now')"})
+    )`);
+
+    const applied = await db.query('SELECT name FROM __migrations ORDER BY name DESC');
+    if (applied.length === 0) {
+      console.log('\n  No migrations to roll back.\n');
+      return;
+    }
+
+    const migrDir = resolve('migrations');
+    const lastMigration = applied[0].name;
+
+    console.log(`\n  Rolling back: ${lastMigration}...\n`);
+
+    const mod = await import(join(migrDir, lastMigration));
+    if (!mod.down) {
+      console.error(`  Error: ${lastMigration} has no 'down' export — cannot roll back`);
+      process.exit(1);
+    }
+
+    const sql = mod.down.trim();
+    if (sql) {
+      await db.exec(sql);
+    }
+
+    await db.exec(`DELETE FROM __migrations WHERE name = '${lastMigration}'`);
+    console.log(`  ✓ Rolled back: ${lastMigration}`);
+    console.log(`\n  Done.\n`);
+  } finally {
+    await db.close();
+  }
+}
+
+async function migrateReset(args) {
+  const tovaFile = findTovaFile(args[0]);
+  const cfg = discoverDbConfig(tovaFile);
+  const db = await connectDb(cfg);
+
+  try {
+    await db.exec(`CREATE TABLE IF NOT EXISTS __migrations (
+      id INTEGER PRIMARY KEY ${db.driver === 'postgres' ? 'GENERATED ALWAYS AS IDENTITY' : 'AUTOINCREMENT'},
+      name TEXT NOT NULL UNIQUE,
+      applied_at TEXT DEFAULT (${db.driver === 'postgres' ? "NOW()::TEXT" : "datetime('now')"})
+    )`);
+
+    const applied = await db.query('SELECT name FROM __migrations ORDER BY name DESC');
+    if (applied.length === 0) {
+      console.log('\n  No migrations to roll back.\n');
+      return;
+    }
+
+    const migrDir = resolve('migrations');
+    console.log(`\n  Rolling back ${applied.length} migration(s)...\n`);
+
+    for (const row of applied) {
+      const file = row.name;
+      try {
+        const mod = await import(join(migrDir, file));
+        if (mod.down) {
+          const sql = mod.down.trim();
+          if (sql) {
+            await db.exec(sql);
+          }
+        } else {
+          console.error(`  ⚠ ${file} has no 'down' export — skipping rollback`);
+          continue;
+        }
+      } catch (e) {
+        console.error(`  ⚠ Error rolling back ${file}: ${e.message}`);
+        continue;
+      }
+      await db.exec(`DELETE FROM __migrations WHERE name = '${file}'`);
+      console.log(`  ✓ Rolled back: ${file}`);
+    }
+
+    console.log(`\n  Done. All migrations rolled back.\n`);
+  } finally {
+    await db.close();
+  }
+}
+
+async function migrateFresh(args) {
+  const tovaFile = findTovaFile(args[0]);
+  const cfg = discoverDbConfig(tovaFile);
+  const db = await connectDb(cfg);
+
+  try {
+    // Drop all tables
+    console.log('\n  Dropping all tables...\n');
+    if (db.driver === 'sqlite') {
+      const tables = await db.query("SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'");
+      for (const t of tables) {
+        await db.exec(`DROP TABLE IF EXISTS "${t.name}"`);
+        console.log(`  ✓ Dropped: ${t.name}`);
+      }
+    } else if (db.driver === 'postgres') {
+      const tables = await db.query("SELECT tablename FROM pg_tables WHERE schemaname = 'public'");
+      for (const t of tables) {
+        await db.exec(`DROP TABLE IF EXISTS "${t.tablename}" CASCADE`);
+        console.log(`  ✓ Dropped: ${t.tablename}`);
+      }
+    } else if (db.driver === 'mysql') {
+      const tables = await db.query("SHOW TABLES");
+      for (const t of tables) {
+        const tableName = Object.values(t)[0];
+        await db.exec(`DROP TABLE IF EXISTS \`${tableName}\``);
+        console.log(`  ✓ Dropped: ${tableName}`);
+      }
+    }
+
+    // Re-create migrations table and run all migrations
+    await db.exec(`CREATE TABLE IF NOT EXISTS __migrations (
+      id INTEGER PRIMARY KEY ${db.driver === 'postgres' ? 'GENERATED ALWAYS AS IDENTITY' : 'AUTOINCREMENT'},
+      name TEXT NOT NULL UNIQUE,
+      applied_at TEXT DEFAULT (${db.driver === 'postgres' ? "NOW()::TEXT" : "datetime('now')"})
+    )`);
+
+    const migrDir = resolve('migrations');
+    if (!existsSync(migrDir)) {
+      console.log('  No migrations directory found.\n');
+      return;
+    }
+
+    const files = readdirSync(migrDir)
+      .filter(f => f.endsWith('.js'))
+      .sort();
+
+    if (files.length === 0) {
+      console.log('  No migration files found.\n');
+      return;
+    }
+
+    console.log(`\n  Running ${files.length} migration(s)...\n`);
+
+    for (const file of files) {
+      const mod = await import(join(migrDir, file));
+      if (!mod.up) {
+        console.error(`  Skipping ${file}: no 'up' export`);
+        continue;
+      }
+      const sql = mod.up.trim();
+      if (sql) {
+        await db.exec(sql);
+      }
+      const ph = db.driver === 'postgres' ? '$1' : '?';
+      await db.query(`INSERT INTO __migrations (name) VALUES (${ph})`, file);
+      console.log(`  ✓ ${file}`);
+    }
+
+    console.log(`\n  Done. Fresh database with ${files.length} migration(s) applied.\n`);
+  } finally {
+    await db.close();
+  }
+}
+
 async function migrateStatus(args) {
   const tovaFile = findTovaFile(args[0]);
   const cfg = discoverDbConfig(tovaFile);
@@ -1440,14 +2210,147 @@ async function startLsp() {
 
 async function startRepl() {
   const readline = await import('readline');
+
+  // ─── ANSI color helpers ──────────────────────────
+  const c = {
+    reset: '\x1b[0m',
+    keyword: '\x1b[35m',    // magenta
+    string: '\x1b[32m',     // green
+    number: '\x1b[33m',     // yellow
+    boolean: '\x1b[33m',    // yellow
+    comment: '\x1b[90m',    // gray
+    builtin: '\x1b[36m',    // cyan
+    type: '\x1b[34m',       // blue
+    nil: '\x1b[90m',        // gray
+    prompt: '\x1b[1;36m',   // bold cyan
+    result: '\x1b[90m',     // gray
+    typeHint: '\x1b[2;36m', // dim cyan
+  };
+
+  const KEYWORDS = new Set([
+    'fn', 'let', 'var', 'if', 'elif', 'else', 'for', 'while', 'loop', 'when',
+    'in', 'return', 'match', 'type', 'import', 'from', 'and', 'or', 'not',
+    'try', 'catch', 'finally', 'break', 'continue', 'async', 'await',
+    'guard', 'interface', 'derive', 'pub', 'impl', 'trait', 'defer',
+    'yield', 'extern', 'is', 'with', 'as', 'export', 'server', 'client', 'shared',
+  ]);
+
+  const TYPE_NAMES = new Set([
+    'Int', 'Float', 'String', 'Bool', 'Nil', 'Any', 'Result', 'Option',
+    'Function', 'List', 'Object', 'Promise',
+  ]);
+
+  const RUNTIME_NAMES = new Set(['Ok', 'Err', 'Some', 'None', 'true', 'false', 'nil']);
+
+  // ─── Syntax highlighter ──────────────────────────
+  function highlight(line) {
+    let out = '';
+    let i = 0;
+    while (i < line.length) {
+      // Comments
+      if (line[i] === '/' && line[i + 1] === '/') {
+        out += c.comment + line.slice(i) + c.reset;
+        break;
+      }
+      // Strings
+      if (line[i] === '"' || line[i] === "'" || line[i] === '`') {
+        const quote = line[i];
+        let j = i + 1;
+        // Handle triple-quoted strings
+        if (quote === '"' && line[j] === '"' && line[j + 1] === '"') {
+          j += 2;
+          while (j < line.length && !(line[j] === '"' && line[j + 1] === '"' && line[j + 2] === '"')) j++;
+          if (j < line.length) j += 3;
+          out += c.string + line.slice(i, j) + c.reset;
+          i = j;
+          continue;
+        }
+        while (j < line.length && line[j] !== quote) {
+          if (line[j] === '\\') j++;
+          j++;
+        }
+        if (j < line.length) j++;
+        out += c.string + line.slice(i, j) + c.reset;
+        i = j;
+        continue;
+      }
+      // Numbers
+      if (/[0-9]/.test(line[i]) && (i === 0 || !/[a-zA-Z_]/.test(line[i - 1]))) {
+        let j = i;
+        while (j < line.length && /[0-9._eExXbBoO]/.test(line[j])) j++;
+        out += c.number + line.slice(i, j) + c.reset;
+        i = j;
+        continue;
+      }
+      // Identifiers and keywords
+      if (/[a-zA-Z_]/.test(line[i])) {
+        let j = i;
+        while (j < line.length && /[a-zA-Z0-9_]/.test(line[j])) j++;
+        const word = line.slice(i, j);
+        if (KEYWORDS.has(word)) {
+          out += c.keyword + word + c.reset;
+        } else if (TYPE_NAMES.has(word)) {
+          out += c.type + word + c.reset;
+        } else if (RUNTIME_NAMES.has(word)) {
+          out += c.boolean + word + c.reset;
+        } else if (BUILTIN_NAMES.has(word)) {
+          out += c.builtin + word + c.reset;
+        } else {
+          out += word;
+        }
+        i = j;
+        continue;
+      }
+      out += line[i];
+      i++;
+    }
+    return out;
+  }
+
+  // ─── Tab completions ─────────────────────────────
+  const completionWords = [
+    ...KEYWORDS, ...TYPE_NAMES, ...RUNTIME_NAMES, ...BUILTIN_NAMES,
+    ':quit', ':exit', ':help', ':clear', ':type',
+  ];
+  const userDefinedNames = new Set();
+
+  function completer(line) {
+    const allWords = [...new Set([...completionWords, ...userDefinedNames])];
+    // Find the last word being typed
+    const match = line.match(/([a-zA-Z_:][a-zA-Z0-9_]*)$/);
+    if (!match) return [[], line];
+    const prefix = match[1];
+    const hits = allWords.filter(w => w.startsWith(prefix));
+    return [hits, prefix];
+  }
+
+  // ─── Type display helper ─────────────────────────
+  function inferType(val) {
+    if (val === null || val === undefined) return 'Nil';
+    if (Array.isArray(val)) {
+      if (val.length === 0) return '[_]';
+      const elemType = inferType(val[0]);
+      return `[${elemType}]`;
+    }
+    if (val?.__tag) return val.__tag;
+    if (typeof val === 'number') return Number.isInteger(val) ? 'Int' : 'Float';
+    if (typeof val === 'string') return 'String';
+    if (typeof val === 'boolean') return 'Bool';
+    if (typeof val === 'function') return 'Function';
+    if (typeof val === 'object') return 'Object';
+    return 'Unknown';
+  }
+
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
-    prompt: 'tova> ',
+    prompt: `${c.prompt}tova>${c.reset} `,
+    completer,
   });
 
   console.log(`\n  Tova REPL v${VERSION}`);
-  console.log('  Type expressions to evaluate. Use :quit to exit.\n');
+  console.log('  Type expressions to evaluate. Use :quit to exit.');
+  console.log('  Use _ to reference the last result. Tab for completions.\n');
 
   const context = {};
   const stdlib = getStdlibForRuntime();
@@ -1461,7 +2364,7 @@ async function startRepl() {
 
   rl.prompt();
 
-  rl.on('line', (line) => {
+  rl.on('line', async (line) => {
     const trimmed = line.trim();
 
     if (trimmed === ':quit' || trimmed === ':exit' || trimmed === ':q') {
@@ -1473,7 +2376,29 @@ async function startRepl() {
     if (trimmed === ':help') {
       console.log('  :quit    Exit the REPL');
       console.log('  :help    Show this help');
-      console.log('  :clear   Clear context\n');
+      console.log('  :clear   Clear context');
+      console.log('  :type    Show inferred type of expression');
+      console.log('  _        Reference the last result');
+      console.log('  Tab      Autocomplete keywords, builtins, and variables\n');
+      rl.prompt();
+      return;
+    }
+
+    if (trimmed.startsWith(':type ')) {
+      const expr = trimmed.slice(6).trim();
+      try {
+        const output = compileTova(expr, '<repl>');
+        const code = output.shared || '';
+        const ctxKeys = Object.keys(context).filter(k => k !== '__mutable');
+        const destructure = ctxKeys.length > 0 ? `const {${ctxKeys.join(',')}} = __ctx;\n` : '';
+        // REPL context: evaluating user-provided Tova expressions (intentional dynamic eval)
+        const fn = new Function('__ctx', `${destructure}return (${code.replace(/;$/, '')});`);
+        const val = fn(context);
+        const typeStr = val === null ? 'Nil' : Array.isArray(val) ? 'List' : val?.__tag ? val.__tag : typeof val === 'number' ? (Number.isInteger(val) ? 'Int' : 'Float') : typeof val === 'string' ? 'String' : typeof val === 'boolean' ? 'Bool' : typeof val === 'function' ? 'Function' : typeof val === 'object' ? 'Object' : 'Unknown';
+        console.log(`  ${expr} : ${typeStr}`);
+      } catch (err) {
+        console.error(`  Error: ${err.message}`);
+      }
       rl.prompt();
       return;
     }
@@ -1482,11 +2407,68 @@ async function startRepl() {
       for (const key of Object.keys(context)) delete context[key];
       delete context.__mutable;
       initFn.call(context);
+      userDefinedNames.clear();
       console.log('  Context cleared.\n');
       rl.prompt();
       return;
     }
 
+    // Handle import statements
+    const tovaImportMatch = trimmed.match(/^import\s+\{([^}]+)\}\s+from\s+['"]([^'"]*\.tova)['"]\s*$/);
+    const npmImportNamedMatch = !tovaImportMatch && trimmed.match(/^import\s+\{([^}]+)\}\s+from\s+['"]([^'"]+)['"]\s*$/);
+    const npmImportDefaultMatch = !tovaImportMatch && !npmImportNamedMatch && trimmed.match(/^import\s+([\w$]+)\s+from\s+['"]([^'"]+)['"]\s*$/);
+
+    if (tovaImportMatch) {
+      // .tova file import: compile and inject into context
+      const names = tovaImportMatch[1].split(',').map(n => n.trim()).filter(Boolean);
+      const modulePath = resolve(process.cwd(), tovaImportMatch[2]);
+      try {
+        if (!existsSync(modulePath)) {
+          throw new Error(`Module not found: ${tovaImportMatch[2]}`);
+        }
+        const modSource = readFileSync(modulePath, 'utf-8');
+        const modOutput = compileTova(modSource, modulePath);
+        let modCode = (modOutput.shared || '');
+        // Strip export keywords
+        modCode = modCode.replace(/^export /gm, '');
+        // REPL context: executing compiled Tova module code (intentional dynamic eval)
+        const modFn = new Function('__ctx', modCode + '\n' + names.map(n => `__ctx.${n} = ${n};`).join('\n'));
+        modFn(context);
+        console.log(`  Imported { ${names.join(', ')} } from ${tovaImportMatch[2]}`);
+      } catch (err) {
+        console.error(`  Error: ${err.message}`);
+      }
+      rl.prompt();
+      return;
+    }
+
+    if (npmImportNamedMatch || npmImportDefaultMatch) {
+      // npm/JS module import via dynamic import()
+      const moduleName = (npmImportNamedMatch || npmImportDefaultMatch)[2];
+      try {
+        const mod = await import(moduleName);
+        if (npmImportNamedMatch) {
+          const names = npmImportNamedMatch[1].split(',').map(n => n.trim()).filter(Boolean);
+          for (const name of names) {
+            if (name in mod) {
+              context[name] = mod[name];
+            } else {
+              console.error(`  Warning: '${name}' not found in '${moduleName}'`);
+            }
+          }
+          console.log(`  Imported { ${names.join(', ')} } from ${moduleName}`);
+        } else {
+          const name = npmImportDefaultMatch[1];
+          context[name] = mod.default || mod;
+          console.log(`  Imported ${name} from ${moduleName}`);
+        }
+      } catch (err) {
+        console.error(`  Error: ${err.message}`);
+      }
+      rl.prompt();
+      return;
+    }
+
     buffer += (buffer ? '\n' : '') + line;
 
     // Track open braces for multi-line input (skip braces inside strings)
@@ -1504,7 +2486,7 @@ async function startRepl() {
     }
 
     if (braceDepth > 0) {
-      process.stdout.write('...  ');
+      process.stdout.write(`${c.prompt}...${c.reset}  `);
       return;
     }
 
@@ -1518,10 +2500,11 @@ async function startRepl() {
       if (code.trim()) {
         // Extract function/const/let names from compiled code
         const declaredInCode = new Set();
-        for (const m of code.matchAll(/\bfunction\s+([a-zA-Z_]\w*)/g)) declaredInCode.add(m[1]);
-        for (const m of code.matchAll(/\bconst\s+([a-zA-Z_]\w*)/g)) declaredInCode.add(m[1]);
+        for (const m of code.matchAll(/\bfunction\s+([a-zA-Z_]\w*)/g)) { declaredInCode.add(m[1]); userDefinedNames.add(m[1]); }
+        for (const m of code.matchAll(/\bconst\s+([a-zA-Z_]\w*)/g)) { declaredInCode.add(m[1]); userDefinedNames.add(m[1]); }
         for (const m of code.matchAll(/\blet\s+([a-zA-Z_]\w*)/g)) {
           declaredInCode.add(m[1]);
+          userDefinedNames.add(m[1]);
           // Track mutable variables for proper let destructuring
           if (!context.__mutable) context.__mutable = new Set();
           context.__mutable.add(m[1]);
@@ -1569,7 +2552,9 @@ async function startRepl() {
           const fn = new Function('__ctx', `${destructure}${evalCode}`);
           const result = fn(context);
           if (result !== undefined) {
-            console.log(' ', result);
+            context._ = result; // Save as last result
+            const typeStr = inferType(result);
+            console.log(`  ${result} ${c.typeHint}: ${typeStr}${c.reset}`);
           }
         } catch (e) {
           // If return-wrapping fails, fall back to plain execution
@@ -1804,11 +2789,14 @@ async function productionBuild(srcDir, outDir) {
     console.log(`  index.html`);
   }
 
-  // Try to use Bun.build for minification if available
-  try {
-    const clientFiles = readdirSync(outDir).filter(f => f.startsWith('client.') && f.endsWith('.js'));
-    for (const f of clientFiles) {
-      const filePath = join(outDir, f);
+  // Minify all JS bundles using Bun's built-in transpiler
+  const jsFiles = readdirSync(outDir).filter(f => f.endsWith('.js') && !f.endsWith('.min.js'));
+  let minified = 0;
+  for (const f of jsFiles) {
+    const filePath = join(outDir, f);
+    const minPath = join(outDir, f.replace('.js', '.min.js'));
+    try {
+      // Use Bun.build for proper minification with tree-shaking
       const result = await Bun.build({
         entrypoints: [filePath],
         outdir: outDir,
@@ -1816,20 +2804,184 @@ async function productionBuild(srcDir, outDir) {
         naming: f.replace('.js', '.min.js'),
       });
       if (result.success) {
-        console.log(`  ${f.replace('.js', '.min.js')} (minified)`);
+        const originalSize = statSync(filePath).size;
+        const minSize = statSync(minPath).size;
+        const ratio = ((1 - minSize / originalSize) * 100).toFixed(0);
+        console.log(`  ${f.replace('.js', '.min.js')} (${_formatBytes(minSize)}, ${ratio}% smaller)`);
+        minified++;
+      }
+    } catch {
+      // Bun.build not available — fall back to simple whitespace stripping
+      try {
+        const source = readFileSync(filePath, 'utf-8');
+        const stripped = _simpleMinify(source);
+        writeFileSync(minPath, stripped);
+        const originalSize = Buffer.byteLength(source);
+        const minSize = Buffer.byteLength(stripped);
+        const ratio = ((1 - minSize / originalSize) * 100).toFixed(0);
+        console.log(`  ${f.replace('.js', '.min.js')} (${_formatBytes(minSize)}, ${ratio}% smaller)`);
+        minified++;
+      } catch {
+        // Skip files that can't be minified
       }
     }
-  } catch (e) {
-    // Bun.build not available, skip minification
+  }
+
+  if (minified === 0 && jsFiles.length > 0) {
+    console.log('  (minification skipped — Bun.build unavailable)');
   }
 
   console.log(`\n  Production build complete.\n`);
 }
 
+// Simple minification fallback: strip comments and collapse whitespace
+function _simpleMinify(code) {
+  // Strip single-line comments (but not URLs with //)
+  let result = code.replace(/(?<![:"'])\/\/[^\n]*/g, '');
+  // Strip multi-line comments
+  result = result.replace(/\/\*[\s\S]*?\*\//g, '');
+  // Collapse multiple blank lines
+  result = result.replace(/\n{3,}/g, '\n\n');
+  // Trim trailing whitespace from each line
+  result = result.replace(/[ \t]+$/gm, '');
+  return result.trim();
+}
+
+function _formatBytes(bytes) {
+  if (bytes < 1024) return `${bytes} B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
+  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+}
+
+// ─── Incremental Build Cache ─────────────────────────────────
+
+class BuildCache {
+  constructor(cacheDir) {
+    this._cacheDir = cacheDir;
+    this._manifest = null; // { files: { [absPath]: { hash, outputs: {...} } } }
+  }
+
+  _manifestPath() {
+    return join(this._cacheDir, 'manifest.json');
+  }
+
+  _hashContent(content) {
+    return createHash('sha256').update(content).digest('hex').slice(0, 16);
+  }
+
+  load() {
+    try {
+      if (existsSync(this._manifestPath())) {
+        this._manifest = JSON.parse(readFileSync(this._manifestPath(), 'utf-8'));
+      }
+    } catch {
+      this._manifest = null;
+    }
+    if (!this._manifest) this._manifest = { files: {} };
+  }
+
+  save() {
+    mkdirSync(this._cacheDir, { recursive: true });
+    writeFileSync(this._manifestPath(), JSON.stringify(this._manifest, null, 2));
+  }
+
+  // Check if a source file is unchanged since last build
+  isUpToDate(absPath, sourceContent) {
+    if (!this._manifest) return false;
+    const entry = this._manifest.files[absPath];
+    if (!entry) return false;
+    return entry.hash === this._hashContent(sourceContent);
+  }
+
+  // Check if a multi-file group (directory) is unchanged since last build
+  isGroupUpToDate(dirKey, files) {
+    if (!this._manifest) return false;
+    const entry = this._manifest.files[dirKey];
+    if (!entry) return false;
+    return entry.hash === this._hashGroup(files);
+  }
+
+  // Hash multiple files together for group caching
+  _hashGroup(files) {
+    const hash = createHash('sha256');
+    for (const f of files.slice().sort()) {
+      hash.update(f);
+      hash.update(readFileSync(f, 'utf-8'));
+    }
+    return hash.digest('hex').slice(0, 16);
+  }
+
+  // Store compiled output for a multi-file group
+  setGroup(dirKey, files, outputs) {
+    if (!this._manifest) this._manifest = { files: {} };
+    this._manifest.files[dirKey] = {
+      hash: this._hashGroup(files),
+      outputs,
+      timestamp: Date.now(),
+    };
+  }
+
+  // Get cached compiled output for a source file
+  getCached(absPath) {
+    if (!this._manifest) return null;
+    const entry = this._manifest.files[absPath];
+    if (!entry || !entry.outputs) return null;
+    // Verify cached output files still exist on disk
+    for (const outFile of Object.values(entry.outputs)) {
+      if (outFile && !existsSync(outFile)) return null;
+    }
+    return entry.outputs;
+  }
+
+  // Store compiled output for a source file
+  set(absPath, sourceContent, outputs) {
+    if (!this._manifest) this._manifest = { files: {} };
+    this._manifest.files[absPath] = {
+      hash: this._hashContent(sourceContent),
+      outputs,
+      timestamp: Date.now(),
+    };
+  }
+
+  // Remove stale entries for files/dirs that no longer exist
+  prune(existingFiles, existingDirs) {
+    if (!this._manifest) return;
+    const existingSet = new Set(existingFiles);
+    const dirSet = existingDirs ? new Set(existingDirs) : null;
+    for (const key of Object.keys(this._manifest.files)) {
+      if (key.startsWith('dir:')) {
+        if (dirSet && !dirSet.has(key)) delete this._manifest.files[key];
+      } else if (!existingSet.has(key)) {
+        delete this._manifest.files[key];
+      }
+    }
+  }
+}
+
 // ─── Multi-file Import Support ───────────────────────────────
 
+// Determine the compiled JS extension for a .tova file.
+// Module files (no blocks) → '.js', app files → '.shared.js'
+function getCompiledExtension(tovaPath) {
+  // Check compilation cache first
+  if (compilationCache.has(tovaPath)) {
+    return compilationCache.get(tovaPath).isModule ? '.js' : '.shared.js';
+  }
+  // Quick-scan the source for block keywords
+  if (existsSync(tovaPath)) {
+    const src = readFileSync(tovaPath, 'utf-8');
+    // If the file contains top-level block keywords followed by '{', it's an app file
+    if (/^(?:shared|server|client|test|bench|data)\s*(?:\{|")/m.test(src)) {
+      return '.shared.js';
+    }
+    return '.js';
+  }
+  return '.shared.js'; // default fallback
+}
+
 const compilationCache = new Map();
 const compilationInProgress = new Set();
+const compilationChain = []; // ordered import chain for circular import error messages
 
 // Track module exports for cross-file import validation
 const moduleExports = new Map();
@@ -1904,6 +3056,7 @@ function compileWithImports(source, filename, srcDir) {
   }
 
   compilationInProgress.add(filename);
+  compilationChain.push(filename);
 
   try {
     // Parse and find .tova imports
@@ -1920,7 +3073,8 @@ function compileWithImports(source, filename, srcDir) {
       if (node.type === 'ImportDeclaration' && node.source.endsWith('.tova')) {
         const importPath = resolve(dirname(filename), node.source);
         if (compilationInProgress.has(importPath)) {
-          throw new Error(`Circular import detected: ${filename} → ${importPath}`);
+          const chain = [...compilationChain, importPath].map(f => basename(f)).join(' \u2192 ');
+          throw new Error(`Circular import detected: ${chain}`);
         } else if (existsSync(importPath) && !compilationCache.has(importPath)) {
           const importSource = readFileSync(importPath, 'utf-8');
           compileWithImports(importSource, importPath, srcDir);
@@ -1938,28 +3092,33 @@ function compileWithImports(source, filename, srcDir) {
             }
           }
         }
-        // Rewrite the import path to .js
-        node.source = node.source.replace('.tova', '.shared.js');
+        // Rewrite the import path to .js (module) or .shared.js (app)
+        const ext = getCompiledExtension(importPath);
+        node.source = node.source.replace('.tova', ext);
       }
       if (node.type === 'ImportDefault' && node.source.endsWith('.tova')) {
         const importPath = resolve(dirname(filename), node.source);
         if (compilationInProgress.has(importPath)) {
-          throw new Error(`Circular import detected: ${filename} → ${importPath}`);
+          const chain = [...compilationChain, importPath].map(f => basename(f)).join(' \u2192 ');
+          throw new Error(`Circular import detected: ${chain}`);
         } else if (existsSync(importPath) && !compilationCache.has(importPath)) {
           const importSource = readFileSync(importPath, 'utf-8');
           compileWithImports(importSource, importPath, srcDir);
         }
-        node.source = node.source.replace('.tova', '.shared.js');
+        const ext2 = getCompiledExtension(importPath);
+        node.source = node.source.replace('.tova', ext2);
       }
       if (node.type === 'ImportWildcard' && node.source.endsWith('.tova')) {
         const importPath = resolve(dirname(filename), node.source);
         if (compilationInProgress.has(importPath)) {
-          throw new Error(`Circular import detected: ${filename} → ${importPath}`);
+          const chain = [...compilationChain, importPath].map(f => basename(f)).join(' \u2192 ');
+          throw new Error(`Circular import detected: ${chain}`);
         } else if (existsSync(importPath) && !compilationCache.has(importPath)) {
           const importSource = readFileSync(importPath, 'utf-8');
           compileWithImports(importSource, importPath, srcDir);
         }
-        node.source = node.source.replace('.tova', '.shared.js');
+        const ext3 = getCompiledExtension(importPath);
+        node.source = node.source.replace('.tova', ext3);
       }
     }
 
@@ -1979,6 +3138,7 @@ function compileWithImports(source, filename, srcDir) {
     return output;
   } finally {
     compilationInProgress.delete(filename);
+    compilationChain.pop();
   }
 }
 
@@ -2130,7 +3290,8 @@ function mergeDirectory(dir, srcDir, options = {}) {
         // Only process imports from OTHER directories (same-dir files are merged)
         if (dirname(importPath) !== dir) {
           if (compilationInProgress.has(importPath)) {
-            throw new Error(`Circular import detected: ${file} → ${importPath}`);
+            const chain = [...compilationChain, importPath].map(f => basename(f)).join(' \u2192 ');
+            throw new Error(`Circular import detected: ${chain}`);
           } else if (existsSync(importPath) && !compilationCache.has(importPath)) {
             const importSource = readFileSync(importPath, 'utf-8');
             compileWithImports(importSource, importPath, srcDir);
@@ -2148,8 +3309,9 @@ function mergeDirectory(dir, srcDir, options = {}) {
               }
             }
           }
-          // Rewrite to .js
-          node.source = node.source.replace('.tova', '.shared.js');
+          // Rewrite to .js (module) or .shared.js (app)
+          const ext = getCompiledExtension(importPath);
+          node.source = node.source.replace('.tova', ext);
         } else {
           // Same-directory import — remove it since files are merged
           node._removed = true;
@@ -2251,4 +3413,132 @@ function findFiles(dir, ext) {
   return results;
 }
 
+// ─── Upgrade Command ─────────────────────────────────────────
+
+async function upgradeCommand() {
+  console.log(`\n  Current version: Tova v${VERSION}\n`);
+  console.log('  Checking for updates...');
+
+  try {
+    // Check the npm registry for the latest version
+    const res = await fetch('https://registry.npmjs.org/tova/latest');
+    if (!res.ok) {
+      console.error('  Could not reach the npm registry. Check your network connection.');
+      process.exit(1);
+    }
+    const data = await res.json();
+    const latestVersion = data.version;
+
+    if (latestVersion === VERSION) {
+      console.log(`  Already on the latest version (v${VERSION}).\n`);
+      return;
+    }
+
+    console.log(`  New version available: v${latestVersion}\n`);
+    console.log('  Upgrading...');
+
+    // Detect the package manager used to install tova
+    const pm = detectPackageManager();
+    const installCmd = pm === 'bun' ? ['bun', ['add', '-g', 'tova@latest']]
+                     : pm === 'pnpm' ? ['pnpm', ['add', '-g', 'tova@latest']]
+                     : pm === 'yarn' ? ['yarn', ['global', 'add', 'tova@latest']]
+                     : ['npm', ['install', '-g', 'tova@latest']];
+
+    const proc = spawn(installCmd[0], installCmd[1], { stdio: 'inherit' });
+    const exitCode = await new Promise(res => proc.on('close', res));
+
+    if (exitCode === 0) {
+      console.log(`\n  Upgraded to Tova v${latestVersion}.\n`);
+    } else {
+      console.error(`\n  Upgrade failed (exit code ${exitCode}).`);
+      console.error(`  Try manually: ${installCmd[0]} ${installCmd[1].join(' ')}\n`);
+      process.exit(1);
+    }
+  } catch (err) {
+    console.error(`  Upgrade failed: ${err.message}`);
+    console.error('  Try manually: bun add -g tova@latest\n');
+    process.exit(1);
+  }
+}
+
+function detectPackageManager() {
+  // Check if we're running under bun (most likely for Tova)
+  if (typeof Bun !== 'undefined') return 'bun';
+  // Check npm_config_user_agent for the package manager
+  const ua = process.env.npm_config_user_agent || '';
+  if (ua.includes('pnpm')) return 'pnpm';
+  if (ua.includes('yarn')) return 'yarn';
+  if (ua.includes('bun')) return 'bun';
+  return 'npm';
+}
+
+// ─── Info Command ────────────────────────────────────────────
+
+async function infoCommand() {
+  const config = resolveConfig(process.cwd());
+  const hasTOML = config._source === 'tova.toml';
+
+  console.log(`\n  ╦  ╦ ╦═╗ ╦`);
+  console.log(`  ║  ║ ║ ║ ╠╣`);
+  console.log(`  ╩═╝╚═╝╩═╝╩  v${VERSION}\n`);
+
+  // Bun version
+  let bunVersion = 'not found';
+  try {
+    const proc = Bun.spawnSync(['bun', '--version']);
+    bunVersion = proc.stdout.toString().trim();
+  } catch {}
+  console.log(`  Runtime:     Bun v${bunVersion}`);
+  console.log(`  Platform:    ${process.platform} ${process.arch}`);
+  console.log(`  Node compat: ${process.version}`);
+
+  // Project config
+  if (hasTOML) {
+    console.log(`\n  Project Config (tova.toml):`);
+    if (config.project?.name) console.log(`    Name:        ${config.project.name}`);
+    if (config.project?.version) console.log(`    Version:     ${config.project.version}`);
+    if (config.project?.entry) console.log(`    Entry:       ${config.project.entry}`);
+    if (config.build?.output) console.log(`    Output:      ${config.build.output}`);
+    if (config.build?.target) console.log(`    Target:      ${config.build.target}`);
+  } else {
+    console.log(`\n  No tova.toml found (using defaults).`);
+  }
+
+  // Installed dependencies
+  const pkgJsonPath = join(process.cwd(), 'package.json');
+  if (existsSync(pkgJsonPath)) {
+    try {
+      const pkg = JSON.parse(readFileSync(pkgJsonPath, 'utf-8'));
+      const deps = Object.keys(pkg.dependencies || {});
+      const devDeps = Object.keys(pkg.devDependencies || {});
+
+      if (deps.length > 0 || devDeps.length > 0) {
+        console.log(`\n  Dependencies:`);
+        for (const dep of deps) {
+          console.log(`    ${dep}: ${pkg.dependencies[dep]}`);
+        }
+        if (devDeps.length > 0) {
+          console.log(`  Dev Dependencies:`);
+          for (const dep of devDeps) {
+            console.log(`    ${dep}: ${pkg.devDependencies[dep]}`);
+          }
+        }
+      } else {
+        console.log(`\n  No dependencies installed.`);
+      }
+    } catch {}
+  }
+
+  // Build output status
+  const outDir = resolve(config.build?.output || '.tova-out');
+  if (existsSync(outDir)) {
+    const files = findFiles(outDir, '.js');
+    console.log(`\n  Build output: ${relative('.', outDir)}/ (${files.length} file${files.length === 1 ? '' : 's'})`);
+  } else {
+    console.log(`\n  Build output: not built yet`);
+  }
+
+  console.log('');
+}
+
 main();