From 0b27f2910f749c81b0eb91eb90ac80e57ef36588 Mon Sep 17 00:00:00 2001 From: Yuzhe Yan Date: Sat, 14 Nov 2026 15:03:30 +0100 Subject: [PATCH] feat(apple): share IosLifiCore and IosQuickAddBridge with macOS Move the Lifi lifecycle facade and the quick-add AI bridge from iosMain to appleMain so the macOS client can use the same AI runtime. The Swift API is unchanged for iOS. IosLifiCore.create picks the platform SQLite driver through an internal expect/actual. Add a createWithDatabase(config:) overload so hosts can pass provider options such as the temperature that reasoning models require. --- .../com/deadliner/bridge/IosQuickAddBridge.kt | 0 .../deadliner/integration/lifi/IosLifiCore.kt | 30 ++++++++++++++----- .../integration/lifi/IosLifiDatabase.ios.kt | 7 +++++ .../integration/lifi/IosLifiDatabase.macos.kt | 7 +++++ 4 files changed, 37 insertions(+), 7 deletions(-) rename shared/src/{iosMain => appleMain}/kotlin/com/deadliner/bridge/IosQuickAddBridge.kt (100%) rename shared/src/{iosMain => appleMain}/kotlin/com/deadliner/integration/lifi/IosLifiCore.kt (87%) create mode 100644 shared/src/iosMain/kotlin/com/deadliner/integration/lifi/IosLifiDatabase.ios.kt create mode 100644 shared/src/macosArm64Main/kotlin/com/deadliner/integration/lifi/IosLifiDatabase.macos.kt diff --git a/shared/src/iosMain/kotlin/com/deadliner/bridge/IosQuickAddBridge.kt b/shared/src/appleMain/kotlin/com/deadliner/bridge/IosQuickAddBridge.kt similarity index 100% rename from shared/src/iosMain/kotlin/com/deadliner/bridge/IosQuickAddBridge.kt rename to shared/src/appleMain/kotlin/com/deadliner/bridge/IosQuickAddBridge.kt diff --git a/shared/src/iosMain/kotlin/com/deadliner/integration/lifi/IosLifiCore.kt b/shared/src/appleMain/kotlin/com/deadliner/integration/lifi/IosLifiCore.kt similarity index 87% rename from shared/src/iosMain/kotlin/com/deadliner/integration/lifi/IosLifiCore.kt rename to shared/src/appleMain/kotlin/com/deadliner/integration/lifi/IosLifiCore.kt index 2f1673a..83101bc 100644 --- a/shared/src/iosMain/kotlin/com/deadliner/integration/lifi/IosLifiCore.kt +++ b/shared/src/appleMain/kotlin/com/deadliner/integration/lifi/IosLifiCore.kt @@ -1,7 +1,7 @@ package com.deadliner.lifi import com.deadliner.db.DeadlinerDatabase -import com.deadliner.db.IosDatabaseDriverFactory +import com.deadliner.db.DatabaseDriverFactory import com.deadliner.domain.ai.model.AIConfig import com.deadliner.domain.ai.model.CoreEvent import com.deadliner.domain.ai.port.ToolResult @@ -29,7 +29,7 @@ interface IosLifiEventListener { } /** - * iOS lifecycle facade for the private Lifi KMP implementation. + * Apple (iOS and macOS) lifecycle facade for the private Lifi KMP implementation. * * It opens the supplied KMP database path, creates the private AI component, * and forwards typed [CoreEvent] values through [IosLifiEventListener]. @@ -131,7 +131,7 @@ class IosLifiCore private constructor( "iOS databasePath must be an absolute database file path." } - val database = DeadlinerDatabase.create(IosDatabaseDriverFactory(databasePath)) + val database = DeadlinerDatabase.create(appleLifiDatabaseDriverFactory(databasePath)) return createWithDatabase(apiKey, baseUrl, model, timezone, database, ownsDatabase = true) } @@ -139,15 +139,28 @@ class IosLifiCore private constructor( fun createWithDatabase( apiKey: String, baseUrl: String, model: String, timezone: String, database: DeadlinerDatabase, ownsDatabase: Boolean = false, - ): IosLifiCore { - val memoryStore = KmpMemoryStoreAdapter(database.memory) - val config = AIConfig( + ): IosLifiCore = createWithDatabase( + config = AIConfig( apiKey = apiKey, baseUrl = baseUrl, model = model, platform = "ios", timezone = timezone, - ) + ), + database = database, + ownsDatabase = ownsDatabase, + ) + + /** + * Same as above with a caller-built [AIConfig], so a host can set provider options such as + * the sampling temperature (reasoning models only accept their default) or the reply language. + */ + fun createWithDatabase( + config: AIConfig, + database: DeadlinerDatabase, + ownsDatabase: Boolean = false, + ): IosLifiCore { + val memoryStore = KmpMemoryStoreAdapter(database.memory) val component = LifiAIComponent(config, memoryStore) val core = DeadlinerCore( config = config, @@ -183,3 +196,6 @@ class IosLifiCore private constructor( } } } + +/** The platform SQLite driver for [IosLifiCore.create]; each Apple target supplies its own. */ +internal expect fun appleLifiDatabaseDriverFactory(databasePath: String): DatabaseDriverFactory diff --git a/shared/src/iosMain/kotlin/com/deadliner/integration/lifi/IosLifiDatabase.ios.kt b/shared/src/iosMain/kotlin/com/deadliner/integration/lifi/IosLifiDatabase.ios.kt new file mode 100644 index 0000000..546d12c --- /dev/null +++ b/shared/src/iosMain/kotlin/com/deadliner/integration/lifi/IosLifiDatabase.ios.kt @@ -0,0 +1,7 @@ +package com.deadliner.lifi + +import com.deadliner.db.DatabaseDriverFactory +import com.deadliner.db.IosDatabaseDriverFactory + +internal actual fun appleLifiDatabaseDriverFactory(databasePath: String): DatabaseDriverFactory = + IosDatabaseDriverFactory(databasePath) diff --git a/shared/src/macosArm64Main/kotlin/com/deadliner/integration/lifi/IosLifiDatabase.macos.kt b/shared/src/macosArm64Main/kotlin/com/deadliner/integration/lifi/IosLifiDatabase.macos.kt new file mode 100644 index 0000000..9a4b3b9 --- /dev/null +++ b/shared/src/macosArm64Main/kotlin/com/deadliner/integration/lifi/IosLifiDatabase.macos.kt @@ -0,0 +1,7 @@ +package com.deadliner.lifi + +import com.deadliner.db.DatabaseDriverFactory +import com.deadliner.db.MacosDatabaseDriverFactory + +internal actual fun appleLifiDatabaseDriverFactory(databasePath: String): DatabaseDriverFactory = + MacosDatabaseDriverFactory(databasePath)