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.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/makima/src/server/state.rs b/makima/src/server/state.rs
index 8a9bb7f..f662e30 100644
--- a/makima/src/server/state.rs
+++ b/makima/src/server/state.rs
@@ -274,6 +274,9 @@ pub enum DaemonCommand {
/// Whether the contract is in local-only mode (skips automatic completion actions)
#[serde(rename = "localOnly", default)]
local_only: bool,
+ /// Whether to auto-merge to target branch locally when local_only mode is enabled
+ #[serde(rename = "autoMergeLocal", default)]
+ auto_merge_local: bool,
/// Task ID to share worktree with (supervisor's task ID). If Some, use that task's worktree instead of creating a new one.
#[serde(rename = "supervisorWorktreeTaskId", default, skip_serializing_if = "Option::is_none")]
supervisor_worktree_task_id: Option<Uuid>,