From ec9738a069e61529be040eff065318972b8a11e2 Mon Sep 17 00:00:00 2001 From: soryu Date: Wed, 4 Mar 2026 16:47:12 +0000 Subject: feat: task slide-out panel, 3-way reconcile toggle, daemon reauth fix (#85) * WIP: heartbeat checkpoint * WIP: heartbeat checkpoint * feat: soryu-co/soryu - makima: Fix daemon reauth flow for new claude setup-token output format * feat: soryu-co/soryu - makima: Update frontend reconcile toggle to three-way switch * feat: soryu-co/soryu - makima: Add task slide-out panel to directive page --- makima/src/server/handlers/mesh_daemon.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'makima/src/server/handlers/mesh_daemon.rs') diff --git a/makima/src/server/handlers/mesh_daemon.rs b/makima/src/server/handlers/mesh_daemon.rs index 30439a4..d5ef1f9 100644 --- a/makima/src/server/handlers/mesh_daemon.rs +++ b/makima/src/server/handlers/mesh_daemon.rs @@ -354,13 +354,16 @@ pub enum DaemonMessage { ReauthStatus { #[serde(rename = "requestId")] request_id: Uuid, - /// Status: "url_ready", "completed", "failed" + /// Status: "pending", "url_ready", "completed", "failed" status: String, /// OAuth login URL (present when status is "url_ready") #[serde(rename = "loginUrl")] login_url: Option, /// Error message (present when status is "failed") error: Option, + /// Whether the OAuth token has been saved to disk + #[serde(rename = "tokenSaved", default)] + token_saved: bool, }, /// Response to RetryCompletionAction command CompletionActionResult { @@ -1634,13 +1637,14 @@ async fn handle_daemon_connection(socket: WebSocket, state: SharedState, auth_re "OAuth login URL available - user should open this in browser" ); } - Ok(DaemonMessage::ReauthStatus { request_id, status, login_url, error }) => { + Ok(DaemonMessage::ReauthStatus { request_id, status, login_url, error, token_saved }) => { tracing::info!( daemon_id = %daemon_uuid, request_id = %request_id, status = %status, login_url = ?login_url, error = ?error, + token_saved = token_saved, "Daemon reauth status update" ); -- cgit v1.2.3