Merge remote-tracking branch 'origin/main' into claude/issue-62

# Conflicts:
#	Macterm/App/AppCommand.swift

Author: thdxg

.gitignore

@@ -4,21 +4,18 @@ xcuserdata/
 DerivedData/
 .netrc
 GhosttyKit.xcframework
-GhosttyKit/ghostty.h
-/ghostty
 
 # Ghostty resources downloaded by setup.sh from the thdxg/ghostty release,
-# mirroring a real Ghostty.app layout: ghostty/{themes,shell-integration} plus
-# a sibling terminfo/. Macterm ships them verbatim so users configure themes
-# via their Ghostty config — none are committed here. (The bare themes/ and
-# shell-integration/ lines cover the older flat layout in case it lingers.)
-/Macterm/Resources/ghostty/
-/Macterm/Resources/terminfo/
-/Macterm/Resources/shell-integration/
-/Macterm/Resources/themes/
+# mirroring a real Ghostty.app layout (ghostty/{themes,shell-integration} plus a
+# sibling terminfo/). The directory is committed (via .gitkeep) so it exists on
+# clone, but its downloaded contents are never committed — ignore everything
+# inside except the .gitkeep.
+/Macterm/Resources/*
+!/Macterm/Resources/.gitkeep
 /build
 .agents/
 .claude/
+.codegraph/
 *.dmg
 appcast*.xml
 macterm_run.log

CLAUDE.md

@@ -32,6 +32,8 @@ enum AppCommand: String, CaseIterable, Identifiable {
     case renameProject
     case removeProject
     case replaceProjectPathWithCurrentDir
+    case applyLayout
+    case saveLayout
     case nextProject
     case previousProject
     // Window
@@ -67,6 +69,8 @@ enum AppCommand: String, CaseIterable, Identifiable {
         case .renameProject: "Rename current project"
         case .removeProject: "Remove current project"
         case .replaceProjectPathWithCurrentDir: "Replace project path with current directory"
+        case .applyLayout: "Apply layout"
+        case .saveLayout: "Save layout"
         case .nextProject: "Next project"
         case .previousProject: "Previous project"
         case .toggleSidebar: "Toggle sidebar"
@@ -101,6 +105,8 @@ enum AppCommand: String, CaseIterable, Identifiable {
              .renameProject,
              .removeProject,
              .replaceProjectPathWithCurrentDir,
+             .applyLayout,
+             .saveLayout,
              .nextProject,
              .previousProject: .projects
         case .toggleSidebar,
@@ -143,7 +149,9 @@ enum AppCommand: String, CaseIterable, Identifiable {
         case .renameTab: .renameTab
         case .renameProject: .renameProject
         case .removeProject,
-             .replaceProjectPathWithCurrentDir: nil
+             .replaceProjectPathWithCurrentDir,
+             .applyLayout,
+             .saveLayout: nil
         }
     }
 

Macterm/App/AppCommand.swift

@@ -109,6 +109,20 @@ extension AppCommand {
                   current?.path != pwd
             else { return nil }
             return { ctx.appState.replaceProjectPathWithCurrentDir(projectStore: ctx.projectStore) }
+        case .applyLayout:
+            guard let projectID, let current else { return nil }
+            return {
+                if let error = ctx.appState.applyLayout(projectID: projectID, projectName: current.name, projectRoot: current.path) {
+                    presentLayoutError(error, verb: "apply")
+                }
+            }
+        case .saveLayout:
+            guard let projectID, let current else { return nil }
+            return {
+                if let error = ctx.appState.saveLayout(projectID: projectID, projectName: current.name, projectRoot: current.path) {
+                    presentLayoutError(error, verb: "save")
+                }
+            }
         case .nextProject:
             return { ctx.appState.selectNextProject(projects: ctx.projectStore.projects) }
         case .previousProject:
@@ -126,3 +140,14 @@ extension AppCommand {
         }
     }
 }
+
+/// Surface a layout apply/save failure (most commonly a missing or unparseable
+/// `.macterm/layout.yaml`) as a simple modal alert.
+@MainActor
+private func presentLayoutError(_ error: Error, verb: String) {
+    let alert = NSAlert()
+    alert.alertStyle = .warning
+    alert.messageText = "Couldn't \(verb) layout"
+    alert.informativeText = error.localizedDescription
+    alert.runModal()
+}