diff options
| author | soryu <soryu@soryu.co> | 2026-04-28 19:12:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-04-28 19:12:52 +0100 |
| commit | d1fdfb140cc440664f77a24886172f9976a05a31 (patch) | |
| tree | 454739f80dde60fc6c1cd97acbaef3223ac041c6 /makima/src/daemon | |
| parent | 636694182fe9381479f2e9062229dda3838c5421 (diff) | |
| download | soryu-d1fdfb140cc440664f77a24886172f9976a05a31.tar.gz soryu-d1fdfb140cc440664f77a24886172f9976a05a31.zip | |
feat: revert broken directive PRs, re-implement Lexical document orchestrator (#98)
* feat: soryu-co/soryu - makima: Revert broken directive PRs and verify clean build
* feat: soryu-co/soryu - makima: Re-implement frontend: Lexical document editor with feature flag and base components
* WIP: heartbeat checkpoint
* feat: soryu-co/soryu - makima: Add contract blocks, expandable log rows, and interaction controls
* WIP: heartbeat checkpoint
* feat: soryu-co/soryu - makima: End-to-end build verification and integration polish
Diffstat (limited to 'makima/src/daemon')
| -rw-r--r-- | makima/src/daemon/process/claude.rs | 2 | ||||
| -rw-r--r-- | makima/src/daemon/storage/patch.rs | 1 | ||||
| -rw-r--r-- | makima/src/daemon/task/manager.rs | 6 | ||||
| -rw-r--r-- | makima/src/daemon/tui/mod.rs | 1 |
4 files changed, 3 insertions, 7 deletions
diff --git a/makima/src/daemon/process/claude.rs b/makima/src/daemon/process/claude.rs index aa18fab..57c8f77 100644 --- a/makima/src/daemon/process/claude.rs +++ b/makima/src/daemon/process/claude.rs @@ -577,7 +577,6 @@ impl ProcessManager { // On Unix, create a new process group so we can kill all child processes #[cfg(unix)] { - #[allow(unused_imports)] use std::os::unix::process::CommandExt; cmd.process_group(0); } @@ -763,7 +762,6 @@ impl ProcessManager { // On Unix, create a new process group so we can kill all child processes #[cfg(unix)] { - #[allow(unused_imports)] use std::os::unix::process::CommandExt; cmd.process_group(0); } diff --git a/makima/src/daemon/storage/patch.rs b/makima/src/daemon/storage/patch.rs index c9bc6f5..05c45a3 100644 --- a/makima/src/daemon/storage/patch.rs +++ b/makima/src/daemon/storage/patch.rs @@ -387,7 +387,6 @@ fn parse_diff_stat(stat_output: &str) -> (usize, usize) { } /// Checkout a specific commit in the worktree. -#[allow(dead_code)] pub async fn checkout_commit(worktree_path: &Path, sha: &str) -> Result<(), PatchError> { let output = Command::new("git") .current_dir(worktree_path) diff --git a/makima/src/daemon/task/manager.rs b/makima/src/daemon/task/manager.rs index f483218..ca97453 100644 --- a/makima/src/daemon/task/manager.rs +++ b/makima/src/daemon/task/manager.rs @@ -20,7 +20,7 @@ use crate::daemon::error::{DaemonError, TaskError, TaskResult}; use crate::daemon::process::{ClaudeInputMessage, ProcessManager}; use crate::daemon::storage; use crate::daemon::temp::TempManager; -use crate::daemon::worktree::{is_new_repo_request, ConflictResolution, WorktreeInfo, WorktreeManager}; +use crate::daemon::worktree::{is_new_repo_request, ConflictResolution, WorktreeError, WorktreeInfo, WorktreeManager}; use crate::daemon::db::local::LocalDb; use crate::daemon::ws::{BranchInfo, DaemonCommand, DaemonMessage}; @@ -3706,7 +3706,6 @@ impl TaskManager { } /// Handle GetWorktreeDiff command - get git diff for a task's worktree. - #[allow(dead_code)] async fn handle_get_worktree_diff( &self, task_id: Uuid, @@ -5623,7 +5622,7 @@ impl TaskManagerInner { let ws_tx = self.ws_tx.clone(); // For auth error detection - let _claude_command = self.process_manager.claude_command().to_string(); + let claude_command = self.process_manager.claude_command().to_string(); let daemon_hostname = hostname::get().ok().and_then(|h| h.into_string().ok()); let mut auth_error_handled = false; @@ -5631,7 +5630,6 @@ impl TaskManagerInner { let mut accumulated_output = String::new(); let mut circuit_breaker = CircuitBreaker::new(); let mut iteration_count = 0u32; - #[allow(unused_assignments)] let mut final_exit_code: i64 = -1; // Track the final exit code across iterations // Autonomous loop: we may run multiple iterations diff --git a/makima/src/daemon/tui/mod.rs b/makima/src/daemon/tui/mod.rs index 46652ec..e52b12a 100644 --- a/makima/src/daemon/tui/mod.rs +++ b/makima/src/daemon/tui/mod.rs @@ -26,6 +26,7 @@ use crossterm::{ execute, terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen}, }; +use ratatui::prelude::*; use ratatui::backend::CrosstermBackend; pub type Terminal = ratatui::Terminal<CrosstermBackend<io::Stdout>>; |
