omarchy-ui 0.0.6-x86_64-linux → 0.0.7-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c8e67a6ee733ab185881c3af8614d428d5888fcea3fed015780ccc4bae6a3b5
-  data.tar.gz: 648c98f47aea9d30e857809a65052bdb2ca374ecaebc122a3ea192b99aa2b815
+  metadata.gz: d389e6d9a8382cb8feec3a900ce2b4ee14001d214a069e96be8e7567e549f39e
+  data.tar.gz: 77d33296ea0cc16f08a93bb94a17607a3b50d19e036f2649304a89fcc4b9f455
 SHA512:
-  metadata.gz: 5f7664f1dafd992a22872bc029e8c48a242452ad5a8df9185a2aa0707b94b14df8724bd2e8c4fe3bd79afedeaf957e838fb1e27ecabb9467ba0ec41806e8f6d8
-  data.tar.gz: 97ec7a87a20e40653d8247cf69fd2534febb44b89ea7601355ada885d5f1978753332418ae756c9cf2e934a5534d108f43a850eca1c2ef3dc1c741435243d4ea
+  metadata.gz: 2be91201712539398abbf26b03cc3298947d2ff040da32e7171009ef70fdb4127adb7ab5992088176a5f28d5f901cdf4bcdfec68e65c13123bcb3fc61c2206f7
+  data.tar.gz: 89953562fbc3a943290234a297e5cd0f6ecf98b9f7b17a9188a5072716cf42e39e7281c724b97d2b4926df7aabd973485dbbc012ad3285447aaf36de9a7f5514

data/App.qml

@@ -2,6 +2,7 @@ import QtQuick
 import Quickshell
 import qs.Commons
 import qs.Ui as OmarchyUi
+import "Theme" as ZuiTheme
 
 ShellRoot {
   id: root
@@ -82,7 +83,7 @@ ShellRoot {
         }
       }
 
-      ZuiRenderer {
+      ControlNode {
         id: renderer
         anchors {
           left: parent.left
@@ -91,7 +92,7 @@ ShellRoot {
           bottom: parent.bottom
           margins: Style.space(24)
         }
-        visible: renderReady
+        visible: ZuiTheme.Fonts.ready && root.activeSurface !== "" && service.rootId(root.activeSurface) !== ""
         bridge: service
         surfaceName: root.activeSurface
         controlId: service.rootId(surfaceName)
@@ -103,7 +104,7 @@ ShellRoot {
         anchors.centerIn: parent
         visible: !renderer.visible
         text: service.lastError !== "" ? service.lastError
-          : "Starting Ruby UI with Zui…"
+          : (ZuiTheme.Fonts.failed ? "Omarchy UI could not load Zui's bundled fonts" : "Starting Ruby UI…")
         color: Color.foreground
         font.family: Style.font.family
         font.pixelSize: Style.font.body

data/BarWidget.qml

@@ -1,6 +1,7 @@
 import QtQuick
 import qs.Commons
 import qs.Ui
+import "Theme" as ZuiTheme
 
 BarWidget {
   id: root
@@ -16,10 +17,10 @@ BarWidget {
   implicitWidth: Math.max(Style.bar.iconSlot, renderer.implicitWidth + Style.space(12))
   implicitHeight: barSize
 
-  ZuiRenderer {
+  ControlNode {
     id: renderer
     anchors.centerIn: parent
-    visible: renderReady
+    visible: ZuiTheme.Fonts.ready && root.rubyService && root.rootControlId !== ""
     bridge: root.rubyService
     surfaceName: root.surfaceName
     controlId: root.rootControlId

data/Panel.qml

@@ -3,6 +3,7 @@ import Quickshell
 import Quickshell.Wayland
 import qs.Commons
 import qs.Ui as OmarchyUi
+import "Theme" as ZuiTheme
 
 Item {
   id: root
@@ -77,10 +78,10 @@ Item {
           onClicked: {}
         }
 
-        ZuiRenderer {
+        ControlNode {
           id: renderer
           anchors.centerIn: parent
-          visible: renderReady
+          visible: ZuiTheme.Fonts.ready && root.service && root.rootControlId !== ""
           bridge: root.service
           surfaceName: root.surfaceName
           controlId: root.rootControlId
@@ -97,7 +98,7 @@ Item {
             anchors.horizontalCenter: parent.horizontalCenter
             text: root.service && root.service.lastError !== ""
               ? root.service.lastError
-              : "Starting Ruby UI with Zui…"
+              : (ZuiTheme.Fonts.failed ? "Omarchy UI could not load Zui's bundled fonts" : "Starting Ruby UI…")
             color: Color.foreground
             font.family: Style.font.family
             font.pixelSize: Style.font.body

data/README.md

@@ -10,7 +10,7 @@
 </p>
 
 <p align="center">
-  <img alt="Omarchy UI 0.0.6" src="https://img.shields.io/badge/Omarchy_UI-0.0.6-b7ff5a?style=flat-square&labelColor=111711">
+  <img alt="Omarchy UI 0.0.7" src="https://img.shields.io/badge/Omarchy_UI-0.0.7-b7ff5a?style=flat-square&labelColor=111711">
   <img alt="Ruby 3.1 or newer" src="https://img.shields.io/badge/Ruby-3.1%2B-cc342d?style=flat-square&logo=ruby&logoColor=white">
   <img alt="Zui 0.0.10" src="https://img.shields.io/badge/Zui-0.0.10-7ee14b?style=flat-square&labelColor=111711">
   <img alt="241 components" src="https://img.shields.io/badge/components-241-75d943?style=flat-square&labelColor=111711">
@@ -63,11 +63,10 @@ and the Omarchy adapter.
 - Ruby 3.1 or newer while installing the gem and developing applications;
 - optional Qt modules for components that use features such as Quick 3D or Multimedia.
 
-The finished Omarchy bundle includes the Omarchy adapter and mruby executable. Shared renderers,
-controls, theme, and fonts stay in the compatible Zui gem instead of being duplicated into every
-plugin. The destination therefore needs Ruby and `omarchy-ui` installed. A component fails with an
-explicit error when its gem, required Qt module, or resource is unavailable; Omarchy UI never
-substitutes a different component.
+The finished Omarchy bundle includes the Omarchy adapter, mruby executable, and a Zui-generated QML
+runtime tree-shaken to the components referenced by that application. The destination does not need
+Ruby or framework gems. A component fails with an explicit error when its required Qt module or
+resource is unavailable; Omarchy UI never substitutes a different component.
 
 ## Quick start
 
@@ -103,7 +102,7 @@ counter/
 omarchy_ui run main.rb
 ```
 
-`run` bundles the project's Ruby entry point, prepares the Omarchy host, resolves the exact Zui gem,
+`run` bundles the project's Ruby entry point, asks Zui to tree-shake the QML runtime, prepares the Omarchy host,
 then launches it through Quickshell.
 
 ## Application model
@@ -335,7 +334,7 @@ omarchy_ui <command> [arguments]
 | --- | --- | --- |
 | `omarchy_ui new NAME` | One application name | Creates a new application directory using a URL-safe form of the name |
 | `omarchy_ui run FILE` | One Ruby entry point | Runs an application through the Omarchy/Quickshell host |
-| `omarchy_ui bundle [DIRECTORY]` | Zero or one project directory | Creates `dist/<project-name>` with the application, Omarchy adapter, and runtime; shared UI comes from Zui |
+| `omarchy_ui bundle [DIRECTORY]` | Zero or one project directory | Creates `dist/<project-name>` with the application, Omarchy adapter, runtime, and tree-shaken Zui QML |
 | `omarchy_ui validate [DIRECTORY]` | Zero or one plugin directory | Stages the complete plugin and delegates validation to `omarchy plugin validate` |
 | `omarchy_ui push [DIRECTORY]` | Optional `--no-enable` and `--no-restart` | Atomically installs and activates a validated plugin |
 | `omarchy_ui version` | None | Prints the installed Omarchy UI version |
@@ -362,7 +361,10 @@ dist/my-application/
 ├── Service.qml                 # process and surface bridge
 ├── Panel.qml                   # shell panel adapter
 ├── BarWidget.qml               # shell bar adapter
-├── ZuiRenderer.qml             # resolves Zui's shared protocol renderer
+├── ControlNode.qml             # generated Zui protocol renderer
+├── Components/Builtins/        # only component adapters selected by Zui
+├── Controls/ Theme/ Fonts/     # generated renderer dependencies
+├── zui-tree-shake.json         # auditable selected-component report
 ├── Commons@ Ui@                # links to Omarchy's shell modules
 ├── omarchy-ui-runtime          # embedded mruby executable
 ├── omarchy-ui-runtime.sha256
@@ -371,10 +373,9 @@ dist/my-application/
 ```
 
 Plugin bundles use the same runtime package and are validated against their manifest before the
-bundle command succeeds. Generated packages exclude `.git`, previous `dist` output, stale
-adapter/runtime files, and every Zui-owned QML directory. Install `omarchy-ui` on the destination so
-RubyGems supplies the exact Zui 0.0.10 catalog once for every plugin. The exact pin intentionally
-matches the Zui core embedded in the deterministic mruby runtime.
+bundle command succeeds. Generated packages exclude `.git`, previous `dist` output, and stale
+adapter/runtime files before regenerating the minimal QML package. Omarchy UI pins Zui 0.0.10 so the
+tree-shaken QML exactly matches the Zui core embedded in the deterministic mruby runtime.
 
 ## Component catalog
 
@@ -461,10 +462,10 @@ The dependency direction is deliberate:
   integration, plugin lifecycle commands, and Omarchy packaging.
 - **Applications own** Ruby source, assets, state, behavior, and reusable UI modules.
 
-At runtime, the adapter locates the compatible Zui gem and loads its protocol renderer, components,
-controls, theme, and fonts directly from `Zui::FRAMEWORK_ROOT`. Bundle, validation, and push install
-only the Omarchy host files and never copy Zui component implementations into an application or
-plugin. Read the full [QML ownership and adapter boundary](docs/qml-support.md).
+At bundle, validation, and push time, Omarchy UI asks Zui to analyze the bundled Ruby syntax and
+generate only the required component adapters plus their renderer dependencies. The four Omarchy
+host files then replace Zui's generic desktop host. Read the full [QML ownership and adapter
+boundary](docs/qml-support.md).
 
 ## Runtime integrity
 

data/Service.qml

@@ -14,11 +14,6 @@ Item {
   readonly property string rubyProgram: pluginDir + "/main.rb"
   property string program: ""
   readonly property string effectiveRubyProgram: program !== "" ? program : rubyProgram
-  readonly property string requiredZuiVersion: "0.0.10"
-  property string zuiRoot: ""
-  property string zuiVersion: ""
-  readonly property bool zuiReady: zuiRoot !== ""
-
   property bool ready: false
   property bool stopping: false
   property string lastError: ""
@@ -418,7 +413,7 @@ Item {
 
   function componentSource(typeName) {
     var definition = componentDefinitions[String(typeName || "")]
-    return definition && zuiReady ? zuiRoot + "/Components/Builtins/" + definition.qml : ""
+    return definition ? pluginDir + "/Components/Builtins/" + definition.qml : ""
   }
 
   function componentDefinition(typeName) {
@@ -446,7 +441,7 @@ Item {
   }
 
   function startRuby() {
-    if (stopping || pluginDir === "" || !zuiReady || rubyProcess.running) return
+    if (stopping || pluginDir === "" || rubyProcess.running) return
     var configuredRuntime = String(Quickshell.env("OMARCHY_UI_RUNTIME") || "")
     rubyProcess.command = [
       configuredRuntime !== "" ? configuredRuntime : pluginDir + "/omarchy-ui-runtime",
@@ -456,68 +451,14 @@ Item {
     rubyProcess.running = true
   }
 
-  function locateZui() {
-    if (stopping || pluginDir === "" || zuiReady || zuiLocator.running) return
-    zuiLocator.command = [
-      "ruby", "-e",
-      'require "json"; gem "zui", "= ' + requiredZuiVersion
-        + '"; require "zui"; STDOUT.write(JSON.generate({root: Zui::FRAMEWORK_ROOT, version: Zui::VERSION}))'
-    ]
-    zuiLocator.running = true
-  }
-
-  onPluginDirChanged: {
-    zuiRoot = ""
-    zuiVersion = ""
-    Qt.callLater(locateZui)
-  }
-
-  Component.onCompleted: Qt.callLater(locateZui)
+  onPluginDirChanged: Qt.callLater(startRuby)
 
   Component.onDestruction: {
     stopping = true
     restartTimer.stop()
-    if (zuiLocator.running) zuiLocator.running = false
     if (rubyProcess.running) rubyProcess.running = false
   }
 
-  Process {
-    id: zuiLocator
-
-    stdout: StdioCollector {
-      id: zuiLocatorOutput
-      waitForEnd: true
-    }
-
-    stderr: StdioCollector {
-      id: zuiLocatorError
-      waitForEnd: true
-    }
-
-    onExited: function(exitCode) {
-      if (root.stopping || root.pluginDir === "") return
-      var detail = String(zuiLocatorError.text || "").trim()
-      if (exitCode !== 0) {
-        root.lastError = "Zui " + root.requiredZuiVersion
-          + " is required from the omarchy-ui gem"
-          + (detail !== "" ? ": " + detail.slice(0, 240) : "")
-        return
-      }
-      try {
-        var located = JSON.parse(String(zuiLocatorOutput.text || ""))
-        if (!located || typeof located.root !== "string" || located.root[0] !== "/"
-            || String(located.version || "") !== root.requiredZuiVersion)
-          throw new Error("invalid Zui gem location")
-        root.zuiRoot = String(located.root)
-        root.zuiVersion = String(located.version)
-        root.lastError = ""
-        root.startRuby()
-      } catch (error) {
-        root.lastError = "Could not locate Zui " + root.requiredZuiVersion + " from RubyGems"
-      }
-    }
-  }
-
   Process {
     id: rubyProcess
     stdinEnabled: true

data/lib/omarchy_ui/runtime.rb

@@ -1,19 +1,23 @@
 # frozen_string_literal: true
 
 require "fileutils"
+require "json"
+require "tmpdir"
 
 module OmarchyUI
   module Runtime
     module_function
 
     BUNDLED = File.expand_path("../../vendor/runtime/x86_64-linux/omarchy-ui-runtime", __dir__)
-    ADAPTER_FILES = %w[Service.qml Panel.qml BarWidget.qml App.qml ZuiRenderer.qml].freeze
+    ADAPTER_FILES = %w[Service.qml Panel.qml BarWidget.qml App.qml].freeze
     ZUI_GENERATED_ENTRIES = %w[Desktop.qml ControlNode.qml Components Controls Theme Fonts].freeze
-    FILES = ADAPTER_FILES.freeze
+    TREE_SHAKE_REPORT = "zui-tree-shake.json"
+    FILES = (ADAPTER_FILES + %w[ControlNode.qml]).freeze
     AUDIT_FILES = %w[
       omarchy-ui-runtime.sha256 runtime-provenance.json RUNTIME_PROVENANCE.md
     ].freeze
-    GENERATED_ENTRIES = (ADAPTER_FILES + ZUI_GENERATED_ENTRIES + %w[omarchy-ui-runtime]).freeze
+    GENERATED_ENTRIES = (ADAPTER_FILES + ZUI_GENERATED_ENTRIES +
+      [TREE_SHAKE_REPORT, "omarchy-ui-runtime"]).freeze
 
     def executable
       override = ENV["OMARCHY_UI_RUNTIME"]
@@ -35,15 +39,24 @@ module OmarchyUI
       FileUtils.rm_f(temporary) if temporary && File.exist?(temporary)
     end
 
-    def install_package(path, framework_root: FRAMEWORK_ROOT)
+    def install_package(path, framework_root: FRAMEWORK_ROOT, project: path)
       FileUtils.mkdir_p(path)
-      ZUI_GENERATED_ENTRIES.each do |entry|
+      GENERATED_ENTRIES.each do |entry|
         generated = File.join(path, entry)
         File.directory?(generated) ? FileUtils.remove_entry(generated) : FileUtils.rm_f(generated)
       end
+      report = install_tree_shaken_zui(path, project:)
       ADAPTER_FILES.each do |file|
         FileUtils.cp(File.join(framework_root, file), File.join(path, file))
       end
+      File.write(File.join(path, TREE_SHAKE_REPORT), JSON.pretty_generate({
+        "zui_version" => Zui::VERSION,
+        "components" => report.components.map(&:to_s),
+        "before_bytes" => report.before_bytes,
+        "after_bytes" => report.after_bytes,
+        "saved_bytes" => report.saved_bytes,
+        "warnings" => report.warnings
+      }) + "\n")
 
       if File.file?(BUNDLED)
         destination = File.join(path, "omarchy-ui-runtime")
@@ -57,8 +70,22 @@ module OmarchyUI
       path
     end
 
-    def install_components(path, **)
-      install_package(path)
+    def install_components(path, **options)
+      install_package(path, **options)
+    end
+
+    def install_tree_shaken_zui(destination, project:)
+      Dir.mktmpdir("omarchy-ui-zui-") do |temporary|
+        qml = File.join(temporary, "qml")
+        native = File.join(temporary, "native")
+        FileUtils.mkdir_p(native)
+        Zui::Runtime.install_qml(qml)
+        report = Zui::TreeShaker.new(project:, framework: qml, native:).shake!
+        FileUtils.rm_f([File.join(qml, "Desktop.qml"), File.join(qml, "Service.qml")])
+        entries = Dir.children(qml).map { |entry| File.join(qml, entry) }
+        FileUtils.cp_r(entries, destination) unless entries.empty?
+        return report
+      end
     end
   end
 end

data/lib/omarchy_ui.rb

@@ -11,7 +11,7 @@ rescue LoadError
 end
 
 module OmarchyUI
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
   ZUI_VERSION = Zui::VERSION
   FRAMEWORK_ROOT = File.expand_path("..", __dir__)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omarchy-ui
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: x86_64-linux
 authors:
 - Adam Moussa Ali
@@ -35,7 +35,6 @@ files:
 - Panel.qml
 - README.md
 - Service.qml
-- ZuiRenderer.qml
 - bin/omarchy_ui
 - lib/omarchy_ui.rb
 - lib/omarchy_ui/cli.rb

data/ZuiRenderer.qml

@@ -1,37 +0,0 @@
-import QtQuick
-
-Loader {
-  id: root
-
-  property var bridge: null
-  property string surfaceName: ""
-  property string controlId: ""
-  property color foreground: "white"
-  property string fontFamily: ""
-  readonly property bool renderReady: status === Loader.Ready && item !== null
-    && String(item.iconFontFamily || "") !== ""
-    && String(item.brandIconFontFamily || "") !== ""
-
-  active: bridge !== null && bridge.zuiReady && controlId !== ""
-  source: active ? bridge.zuiRoot + "/ControlNode.qml" : ""
-
-  function syncRenderer() {
-    if (!item) return
-    item.bridge = bridge
-    item.surfaceName = surfaceName
-    item.controlId = controlId
-    item.foreground = foreground
-    item.fontFamily = fontFamily
-  }
-
-  onLoaded: syncRenderer()
-  onBridgeChanged: syncRenderer()
-  onSurfaceNameChanged: syncRenderer()
-  onControlIdChanged: syncRenderer()
-  onForegroundChanged: syncRenderer()
-  onFontFamilyChanged: syncRenderer()
-  onStatusChanged: {
-    if (status === Loader.Error && bridge)
-      bridge.lastError = "Could not load Zui " + bridge.requiredZuiVersion + " renderer from its gem"
-  }
-}