commit d6ff3de5944e2dcf3cd8f2108bcb9f4c8bab7fcf Author: Hy4ri Date: Tue Jun 16 00:00:36 2026 +0300 Initial commit of HermesControl Android app diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..ec53617f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,8 @@ +root = true + +[*.{kt,kts}] +indent_size = 4 +insert_final_newline = true +max_line_length = 120 +ktlint_standard_no-wildcard-imports = disabled +ktlint_function_naming_ignore_when_annotated_with = Composable diff --git a/.envrc b/.envrc new file mode 100644 index 00000000..3550a30f --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..e64941ef --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +.gradle-home +$PWD +.agents +*.log +/local.properties +/.idea +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties +*.apk diff --git a/2026-06-15_085500-android-app-for-hermes.md b/2026-06-15_085500-android-app-for-hermes.md new file mode 100644 index 00000000..0750a6ec --- /dev/null +++ b/2026-06-15_085500-android-app-for-hermes.md @@ -0,0 +1,594 @@ +# Android App for Hermes — Chat & Control + +> **For Hermes:** Use subagent-driven-development skill to implement this plan task-by-task. + +**Goal:** Build an Android app that lets m57 chat with his Hermes agent instance and send remote control commands from anywhere, directly from his phone. + +**Architecture:** The app talks directly to Hermes' built-in **Dashboard REST API** (port 9119) for management and **Dashboard WebSocket** (`/api/ws`) for real-time chat via JSON-RPC. **No custom bridge needed.** + +**Tech Stack:** Android (Kotlin/Jetpack Compose), OkHttp (WebSocket + Retrofit), JSON-RPC protocol, Hermes Dashboard API. + +--- + +## Current State (What Already Works) + +| Component | Status | Endpoint | +|-----------|--------|----------| +| **Dashboard REST API** | ✅ Running on `127.0.0.1:9119` | `GET /api/status`, sessions, config, etc. | +| **TUI Gateway WebSocket** | ✅ Running at `/api/ws?token=` | JSON-RPC over WebSocket | +| **Auth (loopback mode)** | ✅ `Authorization: Bearer ` or `X-Hermes-Session-Token: ` | For REST API | +| **WebSocket Auth** | ✅ `?token=` query param | For WS upgrade | +| **Dashboard Token** | ✅ Stored in `~/.hermes/.env` | `HERMES_DASHBOARD_SESSION_TOKEN=y9oAS3...iTZ4` | + +**Available JSON-RPC Methods (for Chat):** +- `session.list` — List all sessions +- `session.active_list` — List active sessions +- `session.status` — Get session status +- `session.history` — Get session message history +- `session.resume` — Resume an existing session +- `session.create` — Create a new session +- `prompt.submit` — **Send a message to Hermes!** (key endpoint) +- `session.interrupt` — Interrupt a response +- `session.steer` — Steer the agent +- `clarify.respond` — Respond to clarifications +- `approval.respond` — Approve/reject commands +- `session.delete` — Delete sessions +- `session.title` — Set session title +- `config.get` / `config.set` — Manage config +- `image.attach`, `file.attach` — Attach files +- And many more... + +**Available REST Endpoints (for Management):** +- `GET /api/status` — Hermes version, gateway status, active sessions +- `GET /api/sessions` — List sessions with metadata +- `GET /api/sessions/{id}/messages` — Get messages for a session +- `GET /api/system/stats` — System stats +- `GET /api/config` — Full config +- `GET /api/logs` — Logs +- `GET /api/cron/jobs` — Cron jobs +- And many more (check /api/docs) + +--- + +## Architecture + +``` +┌──────────────────────────────────────────────────────┐ +│ Android Device │ +│ ┌─────────────────┐ ┌────────────────────────┐ │ +│ │ Android App │ │ Hermes (Termux/Ubuntu)│ │ +│ │ (Kotlin/Compose)│────▶│ Dashboard (127.0.0.1) │ │ +│ │ │ │ │ │ +│ │ • REST client │────▶│ REST API :9119 │ │ +│ │ • WS client │────▶│ WS /api/ws?token=... │ │ +│ │ • Local cache │ │ TUI Gateway (JSON-RPC)│ │ +│ └─────────────────┘ └────────────────────────┘ │ +└──────────────────────────────────────────────────────┘ +``` + +Since Hermes runs on the same Android device in Termux, the app connects to **localhost** — no network issues, no CORS, no latency. + +--- + +## Phase 1: Android Project Setup + +### Task 1.1: Scaffold Android Project + +**Objective:** Create a new Android project with Jetpack Compose and the right SDK. + +**Actions:** +1. Open Android Studio → New Project → Empty Compose Activity +2. Name: `HermesControl`, Package: `com.m57.hermescontrol` +3. Language: **Kotlin**, Minimum SDK: **26** +4. Build system: Gradle with Kotlin DSL + +**Files:** +- `app/build.gradle.kts` — Dependencies +- `AndroidManifest.xml` — Internet permission + +**Verify:** App builds and runs on device/emulator. + +--- + +### Task 1.2: Add Dependencies + +**Objective:** Add OkHttp (WebSocket + HTTP), Gson for JSON-RPC. + +**File:** `app/build.gradle.kts` + +```kotlin +dependencies { + // Core + implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0") + implementation("androidx.activity:activity-compose:1.8.2") + + // Compose BOM + implementation(platform("androidx.compose:compose-bom:2024.02.00")) + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.material3:material3") + + // Networking + implementation("com.squareup.okhttp3:okhttp:4.12.0") + implementation("com.squareup.okhttp3:logging-interceptor:4.12.0") + implementation("com.squareup.retrofit2:retrofit:2.9.0") + implementation("com.squareup.retrofit2:converter-gson:2.9.0") + + // JSON + implementation("com.google.code.gson:gson:2.10.1") + + // Local storage + implementation("androidx.security:security-crypto:1.1.0-alpha06") +} +``` + +**Verify:** Gradle sync succeeds. + +--- + +## Phase 2: REST API Client (Management) + +### Task 2.1: Data Models + +**Objective:** Create Kotlin data classes for REST API responses. + +**Files:** +- `data/model/StatusResponse.kt` +- `data/model/SessionListResponse.kt` +- `data/model/SessionMessagesResponse.kt` + +```kotlin +// data/model/StatusResponse.kt +data class StatusResponse( + val version: String, + val gateway_running: Boolean, + val active_sessions: Int, + val gateway_platforms: Map +) + +data class PlatformStatus( + val state: String, + val error_code: String? = null +) +``` + +**Verify:** Compiles cleanly. + +--- + +### Task 2.2: REST API Interface + +**Objective:** Create Retrofit service for Hermes dashboard REST API. + +**Files:** +- `data/remote/HermesApiService.kt` +- `data/remote/ApiClient.kt` + +```kotlin +// data/remote/HermesApiService.kt +interface HermesApiService { + @GET("api/status") + suspend fun getStatus(): Response + + @GET("api/sessions") + suspend fun getSessions(): Response + + @GET("api/sessions/{id}/messages") + suspend fun getSessionMessages(@Path("id") sessionId: String): Response + + @GET("api/system/stats") + suspend fun getSystemStats(): Response +} + +// data/remote/ApiClient.kt +object ApiClient { + private val client = OkHttpClient.Builder() + .addInterceptor { chain -> + val original = chain.request() + val request = original.newBuilder() + .header("Authorization", "Bearer ${AuthManager.getToken()}") + .build() + chain.proceed(request) + } + .build() + + val retrofit = Retrofit.Builder() + .baseUrl("http://127.0.0.1:9119/") + .client(client) + .addConverterFactory(GsonConverterFactory.create()) + .build() + + val hermesApi: HermesApiService = retrofit.create(HermesApiService::class.java) +} +``` + +**Verify:** API calls return valid data. + +--- + +## Phase 3: WebSocket Client (Chat) + +### Task 3.1: JSON-RPC Models + +**Objective:** Create models for JSON-RPC over WebSocket. + +**Files:** +- `data/ws/JsonRpcRequest.kt` +- `data/ws/JsonRpcResponse.kt` +- `data/ws/WsMethods.kt` + +```kotlin +// data/ws/JsonRpcRequest.kt +data class JsonRpcRequest( + val jsonrpc: String = "2.0", + val id: String, + val method: String, + val params: Map = emptyMap() +) + +// data/ws/WsMethods.kt +object WsMethods { + const val SESSION_LIST = "session.list" + const val SESSION_ACTIVE_LIST = "session.active_list" + const val SESSION_STATUS = "session.status" + const val SESSION_HISTORY = "session.history" + const val SESSION_RESUME = "session.resume" + const val SESSION_CREATE = "session.create" + const val PROMPT_SUBMIT = "prompt.submit" + const val SESSION_INTERRUPT = "session.interrupt" +} +``` + +**Verify:** Data classes serialize/deserialize correctly with Gson. + +--- + +### Task 3.2: WebSocket Client + +**Objective:** Implement WebSocket connection to `/api/ws?token=` with reconnection support. + +**Files:** +- `data/ws/HermesWsClient.kt` + +```kotlin +// data/ws/HermesWsClient.kt +class HermesWsClient( + private val token: String, + private val onMessage: (JsonRpcResponse) -> Unit, + private val onConnected: () -> Unit, + private val onDisconnected: (String) -> Unit +) { + private val client = OkHttpClient() + private var ws: WebSocket? = null + private val requestId = AtomicInteger(0) + + fun connect() { + val url = "ws://127.0.0.1:9119/api/ws?token=$token" + val request = Request.Builder().url(url).build() + ws = client.newWebSocket(request, object : WebSocketListener() { + override fun onOpen(ws: WebSocket, response: Response) { + onConnected() + } + + override fun onMessage(ws: WebSocket, text: String) { + val response = Gson().fromJson(text, JsonRpcResponse::class.java) + onMessage(response) + } + + override fun onFailure(ws: WebSocket, t: Throwable, response: Response?) { + onDisconnected(t.message ?: "Unknown error") + } + + override fun onClosed(ws: WebSocket, code: Int, reason: String) { + onDisconnected(reason) + } + }) + } + + fun sendMessage(text: String) { + val request = JsonRpcRequest( + id = requestId.incrementAndGet().toString(), + method = WsMethods.PROMPT_SUBMIT, + params = mapOf("text" to text) + ) + ws?.send(Gson().toJson(request)) + } + + fun resumeSession(sessionId: String) { + val request = JsonRpcRequest( + id = requestId.incrementAndGet().toString(), + method = WsMethods.SESSION_RESUME, + params = mapOf("id" to sessionId) + ) + ws?.send(Gson().toJson(request)) + } + + fun disconnect() { + ws?.close(1000, "App closing") + } +} +``` + +**Verify:** App connects to WebSocket, receives JSON-RPC responses. + +--- + +### Task 3.3: WebSocket Event Parser + +**Objective:** Handle the event-based responses from Hermes (responses come as events, not just RPC replies). + +**Files:** +- `data/ws/EventParser.kt` + +The TUI Gateway sends: +- **RPC responses** (to our requests) with `id` matching +- **Events** (tool calls, streamed tokens, clarify requests) with `event` field + +```kotlin +data class JsonRpcResponse( + val jsonrpc: String?, + val id: String?, + val result: Any?, + val error: JsonRpcError?, + val event: String?, // Event type (for push events) + val data: Map? // Event payload +) + +data class JsonRpcError( + val code: Int, + val message: String +) +``` + +**Event types to handle:** +- `message.complete` — Agent finished responding +- `message.token` — Streaming token +- `clarify.request` — Agent needs clarification +- `tool.start` / `tool.complete` — Tool calls +- `session.updated` — Session state changed + +**Verify:** Parse events correctly from Gson. + +--- + +## Phase 4: UI Screens + +### Task 4.1: Connection Screen + +**Objective:** Enter/display connection info (token auto-loaded or configurable). + +**Files:** +- `ui/connect/ConnectScreen.kt` +- `ui/connect/ConnectViewModel.kt` + +**Features:** +- Text field for token (or load from SharedPreferences) +- "Connect" button +- Connection status indicator + +--- + +### Task 4.2: Chat Screen + +**Objective:** Full chat UI with real-time messaging. + +**Files:** +- `ui/chat/ChatScreen.kt` +- `ui/chat/ChatViewModel.kt` +- `ui/chat/ChatBubble.kt` + +**Features:** +- `LazyColumn` for message list (user + agent bubbles) +- Bottom input bar with send button +- Streaming text (update bubble as tokens arrive) +- Image/file attachment support +- Loading / typing indicator +- Session selector (pick which session to resume) + +**Message types:** +- User messages (right-aligned, primary color) +- Agent messages (left-aligned, surface color) +- Tool calls (collapsible, monospace) +- System notifications (centered, muted) + +--- + +### Task 4.3: Command Panel + +**Objective:** Quick-action buttons for common Hermes commands. + +**Files:** +- `ui/commands/CommandPanel.kt` +- `ui/commands/CommandViewModel.kt` + +**Commands (can be customized):** +- `/status` — Check system status +- `/skills` — List skills +- `/memory` — Show recent memories +- `/sessions` — List active sessions +- `🔄 Restart Gateway` — Trigger gateway restart +- `📊 System Stats` — Show CPU/memory +- `⚡ Quick Prompt` — Pre-set prompts + +--- + +### Task 4.4: Settings Screen + +**Objective:** Configure connection parameters. + +**Files:** +- `ui/settings/SettingsScreen.kt` +- `ui/settings/SettingsViewModel.kt` + +**Settings:** +- Host/IP (default: `127.0.0.1`) +- Port (default: `9119`) +- Auth token (loaded from encrypted storage) +- Theme (Light/Dark/System) +- Auto-reconnect toggle + +--- + +## Phase 5: Polish & Security + +### Task 5.1: Encrypted Token Storage + +**Objective:** Store the dashboard token securely. + +**Files:** +- `data/local/AuthManager.kt` + +Use Android `EncryptedSharedPreferences` to store the `HERMES_DASHBOARD_SESSION_TOKEN`. + +**Verify:** Token persists across app restarts; is encrypted at rest. + +--- + +### Task 5.2: Auto-Reconnect + +**Objective:** Reconnect WebSocket if connection drops. + +**Files:** +- Update `HermesWsClient.kt` — Exponential backoff reconnection. + +**Verify:** Kill dashboard process → app shows "disconnected" → restart dashboard → app reconnects. + +--- + +### Task 5.3: Error Handling & Offline Mode + +**Objective:** Graceful handling of network errors. + +**Files:** +- Update `ChatViewModel.kt` — Show offline banner, cache last N messages locally. + +**Verify:** Turn off network → app shows offline state, cached messages visible. + +--- + +## Task-by-Task Summary + +| # | Task | Phase | Est. Time | Status | +|---|------|-------|-----------|--------| +| 1.1 | Scaffold Android Project | 1 | 10 min | ⬜ | +| 1.2 | Add Dependencies | 1 | 10 min | ⬜ | +| 2.1 | REST Data Models | 2 | 15 min | ⬜ | +| 2.2 | REST API Client | 2 | 20 min | ⬜ | +| 3.1 | JSON-RPC Models | 3 | 10 min | ⬜ | +| 3.2 | WebSocket Client | 3 | 30 min | ⬜ | +| 3.3 | Event Parser | 3 | 20 min | ⬜ | +| 4.1 | Connection Screen | 4 | 20 min | ⬜ | +| 4.2 | Chat Screen | 4 | 45 min | ⬜ | +| 4.3 | Command Panel | 4 | 25 min | ⬜ | +| 4.4 | Settings Screen | 4 | 20 min | ⬜ | +| 5.1 | Encrypted Token Storage | 5 | 15 min | ⬜ | +| 5.2 | Auto-Reconnect | 5 | 20 min | ⬜ | +| 5.3 | Error Handling & Offline | 5 | 15 min | ⬜ | + +--- + +## What You DON'T Need Anymore (vs Original Plan) + +| Originally Planned | Now? | Reason | +|--------------------|------|--------| +| Custom Python Flask bridge | ❌ Removed | Dashboard IS the bridge | +| Custom SQLite reads | ❌ Removed | Dashboard API handles sessions | +| Hermes DB schema analysis | ❌ Removed | REST API abstracts the DB | +| Queue-based message passing | ❌ Removed | WebSocket JSON-RPC handles it | + +--- + +## App Connection Details + +| Setting | Value | +|---------|-------| +| **REST API Base** | `http://127.0.0.1:9119/` | +| **WS Endpoint** | `ws://127.0.0.1:9119/api/ws?token=` | +| **REST Auth** | `Authorization: Bearer *** or `X-Hermes-Session-Token: ` | +| **WS Auth** | `?token=` query parameter (NOT header-based for WS) | +| **Current Token** | `y9oAS3frCosCSaynhmAofMkeCsuiNuF2ad2XB35iTZ4` (in `~/.hermes/.env`) | +| **Dashboard Binding** | `0.0.0.0:9119` (LAN accessible via `--insecure`) | + +--- + +## 🧪 Verified Protocol Details (E2E Tested) + +### REST API +| Endpoint | Auth | Returns | +|----------|------|---------| +| `GET /api/status` | ❌ Public | `version`, `gateway_running`, `active_sessions`, `auth_required` | +| `GET /api/sessions` | ✅ Token | `{"sessions": [...]}` — full session list with message counts | +| `GET /api/config` | ✅ Token | Full config as flat JSON dict | +| `GET /api/system/stats` | ✅ Token | System statistics | + +**Auth methods tested:** +- `Authorization: Bearer ` ✅ works +- `X-Hermes-Session-Token: ` ✅ works +- No header → `401` ✅ +- Bad token → `401` ✅ + +### WebSocket JSON-RPC Protocol + +**Connection:** `ws://HOST:9119/api/ws?token=` + +**First message (always):** `gateway.ready` event — server pushes this immediately on connect. + +**RPC methods tested:** +| Method | Params | Response | Status | +|--------|--------|----------|--------| +| `session.list` | `{}` | `{"sessions": [...]}` — all TUI sessions | ✅ | +| `session.active_list` | `{}` | `{"sessions": [...]}` — active TUI sessions | ✅ | +| `session.status` | `{}` | `{"sessions": [...]}` — session statuses | ✅ | +| `session.create` | `{}` | `{"session_id": "xxx", "stored_session_id": "xxx", ...}` | ✅ | +| `session.resume` | `{"id": "session_id"}` | Session data | ✅ (when valid session) | +| `prompt.submit` | `{"session_id": "xxx", "text": "message"}` | `{"status": "streaming"}` then events | ✅ | +| `nonexistent.method` | `{}` | `{"error": {"code": -32601, "message": "..."}}` | ✅ | + +### Chat Flow (Event Sequence) + +After `prompt.submit`, events arrive on the same WebSocket in this order: + +1. `session.info` — Session metadata, model info, tool list +2. `message.start` — Processing began +3. `thinking.delta` (0+) — Reasoning tokens (model-dependent) +4. `message.token` (0+) — Streaming text tokens (model-dependent) +5. `status.update` — Status changes +6. `tool.start` / `tool.complete` — Tool execution (when applicable) +7. `clarify.request` (optional) — Agent needs input +8. **`message.complete`** — **Final response!** `payload.text` contains the full response text. +9. `message.done` — Processing fully finished + +**Key finding:** The actual response text is in `message.complete.payload.text`, NOT nested under `payload.message.content`. Use: +```kotlin +val responseText = event.payload["text"] as? String +``` + +### Important Implementation Notes + +1. **Agent build time:** After `session.create`, the AI agent needs ~15-20s to initialize (tool discovery, model loading, skill loading). The Android app should: + - Show a loading/connecting state during this time + - Listen for events but ignore them until `message.complete` or set a timer + - OR create a session on app startup and keep it alive for instant responses + +2. **Session reuse:** Multiple `prompt.submit` calls work on the same session_id. Create one session at startup and reuse it. + +3. **No heartbeat needed:** The WS connection stays alive without pings. + +4. **Error codes:** + - `4001` — session not found (invalid/missing session_id) + - `4009` — session busy (agent still processing previous prompt) + - `-32601` — unknown method + - `-32600` — invalid JSON-RPC format + +--- + +## Open Questions + +1. **Chat flow**: Do you want the app to resume the current active session, or start fresh each time? +2. **Deep linking**: Want to add a way to share messages/commands from other apps? +3. **Notifications**: Want push notifications when Hermes completes a task? (Would need a server component for push) + +--- + +*Plan updated: 2026-06-15. Simplified architecture using Hermes Dashboard + TUI Gateway. Ready to build!* 💋 \ No newline at end of file diff --git a/PROGRESS_STATUS.md b/PROGRESS_STATUS.md new file mode 100644 index 00000000..95cb8766 --- /dev/null +++ b/PROGRESS_STATUS.md @@ -0,0 +1,57 @@ +# Progress Status: HermesControl Android App + +This document tracks the completed features and the pending backlog for the HermesControl Jetpack Compose Android application. + +## 👥 Done (Implemented & Verified) + +### 1. Base Infrastructure & Environment +* **Nix Flake Dev Environment (`flake.nix`)**: Fully configured with JDK 17, Android SDK (platforms 34-36), `ktlint`, and Gradle. +* **Scaffolding & Build Pipeline**: Android Jetpack Compose project compiles cleanly using `./gradlew assembleDebug`. +* **Code Formatting**: Code formatting checks integrated using `ktlint` (`./gradlew ktlintCheck`). +* **Unit Testing Suite**: Verified with `./gradlew test` (AuthManager, EventParser, ConnectViewModel, ChatViewModel). +* **Network Capabilities**: Cleartext traffic enabled in `AndroidManifest.xml` to allow connection to local networks (e.g., `192.168.1.18` to `192.168.1.48`). + +### 2. Implemented Features (~45 of 213 endpoints, ~21%) +* **Connection Screen (`ConnectScreen`)**: Saves Host, Port, and Auth Token to `AuthManager` (EncryptedSharedPreferences), with live verification via `GET /api/status`. +* **Chat Screen (`ChatScreen`)**: Live chat over WebSocket (JSON-RPC) supporting: + * Creating sessions, resuming sessions, listing sessions, and submitting prompts. + * Message token streaming, thinking delta indicator, and interrupting sessions. + * Basic Markdown-ish rendering (bold, code blocks) and expandable tool call indicators. +* **Skills Screen (`SkillsScreen`)**: Lists skills (`GET /api/skills`) and allows toggling them (`PUT /api/skills/toggle`) with auto-refresh and swipe-to-refresh. Toggles have optimistic state reversion on failure. +* **Cron Jobs Screen (`CronJobsScreen`)**: Lists cron jobs (`GET /api/cron/jobs`) with actions for Trigger, Pause, Resume, and Delete. Auto-refresh and swipe-to-refresh. +* **Gateway Control Screen (`GatewayScreen`)**: Integrates Start (`POST /api/gateway/start`), Stop (`POST /api/gateway/stop`), and Restart (`POST /api/gateway/restart`) with platform state reporting. +* **Profiles Management Screen (`ProfilesScreen`)**: Switch active profile, update soul personality description (`PUT /api/profiles/{name}/soul`), and switch AI model providers. +* **Toolsets Screen (`ToolsetsScreen`)**: List and toggle toolsets (`GET/PUT /api/tools/toolsets`) to enable/disable specific tool groups (e.g., Web Search, Python local run). +* **Achievements Screen (`AchievementsScreen`)**: Displays a gamified list of discovered/locked/unlocked achievements with progress bars (`GET /api/plugins/hermes-achievements/achievements`). +* **Settings Screen (`SettingsScreen`)**: Allows changing settings (Host, Port, Token, Theme, Auto-reconnect) and tests connection. +* **Navigation Drawer**: Integrated Material3 navigation drawer using Navigation3 for switching screens. + +--- + +## ⏳ Left (To Be Implemented) + +All remaining **168 endpoints** across the Hermes Dashboard API need to be implemented. The categories and their priority order are: + +### Priority 1: Model & Provider Management (3 endpoints) +* List model providers (`GET /api/model/providers`) +* Get and set recommended default model (`GET/POST /api/model/recommended-default`) +* **UI**: Select model directly from a dropdown in Settings or Profiles. + +### Priority 2: Skills Hub & Editing (8 endpoints) +* Browse hub, preview, install, uninstall, update skills. +* Create/edit custom skills by editing their raw YAML/markdown files (`GET/PUT /api/skills/content`). + +### Priority 3: Advanced Sessions & Search (8 endpoints) +* Search through session transcripts. +* Delete sessions in bulk, prune empty sessions, export session transcripts. +* Get session statistics. + +### Priority 4: Cron Creation & Blueprint Instantiation (3 endpoints) +* Form/UI to create new Cron Jobs (`POST /api/cron/jobs`). +* Form/UI to update Cron Jobs (`PUT /api/cron/jobs/{id}`). + +### Priority 5: Kanban Plugin (46 endpoints) +* Full Kanban task boards, lists, cards, comments, attachments. + +### Priority 6: Other Administrative Tools +* Env vars management, webhooks, system backup/restore, credential storage. diff --git a/PROJECT.md b/PROJECT.md new file mode 100644 index 00000000..efede2a4 --- /dev/null +++ b/PROJECT.md @@ -0,0 +1,66 @@ +# Project: HermesControl Jetpack Compose Android App + +## Architecture +The HermesControl Jetpack Compose Android application communicates with the local Hermes agent instance via two communication channels: +1. **REST API (Port 9119)**: For status queries, listing sessions, and system configuration. +2. **WebSocket Gateway (`/api/ws?token=`)**: For real-time JSON-RPC messaging (chat, prompt submission, stream events, tool execution updates, etc.). + +### Package Boundaries +- `com.m57.hermescontrol.data.model` — REST API data classes. +- `com.m57.hermescontrol.data.remote` — Retrofit ApiClient and HermesApiService. +- `com.m57.hermescontrol.data.ws` — JSON-RPC models, HermesWsClient, and EventParser. +- `com.m57.hermescontrol.data.local` — AuthManager (EncryptedSharedPreferences). +- `com.m57.hermescontrol.ui.connect` — ConnectScreen and ConnectViewModel. +- `com.m57.hermescontrol.ui.chat` — ChatScreen, ChatViewModel, and ChatBubble. +- `com.m57.hermescontrol.ui.settings` — SettingsScreen and SettingsViewModel. +- `com.m57.hermescontrol.theme` — Color, Theme, and Type. + +--- + +## Milestones + +| # | Name | Scope | Dependencies | Status | +|---|---|---|---|---| +| M1 | Exploration & Setup | Explore codebase, identify dependencies and structure | None | DONE | +| M2 | Networking & Data Layer | Implement/Fix AuthManager, api clients, WS clients, EventParser | M1 | DONE | +| M3 | UI Screen Implementation | Implement ConnectScreen, ChatScreen, SettingsScreen, and Nav integration | M2 | DONE | +| M4 | Unit Testing | Implement unit tests for AuthManager, EventParser, Connect/Chat ViewModels | M2, M3 | DONE | +| M5 | Styling & Audit Validation | Perform ktlint formatting fixes, compiler error fixes, and run Forensic Audit | M4 | DONE | +| M6 | E2E Testing Track | Design and build comprehensive opaque-box integration tests (Tiers 1-4) | M5 | PLANNED | +| M7 | API Integration & Models | Add Retrofit endpoints and JSON serialization models for Skills & Cron Jobs | M5 | PLANNED | +| M8 | Skills Management UI | Implement Viewmodel and UI Screen for skills management | M7 | PLANNED | +| M9 | Cron Jobs Management UI | Implement Viewmodel and UI Screen for cron jobs control | M7 | PLANNED | +| M10 | Navigation Drawer | Integrate Material3 navigation drawer using Navigation3 keys | M8, M9 | PLANNED | +| M11 | E2E & Hardening Phase | Verify all E2E tests, perform adversarial coverage hardening (Tier 5) | M6, M10 | PLANNED | + +--- + +## Interface Contracts + +### REST API Service +- `getStatus()`: Returns `StatusResponse` (version, gateway status, active sessions) +- `getSessions()`: Returns `SessionListResponse` (all sessions and metadata) +- `getSessionMessages(sessionId: String)`: Returns `SessionMessagesResponse` (message history) +- `getSystemStats()`: Returns `SystemStatsResponse` (CPU, memory, etc.) +- `getSkills()`: Returns list of skills (`GET api/skills`) +- `toggleSkill(payload)`: Toggles a skill's state (`PUT api/skills/toggle`) +- `getCronJobs()`: Returns list of cron jobs (`GET api/cron/jobs`) +- `pauseCronJob(id)`: Pauses a job (`POST api/cron/jobs/{id}/pause`) +- `resumeCronJob(id)`: Resumes a job (`POST api/cron/jobs/{id}/resume`) +- `triggerCronJob(id)`: Triggers a job immediately (`POST api/cron/jobs/{id}/trigger`) +- `deleteCronJob(id)`: Deletes a job (`DELETE api/cron/jobs/{id}`) + +### WebSocket Client (`HermesWsClient`) +- `connect()`: Establish connection to `/api/ws?token=` +- `disconnect()`: Terminate connection +- `sendMessage(text: String)`: Submit prompt (`prompt.submit` JSON-RPC method) +- `resumeSession(sessionId: String)`: Resume a session (`session.resume` JSON-RPC method) +- Callbacks: `onConnected()`, `onDisconnected(reason: String)`, `onMessage(JsonRpcResponse)` + +### Event Parser (`EventParser`) +- Parses incoming JSON messages from WebSocket and extracts event fields (`event`, `data`, `id`, `result`, `error`). +- Categorizes events: `message.complete`, `message.token`, `tool.start`, `tool.complete`, `clarify.request`, etc. + +## Code Layout +- `app/src/main/java/com/m57/hermescontrol/` (Main Source) +- `app/src/test/java/com/m57/hermescontrol/` (Unit Tests) diff --git a/TEST_INFRA.md b/TEST_INFRA.md new file mode 100644 index 00000000..b4d6eb1a --- /dev/null +++ b/TEST_INFRA.md @@ -0,0 +1,57 @@ +# Test Infrastructure - hermes-mobile + +This document describes the test infrastructure, philosophy, architecture, and feature coverage for the **hermes-mobile** Jetpack Compose Android application. + +## Test Philosophy +The test suite utilizes **opaque-box JVM-based integration and E2E tests** that drive the ViewModels directly, bypassing the UI rendering layer, with mocked Retrofit responses using `Mockk` for service stubs. This allows testing the application logic, optimistic UI state changes, API integration pathways, and navigation flows synchronously and reliably without requiring an Android emulator or device. + +## Feature Inventory + +### Feature 1: Skills Management Screen +- **Listing**: Fetches and lists available agent skills. +- **Category/Description Display**: Shows skill details (category, optional description, name). +- **Toggle Success**: Modifies a skill's state optimistically, sends API request, and confirms success state. +- **Toggle Failure Revert**: Handles API failure, displays toast, and reverts the state optimistically. +- **Refresh**: Supports reloading/refreshing the list of skills from the API. + +### Feature 2: Cron Jobs Screen +- **Listing**: Fetches and lists all configured cron jobs. +- **State/Last Run/Next Run Display**: Displays status fields (state, last_run_status, next_run). +- **Pause Action**: Optimistically transitions a job's state to "paused", sends API request. +- **Resume Action**: Optimistically transitions a job's state to "active", sends API request. +- **Trigger Action**: Triggers a job immediately and displays a success toast. +- **Delete Action**: Optimistically removes a job from the list and sends a DELETE API request. +- **Refresh**: Supports reloading/refreshing the list of cron jobs. + +### Feature 3: Navigation Drawer +- **Transitions**: Simulates moving between top-level destinations (Chat, Skills, Cron Jobs) via the Material3 Navigation Drawer using the Custom `NavigationController` and its `backStack`. + +--- + +## Test Architecture + +- **Test Runner**: + - Main Test suite command: `nix develop --command ./gradlew test` + - Style checking command: `nix develop --command ./gradlew ktlintCheck` +- **Test Case Format**: + - JUnit 4 / JUnit Platform JVM tests implemented in Kotlin. + - Mocking library: `Mockk` for mock objects, static mocks, and API endpoints. +- **Directory Layout**: + - `app/src/test/java/com/m57/hermescontrol/E2eIntegrationTest.kt` contains the complete end-to-end integration test suite. + +--- + +## Tier 4 Scenario: Complete User Journey +The Tier 4 scenario is implemented in `testFullUserSessionFlow()` which simulates a complete user session: +1. **Connect**: User enters coordinates and token, successfully authenticating/connecting. +2. **Open Drawer & Navigate**: Transitions from Chat to Skills. +3. **Toggle a Skill (Optimistic Update -> API Failure -> Toast/Revert)**: + - User toggles a skill. + - UI updates optimistically to the new state. + - Retrofit API returns a simulated HTTP 500 error. + - The state is reverted back to original, and an error Toast message is shown. +4. **Navigate to Cron Jobs**: User navigates from Skills to Cron Jobs. +5. **Trigger Cron Job**: + - User triggers a cron job. + - Retrofit API returns a success code. + - Success Toast message is displayed and verified. diff --git a/TEST_READY.md b/TEST_READY.md new file mode 100644 index 00000000..e71c26a6 --- /dev/null +++ b/TEST_READY.md @@ -0,0 +1,35 @@ +# Test Readiness - hermes-mobile + +This document provides a summary of test readiness, including test suite execution details, expected outcomes, coverage summary, and a feature readiness checklist. + +## Execution and Expected Outcome +- **Test Runner Command**: `nix develop --command ./gradlew test` +- **Expected Outcome**: All tests pass successfully. +- **Total Test Count**: 28 tests + +--- + +## Coverage Summary + +| Test Tier | Description | Test Count | Features Covered | +|-----------|-------------|------------|------------------| +| **Tier 1** | Feature Coverage | 13 | Skills (5), Cron Jobs (7), Drawer (1) | +| **Tier 2** | Boundary & Corner Cases | 12 | HTTP errors (400, 404, 500), timeouts, empty lists, action failures | +| **Tier 3** | Cross-Feature Combinations | 2 | Drawer transition during active toggle, Auth token revocation | +| **Tier 4** | Real-World Application Scenarios | 1 | Full end-to-end user session journey flow | +| **Total** | | **28** | | + +--- + +## Feature Checklist + +| Feature | Tier 1 (Coverage) | Tier 2 (Boundaries) | Tier 3 (Combinations) | Tier 4 (E2E Scenario) | +|---------|:-----------------:|:-------------------:|:---------------------:|:---------------------:| +| **Skills Management** | ✅ | ✅ | ✅ | ✅ | +| **Cron Jobs** | ✅ | ✅ | N/A | ✅ | +| **Navigation Drawer** | ✅ | N/A | ✅ | ✅ | +| **Authentication** | N/A | N/A | ✅ | ✅ | + +### Legend: +- ✅: Covered by tests in `E2eIntegrationTest.kt` +- N/A: Not applicable or handled by combinations/other screens. diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 00000000..d3bffba2 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,120 @@ +import org.gradle.api.tasks.testing.Test + +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.compose.compiler) + alias(libs.plugins.kotlin.serialization) +} + +android { + namespace = "com.m57.hermescontrol" + compileSdk = 36 + defaultConfig { + applicationId = "com.m57.hermescontrol" + minSdk = 26 + targetSdk = 36 + versionCode = 1 + versionName = "1.0" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + buildFeatures { + compose = true + aidl = false + buildConfig = false + shaders = false + } + + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +kotlin { + jvmToolchain(17) +} + +dependencies { + val composeBom = platform(libs.androidx.compose.bom) + implementation(composeBom) + androidTestImplementation(composeBom) + + // Core Android dependencies + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + + // Arch Components + implementation(libs.androidx.lifecycle.runtime.compose) + implementation(libs.androidx.lifecycle.viewmodel.compose) + + // Compose + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.ui.tooling.preview) + implementation(libs.androidx.compose.material3) + implementation(libs.androidx.compose.material.icons.extended) + // Tooling + debugImplementation(libs.androidx.compose.ui.tooling) + // Instrumented tests + androidTestImplementation(libs.androidx.compose.ui.test.junit4) + debugImplementation(libs.androidx.compose.ui.test.manifest) + + // Networking + implementation(libs.okhttp) + implementation(libs.okhttp.logging) + implementation(libs.retrofit) + implementation(libs.retrofit.converter.gson) + implementation(libs.gson) + + // Encrypted storage + implementation(libs.androidx.security.crypto) + + // Local tests: jUnit, coroutines, Android runner + testImplementation(libs.junit) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) + testRuntimeOnly(libs.junit.vintage.engine) + testRuntimeOnly(libs.junit.platform.launcher) + testImplementation(libs.okhttp.mockwebserver) + testImplementation(libs.kotlinx.coroutines.test) + testImplementation(libs.mockk) + + // Instrumented tests: jUnit rules and runners + androidTestImplementation(libs.androidx.test.core) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.androidx.test.runner) + androidTestImplementation(libs.androidx.test.espresso.core) + + // Navigation + implementation(libs.androidx.navigation3.ui) + implementation(libs.androidx.navigation3.runtime) + implementation(libs.androidx.lifecycle.viewmodel.navigation3) +} + +tasks.register("ktlintCheck") { + group = "verification" + description = "Runs ktlint check." + workingDir = rootProject.projectDir + commandLine("sh", "-c", "ktlint \"app/src/**/*.kt\"") +} +tasks.register("ktlintFormat") { + group = "formatting" + description = "Runs ktlint format." + workingDir = rootProject.projectDir + commandLine("sh", "-c", "ktlint -F \"app/src/**/*.kt\"") +} + +tasks.withType { + useJUnitPlatform() +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..4c80a8cc --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/m57/hermescontrol/MainActivity.kt b/app/src/main/java/com/m57/hermescontrol/MainActivity.kt new file mode 100644 index 00000000..5924d489 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/MainActivity.kt @@ -0,0 +1,32 @@ +package com.m57.hermescontrol + +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.ui.Modifier +import com.m57.hermescontrol.data.local.AuthManager +import com.m57.hermescontrol.theme.HermesControlTheme + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + AuthManager.init(this) + + enableEdgeToEdge() + setContent { + HermesControlTheme { + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background, + ) { + MainNavigation() + } + } + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/Navigation.kt b/app/src/main/java/com/m57/hermescontrol/Navigation.kt new file mode 100644 index 00000000..6e69901a --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/Navigation.kt @@ -0,0 +1,200 @@ +package com.m57.hermescontrol + +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.safeDrawingPadding +import androidx.compose.material3.DrawerValue +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalDrawerSheet +import androidx.compose.material3.ModalNavigationDrawer +import androidx.compose.material3.NavigationDrawerItem +import androidx.compose.material3.Text +import androidx.compose.material3.rememberDrawerState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.navigation3.runtime.NavKey +import androidx.navigation3.runtime.entryProvider +import androidx.navigation3.runtime.rememberNavBackStack +import androidx.navigation3.ui.NavDisplay +import com.m57.hermescontrol.data.local.AuthManager +import kotlinx.coroutines.launch +import com.m57.hermescontrol.ui.achievements.AchievementsScreen as AchievementsScreenContent +import com.m57.hermescontrol.ui.chat.ChatScreen as ChatScreenContent +import com.m57.hermescontrol.ui.connect.ConnectScreen as ConnectScreenContent +import com.m57.hermescontrol.ui.cron.CronJobsScreen as CronJobsScreenContent +import com.m57.hermescontrol.ui.gateway.GatewayScreen as GatewayScreenContent +import com.m57.hermescontrol.ui.profiles.ProfilesScreen as ProfilesScreenContent +import com.m57.hermescontrol.ui.settings.SettingsScreen as SettingsScreenContent +import com.m57.hermescontrol.ui.skills.SkillsScreen as SkillsScreenContent +import com.m57.hermescontrol.ui.toolsets.ToolsetsScreen as ToolsetsScreenContent + +@Composable +fun MainNavigation() { + val hasToken = !AuthManager.getToken().isNullOrBlank() + val startScreen: NavKey = if (hasToken) ChatScreen else ConnectScreen + + val backStack = rememberNavBackStack(startScreen) + NavigationController.backStack = backStack + + val currentScreen = backStack.lastOrNull() ?: startScreen + val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed) + val scope = rememberCoroutineScope() + + val gesturesEnabled = + currentScreen == ChatScreen || currentScreen == SkillsScreen || currentScreen == CronJobsScreen || + currentScreen == GatewayScreen || currentScreen == ProfilesScreen || + currentScreen == ToolsetsScreen || currentScreen == AchievementsScreen + val openDrawer = { scope.launch { drawerState.open() } } + + ModalNavigationDrawer( + drawerState = drawerState, + gesturesEnabled = gesturesEnabled, + drawerContent = { + if (gesturesEnabled) { + ModalDrawerSheet { + Text( + text = "Hermes Control", + modifier = Modifier.padding(16.dp), + style = MaterialTheme.typography.titleLarge, + ) + HorizontalDivider() + NavigationDrawerItem( + label = { Text("Chat") }, + selected = currentScreen == ChatScreen, + onClick = { + scope.launch { drawerState.close() } + NavigationController.navigateTo(ChatScreen) + }, + modifier = Modifier.padding(horizontal = 12.dp, vertical = 4.dp), + ) + NavigationDrawerItem( + label = { Text("Skills") }, + selected = currentScreen == SkillsScreen, + onClick = { + scope.launch { drawerState.close() } + NavigationController.navigateTo(SkillsScreen) + }, + modifier = Modifier.padding(horizontal = 12.dp, vertical = 4.dp), + ) + NavigationDrawerItem( + label = { Text("Cron Jobs") }, + selected = currentScreen == CronJobsScreen, + onClick = { + scope.launch { drawerState.close() } + NavigationController.navigateTo(CronJobsScreen) + }, + modifier = Modifier.padding(horizontal = 12.dp, vertical = 4.dp), + ) + NavigationDrawerItem( + label = { Text("Profiles") }, + selected = currentScreen == ProfilesScreen, + onClick = { + scope.launch { drawerState.close() } + NavigationController.navigateTo(ProfilesScreen) + }, + modifier = Modifier.padding(horizontal = 12.dp, vertical = 4.dp), + ) + NavigationDrawerItem( + label = { Text("Toolsets") }, + selected = currentScreen == ToolsetsScreen, + onClick = { + scope.launch { drawerState.close() } + NavigationController.navigateTo(ToolsetsScreen) + }, + modifier = Modifier.padding(horizontal = 12.dp, vertical = 4.dp), + ) + NavigationDrawerItem( + label = { Text("Achievements") }, + selected = currentScreen == AchievementsScreen, + onClick = { + scope.launch { drawerState.close() } + NavigationController.navigateTo(AchievementsScreen) + }, + modifier = Modifier.padding(horizontal = 12.dp, vertical = 4.dp), + ) + NavigationDrawerItem( + label = { Text("Gateway") }, + selected = currentScreen == GatewayScreen, + onClick = { + scope.launch { drawerState.close() } + NavigationController.navigateTo(GatewayScreen) + }, + modifier = Modifier.padding(horizontal = 12.dp, vertical = 4.dp), + ) + } + } + }, + ) { + NavDisplay( + backStack = backStack, + onBack = { backStack.removeLastOrNull() }, + entryProvider = + entryProvider { + entry { + ConnectScreenContent( + onConnected = { + backStack.clear() + backStack.add(ChatScreen) + }, + modifier = Modifier.safeDrawingPadding(), + ) + } + + entry { + ChatScreenContent( + onNavigateToSettings = { + backStack.add(SettingsScreen) + }, + onOpenDrawer = { openDrawer() }, + ) + } + + entry { + SettingsScreenContent( + onBack = { + backStack.removeLastOrNull() + }, + ) + } + + entry { + SkillsScreenContent( + onOpenDrawer = { openDrawer() }, + ) + } + + entry { + CronJobsScreenContent( + onOpenDrawer = { openDrawer() }, + ) + } + + entry { + ProfilesScreenContent( + onOpenDrawer = { openDrawer() }, + ) + } + + entry { + ToolsetsScreenContent( + onOpenDrawer = { openDrawer() }, + ) + } + + entry { + AchievementsScreenContent( + onOpenDrawer = { openDrawer() }, + ) + } + + entry { + GatewayScreenContent( + onOpenDrawer = { openDrawer() }, + ) + } + }, + ) + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/NavigationController.kt b/app/src/main/java/com/m57/hermescontrol/NavigationController.kt new file mode 100644 index 00000000..2ba2cf79 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/NavigationController.kt @@ -0,0 +1,26 @@ +package com.m57.hermescontrol + +import androidx.navigation3.runtime.NavBackStack +import androidx.navigation3.runtime.NavKey + +object NavigationController { + var backStack: NavBackStack? = null + + fun navigateTo(key: NavKey) { + val stack = backStack ?: return + if (stack.lastOrNull() == key) return + + if (key == ChatScreen || key == SkillsScreen || key == CronJobsScreen) { + stack.clear() + } + stack.add(key) + } + + fun add(key: NavKey) { + backStack?.add(key) + } + + fun goBack() { + backStack?.removeLastOrNull() + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/NavigationKeys.kt b/app/src/main/java/com/m57/hermescontrol/NavigationKeys.kt new file mode 100644 index 00000000..6647361c --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/NavigationKeys.kt @@ -0,0 +1,22 @@ +package com.m57.hermescontrol + +import androidx.navigation3.runtime.NavKey +import kotlinx.serialization.Serializable + +@Serializable data object ConnectScreen : NavKey + +@Serializable data object ChatScreen : NavKey + +@Serializable data object SettingsScreen : NavKey + +@Serializable data object SkillsScreen : NavKey + +@Serializable data object CronJobsScreen : NavKey + +@Serializable data object GatewayScreen : NavKey + +@Serializable data object ProfilesScreen : NavKey + +@Serializable data object ToolsetsScreen : NavKey + +@Serializable data object AchievementsScreen : NavKey diff --git a/app/src/main/java/com/m57/hermescontrol/data/local/AuthManager.kt b/app/src/main/java/com/m57/hermescontrol/data/local/AuthManager.kt new file mode 100644 index 00000000..bf120371 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/local/AuthManager.kt @@ -0,0 +1,96 @@ +package com.m57.hermescontrol.data.local + +import android.content.Context +import android.content.SharedPreferences +import androidx.security.crypto.EncryptedSharedPreferences +import androidx.security.crypto.MasterKey + +/** + * Singleton that manages encrypted storage of the Hermes dashboard token + * and connection settings. + * + * Must call [init] with a Context before any other method. + */ +object AuthManager { + private const val PREFS_FILE = "hermes_secure_prefs" + + private const val KEY_TOKEN = "auth_token" + private const val KEY_HOST = "host" + private const val KEY_PORT = "port" + private const val KEY_AUTO_RECONNECT = "auto_reconnect" + + private const val DEFAULT_HOST = "127.0.0.1" + private const val DEFAULT_PORT = 9119 + private const val DEFAULT_AUTO_RECONNECT = true + + @Volatile + private var prefs: SharedPreferences? = null + + /** + * Initialise the encrypted preferences. + * Call this once from Application.onCreate() or MainActivity.onCreate(). + */ + fun init(context: Context) { + if (prefs != null) return + synchronized(this) { + if (prefs != null) return + val masterKey = + MasterKey + .Builder(context.applicationContext) + .setKeyScheme(MasterKey.KeyScheme.AES256_GCM) + .build() + + prefs = + EncryptedSharedPreferences.create( + context.applicationContext, + PREFS_FILE, + masterKey, + EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV, + EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM, + ) + } + } + + private fun requirePrefs(): SharedPreferences = + prefs ?: throw IllegalStateException( + "AuthManager not initialised – call AuthManager.init(context) first", + ) + + // ── Token ──────────────────────────────────────────────────────────── + + fun getToken(): String? = requirePrefs().getString(KEY_TOKEN, null) + + fun setToken(token: String?) { + requirePrefs().edit().putString(KEY_TOKEN, token).apply() + } + + // ── Host ───────────────────────────────────────────────────────────── + + fun getHost(): String = requirePrefs().getString(KEY_HOST, DEFAULT_HOST) ?: DEFAULT_HOST + + fun setHost(host: String) { + requirePrefs().edit().putString(KEY_HOST, host).apply() + } + + // ── Port ───────────────────────────────────────────────────────────── + + fun getPort(): Int = requirePrefs().getInt(KEY_PORT, DEFAULT_PORT) + + fun setPort(port: Int) { + requirePrefs().edit().putInt(KEY_PORT, port).apply() + } + + // ── Auto-reconnect ─────────────────────────────────────────────────── + + fun isAutoReconnect(): Boolean = requirePrefs().getBoolean(KEY_AUTO_RECONNECT, DEFAULT_AUTO_RECONNECT) + + fun setAutoReconnect(enabled: Boolean) { + requirePrefs().edit().putBoolean(KEY_AUTO_RECONNECT, enabled).apply() + } + + /** Convenience: build the base URL from current host + port. */ + fun baseUrl(): String = "http://${getHost()}:${getPort()}/" + + /** Convenience: build the WebSocket URL with token query param. */ + fun wsUrl(): String = "ws://${getHost()}:${getPort()}/api/ws?token=${getToken().orEmpty()}" +} diff --git a/app/src/main/java/com/m57/hermescontrol/data/model/Achievement.kt b/app/src/main/java/com/m57/hermescontrol/data/model/Achievement.kt new file mode 100644 index 00000000..d6e5b0ec --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/model/Achievement.kt @@ -0,0 +1,22 @@ +package com.m57.hermescontrol.data.model + +data class AchievementsResponse( + val achievements: List, +) + +data class Achievement( + val id: String, + val name: String, + val description: String?, + val category: String?, + val kind: String?, + val icon: String?, + val unlocked: Boolean, + val discovered: Boolean, + val state: String?, + val tier: String?, + val progress: Double?, + val next_tier: String?, + val next_threshold: Double?, + val progress_pct: Double?, +) diff --git a/app/src/main/java/com/m57/hermescontrol/data/model/CronJob.kt b/app/src/main/java/com/m57/hermescontrol/data/model/CronJob.kt new file mode 100644 index 00000000..23676ad9 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/model/CronJob.kt @@ -0,0 +1,10 @@ +package com.m57.hermescontrol.data.model + +data class CronJob( + val id: String, + val name: String, + val schedule: String?, + val state: String?, + val last_run_status: String?, + val next_run: String?, +) diff --git a/app/src/main/java/com/m57/hermescontrol/data/model/Profile.kt b/app/src/main/java/com/m57/hermescontrol/data/model/Profile.kt new file mode 100644 index 00000000..06077f6f --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/model/Profile.kt @@ -0,0 +1,43 @@ +package com.m57.hermescontrol.data.model + +data class ProfilesResponse( + val profiles: List, +) + +data class ProfileInfo( + val name: String, + val path: String?, + val is_default: Boolean?, + val model: String?, + val provider: String?, + val has_env: Boolean?, + val skill_count: Int?, + val gateway_running: Boolean?, + val description: String?, +) + +data class ActiveProfileResponse( + val active: String, + val current: String?, +) + +data class SetActiveProfileRequest( + val name: String, +) + +data class ProfileSoulResponse( + val content: String, +) + +data class UpdateProfileSoulRequest( + val content: String, +) + +data class UpdateProfileModelRequest( + val provider: String, + val model: String, +) + +data class UpdateProfileDescriptionRequest( + val description: String, +) diff --git a/app/src/main/java/com/m57/hermescontrol/data/model/SessionListResponse.kt b/app/src/main/java/com/m57/hermescontrol/data/model/SessionListResponse.kt new file mode 100644 index 00000000..9ddf0ec0 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/model/SessionListResponse.kt @@ -0,0 +1,13 @@ +package com.m57.hermescontrol.data.model + +data class SessionListResponse( + val sessions: List, +) + +data class SessionInfo( + val id: String, + val title: String?, + val created_at: String?, + val message_count: Int?, + val status: String?, +) diff --git a/app/src/main/java/com/m57/hermescontrol/data/model/SessionMessagesResponse.kt b/app/src/main/java/com/m57/hermescontrol/data/model/SessionMessagesResponse.kt new file mode 100644 index 00000000..b16c4d36 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/model/SessionMessagesResponse.kt @@ -0,0 +1,12 @@ +package com.m57.hermescontrol.data.model + +data class SessionMessagesResponse( + val messages: List, +) + +data class SessionMessage( + val role: String?, + val content: String?, + val timestamp: String?, + val type: String?, +) diff --git a/app/src/main/java/com/m57/hermescontrol/data/model/Skill.kt b/app/src/main/java/com/m57/hermescontrol/data/model/Skill.kt new file mode 100644 index 00000000..836a75d9 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/model/Skill.kt @@ -0,0 +1,8 @@ +package com.m57.hermescontrol.data.model + +data class Skill( + val name: String, + val description: String?, + val category: String?, + val enabled: Boolean, +) diff --git a/app/src/main/java/com/m57/hermescontrol/data/model/StatusResponse.kt b/app/src/main/java/com/m57/hermescontrol/data/model/StatusResponse.kt new file mode 100644 index 00000000..ab94daa5 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/model/StatusResponse.kt @@ -0,0 +1,14 @@ +package com.m57.hermescontrol.data.model + +data class StatusResponse( + val version: String?, + val gateway_running: Boolean?, + val active_sessions: Int?, + val auth_required: Boolean?, + val gateway_platforms: Map?, +) + +data class PlatformStatus( + val state: String?, + val error_code: String? = null, +) diff --git a/app/src/main/java/com/m57/hermescontrol/data/model/SystemStatsResponse.kt b/app/src/main/java/com/m57/hermescontrol/data/model/SystemStatsResponse.kt new file mode 100644 index 00000000..71fe4ea5 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/model/SystemStatsResponse.kt @@ -0,0 +1,24 @@ +package com.m57.hermescontrol.data.model + +/** + * Wrapper around the /api/system/stats response. + * + * The payload shape can change across Hermes versions, so we keep it + * flexible with a Map and provide convenience accessors for the + * most commonly used fields. + */ +data class SystemStatsResponse( + val cpu: Map? = null, + val memory: Map? = null, + val disk: Map? = null, + val uptime: Any? = null, + val extra: Map? = null, +) { + /** CPU usage percentage, if available. */ + val cpuPercent: Double? + get() = (cpu?.get("percent") as? Number)?.toDouble() + + /** Memory usage percentage, if available. */ + val memoryPercent: Double? + get() = (memory?.get("percent") as? Number)?.toDouble() +} diff --git a/app/src/main/java/com/m57/hermescontrol/data/model/ToggleSkillRequest.kt b/app/src/main/java/com/m57/hermescontrol/data/model/ToggleSkillRequest.kt new file mode 100644 index 00000000..75f7fcb6 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/model/ToggleSkillRequest.kt @@ -0,0 +1,6 @@ +package com.m57.hermescontrol.data.model + +data class ToggleSkillRequest( + val name: String, + val enabled: Boolean, +) diff --git a/app/src/main/java/com/m57/hermescontrol/data/model/Toolset.kt b/app/src/main/java/com/m57/hermescontrol/data/model/Toolset.kt new file mode 100644 index 00000000..3445ae8e --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/model/Toolset.kt @@ -0,0 +1,16 @@ +package com.m57.hermescontrol.data.model + +data class Toolset( + val name: String, + val label: String?, + val description: String?, + val enabled: Boolean, + val available: Boolean?, + val configured: Boolean?, + val tools: List?, +) + +data class ToolsetToggleRequest( + val enabled: Boolean, + val profile: String? = null, +) diff --git a/app/src/main/java/com/m57/hermescontrol/data/remote/ApiClient.kt b/app/src/main/java/com/m57/hermescontrol/data/remote/ApiClient.kt new file mode 100644 index 00000000..17ac14b4 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/remote/ApiClient.kt @@ -0,0 +1,86 @@ +package com.m57.hermescontrol.data.remote + +import com.m57.hermescontrol.data.local.AuthManager +import okhttp3.Interceptor +import okhttp3.OkHttpClient +import okhttp3.logging.HttpLoggingInterceptor +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import java.util.concurrent.TimeUnit + +/** + * Provides a Retrofit-backed [HermesApiService]. + * + * The client is lazily built using the current [AuthManager] settings and + * can be rebuilt at any time via [rebuild] (e.g. after the user changes + * host / port / token). + */ +object ApiClient { + @Volatile + private var retrofit: Retrofit? = null + + @Volatile + private var service: HermesApiService? = null + + /** The current [HermesApiService] instance. Lazily created on first access. */ + val hermesApi: HermesApiService + get() { + return service ?: synchronized(this) { + service ?: buildService().also { service = it } + } + } + + /** Force-rebuild the Retrofit client (e.g. after settings change). */ + fun rebuild() { + synchronized(this) { + retrofit = null + service = null + } + } + + // ── Internal ───────────────────────────────────────────────────────── + + private fun buildService(): HermesApiService { + val logging = + HttpLoggingInterceptor().apply { + level = HttpLoggingInterceptor.Level.BODY + } + + val authInterceptor = + Interceptor { chain -> + val token = AuthManager.getToken() + val request = + if (!token.isNullOrBlank()) { + chain + .request() + .newBuilder() + .addHeader("Authorization", "Bearer $token") + .build() + } else { + chain.request() + } + chain.proceed(request) + } + + val okHttp = + OkHttpClient + .Builder() + .addInterceptor(authInterceptor) + .addInterceptor(logging) + .connectTimeout(15, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .writeTimeout(15, TimeUnit.SECONDS) + .build() + + val rf = + Retrofit + .Builder() + .baseUrl(AuthManager.baseUrl()) + .client(okHttp) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .also { retrofit = it } + + return rf.create(HermesApiService::class.java) + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/data/remote/HermesApiService.kt b/app/src/main/java/com/m57/hermescontrol/data/remote/HermesApiService.kt new file mode 100644 index 00000000..8cd3352f --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/remote/HermesApiService.kt @@ -0,0 +1,131 @@ +package com.m57.hermescontrol.data.remote + +import com.m57.hermescontrol.data.model.AchievementsResponse +import com.m57.hermescontrol.data.model.ActiveProfileResponse +import com.m57.hermescontrol.data.model.CronJob +import com.m57.hermescontrol.data.model.ProfileSoulResponse +import com.m57.hermescontrol.data.model.ProfilesResponse +import com.m57.hermescontrol.data.model.SessionListResponse +import com.m57.hermescontrol.data.model.SessionMessagesResponse +import com.m57.hermescontrol.data.model.SetActiveProfileRequest +import com.m57.hermescontrol.data.model.Skill +import com.m57.hermescontrol.data.model.StatusResponse +import com.m57.hermescontrol.data.model.SystemStatsResponse +import com.m57.hermescontrol.data.model.ToggleSkillRequest +import com.m57.hermescontrol.data.model.Toolset +import com.m57.hermescontrol.data.model.ToolsetToggleRequest +import com.m57.hermescontrol.data.model.UpdateProfileDescriptionRequest +import com.m57.hermescontrol.data.model.UpdateProfileModelRequest +import com.m57.hermescontrol.data.model.UpdateProfileSoulRequest +import retrofit2.Response +import retrofit2.http.Body +import retrofit2.http.DELETE +import retrofit2.http.GET +import retrofit2.http.POST +import retrofit2.http.PUT +import retrofit2.http.Path + +interface HermesApiService { + @GET("api/status") + suspend fun getStatus(): Response + + @GET("api/sessions") + suspend fun getSessions(): Response + + @GET("api/sessions/{id}/messages") + suspend fun getSessionMessages( + @Path("id") sessionId: String, + ): Response + + @GET("api/system/stats") + suspend fun getSystemStats(): Response + + @GET("api/config") + suspend fun getConfig(): Response> + + @GET("api/skills") + suspend fun getSkills(): Response> + + @PUT("api/skills/toggle") + suspend fun toggleSkill( + @Body body: ToggleSkillRequest, + ): Response + + @GET("api/cron/jobs") + suspend fun getCronJobs(): Response> + + @POST("api/cron/jobs/{id}/pause") + suspend fun pauseCronJob( + @Path("id") id: String, + ): Response + + @POST("api/cron/jobs/{id}/resume") + suspend fun resumeCronJob( + @Path("id") id: String, + ): Response + + @POST("api/cron/jobs/{id}/trigger") + suspend fun triggerCronJob( + @Path("id") id: String, + ): Response + + @DELETE("api/cron/jobs/{id}") + suspend fun deleteCronJob( + @Path("id") id: String, + ): Response + + @POST("api/gateway/start") + suspend fun startGateway(): Response + + @POST("api/gateway/stop") + suspend fun stopGateway(): Response + + @POST("api/gateway/restart") + suspend fun restartGateway(): Response + + @GET("api/profiles") + suspend fun getProfiles(): Response + + @GET("api/profiles/active") + suspend fun getActiveProfile(): Response + + @POST("api/profiles/active") + suspend fun setActiveProfile( + @Body body: SetActiveProfileRequest, + ): Response + + @GET("api/profiles/{name}/soul") + suspend fun getProfileSoul( + @Path("name") name: String, + ): Response + + @PUT("api/profiles/{name}/soul") + suspend fun updateProfileSoul( + @Path("name") name: String, + @Body body: UpdateProfileSoulRequest, + ): Response + + @PUT("api/profiles/{name}/model") + suspend fun updateProfileModel( + @Path("name") name: String, + @Body body: UpdateProfileModelRequest, + ): Response + + @PUT("api/profiles/{name}/description") + suspend fun updateProfileDescription( + @Path("name") name: String, + @Body body: UpdateProfileDescriptionRequest, + ): Response + + @GET("api/tools/toolsets") + suspend fun getToolsets(): Response> + + @PUT("api/tools/toolsets/{name}") + suspend fun toggleToolset( + @Path("name") name: String, + @Body body: ToolsetToggleRequest, + ): Response + + @GET("api/plugins/hermes-achievements/achievements") + suspend fun getAchievements(): Response +} diff --git a/app/src/main/java/com/m57/hermescontrol/data/ws/EventParser.kt b/app/src/main/java/com/m57/hermescontrol/data/ws/EventParser.kt new file mode 100644 index 00000000..8eb66c13 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/ws/EventParser.kt @@ -0,0 +1,106 @@ +package com.m57.hermescontrol.data.ws + +import android.util.Log + +/** + * Converts raw [JsonRpcResponse] objects into typed [WsEvent] instances. + * + * The Hermes TUI gateway sends events as JSON-RPC **notifications** (no `id` + * field). The `method` is always `"event"` and the event type lives in + * `params.type`. The event payload is in `params.payload`. + * + * Regular RPC responses have an `id` and either a `result` or `error`. + */ +object EventParser { + private const val TAG = "EventParser" + + fun parse( + response: JsonRpcResponse, + rawJson: String = "", + ): WsEvent { + // ── RPC response (has id) ──────────────────────────────────────── + val id = response.id + if (id != null) { + return if (response.error != null) { + WsEvent.RpcError(id, response.error) + } else { + WsEvent.RpcResult(id, response.result) + } + } + + // ── Notification / event (no id, has method) ───────────────────── + val params = response.params ?: return WsEvent.Unknown(rawJson) + val eventType = params["type"] as? String ?: return WsEvent.Unknown(rawJson) + + @Suppress("UNCHECKED_CAST") + val payload = params["payload"] as? Map + + val sessionId = payload?.get("session_id") as? String + + return when (eventType) { + "gateway.ready" -> { + WsEvent.GatewayReady(payload) + } + + "session.info" -> { + WsEvent.SessionInfo(payload) + } + + "message.start" -> { + WsEvent.MessageStart(sessionId) + } + + "message.token" -> { + val token = payload?.get("text") as? String ?: "" + WsEvent.MessageToken(token, sessionId) + } + + "thinking.delta" -> { + val token = payload?.get("text") as? String ?: "" + WsEvent.ThinkingDelta(token, sessionId) + } + + "message.complete" -> { + val text = payload?.get("text") as? String ?: "" + WsEvent.MessageComplete(text, sessionId) + } + + "message.done" -> { + WsEvent.MessageDone(sessionId) + } + + "tool.start" -> { + val name = payload?.get("name") as? String + WsEvent.ToolStart(name, payload) + } + + "tool.complete" -> { + val name = payload?.get("name") as? String + WsEvent.ToolComplete(name, payload) + } + + "clarify.request" -> { + val text = payload?.get("text") as? String + val rawOptions = payload?.get("options") + + @Suppress("UNCHECKED_CAST") + val options = (rawOptions as? List<*>)?.filterIsInstance() + WsEvent.ClarifyRequest(text, options) + } + + "status.update" -> { + val status = payload?.get("status") as? String + WsEvent.StatusUpdate(status, payload) + } + + "session.updated" -> { + WsEvent.SessionUpdated(payload) + } + + else -> { + Log.w(TAG, "Unknown event type: $eventType") + WsEvent.Unknown(rawJson) + } + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/data/ws/HermesWsClient.kt b/app/src/main/java/com/m57/hermescontrol/data/ws/HermesWsClient.kt new file mode 100644 index 00000000..b34462fa --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/ws/HermesWsClient.kt @@ -0,0 +1,224 @@ +package com.m57.hermescontrol.data.ws + +import android.util.Log +import com.google.gson.Gson +import com.m57.hermescontrol.data.local.AuthManager +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.SharedFlow +import kotlinx.coroutines.flow.asSharedFlow +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.Response +import okhttp3.WebSocket +import okhttp3.WebSocketListener +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.atomic.AtomicInteger + +/** + * WebSocket client for the Hermes Dashboard JSON-RPC 2.0 interface. + * + * Connects to `ws://HOST:PORT/api/ws?token=TOKEN`, auto-reconnects with + * exponential backoff, and emits parsed [WsEvent]s via [events] SharedFlow + * as well as direct callbacks. + */ +object HermesWsClient { + private const val TAG = "HermesWsClient" + + // ── Backoff settings ───────────────────────────────────────────────── + + private const val INITIAL_BACKOFF_MS = 1_000L + private const val MAX_BACKOFF_MS = 30_000L + private const val BACKOFF_MULTIPLIER = 2.0 + + // ── Internal state (all access through synchronized / atomic) ──────── + + private val gson = Gson() + private val requestId = AtomicInteger(0) + private val connected = AtomicBoolean(false) + private val intentionalClose = AtomicBoolean(false) + + @Volatile + private var webSocket: WebSocket? = null + + @Volatile + private var currentBackoff = INITIAL_BACKOFF_MS + + private val okHttpClient = + OkHttpClient + .Builder() + .readTimeout(0, TimeUnit.MILLISECONDS) // keep-alive forever + .pingInterval(30, TimeUnit.SECONDS) + .build() + + // ── Public observable stream ───────────────────────────────────────── + + private val _events = MutableSharedFlow(extraBufferCapacity = 64) + + /** Collect this from ViewModels to receive all parsed [WsEvent]s. */ + val events: SharedFlow = _events.asSharedFlow() + + // ── Callbacks (legacy / convenience) ───────────────────────────────── + + var onMessage: ((WsEvent) -> Unit)? = null + var onConnected: (() -> Unit)? = null + var onDisconnected: ((reason: String?) -> Unit)? = null + var onError: ((Throwable) -> Unit)? = null + + // ── Connection helpers ──────────────────────────────────────────────── + + val isConnected: Boolean get() = connected.get() + + /** Open a WebSocket connection using settings from [AuthManager]. */ + fun connect() { + if (connected.get()) { + Log.d(TAG, "Already connected — skipping") + return + } + intentionalClose.set(false) + currentBackoff = INITIAL_BACKOFF_MS + openSocket() + } + + /** Cleanly close the WebSocket and stop auto-reconnect. */ + fun disconnect() { + intentionalClose.set(true) + webSocket?.close(1000, "Client closed") + webSocket = null + connected.set(false) + } + + // ── Send helpers ───────────────────────────────────────────────────── + + /** + * Send a JSON-RPC request with the given [method] and optional [params]. + * @return the request id used (can be matched against [WsEvent.RpcResult]). + */ + fun send( + method: String, + params: Map = emptyMap(), + ): String { + val id = requestId.incrementAndGet().toString() + val request = JsonRpcRequest(id = id, method = method, params = params) + val json = gson.toJson(request) + Log.d(TAG, "→ $json") + webSocket?.send(json) ?: Log.w(TAG, "send() called while disconnected") + return id + } + + /** Convenience: submit a user prompt to an existing session. */ + fun sendMessage( + sessionId: String, + text: String, + ): String = + send( + method = WsMethods.PROMPT_SUBMIT, + params = mapOf("session_id" to sessionId, "text" to text), + ) + + // ── Internal ───────────────────────────────────────────────────────── + + private fun openSocket() { + val url = AuthManager.wsUrl() + Log.d(TAG, "Connecting to $url") + + val request = Request.Builder().url(url).build() + webSocket = okHttpClient.newWebSocket(request, WsListenerImpl()) + } + + private fun scheduleReconnect() { + if (intentionalClose.get()) return + if (!AuthManager.isAutoReconnect()) { + Log.d(TAG, "Auto-reconnect disabled") + return + } + val delay = currentBackoff + currentBackoff = + (currentBackoff * BACKOFF_MULTIPLIER) + .toLong() + .coerceAtMost(MAX_BACKOFF_MS) + Log.d(TAG, "Reconnecting in ${delay}ms …") + + // Simple thread-based scheduling; could be replaced with coroutine delay. + Thread { + try { + Thread.sleep(delay) + } catch (_: InterruptedException) { + return@Thread + } + if (!intentionalClose.get() && !connected.get()) { + openSocket() + } + }.apply { + isDaemon = true + name = "hermes-ws-reconnect" + start() + } + } + + private fun emit(event: WsEvent) { + _events.tryEmit(event) + onMessage?.invoke(event) + } + + // ── Listener ───────────────────────────────────────────────────────── + + private class WsListenerImpl : WebSocketListener() { + override fun onOpen( + ws: WebSocket, + response: Response, + ) { + Log.i(TAG, "WebSocket opened") + connected.set(true) + currentBackoff = INITIAL_BACKOFF_MS + onConnected?.invoke() + } + + override fun onMessage( + ws: WebSocket, + text: String, + ) { + Log.d(TAG, "← $text") + try { + val rpc = gson.fromJson(text, JsonRpcResponse::class.java) + val event = EventParser.parse(rpc, text) + emit(event) + } catch (e: Exception) { + Log.e(TAG, "Failed to parse message", e) + emit(WsEvent.Unknown(text)) + } + } + + override fun onClosing( + ws: WebSocket, + code: Int, + reason: String, + ) { + Log.d(TAG, "WebSocket closing: $code $reason") + ws.close(1000, null) + } + + override fun onClosed( + ws: WebSocket, + code: Int, + reason: String, + ) { + Log.i(TAG, "WebSocket closed: $code $reason") + connected.set(false) + onDisconnected?.invoke(reason) + scheduleReconnect() + } + + override fun onFailure( + ws: WebSocket, + t: Throwable, + response: Response?, + ) { + Log.e(TAG, "WebSocket failure: ${t.message}", t) + connected.set(false) + onError?.invoke(t) + onDisconnected?.invoke(t.message) + scheduleReconnect() + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/data/ws/JsonRpcModels.kt b/app/src/main/java/com/m57/hermescontrol/data/ws/JsonRpcModels.kt new file mode 100644 index 00000000..79e56a58 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/ws/JsonRpcModels.kt @@ -0,0 +1,32 @@ +package com.m57.hermescontrol.data.ws + +/** + * Outgoing JSON-RPC 2.0 request sent over the WebSocket. + */ +data class JsonRpcRequest( + val jsonrpc: String = "2.0", + val id: String, + val method: String, + val params: Map = emptyMap(), +) + +/** + * Incoming JSON-RPC 2.0 response **or** server-pushed notification. + * + * - RPC result/error → [id] is non-null, [result] or [error] is populated. + * - Event notification → [id] is null, [method] is `"event"`, event data in [params]. + */ +data class JsonRpcResponse( + val jsonrpc: String?, + val id: String?, + val result: Any?, + val error: JsonRpcError?, + val method: String?, + val params: Map?, +) + +data class JsonRpcError( + val code: Int, + val message: String, + val data: Any? = null, +) diff --git a/app/src/main/java/com/m57/hermescontrol/data/ws/WsEvent.kt b/app/src/main/java/com/m57/hermescontrol/data/ws/WsEvent.kt new file mode 100644 index 00000000..17df2526 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/ws/WsEvent.kt @@ -0,0 +1,89 @@ +package com.m57.hermescontrol.data.ws + +/** Parsed WebSocket events emitted by [HermesWsClient]. */ +sealed class WsEvent { + // ── Gateway lifecycle ──────────────────────────────────────────────── + + data class GatewayReady( + val data: Map?, + ) : WsEvent() + + // ── Session information ────────────────────────────────────────────── + + data class SessionInfo( + val data: Map?, + ) : WsEvent() + + // ── Message streaming ──────────────────────────────────────────────── + + data class MessageStart( + val sessionId: String?, + ) : WsEvent() + + data class MessageToken( + val token: String, + val sessionId: String?, + ) : WsEvent() + + data class ThinkingDelta( + val token: String, + val sessionId: String?, + ) : WsEvent() + + data class MessageComplete( + val text: String, + val sessionId: String?, + ) : WsEvent() + + data class MessageDone( + val sessionId: String?, + ) : WsEvent() + + // ── Tool execution ─────────────────────────────────────────────────── + + data class ToolStart( + val name: String?, + val data: Map?, + ) : WsEvent() + + data class ToolComplete( + val name: String?, + val data: Map?, + ) : WsEvent() + + // ── Interactive ────────────────────────────────────────────────────── + + data class ClarifyRequest( + val text: String?, + val options: List?, + ) : WsEvent() + + // ── Status ─────────────────────────────────────────────────────────── + + data class StatusUpdate( + val status: String?, + val data: Map?, + ) : WsEvent() + + data class SessionUpdated( + val data: Map?, + ) : WsEvent() + + // ── RPC responses ──────────────────────────────────────────────────── + + data class RpcResult( + val id: String, + val result: Any?, + ) : WsEvent() + + data class RpcError( + val id: String, + val error: JsonRpcError, + ) : WsEvent() + + // ── Fallback ───────────────────────────────────────────────────────── + + data class Unknown( + val raw: String, + ) : WsEvent() +} diff --git a/app/src/main/java/com/m57/hermescontrol/data/ws/WsMethods.kt b/app/src/main/java/com/m57/hermescontrol/data/ws/WsMethods.kt new file mode 100644 index 00000000..7930315e --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/data/ws/WsMethods.kt @@ -0,0 +1,17 @@ +package com.m57.hermescontrol.data.ws + +/** JSON-RPC method name constants used with [HermesWsClient.send]. */ +object WsMethods { + const val SESSION_LIST = "session.list" + const val SESSION_ACTIVE_LIST = "session.active_list" + const val SESSION_STATUS = "session.status" + const val SESSION_HISTORY = "session.history" + const val SESSION_RESUME = "session.resume" + const val SESSION_CREATE = "session.create" + const val PROMPT_SUBMIT = "prompt.submit" + const val SESSION_INTERRUPT = "session.interrupt" + const val SESSION_DELETE = "session.delete" + const val SESSION_TITLE = "session.title" + const val CLARIFY_RESPOND = "clarify.respond" + const val APPROVAL_RESPOND = "approval.respond" +} diff --git a/app/src/main/java/com/m57/hermescontrol/theme/Color.kt b/app/src/main/java/com/m57/hermescontrol/theme/Color.kt new file mode 100644 index 00000000..7450fa15 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/theme/Color.kt @@ -0,0 +1,43 @@ +package com.m57.hermescontrol.theme + +import androidx.compose.ui.graphics.Color + +// Primary - Deep Purple +val HermesPurple = Color(0xFF6B4EFF) +val HermesPurpleLight = Color(0xFF9D8AFF) +val HermesPurpleDark = Color(0xFF4A35B3) +val HermesPurple80 = Color(0xFFCFC3FF) + +// Secondary - Amber / Gold +val HermesAmber = Color(0xFFFFB300) +val HermesAmberLight = Color(0xFFFFE54C) +val HermesAmberDark = Color(0xFFC68400) +val HermesAmber80 = Color(0xFFFFE082) + +// Dark theme surfaces +val DarkBackground = Color(0xFF121212) +val DarkSurface = Color(0xFF1E1E2E) +val DarkSurfaceVariant = Color(0xFF2A2A3C) +val DarkOnSurface = Color(0xFFE6E1E5) +val DarkOnSurfaceVariant = Color(0xFFCAC4D0) + +// Light theme surfaces +val LightBackground = Color(0xFFFFFBFE) +val LightSurface = Color(0xFFFFFBFE) +val LightSurfaceVariant = Color(0xFFE7E0EC) +val LightOnSurface = Color(0xFF1C1B1F) +val LightOnSurfaceVariant = Color(0xFF49454F) + +// Status colors +val StatusGreen = Color(0xFF4CAF50) +val StatusRed = Color(0xFFEF5350) +val StatusYellow = Color(0xFFFFC107) + +// Chat bubble colors +val UserBubble = Color(0xFF6B4EFF) +val UserBubbleDark = Color(0xFF5A3FE0) +val AssistantBubble = Color(0xFF2A2A3C) +val AssistantBubbleLight = Color(0xFFE7E0EC) +val SystemMessageColor = Color(0xFF9E9E9E) +val ToolChipColor = Color(0xFF37474F) +val ToolChipColorLight = Color(0xFFECEFF1) diff --git a/app/src/main/java/com/m57/hermescontrol/theme/Theme.kt b/app/src/main/java/com/m57/hermescontrol/theme/Theme.kt new file mode 100644 index 00000000..3c5b844f --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/theme/Theme.kt @@ -0,0 +1,78 @@ +package com.m57.hermescontrol.theme + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.compositionLocalOf +import androidx.compose.ui.graphics.Color + +enum class ThemePreference { SYSTEM, LIGHT, DARK } + +val LocalThemePreference = compositionLocalOf { ThemePreference.SYSTEM } + +private val HermesDarkColorScheme = + darkColorScheme( + primary = HermesPurple, + onPrimary = Color.White, + primaryContainer = HermesPurpleDark, + onPrimaryContainer = HermesPurple80, + secondary = HermesAmber, + onSecondary = Color.Black, + secondaryContainer = HermesAmberDark, + onSecondaryContainer = HermesAmber80, + tertiary = HermesAmberLight, + background = DarkBackground, + onBackground = DarkOnSurface, + surface = DarkSurface, + onSurface = DarkOnSurface, + surfaceVariant = DarkSurfaceVariant, + onSurfaceVariant = DarkOnSurfaceVariant, + error = Color(0xFFCF6679), + onError = Color.Black, + outline = Color(0xFF938F99), + ) + +private val HermesLightColorScheme = + lightColorScheme( + primary = HermesPurple, + onPrimary = Color.White, + primaryContainer = HermesPurple80, + onPrimaryContainer = HermesPurpleDark, + secondary = HermesAmber, + onSecondary = Color.Black, + secondaryContainer = HermesAmber80, + onSecondaryContainer = HermesAmberDark, + tertiary = HermesAmberDark, + background = LightBackground, + onBackground = LightOnSurface, + surface = LightSurface, + onSurface = LightOnSurface, + surfaceVariant = LightSurfaceVariant, + onSurfaceVariant = LightOnSurfaceVariant, + error = Color(0xFFB00020), + onError = Color.White, + outline = Color(0xFF79747E), + ) + +@Composable +fun HermesControlTheme( + themePreference: ThemePreference = LocalThemePreference.current, + content: @Composable () -> Unit, +) { + val darkTheme = + when (themePreference) { + ThemePreference.SYSTEM -> isSystemInDarkTheme() + ThemePreference.LIGHT -> false + ThemePreference.DARK -> true + } + + val colorScheme = if (darkTheme) HermesDarkColorScheme else HermesLightColorScheme + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content, + ) +} diff --git a/app/src/main/java/com/m57/hermescontrol/theme/Type.kt b/app/src/main/java/com/m57/hermescontrol/theme/Type.kt new file mode 100644 index 00000000..1c095282 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/theme/Type.kt @@ -0,0 +1,36 @@ +package com.m57.hermescontrol.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = + Typography( + bodyLarge = + TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp, + ), + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ + ) diff --git a/app/src/main/java/com/m57/hermescontrol/ui/achievements/AchievementsScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/achievements/AchievementsScreen.kt new file mode 100644 index 00000000..0dcf6a8f --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/achievements/AchievementsScreen.kt @@ -0,0 +1,203 @@ +package com.m57.hermescontrol.ui.achievements + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +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.Menu +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +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.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.lifecycle.viewmodel.compose.viewModel + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AchievementsScreen( + modifier: Modifier = Modifier, + onOpenDrawer: (() -> Unit)? = null, + viewModel: AchievementsViewModel = viewModel { AchievementsViewModel() }, +) { + val state by viewModel.uiState.collectAsStateWithLifecycle() + + LaunchedEffect(Unit) { + viewModel.loadAchievements() + } + + Scaffold( + topBar = { + TopAppBar( + navigationIcon = { + if (onOpenDrawer != null) { + IconButton(onClick = onOpenDrawer) { + Icon( + imageVector = Icons.Filled.Menu, + contentDescription = "Open Drawer", + ) + } + } + }, + title = { Text("Agent Achievements") }, + actions = { + IconButton(onClick = { viewModel.loadAchievements() }) { + Icon(imageVector = Icons.Filled.Refresh, contentDescription = "Refresh") + } + }, + ) + }, + modifier = modifier, + ) { paddingValues -> + Box( + modifier = + Modifier + .fillMaxSize() + .padding(paddingValues), + ) { + if (state.isLoading && state.achievements.isEmpty()) { + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) + } else if (state.errorMessage != null && state.achievements.isEmpty()) { + Column( + modifier = + Modifier + .align(Alignment.Center) + .padding(16.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text(text = state.errorMessage ?: "", color = MaterialTheme.colorScheme.error) + Spacer(modifier = Modifier.height(16.dp)) + IconButton(onClick = { viewModel.loadAchievements() }) { + Icon(imageVector = Icons.Filled.Refresh, contentDescription = "Retry") + } + } + } else { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp), + ) { + items(state.achievements) { achievement -> + val pct = achievement.progress_pct?.toFloat()?.div(100f) ?: 0f + + Card( + modifier = Modifier.fillMaxWidth(), + colors = + CardDefaults.cardColors( + containerColor = + if (achievement.unlocked) { + MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.2f) + } else { + MaterialTheme.colorScheme.surfaceVariant + }, + ), + ) { + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Column(modifier = Modifier.weight(1f)) { + Text( + text = achievement.name, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, + ) + achievement.category?.let { + Text( + text = it, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } + + // Display Icon/Emoji/Tier + val badgeText = + when { + achievement.unlocked -> achievement.tier ?: "🏆" + achievement.discovered -> "🔒 Discovered" + else -> "❓ Secret" + } + Text( + text = badgeText, + style = MaterialTheme.typography.bodyMedium, + fontWeight = FontWeight.SemiBold, + color = + if (achievement.unlocked) { + MaterialTheme.colorScheme.primary + } else { + MaterialTheme.colorScheme.onSurfaceVariant + }, + ) + } + + achievement.description?.let { + Text( + text = it, + style = MaterialTheme.typography.bodyMedium, + ) + } + + if (achievement.discovered && !achievement.unlocked) { + Spacer(modifier = Modifier.height(4.dp)) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = + "Progress: ${achievement.progress?.toInt() ?: 0} / " + + "${achievement.next_threshold?.toInt() ?: 0}", + style = MaterialTheme.typography.bodySmall, + ) + Text( + text = "${achievement.progress_pct?.toInt() ?: 0}%", + style = MaterialTheme.typography.bodySmall, + ) + } + LinearProgressIndicator( + progress = { pct.coerceIn(0f, 1f) }, + modifier = Modifier.fillMaxWidth(), + ) + } + } + } + } + } + } + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/achievements/AchievementsViewModel.kt b/app/src/main/java/com/m57/hermescontrol/ui/achievements/AchievementsViewModel.kt new file mode 100644 index 00000000..5526d1d5 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/achievements/AchievementsViewModel.kt @@ -0,0 +1,58 @@ +package com.m57.hermescontrol.ui.achievements + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.m57.hermescontrol.data.model.Achievement +import com.m57.hermescontrol.data.remote.ApiClient +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +data class AchievementsUiState( + val isLoading: Boolean = false, + val achievements: List = emptyList(), + val errorMessage: String? = null, +) + +class AchievementsViewModel : ViewModel() { + private val _uiState = MutableStateFlow(AchievementsUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + fun loadAchievements() { + _uiState.update { it.copy(isLoading = true, errorMessage = null) } + viewModelScope.launch { + try { + val response = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.getAchievements() + } + if (response.isSuccessful) { + _uiState.update { + it.copy( + isLoading = false, + achievements = response.body()?.achievements.orEmpty(), + ) + } + } else { + _uiState.update { + it.copy( + isLoading = false, + errorMessage = "Failed to load achievements: HTTP ${response.code()}", + ) + } + } + } catch (e: Exception) { + _uiState.update { + it.copy( + isLoading = false, + errorMessage = "Failed to load achievements: ${e.message}", + ) + } + } + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatBubble.kt b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatBubble.kt new file mode 100644 index 00000000..3c83148b --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatBubble.kt @@ -0,0 +1,385 @@ +package com.m57.hermescontrol.ui.chat + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.animateContentSize +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.spring +import androidx.compose.animation.expandVertically +import androidx.compose.animation.fadeIn +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.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Build +import androidx.compose.material.icons.filled.CheckCircle +import androidx.compose.material.icons.filled.Error +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +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.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.withStyle +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.m57.hermescontrol.theme.AssistantBubble +import com.m57.hermescontrol.theme.AssistantBubbleLight +import com.m57.hermescontrol.theme.StatusGreen +import com.m57.hermescontrol.theme.StatusRed +import com.m57.hermescontrol.theme.SystemMessageColor +import com.m57.hermescontrol.theme.ToolChipColor +import com.m57.hermescontrol.theme.ToolChipColorLight +import com.m57.hermescontrol.theme.UserBubble +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale + +@Composable +fun ChatBubble( + message: ChatMessage, + isDarkTheme: Boolean, + modifier: Modifier = Modifier, +) { + val screenWidth = LocalConfiguration.current.screenWidthDp.dp + val maxBubbleWidth = screenWidth * 0.80f + + AnimatedVisibility( + visible = true, + enter = + fadeIn() + + expandVertically( + animationSpec = spring(stiffness = Spring.StiffnessMediumLow), + ), + ) { + when (message.role) { + MessageRole.USER -> UserBubble(message, maxBubbleWidth, modifier) + MessageRole.ASSISTANT -> AssistantBubble(message, maxBubbleWidth, isDarkTheme, modifier) + MessageRole.SYSTEM -> SystemBubble(message, modifier) + MessageRole.TOOL -> ToolBubble(message, isDarkTheme, modifier) + } + } +} + +@Composable +private fun UserBubble( + message: ChatMessage, + maxWidth: androidx.compose.ui.unit.Dp, + modifier: Modifier = Modifier, +) { + Box( + modifier = + modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 3.dp), + contentAlignment = Alignment.CenterEnd, + ) { + Surface( + modifier = + Modifier + .widthIn(max = maxWidth) + .clip( + RoundedCornerShape( + topStart = 16.dp, + topEnd = 16.dp, + bottomStart = 16.dp, + bottomEnd = 4.dp, + ), + ), + color = UserBubble, + tonalElevation = 0.dp, + ) { + Column(modifier = Modifier.padding(12.dp)) { + SelectionContainer { + Text( + text = message.content, + color = Color.White, + style = MaterialTheme.typography.bodyMedium, + ) + } + Text( + text = formatTimestamp(message.timestamp), + color = Color.White.copy(alpha = 0.7f), + style = MaterialTheme.typography.labelSmall, + modifier = + Modifier + .align(Alignment.End) + .padding(top = 4.dp), + ) + } + } + } +} + +@Composable +private fun AssistantBubble( + message: ChatMessage, + maxWidth: androidx.compose.ui.unit.Dp, + isDarkTheme: Boolean, + modifier: Modifier = Modifier, +) { + val bubbleColor = if (isDarkTheme) AssistantBubble else AssistantBubbleLight + val textColor = MaterialTheme.colorScheme.onSurface + + Box( + modifier = + modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 3.dp), + contentAlignment = Alignment.CenterStart, + ) { + Surface( + modifier = + Modifier + .widthIn(max = maxWidth) + .animateContentSize() + .clip( + RoundedCornerShape( + topStart = 4.dp, + topEnd = 16.dp, + bottomStart = 16.dp, + bottomEnd = 16.dp, + ), + ), + color = bubbleColor, + tonalElevation = 1.dp, + ) { + Column(modifier = Modifier.padding(12.dp)) { + SelectionContainer { + RichText( + text = message.content, + textColor = textColor, + ) + } + if (!message.isStreaming) { + Text( + text = formatTimestamp(message.timestamp), + color = textColor.copy(alpha = 0.5f), + style = MaterialTheme.typography.labelSmall, + modifier = + Modifier + .align(Alignment.End) + .padding(top = 4.dp), + ) + } + } + } + } +} + +@Composable +private fun SystemBubble( + message: ChatMessage, + modifier: Modifier = Modifier, +) { + Box( + modifier = + modifier + .fillMaxWidth() + .padding(horizontal = 24.dp, vertical = 6.dp), + contentAlignment = Alignment.Center, + ) { + Text( + text = message.content, + style = + MaterialTheme.typography.bodySmall.copy( + fontStyle = FontStyle.Italic, + color = SystemMessageColor, + ), + ) + } +} + +@Composable +private fun ToolBubble( + message: ChatMessage, + isDarkTheme: Boolean, + modifier: Modifier = Modifier, +) { + var expanded by remember { mutableStateOf(false) } + val chipColor = if (isDarkTheme) ToolChipColor else ToolChipColorLight + val contentColor = if (isDarkTheme) Color.White else Color.Black + + Box( + modifier = + modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 2.dp), + contentAlignment = Alignment.CenterStart, + ) { + Card( + onClick = { expanded = !expanded }, + colors = CardDefaults.cardColors(containerColor = chipColor), + shape = RoundedCornerShape(8.dp), + ) { + Column( + modifier = + Modifier + .animateContentSize() + .padding(horizontal = 12.dp, vertical = 8.dp), + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + val (icon, tint) = + when (message.toolStatus) { + ToolStatus.RUNNING -> Icons.Filled.Build to MaterialTheme.colorScheme.secondary + ToolStatus.COMPLETED -> Icons.Filled.CheckCircle to StatusGreen + ToolStatus.FAILED -> Icons.Filled.Error to StatusRed + null -> Icons.Filled.Build to contentColor.copy(alpha = 0.6f) + } + + if (message.toolStatus == ToolStatus.RUNNING) { + CircularProgressIndicator( + modifier = Modifier.size(14.dp), + strokeWidth = 2.dp, + color = MaterialTheme.colorScheme.secondary, + ) + } else { + Icon( + imageVector = icon, + contentDescription = null, + modifier = Modifier.size(14.dp), + tint = tint, + ) + } + + Text( + text = message.toolName ?: "Tool", + style = + MaterialTheme.typography.labelMedium.copy( + color = contentColor, + fontFamily = FontFamily.Monospace, + ), + ) + } + + if (expanded && message.content.isNotBlank()) { + Text( + text = message.content, + style = + MaterialTheme.typography.bodySmall.copy( + color = contentColor.copy(alpha = 0.8f), + fontFamily = FontFamily.Monospace, + fontSize = 11.sp, + ), + modifier = Modifier.padding(top = 6.dp), + ) + } + } + } + } +} + +/** + * Simple rich text renderer supporting **bold**, `inline code`, and ```code blocks```. + */ +@Composable +private fun RichText( + text: String, + textColor: Color, +) { + val annotated = + remember(text) { + buildAnnotatedString { + var i = 0 + val src = text + while (i < src.length) { + when { + // Code block: ```...``` + src.startsWith("```", i) -> { + val end = src.indexOf("```", i + 3) + if (end != -1) { + val code = src.substring(i + 3, end).trimStart('\n').trimEnd('\n') + withStyle( + SpanStyle( + fontFamily = FontFamily.Monospace, + fontSize = 13.sp, + background = textColor.copy(alpha = 0.08f), + ), + ) { + append(code) + } + i = end + 3 + } else { + append(src[i]) + i++ + } + } + + // Inline code: `...` + src[i] == '`' -> { + val end = src.indexOf('`', i + 1) + if (end != -1) { + withStyle( + SpanStyle( + fontFamily = FontFamily.Monospace, + fontSize = 13.sp, + background = textColor.copy(alpha = 0.08f), + ), + ) { + append(src.substring(i + 1, end)) + } + i = end + 1 + } else { + append(src[i]) + i++ + } + } + + // Bold: **...** + src.startsWith("**", i) -> { + val end = src.indexOf("**", i + 2) + if (end != -1) { + withStyle(SpanStyle(fontWeight = FontWeight.Bold)) { + append(src.substring(i + 2, end)) + } + i = end + 2 + } else { + append(src[i]) + i++ + } + } + + else -> { + append(src[i]) + i++ + } + } + } + } + } + + Text( + text = annotated, + style = MaterialTheme.typography.bodyMedium.copy(color = textColor), + ) +} + +private fun formatTimestamp(timestamp: Long): String { + val sdf = SimpleDateFormat("HH:mm", Locale.getDefault()) + return sdf.format(Date(timestamp)) +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatMessage.kt b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatMessage.kt new file mode 100644 index 00000000..b3b78155 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatMessage.kt @@ -0,0 +1,26 @@ +package com.m57.hermescontrol.ui.chat + +import java.util.UUID + +data class ChatMessage( + val id: String = UUID.randomUUID().toString(), + val role: MessageRole, + val content: String, + val timestamp: Long = System.currentTimeMillis(), + val isStreaming: Boolean = false, + val toolName: String? = null, + val toolStatus: ToolStatus? = null, +) + +enum class MessageRole { + USER, + ASSISTANT, + SYSTEM, + TOOL, +} + +enum class ToolStatus { + RUNNING, + COMPLETED, + FAILED, +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt new file mode 100644 index 00000000..01ba3bda --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt @@ -0,0 +1,562 @@ +package com.m57.hermescontrol.ui.chat + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.animateContentSize +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.RepeatMode +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.rememberInfiniteTransition +import androidx.compose.animation.core.tween +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.slideInVertically +import androidx.compose.animation.slideOutVertically +import androidx.compose.foundation.background +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +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.imePadding +import androidx.compose.foundation.layout.navigationBarsPadding +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.Send +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.ArrowDropDown +import androidx.compose.material.icons.filled.History +import androidx.compose.material.icons.filled.Menu +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material.icons.filled.Stop +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.FilledTonalButton +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.OutlinedTextFieldDefaults +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Snackbar +import androidx.compose.material3.SnackbarHost +import androidx.compose.material3.SnackbarHostState +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +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.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.lifecycle.viewmodel.compose.viewModel +import com.m57.hermescontrol.theme.StatusGreen +import com.m57.hermescontrol.theme.StatusRed + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ChatScreen( + onNavigateToSettings: () -> Unit, + modifier: Modifier = Modifier, + onOpenDrawer: (() -> Unit)? = null, + viewModel: ChatViewModel = viewModel { ChatViewModel() }, +) { + val state by viewModel.uiState.collectAsStateWithLifecycle() + val listState = rememberLazyListState() + var inputText by rememberSaveable { mutableStateOf("") } + val snackbarHostState = remember { SnackbarHostState() } + val isDark = isSystemInDarkTheme() + + // Auto-scroll to bottom on new messages + LaunchedEffect(state.messages.size, state.currentStreamingText) { + if (state.messages.isNotEmpty()) { + listState.animateScrollToItem(state.messages.lastIndex) + } + } + + // Show error as snackbar + LaunchedEffect(state.errorMessage) { + state.errorMessage?.let { error -> + snackbarHostState.showSnackbar(error) + viewModel.clearError() + } + } + + // Clarify dialog + state.clarifyRequest?.let { clarify -> + ClarifyDialog( + clarify = clarify, + onOptionSelected = viewModel::respondToClarify, + onDismiss = viewModel::dismissClarify, + ) + } + + Scaffold( + modifier = modifier.fillMaxSize(), + topBar = { + TopAppBar( + navigationIcon = { + if (onOpenDrawer != null) { + IconButton(onClick = onOpenDrawer) { + Icon( + imageVector = androidx.compose.material.icons.Icons.Filled.Menu, + contentDescription = "Open Drawer", + ) + } + } + }, + title = { + Row(verticalAlignment = Alignment.CenterVertically) { + Text( + text = "Hermes", + style = + MaterialTheme.typography.titleLarge.copy( + fontWeight = FontWeight.Bold, + ), + ) + Spacer(modifier = Modifier.width(8.dp)) + // Connection status dot + Box( + modifier = + Modifier + .size(10.dp) + .clip(CircleShape) + .background(if (state.isConnected) StatusGreen else StatusRed), + ) + } + }, + actions = { + // Session picker + Box { + IconButton(onClick = { + viewModel.loadSessions() + viewModel.toggleSessionPicker() + }) { + Icon( + imageVector = Icons.Filled.History, + contentDescription = "Sessions", + ) + } + + DropdownMenu( + expanded = state.showSessionPicker, + onDismissRequest = { viewModel.toggleSessionPicker() }, + ) { + DropdownMenuItem( + text = { + Row(verticalAlignment = Alignment.CenterVertically) { + Icon( + Icons.Filled.Add, + contentDescription = null, + modifier = Modifier.size(18.dp), + ) + Spacer(modifier = Modifier.width(8.dp)) + Text("New Session") + } + }, + onClick = { + viewModel.createNewSession() + viewModel.toggleSessionPicker() + }, + ) + if (state.sessions.isNotEmpty()) { + HorizontalDivider() + } + state.sessions.forEach { session -> + DropdownMenuItem( + text = { + Column { + Text( + text = session.title, + style = MaterialTheme.typography.bodyMedium, + maxLines = 1, + ) + Text( + text = "${session.messageCount} messages", + style = + MaterialTheme.typography.labelSmall.copy( + color = MaterialTheme.colorScheme.onSurfaceVariant, + ), + ) + } + }, + onClick = { viewModel.switchSession(session.id) }, + trailingIcon = { + if (session.id == state.currentSessionId) { + Icon( + Icons.Filled.ArrowDropDown, + contentDescription = "Current", + tint = MaterialTheme.colorScheme.primary, + modifier = Modifier.size(18.dp), + ) + } + }, + ) + } + } + } + + // Settings + IconButton(onClick = onNavigateToSettings) { + Icon( + imageVector = Icons.Filled.Settings, + contentDescription = "Settings", + ) + } + }, + colors = + TopAppBarDefaults.topAppBarColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + ) + }, + snackbarHost = { + SnackbarHost(snackbarHostState) { data -> + Snackbar( + snackbarData = data, + containerColor = MaterialTheme.colorScheme.errorContainer, + contentColor = MaterialTheme.colorScheme.onErrorContainer, + ) + } + }, + bottomBar = { + ChatInputBar( + inputText = inputText, + onInputChange = { inputText = it }, + onSend = { + viewModel.sendMessage(inputText) + inputText = "" + }, + onInterrupt = viewModel::interruptSession, + isAgentTyping = state.isAgentTyping, + isConnected = state.isConnected, + ) + }, + ) { paddingValues -> + Box( + modifier = + Modifier + .fillMaxSize() + .padding(paddingValues), + ) { + if (state.messages.isEmpty() && !state.isLoading) { + // Empty state + EmptyState() + } + + LazyColumn( + state = listState, + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(vertical = 8.dp), + ) { + items( + items = state.messages, + key = { it.id }, + ) { message -> + ChatBubble( + message = message, + isDarkTheme = isDark, + ) + } + + // Thinking indicator + if (state.isThinking) { + item(key = "thinking") { + ThinkingIndicator(state.thinkingText) + } + } + } + + // Loading overlay + AnimatedVisibility( + visible = state.isLoading, + enter = fadeIn(), + exit = fadeOut(), + modifier = Modifier.fillMaxSize(), + ) { + Box( + modifier = + Modifier + .fillMaxSize() + .background(MaterialTheme.colorScheme.background.copy(alpha = 0.7f)), + contentAlignment = Alignment.Center, + ) { + Card( + colors = + CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(4.dp), + ) { + Column( + modifier = Modifier.padding(32.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + CircularProgressIndicator( + color = MaterialTheme.colorScheme.primary, + ) + Spacer(modifier = Modifier.height(16.dp)) + Text( + text = "Connecting to Hermes…", + style = MaterialTheme.typography.bodyMedium, + ) + } + } + } + } + } + } +} + +@Composable +private fun EmptyState() { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center, + ) { + Column( + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + text = "⚡", + fontSize = 48.sp, + ) + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = "Ready to chat", + style = + MaterialTheme.typography.titleMedium.copy( + color = MaterialTheme.colorScheme.onSurfaceVariant, + ), + ) + Text( + text = "Send a message to start a conversation", + style = + MaterialTheme.typography.bodySmall.copy( + color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.7f), + ), + ) + } + } +} + +@Composable +private fun ThinkingIndicator(thinkingText: String) { + val infiniteTransition = rememberInfiniteTransition(label = "thinking") + val alpha by infiniteTransition.animateFloat( + initialValue = 0.3f, + targetValue = 1f, + animationSpec = + infiniteRepeatable( + animation = tween(600, easing = LinearEasing), + repeatMode = RepeatMode.Reverse, + ), + label = "thinking_alpha", + ) + + Box( + modifier = + Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 4.dp), + contentAlignment = Alignment.CenterStart, + ) { + Card( + colors = + CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f), + ), + shape = RoundedCornerShape(12.dp), + ) { + Row( + modifier = Modifier.padding(horizontal = 12.dp, vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = "🤔", + fontSize = 14.sp, + modifier = Modifier.graphicsLayer { this.alpha = alpha }, + ) + Spacer(modifier = Modifier.width(8.dp)) + Text( + text = + if (thinkingText.isNotBlank()) { + val display = thinkingText.takeLast(100) + "Thinking: $display…" + } else { + "Thinking…" + }, + style = + MaterialTheme.typography.bodySmall.copy( + color = MaterialTheme.colorScheme.onSurfaceVariant, + ), + maxLines = 2, + modifier = Modifier.animateContentSize(), + ) + } + } + } +} + +@Composable +private fun ChatInputBar( + inputText: String, + onInputChange: (String) -> Unit, + onSend: () -> Unit, + onInterrupt: () -> Unit, + isAgentTyping: Boolean, + isConnected: Boolean, +) { + val canSend = inputText.isNotBlank() && !isAgentTyping && isConnected + + AnimatedVisibility( + visible = true, + enter = slideInVertically(initialOffsetY = { it }), + exit = slideOutVertically(targetOffsetY = { it }), + ) { + Card( + modifier = + Modifier + .fillMaxWidth() + .navigationBarsPadding() + .imePadding(), + shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp), + colors = + CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(8.dp), + ) { + Row( + modifier = + Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp, vertical = 8.dp), + verticalAlignment = Alignment.Bottom, + ) { + OutlinedTextField( + value = inputText, + onValueChange = onInputChange, + modifier = + Modifier + .weight(1f) + .heightIn(max = 140.dp), + placeholder = { + Text( + if (!isConnected) { + "Not connected…" + } else if (isAgentTyping) { + "Waiting for response…" + } else { + "Type a message…" + }, + ) + }, + enabled = isConnected, + maxLines = 5, + shape = RoundedCornerShape(20.dp), + colors = + OutlinedTextFieldDefaults.colors( + focusedBorderColor = MaterialTheme.colorScheme.primary, + unfocusedBorderColor = MaterialTheme.colorScheme.outline.copy(alpha = 0.5f), + cursorColor = MaterialTheme.colorScheme.primary, + ), + ) + + Spacer(modifier = Modifier.width(8.dp)) + + if (isAgentTyping) { + // Interrupt button + FilledTonalButton( + onClick = onInterrupt, + modifier = Modifier.size(48.dp), + shape = CircleShape, + contentPadding = PaddingValues(0.dp), + ) { + Icon( + imageVector = Icons.Filled.Stop, + contentDescription = "Interrupt", + tint = MaterialTheme.colorScheme.error, + ) + } + } else { + // Send button + FilledTonalButton( + onClick = onSend, + enabled = canSend, + modifier = Modifier.size(48.dp), + shape = CircleShape, + contentPadding = PaddingValues(0.dp), + ) { + Icon( + imageVector = Icons.AutoMirrored.Filled.Send, + contentDescription = "Send", + ) + } + } + } + } + } +} + +@Composable +private fun ClarifyDialog( + clarify: ClarifyUi, + onOptionSelected: (String) -> Unit, + onDismiss: () -> Unit, +) { + AlertDialog( + onDismissRequest = onDismiss, + title = { Text("Clarification Needed") }, + text = { + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + Text(text = clarify.text) + Spacer(modifier = Modifier.height(8.dp)) + clarify.options.forEach { option -> + FilledTonalButton( + onClick = { onOptionSelected(option) }, + modifier = Modifier.fillMaxWidth(), + ) { + Text(option) + } + } + } + }, + confirmButton = {}, + dismissButton = { + TextButton(onClick = onDismiss) { + Text("Dismiss") + } + }, + ) +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatViewModel.kt b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatViewModel.kt new file mode 100644 index 00000000..1d252851 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatViewModel.kt @@ -0,0 +1,422 @@ +package com.m57.hermescontrol.ui.chat + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.m57.hermescontrol.data.local.AuthManager +import com.m57.hermescontrol.data.ws.HermesWsClient +import com.m57.hermescontrol.data.ws.WsEvent +import com.m57.hermescontrol.data.ws.WsMethods +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch + +data class ChatUiState( + val messages: List = emptyList(), + val currentSessionId: String? = null, + val sessions: List = emptyList(), + val isConnected: Boolean = false, + val isAgentTyping: Boolean = false, + val isThinking: Boolean = false, + val thinkingText: String = "", + val isLoading: Boolean = false, + val currentStreamingText: String = "", + val errorMessage: String? = null, + val clarifyRequest: ClarifyUi? = null, + val showSessionPicker: Boolean = false, +) + +data class SessionUi( + val id: String, + val title: String, + val messageCount: Int = 0, +) + +data class ClarifyUi( + val text: String, + val options: List, +) + +class ChatViewModel : ViewModel() { + private val _uiState = MutableStateFlow(ChatUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + private val wsClient = HermesWsClient + private val pendingRequests = mutableMapOf() // requestId -> method + + init { + connectWebSocket() + } + + private fun connectWebSocket() { + val token = AuthManager.getToken() ?: return + + _uiState.update { it.copy(isLoading = true) } + + viewModelScope.launch(Dispatchers.IO) { + wsClient.connect() + } + + viewModelScope.launch { + wsClient.events.collect { event -> + handleWsEvent(event) + } + } + } + + private fun handleWsEvent(event: WsEvent) { + when (event) { + is WsEvent.GatewayReady -> { + _uiState.update { it.copy(isConnected = true, isLoading = false) } + addSystemMessage("Connected to Hermes") + loadSessions() + // Create a new session if none exists + if (_uiState.value.currentSessionId == null) { + createNewSession() + } + } + + is WsEvent.SessionInfo -> { + // We may receive session info after creation + } + + is WsEvent.MessageStart -> { + _uiState.update { + it.copy( + isAgentTyping = true, + currentStreamingText = "", + isThinking = false, + thinkingText = "", + ) + } + } + + is WsEvent.MessageToken -> { + _uiState.update { state -> + val newText = state.currentStreamingText + event.token + // Update or create the streaming message + val messages = state.messages.toMutableList() + val streamingIdx = + messages.indexOfLast { + it.role == MessageRole.ASSISTANT && it.isStreaming + } + if (streamingIdx >= 0) { + messages[streamingIdx] = messages[streamingIdx].copy(content = newText) + } else { + messages.add( + ChatMessage( + role = MessageRole.ASSISTANT, + content = newText, + isStreaming = true, + ), + ) + } + state.copy( + messages = messages, + currentStreamingText = newText, + isThinking = false, + ) + } + } + + is WsEvent.ThinkingDelta -> { + _uiState.update { state -> + state.copy( + isThinking = true, + thinkingText = state.thinkingText + event.token, + ) + } + } + + is WsEvent.MessageComplete -> { + _uiState.update { state -> + val messages = state.messages.toMutableList() + val streamingIdx = + messages.indexOfLast { + it.role == MessageRole.ASSISTANT && it.isStreaming + } + if (streamingIdx >= 0) { + messages[streamingIdx] = + messages[streamingIdx].copy( + content = event.text, + isStreaming = false, + ) + } else { + messages.add( + ChatMessage( + role = MessageRole.ASSISTANT, + content = event.text, + ), + ) + } + state.copy( + messages = messages, + isAgentTyping = false, + currentStreamingText = "", + isThinking = false, + thinkingText = "", + ) + } + } + + is WsEvent.MessageDone -> { + _uiState.update { + it.copy(isAgentTyping = false, isThinking = false, thinkingText = "") + } + } + + is WsEvent.ToolStart -> { + val toolMessage = + ChatMessage( + role = MessageRole.TOOL, + content = event.data.toString(), + toolName = event.name, + toolStatus = ToolStatus.RUNNING, + ) + _uiState.update { state -> + state.copy(messages = state.messages + toolMessage) + } + } + + is WsEvent.ToolComplete -> { + _uiState.update { state -> + val messages = state.messages.toMutableList() + val toolIdx = + messages.indexOfLast { + it.role == MessageRole.TOOL && + it.toolName == event.name && + it.toolStatus == ToolStatus.RUNNING + } + if (toolIdx >= 0) { + messages[toolIdx] = + messages[toolIdx].copy( + toolStatus = ToolStatus.COMPLETED, + content = event.data.toString(), + ) + } + state.copy(messages = messages) + } + } + + is WsEvent.ClarifyRequest -> { + _uiState.update { + it.copy( + clarifyRequest = + ClarifyUi( + text = event.text.orEmpty(), + options = event.options.orEmpty(), + ), + ) + } + } + + is WsEvent.StatusUpdate -> { + // Can be used for general status + } + + is WsEvent.SessionUpdated -> { + // Refresh sessions list + loadSessions() + } + + is WsEvent.RpcResult -> { + handleRpcResult(event.id, event.result) + } + + is WsEvent.RpcError -> { + handleRpcError(event.id, event.error) + } + + is WsEvent.Unknown -> { + // Handle or ignore unknown/unhandled events + } + } + } + + @Suppress("UNCHECKED_CAST") + private fun handleRpcResult( + id: String, + result: Any?, + ) { + val method = pendingRequests.remove(id) ?: return + + when (method) { + WsMethods.SESSION_CREATE -> { + val resultMap = result as? Map ?: return + val sessionId = resultMap["session_id"] as? String ?: return + _uiState.update { + it.copy( + currentSessionId = sessionId, + isLoading = false, + messages = it.messages, + ) + } + addSystemMessage("Session created") + loadSessions() + } + + WsMethods.SESSION_LIST -> { + val resultMap = result as? Map ?: return + val sessionsList = resultMap["sessions"] as? List> ?: return + val sessions = + sessionsList.map { s -> + SessionUi( + id = s["id"] as? String ?: "", + title = s["title"] as? String ?: "Untitled", + messageCount = (s["message_count"] as? Double)?.toInt() ?: 0, + ) + } + _uiState.update { it.copy(sessions = sessions) } + } + + WsMethods.SESSION_RESUME -> { + _uiState.update { it.copy(isLoading = false) } + addSystemMessage("Session resumed") + } + + WsMethods.SESSION_INTERRUPT -> { + _uiState.update { + it.copy(isAgentTyping = false, isThinking = false) + } + addSystemMessage("Session interrupted") + } + } + } + + private fun handleRpcError( + id: String, + error: Any?, + ) { + val method = pendingRequests.remove(id) + val errorMsg = + when (error) { + is Map<*, *> -> error["message"] as? String ?: error.toString() + else -> error.toString() + } + _uiState.update { + it.copy( + isLoading = false, + errorMessage = "Error${if (method != null) " ($method)" else ""}: $errorMsg", + ) + } + } + + fun sendMessage(text: String) { + if (text.isBlank()) return + val sessionId = _uiState.value.currentSessionId ?: return + + // Add user message to UI + val userMessage = + ChatMessage( + role = MessageRole.USER, + content = text, + ) + _uiState.update { state -> + state.copy( + messages = state.messages + userMessage, + isAgentTyping = true, + ) + } + + viewModelScope.launch(Dispatchers.IO) { + val requestId = wsClient.sendMessage(sessionId, text) + pendingRequests[requestId] = WsMethods.PROMPT_SUBMIT + } + } + + fun interruptSession() { + val sessionId = _uiState.value.currentSessionId ?: return + viewModelScope.launch(Dispatchers.IO) { + val requestId = + wsClient.send( + WsMethods.SESSION_INTERRUPT, + mapOf("session_id" to sessionId), + ) + pendingRequests[requestId] = WsMethods.SESSION_INTERRUPT + } + } + + fun createNewSession() { + _uiState.update { it.copy(isLoading = true, messages = emptyList()) } + viewModelScope.launch(Dispatchers.IO) { + val requestId = wsClient.send(WsMethods.SESSION_CREATE) + pendingRequests[requestId] = WsMethods.SESSION_CREATE + } + } + + fun loadSessions() { + viewModelScope.launch(Dispatchers.IO) { + val requestId = wsClient.send(WsMethods.SESSION_LIST) + pendingRequests[requestId] = WsMethods.SESSION_LIST + } + } + + fun switchSession(sessionId: String) { + if (sessionId == _uiState.value.currentSessionId) return + _uiState.update { + it.copy( + isLoading = true, + messages = emptyList(), + currentSessionId = sessionId, + showSessionPicker = false, + ) + } + viewModelScope.launch(Dispatchers.IO) { + val requestId = + wsClient.send( + WsMethods.SESSION_RESUME, + mapOf("session_id" to sessionId), + ) + pendingRequests[requestId] = WsMethods.SESSION_RESUME + } + } + + fun toggleSessionPicker() { + _uiState.update { it.copy(showSessionPicker = !it.showSessionPicker) } + } + + fun dismissClarify() { + _uiState.update { it.copy(clarifyRequest = null) } + } + + fun respondToClarify(option: String) { + _uiState.update { it.copy(clarifyRequest = null) } + sendMessage(option) + } + + fun clearError() { + _uiState.update { it.copy(errorMessage = null) } + } + + fun reconnect() { + _uiState.update { + it.copy( + isConnected = false, + isLoading = true, + errorMessage = null, + ) + } + viewModelScope.launch(Dispatchers.IO) { + wsClient.disconnect() + } + viewModelScope.launch { + delay(500) + connectWebSocket() + } + } + + private fun addSystemMessage(text: String) { + val msg = ChatMessage(role = MessageRole.SYSTEM, content = text) + _uiState.update { it.copy(messages = it.messages + msg) } + } + + override fun onCleared() { + super.onCleared() + viewModelScope.launch(Dispatchers.IO) { + wsClient.disconnect() + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/commands/CommandPanel.kt b/app/src/main/java/com/m57/hermescontrol/ui/commands/CommandPanel.kt new file mode 100644 index 00000000..7b89e0e3 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/commands/CommandPanel.kt @@ -0,0 +1,95 @@ +package com.m57.hermescontrol.ui.commands + +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Analytics +import androidx.compose.material.icons.filled.History +import androidx.compose.material.icons.filled.Info +import androidx.compose.material3.AssistChip +import androidx.compose.material3.AssistChipDefaults +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.unit.dp + +data class QuickCommand( + val label: String, + val icon: ImageVector, + val action: () -> Unit, +) + +@Composable +fun CommandPanel( + onStatusClick: () -> Unit, + onSessionsClick: () -> Unit, + onSystemStatsClick: () -> Unit, + onNewSessionClick: () -> Unit, + modifier: Modifier = Modifier, +) { + val commands = + listOf( + QuickCommand("Status", Icons.Filled.Info, onStatusClick), + QuickCommand("Sessions", Icons.Filled.History, onSessionsClick), + QuickCommand("System Stats", Icons.Filled.Analytics, onSystemStatsClick), + QuickCommand("New Session", Icons.Filled.Add, onNewSessionClick), + ) + + Card( + modifier = modifier.fillMaxWidth(), + colors = + CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.5f), + ), + elevation = CardDefaults.cardElevation(0.dp), + ) { + Column( + modifier = Modifier.padding(horizontal = 12.dp, vertical = 8.dp), + ) { + Text( + text = "Quick Commands", + style = + MaterialTheme.typography.labelSmall.copy( + color = MaterialTheme.colorScheme.onSurfaceVariant, + ), + modifier = Modifier.padding(bottom = 6.dp), + ) + Row( + modifier = + Modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()), + horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + commands.forEach { cmd -> + AssistChip( + onClick = cmd.action, + label = { Text(cmd.label, style = MaterialTheme.typography.labelMedium) }, + leadingIcon = { + Icon( + imageVector = cmd.icon, + contentDescription = cmd.label, + modifier = Modifier.padding(0.dp), + ) + }, + colors = + AssistChipDefaults.assistChipColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + ) + } + } + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/connect/ConnectScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/connect/ConnectScreen.kt new file mode 100644 index 00000000..c35dc32d --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/connect/ConnectScreen.kt @@ -0,0 +1,256 @@ +package com.m57.hermescontrol.ui.connect + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +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.imePadding +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Visibility +import androidx.compose.material.icons.filled.VisibilityOff +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults +import androidx.compose.material3.Text +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.FontWeight +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.text.input.VisualTransformation +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.lifecycle.viewmodel.compose.viewModel + +@Composable +fun ConnectScreen( + onConnected: () -> Unit, + modifier: Modifier = Modifier, + viewModel: ConnectViewModel = viewModel { ConnectViewModel() }, +) { + val state by viewModel.uiState.collectAsStateWithLifecycle() + + LaunchedEffect(state.connectionSuccess) { + if (state.connectionSuccess) { + onConnected() + } + } + + var passwordVisible by remember { mutableStateOf(false) } + + Box( + modifier = + modifier + .fillMaxSize() + .imePadding(), + contentAlignment = Alignment.Center, + ) { + Column( + modifier = + Modifier + .fillMaxWidth() + .verticalScroll(rememberScrollState()) + .padding(24.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, + ) { + // Branding + Text( + text = "⚡", + fontSize = 64.sp, + textAlign = TextAlign.Center, + ) + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = "Hermes", + style = + MaterialTheme.typography.headlineLarge.copy( + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.primary, + ), + ) + Text( + text = "AI Agent Control", + style = + MaterialTheme.typography.titleMedium.copy( + color = MaterialTheme.colorScheme.onSurfaceVariant, + ), + ) + + Spacer(modifier = Modifier.height(32.dp)) + + // Connection Card + Card( + modifier = Modifier.fillMaxWidth(), + colors = + CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp), + ) { + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(20.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + Text( + text = "Connect to Hermes", + style = + MaterialTheme.typography.titleMedium.copy( + fontWeight = FontWeight.SemiBold, + ), + ) + + // Token field + OutlinedTextField( + value = state.token, + onValueChange = viewModel::onTokenChange, + label = { Text("Auth Token") }, + placeholder = { Text("Enter your API token") }, + singleLine = true, + visualTransformation = + if (passwordVisible) { + VisualTransformation.None + } else { + PasswordVisualTransformation() + }, + trailingIcon = { + IconButton(onClick = { passwordVisible = !passwordVisible }) { + Icon( + imageVector = + if (passwordVisible) { + Icons.Filled.Visibility + } else { + Icons.Filled.VisibilityOff + }, + contentDescription = + if (passwordVisible) { + "Hide token" + } else { + "Show token" + }, + ) + } + }, + modifier = Modifier.fillMaxWidth(), + colors = + OutlinedTextFieldDefaults.colors( + focusedBorderColor = MaterialTheme.colorScheme.primary, + cursorColor = MaterialTheme.colorScheme.primary, + ), + ) + + // Host field + OutlinedTextField( + value = state.host, + onValueChange = viewModel::onHostChange, + label = { Text("Host") }, + placeholder = { Text("127.0.0.1") }, + singleLine = true, + modifier = Modifier.fillMaxWidth(), + colors = + OutlinedTextFieldDefaults.colors( + focusedBorderColor = MaterialTheme.colorScheme.primary, + cursorColor = MaterialTheme.colorScheme.primary, + ), + ) + + // Port field + OutlinedTextField( + value = state.port, + onValueChange = viewModel::onPortChange, + label = { Text("Port") }, + placeholder = { Text("9119") }, + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier.fillMaxWidth(), + colors = + OutlinedTextFieldDefaults.colors( + focusedBorderColor = MaterialTheme.colorScheme.primary, + cursorColor = MaterialTheme.colorScheme.primary, + ), + ) + + // Error message + AnimatedVisibility( + visible = state.errorMessage != null, + enter = fadeIn(), + exit = fadeOut(), + ) { + state.errorMessage?.let { error -> + Card( + colors = + CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.errorContainer, + ), + modifier = Modifier.fillMaxWidth(), + ) { + Text( + text = error, + color = MaterialTheme.colorScheme.onErrorContainer, + style = MaterialTheme.typography.bodySmall, + modifier = Modifier.padding(12.dp), + ) + } + } + } + + // Connect button + Button( + onClick = viewModel::connect, + enabled = !state.isConnecting, + modifier = + Modifier + .fillMaxWidth() + .height(52.dp), + colors = + ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.primary, + ), + ) { + if (state.isConnecting) { + CircularProgressIndicator( + modifier = Modifier.size(24.dp), + color = MaterialTheme.colorScheme.onPrimary, + strokeWidth = 2.dp, + ) + } else { + Text( + text = "Connect", + style = MaterialTheme.typography.labelLarge, + ) + } + } + } + } + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/connect/ConnectViewModel.kt b/app/src/main/java/com/m57/hermescontrol/ui/connect/ConnectViewModel.kt new file mode 100644 index 00000000..6aee6c92 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/connect/ConnectViewModel.kt @@ -0,0 +1,119 @@ +package com.m57.hermescontrol.ui.connect + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.m57.hermescontrol.data.local.AuthManager +import com.m57.hermescontrol.data.remote.ApiClient +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +data class ConnectUiState( + val token: String = "", + val host: String = "127.0.0.1", + val port: String = "9119", + val isConnecting: Boolean = false, + val connectionSuccess: Boolean = false, + val errorMessage: String? = null, +) + +class ConnectViewModel : ViewModel() { + private val _uiState = MutableStateFlow(ConnectUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + init { + // Load saved values + val savedToken = AuthManager.getToken() ?: "" + val savedHost = AuthManager.getHost() + val savedPort = AuthManager.getPort() + _uiState.update { + it.copy( + token = savedToken, + host = savedHost, + port = savedPort.toString(), + ) + } + } + + fun onTokenChange(value: String) { + _uiState.update { it.copy(token = value.trim(), errorMessage = null) } + } + + fun onHostChange(value: String) { + _uiState.update { it.copy(host = value.trim(), errorMessage = null) } + } + + fun onPortChange(value: String) { + _uiState.update { it.copy(port = value.filter { c -> c.isDigit() }, errorMessage = null) } + } + + fun connect() { + val state = _uiState.value + if (state.token.isBlank()) { + _uiState.update { it.copy(errorMessage = "Token is required") } + return + } + if (state.host.isBlank()) { + _uiState.update { it.copy(errorMessage = "Host is required") } + return + } + val port = state.port.toIntOrNull() + if (port == null || port !in 1..65535) { + _uiState.update { it.copy(errorMessage = "Port must be between 1 and 65535") } + return + } + + _uiState.update { it.copy(isConnecting = true, errorMessage = null) } + + // Save settings before testing so ApiClient uses the right base URL + AuthManager.setToken(state.token) + AuthManager.setHost(state.host) + AuthManager.setPort(port) + ApiClient.rebuild() + + viewModelScope.launch { + try { + val response = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.getStatus() + } + if (response.isSuccessful) { + _uiState.update { + it.copy(isConnecting = false, connectionSuccess = true, errorMessage = null) + } + } else { + val code = response.code() + val msg = + when (code) { + 401 -> { + AuthManager.setToken(null) + "Invalid token (401 Unauthorized)" + } + + 403 -> { + "Access denied (403 Forbidden)" + } + + else -> { + "Server returned HTTP $code" + } + } + _uiState.update { it.copy(isConnecting = false, errorMessage = msg) } + } + } catch (e: Exception) { + val msg = + when { + e.message?.contains("timeout", true) == true -> "Connection timed out" + e.message?.contains("refused", true) == true -> "Connection refused – is Hermes running?" + e.message?.contains("resolve", true) == true -> "Could not resolve host" + else -> "Connection failed: ${e.message}" + } + _uiState.update { it.copy(isConnecting = false, errorMessage = msg) } + } + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/cron/CronJobsScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/cron/CronJobsScreen.kt new file mode 100644 index 00000000..eb16d81b --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/cron/CronJobsScreen.kt @@ -0,0 +1,156 @@ +package com.m57.hermescontrol.ui.cron + +import android.widget.Toast +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +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.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Menu +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Card +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.lifecycle.viewmodel.compose.viewModel + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun CronJobsScreen( + modifier: Modifier = Modifier, + onOpenDrawer: (() -> Unit)? = null, + viewModel: CronJobsViewModel = viewModel { CronJobsViewModel() }, +) { + val state by viewModel.uiState.collectAsStateWithLifecycle() + val context = LocalContext.current + + LaunchedEffect(Unit) { + viewModel.loadCronJobs() + } + + LaunchedEffect(state.toastMessage) { + state.toastMessage?.let { msg -> + Toast.makeText(context, msg, Toast.LENGTH_SHORT).show() + viewModel.clearToast() + } + } + + Scaffold( + topBar = { + TopAppBar( + navigationIcon = { + if (onOpenDrawer != null) { + IconButton(onClick = onOpenDrawer) { + Icon( + imageVector = androidx.compose.material.icons.Icons.Filled.Menu, + contentDescription = "Open Drawer", + ) + } + } + }, + title = { Text("Cron Jobs") }, + actions = { + IconButton(onClick = { viewModel.loadCronJobs() }) { + Text("Refresh") + } + }, + ) + }, + modifier = modifier, + ) { paddingValues -> + Box( + modifier = + Modifier + .fillMaxSize() + .padding(paddingValues), + ) { + if (state.isLoading) { + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) + } else if (state.errorMessage != null) { + Text( + text = state.errorMessage ?: "", + color = MaterialTheme.colorScheme.error, + modifier = + Modifier + .align(Alignment.Center) + .padding(16.dp), + ) + } else { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(16.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + items(state.jobs) { job -> + Card(modifier = Modifier.fillMaxWidth()) { + Column(modifier = Modifier.padding(16.dp)) { + Text(text = job.name, style = MaterialTheme.typography.titleMedium) + Spacer(modifier = Modifier.height(4.dp)) + Text(text = "Schedule: ${job.schedule}", style = MaterialTheme.typography.bodyMedium) + Text(text = "Status: ${job.state}", style = MaterialTheme.typography.bodyMedium) + Text( + text = "Last Run: ${job.last_run_status ?: "Never"}", + style = MaterialTheme.typography.bodyMedium, + ) + Text( + text = "Next Run: ${job.next_run ?: "N/A"}", + style = MaterialTheme.typography.bodyMedium, + ) + + Spacer(modifier = Modifier.height(8.dp)) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + if (job.state == "active") { + Button(onClick = { viewModel.pauseCronJob(job.id) }) { + Text("Pause") + } + } else { + Button(onClick = { viewModel.resumeCronJob(job.id) }) { + Text("Resume") + } + } + Button(onClick = { viewModel.triggerCronJob(job.id) }) { + Text("Trigger") + } + Button( + onClick = { viewModel.deleteCronJob(job.id) }, + colors = + ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.error, + ), + ) { + Text("Delete") + } + } + } + } + } + } + } + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/cron/CronJobsViewModel.kt b/app/src/main/java/com/m57/hermescontrol/ui/cron/CronJobsViewModel.kt new file mode 100644 index 00000000..deb749c7 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/cron/CronJobsViewModel.kt @@ -0,0 +1,151 @@ +package com.m57.hermescontrol.ui.cron + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.m57.hermescontrol.data.model.CronJob +import com.m57.hermescontrol.data.remote.ApiClient +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +data class CronJobsUiState( + val isLoading: Boolean = false, + val jobs: List = emptyList(), + val errorMessage: String? = null, + val toastMessage: String? = null, +) + +class CronJobsViewModel : ViewModel() { + private val _uiState = MutableStateFlow(CronJobsUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + fun loadCronJobs() { + _uiState.update { it.copy(isLoading = true, errorMessage = null) } + viewModelScope.launch { + try { + val response = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.getCronJobs() + } + if (response.isSuccessful) { + _uiState.update { it.copy(isLoading = false, jobs = response.body().orEmpty()) } + } else { + _uiState.update { + it.copy( + isLoading = false, + errorMessage = "Failed to load cron jobs: HTTP ${response.code()}", + ) + } + } + } catch (e: Exception) { + _uiState.update { it.copy(isLoading = false, errorMessage = "Failed to load cron jobs: ${e.message}") } + } + } + } + + fun pauseCronJob(id: String) { + val originalJobs = _uiState.value.jobs + // Optimistic update + _uiState.update { state -> + state.copy( + jobs = + state.jobs.map { + if (it.id == id) it.copy(state = "paused") else it + }, + ) + } + viewModelScope.launch { + try { + val response = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.pauseCronJob(id) + } + if (!response.isSuccessful) { + revertJobs(originalJobs, "Failed to pause cron job: HTTP ${response.code()}") + } + } catch (e: Exception) { + revertJobs(originalJobs, "Failed to pause cron job: ${e.message}") + } + } + } + + fun resumeCronJob(id: String) { + val originalJobs = _uiState.value.jobs + // Optimistic update + _uiState.update { state -> + state.copy( + jobs = + state.jobs.map { + if (it.id == id) it.copy(state = "active") else it + }, + ) + } + viewModelScope.launch { + try { + val response = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.resumeCronJob(id) + } + if (!response.isSuccessful) { + revertJobs(originalJobs, "Failed to resume cron job: HTTP ${response.code()}") + } + } catch (e: Exception) { + revertJobs(originalJobs, "Failed to resume cron job: ${e.message}") + } + } + } + + fun triggerCronJob(id: String) { + viewModelScope.launch { + try { + val response = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.triggerCronJob(id) + } + if (response.isSuccessful) { + _uiState.update { it.copy(toastMessage = "Job triggered successfully") } + } else { + _uiState.update { it.copy(toastMessage = "Failed to trigger cron job: HTTP ${response.code()}") } + } + } catch (e: Exception) { + _uiState.update { it.copy(toastMessage = "Failed to trigger cron job: ${e.message}") } + } + } + } + + fun deleteCronJob(id: String) { + val originalJobs = _uiState.value.jobs + // Optimistic update + _uiState.update { state -> + state.copy(jobs = state.jobs.filter { it.id != id }) + } + viewModelScope.launch { + try { + val response = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.deleteCronJob(id) + } + if (!response.isSuccessful) { + revertJobs(originalJobs, "Failed to delete cron job: HTTP ${response.code()}") + } + } catch (e: Exception) { + revertJobs(originalJobs, "Failed to delete cron job: ${e.message}") + } + } + } + + private fun revertJobs( + originalJobs: List, + errorMsg: String, + ) { + _uiState.update { it.copy(jobs = originalJobs, toastMessage = errorMsg) } + } + + fun clearToast() { + _uiState.update { it.copy(toastMessage = null) } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/gateway/GatewayScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/gateway/GatewayScreen.kt new file mode 100644 index 00000000..76d83c2c --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/gateway/GatewayScreen.kt @@ -0,0 +1,306 @@ +package com.m57.hermescontrol.ui.gateway + +import android.widget.Toast +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.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Menu +import androidx.compose.material.icons.filled.PlayArrow +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.lifecycle.viewmodel.compose.viewModel + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun GatewayScreen( + modifier: Modifier = Modifier, + onOpenDrawer: (() -> Unit)? = null, + viewModel: GatewayViewModel = viewModel { GatewayViewModel() }, +) { + val state by viewModel.uiState.collectAsStateWithLifecycle() + val context = LocalContext.current + + LaunchedEffect(Unit) { + viewModel.loadStatus() + } + + LaunchedEffect(state.toastMessage) { + state.toastMessage?.let { msg -> + Toast.makeText(context, msg, Toast.LENGTH_SHORT).show() + viewModel.clearToast() + } + } + + Scaffold( + topBar = { + TopAppBar( + navigationIcon = { + if (onOpenDrawer != null) { + IconButton(onClick = onOpenDrawer) { + Icon( + imageVector = Icons.Filled.Menu, + contentDescription = "Open Drawer", + ) + } + } + }, + title = { Text("Gateway Control") }, + actions = { + IconButton( + onClick = { viewModel.loadStatus() }, + enabled = !state.isLoading, + ) { + Icon(imageVector = Icons.Filled.Refresh, contentDescription = "Refresh") + } + }, + ) + }, + modifier = modifier, + ) { paddingValues -> + Box( + modifier = + Modifier + .fillMaxSize() + .padding(paddingValues), + ) { + if (state.isLoading && state.status == null) { + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) + } else if (state.errorMessage != null && state.status == null) { + Column( + modifier = + Modifier + .align(Alignment.Center) + .padding(16.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + text = state.errorMessage ?: "", + color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodyMedium, + ) + Spacer(modifier = Modifier.height(16.dp)) + Button(onClick = { viewModel.loadStatus() }) { + Text("Retry") + } + } + } else { + val status = state.status + Column( + modifier = + Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + val isRunning = status?.gateway_running == true + + // Status Overview Card + Card( + modifier = Modifier.fillMaxWidth(), + colors = + CardDefaults.cardColors( + containerColor = + if (isRunning) { + MaterialTheme.colorScheme.primaryContainer + } else { + MaterialTheme.colorScheme.errorContainer + }, + ), + ) { + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(16.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + text = if (isRunning) "GATEWAY RUNNING" else "GATEWAY STOPPED", + style = MaterialTheme.typography.headlineSmall, + fontWeight = FontWeight.Bold, + color = + if (isRunning) { + MaterialTheme.colorScheme.onPrimaryContainer + } else { + MaterialTheme.colorScheme.onErrorContainer + }, + ) + status?.version?.let { + Spacer(modifier = Modifier.height(4.dp)) + Text( + text = "Version: $it", + style = MaterialTheme.typography.bodySmall, + color = + if (isRunning) { + MaterialTheme.colorScheme.onPrimaryContainer.copy(alpha = 0.7f) + } else { + MaterialTheme.colorScheme.onErrorContainer.copy(alpha = 0.7f) + }, + ) + } + } + } + + // Action Controls Card + Card( + modifier = Modifier.fillMaxWidth(), + ) { + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp), + ) { + Text( + text = "Controls", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold, + ) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + Button( + onClick = { viewModel.startGateway() }, + modifier = Modifier.weight(1f), + enabled = !isRunning && !state.isActionRunning, + colors = + ButtonDefaults.buttonColors( + containerColor = Color(0xFF4CAF50), // Green for start + contentColor = Color.White, + ), + ) { + Icon(imageVector = Icons.Filled.PlayArrow, contentDescription = null) + Spacer(modifier = Modifier.width(4.dp)) + Text("Start") + } + + Button( + onClick = { viewModel.stopGateway() }, + modifier = Modifier.weight(1f), + enabled = isRunning && !state.isActionRunning, + colors = + ButtonDefaults.buttonColors( + containerColor = Color(0xFFF44336), // Red for stop + contentColor = Color.White, + ), + ) { + Text("Stop") + } + } + + Button( + onClick = { viewModel.restartGateway() }, + modifier = Modifier.fillMaxWidth(), + enabled = !state.isActionRunning, + colors = + ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.secondary, + ), + ) { + Icon(imageVector = Icons.Filled.Refresh, contentDescription = null) + Spacer(modifier = Modifier.width(4.dp)) + Text("Restart") + } + + if (state.isActionRunning) { + Spacer(modifier = Modifier.height(4.dp)) + CircularProgressIndicator( + modifier = Modifier.align(Alignment.CenterHorizontally), + ) + } + } + } + + // Platforms Card + status?.gateway_platforms?.let { platforms -> + if (platforms.isNotEmpty()) { + Card( + modifier = Modifier.fillMaxWidth(), + ) { + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + Text( + text = "Active Platforms", + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.SemiBold, + ) + + platforms.forEach { (platform, pStatus) -> + Row( + modifier = + Modifier + .fillMaxWidth() + .padding(vertical = 4.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Text( + text = platform.replaceFirstChar { it.uppercase() }, + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Medium, + ) + val stateText = pStatus.state?.uppercase() ?: "UNKNOWN" + val badgeColor = + when (stateText) { + "RUNNING" -> Color(0xFF4CAF50) + "STOPPED" -> Color(0xFFF44336) + "ERROR" -> Color(0xFFFF9800) + else -> MaterialTheme.colorScheme.onSurfaceVariant + } + Text( + text = stateText, + style = MaterialTheme.typography.bodyMedium, + color = badgeColor, + fontWeight = FontWeight.Bold, + ) + } + } + } + } + } + } + } + } + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/gateway/GatewayViewModel.kt b/app/src/main/java/com/m57/hermescontrol/ui/gateway/GatewayViewModel.kt new file mode 100644 index 00000000..8fe9636b --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/gateway/GatewayViewModel.kt @@ -0,0 +1,106 @@ +package com.m57.hermescontrol.ui.gateway + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.m57.hermescontrol.data.model.StatusResponse +import com.m57.hermescontrol.data.remote.ApiClient +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +data class GatewayUiState( + val isLoading: Boolean = false, + val isActionRunning: Boolean = false, + val status: StatusResponse? = null, + val errorMessage: String? = null, + val toastMessage: String? = null, +) + +class GatewayViewModel : ViewModel() { + private val _uiState = MutableStateFlow(GatewayUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + fun loadStatus() { + _uiState.update { it.copy(isLoading = true, errorMessage = null) } + viewModelScope.launch { + try { + val response = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.getStatus() + } + if (response.isSuccessful) { + _uiState.update { it.copy(isLoading = false, status = response.body()) } + } else { + _uiState.update { + it.copy( + isLoading = false, + errorMessage = "Failed to load status: HTTP ${response.code()}", + ) + } + } + } catch (e: Exception) { + _uiState.update { + it.copy( + isLoading = false, + errorMessage = "Failed to load status: ${e.message}", + ) + } + } + } + } + + fun startGateway() { + runGatewayAction("start") { ApiClient.hermesApi.startGateway() } + } + + fun stopGateway() { + runGatewayAction("stop") { ApiClient.hermesApi.stopGateway() } + } + + fun restartGateway() { + runGatewayAction("restart") { ApiClient.hermesApi.restartGateway() } + } + + private fun runGatewayAction( + actionName: String, + apiCall: suspend () -> retrofit2.Response, + ) { + _uiState.update { it.copy(isActionRunning = true) } + viewModelScope.launch { + try { + val response = withContext(Dispatchers.IO) { apiCall() } + if (response.isSuccessful) { + _uiState.update { + it.copy( + isActionRunning = false, + toastMessage = "Gateway ${actionName}ed successfully", + ) + } + loadStatus() + } else { + _uiState.update { + it.copy( + isActionRunning = false, + toastMessage = "Failed to $actionName gateway: HTTP ${response.code()}", + ) + } + } + } catch (e: Exception) { + _uiState.update { + it.copy( + isActionRunning = false, + toastMessage = "Failed to $actionName gateway: ${e.message}", + ) + } + } + } + } + + fun clearToast() { + _uiState.update { it.copy(toastMessage = null) } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/profiles/ProfilesScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/profiles/ProfilesScreen.kt new file mode 100644 index 00000000..09d979b9 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/profiles/ProfilesScreen.kt @@ -0,0 +1,341 @@ +package com.m57.hermescontrol.ui.profiles + +import android.widget.Toast +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +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.Check +import androidx.compose.material.icons.filled.Edit +import androidx.compose.material.icons.filled.Menu +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.TopAppBar +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.platform.LocalContext +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.lifecycle.viewmodel.compose.viewModel + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ProfilesScreen( + modifier: Modifier = Modifier, + onOpenDrawer: (() -> Unit)? = null, + viewModel: ProfilesViewModel = viewModel { ProfilesViewModel() }, +) { + val state by viewModel.uiState.collectAsStateWithLifecycle() + val context = LocalContext.current + + var soulEditProfileName by remember { mutableStateOf(null) } + var modelEditProfileName by remember { mutableStateOf(null) } + var tempModelProvider by remember { mutableStateOf("") } + var tempModelName by remember { mutableStateOf("") } + + LaunchedEffect(Unit) { + viewModel.loadProfiles() + } + + LaunchedEffect(state.toastMessage) { + state.toastMessage?.let { msg -> + Toast.makeText(context, msg, Toast.LENGTH_SHORT).show() + viewModel.clearToast() + } + } + + Scaffold( + topBar = { + TopAppBar( + navigationIcon = { + if (onOpenDrawer != null) { + IconButton(onClick = onOpenDrawer) { + Icon( + imageVector = Icons.Filled.Menu, + contentDescription = "Open Drawer", + ) + } + } + }, + title = { Text("Agent Profiles") }, + actions = { + IconButton(onClick = { viewModel.loadProfiles() }) { + Icon(imageVector = Icons.Filled.Refresh, contentDescription = "Refresh") + } + }, + ) + }, + modifier = modifier, + ) { paddingValues -> + Box( + modifier = + Modifier + .fillMaxSize() + .padding(paddingValues), + ) { + if (state.isLoading && state.profiles.isEmpty()) { + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) + } else if (state.errorMessage != null && state.profiles.isEmpty()) { + Column( + modifier = + Modifier + .align(Alignment.Center) + .padding(16.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text(text = state.errorMessage ?: "", color = MaterialTheme.colorScheme.error) + Spacer(modifier = Modifier.height(16.dp)) + Button(onClick = { viewModel.loadProfiles() }) { + Text("Retry") + } + } + } else { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp), + ) { + items(state.profiles) { profile -> + val isActive = profile.name == state.activeProfileName + Card( + modifier = Modifier.fillMaxWidth(), + colors = + CardDefaults.cardColors( + containerColor = + if (isActive) { + MaterialTheme.colorScheme.primaryContainer + } else { + MaterialTheme.colorScheme.surfaceVariant + }, + ), + onClick = { + if (!isActive) { + viewModel.selectActiveProfile(profile.name) + } + }, + ) { + Column( + modifier = + Modifier + .fillMaxWidth() + .padding(16.dp), + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Column(modifier = Modifier.weight(1f)) { + Text( + text = profile.name.replaceFirstChar { it.uppercase() }, + style = MaterialTheme.typography.titleLarge, + fontWeight = FontWeight.Bold, + ) + profile.description?.let { + if (it.isNotBlank()) { + Spacer(modifier = Modifier.height(4.dp)) + Text( + text = it, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } + } + if (isActive) { + Icon( + imageVector = Icons.Filled.Check, + contentDescription = "Active Profile", + tint = MaterialTheme.colorScheme.primary, + modifier = Modifier.padding(start = 8.dp), + ) + } + } + + Spacer(modifier = Modifier.height(12.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Column { + Text( + text = "Model: ${profile.model ?: "None"}", + style = MaterialTheme.typography.bodyMedium, + ) + Text( + text = "Provider: ${profile.provider ?: "None"}", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + } + + Spacer(modifier = Modifier.height(16.dp)) + + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.End, + ) { + OutlinedButton( + onClick = { + soulEditProfileName = profile.name + viewModel.loadSoul(profile.name) + }, + modifier = Modifier.padding(end = 8.dp), + ) { + Icon( + imageVector = Icons.Filled.Edit, + contentDescription = null, + modifier = Modifier.width(16.dp), + ) + Spacer(modifier = Modifier.width(4.dp)) + Text("Edit Soul") + } + + Button( + onClick = { + modelEditProfileName = profile.name + tempModelProvider = profile.provider ?: "" + tempModelName = profile.model ?: "" + }, + ) { + Text("Set Model") + } + } + } + } + } + } + } + } + + // Soul Edit Dialog + soulEditProfileName?.let { profileName -> + var soulText by remember(state.selectedSoulContent) { + mutableStateOf(state.selectedSoulContent ?: "") + } + + AlertDialog( + onDismissRequest = { + soulEditProfileName = null + viewModel.closeSoulDialog() + }, + title = { Text("Edit Soul ($profileName)") }, + text = { + Box(modifier = Modifier.fillMaxWidth()) { + if (state.isLoadingSoul) { + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) + } else { + OutlinedTextField( + value = soulText, + onValueChange = { soulText = it }, + modifier = + Modifier + .fillMaxWidth() + .height(200.dp), + label = { Text("Soul/Persona Prompts") }, + maxLines = 10, + ) + } + } + }, + confirmButton = { + TextButton( + onClick = { + viewModel.saveSoul(profileName, soulText) + soulEditProfileName = null + }, + enabled = !state.isLoadingSoul, + ) { + Text("Save") + } + }, + dismissButton = { + TextButton( + onClick = { + soulEditProfileName = null + viewModel.closeSoulDialog() + }, + ) { + Text("Cancel") + } + }, + ) + } + + // Model Edit Dialog + modelEditProfileName?.let { profileName -> + AlertDialog( + onDismissRequest = { modelEditProfileName = null }, + title = { Text("Switch Model ($profileName)") }, + text = { + Column( + modifier = Modifier.fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(12.dp), + ) { + OutlinedTextField( + value = tempModelProvider, + onValueChange = { tempModelProvider = it }, + label = { Text("Provider (e.g. nvidia, openai, local)") }, + modifier = Modifier.fillMaxWidth(), + ) + + OutlinedTextField( + value = tempModelName, + onValueChange = { tempModelName = it }, + label = { Text("Model Name") }, + modifier = Modifier.fillMaxWidth(), + ) + } + }, + confirmButton = { + TextButton( + onClick = { + viewModel.updateModel(profileName, tempModelProvider, tempModelName) + modelEditProfileName = null + }, + ) { + Text("Save") + } + }, + dismissButton = { + TextButton(onClick = { modelEditProfileName = null }) { + Text("Cancel") + } + }, + ) + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/profiles/ProfilesViewModel.kt b/app/src/main/java/com/m57/hermescontrol/ui/profiles/ProfilesViewModel.kt new file mode 100644 index 00000000..fa6894f8 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/profiles/ProfilesViewModel.kt @@ -0,0 +1,201 @@ +package com.m57.hermescontrol.ui.profiles + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.m57.hermescontrol.data.model.ProfileInfo +import com.m57.hermescontrol.data.model.SetActiveProfileRequest +import com.m57.hermescontrol.data.model.UpdateProfileDescriptionRequest +import com.m57.hermescontrol.data.model.UpdateProfileModelRequest +import com.m57.hermescontrol.data.model.UpdateProfileSoulRequest +import com.m57.hermescontrol.data.remote.ApiClient +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +data class ProfilesUiState( + val isLoading: Boolean = false, + val profiles: List = emptyList(), + val activeProfileName: String? = null, + val selectedSoulContent: String? = null, + val isLoadingSoul: Boolean = false, + val errorMessage: String? = null, + val toastMessage: String? = null, +) + +class ProfilesViewModel : ViewModel() { + private val _uiState = MutableStateFlow(ProfilesUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + fun loadProfiles() { + _uiState.update { it.copy(isLoading = true, errorMessage = null) } + viewModelScope.launch { + try { + val profilesRes = withContext(Dispatchers.IO) { ApiClient.hermesApi.getProfiles() } + val activeRes = withContext(Dispatchers.IO) { ApiClient.hermesApi.getActiveProfile() } + + if (profilesRes.isSuccessful && activeRes.isSuccessful) { + _uiState.update { + it.copy( + isLoading = false, + profiles = profilesRes.body()?.profiles.orEmpty(), + activeProfileName = activeRes.body()?.active, + ) + } + } else { + _uiState.update { + it.copy( + isLoading = false, + errorMessage = + "Failed to load profiles/active: HTTP " + + "${profilesRes.code()} / ${activeRes.code()}", + ) + } + } + } catch (e: Exception) { + _uiState.update { + it.copy( + isLoading = false, + errorMessage = "Error loading profiles: ${e.message}", + ) + } + } + } + } + + fun selectActiveProfile(name: String) { + val originalActive = _uiState.value.activeProfileName + // Optimistically update active profile name + _uiState.update { it.copy(activeProfileName = name) } + + viewModelScope.launch { + try { + val res = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.setActiveProfile(SetActiveProfileRequest(name)) + } + if (res.isSuccessful) { + _uiState.update { it.copy(toastMessage = "Switched to profile $name") } + loadProfiles() + } else { + _uiState.update { + it.copy( + activeProfileName = originalActive, + toastMessage = "Failed to switch profile: HTTP ${res.code()}", + ) + } + } + } catch (e: Exception) { + _uiState.update { + it.copy( + activeProfileName = originalActive, + toastMessage = "Failed to switch profile: ${e.message}", + ) + } + } + } + } + + fun loadSoul(profileName: String) { + _uiState.update { it.copy(isLoadingSoul = true, selectedSoulContent = null) } + viewModelScope.launch { + try { + val res = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.getProfileSoul(profileName) + } + if (res.isSuccessful) { + _uiState.update { + it.copy( + isLoadingSoul = false, + selectedSoulContent = res.body()?.content ?: "", + ) + } + } else { + _uiState.update { + it.copy( + isLoadingSoul = false, + toastMessage = "Failed to load soul: HTTP ${res.code()}", + ) + } + } + } catch (e: Exception) { + _uiState.update { + it.copy( + isLoadingSoul = false, + toastMessage = "Failed to load soul: ${e.message}", + ) + } + } + } + } + + fun saveSoul( + profileName: String, + content: String, + ) { + viewModelScope.launch { + try { + val res = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.updateProfileSoul(profileName, UpdateProfileSoulRequest(content)) + } + if (res.isSuccessful) { + _uiState.update { + it.copy( + selectedSoulContent = null, + toastMessage = "Soul updated successfully", + ) + } + loadProfiles() + } else { + _uiState.update { + it.copy( + toastMessage = "Failed to save soul: HTTP ${res.code()}", + ) + } + } + } catch (e: Exception) { + _uiState.update { + it.copy( + toastMessage = "Failed to save soul: ${e.message}", + ) + } + } + } + } + + fun updateModel( + profileName: String, + provider: String, + model: String, + ) { + viewModelScope.launch { + try { + val res = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.updateProfileModel(profileName, UpdateProfileModelRequest(provider, model)) + } + if (res.isSuccessful) { + _uiState.update { it.copy(toastMessage = "Model settings updated") } + loadProfiles() + } else { + _uiState.update { it.copy(toastMessage = "Failed to update model settings: HTTP ${res.code()}") } + } + } catch (e: Exception) { + _uiState.update { it.copy(toastMessage = "Failed to update model settings: ${e.message}") } + } + } + } + + fun clearToast() { + _uiState.update { it.copy(toastMessage = null) } + } + + fun closeSoulDialog() { + _uiState.update { it.copy(selectedSoulContent = null) } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsScreen.kt new file mode 100644 index 00000000..c346fe8d --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsScreen.kt @@ -0,0 +1,343 @@ +package com.m57.hermescontrol.ui.settings + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +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.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.filled.Visibility +import androidx.compose.material.icons.filled.VisibilityOff +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults +import androidx.compose.material3.Scaffold +import androidx.compose.material3.SegmentedButton +import androidx.compose.material3.SegmentedButtonDefaults +import androidx.compose.material3.SingleChoiceSegmentedButtonRow +import androidx.compose.material3.Switch +import androidx.compose.material3.SwitchDefaults +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.FontWeight +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.text.input.VisualTransformation +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.lifecycle.viewmodel.compose.viewModel +import com.m57.hermescontrol.theme.ThemePreference + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun SettingsScreen( + onBack: () -> Unit, + modifier: Modifier = Modifier, + viewModel: SettingsViewModel = viewModel { SettingsViewModel() }, +) { + val state by viewModel.uiState.collectAsStateWithLifecycle() + var passwordVisible by remember { mutableStateOf(false) } + + Scaffold( + modifier = modifier.fillMaxSize(), + topBar = { + TopAppBar( + title = { + Text( + "Settings", + style = + MaterialTheme.typography.titleLarge.copy( + fontWeight = FontWeight.Bold, + ), + ) + }, + navigationIcon = { + IconButton(onClick = onBack) { + Icon( + imageVector = Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = "Back", + ) + } + }, + colors = + TopAppBarDefaults.topAppBarColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + ) + }, + ) { paddingValues -> + Column( + modifier = + Modifier + .fillMaxSize() + .padding(paddingValues) + .verticalScroll(rememberScrollState()) + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + // Connection section + SectionCard(title = "Connection") { + OutlinedTextField( + value = state.host, + onValueChange = viewModel::onHostChange, + label = { Text("Host") }, + singleLine = true, + modifier = Modifier.fillMaxWidth(), + colors = + OutlinedTextFieldDefaults.colors( + focusedBorderColor = MaterialTheme.colorScheme.primary, + cursorColor = MaterialTheme.colorScheme.primary, + ), + ) + + Spacer(modifier = Modifier.height(12.dp)) + + OutlinedTextField( + value = state.port, + onValueChange = viewModel::onPortChange, + label = { Text("Port") }, + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier.fillMaxWidth(), + colors = + OutlinedTextFieldDefaults.colors( + focusedBorderColor = MaterialTheme.colorScheme.primary, + cursorColor = MaterialTheme.colorScheme.primary, + ), + ) + + Spacer(modifier = Modifier.height(12.dp)) + + OutlinedTextField( + value = state.token, + onValueChange = viewModel::onTokenChange, + label = { Text("Auth Token") }, + singleLine = true, + visualTransformation = + if (passwordVisible) { + VisualTransformation.None + } else { + PasswordVisualTransformation() + }, + trailingIcon = { + IconButton(onClick = { passwordVisible = !passwordVisible }) { + Icon( + imageVector = + if (passwordVisible) { + Icons.Filled.Visibility + } else { + Icons.Filled.VisibilityOff + }, + contentDescription = + if (passwordVisible) { + "Hide token" + } else { + "Show token" + }, + ) + } + }, + modifier = Modifier.fillMaxWidth(), + colors = + OutlinedTextFieldDefaults.colors( + focusedBorderColor = MaterialTheme.colorScheme.primary, + cursorColor = MaterialTheme.colorScheme.primary, + ), + ) + } + + // Behavior section + SectionCard(title = "Behavior") { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Column { + Text( + text = "Auto-Reconnect", + style = MaterialTheme.typography.bodyLarge, + ) + Text( + text = "Automatically reconnect on disconnect", + style = + MaterialTheme.typography.bodySmall.copy( + color = MaterialTheme.colorScheme.onSurfaceVariant, + ), + ) + } + Switch( + checked = state.autoReconnect, + onCheckedChange = viewModel::onAutoReconnectChange, + colors = + SwitchDefaults.colors( + checkedThumbColor = MaterialTheme.colorScheme.primary, + checkedTrackColor = MaterialTheme.colorScheme.primaryContainer, + ), + ) + } + } + + // Appearance section + SectionCard(title = "Appearance") { + Text( + text = "Theme", + style = MaterialTheme.typography.bodyLarge, + ) + Spacer(modifier = Modifier.height(8.dp)) + SingleChoiceSegmentedButtonRow(modifier = Modifier.fillMaxWidth()) { + ThemePreference.entries.forEachIndexed { index, pref -> + SegmentedButton( + selected = state.themePreference == pref, + onClick = { viewModel.onThemeChange(pref) }, + shape = + SegmentedButtonDefaults.itemShape( + index = index, + count = ThemePreference.entries.size, + ), + ) { + Text( + pref.name + .lowercase() + .replaceFirstChar { it.uppercase() }, + ) + } + } + } + } + + // Test result + AnimatedVisibility( + visible = state.testResult != null, + enter = fadeIn(), + exit = fadeOut(), + ) { + state.testResult?.let { result -> + Card( + colors = + CardDefaults.cardColors( + containerColor = + if (result.startsWith("✅")) { + MaterialTheme.colorScheme.primaryContainer + } else { + MaterialTheme.colorScheme.errorContainer + }, + ), + modifier = Modifier.fillMaxWidth(), + ) { + Text( + text = result, + modifier = Modifier.padding(16.dp), + style = MaterialTheme.typography.bodyMedium, + ) + } + } + } + + // Save indicator + AnimatedVisibility( + visible = state.isSaved, + enter = fadeIn(), + exit = fadeOut(), + ) { + Text( + text = "✅ Settings saved", + style = + MaterialTheme.typography.bodyMedium.copy( + color = MaterialTheme.colorScheme.primary, + ), + ) + } + + // Buttons + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(12.dp), + ) { + OutlinedButton( + onClick = viewModel::testConnection, + enabled = !state.isTesting, + modifier = Modifier.weight(1f), + ) { + if (state.isTesting) { + CircularProgressIndicator( + modifier = Modifier.size(18.dp), + strokeWidth = 2.dp, + ) + } else { + Text("Test Connection") + } + } + + Button( + onClick = viewModel::save, + modifier = Modifier.weight(1f), + colors = + ButtonDefaults.buttonColors( + containerColor = MaterialTheme.colorScheme.primary, + ), + ) { + Text("Save") + } + } + + Spacer(modifier = Modifier.height(16.dp)) + } + } +} + +@Composable +private fun SectionCard( + title: String, + content: @Composable () -> Unit, +) { + Card( + modifier = Modifier.fillMaxWidth(), + colors = + CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surface, + ), + elevation = CardDefaults.cardElevation(1.dp), + ) { + Column(modifier = Modifier.padding(16.dp)) { + Text( + text = title, + style = + MaterialTheme.typography.titleSmall.copy( + fontWeight = FontWeight.SemiBold, + color = MaterialTheme.colorScheme.primary, + ), + modifier = Modifier.padding(bottom = 12.dp), + ) + content() + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsViewModel.kt b/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsViewModel.kt new file mode 100644 index 00000000..ce74d76e --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/settings/SettingsViewModel.kt @@ -0,0 +1,119 @@ +package com.m57.hermescontrol.ui.settings + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.m57.hermescontrol.data.local.AuthManager +import com.m57.hermescontrol.data.remote.ApiClient +import com.m57.hermescontrol.theme.ThemePreference +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +data class SettingsUiState( + val host: String = "127.0.0.1", + val port: String = "9119", + val token: String = "", + val autoReconnect: Boolean = true, + val themePreference: ThemePreference = ThemePreference.SYSTEM, + val isTesting: Boolean = false, + val testResult: String? = null, + val isSaved: Boolean = false, +) + +class SettingsViewModel : ViewModel() { + private val _uiState = MutableStateFlow(SettingsUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + init { + loadSettings() + } + + private fun loadSettings() { + _uiState.update { + it.copy( + host = AuthManager.getHost(), + port = AuthManager.getPort().toString(), + token = AuthManager.getToken() ?: "", + autoReconnect = AuthManager.isAutoReconnect(), + ) + } + } + + fun onHostChange(value: String) { + _uiState.update { it.copy(host = value.trim(), isSaved = false) } + } + + fun onPortChange(value: String) { + _uiState.update { it.copy(port = value.filter { c -> c.isDigit() }, isSaved = false) } + } + + fun onTokenChange(value: String) { + _uiState.update { it.copy(token = value.trim(), isSaved = false) } + } + + fun onAutoReconnectChange(enabled: Boolean) { + _uiState.update { it.copy(autoReconnect = enabled, isSaved = false) } + } + + fun onThemeChange(theme: ThemePreference) { + _uiState.update { it.copy(themePreference = theme, isSaved = false) } + } + + fun save() { + val state = _uiState.value + val port = state.port.toIntOrNull() ?: 9119 + + AuthManager.setHost(state.host) + AuthManager.setPort(port) + AuthManager.setToken(state.token) + AuthManager.setAutoReconnect(state.autoReconnect) + ApiClient.rebuild() + + _uiState.update { it.copy(isSaved = true, testResult = null) } + } + + fun testConnection() { + val state = _uiState.value + if (state.token.isBlank()) { + _uiState.update { it.copy(testResult = "❌ Token is required") } + return + } + + // Save first so ApiClient uses updated settings + save() + + _uiState.update { it.copy(isTesting = true, testResult = null) } + + viewModelScope.launch { + try { + val response = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.getStatus() + } + if (response.isSuccessful) { + _uiState.update { + it.copy(isTesting = false, testResult = "✅ Connected successfully") + } + } else { + _uiState.update { + it.copy( + isTesting = false, + testResult = "❌ HTTP ${response.code()}: ${response.message()}", + ) + } + } + } catch (e: Exception) { + _uiState.update { + it.copy( + isTesting = false, + testResult = "❌ ${e.message ?: "Connection failed"}", + ) + } + } + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/skills/SkillsScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/skills/SkillsScreen.kt new file mode 100644 index 00000000..91e76221 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/skills/SkillsScreen.kt @@ -0,0 +1,139 @@ +package com.m57.hermescontrol.ui.skills + +import android.widget.Toast +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +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.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Menu +import androidx.compose.material3.Card +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.lifecycle.viewmodel.compose.viewModel + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun SkillsScreen( + modifier: Modifier = Modifier, + onOpenDrawer: (() -> Unit)? = null, + viewModel: SkillsViewModel = viewModel { SkillsViewModel() }, +) { + val state by viewModel.uiState.collectAsStateWithLifecycle() + val context = LocalContext.current + + LaunchedEffect(Unit) { + viewModel.loadSkills() + } + + LaunchedEffect(state.toastMessage) { + state.toastMessage?.let { msg -> + Toast.makeText(context, msg, Toast.LENGTH_SHORT).show() + viewModel.clearToast() + } + } + + Scaffold( + topBar = { + TopAppBar( + navigationIcon = { + if (onOpenDrawer != null) { + IconButton(onClick = onOpenDrawer) { + Icon( + imageVector = androidx.compose.material.icons.Icons.Filled.Menu, + contentDescription = "Open Drawer", + ) + } + } + }, + title = { Text("Skills Management") }, + actions = { + IconButton(onClick = { viewModel.loadSkills() }) { + Text("Refresh") + } + }, + ) + }, + modifier = modifier, + ) { paddingValues -> + Box( + modifier = + Modifier + .fillMaxSize() + .padding(paddingValues), + ) { + if (state.isLoading) { + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) + } else if (state.errorMessage != null) { + Text( + text = state.errorMessage ?: "", + color = MaterialTheme.colorScheme.error, + modifier = + Modifier + .align(Alignment.Center) + .padding(16.dp), + ) + } else { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(16.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + items(state.skills) { skill -> + Card(modifier = Modifier.fillMaxWidth()) { + Row( + modifier = + Modifier + .fillMaxWidth() + .padding(16.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Column(modifier = Modifier.weight(1f)) { + Text(text = skill.name, style = MaterialTheme.typography.titleMedium) + Text( + text = skill.category ?: "", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Spacer(modifier = Modifier.height(4.dp)) + Text( + text = skill.description ?: "", + style = MaterialTheme.typography.bodyMedium, + ) + } + Switch( + checked = skill.enabled, + onCheckedChange = { viewModel.toggleSkill(skill) }, + ) + } + } + } + } + } + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/skills/SkillsViewModel.kt b/app/src/main/java/com/m57/hermescontrol/ui/skills/SkillsViewModel.kt new file mode 100644 index 00000000..e757b3e2 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/skills/SkillsViewModel.kt @@ -0,0 +1,99 @@ +package com.m57.hermescontrol.ui.skills + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.m57.hermescontrol.data.model.Skill +import com.m57.hermescontrol.data.model.ToggleSkillRequest +import com.m57.hermescontrol.data.remote.ApiClient +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +data class SkillsUiState( + val isLoading: Boolean = false, + val skills: List = emptyList(), + val errorMessage: String? = null, + val toastMessage: String? = null, +) + +class SkillsViewModel : ViewModel() { + private val _uiState = MutableStateFlow(SkillsUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + fun loadSkills() { + _uiState.update { it.copy(isLoading = true, errorMessage = null) } + viewModelScope.launch { + try { + val response = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.getSkills() + } + if (response.isSuccessful) { + _uiState.update { it.copy(isLoading = false, skills = response.body().orEmpty()) } + } else { + _uiState.update { + it.copy( + isLoading = false, + errorMessage = "Failed to load skills: HTTP ${response.code()}", + ) + } + } + } catch (e: Exception) { + _uiState.update { it.copy(isLoading = false, errorMessage = "Failed to load skills: ${e.message}") } + } + } + } + + fun toggleSkill(skill: Skill) { + val originalEnabled = skill.enabled + val targetEnabled = !originalEnabled + + // Optimistically update + _uiState.update { state -> + state.copy( + skills = + state.skills.map { + if (it.name == skill.name) it.copy(enabled = targetEnabled) else it + }, + ) + } + + viewModelScope.launch { + try { + val response = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.toggleSkill(ToggleSkillRequest(skill.name, targetEnabled)) + } + if (!response.isSuccessful) { + revertSkillToggle(skill.name, originalEnabled, "Failed to toggle skill: HTTP ${response.code()}") + } + } catch (e: Exception) { + revertSkillToggle(skill.name, originalEnabled, "Failed to toggle skill: ${e.message}") + } + } + } + + private fun revertSkillToggle( + name: String, + originalEnabled: Boolean, + errorMsg: String, + ) { + _uiState.update { state -> + state.copy( + skills = + state.skills.map { + if (it.name == name) it.copy(enabled = originalEnabled) else it + }, + toastMessage = errorMsg, + ) + } + } + + fun clearToast() { + _uiState.update { it.copy(toastMessage = null) } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/toolsets/ToolsetsScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/toolsets/ToolsetsScreen.kt new file mode 100644 index 00000000..e19e6e12 --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/toolsets/ToolsetsScreen.kt @@ -0,0 +1,186 @@ +package com.m57.hermescontrol.ui.toolsets + +import android.widget.Toast +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.PaddingValues +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.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Menu +import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.SuggestionChip +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.lifecycle.viewmodel.compose.viewModel + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ToolsetsScreen( + modifier: Modifier = Modifier, + onOpenDrawer: (() -> Unit)? = null, + viewModel: ToolsetsViewModel = viewModel { ToolsetsViewModel() }, +) { + val state by viewModel.uiState.collectAsStateWithLifecycle() + val context = LocalContext.current + + LaunchedEffect(Unit) { + viewModel.loadToolsets() + } + + LaunchedEffect(state.toastMessage) { + state.toastMessage?.let { msg -> + Toast.makeText(context, msg, Toast.LENGTH_SHORT).show() + viewModel.clearToast() + } + } + + Scaffold( + topBar = { + TopAppBar( + navigationIcon = { + if (onOpenDrawer != null) { + IconButton(onClick = onOpenDrawer) { + Icon( + imageVector = Icons.Filled.Menu, + contentDescription = "Open Drawer", + ) + } + } + }, + title = { Text("Toolsets Manager") }, + actions = { + IconButton(onClick = { viewModel.loadToolsets() }) { + Icon(imageVector = Icons.Filled.Refresh, contentDescription = "Refresh") + } + }, + ) + }, + modifier = modifier, + ) { paddingValues -> + Box( + modifier = + Modifier + .fillMaxSize() + .padding(paddingValues), + ) { + if (state.isLoading && state.toolsets.isEmpty()) { + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) + } else if (state.errorMessage != null && state.toolsets.isEmpty()) { + Column( + modifier = + Modifier + .align(Alignment.Center) + .padding(16.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text(text = state.errorMessage ?: "", color = MaterialTheme.colorScheme.error) + Spacer(modifier = Modifier.height(16.dp)) + IconButton(onClick = { viewModel.loadToolsets() }) { + Icon(imageVector = Icons.Filled.Refresh, contentDescription = "Retry") + } + } + } else { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp), + ) { + items(state.toolsets) { toolset -> + Card( + modifier = Modifier.fillMaxWidth(), + colors = + CardDefaults.cardColors( + containerColor = + if (toolset.enabled) { + MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.15f) + } else { + MaterialTheme.colorScheme.surfaceVariant + }, + ), + ) { + Row( + modifier = + Modifier + .fillMaxWidth() + .padding(16.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Column(modifier = Modifier.weight(1f)) { + Text( + text = toolset.label ?: toolset.name.replaceFirstChar { it.uppercase() }, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, + ) + toolset.description?.let { + Spacer(modifier = Modifier.height(4.dp)) + Text( + text = it, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + } + + toolset.tools?.let { tools -> + if (tools.isNotEmpty()) { + Spacer(modifier = Modifier.height(8.dp)) + FlowRow( + horizontalArrangement = Arrangement.spacedBy(6.dp), + verticalArrangement = Arrangement.spacedBy(4.dp), + ) { + tools.forEach { tool -> + SuggestionChip( + onClick = {}, + label = { + Text( + text = tool, + style = MaterialTheme.typography.labelSmall, + ) + }, + ) + } + } + } + } + } + + Switch( + checked = toolset.enabled, + onCheckedChange = { viewModel.toggleToolset(toolset) }, + modifier = Modifier.padding(start = 16.dp), + ) + } + } + } + } + } + } + } +} diff --git a/app/src/main/java/com/m57/hermescontrol/ui/toolsets/ToolsetsViewModel.kt b/app/src/main/java/com/m57/hermescontrol/ui/toolsets/ToolsetsViewModel.kt new file mode 100644 index 00000000..1a79ef7a --- /dev/null +++ b/app/src/main/java/com/m57/hermescontrol/ui/toolsets/ToolsetsViewModel.kt @@ -0,0 +1,104 @@ +package com.m57.hermescontrol.ui.toolsets + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.m57.hermescontrol.data.model.Toolset +import com.m57.hermescontrol.data.model.ToolsetToggleRequest +import com.m57.hermescontrol.data.remote.ApiClient +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +data class ToolsetsUiState( + val isLoading: Boolean = false, + val toolsets: List = emptyList(), + val errorMessage: String? = null, + val toastMessage: String? = null, +) + +class ToolsetsViewModel : ViewModel() { + private val _uiState = MutableStateFlow(ToolsetsUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + fun loadToolsets() { + _uiState.update { it.copy(isLoading = true, errorMessage = null) } + viewModelScope.launch { + try { + val response = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.getToolsets() + } + if (response.isSuccessful) { + _uiState.update { it.copy(isLoading = false, toolsets = response.body().orEmpty()) } + } else { + _uiState.update { + it.copy( + isLoading = false, + errorMessage = "Failed to load toolsets: HTTP ${response.code()}", + ) + } + } + } catch (e: Exception) { + _uiState.update { + it.copy( + isLoading = false, + errorMessage = "Failed to load toolsets: ${e.message}", + ) + } + } + } + } + + fun toggleToolset(toolset: Toolset) { + val originalEnabled = toolset.enabled + val targetEnabled = !originalEnabled + + // Optimistic UI update + _uiState.update { state -> + state.copy( + toolsets = + state.toolsets.map { + if (it.name == toolset.name) it.copy(enabled = targetEnabled) else it + }, + ) + } + + viewModelScope.launch { + try { + val response = + withContext(Dispatchers.IO) { + ApiClient.hermesApi.toggleToolset(toolset.name, ToolsetToggleRequest(targetEnabled)) + } + if (!response.isSuccessful) { + revertToggle(toolset.name, originalEnabled, "Failed to toggle toolset: HTTP ${response.code()}") + } + } catch (e: Exception) { + revertToggle(toolset.name, originalEnabled, "Failed to toggle toolset: ${e.message}") + } + } + } + + private fun revertToggle( + name: String, + originalEnabled: Boolean, + errorMsg: String, + ) { + _uiState.update { state -> + state.copy( + toolsets = + state.toolsets.map { + if (it.name == name) it.copy(enabled = originalEnabled) else it + }, + toastMessage = errorMsg, + ) + } + } + + fun clearToast() { + _uiState.update { it.copy(toastMessage = null) } + } +} diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..07d5da9c --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..2b068d11 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..6f3b755b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..6f3b755b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000..c209e78e Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 00000000..b2dfe3d1 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000..4f0f1d64 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 00000000..62b611da Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000..948a3070 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..1b9a6956 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000..28d4b77f Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..9287f508 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000..aa7d6427 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..9126ae37 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 00000000..b9d42cec --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + HermesControl + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 00000000..9d1bb199 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +