kobako 0.14.0 → 0.16.0

data/crates/kobako-wasmtime/src/frames.rs

@@ -18,11 +18,11 @@ use kobako_runtime::profile::Profile;
 
 /// Return the resolved `memory` export handle, or a `Trap` when the loaded
 /// module exports no linear memory — the "not a Kobako-shaped runtime"
-/// failure mode (`SANDBOX_RUNTIME_NOT_KOBAKO`).
+/// failure mode (`guest_mem::SANDBOX_RUNTIME_NOT_KOBAKO`).
 fn require_memory(exports: &Exports) -> Result<Memory, Trap> {
     exports
         .memory
-        .ok_or_else(|| Trap::Other(SANDBOX_RUNTIME_NOT_KOBAKO.to_string()))
+        .ok_or_else(|| Trap::Other(guest_mem::SANDBOX_RUNTIME_NOT_KOBAKO.to_string()))
 }
 
 /// Allocate a `len`-byte buffer in guest linear memory via
@@ -160,13 +160,6 @@ pub(crate) fn fetch_outcome_bytes(
 const SANDBOX_RUNTIME_MISSING_HOOKS: &str = "Sandbox runtime is missing required hooks; \
      rebuild data/kobako.wasm against the installed version";
 
-/// User-facing message for the "the loaded Wasm module is not a
-/// Kobako-shaped runtime at all" failure mode (no linear memory
-/// export). Same phrasing philosophy as
-/// `SANDBOX_RUNTIME_MISSING_HOOKS`.
-const SANDBOX_RUNTIME_NOT_KOBAKO: &str =
-    "the loaded Wasm module is not a Kobako-compatible runtime";
-
 /// Return the resolved `TypedFunc` for an ABI export, or a `Trap`
 /// (boundary → `Kobako::TrapError`) when the option is `None`. Both
 /// run-path methods (`#eval`, `#run`) plus the `build_snapshot` readout

data/crates/kobako-wasmtime/src/guest_mem.rs

@@ -44,6 +44,13 @@ impl Yielder for CallerYielder<'_, '_> {
 const RUNTIME_INCOMPATIBLE: &str =
     "the Sandbox runtime is incompatible; rebuild data/kobako.wasm against the installed version";
 
+/// User-facing message for the "the loaded Wasm module is not a
+/// Kobako-shaped runtime at all" failure mode — no linear memory export
+/// here, no `memory` module export on the instantiation path in
+/// `frames`. One constant so the two detection sites cannot drift.
+pub(crate) const SANDBOX_RUNTIME_NOT_KOBAKO: &str =
+    "the loaded Wasm module is not a Kobako-compatible runtime";
+
 /// Resolve the guest's exported linear `memory`. The lookup shape (and its
 /// diagnostic) is shared by every Caller-based path here — the write side
 /// (`alloc_and_write`), the read side (`read`), and the yield round-trip
@@ -52,7 +59,7 @@ const RUNTIME_INCOMPATIBLE: &str =
 fn memory_export(caller: &mut Caller<'_, Invocation>) -> Result<Memory, &'static str> {
     match caller.get_export("memory") {
         Some(Extern::Memory(m)) => Ok(m),
-        _ => Err("the loaded Wasm module is not a Kobako-compatible runtime"),
+        _ => Err(SANDBOX_RUNTIME_NOT_KOBAKO),
     }
 }
 

data/crates/kobako-wasmtime/src/trap.rs

@@ -42,60 +42,29 @@ pub(crate) fn epoch_deadline_callback(
     }
 }
 
-/// Configured-cap path classification for a wasmtime error. The
-/// downcast logic stays in a pure helper so the `Trap` kind routing
-/// can be exercised from `cargo test` without any frontend.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum TrapClass {
-    /// Wall-clock cap path.
-    Timeout,
-    /// Linear-memory cap path.
-    MemoryLimit,
-    /// Any other wasmtime error — surfaces as the base `Trap::Other`.
-    Other,
-}
-
-/// Inspect a wasmtime error to decide which neutral trap kind it
-/// belongs to. Pure function — operates on the error's downcast chain
-/// only, no frontend state required.
-fn classify_trap(err: &wasmtime::Error) -> TrapClass {
-    if err.downcast_ref::<TimeoutTrap>().is_some() {
-        TrapClass::Timeout
-    } else if err.downcast_ref::<MemoryLimitTrap>().is_some() {
-        TrapClass::MemoryLimit
-    } else {
-        TrapClass::Other
-    }
-}
-
-/// Classify a wasmtime call error into a neutral `Trap`. The ABI export
-/// symbol (`__kobako_eval` / `__kobako_run`) is deliberately omitted from
-/// the message — the Sandbox layer attaches the user-facing verb
+/// Classify a wasmtime call error into a neutral `Trap`. Pure function
+/// over the error's downcast chain, so the kind routing is exercisable
+/// from `cargo test` without any frontend. The ABI export symbol
+/// (`__kobako_eval` / `__kobako_run`) is deliberately omitted from the
+/// message — the Sandbox layer attaches the user-facing verb
 /// (`Sandbox#eval` / `Sandbox#run`) so the message reads in caller
 /// vocabulary rather than ABI vocabulary.
 ///
-/// For the configured-cap paths (`TrapClass::Timeout` /
-/// `TrapClass::MemoryLimit`) the trap's own `std::fmt::Display`
+/// For the configured-cap paths the trap's own `std::fmt::Display`
 /// carries the user-facing reason (`"wall-clock deadline exceeded"`,
-/// `"linear memory growth exceeded memory_limit: ..."`). The wasmtime
-/// outer wrapper at `format!("{err}")` would otherwise surface only
-/// the `"error while executing at wasm backtrace: ..."` framing, which
-/// is operator noise on a cap trap. For `TrapClass::Other` the framing
-/// is kept but the chain's root cause is appended (see
-/// `other_trap_message`) so the real trap reason survives.
+/// `"linear memory growth exceeded memory_limit: ..."`); the wasmtime
+/// outer wrapper would otherwise surface only the `"error while
+/// executing at wasm backtrace: ..."` framing, which is operator noise
+/// on a cap trap. For any other error the framing is kept but the
+/// chain's root cause is appended (see `other_trap_message`) so the
+/// real trap reason survives.
 pub(crate) fn trap_from(err: wasmtime::Error) -> Trap {
-    match classify_trap(&err) {
-        TrapClass::Timeout => Trap::Timeout(
-            err.downcast_ref::<TimeoutTrap>()
-                .map(|t| t.to_string())
-                .unwrap_or_else(|| format!("{err}")),
-        ),
-        TrapClass::MemoryLimit => Trap::MemoryLimit(
-            err.downcast_ref::<MemoryLimitTrap>()
-                .map(|t| t.to_string())
-                .unwrap_or_else(|| format!("{err}")),
-        ),
-        TrapClass::Other => Trap::Other(other_trap_message(&err)),
+    if let Some(t) = err.downcast_ref::<TimeoutTrap>() {
+        Trap::Timeout(t.to_string())
+    } else if let Some(t) = err.downcast_ref::<MemoryLimitTrap>() {
+        Trap::MemoryLimit(t.to_string())
+    } else {
+        Trap::Other(other_trap_message(&err))
     }
 }
 
@@ -129,8 +98,9 @@ pub(crate) fn instantiate_err(err: wasmtime::Error) -> SetupError {
 
 #[cfg(test)]
 mod tests {
-    use super::{classify_trap, other_trap_message, TrapClass, NO_TIMEOUT_EPOCH_DELTA};
+    use super::{other_trap_message, trap_from, NO_TIMEOUT_EPOCH_DELTA};
     use crate::invocation::{Invocation, MemoryLimitTrap, TimeoutTrap};
+    use kobako_runtime::error::Trap;
 
     // The no-timeout priming delta is added to the engine's current
     // epoch inside wasmtime, and the process-wide ticker advances that
@@ -148,21 +118,24 @@ mod tests {
     }
 
     #[test]
-    fn classify_trap_routes_timeout_trap_to_timeout() {
+    fn trap_from_routes_timeout_trap_to_timeout() {
         let err = wasmtime::Error::new(TimeoutTrap);
-        assert_eq!(classify_trap(&err), TrapClass::Timeout);
+        let expected = TimeoutTrap.to_string();
+        assert!(matches!(trap_from(err), Trap::Timeout(msg) if msg == expected));
     }
 
     #[test]
-    fn classify_trap_routes_memory_limit_trap_to_memory_limit() {
-        let err = wasmtime::Error::new(MemoryLimitTrap::new(1 << 20, 1 << 19));
-        assert_eq!(classify_trap(&err), TrapClass::MemoryLimit);
+    fn trap_from_routes_memory_limit_trap_to_memory_limit() {
+        let trap = MemoryLimitTrap::new(1 << 20, 1 << 19);
+        let expected = trap.to_string();
+        let err = wasmtime::Error::new(trap);
+        assert!(matches!(trap_from(err), Trap::MemoryLimit(msg) if msg == expected));
     }
 
     #[test]
-    fn classify_trap_falls_back_to_other_for_unknown_errors() {
+    fn trap_from_falls_back_to_other_for_unknown_errors() {
         let err = wasmtime::Error::msg("some other wasmtime fault");
-        assert_eq!(classify_trap(&err), TrapClass::Other);
+        assert!(matches!(trap_from(err), Trap::Other(_)));
     }
 
     // A guest hard trap reaches the host as a wasmtime error whose Display is

data/ext/kobako/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kobako"
-version = "0.14.0"
+version = "0.16.0"
 edition = "2021"
 authors = ["Aotokitsuruya <contact@aotoki.me>"]
 license = "Apache-2.0"

data/ext/kobako/src/runtime/errors.rs

@@ -55,48 +55,15 @@ pub(super) fn trap_err(ruby: &Ruby, msg: impl Into<String>) -> MagnusError {
     error_in(ruby, &TRAP_ERROR, msg)
 }
 
-/// Construct a `Kobako::SetupError` magnus error. Used for every
-/// construction-time failure on the `Runtime.from_path` path before any
-/// invocation runs — unreadable artifact, bytes that are not a valid Wasm
-/// module, or engine / linker / instantiation setup failure. The
-/// `ModuleNotBuiltError` subclass (artifact absent) is
-/// raised through `MODULE_NOT_BUILT_ERROR` directly.
-pub(super) fn setup_err(ruby: &Ruby, msg: impl Into<String>) -> MagnusError {
-    error_in(ruby, &SETUP_ERROR, msg)
-}
-
-/// Construct a `Kobako::TimeoutError` magnus error. Surfaces the
-/// wall-clock cap path with the verb prefix added
-/// by `Kobako::Sandbox#invoke!`.
-fn timeout_err(ruby: &Ruby, msg: impl Into<String>) -> MagnusError {
-    error_in(ruby, &TIMEOUT_ERROR, msg)
-}
-
-/// Construct a `Kobako::MemoryLimitError` magnus error. Surfaces the
-/// linear-memory cap path with the verb prefix
-/// added by `Kobako::Sandbox#invoke!`.
-fn memory_limit_err(ruby: &Ruby, msg: impl Into<String>) -> MagnusError {
-    error_in(ruby, &MEMORY_LIMIT_ERROR, msg)
-}
-
-/// Construct a `Kobako::SandboxError` magnus error. Used for the
-/// host-side pre-call faults the SPEC attributes to the sandbox / wire
-/// layer rather than the Wasm engine — currently the `#run` invocation
-/// envelope reservation failure (`__kobako_alloc` returns 0).
-/// The runtime is intact, so this must not be a
-/// `TrapError`: no discard-and-recreate recovery is owed to the caller.
-fn sandbox_err(ruby: &Ruby, msg: impl Into<String>) -> MagnusError {
-    error_in(ruby, &SANDBOX_ERROR, msg)
-}
-
 /// Map a neutral `Trap` onto its `Kobako::TrapError`-family Ruby exception.
 /// The boundary between the magnus-free run mechanics and the Ruby surface:
 /// the run path classifies a fault into a `Trap`, and this is where it
-/// becomes a raised exception.
+/// becomes a raised exception. The verb prefix (`Sandbox#eval` / `#run`)
+/// is added by `Kobako::Sandbox#invoke!`.
 pub(super) fn trap_to_magnus(ruby: &Ruby, trap: Trap) -> MagnusError {
     match trap {
-        Trap::Timeout(msg) => timeout_err(ruby, msg),
-        Trap::MemoryLimit(msg) => memory_limit_err(ruby, msg),
+        Trap::Timeout(msg) => error_in(ruby, &TIMEOUT_ERROR, msg),
+        Trap::MemoryLimit(msg) => error_in(ruby, &MEMORY_LIMIT_ERROR, msg),
         Trap::Other(msg) => trap_err(ruby, msg),
     }
 }
@@ -106,8 +73,11 @@ pub(super) fn trap_to_magnus(ruby: &Ruby, trap: Trap) -> MagnusError {
 pub(super) fn setup_to_magnus(ruby: &Ruby, err: SetupError) -> MagnusError {
     match err {
         SetupError::ModuleNotBuilt(msg) => error_in(ruby, &MODULE_NOT_BUILT_ERROR, msg),
-        SetupError::Dead(msg) => setup_err(ruby, msg),
-        SetupError::Intact(msg) => sandbox_err(ruby, msg),
+        SetupError::Dead(msg) => error_in(ruby, &SETUP_ERROR, msg),
+        // Runtime intact means a host-side pre-call fault the SPEC
+        // attributes to the sandbox / wire layer, not the engine — no
+        // discard-and-recreate recovery is owed, so never a TrapError.
+        SetupError::Intact(msg) => error_in(ruby, &SANDBOX_ERROR, msg),
     }
 }
 

data/ext/kobako/src/runtime.rs

@@ -53,26 +53,14 @@ fn rstring_to_vec(s: RString) -> Vec<u8> {
     unsafe { s.as_slice() }.to_vec()
 }
 
-/// The pre-invocation sentinel for one capture channel: no bytes, cap
-/// not reached. Fresh `Vec`s per call because `Capture` owns its buffer.
-fn empty_capture() -> Capture {
-    Capture {
-        bytes: Vec::new(),
-        truncated: false,
-    }
-}
-
 // ---------------------------------------------------------------------------
 // Ruby init
 // ---------------------------------------------------------------------------
 
 pub fn init(ruby: &Ruby, kobako: RModule) -> Result<(), MagnusError> {
-    // Error hierarchy lives in `lib/kobako/errors.rb` (top-level
-    // `Kobako::TrapError` / `TimeoutError` / `MemoryLimitError` /
-    // `SetupError` / `ModuleNotBuiltError`). The ext raises directly into
-    // those classes through `trap_err` / `timeout_err` / `memory_limit_err`
-    // / `sandbox_err` / `setup_err` / `MODULE_NOT_BUILT_ERROR`; no
-    // intermediate hierarchy is registered.
+    // Error hierarchy lives in `lib/kobako/errors.rb`; the ext raises
+    // directly into those classes through the constructors and mappers
+    // in `runtime/errors.rs` — no intermediate hierarchy is registered.
 
     let runtime = kobako.define_class("Runtime", ruby.class_object())?;
     runtime.define_singleton_method("from_path", function!(Runtime::from_path, 6))?;
@@ -210,11 +198,8 @@ impl Runtime {
         Ok(Self {
             driver,
             on_dispatch: Cell::new(None),
-            last_usage: Cell::new(Usage {
-                wall_time: 0.0,
-                memory_peak: 0,
-            }),
-            last_captures: RefCell::new((empty_capture(), empty_capture())),
+            last_usage: Cell::new(Usage::default()),
+            last_captures: RefCell::new((Capture::default(), Capture::default())),
         })
     }
 

data/lib/kobako/catalog/extensions.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+module Kobako
+  module Catalog
+    # Kobako::Catalog::Extensions — per-Sandbox registry of installed
+    # Extensions. Composes each Extension onto the sibling registries at
+    # install time (its +source+ into +Catalog::Snippets+, its +backend+
+    # path into +Catalog::Services+), asserts declared dependencies are
+    # present when the Sandbox seals, and resolves each callable-backed
+    # path to a fresh object at the start of every invocation.
+    #
+    # Sealing and the reject-after-install guard are governed by the owning
+    # Sandbox through +Catalog::Services#sealed?+, the shared seal signal;
+    # this registry only records entries and enforces the Extension-shape
+    # and dependency rules.
+    class Extensions
+      def initialize
+        @entries = [] # : Array[untyped]
+        @asserted = false
+      end
+
+      # Install +extension+: validate its shape, register its +source+ as a
+      # preloaded snippet, and — when it carries a +backend+ — reserve the
+      # backend path in +services+. A callable provider reserves the path
+      # with a placeholder the per-invocation refresh replaces; a fixed
+      # provider binds its object directly. Raises +ArgumentError+ on a
+      # malformed Extension; a malformed +name+ or +backend.path+ surfaces
+      # through the +snippets+ / +services+ registration it routes to.
+      def install(extension, snippets:, services:)
+        validate!(extension)
+        snippets.register(code: extension.source, name: extension.name)
+        backend = extension.backend
+        services.bind(backend.path, initial_object(backend.provider)) if backend
+        @entries << extension
+        self
+      end
+
+      # Assert every installed Extension's +depends_on+ names a fellow
+      # installed Extension. Runs once, when the Sandbox first seals; an
+      # unmet dependency raises +ArgumentError+ naming the gap, before the
+      # guest runs. Idempotent across later invocations.
+      def seal!
+        return self if @asserted
+
+        @asserted = true
+        assert_dependencies!
+        self
+      end
+
+      # Resolve each callable-backed path to this invocation's object and
+      # refresh it behind its already-sealed path in +services+. Distinct
+      # providers yield distinct objects; one provider shared by several
+      # Extensions is invoked once and its result shared, so provider
+      # identity is resource identity. Fixed providers are left untouched —
+      # they stay the object bound at install.
+      def refresh_backends!(services)
+        resolved = {} # : Hash[untyped, untyped]
+        resolved.compare_by_identity
+        @entries.each { |extension| refresh_backend(extension, services, resolved) }
+        self
+      end
+
+      private
+
+      # Resolve one Extension's callable-backed path against the shared
+      # per-invocation +resolved+ cache (keyed by provider identity) and
+      # refresh it in +services+. A fixed provider is skipped — its object
+      # stays as bound at install.
+      def refresh_backend(extension, services, resolved)
+        backend = extension.backend
+        return unless backend
+
+        provider = backend.provider
+        return unless callable?(provider)
+
+        object = resolved.fetch(provider) { resolved[provider] = provider.call }
+        services.refresh(backend.path, object)
+      end
+
+      # Enforce the Extension-shape checks +#preload+ / +#bind+ do not: a
+      # mandatory String +source+ (the install/bind boundary) and a
+      # +backend+ that, when present, exposes +path+ and +provider+.
+      def validate!(extension)
+        source = extension.source
+        raise ArgumentError, "Extension #source must be a String, got #{source.class}" unless source.is_a?(String)
+
+        backend = extension.backend
+        return if backend.nil?
+        return if backend.respond_to?(:path) && backend.respond_to?(:provider)
+
+        raise ArgumentError, "Extension #backend must expose #path and #provider"
+      end
+
+      def assert_dependencies!
+        names = @entries.map(&:name)
+        @entries.each do |extension|
+          (extension.depends_on || []).each do |dependency|
+            next if names.include?(dependency)
+
+            raise ArgumentError,
+                  "Extension #{extension.name.inspect} depends on #{dependency.inspect}, which is not installed"
+          end
+        end
+      end
+
+      def callable?(provider) = provider.respond_to?(:call)
+
+      # A callable provider reserves its path with a placeholder that the
+      # per-invocation refresh replaces before any dispatch; a fixed
+      # provider is the bound object itself.
+      def initial_object(provider) = callable?(provider) ? nil : provider
+    end
+  end
+end

data/lib/kobako/catalog/handles.rb

@@ -6,7 +6,7 @@ module Kobako
   module Catalog
     # Host-side mapping from opaque integer Handle IDs to Ruby objects.
     # The table is owned by +Kobako::Sandbox+ and injected
-    # into the per-Sandbox +Kobako::Catalog::Namespaces+ so guest→host dispatch
+    # into the per-Sandbox +Kobako::Catalog::Services+ so guest→host dispatch
     # resolves Handle targets and arguments against the same table that
     # host→guest wire encoding allocates into.
     #

data/lib/kobako/catalog/services.rb

@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+require_relative "handles"
+require_relative "../codec"
+require_relative "../errors"
+
+module Kobako
+  module Catalog
+    # Kobako::Catalog::Services — per-Sandbox registry of Service
+    # bindings keyed by their constant-path name. Holds the flat
+    # path→object table and the preamble emitted on Frame 1.
+    #
+    # Public API:
+    #
+    #   services = Kobako::Catalog::Services.new
+    #   services.bind("MyService::KV", kv_object)  # => services (chainable)
+    #   services.encode                            # => msgpack bytes for Frame 1
+    #   services.lookup("MyService::KV")           # => kv_object
+    #
+    # Per-dispatch routing is +Kobako::Transport::Dispatcher+'s
+    # responsibility — the Dispatcher receives this registry and the
+    # +Catalog::Handles+ as arguments from the +Runtime#on_dispatch+ Proc
+    # that +Kobako::Sandbox#initialize+ installs. The registry holds an
+    # injected +Catalog::Handles+ reference so dispatch target resolution
+    # and host→guest auto-wrap share the same Sandbox-owned allocator.
+    class Services
+      # Ruby constant-name pattern each +::+-separated bind-path segment
+      # must match.
+      NAME_PATTERN = /\A[A-Z]\w*\z/
+
+      # Build a fresh registry. +handler+ is an internal seam that injects
+      # a pre-configured +Catalog::Handles+; tests pass one whose +next_id+
+      # is pinned near +MAX_ID+ to exercise the cap-exhaustion path
+      # without 2³¹ allocations. Production callers leave it at the default.
+      def initialize(handler: Catalog::Handles.new)
+        @bindings = {} # : Hash[String, untyped]
+        @handler = handler
+        @sealed = false
+        @encoded = nil # : String?
+      end
+
+      # Bind +object+ as the Service reachable at +path+ — a +Symbol+ or
+      # +String+ of one or more +::+-separated constant-form segments
+      # (+"MyService::KV"+ or a top-level +"File"+). Returns +self+ for
+      # chaining. Raises +ArgumentError+ when a segment is malformed, when
+      # +path+ collides with an existing binding (a name is a bound Service
+      # or a grouping prefix, never both), or when the owning Sandbox has
+      # been sealed by its first invocation.
+      def bind(path, object)
+        raise ArgumentError, "cannot bind after first Sandbox invocation" if @sealed
+
+        path_str = validate_path!(path)
+        raise ArgumentError, "Service path #{path_str} conflicts with an existing binding" if collision?(path_str)
+
+        @bindings[path_str] = object
+        self
+      end
+
+      # Resolve a +target+ constant path to the bound Service. Raises
+      # +KeyError+ when no Service is bound at +target+.
+      def lookup(target)
+        target_str = target.to_s
+        raise KeyError, "no service bound at #{target_str.inspect}" unless @bindings.key?(target_str)
+
+        @bindings[target_str]
+      end
+
+      # Replace the object bound at an already-registered +path+ without the
+      # collision or seal checks +#bind+ applies. +Catalog::Extensions+ calls
+      # this during +begin_invocation!+ to swap a callable backend provider's
+      # per-invocation result behind a path whose Frame 1 membership was
+      # fixed at the seal. A path that was never registered is left untouched,
+      # so the sealed key set can never grow here.
+      def refresh(path, object)
+        key = path.to_s
+        @bindings[key] = object if @bindings.key?(key)
+        self
+      end
+
+      # Encode the preamble as msgpack bytes for stdin Frame 1 delivery —
+      # a flat array of the bound constant paths, in bind order:
+      # +["MyService::KV", "File"]+. Routes through Kobako::Codec::Encoder
+      # like every other host-side wire encode; the preamble carries only
+      # Strings, so none of the kobako ext types fire. Returns a binary
+      # +String+ of msgpack bytes.
+      #
+      # Once sealed, the bytes are computed once and reused for every
+      # subsequent invocation: sealing freezes Service registration at the
+      # first invocation, so a bind reaching the registry after the seal
+      # raises +ArgumentError+ and never alters Frame 1.
+      def encode
+        return @encoded if @encoded
+
+        bytes = Codec::Encoder.encode(@bindings.keys).freeze
+        @encoded = bytes if @sealed
+        bytes
+      end
+
+      # Mark the registry as sealed. Called by +Sandbox+ on the first
+      # invocation; afterwards #bind raises ArgumentError. Idempotent;
+      # returns +self+.
+      def seal!
+        @sealed = true
+        self
+      end
+
+      # Returns +true+ when #seal! has been called, +false+ otherwise.
+      def sealed?
+        @sealed
+      end
+
+      private
+
+      def validate_path!(path)
+        path_str = path.to_s
+        segments = path_str.split("::", -1)
+        return path_str if !segments.empty? && segments.all? { |seg| NAME_PATTERN.match?(seg) }
+
+        raise ArgumentError,
+              "bind path must be constant-form segments joined by '::' (got #{path.inspect})"
+      end
+
+      # A path collides when it equals, is a prefix of, or extends an
+      # existing binding on the +::+ segment boundary — the guardrail that
+      # keeps a name from being both a bound Service and a grouping prefix.
+      def collision?(path)
+        @bindings.each_key.any? do |existing|
+          existing == path ||
+            existing.start_with?("#{path}::") ||
+            path.start_with?("#{existing}::")
+        end
+      end
+    end
+  end
+end

data/lib/kobako/catalog/snippets.rb

@@ -44,7 +44,7 @@ module Kobako
       # The bytes are memoized — the table is replayed verbatim on every
       # invocation after sealing, so Frame 3 never changes between
       # encodes; #register drops the memo while the table is still open.
-      # Unlike +Catalog::Namespaces#encode+, which gates its memo on the
+      # Unlike +Catalog::Services#encode+, which gates its memo on the
       # seal, this one can fill eagerly and invalidate in +#register+
       # because every mutation funnels through that single method — there is
       # no out-of-sight child object to change the result behind its back.

data/lib/kobako/catalog.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
 require_relative "catalog/handles"
-require_relative "catalog/namespaces"
+require_relative "catalog/services"
 require_relative "catalog/snippets"
+require_relative "catalog/extensions"
 
 module Kobako
   # Kobako::Catalog — Sandbox-level configuration and per-invocation
-  # allocation tables. Houses the three host-side registries the Sandbox
-  # owns: +Catalog::Namespaces+ (Namespace / Member registry),
-  # +Catalog::Snippets+ (preloaded source / bytecode entries), and
-  # +Catalog::Handles+ (per-invocation Handle ID allocator).
+  # allocation tables. Houses the host-side registries the Sandbox owns:
+  # +Catalog::Services+ (path→Service binding registry),
+  # +Catalog::Snippets+ (preloaded source / bytecode entries),
+  # +Catalog::Extensions+ (installed Extensions, composed onto Services /
+  # Snippets), and +Catalog::Handles+ (per-invocation Handle ID allocator).
   #
   # See {SPEC.md Refinement → Internal Concepts}[link:../../SPEC.md] for
   # how Catalog fits alongside Transport and Runtime.

data/lib/kobako/codec/decoder.rb

@@ -3,7 +3,7 @@
 require "msgpack"
 
 require_relative "error"
-require_relative "factory"
+require_relative "ext_types"
 require_relative "utils"
 
 module Kobako
@@ -31,7 +31,7 @@ module Kobako
       # surfaces as InvalidType without a separate Utils.with_boundary
       # wrapper at the call site.
       def self.decode(bytes)
-        value = Factory.load(bytes.b)
+        value = FACTORY.load(bytes.b)
         validate_utf8!(value)
         block_given? ? yield(value) : value
       # msgpack gem raises the format/type errors below; +ArgumentError+
@@ -54,7 +54,7 @@ module Kobako
       # str family but does not validate the bytes; +bin+ family decodes
       # to ASCII-8BIT. Walk the tree once and reject invalid UTF-8 in any
       # str-typed leaf via Utils.assert_utf8!. Kobako::Fault
-      # payloads are validated transitively: +Factory.unpack_fault+
+      # payloads are validated transitively: +ExtTypes#unpack_fault+
       # feeds the inner ext-0x02 bytes back through this Decoder, so their
       # +str+ fields are already covered by the time control returns here.
       class << self

data/lib/kobako/codec/encoder.rb

@@ -3,7 +3,7 @@
 require "msgpack"
 
 require_relative "error"
-require_relative "factory"
+require_relative "ext_types"
 
 module Kobako
   module Codec
@@ -13,8 +13,8 @@ module Kobako
     # The codec backbone is the official +msgpack+ gem: integers, floats,
     # strings, arrays, and maps go through the gem's narrowest-encoding
     # logic; the three kobako-specific ext types (0x00 Symbol, 0x01
-    # Capability Handle, 0x02 Exception envelope) are registered on
-    # the cached Kobako::Codec::Factory singleton.
+    # Capability Handle, 0x02 Exception envelope) are registered by
+    # ExtTypes on the process-wide factory.
     #
     # Public API is a single function — +.encode+. The codec is stateless;
     # there is no buffer accumulator and no streaming write API. Callers
@@ -32,7 +32,7 @@ module Kobako
       # +NoMethodError+ is likewise reported as +UnsupportedType+ rather than
       # propagating.
       def self.encode(value)
-        Factory.dump(value)
+        FACTORY.dump(value)
       rescue ::RangeError, ::NoMethodError => e
         raise UnsupportedType, e.message
       end