fix: merge

Author: shepherdjerred

packages/multiplexer/src/api/client.rs

@@ -8,7 +8,6 @@ use crate::utils::{daemon, paths};
 use super::protocol::{CreateSessionRequest, ProgressStep, Request, Response};
 use super::traits::ApiClient;
 use super::types::ReconcileReportDto;
-use crate::core::session::AccessMode;
 
 /// Callback type for progress updates
 pub type ProgressCallback = Box<dyn Fn(ProgressStep) + Send + Sync>;

packages/multiplexer/src/api/server.rs

@@ -1,7 +1,6 @@
 use std::sync::Arc;
 use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
 use tokio::net::{UnixListener, UnixStream};
-use tokio::sync::Mutex;
 
 use crate::backends::{DockerBackend, DockerProxyConfig};
 use crate::core::SessionManager;

packages/multiplexer/src/main.rs

@@ -49,16 +49,13 @@ enum Commands {
         #[arg(long, default_value = "false")]
         print: bool,
 
-<<<<<<< Updated upstream
         /// Access mode (read-only or read-write)
         #[arg(long, default_value = "read-write")]
         access_mode: String,
-||||||| Stash base
-=======
+
         /// Skip plan mode (start directly in implementation mode)
         #[arg(long, default_value = "false")]
         no_plan_mode: bool,
->>>>>>> Stashed changes
     },
 
     /// List all sessions
@@ -151,12 +148,8 @@ async fn main() -> anyhow::Result<()> {
             backend,
             dangerous_skip_checks,
             print,
-<<<<<<< Updated upstream
             access_mode,
-||||||| Stash base
-=======
             no_plan_mode,
->>>>>>> Stashed changes
         } => {
             let backend_type = match backend.to_lowercase().as_str() {
                 "zellij" => core::session::BackendType::Zellij,
@@ -176,14 +169,8 @@ async fn main() -> anyhow::Result<()> {
                     agent: core::session::AgentType::ClaudeCode,
                     dangerous_skip_checks,
                     print_mode: print,
-<<<<<<< Updated upstream
-                    plan_mode: true, // Default to plan mode for safety
-                    access_mode,
-||||||| Stash base
-                    plan_mode: true, // Default to plan mode for safety
-=======
                     plan_mode: !no_plan_mode,
->>>>>>> Stashed changes
+                    access_mode,
                     images: vec![],
                 })
                 .await?;

packages/multiplexer/src/tui/mod.rs

@@ -279,7 +279,7 @@ async fn run_main_loop(
                     app.status_message = Some(format!("Deleted session {session_id}"));
                     let _ = app.refresh_sessions().await;
                 }
-                app::DeleteProgress::Error { session_id, message } => {
+                app::DeleteProgress::Error { session_id: _, message } => {
                     app.deleting_session_id = None;
                     app.delete_progress_rx = None;
                     // Task is already complete - just take the handle to clean up