From 3ea2c72e2c50c0d73614d9ac82f41508b6ab1ce4 Mon Sep 17 00:00:00 2001 From: soryu Date: Sat, 31 Jan 2026 22:17:09 +0000 Subject: Add auto_merge_local option for local-only contracts (#50) When local_only=true on a contract, all completion actions are skipped. This adds a new option auto_merge_local that, when enabled along with local_only, will automatically merge completed task changes to the master/main branch locally (without pushing or creating PRs). Changes: - Add auto_merge_local column to contracts table (migration) - Add auto_merge_local field to Contract model and summary - Update CreateContractRequest and UpdateContractRequest structs - Update contract repository create/update functions - Add auto_merge_local to WebSocket protocol StartTask command - Pass auto_merge_local through spawn_task and run_task functions - Modify task manager completion logic: if local_only=true AND auto_merge_local=true, execute 'merge' completion action locally - Update all server handlers to retrieve and pass auto_merge_local - Add TypeScript types to frontend components Co-authored-by: Claude Opus 4.5 --- makima/src/server/state.rs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'makima/src/server/state.rs') 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, -- cgit v1.2.3