openhab · timbms · May 28, 2026 · May 28, 2026 · May 28, 2026 · May 28, 2026
diff --git a/AGENTS.md b/AGENTS.md
@@ -9,9 +9,9 @@
 - UI tests: `xcodebuild test -workspace openHAB.xcworkspace -scheme openHABUITests`
 
 ## Architecture
-- **Main app**: openHAB/ - UIKit + SwiftUI hybrid iOS app targeting iOS 16+
+- **Main app**: openHAB/ - UIKit + SwiftUI hybrid iOS app targeting iOS 18+
 - **Core library**: OpenHABCore/ - Swift Package with shared business logic, models, API clients
-- **Watch app**: openHABWatch/ - watchOS companion app (watchOS 10+)
+- **Watch app**: openHABWatch/ - watchOS companion app (watchOS 11+)
 - **Extensions**: openHABIntents/ (Siri shortcuts), NotificationService/ (rich notifications)
 - **Tests**: openHABTestsSwift/ (Swift Testing), openHABUITests/ (UI automation). For targeted bug fixes,  run only focused tests by default.
 - **Dependencies**: Kingfisher (image loading), SwiftUI, Firebase, OpenAPI runtime, SFSafeSymbols

diff --git a/AppIntents/ContactState.swift b/AppIntents/ContactState.swift
@@ -12,20 +12,18 @@
 import AppIntents
 import Foundation
 
-@available(iOS 17.0, macOS 14.0, *)
 enum ContactState: String, AppEnum {
     case open = "OPEN"
     case closed = "CLOSED"
 
     static let typeDisplayRepresentation = TypeDisplayRepresentation(name: "Contact State")
 
     static let caseDisplayRepresentations: [Self: DisplayRepresentation] = [
-        .open: "Open",
-        .closed: "Closed"
+        .open: DisplayRepresentation(title: "Open", synonyms: ["Opened", "Triggered", "Active"]),
+        .closed: DisplayRepresentation(title: "Closed", synonyms: ["Shut", "Inactive", "Reset"])
     ]
 }
 
-@available(iOS 17.0, macOS 14.0, *)
 extension ContactState: CustomLocalizedStringResourceConvertible {
     var localizedStringResource: LocalizedStringResource {
         switch self {

diff --git a/AppIntents/Home.swift b/AppIntents/Home.swift
@@ -105,7 +105,7 @@ enum HomeResolver {
         )
     }
 
-    /// Production overload for item-by-name resolution (iOS 16 compat intents).
+    /// Production overload for item-by-name resolution.
     /// Builds a stable-identifier-aware `findHomeId` closure and delegates to the testable overload.
     static func resolveHomeId(selectedHome: Home?,
                               itemName: String,
@@ -219,7 +219,9 @@ struct Home: AppEntity {
         }
     }
 
-    static let typeDisplayRepresentation = TypeDisplayRepresentation(name: "Home")
+    static let typeDisplayRepresentation = TypeDisplayRepresentation(
+        name: LocalizedStringResource("Home", defaultValue: "Home")
+    )
 
     static let defaultQuery = HomeQuery()
 

diff --git a/AppIntents/Intents/ContactStateIntent.swift b/AppIntents/Intents/ContactStateIntent.swift
@@ -26,7 +26,6 @@ enum ContactStateError: Error, CustomLocalizedStringResourceConvertible {
     }
 }
 
-@available(iOS 17.0, macOS 14.0, *)
 struct ContactStateIntent: AppIntent {
     static var openAppWhenRun: Bool {
         false

diff --git a/AppIntents/Intents/GetItemStateIntent.swift b/AppIntents/Intents/GetItemStateIntent.swift
@@ -56,7 +56,6 @@ enum ItemStateError: Error, CustomLocalizedStringResourceConvertible {
     }
 }
 
-@available(iOS 17.0, macOS 14.0, *)
 struct GetItemStateIntent: AppIntent {
     static var openAppWhenRun: Bool {
         false
@@ -69,7 +68,7 @@ struct GetItemStateIntent: AppIntent {
     }
 
     static let title: LocalizedStringResource = "Get Item State"
-    static let description = IntentDescription("Retrieve the current state of an item")
+    static let description = IntentDescription("Retrieve the current state of an item", resultValueName: "State")
 
     @Parameter(title: "Home")
     var home: Home?

diff --git a/AppIntents/Intents/SetActiveHomeIntent.swift b/AppIntents/Intents/SetActiveHomeIntent.swift
@@ -12,7 +12,6 @@
 import AppIntents
 import OpenHABCore
 
-@available(iOS 17.0, macOS 14.0, watchOS 10.0, *)
 struct SetActiveHomeIntent: AppIntent {
     static var openAppWhenRun: Bool {
         false

diff --git a/AppIntents/Intents/SetColorValueIntent.swift b/AppIntents/Intents/SetColorValueIntent.swift
@@ -29,7 +29,6 @@ enum ColorValueError: Error, CustomLocalizedStringResourceConvertible {
     }
 }
 
-@available(iOS 17.0, macOS 14.0, *)
 struct SetColorValueIntent: AppIntent {
     static var openAppWhenRun: Bool {
         false

diff --git a/AppIntents/Intents/SetDateTimeValueIntent.swift b/AppIntents/Intents/SetDateTimeValueIntent.swift
@@ -26,7 +26,6 @@ enum DateTimeValueError: Error, CustomLocalizedStringResourceConvertible {
     }
 }
 
-@available(iOS 17.0, macOS 14.0, *)
 struct SetDateTimeValueIntent: AppIntent {
     static var openAppWhenRun: Bool {
         false

diff --git a/AppIntents/Intents/SetDimmerRollerValueIntent.swift b/AppIntents/Intents/SetDimmerRollerValueIntent.swift
@@ -29,7 +29,6 @@ enum DimmerRollerValueError: Error, CustomLocalizedStringResourceConvertible {
     }
 }
 
-@available(iOS 17.0, macOS 14.0, *)
 struct SetDimmerRollerValueIntent: AppIntent {
     static var openAppWhenRun: Bool {
         false

diff --git a/AppIntents/Intents/SetLocationValueIntent.swift b/AppIntents/Intents/SetLocationValueIntent.swift
@@ -32,7 +32,6 @@ enum LocationValueError: Error, CustomLocalizedStringResourceConvertible {
     }
 }
 
-@available(iOS 17.0, macOS 14.0, *)
 struct SetLocationValueIntent: AppIntent {
     static var openAppWhenRun: Bool {
         false

diff --git a/AppIntents/Intents/SetNumberValueIntent.swift b/AppIntents/Intents/SetNumberValueIntent.swift
@@ -26,7 +26,6 @@ enum NumberValueError: Error, CustomLocalizedStringResourceConvertible {
     }
 }
 
-@available(iOS 17.0, macOS 14.0, *)
 struct SetNumberValueIntent: AppIntent {
     static var openAppWhenRun: Bool {
         false

diff --git a/AppIntents/Intents/SetPlayerValueIntent.swift b/AppIntents/Intents/SetPlayerValueIntent.swift
@@ -26,7 +26,6 @@ enum PlayerValueError: Error, CustomLocalizedStringResourceConvertible {
     }
 }
 
-@available(iOS 17.0, macOS 14.0, *)
 struct SetPlayerValueIntent: AppIntent {
     static var openAppWhenRun: Bool {
         false
@@ -77,6 +76,6 @@ struct SetPlayerValueIntent: AppIntent {
             throw PlayerValueError.commandFailed(error.localizedDescription)
         }
 
-        return .result(dialog: "Sent \(action) to \(itemEntity.label)")
+        return .result(dialog: "Sent \(action.rawValue) to \(itemEntity.label)")
     }
 }
diff --git a/AppIntents/Intents/SetStringValueIntent.swift b/AppIntents/Intents/SetStringValueIntent.swift
@@ -26,7 +26,6 @@ enum StringValueError: Error, CustomLocalizedStringResourceConvertible {
     }
 }
 
-@available(iOS 17.0, macOS 14.0, *)
 struct SetStringValueIntent: AppIntent {
     static var openAppWhenRun: Bool {
         false

diff --git a/AppIntents/Intents/SetSwitchItemIntent.swift b/AppIntents/Intents/SetSwitchItemIntent.swift
@@ -26,14 +26,13 @@ enum ControlItemError: Error, CustomLocalizedStringResourceConvertible {
     }
 }
 
-@available(iOS 17.0, macOS 14.0, *)
 struct SetSwitchItemIntent: AppIntent {
     static var openAppWhenRun: Bool {
         false
     }
 
     static var allowedItemTypes: [OpenHABItem.ItemType] {
-        [.switchItem]
+        [.switchItem, .dimmer]
     }
 
     static var parameterSummary: some ParameterSummary {
@@ -78,6 +77,12 @@ struct SetSwitchItemIntent: AppIntent {
             throw ControlItemError.commandFailed(error.localizedDescription)
         }
 
-        return .result(dialog: "Sent \(action) to \(itemEntity.label)")
+        // openHAB accepts commands asynchronously: it returns HTTP 200 before the item
+        // state has actually changed. Without a pause, WidgetKit's immediate timeline
+        // refresh races the server and fetches the pre-command state, overwriting the
+        // Toggle's optimistic visual flip and showing the wrong colour/text.
+        try? await Task.sleep(for: .milliseconds(600))
+
+        return .result(dialog: "Sent \(action.rawValue) to \(itemEntity.label)")
     }
 }
diff --git a/AppIntents/ItemEntity.swift b/AppIntents/ItemEntity.swift
@@ -14,7 +14,6 @@ import OpenHABCore
 
 // MARK: - Shared Protocol for All Item Entities
 
-@available(iOS 17.0, macOS 14.0, *)
 protocol ItemEntity: AppEntity where ID == ItemIdentifier {
     var id: ItemIdentifier { get set }
     var item: OpenHABItem { get set }
@@ -24,7 +23,6 @@ protocol ItemEntity: AppEntity where ID == ItemIdentifier {
     init(_ openHABItem: OpenHABItem, homeId: UUID, homeName: String?)
 }
 
-@available(iOS 17.0, macOS 14.0, *)
 extension ItemEntity {
     var homeId: UUID? {
         id.homeId
@@ -58,13 +56,13 @@ extension ItemEntity {
     var displayRepresentation: DisplayRepresentation {
         if let homeName {
             DisplayRepresentation(
-                title: nonLocalizedDisplayString(label, key: "__app_intents_item_label__"),
-                subtitle: nonLocalizedDisplayString("\(item.name) • \(homeName)", key: "__app_intents_item_subtitle__")
+                title: "\(label)",
+                subtitle: "\(item.name) • \(homeName)"
             )
         } else {
             DisplayRepresentation(
-                title: nonLocalizedDisplayString(label, key: "__app_intents_item_label__"),
-                subtitle: nonLocalizedDisplayString(item.name, key: "__app_intents_item_name__")
+                title: "\(label)",
+                subtitle: "\(item.name)"
             )
         }
     }
@@ -76,8 +74,4 @@ extension ItemEntity {
             homeName: homeName
         )
     }
-
-    func nonLocalizedDisplayString(_ value: String, key: StaticString) -> LocalizedStringResource {
-        LocalizedStringResource(key, defaultValue: "\(value)")
-    }
 }
diff --git a/AppIntents/ItemEntityQuery.swift b/AppIntents/ItemEntityQuery.swift
@@ -14,15 +14,13 @@ import OpenHABCore
 
 // MARK: - Shared Query Protocol
 
-@available(iOS 17.0, macOS 14.0, *)
 protocol ItemEntityQuery: EntityStringQuery {
     associatedtype EntityType: ItemEntity
 
     var allowedTypes: [OpenHABItem.ItemType] { get }
     var selectedHome: Home? { get }
 }
 
-@available(iOS 17.0, macOS 14.0, *)
 extension ItemEntityQuery {
     @MainActor
     func getHomeName(for homeId: UUID) -> String? {

diff --git a/AppIntents/OpenHABAppShortcutsProvider.swift b/AppIntents/OpenHABAppShortcutsProvider.swift
@@ -0,0 +1,78 @@
+// Copyright (c) 2010-2026 Contributors to the openHAB project
+//
+// See the NOTICE file(s) distributed with this work for additional
+// information.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0
+//
+// SPDX-License-Identifier: EPL-2.0
+
+import AppIntents
+internal import SFSafeSymbols
+
+/// App Shortcuts Provider for openHAB app
+///
+/// This provider registers app shortcuts with iOS, enabling:
+/// - Siri phrase suggestions (e.g., "Toggle Kitchen Light in openHAB")
+/// - Shortcuts in Spotlight search
+/// - Add to Home Screen functionality
+/// - Siri Suggestions on lock screen and search
+///
+/// ## Design Note
+/// Due to iOS AppShortcuts limitation of one parameter per phrase,
+/// shortcuts are designed for specific, common actions:
+/// - Toggle switch items (most common switch operation)
+/// - Get item state (universal query)
+/// - Open/Close roller shutters (specific directional commands)
+///
+/// The action is embedded in the phrase itself since we can only
+/// pass the item name as a parameter.
+///
+/// ## SF Symbol Names
+/// Apple's AppShortcut requires literal strings for `systemImageName` -
+/// constants and SFSafeSymbols cannot be used due to compile-time metadata extraction.
+/// Symbol names use SF Symbols naming convention (e.g., "light.beacon.max").
+/// Reference: https://developer.apple.com/sf-symbols/
+///
+/// ## Note
+/// This file was present in PR #742 but was missing from PR #1028.
+/// Adding it restores iOS app shortcuts functionality.
+///
+/// ## Usage
+/// This struct is automatically discovered by iOS at build time.
+/// No explicit registration is required - just having this file
+/// in the app target is sufficient.
+///
+/// ## References
+/// - Apple Documentation: https://developer.apple.com/documentation/appintents/app-shortcuts
+/// - PR #742: Original implementation
+/// - PR #1028: Enhanced intent implementations
+struct OpenHABAppShortcutsProvider: AppShortcutsProvider {
+    static var appShortcuts: [AppShortcut] {
+        // MARK: - Switch Control - Toggle Action
+
+        // Note: Since AppShortcuts only allow one parameter per phrase,
+        // the action (toggle) is embedded in the phrase itself
+
+        AppShortcut(
+            intent: SetSwitchItemIntent(),
+            phrases: [
+                "Toggle \(\.$itemEntity) in \(.applicationName)",
+                "Toggle switch \(\.$itemEntity) in \(.applicationName)"
+            ],
+            shortTitle: "Toggle Switch",
+            systemImageName: "light.beacon.max" // SFSymbol: .lightBeaconMax
+        )
+
+        // Roller shutter and dimmer shortcuts are omitted: SetDimmerRollerValueIntent
+        // requires a value: Int parameter not present in the phrase, so Siri would
+        // prompt "what value?" after the phrase — poor UX. Dedicated open/close
+        // intents (no value parameter) would be needed to add shutter shortcuts.
+    }
+
+    /// The color used for shortcut tiles in the Shortcuts app and Siri interface
+    /// Orange matches the openHAB brand color
+    static let shortcutTileColor: ShortcutTileColor = .orange
+}
-Original file line number
+Diff line change
@@ Expand Up @@
         }
     }
-    @available(iOS 17.0, macOS 14.0, *)
     struct ContactStateIntent: AppIntent {
         static var openAppWhenRun: Bool {
             false
@@ Expand Down @@