@@ -1,133 +1,230 @@
1+//! The Crux `App`: model, events, effects, update logic and view.
3+//! Streaming works like this: after a successful connect the shell opens the
4+//! `/event` SSE stream and forwards every decoded event as
5+//! [`Event::ServerEvent`]. The core parses those and mutates the chat
6+//! incrementally — creating the assistant message on `message.updated`, growing
7+//! its text on `message.part.updated`, and clearing the "generating" flag on
8+//! `session.idle`. User messages are shown optimistically the moment they're
9+//! sent, so the stream only ever *adds* assistant content.
1use base64::Engine;
11use base64::Engine;
2use crux_core::{
12use crux_core::{
4 macros::effect,
13 macros::effect,
5− render::{RenderOperation, render},
14+ render::{render, RenderOperation},
7use crux_http::command::{Http, RequestBuilder};
17use crux_http::command::{Http, RequestBuilder};
8use crux_http::protocol::HttpRequest;
18use crux_http::protocol::HttpRequest;
10use serde::{Deserialize, Serialize};
19use serde::{Deserialize, Serialize};
12−// ─── Events ────────────────────────────────────────────────────────────────
21+use crate::protocol::{self, ServerEvent, WireMessageEnvelope, WirePart};
14−#[derive(Facet, Serialize, Deserialize, Clone, Debug)]
23+/// Result of an HTTP effect handed back to the core.
15−#[repr(C)]
24+pub type HttpResult = Result<crux_http::Response<String>, crux_http::HttpError>;
17− // ── Type-generated events (sent from Shell → Core).
26+// ─── Events ──────────────────────────────────────────────────────────────────
18− // These MUST be contiguous starting at index 0 to match the
19− // generated Kotlin/Swift/TS enum indices. Do not interleave
20− // skipped variants here. ──────────────────────────────────────
22− // Lifecycle
29+ // Lifecycle / connect
24 ServerUrlChanged(String),
31 ServerUrlChanged(String),
25 UsernameChanged(String),
32 UsernameChanged(String),
26 PasswordChanged(String),
33 PasswordChanged(String),
30− // Session list
36+ // Sessions
31 LoadSessions,
37 LoadSessions,
32 SelectSession(String),
38 SelectSession(String),
33 CreateSession,
39 CreateSession,
40+ DeleteSession(String),
36 LoadMessages(String),
43 LoadMessages(String),
44+ DraftChanged(String),
37 SendMessage(String),
45 SendMessage(String),
39− // SSE event received
48+ // A raw event line from the shell's `/event` SSE subscription.
40− EventReceived(String),
49+ ServerEvent(String),
42− // Navigation
51+ // Navigation / misc
43− NavigateToChat(String),
44 NavigateToSessions,
52 NavigateToSessions,
45 NavigateToConnect,
53 NavigateToConnect,
48 DismissError,
54 DismissError,
50− // ── Internal events (skipped from typegen, sent only via then_send).
56+ // ── Internal: results of HTTP effects (never sent by the shell) ──────────
51− // These occupy higher discriminant indices that are never
57+ HealthProbed(HttpResult),
52− // produced by the shell, so the index gap is harmless. ─────────
56− SessionsLoaded(#[facet(opaque)] HttpResult<String>),
58+ SessionsLoaded(HttpResult),
59− SessionCreated(#[facet(opaque)] HttpResult<String>),
59+ SessionCreated(HttpResult),
62− MessagesLoaded(#[facet(opaque)] HttpResult<String>),
60+ MessagesLoaded(String, HttpResult),
63− #[serde(skip)]
61+ PromptSent(HttpResult),
64− #[facet(skip)]
62+ SessionDeleted(HttpResult),
65− MessageSent(#[facet(opaque)] HttpResult<String>),
63+ Aborted(HttpResult),
71− HealthProbed(#[facet(opaque)] HttpResult<String>),
74−// ─── Effects ───────────────────────────────────────────────────────────────
66+// ─── Effects ─────────────────────────────────────────────────────────────────
76−#[effect(facet_typegen)]
68+#[effect]
77#[derive(Debug)]
69#[derive(Debug)]
78pub enum Effect {
70pub enum Effect {
79 Render(RenderOperation),
71 Render(RenderOperation),
80 Http(HttpRequest),
72 Http(HttpRequest),
83−// ─── HTTP result wrapper (opaque, not type-generated) ──────────────────────
85−pub type HttpResult<T> = Result<crux_http::Response<T>, crux_http::HttpError>;
87−// ─── Model ─────────────────────────────────────────────────────────────────
75+// ─── Model ───────────────────────────────────────────────────────────────────
89#[derive(Default)]
77#[derive(Default)]
90pub struct Model {
78pub struct Model {
91 server_url: String,
79 server_url: String,
92 username: String,
80 username: String,
93 password: String,
81 password: String,
94− /// Set once the server replies 401 to an unauthenticated probe.
82+ /// The server answered 401 to an unauthenticated probe — show credentials.
95− /// The view surfaces this so the shell can show credential fields.
96 auth_required: bool,
83 auth_required: bool,
97− /// Set once a request with credentials succeeds. All subsequent
84+ /// Credentials were accepted; attach the auth header to every request.
98− /// requests carry the Authorization header.
99 authed: bool,
85 authed: bool,
100 connected: bool,
86 connected: bool,
101 loading: bool,
87 loading: bool,
102 error: Option<String>,
88 error: Option<String>,
103− sessions: Vec<SessionSummary>,
91+ sessions: Vec<SessionView>,
104 current_session_id: Option<String>,
92 current_session_id: Option<String>,
105 current_session_title: String,
93 current_session_title: String,
106− messages: Vec<MessageView>,
95+ messages: Vec<MsgState>,
107− draft_message: String,
96+ draft: String,
108− /// True between sending a message and the assistant reply arriving.
109 generating: bool,
97 generating: bool,
110− /// Accumulated crash logs (sent from the shell's uncaught-exception handler)
98+
111− crash_logs: Vec<String>,
99+ /// Monotonic counter for optimistic (client-side) user-message ids.
104+ fn message_mut(&mut self, id: &str) -> Option<&mut MsgState> {
105+ self.messages.iter_mut().find(|m| m.id == id)
108+ fn has_credentials(&self) -> bool {
109+ !self.username.is_empty() || !self.password.is_empty()
112+ fn is_current(&self, session_id: &str) -> bool {
113+ self.current_session_id.as_deref() == Some(session_id)
117+/// Internal per-message state. Parts are tracked by id so streaming updates can
118+/// upsert them; the [`MessageView`] handed to the shell is derived from these.
123+ status: MessageStatus,
125+ text_parts: Vec<(String, String)>,
126+ reasoning_parts: Vec<(String, String)>,
127+ tool_parts: Vec<(String, ToolView)>,
131+ fn new(id: String, role: String, time: u64) -> Self {
136+ status: MessageStatus::Sent,
138+ text_parts: Vec::new(),
139+ reasoning_parts: Vec::new(),
140+ tool_parts: Vec::new(),
144+ fn upsert_part(parts: &mut Vec<(String, String)>, id: &str, text: String) {
145+ if let Some(slot) = parts.iter_mut().find(|(pid, _)| pid == id) {
148+ parts.push((id.to_string(), text));
152+ fn upsert_tool(&mut self, id: &str, view: ToolView) {
153+ if let Some(slot) = self.tool_parts.iter_mut().find(|(pid, _)| pid == id) {
156+ self.tool_parts.push((id.to_string(), view));
160+ fn remove_part(&mut self, part_id: &str) {
161+ self.text_parts.retain(|(pid, _)| pid != part_id);
162+ self.reasoning_parts.retain(|(pid, _)| pid != part_id);
163+ self.tool_parts.retain(|(pid, _)| pid != part_id);
166+ fn to_view(&self) -> MessageView {
167+ let join = |parts: &[(String, String)]| {
168+ parts.iter().map(|(_, t)| t.as_str()).collect::<String>()
170+ let reasoning = join(&self.reasoning_parts);
172+ id: self.id.clone(),
173+ role: self.role.clone(),
174+ text: join(&self.text_parts),
175+ reasoning: (!reasoning.is_empty()).then_some(reasoning),
176+ tools: self.tool_parts.iter().map(|(_, t)| t.clone()).collect(),
178+ status: self.status.clone(),
179+ streaming: self.streaming,
184+// ─── View model ──────────────────────────────────────────────────────────────
186+#[derive(Serialize, Deserialize, Clone, Debug, Default, PartialEq, Eq)]
114−#[derive(Clone, Debug, Default)]
194+#[derive(Serialize, Deserialize, Clone, Debug, Default)]
115−pub struct SessionSummary {
195+pub struct SessionView {
116 pub id: String,
196 pub id: String,
117 pub title: String,
197 pub title: String,
200+#[derive(Serialize, Deserialize, Clone, Debug, Default, PartialEq, Eq)]
201+pub enum MessageStatus {
208+#[derive(Serialize, Deserialize, Clone, Debug, Default)]
209+pub struct ToolView {
212+ pub title: Option<String>,
120−#[derive(Facet, Serialize, Deserialize, Clone, Debug, Default)]
215+#[derive(Serialize, Deserialize, Clone, Debug, Default)]
121pub struct MessageView {
216pub struct MessageView {
122 pub id: String,
217 pub id: String,
123 pub role: String,
218 pub role: String,
124 pub text: String,
219 pub text: String,
220+ pub reasoning: Option<String>,
221+ pub tools: Vec<ToolView>,
125 pub time: u64,
222 pub time: u64,
223+ pub status: MessageStatus,
224+ pub streaming: bool,
128−// ─── ViewModel ─────────────────────────────────────────────────────────────
130−#[derive(Facet, Serialize, Deserialize, Clone, Debug, Default)]
227+#[derive(Serialize, Deserialize, Clone, Debug, Default)]
131pub struct ViewModel {
228pub struct ViewModel {
132 pub screen: Screen,
229 pub screen: Screen,
133 pub server_url: String,
230 pub server_url: String,
@@ -141,63 +238,42 @@ pub struct ViewModel {
141 pub current_session_id: Option<String>,
238 pub current_session_id: Option<String>,
142 pub current_session_title: String,
239 pub current_session_title: String,
143 pub messages: Vec<MessageView>,
240 pub messages: Vec<MessageView>,
144− pub draft_message: String,
241+ pub draft: String,
145− /// True while waiting for the assistant to reply after the user sends.
146 pub generating: bool,
242 pub generating: bool,
147− pub crash_log_count: u32,
148− pub latest_crash_log: Option<String>,
151−#[derive(Facet, Serialize, Deserialize, Clone, Debug, Default, PartialEq, Eq)]
160−#[derive(Facet, Serialize, Deserialize, Clone, Debug, Default)]
161−pub struct SessionView {
166−// ─── App ───────────────────────────────────────────────────────────────────
245+// ─── App ─────────────────────────────────────────────────────────────────────
168#[derive(Default)]
247#[derive(Default)]
169pub struct OpencodeApp;
248pub struct OpencodeApp;
171impl OpencodeApp {
250impl OpencodeApp {
172− /// Build a GET request to `path`, adding the Basic-Auth header when the
173− /// model has credentials. The header is always added once `authed` is true
174− /// (i.e. after the server has accepted credentials), and also during the
175− /// credential-retry attempt itself.
176 fn get(&self, model: &Model, path: &str) -> RequestBuilder<Effect, Event, String> {
251 fn get(&self, model: &Model, path: &str) -> RequestBuilder<Effect, Event, String> {
177 let url = format!("{}{path}", model.server_url);
252 let url = format!("{}{path}", model.server_url);
178− let req = Http::get(&url).expect_string();
253+ self.with_auth(Http::get(&url).expect_string(), model)
179− self.with_auth(req, model)
182− /// Build a POST request to `path` with the given body bytes.
183− fn post(&self, model: &Model, path: &str, body: Vec<u8>) -> RequestBuilder<Effect, Event, String> {
256+ fn post_json(&self, model: &Model, path: &str, body: &serde_json::Value) -> RequestBuilder<Effect, Event, String> {
184 let url = format!("{}{path}", model.server_url);
257 let url = format!("{}{path}", model.server_url);
258+ let bytes = serde_json::to_vec(body).unwrap_or_default();
185− let req = Http::post(&url).expect_string().body_bytes(body);
259+ let req = Http::post(&url)
261+ .header("Content-Type", "application/json")
186 self.with_auth(req, model)
263 self.with_auth(req, model)
266+ fn delete(&self, model: &Model, path: &str) -> RequestBuilder<Effect, Event, String> {
267+ let url = format!("{}{path}", model.server_url);
268+ self.with_auth(Http::delete(&url).expect_string(), model)
189− /// Attach the Basic-Auth `Authorization` header if the model carries
271+ /// Attach an RFC 7617 Basic-Auth header when the model carries credentials.
190− /// credentials. Uses RFC 7617 `Basic` scheme with base64-encoded
191− /// `username:password`.
194− req: RequestBuilder<Effect, Event, E>,
272+ fn with_auth<E>(&self, req: RequestBuilder<Effect, Event, E>, model: &Model) -> RequestBuilder<Effect, Event, E>
196− ) -> RequestBuilder<Effect, Event, E>
198 E: 'static,
274 E: 'static,
200− if !model.username.is_empty() || !model.password.is_empty() {
276+ if model.has_credentials() {
201 let creds = format!("{}:{}", model.username, model.password);
277 let creds = format!("{}:{}", model.username, model.password);
202 let encoded = base64::engine::general_purpose::STANDARD.encode(creds.as_bytes());
278 let encoded = base64::engine::general_purpose::STANDARD.encode(creds.as_bytes());
203 req.header("Authorization", format!("Basic {encoded}"))
279 req.header("Authorization", format!("Basic {encoded}"))
@@ -205,13 +281,6 @@ impl OpencodeApp {
209− /// Render helper that also stamps the crash-log summary into the view.
210− fn render_with_crashes(&self, _model: &Model) -> Command<Effect, Event> {
211− // render() is the base; the view() function reads the model directly
212− // for crash-log fields, so a plain render suffices.
217impl App for OpencodeApp {
286impl App for OpencodeApp {
@@ -222,242 +291,256 @@ impl App for OpencodeApp {
223 fn update(&self, event: Event, model: &mut Model) -> Command<Effect, Event> {
292 fn update(&self, event: Event, model: &mut Model) -> Command<Effect, Event> {
224 match event {
293 match event {
294+ // ── Lifecycle / connect ─────────────────────────────────────────
225− Event::Start => {
295+ Event::Start => render(),
226− // Don't reset server_url here — the shell restores it from
296+
227− // persisted storage via ServerUrlChanged before any connect.
297+ // Store the field verbatim while typing; normalizing here would fight
228− render()
298+ // the user's edits (e.g. eat the "://" as they type it). The URL is
229− }
299+ // normalized once, on Connect.
230−
300+ // Clear any prior error as soon as the user edits a field, so a stale
301+ // message (e.g. "Invalid credentials") doesn't linger while they correct it.
231 Event::ServerUrlChanged(url) => {
302 Event::ServerUrlChanged(url) => {
232 model.server_url = url;
303 model.server_url = url;
304+ if model.error.is_some() {
236 Event::UsernameChanged(u) => {
309 Event::UsernameChanged(u) => {
237 model.username = u;
310 model.username = u;
311+ if model.error.is_some() {
241 Event::PasswordChanged(p) => {
316 Event::PasswordChanged(p) => {
242 model.password = p;
317 model.password = p;
318+ if model.error.is_some() {
246 Event::Connect => {
324 Event::Connect => {
325+ model.server_url = normalize_url(&model.server_url);
326+ if model.server_url.is_empty() {
327+ model.error = Some("Enter a server URL".to_string());
247 model.loading = true;
330 model.loading = true;
248 model.error = None;
331 model.error = None;
249− // Probe health. `with_auth` attaches credentials if present,
250− // so a retry after a 401 carries the Authorization header.
251− let req = self.get(model, "/global/health");
252− req.build().then_send(|result| Event::HealthProbed(result))
255− Event::CancelAuth => {
256 model.auth_required = false;
332 model.auth_required = false;
257− model.username.clear();
333+ render().and(self.get(model, "/global/health").build().then_send(Event::HealthProbed))
258− model.password.clear();
259− model.loading = false;
336+ Event::HealthProbed(result) => self.on_health_probed(model, result),
338+ // ── Sessions ────────────────────────────────────────────────────
263 Event::LoadSessions => {
339 Event::LoadSessions => {
264 model.loading = true;
340 model.loading = true;
265− self.get(model, "/session").build().then_send(Event::SessionsLoaded)
341+ render().and(self.get(model, "/session").build().then_send(Event::SessionsLoaded))
268 Event::SessionsLoaded(result) => {
344 Event::SessionsLoaded(result) => {
269 model.loading = false;
345 model.loading = false;
270− match result {
346+ match ok_body(result) {
271− Ok(mut response) => {
347+ Ok(body) => {
272− let body = response.take_body().unwrap_or_default();
273− model.sessions = parse_sessions(&body);
348+ model.sessions = protocol::parse_sessions(&body)
274− model.connected = true;
349+ .into_iter()
275− // Refresh the current session's title in case it was
350+ .map(|s| SessionView {
276− // populated after creation.
351+ id: s.id,
277− if let Some(id) = model.current_session_id.clone() {
352+ title: display_title(&s.title),
278− if let Some(s) = model.sessions.iter().find(|s| s.id == id) {
353+ })
279− model.current_session_title = s.title.clone();
354+ .collect();
280− }
355+ // Impose a stable alphabetical order so the list doesn't shuffle
281− }
356+ // with whatever order the server happens to return sessions in.
282− render()
357+ model.sessions.sort_by_key(|s| s.title.to_lowercase());
285− model.error = Some(format!("Failed to load sessions: {e}"));
359+ Err(e) => model.error = Some(e),
291 Event::SelectSession(id) => {
364 Event::SelectSession(id) => {
292− model.current_session_id = Some(id.clone());
293 model.current_session_title = model
365 model.current_session_title = model
294 .sessions
366 .sessions
296 .find(|s| s.id == id)
368 .find(|s| s.id == id)
297 .map(|s| s.title.clone())
369 .map(|s| s.title.clone())
298 .unwrap_or_default();
370 .unwrap_or_default();
299− Command::event(Event::NavigateToChat(id))
302− Event::NavigateToChat(id) => {
303 model.current_session_id = Some(id.clone());
371 model.current_session_id = Some(id.clone());
304− model.current_session_title = model
307− .find(|s| s.id == id)
308− .map(|s| s.title.clone())
309− .unwrap_or_default();
310 model.messages.clear();
372 model.messages.clear();
373+ model.screen = Screen::Chat;
374+ model.loading = true;
311 render().and(Command::event(Event::LoadMessages(id)))
376 render().and(Command::event(Event::LoadMessages(id)))
314− Event::NavigateToSessions => {
379+ Event::CreateSession => {
315− model.current_session_id = None;
380+ model.loading = true;
316− model.current_session_title.clear();
317− model.messages.clear();
318− model.generating = false;
319− render()
381+ render().and(
382+ self.post_json(model, "/session", &serde_json::json!({}))
384+ .then_send(Event::SessionCreated),
322− Event::NavigateToConnect => {
388+ Event::SessionCreated(result) => {
323− // Return to the connect screen to switch servers / credentials.
324− // Keep the sessions list so a re-connect can refresh in place.
325− model.current_session_id = None;
326− model.current_session_title.clear();
327− model.messages.clear();
328− model.generating = false;
329− model.connected = false;
330− model.auth_required = false;
331 model.loading = false;
389 model.loading = false;
390+ match ok_body(result) {
392+ if let Some(s) = protocol::parse_session(&body) {
393+ let view = SessionView {
395+ title: display_title(&s.title),
397+ if !model.sessions.iter().any(|e| e.id == view.id) {
398+ model.sessions.insert(0, view);
400+ return render().and(Command::event(Event::SelectSession(s.id)));
402+ model.error = Some("Malformed session response".to_string());
404+ Err(e) => model.error = Some(e),
335− Event::CreateSession => {
409+ Event::DeleteSession(id) => {
336− model.loading = true;
410+ model.sessions.retain(|s| s.id != id);
337− self.post(model, "/session", Vec::new())
411+ let mut cmd = self.delete(model, &format!("/session/{id}")).build().then_send(Event::SessionDeleted);
338− .build()
412+ if model.is_current(&id) {
339− .then_send(Event::SessionCreated)
413+ model.current_session_id = None;
414+ model.messages.clear();
415+ model.screen = Screen::Sessions;
417+ cmd = render().and(cmd);
342− Event::SessionCreated(result) => {
421+ Event::SessionDeleted(result) => {
343− model.loading = false;
422+ if let Err(e) = ok_body(result) {
345− Ok(mut response) => {
346− let body = response.take_body().unwrap_or_default();
347− let id = parse_session_id(&body);
348− // Some servers echo the title in the created payload;
349− // fall back to "New session" if absent.
350− let title = extract_string(&body, "title")
351− .filter(|t| !t.is_empty())
352− .unwrap_or_else(|| "New session".to_string());
353− model.current_session_title = title.clone();
354− model.sessions.insert(
356− SessionSummary { id: id.clone(), title },
358− Command::event(Event::NavigateToChat(id))
361− model.error = Some(format!("Failed to create session: {e}"));
423+ model.error = Some(e);
428+ // ── Chat ────────────────────────────────────────────────────────
367 Event::LoadMessages(id) => {
429 Event::LoadMessages(id) => {
368− model.loading = true;
430+ render().and(
369− let path = format!("/session/{id}/message");
431+ self.get(model, &format!("/session/{id}/message"))
370− self.get(model, &path).build().then_send(Event::MessagesLoaded)
433+ .then_send(move |result| Event::MessagesLoaded(id.clone(), result)),
373− Event::MessagesLoaded(result) => {
437+ Event::MessagesLoaded(session_id, result) => {
438+ if !model.is_current(&session_id) {
374 model.loading = false;
441 model.loading = false;
375− model.generating = false;
376− match result {
442+ match ok_body(result) {
377− Ok(mut response) => {
443+ Ok(body) => {
378− let body = response.take_body().unwrap_or_default();
379− model.messages = parse_messages(&body);
444+ model.messages = protocol::parse_messages(&body).iter().map(message_from_wire).collect();
380− render()
445+ model.generating = model.messages.iter().any(|m| m.streaming);
383− model.error = Some(format!("Failed to load messages: {e}"));
447+ Err(e) => model.error = Some(e),
452+ Event::DraftChanged(text) => {
389 Event::SendMessage(text) => {
457 Event::SendMessage(text) => {
458+ let text = text.trim().to_string();
390 let Some(session_id) = model.current_session_id.clone() else {
459 let Some(session_id) = model.current_session_id.clone() else {
391 return render();
460 return render();
393− model.draft_message.clear();
462+ if text.is_empty() {
465+ model.local_seq += 1;
466+ let mut user = MsgState::new(format!("local-{}", model.local_seq), "user".to_string(), 0);
467+ user.status = MessageStatus::Pending;
468+ MsgState::upsert_part(&mut user.text_parts, "local", text.clone());
469+ model.messages.push(user);
470+ model.draft.clear();
394 model.generating = true;
471 model.generating = true;
395− let body = serde_json::json!({
474+ let body = serde_json::json!({ "parts": [{ "type": "text", "text": text }] });
396− "sessionID": session_id,
475+ render().and(
397− "parts": [{ "type": "text", "text": text }]
401− let path = format!("/session/{session_id}/prompt_async");
476+ self.post_json(model, &format!("/session/{session_id}/prompt_async"), &body)
402− self.post(model, &path, body)
403− .build()
477+ .build()
404− .then_send(Event::MessageSent)
478+ .then_send(Event::PromptSent),
407− Event::MessageSent(result) => {
482+ Event::PromptSent(result) => {
408− match result {
483+ match ok_body(result) {
409− Ok(_) => {
484+ Ok(_) => set_last_pending(model, MessageStatus::Sent),
410− // Reload messages to pick up the assistant reply.
411− if let Some(session_id) = model.current_session_id.clone() {
412− Command::event(Event::LoadMessages(session_id))
414− model.generating = false;
418 Err(e) => {
485 Err(e) => {
486+ set_last_pending(model, MessageStatus::Failed);
419 model.generating = false;
487 model.generating = false;
420− model.error = Some(format!("Failed to send message: {e}"));
488+ model.error = Some(e);
494+ Event::CancelGeneration => {
495+ model.generating = false;
496+ match model.current_session_id.clone() {
497+ Some(id) => render().and(
498+ self.post_json(model, &format!("/session/{id}/abort"), &serde_json::json!({}))
500+ .then_send(Event::Aborted),
426− Event::EventReceived(_data) => {
506+ Event::Aborted(_) => render(),
427− // SSE event — reload messages for the current session.
507+
428− if let Some(session_id) = model.current_session_id.clone() {
508+ // ── SSE ─────────────────────────────────────────────────────────
429− Command::event(Event::LoadMessages(session_id))
509+ Event::ServerEvent(json) => {
430− } else {
510+ if let Some(event) = protocol::parse_event(&json) {
431− render()
511+ apply_server_event(model, event);
435− Event::CrashLog(entry) => {
516+ // ── Navigation / misc ───────────────────────────────────────────
436− model.crash_logs.push(entry);
517+ Event::NavigateToSessions => {
437− self.render_with_crashes(model)
518+ model.screen = Screen::Sessions;
519+ model.current_session_id = None;
520+ model.messages.clear();
521+ model.generating = false;
522+ render().and(self.get(model, "/session").build().then_send(Event::SessionsLoaded))
525+ Event::NavigateToConnect => {
526+ model.screen = Screen::Connect;
527+ model.connected = false;
528+ model.sessions.clear();
529+ model.messages.clear();
530+ model.current_session_id = None;
440 Event::DismissError => {
534 Event::DismissError => {
441 model.error = None;
535 model.error = None;
445− // ── Internal events (not type-generated, sent via then_send) ───
446− Event::HealthProbed(result) => handle_health_probed(self, model, result),
450− fn view(&self, model: &Self::Model) -> Self::ViewModel {
541+ fn view(&self, model: &Model) -> ViewModel {
451− let screen = if model.current_session_id.is_some() {
453− } else if model.connected {
459 ViewModel {
542 ViewModel {
460− screen,
543+ screen: model.screen.clone(),
461 server_url: model.server_url.clone(),
544 server_url: model.server_url.clone(),
462 username: model.username.clone(),
545 username: model.username.clone(),
463 password: model.password.clone(),
546 password: model.password.clone(),
@@ -465,398 +548,504 @@ impl App for OpencodeApp {
465 connected: model.connected,
548 connected: model.connected,
466 loading: model.loading,
549 loading: model.loading,
467 error: model.error.clone(),
550 error: model.error.clone(),
468− sessions: model
551+ sessions: model.sessions.clone(),
471− .map(|s| SessionView {
473− title: s.title.clone(),
476 current_session_id: model.current_session_id.clone(),
552 current_session_id: model.current_session_id.clone(),
477 current_session_title: model.current_session_title.clone(),
553 current_session_title: model.current_session_title.clone(),
478− messages: model.messages.clone(),
554+ messages: model.messages.iter().map(MsgState::to_view).collect(),
479− draft_message: model.draft_message.clone(),
555+ draft: model.draft.clone(),
480 generating: model.generating,
556 generating: model.generating,
481− crash_log_count: model.crash_logs.len() as u32,
482− latest_crash_log: model.crash_logs.last().cloned(),
487−// ─── Basic-auth detection ──────────────────────────────────────────────────
561+impl OpencodeApp {
489−// The opencode server uses HTTP Basic Auth when OPENCODE_SERVER_PASSWORD is set
490−// (username defaults to "opencode"). We detect this by probing /global/health
491−// without credentials:
493−// - 200 → server is open; proceed to load sessions.
494−// - 401 → server is behind basic auth; surface `auth_required` and wait for
495−// the user to supply credentials. The user then re-issues Connect,
496−// which now attaches the Authorization header to the same probe.
497−// A 200 on that retry flips `authed` and proceeds.
498−// - Other non-2xx → surface as a connection error.
499−// - Transport error → surface as a connection error.
501−fn handle_health_probed(
504− result: HttpResult<String>,
505−) -> Command<Effect, Event> {
562+ fn on_health_probed(&self, model: &mut Model, result: HttpResult) -> Command<Effect, Event> {
506− let has_creds = !model.username.is_empty() || !model.password.is_empty();
563+ let has_creds = model.has_credentials();
507− match result {
564+ match result {
508− Ok(response) => {
565+ Ok(response) => {
509− let status = response.status().as_u16();
566+ let status = response.status().as_u16();
510− if status == 401 { model.loading = false;
568+ model.loading = false;
511− if has_creds {
569+ if has_creds {
512− // We sent credentials but the server still rejected them.
513− model.error = Some("Invalid credentials".to_string());
570+ model.error = Some("Invalid credentials".to_string());
514− } else {
571+ } else {
515− // No credentials were sent — server is behind basic auth.
516− // Surface the credential fields and wait for the user.
517− model.auth_required = true;
572+ model.auth_required = true;
521− if (200..300).contains(&status) {
576+ if (200..300).contains(&status) {
522− if has_creds {
577+ if has_creds {
523− model.authed = true;
578+ model.authed = true;
580+ model.connected = true;
581+ model.auth_required = false;
583+ model.screen = Screen::Sessions;
584+ model.loading = true;
585+ return render().and(self.get(model, "/session").build().then_send(Event::SessionsLoaded));
525− model.loading = true;
587+ model.loading = false;
527− .get(model, "/session")
529− .then_send(Event::SessionsLoaded);
531− // Other status codes — treat as connection error.
532− model.loading = false;
533− model.error = Some(format!("Server returned status {status}"));
588+ model.error = Some(format!("Server returned status {status}"));
534− render()
589+ render()
536− Err(e) => {
591+ Err(e) => {
537− model.loading = false;
592+ model.loading = false;
538− model.error = Some(format!("Connection failed: {e}"));
593+ model.error = Some(format!("Connection failed: {e}"));
539− render()
594+ render()
544−// ─── JSON parsing (minimal, avoids pulling a JSON dep into the core) ───────
600+// ─── SSE application ─────────────────────────────────────────────────────────
546−fn parse_sessions(body: &str) -> Vec<SessionSummary> {
602+fn apply_server_event(model: &mut Model, event: ServerEvent) {
547− let mut sessions = Vec::new();
603+ match event {
548− let mut depth = 0i32;
604+ // Only assistant messages are created from the stream — the user's own
549− let mut start = 0usize;
605+ // message is already shown optimistically, so ignoring the server's copy
550− for (i, ch) in body.char_indices() {
606+ // avoids a duplicate bubble.
551− match ch {
607+ ServerEvent::MessageUpdated { properties } => {
552− '{' => {
608+ let info = properties.info;
553− if depth == 0 {
609+ if info.role != "assistant" || !model.is_current(&info.session_id) {
554− start = i;
610+ return;
612+ let streaming = info.time.completed.is_none() && info.error.is_none();
613+ if let Some(msg) = model.message_mut(&info.id) {
614+ msg.streaming = streaming;
616+ msg.time = info.time.created;
556− depth += 1;
618+ } else {
619+ let mut msg = MsgState::new(info.id.clone(), "assistant".to_string(), info.time.created);
620+ msg.streaming = streaming;
621+ model.messages.push(msg);
558− '}' => {
623+ if let Some(err) = info.error {
559− depth -= 1;
624+ model.error = Some(err.message());
560− if depth == 0 {
625+ model.generating = false;
561− let obj = &body[start..=i];
626+ }
562− let id = extract_string(obj, "id").unwrap_or_default();
627+ }
563− let title = extract_string(obj, "title").unwrap_or_default();
628+
564− if !id.is_empty() {
629+ // Apply only to a message we already track (an assistant message from the
565− sessions.push(SessionSummary {
630+ // event above). Parts for unknown ids are ignored — see module docs.
566− id,
631+ ServerEvent::MessagePartUpdated { properties } => {
567− title: if title.is_empty() {
632+ let part = properties.part;
568− "Untitled".to_string()
633+ let delta = properties.delta;
569− } else {
634+ let msg_id = part.message_id().to_string();
570− title
635+ let Some(msg) = model.message_mut(&msg_id) else {
639+ WirePart::Text { id, text, synthetic, .. } => {
643+ let value = pick_text(text, &delta, &msg.text_parts, &id);
644+ MsgState::upsert_part(&mut msg.text_parts, &id, value);
646+ WirePart::Reasoning { id, text, .. } => {
647+ let value = pick_text(text, &delta, &msg.reasoning_parts, &id);
648+ MsgState::upsert_part(&mut msg.reasoning_parts, &id, value);
650+ WirePart::Tool { id, tool, state, .. } => {
651+ let sv = protocol::tool_state_view(&state);
652+ msg.upsert_tool(&id, ToolView { name: tool, status: sv.status, title: sv.title });
654+ WirePart::Other => {}
658+ ServerEvent::MessagePartRemoved { properties } => {
659+ if let Some(msg) = model.message_mut(&properties.message_id) {
660+ msg.remove_part(&properties.part_id);
664+ ServerEvent::MessageRemoved { properties } => {
665+ model.messages.retain(|m| m.id != properties.message_id);
668+ ServerEvent::SessionIdle { properties } => {
669+ if model.is_current(&properties.session_id) {
670+ model.generating = false;
671+ for m in &mut model.messages {
672+ m.streaming = false;
677+ ServerEvent::SessionError { properties } => {
678+ let scoped = properties.session_id.as_deref().map_or(true, |s| model.is_current(s));
680+ if let Some(err) = properties.error {
681+ model.error = Some(err.message());
683+ model.generating = false;
687+ ServerEvent::SessionCreated { properties } | ServerEvent::SessionUpdated { properties } => {
688+ let s = properties.info;
689+ let view = SessionView { id: s.id.clone(), title: display_title(&s.title) };
690+ if let Some(existing) = model.sessions.iter_mut().find(|e| e.id == view.id) {
691+ existing.title = view.title.clone();
693+ model.sessions.insert(0, view);
695+ if model.is_current(&s.id) {
696+ model.current_session_title = display_title(&s.title);
700+ ServerEvent::SessionDeleted { properties } => {
701+ let id = properties.session_id.or(properties.info.map(|i| i.id));
702+ if let Some(id) = id {
703+ model.sessions.retain(|s| s.id != id);
704+ if model.is_current(&id) {
705+ model.current_session_id = None;
706+ model.messages.clear();
707+ model.screen = Screen::Sessions;
712+ ServerEvent::Other => {}
582−fn parse_session_id(body: &str) -> String {
716+// ─── Helpers ─────────────────────────────────────────────────────────────────
583− extract_string(body, "id").unwrap_or_default()
717+
718+/// `part.text` is the full current text when present; otherwise fall back to
719+/// accumulating the incremental `delta` onto whatever we already have.
720+fn pick_text(text: String, delta: &Option<String>, existing: &[(String, String)], part_id: &str) -> String {
721+ if !text.is_empty() {
724+ let prior = existing.iter().find(|(pid, _)| pid == part_id).map(|(_, t)| t.clone()).unwrap_or_default();
726+ Some(d) => format!("{prior}{d}"),
586−fn parse_messages(body: &str) -> Vec<MessageView> {
731+fn message_from_wire(env: &WireMessageEnvelope) -> MsgState {
587− let mut messages = Vec::new();
732+ let info = &env.info;
588− let mut depth = 0i32;
733+ let mut msg = MsgState::new(info.id.clone(), info.role.clone(), info.time.created);
589− let mut start = 0usize;
734+ msg.streaming = info.role == "assistant" && info.time.completed.is_none() && info.error.is_none();
590− let mut i = 0usize;
735+ for part in &env.parts {
591− let bytes = body.as_bytes();
592− while i < body.len() {
593− let ch = bytes[i] as char;
594− match ch {
736+ match part {
595− '{' => {
737+ WirePart::Text { id, text, synthetic, .. } => {
596− if depth == 0 {
738+ if !synthetic {
597− start = i;
739+ MsgState::upsert_part(&mut msg.text_parts, id, text.clone());
604− let obj = &body[start..=i];
605− let id = extract_string(obj, "id").unwrap_or_default();
606− let role = extract_string(obj, "role").unwrap_or_default();
607− let time = extract_number(obj, "created").unwrap_or(0);
609− let text = extract_message_text(obj);
610− messages.push(MessageView { id, role, text, time });
614− _ => {}
742+ WirePart::Reasoning { id, text, .. } => {
743+ MsgState::upsert_part(&mut msg.reasoning_parts, id, text.clone());
745+ WirePart::Tool { id, tool, state, .. } => {
746+ let sv = protocol::tool_state_view(state);
747+ msg.upsert_tool(id, ToolView { name: tool.clone(), status: sv.status, title: sv.title });
749+ WirePart::Other => {}
621−/// Extract the text from a message part. opencode messages nest the user/assistant
755+fn set_last_pending(model: &mut Model, status: MessageStatus) {
622−/// text inside a `parts` array; we do a shallow scan for `"text":"..."` after the
756+ if let Some(msg) = model.messages.iter_mut().rev().find(|m| m.status == MessageStatus::Pending) {
623−/// first `"parts"` key.
757+ msg.status = status;
624−fn extract_message_text(obj: &str) -> String {
625− if let Some(parts_idx) = obj.find("\"parts\"") {
626− let rest = &obj[parts_idx..];
627− if let Some(text) = extract_string(rest, "text") {
631− extract_string(obj, "text").unwrap_or_default()
634−fn extract_string(json: &str, key: &str) -> Option<String> {
761+/// Trim whitespace and any trailing `/` so paths concatenate cleanly, and
635− let pattern = format!("\"{key}\"");
762+/// default to an `http://` scheme when the user didn't type one (e.g.
636− let idx = json.find(&pattern)?;
763+/// "192.168.1.10:4096") — otherwise the shell's URL parser rejects it.
637− let rest = &json[idx + pattern.len()..];
764+fn normalize_url(url: &str) -> String {
638− let colon = rest.find(':')?;
765+ let trimmed = url.trim().trim_end_matches('/');
639− let rest = &rest[colon + 1..];
766+ if trimmed.is_empty() {
640− let quote = rest.find('"')?;
767+ String::new()
641− let rest = &rest[quote + 1..];
768+ } else if trimmed.contains("://") {
642− let end = rest.find('"')?;
769+ trimmed.to_string()
643− Some(rest[..end].to_string())
770+ } else {
771+ format!("http://{trimmed}")
646−fn extract_number(json: &str, key: &str) -> Option<u64> {
775+fn display_title(title: &str) -> String {
647− let pattern = format!("\"{key}\"");
776+ let t = title.trim();
648− let idx = json.find(&pattern)?;
777+ if t.is_empty() {
649− let rest = &json[idx + pattern.len()..];
778+ "Untitled".to_string()
650− let colon = rest.find(':')?;
779+ } else {
651− let rest = &rest[colon + 1..].trim_start();
780+ t.to_string()
652− let end = rest
781+ }
653− .find(|c: char| !c.is_ascii_digit())
782+}
654− .unwrap_or(rest.len());
783+
655− rest[..end].parse().ok()
784+/// Reduce an [`HttpResult`] to `Ok(body)` for 2xx, or `Err(message)` otherwise.
785+fn ok_body(result: HttpResult) -> Result<String, String> {
787+ Ok(mut response) => {
788+ let status = response.status().as_u16();
789+ if (200..300).contains(&status) {
790+ Ok(response.take_body().unwrap_or_default())
792+ Err(format!("Server returned status {status}"))
795+ Err(e) => Err(format!("Request failed: {e}")),
658−// ─── Tests ─────────────────────────────────────────────────────────────────
799+// ─── Tests ───────────────────────────────────────────────────────────────────
660#[cfg(test)]
801#[cfg(test)]
661−mod test {
802+mod tests {
662 use super::*;
803 use super::*;
805+ fn app() -> OpencodeApp {
806+ OpencodeApp::default()
809+ /// Put the model into a connected Chat view for the given session.
810+ fn in_chat(session_id: &str) -> Model {
811+ let mut model = Model::default();
812+ model.server_url = "http://localhost:4096".to_string();
813+ model.connected = true;
814+ model.screen = Screen::Chat;
815+ model.current_session_id = Some(session_id.to_string());
819+ fn feed(app: &OpencodeApp, model: &mut Model, json: serde_json::Value) {
820+ let _ = app.update(Event::ServerEvent(json.to_string()), model);
665− fn start_does_not_reset_server_url() {
824+ fn server_url_is_kept_raw_while_typing() {
666− // Start no longer overwrites server_url — the shell restores the
667− // persisted value via ServerUrlChanged so the user's last server
668− // survives a relaunch.
669− let app = OpencodeApp;
825+ let app = app();
670 let mut model = Model::default();
826 let mut model = Model::default();
671− model.server_url = "http://10.0.0.1:4096".to_string();
827+ // Mid-scheme input must survive verbatim — normalizing per keystroke
828+ // would eat the "://" the user is typing and make the field unusable.
672− app.update(Event::Start, &mut model).expect_only_render();
829+ let _ = app.update(Event::ServerUrlChanged("http:/".into()), &mut model);
673− assert_eq!(model.server_url, "http://10.0.0.1:4096");
830+ assert_eq!(app.view(&model).server_url, "http:/");
677− fn server_url_change_updates_model() {
834+ fn connect_normalizes_scheme_less_url() {
678− let app = OpencodeApp;
835+ let app = app();
679 let mut model = Model::default();
836 let mut model = Model::default();
680− app.update(Event::Start, &mut model);
837+ // A scheme-less host (what a user often types) must gain http:// on
681− app.update(
838+ // connect, or the shell's URL parser throws and the attempt crashes.
682− Event::ServerUrlChanged("http://10.0.0.1:4096".to_string()),
839+ let _ = app.update(Event::ServerUrlChanged("192.168.1.10:4096".into()), &mut model);
683− &mut model,
840+ assert_eq!(app.view(&model).server_url, "192.168.1.10:4096");
684− )
841+ let _ = app.update(Event::Connect, &mut model);
685− .expect_only_render();
686− assert_eq!(model.server_url, "http://10.0.0.1:4096");
842+ assert_eq!(app.view(&model).server_url, "http://192.168.1.10:4096");
690− fn connect_emits_http_effect() {
846+ fn connect_trims_and_keeps_explicit_scheme() {
691− let app = OpencodeApp;
847+ let app = app();
692 let mut model = Model::default();
848 let mut model = Model::default();
693− model.server_url = "http://localhost:4096".to_string();
849+ let _ = app.update(Event::ServerUrlChanged(" https://host:4096/ ".into()), &mut model);
694− app.update(Event::Start, &mut model);
695− let mut cmd = app.update(Event::Connect, &mut model);
850+ let _ = app.update(Event::Connect, &mut model);
696− assert!(cmd.effects().any(|e| matches!(e, Effect::Http(_))));
851+ assert_eq!(app.view(&model).server_url, "https://host:4096");
697− assert!(model.loading);
701− fn parse_sessions_extracts_id_and_title() {
855+ fn connect_requires_a_url() {
702− let json = r#"[{"id":"abc123","title":"My Session"},{"id":"def456","title":"Test"}]"#;
856+ let app = app();
703− let sessions = parse_sessions(json);
857+ let mut model = Model::default();
704− assert_eq!(sessions.len(), 2);
858+ let _ = app.update(Event::Connect, &mut model);
705− assert_eq!(sessions[0].id, "abc123");
859+ assert_eq!(app.view(&model).error.as_deref(), Some("Enter a server URL"));
706− assert_eq!(sessions[0].title, "My Session");
707− assert_eq!(sessions[1].id, "def456");
711− fn parse_session_id_extracts_id() {
863+ fn sending_adds_optimistic_user_message_and_sets_generating() {
712− let json = r#"{"id":"xyz789","title":"New"}"#;
864+ let app = app();
713− let id = parse_session_id(json);
865+ let mut model = in_chat("ses_1");
714− assert_eq!(id, "xyz789");
866+ let _ = app.update(Event::DraftChanged("hello there".into()), &mut model);
867+ let _ = app.update(Event::SendMessage("hello there".into()), &mut model);
869+ let view = app.view(&model);
870+ assert!(view.generating);
871+ assert!(view.draft.is_empty());
872+ assert_eq!(view.messages.len(), 1);
873+ assert_eq!(view.messages[0].role, "user");
874+ assert_eq!(view.messages[0].text, "hello there");
875+ assert_eq!(view.messages[0].status, MessageStatus::Pending);
718− fn extract_string_finds_nested_keys() {
879+ fn empty_send_is_ignored() {
719− let json = r#"{"a":"b","id":"target","c":"d"}"#;
880+ let app = app();
720− assert_eq!(extract_string(json, "id"), Some("target".to_string()));
881+ let mut model = in_chat("ses_1");
721− assert_eq!(extract_string(json, "missing"), None);
882+ let _ = app.update(Event::SendMessage(" ".into()), &mut model);
883+ assert!(app.view(&model).messages.is_empty());
884+ assert!(!app.view(&model).generating);
725− fn extract_number_parses_values() {
888+ fn assistant_reply_streams_in_from_sse() {
726− let json = r#"{"created":1234567890}"#;
889+ let app = app();
727− assert_eq!(extract_number(json, "created"), Some(1234567890));
890+ let mut model = in_chat("ses_1");
892+ // Assistant message shell arrives first.
893+ feed(&app, &mut model, serde_json::json!({
894+ "type": "message.updated",
895+ "properties": { "info": {
896+ "id": "msg_a", "role": "assistant", "sessionID": "ses_1",
897+ "time": { "created": 100 }
900+ assert_eq!(app.view(&model).messages.len(), 1);
901+ assert!(app.view(&model).messages[0].streaming);
903+ // Two text deltas for the same part accumulate into full text.
904+ feed(&app, &mut model, serde_json::json!({
905+ "type": "message.part.updated",
906+ "properties": { "part": {
907+ "id": "prt_1", "messageID": "msg_a", "sessionID": "ses_1",
908+ "type": "text", "text": "Hello"
911+ feed(&app, &mut model, serde_json::json!({
912+ "type": "message.part.updated",
913+ "properties": { "part": {
914+ "id": "prt_1", "messageID": "msg_a", "sessionID": "ses_1",
915+ "type": "text", "text": "Hello, world"
919+ let view = app.view(&model);
920+ assert_eq!(view.messages[0].role, "assistant");
921+ assert_eq!(view.messages[0].text, "Hello, world");
731− fn navigate_to_sessions_clears_state() {
925+ fn text_delta_accumulates_when_full_text_absent() {
732− let app = OpencodeApp;
926+ let app = app();
733− let mut model = Model::default();
927+ let mut model = in_chat("ses_1");
734− model.current_session_id = Some("test".to_string());
928+ feed(&app, &mut model, serde_json::json!({
735− model.current_session_title = "Test".to_string();
929+ "type": "message.updated",
736− model.generating = true;
930+ "properties": { "info": { "id": "msg_a", "role": "assistant", "sessionID": "ses_1", "time": {"created": 1}}}
737− model.messages.push(MessageView {
931+ }));
738− id: "m1".to_string(),
932+ for delta in ["Wor", "ld"] {
739− role: "user".to_string(),
933+ feed(&app, &mut model, serde_json::json!({
740− text: "hello".to_string(),
934+ "type": "message.part.updated",
741− time: 0,
935+ "properties": {
742− });
936+ "part": { "id": "p", "messageID": "msg_a", "sessionID": "ses_1", "type": "text", "text": "" },
743− app.update(Event::NavigateToSessions, &mut model);
937+ "delta": delta
744− assert!(model.current_session_id.is_none());
938+ }
745− assert!(model.current_session_title.is_empty());
939+ }));
746− assert!(model.messages.is_empty());
940+ }
747− assert!(!model.generating);
941+ assert_eq!(app.view(&model).messages[0].text, "World");
751− fn select_session_records_title_from_sessions_list() {
945+ fn user_message_from_sse_is_not_duplicated() {
752− let app = OpencodeApp;
946+ let app = app();
753− let mut model = Model::default();
947+ let mut model = in_chat("ses_1");
754− model.sessions = vec![
755− SessionSummary { id: "s1".to_string(), title: "First".to_string() },
756− SessionSummary { id: "s2".to_string(), title: "Second".to_string() },
758− app.update(Event::SelectSession("s2".to_string()), &mut model);
948+ let _ = app.update(Event::SendMessage("hi".into()), &mut model);
759− assert_eq!(model.current_session_id.as_deref(), Some("s2"));
949+ // Server echoes the user message on the stream — must be ignored.
760− assert_eq!(model.current_session_title, "Second");
950+ feed(&app, &mut model, serde_json::json!({
951+ "type": "message.updated",
952+ "properties": { "info": { "id": "msg_user", "role": "user", "sessionID": "ses_1", "time": {"created": 5}}}
761− let view = app.view(&model);
954+ let users = app.view(&model).messages.iter().filter(|m| m.role == "user").count();
762− assert_eq!(view.current_session_title, "Second");
955+ assert_eq!(users, 1);
766− fn send_message_sets_generating_until_messages_loaded() {
959+ fn session_idle_clears_generating() {
767− let app = OpencodeApp;
960+ let app = app();
768− let mut model = Model::default();
961+ let mut model = in_chat("ses_1");
769− model.server_url = "http://localhost:4096".to_string();
770− model.current_session_id = Some("s1".to_string());
771− app.update(Event::SendMessage("hello".to_string()), &mut model);
962+ let _ = app.update(Event::SendMessage("hi".into()), &mut model);
772− assert!(model.generating);
963+ assert!(app.view(&model).generating);
773− // Simulate the MessagesLoaded internal event clearing it.
964+ feed(&app, &mut model, serde_json::json!({
774− let ok_resp = crux_http::testing::ResponseBuilder::ok().body("[]".to_string()).build();
965+ "type": "session.idle", "properties": { "sessionID": "ses_1" }
775− let result: HttpResult<String> = Ok(ok_resp);
966+ }));
776− app.update(Event::MessagesLoaded(result), &mut model);
777− assert!(!model.generating);
967+ assert!(!app.view(&model).generating);
781− fn failed_send_clears_generating() {
971+ fn idle_for_other_session_is_ignored() {
782− let app = OpencodeApp;
972+ let app = app();
783− let mut model = Model::default();
973+ let mut model = in_chat("ses_1");
784− model.server_url = "http://localhost:4096".to_string();
785− model.current_session_id = Some("s1".to_string());
786− app.update(Event::SendMessage("hello".to_string()), &mut model);
974+ let _ = app.update(Event::SendMessage("hi".into()), &mut model);
787− assert!(model.generating);
975+ feed(&app, &mut model, serde_json::json!({
788− let err = crux_http::HttpError::Io("boom".to_string());
976+ "type": "session.idle", "properties": { "sessionID": "ses_other" }
789− app.update(Event::MessageSent(Err(err)), &mut model);
977+ }));
790− assert!(!model.generating);
978+ assert!(app.view(&model).generating);
791− assert!(model.error.is_some());
795− fn auth_header_built_from_credentials() {
982+ fn reasoning_and_tool_parts_are_surfaced() {
796− let app = OpencodeApp;
983+ let app = app();
797− let mut model = Model::default();
984+ let mut model = in_chat("ses_1");
798− model.server_url = "http://localhost:4096".to_string();
985+ feed(&app, &mut model, serde_json::json!({
799− model.username = "opencode".to_string();
986+ "type": "message.updated",
800− model.password = "secret".to_string();
987+ "properties": { "info": { "id": "m", "role": "assistant", "sessionID": "ses_1", "time": {"created": 1}}}
801− // Verify the base64 encoding matches RFC 7617.
988+ }));
802− let creds = format!("{}:{}", model.username, model.password);
989+ feed(&app, &mut model, serde_json::json!({
803− let encoded = base64::engine::general_purpose::STANDARD.encode(creds.as_bytes());
990+ "type": "message.part.updated",
804− assert_eq!(encoded, "b3BlbmNvZGU6c2VjcmV0");
991+ "properties": { "part": { "id": "r", "messageID": "m", "type": "reasoning", "text": "thinking..." }}
805− // Building a request should not panic.
992+ }));
806− let _ = app.get(&model, "/global/health");
993+ feed(&app, &mut model, serde_json::json!({
994+ "type": "message.part.updated",
995+ "properties": { "part": {
996+ "id": "t", "messageID": "m", "type": "tool", "tool": "bash",
997+ "state": { "status": "completed", "title": "ls -la" }
1000+ let msg = &app.view(&model).messages[0];
1001+ assert_eq!(msg.reasoning.as_deref(), Some("thinking..."));
1002+ assert_eq!(msg.tools.len(), 1);
1003+ assert_eq!(msg.tools[0].name, "bash");
1004+ assert_eq!(msg.tools[0].status, "completed");
1005+ assert_eq!(msg.tools[0].title.as_deref(), Some("ls -la"));
810− fn crash_log_event_accumulates() {
1009+ fn session_created_event_updates_list() {
811− let app = OpencodeApp;
1010+ let app = app();
812− let mut model = Model::default();
1011+ let mut model = in_chat("ses_1");
813− app.update(Event::CrashLog("boom".to_string()), &mut model);
1012+ feed(&app, &mut model, serde_json::json!({
814− assert_eq!(model.crash_logs.len(), 1);
1013+ "type": "session.created",
815− let view = app.view(&model);
1014+ "properties": { "info": { "id": "ses_new", "title": "Fresh" }}
816− assert_eq!(view.crash_log_count, 1);
1015+ }));
817− assert_eq!(view.latest_crash_log.as_deref(), Some("boom"));
1016+ assert!(app.view(&model).sessions.iter().any(|s| s.id == "ses_new" && s.title == "Fresh"));
820− /// Verify that the bincode discriminant indices the shell sends match
821− /// the Rust enum variant positions — the type generator skips
822− /// `#[facet(skip)]` variants and renumbers the remaining ones, so the
823− /// shell's index 7 (SelectSession) must land on Rust's SelectSession,
824− /// not on a skipped variant.
826− fn event_discriminants_match_generated_indices() {
1020+ fn unknown_event_types_are_ignored() {
827− // The generated Kotlin Event enum (see generated/.../Core.kt) maps:
1021+ let app = app();
828− // 0=Start, 1=ServerUrlChanged, 2=UsernameChanged, 3=PasswordChanged,
1022+ let mut model = in_chat("ses_1");
829− // 4=Connect, 5=CancelAuth, 6=LoadSessions, 7=SelectSession,
1023+ feed(&app, &mut model, serde_json::json!({
830− // 8=CreateSession, 9=LoadMessages, 10=SendMessage, 11=EventReceived,
1024+ "type": "pty.created", "properties": { "whatever": true }
831− // 12=NavigateToChat, 13=NavigateToSessions, 14=NavigateToConnect,
1025+ }));
832− // 15=DismissError
1026+ feed(&app, &mut model, serde_json::json!({ "type": "totally.new.event" }));
833− //
1027+ // No panic, no state change.
834− // Serialize each Rust variant and check the leading u32 index.
1028+ assert!(app.view(&model).messages.is_empty());
835− let cases: &[(Event, u32)] = &[
1029+ }
836− (Event::Start, 0),
1030+
837− (Event::ServerUrlChanged(String::new()), 1),
1031+ #[test]
838− (Event::UsernameChanged(String::new()), 2),
1032+ fn messages_loaded_parses_info_and_parts() {
839− (Event::PasswordChanged(String::new()), 3),
1033+ let app = app();
840− (Event::Connect, 4),
1034+ let mut model = in_chat("ses_1");
841− (Event::CancelAuth, 5),
1035+ let body = serde_json::json!([
842− (Event::LoadSessions, 6),
1036+ { "info": { "id": "m1", "role": "user", "sessionID": "ses_1", "time": {"created": 1} },
843− (Event::SelectSession(String::new()), 7),
1037+ "parts": [{ "id": "p1", "type": "text", "text": "Question?" }] },
844− (Event::CreateSession, 8),
1038+ { "info": { "id": "m2", "role": "assistant", "sessionID": "ses_1", "time": {"created": 2, "completed": 3} },
845− (Event::LoadMessages(String::new()), 9),
1039+ "parts": [{ "id": "p2", "type": "text", "text": "Answer." }] }
846− (Event::SendMessage(String::new()), 10),
1040+ ]).to_string();
847− (Event::EventReceived(String::new()), 11),
1041+ let result: HttpResult = Ok(crux_http::testing::ResponseBuilder::ok().body(body).build());
848− (Event::NavigateToChat(String::new()), 12),
1042+ let _ = app.update(Event::MessagesLoaded("ses_1".into(), result), &mut model);
849− (Event::NavigateToSessions, 13),
1043+
850− (Event::NavigateToConnect, 14),
1044+ let view = app.view(&model);
851− (Event::DismissError, 15),
1045+ assert_eq!(view.messages.len(), 2);
852− ];
1046+ assert_eq!(view.messages[0].text, "Question?");
853− for (event, expected) in cases {
854− let bytes = bincode::serialize(event).unwrap();
855− let idx = u32::from_le_bytes(bytes[0..4].try_into().unwrap());
856− assert_eq!(
1047+ assert_eq!(view.messages[1].text, "Answer.");
857− idx, *expected,
1048+ assert!(!view.messages[1].streaming);
858− "Event discriminant mismatch for {event:?}: got {idx}, expected {expected}"
1049+ assert!(!view.generating);