@@ -1,230 +1,129 @@
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.
11use base64::Engine;
1use base64::Engine;
12use crux_core::{
2use crux_core::{
14− render::{render, RenderOperation},
15 App, Command,
3 App, Command,
5+ render::{RenderOperation, render},
17use crux_http::command::{Http, RequestBuilder};
7use crux_http::command::{Http, RequestBuilder};
18use crux_http::protocol::HttpRequest;
8use crux_http::protocol::HttpRequest;
19use serde::{Deserialize, Serialize};
10use serde::{Deserialize, Serialize};
21−use crate::protocol::{self, ServerEvent, WireMessageEnvelope, WirePart};
23−/// Result of an HTTP effect handed back to the core.
24−pub type HttpResult = Result<crux_http::Response<String>, crux_http::HttpError>;
26−// ─── Events ──────────────────────────────────────────────────────────────────
12+// ─── Events ────────────────────────────────────────────────────────────────
14+#[derive(Facet, Serialize, Deserialize, Clone, Debug)]
28pub enum Event {
16pub enum Event {
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. ──────────────────────────────────────
29− // Lifecycle / connect
22+ // Lifecycle
31 ServerUrlChanged(String),
24 ServerUrlChanged(String),
32 UsernameChanged(String),
25 UsernameChanged(String),
33 PasswordChanged(String),
26 PasswordChanged(String),
36− // Sessions
30+ // Session list
37 LoadSessions,
31 LoadSessions,
38 SelectSession(String),
32 SelectSession(String),
39 CreateSession,
33 CreateSession,
40− DeleteSession(String),
43 LoadMessages(String),
36 LoadMessages(String),
44− DraftChanged(String),
45 SendMessage(String),
37 SendMessage(String),
48− // A raw event line from the shell's `/event` SSE subscription.
39+ // SSE event received
49− ServerEvent(String),
40+ EventReceived(String),
51− // Navigation / misc
42+ // Navigation
43+ NavigateToChat(String),
52 NavigateToSessions,
44 NavigateToSessions,
53− NavigateToConnect,
45+
54 DismissError,
47 DismissError,
56− // ── Internal: results of HTTP effects (never sent by the shell) ──────────
49+ // ── Internal events (skipped from typegen, sent only via then_send).
57− HealthProbed(HttpResult),
50+ // These occupy higher discriminant indices that are never
51+ // produced by the shell, so the index gap is harmless. ─────────
58− SessionsLoaded(HttpResult),
55+ SessionsLoaded(#[facet(opaque)] HttpResult<String>),
59− SessionCreated(HttpResult),
58+ SessionCreated(#[facet(opaque)] HttpResult<String>),
60− MessagesLoaded(String, HttpResult),
61+ MessagesLoaded(#[facet(opaque)] HttpResult<String>),
61− PromptSent(HttpResult),
62+ #[serde(skip)]
62− SessionDeleted(HttpResult),
63+ #[facet(skip)]
63− Aborted(HttpResult),
64+ MessageSent(#[facet(opaque)] HttpResult<String>),
70+ HealthProbed(#[facet(opaque)] HttpResult<String>),
66−// ─── Effects ─────────────────────────────────────────────────────────────────
73+// ─── Effects ───────────────────────────────────────────────────────────────
68−#[effect]
75+#[effect(facet_typegen)]
69#[derive(Debug)]
76#[derive(Debug)]
70pub enum Effect {
77pub enum Effect {
71 Render(RenderOperation),
78 Render(RenderOperation),
72 Http(HttpRequest),
79 Http(HttpRequest),
82+// ─── HTTP result wrapper (opaque, not type-generated) ──────────────────────
84+pub type HttpResult<T> = Result<crux_http::Response<T>, crux_http::HttpError>;
75−// ─── Model ───────────────────────────────────────────────────────────────────
86+// ─── Model ─────────────────────────────────────────────────────────────────
77#[derive(Default)]
88#[derive(Default)]
78pub struct Model {
89pub struct Model {
79 server_url: String,
90 server_url: String,
80 username: String,
91 username: String,
81 password: String,
92 password: String,
82− /// The server answered 401 to an unauthenticated probe — show credentials.
93+ /// Set once the server replies 401 to an unauthenticated probe.
94+ /// The view surfaces this so the shell can show credential fields.
83 auth_required: bool,
95 auth_required: bool,
84− /// Credentials were accepted; attach the auth header to every request.
96+ /// Set once a request with credentials succeeds. All subsequent
97+ /// requests carry the Authorization header.
85 authed: bool,
98 authed: bool,
86 connected: bool,
99 connected: bool,
87 loading: bool,
100 loading: bool,
88 error: Option<String>,
101 error: Option<String>,
91− sessions: Vec<SessionView>,
102+ sessions: Vec<SessionSummary>,
92 current_session_id: Option<String>,
103 current_session_id: Option<String>,
93− current_session_title: String,
95− messages: Vec<MsgState>,
104+ messages: Vec<MessageView>,
96− draft: String,
105+ draft_message: String,
97− generating: bool,
106+ /// Accumulated crash logs (sent from the shell's uncaught-exception handler)
98−
107+ 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)]
194−#[derive(Serialize, Deserialize, Clone, Debug, Default)]
110+#[derive(Clone, Debug, Default)]
195−pub struct SessionView {
111+pub struct SessionSummary {
196 pub id: String,
112 pub id: String,
197 pub title: String,
113 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>,
215−#[derive(Serialize, Deserialize, Clone, Debug, Default)]
116+#[derive(Facet, Serialize, Deserialize, Clone, Debug, Default)]
216pub struct MessageView {
117pub struct MessageView {
217 pub id: String,
118 pub id: String,
218 pub role: String,
119 pub role: String,
219 pub text: String,
120 pub text: String,
220− pub reasoning: Option<String>,
221− pub tools: Vec<ToolView>,
222 pub time: u64,
121 pub time: u64,
223− pub status: MessageStatus,
224− pub streaming: bool,
124+// ─── ViewModel ─────────────────────────────────────────────────────────────
227−#[derive(Serialize, Deserialize, Clone, Debug, Default)]
126+#[derive(Facet, Serialize, Deserialize, Clone, Debug, Default)]
228pub struct ViewModel {
127pub struct ViewModel {
229 pub screen: Screen,
128 pub screen: Screen,
230 pub server_url: String,
129 pub server_url: String,
@@ -236,44 +135,62 @@ pub struct ViewModel {
236 pub error: Option<String>,
135 pub error: Option<String>,
237 pub sessions: Vec<SessionView>,
136 pub sessions: Vec<SessionView>,
238 pub current_session_id: Option<String>,
137 pub current_session_id: Option<String>,
239− pub current_session_title: String,
240 pub messages: Vec<MessageView>,
138 pub messages: Vec<MessageView>,
241− pub draft: String,
139+ pub draft_message: String,
242− pub generating: bool,
140+ pub crash_log_count: u32,
141+ pub latest_crash_log: Option<String>,
144+#[derive(Facet, Serialize, Deserialize, Clone, Debug, Default, PartialEq, Eq)]
153+#[derive(Facet, Serialize, Deserialize, Clone, Debug, Default)]
154+pub struct SessionView {
245−// ─── App ─────────────────────────────────────────────────────────────────────
159+// ─── App ───────────────────────────────────────────────────────────────────
247#[derive(Default)]
161#[derive(Default)]
248pub struct OpencodeApp;
162pub struct OpencodeApp;
250impl OpencodeApp {
164impl OpencodeApp {
165+ /// Build a GET request to `path`, adding the Basic-Auth header when the
166+ /// model has credentials. The header is always added once `authed` is true
167+ /// (i.e. after the server has accepted credentials), and also during the
168+ /// credential-retry attempt itself.
251 fn get(&self, model: &Model, path: &str) -> RequestBuilder<Effect, Event, String> {
169 fn get(&self, model: &Model, path: &str) -> RequestBuilder<Effect, Event, String> {
252 let url = format!("{}{path}", model.server_url);
170 let url = format!("{}{path}", model.server_url);
253− self.with_auth(Http::get(&url).expect_string(), model)
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()
171+ let req = Http::get(&url).expect_string();
261− .header("Content-Type", "application/json")
263 self.with_auth(req, model)
172 self.with_auth(req, model)
175+ /// Build a POST request to `path` with the given body bytes.
266− fn delete(&self, model: &Model, path: &str) -> RequestBuilder<Effect, Event, String> {
176+ fn post(&self, model: &Model, path: &str, body: Vec<u8>) -> RequestBuilder<Effect, Event, String> {
267 let url = format!("{}{path}", model.server_url);
177 let url = format!("{}{path}", model.server_url);
268− self.with_auth(Http::delete(&url).expect_string(), model)
178+ let req = Http::post(&url).expect_string().body_bytes(body);
179+ self.with_auth(req, model)
271− /// Attach an RFC 7617 Basic-Auth header when the model carries credentials.
182+ /// Attach the Basic-Auth `Authorization` header if the model carries
183+ /// credentials. Uses RFC 7617 `Basic` scheme with base64-encoded
184+ /// `username:password`.
272− fn with_auth<E>(&self, req: RequestBuilder<Effect, Event, E>, model: &Model) -> RequestBuilder<Effect, Event, E>
187+ req: RequestBuilder<Effect, Event, E>,
189+ ) -> RequestBuilder<Effect, Event, E>
274 E: 'static,
191 E: 'static,
276− if model.has_credentials() {
193+ if !model.username.is_empty() || !model.password.is_empty() {
277 let creds = format!("{}:{}", model.username, model.password);
194 let creds = format!("{}:{}", model.username, model.password);
278 let encoded = base64::engine::general_purpose::STANDARD.encode(creds.as_bytes());
195 let encoded = base64::engine::general_purpose::STANDARD.encode(creds.as_bytes());
279 req.header("Authorization", format!("Basic {encoded}"))
196 req.header("Authorization", format!("Basic {encoded}"))
@@ -281,6 +198,13 @@ impl OpencodeApp {
202+ /// Render helper that also stamps the crash-log summary into the view.
203+ fn render_with_crashes(&self, _model: &Model) -> Command<Effect, Event> {
204+ // render() is the base; the view() function reads the model directly
205+ // for crash-log fields, so a plain render suffices.
286impl App for OpencodeApp {
210impl App for OpencodeApp {
@@ -291,256 +215,193 @@ impl App for OpencodeApp {
292 fn update(&self, event: Event, model: &mut Model) -> Command<Effect, Event> {
216 fn update(&self, event: Event, model: &mut Model) -> Command<Effect, Event> {
293 match event {
217 match event {
294− // ── Lifecycle / connect ─────────────────────────────────────────
295− Event::Start => render(),
218+ Event::Start => {
296−
219+ model.server_url = "http://localhost:4096".to_string();
297− // Store the field verbatim while typing; normalizing here would fight
220+ render()
298− // the user's edits (e.g. eat the "://" as they type it). The URL is
221+ }
299− // normalized once, on Connect.
222+
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.
302 Event::ServerUrlChanged(url) => {
223 Event::ServerUrlChanged(url) => {
303 model.server_url = url;
224 model.server_url = url;
304− if model.error.is_some() {
309 Event::UsernameChanged(u) => {
228 Event::UsernameChanged(u) => {
310 model.username = u;
229 model.username = u;
311− if model.error.is_some() {
316 Event::PasswordChanged(p) => {
233 Event::PasswordChanged(p) => {
317 model.password = p;
234 model.password = p;
318− if model.error.is_some() {
324 Event::Connect => {
238 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());
330 model.loading = true;
239 model.loading = true;
331 model.error = None;
240 model.error = None;
332− model.auth_required = false;
241+ // Probe health. `with_auth` attaches credentials if present,
242+ // so a retry after a 401 carries the Authorization header.
243+ let req = self.get(model, "/global/health");
333− render().and(self.get(model, "/global/health").build().then_send(Event::HealthProbed))
244+ req.build().then_send(|result| Event::HealthProbed(result))
336− Event::HealthProbed(result) => self.on_health_probed(model, result),
247+ Event::CancelAuth => {
248+ model.auth_required = false;
249+ model.username.clear();
250+ model.password.clear();
251+ model.loading = false;
338− // ── Sessions ────────────────────────────────────────────────────
339 Event::LoadSessions => {
255 Event::LoadSessions => {
340 model.loading = true;
256 model.loading = true;
341− render().and(self.get(model, "/session").build().then_send(Event::SessionsLoaded))
257+ self.get(model, "/session").build().then_send(Event::SessionsLoaded)
344 Event::SessionsLoaded(result) => {
260 Event::SessionsLoaded(result) => {
345 model.loading = false;
261 model.loading = false;
346− match ok_body(result) {
262+ match result {
347− Ok(body) => {
263+ Ok(mut response) => {
264+ let body = response.take_body().unwrap_or_default();
348− model.sessions = protocol::parse_sessions(&body)
265+ model.sessions = parse_sessions(&body);
349− .into_iter()
266+ model.connected = true;
350− .map(|s| SessionView {
267+ render()
352− title: display_title(&s.title),
354− .collect();
269+ Err(e) => {
355− // Impose a stable alphabetical order so the list doesn't shuffle
270+ model.error = Some(format!("Failed to load sessions: {e}"));
356− // with whatever order the server happens to return sessions in.
271+ render()
357− model.sessions.sort_by_key(|s| s.title.to_lowercase());
359− Err(e) => model.error = Some(e),
364 Event::SelectSession(id) => {
276 Event::SelectSession(id) => {
365− model.current_session_title = model
277+ model.current_session_id = Some(id.clone());
366− .sessions
278+ Command::event(Event::NavigateToChat(id))
368− .find(|s| s.id == id)
280+
369− .map(|s| s.title.clone())
281+ Event::NavigateToChat(id) => {
370− .unwrap_or_default();
371 model.current_session_id = Some(id.clone());
282 model.current_session_id = Some(id.clone());
372 model.messages.clear();
283 model.messages.clear();
373− model.screen = Screen::Chat;
374− model.loading = true;
376 render().and(Command::event(Event::LoadMessages(id)))
284 render().and(Command::event(Event::LoadMessages(id)))
287+ Event::NavigateToSessions => {
288+ model.current_session_id = None;
289+ model.messages.clear();
379 Event::CreateSession => {
293 Event::CreateSession => {
380 model.loading = true;
294 model.loading = true;
382− self.post_json(model, "/session", &serde_json::json!({}))
295+ self.post(model, "/session", Vec::new())
383− .build()
296+ .build()
384− .then_send(Event::SessionCreated),
297+ .then_send(Event::SessionCreated)
388 Event::SessionCreated(result) => {
300 Event::SessionCreated(result) => {
389 model.loading = false;
301 model.loading = false;
390− match ok_body(result) {
302+ match result {
391− Ok(body) => {
303+ Ok(mut response) => {
392− if let Some(s) = protocol::parse_session(&body) {
304+ let body = response.take_body().unwrap_or_default();
393− let view = SessionView {
305+ let id = parse_session_id(&body);
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)));
306+ Command::event(Event::NavigateToChat(id))
402− model.error = Some("Malformed session response".to_string());
309+ model.error = Some(format!("Failed to create session: {e}"));
404− Err(e) => model.error = Some(e),
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;
417− cmd = render().and(cmd);
421− Event::SessionDeleted(result) => {
422− if let Err(e) = ok_body(result) {
423− model.error = Some(e);
428− // ── Chat ────────────────────────────────────────────────────────
429 Event::LoadMessages(id) => {
315 Event::LoadMessages(id) => {
430− render().and(
316+ model.loading = true;
431− self.get(model, &format!("/session/{id}/message"))
317+ let path = format!("/session/{id}/message");
433− .then_send(move |result| Event::MessagesLoaded(id.clone(), result)),
318+ self.get(model, &path).build().then_send(Event::MessagesLoaded)
437− Event::MessagesLoaded(session_id, result) => {
321+ Event::MessagesLoaded(result) => {
438− if !model.is_current(&session_id) {
441 model.loading = false;
322 model.loading = false;
442− match ok_body(result) {
323+ match result {
443− Ok(body) => {
324+ Ok(mut response) => {
325+ let body = response.take_body().unwrap_or_default();
444− model.messages = protocol::parse_messages(&body).iter().map(message_from_wire).collect();
326+ model.messages = parse_messages(&body);
445− model.generating = model.messages.iter().any(|m| m.streaming);
327+ render()
330+ model.error = Some(format!("Failed to load messages: {e}"));
447− Err(e) => model.error = Some(e),
452− Event::DraftChanged(text) => {
457 Event::SendMessage(text) => {
336 Event::SendMessage(text) => {
458− let text = text.trim().to_string();
459 let Some(session_id) = model.current_session_id.clone() else {
337 let Some(session_id) = model.current_session_id.clone() else {
460 return render();
338 return render();
462− if text.is_empty() {
340+ model.draft_message.clear();
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();
471− model.generating = true;
474− let body = serde_json::json!({ "parts": [{ "type": "text", "text": text }] });
341+ let body = serde_json::json!({
475− render().and(
342+ "sessionID": session_id,
343+ "parts": [{ "type": "text", "text": text }]
476− self.post_json(model, &format!("/session/{session_id}/prompt_async"), &body)
347+ let path = format!("/session/{session_id}/prompt_async");
348+ self.post(model, &path, body)
477− .build()
349+ .build()
478− .then_send(Event::PromptSent),
350+ .then_send(Event::MessageSent)
482− Event::PromptSent(result) => {
353+ Event::MessageSent(result) => {
483− match ok_body(result) {
354+ match result {
484− Ok(_) => set_last_pending(model, MessageStatus::Sent),
355+ Ok(_) => {
356+ // Reload messages to pick up the assistant reply.
357+ if let Some(session_id) = model.current_session_id.clone() {
358+ Command::event(Event::LoadMessages(session_id))
485 Err(e) => {
363 Err(e) => {
486− set_last_pending(model, MessageStatus::Failed);
487− model.generating = false;
488− model.error = Some(e);
364+ model.error = Some(format!("Failed to send message: {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),
506− Event::Aborted(_) => render(),
370+ Event::EventReceived(_data) => {
507−
371+ // SSE event — reload messages for the current session.
508− // ── SSE ─────────────────────────────────────────────────────────
372+ if let Some(session_id) = model.current_session_id.clone() {
509− Event::ServerEvent(json) => {
373+ Command::event(Event::LoadMessages(session_id))
510− if let Some(event) = protocol::parse_event(&json) {
374+ } else {
511− apply_server_event(model, event);
375+ render()
516− // ── Navigation / misc ───────────────────────────────────────────
379+ Event::CrashLog(entry) => {
517− Event::NavigateToSessions => {
380+ model.crash_logs.push(entry);
518− model.screen = Screen::Sessions;
381+ self.render_with_crashes(model)
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;
534 Event::DismissError => {
384 Event::DismissError => {
535 model.error = None;
385 model.error = None;
389+ // ── Internal events (not type-generated, sent via then_send) ───
390+ Event::HealthProbed(result) => handle_health_probed(self, model, result),
541− fn view(&self, model: &Model) -> ViewModel {
394+ fn view(&self, model: &Self::Model) -> Self::ViewModel {
395+ let screen = if model.current_session_id.is_some() {
397+ } else if model.connected {
542 ViewModel {
403 ViewModel {
543− screen: model.screen.clone(),
404+ screen,
544 server_url: model.server_url.clone(),
405 server_url: model.server_url.clone(),
545 username: model.username.clone(),
406 username: model.username.clone(),
546 password: model.password.clone(),
407 password: model.password.clone(),
@@ -548,504 +409,341 @@ impl App for OpencodeApp {
548 connected: model.connected,
409 connected: model.connected,
549 loading: model.loading,
410 loading: model.loading,
550 error: model.error.clone(),
411 error: model.error.clone(),
551− sessions: model.sessions.clone(),
412+ sessions: model
415+ .map(|s| SessionView {
417+ title: s.title.clone(),
552 current_session_id: model.current_session_id.clone(),
420 current_session_id: model.current_session_id.clone(),
553− current_session_title: model.current_session_title.clone(),
421+ messages: model.messages.clone(),
554− messages: model.messages.iter().map(MsgState::to_view).collect(),
422+ draft_message: model.draft_message.clone(),
555− draft: model.draft.clone(),
423+ crash_log_count: model.crash_logs.len() as u32,
556− generating: model.generating,
424+ latest_crash_log: model.crash_logs.last().cloned(),
429+// ─── Basic-auth detection ──────────────────────────────────────────────────
431+// The opencode server uses HTTP Basic Auth when OPENCODE_SERVER_PASSWORD is set
432+// (username defaults to "opencode"). We detect this by probing /global/health
433+// without credentials:
435+// - 200 → server is open; proceed to load sessions.
436+// - 401 → server is behind basic auth; surface `auth_required` and wait for
437+// the user to supply credentials. The user then re-issues Connect,
438+// which now attaches the Authorization header to the same probe.
439+// A 200 on that retry flips `authed` and proceeds.
440+// - Other non-2xx → surface as a connection error.
441+// - Transport error → surface as a connection error.
443+fn handle_health_probed(
561−impl OpencodeApp {
444+ app: &OpencodeApp,
446+ result: HttpResult<String>,
562− fn on_health_probed(&self, model: &mut Model, result: HttpResult) -> Command<Effect, Event> {
447+) -> Command<Effect, Event> {
563− let has_creds = model.has_credentials();
448+ let has_creds = !model.username.is_empty() || !model.password.is_empty();
564− match result {
449+ match result {
565− Ok(response) => {
450+ Ok(response) => {
566− let status = response.status().as_u16();
451+ let status = response.status().as_u16();
568− model.loading = false;
452+ if status == 401 { model.loading = false;
569− if has_creds {
453+ if has_creds {
454+ // We sent credentials but the server still rejected them.
570− model.error = Some("Invalid credentials".to_string());
455+ model.error = Some("Invalid credentials".to_string());
571− } else {
456+ } else {
572− model.auth_required = true;
457+ // No credentials were sent — server is behind basic auth.
573− }
458+ // Surface the credential fields and wait for the user.
576− if (200..300).contains(&status) {
578− model.authed = true;
580− model.connected = true;
581− model.auth_required = false;
583− model.screen = Screen::Sessions;
584− model.loading = true;
459+ model.auth_required = true;
585− return render().and(self.get(model, "/session").build().then_send(Event::SessionsLoaded));
587− model.loading = false;
588− model.error = Some(format!("Server returned status {status}"));
589− render()
461+ return render();
592− model.loading = false;
593− model.error = Some(format!("Connection failed: {e}"));
463+ if (200..300).contains(&status) {
465+ model.authed = true;
467+ model.loading = true;
469+ .get(model, "/session")
471+ .then_send(Event::SessionsLoaded);
473+ // Other status codes — treat as connection error.
474+ model.loading = false;
475+ model.error = Some(format!("Server returned status {status}"));
479+ model.loading = false;
480+ model.error = Some(format!("Connection failed: {e}"));
600−// ─── SSE application ─────────────────────────────────────────────────────────
486+// ─── JSON parsing (minimal, avoids pulling a JSON dep into the core) ───────
602−fn apply_server_event(model: &mut Model, event: ServerEvent) {
488+fn parse_sessions(body: &str) -> Vec<SessionSummary> {
603− match event {
489+ let mut sessions = Vec::new();
604− // Only assistant messages are created from the stream — the user's own
490+ let mut depth = 0i32;
605− // message is already shown optimistically, so ignoring the server's copy
491+ let mut start = 0usize;
606− // avoids a duplicate bubble.
492+ for (i, ch) in body.char_indices() {
607− ServerEvent::MessageUpdated { properties } => {
493+ match ch {
608− let info = properties.info;
494+ '{' => {
609− if info.role != "assistant" || !model.is_current(&info.session_id) {
495+ if depth == 0 {
610− return;
496+ start = i;
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;
618− } else {
498+ depth += 1;
619− let mut msg = MsgState::new(info.id.clone(), "assistant".to_string(), info.time.created);
499+ }
620− msg.streaming = streaming;
500+ '}' => {
621− model.messages.push(msg);
501+ depth -= 1;
622− }
502+ if depth == 0 {
623− if let Some(err) = info.error {
503+ let obj = &body[start..=i];
624− model.error = Some(err.message());
504+ let id = extract_string(obj, "id").unwrap_or_default();
625− model.generating = false;
505+ let title = extract_string(obj, "title").unwrap_or_default();
626− }
506+ if !id.is_empty() {
627− }
507+ sessions.push(SessionSummary {
629− // Apply only to a message we already track (an assistant message from the
509+ title: if title.is_empty() {
630− // event above). Parts for unknown ids are ignored — see module docs.
510+ "Untitled".to_string()
631− ServerEvent::MessagePartUpdated { properties } => {
511+ } else {
632− let part = properties.part;
512+ title
633− let delta = properties.delta;
634− let msg_id = part.message_id().to_string();
635− let Some(msg) = model.message_mut(&msg_id) else {
638− match part {
514+ });
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 => {}
716−// ─── Helpers ─────────────────────────────────────────────────────────────────
524+fn parse_session_id(body: &str) -> String {
717−
525+ extract_string(body, "id").unwrap_or_default()
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}"),
731−fn message_from_wire(env: &WireMessageEnvelope) -> MsgState {
528+fn parse_messages(body: &str) -> Vec<MessageView> {
732− let info = &env.info;
529+ let mut messages = Vec::new();
733− let mut msg = MsgState::new(info.id.clone(), info.role.clone(), info.time.created);
530+ let mut depth = 0i32;
734− msg.streaming = info.role == "assistant" && info.time.completed.is_none() && info.error.is_none();
531+ let mut start = 0usize;
735− for part in &env.parts {
532+ let mut i = 0usize;
736− match part {
533+ let bytes = body.as_bytes();
737− WirePart::Text { id, text, synthetic, .. } => {
534+ while i < body.len() {
738− if !synthetic {
535+ let ch = bytes[i] as char;
739− MsgState::upsert_part(&mut msg.text_parts, id, text.clone());
536+ match ch {
546+ let obj = &body[start..=i];
547+ let id = extract_string(obj, "id").unwrap_or_default();
548+ let role = extract_string(obj, "role").unwrap_or_default();
549+ let time = extract_number(obj, "created").unwrap_or(0);
551+ let text = extract_message_text(obj);
552+ messages.push(MessageView { id, role, text, time });
742− WirePart::Reasoning { id, text, .. } => {
556+ _ => {}
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 => {}
755−fn set_last_pending(model: &mut Model, status: MessageStatus) {
563+/// Extract the text from a message part. opencode messages nest the user/assistant
756− if let Some(msg) = model.messages.iter_mut().rev().find(|m| m.status == MessageStatus::Pending) {
564+/// text inside a `parts` array; we do a shallow scan for `"text":"..."` after the
757− msg.status = status;
565+/// first `"parts"` key.
758− }
566+fn extract_message_text(obj: &str) -> String {
759−}
567+ if let Some(parts_idx) = obj.find("\"parts\"") {
760−
568+ let rest = &obj[parts_idx..];
761−/// Trim whitespace and any trailing `/` so paths concatenate cleanly, and
569+ if let Some(text) = extract_string(rest, "text") {
762−/// default to an `http://` scheme when the user didn't type one (e.g.
570+ return text;
763−/// "192.168.1.10:4096") — otherwise the shell's URL parser rejects it.
571+ }
764−fn normalize_url(url: &str) -> String {
765− let trimmed = url.trim().trim_end_matches('/');
766− if trimmed.is_empty() {
768− } else if trimmed.contains("://") {
771− format!("http://{trimmed}")
573+ extract_string(obj, "text").unwrap_or_default()
775−fn display_title(title: &str) -> String {
576+fn extract_string(json: &str, key: &str) -> Option<String> {
776− let t = title.trim();
577+ let pattern = format!("\"{key}\"");
777− if t.is_empty() {
578+ let idx = json.find(&pattern)?;
778− "Untitled".to_string()
579+ let rest = &json[idx + pattern.len()..];
779− } else {
580+ let colon = rest.find(':')?;
780− t.to_string()
581+ let rest = &rest[colon + 1..];
781− }
582+ let quote = rest.find('"')?;
583+ let rest = &rest[quote + 1..];
584+ let end = rest.find('"')?;
585+ Some(rest[..end].to_string())
784−/// Reduce an [`HttpResult`] to `Ok(body)` for 2xx, or `Err(message)` otherwise.
588+fn extract_number(json: &str, key: &str) -> Option<u64> {
785−fn ok_body(result: HttpResult) -> Result<String, String> {
589+ let pattern = format!("\"{key}\"");
786− match result {
590+ let idx = json.find(&pattern)?;
787− Ok(mut response) => {
591+ let rest = &json[idx + pattern.len()..];
788− let status = response.status().as_u16();
592+ let colon = rest.find(':')?;
789− if (200..300).contains(&status) {
593+ let rest = &rest[colon + 1..].trim_start();
790− Ok(response.take_body().unwrap_or_default())
594+ let end = rest
791− } else {
595+ .find(|c: char| !c.is_ascii_digit())
792− Err(format!("Server returned status {status}"))
596+ .unwrap_or(rest.len());
793− }
597+ rest[..end].parse().ok()
795− Err(e) => Err(format!("Request failed: {e}")),
799−// ─── Tests ───────────────────────────────────────────────────────────────────
600+// ─── Tests ─────────────────────────────────────────────────────────────────
801#[cfg(test)]
602#[cfg(test)]
802−mod tests {
603+mod test {
803 use super::*;
604 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);
824− fn server_url_is_kept_raw_while_typing() {
826− 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:/");
834− fn connect_normalizes_scheme_less_url() {
607+ fn start_sets_default_server_url() {
835− let app = app();
608+ let app = OpencodeApp;
836 let mut model = Model::default();
609 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);
610+ app.update(Event::Start, &mut model).expect_only_render();
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");
611+ assert_eq!(model.server_url, "http://localhost:4096");
846− fn connect_trims_and_keeps_explicit_scheme() {
615+ fn server_url_change_updates_model() {
847− let app = app();
616+ let app = OpencodeApp;
848 let mut model = Model::default();
617 let mut model = Model::default();
618+ app.update(Event::Start, &mut model);
849− let _ = app.update(Event::ServerUrlChanged(" https://host:4096/ ".into()), &mut model);
620+ Event::ServerUrlChanged("http://10.0.0.1:4096".to_string()),
850− let _ = app.update(Event::Connect, &mut model);
621+ &mut model,
623+ .expect_only_render();
851− assert_eq!(app.view(&model).server_url, "https://host:4096");
624+ assert_eq!(model.server_url, "http://10.0.0.1:4096");
855− fn connect_requires_a_url() {
628+ fn connect_emits_http_effect() {
856− let app = app();
629+ let app = OpencodeApp;
857 let mut model = Model::default();
630 let mut model = Model::default();
631+ app.update(Event::Start, &mut model);
858− let _ = app.update(Event::Connect, &mut model);
632+ let mut cmd = app.update(Event::Connect, &mut model);
859− assert_eq!(app.view(&model).error.as_deref(), Some("Enter a server URL"));
633+ assert!(cmd.effects().any(|e| matches!(e, Effect::Http(_))));
863− fn sending_adds_optimistic_user_message_and_sets_generating() {
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);
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);
879− fn empty_send_is_ignored() {
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);
634+ assert!(model.loading);
888− fn assistant_reply_streams_in_from_sse() {
638+ fn parse_sessions_extracts_id_and_title() {
889− let app = app();
639+ let json = r#"[{"id":"abc123","title":"My Session"},{"id":"def456","title":"Test"}]"#;
890− let mut model = in_chat("ses_1");
640+ let sessions = parse_sessions(json);
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);
641+ assert_eq!(sessions.len(), 2);
901− assert!(app.view(&model).messages[0].streaming);
642+ assert_eq!(sessions[0].id, "abc123");
902−
643+ assert_eq!(sessions[0].title, "My Session");
903− // Two text deltas for the same part accumulate into full text.
644+ assert_eq!(sessions[1].id, "def456");
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");
925− fn text_delta_accumulates_when_full_text_absent() {
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}}}
932− for delta in ["Wor", "ld"] {
933− feed(&app, &mut model, serde_json::json!({
934− "type": "message.part.updated",
936− "part": { "id": "p", "messageID": "msg_a", "sessionID": "ses_1", "type": "text", "text": "" },
941− assert_eq!(app.view(&model).messages[0].text, "World");
945− fn user_message_from_sse_is_not_duplicated() {
648+ fn parse_session_id_extracts_id() {
946− let app = app();
649+ let json = r#"{"id":"xyz789","title":"New"}"#;
947− let mut model = in_chat("ses_1");
650+ let id = parse_session_id(json);
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}}}
954− let users = app.view(&model).messages.iter().filter(|m| m.role == "user").count();
955− assert_eq!(users, 1);
651+ assert_eq!(id, "xyz789");
959− fn session_idle_clears_generating() {
655+ fn extract_string_finds_nested_keys() {
960− let app = app();
656+ let json = r#"{"a":"b","id":"target","c":"d"}"#;
961− let mut model = in_chat("ses_1");
657+ assert_eq!(extract_string(json, "id"), Some("target".to_string()));
962− let _ = app.update(Event::SendMessage("hi".into()), &mut model);
658+ assert_eq!(extract_string(json, "missing"), None);
963− assert!(app.view(&model).generating);
964− feed(&app, &mut model, serde_json::json!({
965− "type": "session.idle", "properties": { "sessionID": "ses_1" }
967− assert!(!app.view(&model).generating);
971− fn idle_for_other_session_is_ignored() {
662+ fn extract_number_parses_values() {
972− let app = app();
663+ let json = r#"{"created":1234567890}"#;
973− let mut model = in_chat("ses_1");
664+ assert_eq!(extract_number(json, "created"), Some(1234567890));
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" }
978− assert!(app.view(&model).generating);
982− fn reasoning_and_tool_parts_are_surfaced() {
668+ fn navigate_to_sessions_clears_state() {
983− let app = app();
669+ let app = OpencodeApp;
984− let mut model = in_chat("ses_1");
670+ let mut model = Model::default();
985− feed(&app, &mut model, serde_json::json!({
671+ model.current_session_id = Some("test".to_string());
986− "type": "message.updated",
672+ model.messages.push(MessageView {
987− "properties": { "info": { "id": "m", "role": "assistant", "sessionID": "ses_1", "time": {"created": 1}}}
673+ id: "m1".to_string(),
988− }));
674+ role: "user".to_string(),
989− feed(&app, &mut model, serde_json::json!({
675+ text: "hello".to_string(),
990− "type": "message.part.updated",
676+ time: 0,
991− "properties": { "part": { "id": "r", "messageID": "m", "type": "reasoning", "text": "thinking..." }}
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];
678+ app.update(Event::NavigateToSessions, &mut model);
1001− assert_eq!(msg.reasoning.as_deref(), Some("thinking..."));
679+ assert!(model.current_session_id.is_none());
1002− assert_eq!(msg.tools.len(), 1);
680+ assert!(model.messages.is_empty());
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"));
1009− fn session_created_event_updates_list() {
684+ fn auth_header_built_from_credentials() {
1010− let app = app();
685+ let app = OpencodeApp;
1011− let mut model = in_chat("ses_1");
686+ let mut model = Model::default();
1012− feed(&app, &mut model, serde_json::json!({
687+ model.server_url = "http://localhost:4096".to_string();
1013− "type": "session.created",
688+ model.username = "opencode".to_string();
1014− "properties": { "info": { "id": "ses_new", "title": "Fresh" }}
689+ model.password = "secret".to_string();
1015− }));
690+ // Verify the base64 encoding matches RFC 7617.
1016− assert!(app.view(&model).sessions.iter().any(|s| s.id == "ses_new" && s.title == "Fresh"));
691+ let creds = format!("{}:{}", model.username, model.password);
692+ let encoded = base64::engine::general_purpose::STANDARD.encode(creds.as_bytes());
693+ assert_eq!(encoded, "b3BlbmNvZGU6c2VjcmV0");
694+ // Building a request should not panic.
695+ let _ = app.get(&model, "/global/health");
1020− fn unknown_event_types_are_ignored() {
699+ fn crash_log_event_accumulates() {
1021− let app = app();
700+ let app = OpencodeApp;
1022− let mut model = in_chat("ses_1");
701+ let mut model = Model::default();
1023− feed(&app, &mut model, serde_json::json!({
702+ app.update(Event::CrashLog("boom".to_string()), &mut model);
1024− "type": "pty.created", "properties": { "whatever": true }
703+ assert_eq!(model.crash_logs.len(), 1);
1025− }));
704+ let view = app.view(&model);
1026− feed(&app, &mut model, serde_json::json!({ "type": "totally.new.event" }));
705+ assert_eq!(view.crash_log_count, 1);
1027− // No panic, no state change.
706+ assert_eq!(view.latest_crash_log.as_deref(), Some("boom"));
1028− assert!(app.view(&model).messages.is_empty());
709+ /// Verify that the bincode discriminant indices the shell sends match
710+ /// the Rust enum variant positions — the type generator skips
711+ /// `#[facet(skip)]` variants and renumbers the remaining ones, so the
712+ /// shell's index 7 (SelectSession) must land on Rust's SelectSession,
713+ /// not on a skipped variant.
1032− fn messages_loaded_parses_info_and_parts() {
715+ fn event_discriminants_match_generated_indices() {
1033− let app = app();
716+ // The generated Kotlin Event enum (see generated/.../Core.kt) maps:
1034− let mut model = in_chat("ses_1");
717+ // 0=Start, 1=ServerUrlChanged, 2=UsernameChanged, 3=PasswordChanged,
1035− let body = serde_json::json!([
718+ // 4=Connect, 5=CancelAuth, 6=LoadSessions, 7=SelectSession,
1036− { "info": { "id": "m1", "role": "user", "sessionID": "ses_1", "time": {"created": 1} },
719+ // 8=CreateSession, 9=LoadMessages, 10=SendMessage, 11=EventReceived,
1037− "parts": [{ "id": "p1", "type": "text", "text": "Question?" }] },
720+ // 12=NavigateToChat, 13=NavigateToSessions, 14=DismissError
1038− { "info": { "id": "m2", "role": "assistant", "sessionID": "ses_1", "time": {"created": 2, "completed": 3} },
721+ //
1039− "parts": [{ "id": "p2", "type": "text", "text": "Answer." }] }
722+ // Serialize each Rust variant and check the leading u32 index.
1040− ]).to_string();
723+ let cases: &[(Event, u32)] = &[
1041− let result: HttpResult = Ok(crux_http::testing::ResponseBuilder::ok().body(body).build());
724+ (Event::Start, 0),
1042− let _ = app.update(Event::MessagesLoaded("ses_1".into(), result), &mut model);
725+ (Event::ServerUrlChanged(String::new()), 1),
1043−
726+ (Event::UsernameChanged(String::new()), 2),
1044− let view = app.view(&model);
727+ (Event::PasswordChanged(String::new()), 3),
1045− assert_eq!(view.messages.len(), 2);
728+ (Event::Connect, 4),
729+ (Event::CancelAuth, 5),
730+ (Event::LoadSessions, 6),
731+ (Event::SelectSession(String::new()), 7),
732+ (Event::CreateSession, 8),
733+ (Event::LoadMessages(String::new()), 9),
734+ (Event::SendMessage(String::new()), 10),
735+ (Event::EventReceived(String::new()), 11),
736+ (Event::NavigateToChat(String::new()), 12),
737+ (Event::NavigateToSessions, 13),
738+ (Event::DismissError, 14),
740+ for (event, expected) in cases {
741+ let bytes = bincode::serialize(event).unwrap();
742+ let idx = u32::from_le_bytes(bytes[0..4].try_into().unwrap());
1046− assert_eq!(view.messages[0].text, "Question?");
743+ assert_eq!(
1047− assert_eq!(view.messages[1].text, "Answer.");
744+ idx, *expected,
1048− assert!(!view.messages[1].streaming);
745+ "Event discriminant mismatch for {event:?}: got {idx}, expected {expected}"
1049− assert!(!view.generating);
746+ );