smplkit 3.0.95 → 3.0.96

data/lib/smplkit/logging/client.rb

@@ -1,94 +1,393 @@
 # frozen_string_literal: true
 
-require "concurrent"
-
+# The Smpl Logging client — one unified +LoggingClient+.
+#
+# Smpl Logging has two surfaces on a single client, mirroring how the config,
+# flags, audit, and jobs clients expose their full surface from one class:
+#
+# * *Management surface* — works immediately, no +install+ required. Two
+#   sub-clients (the audit pattern):
+#
+#   * +client.logging.loggers+ — logger CRUD + discovery: +new+ / +list+ / +get+
+#     / +delete+ plus +register+ / +flush+ / +flush_sync+ / +pending_count+.
+#   * +client.logging.log_groups+ — log-group CRUD: +new+ / +list+ / +get+ /
+#     +delete+.
+#
+#   The fused client owns the logger-discovery buffer directly; the +loggers+
+#   sub-client shares that same buffer so discovery and explicit registration
+#   drain through one queue.
+#
+# * *Live surface* — directly on the client. +register_adapter+ is a PRE-install
+#   configuration call (allowed before +install+). +install+ opens the live
+#   connection (monkey-patches the app's logging framework, discovers loggers,
+#   fetches + applies levels, opens the shared WebSocket). +on_change+ /
+#   +refresh+ require +install+ first; calling them earlier raises
+#   +NotInstalledError+.
+#
+# The client supports two construction shapes:
+#
+# * *Wired* into +Smplkit::Client+ — borrows the parent's logging transport for
+#   both runtime fetch and CRUD and the parent's shared WebSocket for the live
+#   channel. This is the common path.
+# * *Standalone* — +LoggingClient.new(api_key: ..., base_url: ..., ...)+ builds
+#   and owns its own logging transport and an app transport (the WebSocket
+#   gateway lives on the app service), and on +install+ opens and owns its own
+#   WebSocket. +close+ tears down only the owned transports and owned WebSocket.
 module Smplkit
   module Logging
-    # Synchronous logging runtime namespace.
+    NOT_INSTALLED_MESSAGE = "Smpl Logging live operations require install() first — this opens a live " \
+                            "connection to your running service and hooks into your application's logging " \
+                            "framework. Call client.logging.install() before on_change/refresh()."
+
+    # Build standalone logging + app transports and resolve the app base URL.
     #
-    # Obtained via +Smplkit::Client#logging+. Manages the discovery and level
-    # application for a customer's logging frameworks via pluggable adapters.
-    # CRUD has moved to +mgmt.loggers.*+ / +mgmt.log_groups.*+.
+    # +base_url+/+api_key+ are used directly when supplied (the path a top-level
+    # client takes after it has already resolved them); otherwise the management
+    # config resolver fills in whatever is missing (+~/.smplkit+ / env vars /
+    # defaults). The app transport is needed for the WebSocket gateway, which
+    # lives on the app service (like flags); the app base URL is returned so a
+    # standalone client can open its own WebSocket against the event gateway.
+    def self.logging_transport(api_key:, base_url:, profile:, base_domain:, scheme:, debug:, extra_headers:)
+      cfg = ConfigResolution.resolve_management_config(
+        profile: profile, api_key: api_key, base_domain: base_domain, scheme: scheme, debug: debug
+      )
+      resolved_key = api_key.nil? ? cfg.api_key : api_key
+      merged = {}
+      merged.merge!(cfg.extra_headers || {})
+      merged.merge!(extra_headers || {})
+      tcfg = ConfigResolution::ResolvedManagementConfig.new(
+        api_key: resolved_key, base_domain: cfg.base_domain, scheme: cfg.scheme,
+        debug: cfg.debug, extra_headers: merged
+      )
+      app_url = ConfigResolution.service_url(cfg.scheme, "app", cfg.base_domain)
+      logging_http = Transport.build_api_client(SmplkitGeneratedClient::Logging, "logging", tcfg, base_url: base_url)
+      app_http = Transport.build_api_client(SmplkitGeneratedClient::App, "app", tcfg)
+      [logging_http, app_http, app_url, resolved_key]
+    end
+
+    # Discover and load the SDK's built-in logging adapters.
+    def self.auto_load_adapters
+      adapters = [Adapters::StdlibLoggerAdapter.new]
+
+      begin
+        require "semantic_logger"
+        require_relative "adapters/semantic_logger_adapter"
+        adapters << Adapters::SemanticLoggerAdapter.new
+      rescue LoadError
+        Smplkit.debug("registration", "semantic_logger gem not installed; semantic-logger adapter skipped")
+      end
+
+      adapters
+    end
+
+    LoggerChangeEvent = Struct.new(:name, :level, :source, keyword_init: true) do
+      def ==(other)
+        other.is_a?(LoggerChangeEvent) &&
+          name == other.name && level == other.level && source == other.source
+      end
+    end
+
+    # Surface for +client.logging.loggers.*+ (sync).
     #
-    # Level resolution is client-side: the server stores raw configuration
-    # and the SDK walks the chain (env override → base → group chain →
-    # dot-notation ancestry) to compute each managed logger's effective
-    # level. See {Smplkit::Logging::Resolution}.
+    # Logger CRUD plus the discovery buffer. The buffer is owned by the fused
+    # +LoggingClient+ and shared here so discovery (driven by
+    # +LoggingClient#install+) and explicit +register+ drain through one queue.
+    class LoggersClient
+      def initialize(http_client, buffer:)
+        @api = SmplkitGeneratedClient::Logging::LoggersApi.new(http_client)
+        @buffer = buffer
+      end
+
+      # Buffer logger sources for registration; optionally flush immediately.
+      def register(items, flush: false)
+        batch = items.is_a?(Array) ? items : [items]
+        batch.each do |src|
+          @buffer.add(LoggerSource.new(
+                        name: Normalize.normalize_logger_name(src.name),
+                        resolved_level: src.resolved_level, level: src.level,
+                        service: src.service, environment: src.environment
+                      ))
+        end
+        if flush
+          self.flush
+          return
+        end
+        return unless @buffer.pending_count >= LOGGER_BATCH_FLUSH_SIZE
+
+        Thread.new { threshold_flush }
+      end
+
+      # Drain the buffer and POST pending logger sources to the bulk endpoint.
+      def flush
+        batch = @buffer.drain
+        return if batch.empty?
+
+        items = batch.map do |entry|
+          SmplkitGeneratedClient::Logging::LoggerBulkItem.new(
+            id: entry["id"], resolved_level: entry["resolved_level"], level: entry["level"],
+            service: entry["service"], environment: entry["environment"]
+          )
+        end
+        body = SmplkitGeneratedClient::Logging::LoggerBulkRequest.new(loggers: items)
+        ApiSupport::ErrorMapping.call { @api.bulk_register_loggers(body) }
+      end
+
+      # Synchronous flush — alias of +flush+ for the periodic-flush path.
+      def flush_sync
+        flush
+      end
+
+      # Number of sources queued and awaiting flush.
+      def pending_count
+        @buffer.pending_count
+      end
+
+      # Return a new unsaved +SmplLogger+. Call +SmplLogger#save+ to persist.
+      def new(id, managed: true)
+        SmplLogger.new(self, id: id, name: id, resolved_level: nil, managed: managed)
+      end
+
+      # List loggers for the authenticated account.
+      def list(page_number: nil, page_size: nil)
+        opts = {}
+        opts[:page_number] = page_number unless page_number.nil?
+        opts[:page_size] = page_size unless page_size.nil?
+        response = ApiSupport::ErrorMapping.call { @api.list_loggers(opts) }
+        (response.data || []).map { |r| Helpers.logger_resource_to_model(self, ApiSupport::ResourceShim.from_model(r)) }
+      end
+
+      # Fetch the editable +SmplLogger+ resource by id.
+      def get(id)
+        response = ApiSupport::ErrorMapping.call { @api.get_logger(id) }
+        Helpers.logger_resource_to_model(self, ApiSupport::ResourceShim.from_model(response.data))
+      end
+
+      # Delete a logger by id.
+      def delete(id)
+        ApiSupport::ErrorMapping.call { @api.delete_logger(id) }
+        nil
+      end
+
+      def _update_logger(logger)
+        response = ApiSupport::ErrorMapping.call { @api.update_logger(logger.id || logger.name, logger_body(logger)) }
+        Helpers.logger_resource_to_model(self, ApiSupport::ResourceShim.from_model(response.data))
+      end
+
+      # Runtime entry — walks every page and returns an id-keyed Hash of
+      # resolution-cache entries (+level+, +group+, +managed+, +environments+).
+      def list_logger_entries
+        rows = ApiSupport::PaginatedFetch.collect { |opts| @api.list_loggers(opts) }
+        rows.to_h { |r| logger_entry_from_resource(ApiSupport::ResourceShim.from_model(r)) }
+      end
+
+      # Fetch one logger as a resolution-cache entry. Used by the +logger_changed+
+      # WS handler.
+      def get_logger_entry(id)
+        response = ApiSupport::ErrorMapping.call { @api.get_logger(id) }
+        logger_entry_from_resource(ApiSupport::ResourceShim.from_model(response.data))
+      end
+
+      private
+
+      def threshold_flush
+        flush
+      rescue StandardError => e
+        Smplkit.debug("registration", "logger registration flush failed: #{e.class}: #{e.message}")
+      end
+
+      def logger_entry_from_resource(resource)
+        attrs = resource["attributes"] || {}
+        [
+          resource["id"],
+          {
+            "level" => attrs["level"],
+            "group" => attrs["group"],
+            "managed" => attrs.key?("managed") ? attrs["managed"] : true,
+            "environments" => attrs["environments"] || {}
+          }
+        ]
+      end
+
+      def logger_body(logger)
+        # Logger server schema: name, level, group, managed, environments.
+        # +resolved_level+ is read-only, +service+/+environment+ are observed via
+        # bulk register, +description+ is wrapper-local. The PUT is a full
+        # replace, so the (possibly empty) environments map is always sent —
+        # omitting it would leave a cleared override in place server-side.
+        SmplkitGeneratedClient::Logging::LoggerResponse.new(
+          data: SmplkitGeneratedClient::Logging::LoggerResource.new(
+            type: "logger",
+            id: logger.id,
+            attributes: SmplkitGeneratedClient::Logging::Logger.new(
+              name: logger.name,
+              level: logger.level&.to_s,
+              group: logger.log_group_id,
+              managed: logger.managed,
+              environments: Logging.environments_to_wire(logger.environments)
+            )
+          )
+        )
+      end
+    end
+
+    # Surface for +client.logging.log_groups.*+ (sync).
+    class LogGroupsClient
+      def initialize(http_client)
+        @api = SmplkitGeneratedClient::Logging::LogGroupsApi.new(http_client)
+      end
+
+      # Return a new unsaved +SmplLogGroup+. Call +SmplLogGroup#save+ to persist.
+      def new(id, name: nil, group: nil)
+        SmplLogGroup.new(
+          self, key: id, name: name.nil? ? Smplkit::Helpers.key_to_display_name(id) : name, parent_id: group
+        )
+      end
+
+      # List log groups for the authenticated account.
+      def list(page_number: nil, page_size: nil)
+        opts = {}
+        opts[:page_number] = page_number unless page_number.nil?
+        opts[:page_size] = page_size unless page_size.nil?
+        response = ApiSupport::ErrorMapping.call { @api.list_log_groups(opts) }
+        (response.data || []).map do |r|
+          Helpers.log_group_resource_to_model(self, ApiSupport::ResourceShim.from_model(r))
+        end
+      end
+
+      # Fetch the editable +SmplLogGroup+ resource by id.
+      def get(id)
+        response = ApiSupport::ErrorMapping.call { @api.get_log_group(id) }
+        Helpers.log_group_resource_to_model(self, ApiSupport::ResourceShim.from_model(response.data))
+      end
+
+      # Delete a log group by id.
+      def delete(id)
+        ApiSupport::ErrorMapping.call { @api.delete_log_group(id) }
+        nil
+      end
+
+      def _create_log_group(group)
+        response = ApiSupport::ErrorMapping.call { @api.create_log_group(log_group_body(group)) }
+        Helpers.log_group_resource_to_model(self, ApiSupport::ResourceShim.from_model(response.data))
+      end
+
+      def _update_log_group(group)
+        response = ApiSupport::ErrorMapping.call { @api.update_log_group(group.key, log_group_body(group)) }
+        Helpers.log_group_resource_to_model(self, ApiSupport::ResourceShim.from_model(response.data))
+      end
+
+      # Runtime entry — walks every page and returns an id-keyed Hash of
+      # resolution-cache entries (+level+, +group+, +environments+). The +group+
+      # key carries the *parent group id* so the resolution algorithm can walk
+      # the chain with the same key shape it uses for loggers.
+      def list_group_entries
+        rows = ApiSupport::PaginatedFetch.collect { |opts| @api.list_log_groups(opts) }
+        rows.to_h { |r| group_entry_from_resource(ApiSupport::ResourceShim.from_model(r)) }
+      end
+
+      def get_group_entry(key)
+        response = ApiSupport::ErrorMapping.call { @api.get_log_group(key) }
+        group_entry_from_resource(ApiSupport::ResourceShim.from_model(response.data))
+      end
+
+      private
+
+      def group_entry_from_resource(resource)
+        attrs = resource["attributes"] || {}
+        [
+          resource["id"],
+          {
+            "level" => attrs["level"],
+            "group" => attrs["parent_id"],
+            "environments" => attrs["environments"] || {}
+          }
+        ]
+      end
+
+      def log_group_body(group)
+        # LogGroup server schema: name, level, parent_id (no description).
+        SmplkitGeneratedClient::Logging::LogGroupResponse.new(
+          data: SmplkitGeneratedClient::Logging::LogGroupResource.new(
+            type: "log_group",
+            id: group.key,
+            attributes: SmplkitGeneratedClient::Logging::LogGroup.new(
+              name: group.name,
+              level: group.level&.to_s,
+              parent_id: group.parent_id
+            )
+          )
+        )
+      end
+    end
+
+    # The Smpl Logging client (sync).
+    #
+    # One client exposes the full surface, reachable as +client.logging+
+    # (+Smplkit::Client+) or constructed directly:
+    #
+    #   logging = Smplkit::LoggingClient.new(environment: "production", service: "my-svc")
+    #   logging.loggers.new("sqlalchemy.engine").save
+    #   logging.install
     #
-    # Change-listener contract — every call the SDK makes to
-    # +adapter.apply_level(logger_id, new_level)+ is paired with exactly one
-    # listener notification for that logger, and every notification
-    # corresponds to exactly one adapter apply. A trigger that moves N
-    # loggers' effective levels invokes the global listener N times (once
-    # per logger), each invocation also fires every matching key-scoped
-    # listener for that id. There are no batch / summary events and no
-    # deletion-flavored events — logger / group deletions only emit
-    # listener invocations for *dependents* whose computed effective level
-    # actually moved; the deleted key itself emits nothing.
+    # The management surface (+loggers+ / +log_groups+ sub-clients) works
+    # immediately. +register_adapter+ is a pre-install configuration call. The
+    # live surface (+install+ / +on_change+ / +refresh+) requires +install+
+    # first; calling +on_change+ / +refresh+ earlier raises +NotInstalledError+.
     class LoggingClient
-      def initialize(parent, manage:, metrics:, logging_base_url:, app_base_url:)
+      attr_reader :loggers, :log_groups
+
+      def initialize(api_key = nil, environment: nil, base_url: nil, profile: nil,
+                     base_domain: nil, scheme: nil, debug: nil, extra_headers: nil,
+                     parent: nil, transport: nil, metrics: nil)
         @parent = parent
-        @manage = manage
         @metrics = metrics
-        @logging_base_url = logging_base_url
-        @app_base_url = app_base_url
-        @adapters = []
-        @installed = false
+        @environment = parent.nil? ? environment : parent._environment
+        @service = parent&._service
+        @standalone_api_key = nil
+        if transport.nil?
+          @logging_http, _app_http, @app_base_url, @standalone_api_key = Logging.logging_transport(
+            api_key: api_key, base_url: base_url, profile: profile,
+            base_domain: base_domain, scheme: scheme, debug: debug, extra_headers: extra_headers
+          )
+        else
+          @logging_http = transport
+          @app_base_url = nil
+        end
+
+        # Discovery buffer is owned by this client; the loggers sub-client shares
+        # it so discovery and explicit registration drain together.
+        @buffer = LoggerRegistrationBuffer.new
+        @loggers = LoggersClient.new(@logging_http, buffer: @buffer)
+        @log_groups = LogGroupsClient.new(@logging_http)
+
+        # Live-surface state.
+        @connected = false
+        @name_map = {}        # original_name → normalized_id
+        @loggers_cache = {}   # id → logger data
+        @groups_cache = {}    # id → group data
         @global_listeners = []
         @key_listeners = Hash.new { |h, k| h[k] = [] }
+        @adapters = []
+        @explicit_adapters = false
+        @ws_manager = nil
+        @owns_ws = false
         @lock = Mutex.new
-        # original_name → normalized_id for every adapter-discovered logger.
-        # We keep originals so adapter.apply_level receives whatever the
-        # framework's registry indexes by.
-        @name_map = {}
-        # normalized_id → resolution-cache entry.
-        @loggers_cache = {}
-        # group id → resolution-cache entry. Without this, any managed
-        # logger with +level=null+ that inherits from a group silently
-        # keeps whatever level its adapter had at startup.
-        @groups_cache = {}
-        # normalized_id → last-applied resolved level (string). Drives the
-        # lockstep between adapter.apply_level and listener notifications:
-        # we only push (and fire) when the freshly-resolved level differs
-        # from what's recorded here.
-        @resolved_levels = {}
-      end
-
-      # Install the logging integration.
-      #
-      # Auto-loads the +stdlib-logger+ adapter (always) and the
-      # +semantic-logger+ adapter (when the gem is available). Customer
-      # explicit registration via +register_adapter+ wins over auto-load.
-      def install
-        return self if @installed
-
-        auto_load_adapters if @adapters.empty?
-
-        @adapters.each do |adapter|
-          discovered = adapter.discover
-          discovered.each { |(name, _explicit, effective)| observe_logger(adapter, name, effective) }
-          adapter.install_hook { |name, _explicit, effective| observe_logger(adapter, name, effective) }
-        end
-
-        flush_initial_registration
-        fetch_and_apply(trigger: "install", source: "manual")
-
-        @ws_manager = @parent._ensure_ws
-        @ws_manager.on("logger_changed") { |data| handle_logger_changed(data) }
-        @ws_manager.on("logger_deleted") { |data| handle_logger_deleted(data) }
-        @ws_manager.on("group_changed") { |data| handle_group_changed(data) }
-        @ws_manager.on("group_deleted") { |data| handle_group_deleted(data) }
-        @ws_manager.on("loggers_changed") { |data| handle_loggers_changed(data) }
-        @installed = true
-        self
       end
-      alias start install
 
+      # --- Adapter registration (pre-install, ungated) ---
+
+      # Register a logging adapter. Must be called before install().
+      #
+      # If called at least once, auto-loading is disabled — only explicitly
+      # registered adapters are used. This is a pre-install configuration call:
+      # it is intentionally NOT gated by +install+.
       def register_adapter(adapter)
+        raise "Cannot register adapters after install()" if @connected
         unless adapter.is_a?(Adapters::Base)
           raise ArgumentError, "adapter must implement Smplkit::Logging::Adapters::Base"
         end
 
+        @explicit_adapters = true
         @adapters << adapter
         self
       end
@@ -97,197 +396,353 @@ module Smplkit
         @adapters.dup
       end
 
-      def get(name)
-        @manage.loggers.get(name)
-      end
+      # --- Live surface: install (gate) + transport / WebSocket helpers ---
 
-      def list(page_number: nil, page_size: nil)
-        @manage.loggers.list(page_number: page_number, page_size: page_size)
-      end
+      # Hook smplkit into the application's logging machinery.
+      #
+      # Loads adapters, scans existing loggers, applies levels from the smplkit
+      # server, and wires WebSocket handlers for live updates. This IS the
+      # explicit consent gate — +on_change+ / +refresh+ require it first.
+      #
+      # Idempotent — safe to call multiple times.
+      def install
+        Smplkit.debug("lifecycle", "LoggingClient.install() called")
+        @parent&._ensure_started
+        return self if @connected
 
-      def delete(name)
-        @manage.loggers.delete(name)
-      end
+        # 0. Load adapters
+        @adapters = Logging.auto_load_adapters if @adapters.empty?
 
-      # Re-fetch all loggers and groups and re-apply resolved levels. Fires
-      # listeners only for loggers whose effective level moved.
-      def refresh
-        fetch_and_apply(trigger: "refresh", source: "manual")
+        # 1. Discover existing loggers from all adapters (keep discovery and hook
+        # installation as two passes — discover every adapter before any hook is
+        # live, mirroring the Python SDK).
+        # rubocop:disable Style/CombinableLoops
+        @adapters.each do |adapter|
+          existing = adapter.discover
+          existing.each do |name, explicit_level, effective_level|
+            @name_map[name] = Normalize.normalize_logger_name(name)
+            @loggers.register(loggersource_for(name, explicit_level, effective_level))
+          end
+        rescue StandardError => e
+          Smplkit.debug("logging", "adapter #{adapter.name} discover failed: #{e.class}: #{e.message}")
+        end
+
+        # 2. Install continuous discovery hooks
+        @adapters.each do |adapter|
+          adapter.install_hook { |name, explicit, effective| on_new_logger(name, explicit, effective) }
+        rescue StandardError => e
+          Smplkit.debug("logging", "adapter #{adapter.name} install_hook failed: #{e.class}: #{e.message}")
+        end
+        # rubocop:enable Style/CombinableLoops
+
+        # 3. Flush initial batch
+        begin
+          @loggers.flush
+        rescue StandardError => e
+          Smplkit.debug("registration", "bulk logger registration failed: #{e.class}: #{e.message}")
+        end
+
+        # 4-6. Fetch, resolve, apply
+        begin
+          fetch_and_apply(trigger: "install()")
+        rescue StandardError => e
+          Smplkit.debug("resolution",
+                        "failed to fetch/apply logging levels during connect " \
+                        "(logging: #{@logging_http&.config&.host}): #{e.class}: #{e.message}")
+        end
+
+        # 7. Register WebSocket event handlers for real-time level updates
+        @ws_manager = ensure_ws
+        ws_handlers.each { |event, handler| @ws_manager.on(event, &handler) }
+
+        @connected = true
+        self
       end
 
+      # --- Live surface: change listeners ---
+
+      # Register a change listener.
+      #
+      #   client.logging.on_change { |event| ... }                 # global
+      #   client.logging.on_change("sqlalchemy.engine") { |e| ... } # key-scoped
+      #
+      # Requires +install+ first; raises +NotInstalledError+ otherwise.
       def on_change(name = nil, &block)
+        require_installed
         raise ArgumentError, "on_change requires a block" unless block
 
         if name.nil?
           @global_listeners << block
         else
-          @key_listeners[Normalize.normalize_logger_name(name)] << block
+          @key_listeners[name] << block
         end
         block
       end
 
-      def _close
-        @adapters.each(&:uninstall_hook) if @installed
-        @installed = false
+      # Re-fetch all loggers and groups and fire listener events for any deltas.
+      #
+      # Requires +install+ first; raises +NotInstalledError+ otherwise.
+      def refresh
+        require_installed
+        Smplkit.debug("resolution", "refresh() called, triggering full resolution pass")
+        fetch_and_apply_deltas(trigger: "refresh()", source: "manual")
       end
 
-      private
-
-      def auto_load_adapters
-        @adapters << Adapters::StdlibLoggerAdapter.new
+      # Release resources — only those this client owns.
+      #
+      # Uninstalls the adapter hooks, unsubscribes from the WebSocket, and tears
+      # down the owned WebSocket (standalone install). A wired client borrows the
+      # parent's transport and WebSocket and closes neither.
+      def close
+        Smplkit.debug("lifecycle", "LoggingClient.close() called")
+        @adapters.each do |adapter|
+          adapter.uninstall_hook
+        rescue StandardError => e
+          Smplkit.debug("logging", "adapter #{adapter.name} uninstall_hook failed: #{e.class}: #{e.message}")
+        end
+        if @ws_manager
+          ws_handlers.each { |event, handler| @ws_manager.off(event, handler) }
+          if @owns_ws
+            @ws_manager.stop
+            @owns_ws = false
+          end
+          @ws_manager = nil
+        end
+        @connected = false
+      end
+      alias _close close
 
+      # Construct, yield to the block, and close on exit.
+      def self.open(**kwargs)
+        client = new(**kwargs)
         begin
-          require "semantic_logger"
-          require_relative "adapters/semantic_logger_adapter"
-          @adapters << Adapters::SemanticLoggerAdapter.new
-        rescue LoadError
-          Smplkit.debug("registration", "semantic_logger gem not installed; semantic-logger adapter skipped")
+          yield client
+        ensure
+          client.close
         end
+      end
 
-        return unless @adapters.empty?
+      private
 
-        # Defensive log — unreachable in practice because stdlib +Logger+
-        # is always present, so +StdlibLoggerAdapter+ is always
-        # constructible.
-        # :nocov:
-        Smplkit.debug("registration", "no logging adapters loaded; runtime features disabled")
-        # :nocov:
+      def require_installed
+        raise NotInstalledError, NOT_INSTALLED_MESSAGE unless @connected
       end
 
-      def observe_logger(_adapter, raw_name, level)
-        normalized = Normalize.normalize_logger_name(raw_name)
-        @name_map[raw_name] = normalized
-        @manage.loggers.register(LoggerSource.new(
-                                   name: normalized,
-                                   resolved_level: level,
-                                   level: nil,
-                                   service: @parent._service,
-                                   environment: @parent._environment
-                                 ))
+      # Memoized event → handler map so +install+ registers and +close+
+      # unsubscribes the exact same callback objects. They are stored as procs
+      # (not bound methods) because +SharedWebSocket#off+ removes by object
+      # identity, and +on(event, &proc)+ stores the very proc passed here.
+      def ws_handlers
+        @ws_handlers ||= {
+          "logger_changed" => proc { |data| handle_logger_changed(data) },
+          "logger_deleted" => proc { |data| handle_logger_deleted(data) },
+          "group_changed" => proc { |data| handle_group_changed(data) },
+          "group_deleted" => proc { |data| handle_group_deleted(data) },
+          "loggers_changed" => proc { |data| handle_loggers_changed(data) }
+        }
       end
 
-      def flush_initial_registration
-        @manage.loggers.flush
-      rescue StandardError => e
-        Smplkit.debug("registration", "initial logger flush failed: #{e.class}: #{e.message}")
+      def ensure_ws
+        return @parent._ensure_ws unless @parent.nil?
+
+        if @ws_manager.nil?
+          @ws_manager = SharedWebSocket.new(
+            app_base_url: @app_base_url, api_key: @standalone_api_key, metrics: @metrics
+          )
+          @ws_manager.start
+          @owns_ws = true
+        end
+        @ws_manager
+      end
+
+      # --- Internal ---
+
+      # Build a LoggerSource from an adapter's (name, explicit, effective)
+      # discovery tuple.
+      def loggersource_for(name, explicit_level, effective_level)
+        LoggerSource.new(
+          name: name,
+          resolved_level: effective_level,
+          level: explicit_level,
+          service: @service,
+          environment: @environment
+        )
+      end
+
+      # Callback from adapters when a new logger is created.
+      def on_new_logger(name, explicit_level, effective_level)
+        normalized = Normalize.normalize_logger_name(name)
+        @name_map[name] = normalized
+        @loggers.register(loggersource_for(name, explicit_level, effective_level))
+
+        # If connected, try to apply level from cache.
+        return unless @connected && @loggers_cache.key?(normalized)
+
+        entry = @loggers_cache[normalized]
+        return unless entry["managed"]
+
+        resolved = Resolution.resolve_level(normalized, @environment, @loggers_cache, @groups_cache)
+        coerced = LogLevel.coerce(resolved)
+        push_to_adapters(name, coerced)
+      end
+
+      def push_to_adapters(original_name, coerced_level)
+        @adapters.each do |adapter|
+          adapter.apply_level(original_name, coerced_level)
+        rescue StandardError => e
+          Smplkit.debug("logging", "adapter #{adapter.name} apply_level failed for #{original_name}: " \
+                                   "#{e.class}: #{e.message}")
+        end
       end
 
-      # Full re-fetch of loggers + groups, then apply resolved levels.
-      def fetch_and_apply(trigger:, source: "websocket")
+      # Re-fetch loggers/groups into the cache (no apply, no fire).
+      def fetch_cache(trigger)
         Smplkit.debug("resolution", "full resolution pass starting (trigger: #{trigger})")
-        loggers = @manage.loggers.list_logger_entries
-        groups = @manage.log_groups.list_group_entries
-        @loggers_cache = loggers
-        @groups_cache = groups
-        apply_levels(source: source)
-      rescue StandardError => e
-        Smplkit.debug("resolution", "fetch_and_apply failed (trigger: #{trigger}): #{e.class}: #{e.message}")
-      end
-
-      # Apply newly-resolved levels in lockstep with listener
-      # notifications. For every locally-tracked managed logger whose
-      # freshly-computed effective level differs from the last applied
-      # value: push to adapters, then fire each global + matching
-      # key-scoped listener. No adapter push happens without a paired
-      # listener notification, and no notification fires without a
-      # paired adapter push.
-      def apply_levels(source: "websocket")
-        @name_map.each do |raw_name, normalized_id|
+        @loggers_cache = @loggers.list_logger_entries
+        @groups_cache = @log_groups.list_group_entries
+      end
+
+      # Fetch loggers/groups and unconditionally apply levels (initial install
+      # path).
+      #
+      # Silent — does not fire change-listener events. Use
+      # +fetch_and_apply_deltas+ from the WS / refresh paths to get per-logger
+      # fanout.
+      def fetch_and_apply(trigger: "unknown")
+        fetch_cache(trigger)
+        apply_levels
+      end
+
+      # Fetch loggers/groups; apply + fire listeners only on effective-level
+      # deltas.
+      def fetch_and_apply_deltas(trigger:, source:)
+        pre = snapshot_effective_levels
+        fetch_cache(trigger)
+        apply_deltas_and_fire(pre, source)
+      end
+
+      # Apply resolved levels to all managed, locally-present loggers.
+      def apply_levels
+        @name_map.each do |original_name, normalized_id|
           entry = @loggers_cache[normalized_id]
           next if entry.nil?
           next unless entry["managed"]
 
-          resolved_string = Resolution.resolve_level(
-            normalized_id, @parent._environment, @loggers_cache, @groups_cache
-          )
-          previous = @resolved_levels[normalized_id]
-          next if previous == resolved_string
+          resolved = Resolution.resolve_level(normalized_id, @environment, @loggers_cache, @groups_cache)
+          push_to_adapters(original_name, LogLevel.coerce(resolved))
+          @metrics&.record("logging.level_changes", unit: "changes", dimensions: { "logger" => normalized_id })
+        end
+      end
+
+      # Effective level for every locally-tracked managed logger.
+      #
+      # This is the universe of loggers the adapter applies levels to — the only
+      # loggers whose listener can fire. A logger not in +name_map+ (never
+      # instantiated locally) or marked +managed=false+ in the cache is excluded.
+      def snapshot_effective_levels
+        snapshot = {}
+        @name_map.each_value do |normalized_id|
+          entry = @loggers_cache[normalized_id]
+          next if entry.nil? || !entry["managed"]
 
-          coerced = LogLevel.coerce(resolved_string)
-          @resolved_levels[normalized_id] = resolved_string
-          push_to_adapters(raw_name, coerced)
-          fire_change_event(normalized_id, coerced, source: source)
+          snapshot[normalized_id] = Resolution.resolve_level(
+            normalized_id, @environment, @loggers_cache, @groups_cache
+          )
         end
+        snapshot
       end
 
-      def push_to_adapters(raw_name, coerced_level)
-        @adapters.each do |a|
-          a.apply_level(raw_name, coerced_level)
-        rescue StandardError => e
-          Smplkit.debug("logging", "adapter apply_level raised: #{e.class}: #{e.message}")
+      # Apply + fire per-logger whenever the effective level moved.
+      #
+      # For every locally-tracked managed logger, recompute the effective level
+      # and compare to +pre+. On a delta: call +apply_level+ on every adapter AND
+      # fire one +LoggerChangeEvent+ per affected logger — once to each matching
+      # key-scoped listener and once to every global listener (a global is
+      # semantically a key-scoped subscription on every logger). No-op when
+      # nothing moved: no apply, no fire.
+      def apply_deltas_and_fire(pre, source)
+        @name_map.each do |original_name, normalized_id|
+          entry = @loggers_cache[normalized_id]
+          next if entry.nil? || !entry["managed"]
+
+          new_level = Resolution.resolve_level(normalized_id, @environment, @loggers_cache, @groups_cache)
+          next if pre[normalized_id] == new_level
+
+          push_to_adapters(original_name, LogLevel.coerce(new_level))
+          @metrics&.record("logging.level_changes", unit: "changes", dimensions: { "logger" => normalized_id })
+          fire_for_logger(normalized_id, new_level, source)
         end
       end
 
-      def fire_change_event(normalized_id, level, source:)
-        event = LoggerChangeEvent.new(name: normalized_id, level: level, source: source)
-        (@global_listeners + @key_listeners[normalized_id]).each do |cb|
+      # Fire one +LoggerChangeEvent+ to every matching subscriber.
+      #
+      # Both the key-scoped listeners registered for +logger_id+ and every global
+      # listener receive the same payload.
+      def fire_for_logger(logger_id, level, source)
+        event = LoggerChangeEvent.new(name: logger_id, level: level, source: source)
+        (@global_listeners + @key_listeners[logger_id]).each do |cb|
           cb.call(event)
         rescue StandardError => e
           Smplkit.debug("logging", "listener raised: #{e.class}: #{e.message}")
         end
       end
 
-      def handle_logger_changed(data)
-        key = data["id"] || data["name"] || ""
-        normalized = Normalize.normalize_logger_name(key)
-        return if normalized.empty?
+      # --- Internal: event handlers (called by SharedWebSocket) ---
 
+      def handle_logger_changed(data)
+        key = data["id"] || ""
+        Smplkit.debug("websocket", "logger_changed: fetching logger #{key.inspect}")
+        pre = snapshot_effective_levels
         begin
-          entry_id, entry = @manage.loggers.get_logger_entry(normalized)
-          @loggers_cache[entry_id || normalized] = entry
+          entry_id, entry = @loggers.get_logger_entry(key)
+          @loggers_cache[entry_id || key] = entry
         rescue StandardError => e
-          Smplkit.debug("websocket", "logger_changed fetch failed for #{normalized.inspect}: #{e.class}: #{e.message}")
+          Smplkit.debug("websocket", "failed to fetch logger #{key.inspect} after WS event: #{e.class}: #{e.message}")
           return
         end
-
-        apply_levels(source: "websocket")
+        apply_deltas_and_fire(pre, "websocket")
       end
 
-      # Deletion is a pure cache eviction. The deleted key itself fires
-      # nothing; dependents whose effective level moves fire through the
-      # normal apply path.
       def handle_logger_deleted(data)
-        key = data["id"] || data["name"] || ""
-        normalized = Normalize.normalize_logger_name(key)
-        return if normalized.empty?
-
-        @loggers_cache.delete(normalized)
-        apply_levels(source: "websocket")
+        key = data["id"] || ""
+        Smplkit.debug("websocket", "logger_deleted: removing logger #{key.inspect}")
+        pre = snapshot_effective_levels
+        @loggers_cache.delete(key)
+        apply_deltas_and_fire(pre, "websocket")
       end
 
       def handle_group_changed(data)
-        key = data["id"] || data["key"] || ""
-        return if key.to_s.empty?
-
+        key = data["id"] || ""
+        Smplkit.debug("websocket", "group_changed: fetching group #{key.inspect}")
+        pre = snapshot_effective_levels
         begin
-          entry_id, entry = @manage.log_groups.get_group_entry(key)
+          entry_id, entry = @log_groups.get_group_entry(key)
           @groups_cache[entry_id || key] = entry
         rescue StandardError => e
-          Smplkit.debug("websocket", "group_changed fetch failed for #{key.inspect}: #{e.class}: #{e.message}")
+          Smplkit.debug("websocket",
+                        "failed to fetch log group #{key.inspect} after WS event: #{e.class}: #{e.message}")
           return
         end
-
-        apply_levels(source: "websocket")
+        apply_deltas_and_fire(pre, "websocket")
       end
 
       def handle_group_deleted(data)
-        key = data["id"] || data["key"] || ""
-        return if key.to_s.empty?
-
+        key = data["id"] || ""
+        Smplkit.debug("websocket", "group_deleted: removing group #{key.inspect}")
+        pre = snapshot_effective_levels
         @groups_cache.delete(key)
-        apply_levels(source: "websocket")
+        apply_deltas_and_fire(pre, "websocket")
       end
 
       def handle_loggers_changed(_data)
-        fetch_and_apply(trigger: "loggers_changed WS event")
-      end
-    end
-
-    LoggerChangeEvent = Struct.new(:name, :level, :source, keyword_init: true) do
-      def ==(other)
-        other.is_a?(LoggerChangeEvent) &&
-          name == other.name && level == other.level && source == other.source
+        Smplkit.debug("websocket", "loggers_changed: full re-fetch")
+        fetch_and_apply_deltas(trigger: "loggers_changed WS event", source: "websocket")
+      rescue StandardError => e
+        Smplkit.debug("websocket",
+                      "failed to re-fetch/apply logging levels after loggers_changed event: #{e.class}: #{e.message}")
       end
     end
   end
+
+  LoggingClient = Logging::LoggingClient
 end