Merge pull request '2.3.0 - Unified logging and app intents' (#6) from logging into main

Reviewed-on: #6
2025-11-21 04:01:43 +00:00
parent 071e47f95e 33562e9d16
commit 869ca0fc0d
38 changed files with 2352 additions and 1852 deletions
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -16,8 +16,8 @@ android {
        applicationId = "com.atridad.ascently"
        minSdk = 31
        targetSdk = 36
-        versionCode = 46
-        versionName = "2.2.1"
+        versionCode = 4
+        versionName = "2.3.0"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -38,7 +38,10 @@ android {

    java { toolchain { languageVersion.set(JavaLanguageVersion.of(17)) } }

-    buildFeatures { compose = true }
+    buildFeatures {
+        compose = true
+        buildConfig = true
+    }
 }

 kotlin { compilerOptions { jvmTarget.set(JvmTarget.JVM_17) } }
--- a/android/app/src/main/java/com/atridad/ascently/data/health/HealthConnectStub.kt
+++ b/android/app/src/main/java/com/atridad/ascently/data/health/HealthConnectStub.kt
@@ -3,7 +3,7 @@ package com.atridad.ascently.data.health
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
-import android.util.Log
+import com.atridad.ascently.utils.AppLogger
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.health.connect.client.HealthConnectClient
 import androidx.health.connect.client.PermissionController
@@ -60,7 +60,7 @@ class HealthConnectManager(private val context: Context) {
        try {
            HealthConnectClient.getOrCreate(context)
        } catch (e: Exception) {
-            Log.e(TAG, "Failed to create Health Connect client", e)
+            AppLogger.e(TAG, e) { "Failed to create Health Connect client" }
            _isCompatible.value = false
            null
        }
@@ -75,7 +75,7 @@ class HealthConnectManager(private val context: Context) {
            val status = HealthConnectClient.getSdkStatus(context)
            emit(status == HealthConnectClient.SDK_AVAILABLE)
        } catch (e: Exception) {
-            Log.e(TAG, "Error checking Health Connect availability", e)
+            AppLogger.e(TAG, e) { "Error checking Health Connect availability" }
            _isCompatible.value = false
            emit(false)
        }
@@ -90,10 +90,10 @@ class HealthConnectManager(private val context: Context) {
            try {
                val alreadyHasPermissions = hasAllPermissions()
                if (!alreadyHasPermissions) {
-                    Log.d(TAG, "Health Connect enabled - permissions will be requested by UI")
+                    AppLogger.d(TAG) { "Health Connect enabled - permissions will be requested by UI" }
                }
            } catch (e: Exception) {
-                Log.w(TAG, "Error checking permissions when enabling Health Connect", e)
+                AppLogger.w(TAG, e) { "Error checking permissions when enabling Health Connect" }
            }
        } else if (!enabled) {
            setPermissionsGranted(false)
@@ -119,7 +119,7 @@ class HealthConnectManager(private val context: Context) {
            setPermissionsGranted(hasAll)
            hasAll
        } catch (e: Exception) {
-            Log.e(TAG, "Error checking permissions", e)
+            AppLogger.e(TAG, e) { "Error checking permissions" }
            setPermissionsGranted(false)
            false
        }
@@ -135,7 +135,7 @@ class HealthConnectManager(private val context: Context) {
            val hasPerms = if (isAvailable) hasAllPermissions() else false
            isAvailable && hasPerms
        } catch (e: Exception) {
-            Log.e(TAG, "Error checking Health Connect readiness", e)
+            AppLogger.e(TAG, e) { "Error checking Health Connect readiness" }
            false
        }
    }
@@ -148,7 +148,7 @@ class HealthConnectManager(private val context: Context) {
        return try {
            REQUIRED_PERMISSIONS.map { it }.toSet()
        } catch (e: Exception) {
-            Log.e(TAG, "Error getting required permissions", e)
+            AppLogger.e(TAG, e) { "Error getting required permissions" }
            emptySet()
        }
    }
@@ -181,7 +181,7 @@ class HealthConnectManager(private val context: Context) {
                )
            }

-            Log.d(TAG, "Attempting to sync session '${session.id}' to Health Connect...")
+            AppLogger.d(TAG) { "Attempting to sync session '${session.id}' to Health Connect..." }

            val records = mutableListOf<androidx.health.connect.client.records.Record>()

@@ -199,7 +199,7 @@ class HealthConnectManager(private val context: Context) {
                    )
                records.add(exerciseSession)
            } catch (e: Exception) {
-                Log.w(TAG, "Failed to create exercise session record", e)
+                AppLogger.w(TAG, e) { "Failed to create exercise session record" }
            }

            try {
@@ -220,23 +220,22 @@ class HealthConnectManager(private val context: Context) {
                    records.add(caloriesRecord)
                }
            } catch (e: Exception) {
-                Log.w(TAG, "Failed to create calories record", e)
+                AppLogger.w(TAG, e) { "Failed to create calories record" }
            }

            try {
                val heartRateRecord = createHeartRateRecord(startTime, endTime, attemptCount)
                heartRateRecord?.let { records.add(it) }
            } catch (e: Exception) {
-                Log.w(TAG, "Failed to create heart rate record", e)
+                AppLogger.w(TAG, e) { "Failed to create heart rate record" }
            }

            if (records.isNotEmpty() && healthConnectClient != null) {
-                Log.d(TAG, "Writing ${records.size} records to Health Connect...")
+                AppLogger.d(TAG) { "Writing ${records.size} records to Health Connect..." }
                healthConnectClient!!.insertRecords(records)
-                Log.i(
-                        TAG,
+                AppLogger.i(TAG) {
                    "Successfully synced ${records.size} records for session '${session.id}' to Health Connect"
-                )
+                }

                preferences
                    .edit()
@@ -249,13 +248,13 @@ class HealthConnectManager(private val context: Context) {
                        healthConnectClient == null -> "Health Connect client unavailable"
                        else -> "Unknown reason"
                    }
-                Log.w(TAG, "Sync failed for session '${session.id}': $reason")
+                AppLogger.w(TAG) { "Sync failed for session '${session.id}': $reason" }
                return Result.failure(Exception("Sync failed: $reason"))
            }

            Result.success(Unit)
        } catch (e: Exception) {
-            Log.e(TAG, "Error syncing climbing session to Health Connect", e)
+            AppLogger.e(TAG, e) { "Error syncing climbing session to Health Connect" }
            Result.failure(e)
        }
    }
@@ -266,7 +265,7 @@ class HealthConnectManager(private val context: Context) {
        attemptCount: Int = 0
    ): Result<Unit> {
        return if (_autoSync.value && isReady() && session.status == SessionStatus.COMPLETED) {
-            Log.d(TAG, "Auto-syncing completed session '${session.id}' to Health Connect...")
+            AppLogger.d(TAG) { "Auto-syncing completed session '${session.id}' to Health Connect..." }
            syncCompletedSession(session, gymName, attemptCount)
        } else {
            val reason =
@@ -276,7 +275,7 @@ class HealthConnectManager(private val context: Context) {
                    !isReady() -> "Health Connect not ready"
                    else -> "unknown reason"
                }
-            Log.d(TAG, "Auto-sync skipped for session '${session.id}': $reason")
+            AppLogger.d(TAG) { "Auto-sync skipped for session '${session.id}': $reason" }
            Result.success(Unit)
        }
    }
@@ -328,7 +327,7 @@ class HealthConnectManager(private val context: Context) {
                samples = samples
            )
        } catch (e: Exception) {
-            Log.e(TAG, "Error creating heart rate record", e)
+            AppLogger.e(TAG, e) { "Error creating heart rate record" }
            null
        }
    }
--- a/android/app/src/main/java/com/atridad/ascently/data/repository/ClimbRepository.kt
+++ b/android/app/src/main/java/com/atridad/ascently/data/repository/ClimbRepository.kt
@@ -13,6 +13,7 @@ import com.atridad.ascently.data.format.DeletedItem
 import com.atridad.ascently.data.model.*
 import com.atridad.ascently.data.state.DataStateManager
 import com.atridad.ascently.utils.DateFormatUtils
+import com.atridad.ascently.utils.AppLogger
 import com.atridad.ascently.utils.ZipExportImportUtils
 import java.io.File
 import kotlinx.coroutines.flow.Flow
@@ -43,11 +44,13 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
        dataStateManager.updateDataState()
        triggerAutoSync()
    }
+
    suspend fun updateGym(gym: Gym) {
        gymDao.updateGym(gym)
        dataStateManager.updateDataState()
        triggerAutoSync()
    }
+
    suspend fun deleteGym(gym: Gym) {
        gymDao.deleteGym(gym)
        trackDeletion(gym.id, "gym")
@@ -63,10 +66,12 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
        problemDao.insertProblem(problem)
        dataStateManager.updateDataState()
    }
+
    suspend fun updateProblem(problem: Problem) {
        problemDao.updateProblem(problem)
        dataStateManager.updateDataState()
    }
+
    suspend fun deleteProblem(problem: Problem) {
        problemDao.deleteProblem(problem)
        trackDeletion(problem.id, "problem")
@@ -78,6 +83,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
    suspend fun getSessionById(id: String): ClimbSession? = sessionDao.getSessionById(id)
    fun getSessionsByGym(gymId: String): Flow<List<ClimbSession>> =
        sessionDao.getSessionsByGym(gymId)
+
    suspend fun getActiveSession(): ClimbSession? = sessionDao.getActiveSession()
    fun getActiveSessionFlow(): Flow<ClimbSession?> = sessionDao.getActiveSessionFlow()
    suspend fun insertSession(session: ClimbSession) {
@@ -88,6 +94,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
            triggerAutoSync()
        }
    }
+
    suspend fun updateSession(session: ClimbSession) {
        sessionDao.updateSession(session)
        dataStateManager.updateDataState()
@@ -96,12 +103,14 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
            triggerAutoSync()
        }
    }
+
    suspend fun deleteSession(session: ClimbSession) {
        sessionDao.deleteSession(session)
        trackDeletion(session.id, "session")
        dataStateManager.updateDataState()
        triggerAutoSync()
    }
+
    suspend fun getLastUsedGym(): Gym? {
        val recentSessions = sessionDao.getRecentSessions(1).first()
        return if (recentSessions.isNotEmpty()) {
@@ -115,16 +124,20 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
    fun getAllAttempts(): Flow<List<Attempt>> = attemptDao.getAllAttempts()
    fun getAttemptsBySession(sessionId: String): Flow<List<Attempt>> =
        attemptDao.getAttemptsBySession(sessionId)
+
    fun getAttemptsByProblem(problemId: String): Flow<List<Attempt>> =
        attemptDao.getAttemptsByProblem(problemId)
+
    suspend fun insertAttempt(attempt: Attempt) {
        attemptDao.insertAttempt(attempt)
        dataStateManager.updateDataState()
    }
+
    suspend fun updateAttempt(attempt: Attempt) {
        attemptDao.updateAttempt(attempt)
        dataStateManager.updateDataState()
    }
+
    suspend fun deleteAttempt(attempt: Attempt) {
        attemptDao.deleteAttempt(attempt)
        trackDeletion(attempt.id, "attempt")
@@ -386,10 +399,10 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
            if (imagesDir.exists() && imagesDir.isDirectory) {
                val deletedCount = imagesDir.listFiles()?.size ?: 0
                imagesDir.deleteRecursively()
-                android.util.Log.i("ClimbRepository", "Cleared $deletedCount image files")
+                AppLogger.i("ClimbRepository") { "Cleared $deletedCount image files" }
            }
        } catch (e: Exception) {
-            android.util.Log.w("ClimbRepository", "Failed to clear some images: ${e.message}")
+            AppLogger.w("ClimbRepository", e) { "Failed to clear some images: ${e.message}" }
        }
    }
 }
--- a/android/app/src/main/java/com/atridad/ascently/data/state/DataStateManager.kt
+++ b/android/app/src/main/java/com/atridad/ascently/data/state/DataStateManager.kt
@@ -2,8 +2,8 @@ package com.atridad.ascently.data.state

 import android.content.Context
 import android.content.SharedPreferences
-import android.util.Log
 import androidx.core.content.edit
+import com.atridad.ascently.utils.AppLogger
 import com.atridad.ascently.utils.DateFormatUtils

 /**
@@ -26,7 +26,7 @@ class DataStateManager(context: Context) {
        if (!isInitialized()) {
            updateDataState()
            markAsInitialized()
-            Log.d(TAG, "DataStateManager initialized with timestamp: ${getLastModified()}")
+            AppLogger.d(TAG) { "DataStateManager initialized with timestamp: ${getLastModified()}" }
        }
    }

@@ -37,7 +37,7 @@ class DataStateManager(context: Context) {
    fun updateDataState() {
        val now = DateFormatUtils.nowISO8601()
        prefs.edit { putString(KEY_LAST_MODIFIED, now) }
-        Log.d(TAG, "Data state updated to: $now")
+        AppLogger.d(TAG) { "Data state updated to: $now" }
    }

    /**
--- a/android/app/src/main/java/com/atridad/ascently/data/sync/SyncService.kt
+++ b/android/app/src/main/java/com/atridad/ascently/data/sync/SyncService.kt
@@ -4,10 +4,10 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
-import android.util.Log
 import androidx.annotation.RequiresPermission
 import androidx.core.content.edit
 import com.atridad.ascently.data.format.BackupAttempt
+import com.atridad.ascently.utils.AppLogger
 import com.atridad.ascently.data.format.BackupClimbSession
 import com.atridad.ascently.data.format.BackupGym
 import com.atridad.ascently.data.format.BackupProblem
@@ -164,12 +164,12 @@ class SyncService(private val context: Context, private val repository: ClimbRep
    @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
    suspend fun syncWithServer() {
        if (isOfflineMode) {
-            Log.d(TAG, "Sync skipped: Offline mode is enabled.")
+            AppLogger.d(TAG) { "Sync skipped: Offline mode is enabled." }
            return
        }
        if (!isNetworkAvailable()) {
            _syncError.value = "No internet connection."
-            Log.d(TAG, "Sync skipped: No internet connection.")
+            AppLogger.d(TAG) { "Sync skipped: No internet connection." }
            return
        }
        if (!_isConfigured.value) {
@@ -202,29 +202,32 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                // If both client and server have been synced before, use delta sync
                val lastSyncTimeStr = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null)
                if (hasLocalData && hasServerData && lastSyncTimeStr != null) {
-                    Log.d(TAG, "Using delta sync for incremental updates")
+                    AppLogger.d(TAG) { "Using delta sync for incremental updates" }
                    performDeltaSync(lastSyncTimeStr)
                } else {
                    when {
                        !hasLocalData && hasServerData -> {
-                            Log.d(TAG, "No local data found, performing full restore from server")
+                            AppLogger.d(TAG) { "No local data found, performing full restore from server" }
                            val imagePathMapping = syncImagesFromServer(serverBackup)
                            importBackupToRepository(serverBackup, imagePathMapping)
-                            Log.d(TAG, "Full restore completed")
+                            AppLogger.d(TAG) { "Full restore completed" }
                        }
+
                        hasLocalData && !hasServerData -> {
-                            Log.d(TAG, "No server data found, uploading local data to server")
+                            AppLogger.d(TAG) { "No server data found, uploading local data to server" }
                            uploadData(localBackup)
                            syncImagesForBackup(localBackup)
-                            Log.d(TAG, "Initial upload completed")
+                            AppLogger.d(TAG) { "Initial upload completed" }
                        }
+
                        hasLocalData && hasServerData -> {
-                            Log.d(TAG, "Both local and server data exist, merging (server wins)")
+                            AppLogger.d(TAG) { "Both local and server data exist, merging (server wins)" }
                            mergeDataSafely(serverBackup)
-                            Log.d(TAG, "Merge completed")
+                            AppLogger.d(TAG) { "Merge completed" }
                        }
+
                        else -> {
-                            Log.d(TAG, "No data to sync")
+                            AppLogger.d(TAG) { "No data to sync" }
                        }
                    }
                }
@@ -242,7 +245,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
    }

    private suspend fun performDeltaSync(lastSyncTimeStr: String) {
-        Log.d(TAG, "Starting delta sync with lastSyncTime=$lastSyncTimeStr")
+        AppLogger.d(TAG) { "Starting delta sync with lastSyncTime=$lastSyncTimeStr" }

        // Parse last sync time to filter modified items
        val lastSyncDate = parseISO8601(lastSyncTimeStr) ?: Date(0)
@@ -295,10 +298,9 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                parseISO8601(item.deletedAt)?.after(lastSyncDate) == true
            }

-        Log.d(
-                TAG,
+        AppLogger.d(TAG) {
            "Delta sync sending: gyms=${modifiedGyms.size}, problems=${modifiedProblems.size}, sessions=${modifiedSessions.size}, attempts=${modifiedAttempts.size}, deletions=${modifiedDeletions.size}"
-        )
+        }

        // Create delta request
        val deltaRequest =
@@ -342,10 +344,9 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                }
            }

-        Log.d(
-                TAG,
+        AppLogger.d(TAG) {
            "Delta sync received: gyms=${deltaResponse.gyms.size}, problems=${deltaResponse.problems.size}, sessions=${deltaResponse.sessions.size}, attempts=${deltaResponse.attempts.size}, deletions=${deltaResponse.deletedItems.size}"
-        )
+        }

        // Apply server changes to local data
        applyDeltaResponse(deltaResponse)
@@ -372,7 +373,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
            val allDeletions = repository.getDeletedItems() + response.deletedItems
            val uniqueDeletions = allDeletions.distinctBy { "${it.type}:${it.id}" }

-            Log.d(TAG, "Applying ${uniqueDeletions.size} deletion records before merging data")
+            AppLogger.d(TAG) { "Applying ${uniqueDeletions.size} deletion records before merging data" }
            applyDeletions(uniqueDeletions)

            // Build deleted item lookup set
@@ -392,7 +393,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                            imagePathMapping[imagePath] = localImagePath
                        }
                    } catch (e: Exception) {
-                        Log.w(TAG, "Failed to download image $imagePath: ${e.message}")
+                        AppLogger.w(TAG) { "Failed to download image $imagePath: ${e.message}" }
                    }
                }
            }
@@ -496,12 +497,15 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                "gym" -> {
                    existingGyms.find { it.id == item.id }?.let { repository.deleteGym(it) }
                }
+
                "problem" -> {
                    existingProblems.find { it.id == item.id }?.let { repository.deleteProblem(it) }
                }
+
                "session" -> {
                    existingSessions.find { it.id == item.id }?.let { repository.deleteSession(it) }
                }
+
                "attempt" -> {
                    existingAttempts.find { it.id == item.id }?.let { repository.deleteAttempt(it) }
                }
@@ -512,7 +516,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
    private suspend fun syncModifiedImages(modifiedProblems: List<BackupProblem>) {
        if (modifiedProblems.isEmpty()) return

-        Log.d(TAG, "Syncing images for ${modifiedProblems.size} modified problems")
+        AppLogger.d(TAG) { "Syncing images for ${modifiedProblems.size} modified problems" }

        for (backupProblem in modifiedProblems) {
            backupProblem.imagePaths?.forEach { imagePath ->
@@ -583,7 +587,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
    private suspend fun syncImagesFromServer(backup: ClimbDataBackup): Map<String, String> {
        val imagePathMapping = mutableMapOf<String, String>()
        val totalImages = backup.problems.sumOf { it.imagePaths?.size ?: 0 }
-        Log.d(TAG, "Starting image download from server for $totalImages images")
+        AppLogger.d(TAG) { "Starting image download from server for $totalImages images" }

        withContext(Dispatchers.IO) {
            backup.problems.forEach { problem ->
@@ -595,9 +599,9 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                            imagePathMapping[imagePath] = localImagePath
                        }
                    } catch (_: SyncException.ImageNotFound) {
-                        Log.w(TAG, "Image not found on server: $imagePath")
+                        AppLogger.w(TAG) { "Image not found on server: $imagePath" }
                    } catch (e: Exception) {
-                        Log.w(TAG, "Failed to download image $imagePath: ${e.message}")
+                        AppLogger.w(TAG) { "Failed to download image $imagePath: ${e.message}" }
                    }
                }
            }
@@ -625,14 +629,14 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                    }
                }
            } catch (e: IOException) {
-                Log.e(TAG, "Network error downloading image $serverFilename", e)
+                AppLogger.e(TAG, e) { "Network error downloading image $serverFilename" }
                null
            }
        }
    }

    private suspend fun syncImagesForBackup(backup: ClimbDataBackup) {
-        Log.d(TAG, "Starting image sync for backup with ${backup.problems.size} problems")
+        AppLogger.d(TAG) { "Starting image sync for backup with ${backup.problems.size} problems" }
        withContext(Dispatchers.IO) {
            backup.problems.forEach { problem ->
                problem.imagePaths?.forEach { localPath ->
@@ -646,7 +650,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
    private suspend fun uploadImage(localPath: String, filename: String) {
        val file = ImageUtils.getImageFile(context, localPath)
        if (!file.exists()) {
-            Log.w(TAG, "Local image file not found, cannot upload: $localPath")
+            AppLogger.w(TAG) { "Local image file not found, cannot upload: $localPath" }
            return
        }

@@ -663,16 +667,15 @@ class SyncService(private val context: Context, private val repository: ClimbRep
            try {
                httpClient.newCall(request).execute().use { response ->
                    if (response.isSuccessful) {
-                        Log.d(TAG, "Successfully uploaded image: $filename")
+                        AppLogger.d(TAG) { "Successfully uploaded image: $filename" }
                    } else {
-                        Log.w(
-                                TAG,
+                        AppLogger.w(TAG) {
                            "Failed to upload image $filename. Server responded with ${response.code}"
-                        )
+                        }
                    }
                }
            } catch (e: IOException) {
-                Log.e(TAG, "Network error uploading image $filename", e)
+                AppLogger.e(TAG, e) { "Network error uploading image $filename" }
            }
        }
    }
@@ -737,7 +740,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
    }

    private suspend fun mergeDataSafely(serverBackup: ClimbDataBackup) {
-        Log.d(TAG, "Server data will overwrite local data. Performing full restore.")
+        AppLogger.d(TAG) { "Server data will overwrite local data. Performing full restore." }
        val imagePathMapping = syncImagesFromServer(serverBackup)
        importBackupToRepository(serverBackup, imagePathMapping)
    }
@@ -798,7 +801,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                try {
                    syncWithServer()
                } catch (e: Exception) {
-                        Log.e(TAG, "Auto-sync failed", e)
+                    AppLogger.e(TAG, e) { "Auto-sync failed" }
                }
                if (pendingChanges) {
                    pendingChanges = false
@@ -833,5 +836,6 @@ sealed class SyncException(message: String) : IOException(message), Serializable
    data class ServerError(val code: Int) : SyncException("Server error: HTTP $code")
    data class InvalidResponse(val details: String) :
        SyncException("Invalid server response: $details")
+
    data class NetworkError(val details: String) : SyncException("Network error: $details")
 }
--- a/android/app/src/main/java/com/atridad/ascently/service/SessionTrackingService.kt
+++ b/android/app/src/main/java/com/atridad/ascently/service/SessionTrackingService.kt
@@ -12,6 +12,7 @@ import com.atridad.ascently.MainActivity
 import com.atridad.ascently.R
 import com.atridad.ascently.data.database.AscentlyDatabase
 import com.atridad.ascently.data.repository.ClimbRepository
+import com.atridad.ascently.utils.AppLogger
 import com.atridad.ascently.widget.ClimbStatsWidgetProvider
 import java.time.LocalDateTime
 import java.time.temporal.ChronoUnit
@@ -29,6 +30,7 @@ class SessionTrackingService : Service() {
    private lateinit var notificationManager: NotificationManager

    companion object {
+        private const val LOG_TAG = "SessionTrackingService"
        const val NOTIFICATION_ID = 1001
        const val CHANNEL_ID = "session_tracking_channel"
        const val ACTION_START_SESSION = "start_session"
@@ -68,6 +70,7 @@ class SessionTrackingService : Service() {
                    startSessionTracking(sessionId)
                }
            }
+
            ACTION_STOP_SESSION -> {
                val sessionId = intent.getStringExtra(EXTRA_SESSION_ID)
                serviceScope.launch {
@@ -108,7 +111,7 @@ class SessionTrackingService : Service() {
            // Update widget when session tracking starts
            ClimbStatsWidgetProvider.updateAllWidgets(this)
        } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e(LOG_TAG, e) { "Failed to initialize session tracking notification" }
        }

        notificationJob =
@@ -124,7 +127,7 @@ class SessionTrackingService : Service() {
                        updateNotification(sessionId)
                    }
                } catch (e: Exception) {
-                        e.printStackTrace()
+                    AppLogger.e(LOG_TAG, e) { "Notification updater loop crashed" }
                }
            }

@@ -149,7 +152,7 @@ class SessionTrackingService : Service() {
                        }
                    }
                } catch (e: Exception) {
-                        e.printStackTrace()
+                    AppLogger.e(LOG_TAG, e) { "Session monitoring loop crashed" }
                }
            }
    }
@@ -178,13 +181,13 @@ class SessionTrackingService : Service() {
            // Update widget when notification updates
            ClimbStatsWidgetProvider.updateAllWidgets(this)
        } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e(LOG_TAG, e) { "Failed to update notification; retrying in 10s" }

            try {
                delay(10000L)
                createAndShowNotification(sessionId)
            } catch (retryException: Exception) {
-                retryException.printStackTrace()
+                AppLogger.e(LOG_TAG, retryException) { "Retrying notification update failed" }
                stopSessionTracking()
            }
        }
@@ -256,7 +259,7 @@ class SessionTrackingService : Service() {

            notificationManager.notify(NOTIFICATION_ID, notification)
        } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e(LOG_TAG, e) { "Failed to build session tracking notification" }
            throw e
        }
    }
--- a/android/app/src/main/java/com/atridad/ascently/ui/AscentlyApp.kt
+++ b/android/app/src/main/java/com/atridad/ascently/ui/AscentlyApp.kt
@@ -26,6 +26,7 @@ import com.atridad.ascently.ui.components.NotificationPermissionDialog
 import com.atridad.ascently.ui.screens.*
 import com.atridad.ascently.ui.viewmodel.ClimbViewModel
 import com.atridad.ascently.ui.viewmodel.ClimbViewModelFactory
+import com.atridad.ascently.utils.AppLogger
 import com.atridad.ascently.utils.AppShortcutManager
 import com.atridad.ascently.utils.NotificationPermissionUtils

@@ -101,6 +102,7 @@ fun AscentlyApp(
                    launchSingleTop = true
                }
            }
+
            AppShortcutManager.ACTION_END_SESSION -> {
                navController.navigate(Screen.Sessions) {
                    popUpTo(0) { inclusive = true }
@@ -114,10 +116,7 @@ fun AscentlyApp(

    LaunchedEffect(shortcutAction, activeSession, gyms, lastUsedGym) {
        if (shortcutAction == AppShortcutManager.ACTION_START_SESSION && gyms.isNotEmpty()) {
-            android.util.Log.d(
-                    "AscentlyApp",
-                    "Processing shortcut action: activeSession=$activeSession, gyms.size=${gyms.size}, lastUsedGymId=$lastUsedGymId, lastUsedGym=${lastUsedGym?.name}"
-            )
+            AppLogger.d("AscentlyApp") { "Processing shortcut action: activeSession=$activeSession, gyms.size=${gyms.size}, lastUsedGymId=$lastUsedGymId, lastUsedGym=${lastUsedGym?.name}" }

            if (activeSession == null) {
                if (NotificationPermissionUtils.shouldRequestNotificationPermission() &&
@@ -125,14 +124,11 @@ fun AscentlyApp(
                        context
                    )
                ) {
-                    android.util.Log.d("AscentlyApp", "Showing notification permission dialog")
+                    AppLogger.d("AscentlyApp") { "Showing notification permission dialog" }
                    showNotificationPermissionDialog = true
                } else {
                    if (gyms.size == 1) {
-                        android.util.Log.d(
-                                "AscentlyApp",
-                                "Starting session with single gym: ${gyms.first().name}"
-                        )
+                        AppLogger.d("AscentlyApp") { "Starting session with single gym: ${gyms.first().name}" }
                        viewModel.startSession(context, gyms.first().id)
                    } else {
                        val targetGym =
@@ -140,25 +136,16 @@ fun AscentlyApp(
                                ?: lastUsedGym

                        if (targetGym != null) {
-                            android.util.Log.d(
-                                    "AscentlyApp",
-                                    "Starting session with target gym: ${targetGym.name}"
-                            )
+                            AppLogger.d("AscentlyApp") { "Starting session with target gym: ${targetGym.name}" }
                            viewModel.startSession(context, targetGym.id)
                        } else {
-                            android.util.Log.d(
-                                    "AscentlyApp",
-                                    "No target gym found, navigating to selection"
-                            )
+                            AppLogger.d("AscentlyApp") { "No target gym found, navigating to selection" }
                            navController.navigate(Screen.AddEditSession())
                        }
                    }
                }
            } else {
-                android.util.Log.d(
-                        "AscentlyApp",
-                        "Active session already exists: ${activeSession?.id}"
-                )
+                AppLogger.d("AscentlyApp") { "Active session already exists: ${activeSession?.id}" }
            }

            onShortcutActionProcessed()
--- a/android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModel.kt
+++ b/android/app/src/main/java/com/atridad/ascently/ui/viewmodel/ClimbViewModel.kt
@@ -8,6 +8,7 @@ import com.atridad.ascently.data.model.*
 import com.atridad.ascently.data.repository.ClimbRepository
 import com.atridad.ascently.data.sync.SyncService
 import com.atridad.ascently.service.SessionTrackingService
+import com.atridad.ascently.utils.AppLogger
 import com.atridad.ascently.utils.ImageUtils
 import com.atridad.ascently.widget.ClimbStatsWidgetProvider
 import java.io.File
@@ -192,7 +193,7 @@ class ClimbViewModel(
                }
            }

-            println("Deleted $deletedCount image files and cleared image references")
+            AppLogger.i("ClimbViewModel") { "Deleted $deletedCount image files and cleared image references" }
        }
    }

@@ -233,12 +234,12 @@ class ClimbViewModel(
    // Active session management
    fun startSession(context: Context, gymId: String, notes: String? = null) {
        viewModelScope.launch {
-            android.util.Log.d("ClimbViewModel", "startSession called with gymId: $gymId")
+            AppLogger.d("ClimbViewModel") { "startSession called with gymId: $gymId" }

            if (!com.atridad.ascently.utils.NotificationPermissionUtils
                    .isNotificationPermissionGranted(context)
            ) {
-                android.util.Log.d("ClimbViewModel", "Notification permission not granted")
+                AppLogger.d("ClimbViewModel") { "Notification permission not granted" }
                _uiState.value =
                    _uiState.value.copy(
                        error =
@@ -249,10 +250,7 @@ class ClimbViewModel(

            val existingActive = repository.getActiveSession()
            if (existingActive != null) {
-                android.util.Log.d(
-                        "ClimbViewModel",
-                        "Active session already exists: ${existingActive.id}"
-                )
+                AppLogger.d("ClimbViewModel") { "Active session already exists: ${existingActive.id}" }
                _uiState.value =
                    _uiState.value.copy(
                        error = "There's already an active session. Please end it first."
@@ -260,14 +258,11 @@ class ClimbViewModel(
                return@launch
            }

-            android.util.Log.d("ClimbViewModel", "Creating new session")
+            AppLogger.d("ClimbViewModel") { "Creating new session" }
            val newSession = ClimbSession.create(gymId = gymId, notes = notes)
            repository.insertSession(newSession)

-            android.util.Log.d(
-                    "ClimbViewModel",
-                    "Starting tracking service for session: ${newSession.id}"
-            )
+            AppLogger.d("ClimbViewModel") { "Starting tracking service for session: ${newSession.id}" }
            // Start the tracking service
            val serviceIntent = SessionTrackingService.createStartIntent(context, newSession.id)
            context.startForegroundService(serviceIntent)
@@ -477,15 +472,12 @@ class ClimbViewModel(

                result.onFailure { error ->
                    if (healthConnectManager.isReadySync()) {
-                        android.util.Log.w(
-                                "ClimbViewModel",
-                                "Health Connect sync failed: ${error.message}"
-                        )
+                        AppLogger.w("ClimbViewModel") { "Health Connect sync failed: ${error.message}" }
                    }
                }
            } catch (e: Exception) {
                if (healthConnectManager.isReadySync()) {
-                    android.util.Log.w("ClimbViewModel", "Health Connect sync error: ${e.message}")
+                    AppLogger.w("ClimbViewModel") { "Health Connect sync error: ${e.message}" }
                }
            }
        }
--- a/android/app/src/main/java/com/atridad/ascently/utils/AppLogger.kt
+++ b/android/app/src/main/java/com/atridad/ascently/utils/AppLogger.kt
@@ -0,0 +1,48 @@
+package com.atridad.ascently.utils
+
+import android.util.Log
+import com.atridad.ascently.BuildConfig
+
+object AppLogger {
+
+    private const val DEFAULT_TAG = "Ascently"
+
+    enum class Level(val androidLevel: Int) {
+        DEBUG(Log.DEBUG),
+        INFO(Log.INFO),
+        WARN(Log.WARN),
+        ERROR(Log.ERROR)
+    }
+
+    fun d(tag: String = DEFAULT_TAG, messageProvider: () -> String) {
+        log(Level.DEBUG, tag, messageProvider)
+    }
+
+    fun i(tag: String = DEFAULT_TAG, messageProvider: () -> String) {
+        log(Level.INFO, tag, messageProvider)
+    }
+
+    fun w(tag: String = DEFAULT_TAG, throwable: Throwable? = null, messageProvider: () -> String) {
+        log(Level.WARN, tag, messageProvider, throwable)
+    }
+
+    fun e(tag: String = DEFAULT_TAG, throwable: Throwable? = null, messageProvider: () -> String) {
+        log(Level.ERROR, tag, messageProvider, throwable)
+    }
+
+    private fun log(
+        level: Level,
+        tag: String,
+        messageProvider: () -> String,
+        throwable: Throwable? = null
+    ) {
+        if (!BuildConfig.DEBUG) return
+
+        val message = messageProvider()
+        if (throwable != null) {
+            Log.println(level.androidLevel, tag, "$message\n${Log.getStackTraceString(throwable)}")
+        } else {
+            Log.println(level.androidLevel, tag, message)
+        }
+    }
+}
--- a/android/app/src/main/java/com/atridad/ascently/utils/ImageUtils.kt
+++ b/android/app/src/main/java/com/atridad/ascently/utils/ImageUtils.kt
@@ -6,7 +6,6 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.ImageDecoder
 import android.net.Uri
-import android.util.Log
 import androidx.core.graphics.scale
 import androidx.exifinterface.media.ExifInterface
 import java.io.File
@@ -73,7 +72,7 @@ object ImageUtils {
            compressedBitmap.recycle()
            true
        } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e("ImageUtils", e) { "Error saving image with EXIF data" }
            false
        }
    }
@@ -119,7 +118,7 @@ object ImageUtils {
            val file = getImageFile(context, relativePath)
            file.delete()
        } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e("ImageUtils", e) { "Failed to delete image: $relativePath" }
            false
        }
    }
@@ -137,7 +136,7 @@ object ImageUtils {
            sourceFile.copyTo(destFile, overwrite = true)
            "$IMAGES_DIR/$filename"
        } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e("ImageUtils", e) { "Failed to import image from source: ${sourceFile.name}" }
            null
        }
    }
@@ -157,7 +156,7 @@ object ImageUtils {
            }
                ?: emptyList()
        } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e("ImageUtils", e) { "Failed to enumerate images directory" }
            emptyList()
        }
    }
@@ -178,7 +177,7 @@ object ImageUtils {

            tempFilename
        } catch (e: Exception) {
-            Log.e("ImageUtils", "Error saving temporary image from URI", e)
+            AppLogger.e("ImageUtils", e) { "Error saving temporary image from URI" }
            null
        }
    }
@@ -193,7 +192,7 @@ object ImageUtils {
        return try {
            val tempFile = File(getImagesDirectory(context), tempFilename)
            if (!tempFile.exists()) {
-                Log.e("ImageUtils", "Temporary file does not exist: $tempFilename")
+                AppLogger.e("ImageUtils") { "Temporary file does not exist: $tempFilename" }
                return null
            }

@@ -202,17 +201,14 @@ object ImageUtils {
            val finalFile = File(getImagesDirectory(context), deterministicFilename)

            if (tempFile.renameTo(finalFile)) {
-                Log.d(
-                        "ImageUtils",
-                        "Renamed temporary image: $tempFilename -> $deterministicFilename"
-                )
+                AppLogger.d("ImageUtils") { "Renamed temporary image: $tempFilename -> $deterministicFilename" }
                deterministicFilename
            } else {
-                Log.e("ImageUtils", "Failed to rename temporary image: $tempFilename")
+                AppLogger.e("ImageUtils") { "Failed to rename temporary image: $tempFilename" }
                null
            }
        } catch (e: Exception) {
-            Log.e("ImageUtils", "Error renaming temporary image", e)
+            AppLogger.e("ImageUtils", e) { "Error renaming temporary image" }
            null
        }
    }
@@ -249,7 +245,7 @@ object ImageUtils {
                    destExif.saveAttributes()
                } catch (e: Exception) {
                    // If EXIF preservation fails, continue without it
-                    Log.w("ImageUtils", "Failed to preserve EXIF data: ${e.message}")
+                    AppLogger.w("ImageUtils") { "Failed to preserve EXIF data: ${e.message}" }
                }

                bitmap.recycle()
@@ -262,7 +258,7 @@ object ImageUtils {
            // Return relative path
            "$IMAGES_DIR/$filename"
        } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e("ImageUtils", e) { "Failed to save image from bytes: $filename" }
            null
        }
    }
@@ -275,7 +271,7 @@ object ImageUtils {

            orphanedImages.forEach { path -> deleteImage(context, path) }
        } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e("ImageUtils", e) { "Failed to clean up orphaned images" }
        }
    }
 }
--- a/android/app/src/main/java/com/atridad/ascently/utils/MigrationManager.kt
+++ b/android/app/src/main/java/com/atridad/ascently/utils/MigrationManager.kt
@@ -2,7 +2,6 @@ package com.atridad.ascently.utils

 import android.content.Context
 import android.content.SharedPreferences
-import android.util.Log
 import androidx.core.content.edit

 class MigrationManager(private val context: Context) {
@@ -22,11 +21,11 @@ class MigrationManager(private val context: Context) {
     */
    fun migrateIfNeeded() {
        if (migrationPrefs.getBoolean(MIGRATION_COMPLETED_KEY, false)) {
-            Log.d(TAG, "Migration already completed, skipping")
+            AppLogger.d(TAG) { "Migration already completed, skipping" }
            return
        }

-        Log.i(TAG, "🔄 Starting migration from OpenClimb to Ascently...")
+        AppLogger.i(TAG) { "🔄 Starting migration from OpenClimb to Ascently..." }
        var migrationCount = 0

        // Migrate SharedPreferences
@@ -36,12 +35,9 @@ class MigrationManager(private val context: Context) {
        migrationPrefs.edit { putBoolean(MIGRATION_COMPLETED_KEY, true) }

        if (migrationCount > 0) {
-            Log.i(
-                    TAG,
-                    "🎉 Migration completed! Migrated $migrationCount items from OpenClimb to Ascently"
-            )
+            AppLogger.i(TAG) { "🎉 Migration completed! Migrated $migrationCount items from OpenClimb to Ascently" }
        } else {
-            Log.i(TAG, "ℹ️ No OpenClimb data found to migrate")
+            AppLogger.i(TAG) { "ℹ️ No OpenClimb data found to migrate" }
        }
    }

@@ -95,10 +91,7 @@ class MigrationManager(private val context: Context) {
            // Clear old preferences
            oldPrefs.edit { clear() }

-            Log.d(
-                    TAG,
-                    "✅ Migrated preference file: $oldFileName → $newFileName (${oldPrefs.all.size} keys)"
-            )
+            AppLogger.d(TAG) { "Migrated preference file: $oldFileName → $newFileName (${oldPrefs.all.size} keys)" }
            return oldPrefs.all.size
        }

@@ -150,7 +143,7 @@ class MigrationManager(private val context: Context) {
                    }
                }

-                Log.d(TAG, "✅ Migrated ${keysToMigrate.size} keys in $prefFileName")
+                AppLogger.d(TAG) { "Migrated ${keysToMigrate.size} keys in $prefFileName" }
                count += keysToMigrate.size
            }
        }
@@ -166,6 +159,6 @@ class MigrationManager(private val context: Context) {
    /** Reset migration state (for testing purposes) */
    fun resetMigrationState() {
        migrationPrefs.edit { putBoolean(MIGRATION_COMPLETED_KEY, false) }
-        Log.d(TAG, "Migration state reset")
+        AppLogger.d(TAG) { "Migration state reset" }
    }
 }
--- a/android/app/src/main/java/com/atridad/ascently/utils/ZipExportImportUtils.kt
+++ b/android/app/src/main/java/com/atridad/ascently/utils/ZipExportImportUtils.kt
@@ -52,7 +52,8 @@ object ZipExportImportUtils {
                zipOut.closeEntry()

                // Add JSON data file
-                val json = Json {
+                val json =
+                    Json {
                        prettyPrint = true
                        ignoreUnknownKeys = true
                    }
@@ -78,24 +79,21 @@ object ZipExportImportUtils {
                            zipOut.closeEntry()
                            successfulImages++
                        } else {
-                            android.util.Log.w(
-                                    "ZipExportImportUtils",
+                            AppLogger.w("ZipExportImportUtils") {
                                "Image file not found or empty: $imagePath"
-                            )
+                            }
                        }
                    } catch (e: Exception) {
-                        android.util.Log.e(
-                                "ZipExportImportUtils",
+                        AppLogger.e("ZipExportImportUtils", e) {
                            "Failed to add image $imagePath: ${e.message}"
-                        )
+                        }
                    }
                }

                // Log export summary
-                android.util.Log.i(
-                        "ZipExportImportUtils",
+                AppLogger.i("ZipExportImportUtils") {
                    "Export completed: ${successfulImages}/${referencedImagePaths.size} images included"
-                )
+                }
            }

            // Validate the created ZIP file
@@ -131,7 +129,8 @@ object ZipExportImportUtils {
                    zipOut.closeEntry()

                    // Add JSON data file
-                    val json = Json {
+                    val json =
+                        Json {
                            prettyPrint = true
                            ignoreUnknownKeys = true
                        }
@@ -158,17 +157,15 @@ object ZipExportImportUtils {
                                successfulImages++
                            }
                        } catch (e: Exception) {
-                            android.util.Log.e(
-                                    "ZipExportImportUtils",
+                            AppLogger.e("ZipExportImportUtils", e) {
                                "Failed to add image $imagePath: ${e.message}"
-                            )
+                            }
                        }
                    }

-                    android.util.Log.i(
-                            "ZipExportImportUtils",
+                    AppLogger.i("ZipExportImportUtils") {
                        "Export to URI completed: ${successfulImages}/${referencedImagePaths.size} images included"
-                    )
+                    }
                }
            }
                ?: throw IOException("Could not open output stream")
@@ -217,16 +214,17 @@ object ZipExportImportUtils {
                            // Read metadata for validation
                            val metadataContent = zipIn.readBytes().toString(Charsets.UTF_8)
                            foundRequiredFiles.add("metadata")
-                            android.util.Log.i(
-                                    "ZipExportImportUtils",
+                            AppLogger.i("ZipExportImportUtils") {
                                "Found metadata: ${metadataContent.lines().take(3).joinToString()}"
-                            )
                            }
+                        }
+
                        entry.name == DATA_JSON_FILENAME -> {
                            // Read JSON data
                            jsonContent = zipIn.readBytes().toString(Charsets.UTF_8)
                            foundRequiredFiles.add("data")
                        }
+
                        entry.name.startsWith("$IMAGES_DIR_NAME/") && !entry.isDirectory -> {
                            // Extract image file
                            val originalFilename = entry.name.substringAfter("$IMAGES_DIR_NAME/")
@@ -248,37 +246,33 @@ object ZipExportImportUtils {
                                    val newPath = ImageUtils.importImageFile(context, tempFile)
                                    if (newPath != null) {
                                        importedImagePaths[originalFilename] = newPath
-                                        android.util.Log.d(
-                                                "ZipExportImportUtils",
+                                        AppLogger.d("ZipExportImportUtils") {
                                            "Successfully imported image: $originalFilename -> $newPath"
-                                        )
-                                    } else {
-                                        android.util.Log.w(
-                                                "ZipExportImportUtils",
-                                                "Failed to import image: $originalFilename"
-                                        )
                                        }
                                    } else {
-                                    android.util.Log.w(
-                                            "ZipExportImportUtils",
+                                        AppLogger.w("ZipExportImportUtils") {
+                                            "Failed to import image: $originalFilename"
+                                        }
+                                    }
+                                } else {
+                                    AppLogger.w("ZipExportImportUtils") {
                                        "Extracted image is empty: $originalFilename"
-                                    )
+                                    }
                                }

                                // Clean up temp file
                                tempFile.delete()
                            } catch (e: Exception) {
-                                android.util.Log.e(
-                                        "ZipExportImportUtils",
+                                AppLogger.e("ZipExportImportUtils", e) {
                                    "Failed to process image $originalFilename: ${e.message}"
-                                )
                                }
                            }
+                        }
+
                        else -> {
-                            android.util.Log.d(
-                                    "ZipExportImportUtils",
+                            AppLogger.d("ZipExportImportUtils") {
                                "Skipping ZIP entry: ${entry.name}"
-                            )
+                            }
                        }
                    }

@@ -296,10 +290,9 @@ object ZipExportImportUtils {
                throw IOException("Invalid ZIP file: data.json is empty")
            }

-            android.util.Log.i(
-                    "ZipExportImportUtils",
+            AppLogger.i("ZipExportImportUtils") {
                "Import extraction completed: ${importedImagePaths.size} images processed"
-            )
+            }

            return ImportResult(jsonContent, importedImagePaths)
        } catch (e: Exception) {
--- a/docs/package.json
+++ b/docs/package.json
@@ -25,13 +25,13 @@
    "astro": "astro"
  },
  "dependencies": {
-    "@astrojs/node": "^9.5.0",
-    "@astrojs/starlight": "^0.36.1",
-    "astro": "^5.14.6",
+    "@astrojs/node": "^9.5.1",
+    "@astrojs/starlight": "^0.36.2",
+    "astro": "^5.16.0",
    "qrcode": "^1.5.4",
-    "sharp": "^0.34.4"
+    "sharp": "^0.34.5"
  },
  "devDependencies": {
-    "@types/qrcode": "^1.5.5"
+    "@types/qrcode": "^1.5.6"
  }
 }
--- a/docs/pnpm-lock.yaml
+++ b/docs/pnpm-lock.yaml
--- a/ios/Ascently.xcodeproj/LiveActivityManager.swift
+++ b/ios/Ascently.xcodeproj/LiveActivityManager.swift
@@ -25,7 +25,7 @@ final class LiveActivityManager {
                pushType: nil
            )
        } catch {
-            print("Failed to start live activity: \(error)")
+            AppLogger.error("Failed to start live activity: \(error)", tag: "LegacyLiveActivityManager")
        }
    }

--- a/ios/Ascently.xcodeproj/project.pbxproj
+++ b/ios/Ascently.xcodeproj/project.pbxproj
@@ -465,7 +465,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				DRIVERKIT_DEPLOYMENT_TARGET = 24.6;
 				ENABLE_PREVIEWS = YES;
@@ -487,7 +487,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 15.6;
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -513,7 +513,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				DRIVERKIT_DEPLOYMENT_TARGET = 24.6;
 				ENABLE_PREVIEWS = YES;
@@ -535,7 +535,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 15.6;
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -602,7 +602,7 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = SessionStatusLive/Info.plist;
@@ -613,7 +613,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.SessionStatusLive;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -632,7 +632,7 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = SessionStatusLive/Info.plist;
@@ -643,7 +643,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.SessionStatusLive;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
--- a/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate
--- a/ios/Ascently/AppIntents/AscentlyShortcuts.swift
+++ b/ios/Ascently/AppIntents/AscentlyShortcuts.swift
@@ -0,0 +1,33 @@
+import AppIntents
+
+/// Provides a curated list of the most useful Ascently shortcuts for Siri and the Shortcuts app.
+/// Surfaces intents that users can trigger hands-free to manage their climbing sessions.
+struct AscentlyShortcuts: AppShortcutsProvider {
+
+    static var shortcutTileColor: ShortcutTileColor {
+        .teal
+    }
+
+    static var appShortcuts: [AppShortcut] {
+        return [
+            AppShortcut(
+                intent: StartLastGymSessionIntent(),
+                phrases: [
+                    "Start my climb in \(.applicationName)",
+                    "Begin my last gym session in \(.applicationName)",
+                ],
+                shortTitle: "Start Climb",
+                systemImageName: "figure.climbing"
+            ),
+            AppShortcut(
+                intent: EndActiveSessionIntent(),
+                phrases: [
+                    "Finish my climb in \(.applicationName)",
+                    "End my session in \(.applicationName)",
+                ],
+                shortTitle: "End Climb",
+                systemImageName: "flag.checkered"
+            ),
+        ]
+    }
+}
--- a/ios/Ascently/AppIntents/EndActiveSessionIntent.swift
+++ b/ios/Ascently/AppIntents/EndActiveSessionIntent.swift
@@ -0,0 +1,40 @@
+import AppIntents
+import Foundation
+
+/// Ends the currently active climbing session so logging stays in sync across devices.
+/// Exposed to Shortcuts so users can wrap up a session without opening the app.
+struct EndActiveSessionIntent: AppIntent {
+
+    static var title: LocalizedStringResource {
+        "End Active Session"
+    }
+
+    static var description: IntentDescription {
+        IntentDescription(
+            "Stop the active climbing session and save its progress in Ascently."
+        )
+    }
+
+    static var openAppWhenRun: Bool {
+        false
+    }
+
+    func perform() async throws -> some IntentResult & ProvidesDialog {
+        do {
+            let summary = try await SessionIntentController().endActiveSession()
+            let dialog = IntentDialog("Session at \(summary.gymName) ended. Nice work!")
+            return .result(dialog: dialog)
+        } catch SessionIntentError.noActiveSession {
+            // No active session is fine - just return a friendly message
+            let dialog = IntentDialog("No active session to end.")
+            return .result(dialog: dialog)
+        } catch {
+            // Re-throw other errors
+            throw error
+        }
+    }
+
+    static var parameterSummary: some ParameterSummary {
+        Summary("End my current climbing session")
+    }
+}
--- a/ios/Ascently/AppIntents/SessionIntentSupport.swift
+++ b/ios/Ascently/AppIntents/SessionIntentSupport.swift
@@ -0,0 +1,95 @@
+import Foundation
+
+/// User-visible errors that can arise while handling session-related intents.
+enum SessionIntentError: LocalizedError {
+    case noRecentGym
+    case noActiveSession
+    case failedToStartSession
+    case failedToEndSession
+
+    var errorDescription: String? {
+        switch self {
+        case .noRecentGym:
+            return "There's no recent gym to start a session with."
+        case .noActiveSession:
+            return "There isn't an active session to end right now."
+        case .failedToStartSession:
+            return "Ascently couldn't start a new session."
+        case .failedToEndSession:
+            return "Ascently couldn't finish the active session."
+        }
+    }
+}
+
+struct SessionIntentSummary: Sendable {
+    let sessionId: UUID
+    let gymName: String
+    let status: SessionStatus
+}
+
+/// Central controller that exposes the minimal climbing session operations used by App Intents and shortcuts.
+@MainActor
+final class SessionIntentController {
+
+    private let dataManager: ClimbingDataManager
+
+    init(dataManager: ClimbingDataManager = .shared) {
+        self.dataManager = dataManager
+    }
+
+    /// Starts a new session using the most recently visited gym.
+    func startSessionWithLastUsedGym() async throws -> SessionIntentSummary {
+        // Give a moment for data to be ready if app just launched
+        if dataManager.gyms.isEmpty {
+            try? await Task.sleep(nanoseconds: 500_000_000)  // 0.5 seconds
+        }
+
+        guard let lastGym = dataManager.getLastUsedGym() else {
+            logFailure(.noRecentGym, context: "No recorded sessions available")
+            throw SessionIntentError.noRecentGym
+        }
+
+        guard let startedSession = await dataManager.startSessionAsync(gymId: lastGym.id) else {
+            logFailure(.failedToStartSession, context: "Data manager failed to create new session")
+            throw SessionIntentError.failedToStartSession
+        }
+
+        return SessionIntentSummary(
+            sessionId: startedSession.id,
+            gymName: lastGym.name,
+            status: startedSession.status
+        )
+    }
+
+    /// Ends the currently active climbing session, if one exists.
+    func endActiveSession() async throws -> SessionIntentSummary {
+        guard let activeSession = dataManager.activeSession else {
+            logFailure(.noActiveSession, context: "No active session stored in data manager")
+            throw SessionIntentError.noActiveSession
+        }
+
+        guard let completedSession = await dataManager.endSessionAsync(activeSession.id) else {
+            logFailure(
+                .failedToEndSession, context: "Data manager failed to complete active session")
+            throw SessionIntentError.failedToEndSession
+        }
+
+        guard let gym = dataManager.gym(withId: completedSession.gymId) else {
+            logFailure(
+                .failedToEndSession,
+                context: "Gym missing for completed session \(completedSession.id)")
+            throw SessionIntentError.failedToEndSession
+        }
+
+        return SessionIntentSummary(
+            sessionId: completedSession.id,
+            gymName: gym.name,
+            status: completedSession.status
+        )
+    }
+
+    private func logFailure(_ error: SessionIntentError, context: String) {
+        // Logging from intent context - errors are visible to user via dialog
+        print("SessionIntentError: \(error). Context: \(context)")
+    }
+}
--- a/ios/Ascently/AppIntents/StartLastGymSessionIntent.swift
+++ b/ios/Ascently/AppIntents/StartLastGymSessionIntent.swift
@@ -0,0 +1,43 @@
+import AppIntents
+import Foundation
+
+/// Starts a climbing session at the most recently visited gym.
+/// Exposed to Shortcuts so users can begin logging without opening the app.
+struct StartLastGymSessionIntent: AppIntent {
+
+    static var title: LocalizedStringResource {
+        "Start Last Gym Session"
+    }
+
+    static var description: IntentDescription {
+        IntentDescription(
+            "Begin a new climbing session using the most recent gym you visited in Ascently."
+        )
+    }
+
+    static var openAppWhenRun: Bool {
+        true
+    }
+
+    func perform() async throws -> some IntentResult & ProvidesDialog {
+        // Delay to ensure app has time to fully initialize if just launched
+        try? await Task.sleep(nanoseconds: 1_000_000_000)  // 1 second
+
+        let summary = try await SessionIntentController().startSessionWithLastUsedGym()
+
+        // Give Live Activity extra time to start
+        try? await Task.sleep(nanoseconds: 500_000_000)  // 0.5 seconds
+
+        return .result(
+            dialog: Self.successDialog(for: summary.gymName)
+        )
+    }
+
+    private static func successDialog(for gymName: String) -> IntentDialog {
+        IntentDialog("Session started at \(gymName). Have an awesome climb!")
+    }
+
+    static var parameterSummary: some ParameterSummary {
+        Summary("Start a session at my last gym")
+    }
+}
--- a/ios/Ascently/AscentlyApp.swift
+++ b/ios/Ascently/AscentlyApp.swift
@@ -1,7 +1,19 @@
 import SwiftUI

+class AppDelegate: NSObject, UIApplicationDelegate {
+    func application(
+        _ application: UIApplication,
+        didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+    ) -> Bool {
+        return true
+    }
+}
+
@main
 struct AscentlyApp: App {
+    @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
+    @Environment(\.scenePhase) private var scenePhase
+
    var body: some Scene {
        WindowGroup {
            ContentView()
--- a/ios/Ascently/ContentView.swift
+++ b/ios/Ascently/ContentView.swift
@@ -1,7 +1,7 @@
 import SwiftUI

 struct ContentView: View {
-    @StateObject private var dataManager = ClimbingDataManager()
+    @StateObject private var dataManager = ClimbingDataManager.shared
    @State private var selectedTab = 0
    @Environment(\.scenePhase) private var scenePhase
    @State private var notificationObservers: [NSObjectProtocol] = []
@@ -91,11 +91,12 @@ struct ContentView: View {
            object: nil,
            queue: .main
        ) { _ in
-            print("App will enter foreground - preparing Live Activity check")
-            Task {
+            Task { @MainActor in
+                AppLogger.info(
+                    "App will enter foreground - preparing Live Activity check", tag: "Lifecycle")
                // Small delay to ensure app is fully active
                try? await Task.sleep(nanoseconds: 800_000_000)  // 0.8 seconds
-                await dataManager.onAppBecomeActive()
+                dataManager.onAppBecomeActive()
                // Re-verify health integration when returning from background
                await dataManager.healthKitService.verifyAndRestoreIntegration()
            }
@@ -107,10 +108,11 @@ struct ContentView: View {
            object: nil,
            queue: .main
        ) { _ in
-            print("App did become active - checking Live Activity status")
-            Task {
+            Task { @MainActor in
+                AppLogger.info(
+                    "App did become active - checking Live Activity status", tag: "Lifecycle")
                try? await Task.sleep(nanoseconds: 300_000_000)  // 0.3 seconds
-                await dataManager.onAppBecomeActive()
+                dataManager.onAppBecomeActive()
                await dataManager.healthKitService.verifyAndRestoreIntegration()
            }
        }
--- a/ios/Ascently/Info.plist
+++ b/ios/Ascently/Info.plist
@@ -6,6 +6,7 @@
 	<true/>
 	<key>NSSupportsLiveActivities</key>
 	<true/>
+
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>This app needs access to your photo library to add photos to climbing problems.</string>
 	<key>NSCameraUsageDescription</key>
--- a/ios/Ascently/Services/HealthKitService.swift
+++ b/ios/Ascently/Services/HealthKitService.swift
@@ -38,7 +38,7 @@ class HealthKitService: ObservableObject {
        {
            currentWorkoutStartDate = startDate
            currentWorkoutSessionId = sessionId
-            print("HealthKit: Restored active workout from \(startDate)")
+            AppLogger.info("HealthKit: Restored active workout from \(startDate)", tag: "HealthKit")
        }
    }

@@ -56,31 +56,34 @@ class HealthKitService: ObservableObject {
        guard isEnabled else { return }

        guard HKHealthStore.isHealthDataAvailable() else {
-            print("HealthKit: Device does not support HealthKit")
+            AppLogger.warning("HealthKit: Device does not support HealthKit", tag: "HealthKit")
            return
        }

        checkAuthorization()

        if !isAuthorized {
-            print(
-                "HealthKit: Integration was enabled but authorization lost, attempting to restore..."
-            )
+            AppLogger.warning(
+                "HealthKit: Integration was enabled but authorization lost, attempting to restore...",
+                tag: "HealthKit")

            do {
                try await requestAuthorization()
-                print("HealthKit: Authorization restored successfully")
+                AppLogger.info("HealthKit: Authorization restored successfully", tag: "HealthKit")
            } catch {
-                print("HealthKit: Failed to restore authorization: \(error.localizedDescription)")
+                AppLogger.error(
+                    "HealthKit: Failed to restore authorization: \(error.localizedDescription)",
+                    tag: "HealthKit")
            }
        } else {
-            print("HealthKit: Integration verified - authorization is valid")
+            AppLogger.info(
+                "HealthKit: Integration verified - authorization is valid", tag: "HealthKit")
        }

        if hasActiveWorkout() {
-            print(
-                "HealthKit: Active workout restored - started at \(currentWorkoutStartDate!)"
-            )
+            AppLogger.info(
+                "HealthKit: Active workout restored - started at \(currentWorkoutStartDate!)",
+                tag: "HealthKit")
        }
    }

@@ -130,7 +133,7 @@ class HealthKitService: ObservableObject {
        currentWorkoutStartDate = startDate
        currentWorkoutSessionId = sessionId
        persistActiveWorkout()
-        print("HealthKit: Started workout for session \(sessionId)")
+        AppLogger.info("HealthKit: Started workout for session \(sessionId)", tag: "HealthKit")
    }

    func endWorkout(endDate: Date) async throws {
@@ -178,15 +181,17 @@ class HealthKitService: ObservableObject {
            try await builder.endCollection(at: endDate)
            let workout = try await builder.finishWorkout()

-            print(
-                "HealthKit: Workout saved successfully with id: \(workout?.uuid.uuidString ?? "unknown")"
-            )
+            AppLogger.info(
+                "HealthKit: Workout saved successfully with id: \(workout?.uuid.uuidString ?? "unknown")",
+                tag: "HealthKit")

            currentWorkoutStartDate = nil
            currentWorkoutSessionId = nil
            persistActiveWorkout()
        } catch {
-            print("HealthKit: Failed to save workout: \(error.localizedDescription)")
+            AppLogger.error(
+                "HealthKit: Failed to save workout: \(error.localizedDescription)", tag: "HealthKit"
+            )
            currentWorkoutStartDate = nil
            currentWorkoutSessionId = nil
            persistActiveWorkout()
@@ -199,7 +204,7 @@ class HealthKitService: ObservableObject {
        currentWorkoutStartDate = nil
        currentWorkoutSessionId = nil
        persistActiveWorkout()
-        print("HealthKit: Workout cancelled")
+        AppLogger.info("HealthKit: Workout cancelled", tag: "HealthKit")
    }

    func hasActiveWorkout() -> Bool {
--- a/ios/Ascently/Services/SyncService.swift
+++ b/ios/Ascently/Services/SyncService.swift
@@ -12,10 +12,27 @@ class SyncService: ObservableObject {
    @Published var isOfflineMode = false

    private let userDefaults = UserDefaults.standard
+    private let logTag = "SyncService"
    private var syncTask: Task<Void, Never>?
    private var pendingChanges = false
    private let syncDebounceDelay: TimeInterval = 2.0

+    private func logDebug(_ message: @autoclosure () -> String) {
+        AppLogger.debug(message(), tag: logTag)
+    }
+
+    private func logInfo(_ message: @autoclosure () -> String) {
+        AppLogger.info(message(), tag: logTag)
+    }
+
+    private func logWarning(_ message: @autoclosure () -> String) {
+        AppLogger.warning(message(), tag: logTag)
+    }
+
+    private func logError(_ message: @autoclosure () -> String) {
+        AppLogger.error(message(), tag: logTag)
+    }
+
    private enum Keys {
        static let serverURL = "sync_server_url"
        static let authToken = "sync_auth_token"
@@ -201,7 +218,7 @@ class SyncService: ObservableObject {
            return false
        }

-        print(
+        logInfo(
            "iOS DELTA SYNC: Sending gyms=\(modifiedGyms.count), problems=\(modifiedProblems.count), sessions=\(modifiedSessions.count), attempts=\(modifiedAttempts.count), deletions=\(modifiedDeletions.count)"
        )

@@ -244,7 +261,7 @@ class SyncService: ObservableObject {
        let decoder = JSONDecoder()
        let deltaResponse = try decoder.decode(DeltaSyncResponse.self, from: data)

-        print(
+        logInfo(
            "iOS DELTA SYNC: Received gyms=\(deltaResponse.gyms.count), problems=\(deltaResponse.problems.count), sessions=\(deltaResponse.sessions.count), attempts=\(deltaResponse.attempts.count), deletions=\(deltaResponse.deletedItems.count)"
        )

@@ -270,7 +287,7 @@ class SyncService: ObservableObject {
        let allDeletions = dataManager.getDeletedItems() + response.deletedItems
        let uniqueDeletions = Array(Set(allDeletions))

-        print(
+        logInfo(
            "iOS DELTA SYNC: Applying \(uniqueDeletions.count) deletion records before merging data"
        )
        applyDeletionsToDataManager(deletions: uniqueDeletions, dataManager: dataManager)
@@ -298,10 +315,10 @@ class SyncService: ObservableObject {
                    _ = try imageManager.saveImportedImage(imageData, filename: consistentFilename)
                    imagePathMapping[serverFilename] = consistentFilename
                } catch SyncError.imageNotFound {
-                    print("Image not found on server: \(serverFilename)")
+                    logInfo("Image not found on server: \(serverFilename)")
                    continue
                } catch {
-                    print("Failed to download image \(serverFilename): \(error)")
+                    logInfo("Failed to download image \(serverFilename): \(error)")
                    continue
                }
            }
@@ -436,7 +453,7 @@ class SyncService: ObservableObject {
    ) async throws {
        guard !modifiedProblems.isEmpty else { return }

-        print("iOS DELTA SYNC: Syncing images for \(modifiedProblems.count) modified problems")
+        logInfo("iOS DELTA SYNC: Syncing images for \(modifiedProblems.count) modified problems")

        for backupProblem in modifiedProblems {
            guard
@@ -465,9 +482,9 @@ class SyncService: ObservableObject {
                        }

                        try await uploadImage(filename: consistentFilename, imageData: imageData)
-                        print("Uploaded modified problem image: \(consistentFilename)")
+                        logInfo("Uploaded modified problem image: \(consistentFilename)")
                    } catch {
-                        print("Failed to upload image \(consistentFilename): \(error)")
+                        logInfo("Failed to upload image \(consistentFilename): \(error)")
                    }
                }
            }
@@ -549,7 +566,7 @@ class SyncService: ObservableObject {

    func syncWithServer(dataManager: ClimbingDataManager) async throws {
        if isOfflineMode {
-            print("Sync skipped: Offline mode is enabled.")
+            logInfo("Sync skipped: Offline mode is enabled.")
            return
        }

@@ -586,7 +603,7 @@ class SyncService: ObservableObject {

            // If both client and server have been synced before, use delta sync
            if hasLocalData && hasServerData && lastSyncTime != nil {
-                print("iOS SYNC: Using delta sync for incremental updates")
+                logInfo("iOS SYNC: Using delta sync for incremental updates")
                try await performDeltaSync(dataManager: dataManager)

                // Update last sync time
@@ -597,32 +614,32 @@ class SyncService: ObservableObject {

            if !hasLocalData && hasServerData {
                // Case 1: No local data - do full restore from server
-                print("iOS SYNC: Case 1 - No local data, performing full restore from server")
-                print("Syncing images from server first...")
+                logInfo("iOS SYNC: Case 1 - No local data, performing full restore from server")
+                logInfo("Syncing images from server first...")
                let imagePathMapping = try await syncImagesFromServer(
                    backup: serverBackup, dataManager: dataManager)
-                print("Importing data after images...")
+                logInfo("Importing data after images...")
                try importBackupToDataManager(
                    serverBackup, dataManager: dataManager, imagePathMapping: imagePathMapping)
-                print("Full restore completed")
+                logInfo("Full restore completed")
            } else if hasLocalData && !hasServerData {
                // Case 2: No server data - upload local data to server
-                print("iOS SYNC: Case 2 - No server data, uploading local data to server")
+                logInfo("iOS SYNC: Case 2 - No server data, uploading local data to server")
                let currentBackup = createBackupFromDataManager(dataManager)
                _ = try await uploadData(currentBackup)
-                print("Uploading local images to server...")
+                logInfo("Uploading local images to server...")
                try await syncImagesToServer(dataManager: dataManager)
-                print("Initial upload completed")
+                logInfo("Initial upload completed")
            } else if hasLocalData && hasServerData {
                // Case 3: Both have data - use safe merge strategy
-                print("iOS SYNC: Case 3 - Merging local and server data safely")
+                logInfo("iOS SYNC: Case 3 - Merging local and server data safely")
                try await mergeDataSafely(
                    localBackup: localBackup,
                    serverBackup: serverBackup,
                    dataManager: dataManager)
-                print("Safe merge completed")
+                logInfo("Safe merge completed")
            } else {
-                print("No data to sync")
+                logInfo("No data to sync")
            }

            // Update last sync time
@@ -640,7 +657,7 @@ class SyncService: ObservableObject {
        if let date = formatter.date(from: timestamp) {
            return Int64(date.timeIntervalSince1970 * 1000)
        }
-        print("Failed to parse timestamp: \(timestamp), using 0")
+        logInfo("Failed to parse timestamp: \(timestamp), using 0")
        return 0
    }

@@ -666,12 +683,12 @@ class SyncService: ObservableObject {
                        imageData, filename: consistentFilename)

                    imagePathMapping[serverFilename] = consistentFilename
-                    print("Downloaded and mapped image: \(serverFilename) -> \(consistentFilename)")
+                    logInfo("Downloaded and mapped image: \(serverFilename) -> \(consistentFilename)")
                } catch SyncError.imageNotFound {
-                    print("Image not found on server: \(serverFilename)")
+                    logInfo("Image not found on server: \(serverFilename)")
                    continue
                } catch {
-                    print("Failed to download image \(serverFilename): \(error)")
+                    logInfo("Failed to download image \(serverFilename): \(error)")
                    continue
                }
            }
@@ -704,18 +721,18 @@ class SyncService: ObservableObject {
                            ).path
                            do {
                                try FileManager.default.moveItem(atPath: fullPath, toPath: newPath)
-                                print("Renamed local image: \(filename) -> \(consistentFilename)")
+                                logInfo("Renamed local image: \(filename) -> \(consistentFilename)")

                                // Update problem's image path in memory for consistency
                            } catch {
-                                print("Failed to rename local image, using original: \(error)")
+                                logInfo("Failed to rename local image, using original: \(error)")
                            }
                        }

                        try await uploadImage(filename: consistentFilename, imageData: imageData)
-                        print("Successfully uploaded image: \(consistentFilename)")
+                        logInfo("Successfully uploaded image: \(consistentFilename)")
                    } catch {
-                        print("Failed to upload image \(consistentFilename): \(error)")
+                        logInfo("Failed to upload image \(consistentFilename): \(error)")
                        // Continue with other images even if one fails
                    }
                }
@@ -733,7 +750,7 @@ class SyncService: ObservableObject {
            !activeSessionIds.contains($0.sessionId)
        }

-        print(
+        logInfo(
            "iOS SYNC: Excluding \(dataManager.sessions.count - completedSessions.count) active sessions and \(dataManager.attempts.count - completedAttempts.count) active session attempts from sync"
        )

@@ -808,26 +825,26 @@ class SyncService: ObservableObject {
        let allDeletions = localDeletions + serverBackup.deletedItems
        let uniqueDeletions = Array(Set(allDeletions))

-        print("Merging gyms...")
+        logInfo("Merging gyms...")
        let mergedGyms = mergeGyms(
            local: dataManager.gyms,
            server: serverBackup.gyms,
            deletedItems: uniqueDeletions)

-        print("Merging problems...")
+        logInfo("Merging problems...")
        let mergedProblems = try mergeProblems(
            local: dataManager.problems,
            server: serverBackup.problems,
            imagePathMapping: imagePathMapping,
            deletedItems: uniqueDeletions)

-        print("Merging sessions...")
+        logInfo("Merging sessions...")
        let mergedSessions = try mergeSessions(
            local: dataManager.sessions,
            server: serverBackup.sessions,
            deletedItems: uniqueDeletions)

-        print("Merging attempts...")
+        logInfo("Merging attempts...")
        let mergedAttempts = try mergeAttempts(
            local: dataManager.attempts,
            server: serverBackup.attempts,
@@ -887,7 +904,7 @@ class SyncService: ObservableObject {
                    && !allDeletedAttemptIds.contains($0.id.uuidString)
            }

-            print(
+            logInfo(
                "iOS IMPORT: Preserving \(activeSessions.count) active sessions and \(activeAttempts.count) active attempts during import"
            )

@@ -977,7 +994,7 @@ class SyncService: ObservableObject {

            // Restore active sessions and their attempts after import
            for session in activeSessions {
-                print("iOS IMPORT: Restoring active session: \(session.id)")
+                logInfo("iOS IMPORT: Restoring active session: \(session.id)")
                dataManager.sessions.append(session)
                if session.id == dataManager.activeSession?.id {
                    dataManager.activeSession = session
@@ -997,12 +1014,12 @@ class SyncService: ObservableObject {
            dataManager.clearDeletedItems()
            if let data = try? JSONEncoder().encode(backup.deletedItems) {
                UserDefaults.standard.set(data, forKey: "ascently_deleted_items")
-                print("iOS IMPORT: Imported \(backup.deletedItems.count) deletion records")
+                logInfo("iOS IMPORT: Imported \(backup.deletedItems.count) deletion records")
            }

            // Update local data state to match imported data timestamp
            DataStateManager.shared.setLastModified(backup.exportedAt)
-            print("Data state synchronized to imported timestamp: \(backup.exportedAt)")
+            logInfo("Data state synchronized to imported timestamp: \(backup.exportedAt)")

        } catch {
            throw SyncError.importFailed(error)
--- a/ios/Ascently/Utils/AppLogger.swift
+++ b/ios/Ascently/Utils/AppLogger.swift
@@ -0,0 +1,46 @@
+import Foundation
+
+/// Centralized logging utility for the iOS app.
+///
+/// All log output is automatically compiled out in non-debug builds to avoid leaking
+/// sensitive information. Use this instead of calling `print` directly.
+enum AppLogger {
+
+    enum LogLevel: String {
+        case debug = "DEBUG"
+        case info = "INFO"
+        case warning = "WARN"
+        case error = "ERROR"
+    }
+
+    static func debug(_ message: @autoclosure () -> String, tag: String = #fileID) {
+        log(level: .debug, tag: tag, message: message())
+    }
+
+    static func info(_ message: @autoclosure () -> String, tag: String = #fileID) {
+        log(level: .info, tag: tag, message: message())
+    }
+
+    static func warning(_ message: @autoclosure () -> String, tag: String = #fileID) {
+        log(level: .warning, tag: tag, message: message())
+    }
+
+    static func error(_ message: @autoclosure () -> String, tag: String = #fileID) {
+        log(level: .error, tag: tag, message: message())
+    }
+
+    static func log(level: LogLevel, tag: String, message: @autoclosure () -> String) {
+        #if DEBUG
+            let lastPath = (tag as NSString).lastPathComponent
+            let resolvedTag = lastPath.isEmpty ? tag : lastPath
+            Swift.print("[\(level.rawValue)][\(resolvedTag)] \(message())")
+        #endif
+    }
+}
+
+enum LogTag {
+    static let climbingData = "ClimbingData"
+    static let dataManagement = "DataManagementSection"
+    static let exportData = "ExportDataView"
+    static let syncSection = "SyncSection"
+}
--- a/ios/Ascently/Utils/DataStateManager.swift
+++ b/ios/Ascently/Utils/DataStateManager.swift
@@ -18,14 +18,17 @@ class DataStateManager {
    private init() {
        // Initialize with current timestamp if this is the first time
        if !isInitialized() {
-            print("DataStateManager: First time initialization")
+            AppLogger.info("DataStateManager: First time initialization", tag: "DataState")
            // Set initial timestamp to a very old date so server data will be considered newer
            let epochTime = "1970-01-01T00:00:00.000Z"
            userDefaults.set(epochTime, forKey: Keys.lastModified)
            markAsInitialized()
-            print("DataStateManager initialized with epoch timestamp: \(epochTime)")
+            AppLogger.info(
+                "DataStateManager initialized with epoch timestamp: \(epochTime)", tag: "DataState")
        } else {
-            print("DataStateManager: Already initialized, current timestamp: \(getLastModified())")
+            AppLogger.info(
+                "DataStateManager: Already initialized, current timestamp: \(getLastModified())",
+                tag: "DataState")
        }
    }

@@ -34,29 +37,32 @@ class DataStateManager {
    func updateDataState() {
        let now = ISO8601DateFormatter().string(from: Date())
        userDefaults.set(now, forKey: Keys.lastModified)
-        print("iOS Data state updated to: \(now)")
+        AppLogger.info("iOS Data state updated to: \(now)", tag: "DataState")
    }

    func getLastModified() -> String {
        if let storedTimestamp = userDefaults.string(forKey: Keys.lastModified) {
-            print("iOS DataStateManager returning stored timestamp: \(storedTimestamp)")
+            AppLogger.debug(
+                "iOS DataStateManager returning stored timestamp: \(storedTimestamp)",
+                tag: "DataState")
            return storedTimestamp
        }

        let epochTime = "1970-01-01T00:00:00.000Z"
-        print("No data state timestamp found - returning epoch time: \(epochTime)")
+        AppLogger.warning(
+            "No data state timestamp found - returning epoch time: \(epochTime)", tag: "DataState")
        return epochTime
    }

    func setLastModified(_ timestamp: String) {
        userDefaults.set(timestamp, forKey: Keys.lastModified)
-        print("Data state set to: \(timestamp)")
+        AppLogger.info("Data state set to: \(timestamp)", tag: "DataState")
    }

    func reset() {
        userDefaults.removeObject(forKey: Keys.lastModified)
        userDefaults.removeObject(forKey: Keys.initialized)
-        print("Data state reset")
+        AppLogger.info("Data state reset", tag: "DataState")
    }

    private func isInitialized() -> Bool {
--- a/ios/Ascently/Utils/ImageManager.swift
+++ b/ios/Ascently/Utils/ImageManager.swift
@@ -5,6 +5,7 @@ import UIKit

 class ImageManager {
    static let shared = ImageManager()
+    private let logTag = "ImageManager"

    private let thumbnailCache = NSCache<NSString, UIImage>()
    private let fileManager = FileManager.default
@@ -30,7 +31,7 @@ class ImageManager {

        // Final integrity check
        if !validateStorageIntegrity() {
-            print("CRITICAL: Storage integrity compromised - attempting emergency recovery")
+            logError("CRITICAL: Storage integrity compromised - attempting emergency recovery")
            emergencyImageRestore()
        }

@@ -83,7 +84,7 @@ class ImageManager {
            return
        }

-        print("🔄 Migrating images from OpenClimb to Ascently directory...")
+        logInfo("🔄 Migrating images from OpenClimb to Ascently directory...")

        do {
            // Create parent directory if needed
@@ -94,16 +95,16 @@ class ImageManager {

            // Move the entire directory
            try fileManager.moveItem(at: legacyDir, to: appSupportDirectory)
-            print("Successfully migrated image directory from OpenClimb to Ascently")
+            logInfo("Successfully migrated image directory from OpenClimb to Ascently")
        } catch {
-            print("❌ Failed to migrate image directory: \(error)")
+            logError("Failed to migrate image directory: \(error)")
            // If move fails, try to copy instead
            do {
                try fileManager.copyItem(at: legacyDir, to: appSupportDirectory)
-                print("Successfully copied image directory from OpenClimb to Ascently")
+                logInfo("Successfully copied image directory from OpenClimb to Ascently")
                // Don't remove the old directory in case of issues
            } catch {
-                print("❌ Failed to copy image directory: \(error)")
+                logError("Failed to copy image directory: \(error)")
            }
        }
    }
@@ -122,9 +123,9 @@ class ImageManager {
                        attributes: [
                            .protectionKey: FileProtectionType.completeUntilFirstUserAuthentication
                        ])
-                    print("Created directory: \(directory.path)")
+                    logInfo("Created directory: \(directory.path)")
                } catch {
-                    print("ERROR: Failed to create directory \(directory.path): \(error)")
+                    logError("ERROR: Failed to create directory \(directory.path): \(error)")
                }
            }
        }
@@ -141,9 +142,9 @@ class ImageManager {
            var backupURL = backupDirectory
            try imagesURL.setResourceValues(resourceValues)
            try backupURL.setResourceValues(resourceValues)
-            print("Excluded image directories from iCloud backup")
+            logInfo("Excluded image directories from iCloud backup")
        } catch {
-            print("WARNING: Failed to exclude from iCloud backup: \(error)")
+            logWarning("WARNING: Failed to exclude from iCloud backup: \(error)")
        }
    }

@@ -167,11 +168,11 @@ class ImageManager {
    }

    private func performRobustMigration() {
-        print("Starting robust image migration system...")
+        logInfo("Starting robust image migration system...")

        // Check for interrupted migration
        if let incompleteState = loadMigrationState() {
-            print("Detected interrupted migration, resuming...")
+            logInfo("Detected interrupted migration, resuming...")
            resumeMigration(from: incompleteState)
        } else {
            // Start fresh migration
@@ -188,7 +189,7 @@ class ImageManager {
    private func startNewMigration() {
        // First check for images in previous Application Support directories
        if let previousAppSupportImages = findPreviousAppSupportImages() {
-            print("Found images in previous Application Support directory")
+            logInfo("Found images in previous Application Support directory")
            migratePreviousAppSupportImages(from: previousAppSupportImages)
            return
        }
@@ -198,7 +199,7 @@ class ImageManager {
        let hasLegacyImportImages = fileManager.fileExists(atPath: legacyImportImagesDirectory.path)

        guard hasLegacyImages || hasLegacyImportImages else {
-            print("No legacy images to migrate")
+            logInfo("No legacy images to migrate")
            return
        }

@@ -213,7 +214,7 @@ class ImageManager {
                let legacyFiles = try fileManager.contentsOfDirectory(
                    atPath: legacyImagesDirectory.path)
                allLegacyFiles.append(contentsOf: legacyFiles)
-                print("Found \(legacyFiles.count) images in OpenClimbImages")
+                logInfo("Found \(legacyFiles.count) images in OpenClimbImages")
            }

            // Collect files from Documents/images directory
@@ -221,10 +222,10 @@ class ImageManager {
                let importFiles = try fileManager.contentsOfDirectory(
                    atPath: legacyImportImagesDirectory.path)
                allLegacyFiles.append(contentsOf: importFiles)
-                print("Found \(importFiles.count) images in Documents/images")
+                logInfo("Found \(importFiles.count) images in Documents/images")
            }

-            print("Total legacy images to migrate: \(allLegacyFiles.count)")
+            logInfo("Total legacy images to migrate: \(allLegacyFiles.count)")

            let initialState = MigrationState(
                version: MigrationState.currentVersion,
@@ -239,24 +240,24 @@ class ImageManager {
            performMigrationWithCheckpoints(files: allLegacyFiles, currentState: initialState)

        } catch {
-            print("ERROR: Failed to start migration: \(error)")
+            logError("ERROR: Failed to start migration: \(error)")
        }
    }

    private func resumeMigration(from state: MigrationState) {
-        print("Resuming migration from checkpoint...")
-        print("Progress: \(state.completedFiles.count)/\(state.totalFiles)")
+        logInfo("Resuming migration from checkpoint...")
+        logInfo("Progress: \(state.completedFiles.count)/\(state.totalFiles)")

        do {
            let legacyFiles = try fileManager.contentsOfDirectory(
                atPath: legacyImagesDirectory.path)
            let remainingFiles = legacyFiles.filter { !state.completedFiles.contains($0) }

-            print("Resuming with \(remainingFiles.count) remaining files")
+            logInfo("Resuming with \(remainingFiles.count) remaining files")
            performMigrationWithCheckpoints(files: remainingFiles, currentState: state)

        } catch {
-            print("ERROR: Failed to resume migration: \(error)")
+            logError("ERROR: Failed to resume migration: \(error)")
            // Fallback: start fresh
            removeMigrationState()
            startNewMigration()
@@ -323,11 +324,11 @@ class ImageManager {
                    completedFiles.append(fileName)
                    migratedCount += 1

-                    print("Migrated: \(fileName) (\(migratedCount)/\(currentState.totalFiles))")
+                    logInfo("Migrated: \(fileName) (\(migratedCount)/\(currentState.totalFiles))")

                } catch {
                    failedCount += 1
-                    print("ERROR: Failed to migrate \(fileName): \(error)")
+                    logError("ERROR: Failed to migrate \(fileName): \(error)")
                }

                // Save checkpoint every 5 files or if interrupted
@@ -341,7 +342,7 @@ class ImageManager {
                        lastCheckpoint: Date()
                    )
                    saveMigrationState(checkpointState)
-                    print("Checkpoint saved: \(completedFiles.count)/\(currentState.totalFiles)")
+                    logInfo("Checkpoint saved: \(completedFiles.count)/\(currentState.totalFiles)")
                }
            }
        }
@@ -357,7 +358,7 @@ class ImageManager {
        )
        saveMigrationState(finalState)

-        print("Migration complete: \(migratedCount) migrated, \(failedCount) failed")
+        logInfo("Migration complete: \(migratedCount) migrated, \(failedCount) failed")

        // Clean up legacy directory if no failures
        if failedCount == 0 {
@@ -366,7 +367,7 @@ class ImageManager {
    }

    private func verifyMigrationIntegrity() {
-        print("Verifying migration integrity...")
+        logInfo("Verifying migration integrity...")

        var allLegacyFiles = Set<String>()

@@ -384,12 +385,12 @@ class ImageManager {
                allLegacyFiles.formUnion(importFiles)
            }
        } catch {
-            print("ERROR: Failed to read legacy directories: \(error)")
+            logError("ERROR: Failed to read legacy directories: \(error)")
            return
        }

        guard !allLegacyFiles.isEmpty else {
-            print("No legacy directories to verify against")
+            logInfo("No legacy directories to verify against")
            return
        }

@@ -400,10 +401,10 @@ class ImageManager {
            let missingFiles = allLegacyFiles.subtracting(migratedFiles)

            if missingFiles.isEmpty {
-                print("Migration integrity verified - all files present")
+                logInfo("Migration integrity verified - all files present")
                cleanupLegacyDirectory()
            } else {
-                print("WARNING: Missing \(missingFiles.count) files, re-triggering migration")
+                logWarning("WARNING: Missing \(missingFiles.count) files, re-triggering migration")
                // Re-trigger migration for missing files
                performMigrationWithCheckpoints(
                    files: Array(missingFiles),
@@ -417,16 +418,16 @@ class ImageManager {
                    ))
            }
        } catch {
-            print("ERROR: Failed to verify migration integrity: \(error)")
+            logError("ERROR: Failed to verify migration integrity: \(error)")
        }
    }

    private func cleanupLegacyDirectory() {
        do {
            try fileManager.removeItem(at: legacyImagesDirectory)
-            print("Cleaned up legacy directory")
+            logInfo("Cleaned up legacy directory")
        } catch {
-            print("WARNING: Failed to clean up legacy directory: \(error)")
+            logWarning("WARNING: Failed to clean up legacy directory: \(error)")
        }
    }

@@ -446,16 +447,16 @@ class ImageManager {
            let data = try Data(contentsOf: migrationStateURL)
            let state = try JSONDecoder().decode(MigrationState.self, from: data)

-            // Check if state is too old (more than 1 hour)
+            // Check if state is too old
            if Date().timeIntervalSince(state.lastCheckpoint) > 3600 {
-                print("WARNING: Migration state is stale, starting fresh")
+                logWarning("WARNING: Migration state is stale, starting fresh")
                removeMigrationState()
                return nil
            }

            return state.isComplete ? nil : state
        } catch {
-            print("ERROR: Failed to load migration state: \(error)")
+            logError("ERROR: Failed to load migration state: \(error)")
            removeMigrationState()
            return nil
        }
@@ -466,7 +467,7 @@ class ImageManager {
            let data = try JSONEncoder().encode(state)
            try data.write(to: migrationStateURL)
        } catch {
-            print("ERROR: Failed to save migration state: \(error)")
+            logError("ERROR: Failed to save migration state: \(error)")
        }
    }

@@ -482,7 +483,7 @@ class ImageManager {
    private func cleanupMigrationState() {
        try? fileManager.removeItem(at: migrationStateURL)
        try? fileManager.removeItem(at: migrationLockURL)
-        print("Cleaned up migration state files")
+        logInfo("Cleaned up migration state files")
    }

    func saveImageData(_ data: Data, withName name: String? = nil) -> String? {
@@ -497,10 +498,10 @@ class ImageManager {
            // Create backup copy
            try data.write(to: backupPath)

-            print("Saved image with backup: \(fileName)")
+            logInfo("Saved image with backup: \(fileName)")
            return fileName
        } catch {
-            print("ERROR: Failed to save image \(fileName): \(error)")
+            logError("ERROR: Failed to save image \(fileName): \(error)")
            return nil
        }
    }
@@ -520,7 +521,7 @@ class ImageManager {
        if fileManager.fileExists(atPath: backupPath.path),
            let data = try? Data(contentsOf: backupPath)
        {
-            print("Restored image from backup: \(path)")
+            logInfo("Restored image from backup: \(path)")

            // Restore to primary location
            try? data.write(to: URL(fileURLWithPath: primaryPath))
@@ -595,7 +596,7 @@ class ImageManager {
            do {
                try fileManager.removeItem(atPath: primaryPath)
            } catch {
-                print("ERROR: Failed to delete primary image at \(primaryPath): \(error)")
+                logError("ERROR: Failed to delete primary image at \(primaryPath): \(error)")
                success = false
            }
        }
@@ -605,7 +606,7 @@ class ImageManager {
            do {
                try fileManager.removeItem(at: backupPath)
            } catch {
-                print("ERROR: Failed to delete backup image at \(backupPath.path): \(error)")
+                logError("ERROR: Failed to delete backup image at \(backupPath.path): \(error)")
                success = false
            }
        }
@@ -642,7 +643,7 @@ class ImageManager {
    }

    func performMaintenance() {
-        print("Starting image maintenance...")
+        logInfo("Starting image maintenance...")

        syncBackups()
        validateImageIntegrity()
@@ -660,11 +661,11 @@ class ImageManager {
                    let backupPath = backupDirectory.appendingPathComponent(fileName)

                    try? fileManager.copyItem(at: primaryPath, to: backupPath)
-                    print("Created missing backup for: \(fileName)")
+                    logInfo("Created missing backup for: \(fileName)")
                }
            }
        } catch {
-            print("ERROR: Failed to sync backups: \(error)")
+            logError("ERROR: Failed to sync backups: \(error)")
        }
    }

@@ -683,14 +684,14 @@ class ImageManager {
                }
            }

-            print("Validated \(validFiles) of \(files.count) image files")
+            logInfo("Validated \(validFiles) of \(files.count) image files")
        } catch {
-            print("ERROR: Failed to validate images: \(error)")
+            logError("ERROR: Failed to validate images: \(error)")
        }
    }

    private func cleanupOrphanedFiles() {
-        print("Cleanup would require coordination with data manager")
+        logInfo("Cleanup would require coordination with data manager")
    }

    func getStorageInfo() -> (primaryCount: Int, backupCount: Int, totalSize: Int64) {
@@ -718,7 +719,7 @@ class ImageManager {
    private func logDirectoryInfo() {
        let info = getStorageInfo()
        let previousDir = findPreviousAppSupportImages()
-        print(
+        logInfo(
            """
            Ascently Image Storage:
            - App Support: \(appSupportDirectory.path)
@@ -732,7 +733,7 @@ class ImageManager {
    }

    func forceRecoveryMigration() {
-        print("FORCE RECOVERY: Starting manual migration recovery...")
+        logInfo("FORCE RECOVERY: Starting manual migration recovery...")

        // Remove any stale state
        removeMigrationState()
@@ -741,7 +742,7 @@ class ImageManager {
        // Force fresh migration
        startNewMigration()

-        print("FORCE RECOVERY: Migration recovery completed")
+        logInfo("FORCE RECOVERY: Migration recovery completed")
    }

    func saveImportedImage(_ imageData: Data, filename: String) throws -> String {
@@ -754,12 +755,12 @@ class ImageManager {
        // Create backup
        try? imageData.write(to: backupPath)

-        print("Imported image: \(filename)")
+        logInfo("Imported image: \(filename)")
        return filename
    }

    func emergencyImageRestore() {
-        print("EMERGENCY: Attempting image restoration...")
+        logError("EMERGENCY: Attempting image restoration...")

        // Try to restore from backup directory
        do {
@@ -777,14 +778,14 @@ class ImageManager {
                }
            }

-            print("EMERGENCY: Restored \(restoredCount) images from backup")
+            logError("EMERGENCY: Restored \(restoredCount) images from backup")
        } catch {
-            print("EMERGENCY: Failed to restore from backup: \(error)")
+            logError("EMERGENCY: Failed to restore from backup: \(error)")
        }

        // Try previous Application Support directories first
        if let previousAppSupportImages = findPreviousAppSupportImages() {
-            print("EMERGENCY: Found previous Application Support images, migrating...")
+            logError("EMERGENCY: Found previous Application Support images, migrating...")
            migratePreviousAppSupportImages(from: previousAppSupportImages)
            return
        }
@@ -793,23 +794,21 @@ class ImageManager {
        if fileManager.fileExists(atPath: legacyImagesDirectory.path)
            || fileManager.fileExists(atPath: legacyImportImagesDirectory.path)
        {
-            print("EMERGENCY: Attempting legacy migration as fallback...")
+            logError("EMERGENCY: Attempting legacy migration as fallback...")
            forceRecoveryMigration()
        }
    }

    func debugSafeInitialization() -> Bool {
-        print("DEBUG SAFE: Performing debug-safe initialization check...")
+        logDebug("DEBUG SAFE: Performing debug-safe initialization check...")

        // Check if we're in a debug environment
        #if DEBUG
-            print("DEBUG SAFE: Debug environment detected")
+            logDebug("DEBUG SAFE: Debug environment detected")

-            // Check for interrupted migration more aggressively
            if fileManager.fileExists(atPath: migrationLockURL.path) {
-                print("DEBUG SAFE: Found migration lock - likely debug interruption")
+                logDebug("DEBUG SAFE: Found migration lock - likely debug interruption")

-                // Give extra time for file system to stabilize
                Thread.sleep(forTimeInterval: 1.0)

                // Try emergency recovery
@@ -829,14 +828,14 @@ class ImageManager {
            ((try? fileManager.contentsOfDirectory(atPath: backupDirectory.path)) ?? []).count > 0

        if primaryEmpty && backupHasFiles {
-            print("DEBUG SAFE: Primary empty but backup exists - restoring")
+            logDebug("DEBUG SAFE: Primary empty but backup exists - restoring")
            emergencyImageRestore()
            return true
        }

        // Check if primary storage is empty but previous Application Support images exist
        if primaryEmpty, let previousAppSupportImages = findPreviousAppSupportImages() {
-            print("DEBUG SAFE: Primary empty but found previous Application Support images")
+            logDebug("DEBUG SAFE: Primary empty but found previous Application Support images")
            migratePreviousAppSupportImages(from: previousAppSupportImages)
            return true
        }
@@ -852,7 +851,7 @@ class ImageManager {

        // Check if we have more backups than primary files (sign of corruption)
        if backupFiles.count > primaryFiles.count + 5 {
-            print(
+            logInfo(
                "WARNING INTEGRITY: Backup count significantly exceeds primary - potential corruption"
            )
            return false
@@ -860,7 +859,7 @@ class ImageManager {

        // Check if primary is completely empty but we have data elsewhere
        if primaryFiles.isEmpty && !backupFiles.isEmpty {
-            print("WARNING INTEGRITY: Primary storage empty but backups exist")
+            logWarning("WARNING INTEGRITY: Primary storage empty but backups exist")
            return false
        }

@@ -874,7 +873,7 @@ class ImageManager {
                for: .applicationSupportDirectory, in: .userDomainMask
            ).first
        else {
-            print("ERROR: Could not access Application Support directory")
+            logError("ERROR: Could not access Application Support directory")
            return nil
        }

@@ -908,13 +907,13 @@ class ImageManager {
                }
            }
        } catch {
-            print("ERROR: Error scanning for previous Application Support directories: \(error)")
+            logError("ERROR: Error scanning for previous Application Support directories: \(error)")
        }
        return nil
    }

    private func migratePreviousAppSupportImages(from sourceDirectory: URL) {
-        print("Migrating images from previous Application Support directory")
+        logInfo("Migrating images from previous Application Support directory")

        do {
            let imageFiles = try fileManager.contentsOfDirectory(atPath: sourceDirectory.path)
@@ -937,18 +936,33 @@ class ImageManager {
                        // Create backup
                        try? fileManager.copyItem(at: sourcePath, to: backupPath)

-                        print("Migrated: \(fileName)")
+                        logInfo("Migrated: \(fileName)")
                    } catch {
-                        print("ERROR: Failed to migrate \(fileName): \(error)")
+                        logError("ERROR: Failed to migrate \(fileName): \(error)")
                    }
                }
            }

-            print("Completed migration from previous Application Support directory")
+            logInfo("Completed migration from previous Application Support directory")

        } catch {
-            print("ERROR: Failed to migrate from previous Application Support: \(error)")
+            logError("ERROR: Failed to migrate from previous Application Support: \(error)")
        }
    }

+    private func logInfo(_ message: String) {
+        AppLogger.info(message, tag: logTag)
+    }
+
+    private func logWarning(_ message: String) {
+        AppLogger.warning(message, tag: logTag)
+    }
+
+    private func logError(_ message: String) {
+        AppLogger.error(message, tag: logTag)
+    }
+
+    private func logDebug(_ message: String) {
+        AppLogger.debug(message, tag: logTag)
+    }
 }
--- a/ios/Ascently/Utils/ZipUtils.swift
+++ b/ios/Ascently/Utils/ZipUtils.swift
@@ -4,6 +4,8 @@ import zlib

 struct ZipUtils {

+    private static let logTag = "ZipUtils"
+
    private static let DATA_JSON_FILENAME = "data.json"
    private static let IMAGES_DIR_NAME = "images"
    private static let METADATA_FILENAME = "metadata.txt"
@@ -49,7 +51,7 @@ struct ZipUtils {
        )

        // Process images in batches for better performance
-        print("Processing \(referencedImagePaths.count) images for export")
+        logInfo("Processing \(referencedImagePaths.count) images for export")
        var successfulImages = 0
        let batchSize = 10
        let sortedPaths = Array(referencedImagePaths).sorted()
@@ -59,7 +61,7 @@ struct ZipUtils {

        for (index, imagePath) in sortedPaths.enumerated() {
            if index % batchSize == 0 {
-                print("Processing images \(index)/\(sortedPaths.count)")
+                logInfo("Processing images \(index)/\(sortedPaths.count)")
            }

            let imageURL = URL(fileURLWithPath: imagePath)
@@ -83,11 +85,11 @@ struct ZipUtils {
                    successfulImages += 1
                }
            } catch {
-                print("Failed to read image: \(imageName)")
+                logWarning("Failed to read image: \(imageName)")
            }
        }

-        print("Export: included \(successfulImages)/\(referencedImagePaths.count) images")
+        logInfo("Export: included \(successfulImages)/\(referencedImagePaths.count) images")

        // Build central directory
        centralDirectory.reserveCapacity(fileEntries.count * 100)  // Estimate 100 bytes per entry
@@ -114,7 +116,7 @@ struct ZipUtils {
    }

    static func extractImportZip(data: Data) throws -> ImportResult {
-        print("Starting ZIP extraction - data size: \(data.count) bytes")
+        logInfo("Starting ZIP extraction - data size: \(data.count) bytes")

        return try extractUsingCustomParser(data: data)
    }
@@ -127,10 +129,10 @@ struct ZipUtils {
        let zipEntries: [ZipEntry]
        do {
            zipEntries = try parseZipFile(data: data)
-            print("Successfully parsed ZIP file with \(zipEntries.count) entries")
+            logInfo("Successfully parsed ZIP file with \(zipEntries.count) entries")
        } catch {
-            print("Failed to parse ZIP file: \(error)")
-            print(
+            logError("Failed to parse ZIP file: \(error)")
+            logError(
                "ZIP data header: \(data.prefix(20).map { String(format: "%02X", $0) }.joined(separator: " "))"
            )
            throw NSError(
@@ -142,24 +144,24 @@ struct ZipUtils {
            )
        }

-        print("Found \(zipEntries.count) entries in ZIP file:")
+        logInfo("Found \(zipEntries.count) entries in ZIP file:")
        for entry in zipEntries {
-            print("  - \(entry.filename) (size: \(entry.data.count) bytes)")
+            logInfo("  - \(entry.filename) (size: \(entry.data.count) bytes)")
        }

        for entry in zipEntries {
            switch entry.filename {
            case METADATA_FILENAME:
                metadataContent = String(data: entry.data, encoding: .utf8) ?? ""
-                print("Found metadata: \(metadataContent.prefix(100))...")
+                logInfo("Found metadata: \(metadataContent.prefix(100))...")

            case DATA_JSON_FILENAME:
                jsonContent = String(data: entry.data, encoding: .utf8) ?? ""
-                print("Found data.json with \(jsonContent.count) characters")
+                logInfo("Found data.json with \(jsonContent.count) characters")
                if jsonContent.isEmpty {
-                    print("WARNING: data.json is empty!")
+                    logWarning("WARNING: data.json is empty!")
                } else {
-                    print("data.json preview: \(jsonContent.prefix(200))...")
+                    logInfo("data.json preview: \(jsonContent.prefix(200))...")
                }

            default:
@@ -173,17 +175,17 @@ struct ZipUtils {
                            entry.data, filename: originalFilename)
                        importedImagePaths[originalFilename] = filename
                    } catch {
-                        print("Failed to import image \(originalFilename): \(error)")
+                        logError("Failed to import image \(originalFilename): \(error)")
                    }
                }
            }
        }

        guard !jsonContent.isEmpty else {
-            print("ERROR: data.json not found or empty")
-            print("Available files in ZIP:")
+            logError("ERROR: data.json not found or empty")
+            logInfo("Available files in ZIP:")
            for entry in zipEntries {
-                print("  - \(entry.filename)")
+                logInfo("  - \(entry.filename)")
            }
            throw NSError(
                domain: "ImportError", code: 1,
@@ -194,13 +196,25 @@ struct ZipUtils {
            )
        }

-        print("Import extraction completed: \(importedImagePaths.count) images processed")
+        logInfo("Import extraction completed: \(importedImagePaths.count) images processed")

        return ImportResult(
            jsonData: jsonContent.data(using: .utf8) ?? Data(), imagePathMapping: importedImagePaths
        )
    }

+    private static func logInfo(_ message: String) {
+        AppLogger.info(message, tag: logTag)
+    }
+
+    private static func logWarning(_ message: String) {
+        AppLogger.warning(message, tag: logTag)
+    }
+
+    private static func logError(_ message: String) {
+        AppLogger.error(message, tag: logTag)
+    }
+
    private static func createMetadata(
        exportData: ClimbDataBackup,
        referencedImagePaths: Set<String>
--- a/ios/Ascently/ViewModels/ClimbingDataManager.swift
+++ b/ios/Ascently/ViewModels/ClimbingDataManager.swift
@@ -15,6 +15,8 @@ import UniformTypeIdentifiers
@MainActor
 class ClimbingDataManager: ObservableObject {

+    static let shared = ClimbingDataManager()
+
    @Published var gyms: [Gym] = []
    @Published var problems: [Problem] = []
    @Published var sessions: [ClimbSession] = []
@@ -38,7 +40,6 @@ class ClimbingDataManager: ObservableObject {
    let healthKitService = HealthKitService.shared

    @Published var isSyncing = false
-
    private enum Keys {
        static let gyms = "ascently_gyms"
        static let problems = "ascently_problems"
@@ -79,7 +80,7 @@ class ClimbingDataManager: ObservableObject {
        let name: String
    }

-    init() {
+    fileprivate init() {
        _ = ImageManager.shared
        migrateFromOpenClimbIfNeeded()
        loadAllData()
@@ -115,7 +116,8 @@ class ClimbingDataManager: ObservableObject {
            return
        }

-        print("Starting migration from OpenClimb to Ascently keys...")
+        AppLogger.info(
+            "Starting migration from OpenClimb to Ascently keys...", tag: LogTag.climbingData)
        var migrationCount = 0

        // Migrate each data type if it exists in old format but not in new format
@@ -135,7 +137,7 @@ class ClimbingDataManager: ObservableObject {
                userDefaults.set(oldData, forKey: newKey)
                userDefaults.removeObject(forKey: oldKey)
                migrationCount += 1
-                print("✅ Migrated: \(oldKey) → \(newKey)")
+                AppLogger.info("Migrated: \(oldKey) → \(newKey)", tag: LogTag.climbingData)
            }
        }

@@ -147,7 +149,8 @@ class ClimbingDataManager: ObservableObject {
                {
                    sharedDefaults.set(oldData, forKey: newKey)
                    sharedDefaults.removeObject(forKey: oldKey)
-                    print("✅ Migrated shared: \(oldKey) → \(newKey)")
+                    AppLogger.info(
+                        "Migrated shared: \(oldKey) → \(newKey)", tag: LogTag.climbingData)
                }
            }
        }
@@ -161,18 +164,19 @@ class ClimbingDataManager: ObservableObject {
            userDefaults.set(lastModified, forKey: newDataStateKey)
            userDefaults.removeObject(forKey: legacyDataStateKey)
            migrationCount += 1
-            print("✅ Migrated data state timestamp")
+            AppLogger.info("Migrated data state timestamp", tag: LogTag.climbingData)
        }

        // Mark migration as completed
        userDefaults.set(true, forKey: migrationKey)

        if migrationCount > 0 {
-            print(
-                "Migration completed! Migrated \(migrationCount) data items from OpenClimb to Ascently"
+            AppLogger.info(
+                "Migration completed! Migrated \(migrationCount) data items from OpenClimb to Ascently",
+                tag: LogTag.climbingData
            )
        } else {
-            print("No OpenClimb data found to migrate")
+            AppLogger.info("No OpenClimb data found to migrate", tag: LogTag.climbingData)
        }
    }

@@ -413,9 +417,16 @@ class ClimbingDataManager: ObservableObject {
    }

    func startSession(gymId: UUID, notes: String? = nil) {
-        // End any currently active session
+        Task { @MainActor in
+            await startSessionAsync(gymId: gymId, notes: notes)
+        }
+    }
+
+    @discardableResult
+    func startSessionAsync(gymId: UUID, notes: String? = nil) async -> ClimbSession? {
+        // End any currently active session before starting a new one
        if let currentActive = activeSession {
-            endSession(currentActive.id)
+            await endSessionAsync(currentActive.id)
        }

        let newSession = ClimbSession(gymId: gymId, notes: notes)
@@ -428,29 +439,40 @@ class ClimbingDataManager: ObservableObject {

        // MARK: - Start Live Activity for new session
        if let gym = gym(withId: gymId) {
-            Task {
            await LiveActivityManager.shared.startLiveActivity(
-                    for: newSession, gymName: gym.name)
-            }
+                for: newSession,
+                gymName: gym.name)
        }

        if healthKitService.isEnabled {
-            Task {
            do {
                try await healthKitService.startWorkout(
                    startDate: newSession.startTime ?? Date(),
                    sessionId: newSession.id)
            } catch {
-                    print("Failed to start HealthKit workout: \(error.localizedDescription)")
-                }
-            }
+                AppLogger.error(
+                    "Failed to start HealthKit workout: \(error.localizedDescription)",
+                    tag: LogTag.climbingData)
            }
        }

+        return newSession
+    }
+
    func endSession(_ sessionId: UUID) {
-        if let session = sessions.first(where: { $0.id == sessionId && $0.status == .active }),
+        Task { @MainActor in
+            await endSessionAsync(sessionId)
+        }
+    }
+
+    @discardableResult
+    func endSessionAsync(_ sessionId: UUID) async -> ClimbSession? {
+        guard
+            let session = sessions.first(where: { $0.id == sessionId && $0.status == .active }),
            let index = sessions.firstIndex(where: { $0.id == sessionId })
-        {
+        else {
+            return nil
+        }

        let completedSession = session.completed()
        sessions[index] = completedSession
@@ -467,21 +489,20 @@ class ClimbingDataManager: ObservableObject {
        syncService.triggerAutoSync(dataManager: self)

        // MARK: - End Live Activity after session ends
-            Task {
        await LiveActivityManager.shared.endLiveActivity()
-            }

        if healthKitService.isEnabled {
-                Task {
            do {
                try await healthKitService.endWorkout(
                    endDate: completedSession.endTime ?? Date())
            } catch {
-                        print("Failed to end HealthKit workout: \(error.localizedDescription)")
-                    }
-                }
+                AppLogger.error(
+                    "Failed to end HealthKit workout: \(error.localizedDescription)",
+                    tag: LogTag.climbingData)
            }
        }
+
+        return completedSession
    }

    func updateSession(_ session: ClimbSession) {
@@ -667,7 +688,9 @@ class ClimbingDataManager: ObservableObject {
        }

        if !orphanedAttempts.isEmpty {
-            print("🧹 Cleaning up \(orphanedAttempts.count) orphaned attempts")
+            AppLogger.info(
+                "🧹 Cleaning up \(orphanedAttempts.count) orphaned attempts",
+                tag: LogTag.climbingData)

            // Track these as deleted to prevent sync from re-introducing them
            for attempt in orphanedAttempts {
@@ -693,14 +716,15 @@ class ClimbingDataManager: ObservableObject {

            if seenAttempts.contains(key) {
                duplicateIds.append(attempt.id)
-                print("🧹 Found duplicate attempt: \(attempt.id)")
+                AppLogger.info("🧹 Found duplicate attempt: \(attempt.id)", tag: LogTag.climbingData)
            } else {
                seenAttempts.insert(key)
            }
        }

        if !duplicateIds.isEmpty {
-            print("🧹 Removing \(duplicateIds.count) duplicate attempts")
+            AppLogger.info(
+                "🧹 Removing \(duplicateIds.count) duplicate attempts", tag: LogTag.climbingData)

            // Track duplicates as deleted
            for attemptId in duplicateIds {
@@ -714,8 +738,9 @@ class ClimbingDataManager: ObservableObject {
        if initialAttemptCount != attempts.count {
            saveAttempts()
            let removedCount = initialAttemptCount - attempts.count
-            print(
-                "Cleanup complete. Removed \(removedCount) attempts. Remaining: \(attempts.count)"
+            AppLogger.info(
+                "Cleanup complete. Removed \(removedCount) attempts. Remaining: \(attempts.count)",
+                tag: LogTag.climbingData
            )
        }

@@ -725,7 +750,9 @@ class ClimbingDataManager: ObservableObject {
        }

        if !orphanedProblems.isEmpty {
-            print("🧹 Cleaning up \(orphanedProblems.count) orphaned problems")
+            AppLogger.info(
+                "🧹 Cleaning up \(orphanedProblems.count) orphaned problems",
+                tag: LogTag.climbingData)

            for problem in orphanedProblems {
                trackDeletion(itemId: problem.id.uuidString, itemType: "problem")
@@ -744,7 +771,9 @@ class ClimbingDataManager: ObservableObject {
        }

        if !orphanedSessions.isEmpty {
-            print("🧹 Cleaning up \(orphanedSessions.count) orphaned sessions")
+            AppLogger.info(
+                "🧹 Cleaning up \(orphanedSessions.count) orphaned sessions",
+                tag: LogTag.climbingData)

            for session in orphanedSessions {
                trackDeletion(itemId: session.id.uuidString, itemType: "session")
@@ -844,19 +873,29 @@ class ClimbingDataManager: ObservableObject {
            let problemsForImages = problems

            // Move heavy I/O operations to background thread
+            let logTag = LogTag.climbingData
            let zipData = try await Task.detached(priority: .userInitiated) {
                // Collect actual image paths from disk for the ZIP
-                let referencedImagePaths = await Self.collectReferencedImagePathsStatic(
+                let imageSummary = Self.collectReferencedImagePathsStatic(
                    problems: problemsForImages,
                    imagesDirectory: imagesDirectory)
-                print("Starting export with \(referencedImagePaths.count) images")
+                let referencedImagePaths = imageSummary.paths
+
+                await MainActor.run {
+                    AppLogger.info(
+                        "Starting export with \(referencedImagePaths.count) images (\(imageSummary.missingCount) missing)",
+                        tag: logTag)
+                }

                let zipData = try await ZipUtils.createExportZip(
                    exportData: exportData,
                    referencedImagePaths: referencedImagePaths
                )

-                print("Export completed successfully")
+                await MainActor.run {
+                    AppLogger.info("Export completed successfully", tag: logTag)
+                }
+
                return (zipData, referencedImagePaths.count)
            }.value

@@ -865,7 +904,7 @@ class ClimbingDataManager: ObservableObject {
            return zipData.0
        } catch {
            let errorMessage = "Export failed: \(error.localizedDescription)"
-            print("ERROR: \(errorMessage)")
+            AppLogger.error("ERROR: \(errorMessage)", tag: LogTag.climbingData)
            setError(errorMessage)
            return nil
        }
@@ -894,16 +933,24 @@ class ClimbingDataManager: ObservableObject {
                return Date()
            }

-            print("Raw JSON content preview:")
-            print(String(decoding: importResult.jsonData.prefix(500), as: UTF8.self) + "...")
+            AppLogger.debug("Raw JSON content preview:", tag: LogTag.climbingData)
+            AppLogger.debug(
+                String(decoding: importResult.jsonData.prefix(500), as: UTF8.self) + "...",
+                tag: LogTag.climbingData
+            )

            let importData = try decoder.decode(ClimbDataBackup.self, from: importResult.jsonData)

-            print("Successfully decoded import data:")
-            print("- Gyms: \(importData.gyms.count)")
-            print("- Problems: \(importData.problems.count)")
-            print("- Sessions: \(importData.sessions.count)")
-            print("- Attempts: \(importData.attempts.count)")
+            AppLogger.info(
+                """
+                Successfully decoded import data:
+                - Gyms: \(importData.gyms.count)
+                - Problems: \(importData.problems.count)
+                - Sessions: \(importData.sessions.count)
+                - Attempts: \(importData.attempts.count)
+                """,
+                tag: LogTag.climbingData
+            )

            try validateImportData(importData)

@@ -960,14 +1007,20 @@ class ClimbingDataManager: ObservableObject {
 extension ClimbingDataManager {
    private func collectReferencedImagePaths() -> Set<String> {
        let imagesDirectory = ImageManager.shared.imagesDirectory.path
-        return Self.collectReferencedImagePathsStatic(
+        let result = Self.collectReferencedImagePathsStatic(
            problems: problems,
            imagesDirectory: imagesDirectory)
+
+        AppLogger.info(
+            "Export: Collected \(result.paths.count) images (\(result.missingCount) missing)",
+            tag: LogTag.climbingData)
+
+        return result.paths
    }

-    private static func collectReferencedImagePathsStatic(
+    nonisolated private static func collectReferencedImagePathsStatic(
        problems: [Problem], imagesDirectory: String
-    ) -> Set<String> {
+    ) -> (paths: Set<String>, missingCount: Int) {
        var imagePaths = Set<String>()
        var missingCount = 0

@@ -988,8 +1041,7 @@ extension ClimbingDataManager {
            }
        }

-        print("Export: Collected \(imagePaths.count) images (\(missingCount) missing)")
-        return imagePaths
+        return (imagePaths, missingCount)
    }

    private func updateProblemImagePaths(
@@ -1030,11 +1082,14 @@ extension ClimbingDataManager {
                            }

                            deterministicImagePaths.append(deterministicName)
-                            print("Renamed imported image: \(tempFileName) → \(deterministicName)")
+                            AppLogger.debug(
+                                "Renamed imported image: \(tempFileName) → \(deterministicName)",
+                                tag: LogTag.climbingData)
                        }
                    } catch {
-                        print(
-                            "Failed to rename imported image \(tempFileName) to \(deterministicName): \(error)"
+                        AppLogger.error(
+                            "Failed to rename imported image \(tempFileName) to \(deterministicName): \(error)",
+                            tag: LogTag.climbingData
                        )
                        deterministicImagePaths.append(tempFileName)
                    }
@@ -1078,7 +1133,8 @@ extension ClimbingDataManager {
        if needsUpdate {
            problems = updatedProblems
            saveProblems()
-            print("Migrated image paths for \(problems.count) problems")
+            AppLogger.info(
+                "Migrated image paths for \(problems.count) problems", tag: LogTag.climbingData)
        }
    }

@@ -1089,8 +1145,9 @@ extension ClimbingDataManager {

            // Log storage information for debugging
            let info = await ImageManager.shared.getStorageInfo()
-            print(
-                "Image Storage: \(info.primaryCount) primary, \(info.backupCount) backup, \(info.totalSize / 1024)KB total"
+            await AppLogger.debug(
+                "Image Storage: \(info.primaryCount) primary, \(info.backupCount) backup, \(info.totalSize / 1024)KB total",
+                tag: LogTag.climbingData
            )
        }.value
    }
@@ -1128,7 +1185,9 @@ extension ClimbingDataManager {
            }

            if !orphanedFiles.isEmpty {
-                print("Cleaned up \(orphanedFiles.count) orphaned image files")
+                AppLogger.info(
+                    "Cleaned up \(orphanedFiles.count) orphaned image files",
+                    tag: LogTag.climbingData)
            }
        }
    }
@@ -1145,7 +1204,7 @@ extension ClimbingDataManager {
    }

    func forceImageRecovery() {
-        print("User initiated force image recovery")
+        AppLogger.info("User initiated force image recovery", tag: LogTag.climbingData)
        ImageManager.shared.forceRecoveryMigration()

        // Refresh the UI after recovery
@@ -1153,7 +1212,7 @@ extension ClimbingDataManager {
    }

    func emergencyImageRestore() {
-        print("User initiated emergency image restore")
+        AppLogger.info("User initiated emergency image restore", tag: LogTag.climbingData)
        ImageManager.shared.emergencyImageRestore()

        // Refresh the UI after restore
@@ -1179,15 +1238,15 @@ extension ClimbingDataManager {
    }

    func testLiveActivity() {
-        print("🧪 Testing Live Activity functionality...")
+        AppLogger.info("Testing Live Activity functionality...", tag: LogTag.climbingData)

        // Check Live Activity availability
        let status = LiveActivityManager.shared.checkLiveActivityAvailability()
-        print(status)
+        AppLogger.info(status, tag: LogTag.climbingData)

        // Test with dummy data if we have a gym
        guard let testGym = gyms.first else {
-            print("ERROR: No gyms available for testing")
+            AppLogger.error("No gyms available for testing", tag: LogTag.climbingData)
            return
        }

@@ -1218,15 +1277,18 @@ extension ClimbingDataManager {

        // Only restart if session is actually active
        guard activeSession.status == .active else {
-            print(
-                "WARNING: Session exists but is not active (status: \(activeSession.status)), ending Live Activity"
+            AppLogger.warning(
+                "Session exists but is not active (status: \(activeSession.status)), ending Live Activity",
+                tag: LogTag.climbingData
            )
            await LiveActivityManager.shared.endLiveActivity()
            return
        }

        if let gym = gym(withId: activeSession.gymId) {
-            print("Checking Live Activity for active session at \(gym.name)")
+            AppLogger.info(
+                "Checking Live Activity for active session at \(gym.name)", tag: LogTag.climbingData
+            )

            // First cleanup any dismissed activities
            await LiveActivityManager.shared.cleanupDismissedActivities()
@@ -1241,7 +1303,9 @@ extension ClimbingDataManager {

    /// Call this when app becomes active to check for Live Activity restart
    func onAppBecomeActive() {
-        print("App became active - checking Live Activity status")
+        let logTag = "ClimbingData"
+        AppLogger.info(
+            "App became active - checking Live Activity status", tag: logTag)
        Task {
            await checkAndRestartLiveActivity()
        }
@@ -1249,35 +1313,46 @@ extension ClimbingDataManager {

    /// Call this when app enters background to update Live Activity
    func onAppEnterBackground() {
-        print("App entering background - updating Live Activity if needed")
+        let logTag = "ClimbingData"
+        AppLogger.info(
+            "App entering background - updating Live Activity if needed", tag: logTag)
        Task {
            await updateLiveActivityData()
        }
    }

    /// Setup notifications for Live Activity events
-    private func setupLiveActivityNotifications() {
+    nonisolated private func setupLiveActivityNotifications() {
+        let notificationName = Notification.Name("liveActivityDismissed")
+        let logTag = "ClimbingData"
+
        liveActivityObserver = NotificationCenter.default.addObserver(
-            forName: .liveActivityDismissed,
+            forName: notificationName,
            object: nil,
            queue: .main
        ) { [weak self] _ in
-            print("🔔 Received Live Activity dismissed notification - attempting restart")
            Task { @MainActor in
+                AppLogger.info(
+                    "Received Live Activity dismissed notification - attempting restart",
+                    tag: logTag)
                await self?.handleLiveActivityDismissed()
            }
        }
    }

-    private func setupMigrationNotifications() {
+    nonisolated private func setupMigrationNotifications() {
+        let logTag = "ClimbingData"
+
        migrationObserver = NotificationCenter.default.addObserver(
            forName: NSNotification.Name("ImageMigrationCompleted"),
            object: nil,
            queue: .main
        ) { [weak self] notification in
            if let updateCount = notification.userInfo?["updateCount"] as? Int {
-                print("🔔 Image migration completed with \(updateCount) updates - reloading data")
                Task { @MainActor in
+                    AppLogger.info(
+                        "Image migration completed with \(updateCount) updates - reloading data",
+                        tag: logTag)
                    self?.loadProblems()
                }
            }
@@ -1293,7 +1368,9 @@ extension ClimbingDataManager {
            return
        }

-        print("Attempting to restart dismissed Live Activity for \(gym.name)")
+        AppLogger.info(
+            "Attempting to restart dismissed Live Activity for \(gym.name)",
+            tag: LogTag.climbingData)

        // Wait a bit before restarting to avoid frequency limits
        try? await Task.sleep(nanoseconds: 2_000_000_000)  // 2 seconds
@@ -1333,11 +1410,20 @@ extension ClimbingDataManager {
            activeSession.status == .active,
            let gym = gym(withId: activeSession.gymId)
        else {
-            print("WARNING: Live Activity update skipped - no active session or gym")
+            AppLogger.warning(
+                "Live Activity update skipped - no active session or gym",
+                tag: LogTag.climbingData
+            )
            if let session = activeSession {
-                print("  Session ID: \(session.id)")
-                print("  Session Status: \(session.status)")
-                print("  Gym ID: \(session.gymId)")
+                AppLogger.debug(
+                    """
+                    Skipped session details:
+                      Session ID: \(session.id)
+                      Session Status: \(session.status)
+                      Gym ID: \(session.gymId)
+                    """,
+                    tag: LogTag.climbingData
+                )
            }
            return
        }
@@ -1357,14 +1443,17 @@ extension ClimbingDataManager {
            elapsedInterval = 0
        }

-        print("Live Activity Update Debug:")
-        print("  Session ID: \(activeSession.id)")
-        print("  Gym: \(gym.name)")
-        print("  Total attempts in session: \(totalAttempts)")
-        print("  Completed problems: \(completedProblems)")
-        print("  Elapsed time: \(elapsedInterval) seconds")
-        print(
-            "  All attempts for session: \(attemptsForSession.map { "\($0.result) - Problem: \($0.problemId)" })"
+        AppLogger.debug(
+            """
+            Live Activity Update Debug:
+              Session ID: \(activeSession.id)
+              Gym: \(gym.name)
+              Total attempts in session: \(totalAttempts)
+              Completed problems: \(completedProblems)
+              Elapsed time: \(elapsedInterval) seconds
+              All attempts for session: \(attemptsForSession.map { "\($0.result) - Problem: \($0.problemId)" })
+            """,
+            tag: LogTag.climbingData
        )

        Task {
--- a/ios/Ascently/ViewModels/LiveActivityManager.swift
+++ b/ios/Ascently/ViewModels/LiveActivityManager.swift
@@ -8,6 +8,7 @@ extension Notification.Name {
@MainActor
 final class LiveActivityManager {
    static let shared = LiveActivityManager()
+    private static let logTag = "LiveActivity"
    private init() {}

    nonisolated(unsafe) private var currentActivity: Activity<SessionActivityAttributes>?
@@ -30,11 +31,12 @@ final class LiveActivityManager {
            let isStillActive = activities.contains { $0.id == currentActivity.id }

            if isStillActive {
-                print("Live Activity still running: \(currentActivity.id)")
+                AppLogger.debug("Live Activity still running: \(currentActivity.id)", tag: Self.logTag)
                return
            } else {
-                print(
-                    "WARNING: Tracked Live Activity \(currentActivity.id) was dismissed, clearing reference"
+                AppLogger.warning(
+                    "Tracked Live Activity \(currentActivity.id) was dismissed, clearing reference",
+                    tag: Self.logTag
                )
                self.currentActivity = nil
            }
@@ -43,18 +45,18 @@ final class LiveActivityManager {
        // Check if there are ANY active Live Activities for this session
        let existingActivities = Activity<SessionActivityAttributes>.activities
        if let existingActivity = existingActivities.first {
-            print("Found existing Live Activity: \(existingActivity.id), using it")
+            AppLogger.info("Found existing Live Activity: \(existingActivity.id), using it", tag: Self.logTag)
            self.currentActivity = existingActivity
            return
        }

-        print("No Live Activity found, restarting for existing session")
+        AppLogger.info("No Live Activity found, restarting for existing session", tag: Self.logTag)
        await startLiveActivity(for: activeSession, gymName: gymName)
    }

    /// Call this when a ClimbSession starts to begin a Live Activity
    func startLiveActivity(for session: ClimbSession, gymName: String) async {
-        print("Starting Live Activity for gym: \(gymName)")
+        AppLogger.info("Starting Live Activity for gym: \(gymName)", tag: Self.logTag)

        await endLiveActivity()

@@ -80,18 +82,26 @@ final class LiveActivityManager {
                pushType: nil
            )
            self.currentActivity = activity
-            print("Live Activity started successfully: \(activity.id)")
+            AppLogger.info("Live Activity started successfully: \(activity.id)", tag: Self.logTag)
        } catch {
-            print("ERROR: Failed to start live activity: \(error)")
-            print("Error details: \(error.localizedDescription)")
+            AppLogger.error(
+                """
+                Failed to start live activity: \(error)
+                Details: \(error.localizedDescription)
+                """,
+                tag: Self.logTag
+            )

            // Check specific error types
            if error.localizedDescription.contains("authorization") {
-                print("Authorization error - check Live Activity permissions in Settings")
+                AppLogger.warning(
+                    "Authorization error - check Live Activity permissions in Settings",
+                    tag: Self.logTag
+                )
            } else if error.localizedDescription.contains("content") {
-                print("Content error - check ActivityAttributes structure")
+                AppLogger.warning("Content error - check ActivityAttributes structure", tag: Self.logTag)
            } else if error.localizedDescription.contains("frequencyLimited") {
-                print("Frequency limited - too many Live Activities started recently")
+                AppLogger.warning("Frequency limited - too many Live Activities started recently", tag: Self.logTag)
            }
        }
    }
@@ -100,7 +110,7 @@ final class LiveActivityManager {
    func updateLiveActivity(elapsed: TimeInterval, totalAttempts: Int, completedProblems: Int) async
    {
        guard let currentActivity = currentActivity else {
-            print("WARNING: No current activity to update")
+            AppLogger.warning("No current activity to update", tag: Self.logTag)
            return
        }

@@ -109,15 +119,17 @@ final class LiveActivityManager {
        let isStillActive = activities.contains { $0.id == currentActivity.id }

        if !isStillActive {
-            print(
-                "WARNING: Tracked Live Activity \(currentActivity.id) is no longer active, clearing reference"
+            AppLogger.warning(
+                "Tracked Live Activity \(currentActivity.id) is no longer active, clearing reference",
+                tag: Self.logTag
            )
            self.currentActivity = nil
            return
        }

-        print(
-            "Updating Live Activity - Attempts: \(totalAttempts), Completed: \(completedProblems)"
+        AppLogger.debug(
+            "Updating Live Activity - Attempts: \(totalAttempts), Completed: \(completedProblems)",
+            tag: Self.logTag
        )

        let updatedContentState = SessionActivityAttributes.ContentState(
@@ -137,26 +149,26 @@ final class LiveActivityManager {

        // First end the tracked activity if it exists
        if let currentActivity {
-            print("Ending tracked Live Activity: \(currentActivity.id)")
+            AppLogger.info("Ending tracked Live Activity: \(currentActivity.id)", tag: Self.logTag)
            nonisolated(unsafe) let activity = currentActivity
            await activity.end(nil, dismissalPolicy: .immediate)
            self.currentActivity = nil
-            print("Tracked Live Activity ended successfully")
+            AppLogger.info("Tracked Live Activity ended successfully", tag: Self.logTag)
        }

        // Force end ALL active activities of our type to ensure cleanup
-        print("Checking for any remaining active activities...")
+        AppLogger.debug("Checking for any remaining active activities...", tag: Self.logTag)
        let activities = Activity<SessionActivityAttributes>.activities

        if activities.isEmpty {
-            print("No additional activities found")
+            AppLogger.debug("No additional activities found", tag: Self.logTag)
        } else {
-            print("Found \(activities.count) additional active activities, ending them...")
+            AppLogger.info("Found \(activities.count) additional active activities, ending them...", tag: Self.logTag)
            for activity in activities {
-                print("Force ending activity: \(activity.id)")
+                AppLogger.debug("Force ending activity: \(activity.id)", tag: Self.logTag)
                await activity.end(nil, dismissalPolicy: .immediate)
            }
-            print("All Live Activities ended successfully")
+            AppLogger.info("All Live Activities ended successfully", tag: Self.logTag)
        }
    }

@@ -174,7 +186,7 @@ final class LiveActivityManager {
            • All Active Activities: \(allActivities.count)
            """

-        print(message)
+        AppLogger.info(message, tag: Self.logTag)
        return message
    }

@@ -185,7 +197,7 @@ final class LiveActivityManager {
        if let currentActivity = currentActivity {
            let isStillActive = activities.contains { $0.id == currentActivity.id }
            if !isStillActive {
-                print("Cleaning up dismissed Live Activity: \(currentActivity.id)")
+                AppLogger.info("Cleaning up dismissed Live Activity: \(currentActivity.id)", tag: Self.logTag)
                self.currentActivity = nil
            }
        }
@@ -195,7 +207,7 @@ final class LiveActivityManager {
    func startHealthChecks() {
        stopHealthChecks()  // Stop any existing timer

-        print("🩺 Starting Live Activity health checks")
+        AppLogger.debug("🩺 Starting Live Activity health checks", tag: Self.logTag)
        healthCheckTimer = Timer.scheduledTimer(withTimeInterval: 30.0, repeats: true) {
            [weak self] _ in
            Task { @MainActor [weak self] in
@@ -208,7 +220,7 @@ final class LiveActivityManager {
    func stopHealthChecks() {
        healthCheckTimer?.invalidate()
        healthCheckTimer = nil
-        print("Stopped Live Activity health checks")
+        AppLogger.debug("Stopped Live Activity health checks", tag: Self.logTag)
    }

    /// Perform a health check on the current Live Activity
@@ -221,14 +233,14 @@ final class LiveActivityManager {
        // Only perform health check if it's been at least 25 seconds
        guard timeSinceLastCheck >= 25 else { return }

-        print("🩺 Performing Live Activity health check")
+        AppLogger.debug("🩺 Performing Live Activity health check", tag: Self.logTag)
        lastHealthCheck = now

        let activities = Activity<SessionActivityAttributes>.activities
        let isStillActive = activities.contains { $0.id == currentActivity.id }

        if !isStillActive {
-            print("Health check failed - Live Activity was dismissed")
+            AppLogger.warning("Health check failed - Live Activity was dismissed", tag: Self.logTag)
            self.currentActivity = nil

            // Notify that we need to restart
@@ -237,7 +249,7 @@ final class LiveActivityManager {
                object: nil
            )
        } else {
-            print("Live Activity health check passed")
+            AppLogger.debug("Live Activity health check passed", tag: Self.logTag)
        }
    }

--- a/ios/Ascently/Views/LiveActivityDebugView.swift
+++ b/ios/Ascently/Views/LiveActivityDebugView.swift
@@ -196,7 +196,7 @@ struct LiveActivityDebugView: View {
        }

        isTestRunning = true
-        appendDebugOutput("🧪 Starting Live Activity test...")
+        appendDebugOutput("Starting Live Activity test...")

        Task {
            defer {
--- a/ios/Ascently/Views/ProblemsView.swift
+++ b/ios/Ascently/Views/ProblemsView.swift
@@ -317,7 +317,6 @@ struct ProblemsList: View {
                }

                Button {
-                    // Use a spring animation for more natural movement
                    withAnimation(.spring(response: 0.5, dampingFraction: 0.8, blendDuration: 0.1))
                    {
                        let updatedProblem = problem.updated(isActive: !problem.isActive)
--- a/ios/Ascently/Views/SettingsView.swift
+++ b/ios/Ascently/Views/SettingsView.swift
@@ -84,6 +84,8 @@ struct DataManagementSection: View {
    @State private var isDeletingImages = false
    @State private var showingDeleteImagesAlert = false

+    private static let logTag = "DataManagementSection"
+
    var body: some View {
        Section("Data Management") {
            // Export Data
@@ -217,13 +219,14 @@ struct DataManagementSection: View {
                    try fileManager.removeItem(at: imageFile)
                    deletedCount += 1
                } catch {
-                    print("Failed to delete image: \(imageFile.lastPathComponent)")
+                    AppLogger.error(
+                        "Failed to delete image: \(imageFile.lastPathComponent)", tag: Self.logTag)
                }
            }

-            print("Deleted \(deletedCount) image files")
+            AppLogger.info("Deleted \(deletedCount) image files", tag: Self.logTag)
        } catch {
-            print("Failed to access images directory: \(error)")
+            AppLogger.error("Failed to access images directory: \(error)", tag: Self.logTag)
        }

        // Delete all images from backup directory
@@ -235,7 +238,7 @@ struct DataManagementSection: View {
                try? fileManager.removeItem(at: backupFile)
            }
        } catch {
-            print("Failed to access backup directory: \(error)")
+            AppLogger.error("Failed to access backup directory: \(error)", tag: Self.logTag)
        }

        // Clear image paths from all problems
@@ -260,20 +263,6 @@ struct AppInfoSection: View {

    var body: some View {
        Section("App Information") {
-            HStack {
-                Image("AppLogo")
-                    .resizable()
-                    .frame(width: 24, height: 24)
-                VStack(alignment: .leading) {
-                    Text("Ascently")
-                        .font(.headline)
-                    Text("Track your climbing progress")
-                        .font(.caption)
-                        .foregroundColor(.secondary)
-                }
-                Spacer()
-            }
-
            HStack {
                Image(systemName: "info.circle")
                    .foregroundColor(.blue)
@@ -292,11 +281,13 @@ struct ExportDataView: View {
    @State private var tempFileURL: URL?
    @State private var isCreatingFile = true

+    private static let logTag = "ExportDataView"
+
    var body: some View {
        NavigationStack {
            VStack(spacing: 30) {
                if isCreatingFile {
-                    // Loading state - more prominent
+                    // Loading state
                    VStack(spacing: 20) {
                        ProgressView()
                            .scaleEffect(1.5)
@@ -380,6 +371,7 @@ struct ExportDataView: View {
    }

    private func createTempFile() {
+        let logTag = Self.logTag  // Capture before entering background queue
        DispatchQueue.global(qos: .userInitiated).async {
            do {
                let formatter = ISO8601DateFormatter()
@@ -394,7 +386,9 @@ struct ExportDataView: View {
                        for: .documentDirectory, in: .userDomainMask
                    ).first
                else {
-                    print("Could not access Documents directory")
+                    Task { @MainActor in
+                        AppLogger.error("Could not access Documents directory", tag: logTag)
+                    }
                    DispatchQueue.main.async {
                        self.isCreatingFile = false
                    }
@@ -410,7 +404,9 @@ struct ExportDataView: View {
                    self.isCreatingFile = false
                }
            } catch {
-                print("Failed to create export file: \(error)")
+                Task { @MainActor in
+                    AppLogger.error("Failed to create export file: \(error)", tag: logTag)
+                }
                DispatchQueue.main.async {
                    self.isCreatingFile = false
                }
@@ -420,10 +416,12 @@ struct ExportDataView: View {

    private func cleanupTempFile() {
        if let fileURL = tempFileURL {
+            let logTag = Self.logTag  // Capture before entering async closure
            // Clean up after a delay to ensure sharing is complete
            DispatchQueue.main.asyncAfter(deadline: .now() + 5.0) {
                try? FileManager.default.removeItem(at: fileURL)
-                print("Cleaned up export file: \(fileURL.lastPathComponent)")
+                AppLogger.debug(
+                    "Cleaned up export file: \(fileURL.lastPathComponent)", tag: logTag)
            }
        }
    }
@@ -435,6 +433,8 @@ struct SyncSection: View {
    @State private var showingSyncSettings = false
    @State private var showingDisconnectAlert = false

+    private static let logTag = "SyncSection"
+
    var body: some View {
        Section("Sync") {
            // Sync Status
@@ -579,11 +579,14 @@ struct SyncSection: View {
    }

    private func performSync() {
+        let logTag = Self.logTag  // Capture before entering async context
        Task {
            do {
                try await syncService.syncWithServer(dataManager: dataManager)
            } catch {
-                print("Sync failed: \(error)")
+                await MainActor.run {
+                    AppLogger.error("Sync failed: \(error)", tag: logTag)
+                }
            }
        }
    }
--- a/ios/SessionStatusLive/SessionStatusLiveBundle.swift
+++ b/ios/SessionStatusLive/SessionStatusLiveBundle.swift
@@ -8,7 +8,6 @@ import WidgetKit
 struct SessionStatusLiveBundle: WidgetBundle {
    var body: some Widget {
        SessionStatusLive()
-        SessionStatusLiveControl()
        SessionStatusLiveLiveActivity()
    }
 }
--- a/ios/SessionStatusLive/SessionStatusLiveControl.swift
+++ b/ios/SessionStatusLive/SessionStatusLiveControl.swift
@@ -1,74 +0,0 @@
-//
-//  SessionStatusLiveControl.swift
-
-import AppIntents
-import SwiftUI
-import WidgetKit
-
-struct SessionStatusLiveControl: ControlWidget {
-    static let kind: String = "com.atridad.Ascently.SessionStatusLive"
-
-    var body: some ControlWidgetConfiguration {
-        AppIntentControlConfiguration(
-            kind: Self.kind,
-            provider: Provider()
-        ) { value in
-            ControlWidgetToggle(
-                "Start Timer",
-                isOn: value.isRunning,
-                action: StartTimerIntent(value.name)
-            ) { isRunning in
-                Label(isRunning ? "On" : "Off", systemImage: "timer")
-            }
-        }
-        .displayName("Timer")
-        .description("A an example control that runs a timer.")
-    }
-}
-
-extension SessionStatusLiveControl {
-    struct Value {
-        var isRunning: Bool
-        var name: String
-    }
-
-    struct Provider: AppIntentControlValueProvider {
-        func previewValue(configuration: TimerConfiguration) -> Value {
-            SessionStatusLiveControl.Value(isRunning: false, name: configuration.timerName)
-        }
-
-        func currentValue(configuration: TimerConfiguration) async throws -> Value {
-            let isRunning = true  // Check if the timer is running
-            return SessionStatusLiveControl.Value(
-                isRunning: isRunning, name: configuration.timerName)
-        }
-    }
-}
-
-struct TimerConfiguration: ControlConfigurationIntent {
-    static let title: LocalizedStringResource = "Timer Name Configuration"
-
-    @Parameter(title: "Timer Name", default: "Timer")
-    var timerName: String
-}
-
-struct StartTimerIntent: SetValueIntent {
-    static let title: LocalizedStringResource = "Start a timer"
-
-    @Parameter(title: "Timer Name")
-    var name: String
-
-    @Parameter(title: "Timer is running")
-    var value: Bool
-
-    init() {}
-
-    init(_ name: String) {
-        self.name = name
-    }
-
-    func perform() async throws -> some IntentResult {
-        // Start the timer…
-        return .result()
-    }
-}
--- a/sync/main.go
+++ b/sync/main.go
@@ -13,7 +13,7 @@ import (
 	"time"
 )

-const VERSION = "2.2.0"
+const VERSION = "2.3.0"

 func min(a, b int) int {
 	if a < b {