@@ -1,230 +1,133 @@
1−//! The Crux `App`: model, events, effects, update logic and view.
2−//!
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.
10−
111use base64::Engine;
122use crux_core::{
13− macros::effect,
14− render::{render, RenderOperation},
153 App, Command,
4+ macros::effect,
5+ render::{RenderOperation, render},
166};
177use crux_http::command::{Http, RequestBuilder};
188use crux_http::protocol::HttpRequest;
9+use facet::Facet;
1910use serde::{Deserialize, Serialize};
2011
21−use crate::protocol::{self, ServerEvent, WireMessageEnvelope, WirePart};
22−
23−/// Result of an HTTP effect handed back to the core.
24−pub type HttpResult = Result<crux_http::Response<String>, crux_http::HttpError>;
25−
26−// ─── Events ──────────────────────────────────────────────────────────────────
12+// ─── Events ────────────────────────────────────────────────────────────────
2713
14+#[derive(Facet, Serialize, Deserialize, Clone, Debug)]
15+#[repr(C)]
2816pub enum Event {
29− // Lifecycle / connect
17+ // ── Type-generated events (sent from Shell → Core).
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. ──────────────────────────────────────
21+
22+ // Lifecycle
3023 Start,
3124 ServerUrlChanged(String),
3225 UsernameChanged(String),
3326 PasswordChanged(String),
3427 Connect,
28+ CancelAuth,
3529
36− // Sessions
30+ // Session list
3731 LoadSessions,
3832 SelectSession(String),
3933 CreateSession,
40− DeleteSession(String),
4134
4235 // Chat
4336 LoadMessages(String),
44− DraftChanged(String),
4537 SendMessage(String),
46− CancelGeneration,
4738
48− // A raw event line from the shell's `/event` SSE subscription.
49− ServerEvent(String),
39+ // SSE event received
40+ EventReceived(String),
5041
51− // Navigation / misc
42+ // Navigation
43+ NavigateToChat(String),
5244 NavigateToSessions,
5345 NavigateToConnect,
46+
47+ // Errors
5448 DismissError,
5549
56− // ── Internal: results of HTTP effects (never sent by the shell) ──────────
57− HealthProbed(HttpResult),
58− SessionsLoaded(HttpResult),
59− SessionCreated(HttpResult),
60− MessagesLoaded(String, HttpResult),
61− PromptSent(HttpResult),
62− SessionDeleted(HttpResult),
63− Aborted(HttpResult),
50+ // ── Internal events (skipped from typegen, sent only via then_send).
51+ // These occupy higher discriminant indices that are never
52+ // produced by the shell, so the index gap is harmless. ─────────
53+
54+ #[serde(skip)]
55+ #[facet(skip)]
56+ SessionsLoaded(#[facet(opaque)] HttpResult<String>),
57+ #[serde(skip)]
58+ #[facet(skip)]
59+ SessionCreated(#[facet(opaque)] HttpResult<String>),
60+ #[serde(skip)]
61+ #[facet(skip)]
62+ MessagesLoaded(#[facet(opaque)] HttpResult<String>),
63+ #[serde(skip)]
64+ #[facet(skip)]
65+ MessageSent(#[facet(opaque)] HttpResult<String>),
66+ #[serde(skip)]
67+ #[facet(skip)]
68+ CrashLog(String),
69+ #[serde(skip)]
70+ #[facet(skip)]
71+ HealthProbed(#[facet(opaque)] HttpResult<String>),
6472}
6573
66−// ─── Effects ─────────────────────────────────────────────────────────────────
74+// ─── Effects ───────────────────────────────────────────────────────────────
6775
68−#[effect]
76+#[effect(facet_typegen)]
6977#[derive(Debug)]
7078pub enum Effect {
7179 Render(RenderOperation),
7280 Http(HttpRequest),
7381}
7482
75−// ─── Model ───────────────────────────────────────────────────────────────────
83+// ─── HTTP result wrapper (opaque, not type-generated) ──────────────────────
84+
85+pub type HttpResult<T> = Result<crux_http::Response<T>, crux_http::HttpError>;
86+
87+// ─── Model ─────────────────────────────────────────────────────────────────
7688
7789#[derive(Default)]
7890pub struct Model {
7991 server_url: String,
8092 username: String,
8193 password: String,
82− /// The server answered 401 to an unauthenticated probe — show credentials.
94+ /// Set once the server replies 401 to an unauthenticated probe.
95+ /// The view surfaces this so the shell can show credential fields.
8396 auth_required: bool,
84− /// Credentials were accepted; attach the auth header to every request.
97+ /// Set once a request with credentials succeeds. All subsequent
98+ /// requests carry the Authorization header.
8599 authed: bool,
86100 connected: bool,
87101 loading: bool,
88102 error: Option<String>,
89− screen: Screen,
90−
91− sessions: Vec<SessionView>,
103+ sessions: Vec<SessionSummary>,
92104 current_session_id: Option<String>,
93105 current_session_title: String,
94−
95− messages: Vec<MsgState>,
96− draft: String,
106+ messages: Vec<MessageView>,
107+ draft_message: String,
108+ /// True between sending a message and the assistant reply arriving.
97109 generating: bool,
98−
99− /// Monotonic counter for optimistic (client-side) user-message ids.
100− local_seq: u64,
101−}
102−
103−impl Model {
104− fn message_mut(&mut self, id: &str) -> Option<&mut MsgState> {
105− self.messages.iter_mut().find(|m| m.id == id)
106− }
107−
108− fn has_credentials(&self) -> bool {
109− !self.username.is_empty() || !self.password.is_empty()
110− }
111−
112− fn is_current(&self, session_id: &str) -> bool {
113− self.current_session_id.as_deref() == Some(session_id)
114− }
115−}
116−
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.
119−struct MsgState {
120− id: String,
121− role: String,
122− time: u64,
123− status: MessageStatus,
124− streaming: bool,
125− text_parts: Vec<(String, String)>,
126− reasoning_parts: Vec<(String, String)>,
127− tool_parts: Vec<(String, ToolView)>,
128−}
129−
130−impl MsgState {
131− fn new(id: String, role: String, time: u64) -> Self {
132− Self {
133− id,
134− role,
135− time,
136− status: MessageStatus::Sent,
137− streaming: false,
138− text_parts: Vec::new(),
139− reasoning_parts: Vec::new(),
140− tool_parts: Vec::new(),
141− }
142− }
143−
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) {
146− slot.1 = text;
147− } else {
148− parts.push((id.to_string(), text));
149− }
150− }
151−
152− fn upsert_tool(&mut self, id: &str, view: ToolView) {
153− if let Some(slot) = self.tool_parts.iter_mut().find(|(pid, _)| pid == id) {
154− slot.1 = view;
155− } else {
156− self.tool_parts.push((id.to_string(), view));
157− }
158− }
159−
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);
164− }
165−
166− fn to_view(&self) -> MessageView {
167− let join = |parts: &[(String, String)]| {
168− parts.iter().map(|(_, t)| t.as_str()).collect::<String>()
169− };
170− let reasoning = join(&self.reasoning_parts);
171− MessageView {
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(),
177− time: self.time,
178− status: self.status.clone(),
179− streaming: self.streaming,
180− }
181− }
110+ /// Accumulated crash logs (sent from the shell's uncaught-exception handler)
111+ crash_logs: Vec<String>,
182112}
183113
184−// ─── View model ──────────────────────────────────────────────────────────────
185−
186−#[derive(Serialize, Deserialize, Clone, Debug, Default, PartialEq, Eq)]
187−pub enum Screen {
188− #[default]
189− Connect,
190− Sessions,
191− Chat,
192−}
193−
194−#[derive(Serialize, Deserialize, Clone, Debug, Default)]
195−pub struct SessionView {
114+#[derive(Clone, Debug, Default)]
115+pub struct SessionSummary {
196116 pub id: String,
197117 pub title: String,
198118}
199119
200−#[derive(Serialize, Deserialize, Clone, Debug, Default, PartialEq, Eq)]
201−pub enum MessageStatus {
202− #[default]
203− Sent,
204− Pending,
205− Failed,
206−}
207−
208−#[derive(Serialize, Deserialize, Clone, Debug, Default)]
209−pub struct ToolView {
210− pub name: String,
211− pub status: String,
212− pub title: Option<String>,
213−}
214−
215−#[derive(Serialize, Deserialize, Clone, Debug, Default)]
120+#[derive(Facet, Serialize, Deserialize, Clone, Debug, Default)]
216121pub struct MessageView {
217122 pub id: String,
218123 pub role: String,
219124 pub text: String,
220− pub reasoning: Option<String>,
221− pub tools: Vec<ToolView>,
222125 pub time: u64,
223− pub status: MessageStatus,
224− pub streaming: bool,
225126}
226127
227−#[derive(Serialize, Deserialize, Clone, Debug, Default)]
128+// ─── ViewModel ─────────────────────────────────────────────────────────────
129+
130+#[derive(Facet, Serialize, Deserialize, Clone, Debug, Default)]
228131pub struct ViewModel {
229132 pub screen: Screen,
230133 pub server_url: String,
@@ -238,42 +141,63 @@ pub struct ViewModel {
238141 pub current_session_id: Option<String>,
239142 pub current_session_title: String,
240143 pub messages: Vec<MessageView>,
241− pub draft: String,
144+ pub draft_message: String,
145+ /// True while waiting for the assistant to reply after the user sends.
242146 pub generating: bool,
147+ pub crash_log_count: u32,
148+ pub latest_crash_log: Option<String>,
243149}
244150
245−// ─── App ─────────────────────────────────────────────────────────────────────
151+#[derive(Facet, Serialize, Deserialize, Clone, Debug, Default, PartialEq, Eq)]
152+#[repr(C)]
153+pub enum Screen {
154+ #[default]
155+ Connect,
156+ Sessions,
157+ Chat,
158+}
159+
160+#[derive(Facet, Serialize, Deserialize, Clone, Debug, Default)]
161+pub struct SessionView {
162+ pub id: String,
163+ pub title: String,
164+}
165+
166+// ─── App ───────────────────────────────────────────────────────────────────
246167
247168#[derive(Default)]
248169pub struct OpencodeApp;
249170
250171impl 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.
251176 fn get(&self, model: &Model, path: &str) -> RequestBuilder<Effect, Event, String> {
252177 let url = format!("{}{path}", model.server_url);
253− self.with_auth(Http::get(&url).expect_string(), model)
254− }
255−
256− fn post_json(&self, model: &Model, path: &str, body: &serde_json::Value) -> RequestBuilder<Effect, Event, String> {
257− let url = format!("{}{path}", model.server_url);
258− let bytes = serde_json::to_vec(body).unwrap_or_default();
259− let req = Http::post(&url)
260− .expect_string()
261− .header("Content-Type", "application/json")
262− .body_bytes(bytes);
178+ let req = Http::get(&url).expect_string();
263179 self.with_auth(req, model)
264180 }
265181
266− fn delete(&self, model: &Model, path: &str) -> RequestBuilder<Effect, Event, String> {
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> {
267184 let url = format!("{}{path}", model.server_url);
268− self.with_auth(Http::delete(&url).expect_string(), model)
185+ let req = Http::post(&url).expect_string().body_bytes(body);
186+ self.with_auth(req, model)
269187 }
270188
271− /// Attach an RFC 7617 Basic-Auth header when the model carries credentials.
272− fn with_auth<E>(&self, req: RequestBuilder<Effect, Event, E>, model: &Model) -> RequestBuilder<Effect, Event, E>
189+ /// Attach the Basic-Auth `Authorization` header if the model carries
190+ /// credentials. Uses RFC 7617 `Basic` scheme with base64-encoded
191+ /// `username:password`.
192+ fn with_auth<E>(
193+ &self,
194+ req: RequestBuilder<Effect, Event, E>,
195+ model: &Model,
196+ ) -> RequestBuilder<Effect, Event, E>
273197 where
274198 E: 'static,
275199 {
276− if model.has_credentials() {
200+ if !model.username.is_empty() || !model.password.is_empty() {
277201 let creds = format!("{}:{}", model.username, model.password);
278202 let encoded = base64::engine::general_purpose::STANDARD.encode(creds.as_bytes());
279203 req.header("Authorization", format!("Basic {encoded}"))
@@ -281,6 +205,13 @@ impl OpencodeApp {
281205 req
282206 }
283207 }
208+
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.
213+ render()
214+ }
284215}
285216
286217impl App for OpencodeApp {
@@ -291,256 +222,242 @@ impl App for OpencodeApp {
291222
292223 fn update(&self, event: Event, model: &mut Model) -> Command<Effect, Event> {
293224 match event {
294− // ── Lifecycle / connect ─────────────────────────────────────────
295− Event::Start => render(),
296−
297− // Store the field verbatim while typing; normalizing here would fight
298− // the user's edits (e.g. eat the "://" as they type it). The URL is
299− // normalized once, on Connect.
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.
225+ Event::Start => {
226+ // Don't reset server_url here — the shell restores it from
227+ // persisted storage via ServerUrlChanged before any connect.
228+ render()
229+ }
230+
302231 Event::ServerUrlChanged(url) => {
303232 model.server_url = url;
304− if model.error.is_some() {
305− model.error = None;
306− }
307233 render()
308234 }
235+
309236 Event::UsernameChanged(u) => {
310237 model.username = u;
311− if model.error.is_some() {
312− model.error = None;
313− }
314238 render()
315239 }
240+
316241 Event::PasswordChanged(p) => {
317242 model.password = p;
318− if model.error.is_some() {
319− model.error = None;
320− }
321243 render()
322244 }
323245
324246 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());
328− return render();
329− }
330247 model.loading = true;
331248 model.error = None;
332− model.auth_required = false;
333− render().and(self.get(model, "/global/health").build().then_send(Event::HealthProbed))
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))
334253 }
335254
336− Event::HealthProbed(result) => self.on_health_probed(model, result),
255+ Event::CancelAuth => {
256+ model.auth_required = false;
257+ model.username.clear();
258+ model.password.clear();
259+ model.loading = false;
260+ render()
261+ }
337262
338− // ── Sessions ────────────────────────────────────────────────────
339263 Event::LoadSessions => {
340264 model.loading = true;
341− render().and(self.get(model, "/session").build().then_send(Event::SessionsLoaded))
265+ self.get(model, "/session").build().then_send(Event::SessionsLoaded)
342266 }
343267
344268 Event::SessionsLoaded(result) => {
345269 model.loading = false;
346− match ok_body(result) {
347− Ok(body) => {
348− model.sessions = protocol::parse_sessions(&body)
349− .into_iter()
350− .map(|s| SessionView {
351− id: s.id,
352− title: display_title(&s.title),
353− })
354− .collect();
355− // Impose a stable alphabetical order so the list doesn't shuffle
356− // with whatever order the server happens to return sessions in.
357− model.sessions.sort_by_key(|s| s.title.to_lowercase());
270+ match result {
271+ Ok(mut response) => {
272+ let body = response.take_body().unwrap_or_default();
273+ model.sessions = parse_sessions(&body);
274+ model.connected = true;
275+ // Refresh the current session's title in case it was
276+ // populated after creation.
277+ if let Some(id) = model.current_session_id.clone() {
278+ if let Some(s) = model.sessions.iter().find(|s| s.id == id) {
279+ model.current_session_title = s.title.clone();
280+ }
281+ }
282+ render()
283+ }
284+ Err(e) => {
285+ model.error = Some(format!("Failed to load sessions: {e}"));
286+ render()
358287 }
359− Err(e) => model.error = Some(e),
360288 }
361− render()
362289 }
363290
364291 Event::SelectSession(id) => {
292+ model.current_session_id = Some(id.clone());
365293 model.current_session_title = model
366294 .sessions
367295 .iter()
368296 .find(|s| s.id == id)
369297 .map(|s| s.title.clone())
370298 .unwrap_or_default();
299+ Command::event(Event::NavigateToChat(id))
300+ }
301+
302+ Event::NavigateToChat(id) => {
371303 model.current_session_id = Some(id.clone());
304+ model.current_session_title = model
305+ .sessions
306+ .iter()
307+ .find(|s| s.id == id)
308+ .map(|s| s.title.clone())
309+ .unwrap_or_default();
372310 model.messages.clear();
373− model.screen = Screen::Chat;
374− model.loading = true;
375− model.error = None;
376311 render().and(Command::event(Event::LoadMessages(id)))
377312 }
378313
379− Event::CreateSession => {
380− model.loading = true;
381− render().and(
382− self.post_json(model, "/session", &serde_json::json!({}))
383− .build()
384− .then_send(Event::SessionCreated),
385− )
314+ Event::NavigateToSessions => {
315+ model.current_session_id = None;
316+ model.current_session_title.clear();
317+ model.messages.clear();
318+ model.generating = false;
319+ render()
386320 }
387321
388− Event::SessionCreated(result) => {
322+ Event::NavigateToConnect => {
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;
389331 model.loading = false;
390− match ok_body(result) {
391− Ok(body) => {
392− if let Some(s) = protocol::parse_session(&body) {
393− let view = SessionView {
394− id: s.id.clone(),
395− title: display_title(&s.title),
396− };
397− if !model.sessions.iter().any(|e| e.id == view.id) {
398− model.sessions.insert(0, view);
399− }
400− return render().and(Command::event(Event::SelectSession(s.id)));
401− }
402− model.error = Some("Malformed session response".to_string());
403− }
404− Err(e) => model.error = Some(e),
405− }
406332 render()
407333 }
408334
409− Event::DeleteSession(id) => {
410− model.sessions.retain(|s| s.id != id);
411− let mut cmd = self.delete(model, &format!("/session/{id}")).build().then_send(Event::SessionDeleted);
412− if model.is_current(&id) {
413− model.current_session_id = None;
414− model.messages.clear();
415− model.screen = Screen::Sessions;
416− }
417− cmd = render().and(cmd);
418− cmd
335+ Event::CreateSession => {
336+ model.loading = true;
337+ self.post(model, "/session", Vec::new())
338+ .build()
339+ .then_send(Event::SessionCreated)
419340 }
420341
421− Event::SessionDeleted(result) => {
422− if let Err(e) = ok_body(result) {
423− model.error = Some(e);
342+ Event::SessionCreated(result) => {
343+ model.loading = false;
344+ match 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(
355+ 0,
356+ SessionSummary { id: id.clone(), title },
357+ );
358+ Command::event(Event::NavigateToChat(id))
359+ }
360+ Err(e) => {
361+ model.error = Some(format!("Failed to create session: {e}"));
362+ render()
363+ }
424364 }
425− render()
426365 }
427366
428− // ── Chat ────────────────────────────────────────────────────────
429367 Event::LoadMessages(id) => {
430− render().and(
431− self.get(model, &format!("/session/{id}/message"))
432− .build()
433− .then_send(move |result| Event::MessagesLoaded(id.clone(), result)),
434− )
368+ model.loading = true;
369+ let path = format!("/session/{id}/message");
370+ self.get(model, &path).build().then_send(Event::MessagesLoaded)
435371 }
436372
437− Event::MessagesLoaded(session_id, result) => {
438− if !model.is_current(&session_id) {
439− return render();
440− }
373+ Event::MessagesLoaded(result) => {
441374 model.loading = false;
442− match ok_body(result) {
443− Ok(body) => {
444− model.messages = protocol::parse_messages(&body).iter().map(message_from_wire).collect();
445− model.generating = model.messages.iter().any(|m| m.streaming);
375+ model.generating = false;
376+ match result {
377+ Ok(mut response) => {
378+ let body = response.take_body().unwrap_or_default();
379+ model.messages = parse_messages(&body);
380+ render()
381+ }
382+ Err(e) => {
383+ model.error = Some(format!("Failed to load messages: {e}"));
384+ render()
446385 }
447− Err(e) => model.error = Some(e),
448386 }
449− render()
450− }
451−
452− Event::DraftChanged(text) => {
453− model.draft = text;
454− render()
455387 }
456388
457389 Event::SendMessage(text) => {
458− let text = text.trim().to_string();
459390 let Some(session_id) = model.current_session_id.clone() else {
460391 return render();
461392 };
462− if text.is_empty() {
463− return render();
464− }
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();
393+ model.draft_message.clear();
471394 model.generating = true;
472− model.error = None;
473−
474− let body = serde_json::json!({ "parts": [{ "type": "text", "text": text }] });
475− render().and(
476− self.post_json(model, &format!("/session/{session_id}/prompt_async"), &body)
477− .build()
478− .then_send(Event::PromptSent),
479− )
480− }
481−
482− Event::PromptSent(result) => {
483− match ok_body(result) {
484− Ok(_) => set_last_pending(model, MessageStatus::Sent),
395+ let body = serde_json::json!({
396+ "sessionID": session_id,
397+ "parts": [{ "type": "text", "text": text }]
398+ })
399+ .to_string()
400+ .into_bytes();
401+ let path = format!("/session/{session_id}/prompt_async");
402+ self.post(model, &path, body)
403+ .build()
404+ .then_send(Event::MessageSent)
405+ }
406+
407+ Event::MessageSent(result) => {
408+ match result {
409+ Ok(_) => {
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))
413+ } else {
414+ model.generating = false;
415+ render()
416+ }
417+ }
485418 Err(e) => {
486− set_last_pending(model, MessageStatus::Failed);
487419 model.generating = false;
488− model.error = Some(e);
420+ model.error = Some(format!("Failed to send message: {e}"));
421+ render()
489422 }
490423 }
491− render()
492− }
493−
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!({}))
499− .build()
500− .then_send(Event::Aborted),
501− ),
502− None => render(),
503− }
504424 }
505425
506− Event::Aborted(_) => render(),
507−
508− // ── SSE ─────────────────────────────────────────────────────────
509− Event::ServerEvent(json) => {
510− if let Some(event) = protocol::parse_event(&json) {
511− apply_server_event(model, event);
426+ Event::EventReceived(_data) => {
427+ // SSE event — reload messages for the current session.
428+ if let Some(session_id) = model.current_session_id.clone() {
429+ Command::event(Event::LoadMessages(session_id))
430+ } else {
431+ render()
512432 }
513− render()
514433 }
515434
516− // ── Navigation / misc ───────────────────────────────────────────
517− Event::NavigateToSessions => {
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))
523− }
524−
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;
531− render()
435+ Event::CrashLog(entry) => {
436+ model.crash_logs.push(entry);
437+ self.render_with_crashes(model)
532438 }
533439
534440 Event::DismissError => {
535441 model.error = None;
536442 render()
537443 }
444+
445+ // ── Internal events (not type-generated, sent via then_send) ───
446+ Event::HealthProbed(result) => handle_health_probed(self, model, result),
538447 }
539448 }
540449
541− fn view(&self, model: &Model) -> ViewModel {
450+ fn view(&self, model: &Self::Model) -> Self::ViewModel {
451+ let screen = if model.current_session_id.is_some() {
452+ Screen::Chat
453+ } else if model.connected {
454+ Screen::Sessions
455+ } else {
456+ Screen::Connect
457+ };
458+
542459 ViewModel {
543− screen: model.screen.clone(),
460+ screen,
544461 server_url: model.server_url.clone(),
545462 username: model.username.clone(),
546463 password: model.password.clone(),
@@ -548,504 +465,398 @@ impl App for OpencodeApp {
548465 connected: model.connected,
549466 loading: model.loading,
550467 error: model.error.clone(),
551− sessions: model.sessions.clone(),
468+ sessions: model
469+ .sessions
470+ .iter()
471+ .map(|s| SessionView {
472+ id: s.id.clone(),
473+ title: s.title.clone(),
474+ })
475+ .collect(),
552476 current_session_id: model.current_session_id.clone(),
553477 current_session_title: model.current_session_title.clone(),
554− messages: model.messages.iter().map(MsgState::to_view).collect(),
555− draft: model.draft.clone(),
478+ messages: model.messages.clone(),
479+ draft_message: model.draft_message.clone(),
556480 generating: model.generating,
481+ crash_log_count: model.crash_logs.len() as u32,
482+ latest_crash_log: model.crash_logs.last().cloned(),
557483 }
558484 }
559485}
560486
561−impl OpencodeApp {
562− fn on_health_probed(&self, model: &mut Model, result: HttpResult) -> Command<Effect, Event> {
563− let has_creds = model.has_credentials();
564− match result {
565− Ok(response) => {
566− let status = response.status().as_u16();
567− if status == 401 {
568− model.loading = false;
569− if has_creds {
570− model.error = Some("Invalid credentials".to_string());
571− } else {
572− model.auth_required = true;
573− }
574− return render();
575− }
576− if (200..300).contains(&status) {
577− if has_creds {
578− model.authed = true;
579− }
580− model.connected = true;
581− model.auth_required = false;
582− model.error = None;
583− model.screen = Screen::Sessions;
584− model.loading = true;
585− return render().and(self.get(model, "/session").build().then_send(Event::SessionsLoaded));
487+// ─── Basic-auth detection ──────────────────────────────────────────────────
488+//
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:
492+//
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.
500+
501+fn handle_health_probed(
502+ app: &OpencodeApp,
503+ model: &mut Model,
504+ result: HttpResult<String>,
505+) -> Command<Effect, Event> {
506+ let has_creds = !model.username.is_empty() || !model.password.is_empty();
507+ match result {
508+ Ok(response) => {
509+ let status = response.status().as_u16();
510+ if status == 401 { model.loading = false;
511+ if has_creds {
512+ // We sent credentials but the server still rejected them.
513+ model.error = Some("Invalid credentials".to_string());
514+ } 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;
586518 }
587− model.loading = false;
588− model.error = Some(format!("Server returned status {status}"));
589− render()
590− }
591− Err(e) => {
592− model.loading = false;
593− model.error = Some(format!("Connection failed: {e}"));
594− render()
519+ return render();
595520 }
521+ if (200..300).contains(&status) {
522+ if has_creds {
523+ model.authed = true;
524+ }
525+ model.loading = true;
526+ return app
527+ .get(model, "/session")
528+ .build()
529+ .then_send(Event::SessionsLoaded);
530+ }
531+ // Other status codes — treat as connection error.
532+ model.loading = false;
533+ model.error = Some(format!("Server returned status {status}"));
534+ render()
535+ }
536+ Err(e) => {
537+ model.loading = false;
538+ model.error = Some(format!("Connection failed: {e}"));
539+ render()
596540 }
597541 }
598542}
599543
600−// ─── SSE application ─────────────────────────────────────────────────────────
601−
602−fn apply_server_event(model: &mut Model, event: ServerEvent) {
603− match event {
604− // Only assistant messages are created from the stream — the user's own
605− // message is already shown optimistically, so ignoring the server's copy
606− // avoids a duplicate bubble.
607− ServerEvent::MessageUpdated { properties } => {
608− let info = properties.info;
609− if info.role != "assistant" || !model.is_current(&info.session_id) {
610− return;
611− }
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;
615− if msg.time == 0 {
616− msg.time = info.time.created;
544+// ─── JSON parsing (minimal, avoids pulling a JSON dep into the core) ───────
545+
546+fn parse_sessions(body: &str) -> Vec<SessionSummary> {
547+ let mut sessions = Vec::new();
548+ let mut depth = 0i32;
549+ let mut start = 0usize;
550+ for (i, ch) in body.char_indices() {
551+ match ch {
552+ '{' => {
553+ if depth == 0 {
554+ start = i;
617555 }
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);
622− }
623− if let Some(err) = info.error {
624− model.error = Some(err.message());
625− model.generating = false;
626− }
627− }
628−
629− // Apply only to a message we already track (an assistant message from the
630− // event above). Parts for unknown ids are ignored — see module docs.
631− ServerEvent::MessagePartUpdated { properties } => {
632− let part = properties.part;
633− let delta = properties.delta;
634− let msg_id = part.message_id().to_string();
635− let Some(msg) = model.message_mut(&msg_id) else {
636− return;
637− };
638− match part {
639− WirePart::Text { id, text, synthetic, .. } => {
640− if synthetic {
641− return;
556+ depth += 1;
557+ }
558+ '}' => {
559+ depth -= 1;
560+ if depth == 0 {
561+ let obj = &body[start..=i];
562+ let id = extract_string(obj, "id").unwrap_or_default();
563+ let title = extract_string(obj, "title").unwrap_or_default();
564+ if !id.is_empty() {
565+ sessions.push(SessionSummary {
566+ id,
567+ title: if title.is_empty() {
568+ "Untitled".to_string()
569+ } else {
570+ title
571+ },
572+ });
642573 }
643− let value = pick_text(text, &delta, &msg.text_parts, &id);
644− MsgState::upsert_part(&mut msg.text_parts, &id, value);
645− }
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);
649− }
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 });
653− }
654− WirePart::Other => {}
655− }
656− }
657−
658− ServerEvent::MessagePartRemoved { properties } => {
659− if let Some(msg) = model.message_mut(&properties.message_id) {
660− msg.remove_part(&properties.part_id);
661− }
662− }
663−
664− ServerEvent::MessageRemoved { properties } => {
665− model.messages.retain(|m| m.id != properties.message_id);
666− }
667−
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;
673574 }
674575 }
576+ _ => {}
675577 }
676−
677− ServerEvent::SessionError { properties } => {
678− let scoped = properties.session_id.as_deref().map_or(true, |s| model.is_current(s));
679− if scoped {
680− if let Some(err) = properties.error {
681− model.error = Some(err.message());
682− }
683− model.generating = false;
684− }
685− }
686−
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();
692− } else {
693− model.sessions.insert(0, view);
694− }
695− if model.is_current(&s.id) {
696− model.current_session_title = display_title(&s.title);
697− }
698− }
699−
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;
708− }
709− }
710− }
711−
712− ServerEvent::Other => {}
713578 }
579+ sessions
714580}
715581
716−// ─── Helpers ─────────────────────────────────────────────────────────────────
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() {
722− return text;
723− }
724− let prior = existing.iter().find(|(pid, _)| pid == part_id).map(|(_, t)| t.clone()).unwrap_or_default();
725− match delta {
726− Some(d) => format!("{prior}{d}"),
727− None => prior,
728− }
582+fn parse_session_id(body: &str) -> String {
583+ extract_string(body, "id").unwrap_or_default()
729584}
730585
731−fn message_from_wire(env: &WireMessageEnvelope) -> MsgState {
732− let info = &env.info;
733− let mut msg = MsgState::new(info.id.clone(), info.role.clone(), info.time.created);
734− msg.streaming = info.role == "assistant" && info.time.completed.is_none() && info.error.is_none();
735− for part in &env.parts {
736− match part {
737− WirePart::Text { id, text, synthetic, .. } => {
738− if !synthetic {
739− MsgState::upsert_part(&mut msg.text_parts, id, text.clone());
586+fn parse_messages(body: &str) -> Vec<MessageView> {
587+ let mut messages = Vec::new();
588+ let mut depth = 0i32;
589+ let mut start = 0usize;
590+ let mut i = 0usize;
591+ let bytes = body.as_bytes();
592+ while i < body.len() {
593+ let ch = bytes[i] as char;
594+ match ch {
595+ '{' => {
596+ if depth == 0 {
597+ start = i;
598+ }
599+ depth += 1;
600+ }
601+ '}' => {
602+ depth -= 1;
603+ if depth == 0 {
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);
608+ if !id.is_empty() {
609+ let text = extract_message_text(obj);
610+ messages.push(MessageView { id, role, text, time });
611+ }
740612 }
741613 }
742− WirePart::Reasoning { id, text, .. } => {
743− MsgState::upsert_part(&mut msg.reasoning_parts, id, text.clone());
744− }
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 });
748− }
749− WirePart::Other => {}
614+ _ => {}
750615 }
616+ i += 1;
751617 }
752− msg
753−}
754−
755−fn set_last_pending(model: &mut Model, status: MessageStatus) {
756− if let Some(msg) = model.messages.iter_mut().rev().find(|m| m.status == MessageStatus::Pending) {
757− msg.status = status;
758− }
618+ messages
759619}
760620
761−/// Trim whitespace and any trailing `/` so paths concatenate cleanly, and
762−/// default to an `http://` scheme when the user didn't type one (e.g.
763−/// "192.168.1.10:4096") — otherwise the shell's URL parser rejects it.
764−fn normalize_url(url: &str) -> String {
765− let trimmed = url.trim().trim_end_matches('/');
766− if trimmed.is_empty() {
767− String::new()
768− } else if trimmed.contains("://") {
769− trimmed.to_string()
770− } else {
771− format!("http://{trimmed}")
621+/// Extract the text from a message part. opencode messages nest the user/assistant
622+/// text inside a `parts` array; we do a shallow scan for `"text":"..."` after the
623+/// first `"parts"` key.
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") {
628+ return text;
629+ }
772630 }
631+ extract_string(obj, "text").unwrap_or_default()
773632}
774633
775−fn display_title(title: &str) -> String {
776− let t = title.trim();
777− if t.is_empty() {
778− "Untitled".to_string()
779− } else {
780− t.to_string()
781− }
634+fn extract_string(json: &str, key: &str) -> Option<String> {
635+ let pattern = format!("\"{key}\"");
636+ let idx = json.find(&pattern)?;
637+ let rest = &json[idx + pattern.len()..];
638+ let colon = rest.find(':')?;
639+ let rest = &rest[colon + 1..];
640+ let quote = rest.find('"')?;
641+ let rest = &rest[quote + 1..];
642+ let end = rest.find('"')?;
643+ Some(rest[..end].to_string())
782644}
783645
784−/// Reduce an [`HttpResult`] to `Ok(body)` for 2xx, or `Err(message)` otherwise.
785−fn ok_body(result: HttpResult) -> Result<String, String> {
786− match result {
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())
791− } else {
792− Err(format!("Server returned status {status}"))
793− }
794− }
795− Err(e) => Err(format!("Request failed: {e}")),
796− }
646+fn extract_number(json: &str, key: &str) -> Option<u64> {
647+ let pattern = format!("\"{key}\"");
648+ let idx = json.find(&pattern)?;
649+ let rest = &json[idx + pattern.len()..];
650+ let colon = rest.find(':')?;
651+ let rest = &rest[colon + 1..].trim_start();
652+ let end = rest
653+ .find(|c: char| !c.is_ascii_digit())
654+ .unwrap_or(rest.len());
655+ rest[..end].parse().ok()
797656}
798657
799−// ─── Tests ───────────────────────────────────────────────────────────────────
658+// ─── Tests ─────────────────────────────────────────────────────────────────
800659
801660#[cfg(test)]
802−mod tests {
661+mod test {
803662 use super::*;
804663
805− fn app() -> OpencodeApp {
806− OpencodeApp::default()
807− }
808−
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());
816− model
817− }
818−
819− fn feed(app: &OpencodeApp, model: &mut Model, json: serde_json::Value) {
820− let _ = app.update(Event::ServerEvent(json.to_string()), model);
821− }
822−
823664 #[test]
824− fn server_url_is_kept_raw_while_typing() {
825− let app = app();
665+ fn start_does_not_reset_server_url() {
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;
826670 let mut model = Model::default();
827− // Mid-scheme input must survive verbatim — normalizing per keystroke
828− // would eat the "://" the user is typing and make the field unusable.
829− let _ = app.update(Event::ServerUrlChanged("http:/".into()), &mut model);
830− assert_eq!(app.view(&model).server_url, "http:/");
671+ model.server_url = "http://10.0.0.1:4096".to_string();
672+ app.update(Event::Start, &mut model).expect_only_render();
673+ assert_eq!(model.server_url, "http://10.0.0.1:4096");
831674 }
832675
833676 #[test]
834− fn connect_normalizes_scheme_less_url() {
835− let app = app();
677+ fn server_url_change_updates_model() {
678+ let app = OpencodeApp;
836679 let mut model = Model::default();
837− // A scheme-less host (what a user often types) must gain http:// on
838− // connect, or the shell's URL parser throws and the attempt crashes.
839− let _ = app.update(Event::ServerUrlChanged("192.168.1.10:4096".into()), &mut model);
840− assert_eq!(app.view(&model).server_url, "192.168.1.10:4096");
841− let _ = app.update(Event::Connect, &mut model);
842− assert_eq!(app.view(&model).server_url, "http://192.168.1.10:4096");
680+ app.update(Event::Start, &mut model);
681+ app.update(
682+ Event::ServerUrlChanged("http://10.0.0.1:4096".to_string()),
683+ &mut model,
684+ )
685+ .expect_only_render();
686+ assert_eq!(model.server_url, "http://10.0.0.1:4096");
843687 }
844688
845689 #[test]
846− fn connect_trims_and_keeps_explicit_scheme() {
847− let app = app();
690+ fn connect_emits_http_effect() {
691+ let app = OpencodeApp;
848692 let mut model = Model::default();
849− let _ = app.update(Event::ServerUrlChanged(" https://host:4096/ ".into()), &mut model);
850− let _ = app.update(Event::Connect, &mut model);
851− assert_eq!(app.view(&model).server_url, "https://host:4096");
693+ model.server_url = "http://localhost:4096".to_string();
694+ app.update(Event::Start, &mut model);
695+ let mut cmd = app.update(Event::Connect, &mut model);
696+ assert!(cmd.effects().any(|e| matches!(e, Effect::Http(_))));
697+ assert!(model.loading);
852698 }
853699
854700 #[test]
855− fn connect_requires_a_url() {
856− let app = app();
857− let mut model = Model::default();
858− let _ = app.update(Event::Connect, &mut model);
859− assert_eq!(app.view(&model).error.as_deref(), Some("Enter a server URL"));
701+ fn parse_sessions_extracts_id_and_title() {
702+ let json = r#"[{"id":"abc123","title":"My Session"},{"id":"def456","title":"Test"}]"#;
703+ let sessions = parse_sessions(json);
704+ assert_eq!(sessions.len(), 2);
705+ assert_eq!(sessions[0].id, "abc123");
706+ assert_eq!(sessions[0].title, "My Session");
707+ assert_eq!(sessions[1].id, "def456");
860708 }
861709
862710 #[test]
863− fn sending_adds_optimistic_user_message_and_sets_generating() {
864− let app = app();
865− let mut model = in_chat("ses_1");
866− let _ = app.update(Event::DraftChanged("hello there".into()), &mut model);
867− let _ = app.update(Event::SendMessage("hello there".into()), &mut model);
868−
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);
711+ fn parse_session_id_extracts_id() {
712+ let json = r#"{"id":"xyz789","title":"New"}"#;
713+ let id = parse_session_id(json);
714+ assert_eq!(id, "xyz789");
876715 }
877716
878717 #[test]
879− fn empty_send_is_ignored() {
880− let app = app();
881− let mut model = in_chat("ses_1");
882− let _ = app.update(Event::SendMessage(" ".into()), &mut model);
883− assert!(app.view(&model).messages.is_empty());
884− assert!(!app.view(&model).generating);
718+ fn extract_string_finds_nested_keys() {
719+ let json = r#"{"a":"b","id":"target","c":"d"}"#;
720+ assert_eq!(extract_string(json, "id"), Some("target".to_string()));
721+ assert_eq!(extract_string(json, "missing"), None);
885722 }
886723
887724 #[test]
888− fn assistant_reply_streams_in_from_sse() {
889− let app = app();
890− let mut model = in_chat("ses_1");
891−
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 }
898− }}
899− }));
900− assert_eq!(app.view(&model).messages.len(), 1);
901− assert!(app.view(&model).messages[0].streaming);
902−
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"
909− }}
910− }));
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"
916− }}
917− }));
918−
919− let view = app.view(&model);
920− assert_eq!(view.messages[0].role, "assistant");
921− assert_eq!(view.messages[0].text, "Hello, world");
725+ fn extract_number_parses_values() {
726+ let json = r#"{"created":1234567890}"#;
727+ assert_eq!(extract_number(json, "created"), Some(1234567890));
922728 }
923729
924730 #[test]
925− fn text_delta_accumulates_when_full_text_absent() {
926− let app = app();
927− let mut model = in_chat("ses_1");
928− feed(&app, &mut model, serde_json::json!({
929− "type": "message.updated",
930− "properties": { "info": { "id": "msg_a", "role": "assistant", "sessionID": "ses_1", "time": {"created": 1}}}
931− }));
932− for delta in ["Wor", "ld"] {
933− feed(&app, &mut model, serde_json::json!({
934− "type": "message.part.updated",
935− "properties": {
936− "part": { "id": "p", "messageID": "msg_a", "sessionID": "ses_1", "type": "text", "text": "" },
937− "delta": delta
938− }
939− }));
940− }
941− assert_eq!(app.view(&model).messages[0].text, "World");
942− }
943−
944− #[test]
945− fn user_message_from_sse_is_not_duplicated() {
946− let app = app();
947− let mut model = in_chat("ses_1");
948− let _ = app.update(Event::SendMessage("hi".into()), &mut model);
949− // Server echoes the user message on the stream — must be ignored.
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}}}
953− }));
954− let users = app.view(&model).messages.iter().filter(|m| m.role == "user").count();
955− assert_eq!(users, 1);
731+ fn navigate_to_sessions_clears_state() {
732+ let app = OpencodeApp;
733+ let mut model = Model::default();
734+ model.current_session_id = Some("test".to_string());
735+ model.current_session_title = "Test".to_string();
736+ model.generating = true;
737+ model.messages.push(MessageView {
738+ id: "m1".to_string(),
739+ role: "user".to_string(),
740+ text: "hello".to_string(),
741+ time: 0,
742+ });
743+ app.update(Event::NavigateToSessions, &mut model);
744+ assert!(model.current_session_id.is_none());
745+ assert!(model.current_session_title.is_empty());
746+ assert!(model.messages.is_empty());
747+ assert!(!model.generating);
956748 }
957749
958750 #[test]
959− fn session_idle_clears_generating() {
960− let app = app();
961− let mut model = in_chat("ses_1");
962− let _ = app.update(Event::SendMessage("hi".into()), &mut model);
963− assert!(app.view(&model).generating);
964− feed(&app, &mut model, serde_json::json!({
965− "type": "session.idle", "properties": { "sessionID": "ses_1" }
966− }));
967− assert!(!app.view(&model).generating);
751+ fn select_session_records_title_from_sessions_list() {
752+ let app = OpencodeApp;
753+ let mut model = Model::default();
754+ model.sessions = vec![
755+ SessionSummary { id: "s1".to_string(), title: "First".to_string() },
756+ SessionSummary { id: "s2".to_string(), title: "Second".to_string() },
757+ ];
758+ app.update(Event::SelectSession("s2".to_string()), &mut model);
759+ assert_eq!(model.current_session_id.as_deref(), Some("s2"));
760+ assert_eq!(model.current_session_title, "Second");
761+ let view = app.view(&model);
762+ assert_eq!(view.current_session_title, "Second");
968763 }
969764
970765 #[test]
971− fn idle_for_other_session_is_ignored() {
972− let app = app();
973− let mut model = in_chat("ses_1");
974− let _ = app.update(Event::SendMessage("hi".into()), &mut model);
975− feed(&app, &mut model, serde_json::json!({
976− "type": "session.idle", "properties": { "sessionID": "ses_other" }
977− }));
978− assert!(app.view(&model).generating);
766+ fn send_message_sets_generating_until_messages_loaded() {
767+ let app = OpencodeApp;
768+ let mut model = Model::default();
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);
772+ assert!(model.generating);
773+ // Simulate the MessagesLoaded internal event clearing it.
774+ let ok_resp = crux_http::testing::ResponseBuilder::ok().body("[]".to_string()).build();
775+ let result: HttpResult<String> = Ok(ok_resp);
776+ app.update(Event::MessagesLoaded(result), &mut model);
777+ assert!(!model.generating);
979778 }
980779
981780 #[test]
982− fn reasoning_and_tool_parts_are_surfaced() {
983− let app = app();
984− let mut model = in_chat("ses_1");
985− feed(&app, &mut model, serde_json::json!({
986− "type": "message.updated",
987− "properties": { "info": { "id": "m", "role": "assistant", "sessionID": "ses_1", "time": {"created": 1}}}
988− }));
989− feed(&app, &mut model, serde_json::json!({
990− "type": "message.part.updated",
991− "properties": { "part": { "id": "r", "messageID": "m", "type": "reasoning", "text": "thinking..." }}
992− }));
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" }
998− }}
999− }));
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"));
781+ fn failed_send_clears_generating() {
782+ let app = OpencodeApp;
783+ let mut model = Model::default();
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);
787+ assert!(model.generating);
788+ let err = crux_http::HttpError::Io("boom".to_string());
789+ app.update(Event::MessageSent(Err(err)), &mut model);
790+ assert!(!model.generating);
791+ assert!(model.error.is_some());
1006792 }
1007793
1008794 #[test]
1009− fn session_created_event_updates_list() {
1010− let app = app();
1011− let mut model = in_chat("ses_1");
1012− feed(&app, &mut model, serde_json::json!({
1013− "type": "session.created",
1014− "properties": { "info": { "id": "ses_new", "title": "Fresh" }}
1015− }));
1016− assert!(app.view(&model).sessions.iter().any(|s| s.id == "ses_new" && s.title == "Fresh"));
795+ fn auth_header_built_from_credentials() {
796+ let app = OpencodeApp;
797+ let mut model = Model::default();
798+ model.server_url = "http://localhost:4096".to_string();
799+ model.username = "opencode".to_string();
800+ model.password = "secret".to_string();
801+ // Verify the base64 encoding matches RFC 7617.
802+ let creds = format!("{}:{}", model.username, model.password);
803+ let encoded = base64::engine::general_purpose::STANDARD.encode(creds.as_bytes());
804+ assert_eq!(encoded, "b3BlbmNvZGU6c2VjcmV0");
805+ // Building a request should not panic.
806+ let _ = app.get(&model, "/global/health");
1017807 }
1018808
1019809 #[test]
1020− fn unknown_event_types_are_ignored() {
1021− let app = app();
1022− let mut model = in_chat("ses_1");
1023− feed(&app, &mut model, serde_json::json!({
1024− "type": "pty.created", "properties": { "whatever": true }
1025− }));
1026− feed(&app, &mut model, serde_json::json!({ "type": "totally.new.event" }));
1027− // No panic, no state change.
1028− assert!(app.view(&model).messages.is_empty());
810+ fn crash_log_event_accumulates() {
811+ let app = OpencodeApp;
812+ let mut model = Model::default();
813+ app.update(Event::CrashLog("boom".to_string()), &mut model);
814+ assert_eq!(model.crash_logs.len(), 1);
815+ let view = app.view(&model);
816+ assert_eq!(view.crash_log_count, 1);
817+ assert_eq!(view.latest_crash_log.as_deref(), Some("boom"));
1029818 }
1030819
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.
1031825 #[test]
1032− fn messages_loaded_parses_info_and_parts() {
1033− let app = app();
1034− let mut model = in_chat("ses_1");
1035− let body = serde_json::json!([
1036− { "info": { "id": "m1", "role": "user", "sessionID": "ses_1", "time": {"created": 1} },
1037− "parts": [{ "id": "p1", "type": "text", "text": "Question?" }] },
1038− { "info": { "id": "m2", "role": "assistant", "sessionID": "ses_1", "time": {"created": 2, "completed": 3} },
1039− "parts": [{ "id": "p2", "type": "text", "text": "Answer." }] }
1040− ]).to_string();
1041− let result: HttpResult = Ok(crux_http::testing::ResponseBuilder::ok().body(body).build());
1042− let _ = app.update(Event::MessagesLoaded("ses_1".into(), result), &mut model);
1043−
1044− let view = app.view(&model);
1045− assert_eq!(view.messages.len(), 2);
1046− assert_eq!(view.messages[0].text, "Question?");
1047− assert_eq!(view.messages[1].text, "Answer.");
1048− assert!(!view.messages[1].streaming);
1049− assert!(!view.generating);
826+ fn event_discriminants_match_generated_indices() {
827+ // The generated Kotlin Event enum (see generated/.../Core.kt) maps:
828+ // 0=Start, 1=ServerUrlChanged, 2=UsernameChanged, 3=PasswordChanged,
829+ // 4=Connect, 5=CancelAuth, 6=LoadSessions, 7=SelectSession,
830+ // 8=CreateSession, 9=LoadMessages, 10=SendMessage, 11=EventReceived,
831+ // 12=NavigateToChat, 13=NavigateToSessions, 14=NavigateToConnect,
832+ // 15=DismissError
833+ //
834+ // Serialize each Rust variant and check the leading u32 index.
835+ let cases: &[(Event, u32)] = &[
836+ (Event::Start, 0),
837+ (Event::ServerUrlChanged(String::new()), 1),
838+ (Event::UsernameChanged(String::new()), 2),
839+ (Event::PasswordChanged(String::new()), 3),
840+ (Event::Connect, 4),
841+ (Event::CancelAuth, 5),
842+ (Event::LoadSessions, 6),
843+ (Event::SelectSession(String::new()), 7),
844+ (Event::CreateSession, 8),
845+ (Event::LoadMessages(String::new()), 9),
846+ (Event::SendMessage(String::new()), 10),
847+ (Event::EventReceived(String::new()), 11),
848+ (Event::NavigateToChat(String::new()), 12),
849+ (Event::NavigateToSessions, 13),
850+ (Event::NavigateToConnect, 14),
851+ (Event::DismissError, 15),
852+ ];
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!(
857+ idx, *expected,
858+ "Event discriminant mismatch for {event:?}: got {idx}, expected {expected}"
859+ );
860+ }
1050861 }
1051862}