diff options
| author | soryu <soryu@soryu.co> | 2026-01-20 16:45:34 +0000 |
|---|---|---|
| committer | soryu <soryu@soryu.co> | 2026-01-20 16:45:34 +0000 |
| commit | c6c69af39b29276920b07e0d220f7016335f1019 (patch) | |
| tree | 13a4b58b00f67076b532933b9f8f208122d54bf9 /makima/src/daemon/mod.rs | |
| parent | 36233b7cb834223878aa075bb379846eb6d7bb05 (diff) | |
| parent | a3ecb076a4f83f9c33fc3e4ad64af72c81b3ffd0 (diff) | |
| download | soryu-makima/contract-lifecycle-cleanup.tar.gz soryu-makima/contract-lifecycle-cleanup.zip | |
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>
Diffstat (limited to 'makima/src/daemon/mod.rs')
| -rw-r--r-- | makima/src/daemon/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/makima/src/daemon/mod.rs b/makima/src/daemon/mod.rs index c348838..349a769 100644 --- a/makima/src/daemon/mod.rs +++ b/makima/src/daemon/mod.rs @@ -19,6 +19,6 @@ pub mod tui; pub mod worktree; pub mod ws; -pub use cli::{Cli, Commands, ContractCommand, SupervisorCommand, ViewCommand}; +pub use cli::{Cli, Commands, ContractCommand, SupervisorCommand, ViewArgs}; pub use config::DaemonConfig; pub use error::{DaemonError, Result}; |