feat: snap to column boundaries option for Niri layout

.gitignore

@@ -1,5 +1,7 @@
 # Build artifacts
 .build/
+Zig/omniwm_kernels/.zig-cache/
+Zig/omniwm_kernels/zig-out/
 
 # SwiftPM
 .swiftpm/xcode/xcuserdata/
@@ -35,3 +37,4 @@ Frameworks/
 
 # Local documentation
 STABILITY_IMPROVEMENTS.md
+.omc/

.swiftlint.yml

@@ -18,7 +18,6 @@ opt_in_rules:
   - async_without_await
   - incompatible_concurrency_annotation
   - strict_fileprivate
-  - no_extension_access_modifier
   - empty_count
   - empty_string
   - fatal_error_message
@@ -47,6 +46,18 @@ function_body_length:
   warning: 50
   error: 100
 
+cyclomatic_complexity:
+  warning: 10
+  error: 20
+
+function_parameter_count:
+  warning: 5
+  error: 10
+
+large_tuple:
+  warning: 3
+  error: 6
+
 identifier_name:
   min_length: 2
   max_length: 60

CONTRIBUTING.md

@@ -32,13 +32,18 @@ Bug fixes, documentation improvements, performance work, focused cleanups, featu
 - Include testing notes **if possible**. Mention what you ran, checked, or verified.
 - Add screenshots, recordings, or CLI examples when they help explain the change.
 - Update documentation when behavior, workflows, or interfaces change.
+- Run `make verify` before opening a pull request.
+- When touching `Zig/omniwm_kernels`, run `make kernels-test`.
 
 ## Basic Workflow
 
 1. Fork the repository.
 2. Create a branch for your change.
-3. Make the change and test it.
-4. Open a pull request with clear context and reasoning.
+3. Use `make build` while iterating on local changes.
+4. Use `make test` to run the Swift test suite against the pinned Zig and Ghostty build inputs.
+5. Use `make release-check` before packaging or release-oriented work.
+6. Run `make kernels-test` when your change touches the kernel library.
+7. Open a pull request with clear context, reasoning, and the commands you ran.
 
 ## Questions and Ideas
 

Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>0.4.6</string>
+	<string>0.4.7.3</string>
 	<key>CFBundleVersion</key>
-		<string>39</string>
+	<string>43</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>15.0</string>
 	<key>LSUIElement</key>

Makefile

@@ -1,4 +1,6 @@
-.PHONY: format lint lint-fix check
+.PHONY: format lint lint-fix kernels-build kernels-test build test verify release-check check
+
+SWIFT_WITH_GHOSTTY = LIBRARY_PATH="$$(./Scripts/build-preflight.sh print-ghostty-library-dir)$${LIBRARY_PATH:+:$$LIBRARY_PATH}"
 
 format:
 	swiftformat .
@@ -9,4 +11,36 @@ lint:
 lint-fix:
 	swiftlint lint --fix
 
-check: lint
+kernels-build:
+	./Scripts/build-zig-kernels.sh $(if $(CONFIG),$(CONFIG),debug)
+
+kernels-test:
+	cd Zig/omniwm_kernels && zig build test
+
+build:
+	./Scripts/build-preflight.sh build debug
+	$(MAKE) kernels-build
+	$(SWIFT_WITH_GHOSTTY) swift build
+
+test:
+	./Scripts/build-preflight.sh build debug
+	$(MAKE) kernels-build
+	$(SWIFT_WITH_GHOSTTY) swift test
+
+verify:
+	$(MAKE) lint
+	$(MAKE) build
+	$(MAKE) test
+
+release-check:
+	./Scripts/build-preflight.sh release-check
+	$(MAKE) verify
+	$(MAKE) kernels-build CONFIG=release
+	$(SWIFT_WITH_GHOSTTY) swift build -c release --arch arm64 --arch x86_64
+	test -x .build/apple/Products/Release/OmniWM
+	test -x .build/apple/Products/Release/omniwmctl
+	lipo -info .build/apple/Products/Release/OmniWM
+	lipo -info .build/apple/Products/Release/omniwmctl
+
+check:
+	$(MAKE) verify

Package.swift

@@ -3,12 +3,60 @@ import Foundation
 import PackageDescription
 
 let packageDirectory = URL(fileURLWithPath: #filePath).deletingLastPathComponent().path
-let ghosttyMacOSLibraryDirectory = "\(packageDirectory)/Frameworks/GhosttyKit.xcframework/macos-arm64_x86_64"
+struct BuildMetadata {
+    let macOSDeploymentTarget: String
+    let requiredZigVersion: String
+    let ghosttyArchiveRelativePath: String
+    let ghosttyArchiveSHA256: String
+
+    static func load(packageDirectory: String) -> BuildMetadata {
+        let metadataURL = URL(fileURLWithPath: packageDirectory).appendingPathComponent("Scripts/build-metadata.env")
+        guard let contents = try? String(contentsOf: metadataURL, encoding: .utf8) else {
+            fatalError("Missing build metadata at \(metadataURL.path)")
+        }
+
+        var values: [String: String] = [:]
+        for rawLine in contents.components(separatedBy: .newlines) {
+            let line = rawLine.trimmingCharacters(in: .whitespaces)
+            if line.isEmpty || line.hasPrefix("#") {
+                continue
+            }
+
+            guard let separatorIndex = line.firstIndex(of: "=") else {
+                fatalError("Invalid build metadata line: \(line)")
+            }
+
+            let key = String(line[..<separatorIndex]).trimmingCharacters(in: .whitespaces)
+            let valueStart = line.index(after: separatorIndex)
+            let value = String(line[valueStart...]).trimmingCharacters(in: .whitespaces)
+            values[key] = value
+        }
+
+        func require(_ key: String) -> String {
+            guard let value = values[key], !value.isEmpty else {
+                fatalError("Missing \(key) in \(metadataURL.path)")
+            }
+            return value
+        }
+
+        return BuildMetadata(
+            macOSDeploymentTarget: require("OMNIWM_MACOS_DEPLOYMENT_TARGET"),
+            requiredZigVersion: require("OMNIWM_REQUIRED_ZIG_VERSION"),
+            ghosttyArchiveRelativePath: require("OMNIWM_GHOSTTY_ARCHIVE_RELATIVE_PATH"),
+            ghosttyArchiveSHA256: require("OMNIWM_GHOSTTY_ARCHIVE_SHA256")
+        )
+    }
+}
+
+let buildMetadata = BuildMetadata.load(packageDirectory: packageDirectory)
+let ghosttyArchiveURL = URL(fileURLWithPath: packageDirectory).appendingPathComponent(buildMetadata.ghosttyArchiveRelativePath)
+let ghosttyMacOSLibraryDirectory = ghosttyArchiveURL.deletingLastPathComponent().path
+let zigKernelLibraryDirectory = "\(packageDirectory)/.build/zig-kernels/lib"
 
 let package = Package(
     name: "OmniWM",
     platforms: [
-        .macOS(.v15)
+        .macOS(buildMetadata.macOSDeploymentTarget)
     ],
     products: [
         .executable(
@@ -25,6 +73,11 @@ let package = Package(
             name: "GhosttyKit",
             path: "Frameworks/GhosttyKit.xcframework"
         ),
+        .target(
+            name: "COmniWMKernels",
+            path: "Sources/COmniWMKernels",
+            publicHeadersPath: "include"
+        ),
         .target(
             name: "OmniWMIPC",
             path: "Sources/OmniWMIPC",
@@ -34,7 +87,7 @@ let package = Package(
         ),
         .target(
             name: "OmniWM",
-            dependencies: ["GhosttyKit", "OmniWMIPC"],
+            dependencies: ["GhosttyKit", "OmniWMIPC", "COmniWMKernels"],
             path: "Sources/OmniWM",
             resources: [
                 .process("Resources")
@@ -51,8 +104,10 @@ let package = Package(
                 .linkedFramework("Metal"),
                 .linkedFramework("MetalKit"),
                 .linkedFramework("QuartzCore"),
+                .linkedLibrary("omniwm_kernels"),
                 .linkedLibrary("z"),
                 .linkedLibrary("c++"),
+                .unsafeFlags(["-L\(zigKernelLibraryDirectory)"]),
                 .unsafeFlags(["-L\(ghosttyMacOSLibraryDirectory)"]),
                 .unsafeFlags(["-F/System/Library/PrivateFrameworks", "-framework", "SkyLight"])
             ]
@@ -75,7 +130,7 @@ let package = Package(
         ),
         .testTarget(
             name: "OmniWMTests",
-            dependencies: ["OmniWM", "OmniWMIPC", "OmniWMCtl"],
+            dependencies: ["OmniWM", "OmniWMIPC", "OmniWMCtl", "COmniWMKernels"],
             path: "Tests/OmniWMTests",
             swiftSettings: [
                 .swiftLanguageMode(.v6)

README.md

@@ -111,7 +111,7 @@ Small demo, not fully showing everything, gif recorded at 30fps due to size, som
 - Real quake/sticky terminal using ghostty's libghostty
 - Best-effort macOS native-tab replacement support
 - IPC/CLI
-- Scrathpad/Sticky windows of any app
+- Scratchpad/Sticky windows of any app
 - Niri Overview
 - Unified command palette for windows and app menus
 - App menu anywhere
@@ -282,6 +282,7 @@ Layout legend:
 | Preselect Left / Right / Up / Down | `Unassigned` | `Dwindle` |
 | Clear Preselection | `Unassigned` | `Dwindle` |
 | Raise All Floating Windows | `Option + Shift + R` | `Shared` |
+| Rescue Off-Screen Floating Windows | `Unassigned` | `Shared` |
 | Toggle Focused Window Floating | `Unassigned` | `Shared` |
 | Assign Focused Window to Scratchpad | `Unassigned` | `Shared` |
 | Toggle Scratchpad Window | `Unassigned` | `Shared` |
@@ -406,7 +407,20 @@ Configure per-application behavior in Settings > App Rules:
 Requirements:
 - SwiftPM with Swift 6.2+
 - macOS 15.0+
-- Ghostty's universal `libghostty.a` (build Ghostty and copy it to `Frameworks/GhosttyKit.xcframework/macos-arm64_x86_64/libghostty.a` so it includes both `arm64` and `x86_64`)
+- Zig `0.15.2`
+- Ghostty's universal `libghostty.a` at `Frameworks/GhosttyKit.xcframework/macos-arm64_x86_64/libghostty.a`
+
+Build Commands:
+
+```bash
+make build         # Run build preflight checks, build Zig kernels, then build OmniWM
+make test          # Run build preflight checks, build Zig kernels, then run the Swift test suite
+make kernels-test  # Run the Zig kernel test suite
+make verify        # Run lint + build + tests
+make release-check # Run release-oriented preflight and universal build checks
+```
+
+`make build` and `make test` are the supported entry points for contributors. They run the current preflight checks and Zig kernel build automatically before invoking SwiftPM, so you should not rely on calling `swift build` or `swift test` directly on a fresh checkout.
 
 ## Support