update

Use PPretext for parser string building to avoid GC issues during parsing.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

.cell/lock.toml

@@ -1,6 +0,0 @@
-[modules]
-[modules.extramath]
-hash = "MCLZT3JABTAENS4WVXKGWJ7JPBLZER4YQ5VN2PE7ZD2Z4WYGTIMA===="
-url = "https://gitea.pockle.world/john/extramath@master"
-downloaded = "Monday June 2 12:07:20.42 PM -5 2025 AD"
-commit = "84d81a19a8455bcf8dc494739e9e6d545df6ff2c"

.clang-format

@@ -1,9 +1,20 @@
 BasedOnStyle: GNU
+Language: C
+
 IndentWidth: 2
 TabWidth: 2
 UseTab: Never
-ContinuationIndentWidth: 2  # Indents continuation lines by 2 spaces
+ContinuationIndentWidth: 2
+
 AllowShortFunctionsOnASingleLine: true
 AllowShortBlocksOnASingleLine: true
 AllowShortIfStatementsOnASingleLine: true
 BreakBeforeBraces: Attach
+ColumnLimit: 0
+BreakFunctionDefinitionParameters: false
+BinPackParameters: false
+BinPackArguments: false
+
+# --- Fix the "static T\nname(...)" style ---
+AlwaysBreakAfterDefinitionReturnType: None
+BreakAfterReturnType: None

.gitignore

@@ -1,5 +1,7 @@
 .git/
 .obj/
+website/public/
+website/.hugo_build.lock
 bin/
 build/
 *.zip
@@ -14,6 +16,7 @@ build/
 source/shaders/*.h
 .DS_Store
 *.html
+!website/themes/**/*.html
 .vscode
 *.icns
 icon.ico

CLAUDE.md

@@ -0,0 +1,25 @@
+# Code style
+All code is done with 2 spaces for indentation.
+
+For cell script and its integration files, objects are preferred over classes, and preferrably limited use of prototypes, make objects sendable between actors (.ce files).
+
+## cell script format
+Cell script files end in .ce or .cm. Cell script is similar to Javascript but with some differences.
+
+Variables are delcared with 'var'. Var behaves like let.
+Constants are declared with 'def'.
+!= and == are strict, there is no !== or ===.
+There is no undefined, only null.
+There are no classes, only objects and prototypes.
+Prefer backticks for string interpolation. Otherwise, convering non strings with the text() function is required.
+Everything should be lowercase.
+
+There are no arraybuffers, only blobs, which work with bits. They must be stoned like stone(blob) before being read from.
+
+## c format
+For cell script integration files, everything should be declared static that can be. Most don't have headers at all. Files in a package are not shared between packages.
+
+There is no undefined, so JS_IsNull and JS_NULL should be used only.
+
+## how module loading is done in cell script
+Within a package, a c file, if using the correct macros (CELL_USE_FUNCS etc), will be loaded as a module with its name; so png.c inside ac package is loaded as <package>/png, giving you access to its functions.

Makefile

@@ -9,6 +9,8 @@
 CELL_SHOP = $(HOME)/.cell
 CELL_CORE_PACKAGE = $(CELL_SHOP)/packages/core
 
+maker: install
+
 makecell:
 	cell pack core -o cell
 	cp cell /opt/homebrew/bin/
@@ -56,7 +58,7 @@ static:
 # Bootstrap: build cell from scratch using meson (only needed once)
 # Also installs core scripts to ~/.cell/core
 bootstrap: 
-	meson setup build_bootstrap -Dbuildtype=debugoptimized
+	meson setup build_bootstrap -Dbuildtype=debug -Db_sanitize=address
 	meson compile -C build_bootstrap
 	cp build_bootstrap/cell .
 	cp build_bootstrap/libcell_runtime.dylib .

add.ce

@@ -1,28 +1,103 @@
-// cell add <locator> [alias] - Add and install a package with its dependencies
+// cell add <locator> [alias] - Add a dependency to the current package
+//
+// Usage:
+//   cell add <locator>         Add a dependency using default alias
+//   cell add <locator> <alias> Add a dependency with custom alias
+//
+// This adds the dependency to cell.toml and installs it to the shop.
 
 var shop = use('internal/shop')
+var pkg = use('package')
+var build = use('build')
 var fd = use('fd')
 
-if (args.length < 1) {
+var locator = null
+var alias = null
+
+array(args, function(arg) {
+  if (arg == '--help' || arg == '-h') {
+    log.console("Usage: cell add <locator> [alias]")
+    log.console("")
+    log.console("Add a dependency to the current package.")
+    log.console("")
+    log.console("Examples:")
+    log.console("  cell add gitea.pockle.world/john/prosperon")
+    log.console("  cell add gitea.pockle.world/john/cell-image image")
+    log.console("  cell add ../local-package")
+    $stop()
+  } else if (!starts_with(arg, '-')) {
+    if (!locator) {
+      locator = arg
+    } else if (!alias) {
+      alias = arg
+    }
+  }
+})
+
+if (!locator) {
   log.console("Usage: cell add <locator> [alias]")
-  log.console("Examples:")
-  log.console("  cell add gitea.pockle.world/john/prosperon@main")
-  log.console("  cell add github.com/user/repo@v1.0.0 myalias")
   $stop()
-  return
 }
 
-var locator = args[0]
-
 // Resolve relative paths to absolute paths
-if (locator == '.' || locator.startsWith('./') || locator.startsWith('../') || fd.is_dir(locator)) {
+if (locator == '.' || starts_with(locator, './') || starts_with(locator, '../') || fd.is_dir(locator)) {
   var resolved = fd.realpath(locator)
   if (resolved) {
     locator = resolved
   }
 }
-var alias = args.length > 1 ? args[1] : null
 
-shop.get(locator, alias)
+// Generate default alias from locator
+if (!alias) {
+  // Use the last component of the locator as alias
+  var parts = array(locator, '/')
+  alias = parts[length(parts) - 1]
+  // Remove any version suffix
+  if (search(alias, '@') != null) {
+    alias = array(alias, '@')[0]
+  }
+}
 
-$stop()
+// Check we're in a package directory
+var cwd = fd.realpath('.')
+if (!fd.is_file(cwd + '/cell.toml')) {
+  log.error("Not in a package directory (no cell.toml found)")
+  $stop()
+}
+
+log.console("Adding " + locator + " as '" + alias + "'...")
+
+// Add to local project's cell.toml
+try {
+  pkg.add_dependency(null, locator, alias)
+  log.console("  Added to cell.toml")
+} catch (e) {
+  log.error("Failed to update cell.toml: " + e)
+  $stop()
+}
+
+// Install to shop
+try {
+  shop.get(locator)
+  shop.extract(locator)
+
+  // Build scripts
+  shop.build_package_scripts(locator)
+
+  // Build C code if any
+  try {
+    var target = build.detect_host_target()
+    build.build_dynamic(locator, target, 'release')
+  } catch (e) {
+    // Not all packages have C code
+  }
+
+  log.console("  Installed to shop")
+} catch (e) {
+  log.error("Failed to install: " + e)
+  $stop()
+}
+
+log.console("Added " + alias + " (" + locator + ")")
+
+$stop()

archive/miniz.c

@@ -8,14 +8,14 @@ static JSClassID js_writer_class_id;
 static void js_reader_finalizer(JSRuntime *rt, JSValue val) {
   mz_zip_archive *zip = JS_GetOpaque(val, js_reader_class_id);
   mz_zip_reader_end(zip);
-  js_free_rt(rt,zip);
+  js_free_rt(zip);
 }
 
 static void js_writer_finalizer(JSRuntime *rt, JSValue val) {
   mz_zip_archive *zip = JS_GetOpaque(val, js_writer_class_id);
   mz_zip_writer_finalize_archive(zip);
   mz_zip_writer_end(zip);
-  js_free_rt(rt,zip);
+  js_free_rt(zip);
 }
 
 static JSClassDef js_reader_class = {
@@ -101,7 +101,7 @@ static JSValue js_miniz_compress(JSContext *js, JSValue this_val,
   size_t      in_len  = 0;
   const void *in_ptr  = NULL;
 
-  if (JS_IsString(argv[0])) {
+  if (JS_IsText(argv[0])) {
     /* String → UTF-8 bytes without the terminating NUL */
     cstring = JS_ToCStringLen(js, &in_len, argv[0]);
     if (!cstring)

bench.ce

@@ -3,7 +3,7 @@ var pkg = use('package')
 var fd = use('fd')
 var time = use('time')
 var json = use('json')
-var utf8 = use('utf8')
+var blob = use('blob')
 var os = use('os')
 var testlib = use('internal/testlib')
 var math = use('math/radians')
@@ -24,63 +24,45 @@ def MAX_BATCH_SIZE = 100000000 // 100M iterations max per batch
 
 // Statistical functions
 function median(arr) {
-  if (arr.length == 0) return 0
-  var sorted = arr.slice().sort(function(a, b) { return a - b })
-  var mid = number.floor(arr.length / 2)
-  if (arr.length % 2 == 0) {
+  if (length(arr) == 0) return 0
+  var sorted = sort(arr)
+  var mid = floor(length(arr) / 2)
+  if (length(arr) % 2 == 0) {
     return (sorted[mid - 1] + sorted[mid]) / 2
   }
   return sorted[mid]
 }
 
 function mean(arr) {
-  if (arr.length == 0) return 0
+  if (length(arr) == 0) return 0
   var sum = 0
-  for (var i = 0; i < arr.length; i++) {
-    sum += arr[i]
-  }
-  return sum / arr.length
+  arrfor(arr, function(val) {
+    sum += val
+  })
+  return sum / length(arr)
 }
 
 function stddev(arr, mean_val) {
-  if (arr.length < 2) return 0
+  if (length(arr) < 2) return 0
   var sum_sq_diff = 0
-  for (var i = 0; i < arr.length; i++) {
-    var diff = arr[i] - mean_val
+  arrfor(arr, function(val) {
+    var diff = val - mean_val
     sum_sq_diff += diff * diff
-  }
-  return math.sqrt(sum_sq_diff / (arr.length - 1))
+  })
+  return math.sqrt(sum_sq_diff / (length(arr) - 1))
 }
 
 function percentile(arr, p) {
-  if (arr.length == 0) return 0
-  var sorted = arr.slice().sort(function(a, b) { return a - b })
-  var idx = number.floor(arr.length * p / 100)
-  if (idx >= arr.length) idx = arr.length - 1
+  if (length(arr) == 0) return 0
+  var sorted = sort(arr)
+  var idx = floor(arr) * p / 100
+  if (idx >= length(arr)) idx = length(arr) - 1
   return sorted[idx]
 }
 
-function min_val(arr) {
-  if (arr.length == 0) return 0
-  var m = arr[0]
-  for (var i = 1; i < arr.length; i++) {
-    if (arr[i] < m) m = arr[i]
-  }
-  return m
-}
-
-function max_val(arr) {
-  if (arr.length == 0) return 0
-  var m = arr[0]
-  for (var i = 1; i < arr.length; i++) {
-    if (arr[i] > m) m = arr[i]
-  }
-  return m
-}
-
 // Parse arguments similar to test.ce
 function parse_args() {
-  if (args.length == 0) {
+  if (length(args) == 0) {
     if (!testlib.is_valid_package('.')) {
       log.console('No cell.toml found in current directory')
       return false
@@ -99,7 +81,7 @@ function parse_args() {
   }
 
   if (args[0] == 'package') {
-    if (args.length < 2) {
+    if (length(args) < 2) {
       log.console('Usage: cell bench package <name> [bench]')
       log.console('       cell bench package all')
       return false
@@ -115,7 +97,7 @@ function parse_args() {
     var lock = shop.load_lock()
     if (lock[name]) {
       target_pkg = name
-    } else if (name.startsWith('/') && testlib.is_valid_package(name)) {
+    } else if (starts_with(name, '/') && testlib.is_valid_package(name)) {
       target_pkg = name
     } else {
       if (testlib.is_valid_package('.')) {
@@ -132,7 +114,7 @@ function parse_args() {
       }
     }
 
-    if (args.length >= 3) {
+    if (length(args) >= 3) {
       target_bench = args[2]
     }
 
@@ -144,7 +126,7 @@ function parse_args() {
   var bench_path = args[0]
 
   // Normalize path - add benches/ prefix if not present
-  if (!bench_path.startsWith('benches/') && !bench_path.startsWith('/')) {
+  if (!starts_with(bench_path, 'benches/') && !starts_with(bench_path, '/')) {
     if (!fd.is_file(bench_path + '.cm') && !fd.is_file(bench_path)) {
       if (fd.is_file('benches/' + bench_path + '.cm') || fd.is_file('benches/' + bench_path)) {
         bench_path = 'benches/' + bench_path
@@ -177,19 +159,18 @@ function collect_benches(package_name, specific_bench) {
 
   var files = pkg.list_files(package_name)
   var bench_files = []
-  for (var i = 0; i < files.length; i++) {
-    var f = files[i]
-    if (f.startsWith("benches/") && f.endsWith(".cm")) {
+  arrfor(files, function(f) {
+    if (starts_with(f, "benches/") && ends_with(f, ".cm")) {
       if (specific_bench) {
-        var bench_name = f.substring(0, f.length - 3)
+        var bench_name = text(f, 0, -3)
         var match_name = specific_bench
-        if (!match_name.startsWith('benches/')) match_name = 'benches/' + match_name
-        var match_base = match_name.endsWith('.cm') ? match_name.substring(0, match_name.length - 3) : match_name
-        if (bench_name != match_base) continue
+        if (!starts_with(match_name, 'benches/')) match_name = 'benches/' + match_name
+        var match_base = ends_with(match_name, '.cm') ? text(match_name, 0, -3) : match_name
+        if (bench_name != match_base) return
       }
-      bench_files.push(f)
+      push(bench_files, f)
     }
-  }
+  })
   return bench_files
 }
 
@@ -203,7 +184,7 @@ function calibrate_batch_size(bench_fn, is_batch) {
   // Find a batch size that takes at least MIN_SAMPLE_NS
   while (n < MAX_BATCH_SIZE) {
     // Ensure n is a valid number before calling
-    if (typeof n != 'number' || n < 1) {
+    if (!is_number(n) || n < 1) {
       n = 1
       break
     }
@@ -217,7 +198,7 @@ function calibrate_batch_size(bench_fn, is_batch) {
     // Double the batch size
     var new_n = n * 2
     // Check if multiplication produced a valid number
-    if (typeof new_n != 'number' || new_n > MAX_BATCH_SIZE) {
+    if (!is_number(new_n) || new_n > MAX_BATCH_SIZE) {
       n = MAX_BATCH_SIZE
       break
     }
@@ -225,12 +206,12 @@ function calibrate_batch_size(bench_fn, is_batch) {
   }
 
   // Adjust to target sample duration
-  if (dt > 0 && dt < TARGET_SAMPLE_NS && typeof n == 'number' && typeof dt == 'number') {
+  if (dt > 0 && dt < TARGET_SAMPLE_NS && is_number(n) && is_number(dt)) {
     var calc = n * TARGET_SAMPLE_NS / dt
-    if (typeof calc == 'number' && calc > 0) {
-      var target_n = number.floor(calc)
+    if (is_number(calc) && calc > 0) {
+      var target_n = floor(calc)
       // Check if floor returned a valid number
-      if (typeof target_n == 'number' && target_n > 0) {
+      if (is_number(target_n) && target_n > 0) {
         if (target_n > MAX_BATCH_SIZE) target_n = MAX_BATCH_SIZE
         if (target_n < MIN_BATCH_SIZE) target_n = MIN_BATCH_SIZE
         n = target_n
@@ -239,7 +220,7 @@ function calibrate_batch_size(bench_fn, is_batch) {
   }
 
   // Safety check - ensure we always return a valid batch size
-  if (typeof n != 'number' || n < 1) {
+  if (!is_number(n) || n < 1) {
     n = 1
   }
 
@@ -254,7 +235,7 @@ function run_single_bench(bench_fn, bench_name) {
   // 1. Object with { setup, run, teardown } - structured format
   // 2. Function that accepts (n) - batch format
   // 3. Function that accepts () - legacy format
-  var is_structured = typeof bench_fn == 'object' && bench_fn.run
+  var is_structured = is_object(bench_fn) && bench_fn.run
   var is_batch = false
   var batch_size = 1
   var setup_fn = null
@@ -285,7 +266,7 @@ function run_single_bench(bench_fn, bench_name) {
     batch_size = calibrate_batch_size(calibrate_fn, is_batch)
 
     // Safety check for structured benchmarks
-    if (typeof batch_size != 'number' || batch_size < 1) {
+    if (!is_number(batch_size) || batch_size < 1) {
       batch_size = 1
     }
   } else {
@@ -307,8 +288,9 @@ function run_single_bench(bench_fn, bench_name) {
   // Warmup phase
   for (var i = 0; i < WARMUP_BATCHES; i++) {
     // Ensure batch_size is valid before warmup
-    if (typeof batch_size != 'number' || batch_size < 1) {
-      log.console(`WARNING: batch_size became ${typeof batch_size} = ${batch_size}, resetting to 1`)
+    if (!is_number(batch_size) || batch_size < 1) {
+      var type_str = is_null(batch_size) ? 'null' : is_number(batch_size) ? 'number' : is_text(batch_size) ? 'text' : is_object(batch_size) ? 'object' : is_array(batch_size) ? 'array' : is_function(batch_size) ? 'function' : is_logical(batch_size) ? 'logical' : 'unknown'
+      log.console(`WARNING: batch_size became ${type_str} = ${batch_size}, resetting to 1`)
       batch_size = 1
     }
 
@@ -332,7 +314,7 @@ function run_single_bench(bench_fn, bench_name) {
   // Measurement phase - collect SAMPLES timing samples
   for (var i = 0; i < SAMPLES; i++) {
     // Double-check batch_size is valid (should never happen, but defensive)
-    if (typeof batch_size != 'number' || batch_size < 1) {
+    if (!is_number(batch_size) || batch_size < 1) {
       batch_size = 1
     }
 
@@ -348,7 +330,7 @@ function run_single_bench(bench_fn, bench_name) {
       if (teardown_fn) teardown_fn(state)
 
       var ns_per_op = is_batch ? duration / batch_size : duration
-      timings_per_op.push(ns_per_op)
+      push(timings_per_op, ns_per_op)
     } else {
       var start = os.now()
       if (is_batch) {
@@ -359,15 +341,15 @@ function run_single_bench(bench_fn, bench_name) {
       var duration = os.now() - start
 
       var ns_per_op = is_batch ? duration / batch_size : duration
-      timings_per_op.push(ns_per_op)
+      push(timings_per_op, ns_per_op)
     }
   }
 
   // Calculate statistics
   var mean_ns = mean(timings_per_op)
   var median_ns = median(timings_per_op)
-  var min_ns = min_val(timings_per_op)
-  var max_ns = max_val(timings_per_op)
+  var min_ns = reduce(timings_per_op, min)
+  var max_ns = reduce(timings_per_op, max)
   var stddev_ns = stddev(timings_per_op, mean_ns)
   var p95_ns = percentile(timings_per_op, 95)
   var p99_ns = percentile(timings_per_op, 99)
@@ -375,20 +357,20 @@ function run_single_bench(bench_fn, bench_name) {
   // Calculate ops/s from median
   var ops_per_sec = 0
   if (median_ns > 0) {
-    ops_per_sec = number.floor(1000000000 / median_ns)
+    ops_per_sec = floor(1000000000 / median_ns)
   }
 
   return {
     name: bench_name,
     batch_size: batch_size,
     samples: SAMPLES,
-    mean_ns: number.round(mean_ns),
-    median_ns: number.round(median_ns),
-    min_ns: number.round(min_ns),
-    max_ns: number.round(max_ns),
-    stddev_ns: number.round(stddev_ns),
-    p95_ns: number.round(p95_ns),
-    p99_ns: number.round(p99_ns),
+    mean_ns: round(mean_ns),
+    median_ns: round(median_ns),
+    min_ns: round(min_ns),
+    max_ns: round(max_ns),
+    stddev_ns: round(stddev_ns),
+    p95_ns: round(p95_ns),
+    p99_ns: round(p99_ns),
     ops_per_sec: ops_per_sec
   }
 }
@@ -396,17 +378,17 @@ function run_single_bench(bench_fn, bench_name) {
 // Format nanoseconds for display
 function format_ns(ns) {
   if (ns < 1000) return `${ns}ns`
-  if (ns < 1000000) return `${number.round(ns / 1000 * 100) / 100}µs`
-  if (ns < 1000000000) return `${number.round(ns / 1000000 * 100) / 100}ms`
-  return `${number.round(ns / 1000000000 * 100) / 100}s`
+  if (ns < 1000000) return `${round(ns / 1000 * 100) / 100}µs`
+  if (ns < 1000000000) return `${round(ns / 1000000 * 100) / 100}ms`
+  return `${round(ns / 1000000000 * 100) / 100}s`
 }
 
 // Format ops/sec for display
 function format_ops(ops) {
   if (ops < 1000) return `${ops} ops/s`
-  if (ops < 1000000) return `${number.round(ops / 1000 * 100) / 100}K ops/s`
-  if (ops < 1000000000) return `${number.round(ops / 1000000 * 100) / 100}M ops/s`
-  return `${number.round(ops / 1000000000 * 100) / 100}G ops/s`
+  if (ops < 1000000) return `${round(ops / 1000 * 100) / 100}K ops/s`
+  if (ops < 1000000000) return `${round(ops / 1000000 * 100) / 100}M ops/s`
+  return `${round(ops / 1000000000 * 100) / 100}G ops/s`
 }
 
 // Run benchmarks for a package
@@ -419,14 +401,13 @@ function run_benchmarks(package_name, specific_bench) {
     total: 0
   }
 
-  if (bench_files.length == 0) return pkg_result
+  if (length(bench_files) == 0) return pkg_result
 
   if (package_name) log.console(`Running benchmarks for ${package_name}`)
   else log.console(`Running benchmarks for local package`)
 
-  for (var i = 0; i < bench_files.length; i++) {
-    var f = bench_files[i]
-    var mod_path = f.substring(0, f.length - 3)
+  arrfor(bench_files, function(f) {
+    var mod_path = text(f, 0, -3)
 
     var file_result = {
       name: f,
@@ -439,24 +420,22 @@ function run_benchmarks(package_name, specific_bench) {
       bench_mod = shop.use(mod_path, use_pkg)
 
       var benches = []
-      if (typeof bench_mod == 'function') {
-        benches.push({name: 'main', fn: bench_mod})
-      } else if (typeof bench_mod == 'object') {
-        for (var k in bench_mod) {
-          if (typeof bench_mod[k] == 'function') {
-            benches.push({name: k, fn: bench_mod[k]})
-          }
-        }
+      if (is_function(bench_mod)) {
+        push(benches, {name: 'main', fn: bench_mod})
+      } else if (is_object(bench_mod)) {
+        arrfor(array(bench_mod), function(k) {
+          if (is_function(bench_mod[k]))
+            push(benches, {name: k, fn: bench_mod[k]})
+        })
       }
 
-      if (benches.length > 0) {
+      if (length(benches) > 0) {
         log.console(`  ${f}`)
-        for (var j = 0; j < benches.length; j++) {
-          var b = benches[j]
+        arrfor(benches, function(b) {
           try {
             var result = run_single_bench(b.fn, b.name)
             result.package = pkg_result.package
-            file_result.benchmarks.push(result)
+            push(file_result.benchmarks, result)
             pkg_result.total++
 
             log.console(`    ${result.name}`)
@@ -473,10 +452,10 @@ function run_benchmarks(package_name, specific_bench) {
               name: b.name,
               error: e.toString()
             }
-            file_result.benchmarks.push(error_result)
+            push(file_result.benchmarks, error_result)
             pkg_result.total++
           }
-        }
+        })
       }
     } catch (e) {
       log.console(`  Error loading ${f}: ${e}`)
@@ -485,14 +464,14 @@ function run_benchmarks(package_name, specific_bench) {
         name: "load_module",
         error: `Error loading module: ${e}`
       }
-      file_result.benchmarks.push(error_result)
+      push(file_result.benchmarks, error_result)
       pkg_result.total++
     }
 
-    if (file_result.benchmarks.length > 0) {
-      pkg_result.files.push(file_result)
+    if (length(file_result.benchmarks) > 0) {
+      push(pkg_result.files, file_result)
     }
-  }
+  })
 
   return pkg_result
 }
@@ -502,29 +481,29 @@ var all_results = []
 
 if (all_pkgs) {
   if (testlib.is_valid_package('.')) {
-    all_results.push(run_benchmarks(null, null))
+    push(all_results, run_benchmarks(null, null))
   }
 
   var packages = shop.list_packages()
-  for (var i = 0; i < packages.length; i++) {
-    all_results.push(run_benchmarks(packages[i], null))
-  }
+  arrfor(packages, function(pkg) {
+    push(all_results, run_benchmarks(pkg, null))
+  })
 } else {
-  all_results.push(run_benchmarks(target_pkg, target_bench))
+  push(all_results, run_benchmarks(target_pkg, target_bench))
 }
 
 // Calculate totals
 var total_benches = 0
-for (var i = 0; i < all_results.length; i++) {
-  total_benches += all_results[i].total
-}
+arrfor(all_results, function(result) {
+  total_benches += result.total
+})
 
 log.console(`----------------------------------------`)
 log.console(`Benchmarks: ${total_benches} total`)
 
 // Generate reports
 function generate_reports() {
-  var timestamp = number.floor(time.number()).toString()
+  var timestamp = text(floor(time.number()))
   var report_dir = shop.get_reports_dir() + '/bench_' + timestamp
   testlib.ensure_dir(report_dir)
 
@@ -534,34 +513,28 @@ Total benchmarks: ${total_benches}
 
 === SUMMARY ===
 `
-  for (var i = 0; i < all_results.length; i++) {
-    var pkg_res = all_results[i]
-    if (pkg_res.total == 0) continue
+  arrfor(all_results, function(pkg_res) {
+    if (pkg_res.total == 0) return
     txt_report += `Package: ${pkg_res.package}\n`
-    for (var j = 0; j < pkg_res.files.length; j++) {
-      var f = pkg_res.files[j]
+    arrfor(pkg_res.files, function(f) {
       txt_report += `  ${f.name}\n`
-      for (var k = 0; k < f.benchmarks.length; k++) {
-        var b = f.benchmarks[k]
+      arrfor(f.benchmarks, function(b) {
         if (b.error) {
           txt_report += `    ERROR ${b.name}: ${b.error}\n`
         } else {
           txt_report += `    ${b.name}: ${format_ns(b.median_ns)}/op (${format_ops(b.ops_per_sec)})\n`
         }
-      }
-    }
-  }
+      })
+    })
+  })
 
   txt_report += `\n=== DETAILED RESULTS ===\n`
-  for (var i = 0; i < all_results.length; i++) {
-    var pkg_res = all_results[i]
-    if (pkg_res.total == 0) continue
+  arrfor(all_results, function(pkg_res) {
+    if (pkg_res.total == 0) return
 
-    for (var j = 0; j < pkg_res.files.length; j++) {
-      var f = pkg_res.files[j]
-      for (var k = 0; k < f.benchmarks.length; k++) {
-        var b = f.benchmarks[k]
-        if (b.error) continue
+    arrfor(pkg_res.files, function(f) {
+      arrfor(f.benchmarks, function(b) {
+        if (b.error) return
 
         txt_report += `\n${pkg_res.package}::${b.name}\n`
         txt_report += `  batch_size: ${b.batch_size}  samples: ${b.samples}\n`
@@ -573,30 +546,28 @@ Total benchmarks: ${total_benches}
         txt_report += `  p95: ${format_ns(b.p95_ns)}\n`
         txt_report += `  p99: ${format_ns(b.p99_ns)}\n`
         txt_report += `  ops/s: ${format_ops(b.ops_per_sec)}\n`
-      }
-    }
-  }
+      })
+    })
+  })
 
   testlib.ensure_dir(report_dir)
-  fd.slurpwrite(`${report_dir}/bench.txt`, utf8.encode(txt_report))
+  fd.slurpwrite(`${report_dir}/bench.txt`, stone(blob(txt_report)))
   log.console(`Report written to ${report_dir}/bench.txt`)
 
   // Generate JSON per package
-  for (var i = 0; i < all_results.length; i++) {
-    var pkg_res = all_results[i]
-    if (pkg_res.total == 0) continue
+  arrfor(all_results, function(pkg_res) {
+    if (pkg_res.total == 0) return
 
     var pkg_benches = []
-    for (var j = 0; j < pkg_res.files.length; j++) {
-      var f = pkg_res.files[j]
-      for (var k = 0; k < f.benchmarks.length; k++) {
-        pkg_benches.push(f.benchmarks[k])
-      }
-    }
+    arrfor(pkg_res.files, function(f) {
+      arrfor(f.benchmarks, function(benchmark) {
+        push(pkg_benches, benchmark)
+      })
+    })
 
-    var json_path = `${report_dir}/${pkg_res.package.replace(/\//g, '_')}.json`
-    fd.slurpwrite(json_path, utf8.encode(json.encode(pkg_benches)))
-  }
+    var json_path = `${report_dir}/${replace(pkg_res.package, /\//, '_')}.json`
+    fd.slurpwrite(json_path, stone(blob(json.encode(pkg_benches))))
+  })
 }
 
 generate_reports()

benches/micro_ops.cm

@@ -20,14 +20,14 @@ function make_shapes(n) {
   for (var i = 0; i < n; i++) {
     var o = { a: i }
     o[`p${i}`] = i
-    out.push(o)
+    push(out, o)
   }
   return out
 }
 
 function make_packed_array(n) {
   var a = []
-  for (var i = 0; i < n; i++) a.push(i)
+  for (var i = 0; i < n; i++) push(a, i)
   return a
 }
 
@@ -203,8 +203,8 @@ return {
     var x = 0
     for (var j = 0; j < n; j++) {
       var a = []
-      for (var i = 0; i < 256; i++) a.push(i)
-      x = (x + a.length) | 0
+      for (var i = 0; i < 256; i++) push(a, i)
+      x = (x + length(a)) | 0
     }
     return blackhole(sink, x)
   },
@@ -216,7 +216,7 @@ return {
     for (var j = 0; j < n; j++) {
       var s = ""
       for (var i = 0; i < 16; i++) s = s + "x"
-      x = (x + s.length) | 0
+      x = (x + length(s)) | 0
     }
     return blackhole(sink, x)
   },
@@ -257,5 +257,6 @@ return {
       x = (x + o.x) | 0
     }
     return blackhole(sink, x)
-  }
+  },
+
 }

benchmarks/binarytree.ce

@@ -1,5 +1,5 @@
 function mainThread() {
-  var maxDepth = number.max(6, Number(arg[0] || 16));
+  var maxDepth = max(6, Number(arg[0] || 16));
 
   var stretchDepth = maxDepth + 1;
   var check = itemCheck(bottomUpTree(stretchDepth));
@@ -7,7 +7,7 @@ function mainThread() {
 
   var longLivedTree = bottomUpTree(maxDepth);
 
-  for (let depth = 4; depth <= maxDepth; depth += 2) {
+  for (var depth = 4; depth <= maxDepth; depth += 2) {
     var iterations = 1 << maxDepth - depth + 4;
     work(iterations, depth);
   }
@@ -16,8 +16,8 @@ function mainThread() {
 }
 
 function work(iterations, depth) {
-  let check = 0;
-  for (let i = 0; i < iterations; i++)
+  var check = 0;
+  for (var i = 0; i < iterations; i++)
     check += itemCheck(bottomUpTree(depth));
   log.console(`${iterations}\t trees of depth ${depth}\t check: ${check}`);
 }
@@ -34,8 +34,8 @@ function itemCheck(node) {
 
 function bottomUpTree(depth) {
   return depth > 0
-    ? new TreeNode(bottomUpTree(depth - 1), bottomUpTree(depth - 1))
-    : new TreeNode(null, null);
+    ? TreeNode(bottomUpTree(depth - 1), bottomUpTree(depth - 1))
+    : TreeNode(null, null);
 }
 
 mainThread()

benchmarks/eratosthenes.ce

@@ -2,8 +2,8 @@ var blob = use('blob')
 var math = use('math/radians')
 
 function eratosthenes (n) {
-  var sieve = new blob(n, true)
-  var sqrtN = number.whole(math.sqrt(n));
+  var sieve = blob(n, true)
+  var sqrtN = whole(math.sqrt(n));
 
   for (i = 2; i <= sqrtN; i++)
     if (sieve.read_logical(i))
@@ -17,7 +17,7 @@ var sieve = eratosthenes(10000000);
 stone(sieve)
 
 var c = 0
-for (var i = 0; i < sieve.length; i++)
+for (var i = 0; i < length(sieve); i++)
   if (sieve.read_logical(i)) c++
   
 log.console(c)

benchmarks/fannkuch.ce

@@ -1,6 +1,6 @@
 function fannkuch(n) {
    var perm1 = [n]   
-   for (let i = 0; i < n; i++) perm1[i] = i      
+   for (var i = 0; i < n; i++) perm1[i] = i      
    var perm = [n]
    var count = [n]       
    var f = 0, flips = 0, nperm = 0, checksum = 0      
@@ -18,7 +18,7 @@ function fannkuch(n) {
       while (k != 0) {
          i = 0  
          while (2*i < k) {          
-            let t = perm[i]; perm[i] = perm[k-i]; perm[k-i] = t  
+            var t = perm[i]; perm[i] = perm[k-i]; perm[k-i] = t  
             i += 1           
          }
          k = perm[0]
@@ -34,10 +34,10 @@ function fannkuch(n) {
             log.console( checksum )               
             return flips 
          }
-         let p0 = perm1[0]
+         var p0 = perm1[0]
          i = 0
          while (i < r) {
-            let j = i + 1
+            var j = i + 1
             perm1[i] = perm1[j]
             i = j            
          }

benchmarks/fib.ce

@@ -7,9 +7,9 @@ function fib(n) {
 
 var now = time.number()
 var arr = [1,2,3,4,5]
-for (var i in arr) {
+arrfor(arr, function(i) {
   log.console(fib(28))
-}
+})
 
 log.console(`elapsed: ${time.number()-now}`)
 

benchmarks/js_perf.ce

@@ -109,12 +109,12 @@ function benchArrayOps() {
   var pushTime = measureTime(function() {
     var arr = [];
     for (var i = 0; i < iterations.medium; i++) {
-      arr.push(i);
+      push(arr, i);
     }
   });
   
   var arr = [];
-  for (var i = 0; i < 10000; i++) arr.push(i);
+  for (var i = 0; i < 10000; i++) push(arr, i);
   
   var accessTime = measureTime(function() {
     var sum = 0;
@@ -126,7 +126,7 @@ function benchArrayOps() {
   var iterateTime = measureTime(function() {
     var sum = 0;
     for (var j = 0; j < 1000; j++) {
-      for (var i = 0; i < arr.length; i++) {
+      for (var i = 0; i < length(arr); i++) {
         sum += arr[i];
       }
     }
@@ -151,13 +151,12 @@ function benchObjectCreation() {
   });
   
   function Point(x, y) {
-    this.x = x;
-    this.y = y;
+    return {x,y}
   }
   
   var defructorTime = measureTime(function() {
     for (var i = 0; i < iterations.medium; i++) {
-      var p = new Point(i, i * 2);
+      var p = Point(i, i * 2);
     }
   });
   
@@ -199,19 +198,19 @@ function benchStringOps() {
   
   var strings = [];
   for (var i = 0; i < 1000; i++) {
-    strings.push("string" + i);
+    push(strings, "string" + i);
   }
   
   var joinTime = measureTime(function() {
     for (var i = 0; i < iterations.complex; i++) {
-      var result = strings.join(",");
+      var result = text(strings, ",");
     }
   });
   
   var splitTime = measureTime(function() {
     var str = "a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p";
     for (var i = 0; i < iterations.medium; i++) {
-      var parts = str.split(",");
+      var parts = array(str, ",");
     }
   });
   
@@ -239,7 +238,7 @@ function benchArithmetic() {
     var result = 1.5;
     for (var i = 0; i < iterations.simple; i++) {
       result = math.sine(result) + math.cosine(i * 0.01);
-      result = math.sqrt(number.abs(result)) + 0.1;
+      result = math.sqrt(abs(result)) + 0.1;
     }
   });
   
@@ -270,13 +269,13 @@ function benchClosures() {
   var closureCreateTime = measureTime(function() {
     var funcs = [];
     for (var i = 0; i < iterations.medium; i++) {
-      funcs.push(makeAdder(i));
+      push(funcs, makeAdder(i));
     }
   });
   
   var adders = [];
   for (var i = 0; i < 1000; i++) {
-    adders.push(makeAdder(i));
+    push(adders, makeAdder(i));
   }
   
   var closureCallTime = measureTime(function() {

benchmarks/mandelbrot.ce

@@ -8,15 +8,15 @@ var w = h
 
 log.console(`P4\n${w} ${h}`);
 
-for (let y = 0; y < h; ++y) {
+for (var y = 0; y < h; ++y) {
   // Create a blob for the row - we need w bits
-  var row = new blob(w);
+  var row = blob(w);
 
-  for (let x = 0; x < w; ++x) {
+  for (var x = 0; x < w; ++x) {
     zr = zi = tr = ti = 0;
     cr = 2 * x / w - 1.5;
     ci = 2 * y / h - 1;
-    for (let i = 0; i < iter && (tr + ti <= limit * limit); ++i) {
+    for (var i = 0; i < iter && (tr + ti <= limit * limit); ++i) {
       zi = 2 * zr * zi + ci;
       zr = tr - ti + cr;
       tr = zr * zr;

benchmarks/nbody.ce

@@ -3,17 +3,11 @@ var SOLAR_MASS = 4 * pi * pi;
 var DAYS_PER_YEAR = 365.24;
 
 function Body(x, y, z, vx, vy, vz, mass) {
-    this.x = x;
-    this.y = y;
-    this.z = z;
-    this.vx = vx;
-    this.vy = vy;
-    this.vz = vz;
-    this.mass = mass;
+    return {x, y, z, vx, vy, vz, mass};
 }
 
 function Jupiter() {
-    return new Body(
+    return Body(
         4.84143144246472090e+00,
         -1.16032004402742839e+00,
         -1.03622044471123109e-01,
@@ -25,7 +19,7 @@ function Jupiter() {
 }
 
 function Saturn() {
-    return new Body(
+    return Body(
         8.34336671824457987e+00,
         4.12479856412430479e+00,
         -4.03523417114321381e-01,
@@ -37,7 +31,7 @@ function Saturn() {
 }
 
 function Uranus() {
-    return new Body(
+    return Body(
         1.28943695621391310e+01,
         -1.51111514016986312e+01,
         -2.23307578892655734e-01,
@@ -49,7 +43,7 @@ function Uranus() {
 }
 
 function Neptune() {
-    return new Body(
+    return Body(
         1.53796971148509165e+01,
         -2.59193146099879641e+01,
         1.79258772950371181e-01,
@@ -61,7 +55,7 @@ function Neptune() {
 }
 
 function Sun() {
-    return new Body(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, SOLAR_MASS);
+    return Body(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, SOLAR_MASS);
 }
 
 var bodies = Array(Sun(), Jupiter(), Saturn(), Uranus(), Neptune());
@@ -70,7 +64,7 @@ function offsetMomentum() {
     var px = 0;
     var py = 0;
     var pz = 0;
-    var size = bodies.length;
+    var size = length(bodies);
     for (var i = 0; i < size; i++) {
         var body = bodies[i];
         var mass = body.mass;
@@ -86,7 +80,7 @@ function offsetMomentum() {
 }
 
 function advance(dt) {
-    var size = bodies.length;
+    var size = length(bodies);
 
     for (var i = 0; i < size; i++) {
         var bodyi = bodies[i];
@@ -127,7 +121,7 @@ function advance(dt) {
 
 function energy() {
     var e = 0;
-    var size = bodies.length;
+    var size = length(bodies);
 
     for (var i = 0; i < size; i++) {
         var bodyi = bodies[i];
@@ -158,31 +152,4 @@ for (var i = 0; i < n; i++)
     advance(0.01);
 log.console(energy().toFixed(9))
 
-var js = use('js')
-
-// Get function metadata
-var fn_info = js.fn_info(advance)
-log.console(`${fn_info.filename}:${fn_info.line}:${fn_info.column}: function: ${fn_info.name}`)
-
-// Display arguments
-if (fn_info.args && fn_info.args.length > 0) {
-  log.console(`  args: ${fn_info.args.join(' ')}`)
-}
-
-// Display local variables
-if (fn_info.locals && fn_info.locals.length > 0) {
-  log.console('  locals:')
-  for (var i = 0; i < fn_info.locals.length; i++) {
-    var local = fn_info.locals[i]
-    log.console(`    ${local.index}: ${local.type} ${local.name}`)
-  }
-}
-
-// Display stack size
-log.console(`  stack_size: ${fn_info.stack_size}`)
-
-// Display disassembly
-log.console(js.disassemble(advance))
-log.console(js.disassemble(advance).length)
-
 $stop()

benchmarks/nota.ce

@@ -9,7 +9,7 @@ var newarr = []
 var accstr = ""
 for (var i = 0; i < 10000; i++) {
   accstr += i;
-  newarr.push(i.toString())
+  newarrpush(i.toString())
 }
 // Arrays to store timing results
 var jsonDecodeTimes = [];
@@ -19,34 +19,35 @@ var notaDecodeTimes = [];
 var notaSizes = [];
 
 // Run 100 tests
-for (let i = 0; i < 100; i++) {
+for (var i = 0; i < 100; i++) {
     // JSON Decode test
-    let start = os.now();
+    var start = os.now();
     var jll = json.decode(ll);
-    jsonDecodeTimes.push((os.now() - start) * 1000);
+    jsonDecodeTimespush((os.now() - start) * 1000);
 
     // JSON Encode test
     start = os.now();
-    let jsonStr = JSON.stringify(jll);
-    jsonEncodeTimes.push((os.now() - start) * 1000);
+    var jsonStr = JSON.stringify(jll);
+    jsonEncodeTimespush((os.now() - start) * 1000);
 
     // NOTA Encode test
     start = os.now();
     var nll = nota.encode(jll);
-    notaEncodeTimes.push((os.now() - start) * 1000);
+    notaEncodeTimespush((os.now() - start) * 1000);
 
     // NOTA Decode test
     start = os.now();
     var oll = nota.decode(nll);
-    notaDecodeTimes.push((os.now() - start) * 1000);
+    notaDecodeTimespush((os.now() - start) * 1000);
 }
 
 // Calculate statistics
 function getStats(arr) {
-    def avg = arr.reduce((a, b) => a + b) / arr.length;
-    def min = number.min(...arr);
-    def max = number.max(...arr);
-    return { avg, min, max };
+    return {
+      avg: reduce(arr, (a,b) => a+b, 0) / length(arr),
+      min: reduce(arr, min),
+      max: reduce(arr, max)
+    };
 }
 
 // Pretty print results

benchmarks/spectral-norm.ce

@@ -1,13 +1,13 @@
-const math = require('math/radians');
+def math = use('math/radians');
 
 function A(i,j) {
   return 1/((i+j)*(i+j+1)/2+i+1);
 }
 
 function Au(u,v) {
-  for (var i=0; i<u.length; ++i) {
+  for (var i=0; i<length(u); ++i) {
     var t = 0;
-    for (var j=0; j<u.length; ++j)
+    for (var j=0; j<length(u); ++j)
       t += A(i,j) * u[j];
       
     v[i] = t;
@@ -15,9 +15,9 @@ function Au(u,v) {
 }
 
 function Atu(u,v) {
-  for (var i=0; i<u.length; ++i) {
+  for (var i=0; i<length(u); ++i) {
     var t = 0;
-    for (var j=0; j<u.length; ++j)
+    for (var j=0; j<length(u); ++j)
       t += A(j,i) * u[j];
       
     v[i] = t;

benchmarks/wota.ce

@@ -14,18 +14,18 @@
 // Helper to run a function repeatedly and measure total time in seconds.
 // Returns elapsed time in seconds.
 function measureTime(fn, iterations) {
-    let t1 = os.now();
-    for (let i = 0; i < iterations; i++) {
+    var t1 = os.now();
+    for (var i = 0; i < iterations; i++) {
         fn();
     }
-    let t2 = os.now();
+    var t2 = os.now();
     return t2 - t1;
 }
 
 // We'll define a function that does `encode -> decode` for a given value:
 function roundTripWota(value) {
-    let encoded = wota.encode(value);
-    let decoded = wota.decode(encoded);
+    var encoded = wota.encode(value);
+    var decoded = wota.decode(encoded);
     // Not doing a deep compare here, just measuring performance.
     // (We trust the test suite to verify correctness.)
 }
@@ -63,15 +63,9 @@ def benchmarks = [
   {
     name: "Large Array (1k numbers)",
     // A thousand random numbers
-    data: [ Array.from({length:1000}, (_, i) => i * 0.5) ],
+    data: [ array(1000, i => i *0.5) ],
     iterations: 1000
   },
-  {
-    name: "Large Binary Blob (256KB)",
-    // A 256KB ArrayBuffer
-    data: [ new Uint8Array(256 * 1024).buffer ],
-    iterations: 200
-  }
 ];
 
 // Print a header
@@ -79,28 +73,23 @@ log.console("Wota Encode/Decode Benchmark");
 log.console("===================\n");
 
 // We'll run each benchmark scenario in turn.
-for (let bench of benchmarks) {
-    // We'll measure how long it takes to do 'iterations' *for each test value*
-    // in bench.data. The total loop count is `bench.iterations * bench.data.length`.
-    // Then we compute an overall encode+decode throughput (ops/s).
-    let totalIterations = bench.iterations * bench.data.length;
+arrfor(benchmarks, function(bench) {
+    var totalIterations = bench.iterations * length(bench.data);
     
     // We'll define a function that does a roundTrip for *each* data item in bench.data
     // to measure in one loop iteration. Then we multiply by bench.iterations.
     function runAllData() {
-        for (let val of bench.data) {
-            roundTripWota(val);
-        }
+      arrfor(bench.data, roundTripWota)
     }
 
-    let elapsedSec = measureTime(runAllData, bench.iterations);
-    let opsPerSec  = (totalIterations / elapsedSec).toFixed(1);
+    var elapsedSec = measureTime(runAllData, bench.iterations);
+    var opsPerSec  = (totalIterations / elapsedSec).toFixed(1);
 
     log.console(`${bench.name}:`);
-    log.console(`  Iterations: ${bench.iterations} × ${bench.data.length} data items = ${totalIterations}`);
+    log.console(`  Iterations: ${bench.iterations} × ${length(bench.data)} data items = ${totalIterations}`);
     log.console(`  Elapsed:    ${elapsedSec.toFixed(3)} s`);
     log.console(`  Throughput: ${opsPerSec} encode+decode ops/sec\n`);
-}
+})
 
 // All done
 log.console("Benchmark completed.\n");

benchmarks/wota_nota_json.ce

@@ -13,7 +13,7 @@
 //
 
 // Parse command line arguments
-if (arg.length != 2) {
+if (length(arg) != 2) {
   log.console('Usage: cell benchmark_wota_nota_json.ce <LibraryName> <ScenarioName>');
   $stop()
 }
@@ -32,7 +32,7 @@ def libraries = [
     decode: wota.decode,
     // wota produces an ArrayBuffer. We'll count `buffer.byteLength` as size.
     getSize(encoded) {
-      return encoded.length;
+      return length(encoded);
     }
   },
   {
@@ -41,7 +41,7 @@ def libraries = [
     decode: nota.decode,
     // nota also produces an ArrayBuffer:
     getSize(encoded) {
-      return encoded.length;
+      return length(encoded);
     }
   },
   {
@@ -50,9 +50,8 @@ def libraries = [
     decode: json.decode,
     // json produces a JS string. We'll measure its UTF-16 code unit length
     // as a rough "size". Alternatively, you could convert to UTF-8 for
-    // a more accurate byte size. Here we just use `string.length`.
     getSize(encodedStr) {
-      return encodedStr.length;
+      return length(encodedStr);
     }
   }
 ];
@@ -98,7 +97,7 @@ def benchmarks = [
   },
   {
     name: "large_array",
-    data: [ Array.from({length:1000}, (_, i) => i) ],
+    data: [ array(1000, i => i) ],
     iterations: 1000
   },
 ];
@@ -108,9 +107,9 @@ def benchmarks = [
 ////////////////////////////////////////////////////////////////////////////////
 
 function measureTime(fn) {
-  let start = os.now();
+  var start = os.now();
   fn();
-  let end   = os.now();
+  var end   = os.now();
   return (end - start);  // in seconds
 }
 
@@ -128,19 +127,19 @@ function runBenchmarkForLibrary(lib, bench) {
 
   // Pre-store the encoded results for all items so we can measure decode time
   // in a separate pass. Also measure total size once.
-  let encodedList = [];
-  let totalSize = 0;
+  var encodedList = [];
+  var totalSize = 0;
 
   // 1) Measure ENCODING
-  let encodeTime = measureTime(() => {
-    for (let i = 0; i < bench.iterations; i++) {
+  var encodeTime = measureTime(() => {
+    for (var i = 0; i < bench.iterations; i++) {
       // For each data item, encode it
-      for (let j = 0; j < bench.data.length; j++) {
-        let e = lib.encode(bench.data[j]);
+      for (var j = 0; j < length(bench.data); j++) {
+        var e = lib.encode(bench.data[j]);
         // store only in the very first iteration, so we can decode them later
         // but do not store them every iteration or we blow up memory.
         if (i == 0) {
-          encodedList.push(e);
+          push(encodedList, e);
           totalSize += lib.getSize(e);
         }
       }
@@ -148,13 +147,9 @@ function runBenchmarkForLibrary(lib, bench) {
   });
 
   // 2) Measure DECODING
-  let decodeTime = measureTime(() => {
-    for (let i = 0; i < bench.iterations; i++) {
-      // decode everything we stored during the first iteration
-      for (let e of encodedList) {
-        let decoded = lib.decode(e);
-        // not verifying correctness here, just measuring speed
-      }
+  var decodeTime = measureTime(() => {
+    for (var i = 0; i < bench.iterations; i++) {
+      arrfor(encodedList, lib.decode)
     }
   });
 
@@ -166,18 +161,18 @@ function runBenchmarkForLibrary(lib, bench) {
 ////////////////////////////////////////////////////////////////////////////////
 
 // Find the requested library and scenario
-var lib = libraries.find(l => l.name == lib_name);
-var bench = benchmarks.find(b => b.name == scenario_name);
+var lib = libraries[find(libraries, l => l.name == lib_name)];
+var bench = benchmarks[find(benchmarks, b => b.name == scenario_name)];
 
 if (!lib) {
   log.console('Unknown library:', lib_name);
-  log.console('Available libraries:', libraries.map(l => l.name).join(', '));
+  log.console('Available libraries:', text(array(libraries, l => l.name), ', '));
   $stop()
 }
 
 if (!bench) {
   log.console('Unknown scenario:', scenario_name);
-  log.console('Available scenarios:', benchmarks.map(b => b.name).join(', '));
+  log.console('Available scenarios:', text(array(benchmarks, b => b.name), ', '));
   $stop()
 }
 
@@ -185,7 +180,7 @@ if (!bench) {
 var { encodeTime, decodeTime, totalSize } = runBenchmarkForLibrary(lib, bench);
 
 // Output json for easy parsing by hyperfine or other tools
-var totalOps = bench.iterations * bench.data.length;
+var totalOps = bench.iterations * length(bench.data);
 var result = {
   lib: lib_name,
   scenario: scenario_name,

build.ce

@@ -1,9 +1,11 @@
-// cell build [options] - Build dynamic libraries locally for the current machine
+// cell build [<locator>] - Build dynamic libraries locally for the current machine
 //
 // Usage:
-//   cell build                Build dynamic libraries for all packages
-//   cell build -p <pkg>       Build dynamic library for specific package
+//   cell build                Build dynamic libraries for all packages in shop
+//   cell build .              Build dynamic library for current directory package
+//   cell build <locator>      Build dynamic library for specific package
 //   cell build -t <target>    Cross-compile dynamic libraries for target platform
+//   cell build -b <type>      Build type: release (default), debug, or minsize
 
 var build = use('build')
 var shop = use('internal/shop')
@@ -12,25 +14,28 @@ var fd = use('fd')
 
 var target = null
 var target_package = null
-var buildtype = 'debug'
+var buildtype = 'release'
+var force_rebuild = false
+var dry_run = false
 
-for (var i = 0; i < args.length; i++) {
+for (var i = 0; i < length(args); i++) {
   if (args[i] == '-t' || args[i] == '--target') {
-    if (i + 1 < args.length) {
+    if (i + 1 < length(args)) {
       target = args[++i]
     } else {
       log.error('-t requires a target')
       $stop()
     }
   } else if (args[i] == '-p' || args[i] == '--package') {
-    if (i + 1 < args.length) {
+    // Legacy support for -p flag
+    if (i + 1 < length(args)) {
       target_package = args[++i]
     } else {
       log.error('-p requires a package name')
       $stop()
     }
   } else if (args[i] == '-b' || args[i] == '--buildtype') {
-    if (i + 1 < args.length) {
+    if (i + 1 < length(args)) {
       buildtype = args[++i]
       if (buildtype != 'release' && buildtype != 'debug' && buildtype != 'minsize') {
         log.error('Invalid buildtype: ' + buildtype + '. Must be release, debug, or minsize')
@@ -40,13 +45,30 @@ for (var i = 0; i < args.length; i++) {
       log.error('-b requires a buildtype (release, debug, minsize)')
       $stop()
     }
+  } else if (args[i] == '--force') {
+    force_rebuild = true
+  } else if (args[i] == '--dry-run') {
+    dry_run = true
   } else if (args[i] == '--list-targets') {
     log.console('Available targets:')
     var targets = build.list_targets()
-    for (var t = 0; t < targets.length; t++) {
+    for (var t = 0; t < length(targets); t++) {
       log.console('  ' + targets[t])
     }
     $stop()
+  } else if (!starts_with(args[i], '-') && !target_package) {
+    // Positional argument - treat as package locator
+    target_package = args[i]
+  }
+}
+
+// Resolve local paths to absolute paths
+if (target_package) {
+  if (target_package == '.' || starts_with(target_package, './') || starts_with(target_package, '../') || fd.is_dir(target_package)) {
+    var resolved = fd.realpath(target_package)
+    if (resolved) {
+      target_package = resolved
+    }
   }
 }
 
@@ -58,16 +80,16 @@ if (!target) {
 
 if (target && !build.has_target(target)) {
   log.error('Invalid target: ' + target)
-  log.console('Available targets: ' + build.list_targets().join(', '))
+  log.console('Available targets: ' + text(build.list_targets(), ', '))
   $stop()
 }
 
 var packages = shop.list_packages()
 log.console('Preparing packages...')
-for (var package of packages) {
-  if (package == 'core') continue
+arrfor(packages, function(package) {
+  if (package == 'core') return
   shop.extract(package)
-}
+})
 
 if (target_package) {
   // Build single package
@@ -88,7 +110,7 @@ if (target_package) {
   
   var success = 0
   var failed = 0
-  for (var i = 0; i < results.length; i++) {
+  for (var i = 0; i < length(results); i++) {
     if (results[i].library) {
       success++
     } else if (results[i].error) {

build.cm

@@ -8,7 +8,7 @@
 
 var fd = use('fd')
 var crypto = use('crypto')
-var utf8 = use('utf8')
+var blob = use('blob')
 var os = use('os')
 var toolchains = use('toolchains')
 var shop = use('internal/shop')
@@ -28,15 +28,15 @@ function get_local_dir() {
 // Replace sigils in a string
 // Currently supports: $LOCAL -> .cell/local full path
 function replace_sigils(str) {
-  return str.replaceAll('$LOCAL', get_local_dir())
+  return replace(str, '$LOCAL', get_local_dir())
 }
 
 // Replace sigils in an array of flags
 function replace_sigils_array(flags) {
   var result = []
-  for (var i = 0; i < flags.length; i++) {
-    result.push(replace_sigils(flags[i]))
-  }
+  arrfor(flags, function(flag) {
+    push(result, replace_sigils(flag))
+  })
   return result
 }
 
@@ -73,7 +73,8 @@ Build.detect_host_target = function() {
 // ============================================================================
 
 function content_hash(str) {
-  return text(crypto.blake2(utf8.encode(str)), 'h')
+  var bb = stone(blob(str))
+  return text(crypto.blake2(bb, 32), 'h')
 }
 
 function get_build_dir() {
@@ -82,14 +83,12 @@ function get_build_dir() {
 
 function ensure_dir(path) {
   if (fd.stat(path).isDirectory) return
-  var parts = path.split('/')
-  var current = path.startsWith('/') ? '/' : ''
-  for (var i = 0; i < parts.length; i++) {
+  var parts = array(path, '/')
+  var current = starts_with(path, '/') ? '/' : ''
+  for (var i = 0; i < length(parts); i++) {
     if (parts[i] == '') continue
     current += parts[i] + '/'
-    if (!fd.stat(current).isDirectory) {
-      fd.mkdir(current)
-    }
+    if (!fd.stat(current).isDirectory) fd.mkdir(current)
   }
 }
 
@@ -106,7 +105,7 @@ Build.compile_file = function(pkg, file, target, buildtype = 'release') {
   var src_path = pkg_dir + '/' + file
   
   if (!fd.is_file(src_path)) {
-    throw new Error('Source file not found: ' + src_path)
+    throw Error('Source file not found: ' + src_path)
   }
   
   // Get flags (with sigil replacement)
@@ -122,33 +121,32 @@ Build.compile_file = function(pkg, file, target, buildtype = 'release') {
   
   // Add buildtype-specific flags
   if (buildtype == 'release') {
-    cmd_parts.push('-O3', '-DNDEBUG')
+    cmd_parts = array(cmd_parts, ['-O3', '-DNDEBUG'])
   } else if (buildtype == 'debug') {
-    cmd_parts.push('-O2', '-g')
+    cmd_parts = array(cmd_parts, ['-O2', '-g'])
   } else if (buildtype == 'minsize') {
-    cmd_parts.push('-Os', '-DNDEBUG')
+    cmd_parts = array(cmd_parts, ['-Os', '-DNDEBUG'])
   }
   
-  cmd_parts.push('-DCELL_USE_NAME=' + sym_name)
-  cmd_parts.push('-I"' + pkg_dir + '"')
+  push(cmd_parts, '-DCELL_USE_NAME=' + sym_name)
+  push(cmd_parts, '-I"' + pkg_dir + '"')
   
   // Add package CFLAGS (resolve relative -I paths)
-  for (var i = 0; i < cflags.length; i++) {
-    var flag = cflags[i]
-    if (flag.startsWith('-I') && !flag.startsWith('-I/')) {
-      flag = '-I"' + pkg_dir + '/' + flag.substring(2) + '"'
+  arrfor(cflags, function(flag) {
+    if (starts_with(flag, '-I') && !starts_with(flag, '-I/')) {
+      flag = '-I"' + pkg_dir + '/' + text(flag, 2) + '"'
     }
-    cmd_parts.push(flag)
-  }
+    push(cmd_parts, flag)
+  })
   
   // Add target CFLAGS
-  for (var i = 0; i < target_cflags.length; i++) {
-    cmd_parts.push(target_cflags[i])
-  }
+  arrfor(target_cflags, function(flag) {
+    push(cmd_parts, flag)
+  })
   
-  cmd_parts.push('"' + src_path + '"')
+  push(cmd_parts, '"' + src_path + '"')
   
-  var cmd_str = cmd_parts.join(' ')
+  var cmd_str = text(cmd_parts, ' ')
   
   // Content hash: command + file content
   var file_content = fd.slurp(src_path)
@@ -169,7 +167,7 @@ Build.compile_file = function(pkg, file, target, buildtype = 'release') {
   log.console('Compiling ' + file)
   var ret = os.system(full_cmd)
   if (ret != 0) {
-    throw new Error('Compilation failed: ' + file)
+    throw Error('Compilation failed: ' + file)
   }
   
   return obj_path
@@ -181,10 +179,10 @@ Build.build_package = function(pkg, target = Build.detect_host_target(), exclude
   var c_files = pkg_tools.get_c_files(pkg, target, exclude_main)
   var objects = []
   
-  for (var i = 0; i < c_files.length; i++) {
-    var obj = Build.compile_file(pkg, c_files[i], target, buildtype)
-    objects.push(obj)
-  }
+  arrfor(c_files, function(file) {
+    var obj = Build.compile_file(pkg, file, target, buildtype)
+    push(objects, obj)
+  })
   
   return objects
 }
@@ -192,24 +190,51 @@ Build.build_package = function(pkg, target = Build.detect_host_target(), exclude
 // ============================================================================
 // Dynamic library building
 // ============================================================================
+
+// Compute link key from all inputs that affect the dylib output
+function compute_link_key(objects, ldflags, target_ldflags, target, cc) {
+  // Sort objects for deterministic hash
+  var sorted_objects = sort(objects)
+
+  // Build a string representing all link inputs
+  var parts = []
+  push(parts, 'target:' + target)
+  push(parts, 'cc:' + cc)
+  arrfor(sorted_objects, function(obj) {
+    // Object paths are content-addressed, so the path itself is the hash
+    push(parts, 'obj:' + obj)
+  })
+  arrfor(ldflags, function(flag) {
+    push(parts, 'ldflag:' + flag)
+  })
+  arrfor(target_ldflags, function(flag) {
+    push(parts, 'target_ldflag:' + flag)
+  })
+
+  return content_hash(text(parts, '\n'))
+}
+
 // Build a dynamic library for a package
 // Output goes to .cell/lib/<package_name>.<ext>
 // Dynamic libraries do NOT link against core; undefined symbols are resolved at dlopen time
+// Uses content-addressed store + symlink for caching
 Build.build_dynamic = function(pkg, target = Build.detect_host_target(), buildtype = 'release') {
   var objects = Build.build_package(pkg, target, true, buildtype) // exclude main.c
-  
-  if (objects.length == 0) {
+
+  if (length(objects) == 0) {
     log.console('No C files in ' + pkg)
     return null
   }
-  
+
   var lib_dir = shop.get_lib_dir()
+  var store_dir = lib_dir + '/store'
   ensure_dir(lib_dir)
-  
+  ensure_dir(store_dir)
+
   var lib_name = shop.lib_name_for_package(pkg)
   var dylib_ext = toolchains[target].system == 'windows' ? '.dll' : (toolchains[target].system == 'darwin' ? '.dylib' : '.so')
-  var lib_path = lib_dir + '/' + lib_name + dylib_ext
-  
+  var stable_path = lib_dir + '/' + lib_name + dylib_ext
+
   // Get link flags (with sigil replacement)
   var ldflags = replace_sigils_array(pkg_tools.get_flags(pkg, 'LDFLAGS', target))
   var target_ldflags = toolchains[target].c_link_args || []
@@ -217,65 +242,92 @@ Build.build_dynamic = function(pkg, target = Build.detect_host_target(), buildty
   var pkg_dir = shop.get_package_dir(pkg)
   var local_dir = get_local_dir()
   var tc = toolchains[target]
-  
+
+  // Resolve relative -L paths in ldflags for hash computation
+  var resolved_ldflags = []
+  arrfor(ldflags, function(flag) {
+    if (starts_with(flag, '-L') && !starts_with(flag, '-L/')) {
+      flag = '-L"' + pkg_dir + '/' + text(flag, 2) + '"'
+    }
+    push(resolved_ldflags, flag)
+  })
+
+  // Compute link key
+  var link_key = compute_link_key(objects, resolved_ldflags, target_ldflags, target, cc)
+  var store_path = store_dir + '/' + lib_name + '-' + link_key + dylib_ext
+
+  // Check if already linked in store
+  if (fd.is_file(store_path)) {
+    // Ensure symlink points to the store file
+    if (fd.is_link(stable_path)) {
+      var current_target = fd.readlink(stable_path)
+      if (current_target == store_path) {
+        // Already up to date
+        return stable_path
+      }
+      fd.unlink(stable_path)
+    } else if (fd.is_file(stable_path)) {
+      fd.unlink(stable_path)
+    }
+    fd.symlink(store_path, stable_path)
+    return stable_path
+  }
+
   // Build link command
   var cmd_parts = [cc, '-shared', '-fPIC']
-  
+
   // Platform-specific flags for undefined symbols (resolved at dlopen) and size optimization
   if (tc.system == 'darwin') {
-    // Allow undefined symbols - they will be resolved when dlopen'd into the main executable
-    cmd_parts.push('-undefined', 'dynamic_lookup')
-    // Dead-strip unused code
-    cmd_parts.push('-Wl,-dead_strip')
-    // rpath for .cell/local libraries
-    cmd_parts.push('-Wl,-rpath,@loader_path/../local')
-    cmd_parts.push('-Wl,-rpath,' + local_dir)
+    cmd_parts = array(cmd_parts, [
+      '-undefined', 'dynamic_lookup',
+      '-Wl,-dead_strip',
+      '-Wl,-install_name,' + stable_path,
+      '-Wl,-rpath,@loader_path/../local',
+      '-Wl,-rpath,' + local_dir
+    ])
   } else if (tc.system == 'linux') {
-    // Allow undefined symbols at link time
-    cmd_parts.push('-Wl,--allow-shlib-undefined')
-    // Garbage collect unused sections
-    cmd_parts.push('-Wl,--gc-sections')
-    // rpath for .cell/local libraries
-    cmd_parts.push('-Wl,-rpath,$ORIGIN/../local')
-    cmd_parts.push('-Wl,-rpath,' + local_dir)
+    cmd_parts = array(cmd_parts, [
+      '-Wl,--allow-shlib-undefined',
+      '-Wl,--gc-sections',
+      '-Wl,-rpath,$ORIGIN/../local',
+      '-Wl,-rpath,' + local_dir
+    ])
   } else if (tc.system == 'windows') {
     // Windows DLLs: use --allow-shlib-undefined for mingw
-    cmd_parts.push('-Wl,--allow-shlib-undefined')
+    push(cmd_parts, '-Wl,--allow-shlib-undefined')
   }
-  
+
   // Add .cell/local to library search path
-  cmd_parts.push('-L"' + local_dir + '"')
-  
-  for (var i = 0; i < objects.length; i++) {
-    cmd_parts.push('"' + objects[i] + '"')
-  }
-  
+  push(cmd_parts, '-L"' + local_dir + '"')
+
+  arrfor(objects, function(obj) {
+    push(cmd_parts, '"' + obj + '"')
+  })
+
   // Do NOT link against core library - symbols resolved at dlopen time
-  
-  // Add LDFLAGS (resolve relative -L paths)
-  for (var i = 0; i < ldflags.length; i++) {
-    var flag = ldflags[i]
-    if (flag.startsWith('-L') && !flag.startsWith('-L/')) {
-      flag = '-L"' + pkg_dir + '/' + flag.substring(2) + '"'
-    }
-    cmd_parts.push(flag)
-  }
-  
-  for (var i = 0; i < target_ldflags.length; i++) {
-    cmd_parts.push(target_ldflags[i])
-  }
-  
-  cmd_parts.push('-o', '"' + lib_path + '"')
-  
-  var cmd_str = cmd_parts.join(' ')
-  
-  log.console('Linking ' + lib_path)
+  cmd_parts = array(cmd_parts, resolved_ldflags)
+  cmd_parts = array(cmd_parts, target_ldflags)
+
+  push(cmd_parts, '-o')
+  push(cmd_parts, '"' + store_path + '"')
+
+  var cmd_str = text(cmd_parts, ' ')
+
+  log.console('Linking ' + lib_name + dylib_ext)
   var ret = os.system(cmd_str)
   if (ret != 0) {
-    throw new Error('Linking failed: ' + pkg)
+    throw Error('Linking failed: ' + pkg)
   }
-  
-  return lib_path
+
+  // Update symlink to point to the new store file
+  if (fd.is_link(stable_path)) {
+    fd.unlink(stable_path)
+  } else if (fd.is_file(stable_path)) {
+    fd.unlink(stable_path)
+  }
+  fd.symlink(store_path, stable_path)
+
+  return stable_path
 }
 
 // ============================================================================
@@ -291,38 +343,36 @@ Build.build_static = function(packages, target = Build.detect_host_target(), out
   var seen_flags = {}
   
   // Compile all packages
-  for (var i = 0; i < packages.length; i++) {
-    var pkg = packages[i]
+  arrfor(packages, function(pkg) {
     var is_core = (pkg == 'core')
     
     // For core, include main.c; for others, exclude it
     var objects = Build.build_package(pkg, target, !is_core, buildtype)
     
-    for (var j = 0; j < objects.length; j++) {
-      all_objects.push(objects[j])
-    }
+    arrfor(objects, function(obj) {
+      push(all_objects, obj)
+    })
     
     // Collect LDFLAGS (with sigil replacement)
     var ldflags = replace_sigils_array(pkg_tools.get_flags(pkg, 'LDFLAGS', target))
     var pkg_dir = shop.get_package_dir(pkg)
     
     // Deduplicate based on the entire LDFLAGS string for this package
-    var ldflags_key = pkg + ':' + ldflags.join(' ')
+    var ldflags_key = pkg + ':' + text(ldflags, ' ')
     if (!seen_flags[ldflags_key]) {
       seen_flags[ldflags_key] = true
-      for (var j = 0; j < ldflags.length; j++) {
-        var flag = ldflags[j]
+      arrfor(ldflags, function(flag) {
         // Resolve relative -L paths
-        if (flag.startsWith('-L') && !flag.startsWith('-L/')) {
-          flag = '-L"' + pkg_dir + '/' + flag.substring(2) + '"'
+        if (starts_with(flag, '-L') && !starts_with(flag, '-L/')) {
+          flag = '-L"' + pkg_dir + '/' + text(flag, 2) + '"'
         }
-        all_ldflags.push(flag)
-      }
+        push(all_ldflags, flag)
+      })
     }
-  }
+  })
   
-  if (all_objects.length == 0) {
-    throw new Error('No object files to link')
+  if (length(all_objects) == 0) {
+    throw Error('No object files to link')
   }
   
   // Link
@@ -330,32 +380,32 @@ Build.build_static = function(packages, target = Build.detect_host_target(), out
   var target_ldflags = toolchains[target].c_link_args || []
   var exe_ext = toolchains[target].system == 'windows' ? '.exe' : ''
   
-  if (!output.endsWith(exe_ext) && exe_ext) {
+  if (!ends_with(output, exe_ext) && exe_ext) {
     output = output + exe_ext
   }
   
   var cmd_parts = [cc]
   
-  for (var i = 0; i < all_objects.length; i++) {
-    cmd_parts.push('"' + all_objects[i] + '"')
-  }
+  arrfor(all_objects, function(obj) {
+    push(cmd_parts, '"' + obj + '"')
+  })
   
-  for (var i = 0; i < all_ldflags.length; i++) {
-    cmd_parts.push(all_ldflags[i])
-  }
+  arrfor(all_ldflags, function(flag) {
+    push(cmd_parts, flag)
+  })
   
-  for (var i = 0; i < target_ldflags.length; i++) {
-    cmd_parts.push(target_ldflags[i])
-  }
+  arrfor(target_ldflags, function(flag) {
+    push(cmd_parts, flag)
+  })
   
-  cmd_parts.push('-o', '"' + output + '"')
+  push(cmd_parts, '-o', '"' + output + '"')
   
-  var cmd_str = cmd_parts.join(' ')
+  var cmd_str = text(cmd_parts, ' ')
   
   log.console('Linking ' + output)
   var ret = os.system(cmd_str)
   if (ret != 0) {
-    throw new Error('Linking failed with command: ' + cmd_str)
+    throw Error('Linking failed with command: ' + cmd_str)
   }
   
   log.console('Built ' + output)
@@ -374,30 +424,30 @@ Build.build_all_dynamic = function(target, buildtype = 'release') {
   var results = []
   
   // Build core first
-  if (packages.indexOf('core') >= 0) {
+  if (find(packages, 'core') != null) {
     try {
       var lib = Build.build_dynamic('core', target, buildtype)
-      results.push({ package: 'core', library: lib })
+      push(results, { package: 'core', library: lib })
     } catch (e) {
-      log.error('Failed to build core: ' + e)
-      results.push({ package: 'core', error: e })
+      log.error('Failed to build core: ' + text(e))
+      push(results, { package: 'core', error: e })
     }
   }
   
   // Build other packages
-  for (var i = 0; i < packages.length; i++) {
-    var pkg = packages[i]
-    if (pkg == 'core') continue
+  arrfor(packages, function(pkg) {
+    if (pkg == 'core') return
     
     try {
       var lib = Build.build_dynamic(pkg, target, buildtype)
-      results.push({ package: pkg, library: lib })
+      push(results, { package: pkg, library: lib })
     } catch (e) {
       log.error('Failed to build ' + pkg + ': ')
-      log.error(e)
-      results.push({ package: pkg, error: e })
+      log.console(e.message)
+      log.console(e.stack)
+      push(results, { package: pkg, error: e })
     }
-  }
+  })
   
   return results
 }

cellfs.cm

@@ -17,30 +17,7 @@ var writepath = "."
 function normalize_path(path) {
   if (!path) return ""
   // Remove leading/trailing slashes and normalize
-  return path.replace(/^\/+|\/+$/g, "")
-}
-
-// Helper to get directory from path
-function dirname(path) {
-  var idx = path.lastIndexOf("/")
-  if (idx == -1) return ""
-  return path.substring(0, idx)
-}
-
-// Helper to get basename from path
-function basename(path) {
-  var idx = path.lastIndexOf("/")
-  if (idx == -1) return path
-  return path.substring(idx + 1)
-}
-
-// Helper to join paths
-function join_paths(base, rel) {
-  base = base.replace(/\/+$/, "")
-  rel = rel.replace(/^\/+/, "")
-  if (!base) return rel
-  if (!rel) return base
-  return base + "/" + rel
+  return replace(path, /^\/+|\/+$/, "")
 }
 
 // Check if a file exists in a specific mount
@@ -59,7 +36,7 @@ function mount_exists(mount, path) {
       return false
     }
   } else { // fs
-    var full_path = join_paths(mount.source, path)
+    var full_path = fd.join_paths(mount.source, path)
     try {
       var st = fd.stat(full_path)
       return st.isFile || st.isDirectory
@@ -86,7 +63,7 @@ function is_directory(path) {
       return false;
     }
   } else { // fs
-    var full_path = join_paths(mount.source, path)
+    var full_path = fd.join_paths(mount.source, path)
     try {
       var st = fd.stat(full_path)
       return st.isDirectory
@@ -102,44 +79,50 @@ function resolve(path, must_exist) {
   path = normalize_path(path)
   
   // Check for named mount
-  if (path.startsWith("@")) {
-    var idx = path.indexOf("/")
+  if (starts_with(path, "@")) {
+    var idx = search(path, "/")
     var mount_name = ""
     var rel_path = ""
     
-    if (idx == -1) {
-      mount_name = path.substring(1)
+    if (idx == null) {
+      mount_name = text(path, 1)
       rel_path = ""
     } else {
-      mount_name = path.substring(1, idx)
-      rel_path = path.substring(idx + 1)
+      mount_name = text(path, 1, idx)
+      rel_path = text(path, idx + 1)
     }
     
     // Find named mount
     var mount = null
-    for (var m of mounts) {
+    arrfor(mounts, function(m) {
       if (m.name == mount_name) {
         mount = m
-        break
+        return true
       }
-    }
+    }, false, true)
     
     if (!mount) {
-      throw new Error("Unknown mount point: @" + mount_name)
+      throw Error("Unknown mount point: @" + mount_name)
     }
     
     return { mount: mount, path: rel_path }
   }
   
   // Search path
-  for (var mount of mounts) {
+  var found_mount = null
+  arrfor(mounts, function(mount) {
     if (mount_exists(mount, path)) {
-      return { mount: mount, path: path }
+      found_mount = { mount: mount, path: path }
+      return true
     }
+  }, false, true)
+  
+  if (found_mount) {
+    return found_mount
   }
   
   if (must_exist) {
-    throw new Error("File not found in any mount: " + path)
+    throw Error("File not found in any mount: " + path)
   }
 }
 
@@ -174,8 +157,8 @@ function mount(source, name) {
         mount_info.zip_blob = blob // keep blob alive
     } else {
         var zip = miniz.read(blob)
-        if (!zip || typeof zip.count != 'function') {
-          throw new Error("Invalid archive file (not zip or qop): " + source)
+        if (!is_object(zip) || !is_function(zip.count)) {
+          throw Error("Invalid archive file (not zip or qop): " + source)
         }
         
         mount_info.type = 'zip'
@@ -183,36 +166,32 @@ function mount(source, name) {
         mount_info.zip_blob = blob // keep blob alive
     }
   } else {
-    throw new Error("Unsupported mount source type: " + source)
+    throw Error("Unsupported mount source type: " + source)
   }
   
-  mounts.push(mount_info)
+  push(mounts, mount_info)
 }
 
 // Unmount
 function unmount(name_or_source) {
-  for (var i = 0; i < mounts.length; i++) {
-    if (mounts[i].name == name_or_source || mounts[i].source == name_or_source) {
-      mounts.splice(i, 1)
-      return
-    }
-  }
-  throw new Error("Mount not found: " + name_or_source)
+  mounts = filter(mounts, function(mount) {
+    return mount.name != name_or_source && mount.source != name_or_source
+  })
 }
 
 // Read file
 function slurp(path) {
   var res = resolve(path, true)
-  if (!res) throw new Error("File not found: " + path)
+  if (!res) throw Error("File not found: " + path)
   
   if (res.mount.type == 'zip') {
     return res.mount.handle.slurp(res.path)
   } else if (res.mount.type == 'qop') {
     var data = res.mount.handle.read(res.path)
-    if (!data) throw new Error("File not found in qop: " + path)
+    if (!data) throw Error("File not found in qop: " + path)
     return data
   } else {
-    var full_path = join_paths(res.mount.source, res.path)
+    var full_path = fd.join_paths(res.mount.source, res.path)
     return fd.slurp(full_path)
   }
 }
@@ -229,7 +208,7 @@ function slurpwrite(path, data) {
 // Check existence
 function exists(path) {
   var res = resolve(path, false)
-  if (path.startsWith("@")) {
+  if (starts_with(path, "@")) {
     return mount_exists(res.mount, res.path)
   }
   return res != null
@@ -238,7 +217,7 @@ function exists(path) {
 // Stat
 function stat(path) {
   var res = resolve(path, true)
-  if (!res) throw new Error("File not found: " + path)
+  if (!res) throw Error("File not found: " + path)
   
   if (res.mount.type == 'zip') {
     var mod = res.mount.handle.mod(res.path)
@@ -249,14 +228,14 @@ function stat(path) {
     }
   } else if (res.mount.type == 'qop') {
     var s = res.mount.handle.stat(res.path)
-    if (!s) throw new Error("File not found in qop: " + path)
+    if (!s) throw Error("File not found in qop: " + path)
     return {
         filesize: s.size,
         modtime: s.modtime,
         isDirectory: s.isDirectory
     }
   } else {
-    var full_path = join_paths(res.mount.source, res.path)
+    var full_path = fd.join_paths(res.mount.source, res.path)
     var s = fd.stat(full_path)
     return {
       filesize: s.size,
@@ -268,7 +247,7 @@ function stat(path) {
 
 // Get search paths
 function searchpath() {
-  return mounts.slice()
+  return array(mounts)
 }
 
 // Mount a package using the shop system
@@ -282,7 +261,7 @@ function mount_package(name) {
   var dir = shop.get_package_dir(name)
 
   if (!dir) {
-    throw new Error("Package not found: " + name)
+    throw Error("Package not found: " + name)
   }
 
   mount(dir, name)
@@ -296,16 +275,16 @@ function match(str, pattern) {
 
 function rm(path) {
   var res = resolve(path, true)
-  if (res.mount.type != 'fs') throw new Error("Cannot delete from non-fs mount")
+  if (res.mount.type != 'fs') throw Error("Cannot delete from non-fs mount")
   
-  var full_path = join_paths(res.mount.source, res.path)
+  var full_path = fd.join_paths(res.mount.source, res.path)
   var st = fd.stat(full_path)
   if (st.isDirectory) fd.rmdir(full_path)
   else fd.unlink(full_path)
 }
 
 function mkdir(path) {
-  var full = join_paths(writepath, path)
+  var full = fd.join_paths(writepath, path)
   fd.mkdir(full)
 }
 
@@ -324,7 +303,7 @@ function prefdir(org, app) {
 function realdir(path) {
    var res = resolve(path, false)
    if (!res) return null
-   return join_paths(res.mount.source, res.path)
+   return fd.join_paths(res.mount.source, res.path)
 }
 
 function enumerate(path, recurse) {
@@ -337,21 +316,21 @@ function enumerate(path, recurse) {
        var list = fd.readdir(curr_full)
        if (!list) return
        
-       for (var item of list) {
+       arrfor(list, function(item) {
           var item_rel = rel_prefix ? rel_prefix + "/" + item : item
-          results.push(item_rel)
+          push(results, item_rel)
           
           if (recurse) {
-             var st = fd.stat(join_paths(curr_full, item))
+             var st = fd.stat(fd.join_paths(curr_full, item))
              if (st.isDirectory) {
-                visit(join_paths(curr_full, item), item_rel)
+                visit(fd.join_paths(curr_full, item), item_rel)
              }
           }
-       }
+       })
     }
     
     if (res.mount.type == 'fs') {
-        var full = join_paths(res.mount.source, res.path)
+        var full = fd.join_paths(res.mount.source, res.path)
         var st = fd.stat(full)
         if (st && st.isDirectory) {
            visit(full, "")
@@ -359,29 +338,29 @@ function enumerate(path, recurse) {
     } else if (res.mount.type == 'qop') {
         var all = res.mount.handle.list()
         var prefix = res.path ? res.path + "/" : ""
-        var prefix_len = prefix.length
+        var prefix_len = length(prefix)
         
         // Use a set to avoid duplicates if we are simulating directories
         var seen = {}
         
-        for (var p of all) {
-            if (p.startsWith(prefix)) {
-                var rel = p.substring(prefix_len)
-                if (rel.length == 0) continue
-                
+        arrfor(all, function(p) {
+            if (starts_with(p, prefix)) {
+                var rel = text(p, prefix_len)
+                if (length(rel) == 0) return
+
                 if (!recurse) {
-                    var slash = rel.indexOf('/')
-                    if (slash != -1) {
-                        rel = rel.substring(0, slash)
+                    var slash = search(rel, '/')
+                    if (slash != null) {
+                        rel = text(rel, 0, slash)
                     }
                 }
                 
                 if (!seen[rel]) {
                     seen[rel] = true
-                    results.push(rel)
+                    push(results, rel)
                 }
             }
-        }
+        })
     }
     
     return results
@@ -393,17 +372,25 @@ function globfs(globs, dir) {
    var results = []
    
    function check_neg(path) {
-        for (var g of globs) {
-            if (g.startsWith("!") && wildstar.match(g.substring(1), path, wildstar.WM_WILDSTAR)) return true;
-        }
-        return false;
+        var result = false
+        arrfor(globs, function(g) {
+            if (starts_with(g, "!") && wildstar.match(text(g, 1), path, wildstar.WM_WILDSTAR)) {
+                result = true
+                return true
+            }
+        }, false, true)
+        return result
     }
     
    function check_pos(path) {
-        for (var g of globs) {
-            if (!g.startsWith("!") && wildstar.match(g, path, wildstar.WM_WILDSTAR)) return true;
-        }
-        return false;
+        var result = false
+        arrfor(globs, function(g) {
+            if (!starts_with(g, "!") && wildstar.match(g, path, wildstar.WM_WILDSTAR)) {
+                result = true
+                return true
+            }
+        }, false, true)
+        return result
     }
 
    function visit(curr_full, rel_prefix) {
@@ -412,10 +399,10 @@ function globfs(globs, dir) {
        var list = fd.readdir(curr_full)
        if (!list) return
        
-       for (var item of list) {
+       arrfor(list, function(item) {
           var item_rel = rel_prefix ? rel_prefix + "/" + item : item
           
-          var child_full = join_paths(curr_full, item)
+          var child_full = fd.join_paths(curr_full, item)
           var st = fd.stat(child_full)
           
           if (st.isDirectory) {
@@ -424,14 +411,14 @@ function globfs(globs, dir) {
               }
           } else {
               if (!check_neg(item_rel) && check_pos(item_rel)) {
-                  results.push(item_rel)
+                  push(results, item_rel)
               }
           }
-       }
+       })
    }
    
    if (res.mount.type == 'fs') {
-        var full = join_paths(res.mount.source, res.path)
+        var full = fd.join_paths(res.mount.source, res.path)
         var st = fd.stat(full)
         if (st && st.isDirectory) {
            visit(full, "")
@@ -439,18 +426,18 @@ function globfs(globs, dir) {
    } else if (res.mount.type == 'qop') {
         var all = res.mount.handle.list()
         var prefix = res.path ? res.path + "/" : ""
-        var prefix_len = prefix.length
+        var prefix_len = length(prefix)
         
-        for (var p of all) {
-            if (p.startsWith(prefix)) {
-                var rel = p.substring(prefix_len)
-                if (rel.length == 0) continue
-                
+        arrfor(all, function(p) {
+            if (starts_with(p, prefix)) {
+                var rel = text(p, prefix_len)
+                if (length(rel) == 0) return
+
                 if (!check_neg(rel) && check_pos(rel)) {
-                    results.push(rel)
+                    push(results, rel)
                 }
             }
-        }
+        })
    }
    
    return results

clean.ce

@@ -1,26 +1,218 @@
-// cell clean - Remove build artifacts from global shop
+// cell clean [<scope>] - Remove cached material to force refetch/rebuild
+//
+// Usage:
+//   cell clean              Clean build outputs for current directory package
+//   cell clean .            Clean build outputs for current directory package
+//   cell clean <locator>    Clean build outputs for specific package
+//   cell clean shop         Clean entire shop
+//   cell clean world        Clean all world packages
+//
+// Options:
+//   --build      Remove build outputs only (default)
+//   --fetch      Remove fetched sources only
+//   --all        Remove both build outputs and fetched sources
+//   --deep       Apply to full dependency closure
+//   --dry-run    Show what would be deleted
 
-var fd = use('fd')
 var shop = use('internal/shop')
+var pkg = use('package')
+var fd = use('fd')
 
-var build_dir = shop.get_shop_path() + '/build'
+var scope = null
+var clean_build = false
+var clean_fetch = false
+var deep = false
+var dry_run = false
 
-if (!fd.is_dir(build_dir)) {
-  log.console("No build directory found at " + build_dir)
-  $stop()
-  return
+for (var i = 0; i < length(args); i++) {
+  if (args[i] == '--build') {
+    clean_build = true
+  } else if (args[i] == '--fetch') {
+    clean_fetch = true
+  } else if (args[i] == '--all') {
+    clean_build = true
+    clean_fetch = true
+  } else if (args[i] == '--deep') {
+    deep = true
+  } else if (args[i] == '--dry-run') {
+    dry_run = true
+  } else if (args[i] == '--help' || args[i] == '-h') {
+    log.console("Usage: cell clean [<scope>] [options]")
+    log.console("")
+    log.console("Remove cached material to force refetch/rebuild.")
+    log.console("")
+    log.console("Scopes:")
+    log.console("  <locator>  Clean specific package")
+    log.console("  shop       Clean entire shop")
+    log.console("  world      Clean all world packages")
+    log.console("")
+    log.console("Options:")
+    log.console("  --build    Remove build outputs only (default)")
+    log.console("  --fetch    Remove fetched sources only")
+    log.console("  --all      Remove both build outputs and fetched sources")
+    log.console("  --deep     Apply to full dependency closure")
+    log.console("  --dry-run  Show what would be deleted")
+    $stop()
+  } else if (!starts_with(args[i], '-')) {
+    scope = args[i]
+  }
 }
 
-log.console("Cleaning build artifacts...")
-
-// Remove the build directory
-try {
-  fd.rm(build_dir)
-  log.console("Build directory removed: " + build_dir)
-} catch (e) {
-  log.error(e)
+// Default to --build if nothing specified
+if (!clean_build && !clean_fetch) {
+  clean_build = true
 }
 
-log.console("Clean complete!")
+// Default scope to current directory
+if (!scope) {
+  scope = '.'
+}
 
-$stop()
+// Resolve local paths for single package scope
+var is_shop_scope = (scope == 'shop')
+var is_world_scope = (scope == 'world')
+
+if (!is_shop_scope && !is_world_scope) {
+  if (scope == '.' || starts_with(scope, './') || starts_with(scope, '../') || fd.is_dir(scope)) {
+    var resolved = fd.realpath(scope)
+    if (resolved) {
+      scope = resolved
+    }
+  }
+}
+
+var files_to_delete = []
+var dirs_to_delete = []
+
+// Gather packages to clean
+var packages_to_clean = []
+
+if (is_shop_scope) {
+  packages_to_clean = shop.list_packages()
+} else if (is_world_scope) {
+  // For now, world is the same as shop
+  packages_to_clean = shop.list_packages()
+} else {
+  // Single package
+  push(packages_to_clean, scope)
+
+  if (deep) {
+    try {
+      var deps = pkg.gather_dependencies(scope)
+      arrfor(deps, function(dep) {
+        push(packages_to_clean, dep)
+      })
+    } catch (e) {
+      // Skip if can't read dependencies
+    }
+  }
+}
+
+// Gather files to clean
+var lib_dir = shop.get_lib_dir()
+var build_dir = shop.get_build_dir()
+var packages_dir = replace(shop.get_package_dir(''), /\/$/, '') // Get base packages dir
+
+if (clean_build) {
+  if (is_shop_scope) {
+    // Clean entire build and lib directories
+    if (fd.is_dir(build_dir)) {
+      push(dirs_to_delete, build_dir)
+    }
+    if (fd.is_dir(lib_dir)) {
+      push(dirs_to_delete, lib_dir)
+    }
+  } else {
+    // Clean specific package libraries
+    arrfor(packages_to_clean, function(p) {
+      if (p == 'core') return
+
+      var lib_name = shop.lib_name_for_package(p)
+      var dylib_ext = '.dylib'
+      var lib_path = lib_dir + '/' + lib_name + dylib_ext
+
+      if (fd.is_file(lib_path)) {
+        push(files_to_delete, lib_path)
+      }
+
+      // Also check for .so and .dll
+      var so_path = lib_dir + '/' + lib_name + '.so'
+      var dll_path = lib_dir + '/' + lib_name + '.dll'
+      if (fd.is_file(so_path)) {
+        push(files_to_delete, so_path)
+      }
+      if (fd.is_file(dll_path)) {
+        push(files_to_delete, dll_path)
+      }
+    })
+  }
+}
+
+if (clean_fetch) {
+  if (is_shop_scope) {
+    // Clean entire packages directory (dangerous!)
+    if (fd.is_dir(packages_dir)) {
+      push(dirs_to_delete, packages_dir)
+    }
+  } else {
+    // Clean specific package directories
+    arrfor(packages_to_clean, function(p) {
+      if (p == 'core') return
+
+      var pkg_dir = shop.get_package_dir(p)
+      if (fd.is_dir(pkg_dir) || fd.is_link(pkg_dir)) {
+        push(dirs_to_delete, pkg_dir)
+      }
+    })
+  }
+}
+
+// Execute or report
+if (dry_run) {
+  log.console("Would delete:")
+  if (length(files_to_delete) == 0 && length(dirs_to_delete) == 0) {
+    log.console("  (nothing to clean)")
+  } else {
+    arrfor(files_to_delete, function(f) {
+      log.console("  [file] " + f)
+    })
+    arrfor(dirs_to_delete, function(d) {
+      log.console("  [dir]  " + d)
+    })
+  }
+} else {
+  var deleted_count = 0
+
+  arrfor(files_to_delete, function(f) {
+    try {
+      fd.unlink(f)
+      log.console("Deleted: " + f)
+      deleted_count++
+    } catch (e) {
+      log.error("Failed to delete " + f + ": " + e)
+    }
+  })
+
+  arrfor(dirs_to_delete, function(d) {
+    try {
+      if (fd.is_link(d)) {
+        fd.unlink(d)
+      } else {
+        fd.rmdir(d, 1) // recursive
+      }
+      log.console("Deleted: " + d)
+      deleted_count++
+    } catch (e) {
+      log.error("Failed to delete " + d + ": " + e)
+    }
+  })
+
+  if (deleted_count == 0) {
+    log.console("Nothing to clean.")
+  } else {
+    log.console("")
+    log.console("Clean complete: " + text(deleted_count) + " item(s) deleted.")
+  }
+}
+
+$stop()

clone.ce

@@ -7,7 +7,7 @@ var fd = use('fd')
 var http = use('http')
 var miniz = use('miniz')
 
-if (args.length < 2) {
+if (length(args) < 2) {
   log.console("Usage: cell clone <origin> <path>")
   log.console("Clones a cell package to a local path and links it.")
   $stop()
@@ -18,7 +18,7 @@ var origin = args[0]
 var target_path = args[1]
 
 // Resolve target path to absolute
-if (target_path == '.' || target_path.startsWith('./') || target_path.startsWith('../')) {
+if (target_path == '.' || starts_with(target_path, './') || starts_with(target_path, '../')) {
   var resolved = fd.realpath(target_path)
   if (resolved) {
     target_path = resolved
@@ -27,12 +27,12 @@ if (target_path == '.' || target_path.startsWith('./') || target_path.startsWith
     var cwd = fd.realpath('.')
     if (target_path == '.') {
       target_path = cwd
-    } else if (target_path.startsWith('./')) {
-      target_path = cwd + target_path.substring(1)
-    } else if (target_path.startsWith('../')) {
+    } else if (starts_with(target_path, './')) {
+      target_path = cwd + text(target_path, 1)
+    } else if (starts_with(target_path, '../')) {
       // Go up one directory from cwd
-      var parent = cwd.substring(0, cwd.lastIndexOf('/'))
-      target_path = parent + target_path.substring(2)
+      var parent = fd.dirname(cwd)
+      target_path = parent + text(target_path, 2)
     }
   }
 }
@@ -92,14 +92,13 @@ try {
   for (var i = 0; i < count; i++) {
     if (zip.is_directory(i)) continue
     var filename = zip.get_filename(i)
-    var parts = filename.split('/')
-    if (parts.length <= 1) continue
-    
-    // Skip the first directory (repo-commit prefix)
-    parts.shift()
-    var rel_path = parts.join('/')
+    var first_slash = search(filename, '/')
+    if (first_slash == null) continue
+    if (first_slash + 1 >= length(filename)) continue
+
+    var rel_path = text(filename, first_slash + 1)
     var full_path = target_path + '/' + rel_path
-    var dir_path = full_path.substring(0, full_path.lastIndexOf('/'))
+    var dir_path = fd.dirname(full_path)
     
     // Ensure directory exists
     if (!fd.is_dir(dir_path)) {

config.ce

@@ -31,30 +31,30 @@ function print_help() {
 
 // Parse a dot-notation key into path segments
 function parse_key(key) {
-  return key.split('.')
+  return array(key, '.')
 }
 
 // Get a value from nested object using path
 function get_nested(obj, path) {
   var current = obj
-  for (var segment of path) {
-    if (!current || typeof current != 'object') return null
+  arrfor(path, function(segment) {
+    if (is_null(current) || !is_object(current)) return null
     current = current[segment]
-  }
+  })
   return current
 }
 
 // Set a value in nested object using path
 function set_nested(obj, path, value) {
   var current = obj
-  for (var i = 0; i < path.length - 1; i++) {
+  for (var i = 0; i < length(path) - 1; i++) {
     var segment = path[i]
-    if (!current[segment] || typeof current[segment] != 'object') {
+    if (is_null(current[segment]) || !is_object(current[segment])) {
       current[segment] = {}
     }
     current = current[segment]
   }
-  current[path[path.length - 1]] = value
+  current[path[length(path) - 1]] = value
 }
 
 // Parse value string into appropriate type
@@ -64,7 +64,7 @@ function parse_value(str) {
   if (str == 'false') return false
   
   // Number (including underscores)
-  var num_str = str.replace(/_/g, '')
+  var num_str = replace(str, /_/g, '')
   if (/^-?\d+$/.test(num_str)) return parseInt(num_str)
   if (/^-?\d*\.\d+$/.test(num_str)) return parseFloat(num_str)
   
@@ -74,29 +74,29 @@ function parse_value(str) {
 
 // Format value for display
 function format_value(val) {
-  if (typeof val == 'string') return '"' + val + '"'
-  if (typeof val == 'number' && val >= 1000) {
+  if (is_text(val)) return '"' + val + '"'
+  if (is_number(val) && val >= 1000) {
     // Add underscores to large numbers
-    return val.toString().replace(/\B(?=(\d{3})+(?!\d))/g, '_')
+    return replace(val.toString(), /\B(?=(\d{3})+(?!\d))/g, '_')
   }
   return text(val)
 }
 
 // Print configuration tree recursively
 function print_config(obj, prefix = '') {
-  for (var key in obj) {
+  arrfor(array(obj), function(key) {
     var val = obj[key]
     var full_key = prefix ? prefix + '.' + key : key
     
-    if (isa(val, object))
+    if (is_object(val))
       print_config(val, full_key)
     else
       log.console(full_key + ' = ' + format_value(val))
-  }
+  })
 }
 
 // Main command handling
-if (args.length == 0) {
+if (length(args) == 0) {
   print_help()
   $stop()
   return
@@ -110,6 +110,9 @@ if (!config) {
 }
 
 var command = args[0]
+var key
+var path
+var value
 
 switch (command) {
   case 'help':
@@ -125,14 +128,14 @@ switch (command) {
     break
     
   case 'get':
-    if (args.length < 2) {
+    if (length(args) < 2) {
       log.error("Usage: cell config get <key>")
       $stop()
       return
     }
-    var key = args[1]
-    var path = parse_key(key)
-    var value = get_nested(config, path)
+    key = args[1]
+    path = parse_key(key)
+    value = get_nested(config, path)
     
     if (value == null) {
       log.error("Key not found: " + key)
@@ -143,9 +146,9 @@ switch (command) {
       log.console(key + ' = ' + format_value(value))
     }
     break
-    
+
   case 'set':
-    if (args.length < 3) {
+    if (length(args) < 3) {
       log.error("Usage: cell config set <key> <value>")
       $stop()
       return
@@ -161,8 +164,8 @@ switch (command) {
         'ar_timer', 'actor_memory', 'net_service', 
         'reply_timeout', 'actor_max', 'stack_max'
       ]
-      if (!valid_system_keys.includes(path[1])) {
-        log.error("Invalid system key. Valid keys: " + valid_system_keys.join(', '))
+      if (find(valid_system_keys, path[1]) == null) {
+        log.error("Invalid system key. Valid keys: " + text(valid_system_keys, ', '))
         $stop()
         return
       }
@@ -172,10 +175,10 @@ switch (command) {
     pkg.save_config(config)
     log.console("Set " + key + " = " + format_value(value))
     break
-    
+
   case 'actor':
     // Handle actor-specific configuration
-    if (args.length < 3) {
+    if (length(args) < 3) {
       log.error("Usage: cell config actor <name> <command> [options]")
       $stop()
       return
@@ -190,7 +193,7 @@ switch (command) {
     
     switch (actor_cmd) {
       case 'list':
-        if (array(config.actors[actor_name]).length == 0) {
+        if (length(array(config.actors[actor_name])) == 0) {
           log.console("No configuration for actor: " + actor_name)
         } else {
           log.console("# Configuration for actor: " + actor_name)
@@ -200,14 +203,14 @@ switch (command) {
         break
         
       case 'get':
-        if (args.length < 4) {
+        if (length(args) < 4) {
           log.error("Usage: cell config actor <name> get <key>")
           $stop()
           return
         }
-        var key = args[3]
-        var path = parse_key(key)
-        var value = get_nested(config.actors[actor_name], path)
+        key = args[3]
+        path = parse_key(key)
+        value = get_nested(config.actors[actor_name], path)
         
         if (value == null) {
           log.error("Key not found for actor " + actor_name + ": " + key)
@@ -217,21 +220,21 @@ switch (command) {
         break
         
       case 'set':
-        if (args.length < 5) {
+        if (length(args) < 5) {
           log.error("Usage: cell config actor <name> set <key> <value>")
           $stop()
           return
         }
-        var key = args[3]
+        key = args[3]
         var value_str = args[4]
-        var path = parse_key(key)
-        var value = parse_value(value_str)
+        path = parse_key(key)
+        value = parse_value(value_str)
         
         set_nested(config.actors[actor_name], path, value)
         pkg.save_config(config)
         log.console("Set actors." + actor_name + "." + key + " = " + format_value(value))
         break
-        
+
       default:
         log.error("Unknown actor command: " + actor_cmd)
         log.console("Valid commands: list, get, set")

crypto.c

@@ -231,7 +231,7 @@ JSValue js_crypto_unlock(JSContext *js, JSValue self, int argc, JSValue *argv) {
 
 static const JSCFunctionListEntry js_crypto_funcs[] = {
   JS_CFUNC_DEF("shared", 2, js_crypto_shared),
-  JS_CFUNC_DEF("blake2", 1, js_crypto_blake2),
+  JS_CFUNC_DEF("blake2", 2, js_crypto_blake2),
   JS_CFUNC_DEF("sign", 2, js_crypto_sign),
   JS_CFUNC_DEF("verify", 3, js_crypto_verify),
   JS_CFUNC_DEF("lock", 3, js_crypto_lock),

debug/js.c

@@ -1,8 +1,6 @@
 #include "cell.h"
 
-JSC_CCALL(os_gc, JS_RunGC(JS_GetRuntime(js)) )
 JSC_CCALL(os_mem_limit, JS_SetMemoryLimit(JS_GetRuntime(js), js2number(js,argv[0])))
-JSC_CCALL(os_gc_threshold, JS_SetGCThreshold(JS_GetRuntime(js), js2number(js,argv[0])))
 JSC_CCALL(os_max_stacksize, JS_SetMaxStackSize(JS_GetRuntime(js), js2number(js,argv[0])))
 
 // Compute the approximate size of a single JS value in memory.
@@ -15,8 +13,7 @@ JSC_CCALL(os_calc_mem,
   JS_SetPropertyStr(js,ret,"memory_used_size",number2js(js,mu.memory_used_size));
   JS_SetPropertyStr(js,ret,"malloc_count",number2js(js,mu.malloc_count));
   JS_SetPropertyStr(js,ret,"memory_used_count",number2js(js,mu.memory_used_count));
-  JS_SetPropertyStr(js,ret,"atom_count",number2js(js,mu.atom_count));
-  JS_SetPropertyStr(js,ret,"atom_size",number2js(js,mu.atom_size));
+  /* atom_count and atom_size removed - atoms are now just strings */
   JS_SetPropertyStr(js,ret,"str_count",number2js(js,mu.str_count));
   JS_SetPropertyStr(js,ret,"str_size",number2js(js,mu.str_size));
   JS_SetPropertyStr(js,ret,"obj_count",number2js(js,mu.obj_count));
@@ -42,20 +39,22 @@ JSC_CCALL(os_calc_mem,
 JSC_SSCALL(os_eval,
   if (!str2) return JS_ThrowReferenceError(js, "Second argument should be the script.");
   if (!str) return JS_ThrowReferenceError(js, "First argument should be the name of the script.");
-  ret = JS_Eval(js,str2,strlen(str2),str, 0);
+  JSValue bytecode = JS_Compile(js, str2, strlen(str2), str);
+  if (JS_IsException(bytecode)) return bytecode;
+  ret = JS_Integrate(js, bytecode, JS_NULL);
 )
 
 // Compile a string of JavaScript code into a function object.
 JSC_SSCALL(js_compile,
   if (!str2) return JS_ThrowReferenceError(js, "Second argument should be the script.");
   if (!str) return JS_ThrowReferenceError(js, "First argument should be the name of the script.");
-  ret = JS_Eval(js, str2, strlen(str2), str, JS_EVAL_FLAG_COMPILE_ONLY | JS_EVAL_FLAG_BACKTRACE_BARRIER);
+  ret = JS_Compile(js, str2, strlen(str2), str);
 )
 
-// Evaluate a function object in the current QuickJS context.
-JSC_CCALL(js_eval_compile,
-  JS_DupValue(js,argv[0]);
-  ret = JS_EvalFunction(js, argv[0]);
+// Link compiled bytecode with environment and execute.
+JSC_CCALL(js_integrate,
+  JSValue env = (argc > 1 && !JS_IsNull(argv[1])) ? argv[1] : JS_NULL;
+  ret = JS_Integrate(js, argv[0], env);
 )
 
 // Compile a function object into a bytecode blob.
@@ -92,12 +91,10 @@ JSC_CCALL(js_fn_info,
 static const JSCFunctionListEntry js_js_funcs[] = {
   MIST_FUNC_DEF(os, calc_mem, 0),
   MIST_FUNC_DEF(os, mem_limit, 1),
-  MIST_FUNC_DEF(os, gc_threshold, 1),
   MIST_FUNC_DEF(os, max_stacksize, 1),
-  MIST_FUNC_DEF(os, gc, 0),
   MIST_FUNC_DEF(os, eval, 2),
   MIST_FUNC_DEF(js, compile, 2),
-  MIST_FUNC_DEF(js, eval_compile, 1),
+  MIST_FUNC_DEF(js, integrate, 2),
   MIST_FUNC_DEF(js, compile_blob, 1),
   MIST_FUNC_DEF(js, compile_unblob, 1),
   MIST_FUNC_DEF(js, disassemble, 1),

docs/.pages

@@ -1,9 +0,0 @@
-nav:
-  - index.md
-  - cellscript.md
-  - actors.md
-  - packages.md
-  - cli.md
-  - c-modules.md
-  - Standard Library: library
-

docs/_index.md

@@ -0,0 +1,74 @@
+---
+title: "Documentation"
+description: "ƿit language documentation"
+type: "docs"
+---
+
+![image](/images/wizard.png)
+
+ƿit is an actor-based scripting language for building concurrent applications. It combines a familiar C-like syntax with the actor model of computation, optimized for low memory usage and simplicity.
+
+## Key Features
+
+- **Actor Model** — isolated memory, message passing, no shared state
+- **Immutability** — `stone()` makes values permanently frozen
+- **Prototype Inheritance** — objects without classes
+- **C Integration** — seamlessly extend with native code
+- **Cross-Platform** — deploy to desktop, web, and embedded
+
+## Quick Start
+
+```javascript
+// hello.ce - A simple actor
+log.console("Hello, ƿit!")
+$stop()
+```
+
+```bash
+pit hello
+```
+
+## Language
+
+- [**ƿit Language**](/docs/language/) — syntax, types, and built-in functions
+- [**Actors and Modules**](/docs/actors/) — the execution model
+- [**Packages**](/docs/packages/) — code organization and sharing
+- [**Command Line**](/docs/cli/) — the `pit` tool
+- [**Writing C Modules**](/docs/c-modules/) — native extensions
+
+## Reference
+
+- [**Built-in Functions**](/docs/functions/) — intrinsics reference
+
+## Standard Library
+
+- [text](/docs/library/text/) — string manipulation
+- [number](/docs/library/number/) — numeric operations (functions are global: `floor()`, `max()`, etc.)
+- [array](/docs/library/array/) — array utilities
+- [object](/docs/library/object/) — object utilities
+- [blob](/docs/library/blob/) — binary data
+- [time](/docs/library/time/) — time and dates
+- [math](/docs/library/math/) — trigonometry and math
+- [json](/docs/library/json/) — JSON encoding/decoding
+- [random](/docs/library/random/) — random numbers
+
+## Architecture
+
+ƿit programs are organized into **packages**. Each package contains:
+
+- **Modules** (`.cm`) — return a value, cached and frozen
+- **Actors** (`.ce`) — run independently, communicate via messages
+- **C files** (`.c`) — compiled to native libraries
+
+Actors never share memory. They communicate by sending messages, which are automatically serialized. This makes concurrent programming safe and predictable.
+
+## Installation
+
+```bash
+# Clone and bootstrap
+git clone https://gitea.pockle.world/john/cell
+cd cell
+make bootstrap
+```
+
+The ƿit shop is stored at `~/.pit/`.

docs/actors.md

@@ -1,10 +1,15 @@
-# Actors and Modules
+---
+title: "Actors and Modules"
+description: "The ƿit execution model"
+weight: 20
+type: "docs"
+---
 
-Cell organizes code into two types of scripts: **modules** (`.cm`) and **actors** (`.ce`).
+ƿit organizes code into two types of scripts: **modules** (`.cm`) and **actors** (`.ce`).
 
 ## The Actor Model
 
-Cell is built on the actor model of computation. Each actor:
+ƿit is built on the actor model of computation. Each actor:
 
 - Has its own **isolated memory** — actors never share state
 - Runs to completion each **turn** — no preemption
@@ -62,10 +67,10 @@ An actor is a script that **does not return a value**. It runs as an independent
 // worker.ce
 log.console("Worker started")
 
-$on_message = function(msg) {
+$receiver(function(msg, reply) {
   log.console("Received:", msg)
   // Process message...
-}
+})
 ```
 
 **Key properties:**
@@ -177,11 +182,11 @@ $time_limit(my_requestor, 10)  // 10 second timeout
 
 ## Module Resolution
 
-When you call `use('name')`, Cell searches:
+When you call `use('name')`, ƿit searches:
 
 1. **Current package** — files relative to package root
-2. **Dependencies** — packages declared in `cell.toml`
-3. **Core** — built-in Cell modules
+2. **Dependencies** — packages declared in `pit.toml`
+3. **Core** — built-in ƿit modules
 
 ```javascript
 // From within package 'myapp':

docs/c-modules.md

@@ -1,6 +1,11 @@
-# Writing C Modules
+---
+title: "Writing C Modules"
+description: "Extending ƿit with native code"
+weight: 50
+type: "docs"
+---
 
-Cell makes it easy to extend functionality with C code. C files in a package are compiled into a dynamic library and can be imported like any other module.
+ƿit makes it easy to extend functionality with C code. C files in a package are compiled into a dynamic library and can be imported like any other module.
 
 ## Basic Structure
 
@@ -45,12 +50,12 @@ Where:
 - `<filename>` is the C file name without extension
 
 Examples:
-- `mypackage/math.c` → `js_mypackage_math_use`
-- `gitea.pockle.world/john/lib/render.c` → `js_gitea_pockle_world_john_lib_render_use`
+- `mypackage/math.c` -> `js_mypackage_math_use`
+- `gitea.pockle.world/john/lib/render.c` -> `js_gitea_pockle_world_john_lib_render_use`
 
 ## Required Headers
 
-Include `cell.h` for all Cell integration:
+Include `cell.h` for all ƿit integration:
 
 ```c
 #include "cell.h"
@@ -63,7 +68,7 @@ This provides:
 
 ## Conversion Functions
 
-### JavaScript ↔ C
+### JavaScript <-> C
 
 ```c
 // Numbers
@@ -201,7 +206,7 @@ static const JSCFunctionListEntry js_funcs[] = {
 CELL_USE_FUNCS(js_funcs)
 ```
 
-Usage in Cell:
+Usage in ƿit:
 
 ```javascript
 var vector = use('vector')
@@ -211,7 +216,7 @@ var n = vector.normalize(3, 4) // {x: 0.6, y: 0.8}
 var d = vector.dot(1, 0, 0, 1) // 0
 ```
 
-## Combining C and Cell
+## Combining C and ƿit
 
 A common pattern is to have a C file provide low-level functions and a `.cm` file provide a higher-level API:
 
@@ -244,11 +249,11 @@ return Vector
 C files are automatically compiled when you run:
 
 ```bash
-cell build
-cell update
+pit build
+pit update
 ```
 
-The resulting dynamic library is placed in `~/.cell/lib/`.
+The resulting dynamic library is placed in `~/.pit/lib/`.
 
 ## Platform-Specific Code
 
@@ -260,7 +265,7 @@ audio_playdate.c  # Playdate
 audio_emscripten.c # Web/Emscripten
 ```
 
-Cell selects the appropriate file based on the target platform.
+ƿit selects the appropriate file based on the target platform.
 
 ## Static Declarations
 

docs/cli.md

@@ -1,138 +1,143 @@
-# Command Line Interface
+---
+title: "Command Line Interface"
+description: "The pit tool"
+weight: 40
+type: "docs"
+---
 
-Cell provides a command-line interface for managing packages, running scripts, and building applications.
+ƿit provides a command-line interface for managing packages, running scripts, and building applications.
 
 ## Basic Usage
 
 ```bash
-cell <command> [arguments]
+pit <command> [arguments]
 ```
 
 ## Commands
 
-### cell version
+### pit version
 
-Display the Cell version.
+Display the ƿit version.
 
 ```bash
-cell version
+pit version
 # 0.1.0
 ```
 
-### cell install
+### pit install
 
 Install a package to the shop.
 
 ```bash
-cell install gitea.pockle.world/john/prosperon
-cell install /Users/john/local/mypackage  # local path
+pit install gitea.pockle.world/john/prosperon
+pit install /Users/john/local/mypackage  # local path
 ```
 
-### cell update
+### pit update
 
 Update packages from remote sources.
 
 ```bash
-cell update              # update all packages
-cell update <package>    # update specific package
+pit update              # update all packages
+pit update <package>    # update specific package
 ```
 
-### cell remove
+### pit remove
 
 Remove a package from the shop.
 
 ```bash
-cell remove gitea.pockle.world/john/oldpackage
+pit remove gitea.pockle.world/john/oldpackage
 ```
 
-### cell list
+### pit list
 
 List installed packages.
 
 ```bash
-cell list              # list all installed packages
-cell list <package>    # list dependencies of a package
+pit list              # list all installed packages
+pit list <package>    # list dependencies of a package
 ```
 
-### cell ls
+### pit ls
 
 List modules and actors in a package.
 
 ```bash
-cell ls              # list files in current project
-cell ls <package>    # list files in specified package
+pit ls              # list files in current project
+pit ls <package>    # list files in specified package
 ```
 
-### cell build
+### pit build
 
 Build the current package.
 
 ```bash
-cell build
+pit build
 ```
 
-### cell test
+### pit test
 
 Run tests.
 
 ```bash
-cell test            # run tests in current package
-cell test all        # run all tests
-cell test <package>  # run tests in specific package
+pit test            # run tests in current package
+pit test all        # run all tests
+pit test <package>  # run tests in specific package
 ```
 
-### cell link
+### pit link
 
 Manage local package links for development.
 
 ```bash
-cell link add <canonical> <local_path>  # link a package
-cell link list                          # show all links
-cell link delete <canonical>            # remove a link
-cell link clear                         # remove all links
+pit link add <canonical> <local_path>  # link a package
+pit link list                          # show all links
+pit link delete <canonical>            # remove a link
+pit link clear                         # remove all links
 ```
 
-### cell fetch
+### pit fetch
 
 Fetch package sources without extracting.
 
 ```bash
-cell fetch <package>
+pit fetch <package>
 ```
 
-### cell upgrade
+### pit upgrade
 
-Upgrade the Cell installation itself.
+Upgrade the ƿit installation itself.
 
 ```bash
-cell upgrade
+pit upgrade
 ```
 
-### cell clean
+### pit clean
 
 Clean build artifacts.
 
 ```bash
-cell clean
+pit clean
 ```
 
-### cell help
+### pit help
 
 Display help information.
 
 ```bash
-cell help
-cell help <command>
+pit help
+pit help <command>
 ```
 
 ## Running Scripts
 
-Any `.ce` file in the Cell core can be run as a command:
+Any `.ce` file in the ƿit core can be run as a command:
 
 ```bash
-cell version    # runs version.ce
-cell build      # runs build.ce
-cell test       # runs test.ce
+pit version    # runs version.ce
+pit build      # runs build.ce
+pit test       # runs test.ce
 ```
 
 ## Package Locators
@@ -143,16 +148,16 @@ Packages are identified by locators:
 - **Local**: `/absolute/path/to/package`
 
 ```bash
-cell install gitea.pockle.world/john/prosperon
-cell install /Users/john/work/mylib
+pit install gitea.pockle.world/john/prosperon
+pit install /Users/john/work/mylib
 ```
 
 ## Configuration
 
-Cell stores its data in `~/.cell/`:
+ƿit stores its data in `~/.pit/`:
 
 ```
-~/.cell/
+~/.pit/
 ├── packages/       # installed packages
 ├── lib/            # compiled dynamic libraries
 ├── build/          # build cache
@@ -163,7 +168,7 @@ Cell stores its data in `~/.cell/`:
 
 ## Environment
 
-Cell reads the `HOME` environment variable to locate the shop directory.
+ƿit reads the `HOME` environment variable to locate the shop directory.
 
 ## Exit Codes
 

docs/functions.md

@@ -0,0 +1,427 @@
+---
+title: "Built-in Functions"
+description: "Intrinsic constants and functions"
+weight: 60
+type: "docs"
+---
+
+The intrinsics are constants and functions that are built into the language. The `use` statement is not needed to access them.
+
+A programmer is not obliged to consult the list of intrinsics before naming a new variable or input. New intrinsics may be added to ƿit without breaking existing programs.
+
+## Constants
+
+### false
+
+The value of `1 == 0`. One of the two logical values.
+
+### true
+
+The value of `1 == 1`. One of the two logical values.
+
+### null
+
+The value of `1 / 0`. The null value is an empty immutable object. All attempts to obtain a value from null by refinement will produce null.
+
+Any attempt to modify null will disrupt. Any attempt to call null as a function will disrupt.
+
+null is the value of missing input values, missing fields in records, and invalid numbers.
+
+### pi
+
+An approximation of circumference / diameter: 3.1415926535897932.
+
+## Creator Functions
+
+The creator functions make new objects. Some can take various types. All return null if their inputs are not suitable.
+
+### array
+
+`array(number)` — Make an array. All elements are initialized to null.
+
+`array(number, initial_value)` — Make an array. All elements are initialized to initial_value. If initial_value is a function, it is called for each element. If the function has arity >= 1, it is passed the element number.
+
+```javascript
+array(3)              // [null, null, null]
+array(3, 0)           // [0, 0, 0]
+array(5, i => i * 2)  // [0, 2, 4, 6, 8]
+```
+
+`array(array)` — Copy. Make a mutable copy of the array.
+
+`array(array, function, reverse, exit)` — Map. Call the function with each element, collecting return values in a new array. The function is passed each element and its element number.
+
+```javascript
+array([1, 2, 3], x => x * 10)  // [10, 20, 30]
+```
+
+If reverse is true, starts with the last element and works backwards.
+
+If exit is not null, when the function returns the exit value, array returns early. The exit value is not stored into the new array.
+
+`array(array, another_array)` — Concat. Produce a new array concatenating both.
+
+```javascript
+array([1, 2], [3, 4])  // [1, 2, 3, 4]
+```
+
+`array(array, from, to)` — Slice. Make a mutable copy of part of an array. If from is negative, add length(array). If to is negative, add length(array).
+
+```javascript
+array([1, 2, 3, 4, 5], 1, 4)  // [2, 3, 4]
+array([1, 2, 3], -2)          // [2, 3]
+```
+
+`array(record)` — Keys. Make an array containing all text keys in the record.
+
+`array(text)` — Split text into grapheme clusters.
+
+```javascript
+array("hello")  // ["h", "e", "l", "l", "o"]
+```
+
+`array(text, separator)` — Split text into an array of subtexts.
+
+`array(text, length)` — Dice text into an array of subtexts of a given length.
+
+### logical
+
+```javascript
+logical(0)        // false
+logical(false)    // false
+logical("false")  // false
+logical(null)     // false
+logical(1)        // true
+logical(true)     // true
+logical("true")   // true
+```
+
+All other values return null.
+
+### number
+
+`number(logical)` — Returns 1 or 0.
+
+`number(number)` — Returns the number.
+
+`number(text, radix)` — Convert text to number. Radix is 2 thru 37 (default: 10).
+
+`number(text, format)` — Parse formatted numbers:
+
+| Format | Radix | Separator | Decimal point |
+|--------|-------|-----------|---------------|
+| `""` | 10 | | .period |
+| `"n"` | 10 | | .period |
+| `"u"` | 10 | _underbar | .period |
+| `"d"` | 10 | ,comma | .period |
+| `"s"` | 10 | space | .period |
+| `"v"` | 10 | .period | ,comma |
+| `"l"` | 10 | locale | locale |
+| `"b"` | 2 | | |
+| `"o"` | 8 | | |
+| `"h"` | 16 | | |
+| `"j"` | auto | | |
+
+```javascript
+number("123,456,789.10", "d")  // 123456789.1
+number("123.456.789,10", "v")  // 123456789.1
+number("666", "o")             // 438
+number("666", "h")             // 1638
+```
+
+### text
+
+`text(array, separator)` — Convert array to text. Elements are concatenated with the separator (default: empty text).
+
+`text(number, radix)` — Convert number to text. Radix is 2 thru 37 (default: 10).
+
+`text(number, format)` — Format a number as text:
+
+**Real styles:**
+
+| Style | Description | Separator | Decimal |
+|-------|-------------|-----------|---------|
+| `"e"` | Scientific | | .period |
+| `"n"` | Number | | .period |
+| `"s"` | Space | space | .period |
+| `"u"` | Underbar | _underbar | .period |
+| `"d"` | Decimal | ,comma | .period |
+| `"c"` | Comma | .period | ,comma |
+| `"l"` | Locale | locale | locale |
+
+**Integer styles:**
+
+| Style | Base | Separator |
+|-------|------|-----------|
+| `"i"` | 10 | _underbar |
+| `"b"` | 2 | _underbar |
+| `"o"` | 8 | _underbar |
+| `"h"` | 16 | _underbar |
+| `"t"` | 32 | _underbar |
+
+The format text is: `separation_digit` + `style_letter` + `places_digits`
+
+```javascript
+var data = 123456789.1
+text(data)             // "123456789.1"
+text(data, "3s4")      // "123 456 789.1000"
+text(data, "d2")       // "123,456,789.10"
+text(data, "e")        // "1.234567891e8"
+text(data, "i")        // "123456789"
+text(data, "8b")       // "111_01011011_11001101_00010101"
+text(data, "h")        // "75BCD15"
+text(12, "4b8")        // "0000_1100"
+```
+
+`text(text, from, to)` — Extract a substring. If from/to are negative, add length(text).
+
+```javascript
+var my_text = "miskatonic"
+text(my_text, 0, 3)   // "mis"
+text(my_text, 5)       // "tonic"
+text(my_text, -3)      // "nic"
+```
+
+### record
+
+`record(record)` — Copy. Make a mutable copy.
+
+`record(record, another_record)` — Combine. Copy a record, then put all fields of another into the copy.
+
+`record(record, array_of_keys)` — Select. New record with only the named fields.
+
+`record(array_of_keys)` — Set. New record using array as keys, each value is true.
+
+`record(array_of_keys, value)` — Value Set. Each field value is value.
+
+`record(array_of_keys, function)` — Functional Value Set. The function is called for each key to produce field values.
+
+## Sensory Functions
+
+The sensory functions always return a logical value. In ƿit, they use the `is_` prefix:
+
+```javascript
+is_array([])         // true
+is_blob(blob.make()) // true
+is_function(x => x)  // true
+is_integer(42)       // true
+is_logical(true)     // true
+is_null(null)        // true
+is_number(3.14)      // true
+is_object({})        // true
+is_text("hello")     // true
+```
+
+Additional type checks: `is_character`, `is_data`, `is_digit`, `is_false`, `is_fit`, `is_letter`, `is_lower`, `is_pattern`, `is_stone`, `is_true`, `is_upper`, `is_whitespace`.
+
+## Standard Functions
+
+### abs(number)
+
+Absolute value. Returns null for non-numbers.
+
+### apply(function, array)
+
+Execute the function, passing the array elements as input values. If the array is longer than the function's arity, it disrupts.
+
+### ceiling(number, place)
+
+Round up. If place is 0 or null, round to the smallest integer >= number.
+
+```javascript
+ceiling(12.3775)        // 13
+ceiling(12.3775, -2)    // 12.38
+ceiling(-12.3775)       // -12
+```
+
+### character(value)
+
+If text, returns the first character. If a non-negative 32-bit integer, returns the character from that codepoint.
+
+### codepoint(text)
+
+Returns the codepoint number of the first character.
+
+### extract(text, pattern, from, to)
+
+Match text to pattern. Returns a record of saved fields, or null if no match.
+
+### fallback(requestor_array)
+
+Returns a requestor that tries each requestor in order until one succeeds. Returns a cancel function.
+
+### filter(array, function)
+
+Call function for each element. When it returns true, the element is included in the new array.
+
+```javascript
+filter([0, 1.25, 2, 3.5, 4, 5.75], is_integer)  // [0, 2, 4]
+```
+
+### find(array, function, reverse, from)
+
+Call function for each element. If it returns true, return the element number. If the second argument is not a function, it is compared directly to elements. Returns null if not found.
+
+```javascript
+find([1, 2, 3], x => x > 1)  // 1
+find([1, 2, 3], 2)            // 1
+```
+
+### floor(number, place)
+
+Round down. If place is 0 or null, round to the greatest integer <= number.
+
+```javascript
+floor(12.3775)        // 12
+floor(12.3775, -2)    // 12.37
+floor(-12.3775)       // -13
+```
+
+### for(array, function, reverse, exit)
+
+Call function with each element and its element number. If exit is not null and the function returns the exit value, return early.
+
+### format(text, collection, transformer)
+
+Substitute `{key}` placeholders in text with values from a collection (array or record).
+
+```javascript
+format("{0} in {1}!", ["Malmborg", "Plano"])
+// "Malmborg in Plano!"
+```
+
+### fraction(number)
+
+Returns the fractional part of a number. See also `whole`.
+
+### length(value)
+
+| Value | Result |
+|-------|--------|
+| array | number of elements |
+| blob | number of bits |
+| text | number of codepoints |
+| function | number of named inputs (arity) |
+| record | record.length() |
+| other | null |
+
+### lower(text)
+
+Returns text with all uppercase characters converted to lowercase.
+
+### max(number, number)
+
+Returns the larger of two numbers. Returns null if either is not a number.
+
+### min(number, number)
+
+Returns the smaller of two numbers.
+
+### modulo(dividend, divisor)
+
+Result is `dividend - (divisor * floor(dividend / divisor))`. Result has the sign of the divisor.
+
+### neg(number)
+
+Negate. Reverse the sign of a number.
+
+### normalize(text)
+
+Unicode normalize.
+
+### not(logical)
+
+Returns the opposite logical. Returns null for non-logicals.
+
+### parallel(requestor_array, throttle, need)
+
+Returns a requestor that starts all requestors in the array. Results are collected into an array matching the input order. Optional throttle limits concurrent requestors. Optional need specifies the minimum number of successes required.
+
+### race(requestor_array, throttle, need)
+
+Like parallel, but returns as soon as the needed number of results are obtained. Default need is 1. Unfinished requestors are cancelled.
+
+### reduce(array, function, initial, reverse)
+
+Reduce an array to a single value by applying a function to pairs of elements.
+
+```javascript
+reduce([1, 2, 3, 4, 5, 6, 7, 8, 9], (a, b) => a + b)  // 45
+```
+
+### remainder(dividend, divisor)
+
+For fit integers: `dividend - ((dividend // divisor) * divisor)`.
+
+### replace(text, target, replacement, limit)
+
+Return text with target replaced by replacement. Target can be text or pattern. Replacement can be text or a function.
+
+### reverse(array)
+
+Returns a new array with elements in the opposite order.
+
+### round(number, place)
+
+Round to nearest.
+
+```javascript
+round(12.3775)        // 12
+round(12.3775, -2)    // 12.38
+```
+
+### search(text, target, from)
+
+Search text for target. Returns character position or null.
+
+### sequence(requestor_array)
+
+Returns a requestor that processes each requestor in order. Each result becomes the input to the next. The last result is the final result.
+
+### sign(number)
+
+Returns -1, 0, or 1.
+
+### sort(array, select)
+
+Returns a new sorted array. Sort keys must be all numbers or all texts. Sort is ascending and stable.
+
+| select type | Sort key | Description |
+|-------------|----------|-------------|
+| null | element itself | Simple sort |
+| text | element[select] | Sort by record field |
+| number | element[select] | Sort by array index |
+| array | select[index] | External sort keys |
+
+```javascript
+sort(["oats", "peas", "beans", "barley"])
+// ["barley", "beans", "oats", "peas"]
+
+sort([{n: 3}, {n: 1}], "n")
+// [{n: 1}, {n: 3}]
+```
+
+### stone(value)
+
+Petrify the value, making it permanently immutable. The operation is deep — all nested objects and arrays are also frozen. Returns the value.
+
+### trim(text, reject)
+
+Remove characters from both ends. Default removes whitespace.
+
+### trunc(number, place)
+
+Truncate toward zero.
+
+```javascript
+trunc(12.3775)        // 12
+trunc(-12.3775)       // -12
+```
+
+### upper(text)
+
+Returns text with all lowercase characters converted to uppercase.
+
+### whole(number)
+
+Returns the whole part of a number. See also `fraction`.

docs/index.md

@@ -1,66 +0,0 @@
-# Cell
-
-![image](wizard.png)
-
-Cell is an actor-based scripting language for building concurrent applications. It combines a familiar JavaScript-like syntax with the actor model of computation.
-
-## Key Features
-
-- **Actor Model** — isolated memory, message passing, no shared state
-- **Immutability** — `stone()` makes values permanently frozen
-- **Prototype Inheritance** — objects without classes
-- **C Integration** — seamlessly extend with native code
-- **Cross-Platform** — deploy to desktop, web, and embedded
-
-## Quick Start
-
-```javascript
-// hello.ce - A simple actor
-log.console("Hello, Cell!")
-$stop()
-```
-
-```bash
-cell hello
-```
-
-## Documentation
-
-- [**Cell Language**](cellscript.md) — syntax, types, and built-in functions
-- [**Actors and Modules**](actors.md) — the execution model
-- [**Packages**](packages.md) — code organization and sharing
-- [**Command Line**](cli.md) — the `cell` tool
-- [**Writing C Modules**](c-modules.md) — native extensions
-
-## Standard Library
-
-- [text](library/text.md) — string manipulation
-- [number](library/number.md) — numeric operations
-- [array](library/array.md) — array utilities
-- [object](library/object.md) — object utilities
-- [blob](library/blob.md) — binary data
-- [time](library/time.md) — time and dates
-- [math](library/math.md) — trigonometry and math
-- [json](library/json.md) — JSON encoding/decoding
-- [random](library/random.md) — random numbers
-
-## Architecture
-
-Cell programs are organized into **packages**. Each package contains:
-
-- **Modules** (`.cm`) — return a value, cached and frozen
-- **Actors** (`.ce`) — run independently, communicate via messages
-- **C files** (`.c`) — compiled to native libraries
-
-Actors never share memory. They communicate by sending messages, which are automatically serialized. This makes concurrent programming safe and predictable.
-
-## Installation
-
-```bash
-# Clone and bootstrap
-git clone https://gitea.pockle.world/john/cell
-cd cell
-make bootstrap
-```
-
-The Cell shop is stored at `~/.cell/`.

docs/kim.md

@@ -0,0 +1,94 @@
+---
+title: "Kim Encoding"
+description: "Compact character and count encoding"
+weight: 80
+type: "docs"
+---
+
+Kim is a character and count encoding designed by Douglas Crockford. It encodes Unicode characters and variable-length integers using continuation bytes. Kim is simpler and more compact than UTF-8 for most text.
+
+## Continuation Bytes
+
+The fundamental idea in Kim is the continuation byte:
+
+```
+C  D  D  D  D  D  D  D
+```
+
+- **C** — continue bit. If 1, read another byte. If 0, this is the last byte.
+- **D** (7 bits) — data bits.
+
+To decode: shift the accumulator left by 7 bits, add the 7 data bits. If the continue bit is 1, repeat with the next byte. If 0, the value is complete.
+
+To encode: take the value, emit 7 bits at a time from most significant to least significant, setting the continue bit on all bytes except the last.
+
+## Character Encoding
+
+Kim encodes Unicode codepoints directly as continuation byte sequences:
+
+| Range | Bytes | Characters |
+|-------|-------|------------|
+| U+0000 to U+007F | 1 | ASCII |
+| U+0080 to U+3FFF | 2 | First quarter of BMP |
+| U+4000 to U+10FFFF | 3 | All other Unicode |
+
+Unlike UTF-8, there is no need for surrogate pairs or escapement. Every Unicode character, including emoji and characters from extended planes, is encoded in at most 3 bytes.
+
+### Examples
+
+```
+'A'       (U+0041)  →  41
+'é'       (U+00E9)  →  81 69
+'💩'      (U+1F4A9)  →  87 E9 29
+```
+
+## Count Encoding
+
+Kim is also used for encoding counts (lengths, sizes). The same continuation byte format represents non-negative integers of arbitrary size:
+
+| Range | Bytes |
+|-------|-------|
+| 0 to 127 | 1 |
+| 128 to 16383 | 2 |
+| 16384 to 2097151 | 3 |
+
+## Comparison with UTF-8
+
+| Property | Kim | UTF-8 |
+|----------|-----|-------|
+| ASCII | 1 byte | 1 byte |
+| BMP (first quarter) | 2 bytes | 2-3 bytes |
+| Full Unicode | 3 bytes | 3-4 bytes |
+| Self-synchronizing | No | Yes |
+| Sortable | No | Yes |
+| Simpler to implement | Yes | No |
+| Byte count for counts | Variable (7 bits/byte) | Not applicable |
+
+Kim trades self-synchronization (the ability to find character boundaries from any position) for simplicity and compactness. In practice, Kim text is accessed sequentially, so self-synchronization is not needed.
+
+## Usage in ƿit
+
+Kim is used internally by blobs and by the Nota message format.
+
+### In Blobs
+
+The `blob.write_text` and `blob.read_text` functions use Kim to encode text into binary data:
+
+```javascript
+var blob = use('blob')
+var b = blob.make()
+blob.write_text(b, "hello")  // Kim-encoded length + characters
+stone(b)
+var text = blob.read_text(b, 0)  // "hello"
+```
+
+### In Nota
+
+Nota uses Kim for two purposes:
+
+1. **Counts** — array lengths, text lengths, blob sizes, record pair counts
+2. **Characters** — text content within Nota messages
+
+The preamble byte of each Nota value incorporates the first few bits of a Kim-encoded count, with the continue bit indicating whether more bytes follow.
+
+See [Nota Format](#nota) for the full specification.

docs/language.md

@@ -1,6 +1,11 @@
-# Cell Language
+---
+title: "ƿit Language"
+description: "Syntax, types, operators, and built-in functions"
+weight: 10
+type: "docs"
+---
 
-Cell is a scripting language for actor-based programming. It combines a familiar syntax with a prototype-based object system and strict immutability semantics.
+ƿit is a scripting language for actor-based programming. It combines a familiar syntax with a prototype-based object system and strict immutability semantics.
 
 ## Basics
 
@@ -13,7 +18,7 @@ def PI = 3.14159  // constant (cannot be reassigned)
 
 ### Data Types
 
-Cell has six fundamental types:
+ƿit has six fundamental types:
 
 - **number** — DEC64 decimal floating point (no rounding errors)
 - **text** — Unicode strings
@@ -49,7 +54,7 @@ null
 ["a", "b", "c"]
 
 // Objects
-{name: "cell", version: 1}
+{name: "pit", version: 1}
 {x: 10, y: 20}
 ```
 
@@ -108,7 +113,7 @@ while (condition) {
 break
 continue
 return value
-throw "error message"
+disrupt
 ```
 
 ### Functions
@@ -230,10 +235,10 @@ var json = use('json')
 Check type or prototype chain.
 
 ```javascript
-isa(42, number)        // true
-isa("hi", text)        // true
-isa([1,2], array)      // true
-isa({}, object)        // true
+is_number(42)        // true
+is_text("hi")        // true
+is_array([1,2])      // true
+is_object({})        // true
 isa(child, parent)     // true if parent is in prototype chain
 ```
 
@@ -266,23 +271,41 @@ log.error("problem")     // error output
 
 ## Pattern Matching
 
-Cell supports regex patterns in string functions, but not standalone regex objects.
+ƿit supports regex patterns in string functions, but not standalone regex objects.
 
 ```javascript
 text.search("hello world", /world/)
-text.replace("hello", /l/g, "L")
+replace("hello", /l/g, "L")
 ```
 
 ## Error Handling
 
-```javascript
-try {
-  riskyOperation()
-} catch (e) {
-  log.error(e)
-}
+ƿit uses `disrupt` and `disruption` for error handling. A `disrupt` signals that something went wrong. The `disruption` block attached to a function catches it.
 
-throw "something went wrong"
+```javascript
+var safe_divide = function(a, b) {
+  if (b == 0) disrupt
+  return a / b
+} disruption {
+  log.error("something went wrong")
+}
 ```
 
-If an actor has an uncaught error, it crashes.
+`disrupt` is a bare keyword — it does not carry a value. The `disruption` block knows that something went wrong, but not what.
+
+To test whether an operation disrupts:
+
+```javascript
+var should_disrupt = function(fn) {
+  var caught = false
+  var wrapper = function() {
+    fn()
+  } disruption {
+    caught = true
+  }
+  wrapper()
+  return caught
+}
+```
+
+If an actor has an unhandled disruption, it crashes.

docs/library/.pages

@@ -1,10 +0,0 @@
-nav:
-  - text.md
-  - number.md
-  - array.md
-  - object.md
-  - blob.md
-  - time.md
-  - math.md
-  - json.md
-  - random.md

docs/library/_index.md

@@ -0,0 +1,22 @@
+---
+title: "Standard Library"
+description: "ƿit standard library modules"
+weight: 90
+type: "docs"
+---
+
+ƿit includes a standard library of modules loaded with `use()`.
+
+| Module | Description |
+|--------|-------------|
+| [text](/docs/library/text/) | String conversion and manipulation |
+| [number](/docs/library/number/) | Numeric conversion and operations |
+| [array](/docs/library/array/) | Array creation and manipulation |
+| [object](/docs/library/object/) | Object creation and manipulation |
+| [blob](/docs/library/blob/) | Binary data (bits, not bytes) |
+| [time](/docs/library/time/) | Time constants and conversions |
+| [math](/docs/library/math/) | Trigonometry, logarithms, roots |
+| [json](/docs/library/json/) | JSON encoding and decoding |
+| [random](/docs/library/random/) | Random number generation |
+
+Most numeric functions (`floor`, `max`, `abs`, etc.) are global intrinsics and do not require `use`. See [Built-in Functions](/docs/functions/) for the full list.

docs/library/array.md

@@ -1,4 +1,9 @@
-# array
+---
+title: "array"
+description: "Array creation and manipulation"
+weight: 30
+type: "docs"
+---
 
 The `array` function and its methods handle array creation and manipulation.
 
@@ -59,8 +64,7 @@ array({a: 1, b: 2})  // ["a", "b"]
 Split text into grapheme clusters.
 
 ```javascript
-array("hello")       // ["h", "e", "l", "l", "o"]
-array("👨‍👩‍👧")          // ["👨‍👩‍👧"]
+array("hello")  // ["h", "e", "l", "l", "o"]
 ```
 
 ### array(text, separator)

docs/library/blob.md

@@ -1,4 +1,9 @@
-# blob
+---
+title: "blob"
+description: "Binary data containers (bits, not bytes)"
+weight: 50
+type: "docs"
+---
 
 Blobs are binary large objects — containers of bits (not bytes). They're used for encoding data, messages, images, network payloads, and more.
 

docs/library/json.md

@@ -1,4 +1,9 @@
-# json
+---
+title: "json"
+description: "JSON encoding and decoding"
+weight: 80
+type: "docs"
+---
 
 JSON encoding and decoding.
 

docs/library/math.md

@@ -1,10 +1,15 @@
-# math
+---
+title: "math"
+description: "Trigonometry, logarithms, and roots"
+weight: 70
+type: "docs"
+---
 
-Cell provides three math modules with identical functions but different angle representations:
+ƿit provides three math modules with identical functions but different angle representations:
 
 ```javascript
 var math = use('math/radians')  // angles in radians
-var math = use('math/degrees')  // angles in degrees  
+var math = use('math/degrees')  // angles in degrees
 var math = use('math/cycles')   // angles in cycles (0-1)
 ```
 
@@ -35,7 +40,7 @@ math.tangent(math.pi / 4)  // 1 (radians)
 Inverse sine.
 
 ```javascript
-math.arc_sine(1)  // π/2 (radians)
+math.arc_sine(1)  // pi/2 (radians)
 ```
 
 ### arc_cosine(n)
@@ -43,7 +48,7 @@ math.arc_sine(1)  // π/2 (radians)
 Inverse cosine.
 
 ```javascript
-math.arc_cosine(0)  // π/2 (radians)
+math.arc_cosine(0)  // pi/2 (radians)
 ```
 
 ### arc_tangent(n, denominator)
@@ -51,9 +56,9 @@ math.arc_cosine(0)  // π/2 (radians)
 Inverse tangent. With two arguments, computes atan2.
 
 ```javascript
-math.arc_tangent(1)        // π/4 (radians)
-math.arc_tangent(1, 1)     // π/4 (radians)
-math.arc_tangent(-1, -1)   // -3π/4 (radians)
+math.arc_tangent(1)        // pi/4 (radians)
+math.arc_tangent(1, 1)     // pi/4 (radians)
+math.arc_tangent(-1, -1)   // -3pi/4 (radians)
 ```
 
 ## Exponentials and Logarithms
@@ -64,7 +69,7 @@ Euler's number raised to a power. Default power is 1.
 
 ```javascript
 math.e()     // 2.718281828...
-math.e(2)    // e²
+math.e(2)    // e^2
 ```
 
 ### ln(n)

docs/library/number.md

@@ -1,4 +1,9 @@
-# number
+---
+title: "number"
+description: "Numeric conversion and operations"
+weight: 20
+type: "docs"
+---
 
 The `number` function and its methods handle numeric conversion and operations.
 
@@ -29,15 +34,15 @@ Parse formatted numbers.
 
 | Format | Description |
 |--------|-------------|
-| `""`   | Standard decimal |
-| `"u"`  | Underbar separator (1_000) |
-| `"d"`  | Comma separator (1,000) |
-| `"s"`  | Space separator (1 000) |
-| `"v"`  | European (1.000,50) |
-| `"b"`  | Binary |
-| `"o"`  | Octal |
-| `"h"`  | Hexadecimal |
-| `"j"`  | JavaScript style (0x, 0o, 0b prefixes) |
+| `""` | Standard decimal |
+| `"u"` | Underbar separator (1_000) |
+| `"d"` | Comma separator (1,000) |
+| `"s"` | Space separator (1 000) |
+| `"v"` | European (1.000,50) |
+| `"b"` | Binary |
+| `"o"` | Octal |
+| `"h"` | Hexadecimal |
+| `"j"` | JavaScript style (0x, 0o, 0b prefixes) |
 
 ```javascript
 number("1,000", "d")    // 1000
@@ -46,98 +51,98 @@ number("0xff", "j")     // 255
 
 ## Methods
 
-### number.abs(n)
+### abs(n)
 
 Absolute value.
 
 ```javascript
-number.abs(-5)   // 5
-number.abs(5)    // 5
+abs(-5)   // 5
+abs(5)    // 5
 ```
 
-### number.sign(n)
+### sign(n)
 
 Returns -1, 0, or 1.
 
 ```javascript
-number.sign(-5)  // -1
-number.sign(0)   // 0
-number.sign(5)   // 1
+sign(-5)  // -1
+sign(0)   // 0
+sign(5)   // 1
 ```
 
-### number.floor(n, place)
+### floor(n, place)
 
 Round down.
 
 ```javascript
-number.floor(4.9)      // 4
-number.floor(4.567, 2) // 4.56
+floor(4.9)      // 4
+floor(4.567, 2) // 4.56
 ```
 
-### number.ceiling(n, place)
+### ceiling(n, place)
 
 Round up.
 
 ```javascript
-number.ceiling(4.1)      // 5
-number.ceiling(4.123, 2) // 4.13
+ceiling(4.1)      // 5
+ceiling(4.123, 2) // 4.13
 ```
 
-### number.round(n, place)
+### round(n, place)
 
 Round to nearest.
 
 ```javascript
-number.round(4.5)      // 5
-number.round(4.567, 2) // 4.57
+round(4.5)      // 5
+round(4.567, 2) // 4.57
 ```
 
-### number.trunc(n, place)
+### trunc(n, place)
 
 Truncate toward zero.
 
 ```javascript
-number.trunc(4.9)   // 4
-number.trunc(-4.9)  // -4
+trunc(4.9)   // 4
+trunc(-4.9)  // -4
 ```
 
-### number.whole(n)
+### whole(n)
 
 Get the integer part.
 
 ```javascript
-number.whole(4.9)   // 4
-number.whole(-4.9)  // -4
+whole(4.9)   // 4
+whole(-4.9)  // -4
 ```
 
-### number.fraction(n)
+### fraction(n)
 
 Get the fractional part.
 
 ```javascript
-number.fraction(4.75)  // 0.75
+fraction(4.75)  // 0.75
 ```
 
-### number.min(...values)
+### min(...values)
 
 Return the smallest value.
 
 ```javascript
-number.min(3, 1, 4, 1, 5)  // 1
+min(3, 1, 4, 1, 5)  // 1
 ```
 
-### number.max(...values)
+### max(...values)
 
 Return the largest value.
 
 ```javascript
-number.max(3, 1, 4, 1, 5)  // 5
+max(3, 1, 4, 1, 5)  // 5
 ```
 
-### number.remainder(dividend, divisor)
+### remainder(dividend, divisor)
 
 Compute remainder.
 
 ```javascript
-number.remainder(17, 5)  // 2
+remainder(17, 5)  // 2
 ```

docs/library/object.md

@@ -1,4 +1,9 @@
-# object
+---
+title: "object"
+description: "Object creation and manipulation"
+weight: 40
+type: "docs"
+---
 
 The `object` function and related utilities handle object creation and manipulation.
 

docs/library/random.md

@@ -1,4 +1,9 @@
-# random
+---
+title: "random"
+description: "Random number generation"
+weight: 90
+type: "docs"
+---
 
 Random number generation.
 

docs/library/text.md

@@ -1,4 +1,9 @@
-# text
+---
+title: "text"
+description: "String conversion and manipulation"
+weight: 10
+type: "docs"
+---
 
 The `text` function and its methods handle string conversion and manipulation.
 
@@ -70,18 +75,18 @@ text.search("hello world", "xyz")       // null
 text.search("hello hello", "hello", 1)  // 6
 ```
 
-### text.replace(text, target, replacement, limit)
+### text.replace(text, target, replacement, cap)
 
-Replace occurrences of `target` with `replacement`.
+Replace occurrences of `target` with `replacement`. If `cap` is not specified, replaces all occurrences.
 
 ```javascript
-text.replace("hello", "l", "L")      // "heLLo"
-text.replace("hello", "l", "L", 1)   // "heLlo"
+text.replace("hello", "l", "L")      // "heLLo" (replaces all)
+text.replace("hello", "l", "L", 1)   // "heLlo" (replaces first only)
 
 // With function
 text.replace("hello", "l", function(match, pos) {
   return pos == 2 ? "L" : match
-})  // "heLlo"
+})  // "heLLo" (replaces all by default)
 ```
 
 ### text.format(text, collection, transformer)
@@ -101,7 +106,7 @@ text.format("{0} + {1} = {2}", [1, 2, 3])
 Unicode normalize the text (NFC form).
 
 ```javascript
-text.normalize("café")  // normalized form
+text.normalize("cafe\u0301")  // normalized form
 ```
 
 ### text.codepoint(text)
@@ -109,8 +114,7 @@ text.normalize("café")  // normalized form
 Get the Unicode codepoint of the first character.
 
 ```javascript
-text.codepoint("A")     // 65
-text.codepoint("😀")    // 128512
+text.codepoint("A")  // 65
 ```
 
 ### text.extract(text, pattern, from, to)

docs/library/time.md

@@ -1,4 +1,9 @@
-# time
+---
+title: "time"
+description: "Time constants and conversion functions"
+weight: 60
+type: "docs"
+---
 
 The time module provides time constants and conversion functions.
 

docs/nota.md

@@ -0,0 +1,156 @@
+---
+title: "Nota Format"
+description: "Network Object Transfer Arrangement"
+weight: 85
+type: "docs"
+---
+
+Nota is a binary message format developed for use in the Procession Protocol. It provides a compact, JSON-like encoding that supports blobs, text, arrays, records, numbers, and symbols.
+
+Nota stands for Network Object Transfer Arrangement.
+
+## Design Philosophy
+
+JSON had three design rules: minimal, textual, and subset of JavaScript. The textual and JavaScript rules are no longer necessary. Nota maintains JSON's philosophy of being at the intersection of most programming languages and most data types, but departs by using counts instead of brackets and binary encoding instead of text.
+
+Nota uses Kim continuation bytes for counts and character encoding. See [Kim Encoding](#kim) for details.
+
+## Type Summary
+
+| Bits | Type |
+|------|------|
+| `000` | Blob |
+| `001` | Text |
+| `010` | Array |
+| `011` | Record |
+| `100` | Floating Point (positive exponent) |
+| `101` | Floating Point (negative exponent) |
+| `110` | Integer (zero exponent) |
+| `111` | Symbol |
+
+## Preambles
+
+Every Nota value starts with a preamble byte that is a Kim value with the three most significant bits used for type information.
+
+Most types provide 3 or 4 data bits in the preamble. If the Kim encoding of the data fits in those bits, it is incorporated directly and the continue bit is off. Otherwise the continue bit is on and the continuation follows.
+
+## Blob
+
+```
+C  0  0  0  D  D  D  D
+```
+
+- **C** — continue the number of bits
+- **DDDD** — the number of bits
+
+A blob is a string of bits. The data produces the number of bits. The number of bytes that follow: `floor((number_of_bits + 7) / 8)`. The final byte is padded with 0 if necessary.
+
+Example: A blob containing 25 bits `1111000011100011001000001`:
+
+```
+80 19 F0 E3 20 80
+```
+
+## Text
+
+```
+C  0  0  1  D  D  D  D
+```
+
+- **C** — continue the number of characters
+- **DDDD** — the number of characters
+
+The data produces the number of characters. Kim-encoded characters follow. ASCII characters are 1 byte, first quarter BMP characters are 2 bytes, all other Unicode characters are 3 bytes. Unlike JSON, there is never a need for escapement.
+
+Examples:
+
+```
+""          →  10
+"cat"       →  13 63 61 74
+```
+
+## Array
+
+```
+C  0  1  0  D  D  D  D
+```
+
+- **C** — continue the number of elements
+- **DDDD** — the number of elements
+
+An array is an ordered sequence of values. Following the preamble are the elements, each beginning with its own preamble. Nesting is encouraged.
+
+## Record
+
+```
+C  0  1  1  D  D  D  D
+```
+
+- **C** — continue the number of pairs
+- **DDDD** — the number of pairs
+
+A record is an unordered collection of key/value pairs. Keys must be text and must be unique within the record. Values can be any Nota type.
+
+## Floating Point
+
+```
+C  1  0  E  S  D  D  D
+```
+
+- **C** — continue the exponent
+- **E** — sign of the exponent
+- **S** — sign of the coefficient
+- **DDD** — three bits of the exponent
+
+Nota floating point represents numbers as `coefficient * 10^exponent`. The coefficient must be an integer. The preamble may contain the first three bits of the exponent, followed by the continuation of the exponent (if any), followed by the coefficient.
+
+Use the integer type when the exponent is zero.
+
+Examples:
+
+```
+-1.01                →  5A 65
+98.6                 →  51 87 5A
+-0.5772156649        →  D8 0A 95 C0 B0 BD 69
+-10000000000000      →  C8 0D 01
+```
+
+## Integer
+
+```
+C  1  1  0  S  D  D  D
+```
+
+- **C** — continue the integer
+- **S** — sign
+- **DDD** — three bits of the integer
+
+Integers in the range -7 to 7 fit in a single byte. Integers in the range -1023 to 1023 fit in two bytes. Integers in the range -131071 to 131071 fit in three bytes.
+
+Examples:
+
+```
+0      →  60
+2023   →  E0 8F 67
+-1     →  69
+```
+
+## Symbol
+
+```
+0  1  1  1  D  D  D  D
+```
+
+- **DDDD** — the symbol
+
+There are currently five symbols:
+
+```
+null     →  70
+false    →  72
+true     →  73
+private  →  78
+system   →  79
+```
+
+The private prefix must be followed by a record containing a private process address. The system prefix must be followed by a record containing a system message. All other symbols are reserved.

docs/packages.md

@@ -1,14 +1,19 @@
-# Packages
+---
+title: "Packages"
+description: "Code organization and sharing in ƿit"
+weight: 30
+type: "docs"
+---
 
-Packages are the fundamental unit of code organization and sharing in Cell.
+Packages are the fundamental unit of code organization and sharing in ƿit.
 
 ## Package Structure
 
-A package is a directory containing a `cell.toml` manifest:
+A package is a directory containing a `pit.toml` manifest:
 
 ```
 mypackage/
-├── cell.toml        # package manifest
+├── pit.toml         # package manifest
 ├── main.ce          # entry point (optional)
 ├── utils.cm         # module
 ├── helper/
@@ -17,7 +22,7 @@ mypackage/
 └── _internal.cm     # private module (underscore prefix)
 ```
 
-## cell.toml
+## pit.toml
 
 The package manifest declares metadata and dependencies:
 
@@ -38,11 +43,11 @@ mylib = "/Users/john/work/mylib"
 
 ## Module Resolution
 
-When importing with `use()`, Cell searches in order:
+When importing with `use()`, ƿit searches in order:
 
 1. **Local package** — relative to package root
-2. **Dependencies** — via aliases in `cell.toml`
-3. **Core** — built-in Cell modules
+2. **Dependencies** — via aliases in `pit.toml`
+3. **Core** — built-in ƿit modules
 
 ```javascript
 // In package 'myapp' with dependency: renderer = "gitea.pockle.world/john/renderer"
@@ -85,10 +90,10 @@ Local packages are symlinked into the shop, making development seamless.
 
 ## The Shop
 
-Cell stores all packages in the **shop** at `~/.cell/`:
+ƿit stores all packages in the **shop** at `~/.pit/`:
 
 ```
-~/.cell/
+~/.pit/
 ├── packages/
 │   ├── core -> gitea.pockle.world/john/cell
 │   ├── gitea.pockle.world/
@@ -134,20 +139,20 @@ target = "/Users/john/work/prosperon"
 
 ```bash
 # Install from remote
-cell install gitea.pockle.world/john/prosperon
+pit install gitea.pockle.world/john/prosperon
 
 # Install from local path
-cell install /Users/john/work/mylib
+pit install /Users/john/work/mylib
 ```
 
 ## Updating Packages
 
 ```bash
 # Update all
-cell update
+pit update
 
 # Update specific package
-cell update gitea.pockle.world/john/prosperon
+pit update gitea.pockle.world/john/prosperon
 ```
 
 ## Development Workflow
@@ -156,12 +161,12 @@ For active development, link packages locally:
 
 ```bash
 # Link a package for development
-cell link add gitea.pockle.world/john/prosperon /Users/john/work/prosperon
+pit link add gitea.pockle.world/john/prosperon /Users/john/work/prosperon
 
 # Changes to /Users/john/work/prosperon are immediately visible
 
 # Remove link when done
-cell link delete gitea.pockle.world/john/prosperon
+pit link delete gitea.pockle.world/john/prosperon
 ```
 
 ## C Extensions
@@ -170,14 +175,14 @@ C files in a package are compiled into a dynamic library:
 
 ```
 mypackage/
-├── cell.toml
+├── pit.toml
 ├── render.c      # compiled to mypackage.dylib
-└── render.cm     # optional Cell wrapper
+└── render.cm     # optional ƿit wrapper
 ```
 
-The library is named after the package and placed in `~/.cell/lib/`.
+The library is named after the package and placed in `~/.pit/lib/`.
 
-See [Writing C Modules](c-modules.md) for details.
+See [Writing C Modules](/docs/c-modules/) for details.
 
 ## Platform-Specific Files
 
@@ -190,4 +195,4 @@ mypackage/
 └── audio_emscripten.c # Web-specific
 ```
 
-Cell selects the appropriate file based on the build target.
+ƿit selects the appropriate file based on the build target.

docs/requestors.md

@@ -0,0 +1,176 @@
+---
+title: "Requestors"
+description: "Asynchronous work with requestors"
+weight: 25
+type: "docs"
+---
+
+Requestors are functions that encapsulate asynchronous work. They provide a structured way to compose callbacks, manage cancellation, and coordinate concurrent operations between actors.
+
+## What is a Requestor
+
+A requestor is a function with this signature:
+
+```javascript
+function my_requestor(callback, value) {
+  // Do async work, then call callback with result
+  // Return a cancel function
+}
+```
+
+- **callback** — called when the work completes: `callback(value, reason)`
+  - On success: `callback(result)` or `callback(result, null)`
+  - On failure: `callback(null, reason)` where reason explains the failure
+- **value** — input passed from the previous step (or the initial caller)
+- **return** — a cancel function, or null if cancellation is not supported
+
+The cancel function, when called, should abort the in-progress work.
+
+## Writing a Requestor
+
+```javascript
+function fetch_data(callback, url) {
+  $contact(function(connection) {
+    $send(connection, {get: url}, function(response) {
+      callback(response)
+    })
+  }, {host: url, port: 80})
+  return function cancel() {
+    // clean up if needed
+  }
+}
+```
+
+A requestor that always succeeds immediately:
+
+```javascript
+function constant(callback, value) {
+  callback(42)
+}
+```
+
+A requestor that always fails:
+
+```javascript
+function broken(callback, value) {
+  callback(null, "something went wrong")
+}
+```
+
+## Composing Requestors
+
+ƿit provides four built-in functions for composing requestors into pipelines.
+
+### sequence(requestor_array)
+
+Run requestors one after another. Each result becomes the input to the next. The final result is passed to the callback.
+
+```javascript
+var pipeline = sequence([
+  fetch_user,
+  validate_permissions,
+  load_profile
+])
+
+pipeline(function(profile, reason) {
+  if (reason) {
+    log.error(reason)
+  } else {
+    log.console(profile.name)
+  }
+}, user_id)
+```
+
+If any step fails, the remaining steps are skipped and the failure propagates.
+
+### parallel(requestor_array, throttle, need)
+
+Start all requestors concurrently. Results are collected into an array matching the input order.
+
+```javascript
+var both = parallel([
+  fetch_profile,
+  fetch_settings
+])
+
+both(function(results, reason) {
+  var profile = results[0]
+  var settings = results[1]
+}, user_id)
+```
+
+- **throttle** — limit how many requestors run at once (null for no limit)
+- **need** — minimum number of successes required (default: all)
+
+### race(requestor_array, throttle, need)
+
+Like `parallel`, but returns as soon as the needed number of results arrive. Unfinished requestors are cancelled.
+
+```javascript
+var fastest = race([
+  fetch_from_cache,
+  fetch_from_network,
+  fetch_from_backup
+])
+
+fastest(function(results) {
+  // results[0] is whichever responded first
+}, request)
+```
+
+Default need is 1. Useful for redundant operations where only one result matters.
+
+### fallback(requestor_array)
+
+Try each requestor in order. If one fails, try the next. Return the first success.
+
+```javascript
+var resilient = fallback([
+  fetch_from_primary,
+  fetch_from_secondary,
+  use_cached_value
+])
+
+resilient(function(data, reason) {
+  if (reason) {
+    log.error("all sources failed")
+  }
+}, key)
+```
+
+## Timeouts
+
+Wrap any requestor with `$time_limit` to add a timeout:
+
+```javascript
+var timed = $time_limit(fetch_data, 5)  // 5 second timeout
+
+timed(function(result, reason) {
+  // reason will explain timeout if it fires
+}, url)
+```
+
+If the requestor does not complete within the time limit, it is cancelled and the callback receives a failure.
+
+## Requestors and Actors
+
+Requestors are particularly useful with actor messaging. Since `$send` is callback-based, it fits naturally:
+
+```javascript
+function ask_worker(callback, task) {
+  $send(worker, task, function(reply) {
+    callback(reply)
+  })
+}
+
+var pipeline = sequence([
+  ask_worker,
+  process_result,
+  store_result
+])
+
+pipeline(function(stored) {
+  log.console("done")
+  $stop()
+}, {type: "compute", data: [1, 2, 3]})
+```

docs/spec/bytecode.md

@@ -0,0 +1,118 @@
+---
+title: "Bytecode VM"
+description: "Stack-based virtual machine"
+---
+
+## Overview
+
+The bytecode VM is a stack-based virtual machine. Instructions operate on an implicit operand stack, pushing and popping values. This is the original execution backend for ƿit.
+
+## Compilation Pipeline
+
+```
+Source → Tokenize → Parse (AST) → Bytecode → Link → Execute
+```
+
+The compiler emits `JSFunctionBytecode` objects containing opcode sequences, constant pools, and debug information.
+
+## Instruction Categories
+
+### Value Loading
+
+| Opcode | Description |
+|--------|-------------|
+| `push_i32` | Push a 32-bit immediate integer |
+| `push_const` | Push a value from the constant pool |
+| `null` | Push null |
+| `push_false` | Push false |
+| `push_true` | Push true |
+
+### Stack Manipulation
+
+| Opcode | Description |
+|--------|-------------|
+| `drop` | Remove top of stack |
+| `dup` | Duplicate top of stack |
+| `dup1` / `dup2` / `dup3` | Duplicate item at depth |
+| `swap` | Swap top two items |
+| `rot3l` / `rot3r` | Rotate top three items |
+| `insert2` / `insert3` | Insert top item deeper |
+| `nip` | Remove second item |
+
+### Variable Access
+
+| Opcode | Description |
+|--------|-------------|
+| `get_var` | Load variable by name (pre-link) |
+| `put_var` | Store variable by name (pre-link) |
+| `get_loc` / `put_loc` | Access local variable by index |
+| `get_arg` / `put_arg` | Access function argument by index |
+| `get_env_slot` / `set_env_slot` | Access closure variable (post-link) |
+| `get_global_slot` / `set_global_slot` | Access global variable (post-link) |
+
+Variable access opcodes are patched during linking. `get_var` instructions are rewritten to `get_loc`, `get_env_slot`, or `get_global_slot` depending on where the variable is resolved.
+
+### Arithmetic
+
+| Opcode | Description |
+|--------|-------------|
+| `add` / `sub` / `mul` / `div` | Basic arithmetic |
+| `mod` / `pow` | Modulo and power |
+| `neg` / `inc` / `dec` | Unary operations |
+| `add_loc` / `inc_loc` / `dec_loc` | Optimized local variable update |
+
+### Comparison and Logic
+
+| Opcode | Description |
+|--------|-------------|
+| `strict_eq` / `strict_neq` | Equality (ƿit uses strict only) |
+| `lt` / `lte` / `gt` / `gte` | Ordered comparison |
+| `not` / `lnot` | Logical / bitwise not |
+| `and` / `or` / `xor` | Bitwise operations |
+
+### Control Flow
+
+| Opcode | Description |
+|--------|-------------|
+| `goto` | Unconditional jump |
+| `if_true` / `if_false` | Conditional jump |
+| `goto8` / `goto16` | Short jumps (size-optimized) |
+| `if_true8` / `if_false8` | Short conditional jumps |
+| `catch` | Set exception handler |
+
+### Function Calls
+
+| Opcode | Description |
+|--------|-------------|
+| `call` | Call function with N arguments |
+| `tail_call` | Tail-call optimization |
+| `call_method` | Call method on object |
+| `return` | Return value from function |
+| `return_undef` | Return null from function |
+| `throw` | Throw exception (disrupt) |
+
+### Property Access
+
+| Opcode | Description |
+|--------|-------------|
+| `get_field` | Get named property |
+| `put_field` | Set named property |
+| `get_array_el` | Get computed property |
+| `put_array_el` | Set computed property |
+| `define_field` | Define property during object literal |
+
+### Object Creation
+
+| Opcode | Description |
+|--------|-------------|
+| `object` | Create new empty object |
+| `array_from` | Create array from stack values |
+
+## Bytecode Patching
+
+During the link/integrate phase, symbolic variable references are resolved to concrete access instructions. This is a critical optimization — the interpreter does not perform name lookups at runtime.
+
+A `get_var "x"` instruction becomes:
+- `get_loc 3` — if x is local variable at index 3
+- `get_env_slot 1, 5` — if x is captured from outer scope (depth 1, slot 5)
+- `get_global_slot 7` — if x is a global

docs/spec/dec64.md

@@ -0,0 +1,77 @@
+---
+title: "DEC64 Numbers"
+description: "Decimal floating point representation"
+---
+
+## Overview
+
+ƿit uses DEC64 as its number format. DEC64 represents numbers as `coefficient * 10^exponent` in a 64-bit word. This eliminates the rounding errors that plague IEEE 754 binary floating point — `0.1 + 0.2` is exactly `0.3`.
+
+DEC64 was designed by Douglas Crockford as a general-purpose number type suitable for both business and scientific computation.
+
+## Format
+
+A DEC64 number is a 64-bit value:
+
+```
+[coefficient: 56 bits][exponent: 8 bits]
+```
+
+- **Coefficient** — a 56-bit signed integer (two's complement)
+- **Exponent** — an 8-bit signed integer (range: -127 to 127)
+
+The value of a DEC64 number is: `coefficient * 10^exponent`
+
+### Examples
+
+| Value | Coefficient | Exponent | Hex |
+|-------|------------|----------|-----|
+| `0` | 0 | 0 | `0000000000000000` |
+| `1` | 1 | 0 | `0000000000000100` |
+| `3.14159` | 314159 | -5 | `000000004CB2FFFB` |
+| `-1` | -1 | 0 | `FFFFFFFFFFFFFF00` |
+| `1000000` | 1 | 6 | `0000000000000106` |
+
+## Special Values
+
+### Null
+
+The exponent `0x80` (-128) indicates null. This is the only special value — there is no infinity, no NaN, no negative zero. Operations that would produce undefined results (such as division by zero) return null.
+
+```
+coefficient: any, exponent: 0x80  →  null
+```
+
+## Arithmetic Properties
+
+- **Exact decimals**: All decimal fractions with up to 17 significant digits are represented exactly
+- **No rounding**: `0.1 + 0.2 == 0.3` is true
+- **Integer range**: Exact integers up to 2^55 (about 3.6 * 10^16)
+- **Normalized on demand**: The runtime normalizes coefficients to remove trailing zeros when needed for comparison
+
+## Comparison with IEEE 754
+
+| Property | DEC64 | IEEE 754 double |
+|----------|-------|----------------|
+| Decimal fractions | Exact | Approximate |
+| Significant digits | ~17 | ~15-16 |
+| Special values | null only | NaN, ±Infinity, -0 |
+| Rounding errors | None (decimal) | Common |
+| Financial arithmetic | Correct | Requires libraries |
+| Scientific range | ±10^127 | ±10^308 |
+
+DEC64 trades a smaller exponent range for exact decimal arithmetic. Most applications never need exponents beyond ±127.
+
+## In ƿit
+
+All numbers in ƿit are DEC64. There is no separate integer type at the language level — the distinction is internal. The `is_integer` function checks whether a number has no fractional part.
+
+```javascript
+var x = 42        // coefficient: 42, exponent: 0
+var y = 3.14      // coefficient: 314, exponent: -2
+var z = 1000000   // coefficient: 1, exponent: 6 (normalized)
+
+is_integer(x)     // true
+is_integer(y)     // false
+1 / 0             // null
+```

docs/spec/gc.md

@@ -0,0 +1,82 @@
+---
+title: "Garbage Collection"
+description: "Cheney copying collector"
+---
+
+## Overview
+
+ƿit uses a Cheney copying collector for automatic memory management. Each actor has its own independent heap — actors never share mutable memory, so garbage collection is per-actor with no global pauses.
+
+## Algorithm
+
+The Cheney algorithm is a two-space copying collector:
+
+1. **Allocate new space** — a fresh memory block for the new heap
+2. **Copy roots** — copy all live root objects from old space to new space
+3. **Scan** — walk the new space, updating all internal references
+4. **Free old space** — the entire old heap is freed at once
+
+### Copying and Forwarding
+
+When an object is copied from old space to new space:
+
+1. The object's data is copied to the next free position in new space
+2. The old object's header is overwritten with a **forwarding pointer** (`OBJ_FORWARD`) containing the new address
+3. Future references to the old address find the forwarding pointer and follow it to the new location
+
+```
+Old space:                 New space:
+┌──────────────┐          ┌──────────────┐
+│ OBJ_FORWARD ─┼────────> │ copied object│
+│ (new addr)   │          │              │
+└──────────────┘          └──────────────┘
+```
+
+### Scan Phase
+
+After roots are copied, the collector scans new space linearly. For each object, it examines every JSValue field:
+
+- If the field points to old space, copy the referenced object (or follow its forwarding pointer if already copied)
+- If the field points to stone memory, skip it (stone objects are permanent)
+- If the field is an immediate value (integer, boolean, null, immediate string), skip it
+
+The scan continues until the scan pointer catches up with the allocation pointer — at that point, all live objects have been found and copied.
+
+## Roots
+
+The collector traces from these root sources:
+
+- **Global object** — all global variables
+- **Class prototypes** — built-in type prototypes
+- **Exception** — the current exception value
+- **Value stack** — all values on the operand stack
+- **Frame stack** — all stack frames (bytecode and register VM)
+- **GC reference stack** — manually registered roots (via `JS_PUSH_VALUE` / `JS_POP_VALUE`)
+- **Parser constant pool** — during compilation, constants being built
+
+## Per-Actor Heaps
+
+Each actor maintains its own heap with independent collection:
+
+- No stop-the-world pauses across actors
+- No synchronization between collectors
+- Each actor's GC runs at the end of a turn (between message deliveries)
+- Heap sizes adapt independently based on each actor's allocation patterns
+
+## Heap Growth
+
+The collector uses a buddy allocator for heap blocks. After each collection, if less than 20% of the heap was recovered, the next block size is doubled. The new space size is: `max(live_estimate + alloc_size, next_block_size)`.
+
+All allocations within a heap block use bump allocation (advance a pointer), which is extremely fast.
+
+## Alignment
+
+All objects are aligned to 8-byte boundaries. Object sizes are rounded up to ensure this alignment, which guarantees that the low 3 bits of any heap pointer are always zero — available for JSValue tag bits.
+
+## Interaction with Stone Memory
+
+Stone memory objects (S bit set) are never copied by the collector. When the scanner encounters a pointer to stone memory, it leaves it unchanged. This means:
+
+- Stone objects are effectively permanent GC roots
+- No overhead for tracing through immutable object graphs
+- Module return values and interned strings impose zero GC cost

docs/spec/mach.md

@@ -0,0 +1,156 @@
+---
+title: "Register VM"
+description: "Register-based virtual machine (Mach)"
+---
+
+## Overview
+
+The Mach VM is a register-based virtual machine using 32-bit instructions. It is modeled after Lua's register VM — operands are register indices rather than stack positions, reducing instruction count and improving performance.
+
+## Instruction Formats
+
+All instructions are 32 bits wide. Four encoding formats are used:
+
+### iABC — Three-Register
+
+```
+[op: 8][A: 8][B: 8][C: 8]
+```
+
+Used for operations on three registers: `R(A) = R(B) op R(C)`.
+
+### iABx — Register + Constant
+
+```
+[op: 8][A: 8][Bx: 16]
+```
+
+Used for loading constants: `R(A) = K(Bx)`.
+
+### iAsBx — Register + Signed Offset
+
+```
+[op: 8][A: 8][sBx: 16]
+```
+
+Used for conditional jumps: if `R(A)` then jump by `sBx`.
+
+### isJ — Signed Jump
+
+```
+[op: 8][sJ: 24]
+```
+
+Used for unconditional jumps with a 24-bit signed offset.
+
+## Registers
+
+Each function frame has a fixed number of register slots, determined at compile time. Registers hold:
+
+- **R(0)** — `this` binding
+- **R(1)..R(arity)** — function arguments
+- **R(arity+1)..** — local variables and temporaries
+
+## Instruction Set
+
+### Loading
+
+| Opcode | Format | Description |
+|--------|--------|-------------|
+| `LOADK` | iABx | `R(A) = K(Bx)` — load from constant pool |
+| `LOADI` | iAsBx | `R(A) = sBx` — load small integer |
+| `LOADNULL` | iA | `R(A) = null` |
+| `LOADTRUE` | iA | `R(A) = true` |
+| `LOADFALSE` | iA | `R(A) = false` |
+| `MOVE` | iABC | `R(A) = R(B)` — register copy |
+
+### Arithmetic
+
+| Opcode | Format | Description |
+|--------|--------|-------------|
+| `ADD` | iABC | `R(A) = R(B) + R(C)` |
+| `SUB` | iABC | `R(A) = R(B) - R(C)` |
+| `MUL` | iABC | `R(A) = R(B) * R(C)` |
+| `DIV` | iABC | `R(A) = R(B) / R(C)` |
+| `MOD` | iABC | `R(A) = R(B) % R(C)` |
+| `POW` | iABC | `R(A) = R(B) ^ R(C)` |
+| `NEG` | iABC | `R(A) = -R(B)` |
+| `INC` | iABC | `R(A) = R(B) + 1` |
+| `DEC` | iABC | `R(A) = R(B) - 1` |
+
+### Comparison
+
+| Opcode | Format | Description |
+|--------|--------|-------------|
+| `EQ` | iABC | `R(A) = R(B) == R(C)` |
+| `NEQ` | iABC | `R(A) = R(B) != R(C)` |
+| `LT` | iABC | `R(A) = R(B) < R(C)` |
+| `LE` | iABC | `R(A) = R(B) <= R(C)` |
+| `GT` | iABC | `R(A) = R(B) > R(C)` |
+| `GE` | iABC | `R(A) = R(B) >= R(C)` |
+
+### Property Access
+
+| Opcode | Format | Description |
+|--------|--------|-------------|
+| `GETFIELD` | iABC | `R(A) = R(B)[K(C)]` — named property |
+| `SETFIELD` | iABC | `R(A)[K(B)] = R(C)` — set named property |
+| `GETINDEX` | iABC | `R(A) = R(B)[R(C)]` — computed property |
+| `SETINDEX` | iABC | `R(A)[R(B)] = R(C)` — set computed property |
+
+### Variable Resolution
+
+| Opcode | Format | Description |
+|--------|--------|-------------|
+| `GETNAME` | iABx | Unresolved variable (compiler placeholder) |
+| `GETINTRINSIC` | iABx | Global intrinsic / built-in |
+| `GETENV` | iABx | Module environment variable |
+| `GETUP` | iABC | `R(A) = UpFrame(B).slots[C]` — closure upvalue |
+| `SETUP` | iABC | `UpFrame(A).slots[B] = R(C)` — set closure upvalue |
+
+### Control Flow
+
+| Opcode | Format | Description |
+|--------|--------|-------------|
+| `JMP` | isJ | Unconditional jump |
+| `JMPTRUE` | iAsBx | Jump if `R(A)` is true |
+| `JMPFALSE` | iAsBx | Jump if `R(A)` is false |
+| `JMPNULL` | iAsBx | Jump if `R(A)` is null |
+
+### Function Calls
+
+| Opcode | Format | Description |
+|--------|--------|-------------|
+| `CALL` | iABC | Call `R(A)` with `B` args starting at `R(A+1)`, `C`=keep result |
+| `RETURN` | iA | Return `R(A)` |
+| `RETNIL` | — | Return null |
+| `CLOSURE` | iABx | Create closure from function pool entry `Bx` |
+
+### Object / Array
+
+| Opcode | Format | Description |
+|--------|--------|-------------|
+| `NEWOBJECT` | iA | `R(A) = {}` |
+| `NEWARRAY` | iABC | `R(A) = array(B)` |
+| `PUSH` | iABC | Push `R(B)` to array `R(A)` |
+
+## JSCodeRegister
+
+The compiled output for a function:
+
+```c
+struct JSCodeRegister {
+  uint16_t arity;           // argument count
+  uint16_t nr_slots;        // total register count
+  uint32_t cpool_count;     // constant pool size
+  JSValue *cpool;           // constant pool
+  uint32_t instr_count;     // instruction count
+  MachInstr32 *instructions; // 32-bit instruction array
+  uint32_t func_count;      // nested function count
+  JSCodeRegister **functions; // nested function table
+  JSValue name;             // function name
+  uint16_t disruption_pc;   // exception handler offset
+};
+```
+
+The constant pool holds all non-immediate values referenced by `LOADK` instructions: strings, large numbers, and other constants.

docs/spec/mcode.md

@@ -0,0 +1,90 @@
+---
+title: "Mcode IR"
+description: "JSON-based intermediate representation"
+---
+
+## Overview
+
+Mcode is a JSON-based intermediate representation that can be interpreted directly. It represents the same operations as the Mach register VM but uses string-based instruction dispatch rather than binary opcodes. Mcode is intended as an intermediate step toward native code compilation.
+
+## Pipeline
+
+```
+Source → Tokenize → Parse (AST) → Mcode (JSON) → Interpret
+                                                → Compile to Mach (planned)
+                                                → Compile to native (planned)
+```
+
+Mcode is produced by the `JS_Mcode` compiler pass, which emits a cJSON tree. The mcode interpreter walks this tree directly, dispatching on instruction name strings.
+
+## JSMCode Structure
+
+```c
+struct JSMCode {
+  uint16_t nr_args;        // argument count
+  uint16_t nr_slots;       // register count
+  cJSON **instrs;          // pre-flattened instruction array
+  uint32_t instr_count;    // number of instructions
+
+  struct {
+    const char *name;      // label name
+    uint32_t index;        // instruction index
+  } *labels;
+  uint32_t label_count;
+
+  struct JSMCode **functions; // nested functions
+  uint32_t func_count;
+
+  cJSON *json_root;        // keeps JSON alive
+  const char *name;        // function name
+  const char *filename;    // source file
+  uint16_t disruption_pc;  // exception handler offset
+};
+```
+
+## Instruction Format
+
+Each instruction is a JSON array. The first element is the instruction name (string), followed by operands:
+
+```json
+["LOADK", 0, 42]
+["ADD", 2, 0, 1]
+["JMPFALSE", 3, "else_label"]
+["CALL", 0, 2, 1]
+```
+
+The instruction set mirrors the Mach VM opcodes — same operations, same register semantics, but with string dispatch instead of numeric opcodes.
+
+## Labels
+
+Control flow uses named labels instead of numeric offsets:
+
+```json
+["LABEL", "loop_start"]
+["ADD", 1, 1, 2]
+["JMPFALSE", 3, "loop_end"]
+["JMP", "loop_start"]
+["LABEL", "loop_end"]
+```
+
+Labels are collected into a name-to-index map during loading, enabling O(1) jump resolution.
+
+## Differences from Mach
+
+| Property | Mcode | Mach |
+|----------|-------|------|
+| Instructions | cJSON arrays | 32-bit binary |
+| Dispatch | String comparison | Switch on opcode byte |
+| Constants | Inline in JSON | Separate constant pool |
+| Jump targets | Named labels | Numeric offsets |
+| Memory | Heap (cJSON nodes) | Off-heap (malloc) |
+
+## Purpose
+
+Mcode serves as an inspectable, debuggable intermediate format:
+
+- **Human-readable** — the JSON representation can be printed and examined
+- **Language-independent** — any tool that produces the correct JSON can target the ƿit runtime
+- **Compilation target** — the Mach compiler can consume mcode as input, and future native code generators can work from the same representation
+
+The cost of string-based dispatch makes mcode slower than the binary Mach VM, so it is primarily useful during development and as a compilation intermediate rather than for production execution.

docs/spec/objects.md

@@ -0,0 +1,142 @@
+---
+title: "Object Types"
+description: "Heap object header format and types"
+---
+
+## Object Header
+
+Every heap-allocated object begins with a 64-bit header word (`objhdr_t`):
+
+```
+[capacity: 56 bits][flags: 5 bits][type: 3 bits]
+```
+
+### Type Field (bits 0-2)
+
+| Value | Type | Description |
+|-------|------|-------------|
+| 0 | `OBJ_ARRAY` | Dynamic array of JSValues |
+| 1 | `OBJ_BLOB` | Binary data (bits) |
+| 2 | `OBJ_TEXT` | Unicode text string |
+| 3 | `OBJ_RECORD` | Key-value object with prototype chain |
+| 4 | `OBJ_FUNCTION` | Function (C, bytecode, register, or mcode) |
+| 5 | `OBJ_CODE` | Compiled bytecode |
+| 6 | `OBJ_FRAME` | Stack frame for closures |
+| 7 | `OBJ_FORWARD` | Forwarding pointer (GC) |
+
+### Flags (bits 3-7)
+
+- **Bit 3 (S)** — Stone flag. If set, the object is immutable and excluded from GC.
+- **Bit 4 (P)** — Properties flag.
+- **Bit 5 (A)** — Array flag.
+- **Bit 7 (R)** — Reserved.
+
+### Capacity (bits 8-63)
+
+The interpretation of the 56-bit capacity field depends on the object type.
+
+## Array
+
+```c
+struct JSArray {
+  objhdr_t header;     // type=0, capacity=element slots
+  word_t len;          // current number of elements
+  JSValue values[];    // inline flexible array
+};
+```
+
+Capacity is the number of JSValue slots allocated. Length is the number currently in use. Arrays grow by reallocating with a larger capacity.
+
+## Blob
+
+```c
+struct JSBlob {
+  objhdr_t header;     // type=1, capacity=allocated bits
+  word_t length;       // length in bits
+  uint8_t bits[];      // bit-packed data
+};
+```
+
+Blobs are bit-addressable. The length field tracks the exact number of bits written. A blob starts as antestone (mutable) for writing, then becomes stone (immutable) for reading.
+
+## Text
+
+```c
+struct JSText {
+  objhdr_t header;     // type=2, capacity=character slots
+  word_t length;       // length in codepoints (or hash if stoned)
+  word_t packed[];     // two UTF-32 chars per 64-bit word
+};
+```
+
+Text is stored as UTF-32, with two 32-bit codepoints packed per 64-bit word. When a text object is stoned, the length field is repurposed to cache the hash value (computed via `fash64`), since stoned text is immutable and the hash never changes.
+
+## Record
+
+```c
+struct JSRecord {
+  objhdr_t header;     // type=3, capacity=hash table slots
+  JSRecord *proto;     // prototype chain pointer
+  word_t len;          // number of entries
+  slot slots[];        // key-value pairs (hash table)
+};
+```
+
+Records use a hash table with linear probing. Slot 0 is reserved for internal metadata (class ID and record ID). Empty slots use `JS_NULL` as the key; deleted slots use `JS_EXCEPTION` as a tombstone.
+
+The prototype chain is a linked list of JSRecord pointers, traversed during property lookup.
+
+## Function
+
+```c
+struct JSFunction {
+  objhdr_t header;     // type=4
+  JSValue name;        // function name
+  int16_t length;      // arity (-1 for variadic)
+  uint8_t kind;        // C, bytecode, register, or mcode
+  union {
+    struct { ... } cfunc;      // C function pointer
+    struct { ... } bytecode;   // bytecode + frame
+    struct { ... } regvm;      // register VM code
+    struct { ... } mcode;      // mcode IR
+  } u;
+};
+```
+
+The kind field selects which union variant is active. Functions can be implemented in C (native), bytecode (stack VM), register code (mach VM), or mcode (JSON interpreter).
+
+## Frame
+
+```c
+struct JSFrame {
+  objhdr_t header;     // type=6, capacity=slot count
+  JSValue function;    // owning function
+  JSValue caller;      // parent frame
+  uint32_t return_pc;  // return address
+  JSValue slots[];     // [this][args][captured][locals][temps]
+};
+```
+
+Frames capture the execution context for closures. The slots array contains the function's `this` binding, arguments, captured upvalues, local variables, and temporaries. Frames are linked via the caller field for upvalue resolution across closure depth.
+
+## Forwarding Pointer
+
+```
+[pointer: 61 bits][111]
+```
+
+During garbage collection, when an object is copied to the new heap, the old header is replaced with a forwarding pointer to the new location. This is type 7 (`OBJ_FORWARD`) and stores the new address in bits 3-63. See [Garbage Collection](#gc) for details.
+
+## Object Sizing
+
+All objects are aligned to 8 bytes. The total size in bytes for each type:
+
+| Type | Size |
+|------|------|
+| Array | `8 + 8 + capacity * 8` |
+| Blob | `8 + 8 + ceil(capacity / 8)` |
+| Text | `8 + 8 + ceil(capacity / 2) * 8` |
+| Record | `8 + 8 + 8 + (capacity + 1) * 16` |
+| Function | `sizeof(JSFunction)` (fixed) |
+| Code | `sizeof(JSFunctionBytecode)` (fixed) |
+| Frame | `8 + 8 + 8 + 4 + capacity * 8` |

docs/spec/stone.md

@@ -0,0 +1,82 @@
+---
+title: "Stone Memory"
+description: "Immutable arena allocation"
+---
+
+## Overview
+
+Stone memory is a separate allocation arena for immutable values. Objects in stone memory are permanent — they are never moved, never freed, and never touched by the garbage collector.
+
+The `stone()` function in ƿit petrifies a value, deeply freezing it and all its descendants. Stoned objects have the S bit set in their object header.
+
+## The Stone Arena
+
+Stone memory uses bump allocation from a contiguous arena:
+
+```
+stone_base ──────── stone_free ──────── stone_end
+[allocated objects] [free space        ]
+```
+
+Allocation advances `stone_free` forward. When the arena is exhausted, overflow pages are allocated via the system allocator and linked together:
+
+```c
+struct StonePage {
+  struct StonePage *next;
+  size_t size;
+  uint8_t data[];
+};
+```
+
+## The S Bit
+
+Bit 3 of the object header is the stone flag. When set:
+
+- The object is **immutable** — writes disrupt
+- The object is **excluded from GC** — the collector skips it entirely
+- For text objects, the length field caches the **hash** instead of the character count (since the text cannot change, the hash is computed once and reused)
+
+## What Gets Stoned
+
+When `stone(value)` is called:
+
+1. If the value is already stone, return immediately
+2. Recursively walk all nested values (array elements, record fields, etc.)
+3. Copy each mutable object into the stone arena
+4. Set the S bit on each copied object
+5. Return the stoned value
+
+The operation is deep — an entire object graph becomes permanently immutable.
+
+## Text Interning
+
+The stone arena maintains a hash table for text interning. When a text value is stoned, it is looked up in the intern table. If an identical string already exists in stone memory, the existing one is reused. This deduplicates strings and makes equality comparison O(1) for stoned text.
+
+The hash is computed with `fash64` over the packed UTF-32 words.
+
+## Usage Patterns
+
+### Module Return Values
+
+Every module's return value is automatically stoned:
+
+```javascript
+// config.cm
+return {
+  debug: true,
+  timeout: 30
+}
+// The returned object is stone — shared safely between actors
+```
+
+### Message Passing
+
+Messages between actors are stoned before delivery, ensuring actors never share mutable state.
+
+### Constants
+
+Literal objects and arrays that can be determined at compile time may be allocated directly in stone memory.
+
+## Relationship to GC
+
+The Cheney copying collector only operates on the mutable heap. During collection, when the collector encounters a pointer to stone memory (S bit set), it skips it — stone objects are roots that never move. This means stone memory acts as a permanent root set with zero GC overhead.

docs/spec/values.md

@@ -0,0 +1,96 @@
+---
+title: "Value Representation"
+description: "JSValue tagging and encoding"
+---
+
+## Overview
+
+Every value in ƿit is a 64-bit word called a JSValue. The runtime uses LSB (least significant bit) tagging to pack type information directly into the value, avoiding heap allocation for common types.
+
+## Tag Encoding
+
+The lowest bits of a JSValue determine its type:
+
+| LSB Pattern | Type | Payload |
+|-------------|------|---------|
+| `xxxxxxx0` | Integer | 31-bit signed integer in upper bits |
+| `xxxxx001` | Pointer | 61-bit aligned heap pointer |
+| `xxxxx101` | Short float | 8-bit exponent + 52-bit mantissa |
+| `xxxxx011` | Special | 5-bit tag selects subtype |
+
+### Integers
+
+If the least significant bit is 0, the value is an immediate 31-bit signed integer. The integer is stored in the upper bits, extracted via `v >> 1`.
+
+```
+[integer: 31 bits][0]
+```
+
+Range: -1073741824 to 1073741823. Numbers outside this range are stored as short floats or heap-allocated.
+
+### Pointers
+
+If the lowest 3 bits are `001`, the value is a pointer to a heap object. The pointer is 8-byte aligned, so the low 3 bits are available for the tag. The actual address is extracted by clearing the low 3 bits.
+
+```
+[pointer: 61 bits][001]
+```
+
+All heap objects (arrays, records, blobs, text, functions, etc.) are referenced through pointer-tagged JSValues.
+
+### Short Floats
+
+If the lowest 3 bits are `101`, the value encodes a floating-point number directly. The format uses an 8-bit exponent (bias 127) and 52-bit mantissa, similar to IEEE 754 but with reduced range.
+
+```
+[sign: 1][exponent: 8][mantissa: 52][101]
+```
+
+Range: approximately ±3.4 * 10^38. Numbers outside this range fall back to null. Zero is always positive zero.
+
+### Specials
+
+If the lowest 2 bits are `11`, the next 3 bits select a special type:
+
+| 5-bit Tag | Value |
+|-----------|-------|
+| `00011` | Boolean (true/false in upper bits) |
+| `00111` | Null |
+| `01111` | Exception marker |
+| `10111` | Uninitialized |
+| `11011` | Immediate string |
+| `11111` | Catch offset |
+
+## Immediate Strings
+
+Short ASCII strings (up to 7 characters) are packed directly into the JSValue without heap allocation:
+
+```
+[char6][char5][char4][char3][char2][char1][char0][length: 3][11011]
+```
+
+Each character occupies 8 bits. The length (0-7) is stored in bits 5-7. Only ASCII characters (0-127) qualify — any non-ASCII character forces heap allocation.
+
+```javascript
+var s = "hello"   // 5 chars, fits in immediate string
+var t = ""         // immediate (length 0)
+var u = "longtext" // 8 chars, heap-allocated
+```
+
+## Null
+
+Null is encoded as a special-tagged value with tag `00111`. There is no `undefined` in ƿit — only null.
+
+```javascript
+var x = null       // special tag null
+var y = 1 / 0      // also null (division by zero)
+var z = {}.missing // null (missing field)
+```
+
+## Boolean
+
+True and false are encoded as specials with tag `00011`, distinguished by a bit in the upper payload.
+
+## Summary
+
+The tagging scheme ensures that the most common values — small integers, booleans, null, and short strings — require zero heap allocation. This significantly reduces GC pressure and improves cache locality.

docs/wota.md

@@ -0,0 +1,119 @@
+---
+title: "Wota Format"
+description: "Word Object Transfer Arrangement"
+weight: 86
+type: "docs"
+---
+
+Wota is a binary message format for local inter-process communication. It is similar to Nota but works at word granularity (64-bit words) rather than byte granularity. Wota arrangements are less compact than Nota but faster to arrange and consume.
+
+Wota stands for Word Object Transfer Arrangement.
+
+## Type Summary
+
+| Byte | Type |
+|------|------|
+| `00` | Integer |
+| `01` | Floating Point |
+| `02` | Array |
+| `03` | Record |
+| `04` | Blob |
+| `05` | Text |
+| `07` | Symbol |
+
+## Preambles
+
+Every Wota value starts with a preamble word. The least significant byte contains the type. The remaining 56 bits contain type-specific data.
+
+## Blob
+
+A blob is a string of bits. The remaining field contains the number of bits. The number of words that follow: `floor((number_of_bits + 63) / 64)`. The first bit of the blob goes into the most significant bit of the first word. The final word is padded with 0.
+
+Example: A blob containing 25 bits `111100001110001100100001`:
+
+```
+0000000000001904    # preamble: 25 bits, type blob
+F0E3208000000000    # data (padded to 64 bits)
+```
+
+## Text
+
+The text is a string of UTF-32 characters packed 2 per word. The remaining field contains the number of characters. The number of words that follow: `floor((number_of_characters + 1) / 2)`. The final word is padded with 0.
+
+Example: `"cat"`:
+
+```
+0000000000000305    # preamble: 3 characters, type text
+0000006300000061    # 'c' and 'a'
+0000007400000000    # 't' and padding
+```
+
+## Array
+
+An array is an ordered sequence of values. The remaining field contains the number of elements. Following the preamble are the elements, each beginning with its own preamble. Nesting is encouraged. Cyclic structures are not allowed.
+
+Example: `["duck", "dragon"]`:
+
+```
+0000000000000202    # preamble: 2 elements, type array
+0000000000000405    # text "duck": 4 chars
+0000006400000074    # 'd' 't' (reversed pair order)
+000000630000006B    # 'c' 'k'
+0000000000000605    # text "dragon": 6 chars
+0000006400000072    # 'd' 'r'
+0000006100000067    # 'a' 'g'
+0000006F0000006E    # 'o' 'n'
+```
+
+## Record
+
+A record is a set of key/value pairs. Keys must be text. The remaining field contains the number of pairs.
+
+Example: `{"ox": ["O", "X"]}`:
+
+```
+0000000000000103    # preamble: 1 pair, type record
+0000000000000205    # key "ox": 2 chars
+0000006F00000078    # 'o' 'x'
+0000000000000202    # value: array of 2
+0000000000000105    # "O": 1 char
+0000004F00000000    # 'O'
+0000000000000105    # "X": 1 char
+0000005800000000    # 'X'
+```
+
+## Number
+
+Numbers are represented as DEC64. To arrange an integer, shift the integer up 8 bits. The number is incorporated directly into the preamble.
+
+Example: `7`:
+
+```
+0000000000000700    # integer 7 as DEC64
+```
+
+To arrange a floating point number, place the number in the word following the floating point preamble.
+
+Example: `4.25`:
+
+```
+0000000000000001    # preamble: type floating point
+000000000001A9FE    # DEC64 encoding of 4.25
+```
+
+Care must be taken when decoding that the least significant byte of the number is not `80` (the null exponent).
+
+## Symbol
+
+The remaining field contains the symbol.
+
+Example: `[null, false, true, private, system]`:
+
+```
+0000000000000502    # array of 5
+0000000000000007    # null
+0000000000000207    # false
+0000000000000307    # true
+0000000000000807    # private
+0000000000000907    # system
+```

examples/http_download_actor.ce

@@ -1,234 +0,0 @@
-// HTTP Download Actor
-// Handles download requests and progress queries
-var http = use('http');
-var os = use('os');
-
-// Actor state
-var state = {
-    downloading: false,
-    current_url: null,
-    total_bytes: 0,
-    downloaded_bytes: 0,
-    start_time: 0,
-    error: null,
-    connection: null,
-    download_msg: null,
-    chunks: []
-};
-
-// Helper to calculate progress percentage
-function get_progress() {
-    if (state.total_bytes == 0) {
-        return 0;
-    }
-    return number.round((state.downloaded_bytes / state.total_bytes) * 100);
-}
-
-// Helper to format status response
-function get_status() {
-    if (!state.downloading) {
-        return {
-            status: 'idle',
-            error: state.error
-        };
-    }
-    
-    var elapsed = os.now() - state.start_time;
-    var bytes_per_sec = elapsed > 0 ? state.downloaded_bytes / elapsed : 0;
-    
-    return {
-        status: 'downloading',
-        url: state.current_url,
-        progress: get_progress(),
-        downloaded_bytes: state.downloaded_bytes,
-        total_bytes: state.total_bytes,
-        elapsed_seconds: elapsed,
-        bytes_per_second: number.round(bytes_per_sec)
-    };
-}
-
-// Main message receiver
-$receiver(function(msg) {
-    switch (msg.type) {
-        case 'download':
-            if (state.downloading) {
-                send(msg, {
-                    type: 'error',
-                    error: 'Already downloading',
-                    current_url: state.current_url
-                });
-                return;
-            }
-            
-            if (!msg.url) {
-                send(msg, {
-                    type: 'error',
-                    error: 'No URL provided'
-                });
-                return;
-            }
-            
-            // Start download
-            state.downloading = true;
-            state.current_url = msg.url;
-            state.total_bytes = 0;
-            state.downloaded_bytes = 0;
-            state.start_time = os.now();
-            state.error = null;
-            state.download_msg = msg;
-            state.chunks = [];
-            
-            try {
-                // Start the connection
-                state.connection = http.fetch_start(msg.url, msg.options || {});
-                if (!state.connection) {
-                    throw new Error('Failed to start download');
-                }
-                
-                // Schedule the first chunk read
-                $delay(read_next_chunk, 0);
-                
-            } catch (e) {
-                state.error = e.toString();
-                state.downloading = false;
-                
-                send(msg, {
-                    type: 'error',
-                    error: state.error,
-                    url: msg.url
-                });
-            }
-            break;
-            
-        case 'status':
-            log.console(`got status request. current is ${get_status()}`)
-            send(msg, {
-                type: 'status_response',
-                ...get_status()
-            });
-            break;
-            
-        case 'cancel':
-            if (state.downloading) {
-                // Cancel the download
-                if (state.connection) {
-                    http.fetch_close(state.connection);
-                    state.connection = null;
-                }
-                state.downloading = false;
-                state.current_url = null;
-                state.download_msg = null;
-                state.chunks = [];
-                
-                send(msg, {
-                    type: 'cancelled',
-                    message: 'Download cancelled',
-                    url: state.current_url
-                });
-            } else {
-                send(msg, {
-                    type: 'error',
-                    error: 'No download in progress'
-                });
-            }
-            break;
-            
-        default:
-            send(msg, {
-                type: 'error',
-                error: 'Unknown message type: ' + msg.type
-            });
-    }
-});
-
-// Non-blocking chunk reader
-function read_next_chunk() {
-    if (!state.downloading || !state.connection) {
-        return;
-    }
-    
-    try {
-        var chunk = http.fetch_read_chunk(state.connection);
-        
-        if (chunk == null) {
-            // Download complete
-            finish_download();
-            return;
-        }
-        
-        // Store chunk
-        state.chunks.push(chunk);
-        
-        // Update progress
-        var info = http.fetch_info(state.connection);
-        state.downloaded_bytes = info.bytes_read;
-        if (info.headers_complete && info.content_length > 0) {
-            state.total_bytes = info.content_length;
-        }
-        
-        // Schedule next chunk read
-        $delay(read_next_chunk, 0);
-        
-    } catch (e) {
-        // Error during download
-        state.error = e.toString();
-        if (state.connection) {
-            http.fetch_close(state.connection);
-        }
-        
-        if (state.download_msg) {
-            send(state.download_msg, {
-                type: 'error',
-                error: state.error,
-                url: state.current_url
-            });
-        }
-        
-        // Reset state
-        state.downloading = false;
-        state.connection = null;
-        state.download_msg = null;
-        state.chunks = [];
-    }
-}
-
-// Complete the download and send result
-function finish_download() {
-    if (state.connection) {
-        http.fetch_close(state.connection);
-    }
-    
-    // Combine all chunks into single ArrayBuffer
-    var total_size = 0;
-    for (var i = 0; i < state.chunks.length; i++) {
-        total_size += state.chunks[i].byteLength;
-    }
-    
-    var result = new ArrayBuffer(total_size);
-    var view = new Uint8Array(result);
-    var offset = 0;
-    
-    for (var i = 0; i < state.chunks.length; i++) {
-        var chunk_view = new Uint8Array(state.chunks[i]);
-        view.set(chunk_view, offset);
-        offset += state.chunks[i].byteLength;
-    }
-    
-    // Send complete message
-    if (state.download_msg) {
-        send(state.download_msg, {
-            type: 'complete',
-            url: state.current_url,
-            data: result,
-            size: result.byteLength,
-            duration: os.now() - state.start_time
-        });
-    }
-    
-    // Reset state
-    state.downloading = false;
-    state.connection = null;
-    state.current_url = null;
-    state.download_msg = null;
-    state.chunks = [];
-}

examples/nat.ce

@@ -10,7 +10,7 @@ var match_id = 0;
 $portal(e => {
   log.console("NAT server: received connection request");
   
-  if (!isa(e.actor, actor))
+  if (!is_actor(e.actor))
     send(e, {reason: "Must provide the actor you want to connect."});
 
   if (waiting_client) {

fash.c

@@ -0,0 +1,93 @@
+/*
+  Fash64: Douglas Crockford (2017-02-02)
+  64-bit hash that uses the high 64 bits of a 128-bit product for feedback.
+
+  Notes:
+  - Requires a way to get the high half of a 64x64->128 multiply.
+  - Uses __uint128_t when available; otherwise uses MSVC _umul128.
+*/
+
+#include <stdint.h>
+#include <stddef.h>
+
+typedef struct fash64_state {
+  uint64_t result;
+  uint64_t sum;
+} fash64_state;
+
+enum {
+  FASH64_PRIME_11 = 11111111111111111027ull,
+  FASH64_PRIME_8  = 8888888888888888881ull,
+  FASH64_PRIME_3  = 3333333333333333271ull
+};
+
+static inline void fash64_mul_hi_lo(uint64_t a, uint64_t b, uint64_t *hi, uint64_t *lo)
+{
+#if defined(__SIZEOF_INT128__)
+  __uint128_t p = (__uint128_t)a * (__uint128_t)b;
+  *lo = (uint64_t)p;
+  *hi = (uint64_t)(p >> 64);
+#elif defined(_MSC_VER) && defined(_M_X64)
+  *lo = _umul128(a, b, hi);
+#else
+  /* Portable fallback (no 128-bit type, no _umul128). */
+  uint64_t a0 = (uint32_t)a;
+  uint64_t a1 = a >> 32;
+  uint64_t b0 = (uint32_t)b;
+  uint64_t b1 = b >> 32;
+
+  uint64_t p00 = a0 * b0;
+  uint64_t p01 = a0 * b1;
+  uint64_t p10 = a1 * b0;
+  uint64_t p11 = a1 * b1;
+
+  uint64_t mid = (p00 >> 32) + (uint32_t)p01 + (uint32_t)p10;
+  *lo = (p00 & 0xffffffffull) | (mid << 32);
+  *hi = p11 + (p01 >> 32) + (p10 >> 32) + (mid >> 32);
+#endif
+}
+
+static inline void fash64_begin(fash64_state *s)
+{
+  s->result = (uint64_t)FASH64_PRIME_8;
+  s->sum = (uint64_t)FASH64_PRIME_3;
+}
+
+static inline void fash64_word(fash64_state *s, uint64_t word)
+{
+  uint64_t high, low;
+  uint64_t mixed = s->result ^ word;
+
+  fash64_mul_hi_lo(mixed, (uint64_t)FASH64_PRIME_11, &high, &low);
+
+  s->sum += high;
+  s->result = low ^ s->sum;
+}
+
+static inline void fash64_block(fash64_state *s, const uint64_t *block, size_t word_count)
+{
+  for (size_t i = 0; i < word_count; i++) fash64_word(s, block[i]);
+}
+
+static inline uint64_t fash64_end(const fash64_state *s)
+{
+  return s->result;
+}
+
+/* Convenience one-shot helper */
+static inline uint64_t fash64_hash_words(const uint64_t *words, size_t word_count, uint64_t extra_word)
+{
+  fash64_state s;
+  fash64_begin(&s);
+  fash64_block(&s, words, word_count);
+  fash64_word(&s, extra_word);
+  return fash64_end(&s);
+}
+
+static inline uint64_t fash64_hash_one(uint64_t word)
+{
+  uint64_t high, low;
+  uint64_t mixed = (uint64_t)FASH64_PRIME_8 ^ word;
+  fash64_mul_hi_lo(mixed, (uint64_t)FASH64_PRIME_11, &high, &low);
+  return low ^ ((uint64_t)FASH64_PRIME_3 + high);
+}

fd.c

@@ -50,7 +50,7 @@ JSC_SCALL(fd_open,
     mode_t mode = 0644;
     
     // Parse optional flags argument
-    if (argc > 1 && JS_IsString(argv[1])) {
+    if (argc > 1 && JS_IsText(argv[1])) {
         const char *flag_str = JS_ToCString(js, argv[1]);
         flags = 0;
         
@@ -78,7 +78,7 @@ JSC_CCALL(fd_write,
     
     size_t len;
     ssize_t wrote;
-    if (JS_IsString(argv[1])) {
+    if (JS_IsText(argv[1])) {
         const char *data = JS_ToCStringLen(js, &len, argv[1]);
         if (!data) return JS_EXCEPTION;
         wrote = write(fd, data, len);
@@ -276,7 +276,7 @@ JSC_SCALL(fd_mkdir,
 JSC_SCALL(fd_mv,
     if (argc < 2)
         ret = JS_ThrowTypeError(js, "fd.mv requires 2 arguments: old path and new path");
-    else if (!JS_IsString(argv[1]))
+    else if (!JS_IsText(argv[1]))
         ret = JS_ThrowTypeError(js, "second argument must be a string (new path)");
     else {
         const char *new_path = JS_ToCString(js, argv[1]);
@@ -289,7 +289,7 @@ JSC_SCALL(fd_mv,
 JSC_SCALL(fd_symlink,
     if (argc < 2)
         ret = JS_ThrowTypeError(js, "fd.symlink requires 2 arguments: target and link path");
-    else if (!JS_IsString(argv[1]))
+    else if (!JS_IsText(argv[1]))
         ret = JS_ThrowTypeError(js, "second argument must be a string (link path)");
     else {
         const char *link_path = JS_ToCString(js, argv[1]);
@@ -502,10 +502,9 @@ JSC_SCALL(fd_readdir,
        ret = JS_ThrowInternalError(js, "FindFirstFile failed for %s", path);
     } else {
        ret = JS_NewArray(js);
-       int i = 0;
        do {
           if (strcmp(ffd.cFileName, ".") == 0 || strcmp(ffd.cFileName, "..") == 0) continue;
-          JS_SetPropertyUint32(js, ret, i++, JS_NewString(js, ffd.cFileName));
+          JS_ArrayPush(js, ret,JS_NewString(js, ffd.cFileName));
        } while (FindNextFile(hFind, &ffd) != 0);
        FindClose(hFind);
     }
@@ -515,10 +514,9 @@ JSC_SCALL(fd_readdir,
     d = opendir(str);
     if (d) {
         ret = JS_NewArray(js);
-        int i = 0;
         while ((dir = readdir(d)) != NULL) {
             if (strcmp(dir->d_name, ".") == 0 || strcmp(dir->d_name, "..") == 0) continue;
-            JS_SetPropertyUint32(js, ret, i++, JS_NewString(js, dir->d_name));
+            JS_ArrayPush(js, ret, JS_NewString(js, dir->d_name));
         }
         closedir(d);
     } else {
@@ -559,19 +557,22 @@ JSC_CCALL(fd_slurpwrite,
     size_t len;
     const char *data = js_get_blob_data(js, &len, argv[1]);
 
-    if (data == (const char *)-1)
+    if (!data && len > 0)
         return JS_EXCEPTION;
     
     const char *str = JS_ToCString(js, argv[0]);
 
     if (!str) return JS_EXCEPTION;
     int fd = open(str, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-    JS_FreeCString(js, str);
-    if (fd < 0) 
+    if (fd < 0)  {
+      JS_FreeCString(js, str);
       return JS_ThrowInternalError(js, "open failed for %s: %s", str, strerror(errno));
+    }
     
     ssize_t written = write(fd, data, len);
     close(fd);
+
+    JS_FreeCString(js, str);
     
     if (written != (ssize_t)len) 
       return JS_ThrowInternalError(js, "write failed for %s: %s", str, strerror(errno));

fd.cm

@@ -1,31 +1,67 @@
 var fd = this
 var wildstar = use('wildstar')
 
+function last_pos(str, sep) {
+  var last = null
+  replace(str, sep, function(m, pos) {
+    last = pos
+    return m
+  })
+  return last
+}
+
 // Helper to join paths
 function join_paths(base, rel) {
-  base = base.replace(/\/+$/, "")
-  rel = rel.replace(/^\/+/, "")
+  base = replace(base, /\/+$/, "")
+  rel = replace(rel, /^\/+/, "")
   if (!base) return rel
   if (!rel) return base
   return base + "/" + rel
 }
 
+fd.join_paths = join_paths
+fd.basename = function basename(path) {
+  var last = last_pos(path, '/')
+  if (last == null) return path
+  return text(path, last+1)
+}
+
+fd.dirname = function dirname(path) {
+  var last = last_pos(path, '/')
+  if (last == null) return ""
+  return text(path,0,last)
+}
+
+fd.stem = function stem(path) {
+  var last = last_pos(path, '.')
+  if (last == null) return path
+  return text(path,0,last)
+}
+
 fd.globfs = function(globs, dir) {
   if (dir == null) dir = "."
   var results = []
   
   function check_neg(path) {
-    for (var g of globs) {
-      if (g.startsWith("!") && wildstar.match(g.substring(1), path, wildstar.WM_WILDSTAR)) return true;
-    }
-    return false;
+    var found = false;
+    arrfor(globs, function(g) {
+      if (starts_with(g, "!") && wildstar.match(text(g, 1), path, wildstar.WM_WILDSTAR)) {
+        found = true;
+        return true;
+      }
+    }, null, true);
+    return found;
   }
   
   function check_pos(path) {
-    for (var g of globs) {
-      if (!g.startsWith("!") && wildstar.match(g, path, wildstar.WM_WILDSTAR)) return true;
-    }
-    return false;
+    var found = false;
+    arrfor(globs, function(g) {
+      if (!starts_with(g, "!") && wildstar.match(g, path, wildstar.WM_WILDSTAR)) {
+        found = true;
+        return true;
+      }
+    }, null, true);
+    return found;
   }
 
   function visit(curr_full, rel_prefix) {
@@ -34,7 +70,7 @@ fd.globfs = function(globs, dir) {
     var list = fd.readdir(curr_full)
     if (!list) return
     
-    for (var item of list) {
+    arrfor(list, function(item) {
       var item_rel = rel_prefix ? rel_prefix + "/" + item : item
       
       var child_full = join_paths(curr_full, item)
@@ -46,10 +82,10 @@ fd.globfs = function(globs, dir) {
         }
       } else {
         if (!check_neg(item_rel) && check_pos(item_rel)) {
-          results.push(item_rel)
+          push(results, item_rel)
         }
       }
-    }
+    });
   }
   
   var st = fd.stat(dir)

fd_playdate.c

@@ -39,7 +39,7 @@ JSC_SCALL(fd_open,
     FileOptions flags = kFileRead;
     
     // Parse optional flags argument
-    if (argc > 1 && JS_IsString(argv[1])) {
+    if (argc > 1 && JS_IsText(argv[1])) {
         const char *flag_str = JS_ToCString(js, argv[1]);
         flags = 0;
         
@@ -70,7 +70,7 @@ JSC_CCALL(fd_write,
     
     size_t len;
     int wrote;
-    if (JS_IsString(argv[1])) {
+    if (JS_IsText(argv[1])) {
         const char *data = JS_ToCStringLen(js, &len, argv[1]);
         if (!data) return JS_EXCEPTION;
         wrote = pd_file->write(fd, data, (unsigned int)len);
@@ -202,7 +202,7 @@ JSC_SCALL(fd_mkdir,
 JSC_SCALL(fd_mv,
     if (argc < 2)
         ret = JS_ThrowTypeError(js, "fd.mv requires 2 arguments: old path and new path");
-    else if (!JS_IsString(argv[1]))
+    else if (!JS_IsText(argv[1]))
         ret = JS_ThrowTypeError(js, "second argument must be a string (new path)");
     else {
         const char *new_path = JS_ToCString(js, argv[1]);
@@ -216,7 +216,7 @@ JSC_SCALL(fd_mv,
 
 JSC_SCALL(fd_symlink,
     // Not supported
-    if (argc >= 2 && JS_IsString(argv[1])) {
+    if (argc >= 2 && JS_IsText(argv[1])) {
         // consume arg
         JS_FreeCString(js, JS_ToCString(js, argv[1])); 
     }

fetch.ce

@@ -13,7 +13,7 @@ var shop = use('internal/shop')
 // Parse arguments
 var target_pkg = null
 
-for (var i = 0; i < args.length; i++) {
+for (var i = 0; i < length(args); i++) {
   if (args[i] == '--help' || args[i] == '-h') {
     log.console("Usage: cell fetch [package]")
     log.console("Fetch package zips from remote sources.")
@@ -24,7 +24,7 @@ for (var i = 0; i < args.length; i++) {
     log.console("This command ensures that the zip files on disk match what's in")
     log.console("the lock file. For local packages, this is a no-op.")
     $stop()
-  } else if (!args[i].startsWith('-')) {
+  } else if (!starts_with(args[i], '-')) {
     target_pkg = args[i]
   }
 }
@@ -35,52 +35,55 @@ var packages_to_fetch = []
 
 if (target_pkg) {
   // Fetch specific package
-  if (!all_packages.includes(target_pkg)) {
+  if (find(all_packages, target_pkg) == null) {
     log.error("Package not found: " + target_pkg)
     $stop()
   }
-  packages_to_fetch.push(target_pkg)
+  push(packages_to_fetch, target_pkg)
 } else {
   // Fetch all packages
   packages_to_fetch = all_packages
 }
 
-log.console("Fetching " + text(packages_to_fetch.length) + " package(s)...")
+var remote_count = 0
+arrfor(packages_to_fetch, function(pkg) {
+  var entry = lock[pkg]
+  if (pkg != 'core' && (!entry || entry.type != 'local'))
+    remote_count++
+}, null, null)
 
-var success_count = 0
-var skip_count = 0
+if (remote_count > 0)
+  log.console(`Fetching ${text(remote_count)} remote package(s)...`)
+
+var downloaded_count = 0
+var cached_count = 0
 var fail_count = 0
 
-for (var pkg of packages_to_fetch) {
-  var entry = lock[pkg]
-  
-  // Skip local packages
-  if (entry && entry.type == 'local') {
-    skip_count++
-    continue
-  }
-  
+arrfor(packages_to_fetch, function(pkg) {
   // Skip core (handled separately)
-  if (pkg == 'core') {
-    skip_count++
-    continue
-  }
-  
+  if (pkg == 'core') return
+
   var result = shop.fetch(pkg)
-  if (result) {
-    if (result.zip_blob) {
-      log.console("Fetched: " + pkg)
-      success_count++
-    } else {
-      skip_count++
-    }
-  } else {
-    log.error("Failed to fetch: " + pkg)
+  if (result.status == 'local') {
+    // Local packages are just symlinks, nothing to fetch
+    return
+  } else if (result.status == 'cached') {
+    cached_count++
+  } else if (result.status == 'downloaded') {
+    log.console("  Downloaded: " + pkg)
+    downloaded_count++
+  } else if (result.status == 'error') {
+    log.error("  Failed: " + pkg + (result.message ? " - " + result.message : ""))
     fail_count++
   }
-}
+}, null, null)
 
 log.console("")
-log.console("Fetch complete: " + text(success_count) + " fetched, " + text(skip_count) + " skipped, " + text(fail_count) + " failed")
+var parts = []
+if (downloaded_count > 0) push(parts, `${text(downloaded_count)} downloaded`)
+if (cached_count > 0) push(parts, `${text(cached_count)} cached`)
+if (fail_count > 0) push(parts, `${text(fail_count)} failed`)
+if (length(parts) == 0) push(parts, "nothing to fetch")
+log.console("Fetch complete: " + text(parts, ", "))
 
 $stop()

gc_plan.md

@@ -0,0 +1,403 @@
+# Plan: Complete Copying GC Implementation
+
+## Overview
+
+Remove reference counting (DupValue/FreeValue) entirely and complete the Cheney copying garbage collector. Each JSContext will use bump allocation from a heap block, and when out of memory, request a new heap from JSRuntime's buddy allocator and copy live objects to the new heap.
+
+## Target Architecture (from docs/memory.md)
+
+### Object Types (simplified from current):
+
+**Type 0 - Array**: `{ header, length, elements[] }`
+**Type 1 - Blob**: `{ header, length, bits[] }`
+**Type 2 - Text**: `{ header, length_or_hash, packed_chars[] }`
+**Type 3 - Record**: `{ header, prototype, length, key_value_pairs[] }`
+**Type 4 - Function**: `{ header, code_ptr, outer_frame_ptr }` - 3 words only, always stone
+**Type 5 - Frame**: `{ header, function_ptr, caller_ptr, ret_addr, args[], closure_vars[], local_vars[], temps[] }`
+**Type 6 - Code**: Lives in immutable memory only, never copied
+**Type 7 - Forward**: Object has moved; cap56 contains new address
+
+### Key Design Points:
+- **JSFunction** is just a pointer to code and a pointer to the frame that created it (3 words)
+- **Closure variables live in frames** - when a function returns, its frame is "reduced" to just the closure variables
+- **Code objects are immutable** - stored in stone memory, never copied during GC
+- **Frame reduction**: When a function returns, `caller` is set to zero, signaling the frame can be shrunk
+
+## Current State (needs refactoring)
+
+1. **Partial Cheney GC exists** at `source/quickjs.c:1844-2030`: `ctx_gc`, `gc_copy_value`, `gc_scan_object`
+2. **744 calls to JS_DupValue/JS_FreeValue** scattered throughout (currently undefined, causing compilation errors)
+3. **Current JSFunction** is bloated (has kind, name, union of cfunc/bytecode/bound) - needs simplification
+4. **Current JSVarRef** is a separate object - should be eliminated, closures live in frames
+5. **Bump allocator** in `js_malloc` (line 1495) with `heap_base`/`heap_free`/`heap_end`
+6. **Buddy allocator** for memory blocks (lines 1727-1837)
+7. **Header offset inconsistency** - some structs have header at offset 0, some at offset 8
+
+## Implementation Steps
+
+### Phase 1: Define No-Op DupValue/FreeValue (To Enable Compilation)
+
+Add these near line 100 in `source/quickjs.c`:
+
+```c
+/* Copying GC - no reference counting needed */
+#define JS_DupValue(ctx, v) (v)
+#define JS_FreeValue(ctx, v) ((void)0)
+#define JS_DupValueRT(rt, v) (v)
+#define JS_FreeValueRT(rt, v) ((void)0)
+```
+
+This makes the code compile while keeping existing call sites (they become no-ops).
+
+### Phase 2: Standardize Object Headers (offset 0)
+
+Remove `JSGCObjectHeader` (ref counting remnant) and put `objhdr_t` at offset 0:
+
+```c
+typedef struct JSArray {
+  objhdr_t hdr;      // offset 0
+  word_t length;
+  JSValue values[];
+} JSArray;
+
+typedef struct JSRecord {
+  objhdr_t hdr;      // offset 0
+  JSRecord *proto;
+  word_t length;
+  slot slots[];
+} JSRecord;
+
+typedef struct JSText {
+  objhdr_t hdr;      // offset 0
+  word_t length;     // pretext: length, text: hash
+  word_t packed[];
+} JSText;
+
+typedef struct JSBlob {
+  objhdr_t hdr;      // offset 0
+  word_t length;
+  uint8_t bits[];
+} JSBlob;
+
+/* Simplified JSFunction per memory.md - 3 words */
+typedef struct JSFunction {
+  objhdr_t hdr;           // offset 0, always stone
+  JSCode *code;           // pointer to immutable code object
+  struct JSFrame *outer;  // frame that created this function
+} JSFunction;
+
+/* JSFrame per memory.md */
+typedef struct JSFrame {
+  objhdr_t hdr;           // offset 0
+  JSFunction *function;   // function being executed
+  struct JSFrame *caller; // calling frame (NULL = reduced/returned)
+  word_t ret_addr;        // return instruction address
+  JSValue slots[];        // args, closure vars, locals, temps
+} JSFrame;
+
+/* JSCode - always in immutable (stone) memory */
+typedef struct JSCode {
+  objhdr_t hdr;           // offset 0, always stone
+  word_t arity;           // max number of inputs
+  word_t frame_size;      // capacity of activation frame
+  word_t closure_size;    // reduced capacity for returned frames
+  word_t entry_point;     // address to begin execution
+  word_t disruption_point;// address of disruption clause
+  uint8_t bytecode[];     // actual bytecode
+} JSCode;
+```
+
+### Phase 3: Complete gc_object_size for All Types
+
+Update `gc_object_size` (line 1850) to read header at offset 0:
+
+```c
+static size_t gc_object_size(void *ptr) {
+  objhdr_t hdr = *(objhdr_t*)ptr;  // Header at offset 0
+  uint8_t type = objhdr_type(hdr);
+  uint64_t cap = objhdr_cap56(hdr);
+
+  switch (type) {
+  case OBJ_ARRAY:
+    return sizeof(JSArray) + cap * sizeof(JSValue);
+  case OBJ_BLOB:
+    return sizeof(JSBlob) + (cap + 7) / 8;  // cap is bits
+  case OBJ_TEXT:
+    return sizeof(JSText) + ((cap + 1) / 2) * sizeof(uint64_t);
+  case OBJ_RECORD:
+    return sizeof(JSRecord) + (cap + 1) * sizeof(slot);  // cap is mask
+  case OBJ_FUNCTION:
+    return sizeof(JSFunction);  // 3 words
+  case OBJ_FRAME:
+    return sizeof(JSFrame) + cap * sizeof(JSValue);  // cap is slot count
+  case OBJ_CODE:
+    return 0;  // Code is never copied (immutable)
+  default:
+    return 64;  // Conservative fallback
+  }
+}
+```
+
+### Phase 4: Complete gc_scan_object for All Types
+
+Update `gc_scan_object` (line 1924):
+
+```c
+static void gc_scan_object(JSContext *ctx, void *ptr, uint8_t **to_free, uint8_t *to_end) {
+  objhdr_t hdr = *(objhdr_t*)ptr;
+  uint8_t type = objhdr_type(hdr);
+
+  switch (type) {
+  case OBJ_ARRAY: {
+    JSArray *arr = (JSArray*)ptr;
+    for (uint32_t i = 0; i < arr->length; i++) {
+      arr->values[i] = gc_copy_value(ctx, arr->values[i], to_free, to_end);
+    }
+    break;
+  }
+  case OBJ_RECORD: {
+    JSRecord *rec = (JSRecord*)ptr;
+    // Copy prototype
+    if (rec->proto) {
+      JSValue proto_val = JS_MKPTR(rec->proto);
+      proto_val = gc_copy_value(ctx, proto_val, to_free, to_end);
+      rec->proto = (JSRecord*)JS_VALUE_GET_PTR(proto_val);
+    }
+    // Copy table entries
+    uint32_t mask = objhdr_cap56(rec->hdr);
+    for (uint32_t i = 1; i <= mask; i++) {  // Skip slot 0
+      JSValue k = rec->slots[i].key;
+      if (!rec_key_is_empty(k) && !rec_key_is_tomb(k)) {
+        rec->slots[i].key = gc_copy_value(ctx, k, to_free, to_end);
+        rec->slots[i].value = gc_copy_value(ctx, rec->slots[i].value, to_free, to_end);
+      }
+    }
+    break;
+  }
+  case OBJ_FUNCTION: {
+    JSFunction *func = (JSFunction*)ptr;
+    // Code is immutable, don't copy - but outer frame needs copying
+    if (func->outer) {
+      JSValue outer_val = JS_MKPTR(func->outer);
+      outer_val = gc_copy_value(ctx, outer_val, to_free, to_end);
+      func->outer = (JSFrame*)JS_VALUE_GET_PTR(outer_val);
+    }
+    break;
+  }
+  case OBJ_FRAME: {
+    JSFrame *frame = (JSFrame*)ptr;
+    // Copy function pointer
+    if (frame->function) {
+      JSValue func_val = JS_MKPTR(frame->function);
+      func_val = gc_copy_value(ctx, func_val, to_free, to_end);
+      frame->function = (JSFunction*)JS_VALUE_GET_PTR(func_val);
+    }
+    // Copy caller (unless NULL = reduced frame)
+    if (frame->caller) {
+      JSValue caller_val = JS_MKPTR(frame->caller);
+      caller_val = gc_copy_value(ctx, caller_val, to_free, to_end);
+      frame->caller = (JSFrame*)JS_VALUE_GET_PTR(caller_val);
+    }
+    // Copy all slots (args, closure vars, locals, temps)
+    uint32_t slot_count = objhdr_cap56(frame->hdr);
+    for (uint32_t i = 0; i < slot_count; i++) {
+      frame->slots[i] = gc_copy_value(ctx, frame->slots[i], to_free, to_end);
+    }
+    break;
+  }
+  case OBJ_TEXT:
+  case OBJ_BLOB:
+  case OBJ_CODE:
+    // No internal references to scan
+    break;
+  }
+}
+```
+
+### Phase 5: Fix gc_copy_value Forwarding
+
+Update `gc_copy_value` (line 1883) for offset 0 headers:
+
+```c
+static JSValue gc_copy_value(JSContext *ctx, JSValue v, uint8_t **to_free, uint8_t *to_end) {
+  if (!JS_IsPtr(v)) return v;  // Immediate value
+
+  void *ptr = JS_VALUE_GET_PTR(v);
+
+  // Stone memory - don't copy (includes Code objects)
+  objhdr_t hdr = *(objhdr_t*)ptr;
+  if (objhdr_s(hdr)) return v;
+
+  // Check if in current heap
+  if ((uint8_t*)ptr < ctx->heap_base || (uint8_t*)ptr >= ctx->heap_end)
+    return v;  // External allocation
+
+  // Already forwarded?
+  if (objhdr_type(hdr) == OBJ_FORWARD) {
+    void *new_ptr = (void*)(uintptr_t)objhdr_cap56(hdr);
+    return JS_MKPTR(new_ptr);
+  }
+
+  // Copy object to new space
+  size_t size = gc_object_size(ptr);
+  void *new_ptr = *to_free;
+  *to_free += size;
+  memcpy(new_ptr, ptr, size);
+
+  // Leave forwarding pointer in old location
+  *(objhdr_t*)ptr = objhdr_make((uint64_t)(uintptr_t)new_ptr, OBJ_FORWARD, 0, 0, 0, 0);
+
+  return JS_MKPTR(new_ptr);
+}
+```
+
+### Phase 6: Complete GC Root Tracing
+
+Update `ctx_gc` (line 1966) to trace all roots including JSGCRef:
+
+```c
+static int ctx_gc(JSContext *ctx) {
+  // ... existing setup code ...
+
+  // Copy roots: global object, class prototypes, etc. (existing)
+  ctx->global_obj = gc_copy_value(ctx, ctx->global_obj, &to_free, to_end);
+  ctx->global_var_obj = gc_copy_value(ctx, ctx->global_var_obj, &to_free, to_end);
+  // ... other existing root copying ...
+
+  // Copy GC root stack (JS_PUSH_VALUE/JS_POP_VALUE)
+  for (JSGCRef *ref = ctx->top_gc_ref; ref; ref = ref->prev) {
+    ref->val = gc_copy_value(ctx, ref->val, &to_free, to_end);
+  }
+
+  // Copy GC root list (JS_AddGCRef/JS_DeleteGCRef)
+  for (JSGCRef *ref = ctx->last_gc_ref; ref; ref = ref->prev) {
+    ref->val = gc_copy_value(ctx, ref->val, &to_free, to_end);
+  }
+
+  // Copy current exception
+  ctx->current_exception = gc_copy_value(ctx, ctx->current_exception, &to_free, to_end);
+
+  // Cheney scan (existing)
+  // ...
+}
+```
+
+### Phase 7: Trigger GC on Allocation Failure
+
+Update `js_malloc` (line 1495):
+
+```c
+void *js_malloc(JSContext *ctx, size_t size) {
+  size = (size + 7) & ~7;  // Align to 8 bytes
+
+  if ((uint8_t*)ctx->heap_free + size > (uint8_t*)ctx->heap_end) {
+    if (ctx_gc(ctx) < 0) {
+      JS_ThrowOutOfMemory(ctx);
+      return NULL;
+    }
+    // Retry after GC
+    if ((uint8_t*)ctx->heap_free + size > (uint8_t*)ctx->heap_end) {
+      JS_ThrowOutOfMemory(ctx);
+      return NULL;
+    }
+  }
+
+  void *ptr = ctx->heap_free;
+  ctx->heap_free = (uint8_t*)ctx->heap_free + size;
+  return ptr;
+}
+```
+
+### Phase 8: Frame Reduction (for closures)
+
+When a function returns, "reduce" its frame to just closure variables:
+
+```c
+static void reduce_frame(JSContext *ctx, JSFrame *frame) {
+  if (frame->caller == NULL) return;  // Already reduced
+
+  JSCode *code = frame->function->code;
+  uint32_t closure_size = code->closure_size;
+
+  // Shrink capacity to just closure variables
+  frame->hdr = objhdr_make(closure_size, OBJ_FRAME, 0, 0, 0, 0);
+  frame->caller = NULL;  // Signal: frame is reduced
+}
+```
+
+### Phase 9: Remove Unused Reference Counting Code
+
+Delete:
+- `gc_decref`, `gc_decref_child` functions
+- `gc_scan_incref_child`, `gc_scan_incref_child2` functions
+- `JS_GCPhaseEnum`, `gc_phase` fields
+- `JSGCObjectHeader` struct (merge into objhdr_t)
+- `ref_count` fields from any remaining structs
+- `mark_function_children_decref` function
+- All `free_*` functions that rely on ref counting
+
+## Files to Modify
+
+1. **source/quickjs.c** - Main implementation:
+   - Add DupValue/FreeValue no-op macros (~line 100)
+   - Restructure JSArray, JSBlob, JSText, JSRecord (lines 468-499)
+   - Simplify JSFunction to 3-word struct (line 1205)
+   - Add JSFrame as heap object (new)
+   - Restructure JSCode/JSFunctionBytecode (line 1293)
+   - Fix gc_object_size (line 1850)
+   - Fix gc_copy_value (line 1883)
+   - Complete gc_scan_object (line 1924)
+   - Update ctx_gc for all roots (line 1966)
+   - Update js_malloc to trigger GC (line 1495)
+   - Delete ref counting code throughout
+
+2. **source/quickjs.h** - Public API:
+   - Remove JSGCObjectHeader
+   - Update JSValue type checks if needed
+   - Ensure JS_IsStone works with offset 0 headers
+
+## Execution Order
+
+1. **First**: Add DupValue/FreeValue macros (enables compilation)
+2. **Second**: Standardize struct layouts (header at offset 0)
+3. **Third**: Fix gc_object_size and gc_copy_value
+4. **Fourth**: Complete gc_scan_object for all types
+5. **Fifth**: Update ctx_gc with complete root tracing
+6. **Sixth**: Wire js_malloc to trigger GC
+7. **Seventh**: Add frame reduction for closures
+8. **Finally**: Remove ref counting dead code
+
+## Verification
+
+1. **Compile test**: `make` should succeed without errors
+2. **Basic test**: Run simple scripts:
+   ```js
+   var a = [1, 2, 3]
+   log.console(a[1])
+   ```
+3. **Stress test**: Allocate many objects to trigger GC:
+   ```js
+   for (var i = 0; i < 100000; i++) {
+     var x = { value: i }
+   }
+   log.console("done")
+   ```
+4. **Closure test**: Test functions with closures survive GC:
+   ```js
+   fn make_counter() {
+     var count = 0
+     fn inc() { count = count + 1; return count }
+     return inc
+   }
+   var c = make_counter()
+   log.console(c())  // 1
+   log.console(c())  // 2
+   ```
+5. **GC stress with closures**: Create many closures, trigger GC, verify they still work
+
+## Key Design Decisions (Resolved)
+
+1. **JSCode storage**: Lives in stone (immutable) memory, never copied during GC ✓
+2. **Header offset**: Standardized to offset 0 for all heap objects ✓
+3. **Closure variables**: Live in JSFrame objects; frames are "reduced" when functions return ✓
+4. **JSVarRef**: Eliminated - closures reference their outer frame directly ✓

graph.ce

@@ -0,0 +1,236 @@
+// cell graph [<locator>] - Emit dependency graph
+//
+// Usage:
+//   cell graph             Graph current directory package
+//   cell graph .           Graph current directory package
+//   cell graph <locator>   Graph specific package
+//   cell graph --world     Graph all packages in shop (world set)
+//
+// Options:
+//   --format <fmt>   Output format: tree (default), dot, json
+//   --resolved       Show resolved view with links applied (default)
+//   --locked         Show lock view without links
+//   --world          Graph all packages in shop
+
+var shop = use('internal/shop')
+var pkg = use('package')
+var link = use('link')
+var fd = use('fd')
+var json = use('json')
+
+var target_locator = null
+var format = 'tree'
+var show_locked = false
+var show_world = false
+
+for (var i = 0; i < length(args); i++) {
+  if (args[i] == '--format' || args[i] == '-f') {
+    if (i + 1 < length(args)) {
+      format = args[++i]
+      if (format != 'tree' && format != 'dot' && format != 'json') {
+        log.error('Invalid format: ' + format + '. Must be tree, dot, or json')
+        $stop()
+      }
+    } else {
+      log.error('--format requires a format type')
+      $stop()
+    }
+  } else if (args[i] == '--resolved') {
+    show_locked = false
+  } else if (args[i] == '--locked') {
+    show_locked = true
+  } else if (args[i] == '--world') {
+    show_world = true
+  } else if (args[i] == '--help' || args[i] == '-h') {
+    log.console("Usage: cell graph [<locator>] [options]")
+    log.console("")
+    log.console("Emit the dependency graph.")
+    log.console("")
+    log.console("Options:")
+    log.console("  --format <fmt>  Output format: tree (default), dot, json")
+    log.console("  --resolved      Show resolved view with links applied (default)")
+    log.console("  --locked        Show lock view without links")
+    log.console("  --world         Graph all packages in shop")
+    $stop()
+  } else if (!starts_with(args[i], '-')) {
+    target_locator = args[i]
+  }
+}
+
+var links = show_locked ? {} : link.load()
+
+// Get effective locator (after links)
+function get_effective(locator) {
+  return links[locator] || locator
+}
+
+// Build graph data structure
+var nodes = {}
+var edges = []
+
+function add_node(locator) {
+  if (nodes[locator]) return
+
+  var lock = shop.load_lock()
+  var lock_entry = lock[locator]
+  var link_target = links[locator]
+  var info = shop.resolve_package_info(locator)
+
+  nodes[locator] = {
+    id: locator,
+    effective: get_effective(locator),
+    linked: link_target != null,
+    local: info == 'local',
+    commit: lock_entry && lock_entry.commit ? text(lock_entry.commit, 0, 8) : null
+  }
+}
+
+function gather_graph(locator, visited) {
+  if (visited[locator]) return
+  visited[locator] = true
+
+  add_node(locator)
+
+  try {
+    var deps = pkg.dependencies(locator)
+    if (deps) {
+      arrfor(array(deps), function(alias) {
+        var dep_locator = deps[alias]
+        add_node(dep_locator)
+        push(edges, { from: locator, to: dep_locator, alias: alias })
+        gather_graph(dep_locator, visited)
+      })
+    }
+  } catch (e) {
+    // Package might not have dependencies
+  }
+}
+
+// Gather graph from roots
+var roots = []
+
+if (show_world) {
+  // Use all packages in shop as roots
+  var packages = shop.list_packages()
+  arrfor(packages, function(p) {
+    if (p != 'core') {
+      push(roots, p)
+    }
+  })
+} else {
+  // Default to current directory
+  if (!target_locator) {
+    target_locator = '.'
+  }
+
+  // Resolve local paths
+  if (target_locator == '.' || starts_with(target_locator, './') || starts_with(target_locator, '../') || fd.is_dir(target_locator)) {
+    var resolved = fd.realpath(target_locator)
+    if (resolved) {
+      target_locator = resolved
+    }
+  }
+
+  push(roots, target_locator)
+}
+
+arrfor(roots, function(root) {
+  gather_graph(root, {})
+})
+
+// Output based on format
+if (format == 'tree') {
+  function print_tree(locator, prefix, is_last, visited) {
+    if (visited[locator]) {
+      log.console(prefix + (is_last ? "\\-- " : "|-- ") + locator + " (circular)")
+      return
+    }
+    visited[locator] = true
+
+    var node = nodes[locator]
+    var suffix = ""
+    if (node.linked) suffix += " -> " + node.effective
+    if (node.commit) suffix += " @" + node.commit
+    if (node.local) suffix += " (local)"
+
+    log.console(prefix + (is_last ? "\\-- " : "|-- ") + locator + suffix)
+
+    // Get children
+    var children = []
+    arrfor(edges, function(e) {
+      if (e.from == locator) {
+        push(children, e)
+      }
+    })
+
+    for (var i = 0; i < length(children); i++) {
+      var child_prefix = prefix + (is_last ? "    " : "|   ")
+      print_tree(children[i].to, child_prefix, i == length(children) - 1, visited)
+    }
+  }
+
+  for (var i = 0; i < length(roots); i++) {
+    log.console(roots[i])
+
+    var children = []
+    arrfor(edges, function(e) {
+      if (e.from == roots[i]) {
+        push(children, e)
+      }
+    })
+
+    for (var j = 0; j < length(children); j++) {
+      print_tree(children[j].to, "", j == length(children) - 1, {})
+    }
+
+    if (i < length(roots) - 1) log.console("")
+  }
+
+} else if (format == 'dot') {
+  log.console("digraph dependencies {")
+  log.console("  rankdir=TB;")
+  log.console("  node [shape=box];")
+  log.console("")
+
+  // Node definitions
+  arrfor(array(nodes), function(id) {
+    var node = nodes[id]
+    var label = id
+    if (node.commit) label += "\\n@" + node.commit
+    var attrs = 'label="' + label + '"'
+    if (node.linked) attrs += ', style=dashed'
+    if (node.local) attrs += ', color=blue'
+
+    // Safe node ID for dot
+    var safe_id = replace(id, /[^a-zA-Z0-9]/g, '_')
+    log.console('  ' + safe_id + ' [' + attrs + '];')
+  })
+
+  log.console("")
+
+  // Edges
+  arrfor(edges, function(e) {
+    var from_id = replace(e.from, /[^a-zA-Z0-9]/g, '_')
+    var to_id = replace(e.to, /[^a-zA-Z0-9]/g, '_')
+    var label = e.alias != e.to ? 'label="' + e.alias + '"' : ''
+    log.console('  ' + from_id + ' -> ' + to_id + (label ? ' [' + label + ']' : '') + ';')
+  })
+
+  log.console("}")
+
+} else if (format == 'json') {
+  var output = {
+    nodes: [],
+    edges: []
+  }
+
+  arrfor(array(nodes), function(id) {
+    push(output.nodes, nodes[id])
+  })
+
+  output.edges = edges
+
+  log.console(json.encode(output))
+}
+
+$stop()

help.ce

@@ -2,7 +2,7 @@
 
 var fd = use('fd')
 
-var command = args.length > 0 ? args[0] : null
+var command = length(args) > 0 ? args[0] : null
 
 // Display specific command help
 if (command) {
@@ -27,21 +27,41 @@ if (stat && stat.isFile) {
   log.console(content)
 } else {
   // Fallback if man file doesn't exist
-  log.console("cell - The Cell module system for Prosperon")
+  log.console("cell - The Cell package manager")
   log.console("")
   log.console("Usage: cell <command> [arguments]")
   log.console("")
-  log.console("Commands:")
-  log.console("  init      Initialize a new Cell project")
-  log.console("  get       Fetch and add a module dependency")
-  log.console("  update    Update a dependency to a new version")
-  log.console("  vendor    Copy all dependencies locally")
-  log.console("  build     Compile all modules to bytecode")
-  log.console("  patch     Create a patch for a module")
-  log.console("  config    Manage system and actor configurations")
-  log.console("  help      Show this help message")
+  log.console("Package Management:")
+  log.console("  install <locator>   Install a package and its dependencies")
+  log.console("  update [locator]    Update packages from remote sources")
+  log.console("  remove <locator>    Remove a package from the shop")
+  log.console("  add <locator>       Add a dependency to current package")
   log.console("")
-  log.console("Run 'cell help <command>' for more information on a command.")
+  log.console("Building:")
+  log.console("  build [locator]     Build dynamic libraries for packages")
+  log.console("  clean [scope]       Remove build artifacts")
+  log.console("")
+  log.console("Linking (Local Development):")
+  log.console("  link <origin> <target>  Link a package to a local path")
+  log.console("  unlink <origin>         Remove a package link")
+  log.console("  clone <origin> <path>   Clone and link a package locally")
+  log.console("")
+  log.console("Information:")
+  log.console("  list [scope]        List packages and dependencies")
+  log.console("  ls [locator]        List modules and actors in a package")
+  log.console("  why <locator>       Show reverse dependencies")
+  log.console("  search <query>      Search for packages, modules, or actors")
+  log.console("")
+  log.console("Diagnostics:")
+  log.console("  resolve [locator]   Print fully resolved dependency closure")
+  log.console("  graph [locator]     Emit dependency graph (tree, dot, json)")
+  log.console("  verify [scope]      Verify integrity and consistency")
+  log.console("")
+  log.console("Other:")
+  log.console("  help [command]      Show help for a command")
+  log.console("  version             Show cell version")
+  log.console("")
+  log.console("Run 'cell <command> --help' for more information on a command.")
 }
 
-$stop()
+$stop()

install.ce

@@ -1,62 +1,185 @@
 // cell install <locator> - Install a package to the shop
-// Does not modify the current project's cell.toml
+//
+// Usage:
+//   cell install <locator>   Install a package and its dependencies
+//   cell install .           Install current directory package
+//
+// Options:
+//   --target <triple>   Build for target platform
+//   --refresh           Refresh floating refs before locking
+//   --dry-run           Show what would be installed
 
 var shop = use('internal/shop')
 var build = use('build')
+var pkg = use('package')
 var fd = use('fd')
 
-if (args.length < 1) {
-  log.console("Usage: cell install <locator>")
+if (length(args) < 1) {
+  log.console("Usage: cell install <locator> [options]")
+  log.console("")
+  log.console("Options:")
+  log.console("  --target <triple>  Build for target platform")
+  log.console("  --refresh          Refresh floating refs before locking")
+  log.console("  --dry-run          Show what would be installed")
   $stop()
-  return
 }
 
-var locator = args[0]
+var locator = null
+var target_triple = null
+var refresh = false
+var dry_run = false
+
+for (var i = 0; i < length(args); i++) {
+  if (args[i] == '--target' || args[i] == '-t') {
+    if (i + 1 < length(args)) {
+      target_triple = args[++i]
+    } else {
+      log.error('--target requires a triple')
+      $stop()
+    }
+  } else if (args[i] == '--refresh') {
+    refresh = true
+  } else if (args[i] == '--dry-run') {
+    dry_run = true
+  } else if (args[i] == '--help' || args[i] == '-h') {
+    log.console("Usage: cell install <locator> [options]")
+    log.console("")
+    log.console("Install a package and its dependencies to the shop.")
+    log.console("")
+    log.console("Options:")
+    log.console("  --target <triple>  Build for target platform")
+    log.console("  --refresh          Refresh floating refs before locking")
+    log.console("  --dry-run          Show what would be installed")
+    $stop()
+  } else if (!starts_with(args[i], '-')) {
+    locator = args[i]
+  }
+}
+
+if (!locator) {
+  log.console("Usage: cell install <locator>")
+  $stop()
+}
 
 // Resolve relative paths to absolute paths
 // Local paths like '.' or '../foo' need to be converted to absolute paths
-if (locator == '.' || locator.startsWith('./') || locator.startsWith('../') || fd.is_dir(locator)) {
+if (locator == '.' || starts_with(locator, './') || starts_with(locator, '../') || fd.is_dir(locator)) {
   var resolved = fd.realpath(locator)
   if (resolved) {
     locator = resolved
   }
 }
 
+// Default target
+if (!target_triple) {
+  target_triple = build.detect_host_target()
+}
+
 log.console("Installing " + locator + "...")
 
-var pkg = use('package')
+// Gather all packages that will be installed
+var packages_to_install = []
+var skipped_packages = []
+var visited = {}
 
-// Recursive install function that handles dependencies
-function install_package(pkg_locator, visited) {
+function gather_packages(pkg_locator) {
   if (visited[pkg_locator]) return
   visited[pkg_locator] = true
-  
-  // First, add to lock.toml
-  shop.update(pkg_locator)
-  
-  // Extract/symlink the package so we can read its cell.toml
-  shop.extract(pkg_locator)
-  
-  // Now get direct dependencies and install them first
+
+  // Check if this is a local path that doesn't exist
+  if (starts_with(pkg_locator, '/') && !fd.is_dir(pkg_locator)) {
+    push(skipped_packages, pkg_locator)
+    log.console("  Skipping missing local package: " + pkg_locator)
+    return
+  }
+
+  push(packages_to_install, pkg_locator)
+
+  // Try to read dependencies
   try {
+    // For packages not yet extracted, we need to update and extract first to read deps
+    var lock = shop.load_lock()
+    if (!lock[pkg_locator]) {
+      if (!dry_run) {
+        var update_result = shop.update(pkg_locator)
+        if (update_result) {
+          shop.extract(pkg_locator)
+        } else {
+          // Update failed - package might not be fetchable
+          log.console("Warning: Could not fetch " + pkg_locator)
+          return
+        }
+      }
+    } else {
+      // Package is in lock, ensure it's extracted
+      if (!dry_run) {
+        shop.extract(pkg_locator)
+      }
+    }
+
     var deps = pkg.dependencies(pkg_locator)
     if (deps) {
-      for (var alias in deps) {
+      arrfor(array(deps), function(alias) {
         var dep_locator = deps[alias]
-        log.console("Installing dependency " + dep_locator)
-        install_package(dep_locator, visited)
-      }
+        gather_packages(dep_locator)
+      })
     }
   } catch (e) {
     // Package might not have dependencies or cell.toml issue
-    log.console("Warning: Could not read dependencies for " + pkg_locator + ": " + e.message)
+    if (!dry_run) {
+      log.console(`Warning: Could not read dependencies for ${pkg_locator}: ${e.message}`)
+    }
   }
-  
-  // Build the package after all dependencies are installed
-  build.build_package(pkg_locator)
 }
 
-install_package(locator, {})
-log.console("Installed " + locator)
+// Gather all packages
+gather_packages(locator)
+
+if (dry_run) {
+  log.console("Would install:")
+  arrfor(packages_to_install, function(p) {
+    var lock = shop.load_lock()
+    var exists = lock[p] != null
+    log.console("  " + p + (exists ? " (already installed)" : ""))
+  })
+  if (length(skipped_packages) > 0) {
+    log.console("")
+    log.console("Would skip (missing local paths):")
+    arrfor(skipped_packages, function(p) {
+      log.console("  " + p)
+    })
+  }
+  $stop()
+}
+
+// Install each package
+function install_package(pkg_locator) {
+  // Update lock entry
+  shop.update(pkg_locator)
+
+  // Extract/symlink the package
+  shop.extract(pkg_locator)
+
+  // Build scripts
+  shop.build_package_scripts(pkg_locator)
+
+  // Build C code
+  try {
+    build.build_dynamic(pkg_locator, target_triple, 'release')
+  } catch (e) {
+    // Not all packages have C code
+  }
+}
+
+arrfor(packages_to_install, function(p) {
+  log.console("  Installing " + p + "...")
+  install_package(p)
+})
+
+var summary = "Installed " + text(length(packages_to_install)) + " package(s)."
+if (length(skipped_packages) > 0) {
+  summary += " Skipped " + text(length(skipped_packages)) + " missing local path(s)."
+}
+log.console(summary)
 
 $stop()

internal/array.cm

@@ -1,303 +0,0 @@
-/* array.cm - array creation and manipulation utilities */
-
-var _isArray = Array.isArray
-var _slice = Array.prototype.slice
-var _push = Array.prototype.push
-var _sort = Array.prototype.sort
-var _keys = Object.keys
-var _from = Array.from
-
-function array(arg, arg2, arg3, arg4) {
-  // array(number) - create array of size with nulls
-  // array(number, initial_value) - create array with initial values
-  if (typeof arg == 'number') {
-    if (arg < 0) return null
-    var len = number.floor(arg)
-    var result = []
-    
-    if (arg2 == null) {
-      result.length = 100
-    } else if (typeof arg2 == 'function') {
-      var arity = arg2.length
-      for (var i = 0; i < len; i++) {
-        result[i] = arity >= 1 ? arg2(i) : arg2()
-      }
-    } else {
-      for (var i = 0; i < len; i++) result[i] = arg2
-    }
-    
-    return result
-  }
-  
-  // array(array) - copy
-  // array(array, function, reverse, exit) - map
-  // array(array, another_array) - concat
-  // array(array, from, to) - slice
-  if (_isArray(arg)) {
-    if (arg2 == null) {
-      // Copy
-      return _slice.call(arg)
-    }
-    
-    if (typeof arg2 == 'function') {
-      // Map
-      var fn = arg2
-      var reverse = arg3 == true
-      var exit = arg4
-      var result = []
-      
-      if (reverse) {
-        for (var i = arg.length - 1; i >= 0; i--) {
-          var val = fn(arg[i], i)
-          if (exit != null && val == exit) break
-          result[i] = val
-        }
-      } else {
-        for (var i = 0; i < arg.length; i++) {
-          var val = fn(arg[i], i)
-          if (exit != null && val == exit) break
-          _push.call(result, val)
-        }
-      }
-      
-      return result
-    }
-    
-    if (_isArray(arg2)) {
-      // Concat
-      var result = _slice.call(arg)
-      for (var i = 0; i < arg2.length; i++) {
-        _push.call(result, arg2[i])
-      }
-      return result
-    }
-    
-    if (typeof arg2 == 'number') {
-      // Slice
-      var from = arg2
-      var to = arg3
-      var len = arg.length
-      
-      if (from < 0) from += len
-      if (to == null) to = len
-      if (to < 0) to += len
-      
-      if (from < 0 || from > to || to > len) return null
-      
-      return _slice.call(arg, from, to)
-    }
-    
-    return null
-  }
-  
-  // array(object) - keys
-  if (typeof arg == 'object' && arg != null && !_isArray(arg)) {
-    if (arg instanceof Set) {
-      return _from(arg)
-    }
-    return _keys(arg)
-  }
-  
-  // array(text) - split into grapheme clusters
-  // array(text, separator) - split by separator
-  // array(text, length) - dice into chunks
-  if (typeof arg == 'string') {
-    if (arg2 == null) {
-      // Split into grapheme clusters (simplified: split into characters)
-      var result = []
-      for (var i = 0; i < arg.length; i++) {
-        _push.call(result, arg[i])
-      }
-      return result
-    }
-    
-    if (typeof arg2 == 'string') {
-      // Split by separator
-      return arg.split(arg2)
-    }
-    
-    if (typeof arg2 == 'number') {
-      // Dice into chunks
-      var len = number.floor(arg2)
-      if (len <= 0) return null
-      var result = []
-      for (var i = 0; i < arg.length; i += len) {
-        _push.call(result, arg.substring(i, i + len))
-      }
-      return result
-    }
-    
-    return null
-  }
-  
-  return null
-}
-
-array.reduce = function(arr, fn, initial, reverse) {
-  if (!_isArray(arr)) return null
-  if (typeof fn != 'function') return null
-  
-  var len = arr.length
-  
-  if (initial == null) {
-    if (len == 0) return null
-    if (len == 1) return arr[0]
-    
-    if (reverse == true) {
-      var acc = arr[len - 1]
-      for (var i = len - 2; i >= 0; i--) {
-        acc = fn(acc, arr[i])
-      }
-      return acc
-    } else {
-      var acc = arr[0]
-      for (var i = 1; i < len; i++) {
-        acc = fn(acc, arr[i])
-      }
-      return acc
-    }
-  } else {
-    if (len == 0) return initial
-    
-    if (reverse == true) {
-      var acc = initial
-      for (var i = len - 1; i >= 0; i--) {
-        acc = fn(acc, arr[i])
-      }
-      return acc
-    } else {
-      var acc = initial
-      for (var i = 0; i < len; i++) {
-        acc = fn(acc, arr[i])
-      }
-      return acc
-    }
-  }
-}
-
-array.for = function(arr, fn, reverse, exit) {
-  if (!_isArray(arr)) return null
-  if (arr.length == 0) return null
-  if (typeof fn != 'function') return null
-  
-  if (reverse == true) {
-    for (var i = arr.length - 1; i >= 0; i--) {
-      var result = fn(arr[i], i)
-      if (exit != null && result == exit) return exit
-    }
-  } else {
-    for (var i = 0; i < arr.length; i++) {
-      var result = fn(arr[i], i)
-      if (exit != null && result == exit) return exit
-    }
-  }
-  
-  return null
-}
-
-array.find = function(arr, fn, reverse, from) {
-  if (!_isArray(arr)) return null
-  
-  var len = arr.length
-  
-  if (typeof fn != 'function') {
-    // Compare exactly
-    var target = fn
-    if (reverse == true) {
-      var start = from != null ? from : len - 1
-      for (var i = start; i >= 0; i--) {
-        if (arr[i] == target) return i
-      }
-    } else {
-      var start = from != null ? from : 0
-      for (var i = start; i < len; i++) {
-        if (arr[i] == target) return i
-      }
-    }
-    return null
-  }
-  
-  if (reverse == true) {
-    var start = from != null ? from : len - 1
-    for (var i = start; i >= 0; i--) {
-      if (fn(arr[i], i) == true) return i
-    }
-  } else {
-    var start = from != null ? from : 0
-    for (var i = start; i < len; i++) {
-      if (fn(arr[i], i) == true) return i
-    }
-  }
-  
-  return null
-}
-
-array.filter = function(arr, fn) {
-  if (!_isArray(arr)) return null
-  if (typeof fn != 'function') return null
-  
-  var result = []
-  
-  for (var i = 0; i < arr.length; i++) {
-    var val = fn(arr[i], i)
-    if (val == true) {
-      _push.call(result, arr[i])
-    } else if (val != false) {
-      return null
-    }
-  }
-  
-  return result
-}
-
-array.sort = function(arr, select) {
-  if (!_isArray(arr)) return null
-  
-  var result = _slice.call(arr)
-  var keys = []
-  
-  // Extract keys
-  for (var i = 0; i < result.length; i++) {
-    var key
-    if (select == null) {
-      key = result[i]
-    } else if (typeof select == 'string' || typeof select == 'number') {
-      key = result[i][select]
-    } else if (_isArray(select)) {
-      key = select[i]
-    } else {
-      return null
-    }
-    
-    if (typeof key != 'number' && typeof key != 'string') return null
-    keys[i] = key
-  }
-  
-  // Check all keys are same type
-  if (keys.length > 0) {
-    var keyType = typeof keys[0]
-    for (var i = 1; i < keys.length; i++) {
-      if (typeof keys[i] != keyType) return null
-    }
-  }
-  
-  // Create index array and sort
-  var indices = []
-  for (var i = 0; i < result.length; i++) indices[i] = i
-  
-  // Stable sort using indices
-  _sort.call(indices, function(a, b) {
-    if (keys[a] < keys[b]) return -1
-    if (keys[a] > keys[b]) return 1
-    return a - b // stable
-  })
-  
-  var sorted = []
-  for (var i = 0; i < indices.length; i++) {
-    sorted[i] = result[indices[i]]
-  }
-  
-  return sorted
-}
-
-return array

internal/engine.cm

@@ -1,18 +1,12 @@
-(function engine() {  
-var _cell = globalThis.cell
-delete globalThis.cell
-var ACTORDATA = _cell.hidden.actorsym
+(function engine() {
+// Hidden vars (os, actorsym, init, core_path) come from env
+var ACTORDATA = actorsym
 var SYSYM = '__SYSTEM__'
 
-var hidden = _cell.hidden
-
-var os = hidden.os;
-_cell.os = null
+var _cell = {}
 
 var dylib_ext
 
-_cell.id ??= "newguy"
-
 switch(os.platform()) {
   case 'Windows': dylib_ext = '.dll'; break;
   case 'macOS': dylib_ext = '.dylib'; break;
@@ -24,23 +18,10 @@ var ACTOR_EXT = '.ce'
 
 var load_internal = os.load_internal
 function use_embed(name) {
-  return load_internal(`js_${name}_use`)
+  return load_internal("js_" + name + "_use")
 }
 
-globalThis.meme = function(obj, ...mixins) {
-  var result = _ObjectCreate(obj)
-
-  array.for(mixins, mix => {
-    if (isa(mix, object)) {
-      for (var key in mix)
-        result[key] = mix[key]
-    }
-  })  
-  return result
-}
-
-globalThis.logical = function(val1)
-{
+function logical(val1) {
   if (val1 == 0 || val1 == false || val1 == "false" || val1 == null)
     return false;
   if (val1 == 1 || val1 == true || val1 == "true")
@@ -48,50 +29,58 @@ globalThis.logical = function(val1)
   return null;
 }
 
-var utf8 = use_embed('utf8')
+function some(arr, pred) {
+  return find(arr, pred) != null
+}
+
+function every(arr, pred) {
+  return find(arr, x => not(pred(x))) == null
+}
+
+function starts_with(str, prefix) {
+  return search(str, prefix) == 0
+}
+
+function ends_with(str, suffix) {
+  return search(str, suffix, -length(suffix)) != null
+}
+
 var js = use_embed('js')
 var fd = use_embed('fd')
 
 // Get the shop path from HOME environment
 var home = os.getenv('HOME') || os.getenv('USERPROFILE')
 if (!home) {
-  throw new Error('Could not determine home directory')
+  throw Error('Could not determine home directory')
 }
 var shop_path = home + '/.cell'
 var packages_path = shop_path + '/packages'
 var core_path = packages_path + '/core'
 
 if (!fd.is_dir(core_path)) {
-  throw new Error('Cell shop not found at ' + shop_path + '. Run "cell install" to set up.')
+  throw Error('Cell shop not found at ' + shop_path + '. Run "cell install" to set up.')
 }
 
 var use_cache = {}
 use_cache['core/os'] = os
 
-var _Symbol = Symbol
-
-globalThis.key = function()
-{
-  return _Symbol()
-}
-
 // Load a core module from the file system
 function use_core(path) {
   var cache_key = 'core/' + path
   if (use_cache[cache_key])
     return use_cache[cache_key];
 
-  var sym = use_embed(path.replace('/','_'))
+  var sym = use_embed(replace(path, '/', '_'))
 
   // Core scripts are in packages/core/
   var file_path = core_path + '/' + path + MOD_EXT
 
   if (fd.is_file(file_path)) {
     var script_blob = fd.slurp(file_path)
-    var script = utf8.decode(script_blob)
+    var script = text(script_blob)
     var mod = `(function setup_module(use){${script}})`
     var fn = js.eval('core:' + path, mod)
-    var result = fn.call(sym, use_core);
+    var result = call(fn,sym, [use_core])
     use_cache[cache_key] = result;
     return result;
   }
@@ -101,226 +90,33 @@ function use_core(path) {
 }
 
 var blob = use_core('blob')
-var blob_stone = blob.prototype.stone
-var blob_stonep = blob.prototype.stonep;
-delete blob.prototype.stone;
-delete blob.prototype.stonep;
 
-// Capture Object and Array methods before they're deleted
-var _Object = Object
-var _ObjectKeys = Object.keys
-var _ObjectFreeze = Object.freeze
-var _ObjectIsFrozen = Object.isFrozen
-var _ObjectDefineProperty = Object.defineProperty
-var _ObjectGetPrototypeOf = Object.getPrototypeOf
-var _ObjectCreate = Object.create
-var _ArrayIsArray = Array.isArray
+function actor() {
 
-Object.prototype.toString = function()
-{
-  return json.encode(this)
-}
-
-function deepFreeze(object) {
-  if (object instanceof blob)
-    blob_stone.call(object);
-    
-  var propNames = _ObjectKeys(object);
-
-  for (var name of propNames) {
-    var value = object[name];
-
-    if ((value && typeof value == "object") || typeof value == "function")
-      deepFreeze(value);
-  }
-
-  return _ObjectFreeze(object);
-}
-
-globalThis.actor = function()
-{
-
-}
-
-globalThis.stone = deepFreeze
-stone.p = function(object)
-{
-  if (object instanceof blob)
-    return blob_stonep.call(object)
-    
-  return _ObjectIsFrozen(object) 
 }
 
 var actor_mod = use_core('actor')
 var wota = use_core('wota')
 var nota = use_core('nota')
 
-// Load internal modules for global functions
-globalThis.text = use_core('internal/text')
-globalThis.number = use_core('internal/number')
-globalThis.array = use_core('internal/array')
-globalThis.object = use_core('internal/object')
-globalThis.fn = use_core('internal/fn')
-
-// Global utility functions (use already-captured references)
-var _isArray = _ArrayIsArray
-var _keys = _ObjectKeys
-var _getPrototypeOf = _ObjectGetPrototypeOf
-var _create = _ObjectCreate
-
-globalThis.length = function(value) {
-  if (value == null) return null
-  
-  // For functions, return arity
-  if (typeof value == 'function') return value.length
-  
-  // For strings, return codepoint count
-  if (typeof value == 'string') return value.length
-  
-  // For arrays, return element count
-  if (_isArray(value)) return value.length
-  
-  // For blobs, return bit count
-  if (value instanceof blob && typeof value.length == 'number') return value.length
-  
-  // For records with length field
-  if (typeof value == 'object' && value != null) {
-    if ('length' in value) {
-      var len = value.length
-      if (typeof len == 'function') return len.call(value)
-      if (typeof len == 'number') return len
-    }
-  }
-  
-  return null
-}
-
-globalThis.reverse = function(value) {
-  if (_isArray(value)) {
-    var result = []
-    for (var i = value.length - 1; i >= 0; i--) {
-      result.push(value[i])
-    }
-    return result
-  }
-  
-  // For blobs, would need blob module support
-  if (isa(value, blob)) {
-    // Simplified: return null for now, would need proper blob reversal
-    return null
-  }
-  
-  return null
-}
-
-globalThis.isa = function(value, master) {
-  if (master == null) return false
-  
-  // isa(value, array) - check if object has all keys
-  if (_isArray(master)) {
-    if (typeof value != 'object' || value == null) return false
-    for (var i = 0; i < master.length; i++) {
-      if (!(master[i] in value)) return false
-    }
-    return true
-  }
-  
-  // isa(value, function) - check if function.prototype is in chain
-  if (typeof master == 'function') {
-    // Special type checks
-    if (master == stone) return _ObjectIsFrozen(value) || typeof value != 'object'
-    if (master == number) return typeof value == 'number'
-    if (master == text) return typeof value == 'string'
-    if (master == logical) return typeof value == 'boolean'
-    if (master == array) return _isArray(value)
-    if (master == object) return typeof value == 'object' && value != null && !_isArray(value)
-    if (master == fn) return typeof value == 'function'
-    if (master == actor) return isa(value, object) && value[ACTORDATA]
-    
-    // Check prototype chain
-    if (master.prototype) {
-      var proto = _getPrototypeOf(value)
-      while (proto != null) {
-        if (proto == master.prototype) return true
-        proto = _getPrototypeOf(proto)
-      }
-    }
-    return false
-  }
-  
-  // isa(object, master_object) - check prototype chain
-  if (typeof master == 'object') {
-    var proto = _getPrototypeOf(value)
-    while (proto != null) {
-      if (proto == master) return true
-      proto = _getPrototypeOf(proto)
-    }
-    return false
-  }
-  
-  return false
-}
-
-globalThis.proto = function(obj) {
-  if (!isa(obj, object)) return null
-  var p = _getPrototypeOf(obj)
-  if (p == _Object.prototype) return null
-  return p
-}
-
-globalThis.splat = function(obj) {
-  if (typeof obj != 'object' || obj == null) return null
-  
-  var result = {}
-  var current = obj
-  
-  // Walk prototype chain and collect text keys
-  while (current != null) {
-    var keys = _keys(current)
-    for (var i = 0; i < keys.length; i++) {
-      var k = keys[i]
-      if (!(k in result)) {
-        var val = current[k]
-        // Only include serializable types
-        if (typeof val == 'object' || typeof val == 'number' || 
-            typeof val == 'string' || typeof val == 'boolean') {
-          result[k] = val
-        }
-      }
-    }
-    current = _getPrototypeOf(current)
-  }
-  
-  // Call to_data if present
-  if (typeof obj.to_data == 'function') {
-    var extra = obj.to_data(result)
-    if (typeof extra == 'object' && extra != null) {
-      var extraKeys = _keys(extra)
-      for (var i = 0; i < extraKeys.length; i++) {
-        result[extraKeys[i]] = extra[extraKeys[i]]
-      }
-    }
-  }
-  
-  return result
+function is_actor(value) {
+  return is_object(value) && value[ACTORDATA]
 }
 
 var ENETSERVICE = 0.1
 var REPLYTIMEOUT = 60 // seconds before replies are ignored
 
-globalThis.pi = 3.14159265358979323846264338327950288419716939937510
-
 function caller_data(depth = 0)
 {
   var file = "nofile"
   var line = 0
   
-  var caller = new Error().stack.split("\n")[1+depth]
+  var caller = array(Error().stack, "\n")[1+depth]
   if (caller) {
-    var md = caller.match(/\((.*)\:/)
+    var md = extract(caller, /\((.*)\:/)
     var m = md ? md[1] : "SCRIPT"
     if (m) file = m
-    md = caller.match(/\:(\d*)\)/)
+    md = extract(caller, /\:(\d*)\)/)
     m = md ? md[1] : 0
     if (m) line = m
   }
@@ -329,52 +125,62 @@ function caller_data(depth = 0)
 }
 
 function console_rec(line, file, msg) {
-  return `[${_cell.id.slice(0,5)}] [${file}:${line}]: ${msg}\n`
+  return `[${text(_cell.id, 0, 5)}] [${file}:${line}]: ${msg}\n`
   // time: [${time.text("mb d yyyy h:nn:ss")}]
 }
 
-globalThis.log = {}
-log.console = function(msg)
-{
+function log(name, args) {
   var caller = caller_data(1)
-  os.print(console_rec(caller.line, caller.file, msg))
-}
+  var msg = args[0]
 
-log.error = function(msg = new Error())
-{
-  var caller = caller_data(1)
-  
-  if (msg instanceof Error)
-    msg = msg.name + ": " + msg.message + "\n" + msg.stack 
-  
-  os.print(console_rec(caller.line,caller.file,msg))
-}
-
-log.system = function(msg) { 
-  msg = "[SYSTEM] " + msg
-  log.console(msg)
+  switch(name) {
+    case 'console':
+      os.print(console_rec(caller.line, caller.file, msg))
+      break
+    case 'error':
+      msg = msg ?? Error()
+      if (is_proto(msg, Error))
+        msg = msg.name + ": " + msg.message + "\n" + msg.stack
+      os.print(console_rec(caller.line, caller.file, msg))
+      break
+    case 'system':
+      msg = "[SYSTEM] " + msg
+      os.print(console_rec(caller.line, caller.file, msg))
+      break
+    default:
+      log.console(`unknown log type: ${name}`)
+      break
+  }
 }
 
 function disrupt(err)
 {
+  if (is_function(err.toString)) {
+  os.print(err.toString())
+  os.print("\n")
+  os.print(err.stack)
+  }
+
   if (overling) {
     if (err) {
       // with an err, this is a forceful disrupt
-      var reason = (err instanceof Error) ? err.stack : err
+      var reason = (is_proto(err, Error)) ? err.stack : err
       report_to_overling({type:'disrupt', reason})
     } else
       report_to_overling({type:'stop'})
   }
 
   if (underlings) {
-    for (var id of underlings) {
+    var unders = array(underlings)
+    arrfor(unders, function(id, index) {
       log.console(`calling on ${id} to disrupt too`)
       $_.stop(create_actor({id}))
-    }
+    })
   }
-  
+
   if (err) {
-    log.console(err);  
+    if (err.message)
+      log.console(err.message)
     if (err.stack)
       log.console(err.stack)
   }
@@ -382,11 +188,12 @@ function disrupt(err)
   actor_mod.disrupt()
 }
 
+
+
 actor_mod.on_exception(disrupt)
 
-_cell.args = _cell.hidden.init
-_cell.args ??= {}
-_cell.id ??= "newguy"
+_cell.args = init ?? {}
+_cell.id = "newguy"
 
 function create_actor(desc = {id:guid()}) {
   var actor = {}
@@ -407,17 +214,37 @@ var json = use_core('json')
 var time = use_core('time')
 
 var pronto = use_core('pronto')
-globalThis.fallback = pronto.fallback
-globalThis.parallel = pronto.parallel
-globalThis.race = pronto.race
-globalThis.sequence = pronto.sequence
+var fallback = pronto.fallback
+var parallel = pronto.parallel
+var race = pronto.race
+var sequence = pronto.sequence
+
+// Create runtime environment for modules
+var runtime_env = {
+  logical: logical,
+  some: some,
+  every: every,
+  starts_with: starts_with,
+  ends_with: ends_with,
+  actor: actor,
+  is_actor: is_actor,
+  log: log,
+  send: send,
+  fallback: fallback,
+  parallel: parallel,
+  race: race,
+  sequence: sequence
+}
+
+// Pass to os for shop to access
+os.runtime_env = runtime_env
 
 $_.time_limit = function(requestor, seconds)
 {
   if (!pronto.is_requestor(requestor))
-    throw new Error('time_limit: first argument must be a requestor');
-  if (!isa(seconds, number) || seconds <= 0)
-    throw new Error('time_limit: seconds must be a positive number');
+    throw Error('time_limit: first argument must be a requestor');
+  if (!is_number(seconds) || seconds <= 0)
+    throw Error('time_limit: seconds must be a positive number');
     
   return function time_limit_requestor(callback, value) {
     pronto.check_callback(callback, 'time_limit')
@@ -486,6 +313,8 @@ _cell.config = config
 ENETSERVICE = config.net_service
 REPLYTIMEOUT = config.reply_timeout
 
+
+
 /*
   When handling a message, the message appears like this:
   {
@@ -511,14 +340,12 @@ REPLYTIMEOUT = config.reply_timeout
 
 function guid(bits = 256)
 {
-  var guid = new blob(bits, os.random)
+  var guid = blob(bits, os.random)
   stone(guid)
   return text(guid,'h')
 }
 
-var _Symbol = Symbol
-
-var HEADER = _Symbol()
+var HEADER = {}
 
 // takes a function input value that will eventually be called with the current time in number form.
 $_.clock = function(fn) {
@@ -528,7 +355,7 @@ $_.clock = function(fn) {
   })
 }
 
-var underlings = new Set() // this is more like "all actors that are notified when we die"
+var underlings = {} // this is more like "all actors that are notified when we die"
 var overling = null
 var root = null
 
@@ -581,8 +408,8 @@ var portal_fn = null
 
 // takes a function input value that will eventually be called with the current time in number form.
 $_.portal = function(fn, port) {
-  if (portal) throw new Error(`Already started a portal listening on ${portal.port}`)
-  if (!port) throw new Error("Requires a valid port.")
+  if (portal) throw Error(`Already started a portal listening on ${portal.port}`)
+  if (!port) throw Error("Requires a valid port.")
   log.system(`starting a portal on port ${port}`)
   portal = enet.create_host({address: "any", port})
   portal_fn = fn
@@ -595,14 +422,16 @@ function handle_host(e) {
       peers[`${e.peer.address}:${e.peer.port}`] = e.peer
       var queue = peer_queue.get(e.peer)
       if (queue) {
-        for (var msg of queue) e.peer.send(nota.encode(msg))
+        arrfor(queue, (msg, index) => e.peer.send(nota.encode(msg)))
         log.system(`sent ${msg} out of queue`)
         peer_queue.delete(e.peer)
       }
       break
     case "disconnect":
       peer_queue.delete(e.peer)
-      for (var id in peers) if (peers[id] == e.peer) delete peers[id]
+      arrfor(array(peers), function(id, index) {
+        if (peers[id] == e.peer) delete peers[id]
+      })
       log.system('portal got disconnect from ' + e.peer.address + ":" + e.peer.port)
       break
     case "receive":
@@ -612,16 +441,15 @@ function handle_host(e) {
         data.replycc[ACTORDATA].port = e.peer.port
       }
       function populate_actor_addresses(obj) {
-        if (!isa(obj, object)) return
+        if (!is_object(obj)) return
         if (obj[ACTORDATA] && !obj[ACTORDATA].address) {
           obj[ACTORDATA].address = e.peer.address
           obj[ACTORDATA].port = e.peer.port
         }
-        for (var key in obj) {
-          if (object.has(obj, key)) {
+        arrfor(array(obj), function(key, index) {
+          if (key in obj)
             populate_actor_addresses(obj[key])
-          }
-        }
+        })
       }
       if (data.data) populate_actor_addresses(data.data)
       turn(data)
@@ -639,20 +467,18 @@ $_.receiver = function receiver(fn) {
   receive_fn = fn
 }
 
-$_.start = function start(cb, program, ...args) {
+$_.start = function start(cb, program) {
     if (!program) return
 
     var id = guid()
-    if (args.length == 1 && Array.isArray(args[0])) args = args[0]
     var startup = { 
       id, 
       overling: $_.self, 
       root, 
-      arg: args, 
       program,
     }
     greeters[id] = cb
-    message_queue.push({ startup })
+    push(message_queue, { startup })
 }
 
 // stops an underling or self.
@@ -661,10 +487,10 @@ $_.stop = function stop(actor) {
     need_stop = true
     return
   }
-  if (!isa(actor, actor))
-    throw new Error('Can only call stop on an actor.')
-  if (!underlings.has(actor[ACTORDATA].id))
-    throw new Error('Can only call stop on an underling or self.')
+  if (!is_actor(actor))
+    throw Error('Can only call stop on an actor.')
+  if (is_null(underlings[actor[ACTORDATA].id]))
+    throw Error('Can only call stop on an underling or self.')
 
   sys_msg(actor, {kind:"stop"})
 }
@@ -676,11 +502,6 @@ $_.unneeded = function unneeded(fn, seconds) {
 
 // schedules the invocation of a function after a specified amount of time.
 $_.delay = function delay(fn, seconds = 0) {
-  if (seconds <= 0) {
-    $_.clock(fn)
-    return
-  }
-  
   function delay_turn() {
     fn()
     send_messages()
@@ -692,16 +513,16 @@ $_.delay = function delay(fn, seconds = 0) {
 var enet = use_core('enet')
 
 // causes this actor to stop when another actor stops.
-var couplings = new Set()
+var couplings = {}
 $_.couple = function couple(actor) {
   if (actor == $_.self) return // can't couple to self
-  couplings.add(actor[ACTORDATA].id)
+  couplings[actor[ACTORDATA].id] = true
   sys_msg(actor, {kind:'couple', from: $_.self})
   log.system(`coupled to ${actor}`)
 }
 
 function actor_prep(actor, send) {
-  message_queue.push({actor,send});
+  push(message_queue, {actor,send});
 }
 
 // Send a message immediately without queuing
@@ -717,9 +538,9 @@ function actor_send(actor, message) {
   if (actor[HEADER] && !actor[HEADER].replycc) // attempting to respond to a message but sender is not expecting; silently drop
     return
 
-  if (!isa(actor, actor) && !isa(actor.replycc, actor)) throw new Error(`Must send to an actor object. Attempted send to ${actor}`)
+  if (!is_actor(actor) && !is_actor(actor.replycc)) throw Error(`Must send to an actor object. Attempted send to ${actor}`)
   
-  if (typeof message != 'object') throw new Error('Must send an object record.')
+  if (!is_object(message)) throw Error('Must send an object record.')
 
   // message to self
   if (actor[ACTORDATA].id == _cell.id) {
@@ -730,7 +551,7 @@ function actor_send(actor, message) {
   // message to actor in same flock
   if (actor[ACTORDATA].id && actor_mod.mailbox_exist(actor[ACTORDATA].id)) {
     var wota_blob = wota.encode(message)
-//    log.console(`sending wota blob of ${wota_blob.length/8} bytes`)
+//    log.console(`sending wota blob of ${length(wota_blob)/8} bytes`)
     actor_mod.mailbox_push(actor[ACTORDATA].id, wota_blob)
     return
   }
@@ -768,39 +589,39 @@ var need_stop = false
    // if we've been flagged to stop, bail out before doing anything
    if (need_stop) {
      disrupt()
-     message_queue.length = 0
+     message_queue = []
      return
    }
 
-   for (var msg of message_queue) {
+   arrfor(message_queue, function(msg, index) {
      if (msg.startup) {
        // now is the time to actually spin up the actor
        actor_mod.createactor(msg.startup)
      } else {
        actor_send(msg.actor, msg.send)
      }
-   }
+   })
 
-   message_queue.length = 0
+   message_queue = []
  }
 
 var replies = {}
 
-globalThis.send = function send(actor, message, reply) {
-  if (typeof actor != 'object')
-    throw new Error(`Must send to an actor object. Provided: ${actor}`);
-    
-  if (typeof message != 'object')
-    throw new Error('Message must be an object')
-  var send = {type:"user", data: message}
+function send(actor, message, reply) {
+  if (!is_object(actor))
+    throw Error(`Must send to an actor object. Provided: ${actor}`);
+
+  if (!is_object(message))
+    throw Error('Message must be an object')
+  var send_msg = {type:"user", data: message}
 
   if (actor[HEADER] && actor[HEADER].replycc) {
     var header = actor[HEADER]
-    if (!header.replycc || !isa(header.replycc, actor))
-      throw new Error(`Supplied actor had a return, but it's not a valid actor! ${actor[HEADER]}`)
+    if (!header.replycc || !is_actor(header.replycc))
+      throw Error(`Supplied actor had a return, but it's not a valid actor! ${actor[HEADER]}`)
 
     actor = header.replycc
-    send.return = header.reply
+    send_msg.return = header.reply
   }
 
   if (reply) {
@@ -812,12 +633,12 @@ globalThis.send = function send(actor, message, reply) {
         delete replies[id]
       }
     }, REPLYTIMEOUT)
-    send.reply = id
-    send.replycc = $_.self 
+    send_msg.reply = id
+    send_msg.replycc = $_.self
   }
 
   // Instead of sending immediately, queue it
-  actor_prep(actor,send);
+  actor_prep(actor, send_msg);
 }
 
 stone(send)
@@ -836,8 +657,6 @@ function turn(msg)
 }
 
 //log.console(`FIXME: need to get main from config, not just set to true`)
-//log.console(`FIXME: remove global access (ie globalThis.use)`)
-//log.console(`FIXME: add freeze/unfreeze at this level, so we can do it (but scripts cannot)`)
 actor_mod.register_actor(_cell.id, turn, true, config.ar_timer)
 
 if (config.actor_memory)
@@ -886,21 +705,22 @@ function handle_actor_disconnect(id) {
     delete greeters[id]
   }
   log.system(`actor ${id} disconnected`)
-  if (couplings.has(id)) disrupt("coupled actor died") // couplings now disrupts instead of stop
+  if (!is_null(couplings[id])) disrupt("coupled actor died") // couplings now disrupts instead of stop
 }
 
 function handle_sysym(msg)
 {
+  var from
   switch(msg.kind) {
     case 'stop':
       disrupt("got stop message")
       break
     case 'underling':
-      var from = msg.from
+      from = msg.from
       var greeter = greeters[from[ACTORDATA].id]
       if (greeter) greeter(msg.message)
       if (msg.message.type == 'disrupt')
-        underlings.delete(from[ACTORDATA].id)
+        delete underlings[from[ACTORDATA].id]
       break
     case 'contact':
       if (portal_fn) {
@@ -908,11 +728,11 @@ function handle_sysym(msg)
         letter2[HEADER] = msg
         delete msg.data
         portal_fn(letter2)
-      } else throw new Error('Got a contact message, but no portal is established.')
+      } else throw Error('Got a contact message, but no portal is established.')
       break
     case 'couple': // from must be notified when we die
-      var from = msg.from
-      underlings.add(from[ACTORDATA].id)
+      from = msg.from
+      underlings[from[ACTORDATA].id] = true
       log.system(`actor ${from} is coupled to me`)
       break
   }
@@ -973,99 +793,32 @@ if (!locator) {
 }
 
 if (!locator)
-  throw new Error(`Main program ${_cell.args.program} could not be found`)
-
-// Hide JavaScript built-ins - make them inaccessible
-// Store references we need internally before deleting
-var _Object = Object
-var _Array = Array
-var _String = String
-var _Number = Number
-var _Boolean = Boolean
-var _Math = Math
-var _Function = Function
-
-var _Error = Error
-var _JSON = JSON
-
-// juicing these before Math is gone
-
-use_core('math/radians')
-use_core('math/cycles')
-use_core('math/degrees')
-
-// Delete from globalThis
-delete globalThis.Object
-delete globalThis.Math
-delete globalThis.Number
-delete globalThis.String
-delete globalThis.Array
-delete globalThis.Boolean
-delete globalThis.Date
-delete globalThis.Function
-delete globalThis.Reflect
-delete globalThis.Proxy
-delete globalThis.WeakMap
-delete globalThis.WeakSet
-delete globalThis.WeakRef
-delete globalThis.BigInt
-delete globalThis.Symbol
-//delete globalThis.Map
-//delete globalThis.Set
-delete globalThis.Promise
-delete globalThis.ArrayBuffer
-delete globalThis.DataView
-delete globalThis.Int8Array
-delete globalThis.Uint8Array
-delete globalThis.Uint8ClampedArray
-delete globalThis.Int16Array
-delete globalThis.Uint16Array
-delete globalThis.Int32Array
-delete globalThis.Uint32Array
-delete globalThis.Float32Array
-delete globalThis.Float64Array
-delete globalThis.BigInt64Array
-delete globalThis.BigUint64Array
-delete globalThis.eval
-delete globalThis.parseInt
-delete globalThis.parseFloat
-delete globalThis.isNaN
-delete globalThis.isFinite
-delete globalThis.decodeURI
-delete globalThis.decodeURIComponent
-delete globalThis.encodeURI
-delete globalThis.encodeURIComponent
-delete globalThis.escape
-delete globalThis.unescape
-delete globalThis.Intl
-delete globalThis.RegExp
-
-_ObjectFreeze(globalThis)
+  throw Error(`Main program ${_cell.args.program} could not be found`)
 
 $_.clock(_ => {
   // Get capabilities for the main program
   var file_info = shop.file_info ? shop.file_info(locator.path) : null
   var inject = shop.script_inject_for ? shop.script_inject_for(file_info) : []
-  
-  // Build values array for injection
-  var vals = []
-  for (var i = 0; i < inject.length; i++) {
+
+  // Build env object for injection
+  var env = {}
+  for (var i = 0; i < length(inject); i++) {
     var key = inject[i]
-    if (key && key[0] == '$') key = key.substring(1)
-    if (key == 'fd') vals.push(fd)
-    else vals.push($_[key])
+    if (key && key[0] == '$') key = text(key, 1)
+    if (key == 'fd') env[key] = fd
+    else env[key] = $_[key]
   }
-  
+
   // Create use function bound to the program's package
   var pkg = file_info ? file_info.package : null
   var use_fn = function(path) { return shop.use(path, pkg) }
-  
-  // Call with signature: setup_module(args, use, ...capabilities)
-  // The script wrapper builds $_ from the injected capabilities for backward compatibility
-  var val = locator.symbol.call(null, _cell.args.arg, use_fn, ...vals)
-  
+
+  // Call with signature: setup_module(args, use, env)
+  // The script wrapper binds $delay, $start, etc. from env
+  var val = call(locator.symbol, null, [_cell.args.arg, use_fn, env])
+
   if (val)
-    throw new Error('Program must not return anything');
+    throw Error('Program must not return anything');
 })
 
 })()

internal/fn.cm

@@ -1,22 +0,0 @@
-/* fn.cm - function utilities */
-
-var _apply = Function.prototype.apply
-var _isArray = Array.isArray
-
-var fn = {}
-
-fn.apply = function(func, args) {
-  if (typeof func != 'function') return func
-  
-  if (!_isArray(args)) {
-    args = [args]
-  }
-  
-  if (args.length > func.length) {
-    throw new Error("fn.apply: too many arguments")
-  }
-  
-  return _apply.call(func, null, args)
-}
-
-return fn

internal/json.c

@@ -1,63 +0,0 @@
-#include "cell.h"
-
-static JSValue js_json_encode(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
-    if (argc < 1) return JS_ThrowTypeError(ctx, "json.encode requires at least 1 argument");
-    
-    JSValue global = JS_GetGlobalObject(ctx);
-    JSValue json = JS_GetPropertyStr(ctx, global, "JSON");
-    JSValue stringify = JS_GetPropertyStr(ctx, json, "stringify");
-    
-    JSValue args[3];
-    args[0] = argv[0]; // value
-    args[1] = (argc > 1) ? argv[1] : JS_NULL; // replacer
-    args[2] = (argc > 2) ? argv[2] : JS_NewInt32(ctx, 1); // space, default 1
-    
-    JSValue result = JS_Call(ctx, stringify, json, 3, args);
-    
-    JS_FreeValue(ctx, stringify);
-    JS_FreeValue(ctx, json);
-    JS_FreeValue(ctx, global);
-    
-    if (argc <= 2) JS_FreeValue(ctx, args[2]);
-    
-    return result;
-}
-
-static JSValue js_json_decode(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
-    if (argc < 1) return JS_ThrowTypeError(ctx, "json.decode requires at least 1 argument");
-    
-    if (!JS_IsString(argv[0])) {
-        JSValue err = JS_NewError(ctx);
-        JS_DefinePropertyValueStr(ctx, err, "message", 
-                                  JS_NewString(ctx, "couldn't parse text: not a string"), 
-                                  JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
-        return JS_Throw(ctx, err);
-    }
-
-    JSValue global = JS_GetGlobalObject(ctx);
-    JSValue json = JS_GetPropertyStr(ctx, global, "JSON");
-    JSValue parse = JS_GetPropertyStr(ctx, json, "parse");
-    
-    JSValue args[2];
-    args[0] = argv[0]; // text
-    args[1] = (argc > 1) ? argv[1] : JS_NULL; // reviver
-    
-    JSValue result = JS_Call(ctx, parse, json, argc > 1 ? 2 : 1, args);
-    
-    JS_FreeValue(ctx, parse);
-    JS_FreeValue(ctx, json);
-    JS_FreeValue(ctx, global);
-    
-    return result;
-}
-
-static const JSCFunctionListEntry js_json_funcs[] = {
-  JS_CFUNC_DEF("encode", 1, js_json_encode),
-  JS_CFUNC_DEF("decode", 1, js_json_decode),
-};
-
-JSValue js_json_use(JSContext *js) {
-  JSValue export = JS_NewObject(js);
-  JS_SetPropertyFunctionList(js, export, js_json_funcs, sizeof(js_json_funcs)/sizeof(JSCFunctionListEntry));
-  return export;
-}

internal/nota.c

@@ -1,385 +0,0 @@
-#include "cell.h"
-#include "cell_internal.h"
-
-#define NOTA_IMPLEMENTATION
-#include "nota.h"
-
-typedef struct NotaEncodeContext {
-  JSContext *ctx;
-  JSValue visitedStack;
-  NotaBuffer nb;
-  int cycle;
-  JSValue replacer;
-} NotaEncodeContext;
-
-static void nota_stack_push(NotaEncodeContext *enc, JSValueConst val)
-{
-  JSContext *ctx = enc->ctx;
-  int len = JS_ArrayLength(ctx, enc->visitedStack);
-  JS_SetPropertyInt64(ctx, enc->visitedStack, len, JS_DupValue(ctx, val));
-}
-
-static void nota_stack_pop(NotaEncodeContext *enc)
-{
-  JSContext *ctx = enc->ctx;
-  int len = JS_ArrayLength(ctx, enc->visitedStack);
-  JS_SetPropertyStr(ctx, enc->visitedStack, "length", JS_NewUint32(ctx, len - 1));
-}
-
-static int nota_stack_has(NotaEncodeContext *enc, JSValueConst val)
-{
-  JSContext *ctx = enc->ctx;
-  int len = JS_ArrayLength(ctx, enc->visitedStack);
-  for (int i = 0; i < len; i++) {
-    JSValue elem = JS_GetPropertyUint32(ctx, enc->visitedStack, i);
-    if (JS_IsObject(elem) && JS_IsObject(val)) {
-      if (JS_StrictEq(ctx, elem, val)) {
-        JS_FreeValue(ctx, elem);
-        return 1;
-      }
-    }
-    JS_FreeValue(ctx, elem);
-  }
-  return 0;
-}
-
-static JSValue apply_replacer(NotaEncodeContext *enc, JSValueConst holder, JSValueConst key, JSValueConst val) {
-  if (JS_IsNull(enc->replacer)) return JS_DupValue(enc->ctx, val);
-
-  JSValue args[2] = { JS_DupValue(enc->ctx, key), JS_DupValue(enc->ctx, val) };
-  JSValue result = JS_Call(enc->ctx, enc->replacer, holder, 2, args);
-  JS_FreeValue(enc->ctx, args[0]);
-  JS_FreeValue(enc->ctx, args[1]);
-  
-  if (JS_IsException(result)) return JS_DupValue(enc->ctx, val);
-  return result;
-}
-
-char *js_do_nota_decode(JSContext *js, JSValue *tmp, char *nota, JSValue holder, JSValue key, JSValue reviver) {
-  int type = nota_type(nota);
-  JSValue ret2;
-  long long n;
-  double d;
-  int b;
-  char *str;
-  uint8_t *blob;
-
-  switch(type) {
-    case NOTA_BLOB:
-      nota = nota_read_blob(&n, (char**)&blob, nota);
-      *tmp = js_new_blob_stoned_copy(js, blob, n);
-      free(blob);
-      break;
-    case NOTA_TEXT:
-      nota = nota_read_text(&str, nota);
-      *tmp = JS_NewString(js, str);
-      free(str);
-      break;
-    case NOTA_ARR:
-      nota = nota_read_array(&n, nota);
-      *tmp = JS_NewArray(js);
-      for (int i = 0; i < n; i++) {
-        nota = js_do_nota_decode(js, &ret2, nota, *tmp, JS_NewInt32(js, i), reviver);
-        JS_SetPropertyInt64(js, *tmp, i, ret2);
-      }
-      break;
-    case NOTA_REC:
-      nota = nota_read_record(&n, nota);
-      *tmp = JS_NewObject(js);
-      for (int i = 0; i < n; i++) {
-        nota = nota_read_text(&str, nota);
-        JSValue prop_key = JS_NewString(js, str);
-        nota = js_do_nota_decode(js, &ret2, nota, *tmp, prop_key, reviver);
-        JS_SetPropertyStr(js, *tmp, str, ret2);
-        JS_FreeValue(js, prop_key);
-        free(str);
-      }
-      break;
-    case NOTA_INT:
-      nota = nota_read_int(&n, nota);
-      *tmp = JS_NewInt64(js, n);
-      break;
-    case NOTA_SYM:
-      nota = nota_read_sym(&b, nota);
-      if (b == NOTA_PRIVATE) {
-        JSValue inner;
-        nota = js_do_nota_decode(js, &inner, nota, holder, JS_NULL, reviver);
-        JSValue obj = JS_NewObject(js);
-        cell_rt *crt = JS_GetContextOpaque(js);
-        JS_SetProperty(js, obj, crt->actor_sym, inner);
-        *tmp = obj;
-      } else {
-        switch(b) {
-          case NOTA_NULL: *tmp = JS_NULL; break;
-          case NOTA_FALSE: *tmp = JS_NewBool(js, 0); break;
-          case NOTA_TRUE: *tmp = JS_NewBool(js, 1); break;
-          default: *tmp = JS_NULL; break;
-        }
-      }
-      break;
-    default:
-    case NOTA_FLOAT:
-      nota = nota_read_float(&d, nota);
-      *tmp = JS_NewFloat64(js, d);
-      break;
-  }
-
-  if (!JS_IsNull(reviver)) {
-    JSValue args[2] = { JS_DupValue(js, key), JS_DupValue(js, *tmp) };
-    JSValue revived = JS_Call(js, reviver, holder, 2, args);
-    JS_FreeValue(js, args[0]);
-    JS_FreeValue(js, args[1]);
-    if (!JS_IsException(revived)) {
-      JS_FreeValue(js, *tmp);
-      *tmp = revived;
-    } else {
-      JS_FreeValue(js, revived);
-    }
-  }
-
-  return nota;
-}
-
-static void nota_encode_value(NotaEncodeContext *enc, JSValueConst val, JSValueConst holder, JSValueConst key) {
-  JSContext *ctx = enc->ctx;
-  JSValue replaced = apply_replacer(enc, holder, key, val);
-  int tag = JS_VALUE_GET_TAG(replaced);
-
-  switch (tag) {
-    case JS_TAG_INT: 
-    case JS_TAG_FLOAT64: {
-      double d;
-      JS_ToFloat64(ctx, &d, replaced);
-      nota_write_number(&enc->nb, d);
-      break;
-    }
-    case JS_TAG_STRING: {
-      const char *str = JS_ToCString(ctx, replaced);
-      nota_write_text(&enc->nb, str);
-      JS_FreeCString(ctx, str);
-      break;
-    }
-    case JS_TAG_BOOL:
-      if (JS_VALUE_GET_BOOL(replaced)) nota_write_sym(&enc->nb, NOTA_TRUE);
-      else nota_write_sym(&enc->nb, NOTA_FALSE);
-      break;
-    case JS_TAG_NULL:
-      nota_write_sym(&enc->nb, NOTA_NULL);
-      break;
-    case JS_TAG_OBJECT: {
-      if (js_is_blob(ctx, replaced)) {
-        size_t buf_len;
-        void *buf_data = js_get_blob_data(ctx, &buf_len, replaced);
-        if (buf_data == -1) {
-          JS_FreeValue(ctx, replaced);
-          return; // JS_EXCEPTION will be handled by caller
-        }
-        nota_write_blob(&enc->nb, (unsigned long long)buf_len * 8, (const char*)buf_data);
-        break;
-      }
-
-      if (JS_IsArray(ctx, replaced)) {
-        if (nota_stack_has(enc, replaced)) {
-          enc->cycle = 1;
-          break;
-        }
-        nota_stack_push(enc, replaced);
-        int arr_len = JS_ArrayLength(ctx, replaced);
-        nota_write_array(&enc->nb, arr_len);
-        for (int i = 0; i < arr_len; i++) {
-          JSValue elem_val = JS_GetPropertyUint32(ctx, replaced, i);
-          JSValue elem_key = JS_NewInt32(ctx, i);
-          nota_encode_value(enc, elem_val, replaced, elem_key);
-          JS_FreeValue(ctx, elem_val);
-          JS_FreeValue(ctx, elem_key);
-        }
-        nota_stack_pop(enc);
-        break;
-      }
-
-      cell_rt *crt = JS_GetContextOpaque(ctx);
-      JSValue adata = JS_GetProperty(ctx, replaced, crt->actor_sym);
-      if (!JS_IsNull(adata)) {
-        nota_write_sym(&enc->nb, NOTA_PRIVATE);
-        nota_encode_value(enc, adata, replaced, JS_NULL);
-        JS_FreeValue(ctx, adata);
-        break;
-      }
-      JS_FreeValue(ctx, adata);
-      if (nota_stack_has(enc, replaced)) {
-        enc->cycle = 1;
-        break;
-      }
-      nota_stack_push(enc, replaced);
-
-      JSValue to_json = JS_GetPropertyStr(ctx, replaced, "toJSON");
-      if (JS_IsFunction(ctx, to_json)) {
-        JSValue result = JS_Call(ctx, to_json, replaced, 0, NULL);
-        JS_FreeValue(ctx, to_json);
-        if (!JS_IsException(result)) {
-          nota_encode_value(enc, result, holder, key);
-          JS_FreeValue(ctx, result);
-        } else {
-          nota_write_sym(&enc->nb, NOTA_NULL);
-        }
-        nota_stack_pop(enc);
-        break;
-      }
-      JS_FreeValue(ctx, to_json);
-
-      JSPropertyEnum *ptab;
-      uint32_t plen;
-      if (JS_GetOwnPropertyNames(ctx, &ptab, &plen, replaced, JS_GPN_ENUM_ONLY | JS_GPN_STRING_MASK) < 0) {
-        nota_write_sym(&enc->nb, NOTA_NULL);
-        nota_stack_pop(enc);
-        break;
-      }
-
-      uint32_t non_function_count = 0;
-      for (uint32_t i = 0; i < plen; i++) {
-        JSValue prop_val = JS_GetProperty(ctx, replaced, ptab[i].atom);
-        if (!JS_IsFunction(ctx, prop_val)) non_function_count++;
-        JS_FreeValue(ctx, prop_val);
-      }
-
-      nota_write_record(&enc->nb, non_function_count);
-      for (uint32_t i = 0; i < plen; i++) {
-        JSValue prop_val = JS_GetProperty(ctx, replaced, ptab[i].atom);
-        if (!JS_IsFunction(ctx, prop_val)) {
-          const char *prop_name = JS_AtomToCString(ctx, ptab[i].atom);
-          JSValue prop_key = JS_AtomToValue(ctx, ptab[i].atom);
-          nota_write_text(&enc->nb, prop_name);
-          nota_encode_value(enc, prop_val, replaced, prop_key);
-          JS_FreeCString(ctx, prop_name);
-          JS_FreeValue(ctx, prop_key);
-        }
-        JS_FreeValue(ctx, prop_val);
-        JS_FreeAtom(ctx, ptab[i].atom);
-      }
-      js_free(ctx, ptab);
-      nota_stack_pop(enc);
-      break;
-    }
-    default:
-      nota_write_sym(&enc->nb, NOTA_NULL);
-      break;
-  }
-  JS_FreeValue(ctx, replaced);
-}
-
-void *value2nota(JSContext *ctx, JSValue v) {
-  NotaEncodeContext enc_s, *enc = &enc_s;
-  enc->ctx = ctx;
-  enc->visitedStack = JS_NewArray(ctx);
-  enc->cycle = 0;
-  enc->replacer = JS_NULL;
-
-  nota_buffer_init(&enc->nb, 128);
-  nota_encode_value(enc, v, JS_NULL, JS_NewString(ctx, ""));
-
-  if (enc->cycle) {
-    JS_FreeValue(ctx, enc->visitedStack);
-    nota_buffer_free(&enc->nb);
-    return NULL;
-  }
-
-  JS_FreeValue(ctx, enc->visitedStack);
-  void *data_ptr = enc->nb.data;
-  enc->nb.data = NULL;
-  nota_buffer_free(&enc->nb);
-  return data_ptr;
-}
-
-JSValue nota2value(JSContext *js, void *nota) {
-  if (!nota) return JS_NULL;
-  JSValue ret;
-  JSValue holder = JS_NewObject(js);
-  js_do_nota_decode(js, &ret, nota, holder, JS_NewString(js, ""), JS_NULL);
-  JS_FreeValue(js, holder);
-  return ret;
-}
-
-static JSValue js_nota_tostring(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
-  size_t len;
-  void *nota = js_get_blob_data(ctx, &len, this_val);
-  if (nota == (void*)-1) return JS_EXCEPTION;
-  if (!nota) return JS_NULL;
-  
-  JSValue decoded;
-  JSValue holder = JS_NewObject(ctx);
-  js_do_nota_decode(ctx, &decoded, (char*)nota, holder, JS_NewString(ctx, ""), JS_NULL);
-  JS_FreeValue(ctx, holder);
-  
-  JSValue global = JS_GetGlobalObject(ctx);
-  JSValue json = JS_GetPropertyStr(ctx, global, "JSON");
-  JSValue stringify = JS_GetPropertyStr(ctx, json, "stringify");
-  
-  JSValue args[3];
-  args[0] = decoded;
-  args[1] = JS_NULL;
-  args[2] = JS_NewInt32(ctx, 1);
-  
-  JSValue result = JS_Call(ctx, stringify, json, 3, args);
-  
-  JS_FreeValue(ctx, stringify);
-  JS_FreeValue(ctx, json);
-  JS_FreeValue(ctx, global);
-  JS_FreeValue(ctx, decoded);
-  JS_FreeValue(ctx, args[2]);
-  
-  return result;
-}
-
-static JSValue js_nota_encode(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
-  if (argc < 1) return JS_ThrowTypeError(ctx, "nota.encode requires at least 1 argument");
-
-  NotaEncodeContext enc_s, *enc = &enc_s;
-  enc->ctx = ctx;
-  enc->visitedStack = JS_NewArray(ctx);
-  enc->cycle = 0;
-  enc->replacer = (argc > 1 && JS_IsFunction(ctx, argv[1])) ? argv[1] : JS_NULL;
-
-  nota_buffer_init(&enc->nb, 128);
-  nota_encode_value(enc, argv[0], JS_NULL, JS_NewString(ctx, ""));
-
-  if (enc->cycle) {
-    JS_FreeValue(ctx, enc->visitedStack);
-    nota_buffer_free(&enc->nb);
-    return JS_ThrowReferenceError(ctx, "Tried to encode something to nota with a cycle.");
-  }
-
-  JS_FreeValue(ctx, enc->visitedStack);
-  size_t total_len = enc->nb.size;
-  void *data_ptr = enc->nb.data;
-  JSValue ret = js_new_blob_stoned_copy(ctx, (uint8_t*)data_ptr, total_len);
-
-  nota_buffer_free(&enc->nb);
-  return ret;
-}
-
-static JSValue js_nota_decode(JSContext *js, JSValueConst self, int argc, JSValueConst *argv) {
-  if (argc < 1) return JS_NULL;
-
-  size_t len;
-  unsigned char *nota = js_get_blob_data(js, &len, argv[0]);
-  if (nota == -1) return JS_EXCEPTION;
-  if (!nota) return JS_NULL;
-
-  JSValue reviver = (argc > 1 && JS_IsFunction(js, argv[1])) ? argv[1] : JS_NULL;
-  JSValue ret;
-  JSValue holder = JS_NewObject(js);
-  js_do_nota_decode(js, &ret, (char*)nota, holder, JS_NewString(js, ""), reviver);
-  JS_FreeValue(js, holder);
-  return ret;
-}
-
-static const JSCFunctionListEntry js_nota_funcs[] = {
-  JS_CFUNC_DEF("encode", 1, js_nota_encode),
-  JS_CFUNC_DEF("decode", 1, js_nota_decode),
-};
-
-JSValue js_nota_use(JSContext *js) {
-  JSValue export = JS_NewObject(js);
-  JS_SetPropertyFunctionList(js, export, js_nota_funcs, sizeof(js_nota_funcs)/sizeof(JSCFunctionListEntry));
-  return export;
-}

internal/number.cm

@@ -1,169 +0,0 @@
-/* number.cm - number conversion and math utilities */
-var _floor = Math.floor
-var _ceil = Math.ceil
-var _round = Math.round
-var _abs = Math.abs
-var _trunc = Math.trunc
-var _min = Math.min
-var _max = Math.max
-var _pow = Math.pow
-var _parseInt = parseInt
-var _parseFloat = parseFloat
-
-function number(val, format) {
-  if (val == true) return 1
-  if (val == false) return 0
-  
-  if (typeof val == 'number') return val
-  
-  if (typeof val == 'string') {
-    if (typeof format == 'number') {
-      // radix conversion
-      if (format < 2 || format > 36) return null
-      var result = _parseInt(val, format)
-      if (isNaN(result)) return null
-      return result
-    }
-    
-    if (typeof format == 'string') {
-      return parse_formatted(val, format)
-    }
-    
-    // default: parse as decimal
-    var result = _parseFloat(val)
-    if (!isa(result, number)) return null
-    return result
-  }
-  
-  return null
-}
-
-function parse_formatted(str, format) {
-  if (!format || format == "" || format == "n") {
-    var result = _parseFloat(str)
-    if (isNaN(result)) return null
-    return result
-  }
-  
-  switch (format) {
-    case "u": // underbar separator
-      str = str.split('_').join('')
-      break
-    case "d": // comma separator
-      str = str.split(',').join('')
-      break
-    case "s": // space separator
-      str = str.split(' ').join('')
-      break
-    case "v": // European style: period separator, comma decimal
-      str = str.split('.').join('')
-      str = str.replace(',', '.')
-      break
-    case "l": // locale - treat like 'd' for now
-      str = str.split(',').join('')
-      break
-    case "i": // integer with underbar
-      str = str.split('_').join('')
-      break
-    case "b": // binary
-      return _parseInt(str, 2)
-    case "o": // octal
-      return _parseInt(str, 8)
-    case "h": // hex
-      return _parseInt(str, 16)
-    case "t": // base32
-      return _parseInt(str, 32)
-    case "j": // JavaScript style prefix
-      if (str.startsWith('0x') || str.startsWith('0X'))
-        return _parseInt(str.slice(2), 16)
-      if (str.startsWith('0o') || str.startsWith('0O'))
-        return _parseInt(str.slice(2), 8)
-      if (str.startsWith('0b') || str.startsWith('0B'))
-        return _parseInt(str.slice(2), 2)
-      return _parseFloat(str)
-    default:
-      return null
-  }
-  
-  var result = _parseFloat(str)
-  if (isNaN(result)) return null
-  return result
-}
-
-number.whole = function(n) {
-  if (typeof n != 'number') return null
-  return _trunc(n)
-}
-
-number.fraction = function(n) {
-  if (typeof n != 'number') return null
-  return n - _trunc(n)
-}
-
-number.floor = function(n, place) {
-  if (typeof n != 'number') return null
-  if (place == null || place == 0) return _floor(n)
-  var mult = _pow(10, place)
-  return _floor(n * mult) / mult
-}
-
-number.ceiling = function(n, place) {
-  if (typeof n != 'number') return null
-  if (place == null || place == 0) return _ceil(n)
-  var mult = _pow(10, place)
-  return _ceil(n * mult) / mult
-}
-
-number.abs = function(n) {
-  if (typeof n != 'number') return null
-  return _abs(n)
-}
-
-number.round = function(n, place) {
-  if (typeof n != 'number') return null
-  if (place == null || place == 0) return _round(n)
-  var mult = _pow(10, place)
-  return _round(n * mult) / mult
-}
-
-number.sign = function(n) {
-  if (typeof n != 'number') return null
-  if (n < 0) return -1
-  if (n > 0) return 1
-  return 0
-}
-
-number.trunc = function(n, place) {
-  if (typeof n != 'number') return null
-  if (place == null || place == 0) return _trunc(n)
-  var mult = _pow(10, place)
-  return _trunc(n * mult) / mult
-}
-
-number.min = function(...vals) {
-  if (vals.length == 0) return null
-  var result = vals[0]
-  for (var i = 1; i < vals.length; i++) {
-    if (typeof vals[i] != 'number') return null
-    if (vals[i] < result) result = vals[i]
-  }
-  return result
-}
-
-number.max = function(...vals) {
-  if (vals.length == 0) return null
-  var result = vals[0]
-  for (var i = 1; i < vals.length; i++) {
-    if (typeof vals[i] != 'number') return null
-    if (vals[i] > result) result = vals[i]
-  }
-  return result
-}
-
-number.remainder = function(dividend, divisor) {
-  if (typeof dividend != 'number' || typeof divisor != 'number') return null
-  if (divisor == 0) return null
-  return dividend - (_trunc(dividend / divisor) * divisor)
-}
-
-return number

internal/object.cm

@@ -1,93 +0,0 @@
-/* object.cm - object creation and manipulation utilities */
-
-var _keys = array
-var _create = meme
-var _assign = Object.assign
-var _isArray = function(val) { return isa(val, array) }
-var _values = Object.values
-
-function object(arg, arg2) {
-  // object(object) - shallow mutable copy
-  if (isa(arg, object) && arg2 == null) {
-    var result = {}
-    var keys = _keys(arg)
-    for (var i = 0; i < keys.length; i++) {
-      result[keys[i]] = arg[keys[i]]
-    }
-    return result
-  }
-  
-  // object(object, another_object) - combine
-  if (isa(arg, object) && isa(arg2, object)) {
-    var result = {}
-    var keys = _keys(arg)
-    for (var i = 0; i < keys.length; i++) {
-      result[keys[i]] = arg[keys[i]]
-    }
-    keys = _keys(arg2)
-    for (var i = 0; i < keys.length; i++) {
-      result[keys[i]] = arg2[keys[i]]
-    }
-    return result
-  }
-  
-  // object(object, array_of_keys) - select
-  if (isa(arg, object) && _isArray(arg2)) {
-    var result = {}
-    for (var i = 0; i < arg2.length; i++) {
-      var key = arg2[i]
-      if (typeof key == 'string' && key in arg) {
-        result[key] = arg[key]
-      }
-    }
-    return result
-  }
-  
-  // object(array_of_keys) - set with true values
-  if (_isArray(arg) && arg2 == null) {
-    var result = {}
-    for (var i = 0; i < arg.length; i++) {
-      var key = arg[i]
-      if (typeof key == 'string') {
-        result[key] = true
-      }
-    }
-    return result
-  }
-  
-  // object(array_of_keys, value) - value set
-  // object(array_of_keys, function) - functional value set
-  if (_isArray(arg) && arg2 != null) {
-    var result = {}
-    if (typeof arg2 == 'function') {
-      for (var i = 0; i < arg.length; i++) {
-        var key = arg[i]
-        if (typeof key == 'string') {
-          result[key] = arg2(key)
-        }
-      }
-    } else {
-      for (var i = 0; i < arg.length; i++) {
-        var key = arg[i]
-        if (typeof key == 'string') {
-          result[key] = arg2
-        }
-      }
-    }
-    return result
-  }
-  
-  return null
-}
-
-object.values = function(obj)
-{
-  return _values(obj)
-}
-
-object.assign = function(obj, ...args)
-{
-  return _assign(obj, ...args)
-}
-
-return object

internal/shop.cm

@@ -1,4 +1,5 @@
 var toml = use('toml')
+
 var json = use('json')
 var fd = use('fd')
 var http = use('http')
@@ -6,8 +7,8 @@ var miniz = use('miniz')
 var time = use('time')
 var js = use('js')
 var crypto = use('crypto')
-var utf8 = use('utf8')
 var blob = use('blob')
+
 var pkg_tools = use('package')
 var os = use('os')
 var link = use('link')
@@ -29,9 +30,9 @@ function put_into_cache(content, obj)
 
 function ensure_dir(path) {
   if (fd.stat(path).isDirectory) return
-  var parts = path.split('/')
-  var current = path.startsWith('/') ? '/' : ''
-  for (var i = 0; i < parts.length; i++) {
+  var parts = array(path, '/')
+  var current = starts_with(path, '/') ? '/' : ''
+  for (var i = 0; i < length(parts); i++) {
     if (parts[i] == '') continue
     current += parts[i] + '/'
     if (!fd.stat(current).isDirectory) {
@@ -63,7 +64,7 @@ var dylib_ext = '.dylib' // Default extension
 
 var use_cache = os.use_cache
 var global_shop_path = os.global_shop_path
-var $_ = os.$_
+var my$_ = os.$_
 
 Shop.get_package_dir = function(name) {
   return global_shop_path + '/packages/' + name
@@ -92,8 +93,8 @@ Shop.get_reports_dir = function() {
 }
 
 function get_import_package(name) {
-  var parts = name.split('/')
-  if (parts.length > 1)
+  var parts = array(name, '/')
+  if (length(parts) > 1)
     return parts[0]
 
   return null
@@ -101,24 +102,24 @@ function get_import_package(name) {
 
 function is_internal_path(path)
 {
-  return path && path.startsWith('internal/')
+  return path && starts_with(path, 'internal/')
 }
 
 function split_explicit_package_import(path)
 {
   if (!path) return null
-  var parts = path.split('/')
+  var parts = array(path, '/')
 
-  if (parts.length < 2) return null
+  if (length(parts) < 2) return null
 
-  var looks_explicit = path.startsWith('/') || (parts[0] && parts[0].includes('.'))
+  var looks_explicit = starts_with(path, '/') || (parts[0] && search(parts[0], '.') != null)
   if (!looks_explicit) return null
 
   // Find the longest prefix that is an installed package
-  for (var i = parts.length - 1; i >= 1; i--) {
-    var pkg_candidate = parts.slice(0, i).join('/')
-    var mod_path = parts.slice(i).join('/')
-    if (!mod_path || mod_path.length == 0) continue
+  for (var i = length(parts) - 1; i >= 1; i--) {
+    var pkg_candidate = text(array(parts, 0, i), '/')
+    var mod_path = text(array(parts, i), '/')
+    if (!mod_path || length(mod_path) == 0) continue
 
     var candidate_dir = get_packages_dir() + '/' + safe_package_path(pkg_candidate)
     if (fd.is_file(candidate_dir + '/cell.toml'))
@@ -142,7 +143,7 @@ function package_in_shop(package) {
 function abs_path_to_package(package_dir)
 {
   if (!fd.is_file(package_dir + '/cell.toml'))
-    throw new Error('Not a valid package directory (no cell.toml): ' + package_dir)
+    throw Error('Not a valid package directory (no cell.toml): ' + package_dir)
 
   var packages_prefix = get_packages_dir() + '/'
   var core_dir = packages_prefix + core_package
@@ -159,8 +160,15 @@ function abs_path_to_package(package_dir)
     }
   }
 
-  if (package_dir.startsWith(packages_prefix))
-    return package_dir.substring(packages_prefix.length)
+  if (starts_with(package_dir, packages_prefix))
+    return text(package_dir, length(packages_prefix))
+
+  // Check if this local path is the target of a link
+  // If so, return the canonical package name (link origin) instead
+  var link_origin = link.get_origin(package_dir)
+  if (link_origin) {
+    return link_origin
+  }
 
   // in this case, the dir is the package
   if (package_in_shop(package_dir))
@@ -189,9 +197,9 @@ Shop.file_info = function(file) {
     name: null
   }
   
-  if (file.endsWith(MOD_EXT))
+  if (ends_with(file, MOD_EXT))
     info.is_module = true
-  else if (file.endsWith(ACTOR_EXT))
+  else if (ends_with(file, ACTOR_EXT))
     info.is_actor = true
   
   // Find package directory and determine package name
@@ -200,11 +208,11 @@ Shop.file_info = function(file) {
     info.package = abs_path_to_package(pkg_dir)
 
     if (info.is_actor)
-      info.name = file.substring(pkg_dir.length + 1, file.length - ACTOR_EXT.length)
+      info.name = text(file, length(pkg_dir) + 1, length(file) - length(ACTOR_EXT))
     else if (info.is_module)
-      info.name = file.substring(pkg_dir.length + 1, file.length - MOD_EXT.length)
+      info.name = text(file, length(pkg_dir) + 1, length(file) - length(MOD_EXT))
     else
-      info.name = file.substring(pkg_dir.length + 1)
+      info.name = text(file, length(pkg_dir) + 1)
   }
   
   return info
@@ -212,9 +220,9 @@ Shop.file_info = function(file) {
 
 function get_import_name(path)
 {
-  var parts = path.split('/')
-  if (parts.length < 2) return null
-  return parts.slice(1).join('/')
+  var parts = array(path, '/')
+  if (length(parts) < 2) return null
+  return text(array(parts, 1), '/')
 }
 
 // Given a path like 'prosperon/sprite' and a package context,
@@ -240,14 +248,14 @@ function safe_package_path(pkg)
 {
   // For absolute paths, replace / with _ to create a valid directory name
   // Also replace @ with _
-  if (pkg && pkg.startsWith('/'))
-    return pkg.replaceAll('/', '_').replaceAll('@', '_')
-  return pkg.replaceAll('@', '_')
+  if (pkg && starts_with(pkg, '/'))
+    return replace(replace(pkg, '/', '_'), '@', '_')
+  return replace(pkg, '@', '_')
 }
 
 function package_cache_path(pkg)
 {
-  return global_shop_path + '/cache/' + pkg.replaceAll('/', '_').replaceAll('@', '_')
+  return global_shop_path + '/cache/' + replace(replace(pkg, '/', '_'), '@', '_')
 }
 
 function get_shared_lib_path()
@@ -267,7 +275,7 @@ Shop.load_lock = function() {
     return {}
   
   var content = text(fd.slurp(path))
-  if (!content.length) return {}
+  if (!length(content)) return {}
   
   _lock = toml.decode(content)
   
@@ -277,26 +285,26 @@ Shop.load_lock = function() {
 // Save lock.toml configuration (to global shop)
 Shop.save_lock = function(lock) {
   var path = global_shop_path + '/lock.toml'
-  fd.slurpwrite(path, utf8.encode(toml.encode(lock)));
+  fd.slurpwrite(path, stone(blob(toml.encode(lock))));
 }
 
 
 // Get information about how to resolve a package
 // Local packages always start with /
 Shop.resolve_package_info = function(pkg) {
-  if (pkg.startsWith('/')) return 'local'
-  if (pkg.includes('gitea')) return 'gitea'
+  if (starts_with(pkg, '/')) return 'local'
+  if (search(pkg, 'gitea') != null) return 'gitea'
   return null
 }
 
 // Verify if a package name is valid and return status
 Shop.verify_package_name = function(pkg) {
-  if (!pkg) throw new Error("Empty package name")
-  if (pkg == 'local') throw new Error("local is not a valid package name")
-  if (pkg == 'core') throw new Error("core is not a valid package name")
+  if (!pkg) throw Error("Empty package name")
+  if (pkg == 'local') throw Error("local is not a valid package name")
+  if (pkg == 'core') throw Error("core is not a valid package name")
   
-  if (pkg.includes('://'))
-    throw new Error(`Invalid package name: ${pkg}; did you mean ${pkg.split('://')[1]}?`)
+  if (search(pkg, '://') != null)
+    throw Error(`Invalid package name: ${pkg}; did you mean ${array(pkg, '://')[1]}?`)
 }
 
 // Convert module package to download URL
@@ -304,7 +312,7 @@ Shop.get_download_url = function(pkg, commit_hash) {
   var info = Shop.resolve_package_info(pkg)
 
   if (info == 'gitea') {
-    var parts = pkg.split('/')
+    var parts = array(pkg, '/')
     var host = parts[0]
     var user = parts[1]
     var repo = parts[2]
@@ -320,7 +328,7 @@ Shop.get_api_url = function(pkg) {
   var info = Shop.resolve_package_info(pkg)
 
   if (info == 'gitea') {
-    var parts = pkg.split('/')
+    var parts = array(pkg, '/')
     var host = parts[0]
     var user = parts[1]
     var repo = parts[2]
@@ -339,7 +347,7 @@ Shop.extract_commit_hash = function(pkg, response) {
   var data = json.decode(response)
 
   if (info == 'gitea') {
-    if (isa(data, array))
+    if (is_array(data))
       data = data[0]
     return data.commit && data.commit.id
   }
@@ -354,11 +362,6 @@ var open_dls = {}
 // These map to $_ properties in engine.cm
 var SHOP_DEFAULT_INJECT = ['$self', '$overling', '$clock', '$delay', '$start', '$receiver', '$contact', '$portal', '$time_limit', '$couple', '$stop', '$unneeded', '$connection', '$fd']
 
-function strip_dollar(name) {
-  if (name && name[0] == '$') return name.substring(1)
-  return name
-}
-
 // Decide what a given module is allowed to see.
 // This is the capability gate - tweak as needed.
 Shop.script_inject_for = function(file_info) {
@@ -375,19 +378,45 @@ Shop.get_script_capabilities = function(path) {
   return Shop.script_inject_for(file_info)
 }
 
-function inject_params(inject) {
-  if (!inject || !inject.length) return ''
-  return ', ' + inject.join(', ')
+function inject_env(inject) {
+  // Start with runtime functions from engine
+  var env = {}
+  var rt = my$_.os ? my$_.os.runtime_env : null
+  if (rt) {
+    for (var k in rt) {
+      env[k] = rt[k]
+    }
+  }
+
+  // Add capability injections
+  for (var i = 0; i < length(inject); i++) {
+    var inj = inject[i]
+    var key = trim(inj, '$')
+    if (key == 'fd') env[key] = fd
+    else env[key] = my$_[key]
+  }
+  return env
 }
 
-function inject_values(inject) {
-  var vals = []
-  for (var i = 0; i < inject.length; i++) {
-    var key = strip_dollar(inject[i])
-    if (key == 'fd') vals.push(fd)
-    else vals.push($_[key])
+function inject_bindings_code(inject) {
+  var lines = []
+
+  // Runtime function bindings
+  var runtime_fns = ['logical', 'some', 'every', 'starts_with', 'ends_with',
+                     'actor', 'is_actor', 'log', 'send',
+                     'fallback', 'parallel', 'race', 'sequence']
+  for (var i = 0; i < length(runtime_fns); i++) {
+    var fn = runtime_fns[i]
+    push(lines, `var ${fn} = env["${fn}"];`)
   }
-  return vals
+
+  // Capability bindings ($delay, $start, etc.)
+  for (var i = 0; i < length(inject); i++) {
+    var inj = inject[i]
+    var key = trim(inj, '$')
+    push(lines, `var $${key} = env["${key}"];`)
+  }
+  return text(lines, '\n')
 }
 
 // Build the use function for a specific package context
@@ -398,54 +427,42 @@ function make_use_fn_code(pkg_arg) {
 // for script forms, path is the canonical path of the module
 var script_form = function(path, script, pkg, inject) {
   var pkg_arg = pkg ? `'${pkg}'` : 'null'
-  var params = inject_params(inject)
-  
-  // Build $_ object from injected capabilities for backward compatibility
-  var build_compat = ''
-  if (inject && inject.length) {
-    var compat_props = []
-    for (var i = 0; i < inject.length; i++) {
-      var name = inject[i]
-      var key = name
-      if (key && key[0] == '$') key = key.substring(1)
-      compat_props.push(key + ': ' + name)
-    }
-    build_compat = 'var $_ = {' + compat_props.join(', ') + '};'
-  }
-  
-  // use is passed as a parameter, not on globalThis for the script
-  // $fd is injected as a capability, but we still allow use('fd') for now
-  // $_ is built from injected capabilities for backward compatibility
-  var fn = `(function setup_module(args, use${params}){ def arg = args; def PACKAGE = ${pkg_arg}; ${build_compat} ${script}})`
+  var binds = inject_bindings_code(inject)
+
+  var fn = `(function setup_module(args, use, env){
+def arg = args;
+def PACKAGE = ${pkg_arg};
+${binds}
+${script}
+})`
   return fn
 }
 
 // Resolve module function, hashing it in the process
 // path is the exact path to the script file
 function resolve_mod_fn(path, pkg) {
-  if (!fd.is_file(path)) throw new Error(`path ${path} is not a file`)
+  if (!fd.is_file(path)) throw Error(`path ${path} is not a file`)
 
   var file_info = Shop.file_info(path)
   var file_pkg = file_info.package
   var inject = Shop.script_inject_for(file_info)
   var content = text(fd.slurp(path))
   var script = script_form(path, content, file_pkg, inject);
-  
-  var obj = pull_from_cache(utf8.encode(script))
+
+  var obj = pull_from_cache(stone(blob(script)))
   if (obj) {
     var fn = js.compile_unblob(obj)
-    return js.eval_compile(fn)
+    return js.integrate(fn, null)
   }
-  
+
   // Compile name is just for debug/stack traces
-//  var compile_name = pkg ? pkg + ':' + path : 'local:' + path
   var compile_name = path
-  
+
   var fn = js.compile(compile_name, script)
-  
-  put_into_cache(utf8.encode(script), js.compile_blob(fn))
-  
-  return js.eval_compile(fn)
+
+  put_into_cache(stone(blob(script)), js.compile_blob(fn))
+
+  return js.integrate(fn, null)
 }
 
 // given a path and a package context
@@ -480,7 +497,7 @@ function resolve_locator(path, ctx)
   // If ctx is an absolute path (starts with /), use it directly
   // Otherwise, look it up in the packages directory
   var ctx_dir
-  if (ctx.startsWith('/')) {
+  if (starts_with(ctx, '/')) {
     ctx_dir = ctx
   } else {
     ctx_dir = get_packages_dir() + '/' + safe_package_path(ctx)
@@ -527,25 +544,17 @@ function resolve_locator(path, ctx)
 
 // Generate symbol name for a C module file
 // Uses the same format as Shop.c_symbol_for_file
-// Resolves linked packages to their actual target first
+// Symbol names are based on canonical package names, not link targets
 function make_c_symbol(pkg, file) {
-  // Check if this package is linked - if so, use the link target for symbol name
-  var link_target = link.get_target(pkg)
-  var resolved_pkg = link_target ? link_target : pkg
-  
-  var pkg_safe = resolved_pkg.replace(/\//g, '_').replace(/\./g, '_').replace(/-/g, '_')
-  var file_safe = file.replace(/\//g, '_').replace(/\./g, '_').replace(/-/g, '_')
+  var pkg_safe = replace(replace(replace(pkg, '/', '_'), '.', '_'), '-', '_')
+  var file_safe = replace(replace(replace(file, '/', '_'), '.', '_'), '-', '_')
   return 'js_' + pkg_safe + '_' + file_safe + '_use'
 }
 
 // Get the library path for a package in .cell/lib
-// Resolves linked packages to their actual target first
+// Library names are based on canonical package names, not link targets
 function get_lib_path(pkg) {
-  // Check if this package is linked - if so, use the link target
-  var link_target = link.get_target(pkg)
-  var resolved_pkg = link_target ? link_target : pkg
-  
-  var lib_name = resolved_pkg.replace(/\//g, '_').replace(/\./g, '_').replace(/-/g, '_')
+  var lib_name = replace(replace(replace(pkg, '/', '_'), '.', '_'), '-', '_')
   return global_shop_path + '/lib/' + lib_name + dylib_ext
 }
 
@@ -557,34 +566,43 @@ Shop.open_package_dylib = function(pkg) {
 
   var link_target = link.get_target(pkg)
   var resolved_pkg = link_target ? link_target : pkg
-  
+
   var pkg_dir;
-  if (resolved_pkg.startsWith('/')) {
+  if (starts_with(resolved_pkg, '/')) {
     pkg_dir = resolved_pkg
   } else {
     pkg_dir = get_packages_dir() + '/' + safe_package_path(resolved_pkg)
   }
-  
+
   var toml_path = pkg_dir + '/cell.toml'
   if (fd.is_file(toml_path)) {
     try {
       var content = text(fd.slurp(toml_path))
       var cfg = toml.decode(content)
       if (cfg.dependencies) {
-        for (var alias in cfg.dependencies) {
+        arrfor(array(cfg.dependencies), function(alias, i) {
           var dep_pkg = cfg.dependencies[alias]
-          Shop.open_package_dylib(dep_pkg)
-        }
+          try {
+            Shop.open_package_dylib(dep_pkg)
+          } catch (dep_e) {
+            // Dependency dylib load failed, continue with others
+          }
+        })
       }
     } catch (e) {
-      // Ignore errors reading cell.toml
+      // Error reading toml, continue
     }
   }
 
   var dl_path = get_lib_path(pkg)
   if (fd.is_file(dl_path)) {
     if (!open_dls[dl_path]) {
-      open_dls[dl_path] = os.dylib_open(dl_path)
+      try {
+        open_dls[dl_path] = os.dylib_open(dl_path)
+      } catch (e) {
+        dylib_visited[pkg] = false
+        throw e
+      }
     }
   }
 }
@@ -592,20 +610,19 @@ Shop.open_package_dylib = function(pkg) {
 // Resolve a C symbol by searching:
 // 1. If package_context is null, only check core internal symbols
 // 2. Otherwise: own package (internal then dylib) -> other packages (internal then dylib) -> core (internal only)
- // Core is never loaded as a dynamic library via dlopen
- function resolve_c_symbol(path, package_context)
- {
-   var explicit = split_explicit_package_import(path)
-   if (explicit) {
-     if (is_internal_path(explicit.path) && package_context && explicit.package != package_context)
-       explicit = null
-    }
-    if (explicit) {
-     var sym = make_c_symbol(explicit.package, explicit.path)
-     if (os.internal_exists(sym)) {
-       return {
-         symbol: function() { return os.load_internal(sym) },
-         scope: SCOPE_PACKAGE,
+// Core is never loaded as a dynamic library via dlopen
+function resolve_c_symbol(path, package_context) {
+  var explicit = split_explicit_package_import(path)
+  if (explicit) {
+    if (is_internal_path(explicit.path) && package_context && explicit.package != package_context)
+      explicit = null
+  }
+  if (explicit) {
+    var sym = make_c_symbol(explicit.package, explicit.path)
+    if (os.internal_exists(sym)) {
+      return {
+        symbol: function() { return os.load_internal(sym) },
+        scope: SCOPE_PACKAGE,
         package: explicit.package,
         path: sym
       }
@@ -624,7 +641,8 @@ Shop.open_package_dylib = function(pkg) {
   }
 
   // If no package context, only check core internal symbols
-  if (!package_context) {
+  if (!package_context || package_context == 'core') {
+    path = replace(path, '/', '_')
     var core_sym = `js_${path}_use`
     if (os.internal_exists(core_sym)) {
       return {
@@ -635,7 +653,7 @@ Shop.open_package_dylib = function(pkg) {
     }
     return null
   }
-  
+
   // 1. Check own package first (internal, then dylib)
   var sym = make_c_symbol(package_context, path)
   if (os.internal_exists(sym)) {
@@ -656,10 +674,10 @@ Shop.open_package_dylib = function(pkg) {
       path: sym
     }
   }
-  
+
   if (is_internal_path(path))
     return null
-  
+
   // 2. Check aliased package imports (e.g. 'prosperon/sprite')
   var pkg_alias = get_import_package(path)
   if (pkg_alias) {
@@ -667,7 +685,7 @@ Shop.open_package_dylib = function(pkg) {
     if (canon_pkg) {
       var mod_name = get_import_name(path)
       var sym = make_c_symbol(canon_pkg, mod_name)
-      
+
       // Check internal first
       if (os.internal_exists(sym)) {
         return {
@@ -677,7 +695,7 @@ Shop.open_package_dylib = function(pkg) {
           path: sym
         }
       }
-      
+
       // Then check dylib
       Shop.open_package_dylib(canon_pkg)
       var dl_path = get_lib_path(canon_pkg)
@@ -691,9 +709,9 @@ Shop.open_package_dylib = function(pkg) {
       }
     }
   }
-  
+
   // 3. Check core internal symbols (core is never a dynamic library)
-  var core_sym = `js_${path}_use`
+  var core_sym = `js_${replace(path, '/', '_')}_use`
   if (os.internal_exists(core_sym)) {
     return {
       symbol: function() { return os.load_internal(core_sym) },
@@ -701,7 +719,7 @@ Shop.open_package_dylib = function(pkg) {
       path: core_sym
     }
   }
-  
+
   return null
 }
 
@@ -710,13 +728,13 @@ var module_info_cache = {}
 
 function resolve_module_info(path, package_context) {
   var lookup_key = package_context ? package_context + ':' + path : ':' + path
-  
+
   if (module_info_cache[lookup_key])
     return module_info_cache[lookup_key]
-  
+
   var c_resolve = resolve_c_symbol(path, package_context) || {scope:999}
   var mod_resolve = resolve_locator(path + '.cm', package_context) || {scope:999}
-  var min_scope = number.min(c_resolve.scope, mod_resolve.scope)
+  var min_scope = min(c_resolve.scope, mod_resolve.scope)
 
   if (min_scope == 999)
     return null
@@ -783,6 +801,14 @@ function make_use_fn(pkg) {
   }
 }
 
+// Call a C module loader and execute the entrypoint
+function call_c_module(c_resolve) {
+  var mod = c_resolve.symbol()
+//  if (is_function(mod))
+//    return mod()
+  return mod
+}
+
 function execute_module(info)
 {
   var c_resolve = info.c_resolve
@@ -793,26 +819,31 @@ function execute_module(info)
   if (mod_resolve.scope < 900) {
       var context = null
       if (c_resolve.scope < 900) {
-          context = c_resolve.symbol(null, $_)
+          context = call_c_module(c_resolve)
       }
-      
+
       // Get file info to determine inject list
       var file_info = Shop.file_info(mod_resolve.path)
       var inject = Shop.script_inject_for(file_info)
-      var vals = inject_values(inject)
+      var env = inject_env(inject)
       var pkg = file_info.package
       var use_fn = make_use_fn(pkg)
-      
-      // Call with signature: setup_module(args, use, ...capabilities)
+
+      // Call with signature: setup_module(args, use, env)
       // args is null for module loading
-      used = mod_resolve.symbol.call(context, null, use_fn, ...vals)
+      used = call(mod_resolve.symbol, context, [null, use_fn, env])
   } else if (c_resolve.scope < 900) {
       // C only
-      used = c_resolve.symbol(null, $_)
+      used = call_c_module(c_resolve)
   } else {
-      throw new Error(`Module ${info.path} could not be found`)
-  } if (!used)
-    throw new Error(`Module ${info} returned null`)
+      throw Error(`Module ${info.path} could not be found`)
+  }
+
+//  if (is_function(used))
+//    throw Error('C module loader returned a function; did you forget to call it?')
+
+  if (!used)
+    throw Error(`Module ${info} returned null`)
 
 //  stone(used)
   return used
@@ -822,7 +853,7 @@ function get_module(path, package_context) {
   var info = resolve_module_info(path, package_context)
 
   if (!info)
-    throw new Error(`Module ${path} could not be found in ${package_context}`)
+    throw Error(`Module ${path} could not be found in ${package_context}`)
 
   return execute_module(info)
 }
@@ -830,7 +861,7 @@ function get_module(path, package_context) {
 Shop.use = function use(path, package_context) {
   var info = resolve_module_info(path, package_context)
   if (!info)
-    throw new Error(`Module ${path} could not be found in ${package_context}`)
+    throw Error(`Module ${path} could not be found in ${package_context}`)
 
   if (use_cache[info.cache_key])
     return use_cache[info.cache_key]
@@ -842,7 +873,7 @@ Shop.resolve_locator = resolve_locator
 
 // Get cache path for a package and commit
 function get_cache_path(pkg, commit) {
-  return global_shop_path + '/cache/' + pkg.replaceAll('@','_').replaceAll('/','_') + '_' + commit + '.zip'
+  return global_shop_path + '/cache/' + replace(replace(pkg, '@','_'), '/','_') + '_' + commit + '.zip'
 }
 
 function get_package_abs_dir(package)
@@ -871,22 +902,19 @@ function fetch_remote_hash(pkg) {
 // Returns the zip blob or null on failure
 function download_zip(pkg, commit_hash) {
   var cache_path = get_cache_path(pkg, commit_hash)
-  
+
   var download_url = Shop.get_download_url(pkg, commit_hash)
   if (!download_url) {
     log.error("Could not determine download URL for " + pkg)
     return null
   }
 
-  log.console("Downloading from " + download_url)
   try {
     var zip_blob = http.fetch(download_url)
-    log.console(`putting to ${cache_path}`)
     fd.slurpwrite(cache_path, zip_blob)
-    log.console("Cached to " + cache_path)
     return zip_blob
   } catch (e) {
-    log.error(e)
+    log.error("Download failed for " + pkg + ": " + e)
     return null
   }
 }
@@ -901,39 +929,58 @@ function get_cached_zip(pkg, commit_hash) {
 }
 
 // Fetch: Ensure the zip on disk matches what's in the lock file
-// For local packages, this is a no-op (returns true)
+// For local packages, this is a no-op
 // For remote packages, downloads the zip if not present or hash mismatch
-// Returns true on success
+// Returns: { status: 'local'|'cached'|'downloaded'|'error', message: string }
 Shop.fetch = function(pkg) {
   var lock = Shop.load_lock()
   var lock_entry = lock[pkg]
   var info = Shop.resolve_package_info(pkg)
 
-  if (info == 'local') return null
+  if (info == 'local') {
+    return { status: 'local' }
+  }
 
   // No lock entry - can't fetch without knowing what commit
-  if (!lock_entry || !lock_entry.commit)
-    throw new Error("No lock entry for " + pkg + " - run update first")
-  
+  if (!lock_entry || !lock_entry.commit) {
+    return { status: 'error', message: "No lock entry for " + pkg + " - run update first" }
+  }
+
   var commit = lock_entry.commit
   var expected_hash = lock_entry.zip_hash
-  
+
   // Check if we have the zip cached
   var zip_blob = get_cached_zip(pkg, commit)
-  
+
   if (zip_blob) {
-    // Verify hash matches
-    var actual_hash = text(crypto.blake2(zip_blob), 'h')
-    if (actual_hash == expected_hash)
-      return true
-
-    log.console("Zip hash mismatch for " + pkg + ", re-fetching...")
+    // If we have a hash on record, verify it
+    if (expected_hash) {
+      var actual_hash = text(crypto.blake2(zip_blob), 'h')
+      if (actual_hash == expected_hash) {
+        return { status: 'cached' }
+      }
+      log.console("Zip hash mismatch for " + pkg + ", re-fetching...")
+    } else {
+      // No hash stored yet - compute and store it
+      var actual_hash = text(crypto.blake2(zip_blob), 'h')
+      lock_entry.zip_hash = actual_hash
+      Shop.save_lock(lock)
+      return { status: 'cached' }
+    }
   }
-  
-  // Download the zip
-  download_zip(pkg, commit)
 
-  return true
+  // Download the zip
+  var new_zip = download_zip(pkg, commit)
+  if (!new_zip) {
+    return { status: 'error', message: "Failed to download " + pkg }
+  }
+
+  // Store the hash
+  var new_hash = text(crypto.blake2(new_zip), 'h')
+  lock_entry.zip_hash = new_hash
+  Shop.save_lock(lock)
+
+  return { status: 'downloaded' }
 }
 
 // Extract: Extract a package to its target directory
@@ -943,7 +990,7 @@ Shop.fetch = function(pkg) {
 // Returns true on success
 Shop.extract = function(pkg) {
   var target_dir = get_package_abs_dir(pkg)
-  
+
   // Check if this package is linked
   var link_target = link.get_target(pkg)
   if (link_target) {
@@ -951,7 +998,7 @@ Shop.extract = function(pkg) {
     link.sync_one(pkg, link_target)
     return true
   }
-  
+
   var info = Shop.resolve_package_info(pkg)
 
   if (info == 'local') {
@@ -964,13 +1011,33 @@ Shop.extract = function(pkg) {
     return true
   }
 
+  // Check if already extracted at correct commit
+  var lock = Shop.load_lock()
+  var lock_entry = lock[pkg]
+  if (lock_entry && lock_entry.commit) {
+    var extracted_commit_file = target_dir + '/.cell_commit'
+    if (fd.is_file(extracted_commit_file)) {
+      var extracted_commit = trim(text(fd.slurp(extracted_commit_file)))
+      if (extracted_commit == lock_entry.commit) {
+        // Already extracted at this commit, skip
+        return true
+      }
+    }
+  }
+
   var zip_blob = get_package_zip(pkg)
 
   if (!zip_blob)
-    throw new Error("No zip blob available for " + pkg)
+    throw Error("No zip blob available for " + pkg)
 
   // Extract zip for remote package
   install_zip(zip_blob, target_dir)
+
+  // Write marker file with the extracted commit
+  if (lock_entry && lock_entry.commit) {
+    fd.slurpwrite(target_dir + '/.cell_commit', stone(blob(lock_entry.commit)))
+  }
+
   return true
 }
 
@@ -1002,8 +1069,20 @@ Shop.update = function(pkg) {
 
   log.console(`checking ${pkg}`)
 
-  if (info == 'local') return {
-    updated: time.number()
+  if (info == 'local') {
+    // Check if local path exists
+    if (!fd.is_dir(pkg)) {
+      log.console(`  Local path does not exist: ${pkg}`)
+      return null
+    }
+    // Local packages always get a lock entry
+    var new_entry = {
+      type: 'local',
+      updated: time.number()
+    }
+    lock[pkg] = new_entry
+    Shop.save_lock(lock)
+    return new_entry
   }
   
   var local_commit = lock_entry ? lock_entry.commit : null
@@ -1012,14 +1091,14 @@ Shop.update = function(pkg) {
   log.console(`local commit: ${local_commit}`)
   log.console(`remote commit: ${remote_commit}`)
 
-  if (local_commit == remote_commit)
-    return null
-  
   if (!remote_commit) {
     log.error("Could not resolve commit for " + pkg)
     return null
   }
 
+  if (local_commit == remote_commit)
+    return null
+
   var new_entry = {
     type: info,
     commit: remote_commit,
@@ -1034,29 +1113,36 @@ Shop.update = function(pkg) {
 
 function install_zip(zip_blob, target_dir) {
   var zip = miniz.read(zip_blob)
-  if (!zip) throw new Error("Failed to read zip archive")
-  
+  if (!zip) throw Error("Failed to read zip archive")
+
   if (fd.is_link(target_dir)) fd.unlink(target_dir)
   if (fd.is_dir(target_dir)) fd.rmdir(target_dir, 1)
-  
+
   log.console("Extracting to " + target_dir)
   ensure_dir(target_dir)
-  
+
   var count = zip.count()
-  
+  var created_dirs = {}
+
   for (var i = 0; i < count; i++) {
     if (zip.is_directory(i)) continue
     var filename = zip.get_filename(i)
-    var parts = filename.split('/')
-    if (parts.length <= 1) continue
-    
-    parts.shift()
-    var rel_path = parts.join('/')
+    var slash_pos = search(filename, '/')
+    if (slash_pos == null) continue
+    if (slash_pos + 1 >= length(filename)) continue
+    var rel_path = text(filename, slash_pos + 1)
     var full_path = target_dir + '/' + rel_path
-    var dir_path = full_path.substring(0, full_path.lastIndexOf('/'))
-    
-    ensure_dir(dir_path)
-    fd.slurpwrite(full_path, zip.slurp(filename))
+    var dir_path = fd.dirname(full_path)
+
+    if (!created_dirs[dir_path]) {
+      ensure_dir(dir_path)
+      created_dirs[dir_path] = true
+    }
+    var file_data = zip.slurp(filename)
+
+    stone(file_data)
+
+    fd.slurpwrite(full_path, file_data)
   }
 }
 
@@ -1079,14 +1165,14 @@ Shop.get = function(pkg) {
   if (!lock[pkg]) {
     var info = Shop.resolve_package_info(pkg)
     if (!info) {
-      throw new Error("Invalid package: " + pkg)
+      throw Error("Invalid package: " + pkg)
     }
     
     var commit = null
     if (info != 'local') {
       commit = fetch_remote_hash(pkg)
       if (!commit) {
-        throw new Error("Could not resolve commit for " + pkg)
+        throw Error("Could not resolve commit for " + pkg)
       }
     }
     
@@ -1128,12 +1214,14 @@ Shop.module_reload = function(path, package) {
   var old = use_cache[cache_key]
   var newmod = get_module(path, package)
 
-  for (var i in newmod)
+  arrfor(array(newmod), function(i, idx) {
     old[i] = newmod[i]
+  })
 
-  for (var i in old)
+  arrfor(array(old), function(i, idx) {
     if (!(i in newmod))
       old[i] = null
+  })
 }
 
 function get_package_scripts(package)
@@ -1141,10 +1229,10 @@ function get_package_scripts(package)
   var files = pkg_tools.list_files(package)
   var scripts = []
   
-  for (var i = 0; i < files.length; i++) {
+  for (var i = 0; i < length(files); i++) {
     var file = files[i]
-    if (file.endsWith('.cm') || file.endsWith('.ce')) {
-      scripts.push(file)
+    if (ends_with(file, '.cm') || ends_with(file, '.ce')) {
+      push(scripts, file)
     }
   }
   
@@ -1157,8 +1245,9 @@ Shop.build_package_scripts = function(package)
   var scripts = get_package_scripts(package)
   var pkg_dir = get_package_abs_dir(package)
 
-  for (var script of scripts)
+  arrfor(scripts, function(script, i) {
     resolve_mod_fn(pkg_dir + '/' + script, package)
+  })
 }
 
 Shop.list_packages = function()
@@ -1190,22 +1279,22 @@ Shop.get_package_dir = function(pkg) {
 // e.g., c_symbol_for_file('gitea.pockle.world/john/prosperon', 'sprite.c') 
 //       -> 'js_gitea_pockle_world_john_prosperon_sprite_use'
 Shop.c_symbol_for_file = function(pkg, file) {
-  var pkg_safe = pkg.replace(/\//g, '_').replace(/\./g, '_').replace(/-/g, '_')
-  var file_safe = file.substring(0, file.lastIndexOf('.')).replace(/\//g, '_').replace(/\./g, '_').replace(/-/g, '_')
+  var pkg_safe = replace(replace(replace(pkg, '/', '_'), '.', '_'), '-', '_')
+  var file_safe = replace(replace(fd.stem(file), '/', '_'), '.', '_')
   return 'js_' + pkg_safe + '_' + file_safe + '_use'
 }
 
 // Generate C symbol prefix for a package
 // e.g., c_symbol_prefix('gitea.pockle.world/john/prosperon') -> 'js_gitea_pockle_world_john_prosperon_'
 Shop.c_symbol_prefix = function(pkg) {
-  var pkg_safe = pkg.replace(/\//g, '_').replace(/\./g, '_').replace(/-/g, '_')
+  var pkg_safe = replace(replace(replace(pkg, '/', '_'), '.', '_'), '-', '_')
   return 'js_' + pkg_safe + '_'
 }
 
 // Get the library name for a package (without extension)
 // e.g., 'gitea.pockle.world/john/prosperon' -> 'gitea_pockle_world_john_prosperon'
 Shop.lib_name_for_package = function(pkg) {
-  return pkg.replace(/\//g, '_').replace(/\./g, '_').replace(/-/g, '_')
+  return replace(replace(replace(pkg, '/', '_'), '.', '_'), '-', '_')
 }
 
 // Returns { ok: bool, results: [{pkg, ok, error}] }
@@ -1214,12 +1303,12 @@ Shop.audit_packages = function() {
 
   var bad = []
 
-  for (var package of packages) {
-    if (package == 'core') continue
-    if (fd.is_dir(package)) continue
-    if (fetch_remote_hash(package)) continue
-    bad.push(package)
-  }
+  arrfor(packages, function(package, i) {
+    if (package == 'core') return
+    if (fd.is_dir(package)) return
+    if (fetch_remote_hash(package)) return
+    push(bad, package)
+  })
 
   return bad
 }
@@ -1231,16 +1320,16 @@ Shop.parse_package = function(locator) {
   
   // Strip version suffix if present
   var clean = locator
-  if (locator.includes('@')) {
-    clean = locator.split('@')[0]
+  if (search(locator, '@') != null) {
+    clean = array(locator, '@')[0]
   }
   
   var info = Shop.resolve_package_info(clean)
   if (!info) return null
   
   // Extract package name (last component of path)
-  var parts = clean.split('/')
-  var name = parts[parts.length - 1]
+  var parts = array(clean, '/')
+  var name = parts[length(parts) - 1]
   
   return {
     path: clean,

internal/testlib.cm

@@ -24,7 +24,7 @@ function get_pkg_dir(package_name) {
   if (!package_name) {
     return fd.realpath('.')
   }
-  if (package_name.startsWith('/')) {
+  if (starts_with(package_name, '/')) {
     return package_name
   }
   var shop = use('internal/shop')
@@ -35,9 +35,9 @@ function get_pkg_dir(package_name) {
 function ensure_dir(path) {
   if (fd.is_dir(path)) return true
 
-  var parts = path.split('/')
-  var current = path.startsWith('/') ? '/' : ''
-  for (var i = 0; i < parts.length; i++) {
+  var parts = array(path, '/')
+  var current = starts_with(path, '/') ? '/' : ''
+  for (var i = 0; i < length(parts); i++) {
     if (parts[i] == '') continue
     current += parts[i] + '/'
     if (!fd.is_dir(current)) {

internal/text.c

@@ -1,306 +0,0 @@
-#include "cell.h"
-#include <string.h>
-#include <stdlib.h>
-
-JSC_CCALL(text_blob_to_hex,
-  size_t blob_len;
-  void *blob_data = js_get_blob_data(js, &blob_len, argv[0]);
-  if (!blob_data) return JS_ThrowTypeError(js, "Expected stone blob");
-  uint8_t *bytes = (uint8_t *)blob_data;
-  size_t hex_len = blob_len * 2;
-  char *hex_str = malloc(hex_len + 1);
-  if (!hex_str) return JS_ThrowOutOfMemory(js);
-  static const char hex_digits[] = "0123456789ABCDEF";
-  for (size_t i = 0; i < blob_len; ++i) {
-    hex_str[i * 2] = hex_digits[(bytes[i] >> 4) & 0xF];
-    hex_str[i * 2 + 1] = hex_digits[bytes[i] & 0xF];
-  }
-  hex_str[hex_len] = '\0';
-  JSValue val = JS_NewString(js, hex_str);
-  free(hex_str);
-  return val;
-)
-
-JSC_CCALL(text_blob_to_base32,
-  size_t blob_len;
-  void *blob_data = js_get_blob_data(js, &blob_len, argv[0]);
-  if (!blob_data) return JS_ThrowTypeError(js, "Expected stone blob");
-  uint8_t *bytes = (uint8_t *)blob_data;
-  static const char b32_digits[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
-  
-  // Calculate exact output length needed
-  size_t groups = (blob_len + 4) / 5;  // Round up to next group of 5
-  size_t b32_len = groups * 8;
-  char *b32_str = malloc(b32_len + 1);
-  if (!b32_str) return JS_ThrowOutOfMemory(js);
-  
-  size_t in_idx = 0;
-  size_t out_idx = 0;
-  
-  while (in_idx < blob_len) {
-    // Read up to 5 bytes into a 40-bit buffer
-    uint64_t buf = 0;
-    int bytes_to_read = (blob_len - in_idx < 5) ? (blob_len - in_idx) : 5;
-    
-    for (int i = 0; i < bytes_to_read; ++i) {
-      buf = (buf << 8) | bytes[in_idx++];
-    }
-    
-    // Pad buffer to 40 bits if we read fewer than 5 bytes
-    buf <<= 8 * (5 - bytes_to_read);
-    
-    // Extract 8 groups of 5 bits each
-    for (int i = 0; i < 8; ++i) {
-      b32_str[out_idx++] = b32_digits[(buf >> (35 - i * 5)) & 0x1F];
-    }
-  }
-  
-  // Add padding if necessary
-  if (blob_len % 5 != 0) {
-    static const int pad_count[] = {0, 6, 4, 3, 1};  // padding for 0,1,2,3,4 bytes
-    int padding = pad_count[blob_len % 5];
-    for (int i = 0; i < padding; ++i) {
-      b32_str[b32_len - 1 - i] = '=';
-    }
-  }
-  
-  b32_str[b32_len] = '\0';
-  JSValue val = JS_NewString(js, b32_str);
-  free(b32_str);
-  return val;
-)
-
-static int base32_char_to_val(char c) {
-  if (c >= 'A' && c <= 'Z') return c - 'A';
-  if (c >= 'a' && c <= 'z') return c - 'a';
-  if (c >= '2' && c <= '7') return c - '2' + 26;
-  return -1;
-}
-
-JSC_CCALL(text_base32_to_blob,
-  const char *str = JS_ToCString(js, argv[0]);
-  if (!str) return JS_ThrowTypeError(js, "Expected string");
-  size_t str_len = strlen(str);
-  if (str_len == 0) {
-    JS_FreeCString(js, str);
-    return JS_ThrowTypeError(js, "Empty base32 string");
-  }
-  
-  // Remove padding to get effective length
-  size_t effective_len = str_len;
-  while (effective_len > 0 && str[effective_len - 1] == '=') {
-    effective_len--;
-  }
-  
-  // Calculate output length: each group of 8 base32 chars -> 5 bytes
-  size_t output_len = (effective_len * 5) / 8;
-  uint8_t *output = malloc(output_len);
-  if (!output) {
-    JS_FreeCString(js, str);
-    return JS_ThrowOutOfMemory(js);
-  }
-  
-  size_t in_idx = 0;
-  size_t out_idx = 0;
-  
-  // Process in groups of 8 characters (40 bits -> 5 bytes)
-  while (in_idx < effective_len) {
-    uint64_t buf = 0;
-    int chars_to_read = (effective_len - in_idx < 8) ? (effective_len - in_idx) : 8;
-    
-    // Read up to 8 base32 characters into buffer
-    for (int i = 0; i < chars_to_read; ++i) {
-      int val = base32_char_to_val(str[in_idx++]);
-      if (val < 0) {
-        free(output);
-        JS_FreeCString(js, str);
-        return JS_ThrowTypeError(js, "Invalid base32 character");
-      }
-      buf = (buf << 5) | val;
-    }
-    
-    // Calculate how many bytes we can extract
-    int bytes_to_extract = (chars_to_read * 5) / 8;
-    
-    // Shift buffer to align the most significant bits
-    buf <<= (40 - chars_to_read * 5);
-    
-    // Extract bytes from most significant to least significant
-    for (int i = 0; i < bytes_to_extract && out_idx < output_len; ++i) {
-      output[out_idx++] = (buf >> (32 - i * 8)) & 0xFF;
-    }
-  }
-  
-  JSValue val = js_new_blob_stoned_copy(js, output, output_len);
-  free(output);
-  JS_FreeCString(js, str);
-  return val;
-)
-
-static int base64_char_to_val_standard(char c) {
-  if (c >= 'A' && c <= 'Z') return c - 'A';
-  if (c >= 'a' && c <= 'z') return c - 'a' + 26;
-  if (c >= '0' && c <= '9') return c - '0' + 52;
-  if (c == '+') return 62;
-  if (c == '/') return 63;
-  return -1;
-}
-static int base64_char_to_val_url(char c) {
-  if (c >= 'A' && c <= 'Z') return c - 'A';
-  if (c >= 'a' && c <= 'z') return c - 'a' + 26;
-  if (c >= '0' && c <= '9') return c - '0' + 52;
-  if (c == '-') return 62;
-  if (c == '_') return 63;
-  return -1;
-}
-
-/*─── blob → Base64 (standard, with ‘+’ and ‘/’, padded) ───────────────────*/
-JSC_CCALL(text_blob_to_base64,
-  size_t blob_len;
-  void *blob_data = js_get_blob_data(js, &blob_len, argv[0]);
-  if (!blob_data) return JS_ThrowTypeError(js, "Expected stone blob");
-  const uint8_t *bytes = blob_data;
-  static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                            "abcdefghijklmnopqrstuvwxyz"
-                            "0123456789+/";
-  size_t out_len = ((blob_len + 2) / 3) * 4;
-  char *out = malloc(out_len + 1);
-  if (!out) return JS_ThrowOutOfMemory(js);
-
-  size_t in_i = 0, out_i = 0;
-  while (in_i < blob_len) {
-    uint32_t buf = 0;
-    int to_read = (blob_len - in_i < 3 ? blob_len - in_i : 3);
-    for (int j = 0; j < to_read; ++j) {
-      buf = (buf << 8) | bytes[in_i++];
-    }
-    buf <<= 8 * (3 - to_read);
-    out[out_i++] = b64[(buf >> 18) & 0x3F];
-    out[out_i++] = b64[(buf >> 12) & 0x3F];
-    out[out_i++] = (to_read > 1 ? b64[(buf >> 6) & 0x3F] : '=');
-    out[out_i++] = (to_read > 2 ? b64[ buf        & 0x3F] : '=');
-  }
-  out[out_len] = '\0';
-  JSValue v = JS_NewString(js, out);
-  free(out);
-  return v;
-)
-
-/*─── Base64 → blob (standard, expects ‘+’ and ‘/’, pads allowed) ────────────*/
-JSC_CCALL(text_base64_to_blob,
-  const char *str = JS_ToCString(js, argv[0]);
-  if (!str) return JS_ThrowTypeError(js, "Expected string");
-  size_t len = strlen(str);
-  // strip padding for length calculation
-  size_t eff = len;
-  while (eff > 0 && str[eff-1] == '=') eff--;
-  size_t out_len = (eff * 6) / 8;
-  uint8_t *out = malloc(out_len);
-  if (!out) { JS_FreeCString(js, str); return JS_ThrowOutOfMemory(js); }
-
-  size_t in_i = 0, out_i = 0;
-  while (in_i < eff) {
-    uint32_t buf = 0;
-    int to_read = (eff - in_i < 4 ? eff - in_i : 4);
-    for (int j = 0; j < to_read; ++j) {
-      int v = base64_char_to_val_standard(str[in_i++]);
-      if (v < 0) { free(out); JS_FreeCString(js, str);
-                   return JS_ThrowTypeError(js, "Invalid base64 character"); }
-      buf = (buf << 6) | v;
-    }
-    buf <<= 6 * (4 - to_read);
-    int bytes_out = (to_read * 6) / 8;
-    for (int j = 0; j < bytes_out && out_i < out_len; ++j) {
-      out[out_i++] = (buf >> (16 - 8*j)) & 0xFF;
-    }
-  }
-
-  JSValue v = js_new_blob_stoned_copy(js, out, out_len);
-  free(out);
-  JS_FreeCString(js, str);
-  return v;
-)
-
-/*─── blob → Base64URL (no padding, ‘-’ and ‘_’) ─────────────────────────────*/
-JSC_CCALL(text_blob_to_base64url,
-  size_t blob_len;
-  void *blob_data = js_get_blob_data(js, &blob_len, argv[0]);
-  if (!blob_data) return JS_ThrowTypeError(js, "Expected stone blob");
-  const uint8_t *bytes = blob_data;
-  static const char b64url[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                               "abcdefghijklmnopqrstuvwxyz"
-                               "0123456789-_";
-  size_t raw_len = ((blob_len + 2) / 3) * 4;
-  // we’ll drop any trailing '='
-  char *out = malloc(raw_len + 1);
-  if (!out) return JS_ThrowOutOfMemory(js);
-
-  size_t in_i = 0, out_i = 0;
-  while (in_i < blob_len) {
-    uint32_t buf = 0;
-    int to_read = (blob_len - in_i < 3 ? blob_len - in_i : 3);
-    for (int j = 0; j < to_read; ++j) {
-      buf = (buf << 8) | bytes[in_i++];
-    }
-    buf <<= 8 * (3 - to_read);
-    out[out_i++] = b64url[(buf >> 18) & 0x3F];
-    out[out_i++] = b64url[(buf >> 12) & 0x3F];
-    if (to_read > 1) out[out_i++] = b64url[(buf >> 6) & 0x3F];
-    if (to_read > 2) out[out_i++] = b64url[ buf        & 0x3F];
-  }
-  out[out_i] = '\0';
-  JSValue v = JS_NewString(js, out);
-  free(out);
-  return v;
-)
-
-/*─── Base64URL → blob (accepts ‘-’ / ‘_’, no padding needed) ─────────────────*/
-JSC_CCALL(text_base64url_to_blob,
-  const char *str = JS_ToCString(js, argv[0]);
-  if (!str) return JS_ThrowTypeError(js, "Expected string");
-  size_t len = strlen(str);
-  size_t eff = len;  // no '=' in URL‐safe, but strip if present
-  while (eff > 0 && str[eff-1] == '=') eff--;
-  size_t out_len = (eff * 6) / 8;
-  uint8_t *out = malloc(out_len);
-  if (!out) { JS_FreeCString(js, str); return JS_ThrowOutOfMemory(js); }
-
-  size_t in_i = 0, out_i = 0;
-  while (in_i < eff) {
-    uint32_t buf = 0;
-    int to_read = (eff - in_i < 4 ? eff - in_i : 4);
-    for (int j = 0; j < to_read; ++j) {
-      int v = base64_char_to_val_url(str[in_i++]);
-      if (v < 0) { free(out); JS_FreeCString(js, str);
-                   return JS_ThrowTypeError(js, "Invalid base64url character"); }
-      buf = (buf << 6) | v;
-    }
-    buf <<= 6 * (4 - to_read);
-    int bytes_out = (to_read * 6) / 8;
-    for (int j = 0; j < bytes_out && out_i < out_len; ++j) {
-      out[out_i++] = (buf >> (16 - 8*j)) & 0xFF;
-    }
-  }
-
-  JSValue v = js_new_blob_stoned_copy(js, out, out_len);
-  free(out);
-  JS_FreeCString(js, str);
-  return v;
-)
-
-static const JSCFunctionListEntry js_text_funcs[] = {
-  MIST_FUNC_DEF(text, blob_to_hex, 1),
-  MIST_FUNC_DEF(text, blob_to_base32, 1),
-  MIST_FUNC_DEF(text, base32_to_blob, 1),
-  MIST_FUNC_DEF(text, blob_to_base64,      1),
-  MIST_FUNC_DEF(text, base64_to_blob,      1),
-  MIST_FUNC_DEF(text, blob_to_base64url,   1),
-  MIST_FUNC_DEF(text, base64url_to_blob,   1),
-};
-
-JSValue js_internal_text_use(JSContext *js)
-{
-  JSValue mod = JS_NewObject(js);
-  JS_SetPropertyFunctionList(js, mod, js_text_funcs, countof(js_text_funcs));
-  return mod;
-}

internal/text.cm

@@ -1,602 +0,0 @@
-/* text.cm - text conversion and formatting utilities */
-var blob = use('blob')
-var utf8 = use('utf8')
-
-var _toLowerCase = String.prototype.toLowerCase
-var _toUpperCase = String.prototype.toUpperCase
-var _trim = String.prototype.trim
-var _indexOf = String.prototype.indexOf
-var _lastIndexOf = String.prototype.lastIndexOf
-var _replace = String.prototype.replace
-var _normalize = String.prototype.normalize
-var _substring = String.prototype.substring
-var _charCodeAt = String.prototype.charCodeAt
-var _codePointAt = String.prototype.codePointAt
-
-var _String = String
-
-var that = this
-
-// Convert number to string with given radix
-function to_radix(num, radix) {
-  if (radix < 2 || radix > 36) return null;
-  
-  var digits = "0123456789abcdefghijklmnopqrstuvwxyz";
-  var result = "";
-  var n = number.whole(num);
-  var negative = n < 0;
-  n = number.abs(n);
-  
-  if (n == 0) return "0";
-  
-  while (n > 0) {
-    result = digits[n % radix] + result;
-    n = number.floor(n / radix);
-  }
-  
-  return negative ? "-" + result : result;
-}
-
-// Insert separator every n digits from right
-function add_separator(str, sep, n) {
-  if (!n || n == 0) return str;
-  
-  var negative = str[0] == '-';
-  if (negative) str = str.substring(1);
-  
-  var parts = str.split('.');
-  var integer = parts[0];
-  var decimal = parts[1] || '';
-  
-  // Add separators to integer part
-  var result = "";
-  for (var i = integer.length - 1, count = 0; i >= 0; i--) {
-    if (count == n && i != integer.length - 1) {
-      result = sep + result;
-      count = 0;
-    }
-    result = integer[i] + result;
-    count++;
-  }
-  
-  if (decimal) result += '.' + decimal;
-  return negative ? '-' + result : result;
-}
-
-// Format number with separator from left
-function add_separator_left(str, sep, n) {
-  if (!n || n == 0) return str;
-  
-  var negative = str[0] == '-';
-  if (negative) str = str.substring(1);
-  
-  var result = "";
-  for (var i = 0, count = 0; i < str.length; i++) {
-    if (count == n && i != 0) {
-      result += sep;
-      count = 0;
-    }
-    result += str[i];
-    count++;
-  }
-  
-  return negative ? '-' + result : result;
-}
-
-/* -------- main text function --------------------------------------- */
-
-function text(...arguments) {
-  var arg = arguments[0];
-  
-  // Handle blob conversion
-  if (arg instanceof blob) {
-    if (!stone.p(arg))
-      throw new Error("text: blob must be stone for reading");
-    
-    var format = arguments[1];
-    var bit_length = arg.length;
-    var result = "";
-    
-    if (typeof format == 'string') {
-      // Extract style from format
-      var style = '';
-      for (var i = 0; i < format.length; i++) {
-        if ((format[i] >= 'a' && format[i] <= 'z') || (format[i] >= 'A' && format[i] <= 'Z')) {
-          style = format[i];
-          break;
-        }
-      }
-      
-      // Handle blob encoding styles
-      switch (style) {
-        case 'h': // hexadecimal
-          return that.blob_to_hex(arg);
-          
-        case 't': // base32
-          return that.blob_to_base32(arg);
-          
-        case 'b': // binary
-          for (var i = 0; i < bit_length; i++) {
-            result += arg.read_logical(i) ? '1' : '0';
-          }
-          return result;
-          
-        case 'o': // octal
-          var bits = 0;
-          var value = 0;
-          
-          for (var i = 0; i < bit_length; i++) {
-            var bit = arg.read_logical(i);
-            value = (value << 1) | (bit ? 1 : 0);
-            bits++;
-            
-            if (bits == 3) {
-              result += value.toString();
-              bits = 0;
-              value = 0;
-            }
-          }
-          
-          // Handle remaining bits
-          if (bits > 0) {
-            value = value << (3 - bits);
-            result += value.toString();
-          }
-          
-          return result;
-      }
-    }
-    
-    // Default: interpret as UTF-8 text
-    // Use the utf8 module to decode the blob
-    if (arg.length == 0) return ""
-    return utf8.decode(arg);
-  }
-  
-  // Handle array conversion
-  if (isa(arg, array)) {
-    var separator = arguments[1] || "";
-    
-    // Check if all items are valid codepoints
-    var all_codepoints = true;
-    for (var i = 0; i < arg.length; i++) {
-      var item = arg[i];
-      if (!(typeof item == 'number' && item >= 0 && item <= 0x10FFFF && item == number.floor(item))) {
-        all_codepoints = false;
-        break;
-      }
-    }
-    
-    if (all_codepoints && separator == "") {
-      // Use utf8 module to convert codepoints to string
-      return utf8.from_codepoints(arg);
-    } else {
-      // General array to string conversion
-      var result = "";
-      for (var i = 0; i < arg.length; i++) {
-        if (i > 0) result += separator;
-        
-        var item = arg[i];
-        if (typeof item == 'number' && item >= 0 && item <= 0x10FFFF && item == number.floor(item)) {
-          // Single codepoint - use utf8 module
-          result += utf8.from_codepoints([item]);
-        } else {
-          result += String(item);
-        }
-      }
-      return result;
-    }
-  }
-  
-  // Handle number conversion
-  if (typeof arg == 'number') {
-    var format = arguments[1];
-    
-    // Simple radix conversion
-    if (typeof format == 'number') {
-      return to_radix(arg, format);
-    }
-    
-    // Format string conversion
-    if (typeof format == 'string') {
-      return format_number(arg, format);
-    }
-    
-    // Default conversion
-    return _String(arg);
-  }
-  
-  // Handle text operations
-  if (typeof arg == 'string') {
-    if (arguments.length == 1) return arg;
-    
-    var from = arguments[1];
-    var to = arguments[2];
-    
-    if (typeof from != 'number' || typeof to != 'number') return arg;
-    
-    var len = arg.length;
-    
-    // Adjust negative indices
-    if (from < 0) from += len;
-    if (to < 0) to += len;
-    
-    // Default values
-    if (from == null) from = 0;
-    if (to == null) to = len;
-    
-    // Validate range
-    if (from < 0 || from > to || to > len) return null;
-    
-    return arg.substring(from, to);
-  }
-  
-  return null;
-}
-
-/* -------- number formatting ---------------------------------------- */
-
-function format_number(num, format) {
-  // Parse format string
-  var separation = 0;
-  var style = '';
-  var places = 0;
-  
-  var i = 0;
-  
-  // Parse separation digit
-  if (i < format.length && format[i] >= '0' && format[i] <= '9') {
-    separation = number(format[i]);
-    i++;
-  }
-  
-  // Parse style letter
-  if (i < format.length) {
-    style = format[i];
-    i++;
-  } else {
-    return null;
-  }
-  
-  // Parse places digits
-  if (i < format.length && format[i] >= '0' && format[i] <= '9') {
-    places = number(format[i]);
-    i++;
-    if (i < format.length && format[i] >= '0' && format[i] <= '9') {
-      places = places * 10 + number(format[i]);
-      i++;
-    }
-  }
-  
-  // Invalid format if there's more
-  if (i < format.length) return null;
-  
-  // Real number styles
-  if (style == 'e' || style == 'n' || style == 's' || 
-      style == 'u' || style == 'd' || style == 'v' || style == 'l') {
-    
-    var decimal_point = '.';
-    var separator = '';
-    var default_separation = 0;
-    var default_places = 0;
-    
-    switch (style) {
-      case 'e': // exponential
-        decimal_point = '.';
-        separator = '';
-        default_separation = 0;
-        default_places = 0;
-        break;
-      case 'n': // number
-        decimal_point = '.';
-        separator = '';
-        default_separation = 0;
-        default_places = 0;
-        break;
-      case 's': // space
-        decimal_point = '.';
-        separator = ' ';
-        default_separation = 3;
-        default_places = 0;
-        break;
-      case 'u': // underbar
-        decimal_point = '.';
-        separator = '_';
-        default_separation = 0;
-        default_places = 0;
-        break;
-      case 'd': // decimal
-        decimal_point = '.';
-        separator = ',';
-        default_separation = 3;
-        default_places = 2;
-        break;
-      case 'v': // comma (European style)
-        decimal_point = ',';
-        separator = '.';
-        default_separation = 0;
-        default_places = 0;
-        break;
-      case 'l': // locale (default to 'd' style for now)
-        decimal_point = '.';
-        separator = ',';
-        default_separation = 3;
-        default_places = 2;
-        break;
-    }
-    
-    if (separation == 0) separation = default_separation;
-    if (places == 0 && style != 'e' && style != 'n') places = default_places;
-    
-    // Format the number
-    if (style == 'e') {
-      // Scientific notation
-      var str = places > 0 ? num.toExponential(places) : num.toExponential();
-      return str;
-    } else if (style == 'n' && (number.abs(num) >= 1e21 || (number.abs(num) < 1e-6 && num != 0))) {
-      // Use scientific notation for extreme values
-      return num.toExponential();
-    } else {
-      // Regular decimal formatting
-      var str;
-      if (places > 0) {
-        str = num.toFixed(places);
-      } else {
-        str = num.toString();
-      }
-      
-      // Replace decimal point if needed
-      if (decimal_point != '.') {
-        str = str.replace('.', decimal_point);
-      }
-      
-      // Add separators
-      if (separation > 0 && separator) {
-        str = add_separator(str, separator, separation);
-      }
-      
-      return str;
-    }
-  }
-  
-  // Integer styles
-  if (style == 'i' || style == 'b' || style == 'o' || 
-      style == 'h' || style == 't') {
-    
-    var radix = 10;
-    var default_separation = 0;
-    var default_places = 1;
-    
-    switch (style) {
-      case 'i': // integer
-        radix = 10;
-        default_separation = 0;
-        default_places = 1;
-        break;
-      case 'b': // binary
-        radix = 2;
-        default_separation = 0;
-        default_places = 1;
-        break;
-      case 'o': // octal
-        radix = 8;
-        default_separation = 0;
-        default_places = 1;
-        break;
-      case 'h': // hexadecimal
-        radix = 16;
-        default_separation = 0;
-        default_places = 1;
-        break;
-      case 't': // base32
-        radix = 32;
-        default_separation = 0;
-        default_places = 1;
-        break;
-    } 
-    
-    if (separation == 0) separation = default_separation;
-    if (places == 0) places = default_places;
-    
-    // Convert to integer
-    var n = number.whole(num);
-    var str = to_radix(n, radix).toUpperCase();
-    
-    // Pad with zeros if needed
-    var negative = str[0] == '-';
-    if (negative) str = str.substring(1);
-    
-    while (str.length < places) {
-      str = '0' + str;
-    }
-    
-    // Add separators
-    if (separation > 0) {
-      str = add_separator_left(str, '_', separation);
-    }
-    
-    return negative ? '-' + str : str;
-  }
-  
-  return null;
-}
-
-/* -------- text sub-functions --------------------------------------- */
-
-text.lower = function(str) {
-  if (typeof str != 'string') return null
-  return _toLowerCase.call(str)
-}
-
-text.upper = function(str) {
-  if (typeof str != 'string') return null
-  return _toUpperCase.call(str)
-}
-
-text.trim = function(str, reject) {
-  if (typeof str != 'string') return null
-  if (reject == null) return _trim.call(str)
-  
-  // Custom trim with reject characters
-  var start = 0
-  var end = str.length
-  
-  while (start < end && reject.indexOf(str[start]) >= 0) start++
-  while (end > start && reject.indexOf(str[end - 1]) >= 0) end--
-  
-  return _substring.call(str, start, end)
-}
-
-text.normalize = function(str) {
-  if (typeof str != 'string') return null
-  return _normalize.call(str, 'NFC')
-}
-
-text.codepoint = function(str) {
-  if (typeof str != 'string' || str.length == 0) return null
-  return _codePointAt.call(str, 0)
-}
-
-text.search = function(str, target, from) {
-  if (typeof str != 'string') return null
-  if (typeof target != 'string') return null
-  
-  if (from == null) from = 0
-  if (from < 0) from += str.length
-  if (from < 0) from = 0
-  
-  var result = _indexOf.call(str, target, from)
-  if (result == -1) return null
-  return result
-}
-
-text.replace = function(str, target, replacement, limit) {
-  if (typeof str != 'string') return null
-  if (typeof target != 'string') return null
-  
-  if (limit == null) {
-    // Replace all
-    var result = str
-    var pos = 0
-    while (true) {
-      var idx = _indexOf.call(result, target, pos)
-      if (idx == -1) break
-      
-      var rep = replacement
-      if (typeof replacement == 'function') {
-        rep = replacement(target, idx)
-        if (rep == null) {
-          pos = idx + target.length
-          continue
-        }
-      }
-      
-      result = _substring.call(result, 0, idx) + rep + _substring.call(result, idx + target.length)
-      pos = idx + rep.length
-    }
-    return result
-  }
-  
-  // Replace with limit
-  var result = str
-  var pos = 0
-  var count = 0
-  
-  while (count < limit) {
-    var idx = _indexOf.call(result, target, pos)
-    if (idx == -1) break
-    
-    var rep = replacement
-    if (typeof replacement == 'function') {
-      rep = replacement(target, idx)
-      if (rep == null) {
-        pos = idx + target.length
-        count++
-        continue
-      }
-    }
-    
-    result = _substring.call(result, 0, idx) + rep + _substring.call(result, idx + target.length)
-    pos = idx + rep.length
-    count++
-  }
-  
-  return result
-}
-
-text.format = function(str, collection, transformer) {
-  if (typeof str != 'string') return null
-  
-  var result = ""
-  var i = 0
-  
-  while (i < str.length) {
-    if (str[i] == '{') {
-      var end = _indexOf.call(str, '}', i)
-      if (end == -1) {
-        result += str[i]
-        i++
-        continue
-      }
-      
-      var middle = _substring.call(str, i + 1, end)
-      var colonIdx = _indexOf.call(middle, ':')
-      var key = colonIdx >= 0 ? _substring.call(middle, 0, colonIdx) : middle
-      var formatSpec = colonIdx >= 0 ? _substring.call(middle, colonIdx + 1) : ""
-      
-      var value = null
-      if (isa(collection, array)) {
-        var idx = number(key)
-        if (!isNaN(idx) && idx >= 0 && idx < collection.length) {
-          value = collection[idx]
-        }
-      } else if (isa(collection, object)) {
-        value = collection[key]
-      }
-      
-      var substitution = null
-      
-      if (transformer != null) {
-        if (typeof transformer == 'function') {
-          substitution = transformer(value, formatSpec)
-        } else if (typeof transformer == 'object') {
-          var fn = transformer[formatSpec]
-          if (typeof fn == 'function') {
-            substitution = fn(value)
-          }
-        }
-      }
-      
-      if (substitution == null && typeof value == 'number' && formatSpec) {
-        // Try number formatting
-        substitution = String(value) // simplified
-      }
-      
-      if (substitution == null && value != null) {
-        substitution = String(value)
-      }
-      
-      if (substitution != null) {
-        result += substitution
-      } else {
-        result += _substring.call(str, i, end + 1)
-      }
-      
-      i = end + 1
-    } else {
-      result += str[i]
-      i++
-    }
-  }
-  
-  return result
-}
-
-text.extract = function(str, pattern, from, to) {
-  // Simplified pattern matching - returns null for now
-  // Full implementation would require regex or custom pattern language
-  if (typeof str != 'string') return null
-  return null
-}
-
-return text

link.ce

@@ -17,7 +17,7 @@ var shop = use('internal/shop')
 var fd = use('fd')
 var toml = use('toml')
 
-if (args.length < 1) {
+if (length(args) < 1) {
   log.console("Usage: link <command> [args] or link [package] <target>")
   log.console("Commands:")
   log.console("  list                 List all active links")
@@ -35,25 +35,25 @@ var cmd = args[0]
 if (cmd == 'list') {
   var links = link.load()
   var count = 0
-  for (var k in links) {
+  arrfor(array(links), function(k) {
     log.console(k + " -> " + links[k])
     count++
-  }
+  })
   if (count == 0) log.console("No links.")
   
 } else if (cmd == 'sync') {
   log.console("Syncing links...")
   var result = link.sync_all(shop)
   log.console("Synced " + result.synced + " link(s)")
-  if (result.errors.length > 0) {
+  if (length(result.errors) > 0) {
     log.console("Errors:")
-    for (var i = 0; i < result.errors.length; i++) {
+    for (var i = 0; i < length(result.errors); i++) {
       log.console("  " + result.errors[i])
     }
   }
   
 } else if (cmd == 'delete' || cmd == 'rm') {
-  if (args.length < 2) {
+  if (length(args) < 2) {
     log.console("Usage: link delete <package>")
     $stop()
     return
@@ -92,7 +92,7 @@ if (cmd == 'list') {
   }
   
   var arg1 = args[start_idx]
-  var arg2 = (args.length > start_idx + 1) ? args[start_idx + 1] : null
+  var arg2 = (length(args) > start_idx + 1) ? args[start_idx + 1] : null
   
   if (!arg1) {
     log.console("Error: target or package required")
@@ -108,13 +108,13 @@ if (cmd == 'list') {
     // Resolve target if it's a local path
     if (target == '.' || fd.is_dir(target)) {
       target = fd.realpath(target)
-    } else if (target.startsWith('./') || target.startsWith('../')) {
+    } else if (starts_with(target, './') || starts_with(target, '../')) {
       // Relative path that doesn't exist yet - try to resolve anyway
       var cwd = fd.realpath('.')
-      if (target.startsWith('./')) {
-        target = cwd + target.substring(1)
+      if (starts_with(target, './')) {
+        target = cwd + text(target, 1)
       } else {
-        // For ../ paths, let fd.realpath handle it if possible
+        // For ../ paths, var fd.realpath handle it if possible
         target = fd.realpath(target) || target
       }
     }
@@ -127,7 +127,7 @@ if (cmd == 'list') {
     // Resolve path
     if (target == '.' || fd.is_dir(target)) {
       target = fd.realpath(target)
-    } else if (target.startsWith('./') || target.startsWith('../')) {
+    } else if (starts_with(target, './') || starts_with(target, '../')) {
       target = fd.realpath(target) || target
     }
     
@@ -158,7 +158,7 @@ if (cmd == 'list') {
   }
   
   // Validate: if target is a local path, it must have cell.toml
-  if (target.startsWith('/')) {
+  if (starts_with(target, '/')) {
     if (!fd.is_file(target + '/cell.toml')) {
       log.console("Error: " + target + " is not a valid package (no cell.toml)")
       $stop()
@@ -171,6 +171,7 @@ if (cmd == 'list') {
     link.add(pkg_name, target, shop)
   } catch (e) {
     log.console("Error: " + e.message)
+    log.error(e)
     $stop()
     return
   }

link.cm

@@ -3,7 +3,7 @@
 
 var toml = use('toml')
 var fd = use('fd')
-var utf8 = use('utf8')
+var blob = use('blob')
 var os = use('os')
 
 var global_shop_path = os.global_shop_path
@@ -21,9 +21,9 @@ function get_packages_dir() {
 // return the safe path for the package
 function safe_package_path(pkg) {
   // For absolute paths, replace / with _ to create a valid directory name
-  if (pkg && pkg.startsWith('/'))
-    return pkg.replaceAll('/', '_').replaceAll('@', '_')
-  return pkg.replaceAll('@', '_')
+  if (pkg && starts_with(pkg, '/'))
+    return replace(replace(pkg, '/', '_'), '@', '_')
+  return replace(pkg, '@', '_')
 }
 
 function get_package_abs_dir(package) {
@@ -32,9 +32,9 @@ function get_package_abs_dir(package) {
 
 function ensure_dir(path) {
   if (fd.stat(path).isDirectory) return
-  var parts = path.split('/')
-  var current = path.startsWith('/') ? '/' : ''
-  for (var i = 0; i < parts.length; i++) {
+  var parts = array(path, '/')
+  var current = starts_with(path, '/') ? '/' : ''
+  for (var i = 0; i < length(parts); i++) {
     if (parts[i] == '') continue
     current += parts[i] + '/'
     if (!fd.stat(current).isDirectory) {
@@ -47,7 +47,7 @@ function ensure_dir(path) {
 // If target is a local path (starts with /), return it directly
 // If target is a package name, return the package directory
 function resolve_link_target(target) {
-  if (target.startsWith('/')) {
+  if (starts_with(target, '/')) {
     return target
   }
   // Target is another package - resolve to its directory
@@ -81,34 +81,67 @@ Link.save = function(links) {
   link_cache = links
   var cfg = { links: links }
   var path = get_links_path()
-  fd.slurpwrite(path, utf8.encode(toml.encode(cfg)))
+  var b = blob(toml.encode(cfg))
+  stone(b)
+  fd.slurpwrite(path, b)
 }
 
 Link.add = function(canonical, target, shop) {
   // Validate canonical package exists in shop
   var lock = shop.load_lock()
   if (!lock[canonical]) {
-    throw new Error('Package ' + canonical + ' is not installed. Install it first with: cell get ' + canonical)
+    throw Error('Package ' + canonical + ' is not installed. Install it first with: cell get ' + canonical)
   }
-  
+
   // Validate target is a valid package
-  if (target.startsWith('/')) {
+  if (starts_with(target, '/')) {
     // Local path - must have cell.toml
     if (!fd.is_file(target + '/cell.toml')) {
-      throw new Error('Target ' + target + ' is not a valid package (no cell.toml)')
+      throw Error('Target ' + target + ' is not a valid package (no cell.toml)')
     }
   } else {
     // Remote package target - ensure it's installed
     shop.get(target)
   }
-  
+
   var links = Link.load()
   links[canonical] = target
   Link.save(links)
-  
+
   // Create the symlink immediately
   Link.sync_one(canonical, target, shop)
-  
+
+  // Install dependencies of the linked package
+  // Read the target's cell.toml to find its dependencies
+  var target_path = starts_with(target, '/') ? target : get_package_abs_dir(target)
+  var toml_path = target_path + '/cell.toml'
+  if (fd.is_file(toml_path)) {
+    try {
+      var content = text(fd.slurp(toml_path))
+      var cfg = toml.decode(content)
+      if (cfg.dependencies) {
+        arrfor(array(cfg.dependencies), function(alias) {
+          var dep_locator = cfg.dependencies[alias]
+          // Skip local dependencies that don't exist
+          if (starts_with(dep_locator, '/') && !fd.is_dir(dep_locator)) {
+            log.console("  Skipping missing local dependency: " + dep_locator)
+            return
+          }
+          // Install the dependency if not already in shop
+          try {
+            shop.get(dep_locator)
+            shop.extract(dep_locator)
+          } catch (e) {
+            log.console(`  Warning: Could not install dependency ${dep_locator}: ${e.message}`)
+            log.error(e)
+          }
+        })
+      }
+    } catch (e) {
+      log.console(`  Warning: Could not read dependencies from ${toml_path}`)
+    }
+  }
+
   log.console("Linked " + canonical + " -> " + target)
   return true
 }
@@ -133,12 +166,12 @@ Link.remove = function(canonical) {
 Link.clear = function() {
   // Remove all symlinks first
   var links = Link.load()
-  for (var canonical in links) {
+  arrfor(array(links), function(canonical) {
     var target_dir = get_package_abs_dir(canonical)
     if (fd.is_link(target_dir)) {
       fd.unlink(target_dir)
     }
-  }
+  })
   
   Link.save({})
   log.console("Cleared all links")
@@ -151,7 +184,7 @@ Link.sync_one = function(canonical, target, shop) {
   var link_target = resolve_link_target(target)
 
   // Ensure parent directories exist
-  var parent = target_dir.substring(0, target_dir.lastIndexOf('/'))
+  var parent = fd.dirname(target_dir)
   ensure_dir(parent)
   
   // Check current state
@@ -177,33 +210,59 @@ Link.sync_one = function(canonical, target, shop) {
   return true
 }
 
-// Sync all links - ensure all symlinks are in place
+// Sync all links - ensure all symlinks are in place and dependencies are installed
 Link.sync_all = function(shop) {
   var links = Link.load()
   var count = 0
   var errors = []
-  
-  for (var canonical in links) {
+
+  arrfor(array(links), function(canonical) {
     var target = links[canonical]
     try {
       // Validate target exists
       var link_target = resolve_link_target(target)
       if (!fd.is_dir(link_target)) {
-        errors.push(canonical + ': target ' + link_target + ' does not exist')
-        continue
+        push(errors, canonical + ': target ' + link_target + ' does not exist')
+        return
       }
       if (!fd.is_file(link_target + '/cell.toml')) {
-        errors.push(canonical + ': target ' + link_target + ' is not a valid package')
-        continue
+        push(errors, canonical + ': target ' + link_target + ' is not a valid package')
+        return
       }
-      
+
       Link.sync_one(canonical, target, shop)
+
+      // Install dependencies of the linked package
+      var toml_path = link_target + '/cell.toml'
+      try {
+        var content = text(fd.slurp(toml_path))
+        var cfg = toml.decode(content)
+        if (cfg.dependencies) {
+          arrfor(array(cfg.dependencies), function(alias) {
+            var dep_locator = cfg.dependencies[alias]
+            // Skip local dependencies that don't exist
+            if (starts_with(dep_locator, '/') && !fd.is_dir(dep_locator)) {
+              return
+            }
+            // Install the dependency if not already in shop
+            try {
+              shop.get(dep_locator)
+              shop.extract(dep_locator)
+            } catch (e) {
+              // Silently continue - dependency may already be installed
+            }
+          })
+        }
+      } catch (e) {
+        // Could not read dependencies - continue anyway
+      }
+
       count++
     } catch (e) {
-      errors.push(canonical + ': ' + e.message)
+      push(errors, canonical + ': ' + e.message)
     }
-  }
-  
+  })
+
   return { synced: count, errors: errors }
 }
 
@@ -219,4 +278,15 @@ Link.get_target = function(canonical) {
   return links[canonical] || null
 }
 
+// Get the canonical package name that links to this target (reverse lookup)
+// Returns null if no package links to this target
+Link.get_origin = function(target) {
+  var links = Link.load()
+  var found = null
+  arrfor(array(links), function(origin) {
+    if (links[origin] == target) found = origin
+  })
+  return found
+}
+
 return Link

list.ce

@@ -1,85 +1,169 @@
-// list installed packages
-// cell list -> list packages installed in this package
-// cell list all -> list all packages (including those that are there due to installed packages)
-// cell list package <name> -> list the packages for the package <name>
+// cell list [<scope>] - List packages and dependencies
+//
+// Usage:
+//   cell list              List dependencies of current package
+//   cell list shop         List all packages in shop with status
+//   cell list <locator>    List dependency tree for a package
 
 var shop = use('internal/shop')
 var pkg = use('package')
+var link = use('link')
+var fd = use('fd')
 
 var mode = 'local'
 var target_pkg = null
 
-if (args && args.length > 0) {
-    if (args[0] == 'all') {
-        mode = 'all'
-    } else if (args[0] == 'shop') {
-        mode = 'shop'
-    } else if (args[0] == 'package') {
-        if (args.length < 2) {
-            log.console("Usage: cell list package <name>")
-            $stop()
-            return
-        }
-        mode = 'package'
-        target_pkg = args[1]
-    } else {
-        log.console("Usage:")
-        log.console("  cell list             : list local packages")
-        log.console("  cell list all         : list all recursive packages")
-        log.console("  cell list package <name>: list dependencies of <name>")
-        log.console("  cell list shop        : list all packages in shop")
-        $stop()
-        return
+if (args && length(args) > 0) {
+  if (args[0] == 'shop') {
+    mode = 'shop'
+  } else if (args[0] == '--help' || args[0] == '-h') {
+    log.console("Usage: cell list [<scope>]")
+    log.console("")
+    log.console("List packages and dependencies.")
+    log.console("")
+    log.console("Scopes:")
+    log.console("  (none)     List dependencies of current package")
+    log.console("  shop       List all packages in shop with status")
+    log.console("  <locator>  List dependency tree for a package")
+    $stop()
+  } else {
+    mode = 'package'
+    target_pkg = args[0]
+
+    // Resolve local paths
+    if (target_pkg == '.' || starts_with(target_pkg, './') || starts_with(target_pkg, '../') || fd.is_dir(target_pkg)) {
+      var resolved = fd.realpath(target_pkg)
+      if (resolved) {
+        target_pkg = resolved
+      }
     }
+  }
+}
+
+var links = link.load()
+var lock = shop.load_lock()
+
+function print_deps(ctx, indent) {
+  indent = indent || ""
+  var deps
+  try {
+    deps = pkg.dependencies(ctx)
+  } catch (e) {
+    log.console(indent + "  (could not read dependencies)")
+    return
+  }
+
+  if (!deps) {
+    log.console(indent + "  (none)")
+    return
+  }
+
+  var aliases = array(deps)
+  aliases = sort(aliases)
+
+  if (length(aliases) == 0) {
+    log.console(indent + "  (none)")
+    return
+  }
+
+  for (var i = 0; i < length(aliases); i++) {
+    var alias = aliases[i]
+    var locator = deps[alias]
+    var link_target = links[locator]
+    var lock_entry = lock[locator]
+
+    var line = indent + "  " + alias
+    if (alias != locator) {
+      line += " -> " + locator
+    }
+
+    // Add status indicators
+    var status = []
+    if (link_target) {
+      push(status, "linked -> " + link_target)
+    }
+    if (lock_entry && lock_entry.commit) {
+      push(status, "@" + text(lock_entry.commit, 0, 8))
+    }
+    if (lock_entry && lock_entry.type == 'local') {
+      push(status, "local")
+    }
+    if (!lock_entry) {
+      push(status, "not installed")
+    }
+
+    if (length(status) > 0) {
+      line += " [" + text(status, ", ") + "]"
+    }
+
+    log.console(line)
+  }
 }
 
 if (mode == 'local') {
-    log.console("Installed Packages (Local):")
-    print_deps(null)
+  log.console("Dependencies:")
+  print_deps(null)
 } else if (mode == 'package') {
-    // Resolve alias to canonical package path
-    var canon = shop.get_canonical_package(target_pkg, null)
-    if (!canon) {
-        log.console("Package '" + target_pkg + "' not found in local dependencies.")
-    } else {
-        log.console("Dependencies for " + target_pkg + " (" + canon + "):")
-        print_deps(canon)
-    }
-} else if (mode == 'all') {
-    log.console("All Packages:")
-    var all = shop.list_packages(null)
-    // list_packages returns an array of package strings (locators)
-    // We want to perhaps sort them
-    all.sort()
-    for (var i = 0; i < all.length; i++) {
-        log.console("  " + all[i])
-    }
-    if (all.length == 0) log.console("  (none)")
+  log.console("Dependencies for " + target_pkg + ":")
+  print_deps(target_pkg)
 } else if (mode == 'shop') {
-    log.console("Shop Packages:")
-    var all = shop.list_packages()
-    
-    if (all.length == 0)
-        log.console("  (none)")
-    else
-        all.forEach(package => log.console("  " + package))
-}
+  log.console("Shop packages:")
+  log.console("")
 
-function print_deps(ctx) {
-    var deps = pkg.dependencies(ctx)
-    var aliases = []
-    for (var k in deps) aliases.push(k)
-    aliases.sort()
+  var packages = shop.list_packages()
+  if (length(packages) == 0) {
+    log.console("  (none)")
+  } else {
+    packages = sort(packages)
 
-    if (aliases.length == 0) {
-        log.console("  (none)")
-    } else {
-        for (var i = 0; i < aliases.length; i++) {
-            var alias = aliases[i]
-            var locator = deps[alias]
-            log.console("  " + alias + " -> " + locator)
-        }
+    // Group by type
+    var local_pkgs = []
+    var linked_pkgs = []
+    var remote_pkgs = []
+
+    arrfor(packages, function(p) {
+      if (p == 'core') return
+      var lock_entry = lock[p]
+      var link_target = links[p]
+
+      if (link_target) {
+        push(linked_pkgs, p)
+      } else if (lock_entry && lock_entry.type == 'local') {
+        push(local_pkgs, p)
+      } else {
+        push(remote_pkgs, p)
+      }
+    })
+
+    if (length(linked_pkgs) > 0) {
+      log.console("Linked packages:")
+      arrfor(linked_pkgs, function(p) {
+        var target = links[p]
+        log.console("  " + p + " -> " + target)
+      })
+      log.console("")
     }
+
+    if (length(local_pkgs) > 0) {
+      log.console("Local packages:")
+      arrfor(local_pkgs, function(p) {
+        log.console("  " + p)
+      })
+      log.console("")
+    }
+
+    if (length(remote_pkgs) > 0) {
+      log.console("Remote packages:")
+      arrfor(remote_pkgs, function(p) {
+        var lock_entry = lock[p]
+        var commit = lock_entry && lock_entry.commit ? " @" + text(lock_entry.commit, 0, 8) : ""
+        log.console("  " + p + commit)
+      })
+      log.console("")
+    }
+
+    log.console("Total: " + text(length(packages)) + " package(s)")
+  }
 }
 
 $stop()

ls.ce

@@ -11,22 +11,22 @@ var modules = package.list_modules(pkg)
 var programs = package.list_programs(pkg)
 
 log.console("Modules in " + pkg + ":")
-modules.sort()
-if (modules.length == 0) {
+modules = sort(modules)
+if (length(modules) == 0) {
   log.console("  (none)")
 } else {
-  for (var i = 0; i < modules.length; i++) {
+  for (var i = 0; i < length(modules); i++) {
       log.console("  " + modules[i])
   }
 }
 
 log.console("")
 log.console("Programs in " + pkg + ":")
-programs.sort()
-if (programs.length == 0) {
+programs = sort(programs)
+if (length(programs) == 0) {
   log.console("  (none)")
 } else {
-  for (var i = 0; i < programs.length; i++) {
+  for (var i = 0; i < length(programs); i++) {
       log.console("  " + programs[i])
   }
 }

math/cycles.cm

@@ -1,18 +0,0 @@
-var cycles = {}
-var Math_obj = Math
-
-cycles.arc_cosine = function(x) { return Math_obj.acos(x) / (2 * pi) }
-cycles.arc_sine = function(x) { return Math_obj.asin(x) / (2 * pi) }
-cycles.arc_tangent = function(x) { return Math_obj.atan(x) / (2 * pi) }
-cycles.cosine = function(x) { return Math_obj.cos(x * 2 * pi) }
-cycles.e = Math_obj.E
-cycles.ln = function(x) { return Math_obj.log(x) }
-cycles.log = function(x) { return Math_obj.log10(x) }
-cycles.log2 = function(x) { return Math_obj.log2(x) }
-cycles.power = function(x, y) { return Math_obj.pow(x, y) }
-cycles.root = function(x, y) { return Math_obj.pow(x, 1 / y) }
-cycles.sine = function(x) { return Math_obj.sin(x * 2 * pi) }
-cycles.sqrt = function(x) { return Math_obj.sqrt(x) }
-cycles.tangent = function(x) { return Math_obj.tan(x * 2 * pi) }
-
-return cycles

math/degrees.cm

@@ -1,21 +0,0 @@
-var degrees = {}
-var Math_obj = Math
-
-var deg2rad = pi / 180
-var rad2deg = 180 / pi
-
-return {
-  arc_cosine: function(x) { return Math_obj.acos(x) * rad2deg },
-  arc_sine: function(x) { return Math_obj.asin(x) * rad2deg },
-  arc_tangent: function(x) { return Math_obj.atan(x) * rad2deg },
-  cosine: function(x) { return Math_obj.cos(x * deg2rad) },
-  e: Math_obj.E,
-  ln: function(x) { return Math_obj.log(x) },
-  log: function(x) { return Math_obj.log10(x) },
-  log2: function(x) { return Math_obj.log2(x) },
-  power: function(x, y) { return Math_obj.pow(x, y) },
-  root: function(x, y) { return Math_obj.pow(x, 1/y) },
-  sine: function(x) { return Math_obj.sin(x * deg2rad) },
-  sqrt: function(x) { return Math_obj.sqrt(x) },
-  tangent: function(x) { return Math_obj.tan(x * deg2rad) }
-}

math/radians.cm

@@ -1,17 +0,0 @@
-var Math = globalThis.Math
-
-return {
-  arc_cosine: Math.acos,
-  arc_sine: Math.asin,
-  arc_tangent: Math.atan,
-  cosine: Math.cos,
-  e: Math.E,
-  ln: Math.log,
-  log: Math.log10,
-  log2: Math.log2,
-  power: Math.pow,
-  root: function(x, n) { return Math.pow(x, 1/n) },
-  sine: Math.sin,
-  sqrt: Math.sqrt,
-  tangent: Math.tan
-}

meson.build

@@ -38,12 +38,11 @@ endif
 link_args = link
 sources = []
 src += [        # core
-  'qjs_blob.c',
   'monocypher.c',
   'cell.c',
+  'suite.c',
   'wildmatch.c',
   'qjs_actor.c',
-  'qjs_wota.c',
   'miniz.c',
   'quickjs.c',
   'libregexp.c', 'libunicode.c', 'cutils.c', 'dtoa.c'
@@ -52,17 +51,13 @@ src += [        # core
 src += ['scheduler.c']
 
 scripts = [
-  'internal/nota.c',
   'debug/js.c',
   'qop.c',
   'wildstar.c',
   'fit.c',
   'crypto.c',
-  'internal/text.c',
-  'utf8.c',
   'internal/kim.c',
   'time.c',
-  'internal/nota.c',
   'debug/debug.c',
   'internal/os.c',
   'fd.c',
@@ -70,7 +65,7 @@ scripts = [
   'net/enet.c',
   'wildstar.c',
   'archive/miniz.c',
-  'internal/json.c',
+  'source/cJSON.c'
 ]
 
 foreach file: scripts
@@ -78,7 +73,7 @@ foreach file: scripts
 endforeach
 
 srceng = 'source'
-includes = [srceng, 'internal', 'debug', 'net', 'archive', 'math']
+includes = [srceng, 'internal', 'debug', 'net', 'archive']
 
 foreach file : src
   full_path = join_paths(srceng, file)

net/enet.c

@@ -70,7 +70,7 @@ static JSValue js_enet_host_create(JSContext *ctx, JSValueConst this_val, int ar
 
   JSValue config_obj = argv[0];
   JSValue addr_val = JS_GetPropertyStr(ctx, config_obj, "address");
-  const char *addr_str = JS_IsString(addr_val) ? JS_ToCString(ctx, addr_val) : NULL;
+  const char *addr_str = JS_IsText(addr_val) ? JS_ToCString(ctx, addr_val) : NULL;
   JS_FreeValue(ctx, addr_val);
 
   if (!addr_str)
@@ -145,7 +145,7 @@ static JSValue js_enet_host_service(JSContext *ctx, JSValueConst this_val, int a
   ENetHost *host = JS_GetOpaque(this_val, enet_host_id);
   if (!host) return JS_EXCEPTION;
 
-  if (argc < 1 || !JS_IsFunction(ctx, argv[0])) return JS_ThrowTypeError(ctx, "Expected a callback function as first argument");
+  if (argc < 1 || !JS_IsFunction(argv[0])) return JS_ThrowTypeError(ctx, "Expected a callback function as first argument");
   JSValue callback = JS_DupValue(ctx, argv[0]);
 
   double secs;
@@ -245,7 +245,7 @@ static JSValue js_enet_host_broadcast(JSContext *ctx, JSValueConst this_val, int
   size_t data_len = 0;
   uint8_t *buf = NULL;
 
-  if (JS_IsString(argv[0])) {
+  if (JS_IsText(argv[0])) {
     data_str = JS_ToCStringLen(ctx, &data_len, argv[0]);
     if (!data_str) return JS_EXCEPTION;
   } else if (js_is_blob(ctx,argv[0])) {
@@ -310,7 +310,7 @@ static JSValue js_enet_peer_send(JSContext *ctx, JSValueConst this_val, int argc
   size_t data_len = 0;
   uint8_t *buf = NULL;
 
-  if (JS_IsString(argv[0])) {
+  if (JS_IsText(argv[0])) {
     data_str = JS_ToCStringLen(ctx, &data_len, argv[0]);
     if (!data_str) return JS_EXCEPTION;
   } else if (js_is_blob(ctx,argv[0])) {
@@ -437,8 +437,8 @@ static const JSCFunctionListEntry js_enet_host_funcs[] = {
   JS_CFUNC_DEF("connect", 2, js_enet_host_connect),
   JS_CFUNC_DEF("flush", 0, js_enet_host_flush),
   JS_CFUNC_DEF("broadcast", 1, js_enet_host_broadcast),
-  JS_CGETSET_DEF("port", js_enet_host_get_port, NULL),
-  JS_CGETSET_DEF("address", js_enet_host_get_address, NULL),
+//  JS_CGETSET_DEF("port", js_enet_host_get_port, NULL),
+//  JS_CGETSET_DEF("address", js_enet_host_get_address, NULL),
 };
 
 static JSValue js_enet_peer_get_rtt(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
@@ -552,20 +552,20 @@ static const JSCFunctionListEntry js_enet_peer_funcs[] = {
   JS_CFUNC_DEF("ping", 0, js_enet_peer_ping),
   JS_CFUNC_DEF("throttle_configure", 3, js_enet_peer_throttle_configure),
   JS_CFUNC_DEF("timeout", 3, js_enet_peer_timeout),
-  JS_CGETSET_DEF("rtt", js_enet_peer_get_rtt, NULL),
-  JS_CGETSET_DEF("incoming_bandwidth", js_enet_peer_get_incoming_bandwidth, NULL),
-  JS_CGETSET_DEF("outgoing_bandwidth", js_enet_peer_get_outgoing_bandwidth, NULL),
-  JS_CGETSET_DEF("last_send_time", js_enet_peer_get_last_send_time, NULL),
-  JS_CGETSET_DEF("last_receive_time", js_enet_peer_get_last_receive_time, NULL),
-  JS_CGETSET_DEF("mtu", js_enet_peer_get_mtu, NULL),
-  JS_CGETSET_DEF("outgoing_data_total", js_enet_peer_get_outgoing_data_total, NULL),
-  JS_CGETSET_DEF("incoming_data_total", js_enet_peer_get_incoming_data_total, NULL),
-  JS_CGETSET_DEF("rtt_variance", js_enet_peer_get_rtt_variance, NULL),
-  JS_CGETSET_DEF("packet_loss", js_enet_peer_get_packet_loss, NULL),
-  JS_CGETSET_DEF("state", js_enet_peer_get_state, NULL),
-  JS_CGETSET_DEF("reliable_data_in_transit", js_enet_peer_get_reliable_data_in_transit, NULL),
-  JS_CGETSET_DEF("port", js_enet_peer_get_port, NULL),
-  JS_CGETSET_DEF("address", js_enet_peer_get_address, NULL),
+//  JS_CGETSET_DEF("rtt", js_enet_peer_get_rtt, NULL),
+//  JS_CGETSET_DEF("incoming_bandwidth", js_enet_peer_get_incoming_bandwidth, NULL),
+//  JS_CGETSET_DEF("outgoing_bandwidth", js_enet_peer_get_outgoing_bandwidth, NULL),
+//  JS_CGETSET_DEF("last_send_time", js_enet_peer_get_last_send_time, NULL),
+//  JS_CGETSET_DEF("last_receive_time", js_enet_peer_get_last_receive_time, NULL),
+//  JS_CGETSET_DEF("mtu", js_enet_peer_get_mtu, NULL),
+//  JS_CGETSET_DEF("outgoing_data_total", js_enet_peer_get_outgoing_data_total, NULL),
+//  JS_CGETSET_DEF("incoming_data_total", js_enet_peer_get_incoming_data_total, NULL),
+//  JS_CGETSET_DEF("rtt_variance", js_enet_peer_get_rtt_variance, NULL),
+//  JS_CGETSET_DEF("packet_loss", js_enet_peer_get_packet_loss, NULL),
+//  JS_CGETSET_DEF("state", js_enet_peer_get_state, NULL),
+//  JS_CGETSET_DEF("reliable_data_in_transit", js_enet_peer_get_reliable_data_in_transit, NULL),
+//  JS_CGETSET_DEF("port", js_enet_peer_get_port, NULL),
+//  JS_CGETSET_DEF("address", js_enet_peer_get_address, NULL),
 };
 
 JSValue js_enet_use(JSContext *ctx)

net/http.c

@@ -293,7 +293,7 @@ static int par_easycurl_to_memory(char const *url, par_byte **data, int *nbytes)
 // Performs a blocking HTTP GET and returns a QuickJS Blob of the body
 static JSValue js_fetch_picoparser(JSContext *ctx, JSValueConst this_val,
                                    int argc, JSValueConst *argv) {
-  if (argc < 1 || !JS_IsString(argv[0]))
+  if (argc < 1 || !JS_IsText(argv[0]))
     return JS_ThrowTypeError(ctx, "fetch: URL string required");
 
   const char *url = JS_ToCString(ctx, argv[0]);

net/http_playdate.c

@@ -135,7 +135,7 @@ static int parse_url(const char *url, char **host, int *port, char **path, int *
 // Performs a blocking HTTP GET and returns a QuickJS Blob of the body
 static JSValue js_fetch_playdate(JSContext *ctx, JSValueConst this_val,
                                   int argc, JSValueConst *argv) {
-    if (argc < 1 || !JS_IsString(argv[0]))
+    if (argc < 1 || !JS_IsText(argv[0]))
         return JS_ThrowTypeError(ctx, "fetch: URL string required");
     
     if (!pd_network || !pd_network->http) {

net/socket.c

@@ -144,7 +144,7 @@ JSC_CCALL(socket_socket,
     int protocol = 0;
     
     // Parse domain
-    if (JS_IsString(argv[0])) {
+    if (JS_IsText(argv[0])) {
         const char *domain_str = JS_ToCString(js, argv[0]);
         if (strcmp(domain_str, "AF_INET") == 0) domain = AF_INET;
         else if (strcmp(domain_str, "AF_INET6") == 0) domain = AF_INET6;
@@ -156,7 +156,7 @@ JSC_CCALL(socket_socket,
     
     // Parse type
     if (argc > 1) {
-        if (JS_IsString(argv[1])) {
+        if (JS_IsText(argv[1])) {
             const char *type_str = JS_ToCString(js, argv[1]);
             if (strcmp(type_str, "SOCK_STREAM") == 0) type = SOCK_STREAM;
             else if (strcmp(type_str, "SOCK_DGRAM") == 0) type = SOCK_DGRAM;
@@ -297,7 +297,7 @@ JSC_CCALL(socket_send,
         flags = js2number(js, argv[2]);
     }
     
-    if (JS_IsString(argv[1])) {
+    if (JS_IsText(argv[1])) {
         const char *data = JS_ToCStringLen(js, &len, argv[1]);
         sent = send(sockfd, data, len, flags);
         JS_FreeCString(js, data);
@@ -385,7 +385,7 @@ JSC_CCALL(socket_sendto,
         to_len = sizeof(addr);
     }
     
-    if (JS_IsString(argv[1])) {
+    if (JS_IsText(argv[1])) {
         const char *data = JS_ToCStringLen(js, &len, argv[1]);
         sent = sendto(sockfd, data, len, flags, to_addr, to_len);
         JS_FreeCString(js, data);
@@ -525,7 +525,7 @@ JSC_CCALL(socket_setsockopt,
     int optname = 0;
     
     // Parse level
-    if (JS_IsString(argv[1])) {
+    if (JS_IsText(argv[1])) {
         const char *level_str = JS_ToCString(js, argv[1]);
         if (strcmp(level_str, "SOL_SOCKET") == 0) level = SOL_SOCKET;
         else if (strcmp(level_str, "IPPROTO_TCP") == 0) level = IPPROTO_TCP;
@@ -537,7 +537,7 @@ JSC_CCALL(socket_setsockopt,
     }
     
     // Parse option name
-    if (JS_IsString(argv[2])) {
+    if (JS_IsText(argv[2])) {
         const char *opt_str = JS_ToCString(js, argv[2]);
         if (strcmp(opt_str, "SO_REUSEADDR") == 0) optname = SO_REUSEADDR;
         else if (strcmp(opt_str, "SO_KEEPALIVE") == 0) optname = SO_KEEPALIVE;

pack.ce

@@ -14,7 +14,7 @@ var output_name = 'app'
 var target_package = null
 var buildtype = 'debug'
 
-if (args.length < 1) {
+if (length(args) < 1) {
   log.error('Usage: cell pack <package> [options]')
   log.error('')
   log.error('Options:')
@@ -22,30 +22,30 @@ if (args.length < 1) {
   log.error('  -t, --target <target> Cross-compile for target platform')
   log.error('  -b, --buildtype <type> Build type: release, debug, minsize (default: release)')
   log.error('')
-  log.error('Available targets: ' + build.list_targets().join(', '))
+  log.error('Available targets: ' + text(build.list_targets(), ', '))
   $stop()
   return
 }
 
 target_package = args[0]
 
-for (var i = 1; i < args.length; i++) {
+for (var i = 1; i < length(args); i++) {
   if (args[i] == '-t' || args[i] == '--target') {
-    if (i + 1 < args.length) {
+    if (i + 1 < length(args)) {
       target = args[++i]
     } else {
       log.error('-t requires a target')
       $stop()
     }
   } else if (args[i] == '-o' || args[i] == '--output') {
-    if (i + 1 < args.length) {
+    if (i + 1 < length(args)) {
       output_name = args[++i]
     } else {
       log.error('-o requires an output name')
       $stop()
     }
   } else if (args[i] == '-b' || args[i] == '--buildtype') {
-    if (i + 1 < args.length) {
+    if (i + 1 < length(args)) {
       buildtype = args[++i]
       if (buildtype != 'release' && buildtype != 'debug' && buildtype != 'minsize') {
         log.error('Invalid buildtype: ' + buildtype + '. Must be release, debug, or minsize')
@@ -63,7 +63,7 @@ for (var i = 1; i < args.length; i++) {
     log.console('  -t, --target <target> Cross-compile for target platform')
     log.console('  -b, --buildtype <type> Build type: release, debug, minsize (default: release)')
     log.console('')
-    log.console('Available targets: ' + build.list_targets().join(', '))
+    log.console('Available targets: ' + text(build.list_targets(), ', '))
     $stop()
   } else {
     log.error('Unknown option: ' + args[i])
@@ -79,7 +79,7 @@ if (!target) {
 
 if (target && !build.has_target(target)) {
   log.error('Invalid target: ' + target)
-  log.console('Available targets: ' + build.list_targets().join(', '))
+  log.console('Available targets: ' + text(build.list_targets(), ', '))
   $stop()
 }
 
@@ -87,29 +87,29 @@ if (target && !build.has_target(target)) {
 var packages = ['core']
 var deps = pkg_tools.gather_dependencies(target_package)
 
-for (var i = 0; i < deps.length; i++) {
-  packages.push(deps[i])
+for (var i = 0; i < length(deps); i++) {
+  push(packages, deps[i])
 }
-packages.push(target_package)
+push(packages, target_package)
 
 // Remove duplicates
 var unique_packages = []
 var seen = {}
-for (var i = 0; i < packages.length; i++) {
+for (var i = 0; i < length(packages); i++) {
   if (!seen[packages[i]]) {
     seen[packages[i]] = true
-    unique_packages.push(packages[i])
+    push(unique_packages, packages[i])
   }
 }
 packages = unique_packages
 
 log.console('Preparing packages...')
-for (var package of packages) {
-  if (package == 'core') continue
+arrfor(packages, function(package) {
+  if (package == 'core') return
   shop.extract(package)
-}
+})
 
-log.console('Building static binary from ' + text(packages.length) + ' packages: ' + packages.join(', '))
+log.console('Building static binary from ' + text(length(packages)) + ' packages: ' + text(packages, ', '))
 
 try {
   var result = build.build_static(packages, target, output_name, buildtype)

package.cm

@@ -1,17 +1,21 @@
 var package = {}
-
 var fd = use('fd')
 var toml = use('toml')
+var json = use('json')
 var os = use('os')
+var link = use('link')
+
+// Cache for loaded configs to avoid toml re-parsing corruption
+var config_cache = {}
 
 // Convert package name to a safe directory name
 // For absolute paths (local packages), replace / with _ 
 // For remote packages, keep slashes as they use nested directories
 function safe_package_path(pkg) {
   if (!pkg) return pkg
-  if (pkg.startsWith('/'))
-    return pkg.replaceAll('/', '_').replaceAll('@', '_')
-  return pkg.replaceAll('@', '_')
+  if (starts_with(pkg, '/'))
+    return replace(replace(pkg, '/', '_'), '@', '_')
+  return replace(pkg, '@', '_')
 }
 
 function get_path(name)
@@ -20,19 +24,50 @@ function get_path(name)
   if (!name)
     return fd.realpath('.')
   // If name is already an absolute path, use it directly
-  if (name.startsWith('/'))
+  if (starts_with(name, '/'))
     return name
+
+  // Check if this package is linked - if so, use the link target directly
+  // This avoids symlink-related issues with file reading
+  var link_target = link.get_target(name)
+  if (link_target) {
+    // If link target is a local path, use it directly
+    if (starts_with(link_target, '/'))
+      return link_target
+    // Otherwise it's another package name, resolve that
+    return os.global_shop_path + '/packages/' + replace(replace(link_target, '/', '_'), '@', '_')
+  }
+
   // Remote packages use nested directories, so don't transform slashes
-  return os.global_shop_path + '/packages/' + name.replaceAll('@', '_')
+  return os.global_shop_path + '/packages/' + replace(name, '@', '_')
 }
 
 package.load_config = function(name)
 {
   var config_path = get_path(name) + '/cell.toml'
-  if (!fd.is_file(config_path))
-    throw new Error(`${config_path} isn't a path`)
 
-  return toml.decode(text(fd.slurp(config_path)))
+  // Return cached config if available
+  if (config_cache[config_path])
+    return config_cache[config_path]
+
+  if (!fd.is_file(config_path)) {
+    throw Error(`${config_path} does not exist`)
+  }
+
+  var content = text(fd.slurp(config_path))
+  if (!content || length(trim(content)) == 0)
+    return {}
+
+  var result = toml.decode(content)
+  if (!result) {
+    return {}
+  }
+
+  // Deep copy to avoid toml module's shared state bug and cache it
+  result = json.decode(json.encode(result))
+  config_cache[config_path] = result
+
+  return result
 }
 
 package.save_config = function(name, config)
@@ -51,11 +86,11 @@ package.find_alias = function(name, locator)
   var config = package.load_config(name)
   if (!config.dependencies) return null
   
-  for (var alias in config.dependencies)
-    if (config.dependencies[alias] == locator)
-      return alias
-
-  return null
+  var found = null
+  arrfor(array(config.dependencies), function(alias) {
+    if (config.dependencies[alias] == locator) found = alias
+  })
+  return found
 }
 
 package.alias_to_package = function(name, alias)
@@ -95,19 +130,15 @@ package.find_package_dir = function(file)
   var absolute = fd.realpath(file)
   
   var dir = absolute
-  if (fd.is_file(dir)) {
-    var last_slash = dir.lastIndexOf('/')
-    if (last_slash > 0) dir = dir.substring(0, last_slash)
-  }
+  if (fd.is_file(dir))
+    dir = fd.dirname(dir)
   
-  while (dir && dir.length > 0) {
+  while (dir && length(dir) > 0) {
     var toml_path = dir + '/cell.toml'
     if (fd.is_file(toml_path)) {
       return dir
     }
-    var last_slash = dir.lastIndexOf('/')
-    if (last_slash <= 0) break
-    dir = dir.substring(0, last_slash)
+    dir = fd.dirname(dir)
   }
   
   return null
@@ -120,20 +151,27 @@ package.find_package_dir = function(file)
 // Returns null if no alias is found for the given path
 package.split_alias = function(name, path)
 {
-  if (!path || path.length == 0) {
+  if (!path || length(path) == 0) {
     return null
   }
-  
-  var parts = path.split('/')
+
+  var parts = array(path, '/')
   var first_part = parts[0]
-  
-  var config = package.load_config(name)
-  if (config.dependencies && config.dependencies[first_part]) {
-    var dep_locator = config.dependencies[first_part]
-    var remaining_path = parts.slice(1).join('/')
-    return { package: dep_locator, path: remaining_path }
+
+  try {
+    var config = package.load_config(name)
+    if (!config) return null
+
+    var deps = config.dependencies
+    if (deps && deps[first_part]) {
+      var dep_locator = deps[first_part]
+      var remaining_path = text(array(parts, 1), '/')
+      return { package: dep_locator, path: remaining_path }
+    }
+  } catch (e) {
+    // Config doesn't exist or couldn't be loaded
   }
-  
+
   return null
 }
 
@@ -149,13 +187,13 @@ package.gather_dependencies = function(name)
     var deps = package.dependencies(pkg_name)
     if (!deps) return
     
-    for (var alias in deps) {
+    arrfor(array(deps), function(alias) {
       var locator = deps[alias]
       if (!all_deps[locator]) {
         all_deps[locator] = true
         gather_recursive(locator)
       }
-    }
+    })
   }
   
   gather_recursive(name)
@@ -171,10 +209,10 @@ package.list_files = function(pkg) {
     var list = fd.readdir(current_dir)
     if (!list) return
     
-    for (var i = 0; i < list.length; i++) {
+    for (var i = 0; i < length(list); i++) {
       var item = list[i]
       if (item == '.' || item == '..') continue
-      if (item.startsWith('.')) continue 
+      if (starts_with(item, '.')) continue 
       
       // Skip build directories in root
 
@@ -185,7 +223,7 @@ package.list_files = function(pkg) {
       if (st.isDirectory) {
         walk(full_path, rel_path)
       } else {
-        files.push(rel_path)
+        push(files, rel_path)
       }
     }
   }
@@ -199,9 +237,9 @@ package.list_files = function(pkg) {
 package.list_modules = function(name) {
   var files = package.list_files(name)
   var modules = []
-  for (var i = 0; i < files.length; i++) {
-    if (files[i].endsWith('.cm')) {
-      modules.push(files[i].substring(0, files[i].length - 3))
+  for (var i = 0; i < length(files); i++) {
+    if (ends_with(files[i], '.cm')) {
+      push(modules, text(files[i], 0, -3))
     }
   }
   return modules
@@ -210,9 +248,9 @@ package.list_modules = function(name) {
 package.list_programs = function(name) {
   var files = package.list_files(name)
   var programs = []
-  for (var i = 0; i < files.length; i++) {
-    if (files[i].endsWith('.ce')) {
-      programs.push(files[i].substring(0, files[i].length - 3))
+  for (var i = 0; i < length(files); i++) {
+    if (ends_with(files[i], '.ce')) {
+      push(programs, text(files[i], 0, -3))
     }
   }
   return programs
@@ -229,13 +267,13 @@ package.get_flags = function(name, flag_type, target) {
   // Base flags
   if (config.compilation && config.compilation[flag_type]) {
     var base = config.compilation[flag_type]
-    flags = flags.concat(base.split(/\s+/).filter(function(f) { return f.length > 0 }))
+    flags = array(flags, filter(array(base, /\s+/), function(f) { return length(f) > 0 }))
   }
   
   // Target-specific flags
   if (target && config.compilation && config.compilation[target] && config.compilation[target][flag_type]) {
     var target_flags = config.compilation[target][flag_type]
-    flags = flags.concat(target_flags.split(/\s+/).filter(function(f) { return f.length > 0 }))
+    flags = array(flags, filter(array(target_flags, /\s+/), function(f) { return length(f) > 0 }))
   }
   
   return flags
@@ -252,31 +290,27 @@ package.get_c_files = function(name, target, exclude_main) {
   // Group files by their base name (without target suffix)
   var groups = {} // base_key -> { generic: file, variants: { target: file } }
   
-  for (var i = 0; i < files.length; i++) {
+  for (var i = 0; i < length(files); i++) {
     var file = files[i]
-    if (!file.endsWith('.c') && !file.endsWith('.cpp')) continue
+    if (!ends_with(file, '.c') && !ends_with(file, '.cpp')) continue
     
-    var ext = file.endsWith('.cpp') ? '.cpp' : '.c'
-    var base = file.substring(0, file.length - ext.length)
-    var dir = ''
-    var name_part = base
-    var slash = base.lastIndexOf('/')
-    if (slash >= 0) {
-      dir = base.substring(0, slash + 1)
-      name_part = base.substring(slash + 1)
-    }
+    var ext = ends_with(file, '.cpp') ? '.cpp' : '.c'
+    var base = text(file, 0, -length(ext))
+    var name_part = fd.basename(base)
+    var dir_part = fd.dirname(base)
+    var dir = (dir_part && dir_part != '.') ? dir_part + '/' : ''
     
     // Check for target suffix
     var is_variant = false
     var variant_target = null
     var generic_name = name_part
     
-    for (var t = 0; t < known_targets.length; t++) {
+    for (var t = 0; t < length(known_targets); t++) {
       var suffix = '_' + known_targets[t]
-      if (name_part.endsWith(suffix)) {
+      if (ends_with(name_part, suffix)) {
         is_variant = true
         variant_target = known_targets[t]
-        generic_name = name_part.substring(0, name_part.length - suffix.length)
+        generic_name = text(name_part, 0, -length(suffix))
         break
       }
     }
@@ -295,7 +329,7 @@ package.get_c_files = function(name, target, exclude_main) {
   
   // Select appropriate file from each group
   var result = []
-  for (var key in groups) {
+  arrfor(array(groups), function(key) {
     var group = groups[key]
     var selected = null
     
@@ -309,14 +343,12 @@ package.get_c_files = function(name, target, exclude_main) {
     if (selected) {
       // Skip main.c if requested
       if (exclude_main) {
-        var basename = selected
-        var s = selected.lastIndexOf('/')
-        if (s >= 0) basename = selected.substring(s + 1)
-        if (basename == 'main.c' || basename.startsWith('main_')) continue
+        var basename = fd.basename(selected)
+        if (basename == 'main.c' || starts_with(basename, 'main_')) return
       }
-      result.push(selected)
+      push(result, selected)
     }
-  }
+  })
   
   return result
 }

parseq.cm

@@ -1,224 +0,0 @@
-// parseq.js (Misty edition)
-// Douglas Crockford → adapted for Misty by ChatGPT, 2025‑05‑29
-// Better living thru eventuality!
-
-/*
-  The original parseq.js relied on the browser's setTimeout and ran in
-  milliseconds. In Misty we may be given an optional @.delay capability
-  (arguments[0]) and time limits are expressed in **seconds**. This rewrite
-  removes the setTimeout dependency, uses the @.delay capability when it is
-  present, and provides the factories described in the Misty specification:
-
-     fallback, par_all, par_any, race, sequence
-
-  Each factory returns a **requestor** function as described by the spec.
-*/
-
-def delay = arg[0] // may be null
-
-// ———————————————————————————————————————— helpers
-
-function make_reason (factory, excuse, evidence) {
-  def reason = new Error(`parseq.${factory}${excuse ? ': ' + excuse : ''}`)
-  reason.evidence = evidence
-  return reason
-}
-
-function is_requestor (fn) {
-  return typeof fn == 'function' && (fn.length == 1 || fn.length == 2)
-}
-
-function check_requestors (list, factory) {
-  if (!isa(list, array) || list.some(r => !is_requestor(r)))
-    throw make_reason(factory, 'Bad requestor list.', list)
-}
-
-function check_callback (cb, factory) {
-  if (typeof cb != 'function' || cb.length != 2)
-    throw make_reason(factory, 'Not a callback.', cb)
-}
-
-function schedule (fn, seconds) {
-  if (seconds == null || seconds <= 0) return fn()
-  if (typeof delay == 'function') return delay(fn, seconds)
-  throw make_reason('schedule', '@.delay capability required for timeouts.')
-}
-
-// ———————————————————————————————————————— core runner
-
-function run (factory, requestors, initial, action, time_limit, throttle = 0) {
-  let cancel_list = new Array(requestors.length)
-  let next = 0
-  let timer_cancel
-
-  function cancel (reason = make_reason(factory, 'Cancel.')) {
-    if (timer_cancel) timer_cancel(), timer_cancel = null
-    if (!cancel_list) return
-    cancel_list.forEach(c => { try { if (typeof c == 'function') c(reason) } catch (_) {} })
-    cancel_list = null
-  }
-
-  function start_requestor (value) {
-    if (!cancel_list || next >= requestors.length) return
-    let idx = next++
-    def req = requestors[idx]
-
-    try {
-      cancel_list[idx] = req(function req_cb (val, reason) {
-        if (!cancel_list || idx == null) return
-        cancel_list[idx] = null
-        action(val, reason, idx)
-        idx = null
-        if (factory == 'sequence') start_requestor(val)
-        else if (throttle) start_requestor(initial)
-      }, value)
-    } catch (ex) {
-      action(null, ex, idx)
-      idx = null
-      if (factory == 'sequence') start_requestor(value)
-      else if (throttle) start_requestor(initial)
-    }
-  }
-
-  if (time_limit != null) {
-    if (typeof time_limit != 'number' || time_limit < 0)
-      throw make_reason(factory, 'Bad time limit.', time_limit)
-    if (time_limit > 0) timer_cancel = schedule(() => cancel(make_reason(factory, 'Timeout.', time_limit)), time_limit)
-  }
-
-  def concurrent = throttle ? number.min(throttle, requestors.length) : requestors.length
-  for (let i = 0; i < concurrent; i++) start_requestor(initial)
-
-  return cancel
-}
-
-// ———————————————————————————————————————— factories
-
-function _normalize (collection, factory) {
-  if (isa(collection)) return { names: null, list: collection }
-  if (collection && typeof collection == 'object') {
-    def names = array(collection)
-    def list = names.map(k => collection[k]).filter(is_requestor)
-    return { names, list }
-  }
-  throw make_reason(factory, 'Expected array or record.', collection)
-}
-
-function _denormalize (names, list) {
-  if (!names) return list
-  def obj = meme(null)
-  names.forEach((k, i) => { obj[k] = list[i] })
-  return obj
-}
-
-function par_all (collection, time_limit, throttle) {
-  def factory = 'par_all'
-  def { names, list } = _normalize(collection, factory)
-  if (list.length == 0) return (cb, v) => cb(names ? {} : [])
-  check_requestors(list, factory)
-
-  return function par_all_req (cb, initial) {
-    check_callback(cb, factory)
-    let pending = list.length
-    def results = new Array(list.length)
-
-    def cancel = run(factory, list, initial, (val, reason, idx) => {
-      if (val == null) {
-        cancel(reason)
-        return cb(null, reason)
-      }
-      results[idx] = val
-      if (--pending == 0) cb(_denormalize(names, results))
-    }, time_limit, throttle)
-
-    return cancel
-  }
-}
-
-function par_any (collection, time_limit, throttle) {
-  def factory = 'par_any'
-  def { names, list } = _normalize(collection, factory)
-  if (list.length == 0) return (cb, v) => cb(names ? {} : [])
-  check_requestors(list, factory)
-
-  return function par_any_req (cb, initial) {
-    check_callback(cb, factory)
-    let pending = list.length
-    def successes = new Array(list.length)
-
-    def cancel = run(factory, list, initial, (val, reason, idx) => {
-      pending--
-      if (val != null) successes[idx] = val
-      if (successes.some(v => v != null)) {
-        if (!pending) cancel(make_reason(factory, 'Finished.'))
-        return cb(_denormalize(names, successes.filter(v => v != null)))
-      }
-      if (!pending) cb(null, make_reason(factory, 'No successes.'))
-    }, time_limit, throttle)
-
-    return cancel
-  }
-}
-
-function race (list, time_limit, throttle) {
-  def factory = throttle == 1 ? 'fallback' : 'race'
-  if (!isa(list, array) || list.length == 0)
-    throw make_reason(factory, 'No requestors.')
-  check_requestors(list, factory)
-
-  return function race_req (cb, initial) {
-    check_callback(cb, factory)
-    let done = false
-    def cancel = run(factory, list, initial, (val, reason, idx) => {
-      if (done) return
-      if (val != null) {
-        done = true
-        cancel(make_reason(factory, 'Loser.', idx))
-        cb(val)
-      } else if (--list.length == 0) {
-        done = true
-        cancel(reason)
-        cb(null, reason)
-      }
-    }, time_limit, throttle)
-    return cancel
-  }
-}
-
-function fallback (list, time_limit) {
-  return race(list, time_limit, 1)
-}
-
-function sequence (list, time_limit) {
-  def factory = 'sequence'
-  if (!isa(list, array)) throw make_reason(factory, 'Not an array.', list)
-  check_requestors(list, factory)
-  if (list.length == 0) return (cb, v) => cb(v)
-
-  return function sequence_req (cb, initial) {
-    check_callback(cb, factory)
-    let idx = 0
-
-    function next (value) {
-      if (idx >= list.length) return cb(value)
-      try {
-        list[idx++](function seq_cb (val, reason) {
-          if (val == null) return cb(null, reason)
-          next(val)
-        }, value)
-      } catch (ex) {
-        cb(null, ex)
-      }
-    }
-
-    next(initial)
-  }
-}
-
-return {
-  fallback,
-  par_all,
-  par_any,
-  race,
-  sequence
-}

plan.md

@@ -0,0 +1,338 @@
+# Cell/QuickJS Refactoring Plan: Remove Atoms, Shapes, and Dual-Encoding
+
+## Overview
+
+Refactor `source/quickjs.c` to match `docs/memory.md` specification:
+- Remove JSAtom system (171 references → ~41 remaining)
+- Remove JSShape system (94 references) ✓
+- Remove IC caches (shape-based inline caches) ✓
+- Remove `is_wide_char` dual-encoding (18 locations) ✓
+- Use JSValue texts directly as property keys
+- Reference: `mquickjs.c` shows the target pattern
+
+## Completed Phases
+
+### Phase 1: Remove is_wide_char Remnants ✓
+### Phase 2: Remove IC Caches ✓
+### Phase 3: Remove JSShape System ✓
+### Phase 4: Complete Property Access with JSValue Keys ✓
+
+Completed:
+- Removed JS_GC_OBJ_TYPE_JS_OBJECT fallbacks from OP_get_field
+- Removed JS_GC_OBJ_TYPE_JS_OBJECT fallbacks from OP_put_field
+- Removed JS_GC_OBJ_TYPE_JS_OBJECT fallbacks from OP_define_field
+- Created emit_key() function that adds JSValue to cpool and emits index
+
+---
+
+## Phase 5: Convert JSAtom to JSValue Text (IN PROGRESS)
+
+This is the core transformation. All identifier handling moves from atoms to JSValue.
+
+### Completed Items
+
+**Token and Parser Infrastructure:**
+- [x] Change JSToken.u.ident.atom to JSToken.u.ident.str (JSValue)
+- [x] Change parse_ident() to return JSValue
+- [x] Create emit_key() function (cpool-based)
+- [x] Create JS_KEY_* macros for common names (lines ~279-335 in quickjs.c)
+- [x] Update all token.u.ident.atom references to .str
+- [x] Create keyword lookup table (js_keywords[]) with string comparison
+- [x] Rewrite update_token_ident() to use js_keyword_lookup()
+- [x] Rewrite is_strict_future_keyword() to use JSValue
+- [x] Update token_is_pseudo_keyword() to use JSValue and js_key_equal()
+
+**Function Declaration Parsing:**
+- [x] Update js_parse_function_decl() signature to use JSValue func_name
+- [x] Update js_parse_function_decl2() to use JSValue func_name throughout
+- [x] Update js_parse_function_check_names() to use JSValue
+- [x] Convert JS_DupAtom/JS_FreeAtom to JS_DupValue/JS_FreeValue in function parsing
+
+**Variable Definition and Lookup:**
+- [x] Update find_global_var() to use JSValue and js_key_equal()
+- [x] Update find_lexical_global_var() to use JSValue
+- [x] Update find_lexical_decl() to use JSValue and js_key_equal()
+- [x] Update js_define_var() to use JSValue
+- [x] Update js_parse_check_duplicate_parameter() to use JSValue and js_key_equal()
+- [x] Update js_parse_destructuring_var() to return JSValue
+- [x] Update js_parse_var() to use JSValue for variable names
+
+**Comparison Helpers:**
+- [x] Create js_key_equal_str() for comparing JSValue with C string literals
+- [x] Update is_var_in_arg_scope() to use js_key_equal/js_key_equal_str
+- [x] Update has_with_scope() to use js_key_equal_str
+- [x] Update closure variable comparisons (cv->var_name) to use js_key_equal_str
+
+**Property Access:**
+- [x] Fix JS_GetPropertyStr to create proper JSValue keys
+- [x] Fix JS_SetPropertyInternal callers to use JS_KEY_* instead of JS_ATOM_*
+
+### JS_KEY_* Macros Added
+
+Compile-time immediate ASCII string constants (≤7 chars):
+```c
+JS_KEY_empty, JS_KEY_name, JS_KEY_message, JS_KEY_stack,
+JS_KEY_errors, JS_KEY_Error, JS_KEY_cause, JS_KEY_length,
+JS_KEY_value, JS_KEY_get, JS_KEY_set, JS_KEY_raw,
+JS_KEY_flags, JS_KEY_source, JS_KEY_exec, JS_KEY_toJSON,
+JS_KEY_eval, JS_KEY_this, JS_KEY_true, JS_KEY_false,
+JS_KEY_null, JS_KEY_NaN, JS_KEY_default, JS_KEY_index,
+JS_KEY_input, JS_KEY_groups, JS_KEY_indices, JS_KEY_let,
+JS_KEY_var, JS_KEY_new, JS_KEY_of, JS_KEY_yield,
+JS_KEY_async, JS_KEY_target, JS_KEY_from, JS_KEY_meta,
+JS_KEY_as, JS_KEY_with
+```
+
+Runtime macro for strings >7 chars:
+```c
+#define JS_KEY_STR(ctx, str) JS_NewStringLen((ctx), (str), sizeof(str) - 1)
+```
+
+Helper function for comparing JSValue with C string literals:
+```c
+static JS_BOOL js_key_equal_str(JSValue a, const char *str);
+```
+
+### Remaining Work
+
+#### 5.3 Update js_parse_property_name() ✓
+- [x] Change return type from JSAtom* to JSValue*
+- [x] Update all callers (js_parse_object_literal, etc.)
+- [x] Updated get_lvalue(), put_lvalue(), js_parse_destructuring_element()
+
+#### 5.4 Replace remaining emit_atom() calls with emit_key() ✓
+- [x] Removed emit_atom wrapper function
+- [x] Changed last emit_atom(JS_ATOM_this) to emit_key(JS_KEY_this)
+
+#### 5.5 Update Variable Opcode Format in quickjs-opcode.h
+- [ ] Change `atom` format opcodes to `key` format
+- [ ] Change `atom_u8` and `atom_u16` to `key_u8` and `key_u16`
+
+#### 5.6 Update VM Opcode Handlers ✓
+These now read cpool indices and look up JSValue:
+- [x] OP_check_var, OP_get_var_undef, OP_get_var
+- [x] OP_put_var, OP_put_var_init, OP_put_var_strict
+- [x] OP_set_name, OP_make_var_ref, OP_delete_var
+- [x] OP_define_var, OP_define_func, OP_throw_error
+- [x] OP_make_loc_ref, OP_make_arg_ref
+- [x] OP_define_method, OP_define_method_computed
+
+#### 5.7 Update resolve_scope_var() ✓
+- [x] Changed signature to use JSValue var_name
+- [x] Updated all comparisons to use js_key_equal()/js_key_equal_str()
+- [x] Updated var_object_test() to use JSValue
+- [x] Updated optimize_scope_make_global_ref() to use JSValue
+- [x] Updated resolve_variables() callers to read from cpool
+
+#### 5.8 Convert Remaining JS_ATOM_* Usages
+Categories remaining:
+- Some debug/print functions still use JSAtom
+- Some function signatures not yet converted
+- Will be addressed in Phase 7 cleanup
+
+---
+
+## Phase 6: Update Bytecode Serialization ✓
+
+### 6.1 JS_WriteObjectTag Changes ✓
+- [x] Changed JS_WriteObjectTag to use bc_put_key() directly for property keys
+- [x] Removed JS_ValueToAtom/bc_put_atom path (was broken anyway)
+- [x] cpool values serialized via JS_WriteObjectRec()
+
+### 6.2 JS_ReadObject Changes ✓
+- [x] Changed JS_ReadObjectTag to use bc_get_key() for property keys
+- [x] Uses JS_SetPropertyInternal with JSValue keys
+
+### 6.3 Opcode Format Updates ✓
+- [x] Added OP_FMT_key_u8, OP_FMT_key_u16, OP_FMT_key_label_u16 formats
+- [x] Updated variable opcodes to use key formats instead of atom formats
+- [x] Updated bc_byte_swap() to handle new key formats
+- [x] Updated JS_WriteFunctionBytecode() to skip key format opcodes
+- [x] Updated JS_ReadFunctionBytecode() to skip key format opcodes
+
+### 6.4 Version Bump ✓
+- [x] Incremented BC_VERSION from 5 to 6
+
+---
+
+## Phase 7: Final Cleanup ✓
+
+### 7.1 Additional Parser/Compiler Fixes ✓
+- [x] Fixed TOK_IDENT case to use JSValue name, JS_DupValue, emit_key
+- [x] Fixed TOK_TRY catch clause to use JSValue name
+- [x] Fixed js_parse_statement_or_decl label_name to use JSValue
+- [x] Fixed OP_scope_get_var "eval" check to use js_key_equal_str
+- [x] Fixed js_parse_delete to use JSValue for name comparison
+- [x] Fixed JSON parsing to use js_key_from_string for property names
+- [x] Added js_key_from_string() helper function
+- [x] Added JS_KEY__ret_, JS_KEY__eval_, JS_KEY__var_ for internal names
+- [x] Updated add_closure_var, get_closure_var2, get_closure_var to use JSValue var_name
+- [x] Updated set_closure_from_var to use JS_DupValue
+- [x] Updated add_closure_variables to use JS_DupValue
+- [x] Updated instantiate_hoisted_definitions to use fd_cpool_add for keys
+- [x] Updated resolve_variables to use js_key_equal and fd_cpool_add
+
+### 7.1.1 Property Access and Runtime Fixes ✓
+- [x] Fixed JS_GetPropertyValue to use js_key_from_string instead of JS_ValueToAtom
+- [x] Fixed JS_GetPropertyKey to use js_key_from_string for string keys
+- [x] Fixed JS_SetPropertyKey to use js_key_from_string for string keys
+- [x] Fixed JS_HasPropertyKey to use js_key_from_string for string keys
+- [x] Fixed JS_DeletePropertyKey to use js_key_from_string for string keys
+- [x] Updated JS_HasProperty signature to take JSValue prop
+- [x] Fixed OP_get_ref_value handler to use JSValue key
+- [x] Fixed OP_put_ref_value handler to use JSValue key
+- [x] Updated free_func_def to use JS_FreeValue for JSValue fields
+
+### 7.2 Remove JSAtom Type and Functions ✓
+- [x] Removed most JS_ATOM_* constants (kept JS_ATOM_NULL, JS_ATOM_END for BC compat)
+- [x] JS_NewAtomString now returns JSValue using js_key_new
+- [x] JS_FreeAtom, JS_DupAtom are stubs (no-op for backward compat)
+- [x] JS_AtomToValue, JS_ValueToAtom are stubs (minimal BC compat)
+- [x] Replaced JS_ATOM_* usages with JS_KEY_* or JS_GetPropertyStr
+
+### 7.3 Additional Runtime Fixes ✓
+- [x] Fixed free_function_bytecode to use JS_FreeValueRT for JSValue fields
+- [x] Fixed JS_SetPropertyFunctionList to use JSValue keys via find_key()
+- [x] Fixed JS_InstantiateFunctionListItem to use JSValue keys
+- [x] Fixed internalize_json_property to use JSValue names
+- [x] Fixed emit_break and push_break_entry to use JSValue label_name
+- [x] Implemented JS_Invoke to use JSValue method key
+
+### 7.4 Remaining Stubs (kept for bytecode backward compatibility)
+- JSAtom typedef (uint32_t) - used in BC serialization
+- JS_ATOM_NULL, JS_ATOM_END - bytecode format markers
+- JS_FreeAtom, JS_DupAtom - no-op stubs
+- JS_FreeAtomRT, JS_DupAtomRT - no-op stubs
+- Legacy BC reader (idx_to_atom array) - for reading old bytecode
+
+---
+
+## Current Build Status
+
+**Build: SUCCEEDS** with warnings (unused variables, labels)
+
+**Statistics:**
+- JS_ATOM_* usages: Minimal (only BC serialization compat)
+- Property access uses JS_KEY_* macros or JS_GetPropertyStr
+- BC_VERSION: 6 (updated for new key-based format)
+
+**What Works:**
+- All property access via JSValue keys
+- Keyword detection via string comparison
+- Function declaration parsing with JSValue names
+- Variable definition with JSValue names
+- Closure variable tracking with JSValue names
+- VM opcode handlers read cpool indices and look up JSValue
+- resolve_scope_var() uses JSValue throughout
+- js_parse_property_name() returns JSValue
+- Bytecode serialization uses bc_put_key/bc_get_key for property keys
+- Variable opcodes use key format (cpool indices)
+- JSON parsing uses JSValue keys
+- Internal variable names use JS_KEY__ret_, JS_KEY__eval_, JS_KEY__var_
+- JS_SetPropertyFunctionList uses JSValue keys
+- JS_Invoke uses JSValue method keys
+- break/continue labels use JSValue
+
+---
+
+## Phase 8: Migrate to New Tagging System (IN PROGRESS)
+
+**Problem**: `JS_VALUE_GET_TAG` returns `JS_TAG_PTR` for all pointers, but ~200 places check for obsolete tags like `JS_TAG_OBJECT`, `JS_TAG_STRING`, `JS_TAG_FUNCTION`, etc., which are never returned. This causes crashes.
+
+**Target Design** (from memory.md):
+- JSValue tags: Only `JS_TAG_INT`, `JS_TAG_PTR`, `JS_TAG_SHORT_FLOAT`, `JS_TAG_SPECIAL`
+- Pointer types determined by `objhdr_t` header at offset 8 in heap objects
+- mist_obj_type: `OBJ_ARRAY(0)`, `OBJ_BLOB(1)`, `OBJ_TEXT(2)`, `OBJ_RECORD(3)`, `OBJ_FUNCTION(4)`, etc.
+
+### 8.1 Unified Heap Object Layout ✓
+- [x] Updated mist_text structure to have objhdr_t at offset 8:
+  ```c
+  typedef struct mist_text {
+    JSRefCountHeader _dummy_header; /* unused, for offset alignment */
+    uint32_t _pad;                  /* padding to align objhdr_t to offset 8 */
+    objhdr_t hdr;                   /* NOW at offset 8, like JSString */
+    word_t length;
+    word_t packed[];
+  } mist_text;
+  ```
+- [x] JSString already has objhdr_t at offset 8
+
+### 8.2 Type-Checking Helper Functions ✓
+Added lowercase internal helpers (to avoid conflict with quickjs.h declarations):
+```c
+static inline JS_BOOL js_is_gc_object(JSValue v) { return JS_IsPtr(v); }
+static inline JSGCObjectTypeEnum js_get_gc_type(JSValue v) {
+  return ((JSGCObjectHeader *)JS_VALUE_GET_PTR(v))->gc_obj_type;
+}
+static inline JS_BOOL js_is_record(JSValue v) {
+  if (!JS_IsPtr(v)) return FALSE;
+  return js_get_gc_type(v) == JS_GC_OBJ_TYPE_RECORD;
+}
+static inline JS_BOOL js_is_array(JSValue v) {
+  if (!JS_IsPtr(v)) return FALSE;
+  return js_get_gc_type(v) == JS_GC_OBJ_TYPE_ARRAY;
+}
+static inline JS_BOOL js_is_function(JSValue v) {
+  if (!JS_IsPtr(v)) return FALSE;
+  return js_get_gc_type(v) == JS_GC_OBJ_TYPE_FUNCTION;
+}
+static inline JS_BOOL js_is_object(JSValue v) {
+  if (!JS_IsPtr(v)) return FALSE;
+  JSGCObjectTypeEnum t = js_get_gc_type(v);
+  return t == JS_GC_OBJ_TYPE_RECORD || t == JS_GC_OBJ_TYPE_ARRAY;
+}
+```
+
+### 8.3 Updated Core Functions ✓
+- [x] Updated JS_IsString to read objhdr_t from offset 8
+- [x] Updated js_key_hash to read objhdr_t from offset 8
+- [x] Updated js_key_equal to read objhdr_t from offset 8
+- [x] Updated __JS_FreeValueRT to use objhdr_type for type dispatch
+- [x] Updated JS_MarkValue, JS_MarkValueEdgeEx for GC
+- [x] Added JS_SetPropertyValue function
+- [x] Changed quickjs.h JS_IsFunction/JS_IsObject from inline to extern declarations
+
+### 8.4 Tag Check Migration (PARTIAL)
+Updated some critical tag checks:
+- [x] Some JS_TAG_OBJECT checks → js_is_object() or js_is_record()
+- [ ] Many more JS_TAG_OBJECT checks remain (~200 total)
+- [ ] JS_TAG_FUNCTION checks → js_is_function()
+- [ ] JS_TAG_STRING checks (some already use JS_IsString)
+
+### 8.5 Remaining Work
+- [ ] Fix ASAN memory corruption error (attempting free on address not malloc'd)
+  - Crash occurs in js_def_realloc during js_realloc_array
+  - Address is 112 bytes inside a JSFunctionDef allocation
+- [ ] Complete remaining ~200 tag check migrations
+- [ ] Add mist_hdr to JSFunction (optional, gc_obj_type already works)
+- [ ] Remove obsolete tag definitions from quickjs.h:
+  - JS_TAG_STRING = -8
+  - JS_TAG_ARRAY = -6
+  - JS_TAG_FUNCTION = -5
+  - JS_TAG_FUNCTION_BYTECODE = -2
+  - JS_TAG_OBJECT = -1
+
+### Current Status
+
+**Build: SUCCEEDS** with warnings
+
+**Runtime: CRASHES** with ASAN error:
+```
+==16122==ERROR: AddressSanitizer: attempting free on address which was not malloc()-ed
+```
+The crash occurs during test execution in `js_def_realloc` called from `js_realloc_array`.
+Root cause not yet identified - likely a pointer being passed to realloc that wasn't allocated with malloc.
+
+---
+
+## Notes
+
+- JSVarDef.var_name is JSValue
+- JSClosureVar.var_name is JSValue
+- JSGlobalVar.var_name is JSValue
+- JSFunctionDef.func_name is JSValue
+- BlockEnv.label_name is JSValue
+- OP_get_field/put_field/define_field already use cpool index format
+- JSRecord with open addressing is fully implemented
+- js_key_hash and js_key_equal work with both immediate and heap text
+- js_key_equal_str enables comparison with C string literals for internal names

playdate/json_playdate.c

@@ -145,12 +145,12 @@ static void encode_js_value(json_encoder *enc, JSContext *js, JSValue val) {
         double d = js2number(js, val);
         if (d == (int)d) enc->writeInt(enc, (int)d);
         else enc->writeDouble(enc, d);
-    } else if (JS_IsString(val)) {
+    } else if (JS_IsText(val)) {
         size_t len;
         const char *str = JS_ToCStringLen(js, &len, val);
         enc->writeString(enc, str, len);
         JS_FreeCString(js, str);
-    } else if (JS_IsArray(js, val)) {
+    } else if (JS_IsArray(val)) {
         encode_js_array(enc, js, val);
     } else if (JS_IsObject(val)) {
         encode_js_object(enc, js, val);