fix: unblock main CI (settings compile, bonsplit tests)

Packages/macOS/CmuxSettings/Sources/CmuxSettings/CustomSidebarTemplateCatalog.swift

@@ -92,7 +92,10 @@ public struct CustomSidebarTemplateCatalog: Sendable {
         }
         let installedSource = source
             .split(separator: "\n", omittingEmptySubsequences: false)
-            .filter { !$0.trimmingCharacters(in: .whitespaces).hasPrefix("//   cp Examples/CustomSidebars/") }
+            .filter { line in
+                let trimmed = line.trimmingCharacters(in: .whitespaces)
+                return !(trimmed.hasPrefix("//") && trimmed.contains("cp Examples/CustomSidebars/"))
+            }
             .joined(separator: "\n")
         return CustomSidebarTemplate(descriptor: descriptor, source: installedSource)
     }

Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Environment/SettingsHostActions.swift

@@ -10,13 +10,14 @@ public extension Notification.Name {
 
 /// Holds a gallery request until the progressively mounted Custom Sidebars
 /// section is ready to present it.
+// lint:allow namespace-type — one-shot, main-actor handoff from a host menu to the lazily mounted Custom Sidebars section (#15931); candidate to become an injected SettingsRuntime value.
 @MainActor
 public enum CustomSidebarTemplateGalleryRequest {
     private static var pending = false
 
     public static func request() {
         pending = true
-        NotificationCenter.default.post(name: .customSidebarTemplateGalleryRequested)
+        NotificationCenter.default.post(name: .customSidebarTemplateGalleryRequested, object: nil)
     }
 
     public static func consume() -> Bool {

Packages/macOS/CmuxSwiftRenderUI/Tests/CmuxSwiftRenderUITests/CustomSidebarValidationTests.swift

@@ -98,10 +98,12 @@ struct CustomSidebarValidationTests {
     func downloadableCustomSidebarExamplesValidate() throws {
         let directory = examplesDirectory()
         let report = validator.validate(directory: directory, dataContext: Self.richSidebarContext)
+        // manifest.json is the built-in template catalog's index, not a sidebar.
+        let sidebars = report.entries.filter { $0.name != "manifest" }
 
-        #expect(report.names.sorted() == ["activity", "agents-board", "agents-cards", "agents-dense", "agents-focus", "agents-timeline", "btop-agents", "clock", "compact", "finder", "focus", "kitchen-sink", "panel-info", "panel-sessions", "panel-subagents", "panel-todo", "ports", "status-board", "workspaces"])
-        #expect(report.validCount == 19)
-        #expect(report.errorCount == 0)
+        #expect(sidebars.map(\.name).sorted() == ["activity", "agents-board", "agents-cards", "agents-dense", "agents-focus", "agents-timeline", "btop-agents", "clock", "compact", "finder", "focus", "kitchen-sink", "panel-info", "panel-sessions", "panel-subagents", "panel-todo", "ports", "status-board", "workspaces"])
+        #expect(sidebars.filter(\.isValid).count == 19)
+        #expect(sidebars.allSatisfy(\.isValid))
     }
 
     @MainActor

Sources/CmuxExtensionSidebarSelection.swift

@@ -2,6 +2,7 @@ import AppKit
 import CmuxExtensionSidebarExamples
 import CmuxFoundation
 import CmuxSettings
+import CmuxSettingsUI
 import CmuxSidebarProviderKit
 import Foundation
 

cmuxTests/SidebarProviderMenuRegressionTests.swift

@@ -446,7 +446,7 @@ struct SidebarProviderMenuRegressionTests {
         let directory = root.appendingPathComponent("sidebars", isDirectory: true)
         defer { try? FileManager.default.removeItem(at: root) }
 
-        let template = try #require(CustomSidebarOnboardingAssets().exampleTemplate(id: "focus"))
+        let template = try #require(CustomSidebarOnboardingAssets().exampleTemplate(id: "agents-board"))
         let first = CmuxExtensionSidebarSelection.writeCustomSidebar(
             named: template.suggestedName,
             fileExtension: template.fileExtension,
@@ -468,14 +468,14 @@ struct SidebarProviderMenuRegressionTests {
             return
         }
 
-        #expect(firstName == "focus")
-        #expect(secondName == "focus-2")
+        #expect(firstName == "agents-board")
+        #expect(secondName == "agents-board-2")
         #expect(firstURL != secondURL)
         #expect(CustomSidebarValidator().validate(fileURL: firstURL).errorMessage == nil)
         #expect(CustomSidebarValidator().validate(fileURL: secondURL).errorMessage == nil)
         #expect(
             CmuxExtensionSidebarSelection.discoveredCustomSidebarNames(sidebarsDirectory: directory)
-                == ["focus", "focus-2"]
+                == ["agents-board", "agents-board-2"]
         )
     }
 

tests/test_ci_change_areas.py

@@ -5767,6 +5767,13 @@ def test_static_preflight_rejects_stale_embedded_schema_before_native_work() ->
                               else 'print("Ran 1 test in 0.001s\\nOK")\n' if category == "tests"
                               else "pass\n")
             target.chmod(0o755)
+        # Other static-preflight steps run their own validators; stub them too.
+        for path in sorted(set(re.findall(r"scripts/[\w./-]+\.(?:py|sh)", "\n".join(scripts)))):
+            target = repo / path
+            if not target.exists():
+                target.parent.mkdir(parents=True, exist_ok=True)
+                target.write_text("#!/usr/bin/env bash\nexit 0\n" if target.suffix == ".sh" else "pass\n")
+                target.chmod(0o755)
         for name in ("verify-local.py", "verification_receipt.py"):
             shutil.copy2(ROOT / "scripts" / name, repo / "scripts" / name)
         generator = repo / "scripts/generate-cmux-config-schema.py"