diff options
Diffstat (limited to 'makima/src/db/models.rs')
| -rw-r--r-- | makima/src/db/models.rs | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/makima/src/db/models.rs b/makima/src/db/models.rs index 4411747..a6b5b05 100644 --- a/makima/src/db/models.rs +++ b/makima/src/db/models.rs @@ -1448,6 +1448,11 @@ pub struct Contract { /// allowing users to manually handle code changes via patch files or other means. #[serde(default)] pub local_only: bool, + /// Whether to auto-merge to target branch locally when local_only mode is enabled. + /// When both local_only and auto_merge_local are true, completed task changes will be + /// automatically merged to the master/main branch locally (without pushing or creating PRs). + #[serde(default)] + pub auto_merge_local: bool, /// Whether to spawn a red team task to monitor work tasks. /// When enabled, a parallel task monitors outputs and can alert /// the supervisor about potential issues. @@ -1641,6 +1646,9 @@ pub struct ContractSummary { /// When true, tasks do not auto-execute completion actions and work stays in worktrees. #[serde(default)] pub local_only: bool, + /// When true with local_only, automatically merge completed tasks to target branch locally. + #[serde(default)] + pub auto_merge_local: bool, /// Whether red team monitoring is enabled for this contract. #[serde(default)] pub red_team_enabled: bool, @@ -1710,6 +1718,11 @@ pub struct CreateContractRequest { /// allowing users to manually handle code changes via patch files or other means. #[serde(default)] pub local_only: Option<bool>, + /// Enable auto-merge to target branch locally when local_only mode is enabled. + /// When both local_only and auto_merge_local are true, completed task changes will be + /// automatically merged to the master/main branch locally (without pushing or creating PRs). + #[serde(default)] + pub auto_merge_local: Option<bool>, /// Enable red team monitoring for this contract. /// When enabled, a parallel task monitors work task outputs /// and can alert the supervisor about potential issues. @@ -1745,6 +1758,11 @@ pub struct UpdateContractRequest { /// allowing users to manually handle code changes via patch files or other means. #[serde(default)] pub local_only: Option<bool>, + /// Enable or disable auto-merge to target branch locally when local_only mode is enabled. + /// When both local_only and auto_merge_local are true, completed task changes will be + /// automatically merged to the master/main branch locally (without pushing or creating PRs). + #[serde(default)] + pub auto_merge_local: Option<bool>, /// Version for optimistic locking pub version: Option<i32>, } |