feat: Add Hermes v0.8.0 compatibility and fix Tools tab toggling (#9 )

Hermes v0.8.0 support: - Filter subagent sessions from main list with parent session drill-down - Add agent.log support (new default log file) - Add Feishu and Mattermost platforms - Add Google AI Studio, xAI, Ollama Cloud providers - Expand cron job model (pre-run scripts, delivery tracking, timeouts, SILENT) - Add Docker env, command allowlist, and memory profile to config - Add profile-scoped memory with profile picker - Add browser backend picker and credential removal to Settings - Add skills required config warnings - Consolidate platform icon resolution to single source of truth - Filter Insights queries to exclude subagent sessions Bug fix: - Fix Tools tab phantom toggling when switching platforms (#9) - Add .id() to tool list for proper SwiftUI view identity - Replace ambiguous plain buttons with segmented Picker Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Add Hermes v0.7.0 compatibility: reasoning tokens, cost tracking, schema detection
2026-05-10 10:36:35 +00:00 · 2026-04-08 22:12:13 -04:00 · 2026-04-04 21:46:03 -04:00 · 2026-04-03 13:50:57 -04:00
29 changed files with 664 additions and 188 deletions
@@ -19,35 +19,36 @@

 ## Features

- **Dashboard** — System health, token usage, recent sessions with live refresh
- **Insights** — Usage analytics with token breakdown, model/platform stats, top tools bar chart, activity heatmaps, notable sessions, and time period filtering (7/30/90 days or all time)
- **Sessions Browser** — Full conversation history with message rendering, tool call inspection, full-text search, rename, delete, and JSONL export
+- **Dashboard** — System health, token usage, cost tracking, recent sessions with live refresh
+- **Insights** — Usage analytics with token breakdown (including reasoning tokens), cost tracking, model/platform stats, top tools bar chart, activity heatmaps, notable sessions, and time period filtering (7/30/90 days or all time)
+- **Sessions Browser** — Full conversation history with message rendering, model reasoning/thinking display, tool call inspection, full-text search, rename, delete, and JSONL export. Subagent sessions are filtered from the main list and accessible via parent session drill-down
 - **Activity Feed** — Recent tool execution log with filtering by kind and session, detail inspector with pretty-printed arguments
 - **Live Chat** — Embedded terminal running `hermes chat` with full ANSI color and Rich formatting via [SwiftTerm](https://github.com/migueldeicaza/SwiftTerm), session persistence across navigation, resume/continue previous sessions, and voice mode controls
- **Memory Viewer/Editor** — View and edit Hermes's MEMORY.md and USER.md with live file-watcher refresh
- **Skills Browser** — Browse all installed skills by category with file content viewer and file switcher
- **Tools Manager** — Enable/disable toolsets per platform (CLI, Telegram, Discord, etc.) with toggle switches, MCP server status
+- **Memory Viewer/Editor** — View and edit Hermes's MEMORY.md and USER.md with live file-watcher refresh, external memory provider awareness (Honcho, Supermemory, etc.), and profile-scoped memory support with profile picker
+- **Skills Browser** — Browse all installed skills by category with file content viewer, file switcher, and required config warnings for skills that need specific settings
+- **Tools Manager** — Enable/disable toolsets per platform (CLI, Telegram, Discord, Slack, WhatsApp, Signal, Email, Home Assistant, Webhook, Matrix, Feishu, Mattermost) with toggle switches and segmented platform picker, MCP server status
 - **Gateway Control** — Start/stop/restart the messaging gateway, view platform connection status, manage user pairing (approve/revoke)
- **Cron Manager** — View scheduled jobs, their status, prompts, and output
- **Log Viewer** — Real-time log tailing with level filtering and text search
+- **Cron Manager** — View scheduled jobs with pre-run scripts, delivery failure tracking, timeout info, and `[SILENT]` job indicators
+- **Log Viewer** — Real-time log tailing for agent.log, errors.log, and gateway.log with level filtering and text search
 - **Project Dashboards** — Custom, agent-generated dashboards for any project. Define stat boxes, charts, tables, progress bars, checklists, rich text, and embedded web views in a simple JSON file — Scarf renders them with live refresh. Let your Hermes agent build and maintain project-specific visualizations automatically
- **Settings** — Structured config editor for all Hermes settings
+- **Settings** — Structured config editor for all Hermes settings including model/provider selection, browser backend, reasoning effort, approval mode, cost display, Docker environment, command allowlist, credential management, and more
 - **Menu Bar** — Status icon showing Hermes running state with quick actions

 ## Requirements

 - macOS 26.2+
 - Xcode 26.3+
- [Hermes agent](https://github.com/hermes-ai/hermes-agent) v0.6.0+ installed at `~/.hermes/`
+- [Hermes agent](https://github.com/hermes-ai/hermes-agent) v0.6.0+ installed at `~/.hermes/` (v0.8.0 recommended for full feature support)

 ### Compatibility

-Scarf reads Hermes's SQLite database (schema v6) and parses CLI output from `hermes status`, `hermes doctor`, `hermes tools`, `hermes sessions`, `hermes gateway`, and `hermes pairing`. Tested and verified against:
+Scarf reads Hermes's SQLite database and parses CLI output from `hermes status`, `hermes doctor`, `hermes tools`, `hermes sessions`, `hermes gateway`, and `hermes pairing`. Automatic schema detection provides backward compatibility with older databases while supporting new features in newer Hermes versions.

 | Hermes Version | Status |
 |----------------|--------|
 | v0.6.0 (2026-03-30) | Verified |
-| v0.6.0 (2026-03-31, latest) | Verified |
+| v0.7.0 (2026-04-03) | Verified |
+| v0.8.0 (2026-04-08, latest) | Verified |

 If a Hermes update changes the database schema or CLI output format, Scarf may need to be updated. Check the [Health](#features) view for compatibility warnings.

@@ -407,7 +407,7 @@
 				CODE_SIGN_ENTITLEMENTS = scarf/scarf.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 3Q6X2L86C4;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -421,7 +421,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.scarf;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -443,7 +443,7 @@
 				CODE_SIGN_ENTITLEMENTS = scarf/scarf.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 3Q6X2L86C4;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -457,7 +457,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.scarf;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -475,11 +475,11 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 3Q6X2L86C4;
 				GENERATE_INFOPLIST_FILE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 26.2;
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.scarfTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRING_CATALOG_GENERATE_SYMBOLS = NO;
@@ -496,11 +496,11 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 3Q6X2L86C4;
 				GENERATE_INFOPLIST_FILE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 26.2;
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.scarfTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRING_CATALOG_GENERATE_SYMBOLS = NO;
@@ -516,10 +516,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 3Q6X2L86C4;
 				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.scarfUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRING_CATALOG_GENERATE_SYMBOLS = NO;
@@ -535,10 +535,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 3Q6X2L86C4;
 				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.scarfUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRING_CATALOG_GENERATE_SYMBOLS = NO;
@@ -15,6 +15,14 @@ struct HermesConfig: Sendable {
    var verbose: Bool
    var autoTTS: Bool
    var silenceThreshold: Int
+    var reasoningEffort: String
+    var showCost: Bool
+    var approvalMode: String
+    var browserBackend: String
+    var memoryProvider: String
+    var dockerEnv: [String: String]
+    var commandAllowlist: [String]
+    var memoryProfile: String

    static let empty = HermesConfig(
        model: "unknown",
@@ -30,7 +38,15 @@ struct HermesConfig: Sendable {
        showReasoning: false,
        verbose: false,
        autoTTS: true,
-        silenceThreshold: 200
+        silenceThreshold: 200,
+        reasoningEffort: "medium",
+        showCost: false,
+        approvalMode: "manual",
+        browserBackend: "",
+        memoryProvider: "",
+        dockerEnv: [:],
+        commandAllowlist: [],
+        memoryProfile: ""
    )
 }

@@ -17,6 +17,7 @@ enum HermesPaths: Sendable {
    nonisolated static let gatewayStateJSON: String = home + "/gateway_state.json"
    nonisolated static let skillsDir: String = home + "/skills"
    nonisolated static let errorsLog: String = home + "/logs/errors.log"
+    nonisolated static let agentLog: String = home + "/logs/agent.log"
    nonisolated static let gatewayLog: String = home + "/logs/gateway.log"
    nonisolated static let hermesBinary: String = userHome + "/.local/bin/hermes"
    nonisolated static let scarfDir: String = home + "/scarf"
@@ -13,12 +13,23 @@ struct HermesCronJob: Identifiable, Sendable, Codable {
    let nextRunAt: String?
    let lastRunAt: String?
    let lastError: String?
+    let preRunScript: String?
+    let deliveryFailures: Int?
+    let lastDeliveryError: String?
+    let timeoutType: String?
+    let timeoutSeconds: Int?
+    let silent: Bool?

    enum CodingKeys: String, CodingKey {
-        case id, name, prompt, skills, model, schedule, enabled, state, deliver
+        case id, name, prompt, skills, model, schedule, enabled, state, deliver, silent
        case nextRunAt = "next_run_at"
        case lastRunAt = "last_run_at"
        case lastError = "last_error"
+        case preRunScript = "pre_run_script"
+        case deliveryFailures = "delivery_failures"
+        case lastDeliveryError = "last_delivery_error"
+        case timeoutType = "timeout_type"
+        case timeoutSeconds = "timeout_seconds"
    }

    var stateIcon: String {
@@ -11,10 +11,12 @@ struct HermesMessage: Identifiable, Sendable {
    let timestamp: Date?
    let tokenCount: Int?
    let finishReason: String?
+    let reasoning: String?

    var isUser: Bool { role == "user" }
    var isAssistant: Bool { role == "assistant" }
    var isToolResult: Bool { role == "tool" }
+    var hasReasoning: Bool { reasoning != nil && !(reasoning?.isEmpty ?? true) }
 }

 struct HermesToolCall: Identifiable, Sendable, Codable {
@@ -61,7 +63,7 @@ struct HermesToolCall: Identifiable, Sendable, Codable {
        switch functionName {
        case "read_file", "search_files", "vision_analyze": return .read
        case "write_file", "patch": return .edit
-        case "terminal": return .execute
+        case "terminal", "execute_code": return .execute
        case "web_search", "web_extract": return .fetch
        case "browser_navigate", "browser_click", "browser_screenshot": return .browser
        default: return .other
@@ -17,8 +17,18 @@ struct HermesSession: Identifiable, Sendable {
    let cacheReadTokens: Int
    let cacheWriteTokens: Int
    let estimatedCostUSD: Double?
+    let reasoningTokens: Int
+    let actualCostUSD: Double?
+    let costStatus: String?
+    let billingProvider: String?

-    var totalTokens: Int { inputTokens + outputTokens }
+    var isSubagent: Bool { parentSessionId != nil }
+
+    var totalTokens: Int { inputTokens + outputTokens + reasoningTokens }
+
+    var displayCostUSD: Double? { actualCostUSD ?? estimatedCostUSD }
+
+    var costIsActual: Bool { actualCostUSD != nil }

    var duration: TimeInterval? {
        guard let start = startedAt, let end = endedAt else { return nil }
@@ -30,13 +40,20 @@ struct HermesSession: Identifiable, Sendable {
    }

    var sourceIcon: String {
-        switch source {
-        case "cli": return "terminal"
-        case "telegram": return "paperplane"
-        case "discord": return "bubble.left.and.bubble.right"
-        case "slack": return "number"
-        case "email": return "envelope"
-        default: return "bubble.left"
-        }
+        KnownPlatforms.icon(for: source)
+    }
+
+    func withTitle(_ newTitle: String) -> HermesSession {
+        HermesSession(
+            id: id, source: source, userId: userId, model: model,
+            title: newTitle, parentSessionId: parentSessionId,
+            startedAt: startedAt, endedAt: endedAt, endReason: endReason,
+            messageCount: messageCount, toolCallCount: toolCallCount,
+            inputTokens: inputTokens, outputTokens: outputTokens,
+            cacheReadTokens: cacheReadTokens, cacheWriteTokens: cacheWriteTokens,
+            estimatedCostUSD: estimatedCostUSD, reasoningTokens: reasoningTokens,
+            actualCostUSD: actualCostUSD, costStatus: costStatus,
+            billingProvider: billingProvider
+        )
    }
 }
@@ -12,4 +12,5 @@ struct HermesSkill: Identifiable, Sendable {
    let category: String
    let path: String
    let files: [String]
+    let requiredConfig: [String]
 }
@@ -25,5 +25,28 @@ enum KnownPlatforms {
        HermesToolPlatform(name: "whatsapp", displayName: "WhatsApp", icon: "phone.bubble"),
        HermesToolPlatform(name: "signal", displayName: "Signal", icon: "lock.shield"),
        HermesToolPlatform(name: "email", displayName: "Email", icon: "envelope"),
+        HermesToolPlatform(name: "homeassistant", displayName: "Home Assistant", icon: "house"),
+        HermesToolPlatform(name: "webhook", displayName: "Webhook", icon: "arrow.up.right.square"),
+        HermesToolPlatform(name: "matrix", displayName: "Matrix", icon: "lock.rectangle.stack"),
+        HermesToolPlatform(name: "feishu", displayName: "Feishu", icon: "message.badge.circle"),
+        HermesToolPlatform(name: "mattermost", displayName: "Mattermost", icon: "bubble.left.and.exclamationmark.bubble.right"),
    ]
+
+    static func icon(for platform: String) -> String {
+        switch platform {
+        case "cli": return "terminal"
+        case "telegram": return "paperplane"
+        case "discord": return "bubble.left.and.bubble.right"
+        case "slack": return "number"
+        case "whatsapp": return "phone.bubble"
+        case "signal": return "lock.shield"
+        case "email": return "envelope"
+        case "homeassistant": return "house"
+        case "webhook": return "arrow.up.right.square"
+        case "matrix": return "lock.rectangle.stack"
+        case "feishu": return "message.badge.circle"
+        case "mattermost": return "bubble.left.and.exclamationmark.bubble.right"
+        default: return "bubble.left"
+        }
+    }
 }
@@ -3,6 +3,7 @@ import SQLite3

 actor HermesDataService {
    private var db: OpaquePointer?
+    private var hasV07Schema = false

    func open() -> Bool {
        let path = HermesPaths.stateDB
@@ -14,6 +15,7 @@ actor HermesDataService {
            return false
        }
        sqlite3_exec(db, "PRAGMA journal_mode=WAL", nil, nil, nil)
+        detectSchema()
        return true
    }

@@ -24,17 +26,39 @@ actor HermesDataService {
        db = nil
    }

-    func fetchSessions(limit: Int = QueryDefaults.sessionLimit) -> [HermesSession] {
-        guard let db else { return [] }
-        let sql = """
-            SELECT id, source, user_id, model, title, parent_session_id,
+    // MARK: - Schema Detection
+
+    private func detectSchema() {
+        guard let db else { return }
+        var stmt: OpaquePointer?
+        guard sqlite3_prepare_v2(db, "PRAGMA table_info(sessions)", -1, &stmt, nil) == SQLITE_OK else { return }
+        defer { sqlite3_finalize(stmt) }
+        while sqlite3_step(stmt) == SQLITE_ROW {
+            if let name = sqlite3_column_text(stmt, 1), String(cString: name) == "reasoning_tokens" {
+                hasV07Schema = true
+                return
+            }
+        }
+    }
+
+    // MARK: - Session Queries
+
+    private var sessionColumns: String {
+        var cols = """
+            id, source, user_id, model, title, parent_session_id,
            started_at, ended_at, end_reason, message_count, tool_call_count,
            input_tokens, output_tokens, cache_read_tokens, cache_write_tokens,
            estimated_cost_usd
-            FROM sessions
-            ORDER BY started_at DESC
-            LIMIT ?
            """
+        if hasV07Schema {
+            cols += ", reasoning_tokens, actual_cost_usd, cost_status, billing_provider"
+        }
+        return cols
+    }
+
+    func fetchSessions(limit: Int = QueryDefaults.sessionLimit) -> [HermesSession] {
+        guard let db else { return [] }
+        let sql = "SELECT \(sessionColumns) FROM sessions WHERE parent_session_id IS NULL ORDER BY started_at DESC LIMIT ?"
        var stmt: OpaquePointer?
        guard sqlite3_prepare_v2(db, sql, -1, &stmt, nil) == SQLITE_OK else { return [] }
        defer { sqlite3_finalize(stmt) }
@@ -47,15 +71,52 @@ actor HermesDataService {
        return sessions
    }

+    func fetchSessionsInPeriod(since: Date) -> [HermesSession] {
+        guard let db else { return [] }
+        let sql = "SELECT \(sessionColumns) FROM sessions WHERE parent_session_id IS NULL AND started_at >= ? ORDER BY started_at DESC"
+        var stmt: OpaquePointer?
+        guard sqlite3_prepare_v2(db, sql, -1, &stmt, nil) == SQLITE_OK else { return [] }
+        defer { sqlite3_finalize(stmt) }
+        sqlite3_bind_double(stmt, 1, since.timeIntervalSince1970)
+
+        var sessions: [HermesSession] = []
+        while sqlite3_step(stmt) == SQLITE_ROW {
+            sessions.append(sessionFromRow(stmt!))
+        }
+        return sessions
+    }
+
+    func fetchSubagentSessions(parentId: String) -> [HermesSession] {
+        guard let db else { return [] }
+        let sql = "SELECT \(sessionColumns) FROM sessions WHERE parent_session_id = ? ORDER BY started_at ASC"
+        var stmt: OpaquePointer?
+        guard sqlite3_prepare_v2(db, sql, -1, &stmt, nil) == SQLITE_OK else { return [] }
+        defer { sqlite3_finalize(stmt) }
+        sqlite3_bind_text(stmt, 1, parentId, -1, sqliteTransient)
+
+        var sessions: [HermesSession] = []
+        while sqlite3_step(stmt) == SQLITE_ROW {
+            sessions.append(sessionFromRow(stmt!))
+        }
+        return sessions
+    }
+
+    // MARK: - Message Queries
+
+    private var messageColumns: String {
+        var cols = """
+            id, session_id, role, content, tool_call_id, tool_calls,
+            tool_name, timestamp, token_count, finish_reason
+            """
+        if hasV07Schema {
+            cols += ", reasoning"
+        }
+        return cols
+    }
+
    func fetchMessages(sessionId: String) -> [HermesMessage] {
        guard let db else { return [] }
-        let sql = """
-            SELECT id, session_id, role, content, tool_call_id, tool_calls,
-                   tool_name, timestamp, token_count, finish_reason
-            FROM messages
-            WHERE session_id = ?
-            ORDER BY timestamp ASC
-            """
+        let sql = "SELECT \(messageColumns) FROM messages WHERE session_id = ? ORDER BY timestamp ASC"
        var stmt: OpaquePointer?
        guard sqlite3_prepare_v2(db, sql, -1, &stmt, nil) == SQLITE_OK else { return [] }
        defer { sqlite3_finalize(stmt) }
@@ -70,9 +131,13 @@ actor HermesDataService {

    func searchMessages(query: String, limit: Int = QueryDefaults.messageSearchLimit) -> [HermesMessage] {
        guard let db else { return [] }
+        let sanitized = sanitizeFTSQuery(query)
+        guard !sanitized.isEmpty else { return [] }
+        let msgCols = hasV07Schema
+            ? "m.id, m.session_id, m.role, m.content, m.tool_call_id, m.tool_calls, m.tool_name, m.timestamp, m.token_count, m.finish_reason, m.reasoning"
+            : "m.id, m.session_id, m.role, m.content, m.tool_call_id, m.tool_calls, m.tool_name, m.timestamp, m.token_count, m.finish_reason"
        let sql = """
-            SELECT m.id, m.session_id, m.role, m.content, m.tool_call_id, m.tool_calls,
-                   m.tool_name, m.timestamp, m.token_count, m.finish_reason
+            SELECT \(msgCols)
            FROM messages_fts fts
            JOIN messages m ON m.id = fts.rowid
            WHERE messages_fts MATCH ?
@@ -82,7 +147,7 @@ actor HermesDataService {
        var stmt: OpaquePointer?
        guard sqlite3_prepare_v2(db, sql, -1, &stmt, nil) == SQLITE_OK else { return [] }
        defer { sqlite3_finalize(stmt) }
-        sqlite3_bind_text(stmt, 1, query, -1, sqliteTransient)
+        sqlite3_bind_text(stmt, 1, sanitized, -1, sqliteTransient)
        sqlite3_bind_int(stmt, 2, Int32(limit))

        var messages: [HermesMessage] = []
@@ -95,8 +160,7 @@ actor HermesDataService {
    func fetchRecentToolCalls(limit: Int = QueryDefaults.toolCallLimit) -> [HermesMessage] {
        guard let db else { return [] }
        let sql = """
-            SELECT id, session_id, role, content, tool_call_id, tool_calls,
-                   tool_name, timestamp, token_count, finish_reason
+            SELECT \(messageColumns)
            FROM messages
            WHERE tool_calls IS NOT NULL AND tool_calls != '[]' AND tool_calls != ''
            ORDER BY timestamp DESC
@@ -142,6 +206,8 @@ actor HermesDataService {
        return previews
    }

+    // MARK: - Stats
+
    struct SessionStats: Sendable {
        let totalSessions: Int
        let totalMessages: Int
@@ -149,21 +215,35 @@ actor HermesDataService {
        let totalInputTokens: Int
        let totalOutputTokens: Int
        let totalCostUSD: Double
+        let totalReasoningTokens: Int
+        let totalActualCostUSD: Double

        static let empty = SessionStats(
            totalSessions: 0, totalMessages: 0, totalToolCalls: 0,
-            totalInputTokens: 0, totalOutputTokens: 0, totalCostUSD: 0
+            totalInputTokens: 0, totalOutputTokens: 0, totalCostUSD: 0,
+            totalReasoningTokens: 0, totalActualCostUSD: 0
        )
    }

    func fetchStats() -> SessionStats {
        guard let db else { return .empty }
-        let sql = """
+        let sql: String
+        if hasV07Schema {
+            sql = """
+                SELECT COUNT(*), COALESCE(SUM(message_count),0), COALESCE(SUM(tool_call_count),0),
+                       COALESCE(SUM(input_tokens),0), COALESCE(SUM(output_tokens),0),
+                       COALESCE(SUM(estimated_cost_usd),0),
+                       COALESCE(SUM(reasoning_tokens),0), COALESCE(SUM(actual_cost_usd),0)
+                FROM sessions
+                """
+        } else {
+            sql = """
                SELECT COUNT(*), COALESCE(SUM(message_count),0), COALESCE(SUM(tool_call_count),0),
                       COALESCE(SUM(input_tokens),0), COALESCE(SUM(output_tokens),0),
                       COALESCE(SUM(estimated_cost_usd),0)
                FROM sessions
                """
+        }
        var stmt: OpaquePointer?
        guard sqlite3_prepare_v2(db, sql, -1, &stmt, nil) == SQLITE_OK else { return .empty }
        defer { sqlite3_finalize(stmt) }
@@ -174,41 +254,20 @@ actor HermesDataService {
            totalToolCalls: Int(sqlite3_column_int(stmt, 2)),
            totalInputTokens: Int(sqlite3_column_int(stmt, 3)),
            totalOutputTokens: Int(sqlite3_column_int(stmt, 4)),
-            totalCostUSD: sqlite3_column_double(stmt, 5)
+            totalCostUSD: sqlite3_column_double(stmt, 5),
+            totalReasoningTokens: hasV07Schema ? Int(sqlite3_column_int(stmt, 6)) : 0,
+            totalActualCostUSD: hasV07Schema ? sqlite3_column_double(stmt, 7) : 0
        )
    }

    // MARK: - Insights Queries

-    func fetchSessionsInPeriod(since: Date) -> [HermesSession] {
-        guard let db else { return [] }
-        let sql = """
-            SELECT id, source, user_id, model, title, parent_session_id,
-                   started_at, ended_at, end_reason, message_count, tool_call_count,
-                   input_tokens, output_tokens, cache_read_tokens, cache_write_tokens,
-                   estimated_cost_usd
-            FROM sessions
-            WHERE started_at >= ?
-            ORDER BY started_at DESC
-            """
-        var stmt: OpaquePointer?
-        guard sqlite3_prepare_v2(db, sql, -1, &stmt, nil) == SQLITE_OK else { return [] }
-        defer { sqlite3_finalize(stmt) }
-        sqlite3_bind_double(stmt, 1, since.timeIntervalSince1970)
-
-        var sessions: [HermesSession] = []
-        while sqlite3_step(stmt) == SQLITE_ROW {
-            sessions.append(sessionFromRow(stmt!))
-        }
-        return sessions
-    }
-
    func fetchUserMessageCount(since: Date) -> Int {
        guard let db else { return 0 }
        let sql = """
            SELECT COUNT(*) FROM messages m
            JOIN sessions s ON m.session_id = s.id
-            WHERE m.role = 'user' AND s.started_at >= ?
+            WHERE m.role = 'user' AND s.parent_session_id IS NULL AND s.started_at >= ?
            """
        var stmt: OpaquePointer?
        guard sqlite3_prepare_v2(db, sql, -1, &stmt, nil) == SQLITE_OK else { return 0 }
@@ -224,7 +283,7 @@ actor HermesDataService {
            SELECT m.tool_name, COUNT(*) as cnt
            FROM messages m
            JOIN sessions s ON m.session_id = s.id
-            WHERE m.tool_name IS NOT NULL AND m.tool_name <> '' AND s.started_at >= ?
+            WHERE m.tool_name IS NOT NULL AND m.tool_name <> '' AND s.parent_session_id IS NULL AND s.started_at >= ?
            GROUP BY m.tool_name
            ORDER BY cnt DESC
            """
@@ -245,7 +304,7 @@ actor HermesDataService {
    func fetchSessionStartHours(since: Date) -> [Int: Int] {
        guard let db else { return [:] }
        let sql = """
-            SELECT started_at FROM sessions WHERE started_at >= ?
+            SELECT started_at FROM sessions WHERE parent_session_id IS NULL AND started_at >= ?
            """
        var stmt: OpaquePointer?
        guard sqlite3_prepare_v2(db, sql, -1, &stmt, nil) == SQLITE_OK else { return [:] }
@@ -266,7 +325,7 @@ actor HermesDataService {
    func fetchSessionDaysOfWeek(since: Date) -> [Int: Int] {
        guard let db else { return [:] }
        let sql = """
-            SELECT started_at FROM sessions WHERE started_at >= ?
+            SELECT started_at FROM sessions WHERE parent_session_id IS NULL AND started_at >= ?
            """
        var stmt: OpaquePointer?
        guard sqlite3_prepare_v2(db, sql, -1, &stmt, nil) == SQLITE_OK else { return [:] }
@@ -315,7 +374,11 @@ actor HermesDataService {
            outputTokens: Int(sqlite3_column_int(stmt, 12)),
            cacheReadTokens: Int(sqlite3_column_int(stmt, 13)),
            cacheWriteTokens: Int(sqlite3_column_int(stmt, 14)),
-            estimatedCostUSD: sqlite3_column_type(stmt, 15) != SQLITE_NULL ? sqlite3_column_double(stmt, 15) : nil
+            estimatedCostUSD: sqlite3_column_type(stmt, 15) != SQLITE_NULL ? sqlite3_column_double(stmt, 15) : nil,
+            reasoningTokens: hasV07Schema ? Int(sqlite3_column_int(stmt, 16)) : 0,
+            actualCostUSD: hasV07Schema && sqlite3_column_type(stmt, 17) != SQLITE_NULL ? sqlite3_column_double(stmt, 17) : nil,
+            costStatus: hasV07Schema ? columnOptionalText(stmt, 18) : nil,
+            billingProvider: hasV07Schema ? columnOptionalText(stmt, 19) : nil
        )
    }

@@ -332,7 +395,8 @@ actor HermesDataService {
            toolName: columnOptionalText(stmt, 6),
            timestamp: columnDate(stmt, 7),
            tokenCount: sqlite3_column_type(stmt, 8) != SQLITE_NULL ? Int(sqlite3_column_int(stmt, 8)) : nil,
-            finishReason: columnOptionalText(stmt, 9)
+            finishReason: columnOptionalText(stmt, 9),
+            reasoning: hasV07Schema ? columnOptionalText(stmt, 10) : nil
        )
    }

@@ -365,4 +429,17 @@ actor HermesDataService {
        let value = sqlite3_column_double(stmt, col)
        return Date(timeIntervalSince1970: value)
    }
+
+    /// Wraps each whitespace-delimited token in double quotes to prevent FTS5 parse errors
+    /// on terms containing dots, hyphens, or FTS5 operators (e.g., "v0.7.0", "config.yaml").
+    private func sanitizeFTSQuery(_ raw: String) -> String {
+        raw.split(separator: " ")
+            .map { token in
+                let t = String(token)
+                let stripped = t.replacingOccurrences(of: "\"", with: "")
+                return stripped.isEmpty ? nil : "\"\(stripped)\""
+            }
+            .compactMap { $0 }
+            .joined(separator: " ")
+    }
 }
@@ -12,12 +12,37 @@ struct HermesFileService: Sendable {
    private func parseConfig(_ yaml: String) -> HermesConfig {
        var values: [String: String] = [:]
        var currentSection = ""
+        var dockerEnv: [String: String] = [:]
+        var commandAllowlist: [String] = []
+        var inDockerEnv = false
+        var inAllowlist = false

        for line in yaml.components(separatedBy: "\n") {
            let trimmed = line.trimmingCharacters(in: .whitespaces)
            if trimmed.isEmpty || trimmed.hasPrefix("#") { continue }

            let indent = line.prefix(while: { $0 == " " }).count
+
+            // Detect end of nested blocks when indent returns to section level
+            if indent <= 2 && (inDockerEnv || inAllowlist) {
+                inDockerEnv = false
+                inAllowlist = false
+            }
+
+            // Collect docker_env nested key-value pairs
+            if inDockerEnv, indent >= 4, let colonIdx = trimmed.firstIndex(of: ":") {
+                let key = String(trimmed[trimmed.startIndex..<colonIdx]).trimmingCharacters(in: .whitespaces)
+                let val = String(trimmed[trimmed.index(after: colonIdx)...]).trimmingCharacters(in: .whitespaces)
+                dockerEnv[key] = val
+                continue
+            }
+
+            // Collect allowlist items
+            if inAllowlist, indent >= 4, trimmed.hasPrefix("- ") {
+                commandAllowlist.append(String(trimmed.dropFirst(2)))
+                continue
+            }
+
            if indent == 0 && trimmed.hasSuffix(":") {
                currentSection = String(trimmed.dropLast())
                continue
@@ -26,6 +51,16 @@ struct HermesFileService: Sendable {
            if let colonIdx = trimmed.firstIndex(of: ":") {
                let key = String(trimmed[trimmed.startIndex..<colonIdx]).trimmingCharacters(in: .whitespaces)
                let val = String(trimmed[trimmed.index(after: colonIdx)...]).trimmingCharacters(in: .whitespaces)
+
+                if key == "docker_env" && val.isEmpty {
+                    inDockerEnv = true
+                    continue
+                }
+                if key == "permanent_allowlist" && val.isEmpty {
+                    inAllowlist = true
+                    continue
+                }
+
                values[currentSection + "." + key] = val
            }
        }
@@ -44,7 +79,15 @@ struct HermesFileService: Sendable {
            showReasoning: values["display.show_reasoning"] == "true",
            verbose: values["agent.verbose"] == "true",
            autoTTS: values["voice.auto_tts"] != "false",
-            silenceThreshold: Int(values["voice.silence_threshold"] ?? "") ?? QueryDefaults.defaultSilenceThreshold
+            silenceThreshold: Int(values["voice.silence_threshold"] ?? "") ?? QueryDefaults.defaultSilenceThreshold,
+            reasoningEffort: values["agent.reasoning_effort"] ?? "medium",
+            showCost: values["display.show_cost"] == "true",
+            approvalMode: values["approvals.mode"] ?? "manual",
+            browserBackend: values["browser.backend"] ?? "",
+            memoryProvider: values["memory.provider"] ?? "",
+            dockerEnv: dockerEnv,
+            commandAllowlist: commandAllowlist,
+            memoryProfile: values["memory.profile"] ?? ""
        )
    }

@@ -62,20 +105,41 @@ struct HermesFileService: Sendable {

    // MARK: - Memory

-    func loadMemory() -> String {
-        readFile(HermesPaths.memoryMD) ?? ""
+    func loadMemoryProfiles() -> [String] {
+        let fm = FileManager.default
+        guard let entries = try? fm.contentsOfDirectory(atPath: HermesPaths.memoriesDir) else { return [] }
+        return entries.filter { name in
+            var isDir: ObjCBool = false
+            let path = HermesPaths.memoriesDir + "/" + name
+            return fm.fileExists(atPath: path, isDirectory: &isDir) && isDir.boolValue
+        }.sorted()
    }

-    func loadUserProfile() -> String {
-        readFile(HermesPaths.userMD) ?? ""
+    func loadMemory(profile: String = "") -> String {
+        let path = memoryPath(profile: profile, file: "MEMORY.md")
+        return readFile(path) ?? ""
    }

-    func saveMemory(_ content: String) {
-        writeFile(HermesPaths.memoryMD, content: content)
+    func loadUserProfile(profile: String = "") -> String {
+        let path = memoryPath(profile: profile, file: "USER.md")
+        return readFile(path) ?? ""
    }

-    func saveUserProfile(_ content: String) {
-        writeFile(HermesPaths.userMD, content: content)
+    func saveMemory(_ content: String, profile: String = "") {
+        let path = memoryPath(profile: profile, file: "MEMORY.md")
+        writeFile(path, content: content)
+    }
+
+    func saveUserProfile(_ content: String, profile: String = "") {
+        let path = memoryPath(profile: profile, file: "USER.md")
+        writeFile(path, content: content)
+    }
+
+    private func memoryPath(profile: String, file: String) -> String {
+        if profile.isEmpty {
+            return HermesPaths.memoriesDir + "/" + file
+        }
+        return HermesPaths.memoriesDir + "/" + profile + "/" + file
    }

    // MARK: - Cron
@@ -118,12 +182,14 @@ struct HermesFileService: Sendable {
                var isSkillDir: ObjCBool = false
                guard fm.fileExists(atPath: skillPath, isDirectory: &isSkillDir), isSkillDir.boolValue else { return nil }
                let files = (try? fm.contentsOfDirectory(atPath: skillPath)) ?? []
+                let requiredConfig = parseSkillRequiredConfig(skillPath + "/skill.yaml")
                return HermesSkill(
                    id: categoryName + "/" + skillName,
                    name: skillName,
                    category: categoryName,
                    path: skillPath,
-                    files: files.sorted()
+                    files: files.sorted(),
+                    requiredConfig: requiredConfig
                )
            }

@@ -142,6 +208,30 @@ struct HermesFileService: Sendable {
        return readFile(path) ?? ""
    }

+    private func parseSkillRequiredConfig(_ path: String) -> [String] {
+        guard let content = readFile(path) else { return [] }
+        var result: [String] = []
+        var inRequiredConfig = false
+        for line in content.components(separatedBy: "\n") {
+            let trimmed = line.trimmingCharacters(in: .whitespaces)
+            if trimmed.isEmpty || trimmed.hasPrefix("#") { continue }
+            let indent = line.prefix(while: { $0 == " " }).count
+            if trimmed == "required_config:" || trimmed.hasPrefix("required_config:") {
+                inRequiredConfig = true
+                continue
+            }
+            if inRequiredConfig {
+                if indent < 2 && !trimmed.isEmpty {
+                    break
+                }
+                if trimmed.hasPrefix("- ") {
+                    result.append(String(trimmed.dropFirst(2)))
+                }
+            }
+        }
+        return result
+    }
+
    // MARK: - Hermes Process

    func isHermesRunning() -> Bool {
@@ -16,6 +16,7 @@ final class HermesFileWatcher {
            HermesPaths.userMD,
            HermesPaths.cronJobsJSON,
            HermesPaths.gatewayStateJSON,
+            HermesPaths.agentLog,
            HermesPaths.errorsLog,
            HermesPaths.gatewayLog,
            HermesPaths.projectsRegistry
@@ -38,6 +38,11 @@ struct CronView: View {
                            .foregroundStyle(.secondary)
                    }
                    Spacer()
+                    if job.silent == true {
+                        Text("SILENT")
+                            .font(.caption2.bold())
+                            .foregroundStyle(.purple)
+                    }
                    if !job.enabled {
                        Text("Disabled")
                            .font(.caption2)
@@ -86,6 +91,20 @@ struct CronView: View {
                            .background(.quaternary.opacity(0.5))
                            .clipShape(RoundedRectangle(cornerRadius: 6))
                    }
+                    if let script = job.preRunScript, !script.isEmpty {
+                        VStack(alignment: .leading, spacing: 4) {
+                            Text("Pre-Run Script")
+                                .font(.caption.bold())
+                                .foregroundStyle(.secondary)
+                            Text(script)
+                                .font(.system(.caption, design: .monospaced))
+                                .textSelection(.enabled)
+                                .padding(8)
+                                .frame(maxWidth: .infinity, alignment: .leading)
+                                .background(.quaternary.opacity(0.5))
+                                .clipShape(RoundedRectangle(cornerRadius: 6))
+                        }
+                    }
                    if let skills = job.skills, !skills.isEmpty {
                        VStack(alignment: .leading, spacing: 4) {
                            Text("Skills")
@@ -118,6 +137,21 @@ struct CronView: View {
                            .font(.caption)
                            .foregroundStyle(.red)
                    }
+                    if let timeout = job.timeoutSeconds {
+                        Label("Timeout: \(timeout)s (\(job.timeoutType ?? "wall_clock"))", systemImage: "timer")
+                            .font(.caption)
+                            .foregroundStyle(.secondary)
+                    }
+                    if let failures = job.deliveryFailures, failures > 0 {
+                        Label("\(failures) delivery failure\(failures == 1 ? "" : "s")", systemImage: "exclamationmark.triangle")
+                            .font(.caption)
+                            .foregroundStyle(.orange)
+                    }
+                    if let deliveryError = job.lastDeliveryError {
+                        Label(deliveryError, systemImage: "paperplane.circle")
+                            .font(.caption)
+                            .foregroundStyle(.orange)
+                    }
                    if let output = viewModel.jobOutput {
                        Divider()
                        VStack(alignment: .leading, spacing: 4) {
@@ -60,6 +60,10 @@ struct DashboardView: View {
                StatCard(label: "Messages", value: "\(viewModel.stats.totalMessages)")
                StatCard(label: "Tool Calls", value: "\(viewModel.stats.totalToolCalls)")
                StatCard(label: "Tokens", value: formatTokens(viewModel.stats.totalInputTokens + viewModel.stats.totalOutputTokens))
+                let cost = viewModel.stats.totalActualCostUSD > 0 ? viewModel.stats.totalActualCostUSD : viewModel.stats.totalCostUSD
+                if cost > 0 {
+                    StatCard(label: "Cost", value: String(format: "$%.2f", cost))
+                }
            }
        }
    }
@@ -90,14 +94,6 @@ struct DashboardView: View {
        }
    }

-    private func formatTokens(_ count: Int) -> String {
-        if count >= 1_000_000 {
-            return String(format: "%.1fM", Double(count) / 1_000_000)
-        } else if count >= 1_000 {
-            return String(format: "%.1fK", Double(count) / 1_000)
-        }
-        return "\(count)"
-    }
 }

 struct StatusCard: View {
@@ -19,17 +19,7 @@ struct PlatformInfo: Identifiable {

    var isConnected: Bool { state == "connected" }

-    var icon: String {
-        switch name {
-        case "telegram": return "paperplane"
-        case "discord": return "bubble.left.and.bubble.right"
-        case "slack": return "number"
-        case "whatsapp": return "phone.bubble"
-        case "signal": return "lock.shield"
-        case "email": return "envelope"
-        default: return "bubble.left"
-        }
-    }
+    var icon: String { KnownPlatforms.icon(for: name) }
 }

 struct PairedUser: Identifiable {
@@ -177,15 +177,7 @@ struct GatewayView: View {
    }

    private func platformIcon(_ platform: String) -> String {
-        switch platform {
-        case "telegram": return "paperplane"
-        case "discord": return "bubble.left.and.bubble.right"
-        case "slack": return "number"
-        case "whatsapp": return "phone.bubble"
-        case "signal": return "lock.shield"
-        case "email": return "envelope"
-        default: return "bubble.left"
-        }
+        KnownPlatforms.icon(for: platform)
    }
 }

@@ -27,7 +27,8 @@ struct ModelUsage: Identifiable {
    let outputTokens: Int
    let cacheReadTokens: Int
    let cacheWriteTokens: Int
-    var totalTokens: Int { inputTokens + outputTokens + cacheReadTokens + cacheWriteTokens }
+    let reasoningTokens: Int
+    var totalTokens: Int { inputTokens + outputTokens + cacheReadTokens + cacheWriteTokens + reasoningTokens }
 }

 struct PlatformUsage: Identifiable {
@@ -69,7 +70,9 @@ final class InsightsViewModel {
    var totalOutputTokens = 0
    var totalCacheReadTokens = 0
    var totalCacheWriteTokens = 0
+    var totalReasoningTokens = 0
    var totalTokens = 0
+    var totalCost: Double = 0
    var activeTime: TimeInterval = 0
    var avgSessionDuration: TimeInterval = 0

@@ -119,7 +122,9 @@ final class InsightsViewModel {
        totalOutputTokens = sessions.reduce(0) { $0 + $1.outputTokens }
        totalCacheReadTokens = sessions.reduce(0) { $0 + $1.cacheReadTokens }
        totalCacheWriteTokens = sessions.reduce(0) { $0 + $1.cacheWriteTokens }
-        totalTokens = totalInputTokens + totalOutputTokens + totalCacheReadTokens + totalCacheWriteTokens
+        totalReasoningTokens = sessions.reduce(0) { $0 + $1.reasoningTokens }
+        totalTokens = totalInputTokens + totalOutputTokens + totalCacheReadTokens + totalCacheWriteTokens + totalReasoningTokens
+        totalCost = sessions.reduce(0.0) { $0 + ($1.displayCostUSD ?? 0) }

        var total: TimeInterval = 0
        var count = 0
@@ -134,21 +139,22 @@ final class InsightsViewModel {
    }

    private func computeModelBreakdown() {
-        var grouped: [String: (sessions: Int, input: Int, output: Int, cacheRead: Int, cacheWrite: Int)] = [:]
+        var grouped: [String: (sessions: Int, input: Int, output: Int, cacheRead: Int, cacheWrite: Int, reasoning: Int)] = [:]
        for s in sessions {
            let model = s.model ?? "unknown"
-            var entry = grouped[model, default: (0, 0, 0, 0, 0)]
+            var entry = grouped[model, default: (0, 0, 0, 0, 0, 0)]
            entry.sessions += 1
            entry.input += s.inputTokens
            entry.output += s.outputTokens
            entry.cacheRead += s.cacheReadTokens
            entry.cacheWrite += s.cacheWriteTokens
+            entry.reasoning += s.reasoningTokens
            grouped[model] = entry
        }
        modelUsage = grouped.map { key, val in
            ModelUsage(model: key, sessions: val.sessions, inputTokens: val.input,
                       outputTokens: val.output, cacheReadTokens: val.cacheRead,
-                       cacheWriteTokens: val.cacheWrite)
+                       cacheWriteTokens: val.cacheWrite, reasoningTokens: val.reasoning)
        }.sorted { $0.totalTokens > $1.totalTokens }
    }

@@ -158,7 +164,7 @@ final class InsightsViewModel {
            var entry = grouped[s.source, default: (0, 0, 0)]
            entry.sessions += 1
            entry.messages += s.messageCount
-            entry.tokens += s.inputTokens + s.outputTokens + s.cacheReadTokens + s.cacheWriteTokens
+            entry.tokens += s.inputTokens + s.outputTokens + s.cacheReadTokens + s.cacheWriteTokens + s.reasoningTokens
            grouped[s.source] = entry
        }
        platformUsage = grouped.map { key, val in
@@ -50,7 +50,9 @@ struct InsightsView: View {
                InsightCard(label: "Output Tokens", value: formatTokens(viewModel.totalOutputTokens))
                InsightCard(label: "Cache Read", value: formatTokens(viewModel.totalCacheReadTokens))
                InsightCard(label: "Cache Write", value: formatTokens(viewModel.totalCacheWriteTokens))
+                InsightCard(label: "Reasoning Tokens", value: formatTokens(viewModel.totalReasoningTokens))
                InsightCard(label: "Total Tokens", value: formatTokens(viewModel.totalTokens))
+                InsightCard(label: "Total Cost", value: String(format: "$%.2f", viewModel.totalCost))
                InsightCard(label: "Active Time", value: formatDuration(viewModel.activeTime))
                InsightCard(label: "Avg Session", value: formatDuration(viewModel.avgSessionDuration))
                InsightCard(label: "Avg Msgs/Session", value: viewModel.sessions.isEmpty ? "0" : String(format: "%.1f", Double(viewModel.totalMessages) / Double(viewModel.sessions.count)))
@@ -273,19 +275,12 @@ struct InsightsView: View {
    // MARK: - Helpers

    private func platformIcon(_ platform: String) -> String {
-        switch platform {
-        case "cli": return "terminal"
-        case "telegram": return "paperplane"
-        case "discord": return "bubble.left.and.bubble.right"
-        case "slack": return "number"
-        case "email": return "envelope"
-        default: return "bubble.left"
-        }
+        KnownPlatforms.icon(for: platform)
    }

    private func barColor(for toolName: String) -> Color {
        switch toolName {
-        case "terminal": return .orange
+        case "terminal", "execute_code": return .orange
        case "read_file", "search_files": return .green
        case "write_file", "patch": return .blue
        case "web_search", "web_extract": return .purple
@@ -5,12 +5,13 @@ final class LogsViewModel {
    private let logService = HermesLogService()

    var entries: [LogEntry] = []
-    var selectedLogFile: LogFile = .errors
+    var selectedLogFile: LogFile = .agent
    var filterLevel: LogEntry.LogLevel?
    var searchText = ""
    private var pollTimer: Timer?

    enum LogFile: String, CaseIterable, Identifiable {
+        case agent = "agent.log"
        case errors = "errors.log"
        case gateway = "gateway.log"

@@ -18,6 +19,7 @@ final class LogsViewModel {

        var path: String {
            switch self {
+            case .agent: return HermesPaths.agentLog
            case .errors: return HermesPaths.errorsLog
            case .gateway: return HermesPaths.gatewayLog
            }
@@ -6,9 +6,12 @@ final class MemoryViewModel {

    var memoryContent = ""
    var userContent = ""
+    var memoryProvider = ""
    var isEditing = false
    var editingFile: EditTarget = .memory
    var editText = ""
+    var profiles: [String] = []
+    var activeProfile = ""

    enum EditTarget {
        case memory, user
@@ -17,9 +20,27 @@ final class MemoryViewModel {
    var memoryCharCount: Int { memoryContent.count }
    var userCharCount: Int { userContent.count }

+    var hasExternalProvider: Bool {
+        !memoryProvider.isEmpty && memoryProvider != "file"
+    }
+
+    var hasMultipleProfiles: Bool { !profiles.isEmpty }
+
    func load() {
-        memoryContent = fileService.loadMemory()
-        userContent = fileService.loadUserProfile()
+        let config = fileService.loadConfig()
+        memoryProvider = config.memoryProvider
+        profiles = fileService.loadMemoryProfiles()
+        if activeProfile.isEmpty {
+            activeProfile = config.memoryProfile
+        }
+        memoryContent = fileService.loadMemory(profile: activeProfile)
+        userContent = fileService.loadUserProfile(profile: activeProfile)
+    }
+
+    func switchProfile(_ profile: String) {
+        activeProfile = profile
+        memoryContent = fileService.loadMemory(profile: profile)
+        userContent = fileService.loadUserProfile(profile: profile)
    }

    func startEditing(_ target: EditTarget) {
@@ -31,10 +52,10 @@ final class MemoryViewModel {
    func save() {
        switch editingFile {
        case .memory:
-            fileService.saveMemory(editText)
+            fileService.saveMemory(editText, profile: activeProfile)
            memoryContent = editText
        case .user:
-            fileService.saveUserProfile(editText)
+            fileService.saveUserProfile(editText, profile: activeProfile)
            userContent = editText
        }
        isEditing = false
@@ -7,6 +7,35 @@ struct MemoryView: View {
    var body: some View {
        ScrollView {
            VStack(alignment: .leading, spacing: 20) {
+                if viewModel.hasMultipleProfiles {
+                    HStack(spacing: 8) {
+                        Text("Profile")
+                            .font(.caption.bold())
+                            .foregroundStyle(.secondary)
+                        Picker("", selection: Binding(
+                            get: { viewModel.activeProfile },
+                            set: { viewModel.switchProfile($0) }
+                        )) {
+                            Text("Default").tag("")
+                            ForEach(viewModel.profiles, id: \.self) { profile in
+                                Text(profile).tag(profile)
+                            }
+                        }
+                        .frame(maxWidth: 200)
+                    }
+                }
+                if viewModel.hasExternalProvider {
+                    HStack(spacing: 8) {
+                        Image(systemName: "info.circle")
+                        Text("Memory is managed by \(viewModel.memoryProvider). File contents shown here may be stale.")
+                    }
+                    .font(.caption)
+                    .foregroundStyle(.orange)
+                    .padding(10)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .background(.orange.opacity(0.1))
+                    .clipShape(RoundedRectangle(cornerRadius: 8))
+                }
                memorySection("Agent Memory", content: viewModel.memoryContent, charCount: viewModel.memoryCharCount, target: .memory)
                memorySection("User Profile", content: viewModel.userContent, charCount: viewModel.userCharCount, target: .user)
            }
@@ -21,6 +21,7 @@ final class SessionsViewModel {
    var searchResults: [HermesMessage] = []
    var isSearching = false
    var storeStats: SessionStoreStats?
+    var subagentSessions: [HermesSession] = []

    var renameSessionId: String?
    var renameText = ""
@@ -45,6 +46,7 @@ final class SessionsViewModel {
    func selectSession(_ session: HermesSession) async {
        selectedSession = session
        messages = await dataService.fetchMessages(sessionId: session.id)
+        subagentSessions = await dataService.fetchSubagentSessions(parentId: session.id)
    }

    func selectSessionById(_ id: String) async {
@@ -83,17 +85,7 @@ final class SessionsViewModel {
        let result = runHermes(["sessions", "rename", sessionId, title])
        if result.exitCode == 0 {
            if let idx = sessions.firstIndex(where: { $0.id == sessionId }) {
-                let updated = HermesSession(
-                    id: sessions[idx].id, source: sessions[idx].source,
-                    userId: sessions[idx].userId, model: sessions[idx].model,
-                    title: title, parentSessionId: sessions[idx].parentSessionId,
-                    startedAt: sessions[idx].startedAt, endedAt: sessions[idx].endedAt,
-                    endReason: sessions[idx].endReason, messageCount: sessions[idx].messageCount,
-                    toolCallCount: sessions[idx].toolCallCount, inputTokens: sessions[idx].inputTokens,
-                    outputTokens: sessions[idx].outputTokens, cacheReadTokens: sessions[idx].cacheReadTokens,
-                    cacheWriteTokens: sessions[idx].cacheWriteTokens,
-                    estimatedCostUSD: sessions[idx].estimatedCostUSD
-                )
+                let updated = sessions[idx].withTitle(title)
                sessions[idx] = updated
                if selectedSession?.id == sessionId {
                    selectedSession = updated
@@ -3,14 +3,19 @@ import SwiftUI
 struct SessionDetailView: View {
    let session: HermesSession
    let messages: [HermesMessage]
+    var subagentSessions: [HermesSession] = []
    var preview: String?
    var onRename: (() -> Void)?
    var onExport: (() -> Void)?
    var onDelete: (() -> Void)?
+    var onSelectSubagent: ((HermesSession) -> Void)?

    var body: some View {
        VStack(alignment: .leading, spacing: 0) {
            sessionHeader
+            if !subagentSessions.isEmpty {
+                subagentSection
+            }
            Divider()
            messagesList
        }
@@ -41,9 +46,22 @@ struct SessionDetailView: View {
            }
            HStack(spacing: 16) {
                Label(session.source, systemImage: session.sourceIcon)
+                if session.isSubagent {
+                    Label("Subagent", systemImage: "arrow.triangle.branch")
+                        .foregroundStyle(.orange)
+                }
+                if let userId = session.userId, !userId.isEmpty, session.source != "cli" {
+                    Label(userId, systemImage: "person")
+                }
                Label(session.model ?? "unknown", systemImage: "cpu")
                Label("\(session.messageCount) msgs", systemImage: "bubble.left")
                Label("\(session.toolCallCount) tools", systemImage: "wrench")
+                if session.reasoningTokens > 0 {
+                    Label("\(session.reasoningTokens) reasoning", systemImage: "brain")
+                }
+                if let cost = session.displayCostUSD {
+                    Label(String(format: "$%.4f%@", cost, session.costIsActual ? "" : " est."), systemImage: "dollarsign.circle")
+                }
                if let date = session.startedAt {
                    Label(date.formatted(.dateTime.month().day().hour().minute()), systemImage: "calendar")
                }
@@ -58,6 +76,38 @@ struct SessionDetailView: View {
        .padding()
    }

+    private var subagentSection: some View {
+        VStack(alignment: .leading, spacing: 6) {
+            Divider()
+            Text("Subagent Sessions (\(subagentSessions.count))")
+                .font(.caption.bold())
+                .foregroundStyle(.secondary)
+            ForEach(subagentSessions) { sub in
+                Button {
+                    onSelectSubagent?(sub)
+                } label: {
+                    HStack(spacing: 8) {
+                        Image(systemName: "arrow.triangle.branch")
+                            .foregroundStyle(.orange)
+                        Text(sub.displayTitle)
+                            .lineLimit(1)
+                        Spacer()
+                        Text(sub.model ?? "")
+                            .font(.caption2)
+                            .foregroundStyle(.tertiary)
+                        Text("\(sub.messageCount) msgs")
+                            .font(.caption2)
+                            .foregroundStyle(.tertiary)
+                    }
+                    .font(.caption)
+                }
+                .buttonStyle(.plain)
+            }
+        }
+        .padding(.horizontal)
+        .padding(.bottom, 8)
+    }
+
    private var messagesList: some View {
        ScrollView {
            LazyVStack(alignment: .leading, spacing: 12) {
@@ -78,6 +128,16 @@ struct MessageBubble: View {
            HStack {
                if message.isUser { Spacer(minLength: 60) }
                VStack(alignment: .leading, spacing: 6) {
+                    if message.hasReasoning {
+                        DisclosureGroup("Reasoning") {
+                            Text(message.reasoning ?? "")
+                                .font(.caption.monospaced())
+                                .foregroundStyle(.secondary)
+                                .textSelection(.enabled)
+                        }
+                        .font(.caption.bold())
+                        .foregroundStyle(.orange)
+                    }
                    if !message.content.isEmpty {
                        Text(message.content)
                            .textSelection(.enabled)
@@ -115,10 +115,14 @@ struct SessionsView: View {
            SessionDetailView(
                session: session,
                messages: viewModel.messages,
+                subagentSessions: viewModel.subagentSessions,
                preview: viewModel.previewFor(session),
                onRename: { viewModel.beginRename(session) },
                onExport: { viewModel.exportSession(session) },
-                onDelete: { viewModel.beginDelete(session) }
+                onDelete: { viewModel.beginDelete(session) },
+                onSelectSubagent: { sub in
+                    Task { await viewModel.selectSession(sub) }
+                }
            )
            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
        } else {
@@ -149,13 +153,6 @@ struct SessionsView: View {
    }

    private func platformIcon(_ platform: String) -> String {
-        switch platform {
-        case "cli": return "terminal"
-        case "telegram": return "paperplane"
-        case "discord": return "bubble.left.and.bubble.right"
-        case "slack": return "number"
-        case "email": return "envelope"
-        default: return "bubble.left"
-        }
+        KnownPlatforms.icon(for: platform)
    }
 }
@@ -10,9 +10,11 @@ final class SettingsViewModel {
    var hermesRunning = false
    var rawConfigYAML = ""
    var personalities: [String] = []
-    var providers = ["anthropic", "openrouter", "nous", "openai-codex", "zai", "kimi-coding", "minimax"]
+    var providers = ["anthropic", "openrouter", "nous", "openai-codex", "google-ai-studio", "xai", "ollama-cloud", "zai", "kimi-coding", "minimax"]
    var terminalBackends = ["local", "docker", "singularity", "modal", "daytona", "ssh"]
+    var browserBackends = ["browseruse", "firecrawl", "local"]
    var saveMessage: String?
+    var showAuthRemoveConfirmation = false

    func load() {
        config = fileService.loadConfig()
@@ -52,6 +54,22 @@ final class SettingsViewModel {
    func setVerbose(_ value: Bool) { setSetting("agent.verbose", value: value ? "true" : "false") }
    func setAutoTTS(_ value: Bool) { setSetting("voice.auto_tts", value: value ? "true" : "false") }
    func setSilenceThreshold(_ value: Int) { setSetting("voice.silence_threshold", value: String(value)) }
+    func setReasoningEffort(_ value: String) { setSetting("agent.reasoning_effort", value: value) }
+    func setShowCost(_ value: Bool) { setSetting("display.show_cost", value: value ? "true" : "false") }
+    func setApprovalMode(_ value: String) { setSetting("approvals.mode", value: value) }
+    func setBrowserBackend(_ value: String) { setSetting("browser.backend", value: value) }
+
+    func removeAuth() {
+        let result = runHermes(["auth", "remove"])
+        if result.exitCode == 0 {
+            saveMessage = "Credentials removed"
+        } else {
+            saveMessage = "Failed to remove credentials"
+        }
+        DispatchQueue.main.asyncAfter(deadline: .now() + 2) { [weak self] in
+            self?.saveMessage = nil
+        }
+    }

    func openConfigInEditor() {
        NSWorkspace.shared.open(URL(fileURLWithPath: HermesPaths.configYAML))
@@ -11,6 +11,12 @@ struct SettingsView: View {
                modelSection
                displaySection
                terminalSection
+                if !viewModel.config.dockerEnv.isEmpty {
+                    dockerEnvSection
+                }
+                if !viewModel.config.commandAllowlist.isEmpty {
+                    allowlistSection
+                }
                voiceSection
                memorySection
                pathsSection
@@ -21,6 +27,12 @@ struct SettingsView: View {
        }
        .navigationTitle("Settings")
        .onAppear { viewModel.load() }
+        .confirmationDialog("Remove Credentials?", isPresented: $viewModel.showAuthRemoveConfirmation) {
+            Button("Remove", role: .destructive) { viewModel.removeAuth() }
+            Button("Cancel", role: .cancel) {}
+        } message: {
+            Text("This will permanently clear all stored provider credentials.")
+        }
    }

    private var headerBar: some View {
@@ -44,6 +56,20 @@ struct SettingsView: View {
        SettingsSection(title: "Model", icon: "cpu") {
            EditableTextField(label: "Model", value: viewModel.config.model) { viewModel.setModel($0) }
            PickerRow(label: "Provider", selection: viewModel.config.provider, options: viewModel.providers) { viewModel.setProvider($0) }
+            HStack {
+                Text("Credentials")
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+                    .frame(width: 130, alignment: .trailing)
+                Button("Remove Credentials", role: .destructive) {
+                    viewModel.showAuthRemoveConfirmation = true
+                }
+                .controlSize(.small)
+                Spacer()
+            }
+            .padding(.horizontal, 12)
+            .padding(.vertical, 6)
+            .background(.quaternary.opacity(0.3))
        }
    }

@@ -58,6 +84,7 @@ struct SettingsView: View {
            }
            ToggleRow(label: "Streaming", isOn: viewModel.config.streaming) { viewModel.setStreaming($0) }
            ToggleRow(label: "Show Reasoning", isOn: viewModel.config.showReasoning) { viewModel.setShowReasoning($0) }
+            ToggleRow(label: "Show Cost", isOn: viewModel.config.showCost) { viewModel.setShowCost($0) }
            ToggleRow(label: "Verbose", isOn: viewModel.config.verbose) { viewModel.setVerbose($0) }
        }
    }
@@ -68,6 +95,27 @@ struct SettingsView: View {
        SettingsSection(title: "Terminal", icon: "terminal") {
            PickerRow(label: "Backend", selection: viewModel.config.terminalBackend, options: viewModel.terminalBackends) { viewModel.setTerminalBackend($0) }
            StepperRow(label: "Max Turns", value: viewModel.config.maxTurns, range: 1...200) { viewModel.setMaxTurns($0) }
+            PickerRow(label: "Reasoning Effort", selection: viewModel.config.reasoningEffort, options: ["low", "medium", "high"]) { viewModel.setReasoningEffort($0) }
+            PickerRow(label: "Approval Mode", selection: viewModel.config.approvalMode, options: ["auto", "manual", "smart"]) { viewModel.setApprovalMode($0) }
+            PickerRow(label: "Browser Backend", selection: viewModel.config.browserBackend, options: viewModel.browserBackends) { viewModel.setBrowserBackend($0) }
+        }
+    }
+
+    // MARK: - Docker Environment
+
+    private var dockerEnvSection: some View {
+        SettingsSection(title: "Docker Environment", icon: "shippingbox") {
+            ForEach(viewModel.config.dockerEnv.sorted(by: { $0.key < $1.key }), id: \.key) { key, value in
+                ReadOnlyRow(label: key, value: value)
+            }
+        }
+    }
+
+    // MARK: - Command Allowlist
+
+    private var allowlistSection: some View {
+        SettingsSection(title: "Command Allowlist", icon: "checkmark.shield") {
+            ReadOnlyRow(label: "Commands", value: viewModel.config.commandAllowlist.joined(separator: ", "))
        }
    }

@@ -85,6 +133,9 @@ struct SettingsView: View {
    private var memorySection: some View {
        SettingsSection(title: "Memory", icon: "brain") {
            ToggleRow(label: "Memory Enabled", isOn: viewModel.config.memoryEnabled) { viewModel.setMemoryEnabled($0) }
+            if !viewModel.config.memoryProfile.isEmpty {
+                ReadOnlyRow(label: "Profile", value: viewModel.config.memoryProfile)
+            }
            StepperRow(label: "Memory Char Limit", value: viewModel.config.memoryCharLimit, range: 500...10000) { viewModel.setMemoryCharLimit($0) }
            StepperRow(label: "User Char Limit", value: viewModel.config.userCharLimit, range: 500...10000) { viewModel.setUserCharLimit($0) }
            StepperRow(label: "Nudge Interval", value: viewModel.config.nudgeInterval, range: 1...50) { viewModel.setNudgeInterval($0) }
@@ -101,7 +152,8 @@ struct SettingsView: View {
            PathRow(label: "Memory", path: HermesPaths.memoriesDir)
            PathRow(label: "Sessions", path: HermesPaths.sessionsDir)
            PathRow(label: "Skills", path: HermesPaths.skillsDir)
-            PathRow(label: "Logs", path: HermesPaths.errorsLog)
+            PathRow(label: "Agent Log", path: HermesPaths.agentLog)
+            PathRow(label: "Error Log", path: HermesPaths.errorsLog)
        }
    }

@@ -270,6 +322,27 @@ struct StepperRow: View {
    }
 }

+struct ReadOnlyRow: View {
+    let label: String
+    let value: String
+
+    var body: some View {
+        HStack {
+            Text(label)
+                .font(.caption)
+                .foregroundStyle(.secondary)
+                .frame(width: 130, alignment: .trailing)
+            Text(value)
+                .font(.system(.caption, design: .monospaced))
+                .textSelection(.enabled)
+            Spacer()
+        }
+        .padding(.horizontal, 12)
+        .padding(.vertical, 6)
+        .background(.quaternary.opacity(0.3))
+    }
+}
+
 struct PathRow: View {
    let label: String
    let path: String
@@ -9,6 +9,8 @@ final class SkillsViewModel {
    var skillContent = ""
    var selectedFileName: String?
    var searchText = ""
+    var missingConfig: [String] = []
+    private var currentConfig = HermesConfig.empty

    var filteredCategories: [HermesSkillCategory] {
        guard !searchText.isEmpty else { return categories }
@@ -28,6 +30,7 @@ final class SkillsViewModel {

    func load() {
        categories = fileService.loadSkills()
+        currentConfig = fileService.loadConfig()
    }

    func selectSkill(_ skill: HermesSkill) {
@@ -40,6 +43,17 @@ final class SkillsViewModel {
            selectedFileName = nil
            skillContent = ""
        }
+        missingConfig = computeMissingConfig(for: skill)
+    }
+
+    private func computeMissingConfig(for skill: HermesSkill) -> [String] {
+        guard !skill.requiredConfig.isEmpty else { return [] }
+        guard let yaml = try? String(contentsOfFile: HermesPaths.configYAML, encoding: .utf8) else {
+            return skill.requiredConfig
+        }
+        return skill.requiredConfig.filter { key in
+            !yaml.contains(key)
+        }
    }

    func selectFile(_ file: String) {
@@ -53,9 +53,28 @@ struct SkillsView: View {
                    HStack {
                        Label(skill.category, systemImage: "folder")
                        Label("\(skill.files.count) files", systemImage: "doc")
+                        if !skill.requiredConfig.isEmpty {
+                            Label("\(skill.requiredConfig.count) required config", systemImage: "gearshape")
+                        }
                    }
                    .font(.caption)
                    .foregroundStyle(.secondary)
+                    if !viewModel.missingConfig.isEmpty {
+                        HStack(spacing: 8) {
+                            Image(systemName: "exclamationmark.triangle")
+                            VStack(alignment: .leading, spacing: 2) {
+                                Text("Missing required config:")
+                                    .font(.caption.bold())
+                                Text(viewModel.missingConfig.joined(separator: ", "))
+                                    .font(.caption.monospaced())
+                            }
+                        }
+                        .foregroundStyle(.orange)
+                        .padding(10)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                        .background(.orange.opacity(0.1))
+                        .clipShape(RoundedRectangle(cornerRadius: 8))
+                    }
                    Divider()
                    if !skill.files.isEmpty {
                        VStack(alignment: .leading, spacing: 4) {
@@ -18,23 +18,20 @@ struct ToolsView: View {
    }

    private var platformPicker: some View {
-        HStack(spacing: 16) {
-            ForEach(viewModel.availablePlatforms) { platform in
-                Button {
+        HStack(spacing: 12) {
+            Picker("Platform", selection: Binding(
+                get: { viewModel.selectedPlatform.name },
+                set: { name in
+                    if let platform = viewModel.availablePlatforms.first(where: { $0.name == name }) {
                        viewModel.switchPlatform(platform)
-                } label: {
-                    HStack(spacing: 4) {
-                        Image(systemName: platform.icon)
-                        Text(platform.displayName)
-                            .font(.caption)
                    }
-                    .padding(.horizontal, 10)
-                    .padding(.vertical, 6)
-                    .background(viewModel.selectedPlatform.name == platform.name ? Color.accentColor.opacity(0.2) : Color.secondary.opacity(0.1))
-                    .clipShape(RoundedRectangle(cornerRadius: 6))
                }
-                .buttonStyle(.plain)
+            )) {
+                ForEach(viewModel.availablePlatforms) { platform in
+                    Text(platform.displayName).tag(platform.name)
                }
+            }
+            .pickerStyle(.segmented)
            Spacer()
            Text("\(viewModel.toolsets.filter(\.enabled).count) of \(viewModel.toolsets.count) enabled")
                .font(.caption)
@@ -56,6 +53,7 @@ struct ToolsView: View {
            .padding(.horizontal)
            .padding(.vertical, 8)
        }
+        .id(viewModel.selectedPlatform.name)
    }

    private var mcpSection: some View {