diff options
| author | soryu <soryu@soryu.co> | 2026-01-22 01:26:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-22 01:26:53 +0000 |
| commit | b61a907bac09a7649ca3f6d850e771b3b75c7015 (patch) | |
| tree | a7794d5b29bc165b6d76596d6e53cf75158d3a64 /makima/src/server | |
| parent | b84b3f782d3a3d6bf7ed8040fd72907ca19db8c6 (diff) | |
| download | soryu-b61a907bac09a7649ca3f6d850e771b3b75c7015.tar.gz soryu-b61a907bac09a7649ca3f6d850e771b3b75c7015.zip | |
Add daemon restart feature from settings (#18)
* Add daemon restart feature from settings
This adds the ability to restart a connected daemon from the settings page.
The feature includes:
- Backend: RestartDaemon command added to DaemonCommand enum
- Backend: New POST /api/v1/mesh/daemons/{id}/restart endpoint
- Backend: Daemon gracefully shuts down tasks and exits with code 42
(can be used by process managers like systemd to detect restart requests)
- Frontend: restartDaemon() API function
- Frontend: Restart button in Connected Daemons section of settings
- Frontend: Confirmation dialog before restart to prevent accidental restarts
When a daemon receives the restart command, it:
1. Gracefully shuts down all running Claude processes (5s timeout)
2. Exits with code 42 to signal restart requested
3. The daemon can be restarted by a process manager or manually
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Diffstat (limited to 'makima/src/server')
| -rw-r--r-- | makima/src/server/handlers/mesh.rs | 109 | ||||
| -rw-r--r-- | makima/src/server/mod.rs | 1 | ||||
| -rw-r--r-- | makima/src/server/state.rs | 3 |
3 files changed, 113 insertions, 0 deletions
diff --git a/makima/src/server/handlers/mesh.rs b/makima/src/server/handlers/mesh.rs index 99c3d9d..53e1587 100644 --- a/makima/src/server/handlers/mesh.rs +++ b/makima/src/server/handlers/mesh.rs @@ -3561,3 +3561,112 @@ pub async fn branch_task( ) .into_response() } + +// ============================================================================= +// Daemon Management +// ============================================================================= + +/// Response for restart daemon request. +#[derive(Debug, serde::Serialize, utoipa::ToSchema)] +#[serde(rename_all = "camelCase")] +pub struct RestartDaemonResponse { + /// Whether the restart command was sent successfully. + pub success: bool, + /// The daemon ID that received the restart command. + pub daemon_id: Uuid, + /// Message describing the result. + pub message: String, +} + +/// Restart a daemon by ID (requires authentication). +/// +/// Sends a restart command to the specified daemon, which will cause it to +/// gracefully terminate and restart. Any running tasks will be interrupted. +#[utoipa::path( + post, + path = "/api/v1/mesh/daemons/{id}/restart", + params( + ("id" = Uuid, Path, description = "Daemon ID") + ), + responses( + (status = 200, description = "Restart command sent", body = RestartDaemonResponse), + (status = 401, description = "Unauthorized", body = ApiError), + (status = 404, description = "Daemon not found or not connected", body = ApiError), + (status = 503, description = "Database not configured", body = ApiError), + (status = 500, description = "Internal server error", body = ApiError), + ), + security( + ("bearer_auth" = []), + ("api_key" = []) + ), + tag = "Mesh" +)] +pub async fn restart_daemon( + State(state): State<SharedState>, + Authenticated(auth): Authenticated, + Path(id): Path<Uuid>, +) -> impl IntoResponse { + let Some(ref pool) = state.db_pool else { + return ( + StatusCode::SERVICE_UNAVAILABLE, + Json(ApiError::new("DB_UNAVAILABLE", "Database not configured")), + ) + .into_response(); + }; + + // Verify the daemon exists and belongs to this owner + match repository::get_daemon_for_owner(pool, id, auth.owner_id).await { + Ok(Some(_)) => {} + Ok(None) => { + return ( + StatusCode::NOT_FOUND, + Json(ApiError::new("NOT_FOUND", "Daemon not found")), + ) + .into_response(); + } + Err(e) => { + tracing::error!("Failed to get daemon {}: {}", id, e); + return ( + StatusCode::INTERNAL_SERVER_ERROR, + Json(ApiError::new("DB_ERROR", e.to_string())), + ) + .into_response(); + } + } + + // Check if daemon is connected + if !state.is_daemon_connected(id) { + return ( + StatusCode::NOT_FOUND, + Json(ApiError::new( + "DAEMON_NOT_CONNECTED", + "Daemon is not currently connected", + )), + ) + .into_response(); + } + + // Send restart command to daemon + let command = DaemonCommand::RestartDaemon; + if let Err(e) = state.send_daemon_command(id, command).await { + tracing::error!("Failed to send restart command to daemon {}: {}", id, e); + return ( + StatusCode::INTERNAL_SERVER_ERROR, + Json(ApiError::new("DAEMON_ERROR", e)), + ) + .into_response(); + } + + tracing::info!( + daemon_id = %id, + owner_id = %auth.owner_id, + "Restart command sent to daemon" + ); + + Json(RestartDaemonResponse { + success: true, + daemon_id: id, + message: "Restart command sent. The daemon will restart shortly.".to_string(), + }) + .into_response() +} diff --git a/makima/src/server/mod.rs b/makima/src/server/mod.rs index d575997..0bc1b92 100644 --- a/makima/src/server/mod.rs +++ b/makima/src/server/mod.rs @@ -93,6 +93,7 @@ pub fn make_router(state: SharedState) -> Router { .route("/mesh/daemons", get(mesh::list_daemons)) .route("/mesh/daemons/directories", get(mesh::get_daemon_directories)) .route("/mesh/daemons/{id}", get(mesh::get_daemon)) + .route("/mesh/daemons/{id}/restart", post(mesh::restart_daemon)) // Merge endpoints for orchestrators .route("/mesh/tasks/{id}/branches", get(mesh_merge::list_branches)) .route("/mesh/tasks/{id}/merge/start", post(mesh_merge::merge_start)) diff --git a/makima/src/server/state.rs b/makima/src/server/state.rs index 38aadf5..28d65d0 100644 --- a/makima/src/server/state.rs +++ b/makima/src/server/state.rs @@ -435,6 +435,9 @@ pub enum DaemonCommand { /// Error response Error { code: String, message: String }, + + /// Restart the daemon process + RestartDaemon, } /// Active daemon connection info stored in state. |
