Take the catalogue's composition rules into the node-engine

ADR 0593 §7: the composer with its refusals leaves mesh-sdk, so mesh-sdk carries no composition rule. The catalogue functions only the node-engine's composition reaches (Resolve, Resolution's Compose, Declaration, DataItems, LeftOut, Rules and the rest, the settings, placeholder and template refusals, the rendering helpers) are copied with their tests into internal/compose/resolution; a method of a mesh-sdk shape becomes a function taking it first. The composition calls its own copies, and the captured catalogue its tests read lives here now, shared by mesh-compose's tests. Claude-Session: https://claude.ai/code/session_01NcbgfJ9Gum47zkFKWRaovL
2026-11-02 19:15:55 +01:00
parent be0226b624
commit d68e241724
686 changed files with 35703 additions and 80 deletions
@@ -0,0 +1,51 @@
+# The mesh's block (module xorg, novox/hq ADR 0208 §5): the graphical session's start, replaced at
+# every push. It ends by starting the session, so no line below it in this file runs any more. A line
+# of your own that must run at every session start goes in ~/.xinitrc.local, which this block sources
+# just before the session starts (the module's README lists where each of today's lines went).
+
+# 1. The account's environment (ADR 0203): the file every shell sources, written by node-environment.
+if [ -r "${machine:account-home}/.config/mesh/environment.sh" ]; then
+  . "${machine:account-home}/.config/mesh/environment.sh"
+fi
+
+# The session bus is the user manager's. pam_systemd normally hands it over; when it did not, take
+# the canonical socket rather than starting a second bus, which runs every D-Bus-activated service
+# twice (two notifiers, two portals) and hides one copy from the other.
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && [ -S "/run/user/$(id -u)/bus" ]; then
+  DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$(id -u)/bus"
+  export DBUS_SESSION_BUS_ADDRESS
+fi
+
+# 2. The session's own words into the user manager and D-Bus activation, so the portal, the notifier
+# and every user service see the display and the desktop's identity. An explicit list and never
+# --all: a session's environment may hold things no user service should be able to read back.
+mesh_words=
+for mesh_word in DISPLAY XAUTHORITY XDG_SESSION_TYPE XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP \
+  XDG_CONFIG_HOME XDG_DATA_DIRS GTK_THEME GTK2_RC_FILES QT_QPA_PLATFORMTHEME QT_STYLE_OVERRIDE \
+  QT_SELECT XCURSOR_THEME XCURSOR_SIZE TERMINAL; do
+  if printenv "$mesh_word" >/dev/null 2>&1; then
+    mesh_words="$mesh_words $mesh_word"
+  fi
+done
+dbus-update-activation-environment --systemd $mesh_words
+unset mesh_word mesh_words
+
+# 3. X resources: the mesh's, then yours in ~/.Xresources, which win. The mesh's file is merged
+# without the C preprocessor, so no compiler is needed for it.
+xrdb -nocpp -merge "${machine:account-home}/.config/xorg/xresources"
+if [ -r "$HOME/.Xresources" ]; then
+  xrdb -merge "$HOME/.Xresources"
+fi
+
+# 4. The monitors: the saved layout profile that matches the monitors connected, if one does.
+if command -v autorandr >/dev/null 2>&1; then
+  autorandr --change >/dev/null 2>&1 || true
+fi
+
+# 5. Other modules' session lines (ADR 0208 §4), then yours.
+${shell:xinitrc:first}${shell:xinitrc:normal}if [ -r "$HOME/.xinitrc.local" ]; then
+  . "$HOME/.xinitrc.local"
+fi
+
+# 6. The session itself: the holder of node-display-session starts it from the last slot.
+${shell:xinitrc:last}
@@ -0,0 +1,13 @@
+! The mesh's X resources (module xorg, novox/hq ADR 0208 §4), replaced at every push. The session's
+! start merges them with xrdb -nocpp before ~/.Xresources, so your own resources there win. Without
+! the preprocessor there is no #include or #define here, and a line starting with # is skipped,
+! which is what the line naming each contributing module is.
+!
+! Font rendering, as both workstations had it. 96 DPI becomes a setting with issue 168; xorg_dpi
+! changes it for the running session.
+Xft.dpi: 96
+Xft.antialias: 1
+Xft.hinting: 1
+Xft.hintstyle: hintslight
+Xft.rgba: rgb
+${shell:xresources:first}${shell:xresources:normal}${shell:xresources:last}
@@ -0,0 +1,134 @@
+{
+  "module": "xorg",
+  "version": "1",
+  "moved": true,
+  "capabilities": [
+    "package-manager",
+    "seat"
+  ],
+  "provides": [
+    {
+      "name": "x11-display",
+      "reach": "machine"
+    }
+  ],
+  "claims": [
+    {
+      "name": "node-display-server",
+      "scope": "node",
+      "serves": [
+        "displays",
+        "layout"
+      ]
+    }
+  ],
+  "tools": [
+    "xorg_set_mode",
+    "xorg_primary",
+    "xorg_dpi",
+    "xorg_input_devices",
+    "xorg_input_set",
+    "xorg_keyboard",
+    "xorg_screenshot",
+    "xorg_windows",
+    "xorg_x_log"
+  ],
+  "resources": [
+    {
+      "id": "package-xorg-server",
+      "type": "package",
+      "package": "xorg-server"
+    },
+    {
+      "id": "package-xorg-xinit",
+      "type": "package",
+      "package": "xorg-xinit"
+    },
+    {
+      "id": "package-xorg-xrandr",
+      "type": "package",
+      "package": "xorg-xrandr"
+    },
+    {
+      "id": "package-xorg-xset",
+      "type": "package",
+      "package": "xorg-xset"
+    },
+    {
+      "id": "package-xorg-xrdb",
+      "type": "package",
+      "package": "xorg-xrdb"
+    },
+    {
+      "id": "package-xorg-xinput",
+      "type": "package",
+      "package": "xorg-xinput"
+    },
+    {
+      "id": "package-xorg-setxkbmap",
+      "type": "package",
+      "package": "xorg-setxkbmap"
+    },
+    {
+      "id": "package-xorg-xwd",
+      "type": "package",
+      "package": "xorg-xwd"
+    },
+    {
+      "id": "package-xorg-xwininfo",
+      "type": "package",
+      "package": "xorg-xwininfo"
+    },
+    {
+      "id": "package-autorandr",
+      "type": "package",
+      "package": "autorandr"
+    },
+    {
+      "id": "config",
+      "type": "directory",
+      "path": "${machine:account-home}/.config/xorg",
+      "owner": "${machine:account}",
+      "mode": "0755",
+      "unknown": "move-out"
+    },
+    {
+      "id": "xresources",
+      "type": "file",
+      "path": "${machine:account-home}/.config/xorg/xresources",
+      "owner": "${machine:account}",
+      "mode": "0644",
+      "template": "files/xresources"
+    },
+    {
+      "id": "xinitrc",
+      "type": "file",
+      "path": "${machine:account-home}/.xinitrc",
+      "owner": "${machine:account}",
+      "mode": "0755",
+      "into": "block",
+      "at": "start",
+      "template": "files/xinitrc"
+    }
+  ],
+  "build": {
+    "artifacts": [
+      {
+        "name": "tools",
+        "kind": "bundle",
+        "language": "go",
+        "system": "arch",
+        "from": "cmd/xorg",
+        "binary": "xorg",
+        "loads": [
+          "xorg"
+        ]
+      },
+      {
+        "name": "files",
+        "kind": "archive",
+        "from": "files"
+      }
+    ]
+  }
+}