Route interactive Git through native terminal sessions

Remove Kotlin interactive-add emulation and run patch add via the native Git runtime with PTY-backed session IO.

app/src/main/java/solutions/tretter/githugandroid/RepoStateSaver.kt

@@ -7,7 +7,16 @@ val RepoStateSaver = listSaver<RepoState, Any>(
         listOf(
             state.initialized,
             state.headBranch,
-            state.files.flatMap { listOf(it.name, it.content, it.staged.toString(), it.tracked.toString(), it.deleted.toString()) },
+            state.files.flatMap {
+                listOf(
+                    it.name,
+                    it.content,
+                    it.staged.toString(),
+                    it.tracked.toString(),
+                    it.deleted.toString(),
+                    it.stagedContent.orEmpty(),
+                )
+            },
             state.commits.flatMap {
                 listOf(
                     it.id,
@@ -28,14 +37,8 @@ val RepoStateSaver = listSaver<RepoState, Any>(
             state.submodules.flatMap { listOf(it.key, it.value) },
             state.maintenanceActions.toList(),
             state.fetchHeadCount,
-            state.interactiveAddSession?.let {
-                listOf(
-                    it.target.orEmpty(),
-                    it.awaitingUpdateSelection.toString(),
-                    it.selectionPrompt,
-                    it.selectionAction,
-                )
-            }.orEmpty(),
+            emptyList<Any>(),
+            emptyList<Any>(),
         )
     },
     restore = { saved ->
@@ -54,17 +57,23 @@ val RepoStateSaver = listSaver<RepoState, Any>(
         val submoduleParts = saved.getOrNull(13) as? List<*> ?: emptyList<Any>()
         val maintenanceActions = saved.getOrNull(14) as? List<*> ?: emptyList<Any>()
         val fetchHeadCount = saved.getOrNull(15) as? Int ?: 0
-        val interactiveAddSessionParts = saved.getOrNull(16) as? List<*> ?: emptyList<Any>()
         RepoState(
             initialized = initialized,
             headBranch = headBranch,
-            files = fileParts.chunked(if (fileParts.size % 5 == 0) 5 else 4).map {
+            files = fileParts.chunked(
+                when {
+                    fileParts.size % 6 == 0 -> 6
+                    fileParts.size % 5 == 0 -> 5
+                    else -> 4
+                },
+            ).map {
                 GitFile(
                     name = it[0] as String,
                     content = it[1] as String,
                     staged = (it[2] as String).toBoolean(),
                     tracked = (it[3] as String).toBoolean(),
                     deleted = (it.getOrNull(4) as? String)?.toBoolean() ?: false,
+                    stagedContent = (it.getOrNull(5) as? String)?.takeIf { value -> value.isNotEmpty() },
                 )
             },
             commits = commitParts.restoreCommitNodes(),
@@ -80,14 +89,6 @@ val RepoStateSaver = listSaver<RepoState, Any>(
             pushedTags = pushedTags.filterIsInstance<String>().toSet(),
             submodules = submoduleParts.chunked(2).associate { (it[0] as String) to (it[1] as String) },
             maintenanceActions = maintenanceActions.filterIsInstance<String>().toSet(),
-            interactiveAddSession = interactiveAddSessionParts.takeIf { it.size >= 2 }?.let {
-                InteractiveAddSession(
-                    target = (it[0] as String).ifBlank { null },
-                    awaitingUpdateSelection = (it[1] as String).toBoolean(),
-                    selectionPrompt = it.getOrNull(2) as? String ?: "Update>>",
-                    selectionAction = it.getOrNull(3) as? String ?: "update",
-                )
-            },
         )
     }
 )