summaryrefslogtreecommitdiff
path: root/makima/src/server/state.rs
diff options
context:
space:
mode:
Diffstat (limited to 'makima/src/server/state.rs')
-rw-r--r--makima/src/server/state.rs17
1 files changed, 17 insertions, 0 deletions
diff --git a/makima/src/server/state.rs b/makima/src/server/state.rs
index 6872d5e..1bc7d7e 100644
--- a/makima/src/server/state.rs
+++ b/makima/src/server/state.rs
@@ -506,6 +506,23 @@ pub enum DaemonCommand {
/// Restart the daemon process
RestartDaemon,
+
+ /// Apply a patch to a task's worktree (for cross-daemon merge).
+ /// Sent by server when routing MergePatchToSupervisor to the supervisor's daemon.
+ ApplyPatchToWorktree {
+ /// Target task whose worktree should be patched.
+ #[serde(rename = "targetTaskId")]
+ target_task_id: Uuid,
+ /// Source task that generated the patch (for logging).
+ #[serde(rename = "sourceTaskId")]
+ source_task_id: Uuid,
+ /// Base64-gzipped patch data.
+ #[serde(rename = "patchData")]
+ patch_data: String,
+ /// Base commit SHA for the patch.
+ #[serde(rename = "baseSha")]
+ base_sha: String,
+ },
}
/// Active daemon connection info stored in state.