From 53cdf00b43c860b6789ea23cdffb439a195275f6 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 9 Nov 2026 18:25:33 -0500 Subject: [PATCH] feat(agent): continue the conversation after a Lab build restarts the app --- .../com/droiddeck/launcher/agent/AgentHost.kt | 21 ++++++++++++++++++- app/src/main/res/values/strings.xml | 1 + .../droiddeck/launcher/agent/AgentHostTest.kt | 6 ++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index f21d9795a..d53a8d343 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -10,6 +10,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue +import com.droiddeck.launcher.R import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.SessionPrefs import org.json.JSONObject @@ -66,9 +67,26 @@ object AgentHost { if (!loaded) { loaded = true entries.addAll(readTranscript(transcript(context))) + resumeAfterRestart(context.applicationContext) } } + /** + * A Lab build restarts the app, which ends the agent's process mid-turn. dd-lab-build leaves + * [RESUME] when the app's own agent ran it, so the same conversation picks up on the new build. + */ + private fun resumeAfterRestart(app: Context) { + val marker = File(app.filesDir, RESUME) + val claimed = File(app.filesDir, "$RESUME.claimed") + if (!marker.renameTo(claimed)) return + claimed.delete() + if (!installed || !interrupted(entries)) return + send(app, app.getString(R.string.agent_resumed)) + } + + @VisibleForTesting + internal fun interrupted(entries: List) = entries.isNotEmpty() && entries.last() !is Entry.Finished + /** Switches the agent CLI; a conversation belongs to one CLI, so a new one starts. */ fun choose(context: Context, choice: AgentHarness) { if (choice == harness || state == State.WORKING) return @@ -139,7 +157,7 @@ object AgentHost { val env = listOf( "/usr/bin/env", "HOME=/root", "PATH=/root/.local/bin:/usr/local/bin:/usr/bin:/bin", "LANG=C.UTF-8", "ADB_SERIAL=${adb.serial}", "ADB_VENDOR_KEYS=${adb.vendorKeys}", - "BROWSER=/root/.local/bin/android-open", "DD_BROWSER_DISPLAY=${AgentAdb.browserDisplay}", + "DD_AGENT=1", "BROWSER=/root/.local/bin/android-open", "DD_BROWSER_DISPLAY=${AgentAdb.browserDisplay}", ) val shell = listOf( "/bin/sh", "-c", @@ -188,6 +206,7 @@ object AgentHost { private const val CONVERSATION_KEY = "session_id" private const val HARNESS_KEY = "harness" + private const val RESUME = "agent/resume" internal fun prefs(context: Context) = context.getSharedPreferences("agent", Context.MODE_PRIVATE) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9d65f45e3..47854fc09 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1149,6 +1149,7 @@ Send New conversation Stop + DroidDeck restarted on your Lab build. Continue where you left off. Ask it why a game won\'t start, to explain a log, or to change DroidDeck and try the change on this device. Stopped: %1$s Set up the agent diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt index 01e575713..185a0052d 100644 --- a/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt @@ -67,6 +67,12 @@ class AgentHostTest { assertEquals(ClaudeCode, AgentHarness.byId("gone")) } + @Test fun aTurnWithoutAnEndWasInterrupted() { + assertTrue(AgentHost.interrupted(listOf(Entry.Asked("hi"), Entry.Used("Bash", "dd-lab-build")))) + assertEquals(false, AgentHost.interrupted(listOf(Entry.Asked("hi"), Entry.Finished(null)))) + assertEquals(false, AgentHost.interrupted(emptyList())) + } + @Test fun theTranscriptSurvivesARestart() { val entries = listOf(Entry.Asked("hi"), Entry.Said("hello"), Entry.Used("Read", "/root/x"), Entry.Finished(null), Entry.Finished("stopped")) val file = Files.createTempFile("transcript", ".jsonl").toFile()