Integrate Fhir Engine

.github/workflows/ci.yml

@@ -75,25 +75,6 @@ jobs:
               :ohs-player-reference-app:lintDebug
             kotlinDaemonHeap: '-Xmx6g -XX:+UseG1GC'
             extraArgs: ''
-          - id: js
-            label: Kotlin/JS
-            # jsBrowserTest is disabled in build.gradle.kts, but requesting
-            # it still runs the compile prerequisites (compileKotlinJs +
-            # compileTestDevelopmentExecutableKotlinJs) — which is the work
-            # we want covered.
-            tasks: ':ohs-player-reference-app:jsBrowserTest'
-            kotlinDaemonHeap: '-Xmx10g -XX:+UseG1GC'
-            extraArgs: ''
-          - id: wasm
-            label: Kotlin/Wasm
-            tasks: >-
-              :ohs-player-library:wasmJsBrowserTest
-              :ohs-player-reference-app:wasmJsBrowserTest
-            kotlinDaemonHeap: '-Xmx10g -XX:+UseG1GC'
-            # Serialize the library + reference-app wasm compiles so they
-            # don't run concurrently as workers and double the daemon heap
-            # demand even at 10g.
-            extraArgs: '--max-workers=1'
     steps:
       - uses: actions/checkout@v4
 

.gitignore

@@ -53,3 +53,6 @@ AGENT.MD
 CLAUDE.MD
 .skills
 
+# Git worktrees used for isolated agent workspaces
+.worktrees/
+

gradle/libs.versions.toml

@@ -15,6 +15,7 @@ composeMaterialIcons = "1.7.3"
 fhirDataCapture = "2.0.0-alpha02"
 junit = "4.13.2"
 kermit = "2.1.0"
+koinBom = "4.1.1"
 kotlin = "2.3.21"
 kotlinx-coroutines = "1.11.0"
 kotlinpoet = "2.3.0"
@@ -25,6 +26,7 @@ navigation-compose = "2.9.2"
 material3 = "1.10.0-alpha05"
 kotlinxSerializationJson = "1.11.0"
 spotless = "8.6.0"
+ohsFhirEngine   = "2.0.0-alpha01"
 ohsFhirModel    = "1.0.0-beta05"
 ohsFhirPath     = "1.0.0-beta03"
 kotlinxDatetime = "0.8.0"
@@ -33,6 +35,10 @@ ionspin-bignum = "0.3.10"
 [libraries]
 fhir-data-capture = { module = "dev.ohs.fhir:fhir-data-capture", version.ref = "fhirDataCapture" }
 kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
+koin-bom = { module = "io.insert-koin:koin-bom", version.ref = "koinBom" }
+koin-core = { module = "io.insert-koin:koin-core" }
+koin-compose = { module = "io.insert-koin:koin-compose" }
+koin-composeViewmodel = { module = "io.insert-koin:koin-compose-viewmodel" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlin-testJunit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 junit = { module = "junit:junit", version.ref = "junit" }
@@ -59,6 +65,7 @@ kotlinx-datetime  = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version
 kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "navigation-compose" }
+ohs-fhir-engine = { module = "dev.ohs.fhir:fhir-engine", version.ref = "ohsFhirEngine" }
 ohs-fhir-model = { module = "dev.ohs.fhir:fhir-model", version.ref = "ohsFhirModel" }
 ohs-fhir-path = { module = "dev.ohs.fhir:fhir-path", version.ref = "ohsFhirPath" }
 ionspin-bignum = { module = "com.ionspin.kotlin:bignum", version.ref = "ionspin-bignum" }

ohs-player-reference-app/build.gradle.kts

@@ -73,6 +73,11 @@ kotlin {
       implementation(libs.kotlinx.serialization.json)
       implementation(libs.kotlinx.datetime)
       implementation(libs.navigation.compose)
+      implementation(project.dependencies.platform(libs.koin.bom))
+      implementation(libs.koin.core)
+      implementation(libs.koin.compose)
+      implementation(libs.koin.composeViewmodel)
+      implementation(libs.ohs.fhir.engine)
       implementation(libs.ohs.fhir.model)
       implementation(libs.ohs.fhir.path)
       implementation(libs.fhir.data.capture)

ohs-player-reference-app/src/androidMain/AndroidManifest.xml

@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
+        android:name=".OhsPlayerApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

ohs-player-reference-app/src/androidMain/kotlin/dev/ohs/player/reference/app/MainActivity.kt

@@ -19,20 +19,11 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import dev.ohs.fhir.datacapture.DataCapture
-import dev.ohs.player.reference.app.data.AppDependencies
-import dev.ohs.player.reference.app.data.repository.AndroidAppContextHolder
-import dev.ohs.player.reference.app.data.repository.InMemoryFhirRepository
-import dev.ohs.player.reference.app.data.repository.PlatformRepositorySnapshotStore
 
 class MainActivity : ComponentActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     enableEdgeToEdge()
     super.onCreate(savedInstanceState)
-    AndroidAppContextHolder.applicationContext = applicationContext
-    AppDependencies.fhirRepository =
-      InMemoryFhirRepository(snapshotStore = PlatformRepositorySnapshotStore)
-    DataCapture.initialize(applicationContext)
     setContent { App() }
   }
 }

ohs-player-reference-app/src/androidMain/kotlin/dev/ohs/player/reference/app/OhsPlayerApplication.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2026 Open Health Stack Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package dev.ohs.player.reference.app
+
+import android.app.Application
+import dev.ohs.fhir.FhirEngine
+import dev.ohs.fhir.FhirEngineConfiguration
+import dev.ohs.fhir.FhirEngineProvider
+import dev.ohs.fhir.datacapture.DataCapture
+import dev.ohs.player.reference.app.data.di.initKoin
+import org.koin.dsl.module
+
+class OhsPlayerApplication : Application() {
+  override fun onCreate() {
+    super.onCreate()
+    FhirEngineProvider.init(FhirEngineConfiguration(), applicationContext)
+    initKoin(module { single<FhirEngine> { FhirEngineProvider.getInstance(applicationContext) } })
+    DataCapture.initialize(applicationContext)
+  }
+}