Merge lifecycle improvementsmakima/contract-lifecycle-cleanup

Resolved conflict in supervisor.rs by keeping both:
- supervisor_complete and supervisor_resume_contract methods (lifecycle management)
- delete_task and update_task methods (task management)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/makima/src/daemon/tui/mod.rs b/makima/src/daemon/tui/mod.rs
index fd1d44d..4cb4f60 100644
--- a/makima/src/daemon/tui/mod.rs
+++ b/makima/src/daemon/tui/mod.rs
@@ -14,8 +14,10 @@ pub mod app;
 pub mod event;
 pub mod fuzzy;
 pub mod ui;
+pub mod ws_client;
 
-pub use app::{App, ListItem, ViewType, InputMode, Action};
+pub use app::{App, ListItem, ViewType, ViewState, InputMode, Action, OutputBuffer, OutputLine, OutputMessageType, WsConnectionState};
+pub use ws_client::{TuiWsClient, WsCommand, WsEvent, TaskOutputEvent};
 pub use fuzzy::FuzzyMatcher;
 
 use std::io;