feat: new window gets 1/n ratio, existing windows scale proportionally

Previously addWindow() reset all ratios to equal splits, losing any
custom sizing. Now _addRatioForNewWindow() gives the new window 1/n of
the space and scales the existing windows by (n-1)/n, preserving their
ratios relative to each other.

e.g. [1/3, 1/6, 1/2] + new → [0.25, 0.125, 0.375, 0.25]

.gitea/workflows/build.yaml

@@ -0,0 +1,99 @@
+name: Build and Test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: archlinux
+    container:
+      image: node:25
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Install pnpm and TypeScript
+        run: npm install -g pnpm typescript@5.8.3
+
+      - name: Install just
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to /usr/local/bin
+
+      - name: Install system dependencies
+        run: |
+          apt-get update
+          apt-get install -y libglib2.0-dev glib-networking zip
+
+      - name: Install project dependencies
+        run: pnpm install
+
+      - name: Run unit tests
+        run: just test
+
+      - name: Build and package extension
+        run: just build-package
+
+      - name: Upload extension package
+        uses: actions/upload-artifact@v3
+        with:
+          name: aerospike-extension
+          path: aerospike.zip
+          retention-days: 30
+
+  release:
+    needs: build
+    runs-on: archlinux
+    if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+    environment:
+      name: production
+    container:
+      image: node:25
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Download artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: aerospike-extension
+
+      - name: Get version from package.json
+        id: get_version
+        run: |
+          VERSION=$(node -p "require('./package.json').version")
+          echo "version=v${VERSION}" >> $GITHUB_OUTPUT
+
+      - name: Create Gitea Release
+        env:
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+        run: |
+          curl -X POST \
+            -H "Authorization: token ${GITEA_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d '{
+              "tag_name": "${{ steps.get_version.outputs.version }}",
+              "name": "Release ${{ steps.get_version.outputs.version }}",
+              "body": "Automated release of aerospike GNOME extension ${{ steps.get_version.outputs.version }}\n\n## Installation\nDownload aerospike.zip and install it as a GNOME extension."
+            }' \
+            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases"
+
+      - name: Upload Release Asset
+        env:
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+        run: |
+          RELEASE_ID=$(curl -H "Authorization: token ${GITEA_TOKEN}" \
+            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/tags/${{ steps.get_version.outputs.version }}" | \
+            grep -Po '"id":\s*\K[0-9]+' | head -1)
+
+          curl -X POST \
+            -H "Authorization: token ${GITEA_TOKEN}" \
+            -H "Content-Type: multipart/form-data" \
+            -F "attachment=@aerospike.zip" \
+            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=aerospike.zip"

.gitignore

@@ -3,3 +3,4 @@ node_modules
 dist
 /schemas/gschemas.compiled
 /aerospike.zip
+/debug.log

.nvmrc

@@ -0,0 +1 @@
+24

ambient.d.ts

@@ -2,3 +2,10 @@ import "@girs/gjs";
 import "@girs/gjs/dom";
 import "@girs/gnome-shell/ambient";
 import "@girs/gnome-shell/extensions/global";
+
+// Extend Meta.Window with our custom property
+declare namespace Meta {
+    interface Window {
+        _aerospikeData?: any;
+    }
+}

extension.ts

@@ -1,264 +1,72 @@
-import GLib from 'gi://GLib';
-import St from 'gi://St';
 import Meta from 'gi://Meta';
-import {Extension, ExtensionMetadata} from 'resource:///org/gnome/shell/extensions/extension.js';
-import Mtk from "@girs/mtk-16";
-
+import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js';
 import * as Main from 'resource:///org/gnome/shell/ui/main.js';
 import Gio from 'gi://Gio';
 import Shell from 'gi://Shell';
-
-import { WindowTree, WindowNode, createWindowNode, addNodeChild, removeNode, findNodeByWindowId, calculateLayout } from './src/winGroup.js';
-
-type Signal = {
-    name: string;
-    id: number;
-}
-
-type WinWrapper = {
-    window: Meta.Window | null;
-    signals: Signal[] | null;
-}
-
-type WorkspaceMonitorKey = `${number}-${number}`; // format: "workspace-monitor"
-
-type DraggedWindowInfo = {
-    id: number;
-    originalMonitor: number;
-    originalWorkspace: number;
-}
+import WindowManager from './src/wm/windowManager.js'
+import {Logger} from "./src/utils/logger.js";
 
 export default class aerospike extends Extension {
     settings: Gio.Settings;
     keyBindings: Map<string, number>;
-    borderActor: St.Widget | null;
-    focusWindowSignals: any[];
-    lastFocusedWindow: Meta.Window | null;
-    _focusSignal: number | null;
-    _windowCreateId: number | null;
-    _windows: Map<number, WinWrapper>;
-    _windowTrees: Map<WorkspaceMonitorKey, WindowTree>;
-    _activeWindowId: number | null;
-    _windowDragBeginId: number | null;
-    _windowDragEndId: number | null;
-    _draggedWindowInfo: DraggedWindowInfo | null;
-    _workspaceChangedId: number | null;
+    windowManager: WindowManager;
 
-    constructor(metadata: ExtensionMetadata) {
+    constructor(metadata: ConstructorParameters<typeof Extension>[0]) {
         super(metadata);
         this.settings = this.getSettings('org.gnome.shell.extensions.aerospike');
         this.keyBindings = new Map();
-        // Initialize instance variables
-        this.borderActor = null;
-        this.focusWindowSignals = [];
-        this.lastFocusedWindow = null;
-        this._focusSignal = null;
-        this._windowCreateId = null;
-        this._windows = new Map<number, WinWrapper>();
-        this._windowTrees = new Map<WorkspaceMonitorKey, WindowTree>();
-        this._activeWindowId = null;
-        this._windowDragBeginId = null;
-        this._windowDragEndId = null;
-        this._draggedWindowInfo = null;
-        this._workspaceChangedId = null;
+        this.windowManager = new WindowManager();
     }
 
     enable() {
-        try {
-            console.log("STARTING AEROSPIKE!");
-            
-            // Initialize data structures
-            this._windows = new Map<number, WinWrapper>();
-            this._windowTrees = new Map<WorkspaceMonitorKey, WindowTree>();
-            this._activeWindowId = null;
-            this._draggedWindowInfo = null;
-            
-            // Connect to window creation
-            this._windowCreateId = global.display.connect(
-                'window-created',
-                (display, window) => {
-                    try {
-                        this.handleWindowCreated(window);
-                    } catch (e) {
-                        console.error("Error handling window creation:", e);
-                    }
-                }
-            );
-
-            // Connect to window drag operations
-            this._connectDraggingSignals();
-            
-            // Connect to workspace change signals
-            this._workspaceChangedId = global.workspace_manager.connect(
-                'workspace-switched',
-                (_workspaceManager, _oldWorkspaceIndex, _newWorkspaceIndex) => {
-                    try {
-                        this._refreshActiveWorkspace();
-                    } catch (e) {
-                        console.error("Error refreshing workspace:", e);
-                    }
-                }
-            );
-            
-            // Setup keybindings
-            this.bindSettings();
-            
-            // Capture existing windows - do this last
-            this._captureExistingWindows();
-            
-            console.log("AEROSPIKE STARTED SUCCESSFULLY");
-        } catch (e) {
-            console.error("Error enabling Aerospike:", e);
-            // Perform cleanup if something failed
-            this.disable();
-        }
+        Logger.log("STARTING AEROSPIKE!")
+        this.windowManager._settings = this.settings;
+        this.bindSettings();
+        this.setupKeybindings();
+        this.windowManager.enable()
     }
 
-    _connectDraggingSignals() {
-        // Handle window drag begin
-        this._windowDragBeginId = global.display.connect(
-            'grab-op-begin',
-            (_display, window, op) => {
-                if (window && (op === Meta.GrabOp.MOVING || op === Meta.GrabOp.KEYBOARD_MOVING)) {
-                    this._handleDragBegin(window);
-                }
-            }
-        );
-        
-        // Handle window drag end
-        this._windowDragEndId = global.display.connect(
-            'grab-op-end',
-            (_display, window, op) => {
-                if (window && (op === Meta.GrabOp.MOVING || op === Meta.GrabOp.KEYBOARD_MOVING)) {
-                    this._handleDragEnd(window);
-                }
-            }
-        );
+    disable() {
+        this.windowManager.disable()
+        this.removeKeybindings()
     }
 
-    _handleDragBegin(window: Meta.Window) {
-        try {
-            if (!window) {
-                console.error("Received null window in _handleDragBegin");
-                return;
-            }
-            
-            const workspace = window.get_workspace();
-            if (!workspace) {
-                console.error("Window has no workspace in _handleDragBegin");
-                return;
-            }
-            
-            const id = window.get_id();
-            console.log(`Drag begin for window ${id}`);
-            
-            this._draggedWindowInfo = {
-                id: id,
-                originalMonitor: window.get_monitor(),
-                originalWorkspace: workspace.index()
-            };
-            
-            console.log(`Original location: workspace ${this._draggedWindowInfo.originalWorkspace}, monitor ${this._draggedWindowInfo.originalMonitor}`);
-        } catch (e) {
-            console.error("Error in _handleDragBegin:", e);
-            this._draggedWindowInfo = null;
-        }
-    }
-
-    _handleDragEnd(window: Meta.Window) {
-        try {
-            if (!window) {
-                console.error("Received null window in _handleDragEnd");
-                this._draggedWindowInfo = null;
-                return;
-            }
-            
-            if (!this._draggedWindowInfo) {
-                console.log("No drag info available, ignoring drag end");
-                return;
-            }
-            
-            const workspace = window.get_workspace();
-            if (!workspace) {
-                console.error("Window has no workspace in _handleDragEnd");
-                this._draggedWindowInfo = null;
-                return;
-            }
-            
-            const id = window.get_id();
-            const newMonitor = window.get_monitor();
-            const newWorkspace = workspace.index();
-            
-            console.log(`Drag end for window ${id}: new location - workspace ${newWorkspace}, monitor ${newMonitor}`);
-            
-            // Check if monitor or workspace changed
-            if (this._draggedWindowInfo.originalMonitor !== newMonitor || 
-                this._draggedWindowInfo.originalWorkspace !== newWorkspace) {
-                
-                console.log(`Window moved from workspace ${this._draggedWindowInfo.originalWorkspace}, monitor ${this._draggedWindowInfo.originalMonitor}`);
-                console.log(`to workspace ${newWorkspace}, monitor ${newMonitor}`);
-                
-                // Remove from old tree
-                const oldKey = `${this._draggedWindowInfo.originalWorkspace}-${this._draggedWindowInfo.originalMonitor}` as WorkspaceMonitorKey;
-                this._removeWindowFromTree(id, oldKey);
-                
-                // Add to new tree
-                this._addWindowToTree(window, newWorkspace, newMonitor);
-                
-                // Retile both affected trees with a small delay
-                GLib.timeout_add(GLib.PRIORITY_DEFAULT, 50, () => {
-                    try {
-                        this._tileWindowsInTree(oldKey);
-                        this._tileWindowsInTree(`${newWorkspace}-${newMonitor}` as WorkspaceMonitorKey);
-                    } catch (e) {
-                        console.error("Error retiling after drag:", e);
-                    }
-                    return GLib.SOURCE_REMOVE;
-                });
-            } else {
-                console.log("Window position unchanged after drag");
-            }
-        } catch (e) {
-            console.error("Error in _handleDragEnd:", e);
-        } finally {
-            this._draggedWindowInfo = null;
-        }
-    }
-
-    _refreshActiveWorkspace() {
-        // Refresh all trees in the current workspace
-        const workspace = global.workspace_manager.get_active_workspace();
-        const workspaceIndex = workspace.index();
-        
-        // Find all trees in the current workspace
-        for (const key of this._windowTrees.keys()) {
-            const [wsIndex, _] = key.split('-').map(Number);
-            if (wsIndex === workspaceIndex) {
-                this._tileWindowsInTree(key as WorkspaceMonitorKey);
-            }
-        }
-    }
 
     private bindSettings() {
         // Monitor settings changes
-        this.settings.connect('changed::keybinding-1', () => {
-            log(`Keybinding 1 changed to: ${this.settings.get_strv('keybinding-1')}`);
-            this.refreshKeybinding('keybinding-1');
+        this.settings.connect('changed::move-left', () => {
+            log(`Keybinding 1 changed to: ${this.settings.get_strv('move-left')}`);
+            this.refreshKeybinding('move-left');
         });
 
-        this.settings.connect('changed::keybinding-2', () => {
-            log(`Keybinding 2 changed to: ${this.settings.get_strv('keybinding-2')}`);
-            this.refreshKeybinding('keybinding-2');
+        this.settings.connect('changed::move-right', () => {
+            log(`Keybinding 2 changed to: ${this.settings.get_strv('move-right')}`);
+            this.refreshKeybinding('move-right');
         });
 
-        this.settings.connect('changed::keybinding-3', () => {
-            log(`Keybinding 3 changed to: ${this.settings.get_strv('keybinding-3')}`);
-            this.refreshKeybinding('keybinding-3');
+        this.settings.connect('changed::join-with-left', () => {
+            log(`Keybinding 3 changed to: ${this.settings.get_strv('join-with-left')}`);
+            this.refreshKeybinding('join-with-left');
         });
 
-        this.settings.connect('changed::keybinding-4', () => {
-            log(`Keybinding 4 changed to: ${this.settings.get_strv('keybinding-4')}`);
-            this.refreshKeybinding('keybinding-4');
+        this.settings.connect('changed::join-with-right', () => {
+            log(`Keybinding 4 changed to: ${this.settings.get_strv('join-with-right')}`);
+            this.refreshKeybinding('join-with-right');
+        });
+
+        this.settings.connect('changed::print-tree', () => {
+            log(`Print tree keybinding changed to: ${this.settings.get_strv('print-tree')}`);
+            this.refreshKeybinding('print-tree');
+        });
+
+        this.settings.connect('changed::toggle-orientation', () => {
+            log(`Toggle orientation keybinding changed to: ${this.settings.get_strv('toggle-orientation')}`);
+            this.refreshKeybinding('toggle-orientation');
+        });
+
+        this.settings.connect('changed::reset-ratios', () => {
+            log(`Reset ratios keybinding changed to: ${this.settings.get_strv('reset-ratios')}`);
+            this.refreshKeybinding('reset-ratios');
         });
 
         this.settings.connect('changed::dropdown-option', () => {
@@ -269,7 +77,6 @@ export default class aerospike extends Extension {
             log(`Color selection changed to: ${this.settings.get_string('color-selection')}`);
         });
     }
-    
     private refreshKeybinding(settingName: string) {
         if (this.keyBindings.has(settingName)) {
             Main.wm.removeKeybinding(settingName);
@@ -277,24 +84,39 @@ export default class aerospike extends Extension {
         }
 
         switch (settingName) {
-            case 'keybinding-1':
-                this.bindKeybinding('keybinding-1', () => {
-                    log('Keybinding 1 was pressed!');
+            case 'move-left':
+                this.bindKeybinding('move-left', () => {
+                    Logger.info('Keybinding 1 was pressed!');
                 });
                 break;
-            case 'keybinding-2':
-                this.bindKeybinding('keybinding-2', () => {
-                    log('Keybinding 2 was pressed!');
+            case 'move-right':
+                this.bindKeybinding('move-right', () => {
+                    Logger.info('Keybinding 2 was pressed!');
                 });
                 break;
-            case 'keybinding-3':
-                this.bindKeybinding('keybinding-3', () => {
-                    log('Keybinding 3 was pressed!');
+            case 'join-with-left':
+                this.bindKeybinding('join-with-left', () => {
+                    Logger.info('Keybinding 3 was pressed!');
                 });
                 break;
-            case 'keybinding-4':
-                this.bindKeybinding('keybinding-4', () => {
-                    log('Keybinding 4 was pressed!');
+            case 'join-with-right':
+                this.bindKeybinding('join-with-right', () => {
+                    Logger.info('Keybinding 4 was pressed!');
+                });
+                break;
+            case 'print-tree':
+                this.bindKeybinding('print-tree', () => {
+                    this.windowManager.printTreeStructure();
+                });
+                break;
+            case 'toggle-orientation':
+                this.bindKeybinding('toggle-orientation', () => {
+                    this.windowManager.toggleActiveContainerOrientation();
+                });
+                break;
+            case 'reset-ratios':
+                this.bindKeybinding('reset-ratios', () => {
+                    this.windowManager.resetActiveContainerRatios();
                 });
                 break;
         }
@@ -308,20 +130,32 @@ export default class aerospike extends Extension {
     }
 
     private setupKeybindings() {
-        this.bindKeybinding('keybinding-1', () => {
-            log('Keybinding 1 was pressed!');
+        this.bindKeybinding('move-left', () => {
+            Logger.info('Keybinding 1 was pressed!');
         });
 
-        this.bindKeybinding('keybinding-2', () => {
-            log('Keybinding 2 was pressed!');
+        this.bindKeybinding('move-right', () => {
+            Logger.info('Keybinding 2 was pressed!');
         });
 
-        this.bindKeybinding('keybinding-3', () => {
-            log('Keybinding 3 was pressed!');
+        this.bindKeybinding('join-with-left', () => {
+            Logger.info('Keybinding 3 was pressed!');
         });
 
-        this.bindKeybinding('keybinding-4', () => {
-            log('Keybinding 4 was pressed!');
+        this.bindKeybinding('join-with-right', () => {
+            Logger.info('Keybinding 4 was pressed!');
+        });
+
+        this.bindKeybinding('print-tree', () => {
+            this.windowManager.printTreeStructure();
+        });
+
+        this.bindKeybinding('toggle-orientation', () => {
+            this.windowManager.toggleActiveContainerOrientation();
+        });
+
+        this.bindKeybinding('reset-ratios', () => {
+            this.windowManager.resetActiveContainerRatios();
         });
     }
 
@@ -335,7 +169,7 @@ export default class aerospike extends Extension {
         const keyBindingAction = Main.wm.addKeybinding(
             settingName,
             this.settings,
-            Meta.KeyBindingFlags.IGNORE_AUTOREPEAT,
+            Meta.KeyBindingFlags.NONE,
             Shell.ActionMode.NORMAL,
             callback
         );
@@ -343,566 +177,6 @@ export default class aerospike extends Extension {
         this.keyBindings.set(settingName, keyBindingAction);
     }
 
-    handleWindowCreated(window: Meta.Window) {
-        try {
-            if (!window) {
-                console.error("Received null or undefined window");
-                return;
-            }
-            
-            console.log("WINDOW CREATED", window);
-            
-            if (!this._isWindowTileable(window)) {
-                console.log("Window is not tileable, ignoring");
-                return;
-            }
-            
-            console.log("WINDOW IS TILABLE");
-            
-            const actor = window.get_compositor_private();
-            if (!actor) {
-                console.log("Window has no compositor actor, ignoring");
-                return;
-            }
-            
-            // Get workspace safely
-            const workspace = window.get_workspace();
-            if (!workspace) {
-                console.error("Window has no workspace, ignoring");
-                return;
-            }
-            
-            // Track window for signal management
-            this._addWindow(window);
-            
-            // Add to appropriate tree
-            const workspaceIndex = workspace.index();
-            const monitor = window.get_monitor();
-            
-            console.log(`Adding window to workspace ${workspaceIndex}, monitor ${monitor}`);
-            this._addWindowToTree(window, workspaceIndex, monitor);
-        } catch (e) {
-            console.error("Error in handleWindowCreated:", e);
-        }
-    }
 
-    _captureExistingWindows() {
-        try {
-            console.log("CAPTURING WINDOWS");
-            
-            // Get all workspaces
-            const workspaceCount = global.workspace_manager.get_n_workspaces();
-            const monitorCount = global.display.get_n_monitors();
-            
-            console.log(`Found ${workspaceCount} workspaces and ${monitorCount} monitors`);
-            
-            // Initialize trees for all workspace-monitor combinations
-            for (let wsIndex = 0; wsIndex < workspaceCount; wsIndex++) {
-                const workspace = global.workspace_manager.get_workspace_by_index(wsIndex);
-                if (!workspace) {
-                    console.error(`Workspace at index ${wsIndex} not found`);
-                    continue;
-                }
-                
-                for (let monIndex = 0; monIndex < monitorCount; monIndex++) {
-                    try {
-                        // Create empty tree for this workspace-monitor combination
-                        this._getWindowTree(wsIndex, monIndex);
-                        
-                        // Get windows for this workspace
-                        const windows = global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
-                        console.log(`Found ${windows.length} windows in workspace ${wsIndex}`);
-                        
-                        // Add tileable windows to the appropriate tree
-                        let addedWindows = 0;
-                        for (const window of windows) {
-                            try {
-                                if (window && this._isWindowTileable(window) && window.get_monitor() === monIndex) {
-                                    // Track window for signal management
-                                    this._addWindow(window);
-                                    
-                                    // Add to tree
-                                    this._addWindowToTree(window, wsIndex, monIndex);
-                                    addedWindows++;
-                                }
-                            } catch (e) {
-                                console.error(`Error processing window in workspace ${wsIndex}, monitor ${monIndex}:`, e);
-                            }
-                        }
-                        
-                        console.log(`Added ${addedWindows} windows to workspace ${wsIndex}, monitor ${monIndex}`);
-                    } catch (e) {
-                        console.error(`Error processing monitor ${monIndex} in workspace ${wsIndex}:`, e);
-                    }
-                }
-            }
-            
-            // Tile all trees with a slight delay to ensure all windows are ready
-            GLib.timeout_add(GLib.PRIORITY_DEFAULT, 100, () => {
-                try {
-                    for (const key of this._windowTrees.keys()) {
-                        this._tileWindowsInTree(key as WorkspaceMonitorKey);
-                    }
-                } catch (e) {
-                    console.error("Error tiling windows:", e);
-                }
-                return GLib.SOURCE_REMOVE;
-            });
-            
-            console.log("FINISHED CAPTURING WINDOWS");
-        } catch (e) {
-            console.error("Error in _captureExistingWindows:", e);
-        }
-    }
-    
-    _getWindowTree(workspace: number, monitor: number): WindowTree {
-        const key: WorkspaceMonitorKey = `${workspace}-${monitor}` as WorkspaceMonitorKey;
-        
-        if (!this._windowTrees.has(key)) {
-            this._windowTrees.set(key, {
-                root: null,
-                monitor: monitor,
-                workspace: workspace
-            });
-        }
-        
-        return this._windowTrees.get(key)!;
-    }
-    
-    _addWindowToTree(window: Meta.Window, workspace: number, monitor: number) {
-        const tree = this._getWindowTree(workspace, monitor);
-        const windowNode = createWindowNode(window);
-        
-        if (!tree.root) {
-            // First window in this tree
-            tree.root = windowNode;
-        } else {
-            // Add to existing tree
-            addNodeChild(tree.root, windowNode);
-        }
-        
-        // Update the layout
-        this._tileWindowsInTree(`${workspace}-${monitor}` as WorkspaceMonitorKey);
-    }
-    
-    _removeWindowFromTree(windowId: number, key: WorkspaceMonitorKey) {
-        const tree = this._windowTrees.get(key);
-        if (!tree) return;
-        
-        const node = findNodeByWindowId(tree, windowId);
-        if (node) {
-            removeNode(node, tree);
-        }
-    }
-    
-    _tileWindowsInTree(key: WorkspaceMonitorKey) {
-        try {
-            console.log(`Tiling windows for ${key}`);
-            
-            const tree = this._windowTrees.get(key);
-            if (!tree || !tree.root) {
-                console.log(`No tree or empty tree for ${key}`);
-                return;
-            }
-            
-            // Get workspace and monitor info
-            const [workspaceIndex, monitorIndex] = key.split('-').map(Number);
-            
-            const workspace = global.workspace_manager.get_workspace_by_index(workspaceIndex);
-            if (!workspace) {
-                console.error(`Workspace ${workspaceIndex} not found`);
-                return;
-            }
-            
-            const workArea = workspace.get_work_area_for_monitor(monitorIndex);
-            if (!workArea) {
-                console.error(`WorkArea for monitor ${monitorIndex} in workspace ${workspaceIndex} not found`);
-                return;
-            }
-            
-            console.log(`Work area for ${key}: ${workArea.x},${workArea.y} ${workArea.width}x${workArea.height}`);
-            
-            // Calculate layout
-            calculateLayout(tree.root, {
-                x: workArea.x,
-                y: workArea.y,
-                width: workArea.width,
-                height: workArea.height
-            });
-            
-            // Apply layout to all windows in the tree
-            this._applyLayoutToTree(tree.root);
-            
-            console.log(`Finished tiling windows for ${key}`);
-        } catch (e) {
-            console.error(`Error tiling windows for ${key}:`, e);
-        }
-    }
-    
-    _applyLayoutToTree(node: WindowNode) {
-        try {
-            // Apply layout to this node
-            if (node.window) {
-                // Validate window object
-                if (!node.window.get_compositor_private) {
-                    console.error(`Window at node ${node.windowId} is invalid`);
-                    return;
-                }
-                
-                // Check for valid rect dimensions
-                if (node.rect.width <= 0 || node.rect.height <= 0) {
-                    console.error(`Invalid rect dimensions for window ${node.windowId}: ${node.rect.width}x${node.rect.height}`);
-                    return;
-                }
-                
-                // Resize window
-                this.safelyResizeWindow(
-                    node.window,
-                    node.rect.x,
-                    node.rect.y,
-                    node.rect.width,
-                    node.rect.height
-                );
-            }
-            
-            // Apply layout to all children
-            for (const child of node.children) {
-                try {
-                    this._applyLayoutToTree(child);
-                } catch (e) {
-                    console.error(`Error applying layout to child node:`, e);
-                }
-            }
-        } catch (e) {
-            console.error(`Error in _applyLayoutToTree:`, e);
-        }
-    }
 
-    getUsableMonitorSpace(window: Meta.Window) {
-        // Get the current workspace
-        const workspace = window.get_workspace();
-
-        // Get the monitor index that this window is on
-        const monitorIndex = window.get_monitor();
-
-        // Get the work area
-        const workArea = workspace.get_work_area_for_monitor(monitorIndex);
-
-        return {
-            x: workArea.x,
-            y: workArea.y,
-            width: workArea.width,
-            height: workArea.height
-        };
-    }
-
-    // Function to safely resize a window after it's ready
-    safelyResizeWindow(win: Meta.Window, x: number, y: number, width: number, height: number): void {
-        const actor = win.get_compositor_private();
-
-        if (!actor) {
-            console.log("No actor available, can't resize safely yet");
-            return;
-        }
-        
-        // Check if the window type needs special handling
-        const windowType = win.get_window_type();
-        
-        // Try immediate resize first for most window types
-        if (windowType === Meta.WindowType.NORMAL) {
-            // Standard resizing path with safety checks
-            this.resizeWindow(win, x, y, width, height);
-            
-            // Set up a verification check
-            GLib.timeout_add(GLib.PRIORITY_DEFAULT, 100, () => {
-                const rect = win.get_frame_rect();
-                
-                // If window didn't resize well, try again with the first-frame signal
-                if (Math.abs(rect.width - width) > 5 || Math.abs(rect.height - height) > 5) {
-                    this._setupFirstFrameResize(win, actor, x, y, width, height);
-                }
-                
-                return GLib.SOURCE_REMOVE;
-            });
-        } else {
-            // For non-standard windows, use the original approach
-            this._setupFirstFrameResize(win, actor, x, y, width, height);
-        }
-    }
-    
-    _setupFirstFrameResize(win: Meta.Window, actor: any, x: number, y: number, width: number, height: number): void {
-        // Set a flag to track if the resize has been done
-        let resizeDone = false;
-
-        // Connect to the first-frame signal
-        const id = actor.connect('first-frame', () => {
-            // Disconnect the signal handler
-            actor.disconnect(id);
-
-            if (!resizeDone) {
-                resizeDone = true;
-
-                // Add a small delay
-                GLib.timeout_add(GLib.PRIORITY_DEFAULT, 150, () => {
-                    try {
-                        this.resizeWindow(win, x, y, width, height);
-                    } catch (e) {
-                        console.error("Error resizing window:", e);
-                    }
-                    return GLib.SOURCE_REMOVE;
-                });
-            }
-        });
-
-        // Fallback timeout in case the first-frame signal doesn't fire
-        // (for windows that are already mapped)
-        GLib.timeout_add(GLib.PRIORITY_DEFAULT, 50, () => {
-            if (!resizeDone) {
-                resizeDone = true;
-                try {
-                    this.resizeWindow(win, x, y, width, height);
-                } catch (e) {
-                    console.error("Error resizing window (fallback):", e);
-                }
-            }
-            return GLib.SOURCE_REMOVE;
-        });
-    }
-
-    resizeWindow(win: Meta.Window, x:number, y:number, width:number, height:number) {
-        // First, ensure window is not maximized or fullscreen
-        const wasMaximized = win.get_maximized();
-        const wasFullscreen = win.is_fullscreen();
-        
-        if (wasMaximized) {
-            console.log("WINDOW MAXIMIZED")
-            win.unmaximize(Meta.MaximizeFlags.BOTH);
-        }
-
-        if (wasFullscreen) {
-            console.log("WINDOW IS FULLSCREEN")
-            win.unmake_fullscreen();
-        }
-        
-        // Wait for state change to complete if needed
-        if (wasMaximized || wasFullscreen) {
-            GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
-                this._performResize(win, x, y, width, height);
-                return GLib.SOURCE_REMOVE;
-            });
-        } else {
-            // Immediate resize if no state change needed
-            this._performResize(win, x, y, width, height);
-        }
-    }
-    
-    _performResize(win: Meta.Window, x:number, y:number, width:number, height:number) {
-        console.log("WINDOW", win.get_window_type(), win.allows_move());
-        console.log("MONITOR INFO", this.getUsableMonitorSpace(win));
-        console.log("NEW_SIZE", x, y, width, height);
-        
-        // Perform the actual resize
-        win.move_resize_frame(false, x, y, width, height);
-        
-        // Check result
-        const newRect = win.get_frame_rect();
-        console.log("RESIZED WINDOW", newRect.height, newRect.width, newRect.x, newRect.y);
-        
-        // Validate the resize was successful
-        if (Math.abs(newRect.x - x) > 5 || Math.abs(newRect.y - y) > 5 || 
-            Math.abs(newRect.width - width) > 5 || Math.abs(newRect.height - height) > 5) {
-            console.warn(`Resize did not achieve expected dimensions for window ${win.get_id()}`);
-            
-            // Try a second time if the resize didn't work well
-            GLib.timeout_add(GLib.PRIORITY_DEFAULT, 50, () => {
-                win.move_resize_frame(false, x, y, width, height);
-                return GLib.SOURCE_REMOVE;
-            });
-        }
-    }
-
-    _addWindow(window: Meta.Window) {
-        const windowId = window.get_id();
-
-        // Connect to window signals
-        const signals: Signal[] = [];
-        console.log("ADDING WINDOW", window);
-
-        const destroyId = window.connect('unmanaging', () => {
-            console.log("REMOVING WINDOW", windowId);
-            this._handleWindowClosed(windowId);
-        });
-        signals.push({name: 'unmanaging', id: destroyId});
-
-        const focusId = window.connect('notify::has-focus', () => {
-            if (window.has_focus()) {
-                this._activeWindowId = windowId;
-            }
-        });
-        signals.push({name: 'notify::has-focus', id: focusId});
-        
-        // Monitor change signal
-        const monitorChangedId = window.connect('notify::monitor', () => {
-            this._handleWindowMonitorChanged(window);
-        });
-        signals.push({name: 'notify::monitor', id: monitorChangedId});
-        
-        // Workspace change signal
-        const workspaceChangedId = window.connect('workspace-changed', () => {
-            this._handleWindowWorkspaceChanged(window);
-        });
-        signals.push({name: 'workspace-changed', id: workspaceChangedId});
-
-        // Add window to managed windows
-        this._windows.set(windowId, {
-            window: window,
-            signals: signals
-        });
-
-        // If this is the first window, make it the active one
-        if (this._windows.size === 1 || window.has_focus()) {
-            this._activeWindowId = windowId;
-        }
-    }
-    
-    _handleWindowMonitorChanged(window: Meta.Window) {
-        const windowId = window.get_id();
-        
-        // Find which tree this window is in
-        for (const [key, tree] of this._windowTrees.entries()) {
-            const node = findNodeByWindowId(tree, windowId);
-            if (node) {
-                // Found the window - get new workspace/monitor
-                const newWorkspace = window.get_workspace().index();
-                const newMonitor = window.get_monitor();
-                const newKey = `${newWorkspace}-${newMonitor}` as WorkspaceMonitorKey;
-                
-                // Skip if it's already in the right tree
-                if (key === newKey) return;
-                
-                // Remove from old tree
-                this._removeWindowFromTree(windowId, key as WorkspaceMonitorKey);
-                
-                // Add to new tree
-                this._addWindowToTree(window, newWorkspace, newMonitor);
-                
-                // Retile both trees
-                this._tileWindowsInTree(key as WorkspaceMonitorKey);
-                this._tileWindowsInTree(newKey);
-                
-                return;
-            }
-        }
-    }
-    
-    _handleWindowWorkspaceChanged(window: Meta.Window) {
-        // Similar to monitor change, but for workspace changes
-        this._handleWindowMonitorChanged(window); // This handles both cases
-    }
-
-    _handleWindowClosed(windowId: number) {
-        print("closing window", windowId);
-        const windowData = this._windows.get(windowId);
-        if (!windowData) {
-            return;
-        }
-
-        // Disconnect signals
-        if (windowData.signals) {
-            windowData.signals.forEach(signal => {
-                try {
-                    if (windowData.window != null) {
-                        windowData.window.disconnect(signal.id);
-                    }
-                } catch (e) {
-                    // Window might already be gone
-                }
-            });
-        }
-
-        // Remove from managed windows
-        this._windows.delete(windowId);
-
-        // Remove from all trees
-        for (const key of this._windowTrees.keys()) {
-            this._removeWindowFromTree(windowId, key as WorkspaceMonitorKey);
-            this._tileWindowsInTree(key as WorkspaceMonitorKey);
-        }
-
-        // If this was the active window, find a new one
-        if (this._activeWindowId === windowId && this._windows.size > 0) {
-            this._activeWindowId = Array.from(this._windows.keys())[0];
-        } else if (this._windows.size === 0) {
-            this._activeWindowId = null;
-        }
-    }
-
-    _isWindowTileable(window: Meta.Window) {
-        if (!window || !window.get_compositor_private()) {
-            return false;
-        }
-
-        const windowType = window.get_window_type();
-        console.log("WINDOW TYPE", windowType);
-        // Skip certain types of windows
-        return !window.is_skip_taskbar() &&
-            windowType !== Meta.WindowType.DESKTOP &&
-            windowType !== Meta.WindowType.DOCK &&
-            windowType !== Meta.WindowType.DIALOG &&
-            windowType !== Meta.WindowType.MODAL_DIALOG &&
-            windowType !== Meta.WindowType.UTILITY &&
-            windowType !== Meta.WindowType.MENU;
-    }
-
-    disable() {
-        console.log("DISABLED AEROSPIKE!")
-        
-        // Disconnect window creation signal
-        if (this._windowCreateId) {
-            global.display.disconnect(this._windowCreateId);
-            this._windowCreateId = null;
-        }
-        
-        // Disconnect workspace signals
-        if (this._workspaceChangedId) {
-            global.workspace_manager.disconnect(this._workspaceChangedId);
-            this._workspaceChangedId = null;
-        }
-        
-        // Disconnect drag signals
-        if (this._windowDragBeginId) {
-            global.display.disconnect(this._windowDragBeginId);
-            this._windowDragBeginId = null;
-        }
-        
-        if (this._windowDragEndId) {
-            global.display.disconnect(this._windowDragEndId);
-            this._windowDragEndId = null;
-        }
-        
-        // Disconnect all window signals
-        this._windows.forEach((windowData) => {
-            if (windowData.signals && windowData.window) {
-                windowData.signals.forEach(signal => {
-                    try {
-                        windowData.window!.disconnect(signal.id);
-                    } catch (e) {
-                        // Window might already be gone
-                    }
-                });
-            }
-        });
-        
-        // Clear all window data
-        this._windows.clear();
-        this._windowTrees.clear();
-        
-        // Remove keybindings
-        this.removeKeybindings();
-        
-        // Reset state
-        this._activeWindowId = null;
-        this.lastFocusedWindow = null;
-        this._draggedWindowInfo = null;
-    }
 }

jest.config.js

@@ -0,0 +1,23 @@
+export default {
+  preset: 'ts-jest/presets/default-esm',
+  testEnvironment: 'node',
+  extensionsToTreatAsEsm: ['.ts'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
+  transform: {
+    '^.+\\.ts$': [
+      'ts-jest',
+      {
+        useESM: true,
+      },
+    ],
+  },
+  testMatch: ['**/__tests__/**/*.test.ts', '**/?(*.)+(spec|test).ts'],
+  collectCoverageFrom: [
+    'src/**/*.ts',
+    '!src/**/*.d.ts',
+    '!src/**/__tests__/**',
+  ],
+  modulePathIgnorePatterns: ['<rootDir>/dist/', '<rootDir>/node_modules/'],
+};

justfile

@@ -8,7 +8,7 @@ packages:
 
 build: packages && build-schemas
     rm -rf dist/*
-    tsc
+    pnpm exec tsc
     cp metadata.json dist/
     cp stylesheet.css dist/
     mkdir -p dist/schemas
@@ -24,14 +24,29 @@ build-package: build
 
 install: build
 	mkdir -p ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}
-	rm -rf /.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}/*
+	rm -rf ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}/*
 	cp -r dist/* ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}/
 
 run:
-    env MUTTER_DEBUG_DUMMY_MODE_SPECS=1280x720 dbus-run-session -- gnome-shell --nested --wayland
+    env MUTTER_DEBUG_DUMMY_MODE_SPECS=1280x720 dbus-run-session -- gnome-shell --devkit --wayland
 
 install-and-run: install run
 
+live-debug:
+    journalctl /usr/bin/gnome-shell -f -o cat | tee debug.log
+
+test:
+    pnpm test
+
+test-watch:
+    pnpm test:watch
+
+test-coverage:
+    pnpm test:coverage
+
+ci-local:
+    act -W .gitea/workflows/build.yaml
+
 #pack: build
 #    gnome-extensions pack dist \
 #        --force \

metadata.json

@@ -4,7 +4,8 @@
   "uuid": "aerospike@lucaso.io",
   "settings-schema": "org.gnome.shell.extensions.aerospike",
   "shell-version": [
-    "48"
+    "48",
+    "49"
   ],
   "gettext-domain": "aerospike@lucaso.io",
   "url": "https://gitea.chaosdev.gay/lucasoskorep/aerospike@lucaso.io"

package.json

@@ -15,14 +15,43 @@
   },
   "homepage": "https://github.com/example/my-extension#readme",
   "sideEffects": false,
+  "scripts": {
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage"
+  },
   "devDependencies": {
-    "@girs/gjs": "4.0.0-beta.23",
-    "@girs/gnome-shell": "^48.0.2",
-    "eslint": "^9.24.0",
-    "eslint-plugin-jsdoc": "^50.6.9",
-    "typescript": "^5.8.3"
+    "@girs/gjs": "4.0.0-beta.38",
+    "@girs/gnome-shell": "49.1.0",
+    "@jest/globals": "^30.0.0",
+    "@types/jest": "^30.0.0",
+    "eslint": "^9.36.0",
+    "eslint-plugin-jsdoc": "^62.0.0",
+    "jest": "^30.0.0",
+    "ts-jest": "^29.1.2",
+    "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@girs/mtk-16": "16.0.0-4.0.0-beta.23"
+    "@girs/mtk-17": "17.0.0-4.0.0-beta.38"
+  },
+  "pnpm": {
+    "overrides": {
+      "@girs/cairo-1.0": "1.0.0-4.0.0-beta.38",
+      "@girs/freetype2-2.0": "2.0.0-4.0.0-beta.38",
+      "@girs/gdk-4.0": "4.0.0-4.0.0-beta.38",
+      "@girs/gdkpixbuf-2.0": "2.0.0-4.0.0-beta.38",
+      "@girs/gio-2.0": "2.86.0-4.0.0-beta.38",
+      "@girs/gjs": "4.0.0-beta.38",
+      "@girs/glib-2.0": "2.86.0-4.0.0-beta.38",
+      "@girs/gmodule-2.0": "2.0.0-4.0.0-beta.38",
+      "@girs/gobject-2.0": "2.86.0-4.0.0-beta.38",
+      "@girs/graphene-1.0": "1.0.0-4.0.0-beta.38",
+      "@girs/gsk-4.0": "4.0.0-4.0.0-beta.38",
+      "@girs/gtk-4.0": "4.20.1-4.0.0-beta.38",
+      "@girs/harfbuzz-0.0": "11.5.0-4.0.0-beta.38",
+      "@girs/mtk-17": "17.0.0-4.0.0-beta.38",
+      "@girs/pango-1.0": "1.57.0-4.0.0-beta.38",
+      "@girs/pangocairo-1.0": "1.0.0-4.0.0-beta.38"
+    }
   }
 }

prefs.ts

@@ -1,4 +1,4 @@
 // This file is just a wrapper around the compiled TypeScript code
-import MyExtensionPreferences from './src/prefs.js';
+import AerospikeExtensions from './src/prefs/prefs.js';
 
-export default MyExtensionPreferences;
+export default AerospikeExtensions;

renovate.json

@@ -0,0 +1,12 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ],
+  "packageRules": [
+    {
+      "matchPackageNames": ["actions/upload-artifact", "actions/download-artifact"],
+      "allowedVersions": "<4"
+    }
+  ]
+}

schemas/org.gnome.shell.extensions.aerospike.gschema.xml

@@ -1,30 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
     <schema id="org.gnome.shell.extensions.aerospike" path="/org/gnome/shell/extensions/aerospike/">
-        <key name="keybinding-1" type="as">
-            <default><![CDATA[['<Super>1']]]></default>
-            <summary>Keybinding for action 1</summary>
-            <description>Keyboard shortcut for triggering action 1</description>
-        </key>
-
-        <key name="keybinding-2" type="as">
-            <default><![CDATA[['<Super>2']]]></default>
-            <summary>Keybinding for action 2</summary>
-            <description>Keyboard shortcut for triggering action 2</description>
-        </key>
-
-        <key name="keybinding-3" type="as">
-            <default><![CDATA[['<Super>3']]]></default>
-            <summary>Keybinding for action 3</summary>
-            <description>Keyboard shortcut for triggering action 3</description>
-        </key>
-
-        <key name="keybinding-4" type="as">
-            <default><![CDATA[['<Super>4']]]></default>
-            <summary>Keybinding for action 4</summary>
-            <description>Keyboard shortcut for triggering action 4</description>
-        </key>
-
         <key name="dropdown-option" type="s">
             <default>'option1'</default>
             <summary>Dropdown selection</summary>
@@ -36,5 +12,55 @@
             <summary>Selected color</summary>
             <description>Color chosen from the color picker</description>
         </key>
+
+        <key name="move-left" type="as">
+            <default><![CDATA[['<Super>1']]]></default>
+            <summary>Keybinding for action 1</summary>
+            <description>Keyboard shortcut for triggering action 1</description>
+        </key>
+
+        <key name="move-right" type="as">
+            <default><![CDATA[['<Super>2']]]></default>
+            <summary>Keybinding for action 2</summary>
+            <description>Keyboard shortcut for triggering action 2</description>
+        </key>
+
+        <key name="join-with-left" type="as">
+            <default><![CDATA[['<Super>3']]]></default>
+            <summary>Keybinding for action 3</summary>
+            <description>Keyboard shortcut for triggering action 3</description>
+        </key>
+
+        <key name="join-with-right" type="as">
+            <default><![CDATA[['<Super>4']]]></default>
+            <summary>Keybinding for action 4</summary>
+            <description>Keyboard shortcut for triggering action 4</description>
+        </key>
+
+        <key name="print-tree" type="as">
+            <default><![CDATA[['<Super><Shift>x']]]></default>
+            <summary>Print window tree structure</summary>
+            <description>Prints the current tree of containers and windows per monitor to logs</description>
+        </key>
+
+        <key name="toggle-orientation" type="as">
+            <default><![CDATA[['<Super><Shift>comma']]]></default>
+            <summary>Toggle active container orientation</summary>
+            <description>Toggles the orientation of the container holding the active window between horizontal and vertical</description>
+        </key>
+
+        <key name="reset-ratios" type="as">
+            <default><![CDATA[['<Primary>z']]]></default>
+            <summary>Reset container ratios to equal splits</summary>
+            <description>Resets all window size ratios in the active window's container to equal splits</description>
+        </key>
+
+        <key name="min-window-size-percent" type="d">
+            <default>0.10</default>
+            <range min="0.01" max="0.49"/>
+            <summary>Minimum window size percentage</summary>
+            <description>Minimum fraction of a container that any single window may occupy when resizing boundaries</description>
+        </key>
+
     </schema>
 </schemalist>

src/__tests__/container.test.ts

@@ -0,0 +1,182 @@
+import { describe, test, expect, jest, beforeEach } from '@jest/globals';
+
+// Mock the dependencies
+jest.mock('../utils/logger.js', () => ({
+  Logger: {
+    log: jest.fn(),
+    info: jest.fn(),
+    debug: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+  },
+}));
+
+jest.mock('../utils/events.js', () => ({
+  default: jest.fn(),
+}));
+
+// Since we can't import the actual WindowContainer that depends on GNOME APIs,
+// we'll test the logic patterns used in the container
+
+describe('Container Logic Tests', () => {
+  describe('Orientation Toggle Logic', () => {
+    enum Orientation {
+      HORIZONTAL = 0,
+      VERTICAL = 1,
+    }
+
+    const toggleOrientation = (current: Orientation): Orientation => {
+      return current === Orientation.HORIZONTAL
+        ? Orientation.VERTICAL
+        : Orientation.HORIZONTAL;
+    };
+
+    test('should toggle from HORIZONTAL to VERTICAL', () => {
+      const result = toggleOrientation(Orientation.HORIZONTAL);
+      expect(result).toBe(Orientation.VERTICAL);
+    });
+
+    test('should toggle from VERTICAL to HORIZONTAL', () => {
+      const result = toggleOrientation(Orientation.VERTICAL);
+      expect(result).toBe(Orientation.HORIZONTAL);
+    });
+  });
+
+  describe('Window Bounds Calculation', () => {
+    test('should calculate horizontal bounds correctly', () => {
+      const workArea = { x: 0, y: 0, width: 1000, height: 500 };
+      const itemCount = 3;
+      const windowWidth = Math.floor(workArea.width / itemCount);
+
+      const bounds = Array.from({ length: itemCount }, (_, index) => ({
+        x: workArea.x + (index * windowWidth),
+        y: workArea.y,
+        width: windowWidth,
+        height: workArea.height,
+      }));
+
+      expect(bounds.length).toBe(3);
+      expect(bounds[0].x).toBe(0);
+      expect(bounds[1].x).toBe(333);
+      expect(bounds[2].x).toBe(666);
+      expect(bounds[0].width).toBe(333);
+    });
+
+    test('should calculate vertical bounds correctly', () => {
+      const workArea = { x: 0, y: 0, width: 1000, height: 900 };
+      const itemCount = 3;
+      const windowHeight = Math.floor(workArea.height / itemCount);
+
+      const bounds = Array.from({ length: itemCount }, (_, index) => ({
+        x: workArea.x,
+        y: workArea.y + (index * windowHeight),
+        width: workArea.width,
+        height: windowHeight,
+      }));
+
+      expect(bounds.length).toBe(3);
+      expect(bounds[0].y).toBe(0);
+      expect(bounds[1].y).toBe(300);
+      expect(bounds[2].y).toBe(600);
+      expect(bounds[0].height).toBe(300);
+    });
+
+    test('should handle single window bounds', () => {
+      const workArea = { x: 100, y: 50, width: 800, height: 600 };
+      const itemCount = 1;
+      const windowWidth = Math.floor(workArea.width / itemCount);
+
+      const bounds = [{
+        x: workArea.x,
+        y: workArea.y,
+        width: windowWidth,
+        height: workArea.height,
+      }];
+
+      expect(bounds[0].x).toBe(100);
+      expect(bounds[0].y).toBe(50);
+      expect(bounds[0].width).toBe(800);
+      expect(bounds[0].height).toBe(600);
+    });
+  });
+
+  describe('Window Index Finding', () => {
+    test('should find window index in array', () => {
+      const windows = [
+        { id: 1, title: 'Window 1' },
+        { id: 2, title: 'Window 2' },
+        { id: 3, title: 'Window 3' },
+      ];
+
+      const findIndex = (id: number) => {
+        for (let i = 0; i < windows.length; i++) {
+          if (windows[i].id === id) {
+            return i;
+          }
+        }
+        return -1;
+      };
+
+      expect(findIndex(2)).toBe(1);
+      expect(findIndex(3)).toBe(2);
+      expect(findIndex(999)).toBe(-1);
+    });
+
+    test('should safely remove window by index', () => {
+      const windows = [
+        { id: 1, title: 'Window 1' },
+        { id: 2, title: 'Window 2' },
+        { id: 3, title: 'Window 3' },
+      ];
+
+      const removeWindow = (id: number) => {
+        const index = windows.findIndex(w => w.id === id);
+        if (index !== -1) {
+          windows.splice(index, 1);
+          return true;
+        }
+        return false;
+      };
+
+      const removed = removeWindow(2);
+      expect(removed).toBe(true);
+      expect(windows.length).toBe(2);
+      expect(windows.find(w => w.id === 2)).toBeUndefined();
+    });
+  });
+
+  describe('Container Item Reordering', () => {
+    test('should reorder items correctly', () => {
+      const items = ['A', 'B', 'C', 'D'];
+      const originalIndex = 1; // 'B'
+      const newIndex = 3;
+
+      // Remove from original position and insert at new position
+      const [item] = items.splice(originalIndex, 1);
+      items.splice(newIndex, 0, item);
+
+      expect(items).toEqual(['A', 'C', 'D', 'B']);
+    });
+
+    test('should handle reordering to same position', () => {
+      const items = ['A', 'B', 'C'];
+      const originalIndex = 1;
+      const newIndex = 1;
+
+      if (originalIndex !== newIndex) {
+        const [item] = items.splice(originalIndex, 1);
+        items.splice(newIndex, 0, item);
+      }
+
+      expect(items).toEqual(['A', 'B', 'C']);
+    });
+
+    test('should handle moving first item to last', () => {
+      const items = ['A', 'B', 'C'];
+      const [item] = items.splice(0, 1);
+      items.splice(2, 0, item);
+
+      expect(items).toEqual(['B', 'C', 'A']);
+    });
+  });
+});

src/__tests__/rect.test.ts

@@ -0,0 +1,75 @@
+import { describe, test, expect } from '@jest/globals';
+import type { Rect } from '../utils/rect.js';
+
+describe('Rect Type Tests', () => {
+  test('should create a valid Rect object', () => {
+    const rect: Rect = {
+      x: 10,
+      y: 20,
+      width: 100,
+      height: 200,
+    };
+
+    expect(rect.x).toBe(10);
+    expect(rect.y).toBe(20);
+    expect(rect.width).toBe(100);
+    expect(rect.height).toBe(200);
+  });
+
+  test('should handle zero dimensions', () => {
+    const rect: Rect = {
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0,
+    };
+
+    expect(rect.width).toBe(0);
+    expect(rect.height).toBe(0);
+  });
+
+  test('should handle negative coordinates', () => {
+    const rect: Rect = {
+      x: -50,
+      y: -100,
+      width: 200,
+      height: 300,
+    };
+
+    expect(rect.x).toBe(-50);
+    expect(rect.y).toBe(-100);
+  });
+
+  test('should calculate rect area correctly', () => {
+    const rect: Rect = {
+      x: 0,
+      y: 0,
+      width: 100,
+      height: 50,
+    };
+
+    const area = rect.width * rect.height;
+    expect(area).toBe(5000);
+  });
+
+  test('should determine if point is inside rect', () => {
+    const rect: Rect = {
+      x: 10,
+      y: 10,
+      width: 100,
+      height: 100,
+    };
+
+    const pointInside = { x: 50, y: 50 };
+    const pointOutside = { x: 200, y: 200 };
+
+    const isInside = (point: { x: number; y: number }, r: Rect) =>
+      point.x >= r.x &&
+      point.x <= r.x + r.width &&
+      point.y >= r.y &&
+      point.y <= r.y + r.height;
+
+    expect(isInside(pointInside, rect)).toBe(true);
+    expect(isInside(pointOutside, rect)).toBe(false);
+  });
+});

src/prefs.ts

@@ -1,192 +0,0 @@
-import Adw from 'gi://Adw';
-import Gio from 'gi://Gio';
-import Gtk from 'gi://Gtk';
-import Gdk from 'gi://Gdk';
-import { ExtensionPreferences, gettext as _ } from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
-
-export default class MyExtensionPreferences extends ExtensionPreferences {
-    async fillPreferencesWindow(window: Adw.PreferencesWindow) {
-        // Create settings object
-        const settings = this.getSettings('org.gnome.shell.extensions.aerospike');
-
-        // Create a preferences page
-        const page = new Adw.PreferencesPage({
-            title: _('Settings'),
-            icon_name: 'preferences-system-symbolic',
-        });
-        window.add(page);
-
-        // Create keybindings group
-        const keybindingsGroup = new Adw.PreferencesGroup({
-            title: _('Keyboard Shortcuts'),
-        });
-        page.add(keybindingsGroup);
-
-        // Add keybinding rows
-        this.addKeybindingRow(keybindingsGroup, settings, 'keybinding-1', _('Action 1'));
-        this.addKeybindingRow(keybindingsGroup, settings, 'keybinding-2', _('Action 2'));
-        this.addKeybindingRow(keybindingsGroup, settings, 'keybinding-3', _('Action 3'));
-        this.addKeybindingRow(keybindingsGroup, settings, 'keybinding-4', _('Action 4'));
-
-        // Create options group
-        const optionsGroup = new Adw.PreferencesGroup({
-            title: _('Options'),
-        });
-        page.add(optionsGroup);
-
-        // Add dropdown
-        const dropdownRow = new Adw.ComboRow({
-            title: _('Select an option'),
-        });
-        optionsGroup.add(dropdownRow);
-
-        // Create dropdown model
-        const dropdownModel = new Gtk.StringList();
-        dropdownModel.append(_('Option 1'));
-        dropdownModel.append(_('Option 2'));
-        dropdownModel.append(_('Option 3'));
-        dropdownModel.append(_('Option 4'));
-
-        dropdownRow.set_model(dropdownModel);
-
-        // Set the active option based on settings
-        const currentOption = settings.get_string('dropdown-option');
-        switch (currentOption) {
-            case 'option1':
-                dropdownRow.set_selected(0);
-                break;
-            case 'option2':
-                dropdownRow.set_selected(1);
-                break;
-            case 'option3':
-                dropdownRow.set_selected(2);
-                break;
-            case 'option4':
-                dropdownRow.set_selected(3);
-                break;
-            default:
-                dropdownRow.set_selected(0);
-        }
-
-        // Connect dropdown change signal
-        dropdownRow.connect('notify::selected', () => {
-            const selected = dropdownRow.get_selected();
-            let optionValue: string;
-
-            switch (selected) {
-                case 0:
-                    optionValue = 'option1';
-                    break;
-                case 1:
-                    optionValue = 'option2';
-                    break;
-                case 2:
-                    optionValue = 'option3';
-                    break;
-                case 3:
-                    optionValue = 'option4';
-                    break;
-                default:
-                    optionValue = 'option1';
-            }
-
-            settings.set_string('dropdown-option', optionValue);
-        });
-
-        // Add color button
-        const colorRow = new Adw.ActionRow({
-            title: _('Choose a color'),
-        });
-        optionsGroup.add(colorRow);
-
-        const colorButton = new Gtk.ColorButton();
-        colorRow.add_suffix(colorButton);
-        colorRow.set_activatable_widget(colorButton);
-
-        // Set current color from settings
-        const colorStr = settings.get_string('color-selection');
-        const rgba = new Gdk.RGBA();
-        rgba.parse(colorStr);
-        colorButton.set_rgba(rgba);
-
-        // Connect color button signal
-        colorButton.connect('color-set', () => {
-            const color = colorButton.get_rgba().to_string();
-            settings.set_string('color-selection', color);
-        });
-    }
-
-    private addKeybindingRow(
-        group: Adw.PreferencesGroup,
-        settings: Gio.Settings,
-        key: string,
-        title: string
-    ) {
-        const shortcutsRow = new Adw.ActionRow({
-            title: title,
-        });
-
-        group.add(shortcutsRow);
-
-        // Create a button for setting shortcuts
-        const shortcutButton = new Gtk.Button({
-            valign: Gtk.Align.CENTER,
-            label: settings.get_strv(key)[0] || _("Disabled")
-        });
-
-        shortcutsRow.add_suffix(shortcutButton);
-        shortcutsRow.set_activatable_widget(shortcutButton);
-
-        // When clicking the button, show a dialog or start listening for keystroke
-        shortcutButton.connect('clicked', () => {
-            // Show a simple popup stating that the shortcut is being recorded
-            const dialog = new Gtk.MessageDialog({
-                modal: true,
-                text: _("Press a key combination to set as shortcut"),
-                secondary_text: _("Press Esc to cancel or Backspace to disable"),
-                buttons: Gtk.ButtonsType.CANCEL,
-                transient_for: group.get_root() as Gtk.Window
-            });
-
-            // Create a keypress event controller
-            const controller = new Gtk.EventControllerKey();
-            dialog.add_controller(controller);
-
-            controller.connect('key-pressed', (_controller, keyval, keycode, state) => {
-                // Get the key name
-                let keyName = Gdk.keyval_name(keyval);
-
-                // Handle special cases
-                if (keyName === 'Escape') {
-                    dialog.response(Gtk.ResponseType.CANCEL);
-                    return Gdk.EVENT_STOP;
-                } else if (keyName === 'BackSpace') {
-                    // Clear the shortcut
-                    settings.set_strv(key, []);
-                    shortcutButton.set_label(_("Disabled"));
-                    dialog.response(Gtk.ResponseType.OK);
-                    return Gdk.EVENT_STOP;
-                }
-
-                // Convert modifier state to keybinding modifiers
-                let modifiers = state & Gtk.accelerator_get_default_mod_mask();
-
-                // Ignore standalone modifier keys
-                if (Gdk.ModifierType.SHIFT_MASK <= keyval && keyval <= Gdk.ModifierType.META_MASK)
-                    return Gdk.EVENT_STOP;
-
-                // Create accelerator string
-                let accelerator = Gtk.accelerator_name(keyval, modifiers);
-                if (accelerator) {
-                    settings.set_strv(key, [accelerator]);
-                    shortcutButton.set_label(accelerator);
-                    dialog.response(Gtk.ResponseType.OK);
-                }
-
-                return Gdk.EVENT_STOP;
-            });
-
-            dialog.present();
-        });
-    }
-}

src/prefs/keybindings.ts

@@ -0,0 +1,83 @@
+// Gnome imports
+import Adw from 'gi://Adw';
+import Gtk from 'gi://Gtk';
+import Gio from 'gi://Gio';
+import GObject from 'gi://GObject';
+import { gettext as _ } from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
+import { Logger } from '../utils/logger.js';
+
+/**
+ * EntryRow class for handling text input including keybindings
+ */
+export class EntryRow extends Adw.EntryRow {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(params: {
+        title: string,
+        settings: Gio.Settings,
+        bind: string,
+        map?: {
+            from: (settings: Gio.Settings, bind: string) => string,
+            to: (settings: Gio.Settings, bind: string, value: string) => void
+        }
+    }) {
+        super({ title: params.title });
+        
+        const { settings, bind, map } = params;
+
+        // When text changes, update settings
+        this.connect('changed', () => {
+            const text = this.get_text();
+            if (typeof text === 'string') {
+                if (map) {
+                    map.to(settings, bind, text);
+                } else {
+                    settings.set_string(bind, text);
+                }
+            }
+        });
+
+        // Set initial text from settings
+        const current = map ? map.from(settings, bind) : settings.get_string(bind);
+        this.set_text(current ?? '');
+
+        // Add reset button
+        this.add_suffix(
+            new ResetButton({
+                settings,
+                bind,
+                onReset: () => {
+                    this.set_text((map ? map.from(settings, bind) : settings.get_string(bind)) ?? '');
+                },
+            })
+        );
+    }
+}
+
+/**
+ * Reset button for settings
+ */
+export class ResetButton extends Gtk.Button {
+    static {
+        GObject.registerClass(this);
+    }
+
+    constructor(params: {
+        settings?: Gio.Settings,
+        bind: string,
+        onReset?: () => void
+    }) {
+        super({
+            icon_name: 'edit-clear-symbolic',
+            tooltip_text: _('Reset'),
+            valign: Gtk.Align.CENTER,
+        });
+
+        this.connect('clicked', () => {
+            params.settings?.reset(params.bind);
+            params.onReset?.();
+        });
+    }
+}

src/prefs/prefs.ts

@@ -0,0 +1,247 @@
+import Adw from 'gi://Adw';
+import Gio from 'gi://Gio';
+import Gtk from 'gi://Gtk';
+import Gdk from 'gi://Gdk';
+import { ExtensionPreferences, gettext as _ } from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
+import {Logger} from "../utils/logger.js";
+import {EntryRow} from "./keybindings.js";
+
+export default class AerospikeExtensions extends ExtensionPreferences {
+    async fillPreferencesWindow(window: Adw.PreferencesWindow) {
+        // Create settings object
+        const settings = this.getSettings('org.gnome.shell.extensions.aerospike');
+
+        // Create a preferences page
+        const page = new Adw.PreferencesPage({
+            title: _('Settings'),
+            icon_name: 'preferences-system-symbolic',
+        });
+        window.add(page);
+
+
+        // Create options group
+        const optionsGroup = new Adw.PreferencesGroup({
+            title: _('Options'),
+        });
+        page.add(optionsGroup);
+
+        // Add dropdown
+        const dropdownRow = new Adw.ComboRow({
+            title: _('Select an option'),
+        });
+        optionsGroup.add(dropdownRow);
+
+        // Create dropdown model
+        const dropdownModel = new Gtk.StringList();
+        dropdownModel.append(_('Option 1'));
+        dropdownModel.append(_('Option 2'));
+        dropdownModel.append(_('Option 3'));
+        dropdownModel.append(_('Option 4'));
+
+        dropdownRow.set_model(dropdownModel);
+
+        // Set the active option based on settings
+        const currentOption = settings.get_string('dropdown-option');
+        switch (currentOption) {
+            case 'option1':
+                dropdownRow.set_selected(0);
+                break;
+            case 'option2':
+                dropdownRow.set_selected(1);
+                break;
+            case 'option3':
+                dropdownRow.set_selected(2);
+                break;
+            case 'option4':
+                dropdownRow.set_selected(3);
+                break;
+            default:
+                dropdownRow.set_selected(0);
+        }
+
+        // Connect dropdown change signal
+        dropdownRow.connect('notify::selected', () => {
+            const selected = dropdownRow.get_selected();
+            let optionValue: string;
+
+            switch (selected) {
+                case 0:
+                    optionValue = 'option1';
+                    break;
+                case 1:
+                    optionValue = 'option2';
+                    break;
+                case 2:
+                    optionValue = 'option3';
+                    break;
+                case 3:
+                    optionValue = 'option4';
+                    break;
+                default:
+                    optionValue = 'option1';
+            }
+
+            settings.set_string('dropdown-option', optionValue);
+        });
+
+        // Add color button
+        const colorRow = new Adw.ActionRow({
+            title: _('Choose a color'),
+        });
+        optionsGroup.add(colorRow);
+
+        const colorButton = new Gtk.ColorButton();
+        colorRow.add_suffix(colorButton);
+        colorRow.set_activatable_widget(colorButton);
+
+        // Set current color from settings
+        const colorStr = settings.get_string('color-selection');
+        const rgba = new Gdk.RGBA();
+        rgba.parse(colorStr);
+        colorButton.set_rgba(rgba);
+
+        // Connect color button signal
+        colorButton.connect('color-set', () => {
+            const color = colorButton.get_rgba().to_string();
+            settings.set_string('color-selection', color);
+        });
+
+        // Create keybindings group
+        const keybindingsGroup = new Adw.PreferencesGroup({
+            title: _('Keyboard Shortcuts'),
+            description: `${_("Syntax")}: <Super>h, <Shift>g, <Super><Shift>h
+            ${_("Legend")}: <Super> - ${_("Windows key")}, <Primary> - ${_("Control key")}
+            ${_("Delete text to unset. Press Return key to accept.")}`,
+        });
+        page.add(keybindingsGroup);
+
+        // Add keybinding rows as EntryRows with proper mapping
+        // Use the helper function to create the map object
+        const keybindingMap = this.createKeybindingMap();
+        
+        keybindingsGroup.add(
+            new EntryRow({
+                title: _('Action 1'),
+                settings: settings,
+                bind: 'move-left',
+                map: keybindingMap
+            })
+        );
+        
+        keybindingsGroup.add(
+            new EntryRow({
+                title: _('Action 2'),
+                settings: settings,
+                bind: 'move-right',
+                map: keybindingMap
+            })
+        );
+        
+        keybindingsGroup.add(
+            new EntryRow({
+                title: _('Action 3'),
+                settings: settings,
+                bind: 'join-with-left',
+                map: keybindingMap
+            })
+        );
+        
+        keybindingsGroup.add(
+            new EntryRow({
+                title: _('Action 4'),
+                settings: settings,
+                bind: 'join-with-right',
+                map: keybindingMap
+            })
+        );
+
+        keybindingsGroup.add(
+            new EntryRow({
+                title: _('Print Tree Structure'),
+                settings: settings,
+                bind: 'print-tree',
+                map: keybindingMap
+            })
+        );
+
+        keybindingsGroup.add(
+            new EntryRow({
+                title: _('Toggle Orientation'),
+                settings: settings,
+                bind: 'toggle-orientation',
+                map: keybindingMap
+            })
+        );
+
+        keybindingsGroup.add(
+            new EntryRow({
+                title: _('Reset Container Ratios to Equal'),
+                settings: settings,
+                bind: 'reset-ratios',
+                map: keybindingMap
+            })
+        );
+
+        // Create sizing group
+        const sizingGroup = new Adw.PreferencesGroup({
+            title: _('Window Sizing'),
+        });
+        page.add(sizingGroup);
+
+        // Minimum window size percentage spinner
+        const minSizeRow = new Adw.ActionRow({
+            title: _('Minimum Window Size'),
+            subtitle: _('Smallest fraction of a container any window may occupy when resizing (e.g. 0.10 = 10%)'),
+        });
+        sizingGroup.add(minSizeRow);
+
+        const minSizeSpin = new Gtk.SpinButton({
+            adjustment: new Gtk.Adjustment({
+                lower: 0.01,
+                upper: 0.49,
+                step_increment: 0.01,
+                page_increment: 0.05,
+                value: settings.get_double('min-window-size-percent'),
+            }),
+            digits: 2,
+            valign: Gtk.Align.CENTER,
+        });
+        minSizeRow.add_suffix(minSizeSpin);
+        minSizeRow.set_activatable_widget(minSizeSpin);
+
+        minSizeSpin.connect('value-changed', () => {
+            settings.set_double('min-window-size-percent', minSizeSpin.get_value());
+        });
+
+        settings.connect('changed::min-window-size-percent', () => {
+            minSizeSpin.set_value(settings.get_double('min-window-size-percent'));
+        });
+
+    }
+
+    // Helper function to create a keybinding mapping object
+    private createKeybindingMap() {
+        return {
+            from(settings: Gio.Settings, bind: string) {
+                return settings.get_strv(bind).join(',');
+            },
+            to(settings: Gio.Settings, bind: string, value: string) {
+                if (!!value) {
+                    const mappings = value.split(',').map((x) => {
+                        const [, key, mods] = Gtk.accelerator_parse(x);
+                        return Gtk.accelerator_valid(key, mods) && Gtk.accelerator_name(key, mods);
+                    });
+                    // Filter out any false values to ensure we only have strings
+                    const stringMappings = mappings.filter((x): x is string => typeof x === 'string');
+                    if (stringMappings.length > 0) {
+                        Logger.debug("setting", bind, "to", stringMappings);
+                        settings.set_strv(bind, stringMappings);
+                    }
+                } else {
+                    // If value deleted, unset the mapping
+                    settings.set_strv(bind, []);
+                }
+            },
+        };
+    }
+}

src/utils.ts

@@ -1,20 +0,0 @@
-// Utility functions and type definitions
-
-/**
- * Interface for the extension settings
- */
-export interface ExtensionSettings {
-    keybinding1: string[];
-    keybinding2: string[];
-    keybinding3: string[];
-    keybinding4: string[];
-    dropdownOption: string;
-    colorSelection: string;
-}
-
-/**
- * Log a message with the extension name prefix
- */
-export function log(message: string): void {
-    console.log(`[MyExtension] ${message}`);
-}

src/utils/events.ts

@@ -0,0 +1,28 @@
+import GLib from "gi://GLib";
+
+
+export type QueuedEvent = {
+    name: string;
+    callback: () => void;
+}
+
+// Pending events indexed by name so that duplicate events collapse into one.
+// Only the most-recently-queued callback for a given name is kept.
+const pendingEvents: Map<string, QueuedEvent> = new Map();
+
+export default function queueEvent(event: QueuedEvent, interval = 200) {
+    // Overwrite any earlier pending event with the same name — the latest
+    // callback is always the most up-to-date one.
+    pendingEvents.set(event.name, event);
+
+    GLib.timeout_add(GLib.PRIORITY_DEFAULT, interval, () => {
+        const e = pendingEvents.get(event.name);
+        if (e && e === event) {
+            // Only fire if this is still the current callback for this name
+            // (a newer call may have replaced it).
+            pendingEvents.delete(event.name);
+            e.callback();
+        }
+        return GLib.SOURCE_REMOVE;
+    });
+}

src/utils/logger.ts

@@ -0,0 +1,30 @@
+export class Logger {
+
+    static fatal(...args: any[]) {
+        console.log(`[Aerospike] [FATAL]`, ...args);
+    }
+
+    static error(...args: any[]) {
+        console.log(`[Aerospike] [ERROR]`, ...args);
+    }
+
+    static warn(...args: any[]) {
+        console.log(`[Aerospike] [WARN]`, ...args);
+    }
+
+    static info(...args: any[]) {
+        console.log(`[Aerospike] [INFO]`, ...args);
+    }
+
+    static debug(...args: any[]) {
+        console.log(`[Aerospike] [DEBUG]`, ...args);
+    }
+
+    static trace(...args: any[]) {
+        console.log(`[Aerospike] [TRACE]`, ...args);
+    }
+
+    static log(...args: any[]) {
+        console.log(`[Aerospike] [LOG]`, ...args);
+    }
+}

src/utils/rect.ts

@@ -0,0 +1,6 @@
+export type Rect = {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+}

src/winGroup.ts

@@ -1,164 +0,0 @@
-import Meta from 'gi://Meta';
-import Mtk from '@girs/mtk-16';
-
-export interface WindowTree {
-  root: WindowNode | null;
-  monitor: number;
-  workspace: number;
-}
-
-export interface WindowNode {
-  window: Meta.Window | null;
-  windowId: number | null;
-  children: WindowNode[];
-  parent: WindowNode | null;
-  splitRatio: number;
-  splitDirection: 'horizontal' | 'vertical';
-  rect: {
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-  };
-}
-
-export function createWindowNode(window: Meta.Window | null = null): WindowNode {
-  return {
-    window: window,
-    windowId: window ? window.get_id() : null,
-    children: [],
-    parent: null,
-    splitRatio: 1.0,
-    splitDirection: 'horizontal',
-    rect: { x: 0, y: 0, width: 0, height: 0 }
-  };
-}
-
-export function addNodeChild(parent: WindowNode, child: WindowNode): void {
-  child.parent = parent;
-  parent.children.push(child);
-  
-  // Update split ratios to be equal
-  const childCount = parent.children.length;
-  parent.children.forEach(node => {
-    node.splitRatio = 1.0 / childCount;
-  });
-}
-
-export function removeNode(node: WindowNode, tree: WindowTree): WindowNode | null {
-  if (!node.parent) {
-    // This is the root node
-    if (node.children.length > 0) {
-      // Promote first child to root
-      const newRoot = node.children[0];
-      newRoot.parent = null;
-      
-      // Transfer any other children to the new root
-      for (let i = 1; i < node.children.length; i++) {
-        addNodeChild(newRoot, node.children[i]);
-      }
-      
-      tree.root = newRoot;
-      return newRoot;
-    } else {
-      // No children, tree is now empty
-      tree.root = null;
-      return null;
-    }
-  } else {
-    // Remove from parent's children
-    const parent = node.parent;
-    const index = parent.children.indexOf(node);
-    if (index !== -1) {
-      parent.children.splice(index, 1);
-    }
-    
-    // Update split ratios of remaining siblings
-    if (parent.children.length > 0) {
-      const ratio = 1.0 / parent.children.length;
-      parent.children.forEach(child => {
-        child.splitRatio = ratio;
-      });
-    }
-    
-    // Transfer any children to the parent
-    node.children.forEach(child => {
-      addNodeChild(parent, child);
-    });
-    
-    return parent;
-  }
-}
-
-export function findNodeByWindowId(tree: WindowTree, windowId: number): WindowNode | null {
-  if (!tree.root) return null;
-  
-  function search(node: WindowNode): WindowNode | null {
-    if (node.windowId === windowId) return node;
-    
-    for (const child of node.children) {
-      const result = search(child);
-      if (result) return result;
-    }
-    
-    return null;
-  }
-  
-  return search(tree.root);
-}
-
-export function calculateLayout(node: WindowNode, rect: {x: number, y: number, width: number, height: number}): void {
-  // Update node's rect
-  node.rect = {...rect};
-  
-  // Process children recursively
-  if (node.children.length > 0) {
-    if (node.splitDirection === 'horizontal') {
-      // Divide width with remainder handling
-      let currentX = rect.x;
-      let remainingWidth = rect.width;
-      const lastChildIndex = node.children.length - 1;
-      
-      node.children.forEach((child, index) => {
-        const isLastChild = index === lastChildIndex;
-        // Last child gets remainder to avoid gaps
-        const childWidth = isLastChild ? 
-            remainingWidth : 
-            Math.floor(rect.width * child.splitRatio);
-        
-        calculateLayout(child, {
-          x: currentX,
-          y: rect.y,
-          width: childWidth,
-          height: rect.height
-        });
-        
-        currentX += childWidth;
-        remainingWidth -= childWidth;
-      });
-    } else {
-      // Divide height with remainder handling
-      let currentY = rect.y;
-      let remainingHeight = rect.height;
-      const lastChildIndex = node.children.length - 1;
-      
-      node.children.forEach((child, index) => {
-        const isLastChild = index === lastChildIndex;
-        // Last child gets remainder to avoid gaps
-        const childHeight = isLastChild ? 
-            remainingHeight : 
-            Math.floor(rect.height * child.splitRatio);
-        
-        calculateLayout(child, {
-          x: rect.x,
-          y: currentY,
-          width: rect.width,
-          height: childHeight
-        });
-        
-        currentY += childHeight;
-        remainingHeight -= childHeight;
-      });
-    }
-  }
-}

src/wm/container.ts

@@ -0,0 +1,383 @@
+import {WindowWrapper} from "./window.js";
+import {Logger} from "../utils/logger.js";
+import Meta from "gi://Meta";
+import queueEvent from "../utils/events.js";
+import {Rect} from "../utils/rect.js";
+
+enum Orientation {
+    HORIZONTAL = 0,
+    VERTICAL = 1,
+}
+
+/**
+ * Build a split-ratio array of length `n` where every element equals 1/n,
+ * with the last slot absorbing any floating-point remainder so the array
+ * always sums to exactly 1.0.
+ */
+function equalRatios(n: number): number[] {
+    if (n <= 0) return [];
+    const base = 1 / n;
+    const ratios = Array(n).fill(base);
+    // Fix floating-point drift: make last slot exact
+    const sumExceptLast = ratios.slice(0, -1).reduce((a, b) => a + b, 0);
+    ratios[n - 1] = 1 - sumExceptLast;
+    return ratios;
+}
+
+
+export default class WindowContainer {
+
+    _tiledItems: (WindowWrapper | WindowContainer)[];
+    _tiledWindowLookup: Map<number, WindowWrapper>;
+    _orientation: Orientation = Orientation.HORIZONTAL;
+    _workArea: Rect;
+
+    /**
+     * Per-child split ratios. Always satisfies:
+     *   _splitRatios.length === _tiledItems.length
+     *   _splitRatios.reduce((a,b) => a+b, 0) === 1.0  (within floating-point epsilon)
+     *   every element >= MIN_RATIO
+     */
+    _splitRatios: number[];
+
+    constructor(workspaceArea: Rect) {
+        this._tiledItems = [];
+        this._tiledWindowLookup = new Map<number, WindowWrapper>();
+        this._workArea = workspaceArea;
+        this._splitRatios = [];
+    }
+
+    // ─── Helpers ────────────────────────────────────────────────────────────────
+
+    /** Rebuild _splitRatios as equal fractions after any structural change. */
+    private _resetRatios(): void {
+        this._splitRatios = equalRatios(this._tiledItems.length);
+    }
+
+    /**
+     * Called after a new item has been pushed onto _tiledItems.
+     * The new window (last slot) gets 1/n of the space; existing windows
+     * are scaled down proportionally so their ratios relative to each other
+     * are preserved and the total remains 1.0.
+     *
+     * e.g. [0.33, 0.166, 0.5] + new → new=0.25, existing scaled by 0.75
+     *      → [0.2475, 0.1245, 0.375, 0.25]
+     */
+    private _addRatioForNewWindow(): void {
+        const n = this._tiledItems.length;
+        if (n <= 1) {
+            this._splitRatios = [1.0];
+            return;
+        }
+        const newRatio = 1 / n;
+        const scale    = 1 - newRatio; // existing windows share this fraction
+        const scaled   = this._splitRatios.map(r => r * scale);
+        // Absorb all floating-point drift into the last slot so sum is exactly 1.0
+        const partialSum = scaled.reduce((a, b) => a + b, 0) + newRatio;
+        scaled[scaled.length - 1] += (1.0 - partialSum);
+        this._splitRatios = [...scaled, newRatio];
+    }
+
+    /** Total dimension for the active orientation (width for H, height for V). */
+    private _totalDimension(): number {
+        return this._orientation === Orientation.HORIZONTAL
+            ? this._workArea.width
+            : this._workArea.height;
+    }
+
+    // ─── Public API ─────────────────────────────────────────────────────────────
+
+    move(rect: Rect): void {
+        this._workArea = rect;
+        this.tileWindows();
+    }
+
+    toggleOrientation(): void {
+        this._orientation = this._orientation === Orientation.HORIZONTAL
+            ? Orientation.VERTICAL
+            : Orientation.HORIZONTAL;
+        Logger.info(`Container orientation toggled to ${this._orientation === Orientation.HORIZONTAL ? 'HORIZONTAL' : 'VERTICAL'}`);
+        this.tileWindows();
+    }
+
+    addWindow(winWrap: WindowWrapper): void {
+        this._tiledItems.push(winWrap);
+        this._tiledWindowLookup.set(winWrap.getWindowId(), winWrap);
+        this._addRatioForNewWindow();
+        queueEvent({
+            name: "tiling-windows",
+            callback: () => {
+                this.tileWindows();
+            }
+        }, 100);
+    }
+
+    getWindow(win_id: number): WindowWrapper | undefined {
+        if (this._tiledWindowLookup.has(win_id)) {
+            return this._tiledWindowLookup.get(win_id);
+        }
+        for (const item of this._tiledItems) {
+            if (item instanceof WindowContainer) {
+                const win = item.getWindow(win_id);
+                if (win) {
+                    return win;
+                }
+            } else if (item.getWindowId() === win_id) {
+                return item;
+            }
+        }
+        return undefined;
+    }
+
+    _getIndexOfWindow(win_id: number): number {
+        for (let i = 0; i < this._tiledItems.length; i++) {
+            const item = this._tiledItems[i];
+            if (item instanceof WindowWrapper && item.getWindowId() === win_id) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    removeWindow(win_id: number): void {
+        if (this._tiledWindowLookup.has(win_id)) {
+            const index = this._getIndexOfWindow(win_id);
+            this._tiledWindowLookup.delete(win_id);
+            if (index !== -1) {
+                this._tiledItems.splice(index, 1);
+            }
+            this._resetRatios();
+        } else {
+            for (const item of this._tiledItems) {
+                if (item instanceof WindowContainer) {
+                    item.removeWindow(win_id);
+                }
+            }
+        }
+        this.tileWindows();
+    }
+
+    disconnectSignals(): void {
+        this._tiledItems.forEach((item) => {
+            if (item instanceof WindowContainer) {
+                item.disconnectSignals();
+            } else {
+                item.disconnectWindowSignals();
+            }
+        });
+    }
+
+    removeAllWindows(): void {
+        this._tiledItems = [];
+        this._tiledWindowLookup.clear();
+        this._splitRatios = [];
+    }
+
+    tileWindows() {
+        Logger.log("TILING WINDOWS IN CONTAINER");
+        Logger.log("WorkArea", this._workArea);
+        this._tileItems();
+        return true;
+    }
+
+    _tileItems() {
+        if (this._tiledItems.length === 0) {
+            return;
+        }
+        const bounds = this.getBounds();
+        Logger.info(`_tileItems: ratios=[${this._splitRatios.map(r => r.toFixed(3)).join(', ')}] bounds=[${bounds.map(b => `(${b.x},${b.y},${b.width},${b.height})`).join(', ')}]`);
+        this._tiledItems.forEach((item, index) => {
+            const rect = bounds[index];
+            if (item instanceof WindowContainer) {
+                item.move(rect);
+            } else {
+                Logger.info(`_tileItems: window[${index}] id=${item.getWindowId()} dragging=${item._dragging} → rect=(${rect.x},${rect.y},${rect.width},${rect.height})`);
+                item.safelyResizeWindow(rect);
+            }
+        });
+    }
+
+    // ─── Bounds Calculation ──────────────────────────────────────────────────────
+
+    getBounds(): Rect[] {
+        if (this._orientation === Orientation.HORIZONTAL) {
+            return this.getHorizontalBounds();
+        }
+        return this.getVerticalBounds();
+    }
+
+    getVerticalBounds(): Rect[] {
+        const items = this._tiledItems;
+        const totalHeight = this._workArea.height;
+        let usedHeight = 0;
+
+        return items.map((_, index) => {
+            const y = this._workArea.y + usedHeight;
+            let height: number;
+            if (index === items.length - 1) {
+                // Last item gets the remainder to avoid pixel gaps from rounding
+                height = totalHeight - usedHeight;
+            } else {
+                height = Math.floor(this._splitRatios[index] * totalHeight);
+            }
+            usedHeight += height;
+            return {
+                x: this._workArea.x,
+                y: y,
+                width: this._workArea.width,
+                height: height,
+            } as Rect;
+        });
+    }
+
+    getHorizontalBounds(): Rect[] {
+        const totalWidth = this._workArea.width;
+        let usedWidth = 0;
+
+        return this._tiledItems.map((_, index) => {
+            const x = this._workArea.x + usedWidth;
+            let width: number;
+            if (index === this._tiledItems.length - 1) {
+                // Last item gets the remainder to avoid pixel gaps from rounding
+                width = totalWidth - usedWidth;
+            } else {
+                width = Math.floor(this._splitRatios[index] * totalWidth);
+            }
+            usedWidth += width;
+            return {
+                x: x,
+                y: this._workArea.y,
+                width: width,
+                height: this._workArea.height,
+            } as Rect;
+        });
+    }
+
+    // ─── Boundary / Ratio Adjustment ─────────────────────────────────────────────
+
+    /**
+     * Adjust the boundary between item[boundaryIndex] and item[boundaryIndex+1]
+     * by deltaPixels (positive = move right/down, negative = move left/up).
+     *
+     * Both affected ratios are clamped to [_minRatio, 1 - _minRatio] so no
+     * window can be squashed below the configured minimum.
+     *
+     * Returns true if the adjustment was applied, false if it was rejected
+     * (e.g. out of bounds index or clamping would violate minimum).
+     */
+    adjustBoundary(boundaryIndex: number, deltaPixels: number, minRatio: number = 0.10): boolean {
+        if (boundaryIndex < 0 || boundaryIndex >= this._tiledItems.length - 1) {
+            Logger.warn(`adjustBoundary: invalid boundaryIndex ${boundaryIndex}`);
+            return false;
+        }
+
+        const totalDim = this._totalDimension();
+        if (totalDim === 0) return false;
+
+        const ratioDelta = deltaPixels / totalDim;
+
+        const newLeft  = this._splitRatios[boundaryIndex]     + ratioDelta;
+        const newRight = this._splitRatios[boundaryIndex + 1] - ratioDelta;
+
+        if (newLeft < minRatio || newRight < minRatio) {
+            Logger.log(`adjustBoundary: clamped — newLeft=${newLeft.toFixed(3)}, newRight=${newRight.toFixed(3)}, min=${minRatio}`);
+            return false;
+        }
+
+        this._splitRatios[boundaryIndex]     = newLeft;
+        this._splitRatios[boundaryIndex + 1] = newRight;
+
+        Logger.info(`adjustBoundary: boundary=${boundaryIndex} ratios=[${this._splitRatios.map(r => r.toFixed(3)).join(', ')}]`);
+        return true;
+    }
+
+    /**
+     * Adjust boundaries on BOTH axes simultaneously for corner resize ops.
+     * horizontalDelta applies to this container if HORIZONTAL, verticalDelta if VERTICAL.
+     * For nested containers the perpendicular delta is forwarded to the child container.
+     *
+     * boundaryIndex: the slot index whose right/bottom edge is being dragged.
+     */
+    adjustBoundaryBothAxes(
+        boundaryIndex: number,
+        horizontalDelta: number,
+        verticalDelta: number,
+    ): void {
+        if (this._orientation === Orientation.HORIZONTAL) {
+            this.adjustBoundary(boundaryIndex, horizontalDelta);
+        } else {
+            this.adjustBoundary(boundaryIndex, verticalDelta);
+        }
+    }
+
+    // ─── Container Lookup ────────────────────────────────────────────────────────
+
+    /**
+     * Returns the direct-parent WindowContainer that contains win_id as an
+     * immediate child (not recursed further). Returns null if not found.
+     */
+    getContainerForWindow(win_id: number): WindowContainer | null {
+        for (const item of this._tiledItems) {
+            if (item instanceof WindowWrapper && item.getWindowId() === win_id) {
+                return this;
+            }
+        }
+        for (const item of this._tiledItems) {
+            if (item instanceof WindowContainer) {
+                const found = item.getContainerForWindow(win_id);
+                if (found !== null) return found;
+            }
+        }
+        return null;
+    }
+
+    getIndexOfItemNested(item: WindowWrapper): number {
+        for (let i = 0; i < this._tiledItems.length; i++) {
+            const container = this._tiledItems[i];
+            if (container instanceof WindowContainer) {
+                const index = container.getIndexOfItemNested(item);
+                if (index !== -1) {
+                    return i;
+                }
+            } else if (container.getWindowId() === item.getWindowId()) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    // TODO: update this to work with nested containers - all other logic should already be working
+    itemDragged(item: WindowWrapper, x: number, y: number): void {
+        let original_index = this.getIndexOfItemNested(item);
+
+        if (original_index === -1) {
+            Logger.error("Item not found in container during drag op", item.getWindowId());
+            return;
+        }
+        let new_index = original_index;
+        this.getBounds().forEach((rect, index) => {
+            if (rect.x < x && rect.x + rect.width > x && rect.y < y && rect.y + rect.height > y) {
+                new_index = index;
+            }
+        });
+        if (original_index !== new_index) {
+            // Swap only the items — ratios stay with their slots.
+            // e.g. slot 0 = 40%, slot 1 = 60%: when the window in slot 1 drags
+            // into slot 0, it takes slot 0's 40% size. The window it displaces
+            // moves to slot 1 and takes the 60% size. The slot ratios are unchanged.
+            [this._tiledItems[original_index], this._tiledItems[new_index]] =
+                [this._tiledItems[new_index], this._tiledItems[original_index]];
+            Logger.info(`itemDragged: swapped slots ${original_index}<->${new_index}, ratios=[${this._splitRatios.map(r => r.toFixed(3)).join(', ')}]`);
+            this.tileWindows();
+        }
+    }
+
+    /**
+     * Reset all split ratios in this container to equal fractions.
+     * Called when the user explicitly requests an equal-split reset (e.g. Ctrl+Z).
+     */
+    resetRatios(): void {
+        this._resetRatios();
+        this.tileWindows();
+    }
+}

src/wm/monitor.ts

@@ -0,0 +1,86 @@
+import {WindowWrapper} from "./window.js";
+import {Rect} from "../utils/rect.js";
+import queueEvent from "../utils/events.js";
+import {Logger} from "../utils/logger.js";
+import Meta from "gi://Meta";
+import Mtk from "@girs/mtk-17";
+
+import WindowContainer from "./container.js";
+import Window = Meta.Window;
+
+export default class Monitor {
+
+    _id: number;
+    _workArea: Rect;
+    _workspaces: WindowContainer[] = [];
+
+    constructor(monitorId: number) {
+        this._id = monitorId;
+        const workspace = global.workspace_manager.get_active_workspace();
+        this._workArea = workspace.get_work_area_for_monitor(this._id);
+        Logger.log("CREATING MONITOR", monitorId);
+        Logger.log("WorkArea", this._workArea.x, this._workArea.y, this._workArea.width, this._workArea.height);
+        const workspaceCount = global.workspace_manager.get_n_workspaces()
+        Logger.log("Workspace Count", workspaceCount);
+        for (let i = 0; i < workspaceCount; i++) {
+            this._workspaces.push(new WindowContainer(this._workArea));
+        }
+    }
+
+    disconnectSignals() {
+        for (const container of this._workspaces) {
+            container.disconnectSignals();
+        }
+    }
+
+    removeAllWindows(): void {
+        for (const container of this._workspaces) {
+            container.removeAllWindows();
+        }
+    }
+
+    getWindow(windowId: number): WindowWrapper | undefined {
+        for (const container of this._workspaces) {
+            const win = container.getWindow(windowId);
+            if (win) {
+                return win;
+            }
+        }
+        return undefined;
+    }
+
+    removeWindow(winWrap: WindowWrapper) {
+        const windowId = winWrap.getWindowId();
+        for (const container of this._workspaces) {
+            const win = container.getWindow(windowId);
+            if (win) {
+                container.removeWindow(windowId);
+            }
+        }
+    }
+
+    addWindow(winWrap: WindowWrapper) {
+        const window_workspace = winWrap.getWindow().get_workspace().index();
+        this._workspaces[window_workspace].addWindow(winWrap);
+    }
+
+    tileWindows(): void {
+        this._workArea = global.workspace_manager.get_active_workspace().get_work_area_for_monitor(this._id);
+        const activeWorkspace = global.workspace_manager.get_active_workspace();
+        // move() already calls tileWindows() internally — don't call it again
+        this._workspaces[activeWorkspace.index()].move(this._workArea);
+    }
+
+    removeWorkspace(workspaceId: number): void {
+        this._workspaces.splice(workspaceId, 1);
+    }
+
+    addWorkspace(): void {
+        this._workspaces.push(new WindowContainer(this._workArea));
+    }
+
+    itemDragged(item: WindowWrapper, x: number, y: number): void {
+        this._workspaces[item.getWorkspace()].itemDragged(item, x, y);
+    }
+
+}

src/wm/window.ts

@@ -0,0 +1,162 @@
+import Meta from 'gi://Meta';
+import Clutter from "gi://Clutter";
+import {IWindowManager} from "./windowManager.js";
+import {Logger} from "../utils/logger.js";
+import {Rect} from "../utils/rect.js";
+import WindowContainer from "./container.js";
+import queueEvent from "../utils/events.js";
+
+
+type WindowMinimizedHandler = (window: WindowWrapper) => void;
+type WindowWorkspaceChangedHandler = (window: WindowWrapper) => void;
+
+export class WindowWrapper {
+    readonly _window: Meta.Window;
+    readonly _windowMinimizedHandler: WindowMinimizedHandler;
+    readonly _signals: number[] = [];
+    _parent: WindowContainer | null = null;
+    _dragging: boolean = false;
+
+    constructor(
+        window: Meta.Window,
+        winMinimized: WindowMinimizedHandler
+    ) {
+        this._window = window;
+        this._windowMinimizedHandler = winMinimized;
+    }
+
+    getWindow(): Meta.Window {
+        return this._window;
+    }
+
+    getWindowId(): number {
+        return this._window.get_id();
+    }
+
+    getWorkspace(): number {
+        return this._window.get_workspace().index();
+    }
+
+    getMonitor(): number {
+        return this._window.get_monitor();
+    }
+
+    getRect(): Rect {
+        return this._window.get_frame_rect();
+    }
+
+    startDragging(): void {
+        this._dragging = true;
+    }
+    stopDragging(): void {
+        Logger.log("STOPPED DRAGGING")
+        this._dragging = false;
+    }
+
+    // setParent(parent: WindowContainer): void {
+    //     this._parent = parent;
+    // }
+    //
+    // getParent(): WindowContainer | null {
+    //     if (this._parent == null) {
+    //         Logger.warn(`Attempting to get parent for window without parent ${JSON.stringify(this)}`);
+    //     }
+    //     return this._parent
+    // }
+
+    connectWindowSignals(
+        windowManager: IWindowManager,
+    ): void {
+        const windowId = this._window.get_id()
+        // Handle window destruction
+        this._signals.push(
+            this._window.connect('unmanaging', window => {
+                Logger.log("REMOVING WINDOW", windowId);
+                windowManager.handleWindowClosed(this)
+            }),
+            this._window.connect('notify::minimized', (we) => {
+                if (this._window.minimized) {
+                    Logger.log(`Window minimized: ${windowId}`);
+                    windowManager.handleWindowMinimized(this);
+
+                } else if (!this._window.minimized) {
+                    Logger.log(`Window unminimized: ${windowId}`);
+                    windowManager.handleWindowUnminimized(this);
+
+                }
+            }),
+            this._window.connect('notify::maximized-horizontally', () => {
+                if (this._window.is_maximized()) {
+                    Logger.log(`Window maximized: ${windowId}`);
+                } else {
+                    Logger.log(`Window unmaximized: ${windowId}`);
+                }
+            }),
+            this._window.connect("workspace-changed", (_metaWindow) => {
+                Logger.log("WORKSPACE CHANGED FOR WINDOW", this._window.get_id());
+                windowManager.handleWindowChangedWorkspace(this);
+            }),
+            this._window.connect("position-changed", (_metaWindow) => {
+                windowManager.handleWindowPositionChanged(this);
+            }),
+            this._window.connect("size-changed", (_metaWindow) => {
+                windowManager.handleWindowPositionChanged(this);
+            }),
+        );
+    }
+
+    disconnectWindowSignals(): void {
+
+        if (this._signals) {
+            this._signals.forEach(signal => {
+                try {
+                    if (this._window != null) {
+                        this._window.disconnect(signal);
+                    }
+                } catch (e) {
+                    Logger.warn("error disconnecting signal", signal, e);
+                }
+            });
+        }
+    }
+
+    safelyResizeWindow(rect: Rect, _retry: number = 3): void {
+        if (this._dragging) {
+            Logger.info("STOPPED RESIZE BECAUSE ITEM IS BEING DRAGGED");
+            return;
+        }
+
+        const actor = this._window.get_compositor_private() as Clutter.Actor | null;
+        if (!actor) {
+            Logger.log("No actor available, can't resize safely yet");
+            return;
+        }
+
+        actor.remove_all_transitions();
+
+        // Single call: move + resize atomically
+        this._window.move_resize_frame(true, rect.x, rect.y, rect.width, rect.height);
+
+        const new_rect = this._window.get_frame_rect();
+        const TOLERANCE = 2; // pixels — allow compositor rounding
+        const mismatch =
+            Math.abs(new_rect.x - rect.x) > TOLERANCE ||
+            Math.abs(new_rect.y - rect.y) > TOLERANCE ||
+            Math.abs(new_rect.width  - rect.width)  > TOLERANCE ||
+            Math.abs(new_rect.height - rect.height) > TOLERANCE;
+
+        if (_retry > 0 && mismatch) {
+            Logger.warn("RESIZE MISMATCH, retrying",
+                `want(${rect.x},${rect.y},${rect.width},${rect.height})`,
+                `got(${new_rect.x},${new_rect.y},${new_rect.width},${new_rect.height})`);
+            queueEvent({
+                name: `delayed_resize_${this.getWindowId()}`,
+                callback: () => {
+                    this.safelyResizeWindow(rect, _retry - 1);
+                }
+            }, 50);
+        }
+    }
+
+
+}

src/wm/windowManager.ts

@@ -0,0 +1,764 @@
+import Meta from "gi://Meta";
+import Gio from "gi://Gio";
+// import GLib from "gi://GLib";
+
+import {WindowWrapper} from './window.js';
+import * as Main from "resource:///org/gnome/shell/ui/main.js";
+// import Mtk from "@girs/mtk-16";
+import {Logger} from "../utils/logger.js";
+import Monitor from "./monitor.js";
+import WindowContainer from "./container.js";
+import {Rect} from "../utils/rect.js";
+
+
+export interface IWindowManager {
+    _activeWindowId: number | null;
+
+    // addWindow(window: Meta.Window): void;
+
+    handleWindowClosed(winWrap: WindowWrapper): void;
+
+    handleWindowMinimized(winWrap: WindowWrapper): void;
+
+    handleWindowUnminimized(winWrap: WindowWrapper): void;
+
+    handleWindowChangedWorkspace(winWrap: WindowWrapper): void;
+
+    handleWindowPositionChanged(winWrap: WindowWrapper): void;
+
+    syncActiveWindow(): number | null;
+}
+
+
+const _UNUSED_MONITOR_ID = -1
+const _UNUSED_WINDOW_ID = -1
+
+export default class WindowManager implements IWindowManager {
+    _displaySignals: number[] = [];
+    _windowManagerSignals: number[] = [];
+    _workspaceManagerSignals: number[] = [];
+    _overviewSignals: number[] = [];
+
+    _activeWindowId: number | null = null;
+    _monitors: Map<number, Monitor> = new Map<number, Monitor>();
+
+    _minimizedItems: Map<number, WindowWrapper> = new Map<number, WindowWrapper>();
+
+    _grabbedWindowMonitor: number = _UNUSED_MONITOR_ID;
+    _grabbedWindowId: number = _UNUSED_WINDOW_ID;
+    _changingGrabbedMonitor: boolean = false;
+
+    _showingOverview: boolean = false;
+
+    // ── Resize-drag tracking ──────────────────────────────────────────────────
+    _isResizeDrag: boolean = false;
+    _resizeDragWindowId: number = _UNUSED_WINDOW_ID;
+    _resizeDragOp: Meta.GrabOp = Meta.GrabOp.NONE;
+    /** Mouse position at the start of each incremental resize step. */
+    _resizeDragLastMouseX: number = 0;
+    _resizeDragLastMouseY: number = 0;
+    /** Re-entrancy guard: true while tileWindows is propagating position-changed events. */
+    _isTiling: boolean = false;
+
+    _settings: Gio.Settings | null = null;
+
+    constructor() {}
+
+    /** Returns the live min-ratio value from settings, falling back to 0.10. */
+    private _getMinRatio(): number {
+        return this._settings?.get_double('min-window-size-percent') ?? 0.10;
+    }
+
+    public enable(): void {
+        Logger.log("Starting Aerospike Window Manager");
+        // Connect window signals
+        this.instantiateDisplaySignals();
+
+        const mon_count = global.display.get_n_monitors();
+        for (let i = 0; i < mon_count; i++) {
+            this._monitors.set(i, new Monitor(i));
+        }
+
+        this.captureExistingWindows();
+
+        // Sync the initially focused window
+        this.syncActiveWindow();
+    }
+
+    instantiateDisplaySignals(): void {
+        this._displaySignals.push(
+            global.display.connect("grab-op-begin", (display, window, op) => {
+                this.handleGrabOpBegin(display, window, op)
+            }),
+            global.display.connect("grab-op-end", (display, window, op) => {
+                this.handleGrabOpEnd(display, window, op)
+            }),
+            global.display.connect("window-entered-monitor", (display, monitor, window) => {
+                Logger.log("WINDOW HAS ENTERED NEW MONITOR!")
+                if (this._showingOverview) {
+                    if (this._getWrappedWindow(window) !== undefined) {
+                        Logger.log("OVERVIEW - MOVING")
+                        this._moveWindowToMonitor(window, monitor)
+                    }
+                }
+            }),
+            global.display.connect('window-created', (display, window) => {
+                this.handleWindowCreated(display, window);
+            }),
+            global.display.connect('notify::focus-window', () => {
+                this.syncActiveWindow();
+            }),
+
+            global.display.connect("showing-desktop-changed", () => {
+                Logger.log("SHOWING DESKTOP CHANGED");
+            }),
+            global.display.connect("workareas-changed", (display) => {
+                Logger.log("WORK AREAS CHANGED",);
+                console.log(display.get_workspace_manager().get_active_workspace_index())
+            }),
+            global.display.connect("in-fullscreen-changed", () => {
+                Logger.log("IN FULL SCREEN CHANGED");
+            }),
+        )
+
+        // this._windowManagerSignals = [
+        //     global.window_manager.connect("show-tile-preview", (_, _metaWindow, _rect, _num) => {
+        //         Logger.log("SHOW TITLE PREVIEW!")
+        //     }),
+        // ];
+
+        this._workspaceManagerSignals = [
+            global.workspace_manager.connect("showing-desktop-changed", () => {
+                Logger.log("SHOWING DESKTOP CHANGED AT WORKSPACE LEVEL");
+            }),
+            global.workspace_manager.connect("workspace-added", (_, wsIndex) => {
+                Logger.log("WORKSPACE ADDED", wsIndex);
+                this._monitors.forEach((monitor: Monitor) => {
+                    monitor.addWorkspace();
+                })
+            }),
+            global.workspace_manager.connect("workspace-removed", (_, wsIndex) => {
+                Logger.log("WORKSPACE REMOVED", wsIndex);
+                this._monitors.forEach((monitor: Monitor) => {
+                    monitor.removeWorkspace(wsIndex);
+                })
+            }),
+            global.workspace_manager.connect("active-workspace-changed", (source) => {
+                Logger.log("Active workspace-changed", source.get_active_workspace().index());
+            }),
+        ];
+
+        this._overviewSignals = [
+            Main.overview.connect("hiding", () => {
+                // this.fromOverview = true;
+                Logger.log("HIDING OVERVIEW")
+                this._showingOverview = false;
+                this._tileMonitors();
+                // const eventObj = {
+                //     name: "focus-after-overview",
+                //     callback: () => {
+                //         Logger.log("FOCUSING AFTER OVERVIEW");
+                //     },
+                // };
+                // this.queueEvent(eventObj);
+            }),
+            Main.overview.connect("showing", () => {
+                this._showingOverview = true;
+                Logger.log("SHOWING OVERVIEW");
+            }),
+        ];
+
+
+    }
+
+    public disable(): void {
+        Logger.log("DISABLED AEROSPIKE WINDOW MANAGER!")
+        // Disconnect the focus signal and remove any existing borders
+        this.disconnectSignals();
+        this.removeAllWindows();
+    }
+
+    removeAllWindows(): void {
+        // Disconnect signals from minimized windows before clearing
+        this.disconnectMinimizedSignals();
+        this._minimizedItems.clear();
+
+        this._monitors.forEach((monitor: Monitor) => {
+            monitor.removeAllWindows();
+        })
+    }
+
+
+    disconnectSignals(): void {
+        this.disconnectDisplaySignals();
+        this.disconnectMonitorSignals();
+        this.disconnectMinimizedSignals();
+    }
+
+    disconnectMonitorSignals(): void {
+        this._monitors.forEach((monitor: Monitor) => {
+            monitor.disconnectSignals();
+        })
+    }
+
+    disconnectDisplaySignals(): void {
+        this._displaySignals.forEach((signal) => {
+            global.display.disconnect(signal)
+        })
+        this._windowManagerSignals.forEach((signal) => {
+            global.window_manager.disconnect(signal)
+        })
+        this._workspaceManagerSignals.forEach((signal) => {
+            global.workspace_manager.disconnect(signal)
+        })
+        this._overviewSignals.forEach((signal) => {
+            Main.overview.disconnect(signal)
+        })
+    }
+
+    disconnectMinimizedSignals(): void {
+        this._minimizedItems.forEach((item) => {
+            item.disconnectWindowSignals();
+        })
+    }
+
+
+    /**
+     * Returns true if the grab op is a resize operation (any edge or corner).
+     */
+    _isResizeOp(op: Meta.GrabOp): boolean {
+        return op === Meta.GrabOp.RESIZING_E  ||
+               op === Meta.GrabOp.RESIZING_W  ||
+               op === Meta.GrabOp.RESIZING_N  ||
+               op === Meta.GrabOp.RESIZING_S  ||
+               op === Meta.GrabOp.RESIZING_NE ||
+               op === Meta.GrabOp.RESIZING_NW ||
+               op === Meta.GrabOp.RESIZING_SE ||
+               op === Meta.GrabOp.RESIZING_SW;
+    }
+
+    handleGrabOpBegin(display: Meta.Display, window: Meta.Window, op: Meta.GrabOp): void {
+        Logger.log("Grab Op Start", op);
+
+        if (this._isResizeOp(op)) {
+            // ── Resize drag ──────────────────────────────────────────────────
+            Logger.log("Resize drag begin, op=", op);
+            this._isResizeDrag = true;
+            this._resizeDragWindowId = window.get_id();
+            this._resizeDragOp = op;
+            const [startMouseX, startMouseY] = global.get_pointer();
+            this._resizeDragLastMouseX = startMouseX;
+            this._resizeDragLastMouseY = startMouseY;
+            // Mark the window as dragging so safelyResizeWindow skips it while
+            // we tile the other windows in response to ratio changes.
+            this._getWrappedWindow(window)?.startDragging();
+        } else {
+            // ── Move drag (existing behaviour) ───────────────────────────────
+            this._getWrappedWindow(window)?.startDragging();
+            this._grabbedWindowMonitor = window.get_monitor();
+            this._grabbedWindowId = window.get_id();
+        }
+    }
+
+    handleGrabOpEnd(display: Meta.Display, window: Meta.Window, op: Meta.GrabOp): void {
+        Logger.log("Grab Op End ", op);
+
+        if (this._isResizeDrag) {
+            // ── Resize drag end ──────────────────────────────────────────────
+            Logger.log("Resize drag end, op=", op);
+            this._isResizeDrag = false;
+            this._resizeDragWindowId = _UNUSED_WINDOW_ID;
+            this._resizeDragLastMouseX = 0;
+            this._resizeDragLastMouseY = 0;
+            this._resizeDragOp = Meta.GrabOp.NONE;
+            // Stop suppressing the window, then snap everything to computed ratios
+            this._getWrappedWindow(window)?.stopDragging();
+            this._tileMonitors();
+        } else {
+            // ── Move drag end (existing behaviour) ───────────────────────────
+            Logger.log("primary display", display.get_primary_monitor())
+            this._grabbedWindowId = _UNUSED_WINDOW_ID;
+            this._getWrappedWindow(window)?.stopDragging();
+            this._tileMonitors();
+            Logger.info("monitor_start and monitor_end", this._grabbedWindowMonitor, window.get_monitor());
+        }
+    }
+
+    _getWrappedWindow(window: Meta.Window): WindowWrapper | undefined {
+        let wrapped: WindowWrapper | undefined = undefined;
+        for (const monitor of this._monitors.values()) {
+            wrapped = monitor.getWindow(window.get_id());
+            if (wrapped !== undefined) {
+                break;
+            }
+        }
+        return wrapped;
+    }
+
+    _getAndRemoveWrappedWindow(window: Meta.Window): WindowWrapper | undefined {
+        let wrapped: WindowWrapper | undefined = undefined;
+        for (const monitor of this._monitors.values()) {
+            wrapped = monitor.getWindow(window.get_id());
+            if (wrapped !== undefined) {
+                monitor.removeWindow(wrapped);
+                break;
+            }
+        }
+        return wrapped;
+    }
+
+    _moveWindowToMonitor(window: Meta.Window, monitorId: number): void {
+        let wrapped = this._getAndRemoveWrappedWindow(window);
+        if (wrapped === undefined) {
+            Logger.error("WINDOW NOT DEFINED")
+            wrapped = new WindowWrapper(window, (winWrap) => this.handleWindowMinimized(winWrap));
+            wrapped.connectWindowSignals(this);
+        }
+        let new_mon = this._monitors.get(monitorId);
+        new_mon?.addWindow(wrapped)
+        this._grabbedWindowMonitor = monitorId;
+    }
+
+    public handleWindowPositionChanged(winWrap: WindowWrapper): void {
+        // Ignore position changes that we triggered ourselves via tileWindows
+        if (this._isTiling) {
+            return;
+        }
+        if (this._changingGrabbedMonitor) {
+            return;
+        }
+
+        // ── Live resize-drag handling ─────────────────────────────────────────
+        if (this._isResizeDrag && winWrap.getWindowId() === this._resizeDragWindowId) {
+            this._handleResizeDragUpdate(winWrap);
+            return;
+        }
+
+        // ── Move-drag handling (existing behaviour) ───────────────────────────
+        if (winWrap.getWindowId() === this._grabbedWindowId) {
+            const [mouseX, mouseY, _] = global.get_pointer();
+
+            let monitorIndex = -1;
+            for (let i = 0; i < global.display.get_n_monitors(); i++) {
+                const workArea = global.workspace_manager.get_active_workspace().get_work_area_for_monitor(i);
+                if (mouseX >= workArea.x && mouseX < workArea.x + workArea.width &&
+                    mouseY >= workArea.y && mouseY < workArea.y + workArea.height) {
+                    monitorIndex = i;
+                    break;
+                }
+            }
+            if (monitorIndex === -1) {
+                return;
+            }
+
+            if (monitorIndex !== this._grabbedWindowMonitor) {
+                this._changingGrabbedMonitor = true;
+                this._moveWindowToMonitor(winWrap.getWindow(), monitorIndex);
+                this._changingGrabbedMonitor = false;
+            }
+            // Guard _isTiling so that tileWindows() calls triggered by itemDragged
+            // (which repositions the displaced window) don't re-enter this handler.
+            this._isTiling = true;
+            try {
+                this._monitors.get(monitorIndex)?.itemDragged(winWrap, mouseX, mouseY);
+            } finally {
+                this._isTiling = false;
+            }
+        }
+    }
+
+    /**
+     * Called on every position-changed event while a resize drag is in progress.
+     * Computes the pixel delta from the drag-start rect, maps it to the correct
+     * container boundary, and calls adjustBoundary() for live feedback.
+     */
+    private _handleResizeDragUpdate(winWrap: WindowWrapper): void {
+        const op    = this._resizeDragOp;
+        const winId = winWrap.getWindowId();
+
+        // Read the current mouse position — this is unclamped by the compositor
+        // and always reflects the true user intent, unlike the window's frame rect
+        // which gets clamped when adjacent windows block expansion.
+        const [mouseX, mouseY] = global.get_pointer();
+        const dx = mouseX - this._resizeDragLastMouseX;
+        const dy = mouseY - this._resizeDragLastMouseY;
+
+        if (dx === 0 && dy === 0) return;
+
+        // Update last position first so even if we return early the baseline advances
+        this._resizeDragLastMouseX = mouseX;
+        this._resizeDragLastMouseY = mouseY;
+
+        // Find the container that directly holds this window
+        const container = this._findContainerForWindowAcrossMonitors(winId);
+        if (!container) {
+            Logger.warn("_handleResizeDragUpdate: no container found for window", winId);
+            return;
+        }
+
+        const itemIndex = container._getIndexOfWindow(winId);
+        if (itemIndex === -1) return;
+
+        const isHorizontal = container._orientation === 0; // Orientation.HORIZONTAL
+
+        // Map the mouse delta to the correct boundary.
+        //
+        // East/South edge → boundary AFTER  the item (boundaryIndex = itemIndex)
+        //   positive dx/dy grows this item, shrinks the next one.
+        // West/North edge → boundary BEFORE the item (boundaryIndex = itemIndex - 1)
+        //   positive dx/dy moves the left edge right, growing the left neighbour
+        //   and shrinking this item — so we negate the delta.
+
+        const minRatio = this._getMinRatio();
+        let adjusted = false;
+        if (isHorizontal) {
+            if (op === Meta.GrabOp.RESIZING_E || op === Meta.GrabOp.RESIZING_NE || op === Meta.GrabOp.RESIZING_SE) {
+                adjusted = container.adjustBoundary(itemIndex, dx, minRatio);
+            } else if (op === Meta.GrabOp.RESIZING_W || op === Meta.GrabOp.RESIZING_NW || op === Meta.GrabOp.RESIZING_SW) {
+                adjusted = container.adjustBoundary(itemIndex - 1, dx, minRatio);
+            }
+        } else {
+            if (op === Meta.GrabOp.RESIZING_S || op === Meta.GrabOp.RESIZING_SE || op === Meta.GrabOp.RESIZING_SW) {
+                adjusted = container.adjustBoundary(itemIndex, dy, minRatio);
+            } else if (op === Meta.GrabOp.RESIZING_N || op === Meta.GrabOp.RESIZING_NE || op === Meta.GrabOp.RESIZING_NW) {
+                adjusted = container.adjustBoundary(itemIndex - 1, dy, minRatio);
+            }
+        }
+
+        // Tile all windows with the updated ratios, guarded so the resulting
+        // position-changed events don't re-enter this handler.
+        if (adjusted) {
+            this._isTiling = true;
+            try {
+                container.tileWindows();
+            } finally {
+                this._isTiling = false;
+            }
+        }
+    }
+
+    /**
+     * Searches all monitors for the WindowContainer that directly holds win_id.
+     */
+    private _findContainerForWindowAcrossMonitors(winId: number): WindowContainer | null {
+        const activeWorkspaceIndex = global.workspace_manager.get_active_workspace().index();
+        for (const monitor of this._monitors.values()) {
+            if (activeWorkspaceIndex >= monitor._workspaces.length) continue;
+            const workspace = monitor._workspaces[activeWorkspaceIndex];
+            const container = workspace.getContainerForWindow(winId);
+            if (container !== null) return container;
+        }
+        return null;
+    }
+
+
+    public handleWindowMinimized(winWrap: WindowWrapper): void {
+        const monitor_id = winWrap.getWindow().get_monitor()
+        this._minimizedItems.set(winWrap.getWindowId(), winWrap);
+        this._monitors.get(monitor_id)?.removeWindow(winWrap);
+        this._tileMonitors()
+    }
+
+    public handleWindowUnminimized(winWrap: WindowWrapper): void {
+        this._minimizedItems.delete(winWrap.getWindowId());
+        this._addWindowWrapperToMonitor(winWrap);
+        this._tileMonitors()
+    }
+
+
+    public handleWindowChangedWorkspace(winWrap: WindowWrapper): void {
+        const monitor = winWrap.getWindow().get_monitor();
+        this._monitors.get(monitor)?.removeWindow(winWrap);
+        this._monitors.get(monitor)?.addWindow(winWrap);
+    }
+
+    public captureExistingWindows() {
+        const workspace = global.workspace_manager.get_active_workspace();
+        const windows = global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
+        windows.forEach(window => {
+            if (this._isWindowTileable(window)) {
+                this.addWindowToMonitor(window);
+            }
+        });
+
+        this._tileMonitors();
+    }
+
+
+    handleWindowCreated(display: Meta.Display, window: Meta.Window) {
+        Logger.log("WINDOW CREATED ON DISPLAY", window, display);
+        if (!this._isWindowTileable(window)) {
+            return;
+        }
+        Logger.log("WINDOW IS TILABLE");
+        this.addWindowToMonitor(window);
+    }
+
+
+    /**
+     * Handle window closed event
+     */
+    handleWindowClosed(window: WindowWrapper): void {
+
+        const mon_id = window._window.get_monitor();
+
+        this._monitors.get(mon_id)?.removeWindow(window);
+
+        window.disconnectWindowSignals()
+        // Remove from managed windows
+        this.syncActiveWindow();
+        // Retile remaining windows
+        this._tileMonitors();
+    }
+
+
+    public addWindowToMonitor(window: Meta.Window) {
+
+        Logger.log("ADDING WINDOW TO MONITOR", window, window);
+        var wrapper = new WindowWrapper(window, (winWrap) => this.handleWindowMinimized(winWrap))
+        wrapper.connectWindowSignals(this);
+        this._addWindowWrapperToMonitor(wrapper);
+
+    }
+
+    _addWindowWrapperToMonitor(winWrap: WindowWrapper) {
+        if (winWrap.getWindow().minimized) {
+            this._minimizedItems.set(winWrap.getWindow().get_id(), winWrap);
+        } else {
+            this._monitors.get(winWrap.getWindow().get_monitor())?.addWindow(winWrap)
+        }
+    }
+
+    _tileMonitors(): void {
+        this._isTiling = true;
+        try {
+            for (const monitor of this._monitors.values()) {
+                monitor.tileWindows();
+            }
+        } finally {
+            this._isTiling = false;
+        }
+    }
+
+    block_titles = [
+        "org.gnome.Shell.Extensions",
+    ]
+
+    _isWindowTilingBlocked(window: Meta.Window) : boolean {
+        Logger.info("title", window.get_title());
+        Logger.info("description", window.get_description());
+        Logger.info("class", window.get_wm_class());
+        Logger.info("class", window.get_wm_class_instance());
+        return this.block_titles.some((title) => {
+            if (window.get_wm_class() === title) {
+                Logger.log("WINDOW BLOCKED FROM TILING", window.get_title());
+                return true;
+            }
+            return false;
+        });
+    }
+
+    _isWindowTileable(window: Meta.Window) {
+
+        if (!window || !window.get_compositor_private()) {
+            return false;
+        }
+        if (this._isWindowTilingBlocked(window)) {
+            return false;
+        }
+        const windowType = window.get_window_type();
+        Logger.log("WINDOW TILING CHECK",);
+
+        // Skip certain types of windows
+        return !window.is_skip_taskbar() &&
+            windowType !== Meta.WindowType.DESKTOP &&
+            windowType !== Meta.WindowType.DOCK &&
+            windowType !== Meta.WindowType.DIALOG &&
+            windowType !== Meta.WindowType.MODAL_DIALOG &&
+            windowType !== Meta.WindowType.UTILITY &&
+            windowType !== Meta.WindowType.MENU;
+    }
+
+    /**
+     * Synchronizes the active window with GNOME's currently active window
+     *
+     * This function queries GNOME Shell for the current focused window and
+     * updates the extension's active window tracking to match.
+     *
+     * @returns The window ID of the active window, or null if no window is active
+     */
+    public syncActiveWindow(): number | null {
+        const focusWindow = global.display.focus_window;
+        if (focusWindow) {
+            this._activeWindowId = focusWindow.get_id();
+            Logger.debug(`Active window changed to: ${this._activeWindowId} (${focusWindow.get_title()})`);
+        } else {
+            this._activeWindowId = null;
+            Logger.debug('No active window');
+        }
+        return this._activeWindowId;
+    }
+
+    /**
+     * Toggles the orientation of the active container (the container holding the active window)
+     */
+    public toggleActiveContainerOrientation(): void {
+        if (this._activeWindowId === null) {
+            Logger.warn("No active window, cannot toggle container orientation");
+            return;
+        }
+
+        // Find the active window's container
+        const activeContainer = this._findActiveContainer();
+        if (activeContainer) {
+            activeContainer.toggleOrientation();
+        } else {
+            Logger.warn("Could not find container for active window");
+        }
+    }
+
+    /**
+     * Resets all split ratios in the active window's container to equal fractions.
+     * Bound to Ctrl+Z by default.
+     */
+    public resetActiveContainerRatios(): void {
+        if (this._activeWindowId === null) {
+            Logger.warn("No active window, cannot reset container ratios");
+            return;
+        }
+
+        const activeContainer = this._findActiveContainer();
+        if (activeContainer) {
+            Logger.info("Resetting container ratios to equal splits");
+            activeContainer.resetRatios();
+        } else {
+            Logger.warn("Could not find container for active window");
+        }
+    }
+
+    /**
+     * Finds the container that directly contains the active window
+     * @returns The container holding the active window, or null if not found
+     */
+    private _findActiveContainer(): WindowContainer | null {
+        if (this._activeWindowId === null) {
+            return null;
+        }
+
+        for (const monitor of this._monitors.values()) {
+            const activeWorkspaceIndex = global.workspace_manager.get_active_workspace().index();
+
+            // Bounds check to prevent accessing invalid workspace
+            if (activeWorkspaceIndex >= monitor._workspaces.length || activeWorkspaceIndex < 0) {
+                Logger.warn(`Active workspace index ${activeWorkspaceIndex} out of bounds for monitor with ${monitor._workspaces.length} workspaces`);
+                continue;
+            }
+
+            const workspace = monitor._workspaces[activeWorkspaceIndex];
+
+            // Check if the window is directly in the workspace container
+            const windowWrapper = workspace.getWindow(this._activeWindowId);
+            if (windowWrapper) {
+                // Try to find the parent container
+                const container = this._findContainerHoldingWindow(workspace, this._activeWindowId);
+                return container;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Recursively finds the container that directly contains a specific window
+     * @param container The container to search
+     * @param windowId The window ID to find
+     * @returns The container that directly contains the window, or null if not found
+     */
+    private _findContainerHoldingWindow(container: WindowContainer, windowId: number): WindowContainer | null {
+        // Check if this container directly contains the window
+        for (const item of container._tiledItems) {
+            if (item instanceof WindowContainer) {
+                // Recursively search nested containers
+                const result = this._findContainerHoldingWindow(item, windowId);
+                if (result) {
+                    return result;
+                }
+            } else if (item.getWindowId() === windowId) {
+                // Found it! Return this container as it directly holds the window
+                return container;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Prints the tree structure of all monitors, workspaces, containers, and windows to the logs
+     */
+    public printTreeStructure(): void {
+        Logger.info("=".repeat(80));
+        Logger.info("WINDOW TREE STRUCTURE");
+        Logger.info("=".repeat(80));
+        Logger.info(`Active Window ID: ${this._activeWindowId ?? 'none'}`);
+        Logger.info("=".repeat(80));
+
+        const activeWorkspaceIndex = global.workspace_manager.get_active_workspace().index();
+
+        this._monitors.forEach((monitor: Monitor, monitorId: number) => {
+            const isActiveMonitor = this._activeWindowId !== null &&
+                                   monitor.getWindow(this._activeWindowId) !== undefined;
+            const monitorMarker = isActiveMonitor ? ' *' : '';
+
+            Logger.info(`Monitor ${monitorId}${monitorMarker}:`);
+            Logger.info(`  Work Area: x=${monitor._workArea.x}, y=${monitor._workArea.y}, w=${monitor._workArea.width}, h=${monitor._workArea.height}`);
+
+            monitor._workspaces.forEach((workspace, workspaceIndex) => {
+                const isActiveWorkspace = workspaceIndex === activeWorkspaceIndex;
+                const workspaceMarker = isActiveWorkspace && isActiveMonitor ? ' *' : '';
+
+                Logger.info(`  Workspace ${workspaceIndex}${workspaceMarker}:`);
+                Logger.info(`    Orientation: ${workspace._orientation === 0 ? 'HORIZONTAL' : 'VERTICAL'}`);
+                Logger.info(`    Items: ${workspace._tiledItems.length}`);
+
+                this._printContainerTree(workspace, 4);
+            });
+        });
+
+        Logger.info("=".repeat(80));
+    }
+
+    /**
+     * Recursively prints the container tree structure
+     * @param container The container to print
+     * @param indentLevel The indentation level (number of spaces)
+     */
+    private _printContainerTree(container: any, indentLevel: number): void {
+        const indent = " ".repeat(indentLevel);
+
+        container._tiledItems.forEach((item: any, index: number) => {
+            if (item instanceof WindowContainer) {
+                // Check if this container contains the active window
+                const containsActiveWindow = this._activeWindowId !== null &&
+                                            item.getWindow(this._activeWindowId) !== undefined;
+                const containerMarker = containsActiveWindow ? ' *' : '';
+
+                Logger.info(`${indent}[${index}] Container (${item._orientation === 0 ? 'HORIZONTAL' : 'VERTICAL'})${containerMarker}:`);
+                Logger.info(`${indent}    Items: ${item._tiledItems.length}`);
+                Logger.info(`${indent}    Work Area: x=${item._workArea.x}, y=${item._workArea.y}, w=${item._workArea.width}, h=${item._workArea.height}`);
+                this._printContainerTree(item, indentLevel + 4);
+            } else {
+                const window = item.getWindow();
+                const isActiveWindow = this._activeWindowId === item.getWindowId();
+                const windowMarker = isActiveWindow ? ' *' : '';
+
+                Logger.info(`${indent}[${index}] Window ID: ${item.getWindowId()}${windowMarker}`);
+                Logger.info(`${indent}    Title: "${window.get_title()}"`);
+                Logger.info(`${indent}    Class: ${window.get_wm_class()}`);
+                const rect = item.getRect();
+                Logger.info(`${indent}    Rect: x=${rect.x}, y=${rect.y}, w=${rect.width}, h=${rect.height}`);
+            }
+        });
+    }
+
+
+}

tsconfig.json

@@ -5,6 +5,8 @@
     "outDir": "./dist",
     "sourceMap": false,
     "strict": true,
+    "noImplicitAny": false,
+    "skipLibCheck": true,
     "target": "ES2022",
     "lib": [
       "ES2022"
@@ -16,7 +18,6 @@
     "src/**/*"
   ],
   "files": [
-    "extension.ts",
-    "src/winGroup.ts"
+    "extension.ts"
   ],
 }