Fix app install packaging and add workspace memory

Author: raghavendra-talur

Makefile

@@ -0,0 +1,45 @@
+.PHONY: help build build-release run app dmg install uninstall open-dist-app open-installed-app clean
+
+APP_NAME := AeroMux
+DIST_DIR := dist
+APP_BUNDLE := $(DIST_DIR)/$(APP_NAME).app
+APP_INSTALL_DIR ?= /Applications
+APP_INSTALL_PATH := $(APP_INSTALL_DIR)/$(APP_NAME).app
+VERSION ?= $(shell git describe --tags --always --dirty)
+
+help: ## Show available targets
+	@awk 'BEGIN {FS = ":.*## "}; /^[a-zA-Z0-9_.-]+:.*## / {printf "%-18s %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+
+build: ## Build the debug binary with SwiftPM
+	swift build
+
+build-release: ## Build the release binary with SwiftPM
+	swift build -c release
+
+run: ## Run the app from source with SwiftPM
+	swift run
+
+app: ## Build the macOS .app bundle into dist/
+	VERSION="$(VERSION)" ./scripts/build-release-app.sh
+
+dmg: ## Build the DMG into dist/
+	VERSION="$(VERSION)" ./scripts/build-release-dmg.sh
+
+install: app ## Install the built app bundle into /Applications
+	rm -rf "$(APP_INSTALL_PATH)"
+	/usr/bin/ditto "$(APP_BUNDLE)" "$(APP_INSTALL_PATH)"
+	@printf 'Installed %s\n' "$(APP_INSTALL_PATH)"
+
+uninstall: ## Remove the installed app bundle from /Applications
+	rm -rf "$(APP_INSTALL_PATH)"
+	@printf 'Removed %s\n' "$(APP_INSTALL_PATH)"
+
+open-dist-app: app ## Open the locally built app bundle from dist/
+	open "$(APP_BUNDLE)"
+
+open-installed-app: ## Open the installed app from /Applications
+	open "$(APP_INSTALL_PATH)"
+
+clean: ## Remove SwiftPM and packaging build artifacts
+	swift package clean
+	rm -rf "$(DIST_DIR)"

Package.swift

@@ -13,8 +13,8 @@ let package = Package(
         .executableTarget(
             name: "AeroMux",
             path: "Sources",
-            resources: [
-                .process("Resources"),
+            exclude: [
+                "Resources",
             ]
         ),
     ]

README.md

@@ -17,6 +17,7 @@ This is an early release MVP. It now ships as a GitHub Releases DMG and can stil
 - Supports a localhost refresh hook for lower-latency updates
 - Detects whether your AeroSpace left gap is large enough to avoid overlap
 - Lets you keep workspace positions stable instead of moving the active one to the top
+- Supports local workspace titles/descriptions from `~/.config/aeromux/workspaces.json`
 
 ## Why It Exists
 
@@ -117,6 +118,42 @@ A helper script is included at `scripts/aerospace-refresh-hook.sh`.
 
 The refresh listener binds only to `127.0.0.1:39173`.
 
+## Workspace Memory File
+
+AeroMux can read custom titles and descriptions for AeroSpace workspaces from:
+
+```bash
+~/.config/aeromux/workspaces.json
+```
+
+If `XDG_CONFIG_HOME` is set, AeroMux uses:
+
+```bash
+$XDG_CONFIG_HOME/aeromux/workspaces.json
+```
+
+The file is created automatically on first run and populated with the currently discovered AeroSpace workspaces:
+
+```json
+{
+  "workspaces": [
+    {
+      "workspace": "1",
+      "title": "1",
+      "description": null
+    }
+  ]
+}
+```
+
+Behavior:
+
+- `workspace` must match the AeroSpace workspace name exactly
+- `title` replaces the default `Task <workspace>` label
+- `description` is shown under the title
+- when a custom title is present, AeroMux also shows the raw workspace name underneath as `Workspace <name>`
+- you can edit title and description directly from the sidebar using the pencil button on each workspace card
+
 ## AeroSpace Commands Used
 
 AeroMux currently relies on these AeroSpace CLI commands:
@@ -222,3 +259,5 @@ Issues and compatibility reports are useful, especially for:
 ## Releasing
 
 If you are maintaining this repository, local packaging and tag-based GitHub Releases are documented in [docs/RELEASING.md](docs/RELEASING.md).
+
+General local contributor workflow is documented in [docs/DEVELOPMENT.md](docs/DEVELOPMENT.md).

Sources/App/AppEnvironment.swift

@@ -11,10 +11,12 @@ final class AppEnvironment {
     let bridgeServer: RefreshBridgeServer
     let windowController: SidebarWindowController
     let statusItemController: StatusItemController
+    let workspaceMemoryStore: WorkspaceMemoryStore
 
     init() {
         logger = AppLogger()
         settings = SettingsStore()
+        workspaceMemoryStore = WorkspaceMemoryStore(logger: logger)
         let aerospaceExecutablePath = AeroSpaceExecutableResolver.resolve()
         let commandRunner = ProcessCommandRunner(logger: logger)
         let client = AeroSpaceClient(
@@ -37,6 +39,7 @@ final class AppEnvironment {
             settings: settings,
             client: client,
             configService: configService,
+            workspaceMemoryStore: workspaceMemoryStore,
             stateStore: stateStore,
             logger: logger
         )
@@ -46,7 +49,9 @@ final class AppEnvironment {
         windowController = SidebarWindowController(
             settings: settings,
             stateStore: stateStore,
-            focusService: focusService
+            focusService: focusService,
+            workspaceMemoryStore: workspaceMemoryStore,
+            refreshCoordinator: refreshCoordinator
         )
         statusItemController = StatusItemController(
             settings: settings,

Sources/App/AppIconProvider.swift

@@ -2,21 +2,31 @@ import AppKit
 
 enum AppIconProvider {
     static func applicationIconImage() -> NSImage? {
-        loadImage(named: "AeroMuxAppIcon", extension: "png")
+        loadImage(resourceName: "AeroMux.icns")
+            ?? loadDevelopmentImage(at: "../../../Packaging/AeroMux.icns")
     }
 
     static func statusItemImage() -> NSImage? {
-        let image = loadImage(named: "AeroMuxStatusTemplate", extension: "png")
+        let image = loadImage(resourceName: "AeroMuxStatusTemplate.png")
+            ?? loadDevelopmentImage(at: "../../../Sources/Resources/AeroMuxStatusTemplate.png")
             ?? NSImage(systemSymbolName: "paperplane.fill", accessibilityDescription: "AeroMux")
         image?.isTemplate = true
         image?.size = NSSize(width: 18, height: 18)
         return image
     }
 
-    private static func loadImage(named name: String, extension ext: String) -> NSImage? {
-        guard let url = Bundle.module.url(forResource: name, withExtension: ext) else {
-            return nil
-        }
+    private static func loadImage(resourceName: String) -> NSImage? {
+        guard let resourceURL = Bundle.main.resourceURL else { return nil }
+        let url = resourceURL.appendingPathComponent(resourceName)
+        return NSImage(contentsOf: url)
+    }
+
+    private static func loadDevelopmentImage(at relativePath: String) -> NSImage? {
+        let sourceFileURL = URL(fileURLWithPath: #filePath)
+        let url = sourceFileURL
+            .deletingLastPathComponent()
+            .appending(path: relativePath)
+            .standardizedFileURL
         return NSImage(contentsOf: url)
     }
 }

Sources/Models/WorkspaceState.swift

@@ -43,6 +43,8 @@ struct WorkspaceGroup: Identifiable, Equatable {
     let workspaceName: String
     let windows: [WindowItem]
     let isFocused: Bool
+    let titleOverride: String?
+    let descriptionOverride: String?
 }
 
 struct WindowItem: Identifiable, Equatable {
@@ -70,6 +72,10 @@ extension WorkspaceState {
     var visibleWorkspaceCount: Int {
         workspaces.count
     }
+
+    var focusedWorkspaceGroup: WorkspaceGroup? {
+        workspaces.first(where: \.isFocused)
+    }
 }
 
 extension WindowItem {
@@ -83,3 +89,23 @@ extension WindowItem {
         return NSWorkspace.shared.runningApplications.first(where: { $0.localizedName == appName })?.icon
     }
 }
+
+extension WorkspaceGroup {
+    var displayTitle: String {
+        titleOverride ?? "Task \(workspaceName)"
+    }
+
+    var metadataLine: String? {
+        if let titleOverride, titleOverride != workspaceName {
+            return "Workspace \(workspaceName)"
+        }
+        return nil
+    }
+
+    var detailLine: String {
+        if let descriptionOverride {
+            return descriptionOverride
+        }
+        return "\(windows.count) window\(windows.count == 1 ? "" : "s")"
+    }
+}

Sources/Services/AeroSpaceClient.swift

@@ -233,7 +233,9 @@ extension AeroSpaceClient {
             WorkspaceGroup(
                 workspaceName: workspaceName,
                 windows: sortWindows(windows),
-                isFocused: workspaceName == focusedWorkspaceName
+                isFocused: workspaceName == focusedWorkspaceName,
+                titleOverride: nil,
+                descriptionOverride: nil
             )
         }
 
@@ -242,7 +244,9 @@ extension AeroSpaceClient {
                 WorkspaceGroup(
                     workspaceName: focusedWorkspaceName,
                     windows: [],
-                    isFocused: true
+                    isFocused: true,
+                    titleOverride: nil,
+                    descriptionOverride: nil
                 )
             )
         }

Sources/Services/RefreshCoordinator.swift

@@ -12,15 +12,24 @@ final class RefreshCoordinator {
     private let settings: SettingsStore
     private let client: AeroSpaceClient
     private let configService: AeroSpaceConfigService
+    private let workspaceMemoryStore: WorkspaceMemoryStore
     private let stateStore: SidebarStateStore
     private let logger: AppLogger
     private var scheduledRefresh: Task<Void, Never>?
     private var pollingTask: Task<Void, Never>?
 
-    init(settings: SettingsStore, client: AeroSpaceClient, configService: AeroSpaceConfigService, stateStore: SidebarStateStore, logger: AppLogger) {
+    init(
+        settings: SettingsStore,
+        client: AeroSpaceClient,
+        configService: AeroSpaceConfigService,
+        workspaceMemoryStore: WorkspaceMemoryStore,
+        stateStore: SidebarStateStore,
+        logger: AppLogger
+    ) {
         self.settings = settings
         self.client = client
         self.configService = configService
+        self.workspaceMemoryStore = workspaceMemoryStore
         self.stateStore = stateStore
         self.logger = logger
     }
@@ -62,12 +71,26 @@ final class RefreshCoordinator {
             async let integrationTask = configService.integrationStatus(sidebarWidth: settings.sidebarWidth)
             let snapshot = try await snapshotTask
             let integrationStatus = await integrationTask
-            let totalWindowCount = snapshot.workspaces.reduce(0) { $0 + $1.windows.count }
+            async let workspaceMemoryTask = workspaceMemoryStore.metadataByWorkspace(
+                for: snapshot.workspaces.map(\.workspaceName)
+            )
+            let workspaceMemory = await workspaceMemoryTask
+            let annotatedWorkspaces = snapshot.workspaces.map { workspace in
+                let metadata = workspaceMemory[workspace.workspaceName]
+                return WorkspaceGroup(
+                    workspaceName: workspace.workspaceName,
+                    windows: workspace.windows,
+                    isFocused: workspace.isFocused,
+                    titleOverride: metadata?.title,
+                    descriptionOverride: metadata?.description
+                )
+            }
+            let totalWindowCount = annotatedWorkspaces.reduce(0) { $0 + $1.windows.count }
             let status: SidebarStatus = totalWindowCount == 0 ? .empty : .ready
             let workspaceState = WorkspaceState(
                 workspaceName: snapshot.workspaceName,
                 monitorName: snapshot.monitorName,
-                workspaces: snapshot.workspaces,
+                workspaces: annotatedWorkspaces,
                 focusedWindowId: snapshot.focusedWindowId,
                 integrationStatus: integrationStatus,
                 lastUpdatedAt: .now,