Phase 16: Commit and PR Workflow

Author: hrabanazviking

.mythic/memory.sqlite

@@ -6,3 +6,4 @@
 {"routing_attempt": true, "from_provider": "copy-paste", "to_provider": "copy-paste", "role": "Companion Shell", "task_type": "conversation", "packet_id": "shell", "succeeded": true, "error": "", "skipped_reason": ""}
 {"routing_attempt": true, "from_provider": "copy-paste", "to_provider": "copy-paste", "role": "Companion Shell", "task_type": "conversation", "packet_id": "shell", "succeeded": true, "error": "", "skipped_reason": ""}
 {"routing_attempt": true, "from_provider": "copy-paste", "to_provider": "copy-paste", "role": "Companion Shell", "task_type": "conversation", "packet_id": "shell", "succeeded": true, "error": "", "skipped_reason": ""}
+{"routing_attempt": true, "from_provider": "copy-paste", "to_provider": "copy-paste", "role": "Companion Shell", "task_type": "conversation", "packet_id": "shell", "succeeded": true, "error": "", "skipped_reason": ""}

mythic/ai/provider_calls.jsonl

@@ -1967,6 +1967,9 @@ def _help(text: str) -> str:
             """
             Examples:
               mythic-vibe workspace status
+              mythic-vibe workspace diff
+              mythic-vibe workspace commit --message "Add memory feature" --yes
+              mythic-vibe workspace push --yes
               mythic-vibe workspace clone https://github.com/owner/repo --yes
               mythic-vibe workspace open ./repo
               mythic-vibe workspace branch feature/memory --yes
@@ -2021,6 +2024,24 @@ def _help(text: str) -> str:
     workspace_plan.add_argument("--workspace-root", default="")
     add_runtime_options(workspace_plan, json_output=True)
 
+    workspace_diff = workspace_sub.add_parser("diff", help=_help("Show changes in the current workspace"))
+    workspace_diff.add_argument("--path", default=".")
+    workspace_diff.add_argument("--workspace-root", default="")
+    add_runtime_options(workspace_diff, json_output=True)
+
+    workspace_commit = workspace_sub.add_parser("commit", help=_help("Commit changes in the current workspace"))
+    workspace_commit.add_argument("--path", default=".")
+    workspace_commit.add_argument("--message", "-m", default="", help="Commit message")
+    workspace_commit.add_argument("--workspace-root", default="")
+    workspace_commit.add_argument("--yes", action="store_true", help="Actually run git commit")
+    add_runtime_options(workspace_commit, json_output=True)
+
+    workspace_push = workspace_sub.add_parser("push", help=_help("Push the current branch to origin"))
+    workspace_push.add_argument("--path", default=".")
+    workspace_push.add_argument("--workspace-root", default="")
+    workspace_push.add_argument("--yes", action="store_true", help="Actually run git push")
+    add_runtime_options(workspace_push, json_output=True)
+
     # --- PH-05 slice 5.5 / 5.6: graph query + visualize ---
     graph_cmd = sub.add_parser(
         "graph",

mythic_vibe_cli/app.py

@@ -6897,9 +6897,15 @@ def cmd_workspace_dispatch(args: argparse.Namespace) -> int:
         return cmd_workspace_pr(args)
     if sub == "plan":
         return cmd_workspace_plan(args)
+    if sub == "diff":
+        return cmd_workspace_diff(args)
+    if sub == "commit":
+        return cmd_workspace_commit(args)
+    if sub == "push":
+        return cmd_workspace_push(args)
     write_error(
         f"Unknown workspace subcommand: {sub!r}. "
-        "Valid: status | clone | open | branch | track | pr | plan."
+        "Valid: status | clone | open | branch | track | pr | plan | diff | commit | push."
     )
     return USER_INPUT_ERROR
 
@@ -6928,6 +6934,62 @@ def cmd_workspace_status(args: argparse.Namespace) -> int:
     return SUCCESS
 
 
+def cmd_workspace_diff(args: argparse.Namespace) -> int:
+    from .workspaces.manager import show_diff
+
+    action = show_diff(
+        Path(getattr(args, "path", ".")).resolve(),
+        workspace_root=_workspace_root_from_args(args),
+    )
+    if _flag(args, "json"):
+        write_json({"command": "workspace diff", "action": action.to_dict()})
+        return SUCCESS if action.exit_code == 0 else USER_INPUT_ERROR
+    _render_workspace_action(action)
+    if action.stdout:
+        write_line("")
+        write_line(action.stdout)
+    return SUCCESS if action.exit_code == 0 else USER_INPUT_ERROR
+
+
+def cmd_workspace_commit(args: argparse.Namespace) -> int:
+    from .workspaces.manager import commit_changes
+
+    action = commit_changes(
+        Path(getattr(args, "path", ".")).resolve(),
+        workspace_root=_workspace_root_from_args(args),
+        message=str(getattr(args, "message", "") or ""),
+        execute=bool(getattr(args, "yes", False)),
+    )
+    if _flag(args, "json"):
+        write_json({"command": "workspace commit", "action": action.to_dict()})
+        return SUCCESS if action.exit_code == 0 else USER_INPUT_ERROR
+    _render_workspace_action(action)
+    if action.stdout:
+        write_line("")
+        write_line(action.stdout)
+    return SUCCESS if action.exit_code == 0 else USER_INPUT_ERROR
+
+
+def cmd_workspace_push(args: argparse.Namespace) -> int:
+    from .workspaces.manager import push_branch
+
+    action = push_branch(
+        Path(getattr(args, "path", ".")).resolve(),
+        workspace_root=_workspace_root_from_args(args),
+        execute=bool(getattr(args, "yes", False)),
+    )
+    if _flag(args, "json"):
+        write_json({"command": "workspace push", "action": action.to_dict()})
+        return SUCCESS if action.exit_code == 0 else USER_INPUT_ERROR
+    _render_workspace_action(action)
+    if action.stdout:
+        write_line("")
+        write_line(action.stdout)
+    if action.stderr:
+        write_line(action.stderr)
+    return SUCCESS if action.exit_code == 0 else USER_INPUT_ERROR
+
+
 def cmd_workspace_clone(args: argparse.Namespace) -> int:
     from .workspaces.manager import clone_repo
 

mythic_vibe_cli/commands.py

@@ -367,6 +367,10 @@ def _known_command_names(_main: Callable[[list[str]], int]) -> set[str]:
 5. EDIT code, run tests, and execute commands to achieve the goal.
 6. REMEMBER the results of your actions.
 
+Workspace Safety Protocol:
+- Always use `workspace diff` to review your own changes before making a commit.
+- You must ask the user for explicit confirmation before executing `workspace commit` or `workspace push`.
+
 Always use your tools when you need to read files, run tests, or modify code. 
 When the user asks you a question or gives you a task, you can invoke multiple tools in sequence. 
 Once you have accomplished the goal, provide a conversational summary to the user.

mythic_vibe_cli/repl.py

@@ -452,6 +452,136 @@ def prepare_pr_draft(
     )
 
 
+def show_diff(path: Path, *, workspace_root: Path) -> WorkspaceAction:
+    repo, branch, remote, dirty = detect_repo(path)
+    if not repo:
+        return WorkspaceAction(
+            action="diff",
+            workspace_root=str(workspace_root),
+            target_path=str(path.resolve()),
+            exit_code=1,
+            message="No Git repository detected at this path.",
+        )
+    command = ("git", "diff", "HEAD")
+    result = exec_command(command, cwd=repo)
+    return WorkspaceAction(
+        action="diff",
+        workspace_root=str(workspace_root),
+        target_path=repo,
+        branch=branch,
+        executed=True,
+        command=command,
+        exit_code=result.code,
+        stdout=result.stdout,
+        stderr=result.stderr,
+        message="Diff generated." if result.code == 0 else "Failed to generate diff.",
+    )
+
+
+def commit_changes(path: Path, *, workspace_root: Path, message: str, execute: bool = False) -> WorkspaceAction:
+    repo, branch, remote, dirty = detect_repo(path)
+    if not repo:
+        return WorkspaceAction(
+            action="commit",
+            workspace_root=str(workspace_root),
+            target_path=str(path.resolve()),
+            exit_code=1,
+            message="No Git repository detected at this path.",
+        )
+    if not dirty:
+        return WorkspaceAction(
+            action="commit",
+            workspace_root=str(workspace_root),
+            target_path=repo,
+            branch=branch,
+            exit_code=0,
+            message="Working tree is clean, nothing to commit.",
+        )
+    if not message:
+        return WorkspaceAction(
+            action="commit",
+            workspace_root=str(workspace_root),
+            target_path=repo,
+            branch=branch,
+            exit_code=1,
+            message="A commit message is required.",
+        )
+    
+    command = ("git", "commit", "-am", message)
+    if not execute:
+        return WorkspaceAction(
+            action="commit",
+            workspace_root=str(workspace_root),
+            target_path=repo,
+            branch=branch,
+            executed=False,
+            command=command,
+            message="Commit prepared; pass --yes to execute.",
+        )
+    
+    result = exec_command(command, cwd=repo)
+    return WorkspaceAction(
+        action="commit",
+        workspace_root=str(workspace_root),
+        target_path=repo,
+        branch=branch,
+        executed=True,
+        command=command,
+        exit_code=result.code,
+        stdout=result.stdout,
+        stderr=result.stderr,
+        message="Changes committed." if result.code == 0 else "Commit failed.",
+        metadata={"dirty": False} if result.code == 0 else {"dirty": True},
+    )
+
+
+def push_branch(path: Path, *, workspace_root: Path, execute: bool = False) -> WorkspaceAction:
+    repo, branch, remote, dirty = detect_repo(path)
+    if not repo:
+        return WorkspaceAction(
+            action="push",
+            workspace_root=str(workspace_root),
+            target_path=str(path.resolve()),
+            exit_code=1,
+            message="No Git repository detected at this path.",
+        )
+    if not remote:
+        return WorkspaceAction(
+            action="push",
+            workspace_root=str(workspace_root),
+            target_path=repo,
+            branch=branch,
+            exit_code=1,
+            message="No remote configured for this repository.",
+        )
+    
+    command = ("git", "push", "origin", branch)
+    if not execute:
+        return WorkspaceAction(
+            action="push",
+            workspace_root=str(workspace_root),
+            target_path=repo,
+            branch=branch,
+            executed=False,
+            command=command,
+            message="Push prepared; pass --yes to execute.",
+        )
+    
+    result = exec_command(command, cwd=repo)
+    return WorkspaceAction(
+        action="push",
+        workspace_root=str(workspace_root),
+        target_path=repo,
+        branch=branch,
+        executed=True,
+        command=command,
+        exit_code=result.code,
+        stdout=result.stdout,
+        stderr=result.stderr,
+        message="Branch pushed successfully." if result.code == 0 else "Push failed.",
+    )
+
+
 def propose_workspace_plan(prompt: str, *, workspace_root: Path) -> str:
     text = prompt.strip()
     repo_url = _extract_repo_url(text)
@@ -505,16 +635,19 @@ def _extract_branch_name(text: str) -> str:
     "WorkspaceRecord",
     "WorkspaceStatus",
     "clone_repo",
+    "commit_changes",
     "create_branch",
     "default_workspace_root",
     "detect_repo",
     "load_registry",
     "open_workspace",
     "prepare_pr_draft",
     "propose_workspace_plan",
+    "push_branch",
     "registry_path",
     "resolve_workspace_root",
     "save_registry",
+    "show_diff",
     "track_branch",
     "workspace_status",
 ]