Keep a subagent's words in its own transcript, and count the ones already running
Two corrections to the previous commit. A subagent's closing report belongs in the subagent's transcript, which is where it already is; drawing it as a card in the parent's put the same paragraph in two places for a reader who did not ask for it. The row is a divider now -- a boundary, which is what the transcript actually needed there -- closed, saying only what reported and how it went. Opening it shows the report anyway, since leaving the conversation to read one line has its own cost, and a backgrounded command has no transcript of its own so this is the only place its report exists at all: that one names itself from its summary and has nothing left to open. `TranscriptDivider` grew a `trailing` slot for the chevron rather than the row growing its own copy of the rules. And the status was wrong for a session that was already running before the update, which is every session when the backend is replaced under it. Adoption picks a session's stdout back up from a recorded offset, so the `task_started` lines for subagents launched earlier are behind it and the translator never saw them -- it started with an empty set and reported `idle` with a subagent plainly still working. `Subagents::any_open` reads the directory instead, which is a measurement rather than bookkeeping and is right for a session this process did not start. Both sources are kept and neither subsumes the other: the translator's own set is the only thing that knows about a backgrounded *command*, which has no subagent to be found. The same pair decides whether an ending has already been reported, so a task that began before the restart still gets its divider. Echo's helpers now record their report as their own subagent's closing text, the way the real driver does, so the fixture has the shape being tested. Verified on the emulator: three dividers closed, one opened to its report, and each reply drawn as its own message. 170 server tests, ktfmt, clippy, rustfmt, Android lint and the JVM unit tests all clean. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
5711c2568a
commit
ef1aad8776
11 files changed
+342
-120
No files matched your search
@@ -280,6 +280,35 @@ impl Subagents {
|
||||
.filter(|title| !title.is_empty())
|
||||
}
|
||||
|
||||
/// Whether the subagent named `id` exists and has not finished. `false`
|
||||
/// for an id that is not a subagent's at all -- a backgrounded command's
|
||||
/// tool call reaches here with the same shape.
|
||||
pub fn is_open(&self, id: &str) -> bool {
|
||||
self.get(id).is_some_and(|subagent| subagent.is_open())
|
||||
}
|
||||
|
||||
/// Whether this session has any subagent still working, read from the
|
||||
/// directory rather than from what this process has seen.
|
||||
///
|
||||
/// That is the whole point of it. A backend restart adopts a session's
|
||||
/// process and picks its stdout back up from a recorded offset, so the
|
||||
/// `task_started` lines for subagents launched before the restart are
|
||||
/// already behind that offset and the translator never sees them -- it
|
||||
/// starts with an empty set and reports the session `Idle` at the end of
|
||||
/// a turn it should have called [`SessionStatus::Waiting`]. Asking the
|
||||
/// registry is a measurement instead of bookkeeping, so it is right for
|
||||
/// a session this process did not start.
|
||||
///
|
||||
/// Measured rather than cached because the wrong answer has to be able
|
||||
/// to correct itself: a subagent left `Running` by a previous run is
|
||||
/// finished by the session's own exit (see `finish_all`), and the next
|
||||
/// turn to end then reads the truth.
|
||||
pub fn any_open(&self, session_running: bool) -> bool {
|
||||
self.list(session_running)
|
||||
.iter()
|
||||
.any(|info| info.status == SessionStatus::Running)
|
||||
}
|
||||
|
||||
/// Appends one event to a subagent's own transcript. A no-op, with a
|
||||
/// debug log, for an id nothing was started under -- a child line for a
|
||||
/// subagent this registry never opened is dropped rather than guessed
|
||||
|
||||
Reference in new issue
Block a user