feat: --force-commit (#34)

Author: Gusarich

src/cli.py

@@ -277,6 +277,11 @@ def create_parser(cls) -> argparse.ArgumentParser:
             action="store_true",
             help="Share agent session across runs (advanced)",
         )
+        g_limits.add_argument(
+            "--force-commit",
+            action="store_true",
+            help="Force a git commit in the workspace after agent finishes (if there are changes)",
+        )
 
         # Config, state & logs group
         g_state = parser.add_argument_group("Config, State & Logs")
@@ -1623,6 +1628,8 @@ async def run_orchestrator(self, args: argparse.Namespace) -> int:
             ] = args.max_parallel
         if hasattr(args, "timeout") and args.timeout:
             cli_config.setdefault("runner", {})["timeout"] = args.timeout
+        if hasattr(args, "force_commit") and args.force_commit:
+            cli_config.setdefault("runner", {})["force_commit"] = True
         if args.model:
             cli_config["model"] = args.model
         if hasattr(args, "plugin") and args.plugin:
@@ -1965,6 +1972,7 @@ def _red(k, v):
             ),
             default_docker_image=full_config.get("runner", {}).get("docker_image"),
             default_agent_cli_args=_agent_cli_args or None,
+            force_commit=bool(full_config.get("runner", {}).get("force_commit", False)),
         )
 
         # Initialize orchestrator

src/instance_runner/api.py

@@ -55,6 +55,7 @@ async def run_instance(
     allow_overwrite_protected_refs: bool = False,
     allow_global_session_volume: bool = False,
     agent_cli_args: Optional[list[str]] = None,
+    force_commit: bool = False,
 ) -> InstanceResult:
     """
     Execute a single AI coding instance in an isolated environment.
@@ -133,6 +134,7 @@ async def run_instance(
         allow_overwrite_protected_refs=allow_overwrite_protected_refs,
         allow_global_session_volume=allow_global_session_volume,
         agent_cli_args=agent_cli_args,
+        force_commit=force_commit,
     )
 
 

src/instance_runner/runner.py

@@ -104,6 +104,7 @@ async def run_instance(
     allow_overwrite_protected_refs: bool = False,
     allow_global_session_volume: bool = False,
     agent_cli_args: Optional[list[str]] = None,
+    force_commit: bool = False,
 ) -> InstanceResult:
     """
     Execute a single AI coding instance in Docker.
@@ -259,6 +260,7 @@ async def run_instance(
             allow_overwrite_protected_refs=allow_overwrite_protected_refs,
             allow_global_session_volume=allow_global_session_volume,
             agent_cli_args=agent_cli_args,
+            force_commit=force_commit,
         )
 
         # Success or non-retryable error
@@ -365,6 +367,7 @@ async def _run_instance_attempt(
     allow_overwrite_protected_refs: bool = False,
     allow_global_session_volume: bool = False,
     agent_cli_args: Optional[list[str]] = None,
+    force_commit: bool = False,
 ) -> InstanceResult:
     """Single attempt at running an instance (internal helper for retry logic)."""
     start_time = time.time()
@@ -670,6 +673,40 @@ def emit_event(event_type: str, data: Dict[str, Any]) -> None:
             logger.info("Collecting results and importing branch")
             emit_event("instance.result_collection_started", {})
 
+            # Optional: force a commit if there are uncommitted changes
+            if force_commit and workspace_dir:
+                try:
+                    # Check for uncommitted changes
+                    status_cmd = [
+                        "git",
+                        "-C",
+                        str(workspace_dir),
+                        "status",
+                        "--porcelain",
+                    ]
+                    rc, out = await git_ops._run_command(status_cmd)  # type: ignore[attr-defined]
+                    if rc == 0 and (out or "").strip():
+                        # Stage all and commit
+                        await git_ops._run_command(["git", "-C", str(workspace_dir), "add", "-A"])  # type: ignore[attr-defined]
+                        msg = f"pitaya: force commit (run_id={run_id or ''} iid={instance_id})"
+                        commit_cmd = [
+                            "git",
+                            "-C",
+                            str(workspace_dir),
+                            "commit",
+                            "-m",
+                            msg,
+                        ]
+                        rc2, out2 = await git_ops._run_command(commit_cmd)  # type: ignore[attr-defined]
+                        if rc2 != 0:
+                            logger.debug(
+                                f"force-commit skipped (git commit failed): {out2}"
+                            )
+                        else:
+                            logger.info("force-commit created a commit in workspace")
+                except Exception as e:
+                    logger.debug(f"force-commit error ignored: {e}")
+
             # Import work from workspace to host repository according to policy
             import_info = await git_ops.import_branch(
                 repo_path=repo_path,

src/orchestration/orchestrator.py

@@ -73,6 +73,7 @@ def __init__(
         default_model_alias: str = "sonnet",
         default_docker_image: Optional[str] = None,
         default_agent_cli_args: Optional[List[str]] = None,
+        force_commit: bool = False,
     ):
         """
         Initialize orchestrator.
@@ -104,6 +105,8 @@ def __init__(
             self.default_agent_cli_args: List[str] = list(default_agent_cli_args or [])
         except Exception:
             self.default_agent_cli_args = []
+        # Runner behavior: force a commit if workspace has changes
+        self.force_commit: bool = bool(force_commit)
         # Load model mapping checksum for handshake (single-process still validates equality)
         try:
             from ..utils.model_mapping import load_model_mapping
@@ -1748,6 +1751,7 @@ def _write_last_active():
                 allow_overwrite_protected_refs=self.allow_overwrite_protected_refs,
                 allow_global_session_volume=self.allow_global_session_volume,
                 agent_cli_args=(info.metadata or {}).get("agent_cli_args"),
+                force_commit=self.force_commit,
             )
             logger.info(
                 f"_execute_instance: run_instance finished iid={instance_id} success={result.success} status={getattr(result,'status',None)}"
@@ -2689,6 +2693,7 @@ async def _run_instance_from_saved_state(self, instance_info) -> InstanceResult:
                 allow_overwrite_protected_refs=self.allow_overwrite_protected_refs,
                 allow_global_session_volume=self.allow_global_session_volume,
                 agent_cli_args=(instance_info.metadata or {}).get("agent_cli_args"),
+                force_commit=self.force_commit,
             )
 
             # Update state