feat: first-class herdr multiplexer support — native splits + classic attach (WIP)

android/app/schemas/com.jossephus.chuchu.data.db.AppDatabase/12.json

@@ -0,0 +1,185 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 12,
+    "identityHash": "e1c59cbcdee1384ed9afa8331c0d766e",
+    "entities": [
+      {
+        "tableName": "host_profiles",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `host` TEXT NOT NULL, `port` INTEGER NOT NULL, `username` TEXT NOT NULL, `password` TEXT NOT NULL, `keyId` INTEGER, `keyPassphrase` TEXT NOT NULL, `transport` TEXT NOT NULL, `authMethod` TEXT NOT NULL, `requireAuthOnConnect` INTEGER NOT NULL DEFAULT 0, `postConnectCommand` TEXT, `multiplexer` TEXT DEFAULT NULL, `herdrNativeMode` INTEGER NOT NULL DEFAULT 1)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "host",
+            "columnName": "host",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "port",
+            "columnName": "port",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "keyId",
+            "columnName": "keyId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "keyPassphrase",
+            "columnName": "keyPassphrase",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "transport",
+            "columnName": "transport",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authMethod",
+            "columnName": "authMethod",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "requireAuthOnConnect",
+            "columnName": "requireAuthOnConnect",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "postConnectCommand",
+            "columnName": "postConnectCommand",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "multiplexer",
+            "columnName": "multiplexer",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "NULL"
+          },
+          {
+            "fieldPath": "herdrNativeMode",
+            "columnName": "herdrNativeMode",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_host_profiles_name",
+            "unique": false,
+            "columnNames": [
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_host_profiles_name` ON `${TABLE_NAME}` (`name`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ssh_keys",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `algorithm` TEXT NOT NULL, `privateKeyPem` TEXT NOT NULL, `publicKeyOpenSsh` TEXT NOT NULL, `createdAtEpochMs` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "algorithm",
+            "columnName": "algorithm",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKeyPem",
+            "columnName": "privateKeyPem",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicKeyOpenSsh",
+            "columnName": "publicKeyOpenSsh",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAtEpochMs",
+            "columnName": "createdAtEpochMs",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_ssh_keys_name",
+            "unique": true,
+            "columnNames": [
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ssh_keys_name` ON `${TABLE_NAME}` (`name`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'e1c59cbcdee1384ed9afa8331c0d766e')"
+    ]
+  }
+}

android/app/src/main/java/com/jossephus/chuchu/MainActivity.kt

@@ -1,5 +1,7 @@
 package com.jossephus.chuchu
 
+import android.app.Application
+import android.content.Intent
 import android.os.Bundle
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
@@ -13,12 +15,16 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.lifecycleScope
 import com.jossephus.chuchu.data.repository.SettingsRepository
+import com.jossephus.chuchu.service.terminal.HerdrAgentNotifier
+import com.jossephus.chuchu.service.terminal.TerminalSessionRepository
 import com.jossephus.chuchu.ui.ApplicationNavController
 import com.jossephus.chuchu.ui.theme.ChuColors
 import com.jossephus.chuchu.ui.theme.ChuTheme
 import com.jossephus.chuchu.ui.theme.GhosttyThemeRegistry
 import com.jossephus.chuchu.ui.theme.resolveActiveThemeName
+import kotlinx.coroutines.launch
 
 class MainActivity : FragmentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -30,6 +36,22 @@ class MainActivity : FragmentActivity() {
         setContent {
             AppRoot()
         }
+        handleHerdrNotificationIntent(intent)
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        setIntent(intent)
+        handleHerdrNotificationIntent(intent)
+    }
+
+    private fun handleHerdrNotificationIntent(intent: Intent?) {
+        val sessionId = intent?.getStringExtra(HerdrAgentNotifier.EXTRA_TAB_SESSION_ID) ?: return
+        val herdrTabId = intent.getStringExtra(HerdrAgentNotifier.EXTRA_HERDR_TAB_ID) ?: return
+        val repository = TerminalSessionRepository.getInstance(application as Application)
+        repository.selectTab(sessionId)
+        val tab = repository.tabs.value.firstOrNull { it.id == sessionId } ?: return
+        lifecycleScope.launch { tab.engine.herdrFocusTab(herdrTabId) }
     }
 }
 

android/app/src/main/java/com/jossephus/chuchu/data/backup/ChuchuBackupModels.kt

@@ -64,6 +64,7 @@ data class BackupHostProfile(
     val requireAuthOnConnect: Boolean,
     val postConnectCommand: String?,
     val multiplexer: MultiplexerType?,
+    val herdrNativeMode: Boolean = true,
 ) {
     fun toEntity(
         idOverride: Long = id,
@@ -82,6 +83,7 @@ data class BackupHostProfile(
         requireAuthOnConnect = requireAuthOnConnect,
         postConnectCommand = postConnectCommand,
         multiplexer = multiplexer,
+        herdrNativeMode = herdrNativeMode,
     )
 
     companion object {
@@ -99,6 +101,7 @@ data class BackupHostProfile(
             requireAuthOnConnect = host.requireAuthOnConnect,
             postConnectCommand = host.postConnectCommand,
             multiplexer = host.multiplexer,
+            herdrNativeMode = host.herdrNativeMode,
         )
     }
 }

android/app/src/main/java/com/jossephus/chuchu/data/db/AppDatabase.kt

@@ -14,14 +14,15 @@ import com.jossephus.chuchu.model.SshKey
 
 @Database(
     entities = [HostProfile::class, SshKey::class],
-    version = 11,
+    version = 12,
     autoMigrations = [
         AutoMigration(from = 5, to = 6),
         AutoMigration(from = 6, to = 7, spec = AppDatabase.Migration6To7::class),
         AutoMigration(from = 7, to = 8),
         AutoMigration(from = 8, to = 9),
         AutoMigration(from = 9, to = 10, spec = AppDatabase.Migration9To10::class),
         AutoMigration(from = 10, to = 11),
+        AutoMigration(from = 11, to = 12),
     ],
 )
 @TypeConverters(Converters::class)

android/app/src/main/java/com/jossephus/chuchu/data/repository/SettingsRepository.kt

@@ -53,6 +53,10 @@ class SettingsRepository(context: Context) {
     private val _localShellEnabled = MutableStateFlow(prefs.getBoolean(KEY_LOCAL_SHELL_ENABLED, true))
     val localShellEnabled: StateFlow<Boolean> = _localShellEnabled.asStateFlow()
 
+    private val _herdrNotificationsEnabled =
+        MutableStateFlow(prefs.getBoolean(KEY_HERDR_NOTIFICATIONS, true))
+    val herdrNotificationsEnabled: StateFlow<Boolean> = _herdrNotificationsEnabled.asStateFlow()
+
     private val _terminalTabMode = MutableStateFlow(
         parseTabMode(prefs.getString(KEY_TAB_MODE, TerminalTabMode.Classic.name)),
     )
@@ -131,6 +135,11 @@ class SettingsRepository(context: Context) {
         _localShellEnabled.value = enabled
     }
 
+    fun setHerdrNotificationsEnabled(enabled: Boolean) {
+        prefs.edit().putBoolean(KEY_HERDR_NOTIFICATIONS, enabled).apply()
+        _herdrNotificationsEnabled.value = enabled
+    }
+
     fun setThemeMode(mode: ThemeMode) {
         prefs.edit().putString(KEY_THEME_MODE, mode.name).apply()
         _themeMode.value = mode
@@ -193,6 +202,7 @@ class SettingsRepository(context: Context) {
         private const val KEY_APP_LOCK_ENABLED = "app_lock_enabled"
         private const val KEY_REQUIRE_AUTH_ON_CONNECT = "require_auth_on_connect"
         private const val KEY_LOCAL_SHELL_ENABLED = "local_shell_enabled"
+        private const val KEY_HERDR_NOTIFICATIONS = "herdr_notifications_enabled"
         private const val KEY_THEME_MODE = "theme_mode"
         private const val KEY_LIGHT_THEME = "light_theme_name"
         private const val KEY_TERMINAL_FONT_SIZE = "terminal_font_size_sp"

android/app/src/main/java/com/jossephus/chuchu/model/HostProfile.kt

@@ -25,4 +25,6 @@ data class HostProfile(
     val postConnectCommand: String? = null,
     @ColumnInfo(defaultValue = "NULL")
     val multiplexer: MultiplexerType? = null,
+    @ColumnInfo(defaultValue = "1")
+    val herdrNativeMode: Boolean = true,
 )

android/app/src/main/java/com/jossephus/chuchu/model/MultiplexerType.kt

@@ -8,6 +8,7 @@ enum class MultiplexerType(
     Tmux("tmux", "tmux", true),
     Zellij("zellij", "zellij", false),
     Zmx("zmx", "zmx", true),
+    Herdr("herdr", "herdr", true),
     ;
 
     companion object {

android/app/src/main/java/com/jossephus/chuchu/service/backup/ChuchuBackupCodec.kt

@@ -11,7 +11,7 @@ import com.jossephus.chuchu.model.Transport
 
 object ChuchuBackupCodec {
     const val FORMAT_VERSION: Int = 1
-    const val PAYLOAD_VERSION: Int = 2
+    const val PAYLOAD_VERSION: Int = 3
     const val KDF_ID_PBKDF2_HMAC_SHA1: Int = 1
     const val CIPHER_ID_AES_256_GCM: Int = 1
     const val KDF_ITERATIONS: Int = 210_000
@@ -102,6 +102,7 @@ object ChuchuBackupCodec {
             writer.writeBoolean(host.requireAuthOnConnect)
             writeNullableStringField(host.postConnectCommand, "post-connect command")
             writeNullableStringField(host.multiplexer?.id, "multiplexer")
+            writer.writeBoolean(host.herdrNativeMode)
         }
 
         val encoded = writer.toByteArray()
@@ -173,6 +174,7 @@ object ChuchuBackupCodec {
                 } else {
                     null
                 }
+                val herdrNativeMode = if (version >= 3) reader.readBoolean() else true
                 if (transport != Transport.LocalShell) {
                     add(
                         BackupHostProfile(
@@ -189,6 +191,7 @@ object ChuchuBackupCodec {
                             requireAuthOnConnect = requireAuthOnConnect,
                             postConnectCommand = postConnectCommand,
                             multiplexer = multiplexer,
+                            herdrNativeMode = herdrNativeMode,
                         ),
                     )
                 }