omarchy-ui 0.0.5-x86_64-linux → 0.0.6-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fbf5b96c9328c174f2b4f23eaa0d77c94abef05b7248e8c8dfe3c9faccb8295
-  data.tar.gz: 3e132767616cad3a67a1422dbb37797f9f7d82a2f3e4230aaf46e036c73a11d2
+  metadata.gz: 8c8e67a6ee733ab185881c3af8614d428d5888fcea3fed015780ccc4bae6a3b5
+  data.tar.gz: 648c98f47aea9d30e857809a65052bdb2ca374ecaebc122a3ea192b99aa2b815
 SHA512:
-  metadata.gz: c50abde08e09b6fbdfaedcedd5fbb11ba7b4a2acbdce67ad147f620981b11bd534857cfcc40c846007603333547a94b64c7d648acdcd07e16d0a1b0811044980
-  data.tar.gz: f8ac9e2883b7a34423c01007171d0baf417dd19ef7c290a65609d16fc283130dfb3a44a0a744def7a0c52b18ad3d074cb7e3d572ed9c4efa21da799436b0086f
+  metadata.gz: 5f7664f1dafd992a22872bc029e8c48a242452ad5a8df9185a2aa0707b94b14df8724bd2e8c4fe3bd79afedeaf957e838fb1e27ecabb9467ba0ec41806e8f6d8
+  data.tar.gz: 97ec7a87a20e40653d8247cf69fd2534febb44b89ea7601355ada885d5f1978753332418ae756c9cf2e934a5534d108f43a850eca1c2ef3dc1c741435243d4ea

data/App.qml

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

data/BarWidget.qml

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

data/Panel.qml

@@ -3,7 +3,6 @@ import Quickshell
 import Quickshell.Wayland
 import qs.Commons
 import qs.Ui as OmarchyUi
-import "Theme" as ZuiTheme
 
 Item {
   id: root
@@ -78,10 +77,10 @@ Item {
           onClicked: {}
         }
 
-        ControlNode {
+        ZuiRenderer {
           id: renderer
           anchors.centerIn: parent
-          visible: ZuiTheme.Fonts.ready && root.service && root.rootControlId !== ""
+          visible: renderReady
           bridge: root.service
           surfaceName: root.surfaceName
           controlId: root.rootControlId
@@ -98,7 +97,7 @@ Item {
             anchors.horizontalCenter: parent.horizontalCenter
             text: root.service && root.service.lastError !== ""
               ? root.service.lastError
-              : (ZuiTheme.Fonts.failed ? "Omarchy UI could not load Zui's bundled fonts" : "Starting Ruby UI…")
+              : "Starting Ruby UI with Zui…"
             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.5" src="https://img.shields.io/badge/Omarchy_UI-0.0.5-b7ff5a?style=flat-square&labelColor=111711">
+  <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="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,9 +63,11 @@ 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 framework and mruby executable, so the destination does
-not need the Ruby interpreter 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.
+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.
 
 ## Quick start
 
@@ -101,7 +103,7 @@ counter/
 omarchy_ui run main.rb
 ```
 
-`run` bundles the project's Ruby entry point, prepares the versioned Zui catalog and Omarchy host,
+`run` bundles the project's Ruby entry point, prepares the Omarchy host, resolves the exact Zui gem,
 then launches it through Quickshell.
 
 ## Application model
@@ -333,7 +335,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, adapter, catalog, and runtime |
+| `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 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 |
@@ -360,9 +362,7 @@ dist/my-application/
 ├── Service.qml                 # process and surface bridge
 ├── Panel.qml                   # shell panel adapter
 ├── BarWidget.qml               # shell bar adapter
-├── ControlNode.qml             # Zui protocol router
-├── Components/                 # complete native catalog
-├── Controls/ Theme/ Fonts/     # Zui presentation modules
+├── ZuiRenderer.qml             # resolves Zui's shared protocol renderer
 ├── Commons@ Ui@                # links to Omarchy's shell modules
 ├── omarchy-ui-runtime          # embedded mruby executable
 ├── omarchy-ui-runtime.sha256
@@ -371,8 +371,10 @@ 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, and stale
-adapter/runtime files.
+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.
 
 ## Component catalog
 
@@ -459,10 +461,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 run, bundle, validation, or push time, the adapter installs Zui's versioned QML package, removes
-the standard desktop entry point, and overlays the four Omarchy host files. It does not copy or fork
-Zui component implementations in this repository. Read the full [QML ownership and adapter
-boundary](docs/qml-support.md).
+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).
 
 ## Runtime integrity
 

data/Service.qml

@@ -14,6 +14,10 @@ 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
@@ -414,7 +418,7 @@ Item {
 
   function componentSource(typeName) {
     var definition = componentDefinitions[String(typeName || "")]
-    return definition ? pluginDir + "/Components/Builtins/" + definition.qml : ""
+    return definition && zuiReady ? zuiRoot + "/Components/Builtins/" + definition.qml : ""
   }
 
   function componentDefinition(typeName) {
@@ -442,7 +446,7 @@ Item {
   }
 
   function startRuby() {
-    if (stopping || pluginDir === "" || rubyProcess.running) return
+    if (stopping || pluginDir === "" || !zuiReady || rubyProcess.running) return
     var configuredRuntime = String(Quickshell.env("OMARCHY_UI_RUNTIME") || "")
     rubyProcess.command = [
       configuredRuntime !== "" ? configuredRuntime : pluginDir + "/omarchy-ui-runtime",
@@ -452,14 +456,68 @@ Item {
     rubyProcess.running = true
   }
 
-  onPluginDirChanged: Qt.callLater(startRuby)
+  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)
 
   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/ZuiRenderer.qml

@@ -0,0 +1,37 @@
+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"
+  }
+}

data/lib/omarchy_ui/runtime.rb

@@ -7,13 +7,13 @@ module OmarchyUI
     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].freeze
-    CORE_FILES = %w[ControlNode.qml Components Controls Theme Fonts].freeze
-    FILES = (ADAPTER_FILES + ["ControlNode.qml"]).freeze
+    ADAPTER_FILES = %w[Service.qml Panel.qml BarWidget.qml App.qml ZuiRenderer.qml].freeze
+    ZUI_GENERATED_ENTRIES = %w[Desktop.qml ControlNode.qml Components Controls Theme Fonts].freeze
+    FILES = ADAPTER_FILES.freeze
     AUDIT_FILES = %w[
       omarchy-ui-runtime.sha256 runtime-provenance.json RUNTIME_PROVENANCE.md
     ].freeze
-    GENERATED_ENTRIES = (ADAPTER_FILES + CORE_FILES + %w[Desktop.qml omarchy-ui-runtime]).freeze
+    GENERATED_ENTRIES = (ADAPTER_FILES + ZUI_GENERATED_ENTRIES + %w[omarchy-ui-runtime]).freeze
 
     def executable
       override = ENV["OMARCHY_UI_RUNTIME"]
@@ -36,8 +36,11 @@ module OmarchyUI
     end
 
     def install_package(path, framework_root: FRAMEWORK_ROOT)
-      Zui::Runtime.install_qml(path)
-      FileUtils.rm_f(File.join(path, "Desktop.qml"))
+      FileUtils.mkdir_p(path)
+      ZUI_GENERATED_ENTRIES.each do |entry|
+        generated = File.join(path, entry)
+        File.directory?(generated) ? FileUtils.remove_entry(generated) : FileUtils.rm_f(generated)
+      end
       ADAPTER_FILES.each do |file|
         FileUtils.cp(File.join(framework_root, file), File.join(path, file))
       end
@@ -55,9 +58,7 @@ module OmarchyUI
     end
 
     def install_components(path, **)
-      Zui::Runtime.install_qml(path)
-      FileUtils.rm_f(File.join(path, "Desktop.qml"))
-      path
+      install_package(path)
     end
   end
 end

data/lib/omarchy_ui.rb

@@ -11,7 +11,7 @@ rescue LoadError
 end
 
 module OmarchyUI
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
   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.5
+  version: 0.0.6
 platform: x86_64-linux
 authors:
 - Adam Moussa Ali
@@ -13,14 +13,14 @@ dependencies:
   name: zui
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.0.10
 description: The Omarchy adapter for the platform-neutral Zui desktop framework.
@@ -35,6 +35,7 @@ files:
 - Panel.qml
 - README.md
 - Service.qml
+- ZuiRenderer.qml
 - bin/omarchy_ui
 - lib/omarchy_ui.rb
 - lib/omarchy_ui/cli.rb