Merge pull request #24 from garfiec/refactor/file-organization

refactor: extract supporting types and organize into sub-packages

core/data/src/commonMain/kotlin/com/garfiec/librechat/core/data/datastore/ChatFontSize.kt

@@ -0,0 +1,19 @@
+package com.garfiec.librechat.core.data.datastore
+
+enum class ChatFontSize {
+    SMALL, MEDIUM, LARGE;
+
+    companion object {
+        fun fromString(value: String?): ChatFontSize = when (value) {
+            "small" -> SMALL
+            "large" -> LARGE
+            else -> MEDIUM
+        }
+    }
+
+    fun toStorageString(): String = when (this) {
+        SMALL -> "small"
+        MEDIUM -> "medium"
+        LARGE -> "large"
+    }
+}

core/data/src/commonMain/kotlin/com/garfiec/librechat/core/data/datastore/ConfigCacheDataStore.kt

@@ -5,7 +5,7 @@ import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import com.garfiec.librechat.core.model.EndpointConfig
-import com.garfiec.librechat.core.model.StartupConfig
+import com.garfiec.librechat.core.model.config.StartupConfig
 import kotlinx.coroutines.flow.first
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.MapSerializer

core/data/src/commonMain/kotlin/com/garfiec/librechat/core/data/datastore/LatexRenderer.kt

@@ -0,0 +1,17 @@
+package com.garfiec.librechat.core.data.datastore
+
+enum class LatexRenderer {
+    NATIVE, KATEX;
+
+    companion object {
+        fun fromString(value: String?): LatexRenderer = when (value) {
+            "native" -> NATIVE
+            else -> KATEX
+        }
+    }
+
+    fun toStorageString(): String = when (this) {
+        NATIVE -> "native"
+        KATEX -> "katex"
+    }
+}

core/data/src/commonMain/kotlin/com/garfiec/librechat/core/data/datastore/SettingsDataStore.kt

@@ -10,40 +10,6 @@ import androidx.datastore.preferences.core.stringSetPreferencesKey
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
-enum class LatexRenderer {
-    NATIVE, KATEX;
-
-    companion object {
-        fun fromString(value: String?): LatexRenderer = when (value) {
-            "native" -> NATIVE
-            else -> KATEX
-        }
-    }
-
-    fun toStorageString(): String = when (this) {
-        NATIVE -> "native"
-        KATEX -> "katex"
-    }
-}
-
-enum class ChatFontSize {
-    SMALL, MEDIUM, LARGE;
-
-    companion object {
-        fun fromString(value: String?): ChatFontSize = when (value) {
-            "small" -> SMALL
-            "large" -> LARGE
-            else -> MEDIUM
-        }
-    }
-
-    fun toStorageString(): String = when (this) {
-        SMALL -> "small"
-        MEDIUM -> "medium"
-        LARGE -> "large"
-    }
-}
-
 class SettingsDataStore(
     private val dataStore: DataStore<Preferences>,
 ) {

core/data/src/commonMain/kotlin/com/garfiec/librechat/core/data/datastore/ThemeDataStore.kt

@@ -11,10 +11,6 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.runBlocking
 
-enum class ThemeMode {
-    SYSTEM, LIGHT, DARK
-}
-
 class ThemeDataStore(
     private val dataStore: DataStore<Preferences>,
 ) {

core/data/src/commonMain/kotlin/com/garfiec/librechat/core/data/datastore/ThemeMode.kt

@@ -0,0 +1,5 @@
+package com.garfiec.librechat.core.data.datastore
+
+enum class ThemeMode {
+    SYSTEM, LIGHT, DARK
+}

core/data/src/commonMain/kotlin/com/garfiec/librechat/core/data/mapper/MessageMapper.kt

@@ -5,7 +5,7 @@ import com.garfiec.librechat.core.model.Attachment
 import com.garfiec.librechat.core.model.Feedback
 import com.garfiec.librechat.core.model.FileReference
 import com.garfiec.librechat.core.model.Message
-import com.garfiec.librechat.core.model.MessageContentPart
+import com.garfiec.librechat.core.model.content.MessageContentPart
 import kotlin.time.Clock
 import kotlin.time.Instant
 import kotlinx.serialization.builtins.ListSerializer

core/data/src/commonMain/kotlin/com/garfiec/librechat/core/data/repository/ConfigRepository.kt

@@ -2,7 +2,7 @@ package com.garfiec.librechat.core.data.repository
 
 import com.garfiec.librechat.core.common.result.Result
 import com.garfiec.librechat.core.model.EndpointConfig
-import com.garfiec.librechat.core.model.StartupConfig
+import com.garfiec.librechat.core.model.config.StartupConfig
 import kotlinx.coroutines.flow.StateFlow
 
 /**

core/data/src/commonMain/kotlin/com/garfiec/librechat/core/data/repository/ConfigRepositoryImpl.kt

@@ -6,7 +6,7 @@ import com.garfiec.librechat.core.common.result.Result
 import com.garfiec.librechat.core.common.result.safeApiCall
 import com.garfiec.librechat.core.data.datastore.ConfigCacheDataStore
 import com.garfiec.librechat.core.model.EndpointConfig
-import com.garfiec.librechat.core.model.StartupConfig
+import com.garfiec.librechat.core.model.config.StartupConfig
 import com.garfiec.librechat.core.network.api.ConfigApi
 import io.ktor.client.plugins.HttpRequestTimeoutException
 import kotlinx.coroutines.flow.MutableStateFlow

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/ContentType.kt

@@ -0,0 +1,37 @@
+package com.garfiec.librechat.core.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class ContentType {
+    @SerialName("text")
+    TEXT,
+
+    @SerialName("think")
+    THINK,
+
+    @SerialName("text_delta")
+    TEXT_DELTA,
+
+    @SerialName("tool_call")
+    TOOL_CALL,
+
+    @SerialName("image_file")
+    IMAGE_FILE,
+
+    @SerialName("image_url")
+    IMAGE_URL,
+
+    @SerialName("video_url")
+    VIDEO_URL,
+
+    @SerialName("input_audio")
+    INPUT_AUDIO,
+
+    @SerialName("agent_update")
+    AGENT_UPDATE,
+
+    @SerialName("error")
+    ERROR,
+}

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/EModelEndpoint.kt

@@ -0,0 +1,34 @@
+package com.garfiec.librechat.core.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class EModelEndpoint {
+    @SerialName("azureOpenAI")
+    AZURE_OPENAI,
+
+    @SerialName("openAI")
+    OPENAI,
+
+    @SerialName("google")
+    GOOGLE,
+
+    @SerialName("anthropic")
+    ANTHROPIC,
+
+    @SerialName("assistants")
+    ASSISTANTS,
+
+    @SerialName("azureAssistants")
+    AZURE_ASSISTANTS,
+
+    @SerialName("agents")
+    AGENTS,
+
+    @SerialName("custom")
+    CUSTOM,
+
+    @SerialName("bedrock")
+    BEDROCK,
+}

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/Endpoint.kt

@@ -1,142 +0,0 @@
-package com.garfiec.librechat.core.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-enum class EModelEndpoint {
-    @SerialName("azureOpenAI")
-    AZURE_OPENAI,
-
-    @SerialName("openAI")
-    OPENAI,
-
-    @SerialName("google")
-    GOOGLE,
-
-    @SerialName("anthropic")
-    ANTHROPIC,
-
-    @SerialName("assistants")
-    ASSISTANTS,
-
-    @SerialName("azureAssistants")
-    AZURE_ASSISTANTS,
-
-    @SerialName("agents")
-    AGENTS,
-
-    @SerialName("custom")
-    CUSTOM,
-
-    @SerialName("bedrock")
-    BEDROCK,
-}
-
-@Serializable
-enum class ContentType {
-    @SerialName("text")
-    TEXT,
-
-    @SerialName("think")
-    THINK,
-
-    @SerialName("text_delta")
-    TEXT_DELTA,
-
-    @SerialName("tool_call")
-    TOOL_CALL,
-
-    @SerialName("image_file")
-    IMAGE_FILE,
-
-    @SerialName("image_url")
-    IMAGE_URL,
-
-    @SerialName("video_url")
-    VIDEO_URL,
-
-    @SerialName("input_audio")
-    INPUT_AUDIO,
-
-    @SerialName("agent_update")
-    AGENT_UPDATE,
-
-    @SerialName("error")
-    ERROR,
-}
-
-@Serializable
-enum class StepType {
-    @SerialName("tool_calls")
-    TOOL_CALLS,
-
-    @SerialName("message_creation")
-    MESSAGE_CREATION,
-}
-
-@Serializable
-enum class ToolCallType {
-    @SerialName("function")
-    FUNCTION,
-
-    @SerialName("retrieval")
-    RETRIEVAL,
-
-    @SerialName("file_search")
-    FILE_SEARCH,
-
-    @SerialName("code_interpreter")
-    CODE_INTERPRETER,
-
-    @SerialName("tool_call")
-    TOOL_CALL,
-}
-
-@Serializable
-enum class FeedbackRating {
-    @SerialName("thumbsUp")
-    THUMBS_UP,
-
-    @SerialName("thumbsDown")
-    THUMBS_DOWN,
-}
-
-@Serializable
-enum class Provider {
-    @SerialName("openAI")
-    OPENAI,
-
-    @SerialName("anthropic")
-    ANTHROPIC,
-
-    @SerialName("azureOpenAI")
-    AZURE,
-
-    @SerialName("google")
-    GOOGLE,
-
-    @SerialName("vertexai")
-    VERTEXAI,
-
-    @SerialName("bedrock")
-    BEDROCK,
-
-    @SerialName("mistralai")
-    MISTRALAI,
-
-    @SerialName("mistral")
-    MISTRAL,
-
-    @SerialName("deepseek")
-    DEEPSEEK,
-
-    @SerialName("moonshot")
-    MOONSHOT,
-
-    @SerialName("openrouter")
-    OPENROUTER,
-
-    @SerialName("xai")
-    XAI,
-}

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/FeedbackRating.kt

@@ -0,0 +1,13 @@
+package com.garfiec.librechat.core.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class FeedbackRating {
+    @SerialName("thumbsUp")
+    THUMBS_UP,
+
+    @SerialName("thumbsDown")
+    THUMBS_DOWN,
+}

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/Message.kt

@@ -1,5 +1,6 @@
 package com.garfiec.librechat.core.model
 
+import com.garfiec.librechat.core.model.content.MessageContentPart
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/MessageContentPart.kt

@@ -1,76 +0,0 @@
-package com.garfiec.librechat.core.model
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonElement
-
-@Serializable
-data class MessageContentPart(
-    val type: ContentType,
-    val text: String? = null,
-    val think: String? = null,
-    val error: String? = null,
-    @SerialName("tool_call_ids") val toolCallIds: List<String>? = null,
-    @SerialName("tool_call") val toolCall: AgentToolCall? = null,
-    @SerialName("image_file") val imageFile: ImageFileContent? = null,
-    @SerialName("image_url") val imageUrl: ImageUrlContent? = null,
-    @SerialName("video_url") val videoUrl: VideoUrlContent? = null,
-    @SerialName("input_audio") val inputAudio: InputAudioContent? = null,
-    @SerialName("agent_update") val agentUpdate: AgentUpdateContent? = null,
-    val agentId: String? = null,
-    val groupId: Int? = null,
-    val stepIndex: Int? = null,
-    val siblingIndex: Int? = null,
-)
-
-@Serializable
-data class AgentToolCall(
-    val type: ToolCallType? = null,
-    val name: String? = null,
-    val args: JsonElement? = null,
-    val id: String? = null,
-    val output: String? = null,
-    val auth: String? = null,
-    @SerialName("expires_at") val expiresAt: Long? = null,
-    val function: FunctionCall? = null,
-)
-
-@Serializable
-data class FunctionCall(
-    val name: String? = null,
-    val arguments: String? = null,
-    val output: String? = null,
-)
-
-@Serializable
-data class ImageFileContent(
-    @SerialName("file_id") val fileId: String? = null,
-    val filepath: String? = null,
-    val filename: String? = null,
-    val width: Int? = null,
-    val height: Int? = null,
-)
-
-@Serializable
-data class ImageUrlContent(
-    val url: String? = null,
-    val detail: String? = null,
-)
-
-@Serializable
-data class VideoUrlContent(
-    val url: String? = null,
-)
-
-@Serializable
-data class InputAudioContent(
-    val data: String? = null,
-    val format: String? = null,
-)
-
-@Serializable
-data class AgentUpdateContent(
-    val index: Int? = null,
-    val runId: String? = null,
-    val agentId: String? = null,
-)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/Provider.kt

@@ -0,0 +1,43 @@
+package com.garfiec.librechat.core.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class Provider {
+    @SerialName("openAI")
+    OPENAI,
+
+    @SerialName("anthropic")
+    ANTHROPIC,
+
+    @SerialName("azureOpenAI")
+    AZURE,
+
+    @SerialName("google")
+    GOOGLE,
+
+    @SerialName("vertexai")
+    VERTEXAI,
+
+    @SerialName("bedrock")
+    BEDROCK,
+
+    @SerialName("mistralai")
+    MISTRALAI,
+
+    @SerialName("mistral")
+    MISTRAL,
+
+    @SerialName("deepseek")
+    DEEPSEEK,
+
+    @SerialName("moonshot")
+    MOONSHOT,
+
+    @SerialName("openrouter")
+    OPENROUTER,
+
+    @SerialName("xai")
+    XAI,
+}

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/SseContentEvent.kt

@@ -1,5 +1,6 @@
 package com.garfiec.librechat.core.model
 
+import com.garfiec.librechat.core.model.content.MessageContentPart
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/StepType.kt

@@ -0,0 +1,13 @@
+package com.garfiec.librechat.core.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class StepType {
+    @SerialName("tool_calls")
+    TOOL_CALLS,
+
+    @SerialName("message_creation")
+    MESSAGE_CREATION,
+}

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/StreamEvent.kt

@@ -1,5 +1,7 @@
 package com.garfiec.librechat.core.model
 
+import com.garfiec.librechat.core.model.content.MessageContentPart
+
 sealed interface StreamEvent {
     data class ContentDelta(
         val chunk: String,

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/ToolCallType.kt

@@ -0,0 +1,22 @@
+package com.garfiec.librechat.core.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class ToolCallType {
+    @SerialName("function")
+    FUNCTION,
+
+    @SerialName("retrieval")
+    RETRIEVAL,
+
+    @SerialName("file_search")
+    FILE_SEARCH,
+
+    @SerialName("code_interpreter")
+    CODE_INTERPRETER,
+
+    @SerialName("tool_call")
+    TOOL_CALL,
+}

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/config/BalanceConfig.kt

@@ -0,0 +1,13 @@
+package com.garfiec.librechat.core.model.config
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BalanceConfig(
+    val enabled: Boolean = false,
+    val startBalance: Long? = null,
+    val autoRefillEnabled: Boolean = false,
+    val refillIntervalValue: Int? = null,
+    val refillIntervalUnit: String? = null,
+    val refillAmount: Long? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/config/InterfaceConfig.kt

@@ -0,0 +1,27 @@
+package com.garfiec.librechat.core.model.config
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonElement
+
+@Serializable
+data class InterfaceConfig(
+    val privacyPolicy: PrivacyPolicyConfig? = null,
+    val termsOfService: TermsOfServiceConfig? = null,
+    val endpointsMenu: Boolean = true,
+    val modelSelect: Boolean = true,
+    val parameters: Boolean = true,
+    val presets: Boolean = true,
+    val sidePanel: Boolean = true,
+    val bookmarks: Boolean = true,
+    val prompts: JsonElement? = null,
+    val agents: JsonElement? = null,
+    val multiConvo: Boolean = true,
+    val memories: Boolean = true,
+    val temporaryChat: Boolean = true,
+    val runCode: Boolean = true,
+    val webSearch: Boolean = true,
+    val fileSearch: Boolean = true,
+    val fileCitations: Boolean = true,
+    val customWelcome: String? = null,
+    val remoteAgents: JsonElement? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/config/LdapConfig.kt

@@ -0,0 +1,9 @@
+package com.garfiec.librechat.core.model.config
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class LdapConfig(
+    val enabled: Boolean = false,
+    val username: Boolean? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/config/ModelSpec.kt

@@ -0,0 +1,13 @@
+package com.garfiec.librechat.core.model.config
+
+import com.garfiec.librechat.core.model.Preset
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ModelSpec(
+    val name: String,
+    val label: String? = null,
+    val preset: Preset? = null,
+    val iconURL: String? = null,
+    val description: String? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/config/ModelSpecs.kt

@@ -0,0 +1,8 @@
+package com.garfiec.librechat.core.model.config
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ModelSpecs(
+    val list: List<ModelSpec> = emptyList(),
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/config/PrivacyPolicyConfig.kt

@@ -0,0 +1,9 @@
+package com.garfiec.librechat.core.model.config
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PrivacyPolicyConfig(
+    val externalUrl: String? = null,
+    val openNewTab: Boolean? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/config/StartupConfig.kt

@@ -1,8 +1,8 @@
-package com.garfiec.librechat.core.model
+package com.garfiec.librechat.core.model.config
 
+import com.garfiec.librechat.core.model.Preset
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 
 @Serializable
@@ -52,79 +52,3 @@ data class StartupConfig(
     /** Backend version, if the server includes it in the config response (not yet standard). */
     val version: String? = null,
 )
-
-@Serializable
-data class ModelSpecs(
-    val list: List<ModelSpec> = emptyList(),
-)
-
-@Serializable
-data class ModelSpec(
-    val name: String,
-    val label: String? = null,
-    val preset: Preset? = null,
-    val iconURL: String? = null,
-    val description: String? = null,
-)
-
-@Serializable
-data class InterfaceConfig(
-    val privacyPolicy: PrivacyPolicyConfig? = null,
-    val termsOfService: TermsOfServiceConfig? = null,
-    val endpointsMenu: Boolean = true,
-    val modelSelect: Boolean = true,
-    val parameters: Boolean = true,
-    val presets: Boolean = true,
-    val sidePanel: Boolean = true,
-    val bookmarks: Boolean = true,
-    val prompts: JsonElement? = null,
-    val agents: JsonElement? = null,
-    val multiConvo: Boolean = true,
-    val memories: Boolean = true,
-    val temporaryChat: Boolean = true,
-    val runCode: Boolean = true,
-    val webSearch: Boolean = true,
-    val fileSearch: Boolean = true,
-    val fileCitations: Boolean = true,
-    val customWelcome: String? = null,
-    val remoteAgents: JsonElement? = null,
-)
-
-@Serializable
-data class PrivacyPolicyConfig(
-    val externalUrl: String? = null,
-    val openNewTab: Boolean? = null,
-)
-
-@Serializable
-data class TermsOfServiceConfig(
-    val externalUrl: String? = null,
-)
-
-@Serializable
-data class TurnstileConfig(
-    val siteKey: String? = null,
-    val options: TurnstileOptions? = null,
-)
-
-@Serializable
-data class TurnstileOptions(
-    val language: String? = null,
-    val size: String? = null,
-)
-
-@Serializable
-data class BalanceConfig(
-    val enabled: Boolean = false,
-    val startBalance: Long? = null,
-    val autoRefillEnabled: Boolean = false,
-    val refillIntervalValue: Int? = null,
-    val refillIntervalUnit: String? = null,
-    val refillAmount: Long? = null,
-)
-
-@Serializable
-data class LdapConfig(
-    val enabled: Boolean = false,
-    val username: Boolean? = null,
-)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/config/TermsOfServiceConfig.kt

@@ -0,0 +1,8 @@
+package com.garfiec.librechat.core.model.config
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TermsOfServiceConfig(
+    val externalUrl: String? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/config/TurnstileConfig.kt

@@ -0,0 +1,9 @@
+package com.garfiec.librechat.core.model.config
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TurnstileConfig(
+    val siteKey: String? = null,
+    val options: TurnstileOptions? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/config/TurnstileOptions.kt

@@ -0,0 +1,9 @@
+package com.garfiec.librechat.core.model.config
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TurnstileOptions(
+    val language: String? = null,
+    val size: String? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/content/AgentToolCall.kt

@@ -0,0 +1,18 @@
+package com.garfiec.librechat.core.model.content
+
+import com.garfiec.librechat.core.model.ToolCallType
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonElement
+
+@Serializable
+data class AgentToolCall(
+    val type: ToolCallType? = null,
+    val name: String? = null,
+    val args: JsonElement? = null,
+    val id: String? = null,
+    val output: String? = null,
+    val auth: String? = null,
+    @SerialName("expires_at") val expiresAt: Long? = null,
+    val function: FunctionCall? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/content/AgentUpdateContent.kt

@@ -0,0 +1,10 @@
+package com.garfiec.librechat.core.model.content
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class AgentUpdateContent(
+    val index: Int? = null,
+    val runId: String? = null,
+    val agentId: String? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/content/FunctionCall.kt

@@ -0,0 +1,10 @@
+package com.garfiec.librechat.core.model.content
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FunctionCall(
+    val name: String? = null,
+    val arguments: String? = null,
+    val output: String? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/content/ImageFileContent.kt

@@ -0,0 +1,13 @@
+package com.garfiec.librechat.core.model.content
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ImageFileContent(
+    @SerialName("file_id") val fileId: String? = null,
+    val filepath: String? = null,
+    val filename: String? = null,
+    val width: Int? = null,
+    val height: Int? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/content/ImageUrlContent.kt

@@ -0,0 +1,9 @@
+package com.garfiec.librechat.core.model.content
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ImageUrlContent(
+    val url: String? = null,
+    val detail: String? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/content/InputAudioContent.kt

@@ -0,0 +1,9 @@
+package com.garfiec.librechat.core.model.content
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class InputAudioContent(
+    val data: String? = null,
+    val format: String? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/content/MessageContentPart.kt

@@ -0,0 +1,24 @@
+package com.garfiec.librechat.core.model.content
+
+import com.garfiec.librechat.core.model.ContentType
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MessageContentPart(
+    val type: ContentType,
+    val text: String? = null,
+    val think: String? = null,
+    val error: String? = null,
+    @SerialName("tool_call_ids") val toolCallIds: List<String>? = null,
+    @SerialName("tool_call") val toolCall: AgentToolCall? = null,
+    @SerialName("image_file") val imageFile: ImageFileContent? = null,
+    @SerialName("image_url") val imageUrl: ImageUrlContent? = null,
+    @SerialName("video_url") val videoUrl: VideoUrlContent? = null,
+    @SerialName("input_audio") val inputAudio: InputAudioContent? = null,
+    @SerialName("agent_update") val agentUpdate: AgentUpdateContent? = null,
+    val agentId: String? = null,
+    val groupId: Int? = null,
+    val stepIndex: Int? = null,
+    val siblingIndex: Int? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/content/VideoUrlContent.kt

@@ -0,0 +1,8 @@
+package com.garfiec.librechat.core.model.content
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class VideoUrlContent(
+    val url: String? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/mcp/McpAuthConfig.kt

@@ -0,0 +1,44 @@
+package com.garfiec.librechat.core.model.mcp
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/** Maps to backend apiKey object: { source, authorization_type, key?, custom_header? }. */
+@Serializable
+data class McpApiKeyConfig(
+    val source: McpApiKeySource = McpApiKeySource.USER,
+    @SerialName("authorization_type") val authorizationType: McpAuthorizationType = McpAuthorizationType.BEARER,
+    val key: String? = null,
+    @SerialName("custom_header") val customHeader: String? = null,
+)
+
+@Serializable
+enum class McpApiKeySource {
+    @SerialName("admin")
+    ADMIN,
+
+    @SerialName("user")
+    USER,
+}
+
+@Serializable
+enum class McpAuthorizationType {
+    @SerialName("bearer")
+    BEARER,
+
+    @SerialName("basic")
+    BASIC,
+
+    @SerialName("custom")
+    CUSTOM,
+}
+
+/** Maps to backend oauth object. Only the most common fields are exposed in the UI. */
+@Serializable
+data class McpOAuthConfig(
+    @SerialName("authorization_url") val authorizationUrl: String? = null,
+    @SerialName("token_url") val tokenUrl: String? = null,
+    @SerialName("client_id") val clientId: String? = null,
+    @SerialName("client_secret") val clientSecret: String? = null,
+    val scope: String? = null,
+)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/mcp/McpAuthMode.kt

@@ -0,0 +1,4 @@
+package com.garfiec.librechat.core.model.mcp
+
+/** Auth mode for the MCP server add/edit dialog. */
+enum class McpAuthMode { NONE, API_KEY, OAUTH }

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/mcp/McpServer.kt

@@ -1,8 +1,5 @@
 package com.garfiec.librechat.core.model.mcp
 
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
 /**
  * Represents an MCP server as shown in the UI.
  * The backend returns a map of server name -> config from GET /api/mcp/servers.
@@ -20,64 +17,3 @@ data class McpServer(
     val apiKey: McpApiKeyConfig? = null,
     val oauth: McpOAuthConfig? = null,
 )
-
-@Serializable
-enum class McpServerType {
-    @SerialName("sse")
-    SSE,
-
-    @SerialName("streamable-http")
-    STREAMABLE_HTTP,
-
-    @SerialName("http")
-    HTTP,
-
-    @SerialName("stdio")
-    STDIO,
-
-    @SerialName("websocket")
-    WEBSOCKET,
-}
-
-/** Auth mode for the MCP server add/edit dialog. */
-enum class McpAuthMode { NONE, API_KEY, OAUTH }
-
-/** Maps to backend apiKey object: { source, authorization_type, key?, custom_header? }. */
-@Serializable
-data class McpApiKeyConfig(
-    val source: McpApiKeySource = McpApiKeySource.USER,
-    @SerialName("authorization_type") val authorizationType: McpAuthorizationType = McpAuthorizationType.BEARER,
-    val key: String? = null,
-    @SerialName("custom_header") val customHeader: String? = null,
-)
-
-@Serializable
-enum class McpApiKeySource {
-    @SerialName("admin")
-    ADMIN,
-
-    @SerialName("user")
-    USER,
-}
-
-@Serializable
-enum class McpAuthorizationType {
-    @SerialName("bearer")
-    BEARER,
-
-    @SerialName("basic")
-    BASIC,
-
-    @SerialName("custom")
-    CUSTOM,
-}
-
-/** Maps to backend oauth object. Only the most common fields are exposed in the UI. */
-@Serializable
-data class McpOAuthConfig(
-    @SerialName("authorization_url") val authorizationUrl: String? = null,
-    @SerialName("token_url") val tokenUrl: String? = null,
-    @SerialName("client_id") val clientId: String? = null,
-    @SerialName("client_secret") val clientSecret: String? = null,
-    val scope: String? = null,
-)

core/model/src/commonMain/kotlin/com/garfiec/librechat/core/model/mcp/McpServerType.kt

@@ -0,0 +1,22 @@
+package com.garfiec.librechat.core.model.mcp
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+enum class McpServerType {
+    @SerialName("sse")
+    SSE,
+
+    @SerialName("streamable-http")
+    STREAMABLE_HTTP,
+
+    @SerialName("http")
+    HTTP,
+
+    @SerialName("stdio")
+    STDIO,
+
+    @SerialName("websocket")
+    WEBSOCKET,
+}

core/model/src/commonTest/kotlin/com/garfiec/librechat/core/model/MessageSerializationTest.kt

@@ -1,5 +1,6 @@
 package com.garfiec.librechat.core.model
 
+import com.garfiec.librechat.core.model.content.MessageContentPart
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive

core/model/src/commonTest/kotlin/com/garfiec/librechat/core/model/SseContentEventSerializationTest.kt

@@ -1,5 +1,7 @@
 package com.garfiec.librechat.core.model
 
+import com.garfiec.librechat.core.model.content.AgentToolCall
+import com.garfiec.librechat.core.model.content.MessageContentPart
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive

core/network/src/commonMain/kotlin/com/garfiec/librechat/core/network/api/AuthApi.kt

@@ -1,5 +1,8 @@
 package com.garfiec.librechat.core.network.api
 
+import com.garfiec.librechat.core.network.api.dto.LoginResult
+import com.garfiec.librechat.core.network.api.dto.RefreshResult
+import com.garfiec.librechat.core.network.api.dto.TwoFactorConfirmRequest
 import com.garfiec.librechat.core.model.request.LoginRequest
 import com.garfiec.librechat.core.model.request.OtpVerificationRequest
 import com.garfiec.librechat.core.model.request.PasswordResetRequest
@@ -15,23 +18,10 @@ import com.garfiec.librechat.core.model.response.TwoFactorSetupResponse
 import com.garfiec.librechat.core.network.client.CookieHelper
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
-import io.ktor.client.request.get
 import io.ktor.client.request.header
 import io.ktor.client.request.post
 import io.ktor.client.request.setBody
 import io.ktor.http.path
-import kotlinx.serialization.Serializable
-
-data class LoginResult(
-    val response: LoginResponse,
-    val refreshToken: String?,
-)
-
-data class RefreshResult(
-    val response: RefreshResponse,
-    /** New refresh token from Set-Cookie header, if the backend rotated it. */
-    val newRefreshToken: String?,
-)
 
 class AuthApi constructor(
     private val client: HttpClient,
@@ -169,8 +159,3 @@ class AuthApi constructor(
         }
     }
 }
-
-@Serializable
-data class TwoFactorConfirmRequest(
-    val token: String,
-)

core/network/src/commonMain/kotlin/com/garfiec/librechat/core/network/api/ConfigApi.kt

@@ -1,7 +1,7 @@
 package com.garfiec.librechat.core.network.api
 
 import com.garfiec.librechat.core.model.EndpointConfig
-import com.garfiec.librechat.core.model.StartupConfig
+import com.garfiec.librechat.core.model.config.StartupConfig
 import com.garfiec.librechat.core.model.response.Category
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body

core/network/src/commonMain/kotlin/com/garfiec/librechat/core/network/api/UserApi.kt

@@ -1,5 +1,8 @@
 package com.garfiec.librechat.core.network.api
 
+import com.garfiec.librechat.core.network.api.dto.UpdateFavoritesRequest
+import com.garfiec.librechat.core.network.api.dto.UpdatePluginsRequest
+import com.garfiec.librechat.core.network.api.dto.UserUpdateRequest
 import com.garfiec.librechat.core.model.User
 import com.garfiec.librechat.core.model.UserFavorite
 import com.garfiec.librechat.core.model.request.OtpVerificationRequest
@@ -17,23 +20,6 @@ import io.ktor.client.request.setBody
 import io.ktor.http.Headers
 import io.ktor.http.HttpHeaders
 import io.ktor.http.path
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class UserUpdateRequest(
-    val name: String? = null,
-    val username: String? = null,
-)
-
-@Serializable
-data class UpdateFavoritesRequest(
-    val favorites: List<UserFavorite>,
-)
-
-@Serializable
-data class UpdatePluginsRequest(
-    val plugins: List<String>,
-)
 
 class UserApi constructor(
     private val client: HttpClient,

core/network/src/commonMain/kotlin/com/garfiec/librechat/core/network/api/dto/LoginResult.kt

@@ -0,0 +1,8 @@
+package com.garfiec.librechat.core.network.api.dto
+
+import com.garfiec.librechat.core.model.response.LoginResponse
+
+data class LoginResult(
+    val response: LoginResponse,
+    val refreshToken: String?,
+)

core/network/src/commonMain/kotlin/com/garfiec/librechat/core/network/api/dto/RefreshResult.kt

@@ -0,0 +1,9 @@
+package com.garfiec.librechat.core.network.api.dto
+
+import com.garfiec.librechat.core.model.response.RefreshResponse
+
+data class RefreshResult(
+    val response: RefreshResponse,
+    /** New refresh token from Set-Cookie header, if the backend rotated it. */
+    val newRefreshToken: String?,
+)

core/network/src/commonMain/kotlin/com/garfiec/librechat/core/network/api/dto/TwoFactorConfirmRequest.kt

@@ -0,0 +1,8 @@
+package com.garfiec.librechat.core.network.api.dto
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TwoFactorConfirmRequest(
+    val token: String,
+)

core/network/src/commonMain/kotlin/com/garfiec/librechat/core/network/api/dto/UpdateFavoritesRequest.kt

@@ -0,0 +1,9 @@
+package com.garfiec.librechat.core.network.api.dto
+
+import com.garfiec.librechat.core.model.UserFavorite
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UpdateFavoritesRequest(
+    val favorites: List<UserFavorite>,
+)

core/network/src/commonMain/kotlin/com/garfiec/librechat/core/network/api/dto/UpdatePluginsRequest.kt

@@ -0,0 +1,8 @@
+package com.garfiec.librechat.core.network.api.dto
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UpdatePluginsRequest(
+    val plugins: List<String>,
+)

core/network/src/commonMain/kotlin/com/garfiec/librechat/core/network/api/dto/UserUpdateRequest.kt

@@ -0,0 +1,9 @@
+package com.garfiec.librechat.core.network.api.dto
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UserUpdateRequest(
+    val name: String? = null,
+    val username: String? = null,
+)

core/network/src/commonMain/kotlin/com/garfiec/librechat/core/network/sse/SseEventMapper.kt

@@ -210,7 +210,7 @@ class SseEventMapper(private val json: Json) {
             aggregatedContent.mapNotNull { element ->
                 try {
                     json.decodeFromJsonElement(
-                        com.garfiec.librechat.core.model.MessageContentPart.serializer(),
+                        com.garfiec.librechat.core.model.content.MessageContentPart.serializer(),
                         element,
                     )
                 } catch (e: Exception) {

core/network/src/commonMain/kotlin/com/garfiec/librechat/core/network/sse/SseLineParser.kt

@@ -82,6 +82,3 @@ class SseLineParser(
         const val DEFAULT_LINE_READ_TIMEOUT_MS = 120_000L
     }
 }
-
-/** Cross-platform exception for SSE stream errors (replaces java.io.IOException). */
-class SseStreamException(message: String, cause: Throwable? = null) : Exception(message, cause)

core/network/src/commonMain/kotlin/com/garfiec/librechat/core/network/sse/SseStreamException.kt

@@ -0,0 +1,4 @@
+package com.garfiec.librechat.core.network.sse
+
+/** Cross-platform exception for SSE stream errors (replaces java.io.IOException). */
+class SseStreamException(message: String, cause: Throwable? = null) : Exception(message, cause)

feature/agents/src/commonMain/kotlin/com/garfiec/librechat/feature/agents/components/AgentAdvancedPanel.kt

@@ -32,12 +32,7 @@ import androidx.compose.ui.unit.dp
 import librechat_mobile.feature.agents.generated.resources.Res
 import librechat_mobile.feature.agents.generated.resources.*
 import kotlin.math.roundToInt
-
+import com.garfiec.librechat.feature.agents.components.model.AgentAdvancedSettings
-data class AgentAdvancedSettings(
-    val temperature: Float? = null,
-    val topP: Float? = null,
-    val maxTokens: Int? = null,
-)
 
 @Composable
 fun AgentAdvancedPanel(

feature/agents/src/commonMain/kotlin/com/garfiec/librechat/feature/agents/components/AgentCapabilitiesSection.kt

@@ -20,13 +20,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import librechat_mobile.feature.agents.generated.resources.Res
 import librechat_mobile.feature.agents.generated.resources.*
-
+import com.garfiec.librechat.feature.agents.components.model.AgentCapabilities
-data class AgentCapabilities(
-    val artifacts: Boolean = false,
-    val endAfterTools: Boolean = false,
-    val hideSequentialOutputs: Boolean = false,
-    val recursionLimit: Int = 25,
-)
 
 @Composable
 fun AgentCapabilitiesSection(

feature/agents/src/commonMain/kotlin/com/garfiec/librechat/feature/agents/components/AgentSharingSection.kt

@@ -33,18 +33,8 @@ import org.jetbrains.compose.resources.stringResource
 import androidx.compose.ui.unit.dp
 import librechat_mobile.feature.agents.generated.resources.Res
 import librechat_mobile.feature.agents.generated.resources.*
-
+import com.garfiec.librechat.feature.agents.components.model.AgentSharingState
-enum class AgentVisibility(val label: String) {
+import com.garfiec.librechat.feature.agents.components.model.AgentVisibility
-    PRIVATE("Private"),
-    TEAM("Team"),
-    PUBLIC("Public"),
-}
-
-@androidx.compose.runtime.Immutable
-data class AgentSharingState(
-    val visibility: AgentVisibility = AgentVisibility.PRIVATE,
-    val isCollaborative: Boolean = false,
-)
 
 /** Visibility (Private/Team/Public) and collaborative toggle; maps to agent model isPublic/isCollaborative. */
 @OptIn(ExperimentalMaterial3Api::class)

feature/agents/src/commonMain/kotlin/com/garfiec/librechat/feature/agents/components/AgentSupportContactSection.kt

@@ -13,12 +13,7 @@ import org.jetbrains.compose.resources.stringResource
 import androidx.compose.ui.unit.dp
 import librechat_mobile.feature.agents.generated.resources.Res
 import librechat_mobile.feature.agents.generated.resources.*
-
+import com.garfiec.librechat.feature.agents.components.model.SupportContactState
-@androidx.compose.runtime.Immutable
-data class SupportContactState(
-    val name: String = "",
-    val email: String = "",
-)
 
 @Composable
 fun AgentSupportContactSection(

feature/agents/src/commonMain/kotlin/com/garfiec/librechat/feature/agents/components/AgentVersionHistory.kt

@@ -25,12 +25,7 @@ import org.jetbrains.compose.resources.stringResource
 import androidx.compose.ui.unit.dp
 import librechat_mobile.feature.agents.generated.resources.Res
 import librechat_mobile.feature.agents.generated.resources.*
-
+import com.garfiec.librechat.feature.agents.components.model.AgentVersion
-data class AgentVersion(
-    val version: Int,
-    val updatedAt: String?,
-    val isCurrent: Boolean = false,
-)
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable

feature/agents/src/commonMain/kotlin/com/garfiec/librechat/feature/agents/components/model/AgentAdvancedSettings.kt

@@ -0,0 +1,7 @@
+package com.garfiec.librechat.feature.agents.components.model
+
+data class AgentAdvancedSettings(
+    val temperature: Float? = null,
+    val topP: Float? = null,
+    val maxTokens: Int? = null,
+)

feature/agents/src/commonMain/kotlin/com/garfiec/librechat/feature/agents/components/model/AgentCapabilities.kt

@@ -0,0 +1,8 @@
+package com.garfiec.librechat.feature.agents.components.model
+
+data class AgentCapabilities(
+    val artifacts: Boolean = false,
+    val endAfterTools: Boolean = false,
+    val hideSequentialOutputs: Boolean = false,
+    val recursionLimit: Int = 25,
+)

feature/agents/src/commonMain/kotlin/com/garfiec/librechat/feature/agents/components/model/AgentSharingState.kt

@@ -0,0 +1,7 @@
+package com.garfiec.librechat.feature.agents.components.model
+
+@androidx.compose.runtime.Immutable
+data class AgentSharingState(
+    val visibility: AgentVisibility = AgentVisibility.PRIVATE,
+    val isCollaborative: Boolean = false,
+)

feature/agents/src/commonMain/kotlin/com/garfiec/librechat/feature/agents/components/model/AgentVersion.kt

@@ -0,0 +1,7 @@
+package com.garfiec.librechat.feature.agents.components.model
+
+data class AgentVersion(
+    val version: Int,
+    val updatedAt: String?,
+    val isCurrent: Boolean = false,
+)

feature/agents/src/commonMain/kotlin/com/garfiec/librechat/feature/agents/components/model/AgentVisibility.kt

@@ -0,0 +1,7 @@
+package com.garfiec.librechat.feature.agents.components.model
+
+enum class AgentVisibility(val label: String) {
+    PRIVATE("Private"),
+    TEAM("Team"),
+    PUBLIC("Public"),
+}

feature/agents/src/commonMain/kotlin/com/garfiec/librechat/feature/agents/components/model/SupportContactState.kt

@@ -0,0 +1,7 @@
+package com.garfiec.librechat.feature.agents.components.model
+
+@androidx.compose.runtime.Immutable
+data class SupportContactState(
+    val name: String = "",
+    val email: String = "",
+)

feature/agents/src/commonMain/kotlin/com/garfiec/librechat/feature/agents/util/OpenApiParseResult.kt

@@ -0,0 +1,12 @@
+package com.garfiec.librechat.feature.agents.util
+
+import com.garfiec.librechat.core.model.request.FunctionTool
+
+/**
+ * Result of parsing an OpenAPI spec.
+ */
+data class OpenApiParseResult(
+    val domain: String,
+    val functions: List<FunctionTool>,
+    val errors: List<String> = emptyList(),
+)

feature/agents/src/commonMain/kotlin/com/garfiec/librechat/feature/agents/util/OpenApiSpecParser.kt

@@ -12,25 +12,6 @@ import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 
-/**
- * Result of parsing an OpenAPI spec.
- */
-data class OpenApiParseResult(
-    val domain: String,
-    val functions: List<FunctionTool>,
-    val errors: List<String> = emptyList(),
-)
-
-/**
- * Represents a parsed function for display in the available actions table.
- */
-data class ParsedFunctionInfo(
-    val name: String,
-    val method: String,
-    val path: String,
-    val description: String,
-)
-
 /**
  * Parses an OpenAPI specification and extracts function definitions.
  *

feature/agents/src/commonMain/kotlin/com/garfiec/librechat/feature/agents/util/ParsedFunctionInfo.kt

@@ -0,0 +1,11 @@
+package com.garfiec.librechat.feature.agents.util
+
+/**
+ * Represents a parsed function for display in the available actions table.
+ */
+data class ParsedFunctionInfo(
+    val name: String,
+    val method: String,
+    val path: String,
+    val description: String,
+)

feature/agents/src/commonMain/kotlin/com/garfiec/librechat/feature/agents/viewmodel/AgentEditorViewModel.kt

@@ -24,13 +24,13 @@ import com.garfiec.librechat.core.model.request.UpdateAgentRequest
 import com.garfiec.librechat.feature.agents.AgentActionDisplayData
 import com.garfiec.librechat.feature.agents.AgentHandoffDisplayData
 import com.garfiec.librechat.feature.agents.AgentToolDisplayData
-import com.garfiec.librechat.feature.agents.components.AgentAdvancedSettings
-import com.garfiec.librechat.feature.agents.components.AgentCapabilities
-import com.garfiec.librechat.feature.agents.components.AgentSharingState
-import com.garfiec.librechat.feature.agents.components.AgentVersion
-import com.garfiec.librechat.feature.agents.components.AgentVisibility
 import com.garfiec.librechat.feature.agents.components.ModelOption
-import com.garfiec.librechat.feature.agents.components.SupportContactState
+import com.garfiec.librechat.feature.agents.components.model.AgentAdvancedSettings
+import com.garfiec.librechat.feature.agents.components.model.AgentCapabilities
+import com.garfiec.librechat.feature.agents.components.model.AgentSharingState
+import com.garfiec.librechat.feature.agents.components.model.AgentVersion
+import com.garfiec.librechat.feature.agents.components.model.AgentVisibility
+import com.garfiec.librechat.feature.agents.components.model.SupportContactState
 import com.garfiec.librechat.feature.agents.util.OpenApiSpecParser
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow

feature/auth/src/androidUnitTest/kotlin/com/garfiec/librechat/feature/auth/viewmodel/LoginViewModelTest.kt

@@ -6,7 +6,7 @@ import com.garfiec.librechat.core.data.datastore.ServerDataStore
 import com.garfiec.librechat.core.data.repository.AuthRepository
 import com.garfiec.librechat.core.data.repository.ConfigRepository
 import com.garfiec.librechat.core.model.LoginOutcome
-import com.garfiec.librechat.core.model.StartupConfig
+import com.garfiec.librechat.core.model.config.StartupConfig
 import com.garfiec.librechat.core.model.User
 import com.garfiec.librechat.feature.auth.oauth.OAuthLauncher
 import io.mockk.coEvery

feature/auth/src/androidUnitTest/kotlin/com/garfiec/librechat/feature/auth/viewmodel/RegisterViewModelTest.kt

@@ -4,7 +4,7 @@ import com.google.common.truth.Truth.assertThat
 import com.garfiec.librechat.core.common.result.Result
 import com.garfiec.librechat.core.data.repository.AuthRepository
 import com.garfiec.librechat.core.data.repository.ConfigRepository
-import com.garfiec.librechat.core.model.StartupConfig
+import com.garfiec.librechat.core.model.config.StartupConfig
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.every

feature/chat/src/androidMain/kotlin/com/garfiec/librechat/feature/chat/components/ChatInput.kt

@@ -51,8 +51,8 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
-import com.garfiec.librechat.feature.chat.McpServerDisplayData
+import com.garfiec.librechat.feature.chat.model.McpServerDisplayData
-import com.garfiec.librechat.feature.chat.PromptMentionDisplayData
+import com.garfiec.librechat.feature.chat.model.PromptMentionDisplayData
 import librechat_mobile.feature.chat.generated.resources.Res
 import librechat_mobile.feature.chat.generated.resources.*
 import java.io.File

feature/chat/src/androidMain/kotlin/com/garfiec/librechat/feature/chat/components/ContentPartRenderer.kt

@@ -3,7 +3,7 @@ package com.garfiec.librechat.feature.chat.components
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.LayoutCoordinates
-import com.garfiec.librechat.core.model.MessageContentPart
+import com.garfiec.librechat.core.model.content.MessageContentPart
 
 @Composable
 actual fun ContentPartRenderer(

feature/chat/src/androidMain/kotlin/com/garfiec/librechat/feature/chat/screen/ChatScreen.kt

@@ -74,7 +74,7 @@ import com.garfiec.librechat.core.common.EndpointConstants
 import com.garfiec.librechat.core.data.datastore.ChatFontSize
 import com.garfiec.librechat.core.data.datastore.LatexRenderer
 import com.garfiec.librechat.core.model.ContentType
-import com.garfiec.librechat.core.model.MessageContentPart
+import com.garfiec.librechat.core.model.content.MessageContentPart
 import com.garfiec.librechat.core.ui.components.LoadingIndicator
 import com.garfiec.librechat.core.ui.components.ModelParameterSheet
 import librechat_mobile.feature.chat.generated.resources.Res

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/ChatDisplayData.kt

@@ -1,26 +0,0 @@
-package com.garfiec.librechat.feature.chat
-
-import androidx.compose.runtime.Immutable
-
-@Immutable
-data class PresetDisplayData(
-    val presetId: String?,
-    val title: String,
-    val endpointLabel: String?,
-    val model: String?,
-)
-
-@Immutable
-data class PromptMentionDisplayData(
-    val name: String,
-    val command: String?,
-    val oneliner: String?,
-)
-
-@Immutable
-data class McpServerDisplayData(
-    val name: String,
-    val title: String?,
-    val description: String?,
-    val isConnected: Boolean,
-)

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/AttachmentChipsRow.kt

@@ -52,7 +52,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import com.garfiec.librechat.core.common.ToolConstants
-import com.garfiec.librechat.feature.chat.McpServerDisplayData
+import com.garfiec.librechat.feature.chat.model.McpServerDisplayData
 import librechat_mobile.feature.chat.generated.resources.Res
 import librechat_mobile.feature.chat.generated.resources.*
 

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/ChatInputParsing.kt

@@ -1,6 +1,6 @@
 package com.garfiec.librechat.feature.chat.components
 
-import com.garfiec.librechat.feature.chat.PromptMentionDisplayData
+import com.garfiec.librechat.feature.chat.model.PromptMentionDisplayData
 
 /**
  * Extracts the @mention query from the input text.

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/ChatInputToolbar.kt

@@ -35,7 +35,7 @@ import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import com.garfiec.librechat.core.common.ToolConstants
-import com.garfiec.librechat.feature.chat.McpServerDisplayData
+import com.garfiec.librechat.feature.chat.model.McpServerDisplayData
 import librechat_mobile.feature.chat.generated.resources.Res
 import librechat_mobile.feature.chat.generated.resources.*
 

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/ChatToolsBottomSheet.kt

@@ -54,7 +54,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.garfiec.librechat.core.common.ToolConstants
-import com.garfiec.librechat.feature.chat.McpServerDisplayData
+import com.garfiec.librechat.feature.chat.model.McpServerDisplayData
 import librechat_mobile.feature.chat.generated.resources.Res
 import librechat_mobile.feature.chat.generated.resources.*
 

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/CommonChatInputCore.kt

@@ -41,7 +41,7 @@ import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.garfiec.librechat.feature.chat.McpServerDisplayData
+import com.garfiec.librechat.feature.chat.model.McpServerDisplayData
 import librechat_mobile.feature.chat.generated.resources.Res
 import librechat_mobile.feature.chat.generated.resources.cd_send_message
 import librechat_mobile.feature.chat.generated.resources.cd_start_voice_recording

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/McpServerSelector.kt

@@ -33,7 +33,7 @@ import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.garfiec.librechat.feature.chat.McpServerDisplayData
+import com.garfiec.librechat.feature.chat.model.McpServerDisplayData
 import librechat_mobile.feature.chat.generated.resources.Res
 import librechat_mobile.feature.chat.generated.resources.*
 

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/PlatformChatComponents.kt

@@ -5,7 +5,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.LayoutCoordinates
 import com.garfiec.librechat.core.common.ChatLayoutConstants
 import com.garfiec.librechat.core.model.Message
-import com.garfiec.librechat.core.model.MessageContentPart
+import com.garfiec.librechat.core.model.content.MessageContentPart
 
 /** Platform-specific message bubble. */
 @Composable

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/PresetPicker.kt

@@ -28,7 +28,7 @@ import androidx.compose.ui.Modifier
 import org.jetbrains.compose.resources.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.garfiec.librechat.feature.chat.PresetDisplayData
+import com.garfiec.librechat.feature.chat.model.PresetDisplayData
 import librechat_mobile.feature.chat.generated.resources.Res
 import librechat_mobile.feature.chat.generated.resources.*
 

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/SharedContentParts.kt

@@ -48,7 +48,7 @@ import coil3.compose.SubcomposeAsyncImage
 import com.garfiec.librechat.core.common.ToolConstants
 import com.garfiec.librechat.core.model.Attachment
 import com.garfiec.librechat.core.model.ContentType
-import com.garfiec.librechat.core.model.MessageContentPart
+import com.garfiec.librechat.core.model.content.MessageContentPart
 import com.garfiec.librechat.feature.chat.components.artifact.Artifact
 import com.garfiec.librechat.feature.chat.components.artifact.ArtifactButton
 import com.garfiec.librechat.feature.chat.components.artifact.ArtifactPanel

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/SlashCommandMenu.kt

@@ -10,7 +10,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.garfiec.librechat.feature.chat.PromptMentionDisplayData
+import com.garfiec.librechat.feature.chat.model.PromptMentionDisplayData
 
 /**
  * Dropdown menu showing slash command suggestions.

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/ToolCallParsing.kt

@@ -1,6 +1,6 @@
 package com.garfiec.librechat.feature.chat.components
 
-import com.garfiec.librechat.core.model.AgentToolCall
+import com.garfiec.librechat.core.model.content.AgentToolCall
 import com.garfiec.librechat.core.model.Attachment
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/artifact/Artifact.kt

@@ -0,0 +1,26 @@
+package com.garfiec.librechat.feature.chat.components.artifact
+
+/**
+ * Parsed artifact extracted from message content. Artifacts are marked in LLM
+ * responses using the remark-directive markdown format:
+ *
+ * ```
+ * :::artifact{identifier="id" type="mime-type" title="Title"}
+ * ```language
+ * ...content...
+ * ```
+ * :::
+ * ```
+ *
+ * Supported types: text/html, image/svg+xml, application/vnd.react,
+ * application/vnd.mermaid, text/markdown, text/md, text/plain,
+ * application/vnd.code-html.
+ */
+data class Artifact(
+    val identifier: String,
+    val type: String,
+    val title: String,
+    val language: String?,
+    val content: String,
+    val version: Int = 1,
+)

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/artifact/ArtifactDetector.kt

@@ -1,38 +1,5 @@
 package com.garfiec.librechat.feature.chat.components.artifact
 
-/**
- * Parsed artifact extracted from message content. Artifacts are marked in LLM
- * responses using the remark-directive markdown format:
- *
- * ```
- * :::artifact{identifier="id" type="mime-type" title="Title"}
- * ```language
- * ...content...
- * ```
- * :::
- * ```
- *
- * Supported types: text/html, image/svg+xml, application/vnd.react,
- * application/vnd.mermaid, text/markdown, text/md, text/plain,
- * application/vnd.code-html.
- */
-data class Artifact(
-    val identifier: String,
-    val type: String,
-    val title: String,
-    val language: String?,
-    val content: String,
-    val version: Int = 1,
-)
-
-/**
- * Segment of message text that is either plain content or an artifact.
- */
-sealed interface ArtifactSegment {
-    data class Text(val text: String) : ArtifactSegment
-    data class ArtifactReference(val artifact: Artifact) : ArtifactSegment
-}
-
 /**
  * Matches the remark-directive artifact format:
  *   :::artifact{key="value" ...}

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/components/artifact/ArtifactSegment.kt

@@ -0,0 +1,9 @@
+package com.garfiec.librechat.feature.chat.components.artifact
+
+/**
+ * Segment of message text that is either plain content or an artifact.
+ */
+sealed interface ArtifactSegment {
+    data class Text(val text: String) : ArtifactSegment
+    data class ArtifactReference(val artifact: Artifact) : ArtifactSegment
+}

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/model/McpServerDisplayData.kt

@@ -0,0 +1,11 @@
+package com.garfiec.librechat.feature.chat.model
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+data class McpServerDisplayData(
+    val name: String,
+    val title: String?,
+    val description: String?,
+    val isConnected: Boolean,
+)

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/model/PresetDisplayData.kt

@@ -0,0 +1,11 @@
+package com.garfiec.librechat.feature.chat.model
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+data class PresetDisplayData(
+    val presetId: String?,
+    val title: String,
+    val endpointLabel: String?,
+    val model: String?,
+)

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/model/PromptMentionDisplayData.kt

@@ -0,0 +1,10 @@
+package com.garfiec.librechat.feature.chat.model
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+data class PromptMentionDisplayData(
+    val name: String,
+    val command: String?,
+    val oneliner: String?,
+)

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/viewmodel/ChatUiState.kt

@@ -8,9 +8,9 @@ import com.garfiec.librechat.core.data.datastore.LatexRenderer
 import com.garfiec.librechat.core.model.Agent
 import com.garfiec.librechat.core.model.EndpointConfig
 import com.garfiec.librechat.core.ui.components.ModelParameters
-import com.garfiec.librechat.feature.chat.McpServerDisplayData
+import com.garfiec.librechat.feature.chat.model.McpServerDisplayData
-import com.garfiec.librechat.feature.chat.PresetDisplayData
+import com.garfiec.librechat.feature.chat.model.PresetDisplayData
-import com.garfiec.librechat.feature.chat.PromptMentionDisplayData
+import com.garfiec.librechat.feature.chat.model.PromptMentionDisplayData
 import com.garfiec.librechat.feature.chat.util.MessageNode
 
 enum class ChatScreenState { LANDING, LOADING, ACTIVE }

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/viewmodel/ChatViewModel.kt

@@ -27,8 +27,8 @@ import com.garfiec.librechat.core.model.Preset
 import com.garfiec.librechat.core.model.StreamEvent
 import com.garfiec.librechat.core.model.request.EphemeralAgent
 import com.garfiec.librechat.core.ui.components.ModelParameters
-import com.garfiec.librechat.feature.chat.PresetDisplayData
+import com.garfiec.librechat.feature.chat.model.PresetDisplayData
-import com.garfiec.librechat.feature.chat.PromptMentionDisplayData
+import com.garfiec.librechat.feature.chat.model.PromptMentionDisplayData
 import com.garfiec.librechat.feature.chat.components.AttachedFile
 import com.garfiec.librechat.feature.chat.util.NEW_CHAT_DRAFT_KEY
 import com.garfiec.librechat.feature.chat.util.buildActiveMessagePath

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/viewmodel/delegate/EModelEndpointExtensions.kt

@@ -0,0 +1,15 @@
+package com.garfiec.librechat.feature.chat.viewmodel.delegate
+
+import com.garfiec.librechat.core.model.EModelEndpoint
+
+internal fun EModelEndpoint.toSerialName(): String = when (this) {
+    EModelEndpoint.AZURE_OPENAI -> "azureOpenAI"
+    EModelEndpoint.OPENAI -> "openAI"
+    EModelEndpoint.GOOGLE -> "google"
+    EModelEndpoint.ANTHROPIC -> "anthropic"
+    EModelEndpoint.ASSISTANTS -> "assistants"
+    EModelEndpoint.AZURE_ASSISTANTS -> "azureAssistants"
+    EModelEndpoint.AGENTS -> "agents"
+    EModelEndpoint.CUSTOM -> "custom"
+    EModelEndpoint.BEDROCK -> "bedrock"
+}

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/viewmodel/delegate/ModelSelectionDelegate.kt

@@ -11,7 +11,7 @@ import com.garfiec.librechat.core.model.EModelEndpoint
 import com.garfiec.librechat.core.model.mcp.McpServer
 import com.garfiec.librechat.core.model.request.AddedConversation
 import com.garfiec.librechat.core.ui.components.ModelParameters
-import com.garfiec.librechat.feature.chat.McpServerDisplayData
+import com.garfiec.librechat.feature.chat.model.McpServerDisplayData
 import com.garfiec.librechat.feature.chat.viewmodel.ChatScreenState
 import com.garfiec.librechat.feature.chat.viewmodel.ChatStateHandle
 import com.garfiec.librechat.feature.chat.viewmodel.ComparisonState
@@ -343,15 +343,3 @@ internal fun McpServer.toDisplayData() = McpServerDisplayData(
     description = description,
     isConnected = isConnected,
 )
-
-internal fun EModelEndpoint.toSerialName(): String = when (this) {
-    EModelEndpoint.AZURE_OPENAI -> "azureOpenAI"
-    EModelEndpoint.OPENAI -> "openAI"
-    EModelEndpoint.GOOGLE -> "google"
-    EModelEndpoint.ANTHROPIC -> "anthropic"
-    EModelEndpoint.ASSISTANTS -> "assistants"
-    EModelEndpoint.AZURE_ASSISTANTS -> "azureAssistants"
-    EModelEndpoint.AGENTS -> "agents"
-    EModelEndpoint.CUSTOM -> "custom"
-    EModelEndpoint.BEDROCK -> "bedrock"
-}

feature/chat/src/commonMain/kotlin/com/garfiec/librechat/feature/chat/viewmodel/delegate/PresetPromptDelegate.kt

@@ -6,8 +6,8 @@ import com.garfiec.librechat.core.data.repository.PromptRepository
 import com.garfiec.librechat.core.model.EModelEndpoint
 import com.garfiec.librechat.core.model.Preset
 import com.garfiec.librechat.core.model.PromptGroup
-import com.garfiec.librechat.feature.chat.PresetDisplayData
+import com.garfiec.librechat.feature.chat.model.PresetDisplayData
-import com.garfiec.librechat.feature.chat.PromptMentionDisplayData
+import com.garfiec.librechat.feature.chat.model.PromptMentionDisplayData
 import com.garfiec.librechat.feature.chat.viewmodel.ChatStateHandle
 import kotlinx.coroutines.launch
 import co.touchlab.kermit.Logger

feature/chat/src/iosMain/kotlin/com/garfiec/librechat/feature/chat/components/IosChatInput.kt

@@ -26,7 +26,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.garfiec.librechat.feature.chat.McpServerDisplayData
+import com.garfiec.librechat.feature.chat.model.McpServerDisplayData
 import librechat_mobile.feature.chat.generated.resources.Res
 import librechat_mobile.feature.chat.generated.resources.cd_attach_file
 import librechat_mobile.feature.chat.generated.resources.cd_paste_image