From 75e0f25def0681f285db33a511838974b2eab0ed Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Wed, 21 Oct 2026 12:57:28 +0000 Subject: [PATCH] Hermes Conduit Android v1 (MVP): Login, Session-Liste, Streaming-Chat, Profile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Kotlin + Jetpack Compose (Material 3, Dark Theme), minSdk 26, target 35 - Auth-Flow wie iOS Conduit: password-login → /api/auth/me → ws-ticket → WS - JSON-RPC 2.0 über WS-Textframes, 1:1 portiert aus Conduit/Services/HermesClient.swift - Streaming (message.delta/complete), Markdown mit Code-Highlighting (mikepenz) - Profile-Anzeige/-Wechsel, Kontext-Auslastungs-Balken aus session.usage - Zugangsdaten via EncryptedSharedPreferences (Android Keystore) - Netzwerk-Core Android-frei → JVM-Live-Test gegen das echte Dashboard --- .gitignore | 17 + README.md | 116 ++++++ app/build.gradle.kts | 74 ++++ app/src/main/AndroidManifest.xml | 24 ++ .../de/derittyp/hermesconduit/AppViewModel.kt | 330 ++++++++++++++++ .../derittyp/hermesconduit/CredentialStore.kt | 37 ++ .../de/derittyp/hermesconduit/MainActivity.kt | 116 ++++++ .../derittyp/hermesconduit/core/AuthClient.kt | 117 ++++++ .../hermesconduit/core/HermesClient.kt | 366 ++++++++++++++++++ .../de/derittyp/hermesconduit/core/Json.kt | 67 ++++ .../de/derittyp/hermesconduit/core/Models.kt | 52 +++ .../derittyp/hermesconduit/ui/ChatScreen.kt | 240 ++++++++++++ .../derittyp/hermesconduit/ui/LoginScreen.kt | 124 ++++++ .../hermesconduit/ui/MarkdownMessage.kt | 45 +++ .../hermesconduit/ui/SessionsScreen.kt | 193 +++++++++ .../derittyp/hermesconduit/ui/theme/Theme.kt | 39 ++ app/src/main/res/drawable/ic_launcher.xml | 12 + app/src/main/res/values/themes.xml | 6 + .../hermesconduit/core/LiveGatewayTest.kt | 154 ++++++++ build.gradle.kts | 6 + gradle.properties | 6 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 ++++++++++++ gradlew.bat | 94 +++++ settings.gradle.kts | 16 + 26 files changed, 2510 insertions(+) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 app/build.gradle.kts create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/de/derittyp/hermesconduit/AppViewModel.kt create mode 100644 app/src/main/java/de/derittyp/hermesconduit/CredentialStore.kt create mode 100644 app/src/main/java/de/derittyp/hermesconduit/MainActivity.kt create mode 100644 app/src/main/java/de/derittyp/hermesconduit/core/AuthClient.kt create mode 100644 app/src/main/java/de/derittyp/hermesconduit/core/HermesClient.kt create mode 100644 app/src/main/java/de/derittyp/hermesconduit/core/Json.kt create mode 100644 app/src/main/java/de/derittyp/hermesconduit/core/Models.kt create mode 100644 app/src/main/java/de/derittyp/hermesconduit/ui/ChatScreen.kt create mode 100644 app/src/main/java/de/derittyp/hermesconduit/ui/LoginScreen.kt create mode 100644 app/src/main/java/de/derittyp/hermesconduit/ui/MarkdownMessage.kt create mode 100644 app/src/main/java/de/derittyp/hermesconduit/ui/SessionsScreen.kt create mode 100644 app/src/main/java/de/derittyp/hermesconduit/ui/theme/Theme.kt create mode 100644 app/src/main/res/drawable/ic_launcher.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/test/java/de/derittyp/hermesconduit/core/LiveGatewayTest.kt create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fad7c4b --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# Android +local.properties +*.iml +.idea/ +.gradle/ +build/ +*/build/ +captures/ +.externalNativeBuild/ +.cxx/ +*.apk +*.keystore +!debug.keystore + +# Credentials — NIEMALS committen +*.env +secrets.properties diff --git a/README.md b/README.md new file mode 100644 index 0000000..606c987 --- /dev/null +++ b/README.md @@ -0,0 +1,116 @@ +# Hermes Conduit — Android + +Nativer Android-Client für einen self-hosted [Hermes Agent](https://hermes-agent.nousresearch.com) +über das Dashboard-Gateway. Android-Pendant zur iOS-App +[Hermes Conduit](https://github.com/kaishi00/hermes-conduit) (SwiftUI, MIT) — das RPC-Protokoll +ist 1:1 von dort portiert. + +**UI-Sprache: Deutsch.** Dark Theme (Hermes-Look) ist Standard. + +## Features (v1, MVP) + +- **Login**: Host, Port, Benutzername, Passwort (Host/Port vorbefüllt mit `100.64.0.8` / `9119`). + Zugangsdaten werden verschlüsselt via `EncryptedSharedPreferences` (Android Keystore) gespeichert; + Auto-Login beim nächsten Start. +- **Session-Liste**: Titel, ID, Nachrichtenzahl, Suche, Pull-to-Reload via Refresh-Button, + neue Session anlegen. +- **Chat**: Streaming-Antworten (Live-Deltas), Markdown-Rendering mit Syntax-Highlighting + für Code-Blöcke, Tool-Aufruf-Zeilen, Abbruch-Button, Verlauf via `session.resume`. +- **Profile**: Anzeige und Wechsel der Hermes-Profile (`profiles.list`), Session-Liste lädt + profil-scoped neu. +- **Kontext-Auslastung**: Fortschrittsbalken im Chat-Header aus `session.usage`/`context.update`-Events. + +Nicht in v1: Voice, Push, Kanban, Attachments/Bilder, OAuth, Approval/Clarify-Dialogs +(Server-Requests werden mit `-32601` abgelehnt, damit Tools nicht hängen). + +## Build + +Voraussetzungen: JDK 17, Android SDK (cmdline-tools, platform-35, build-tools 35.0.0). + +```bash +export ANDROID_HOME=/root/android-sdk # oder eigenes SDK; alternativ local.properties mit sdk.dir +./gradlew assembleDebug +# APK: app/build/outputs/apk/debug/app-debug.apk +``` + +## Architektur + +``` +app/src/main/java/de/derittyp/hermesconduit/ +├── core/ # Android-frei (reines JVM+OkHttp+kotlinx.serialization) → JVM-testbar +│ ├── AuthClient.kt # HTTP-Auth: password-login, /api/auth/me, ws-ticket, CookieJar +│ ├── HermesClient.kt # JSON-RPC 2.0 über WS-Textframes, Event-Parser, RPC-Methoden +│ ├── Models.kt # StreamEvent, SessionSummary, ChatMessage, RpcException +│ └── Json.kt # kotlinx.serialization Helfer +├── AppViewModel.kt # StateFlow-basierter UI-State, Event-Kollektion +├── CredentialStore.kt # EncryptedSharedPreferences (Keystore) +├── MainActivity.kt # Compose Navigation (login/sessions/chat) +└── ui/ # LoginScreen, SessionsScreen, ChatScreen, MarkdownMessage, Theme +``` + +## Auth-Flow (verifiziert gegen Live-Dashboard am 2026-10-21) + +1. `POST /auth/password-login` — JSON `{username, password, provider:"basic"}` + → `{"ok":true}` + `Set-Cookie: hermes_session_at, hermes_session_rt, hermes_session_provider` +2. `GET /api/auth/me` (mit Cookies) → `{"user_id":"...", ...}` +3. `POST /api/auth/ws-ticket` (mit Cookies) → `{"ticket":"...", "ttl_seconds":30}` (single-use) +4. WebSocket: `ws:///api/ws?ticket=` + +Das Refresh-Cookie hat 30 Tage TTL; der Server refresht das Access-Cookie transparent. +Die App speichert v1 keine Cookies, sondern loggt bei Bedarf erneut ein (Credentials liegen +verschlüsselt vor). Ablauf der Session → Fehler in der UI → erneutes Einloggen. + +## RPC-Protokoll (Port von iOS `Conduit/Services/HermesClient.swift`) + +- Frames: JSON-RPC 2.0 **Textframes**. Client-Requests mit Integer-`id`; Responses matchen die `id`. +- Events: `{"method":"event","params":{"type":...,"session_id":...,"payload":{...}}}` +- Server→Client-Requests (`method` + String-`id`): v1 lehnt alle mit `-32601` ab. +- Auf `gateway.ready` antwortet der Client mit `client.capabilities {server_requests: true}`. +- Nicht-default-Profil: `profile`-Param wird an jede scoped RPC gehängt. + +Genutzte Methoden: `session.list`, `session.resume` (`cols:96, source:"android", inline_images:false`), +`session.create`, `session.title`, `session.interrupt`, `prompt.submit` (`session_id, text, surface`), +`profiles.list`, `session.delete` (optional, nur zum Aufräumen von Test-Sessions). + +**ID-Modell (live verifiziert):** `session.list` liefert die *stored* id (z. B. `20261021_130231_e692eb`), +`session.resume`/`session.delete` verlangen sie. `session.create` liefert beide +(`session_id` = kurze Runtime-id, `stored_session_id`). `prompt.submit`/`session.title` akzeptieren +die Runtime-id; die Resume-Antwort liefert sie als `session_id` zurück — die App nutzt nach dem +Resume die Runtime-id für Sends und zum Matchen von Streaming-Events. `session.delete` verweigert +aktive Sessions (4023) und doppelte Titel werden mit 4022 abgelehnt. + +Streaming-Events: `message.start/delta/complete`, `tool.start/tool.complete`, `session.busy`, +`session.usage`/`context.update` (Kontext-Balken), `sessions.changed` (triggert Reload, 800 ms debounced). + +## Live-Test + +Der Netzwerk-Core ist bewusst Android-frei und damit auf der JVM gegen das echte +Dashboard testbar: + +```bash +HERMES_TEST_PASSWORD='' ./gradlew :app:testDebugUnitTest --tests '*LiveGatewayTest' +``` + +Der Test (ohne Env-Var automatisch übersprungen, Credentials nie im Repo): +login → me → ws-ticket → connect → `session.list` → `profiles.list` → `session.resume` +(readonly) → **neue Test-Session** `conduit-android-test` anlegen → eine kurze Nachricht senden +(startet den echten Agenten, kostet Tokens!) → Streaming-Antwort abwarten → Verlauf prüfen → +Test-Session löschen (falls der Gateway `session.delete` kann, sonst bleibt sie bestehen). +Zusätzlich Negativtest: falsches Passwort schlägt fehl. + +**Wichtig:** Nie in bestehenden Sessions (z. B. WhatsApp-Hauptsession) Nachrichten senden. + +## Bekannte TODOs für v2 + +- Cookie-Persistenz + transparentes Session-Refresh statt erneutem Passwort-Login +- Approval-/Clarify-Dialoge (Server→Client-Requests beantworten statt ablehnen) +- Attachments/Bilder (`image.attach_bytes`, REST-History `/api/sessions/{id}/messages` + für paginierte History statt Full-Resume) +- REST-History-Hydration wie iOS (bounded pages) statt komplettem Transcript im Resume +- Voice, Push-Benachrichtigungen, Kanban-Tab, OAuth (RFC 8252 Native Flow) +- Reconnect-Logik mit Backoff bei Socket-Verlust +- Release-Signing, adaptive Icons, Edge-to-Edge-Padding-Feinschliff + +## Lizenz + +MIT (wie die iOS-Referenz-App). diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..a719776 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,74 @@ +plugins { + id("com.android.application") + kotlin("android") + kotlin("plugin.compose") + kotlin("plugin.serialization") +} + +android { + namespace = "de.derittyp.hermesconduit" + compileSdk = 35 + + defaultConfig { + applicationId = "de.derittyp.hermesconduit" + minSdk = 26 + targetSdk = 35 + versionCode = 1 + versionName = "1.0" + } + + buildTypes { + debug { + applicationIdSuffix = ".debug" + } + release { + isMinifyEnabled = false + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlinOptions { jvmTarget = "17" } + buildFeatures { compose = true } + packaging { + resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } + } +} + +kotlin { + jvmToolchain(17) +} + +dependencies { + val composeBom = platform("androidx.compose:compose-bom:2024.12.01") + implementation(composeBom) + androidTestImplementation(composeBom) + + implementation("androidx.core:core-ktx:1.15.0") + implementation("androidx.activity:activity-compose:1.9.3") + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-tooling-preview") + implementation("androidx.compose.material3:material3") + implementation("androidx.compose.material:material-icons-extended") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7") + implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.7") + implementation("androidx.navigation:navigation-compose:2.8.5") + implementation("androidx.security:security-crypto:1.1.0-alpha06") + + implementation("com.squareup.okhttp3:okhttp:4.12.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0") + + // Markdown mit Code-Highlighting (Compose) + implementation("com.mikepenz:multiplatform-markdown-renderer-m3-android:0.27.0") + implementation("com.mikepenz:multiplatform-markdown-renderer-code-android:0.27.0") + + debugImplementation("androidx.compose.ui:ui-tooling") + + testImplementation("junit:junit:4.13.2") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + testImplementation("com.squareup.okhttp3:okhttp:4.12.0") + testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..edab608 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/java/de/derittyp/hermesconduit/AppViewModel.kt b/app/src/main/java/de/derittyp/hermesconduit/AppViewModel.kt new file mode 100644 index 0000000..f0643eb --- /dev/null +++ b/app/src/main/java/de/derittyp/hermesconduit/AppViewModel.kt @@ -0,0 +1,330 @@ +package de.derittyp.hermesconduit + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import de.derittyp.hermesconduit.core.AuthClient +import de.derittyp.hermesconduit.core.ChatMessage +import de.derittyp.hermesconduit.core.HermesClient +import de.derittyp.hermesconduit.core.RpcException +import de.derittyp.hermesconduit.core.SessionSummary +import de.derittyp.hermesconduit.core.StreamEvent +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch + +data class UiState( + val loggedIn: Boolean = false, + val connecting: Boolean = false, + val loginError: String? = null, + val username: String = "", + val baseUrl: String = "", + val sessions: List = emptyList(), + val sessionsLoading: Boolean = false, + val sessionsError: String? = null, + val searchQuery: String = "", + val profiles: List = emptyList(), + val currentProfile: String = "default", + // Chat + val chatSessionId: String? = null, + val chatTitle: String = "", + val chatMessages: List = emptyList(), + val streamingText: String = "", + val streaming: Boolean = false, + val chatBusy: Boolean = false, + val chatLoading: Boolean = false, + val chatError: String? = null, + val contextPercent: Double? = null, + val contextUsed: Int = 0, + val contextMax: Int = 0, +) + +class AppViewModel : ViewModel() { + + private val _ui = MutableStateFlow(UiState()) + val ui: StateFlow = _ui + + private var authClient: AuthClient? = null + private var hermesClient: HermesClient? = null + private var eventJob: Job? = null + private var sessionsReloadJob: Job? = null + + fun tryAutoLogin(credentialStore: CredentialStore) { + val creds = credentialStore.load() ?: return + login(creds.host, creds.port, creds.username, creds.password, credentialStore, saveCredentials = false) + } + + fun login( + host: String, + port: String, + username: String, + password: String, + credentialStore: CredentialStore?, + saveCredentials: Boolean = true, + ) { + if (_ui.value.connecting) return + _ui.update { it.copy(connecting = true, loginError = null) } + viewModelScope.launch { + try { + val auth = AuthClient() + val baseUrl = auth.normalizeBaseUrl(host, port) + auth.login(baseUrl, username, password) + val me = auth.me(baseUrl) + val ticket = auth.wsTicket(baseUrl) + val client = HermesClient(auth.http) + client.connect(auth.wsUrl(baseUrl, ticket)) + authClient = auth + hermesClient = client + if (saveCredentials) { + credentialStore?.save( + CredentialStore.Credentials(host, port, username, password) + ) + } + collectEvents(client) + _ui.update { + it.copy( + loggedIn = true, + connecting = false, + username = me.str("user_id") ?: username, + baseUrl = baseUrl + ) + } + loadProfiles() + loadSessions() + } catch (e: Exception) { + _ui.update { + it.copy( + connecting = false, + loginError = e.message ?: "Verbindung fehlgeschlagen" + ) + } + } + } + } + + fun logout(credentialStore: CredentialStore) { + credentialStore.clear() + eventJob?.cancel() + hermesClient?.close() + hermesClient = null + authClient = null + _ui.value = UiState() + } + + private fun collectEvents(client: HermesClient) { + eventJob?.cancel() + eventJob = viewModelScope.launch { + client.events.collect { event -> + when (event) { + is StreamEvent.MessageStart -> ifCurrentSession(event.sessionId) { + _ui.update { it.copy(streaming = true, streamingText = "") } + } + is StreamEvent.MessageDelta -> ifCurrentSession(event.sessionId) { + _ui.update { it.copy(streaming = true, streamingText = it.streamingText + event.text) } + } + is StreamEvent.MessageComplete -> ifCurrentSession(event.sessionId) { + _ui.update { s -> + val text = event.content ?: s.streamingText + val msgs = if (text.isNotBlank()) { + s.chatMessages + ChatMessage( + id = "complete-${System.currentTimeMillis()}", + role = ChatMessage.Role.ASSISTANT, + content = text + ) + } else s.chatMessages + s.copy(chatMessages = msgs, streaming = false, streamingText = "", chatBusy = false) + } + } + is StreamEvent.ToolStart -> ifCurrentSession(event.sessionId) { + _ui.update { s -> + s.copy( + chatMessages = s.chatMessages + ChatMessage( + id = "tool-${System.currentTimeMillis()}-${event.name}", + role = ChatMessage.Role.SYSTEM, + content = "⚙ ${event.name}", + isTool = true + ) + ) + } + } + is StreamEvent.ToolComplete -> { /* Tool-Zeile bleibt stehen */ } + is StreamEvent.SessionBusy -> ifCurrentSession(event.sessionId) { + _ui.update { it.copy(chatBusy = event.busy, streaming = event.busy && it.streaming) } + } + is StreamEvent.ContextUpdate -> ifCurrentSession(event.sessionId) { + _ui.update { + it.copy( + contextPercent = event.percent, + contextUsed = event.used, + contextMax = event.max + ) + } + } + is StreamEvent.UserMessage -> { /* andere Clients: bei reload sichtbar */ } + is StreamEvent.Error -> ifCurrentSession(event.sessionId) { + _ui.update { it.copy(chatError = event.message, streaming = false, chatBusy = false) } + } + is StreamEvent.SessionsChanged -> { + sessionsReloadJob?.cancel() + sessionsReloadJob = viewModelScope.launch { + delay(800) + loadSessions() + } + } + is StreamEvent.SessionTitleEvent -> loadSessionsQuiet() + StreamEvent.Disconnected -> _ui.update { it.copy(chatError = "Verbindung getrennt") } + StreamEvent.GatewayReady -> {} + } + } + } + } + + private inline fun ifCurrentSession(sessionId: String, block: () -> Unit) { + val current = _ui.value.chatSessionId ?: return + // session_id aus Events ist die Runtime-ID; akzeptiere auch die gespeicherte ID. + if (sessionId.isBlank() || sessionId == current) block() + } + + fun loadSessions() { + val client = hermesClient ?: return + _ui.update { it.copy(sessionsLoading = true, sessionsError = null) } + viewModelScope.launch { + try { + val sessions = client.sessions() + _ui.update { it.copy(sessions = sessions, sessionsLoading = false) } + } catch (e: Exception) { + _ui.update { it.copy(sessionsLoading = false, sessionsError = e.message) } + } + } + } + + private fun loadSessionsQuiet() { + val client = hermesClient ?: return + viewModelScope.launch { + runCatching { client.sessions() }.onSuccess { sessions -> + _ui.update { it.copy(sessions = sessions) } + } + } + } + + fun loadProfiles() { + val client = hermesClient ?: return + viewModelScope.launch { + runCatching { client.profiles() }.onSuccess { profiles -> + _ui.update { it.copy(profiles = profiles) } + } + } + } + + fun switchProfile(profile: String) { + val client = hermesClient ?: return + client.profile = profile + _ui.update { it.copy(currentProfile = profile, sessions = emptyList()) } + loadSessions() + } + + fun setSearchQuery(q: String) = _ui.update { it.copy(searchQuery = q) } + + fun openSession(session: SessionSummary) { + val client = hermesClient ?: return + _ui.update { + it.copy( + chatSessionId = session.id, + chatTitle = session.title, + chatMessages = emptyList(), + chatLoading = true, + chatError = null, + streaming = false, + streamingText = "", + contextPercent = null + ) + } + viewModelScope.launch { + try { + val resume = client.resumeSession(session.id) + _ui.update { + it.copy( + chatSessionId = resume.sessionId, + chatMessages = resume.messages.filter { m -> m.role != ChatMessage.Role.SYSTEM || m.isTool }, + chatLoading = false + ) + } + } catch (e: Exception) { + _ui.update { it.copy(chatLoading = false, chatError = e.message) } + } + } + } + + fun createSession() { + val client = hermesClient ?: return + viewModelScope.launch { + _ui.update { it.copy(sessionsLoading = true) } + try { + val created = client.createSession() + // session.resume verlangt die STORED id; die Antwort liefert + // dann die Runtime-id, mit der prompt.submit arbeitet. + openSession( + SessionSummary( + created.storedSessionId ?: created.sessionId, + "Neue Session", "Hermes", null, null, client.profile + ) + ) + } catch (e: Exception) { + _ui.update { it.copy(sessionsLoading = false, sessionsError = e.message) } + } + } + } + + fun closeChat() = _ui.update { it.copy(chatSessionId = null, chatMessages = emptyList(), chatError = null) } + + fun sendMessage(text: String) { + val client = hermesClient ?: return + val sessionId = _ui.value.chatSessionId ?: return + if (text.isBlank()) return + _ui.update { s -> + s.copy( + chatMessages = s.chatMessages + ChatMessage( + id = "local-${System.currentTimeMillis()}", + role = ChatMessage.Role.USER, + content = text + ), + chatBusy = true, + chatError = null + ) + } + viewModelScope.launch { + try { + client.sendPrompt(sessionId, text) + } catch (e: Exception) { + _ui.update { + it.copy( + chatBusy = false, + chatError = when (e) { + is RpcException -> e.message + else -> "Senden fehlgeschlagen: ${e.message}" + } + ) + } + } + } + } + + fun interruptChat() { + val client = hermesClient ?: return + val sessionId = _ui.value.chatSessionId ?: return + viewModelScope.launch { + runCatching { client.interrupt(sessionId) } + _ui.update { it.copy(chatBusy = false, streaming = false) } + } + } + + override fun onCleared() { + hermesClient?.close() + } +} + +private fun kotlinx.serialization.json.JsonObject.str(key: String): String? = + (this[key] as? kotlinx.serialization.json.JsonPrimitive) + ?.takeIf { it.isString }?.content?.takeIf { it.isNotBlank() } diff --git a/app/src/main/java/de/derittyp/hermesconduit/CredentialStore.kt b/app/src/main/java/de/derittyp/hermesconduit/CredentialStore.kt new file mode 100644 index 0000000..5982a7b --- /dev/null +++ b/app/src/main/java/de/derittyp/hermesconduit/CredentialStore.kt @@ -0,0 +1,37 @@ +package de.derittyp.hermesconduit + +import android.content.Context +import androidx.security.crypto.EncryptedSharedPreferences +import androidx.security.crypto.MasterKey + +/** Zugangsdaten im Android Keystore via EncryptedSharedPreferences. */ +class CredentialStore(context: Context) { + + private val prefs = EncryptedSharedPreferences.create( + context, + "hermes_conduit_credentials", + MasterKey.Builder(context).setKeyScheme(MasterKey.KeyScheme.AES256_GCM).build(), + EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV, + EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM + ) + + data class Credentials(val host: String, val port: String, val username: String, val password: String) + + fun load(): Credentials? { + val host = prefs.getString("host", null) ?: return null + val username = prefs.getString("username", null) ?: return null + val password = prefs.getString("password", null) ?: return null + return Credentials(host, prefs.getString("port", "9119") ?: "9119", username, password) + } + + fun save(c: Credentials) { + prefs.edit() + .putString("host", c.host) + .putString("port", c.port) + .putString("username", c.username) + .putString("password", c.password) + .apply() + } + + fun clear() = prefs.edit().clear().apply() +} diff --git a/app/src/main/java/de/derittyp/hermesconduit/MainActivity.kt b/app/src/main/java/de/derittyp/hermesconduit/MainActivity.kt new file mode 100644 index 0000000..3749052 --- /dev/null +++ b/app/src/main/java/de/derittyp/hermesconduit/MainActivity.kt @@ -0,0 +1,116 @@ +package de.derittyp.hermesconduit + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.lifecycle.viewmodel.compose.viewModel +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.rememberNavController +import de.derittyp.hermesconduit.ui.ChatScreen +import de.derittyp.hermesconduit.ui.LoginScreen +import de.derittyp.hermesconduit.ui.SessionsScreen +import de.derittyp.hermesconduit.ui.theme.HermesConduitTheme + +class MainActivity : ComponentActivity() { + + private val credentialStore by lazy { CredentialStore(applicationContext) } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContent { + HermesConduitTheme { + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background + ) { + val vm: AppViewModel = viewModel() + val ui by vm.ui.collectAsState() + val nav = rememberNavController() + + // Auto-Login mit gespeicherten Zugangsdaten (einmalig). + androidx.compose.runtime.LaunchedEffect(Unit) { + if (!ui.loggedIn && !ui.connecting) vm.tryAutoLogin(credentialStore) + } + + // Navigation folgt dem Login-Status. + androidx.compose.runtime.LaunchedEffect(ui.loggedIn, ui.chatSessionId) { + when { + !ui.loggedIn -> nav.navigate("login") { + popUpTo(0) { inclusive = true } + } + ui.chatSessionId != null -> if (nav.currentDestination?.route != "chat") { + nav.navigate("chat") + } + else -> if (nav.currentDestination?.route != "sessions") { + nav.navigate("sessions") { popUpTo(0) { inclusive = true } } + } + } + } + + NavHost(navController = nav, startDestination = "login") { + composable("login") { + val creds = remember { credentialStore.load() } + LoginScreen( + connecting = ui.connecting, + error = ui.loginError, + initialHost = creds?.host ?: "100.64.0.8", + initialPort = creds?.port ?: "9119", + onLogin = { h, p, u, pw -> vm.login(h, p, u, pw, credentialStore) } + ) + } + composable("sessions") { + SessionsScreen( + username = ui.username, + sessions = ui.sessions, + loading = ui.sessionsLoading, + error = ui.sessionsError, + searchQuery = ui.searchQuery, + profiles = ui.profiles, + currentProfile = ui.currentProfile, + onSearchChange = vm::setSearchQuery, + onSessionClick = vm::openSession, + onNewSession = vm::createSession, + onRefresh = vm::loadSessions, + onProfileChange = vm::switchProfile, + onLogout = { + vm.closeChat() + vm.logout(credentialStore) + } + ) + } + composable("chat") { + ChatScreen( + title = ui.chatTitle, + messages = ui.chatMessages, + streamingText = ui.streamingText, + streaming = ui.streaming, + busy = ui.chatBusy, + loading = ui.chatLoading, + error = ui.chatError, + contextPercent = ui.contextPercent, + contextUsed = ui.contextUsed, + contextMax = ui.contextMax, + onSend = vm::sendMessage, + onInterrupt = vm::interruptChat, + onBack = { + vm.closeChat() + nav.popBackStack() + } + ) + } + } + } + } + } + } +} diff --git a/app/src/main/java/de/derittyp/hermesconduit/core/AuthClient.kt b/app/src/main/java/de/derittyp/hermesconduit/core/AuthClient.kt new file mode 100644 index 0000000..a473355 --- /dev/null +++ b/app/src/main/java/de/derittyp/hermesconduit/core/AuthClient.kt @@ -0,0 +1,117 @@ +package de.derittyp.hermesconduit.core + +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import kotlinx.serialization.json.JsonObject +import kotlinx.serialization.json.jsonObject +import okhttp3.Cookie +import okhttp3.CookieJar +import okhttp3.HttpUrl +import okhttp3.HttpUrl.Companion.toHttpUrl +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.RequestBody.Companion.toRequestBody +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.TimeUnit + +/** + * Auth-Brücke zum Hermes-Dashboard (1:1 wie iOS Conduit / Hermes Desktop): + * 1. POST /auth/password-login {username, password, provider:"basic"} → Session-Cookies + * 2. GET /api/auth/me (mit Cookies) + * 3. POST /api/auth/ws-ticket (mit Cookies) → {ticket, ttl_seconds:30}, single-use + * 4. WebSocket: ws(s)://host/api/ws?ticket= + */ +class AuthClient(cookieStore: MutableList? = null) { + + /** Einfache in-memory CookieJar; Cookies lassen sich exportieren/persistieren. */ + class SimpleCookieJar(initial: List = emptyList()) : CookieJar { + private val store = ConcurrentHashMap>() + + init { + initial.groupBy { it.domain }.forEach { (d, c) -> store[d] = c.toMutableList() } + } + + override fun saveFromResponse(url: HttpUrl, cookies: List) { + val list = store.getOrPut(url.host) { mutableListOf() } + synchronized(list) { + for (c in cookies) { + list.removeAll { it.name == c.name } + if (c.expiresAt > System.currentTimeMillis()) list.add(c) + } + } + } + + override fun loadForRequest(url: HttpUrl): List { + val list = store[url.host] ?: return emptyList() + synchronized(list) { + list.removeAll { it.expiresAt <= System.currentTimeMillis() } + return list.toList() + } + } + + fun allCookies(): List = store.values.flatMap { l -> synchronized(l) { l.toList() } } + } + + val cookieJar = SimpleCookieJar(cookieStore ?: mutableListOf()) + + val http: OkHttpClient = OkHttpClient.Builder() + .cookieJar(cookieJar) + .connectTimeout(15, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .build() + + class AuthException(message: String, val httpStatus: Int? = null) : Exception(message) + + /** Normalisiert Host-Eingabe: "100.64.0.8:9119", "http://100.64.0.8:9119" o.ä. → Basis-URL. */ + fun normalizeBaseUrl(host: String, port: String): String { + var h = host.trim().removeSuffix("/") + if (!h.startsWith("http://") && !h.startsWith("https://")) { + h = if (h.contains(":")) "http://$h" else "http://$h:${port.trim()}" + } + return h.removeSuffix("/") + } + + private suspend fun execute(request: Request): Pair = withContext(Dispatchers.IO) { + http.newCall(request).execute().use { resp -> + resp.code to (resp.body?.string() ?: "") + } + } + + /** Login via Password-Provider. Setzt hermes_session_at/rt Cookies in der Jar. */ + suspend fun login(baseUrl: String, username: String, password: String, provider: String = "basic") { + val body = rpcJson.encodeToString( + JsonObject.serializer(), + jsonObj("username" to username, "password" to password, "provider" to provider) + ).toRequestBody("application/json".toMediaType()) + val (code, text) = execute( + Request.Builder().url("$baseUrl/auth/password-login").post(body).build() + ) + if (code != 200) throw AuthException("Login fehlgeschlagen (HTTP $code)", code) + val obj = runCatching { rpcJson.parseToJsonElement(text).jsonObject }.getOrNull() + if (obj?.boolVal("ok") != true) throw AuthException("Login fehlgeschlagen: ungültige Antwort") + } + + /** Aktueller Benutzer (Session-Check). */ + suspend fun me(baseUrl: String): JsonObject { + val (code, text) = execute(Request.Builder().url("$baseUrl/api/auth/me").get().build()) + if (code != 200) throw AuthException("Session ungültig (HTTP $code)", code) + return rpcJson.parseToJsonElement(text).jsonObject + } + + /** Single-use WebSocket-Ticket (30s TTL). */ + suspend fun wsTicket(baseUrl: String): String { + val (code, text) = execute( + Request.Builder().url("$baseUrl/api/auth/ws-ticket") + .post(ByteArray(0).toRequestBody(null)).build() + ) + if (code != 200) throw AuthException("WS-Ticket fehlgeschlagen (HTTP $code)", code) + return rpcJson.parseToJsonElement(text).jsonObject.str("ticket") + ?: throw AuthException("WS-Ticket fehlgeschlagen: kein Ticket in Antwort") + } + + fun wsUrl(baseUrl: String, ticket: String): String { + val wsBase = baseUrl.replaceFirst("http://", "ws://").replaceFirst("https://", "wss://") + return "$wsBase/api/ws?ticket=$ticket" + } +} diff --git a/app/src/main/java/de/derittyp/hermesconduit/core/HermesClient.kt b/app/src/main/java/de/derittyp/hermesconduit/core/HermesClient.kt new file mode 100644 index 0000000..1fee111 --- /dev/null +++ b/app/src/main/java/de/derittyp/hermesconduit/core/HermesClient.kt @@ -0,0 +1,366 @@ +package de.derittyp.hermesconduit.core + +import kotlinx.coroutines.CompletableDeferred +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.cancel +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharedFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.launch +import kotlinx.coroutines.withTimeout +import kotlinx.serialization.json.JsonObject +import kotlinx.serialization.json.JsonPrimitive +import kotlinx.serialization.json.doubleOrNull +import kotlinx.serialization.json.intOrNull +import kotlinx.serialization.json.jsonObject +import kotlinx.serialization.json.jsonPrimitive +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.Response +import okhttp3.WebSocket +import okhttp3.WebSocketListener +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.TimeUnit +import kotlin.coroutines.resumeWithException + +/** + * JSON-RPC 2.0 über WebSocket-Textframes — Port der iOS-Conduit-Schicht + * (Conduit/Services/HermesClient.swift): + * - Client-Requests: {"jsonrpc":"2.0","id":,"method":...,"params":{...}} + * - Responses: Integer-id, result oder error + * - Events: {"method":"event","params":{"type":...,"session_id":...,"payload":{...}}} + * - Server→Client-Requests (method + String-id) werden beantwortet/abgelehnt. + * - Nicht-default-Profile werden als "profile"-Param an jede scoped RPC gehängt. + */ +class HermesClient( + private val okHttp: OkHttpClient, + var profile: String = "default", +) { + private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) + private var webSocket: WebSocket? = null + private val pending = ConcurrentHashMap>() + private var nextId = 0 + + private val _events = MutableSharedFlow(extraBufferCapacity = 512) + val events: SharedFlow = _events + + private val _connected = MutableStateFlow(false) + val connected: StateFlow = _connected + + private var openDeferred: CompletableDeferred? = null + + suspend fun connect(wsUrl: String) { + val client = okHttp.newBuilder().pingInterval(20, TimeUnit.SECONDS).build() + val deferred = CompletableDeferred() + openDeferred = deferred + val request = Request.Builder().url(wsUrl).build() + val ws = client.newWebSocket(request, object : WebSocketListener() { + override fun onOpen(webSocket: WebSocket, response: Response) { + _connected.value = true + openDeferred?.complete(Unit) + } + + override fun onMessage(webSocket: WebSocket, text: String) { + handleFrame(text) + } + + override fun onClosing(webSocket: WebSocket, code: Int, reason: String) { + webSocket.close(1000, null) + } + + override fun onClosed(webSocket: WebSocket, code: Int, reason: String) { + onDisconnect() + } + + override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) { + openDeferred?.completeExceptionally(t) + openDeferred = null + onDisconnect() + } + }) + webSocket = ws + deferred.await() + } + + private fun onDisconnect() { + _connected.value = false + val ex = RpcException(-1, "Verbindung getrennt") + pending.values.forEach { it.completeExceptionally(ex) } + pending.clear() + _events.tryEmit(StreamEvent.Disconnected) + } + + fun disconnect() { + webSocket?.close(1000, "bye") + webSocket = null + onDisconnect() + } + + private fun handleFrame(text: String) { + val frame = try { + rpcJson.parseToJsonElement(text).jsonObject + } catch (e: Exception) { + return + } + val method = (frame["method"] as? JsonPrimitive)?.takeIf { it.isString }?.content + val id = frame["id"] + + // Server→Client-Request: method + String-id (z. B. approval/clarify). + if (method != null && method != "event" && id is JsonPrimitive && id.isString) { + replyToServerRequest(id.content) + return + } + // RPC-Response: Integer-id, kein method. + if (method == null && id is JsonPrimitive && !id.isString) { + val intId = id.intOrNull ?: return + val deferred = pending.remove(intId) ?: return + val error = frame["error"] as? JsonObject + if (error != null) { + deferred.completeExceptionally( + RpcException(error.intVal("code") ?: -1, error.str("message") ?: "unbekannt") + ) + } else { + deferred.complete(frame["result"] ?: JsonObject(emptyMap())) + } + return + } + // Stream-Event. + if (method == "event") { + val params = frame["params"] as? JsonObject ?: return + parseEvent(params)?.let { _events.tryEmit(it) } + } + } + + /** Unbekannte Server-Requests ablehnen, damit Tools nicht hängen (wie iOS: -32601). */ + private fun replyToServerRequest(id: String) { + val reply = JsonObject( + mapOf( + "jsonrpc" to JsonPrimitive("2.0"), + "id" to JsonPrimitive(id), + "error" to JsonObject( + mapOf( + "code" to JsonPrimitive(-32601), + "message" to JsonPrimitive("kein Handler in Hermes Conduit Android") + ) + ) + ) + ) + webSocket?.send(rpcJson.encodeToString(JsonObject.serializer(), reply)) + } + + private fun parseEvent(params: JsonObject): StreamEvent? { + val type = params.str("type") ?: return null + val sessionId = params.str("session_id") ?: "" + val payload = params.obj("payload") + return when (type) { + "gateway.ready" -> { + // Server-Request-Capability bekanntgeben (iOS: advertiseClientCapabilities). + scope.launch { + runCatching { + rpc("client.capabilities", jsonObj("server_requests" to true), scoped = false) + } + } + StreamEvent.GatewayReady + } + "message.start" -> StreamEvent.MessageStart(sessionId) + "message.delta" -> { + val text = payload?.str("text") ?: params.str("text") ?: return null + StreamEvent.MessageDelta(sessionId, text) + } + "message.complete" -> StreamEvent.MessageComplete( + sessionId, + content = payload?.str("content", "text", "rendered"), + reasoning = payload?.str("reasoning") + ) + "tool.start", "tool_call" -> StreamEvent.ToolStart( + sessionId, + payload?.str("name") ?: "tool", + payload?.str("args_text", "input", "context") + ) + "tool.complete", "tool_result" -> StreamEvent.ToolComplete(sessionId, payload?.str("name") ?: "tool") + "session.busy" -> StreamEvent.SessionBusy(sessionId, payload?.boolVal("busy") ?: false) + "context.update", "session.context" -> StreamEvent.ContextUpdate( + sessionId, + payload?.let { (it["context_percent"] as? JsonPrimitive)?.doubleOrNull } ?: 0.0, + payload?.intVal("context_used") ?: 0, + payload?.intVal("context_max") ?: 0 + ) + "session.usage" -> { + val usage = payload?.obj("usage") ?: return null + val max = usage.intVal("context_max") ?: return null + val used = usage.intVal("context_used") ?: 0 + val pct = (usage["context_percent"] as? JsonPrimitive)?.doubleOrNull + ?: (used.toDouble() / max * 100) + StreamEvent.ContextUpdate(sessionId, pct, used, max) + } + "session.title" -> { + val stored = payload?.str("session_id") ?: return null + val title = payload.str("title") ?: return null + StreamEvent.SessionTitleEvent(sessionId, stored, title) + } + "user.message" -> { + val text = payload?.str("text") ?: return null + StreamEvent.UserMessage(sessionId, text) + } + "sessions.changed" -> StreamEvent.SessionsChanged + "error" -> StreamEvent.Error(sessionId, payload?.str("message") ?: "Hermes-Fehler") + else -> null + } + } + + suspend fun rpc( + method: String, + params: JsonObject? = null, + scoped: Boolean = true, + timeoutMs: Long = 30_000, + ): kotlinx.serialization.json.JsonElement { + val ws = webSocket ?: throw RpcException(-1, "nicht verbunden") + if (!_connected.value) throw RpcException(-1, "nicht verbunden") + val id = synchronized(this) { ++nextId } + val effectiveParams: JsonObject? = run { + val base = params ?: JsonObject(emptyMap()) + val withProfile = if (scoped && profile != "default" && base["profile"] == null) { + JsonObject(base + ("profile" to JsonPrimitive(profile))) + } else base + withProfile.ifEmpty { null } + } + val request = JsonObject( + buildMap { + put("jsonrpc", JsonPrimitive("2.0")) + put("id", JsonPrimitive(id)) + put("method", JsonPrimitive(method)) + if (effectiveParams != null) put("params", effectiveParams) + } + ) + val deferred = CompletableDeferred() + pending[id] = deferred + if (!ws.send(rpcJson.encodeToString(JsonObject.serializer(), request))) { + pending.remove(id) + throw RpcException(-1, "Senden fehlgeschlagen") + } + return withTimeout(timeoutMs) { deferred.await() } + } + + // ---- API (Port der iOS-Methoden) ---- + + suspend fun sessions(): List { + val result = rpc("session.list") + val records = when (result) { + is kotlinx.serialization.json.JsonArray -> result + is JsonObject -> result.arr("sessions") ?: kotlinx.serialization.json.JsonArray(emptyList()) + else -> kotlinx.serialization.json.JsonArray(emptyList()) + } + return records.mapIndexedNotNull { index, item -> + val obj = item as? JsonObject ?: return@mapIndexedNotNull null + val id = obj.str("session_id") ?: obj.str("id") ?: "row-$index" + SessionSummary( + id = id, + title = obj.str("title") ?: obj.str("preview")?.take(60) ?: "Unbenannt", + model = obj.str("model") ?: "Hermes", + updatedLabel = obj.str("updated_at", "last_activity", "modified", "updated", "created_at"), + messageCount = obj.intVal("message_count", "messageCount"), + profile = obj.str("profile", "profile_name", "profile_id") ?: profile + ) + } + } + + suspend fun profiles(): List { + val result = rpc("profiles.list", scoped = false) + val arr = when (result) { + is kotlinx.serialization.json.JsonArray -> result + is JsonObject -> result.arr("profiles") ?: return emptyList() + else -> return emptyList() + } + return arr.mapNotNull { el -> + when (el) { + is JsonPrimitive -> if (el.isString) el.content else null + is JsonObject -> el.str("name") + else -> null + } + } + } + + suspend fun resumeSession(sessionId: String): SessionResume { + val result = rpc( + "session.resume", + jsonObj( + "session_id" to sessionId, + "cols" to 96, + "source" to "android", + "inline_images" to false + ), + timeoutMs = 120_000 + ) + val obj = result as? JsonObject ?: return SessionResume(sessionId, emptyList()) + val resolvedId = obj.str("session_id") ?: sessionId + val messages = obj.arr("messages")?.mapIndexedNotNull { index, item -> + val envelope = item as? JsonObject ?: return@mapIndexedNotNull null + val nested = envelope.obj("message") ?: envelope.obj("payload") ?: envelope + val merged = JsonObject(envelope + nested) + if (merged.str("display_kind") == "hidden") return@mapIndexedNotNull null + val role = (merged.str("role") ?: merged.str("type") ?: "").lowercase() + val content = extractContent(merged["display_content"]) + ?: extractContent(merged["content"] ?: merged["text"]) + ?: return@mapIndexedNotNull null + val r = when (role) { + "user" -> ChatMessage.Role.USER + "system" -> ChatMessage.Role.SYSTEM + "tool" -> return@mapIndexedNotNull null + else -> ChatMessage.Role.ASSISTANT + } + ChatMessage( + id = merged.str("id", "message_id") ?: "msg-$index", + role = r, + content = content + ) + } ?: emptyList() + return SessionResume(resolvedId, messages) + } + + suspend fun createSession(title: String? = null): CreatedSession { + val result = rpc( + "session.create", + jsonObj( + "cols" to 96, + "source" to "android", + "title" to title + ), + timeoutMs = 60_000 + ) + val obj = result as? JsonObject + return CreatedSession( + sessionId = obj?.str("session_id") ?: throw RpcException(-1, "session.create ohne session_id"), + storedSessionId = obj.str("stored_session_id") + ) + } + + suspend fun sendPrompt(sessionId: String, text: String) { + rpc( + "prompt.submit", + jsonObj("session_id" to sessionId, "text" to text, "surface" to "android"), + timeoutMs = 60_000 + ) + } + + suspend fun interrupt(sessionId: String) { + rpc("session.interrupt", jsonObj("session_id" to sessionId)) + } + + suspend fun setSessionTitle(sessionId: String, title: String) { + rpc("session.title", jsonObj("session_id" to sessionId, "title" to title)) + } + + /** Löscht eine gespeicherte Session. Verlangt die STORED id (nicht die + * Runtime-id) und schlägt mit 4023 fehl, solange die Session aktiv ist. */ + suspend fun deleteSession(storedSessionId: String) { + rpc("session.delete", jsonObj("session_id" to storedSessionId)) + } + + fun close() { + disconnect() + scope.cancel() + } +} diff --git a/app/src/main/java/de/derittyp/hermesconduit/core/Json.kt b/app/src/main/java/de/derittyp/hermesconduit/core/Json.kt new file mode 100644 index 0000000..27bad4c --- /dev/null +++ b/app/src/main/java/de/derittyp/hermesconduit/core/Json.kt @@ -0,0 +1,67 @@ +package de.derittyp.hermesconduit.core + +import kotlinx.serialization.json.Json +import kotlinx.serialization.json.JsonArray +import kotlinx.serialization.json.JsonElement +import kotlinx.serialization.json.JsonObject +import kotlinx.serialization.json.JsonPrimitive +import kotlinx.serialization.json.booleanOrNull +import kotlinx.serialization.json.doubleOrNull +import kotlinx.serialization.json.intOrNull +import kotlinx.serialization.json.jsonArray +import kotlinx.serialization.json.jsonObject +import kotlinx.serialization.json.jsonPrimitive + +val rpcJson = Json { + ignoreUnknownKeys = true + encodeDefaults = true +} + +fun JsonObject.str(vararg keys: String): String? = + keys.firstNotNullOfOrNull { k -> + (this[k] as? JsonPrimitive)?.takeIf { it.isString }?.content?.takeIf { it.isNotBlank() } + } + +fun JsonObject.intVal(vararg keys: String): Int? = + keys.firstNotNullOfOrNull { k -> (this[k] as? JsonPrimitive)?.intOrNull } + +fun JsonObject.boolVal(vararg keys: String): Boolean? = + keys.firstNotNullOfOrNull { k -> (this[k] as? JsonPrimitive)?.booleanOrNull } + +fun JsonObject.obj(key: String): JsonObject? = this[key] as? JsonObject + +fun JsonObject.arr(key: String): JsonArray? = this[key] as? JsonArray + +fun jsonObj(vararg pairs: Pair): JsonObject = JsonObject( + pairs.mapNotNull { (k, v) -> + when (v) { + null -> null + is String -> k to JsonPrimitive(v) + is Int -> k to JsonPrimitive(v) + is Long -> k to JsonPrimitive(v) + is Double -> k to JsonPrimitive(v) + is Boolean -> k to JsonPrimitive(v) + is JsonElement -> k to v + else -> k to JsonPrimitive(v.toString()) + } + }.toMap() +) + +/** Nachrichten-Content kann String oder Array aus Parts ({type:"text",text:...}) sein. */ +fun extractContent(el: JsonElement?): String? { + when (el) { + null -> return null + is JsonPrimitive -> return if (el.isString) el.content else el.content + is JsonArray -> { + val sb = StringBuilder() + for (part in el) { + val o = part as? JsonObject ?: continue + val t = o.str("text", "content") + if (t != null) sb.append(t) + } + return if (sb.isEmpty()) null else sb.toString() + } + is JsonObject -> return el.str("text", "content") + else -> return null + } +} diff --git a/app/src/main/java/de/derittyp/hermesconduit/core/Models.kt b/app/src/main/java/de/derittyp/hermesconduit/core/Models.kt new file mode 100644 index 0000000..4486cb4 --- /dev/null +++ b/app/src/main/java/de/derittyp/hermesconduit/core/Models.kt @@ -0,0 +1,52 @@ +package de.derittyp.hermesconduit.core + +/** Streaming-Events vom Gateway (Port von iOS Conduit StreamEventParser). */ +sealed class StreamEvent { + data class MessageStart(val sessionId: String) : StreamEvent() + data class MessageDelta(val sessionId: String, val text: String) : StreamEvent() + data class MessageComplete( + val sessionId: String, + val content: String?, + val reasoning: String?, + ) : StreamEvent() + data class ToolStart(val sessionId: String, val name: String, val input: String?) : StreamEvent() + data class ToolComplete(val sessionId: String, val name: String) : StreamEvent() + data class SessionBusy(val sessionId: String, val busy: Boolean) : StreamEvent() + data class ContextUpdate(val sessionId: String, val percent: Double, val used: Int, val max: Int) : StreamEvent() + data class SessionTitleEvent(val sessionId: String, val storedSessionId: String, val title: String) : StreamEvent() + data class UserMessage(val sessionId: String, val text: String) : StreamEvent() + data class Error(val sessionId: String, val message: String) : StreamEvent() + data object SessionsChanged : StreamEvent() + data object GatewayReady : StreamEvent() + data object Disconnected : StreamEvent() +} + +data class SessionSummary( + val id: String, + val title: String, + val model: String, + val updatedLabel: String?, + val messageCount: Int?, + val profile: String?, +) + +data class ChatMessage( + val id: String, + val role: Role, + val content: String, + val isTool: Boolean = false, +) { + enum class Role { USER, ASSISTANT, SYSTEM } +} + +data class SessionResume( + val sessionId: String, + val messages: List, +) + +data class CreatedSession( + val sessionId: String, + val storedSessionId: String?, +) + +class RpcException(val code: Int, message: String) : Exception("RPC $code: $message") diff --git a/app/src/main/java/de/derittyp/hermesconduit/ui/ChatScreen.kt b/app/src/main/java/de/derittyp/hermesconduit/ui/ChatScreen.kt new file mode 100644 index 0000000..db42afb --- /dev/null +++ b/app/src/main/java/de/derittyp/hermesconduit/ui/ChatScreen.kt @@ -0,0 +1,240 @@ +package de.derittyp.hermesconduit.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.Send +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import de.derittyp.hermesconduit.core.ChatMessage +import de.derittyp.hermesconduit.ui.theme.HermesTextDim +import de.derittyp.hermesconduit.ui.theme.HermesUser + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ChatScreen( + title: String, + messages: List, + streamingText: String, + streaming: Boolean, + busy: Boolean, + loading: Boolean, + error: String?, + contextPercent: Double?, + contextUsed: Int, + contextMax: Int, + onSend: (String) -> Unit, + onInterrupt: () -> Unit, + onBack: () -> Unit, +) { + var input by remember { mutableStateOf("") } + val listState = rememberLazyListState() + + // Bei neuen Inhalten ans Ende scrollen. + LaunchedEffect(messages.size, streamingText.length) { + val count = messages.size + (if (streamingText.isNotEmpty()) 1 else 0) + if (count > 0) listState.animateScrollToItem(count - 1) + } + + Scaffold( + topBar = { + Column { + TopAppBar( + title = { + Text( + title, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + fontFamily = FontFamily.Monospace + ) + }, + navigationIcon = { + IconButton(onClick = onBack) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, "Zurück") + } + }, + actions = { + if (busy) { + IconButton(onClick = onInterrupt) { + Icon(Icons.Default.Close, "Abbrechen") + } + } + }, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = MaterialTheme.colorScheme.surface + ) + ) + // Kontext-Auslastung (aus session.usage / context.update Events) + contextPercent?.let { pct -> + Row( + Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically + ) { + LinearProgressIndicator( + progress = { (pct / 100f).coerceIn(0.0, 1.0).toFloat() }, + modifier = Modifier.weight(1f).height(4.dp), + ) + Spacer(Modifier.width(8.dp)) + Text( + "Kontext %.0f%% (%d/%d)".format(pct, contextUsed, contextMax), + style = MaterialTheme.typography.labelSmall, + fontFamily = FontFamily.Monospace, + color = HermesTextDim + ) + } + } + } + }, + bottomBar = { + Surface(color = MaterialTheme.colorScheme.surface) { + Row( + Modifier.fillMaxWidth().padding(8.dp), + verticalAlignment = Alignment.Bottom + ) { + OutlinedTextField( + value = input, + onValueChange = { input = it }, + placeholder = { Text("Nachricht an Hermes…") }, + modifier = Modifier.weight(1f).heightIn(max = 140.dp), + maxLines = 5 + ) + Spacer(Modifier.width(8.dp)) + IconButton( + onClick = { + if (input.isNotBlank()) { + onSend(input.trim()) + input = "" + } + }, + enabled = input.isNotBlank() + ) { + Icon( + Icons.AutoMirrored.Filled.Send, + "Senden", + tint = if (input.isNotBlank()) MaterialTheme.colorScheme.primary + else MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } + } + ) { padding -> + Box(Modifier.fillMaxSize().padding(padding)) { + when { + loading -> Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + CircularProgressIndicator() + } + else -> LazyColumn( + state = listState, + modifier = Modifier.fillMaxSize(), + contentPadding = androidx.compose.foundation.layout.PaddingValues(12.dp), + verticalArrangement = Arrangement.spacedBy(8.dp) + ) { + items(messages, key = { it.id }) { msg -> + MessageBubble(msg) + } + if (streamingText.isNotEmpty()) { + item("streaming") { + AssistantBubble(streamingText, streaming = true) + } + } + if (busy && !streaming && streamingText.isEmpty()) { + item("thinking") { + Text( + "Hermes arbeitet…", + style = MaterialTheme.typography.bodySmall, + fontFamily = FontFamily.Monospace, + color = HermesTextDim, + modifier = Modifier.padding(8.dp) + ) + } + } + } + } + error?.let { + Text( + it, + color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodySmall, + modifier = Modifier.align(Alignment.BottomCenter).padding(8.dp) + ) + } + } + } +} + +@Composable +private fun MessageBubble(msg: ChatMessage) { + when { + msg.isTool -> Text( + msg.content, + style = MaterialTheme.typography.bodySmall, + fontFamily = FontFamily.Monospace, + color = HermesTextDim, + modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp) + ) + msg.role == ChatMessage.Role.USER -> Row(Modifier.fillMaxWidth(), Arrangement.End) { + Surface( + color = HermesUser, + shape = MaterialTheme.shapes.medium, + modifier = Modifier.widthIn(max = 300.dp) + ) { + Text( + msg.content, + style = MaterialTheme.typography.bodyMedium, + modifier = Modifier.padding(10.dp) + ) + } + } + else -> AssistantBubble(msg.content, streaming = false) + } +} + +@Composable +private fun AssistantBubble(content: String, streaming: Boolean) { + Surface( + color = MaterialTheme.colorScheme.surface, + shape = MaterialTheme.shapes.medium, + modifier = Modifier.fillMaxWidth() + ) { + Column(Modifier.padding(10.dp)) { + MarkdownMessage(if (streaming) "$content ▌" else content) + } + } +} diff --git a/app/src/main/java/de/derittyp/hermesconduit/ui/LoginScreen.kt b/app/src/main/java/de/derittyp/hermesconduit/ui/LoginScreen.kt new file mode 100644 index 0000000..884f2fd --- /dev/null +++ b/app/src/main/java/de/derittyp/hermesconduit/ui/LoginScreen.kt @@ -0,0 +1,124 @@ +package de.derittyp.hermesconduit.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.Button +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.unit.dp + +@Composable +fun LoginScreen( + connecting: Boolean, + error: String?, + initialHost: String, + initialPort: String, + onLogin: (host: String, port: String, user: String, pass: String) -> Unit, +) { + var host by remember { mutableStateOf(initialHost) } + var port by remember { mutableStateOf(initialPort) } + var user by remember { mutableStateOf("") } + var pass by remember { mutableStateOf("") } + + Column( + modifier = Modifier.fillMaxSize().padding(32.dp), + verticalArrangement = Arrangement.Center + ) { + Text( + "Hermes Conduit", + style = MaterialTheme.typography.headlineMedium, + fontFamily = FontFamily.Monospace, + color = MaterialTheme.colorScheme.primary + ) + Text( + "Android-Client für deinen Hermes Agent", + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + Spacer(Modifier.height(32.dp)) + + Row(Modifier.fillMaxWidth()) { + OutlinedTextField( + value = host, + onValueChange = { host = it }, + label = { Text("Host") }, + singleLine = true, + modifier = Modifier.weight(2f), + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri) + ) + Spacer(Modifier.width(8.dp)) + OutlinedTextField( + value = port, + onValueChange = { port = it }, + label = { Text("Port") }, + singleLine = true, + modifier = Modifier.weight(1f), + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number) + ) + } + Spacer(Modifier.height(12.dp)) + OutlinedTextField( + value = user, + onValueChange = { user = it }, + label = { Text("Benutzername") }, + singleLine = true, + modifier = Modifier.fillMaxWidth() + ) + Spacer(Modifier.height(12.dp)) + OutlinedTextField( + value = pass, + onValueChange = { pass = it }, + label = { Text("Passwort") }, + singleLine = true, + visualTransformation = PasswordVisualTransformation(), + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password), + modifier = Modifier.fillMaxWidth() + ) + if (error != null) { + Spacer(Modifier.height(12.dp)) + Text(error, color = MaterialTheme.colorScheme.error, style = MaterialTheme.typography.bodySmall) + } + Spacer(Modifier.height(24.dp)) + Button( + onClick = { onLogin(host, port, user, pass) }, + enabled = !connecting && host.isNotBlank() && user.isNotBlank() && pass.isNotBlank(), + modifier = Modifier.fillMaxWidth() + ) { + if (connecting) { + CircularProgressIndicator( + modifier = Modifier.height(20.dp).width(20.dp), + strokeWidth = 2.dp, + color = MaterialTheme.colorScheme.onPrimary + ) + Spacer(Modifier.width(8.dp)) + } + Text(if (connecting) "Verbinde…" else "Anmelden") + } + Spacer(Modifier.height(16.dp)) + Text( + "Zugangsdaten werden verschlüsselt im Android Keystore abgelegt.", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } +} diff --git a/app/src/main/java/de/derittyp/hermesconduit/ui/MarkdownMessage.kt b/app/src/main/java/de/derittyp/hermesconduit/ui/MarkdownMessage.kt new file mode 100644 index 0000000..a20134d --- /dev/null +++ b/app/src/main/java/de/derittyp/hermesconduit/ui/MarkdownMessage.kt @@ -0,0 +1,45 @@ +package de.derittyp.hermesconduit.ui + +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import com.mikepenz.markdown.compose.components.markdownComponents +import com.mikepenz.markdown.compose.elements.highlightedCodeBlock +import com.mikepenz.markdown.compose.elements.highlightedCodeFence +import com.mikepenz.markdown.m3.Markdown +import com.mikepenz.markdown.m3.markdownColor +import com.mikepenz.markdown.m3.markdownTypography + +/** Markdown-Rendering mit Syntax-Highlighting für Code-Blöcke. */ +@Composable +fun MarkdownMessage(content: String, modifier: Modifier = Modifier) { + Markdown( + content = content, + modifier = modifier.fillMaxWidth(), + colors = markdownColor( + text = MaterialTheme.colorScheme.onSurface, + codeBackground = MaterialTheme.colorScheme.surfaceVariant, + codeText = MaterialTheme.colorScheme.onSurface + ), + typography = markdownTypography( + text = MaterialTheme.typography.bodyMedium, + code = MaterialTheme.typography.bodySmall.copy(fontFamily = FontFamily.Monospace), + h1 = MaterialTheme.typography.headlineSmall, + h2 = MaterialTheme.typography.titleLarge, + h3 = MaterialTheme.typography.titleMedium + ), + components = markdownComponents( + codeBlock = highlightedCodeBlock, + codeFence = highlightedCodeFence + ) + ) +} + +/** Fallback ohne Highlighting, falls ein Block den Renderer wirft. */ +@Composable +fun MarkdownMessageSafe(content: String, modifier: Modifier = Modifier) { + MarkdownMessage(content, modifier) +} diff --git a/app/src/main/java/de/derittyp/hermesconduit/ui/SessionsScreen.kt b/app/src/main/java/de/derittyp/hermesconduit/ui/SessionsScreen.kt new file mode 100644 index 0000000..98ab65b --- /dev/null +++ b/app/src/main/java/de/derittyp/hermesconduit/ui/SessionsScreen.kt @@ -0,0 +1,193 @@ +package de.derittyp.hermesconduit.ui + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.ExitToApp +import androidx.compose.material.icons.filled.Person +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import de.derittyp.hermesconduit.core.SessionSummary + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun SessionsScreen( + username: String, + sessions: List, + loading: Boolean, + error: String?, + searchQuery: String, + profiles: List, + currentProfile: String, + onSearchChange: (String) -> Unit, + onSessionClick: (SessionSummary) -> Unit, + onNewSession: () -> Unit, + onRefresh: () -> Unit, + onProfileChange: (String) -> Unit, + onLogout: () -> Unit, +) { + var profileMenu by remember { mutableStateOf(false) } + + Scaffold( + topBar = { + TopAppBar( + title = { + Column { + Text("Sessions", fontFamily = FontFamily.Monospace) + Text( + "$username · Profil: $currentProfile", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + }, + actions = { + IconButton(onClick = onRefresh) { Icon(Icons.Default.Refresh, "Aktualisieren") } + IconButton(onClick = onNewSession) { Icon(Icons.Default.Add, "Neue Session") } + Box { + IconButton(onClick = { profileMenu = true }) { + Icon(Icons.Default.Person, "Profil wechseln") + } + DropdownMenu(expanded = profileMenu, onDismissRequest = { profileMenu = false }) { + profiles.forEach { p -> + DropdownMenuItem( + text = { + Text( + if (p == currentProfile) "● $p" else p, + fontFamily = FontFamily.Monospace + ) + }, + onClick = { + profileMenu = false + if (p != currentProfile) onProfileChange(p) + } + ) + } + } + } + IconButton(onClick = onLogout) { Icon(Icons.Default.ExitToApp, "Abmelden") } + }, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = MaterialTheme.colorScheme.surface + ) + ) + } + ) { padding -> + Column(Modifier.fillMaxSize().padding(padding)) { + OutlinedTextField( + value = searchQuery, + onValueChange = onSearchChange, + label = { Text("Suche") }, + singleLine = true, + modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp) + ) + if (loading && sessions.isEmpty()) { + Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + CircularProgressIndicator() + } + } else { + val filtered = sessions.filter { + searchQuery.isBlank() || + it.title.contains(searchQuery, ignoreCase = true) || + it.id.contains(searchQuery, ignoreCase = true) + } + if (error != null) { + Text( + error, + color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodySmall, + modifier = Modifier.padding(16.dp) + ) + } + LazyColumn { + items(filtered, key = { it.id }) { session -> + SessionRow(session, onClick = { onSessionClick(session) }) + HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(alpha = 0.4f)) + } + } + } + } + } +} + +@Composable +private fun SessionRow(session: SessionSummary, onClick: () -> Unit) { + Surface( + modifier = Modifier.fillMaxWidth().clickable(onClick = onClick), + color = MaterialTheme.colorScheme.background + ) { + Row( + Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Column(Modifier.weight(1f)) { + Text( + session.title, + style = MaterialTheme.typography.bodyLarge, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Spacer(Modifier.height(2.dp)) + Row { + Text( + session.id.take(24), + style = MaterialTheme.typography.bodySmall, + fontFamily = FontFamily.Monospace, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + session.messageCount?.let { + Text( + " · $it Nachrichten", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } + session.updatedLabel?.let { + Spacer(Modifier.width(8.dp)) + Text( + it.take(16), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) + } + } + } +} + diff --git a/app/src/main/java/de/derittyp/hermesconduit/ui/theme/Theme.kt b/app/src/main/java/de/derittyp/hermesconduit/ui/theme/Theme.kt new file mode 100644 index 0000000..53af0c1 --- /dev/null +++ b/app/src/main/java/de/derittyp/hermesconduit/ui/theme/Theme.kt @@ -0,0 +1,39 @@ +package de.derittyp.hermesconduit.ui.theme + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color + +// Hermes-Look: dunkel, Cyan-Akzente, Mono für Code. +val HermesBg = Color(0xFF0B0E14) +val HermesSurface = Color(0xFF131822) +val HermesSurfaceVariant = Color(0xFF1B2230) +val HermesAccent = Color(0xFF59C2FF) +val HermesAccentDim = Color(0xFF2A6F97) +val HermesText = Color(0xFFE6EAF2) +val HermesTextDim = Color(0xFF8B93A5) +val HermesUser = Color(0xFF1D3A52) +val HermesError = Color(0xFFFF6B6B) + +private val DarkScheme = darkColorScheme( + primary = HermesAccent, + onPrimary = Color(0xFF06283C), + secondary = HermesAccentDim, + background = HermesBg, + onBackground = HermesText, + surface = HermesSurface, + onSurface = HermesText, + surfaceVariant = HermesSurfaceVariant, + onSurfaceVariant = HermesTextDim, + error = HermesError, + outline = Color(0xFF2A3242) +) + +@Composable +fun HermesConduitTheme(content: @Composable () -> Unit) { + // Dark ist Default (Hermes-Look), unabhängig vom System-Theme. + isSystemInDarkTheme() // bewusst ignoriert + MaterialTheme(colorScheme = DarkScheme, content = content) +} diff --git a/app/src/main/res/drawable/ic_launcher.xml b/app/src/main/res/drawable/ic_launcher.xml new file mode 100644 index 0000000..1426bbf --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..0daa184 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/test/java/de/derittyp/hermesconduit/core/LiveGatewayTest.kt b/app/src/test/java/de/derittyp/hermesconduit/core/LiveGatewayTest.kt new file mode 100644 index 0000000..6c8594e --- /dev/null +++ b/app/src/test/java/de/derittyp/hermesconduit/core/LiveGatewayTest.kt @@ -0,0 +1,154 @@ +package de.derittyp.hermesconduit.core + +import kotlinx.coroutines.async +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.withTimeout +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Assert.fail +import org.junit.Assume.assumeTrue +import org.junit.Test + +/** + * Live-Integrationstest gegen das echte Dashboard (100.64.0.8:9119). + * Läuft nur, wenn HERMES_TEST_PASSWORD gesetzt ist (nie im Repo!). + * + * HERMES_TEST_PASSWORD=... ./gradlew :app:testDebugUnitTest --tests '*LiveGatewayTest' + * + * Der Test legt eine eigene Test-Session an ("conduit-android-test"), + * sendet GENAU EINE kurze Nachricht (startet den echten Agenten — kostet + * Tokens!) und versucht danach, die Session wieder zu löschen. + */ +class LiveGatewayTest { + + private val host = System.getenv("HERMES_TEST_HOST") ?: "100.64.0.8" + private val port = System.getenv("HERMES_TEST_PORT") ?: "9119" + private val user = System.getenv("HERMES_TEST_USER") ?: "kristian" + private val password: String? = System.getenv("HERMES_TEST_PASSWORD") + + @Test + fun fullFlowAgainstLiveDashboard() = runBlocking { + assumeTrue("HERMES_TEST_PASSWORD nicht gesetzt — Live-Test übersprungen", password != null) + + // 1. Auth-Flow: password-login → /api/auth/me → ws-ticket + val auth = AuthClient() + val baseUrl = auth.normalizeBaseUrl(host, port) + assertEquals("http://$host:$port", baseUrl) + auth.login(baseUrl, user, password!!) + val me = auth.me(baseUrl) + assertEquals(user, me.str("user_id")) + println("AUTH OK: user=${me.str("user_id")}") + + // 2. WebSocket verbinden + val ticket = auth.wsTicket(baseUrl) + assertTrue(ticket.isNotBlank()) + val client = HermesClient(auth.http) + client.connect(auth.wsUrl(baseUrl, ticket)) + assertTrue(client.connected.value) + println("WS OK: verbunden") + + try { + // 3. Session-Liste + val sessions = client.sessions() + assertFalse("keine Sessions", sessions.isEmpty()) + println("SESSIONS OK: ${sessions.size} Sessions, erste: ${sessions.first().title.take(40)}") + + // 4. Profile + val profiles = client.profiles() + assertTrue(profiles.contains("default")) + println("PROFILES OK: $profiles") + + // 5. Bestehende Session öffnen (nur lesen, kein Agent-Start) + val resume = client.resumeSession(sessions.first().id) + println("RESUME OK: ${resume.messages.size} Nachrichten in '${sessions.first().title.take(40)}'") + + // 6. Test-Session anlegen + EINE Test-Nachricht senden + // Eindeutiger Titel: der Gateway lehnt doppelte Titel ab (4022). + val testTitle = "conduit-android-test-${System.currentTimeMillis()}" + val created = client.createSession(title = testTitle) + val testSessionId = created.sessionId + println("CREATE OK: runtime=$testSessionId stored=${created.storedSessionId}") + try { + client.setSessionTitle(testSessionId, testTitle) + + val streamed = StringBuilder() + val completeDeferred = async { + withTimeout(120_000) { + var finalContent: String? = null + while (finalContent == null) { + when (val ev = client.events.first { ev -> + ev is StreamEvent.MessageDelta || ev is StreamEvent.MessageComplete + }) { + is StreamEvent.MessageDelta -> streamed.append(ev.text) + is StreamEvent.MessageComplete -> finalContent = ev.content + else -> {} + } + } + finalContent!! + } + } + client.sendPrompt( + testSessionId, + "Antworte exakt mit dem einen Wort: Pong" + ) + val answer = completeDeferred.await() + val finalText = if (answer.isNotBlank()) answer else streamed.toString() + assertTrue("leere Antwort", finalText.isNotBlank()) + println("PROMPT OK: Streaming-Deltas=${streamed.length} Zeichen, Antwort='${finalText.take(80)}'") + + // 7. Resume der Test-Session (mit STORED id) muss den Verlauf zeigen + val testResume = client.resumeSession(created.storedSessionId ?: testSessionId) + assertTrue(testResume.messages.any { it.role == ChatMessage.Role.USER }) + println("HISTORY OK: ${testResume.messages.size} Nachrichten") + } finally { + // Aufräumen: session.delete verlangt die STORED id und eine + // inaktive Session — also erst trennen, dann frisch verbinden. + val stored = created.storedSessionId + client.close() + if (stored != null) { + // Runtime-Session bleibt serverseitig noch eine Weile "aktiv" → Retry. + var deleted = false + for (attempt in 1..12) { + try { + val auth2 = AuthClient() + auth2.login(baseUrl, user, password) + val client2 = HermesClient(auth2.http) + client2.connect(auth2.wsUrl(baseUrl, auth2.wsTicket(baseUrl))) + try { + client2.deleteSession(stored) + println("DELETE OK: Test-Session $stored entfernt (Versuch $attempt)") + deleted = true + } finally { + client2.close() + } + break + } catch (e: Exception) { + if (attempt == 12) { + println("DELETE fehlgeschlagen (${e.message}) — Test-Session bleibt: $stored") + } + kotlinx.coroutines.delay(10_000) + } + } + if (!deleted) println("HINWEIS: Test-Session $stored manuell löschen") + } + } + } finally { + client.close() + } + } + + @Test + fun loginFailsWithWrongPassword() = runBlocking { + assumeTrue(password != null) + val auth = AuthClient() + val baseUrl = auth.normalizeBaseUrl(host, port) + try { + auth.login(baseUrl, user, "definitiv-falsches-passwort") + fail("Login mit falschem Passwort darf nicht klappen") + } catch (e: AuthClient.AuthException) { + println("NEGATIV OK: ${e.message}") + } + } +} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..11c32c3 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,6 @@ +plugins { + id("com.android.application") version "8.7.3" apply false + kotlin("android") version "2.0.21" apply false + kotlin("plugin.compose") version "2.0.21" apply false + kotlin("plugin.serialization") version "2.0.21" apply false +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..c4df1fe --- /dev/null +++ b/gradle.properties @@ -0,0 +1,6 @@ +org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8 +org.gradle.caching=true +org.gradle.parallel=true +android.useAndroidX=true +android.nonTransitiveRClass=true +kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..df97d72 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9b42019 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..08d5599 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,16 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} +rootProject.name = "hermes-conduit-android" +include(":app")