@tutorialkit-rb/cli 0.1.5 → 0.1.7

package/template/cors-proxy/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "cors-proxy",
+  "private": true,
+  "version": "0.0.0",
+  "scripts": {
+    "dev": "wrangler dev",
+    "deploy": "wrangler deploy"
+  },
+  "devDependencies": {
+    "wrangler": "^4.0.0"
+  }
+}

package/template/cors-proxy/src/index.ts

@@ -0,0 +1,87 @@
+interface Env {
+  ALLOWED_HOSTS: string;
+}
+
+export default {
+  async fetch(request: Request, env: Env): Promise<Response> {
+    // Handle CORS preflight
+    if (request.method === 'OPTIONS') {
+      return new Response(null, {
+        headers: corsHeaders(request),
+      });
+    }
+
+    // Extract target URL from query string: /proxy?https://api.example.com/data
+    const url = new URL(request.url);
+    const targetUrl = url.search.slice(1); // Remove leading '?'
+
+    if (!targetUrl) {
+      return new Response(JSON.stringify({ error: 'Missing target URL. Usage: /proxy?https://api.example.com/path' }), {
+        status: 400,
+        headers: { 'content-type': 'application/json', ...corsHeaders(request) },
+      });
+    }
+
+    // Validate target URL
+    let target: URL;
+    try {
+      target = new URL(targetUrl);
+    } catch {
+      return new Response(JSON.stringify({ error: 'Invalid target URL' }), {
+        status: 400,
+        headers: { 'content-type': 'application/json', ...corsHeaders(request) },
+      });
+    }
+
+    // Check allowed hosts
+    if (env.ALLOWED_HOSTS) {
+      const allowed = env.ALLOWED_HOSTS.split(',').map(h => h.trim()).filter(Boolean);
+      if (allowed.length > 0 && !allowed.some(h => target.hostname === h || target.hostname.endsWith(`.${h}`))) {
+        return new Response(JSON.stringify({ error: `Host ${target.hostname} is not allowed` }), {
+          status: 403,
+          headers: { 'content-type': 'application/json', ...corsHeaders(request) },
+        });
+      }
+    }
+
+    // Forward the request
+    const headers = new Headers(request.headers);
+    headers.delete('host');
+    headers.delete('origin');
+    headers.delete('referer');
+
+    try {
+      const response = await fetch(targetUrl, {
+        method: request.method,
+        headers,
+        body: request.method !== 'GET' && request.method !== 'HEAD' ? request.body : undefined,
+      });
+
+      // Return response with CORS headers
+      const responseHeaders = new Headers(response.headers);
+      for (const [k, v] of Object.entries(corsHeaders(request))) {
+        responseHeaders.set(k, v);
+      }
+
+      return new Response(response.body, {
+        status: response.status,
+        statusText: response.statusText,
+        headers: responseHeaders,
+      });
+    } catch (err) {
+      return new Response(JSON.stringify({ error: `Proxy error: ${(err as Error).message}` }), {
+        status: 502,
+        headers: { 'content-type': 'application/json', ...corsHeaders(request) },
+      });
+    }
+  },
+};
+
+function corsHeaders(request: Request): Record<string, string> {
+  return {
+    'access-control-allow-origin': request.headers.get('origin') || '*',
+    'access-control-allow-methods': 'GET, POST, PUT, PATCH, DELETE, OPTIONS',
+    'access-control-allow-headers': request.headers.get('access-control-request-headers') || '*',
+    'access-control-max-age': '86400',
+  };
+}

package/template/cors-proxy/wrangler.toml

@@ -0,0 +1,7 @@
+name = "cors-proxy"
+main = "src/index.ts"
+compatibility_date = "2024-12-01"
+
+[vars]
+# Comma-separated list of allowed target hosts (empty = allow all)
+ALLOWED_HOSTS = "httpbin.org"

package/template/netlify.toml

@@ -0,0 +1,9 @@
+[build]
+  publish = "./dist"
+  command = "# no build needed — built in CI"
+
+[[headers]]
+  for = "/*"
+  [headers.values]
+    Cross-Origin-Embedder-Policy = "require-corp"
+    Cross-Origin-Opener-Policy = "same-origin"

package/template/package.json

@@ -7,7 +7,14 @@
     "astro": "astro",
     "build": "astro check && astro build",
     "build:wasm": "./bin/build-wasm",
+    "build:wasm:clean": "cd ruby-wasm && rm -rf build rubies tmp dist vendor .bundle && cd .. && npm run build:wasm",
+    "build:wasm:base": "./bin/build-ruby-base",
+    "build:wasm:base:clean": "cd ruby-wasm && rm -rf build rubies tmp dist/ruby-base.wasm dist/usr-dir.txt vendor .bundle Gemfile.base.lock && cd .. && npm run build:wasm:base",
+    "pack:wasm": "./bin/build-pack",
+    "pack:wasm:clean": "cd ruby-wasm && rm -rf tmp/gems_bundle dist/ruby.wasm vendor .bundle && rm -f ../public/ruby.wasm ../public/ruby.wasm.hash && cd .. && npm run pack:wasm",
     "dev": "astro dev",
+    "link:local": "./bin/link-local",
+    "unlink:local": "./bin/unlink-local",
     "preview": "astro preview",
     "start": "astro dev"
   },
@@ -15,7 +22,8 @@
     "@codemirror/lang-yaml": "^6.1.2",
     "@codemirror/legacy-modes": "^6.5.1",
     "@nanostores/react": "0.7.2",
-    "@tutorialkit-rb/react": "0.1.5",
+    "@tutorialkit-rb/react": "0.1.7",
+    "@tutorialkit-rb/runtime": "0.1.7",
     "nanostores": "^0.10.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
@@ -23,9 +31,9 @@
   "devDependencies": {
     "@astrojs/check": "^0.7.0",
     "@astrojs/react": "^3.6.0",
-    "@tutorialkit-rb/astro": "0.1.5",
-    "@tutorialkit-rb/theme": "0.1.5",
-    "@tutorialkit-rb/types": "0.1.5",
+    "@tutorialkit-rb/astro": "0.1.7",
+    "@tutorialkit-rb/theme": "0.1.7",
+    "@tutorialkit-rb/types": "0.1.7",
     "@types/mdast": "^4.0.4",
     "@types/node": "^20.14.6",
     "@types/react": "^18.3.3",

package/template/ruby-wasm/Gemfile

@@ -20,3 +20,9 @@ gem "solid_cable"
 gem "image_processing", "~> 1.2"
 
 gem "tzinfo-data"
+
+# Pin json < 2.8 — newer versions redefine rb_hash_bulk_insert as static,
+# which conflicts with Ruby 3.3's headers during WASM cross-compilation.
+gem "json", "< 2.8"
+
+# gem "ruby_llm" — removed; outbound HTTP demo uses Net::HTTP only

package/template/ruby-wasm/Gemfile.base

@@ -0,0 +1,19 @@
+source "https://rubygems.org"
+
+# Pin to match monolithic pipeline's Gemfile.lock. Unpinned, Bundler resolves
+# to the latest (2.8.1), which may differ from the monolithic lockfile (2.7.1).
+gem "js", "2.7.1"
+
+# Gems with C extensions that must be statically linked into the base binary.
+# WASI has no dlopen() — C extensions cannot be loaded at runtime from the
+# filesystem. They must be compiled and linked during `rbwasm build`.
+# Pure Ruby gems are handled by the dynamic packing layer (bin/pack-gems).
+gem "bcrypt", "~> 3.1.7"
+gem "websocket-driver", "~> 0.7"
+
+# Pin to < 2.8: ruby_wasm 2.8+ adds ac_cv_func_chmod=no which causes Ruby
+# to generate its own chmod stub (returns ENOSYS) that shadows wasi-libc's
+# stub (returns ENOTSUP). FileUtils rescues ENOTSUP but not ENOSYS, so
+# `rails new` crashes. Without the flag, wasi-libc's ENOTSUP stub is used
+# and FileUtils handles it — matching the monolithic approach.
+gem "ruby_wasm", "2.7.1", group: :development

package/template/ruby-wasm/Gemfile.base.lock

@@ -0,0 +1,50 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    base64 (0.3.0)
+    bcrypt (3.1.22)
+    js (2.7.1)
+    ruby_wasm (2.7.1)
+    ruby_wasm (2.7.1-aarch64-linux)
+    ruby_wasm (2.7.1-aarch64-linux-musl)
+    ruby_wasm (2.7.1-arm64-darwin)
+    ruby_wasm (2.7.1-x86_64-darwin)
+    ruby_wasm (2.7.1-x86_64-linux)
+    ruby_wasm (2.7.1-x86_64-linux-musl)
+    websocket-driver (0.8.0)
+      base64
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+
+PLATFORMS
+  aarch64-linux
+  aarch64-linux-musl
+  arm64-darwin
+  ruby
+  wasm32-wasi
+  x86_64-darwin
+  x86_64-linux
+  x86_64-linux-musl
+
+DEPENDENCIES
+  bcrypt (~> 3.1.7)
+  js (= 2.7.1)
+  ruby_wasm (= 2.7.1)
+  websocket-driver (~> 0.7)
+
+CHECKSUMS
+  base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
+  bcrypt (3.1.22) sha256=1f0072e88c2d705d94aff7f2c5cb02eb3f1ec4b8368671e19112527489f29032
+  js (2.7.1) sha256=a609ea04ae96f67f2005f339f2400f3a6e52002cadaac59e7718bc63d13d45f0
+  ruby_wasm (2.7.1) sha256=b3c9c6cfab73c3c47924cde88c552487fb2ff15d69f9dff3a812372ea4af1c33
+  ruby_wasm (2.7.1-aarch64-linux) sha256=e4c7984effc226308d245237205a607f88956b4e6cda08c911e411a16ea45b27
+  ruby_wasm (2.7.1-aarch64-linux-musl) sha256=46123cfcc66db9f18c39c640edc26578ce441311dd44051d2f76d4eab289d561
+  ruby_wasm (2.7.1-arm64-darwin) sha256=f46a720d6375ad246c8a19da47dc15aad3ae51e01f893a84b02890d75aac9ce0
+  ruby_wasm (2.7.1-x86_64-darwin) sha256=d41b5e18aa6f5da8aee736e5373305695b6e15db0874d4e3443837c635d7d0e8
+  ruby_wasm (2.7.1-x86_64-linux) sha256=22390b51ae5eb437eb50aff773c89b75cca53188c9bb641265eb128406598d22
+  ruby_wasm (2.7.1-x86_64-linux-musl) sha256=245e75ee1ce23340c2f7a75916a8ddf03ff37fbed1360f23bb19270d38b412fe
+  websocket-driver (0.8.0) sha256=ed0dba4b943c22f17f9a734817e808bc84cdce6a7e22045f5315aa57676d4962
+  websocket-extensions (0.1.5) sha256=1c6ba63092cda343eb53fc657110c71c754c56484aad42578495227d717a8241
+
+BUNDLED WITH
+  4.0.7

package/template/ruby-wasm/Gemfile.lock

@@ -85,6 +85,7 @@ GEM
     erubi (1.13.1)
     et-orbi (1.2.11)
       tzinfo
+    ffi (1.17.1)
     ffi (1.17.1-aarch64-linux-gnu)
     ffi (1.17.1-aarch64-linux-musl)
     ffi (1.17.1-arm-linux-gnu)
@@ -116,6 +117,7 @@ GEM
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     js (2.7.1)
+    json (2.7.6)
     logger (1.7.0)
     loofah (2.24.0)
       crass (~> 1.0.2)
@@ -128,6 +130,7 @@ GEM
     marcel (1.0.4)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
+    mini_portile2 (2.8.9)
     minitest (5.25.5)
     net-imap (0.5.8)
       date
@@ -139,6 +142,9 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
+    nokogiri (1.18.8)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
     nokogiri (1.18.8-aarch64-linux-gnu)
       racc (~> 1.4)
     nokogiri (1.18.8-aarch64-linux-musl)
@@ -268,6 +274,7 @@ PLATFORMS
   arm-linux-gnu
   arm-linux-musl
   arm64-darwin
+  wasm32-wasi
   x86_64-darwin
   x86_64-linux
   x86_64-linux-gnu
@@ -278,6 +285,7 @@ DEPENDENCIES
   image_processing (~> 1.2)
   importmap-rails
   jbuilder
+  json (< 2.8)
   propshaft
   rails (~> 8.0.0)
   solid_cable

package/template/ruby-wasm/bin/pack-gems

@@ -0,0 +1,368 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Cross-compile gems for wasm32-wasi and pack them into a Ruby WASM base
+# binary via wasi-vfs (single-pack strategy).
+#
+# This replaces the monolithic wasmify-rails build with a faster approach:
+# a raw pre-VFS base binary (Ruby + statically-linked C extensions) gets
+# all gems + stdlib + config packed in a single wasi-vfs pass (~30 seconds).
+#
+# The base binary has NO embedded VFS data. This script does the only
+# wasi-vfs pack, mapping three directories: /bundle (gems), /usr (stdlib),
+# /rails-vm (boot config). Uses RubyWasmExt::WasiVfs (bundled in ruby_wasm
+# gem) to ensure version parity with the monolithic pipeline.
+#
+# Usage: bundle exec ruby bin/pack-gems
+#   (called from bin/build-pack orchestrator)
+
+require "bundler/setup"
+require "fileutils"
+require "find"
+
+# Load RubyWasmExt::WasiVfs — the bundled wasi-vfs implementation from the
+# ruby_wasm gem. This ensures version parity with the monolithic pipeline
+# (wasi-vfs 0.5.3-p1 + Wizer 6.0.0) instead of using the Homebrew CLI
+# (wasi-vfs 0.5.5 + Wizer 7.0.0) which produces different binary layouts.
+require "ruby_wasm"
+begin
+  RUBY_VERSION =~ /(\d+\.\d+)/
+  require "ruby_wasm/#{$1}/ruby_wasm.so"
+rescue LoadError
+  require "ruby_wasm/ruby_wasm.so"
+end
+
+# --- Configuration -----------------------------------------------------------
+
+SCRIPT_DIR   = File.expand_path("..", __dir__)
+TMP_DIR      = File.join(SCRIPT_DIR, "tmp", "gems_bundle")
+BUNDLE_DIR   = File.join(TMP_DIR, "bundle")
+RAILS_VM_DIR = File.join(TMP_DIR, "rails-vm")
+OUTPUT_DIR   = File.join(SCRIPT_DIR, "dist")
+OUTPUT_FILE  = File.join(OUTPUT_DIR, "ruby.wasm")
+
+# Gems whose cross-compiled native extensions don't work in WASM.
+# We strip their .so files so Ruby falls back to the stdlib versions
+# compiled into the base WASM binary. We keep gem.build_complete markers
+# so Bundler considers them installed.
+STRIP_EXTENSION_GEMS = %w[nio4r io-console psych bigdecimal date].freeze
+
+# Build-time gems that should not be packed into the WASM VFS.
+# ruby_wasm: provides rbwasm CLI + 23MB native extension for host machine
+# ffi: dependency of ruby_wasm, not WASM-compatible
+# NOTE: wasmify-rails MUST stay — boot.rb requires it at runtime for WASM shims
+EXCLUDE_FROM_PACK = %w[ruby_wasm ffi].freeze
+
+# Paths to strip from the bundle to reduce size
+STRIP_PATTERNS = %w[
+  **/cache/*.gem
+  **/cache/bundler
+  **/*.o
+  **/*.a
+].freeze
+
+# --- Helpers -----------------------------------------------------------------
+
+def human_size(bytes)
+  if bytes < 1024
+    "#{bytes} bytes"
+  elsif bytes < 1024 * 1024
+    "#{(bytes.to_f / 1024).round(1)} KB"
+  else
+    "#{(bytes.to_f / 1024 / 1024).round(1)} MB"
+  end
+end
+
+def find_rbconfig
+  # 1. Shipped rbconfig in this repo (checked-in)
+  shipped = File.join(SCRIPT_DIR, "rbconfig", "wasm32-wasi", "rbconfig.rb")
+  return shipped if File.exist?(shipped)
+
+  # 2. From @tutorialkit-rb/ruby-3.3 npm package
+  npm_pkg = File.join(SCRIPT_DIR, "node_modules", "@tutorialkit-rb", "ruby-3.3",
+                      "rbconfig", "wasm32-wasi", "rbconfig.rb")
+  return npm_pkg if File.exist?(npm_pkg)
+
+  # 3. Fallback: generated by a previous base binary build
+  Dir.glob(File.join(SCRIPT_DIR, "rubies", "*/usr/local/lib/ruby/*/wasm32-wasi/rbconfig.rb")).first
+end
+
+def find_base_wasm
+  # 1. Locally-built custom binary (from bin/build-ruby-base)
+  local = File.join(SCRIPT_DIR, "dist", "ruby-base.wasm")
+  return local if File.exist?(local)
+
+  # 2. From @tutorialkit-rb/ruby-3.3 npm package
+  npm_pkg = File.join(SCRIPT_DIR, "node_modules", "@tutorialkit-rb", "ruby-3.3",
+                      "dist", "ruby-base.wasm")
+  return npm_pkg if File.exist?(npm_pkg)
+
+  $stderr.puts "Error: No base WASM binary found."
+  $stderr.puts "Either run 'bin/build-ruby-base' to build a custom binary,"
+  $stderr.puts "or install @tutorialkit-rb/ruby-3.3 npm package."
+  exit 1
+end
+
+def find_usr_dir
+  # 1. Path recorded by build-ruby-base (local build, single-pack strategy)
+  txt = File.join(SCRIPT_DIR, "dist", "usr-dir.txt")
+  if File.exist?(txt)
+    path = File.read(txt).strip
+    return path if Dir.exist?(path)
+  end
+
+  # 2. From @tutorialkit-rb/ruby-3.3 npm package
+  npm_pkg = File.join(SCRIPT_DIR, "node_modules", "@tutorialkit-rb", "ruby-3.3",
+                      "rubies", "usr")
+  return npm_pkg if Dir.exist?(npm_pkg)
+
+  # 3. Fallback: glob for the rubies/ directory left by rbwasm
+  candidates = Dir.glob(File.join(SCRIPT_DIR, "rubies", "ruby-3.3-wasm32-unknown-wasip1-full-*", "usr"))
+  return candidates.first if candidates.any?
+
+  nil
+end
+
+# --- Main --------------------------------------------------------------------
+
+puts "=== Cross-compiling gems + wasi-vfs pack ==="
+puts
+
+# 1. Find rbconfig
+rbconfig_path = find_rbconfig
+unless rbconfig_path
+  $stderr.puts "Error: Could not find rbconfig.rb for cross-compilation"
+  $stderr.puts "Expected at: rbconfig/wasm32-wasi/rbconfig.rb"
+  $stderr.puts "Or install @tutorialkit-rb/ruby-3.3 npm package."
+  exit 1
+end
+puts "rbconfig: #{rbconfig_path}"
+
+# 2. Find base WASM binary
+base_wasm = find_base_wasm
+puts "base WASM: #{base_wasm} (#{human_size(File.size(base_wasm))})"
+
+# 2b. Find usr/ directory for single-pack /usr mapping
+usr_dir = find_usr_dir
+if usr_dir
+  puts "usr dir:   #{usr_dir} (will map to /usr in wasi-vfs pack)"
+else
+  $stderr.puts "Warning: Could not find usr/ directory for /usr mapping."
+  $stderr.puts "  The packed binary may be missing Ruby stdlib at /usr."
+  $stderr.puts "  Run 'bin/build-ruby-base' or install @tutorialkit-rb/ruby-3.3."
+end
+puts
+
+# 3. Add wasm32-wasi platform to lockfile if missing
+Bundler.with_unbundled_env do
+  lockfile = File.join(SCRIPT_DIR, "Gemfile.lock")
+  if File.exist?(lockfile) && !File.read(lockfile).include?("wasm32-wasi")
+    puts "Adding wasm32-wasi platform to Gemfile.lock..."
+    system("bundle", "lock", "--add-platform", "wasm32-wasi", chdir: SCRIPT_DIR) or abort "Failed to add platform"
+    puts
+  end
+end
+
+# 4. Cross-compile gems into Bundler layout
+puts "Cross-compiling gems..."
+FileUtils.rm_rf(TMP_DIR)
+FileUtils.mkdir_p(TMP_DIR)
+
+# Use a temp config dir so .bundle/config (which sets BUNDLE_PATH=vendor/bundle)
+# doesn't override our BUNDLE_PATH for cross-compilation.
+xcompile_config = File.join(TMP_DIR, ".bundle")
+FileUtils.mkdir_p(xcompile_config)
+
+env = {
+  "BUNDLE_APP_CONFIG" => xcompile_config,
+  "BUNDLE_PATH"       => BUNDLE_DIR,
+  "BUNDLE_FROZEN"     => "true",
+  "BUNDLE_WITHOUT"    => "development:test",
+}
+
+cmd = ["bundle", "install", "--target-rbconfig", rbconfig_path]
+
+Bundler.with_unbundled_env do
+  env.each { |k, v| ENV[k] = v }
+  success = system(*cmd, chdir: SCRIPT_DIR)
+  unless success
+    $stderr.puts "Bundle install (cross-compile) failed"
+    exit 1
+  end
+end
+
+# 5. Strip broken native extensions
+puts
+puts "Stripping incompatible native extensions..."
+
+ext_dir = Dir.glob(File.join(BUNDLE_DIR, "ruby/*/extensions")).first
+if ext_dir
+  STRIP_EXTENSION_GEMS.each do |gem_name|
+    Dir.glob(File.join(ext_dir, "**/#{gem_name}-*")).each do |ext_gem_dir|
+      Dir.glob(File.join(ext_gem_dir, "**/*.so")).each { |so| FileUtils.rm(so) }
+      puts "  Stripped .so: #{gem_name}"
+    end
+  end
+end
+
+# 6. Remove build-time gems that shouldn't be packed into the WASM VFS
+puts
+puts "Removing build-time gems..."
+
+gems_src_dir = Dir.glob(File.join(BUNDLE_DIR, "ruby/*/gems")).first
+if gems_src_dir
+  EXCLUDE_FROM_PACK.each do |gem_name|
+    Dir.glob(File.join(gems_src_dir, "#{gem_name}-*")).each do |gem_dir|
+      size = `du -sh "#{gem_dir}" 2>/dev/null`.split("\t").first rescue "?"
+      FileUtils.rm_rf(gem_dir)
+      puts "  Removed #{File.basename(gem_dir)} (#{size})"
+    end
+  end
+end
+
+# 7. Clean up the bundle to reduce size
+puts
+puts "Cleaning bundle..."
+
+STRIP_PATTERNS.each do |pattern|
+  Dir.glob(File.join(TMP_DIR, pattern)).each do |path|
+    FileUtils.rm_rf(path)
+  end
+end
+
+# Strip build artifacts from gems
+if gems_src_dir
+  Dir.glob(File.join(gems_src_dir, "*")).each do |gem_dir|
+    %w[test spec ext ports gumbo-parser patches sig rakelib samples benchmarks].each do |subdir|
+      path = File.join(gem_dir, subdir)
+      FileUtils.rm_rf(path) if Dir.exist?(path)
+    end
+  end
+end
+
+# 8. Reorganize from Bundler layout to rbwasm layout
+#
+# Bundler layout:   bundle/ruby/3.3.0/gems/<name>/lib/...
+# rbwasm layout:    bundle/gems/<name>/lib/...
+#
+# We move gems out of the ruby/<version> nesting and drop specifications/
+# extensions directories (not needed at runtime with our generated setup.rb).
+puts
+puts "Reorganizing to rbwasm layout..."
+
+bundler_gems_dir = gems_src_dir  # bundle/ruby/3.3.0/gems
+rbwasm_gems_dir = File.join(BUNDLE_DIR, "gems")
+
+if bundler_gems_dir && Dir.exist?(bundler_gems_dir)
+  FileUtils.mkdir_p(rbwasm_gems_dir)
+  Dir.glob(File.join(bundler_gems_dir, "*")).each do |gem_dir|
+    dest = File.join(rbwasm_gems_dir, File.basename(gem_dir))
+    FileUtils.mv(gem_dir, dest)
+  end
+
+  # Remove the now-empty ruby/<version> tree
+  ruby_dir = File.join(BUNDLE_DIR, "ruby")
+  FileUtils.rm_rf(ruby_dir)
+
+  puts "  Moved #{Dir.glob(File.join(rbwasm_gems_dir, '*')).length} gems to bundle/gems/"
+else
+  $stderr.puts "Warning: Could not find Bundler gems directory for reorganization"
+end
+
+# 9. Generate /bundle/setup.rb
+#    Each gem gets its lib/ added to $LOAD_PATH. One exception:
+#    concurrent-ruby uses lib/concurrent-ruby/ as its require path
+#    (the only gem in the Rails dependency tree with this pattern).
+puts
+puts "Generating setup.rb..."
+
+# Gems whose require_path is not the standard "lib"
+CUSTOM_REQUIRE_PATHS = {
+  "concurrent-ruby" => "lib/concurrent-ruby",
+}.freeze
+
+setup_lines = ["# Auto-generated by pack-gems"]
+Dir.glob(File.join(rbwasm_gems_dir, "*")).sort.each do |gem_dir|
+  gem_name = File.basename(gem_dir)
+  # Extract gem base name (without version) for lookup
+  base_name = gem_name.sub(/-\d+(\.\d+)*\z/, "")
+  rpath = CUSTOM_REQUIRE_PATHS.fetch(base_name, "lib")
+  full_path = File.join(gem_dir, rpath)
+  if Dir.exist?(full_path)
+    setup_lines << "$:.unshift File.expand_path(\"/bundle/gems/#{gem_name}/#{rpath}\")"
+  end
+end
+
+setup_rb = File.join(BUNDLE_DIR, "setup.rb")
+File.write(setup_rb, setup_lines.join("\n") + "\n")
+puts "  Generated setup.rb with #{setup_lines.length - 1} gem load paths"
+
+# 10. Prepare /rails-vm/ files
+puts
+puts "Preparing /rails-vm/ files..."
+FileUtils.mkdir_p(RAILS_VM_DIR)
+
+%w[boot.rb Gemfile Gemfile.lock .railsrc].each do |file|
+  src = File.join(SCRIPT_DIR, file)
+  if File.exist?(src)
+    FileUtils.cp(src, RAILS_VM_DIR)
+    puts "  Copied #{file} → rails-vm/"
+  end
+end
+
+# 11. Stage usr/ directory (strip non-runtime files to reduce binary size)
+#
+# The rubies/ directory has the full install tree including bin/ruby (32MB),
+# include/ (headers), and libruby-static.a — none of which are needed at
+# runtime. We create a staging copy with only the runtime lib/ files,
+# matching what rbwasm's remove_non_runtime_files() does.
+usr_staging_dir = nil
+if usr_dir
+  puts
+  puts "Staging usr/ directory (stripping non-runtime files)..."
+  usr_staging_dir = File.join(TMP_DIR, "usr_staging", "usr")
+  FileUtils.rm_rf(File.join(TMP_DIR, "usr_staging"))
+  FileUtils.mkdir_p(usr_staging_dir)
+
+  # Copy only local/lib/ and local/share/ (runtime files)
+  %w[local/lib local/share].each do |subdir|
+    src = File.join(usr_dir, subdir)
+    if Dir.exist?(src)
+      dest = File.join(usr_staging_dir, subdir)
+      FileUtils.mkdir_p(File.dirname(dest))
+      FileUtils.cp_r(src, dest)
+    end
+  end
+
+  # Remove libruby-static.a (not needed at runtime)
+  Dir.glob(File.join(usr_staging_dir, "**/libruby-static.a")).each do |f|
+    FileUtils.rm(f)
+  end
+
+  staged_size = `du -sh "#{usr_staging_dir}" 2>/dev/null`.split("\t").first rescue "?"
+  puts "  Staged usr/ size: #{staged_size} (stripped bin/, include/, libruby-static.a)"
+end
+
+# 12. Pack via RubyWasmExt::WasiVfs (bundled in ruby_wasm gem)
+#
+# Uses the same wasi-vfs implementation as the monolithic pipeline
+# (RubyWasmExt::WasiVfs from ruby_wasm 2.7.1, which bundles wasi-vfs 0.5.3
+# and Wizer 6.0.0) instead of shelling out to the Homebrew wasi-vfs CLI
+# (v0.5.5 + Wizer 7.0.0). This ensures identical binary layout.
+puts
+puts "Packing with RubyWasmExt::WasiVfs (bundled wasi-vfs)..."
+
+FileUtils.mkdir_p(OUTPUT_DIR)
+
+wasi_vfs = RubyWasmExt::WasiVfs.new
+wasi_vfs.map_dir("/bundle", BUNDLE_DIR)
+wasi_vfs.map_dir("/rails-vm", RAILS_VM_DIR)
+wasi_vfs.map_dir("/usr", usr_staging_dir) if usr_staging_dir
+
+wasm_bytes = wasi_vfs.pack(File.binread(base_wasm))
+File.binwrite(OUTPUT_FILE, wasm_bytes)
+
+puts
+puts "=== Pack Complete ==="
+puts "  Output: #{OUTPUT_FILE}"
+puts "  Size:   #{human_size(File.size(OUTPUT_FILE))}"

package/template/ruby-wasm/package.json

@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "optionalDependencies": {
+    "@tutorialkit-rb/ruby-3.3": "^3.3.0"
+  }
+}