chore: merge develop into work/companion

# Conflicts:
#	crates/tui/src/app.rs
This commit is contained in:
2026-08-21 07:18:07 +09:00
61 changed files with 7110 additions and 523 deletions
+8 -2
View File
@@ -1432,7 +1432,10 @@ impl Runtime {
context_tokens: 0,
},
status: protocol::WorkerStatus::Idle,
in_flight: protocol::InFlightSnapshot { blocks: Vec::new() },
in_flight: protocol::InFlightSnapshot {
blocks: Vec::new(),
commands: Vec::new(),
},
internal_workers: Vec::new(),
})
}
@@ -4088,7 +4091,10 @@ mod tests {
context_tokens: 64,
},
status: protocol::WorkerStatus::Running,
in_flight: protocol::InFlightSnapshot { blocks: Vec::new() },
in_flight: protocol::InFlightSnapshot {
blocks: Vec::new(),
commands: Vec::new(),
},
internal_workers: Vec::new(),
},
);