feat(workspace): add git workflow backend APIs

Author: stocky789

app.py

@@ -554,6 +554,11 @@ async def web_search_error_handler(request: Request, exc: WebSearchError):
 from routes.emoji_routes import setup_emoji_routes
 app.include_router(setup_emoji_routes())
 
+from routes.workspace_routes import setup_workspace_routes
+app.include_router(setup_workspace_routes())
+from routes.workspace_git_routes import setup_workspace_git_routes
+app.include_router(setup_workspace_git_routes())
+
 # Sessions
 from routes.session_routes import setup_session_routes
 session_config = {"REQUEST_TIMEOUT": REQUEST_TIMEOUT, "OPENAI_API_KEY": OPENAI_API_KEY, "SESSIONS_FILE": SESSIONS_FILE}

routes/workspace_git_routes.py

@@ -0,0 +1,303 @@
+from __future__ import annotations
+
+from typing import Any, Callable
+
+from fastapi import APIRouter, Body, Query, Request
+from fastapi.responses import JSONResponse
+
+from src.auth_helpers import get_current_user
+from src.task_endpoint import resolve_task_endpoint
+from src.tool_security import owner_is_admin_or_single_user
+from src.workspace_git import (
+    GitWorkspaceError,
+    git_blame,
+    git_branches,
+    git_checkout,
+    git_clone,
+    git_commit,
+    git_commit_selected,
+    git_commit_stat,
+    git_conflicts,
+    git_create_branch,
+    git_diff,
+    git_discard,
+    git_history,
+    git_init,
+    git_remote_action,
+    git_resolve_conflict,
+    git_stage,
+    git_stage_hunk,
+    git_status,
+    git_unstage,
+    git_unstage_hunk,
+)
+
+
+def _error(status_code: int, code: str, message: str) -> JSONResponse:
+    return JSONResponse({"ok": False, "error": message, "code": code}, status_code=status_code)
+
+
+def _authorized(request: Request) -> JSONResponse | None:
+    owner = get_current_user(request)
+    if not owner_is_admin_or_single_user(owner):
+        return _error(403, "not_authorized", "Workspace Git APIs are admin-only")
+    return None
+
+
+def _run(request: Request, func: Callable[..., dict[str, Any]], *args: Any, **kwargs: Any):
+    blocked = _authorized(request)
+    if blocked is not None:
+        return blocked
+    try:
+        return func(*args, **kwargs)
+    except GitWorkspaceError as exc:
+        status = 403 if exc.code == "not_authorized" else 400
+        return _error(status, exc.code, exc.message)
+
+
+def _body_list(body: dict[str, Any], key: str) -> list[str]:
+    value = body.get(key)
+    return value if isinstance(value, list) else []
+
+
+def _hunk_id(body: dict[str, Any]) -> str:
+    return str(body.get("hunkId") or body.get("hunk_id") or "")
+
+
+# ── AI commit-message generation ────────────────────────────────────────────
+_COMMIT_MSG_MAX_DIFF = 12000
+
+
+def _resolve_commit_model(session_id: str | None, owner: str | None):
+    """(endpoint_url, model, headers) for the message. Prefer the exact model/
+    endpoint/key of the chat session the user has selected; fall back to the
+    configured background-task endpoint when no session model is available."""
+    if session_id:
+        try:
+            from src.ai_interaction import get_session_manager
+            sm = get_session_manager()
+            sess = sm.get_session(session_id) if sm else None
+            if sess and getattr(sess, "model", None):
+                # Refresh the session's auth exactly like the chat path does.
+                # Session-backed providers (ChatGPT Subscription, Copilot, …) keep
+                # a short-lived bearer that is re-resolved per request and never
+                # persisted to the session, so reading sess.headers alone yields no
+                # token and the model call goes out unauthorized (401).
+                try:
+                    from routes.chat_helpers import resolve_session_auth
+                    resolve_session_auth(sess, session_id, owner)
+                except Exception:
+                    pass
+                return (
+                    getattr(sess, "endpoint_url", None) or None,
+                    sess.model,
+                    getattr(sess, "headers", None) or None,
+                )
+        except Exception:
+            pass
+    return resolve_task_endpoint(owner=owner)
+
+
+def _clean_commit_text(raw: str) -> str:
+    text = raw or ""
+    try:
+        from src.text_helpers import strip_think
+        text = strip_think(text, prose=False, prompt_echo=False)
+    except Exception:
+        pass
+    text = (text or "").strip()
+    if text.startswith("```"):
+        lines = text.split("\n")
+        if lines and lines[0].startswith("```"):
+            lines = lines[1:]
+        if lines and lines[-1].strip().startswith("```"):
+            lines = lines[:-1]
+        text = "\n".join(lines).strip()
+    if len(text) >= 2 and text[0] in "\"'" and text[-1] == text[0]:
+        text = text[1:-1].strip()
+    return text
+
+
+def _generate_commit_message(workspace: str | None, session_id: str | None, owner: str | None) -> dict[str, Any]:
+    # Prefer the staged diff; fall back to the full working-tree diff.
+    diff = git_diff(workspace, None, True)
+    patch = (diff.get("patch") or "").strip()
+    scope = "staged"
+    if not patch:
+        diff = git_diff(workspace, None, False)
+        patch = (diff.get("patch") or "").strip()
+        scope = "uncommitted"
+    if not patch:
+        raise GitWorkspaceError("no_changes", "No changes to describe")
+    truncated = bool(diff.get("truncated")) or len(patch) > _COMMIT_MSG_MAX_DIFF
+    if len(patch) > _COMMIT_MSG_MAX_DIFF:
+        patch = patch[:_COMMIT_MSG_MAX_DIFF]
+
+    url, model, headers = _resolve_commit_model(session_id, owner)
+    if not model:
+        raise GitWorkspaceError("llm_failed", "No model is available to generate a message")
+
+    system = (
+        "You write clear git commit messages. Return ONLY the commit message: a "
+        "concise imperative subject line (<= 72 chars), optionally followed by a "
+        "blank line and a short body. No markdown, no code fences, no surrounding "
+        "quotes, no preamble."
+    )
+    note = "\n\n[diff truncated]" if truncated else ""
+    user = f"Write a commit message for these {scope} changes:\n\n{patch}{note}"
+    try:
+        from src.llm_core import llm_call
+        raw = llm_call(
+            url, model,
+            [{"role": "system", "content": system}, {"role": "user", "content": user}],
+            temperature=0.3, max_tokens=512, headers=headers or None, timeout=30,
+        )
+    except GitWorkspaceError:
+        raise
+    except Exception as exc:  # provider/network failure
+        raise GitWorkspaceError("llm_failed", f"Model call failed: {exc}")
+
+    message = _clean_commit_text(raw)
+    if not message:
+        raise GitWorkspaceError("llm_failed", "The model returned an empty message")
+    return {"ok": True, "message": message, "model": model, "truncated": truncated}
+
+
+def setup_workspace_git_routes() -> APIRouter:
+    router = APIRouter(prefix="/api/workspace/git", tags=["workspace-git"])
+
+    @router.get("/status")
+    def status(request: Request, workspace: str | None = Query(default=None)):
+        return _run(request, git_status, workspace)
+
+    @router.get("/diff")
+    def diff(
+        request: Request,
+        workspace: str | None = Query(default=None),
+        path: str | None = Query(default=None),
+        staged: bool = Query(default=False),
+    ):
+        return _run(request, git_diff, workspace, path, staged)
+
+    @router.post("/stage")
+    def stage(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        return _run(request, git_stage, body.get("workspace"), _body_list(body, "paths"))
+
+    @router.post("/unstage")
+    def unstage(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        return _run(request, git_unstage, body.get("workspace"), _body_list(body, "paths"))
+
+    @router.post("/discard")
+    def discard(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        return _run(
+            request,
+            git_discard,
+            body.get("workspace"),
+            _body_list(body, "paths"),
+            bool(body.get("confirmConflict") or body.get("confirm_conflict")),
+        )
+
+    @router.post("/hunks/stage")
+    def stage_hunk(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        return _run(request, git_stage_hunk, body.get("workspace"), body.get("path"), _hunk_id(body))
+
+    @router.post("/hunks/unstage")
+    def unstage_hunk(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        return _run(request, git_unstage_hunk, body.get("workspace"), body.get("path"), _hunk_id(body))
+
+    @router.post("/commit")
+    def commit(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        return _run(request, git_commit, body.get("workspace"), body.get("message"))
+
+    @router.post("/commit-selected")
+    def commit_selected(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        return _run(request, git_commit_selected, body.get("workspace"), _body_list(body, "paths"), body.get("message"))
+
+    @router.get("/branches")
+    def branches(request: Request, workspace: str | None = Query(default=None)):
+        return _run(request, git_branches, workspace)
+
+    @router.post("/checkout")
+    def checkout(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        return _run(request, git_checkout, body.get("workspace"), body.get("branch"), stash=False)
+
+    @router.post("/checkout-stash")
+    def checkout_stash(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        return _run(request, git_checkout, body.get("workspace"), body.get("branch"), stash=True)
+
+    @router.post("/branch/create")
+    def branch_create(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        return _run(request, git_create_branch, body.get("workspace"), body.get("branch"))
+
+    @router.post("/commit-message")
+    def commit_message(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        blocked = _authorized(request)
+        if blocked is not None:
+            return blocked
+        owner = get_current_user(request)
+        session_id = body.get("sessionId") or body.get("session_id")
+        try:
+            return _generate_commit_message(body.get("workspace"), session_id, owner)
+        except GitWorkspaceError as exc:
+            status = 403 if exc.code == "not_authorized" else 400
+            return _error(status, exc.code, exc.message)
+
+    @router.post("/fetch")
+    def fetch(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        return _run(request, git_remote_action, body.get("workspace"), "fetch")
+
+    @router.post("/pull")
+    def pull(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        return _run(request, git_remote_action, body.get("workspace"), "pull")
+
+    @router.post("/push")
+    def push(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        return _run(request, git_remote_action, body.get("workspace"), "push")
+
+    @router.post("/init")
+    def init(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        return _run(request, git_init, body.get("workspace"))
+
+    @router.post("/clone")
+    def clone(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        return _run(request, git_clone, body.get("workspace"), body.get("url"), body.get("target"), body.get("name"))
+
+    @router.get("/history")
+    def history(
+        request: Request,
+        workspace: str | None = Query(default=None),
+        path: str | None = Query(default=None),
+        limit: int = Query(default=50),
+    ):
+        return _run(request, git_history, workspace, path, limit)
+
+    @router.get("/commit")
+    def commit_stat(
+        request: Request,
+        workspace: str | None = Query(default=None),
+        sha: str | None = Query(default=None),
+    ):
+        return _run(request, git_commit_stat, workspace, sha)
+
+    @router.get("/blame")
+    def blame(request: Request, workspace: str | None = Query(default=None), path: str | None = Query(default=None)):
+        return _run(request, git_blame, workspace, path)
+
+    @router.get("/conflicts")
+    def conflicts(request: Request, workspace: str | None = Query(default=None)):
+        return _run(request, git_conflicts, workspace)
+
+    @router.post("/conflict/resolve")
+    def resolve_conflict(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        blocked = _authorized(request)
+        if blocked is not None:
+            return blocked
+        if "content" not in body or not isinstance(body.get("content"), str):
+            return _error(400, "invalid_request", "content must be provided as text")
+        try:
+            return git_resolve_conflict(body.get("workspace"), body.get("path"), body.get("content"))
+        except GitWorkspaceError as exc:
+            status = 403 if exc.code == "not_authorized" else 400
+            return _error(status, exc.code, exc.message)
+
+    return router

routes/workspace_routes.py

@@ -1,9 +1,40 @@
-"""Workspace API - browse server directories to pick a tool workspace folder."""
+"""Workspace API — browse, validate, and edit files in a selected tool workspace."""
 import os
-from fastapi import APIRouter, Request, HTTPException, Query
+from typing import Any
+
+from fastapi import APIRouter, Body, Request, HTTPException, Query
+from fastapi.responses import JSONResponse
 
 from src.auth_helpers import get_current_user
 from src.tool_security import owner_is_admin_or_single_user
+from src.workspace_git import (
+    GitWorkspaceError,
+    delete_workspace_file,
+    list_workspace_files,
+    read_workspace_file,
+    save_workspace_file,
+)
+
+
+def _workspace_error(status_code: int, code: str, message: str) -> JSONResponse:
+    return JSONResponse({"ok": False, "error": message, "code": code}, status_code=status_code)
+
+
+def _require_workspace_admin(request: Request) -> JSONResponse | None:
+    owner = get_current_user(request)
+    if not owner_is_admin_or_single_user(owner):
+        return _workspace_error(403, "not_authorized", "Workspace APIs are admin-only")
+    return None
+
+
+def _run_workspace(request: Request, func, *args):
+    blocked = _require_workspace_admin(request)
+    if blocked is not None:
+        return blocked
+    try:
+        return func(*args)
+    except GitWorkspaceError as exc:
+        return _workspace_error(400, exc.code, exc.message)
 
 # Cap entries returned per directory (mirrors filesystem_tools._CODENAV_MAX_HITS).
 # A huge directory shouldn't dump thousands of rows into the picker; the user can
@@ -82,4 +113,34 @@ def vet(request: Request, path: str = Query(default="")):
         resolved = vet_workspace(path)
         return {"ok": resolved is not None, "path": resolved}
 
+    @router.get("/files")
+    def files(request: Request, workspace: str | None = Query(default=None), path: str = Query(default="")):
+        return _run_workspace(request, list_workspace_files, workspace, path)
+
+    @router.get("/file")
+    def file(request: Request, workspace: str | None = Query(default=None), path: str = Query(default="")):
+        return _run_workspace(request, read_workspace_file, workspace, path)
+
+    @router.post("/file/save")
+    def file_save(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        blocked = _require_workspace_admin(request)
+        if blocked is not None:
+            return blocked
+        if "content" not in body or not isinstance(body.get("content"), str):
+            return _workspace_error(400, "invalid_request", "content must be provided as text")
+        try:
+            return save_workspace_file(body.get("workspace"), body.get("path") or "", body.get("content"))
+        except GitWorkspaceError as exc:
+            return _workspace_error(400, exc.code, exc.message)
+
+    @router.post("/file/delete")
+    def file_delete(request: Request, body: dict[str, Any] = Body(default_factory=dict)):
+        blocked = _require_workspace_admin(request)
+        if blocked is not None:
+            return blocked
+        try:
+            return delete_workspace_file(body.get("workspace"), body.get("path") or "")
+        except GitWorkspaceError as exc:
+            return _workspace_error(400, exc.code, exc.message)
+
     return router