Files
roboco/tests/unit/services/test_git.py
T
818f2ac7a6 [21e195cd] Panel-wide UI standardization and usability pass (#194)
* [4c179e3a] Add git pull, fetch, and rebase backend endpoints (#190)

* [f966f772] feat(git): add pull, fetch, and rebase endpoints with integration tests (#185)

- Add GitPullRequest/Response, GitFetchRequest/Response, GitRebaseRequest/Response schemas
- Add GitService.pull(), fetch(), and rebase() methods using _network_git_timeout()
- Add POST /api/git/pull, /api/git/fetch, /api/git/rebase route handlers
- Rebase detects conflicts via git diff --name-only --diff-filter=U and aborts cleanly
- Integration tests cover success path and GitCommandError→500 for all three endpoints
- Rebase conflict test verifies conflict=True with populated conflicted_files list

Co-authored-by: Backend Developer 1 <be-dev-1@agents.roboco.dev>

* [26e2b7af] test(git): add AsyncMock unit tests for rebase_onto_base conflict-state handling (#186)

New test_git_rebase.py covers three branches of rebase_onto_base:
- success path: rebase exits 0, returns rebased status, abort never called
- conflict path: non-zero exit → diff → abort → returns conflict+files
- resilience: both rebase and abort exit non-zero, still returns conflict dict without exception

All tests use AsyncMock with side_effect sequences to mock _run_git at the service-method level.

Co-authored-by: Backend Developer 2 <be-dev-2@agents.roboco.dev>

---------

Co-authored-by: Backend Developer 1 <be-dev-1@agents.roboco.dev>
Co-authored-by: Backend Developer 2 <be-dev-2@agents.roboco.dev>

* [551b1dbf] Panel-wide frontend UI standardization and page fixes (#193)

* [1ec787b2] feat(panel): design-system sweep — full-width layouts, scrollbar fix, Secretary button, component audit (#188)

- Settings page: remove max-w-3xl, wrap cards in grid-cols-1 lg:grid-cols-2 two-column layout
- AI Providers page: remove max-w-5xl so AIRoutingCard fills available width
- Journals AgentList: replace ScrollArea with overflow-y-auto div to eliminate nested scrollbar
- Secretary chat input: add items-stretch to flex row so Send/Start button matches Textarea height
- Component audit: replace all raw <button>/<input>/hand-rolled badge spans outside components/ui/ with canonical Button, Checkbox, Badge variants across 15 files:
  - ai-routing-card.tsx: ModeButton → Button, checkbox → Checkbox, badge spans → Badge
  - self-hosted-section.tsx: eye-toggle → Button ghost icon-sm, badge spans → Badge
  - journals/agent-item.tsx, communications/channel-item.tsx → Button ghost
  - kb-search-bar.tsx, kb-filters.tsx → Button ghost
  - kb-category-nav.tsx, git-log-panel.tsx → Button ghost
  - communications/page.tsx (channel + group lists) → Button ghost
  - projects/project-table.tsx, products/product-table.tsx → Button link
  - git-branch-panel.tsx (local + remote lists) → Button ghost
  - tasks/dependency-selector.tsx: Button ghost + Checkbox for visual indicator
  - tasks/task-table.tsx: sortable header + expand toggle → Button ghost
  - business/goals-tab.tsx: hidden button → Button

Co-authored-by: Frontend Developer 1 <fe-dev-1@agents.roboco.dev>

* [435b37b4] feat(metrics,notifications): URL-persisted tab state, semantic chart colors, humanized counts (#187)

- Notifications page: replace useState with useSearchParams/useRouter for
  ?tab= URL parameter (all/unread/pending, default: unread); Suspense wrapper
  with skeleton fallback for SSR compatibility.

- Metrics page: split into Performance tab (Velocity + Task Status + Agent
  Status + Team Health) and Token Usage tab (TokenUsageCostsSection) with
  ?tab= URL parameter (default: performance); Suspense wrapper; Refresh button
  moved inside PerformanceTabContent; humanizeCount() helper applies K/M
  suffixes to all MetricCard numeric values >= 1000.

- Chart components (usage-time-series, agent-usage, team-usage, model-donut):
  replace var(--chart-N) CSS vars with explicit semantic hex colors —
  #3b82f6 blue for informational, #f59e0b amber for warning/pending,
  #22c55e green for success/healthy, #ef4444 red for error/blocked,
  #a855f7 purple for supplemental.

pnpm lint and pnpm typecheck pass with zero new errors.

Co-authored-by: Frontend Developer 2 <fe-dev-2@agents.roboco.dev>

* [ccd256f4] Kanban mobile viewport: 375px layout, column navigation, 44px touch targets (#191)

* [ccd256f4] feat(kanban): mobile 375px layout with column navigator and 44px touch targets

- KanbanBoard: add activeColumnIndex state + mobile prev/next column
  navigator (lg:hidden); existing horizontal-scroll layout hidden on
  mobile (hidden lg:flex). Desktop DnD behavior unchanged.
- KanbanColumn: add optional className prop (cn-based) so mobile view
  can pass w-full/sm:w-full to fill the viewport.
- KanbanCard: bump all action buttons to min-h-11 (44px) touch targets
  (Assign, Pass, Fail, Move-forward).

* [ccd256f4] fix(kanban): change breakpoint from lg to sm for mobile/desktop layout switch

AC3 requires >=640px viewport to show multi-column layout (sm: breakpoint).
Previous impl used lg: (1024px), leaving 640-1023px in single-column mode.

Change:
- Mobile navigator div: lg:hidden → sm:hidden
- Desktop multi-column div: hidden lg:flex → hidden sm:flex

At <640px: single-column with prev/next navigator (375px mobile use case).
At >=640px: full horizontal-scroll multi-column layout (per AC3).
DnD behavior and all other layout unchanged.

---------

Co-authored-by: Frontend Developer 1 <fe-dev-1@agents.roboco.dev>

* [23f02af4] Agents page On-Demand section + Board composition; Overview Quick Actions visibility + Team Health Intake/Secretary (#189)

* [23f02af4] feat(agents,overview): On-Demand section, Board composition fix, Intake/Secretary in Quick Actions + Team Health

- agent-definitions.ts: remove AgentRole.MAIN_PM from getBoardAgents
  (Main PM has its own dedicated section; including it there was redundant).
  Add getOnDemandAgents() that catches agents not in any standard team
  (board/main_pm/backend/frontend/ux_ui/marketing) and not a standard cell
  role — surfaces prompter/intake agents that the API may return.

- agents/page.tsx: import getOnDemandAgents; add a conditional
  'On-Demand Agents' AgentGrid section (only rendered when the API returns
  at least one matching agent, e.g. the Intake interviewer).

- quick-actions-bar.tsx: add 'Task Intake' button (→/prompter, Sparkles
  icon) and 'Secretary' button (→/business?tab=secretary, Bot icon)
  alongside existing quick actions so operators can reach on-demand agents
  from the Overview in one click.

- team-health-cards.tsx: add OnDemandAgentCard sub-component (link card
  with On-Demand badge) and render static cards for 'Task Intake' and
  'Secretary' appended after the API-driven TeamHealthCard list, giving
  them equal visual presence in the Team Health section.

pnpm lint and pnpm typecheck pass with zero new errors.

* [23f02af4] fix(agents,overview): QA revision — enum entries, QuickActions placement, On-Demand title, Board PR_REVIEWER

AC3: types/index.ts AgentRole enum adds PR_REVIEWER, PROMPTER, SECRETARY.
     agent-selector.tsx ROLE_LABELS exhaustive Record updated accordingly.

AC4: command-center.tsx QuickActionsBar moved to after Team Health section,
     before CEO Approval Queue and data-heavy grid rows — visible without
     scrolling on a 900px viewport.

AC1: agents/page.tsx On-Demand AgentGrid title fixed to 'On-Demand'
     (was 'On-Demand Agents' in prior commit).

AC2: agent-definitions.ts getBoardAgents adds explicit PR_REVIEWER inclusion
     and uses inclusion-based getOnDemandAgents (PROMPTER|SECRETARY roles).

AC5: team-health-cards.tsx static OnDemandAgentCard implementation refined
     with correct fallback rendering when no API team data.

AC6: pnpm lint and pnpm typecheck (src only) pass with zero new errors.

---------

Co-authored-by: Frontend Developer 2 <fe-dev-2@agents.roboco.dev>
Co-authored-by: Frontend Developer 1 <fe-dev-1@agents.roboco.dev>

* [b1c59206] Git page: Pull, Fetch, Rebase buttons wired to backend; Rebase destructive confirmation dialog (#192)

* [b1c59206] feat(git): add Pull, Fetch, Rebase operations to Git page with destructive confirmation dialog for Rebase

- Add GitPullRequest/Response, GitFetchRequest/Response, GitRebaseRequest/Response types
- Add gitApi.pull(), gitApi.fetch(), gitApi.rebase() with mock stubs for /git/pull, /git/fetch, /git/rebase
- Add useGitPull, useGitFetch, useGitRebase mutation hooks with cache invalidation; exported via useGitOperations
- Add Pull (Download icon), Fetch (RefreshCcw icon), Rebase (GitGraph icon) buttons to GitActionsPanel
- Rebase button triggers AlertDialog with destructive confirmation before calling API
- Wire handlePull, handleFetch, handleRebase handlers in git-browser.tsx with toast feedback

* [b1c59206] fix(git): add destructive styling and branch name to Rebase AlertDialog

- Add className='border-destructive bg-destructive/5' to AlertDialogContent
  so the dialog container has the required red-tinted styling (AC3)
- Update AlertDialogDescription to interpolate status?.current_branch so
  the dialog body explicitly names the branch being rebased (AC3)

---------

Co-authored-by: Frontend Developer 2 <fe-dev-2@agents.roboco.dev>

---------

Co-authored-by: Frontend Developer 1 <fe-dev-1@agents.roboco.dev>
Co-authored-by: Frontend Developer 2 <fe-dev-2@agents.roboco.dev>

* [3f305ed9] Frontend: Fix git control contract, complete Secretary restyling, and apply polish (CEO revision) (#199)

* [72de8a65] fix(git): correct Pull/Fetch/Rebase types, API mocks, request fields, and toast handlers (#197)

- types/git.ts: GitPullResponse and GitFetchResponse now have current_branch,
  has_changes, staged_files, unstaged_files, untracked_files, ahead, behind
  (matching backend GitStatusResponse); removed nonexistent commits_received/
  refs_updated/remote fields
- types/git.ts: GitRebaseRequest now uses target_branch: string (not onto?: string);
  GitRebaseResponse now has conflict: boolean and conflicted_files: string[]
  (removed branch/onto/commits_rebased); task_id made optional on all three
  request types
- lib/api/git.ts: Updated mock returns for pull/fetch/rebase to match new types
- git-actions-panel.tsx: onRebase prop now (targetBranch: string) => void;
  Rebase AlertDialog now contains an Input for target_branch; AlertDialogAction
  disabled when targetBranch empty and passes the value to onRebase
- git-browser.tsx: handlePull and handleFetch toast references result.current_branch;
  handleRebase accepts targetBranch, sends target_branch in payload, toasts
  result.conflict and result.conflicted_files; no 'manual' task_id for any
  pull/fetch/rebase operation

Co-authored-by: Frontend Developer 1 <fe-dev-1@agents.roboco.dev>

* [be6a17fc] feat(ui): design-system polish — chart tokens, KB aria-label, Kanban touch targets (#196)

- kb-search-bar.tsx: add aria-label="Clear search" to the clear (X) button
- model-usage-donut.tsx: replace hex CHART_COLORS with var(--chart-1)…var(--chart-5)
- usage-time-series-chart.tsx: replace hex stopColor/stroke with var(--chart-1)/var(--chart-2)
- agent-usage-chart.tsx: Bar fill hex → var(--chart-1)
- team-usage-chart.tsx: Bar fill hex → var(--chart-1)
- kanban-card.tsx: min-h-11 → max-sm:min-h-11 (44px touch target mobile-only, 3 buttons)
- secretary-tab.tsx: already compliant (Button + design-system tokens), no change needed

Co-authored-by: Frontend Developer 2 <fe-dev-2@agents.roboco.dev>

---------

Co-authored-by: Frontend Developer 1 <fe-dev-1@agents.roboco.dev>
Co-authored-by: Frontend Developer 2 <fe-dev-2@agents.roboco.dev>

* [d62036bd] Backend: Fix git endpoint schemas, add safety gates, and unit tests (CEO revision) (#200)

* [d0593fe3] feat(git): remove agent_id from schemas and add service-layer safety gates (#195)

- Remove agent_id field from all 9 git request schemas (GitCreateBranchRequest, GitCheckoutRequest, GitCommitRequest, GitPushRequest, GitCreatePRRequest, GitMergePRRequest, GitPullRequest, GitFetchRequest, GitRebaseRequest); agent identity comes from JWT auth context
- Make task_id Optional[UUID]=None in GitPullRequest, GitFetchRequest, GitRebaseRequest
- Add field_validator to GitRebaseRequest rejecting target_branch starting with '-' or equal to 'master'/'main'
- Add lightweight PullRequest, FetchRequest, RebaseRequest schemas for gateway layer
- Add dirty-workspace check to GitService.pull() (raises ValidationError if porcelain output)
- Switch GitService.pull() to --ff-only; raises ValidationError with diverged-branch message on non-zero exit
- Add master/main guard to GitService.rebase() for both head_branch and target_branch
- Update callers: routes/tasks.py (2x), services/task.py, tests/unit/services/test_git.py (2x)

Co-authored-by: Backend Developer 1 <be-dev-1@agents.roboco.dev>

* [a2f96961] Add role-gated rebase endpoint and unit tests (test_git_rebase.py) (#198)

* [a2f96961] feat(git): add role-gated rebase endpoint and unit tests

Add role-gate to POST /rebase restricting access to DEVELOPER and
CELL_PM roles; add master/main protected-branch guard to
GitService.rebase() before any git subprocess runs; add 4 unit tests
in tests/unit/services/test_git_rebase.py covering both
target-branch and head-branch REBASE_FORBIDDEN cases

* [a2f96961] fix(git): invert rebase role gate, add ownership check, schema validator, and missing tests

- _REBASE_ALLOWED_ROLES changed from {DEVELOPER, CELL_PM} to {CEO, CELL_PM, MAIN_PM}
  so developers correctly receive 403 per AC1/AC2
- rebase_branch() now verifies task ownership for non-CEO PM callers: if task_id
  is provided and the task is not assigned to the calling agent, returns 403/404
- GitRebaseRequest.target_branch gets a @field_validator rejecting '-' prefix
  names and protected branch names (main, master, develop)
- GitService.pull() gains pre-flight safety gates: raises ValidationError
  DIRTY_TREE when staged/unstaged changes exist, DIVERGED_BRANCH when
  ahead > 0 and behind > 0
- test_git_rebase.py adds 9 new tests: pull() dirty-tree ValidationError,
  pull() diverged-branch ValidationError, pull() success path, schema
  validator for '-' prefix and protected names, and route-level tests
  confirming HTTP 403 for DEVELOPER and HTTP 200 for CELL_PM on POST /rebase

* [a2f96961] fix(tests): add type annotations for tuple variables in test_git_rebase.py

mypy needs explicit tuple type annotations when assigning bare tuples
to variables used as mock side_effect return values — fixes var-annotated
error caught by the server-side quality gate

---------

Co-authored-by: Backend Developer 1 <be-dev-1@agents.roboco.dev>
Co-authored-by: Renn F <rennf93@users.noreply.github.com>

---------

Co-authored-by: Backend Developer 1 <be-dev-1@agents.roboco.dev>
Co-authored-by: Renn F <rennf93@users.noreply.github.com>

* [94015c6d] Frontend R3: Fix legacy git taskId coercion + rebase placeholder + phantom fields (#204)

* [401ddb40] fix(git): remove phantom fields from GitPullRequest/GitFetchRequest and make task_id optional in write request interfaces; use taskId || undefined in git-browser.tsx handlers to avoid 422 errors when no task context is active (#201)

Co-authored-by: Frontend Developer 1 <fe-dev-1@agents.roboco.dev>

* [cca8d0c0] fix(git): fix rebase placeholder and surface backend error in toast (#202)

git-actions-panel.tsx: change rebase target_branch Input placeholder
from "e.g. main or origin/main" to "Remote ref (e.g. origin/HEAD)" so
no default branch name (main/master/develop) is suggested.

git-browser.tsx: import getErrorMessage from @/lib/api/client and use
it in handleRebase catch block instead of the hardcoded string "Failed
to rebase". getErrorMessage extracts the real detail from
AxiosError.response.data.detail and falls back to a non-empty generic
message, satisfying both the detail-surfacing and fallback criteria.

Co-authored-by: Frontend Developer 2 <fe-dev-2@agents.roboco.dev>

---------

Co-authored-by: Frontend Developer 1 <fe-dev-1@agents.roboco.dev>
Co-authored-by: Frontend Developer 2 <fe-dev-2@agents.roboco.dev>

* [1ea0fbcb] Backend R3: Relax legacy git schemas + fix integration tests (#206)

* [219c539b] Make task_id Optional in git request schemas and update service methods (#205)

* [219c539b] feat(git): make task_id Optional in git schemas and add None-guards in service methods

- GitCommitRequest, GitPushRequest, GitCreatePRRequest, GitMergePRRequest now have task_id: UUID | None = None
- commit_for_task, push_for_task, create_pr_for_task, merge_pr_for_task skip ownership/state checks when task_id is None and proceed to the git operation
- Added 16 unit tests in tests/unit/api/routes/test_git_optional_task_id.py covering schema validation and HTTP endpoint responses
- Added 4 integration tests in tests/integration/test_git_routes.py for no-422 behaviour
- All quality gates pass: ruff format, ruff check, mypy, pytest

* [219c539b] fix(tests): remove unused type-ignore comments, redundant cast, and invalid agent_id kwarg in git_optional_task_id unit tests

---------

Co-authored-by: Backend Developer 1 <be-dev-1@agents.roboco.dev>

* [de95ce94] test(git): fix 3 rebase integration tests to use non-protected target_branch (#203)

- Add pm_git_client fixture (CELL_PM role) needed for the role-gated rebase endpoint
- Change target_branch from 'main' to 'develop' in test_rebase_success, test_rebase_conflict, and test_rebase_git_command_error
- Remove task_id from request bodies (optional field; random UUIDs trigger 404)
- Switch all 3 rebase tests to use pm_git_client instead of git_client

Co-authored-by: Backend Developer 2 <be-dev-2@agents.roboco.dev>

---------

Co-authored-by: Backend Developer 1 <be-dev-1@agents.roboco.dev>
Co-authored-by: Backend Developer 2 <be-dev-2@agents.roboco.dev>

* chore: ruff format test_agent_image_registry.py (unblock quality gate)

---------

Co-authored-by: Backend Developer 1 <be-dev-1@agents.roboco.dev>
Co-authored-by: Backend Developer 2 <be-dev-2@agents.roboco.dev>
Co-authored-by: Frontend Developer 1 <fe-dev-1@agents.roboco.dev>
Co-authored-by: Frontend Developer 2 <fe-dev-2@agents.roboco.dev>
Co-authored-by: Renn F <rennf93@users.noreply.github.com>
2026-06-17 06:36:28 +02:00

675 lines
26 KiB
Python

"""Unit tests for GitService gateway-backfill methods.
These tests target signature-level behavior. Full integration with the
GitHub REST API + filesystem lives under integration tests; here we
mock the network and filesystem boundaries.
"""
from __future__ import annotations
from pathlib import Path
from typing import TYPE_CHECKING
from unittest.mock import AsyncMock, MagicMock, patch
from uuid import uuid4
import pytest
from roboco.api.schemas.git import GitCreateBranchRequest
from roboco.config import settings
from roboco.exceptions import GitCommandError
from roboco.services.base import NotFoundError, UnauthorizedError
from roboco.services.git import GitService
if TYPE_CHECKING:
from contextlib import AbstractContextManager
_EXPECTED_PR_NUMBER = 7
_PUSHED_COMMIT_COUNT = 2
def _make_session(execute_returns: object | None = None) -> MagicMock:
"""Build a MagicMock-backed session with execute pre-stubbed."""
session = MagicMock()
session.execute = AsyncMock(return_value=execute_returns)
session.commit = AsyncMock()
session.rollback = AsyncMock()
session.flush = AsyncMock()
return session
def _service(execute_returns: object | None = None) -> GitService:
return GitService(_make_session(execute_returns))
def _patch_project_service(project: object | None) -> AbstractContextManager[object]:
"""Patch get_project_service to return a service whose .get() resolves project."""
fake_service = MagicMock()
fake_service.get = AsyncMock(return_value=project)
fake_service.get_by_slug = AsyncMock(return_value=project)
return patch("roboco.services.git.get_project_service", return_value=fake_service)
def _bind(svc: GitService, name: str, value: object) -> None:
"""Stub `name` on `svc` without tripping mypy's method-assign check.
Uses setattr so the attribute lookup is dynamic (vs. attribute
binding to the class), letting tests override async helpers
without triggering [method-assign].
"""
object.__setattr__(svc, name, value)
# ---------------------------------------------------------------------------
# _task_for_branch + _project_slug_for_branch
# ---------------------------------------------------------------------------
@pytest.mark.asyncio
async def test_task_for_branch_returns_task_when_present() -> None:
fake_task = MagicMock(branch_name="feature/backend/abc12345")
result = MagicMock()
result.scalar_one_or_none.return_value = fake_task
svc = _service(execute_returns=result)
out = await svc._task_for_branch("feature/backend/abc12345")
assert out is fake_task
@pytest.mark.asyncio
async def test_task_for_branch_returns_none_when_missing() -> None:
result = MagicMock()
result.scalar_one_or_none.return_value = None
svc = _service(execute_returns=result)
assert await svc._task_for_branch("nope/branch") is None
@pytest.mark.asyncio
async def test_project_slug_for_branch_returns_slug() -> None:
project_id = uuid4()
fake_task = MagicMock(branch_name="feature/backend/x", project_id=project_id)
fake_project = MagicMock(slug="roboco")
svc = _service()
_bind(svc, "_task_for_branch", AsyncMock(return_value=fake_task))
with _patch_project_service(fake_project):
out = await svc._project_slug_for_branch("feature/backend/x")
assert out == "roboco"
@pytest.mark.asyncio
async def test_project_slug_for_branch_none_when_no_task() -> None:
svc = _service()
_bind(svc, "_task_for_branch", AsyncMock(return_value=None))
assert await svc._project_slug_for_branch("missing") is None
@pytest.mark.asyncio
async def test_project_for_task_resolves_coordination_root_via_product() -> None:
"""A project-less coordination root resolves its repo from the product map."""
pid = uuid4()
fake_project = MagicMock(slug="roboco")
task = MagicMock(project_id=None, product_id=uuid4())
svc = _service()
product_svc = MagicMock(distinct_project_ids=AsyncMock(return_value=[pid]))
with (
_patch_project_service(fake_project),
patch("roboco.services.product.get_product_service", return_value=product_svc),
):
out = await svc._project_for_task(task)
assert out is fake_project
product_svc.distinct_project_ids.assert_awaited_once()
@pytest.mark.asyncio
async def test_project_for_task_uses_project_id_when_present() -> None:
"""A normal task resolves by project_id exactly as before (additive change)."""
fake_project = MagicMock(slug="roboco")
task = MagicMock(project_id=uuid4(), product_id=None)
svc = _service()
with _patch_project_service(fake_project):
out = await svc._project_for_task(task)
assert out is fake_project
# ---------------------------------------------------------------------------
# push_task_branch: idempotent push at the QA-submission boundary
# ---------------------------------------------------------------------------
@pytest.mark.asyncio
async def test_push_task_branch_resolves_workspace_and_pushes() -> None:
"""Resolves the task's project + workspace, then pushes; returns the count."""
task = MagicMock(branch_name="feature/backend/abc")
project = MagicMock(slug="roboco")
svc = _service()
_bind(svc, "_assert_task_owned_with_branch", AsyncMock(return_value=task))
_bind(svc, "_project_for_task", AsyncMock(return_value=project))
_bind(svc, "get_workspace", AsyncMock(return_value=Path("/tmp/ws")))
_bind(svc, "_assert_on_task_branch", AsyncMock())
push_mock = AsyncMock(return_value=("feature/backend/abc", _PUSHED_COMMIT_COUNT))
_bind(svc, "push", push_mock)
pushed = await svc.push_task_branch(uuid4(), uuid4())
assert pushed == _PUSHED_COMMIT_COUNT
push_mock.assert_awaited_once_with(Path("/tmp/ws"))
@pytest.mark.asyncio
async def test_push_task_branch_noop_for_project_less_task() -> None:
"""A git-exempt task (no resolvable project) is a no-op, not an error."""
task = MagicMock(branch_name="feature/main_pm/abc")
svc = _service()
_bind(svc, "_assert_task_owned_with_branch", AsyncMock(return_value=task))
_bind(svc, "_project_for_task", AsyncMock(return_value=None))
push_mock = AsyncMock()
_bind(svc, "push", push_mock)
pushed = await svc.push_task_branch(uuid4(), uuid4())
assert pushed == 0
push_mock.assert_not_awaited()
# ---------------------------------------------------------------------------
# diff: derives parent + invokes git diff
# ---------------------------------------------------------------------------
@pytest.mark.asyncio
async def test_diff_returns_diff_stdout() -> None:
svc = _service()
_bind(svc, "_workspace_for_branch", AsyncMock(return_value=Path("/tmp/ws")))
async def _run_git(
_workspace: Path,
args: list[str],
check: bool = True,
token: str | None = None,
) -> MagicMock:
del check, token
if args[:1] == ["fetch"]:
return MagicMock(stdout="", returncode=0)
return MagicMock(stdout="diff --git a b\n+hello\n", returncode=0)
_bind(svc, "_run_git", AsyncMock(side_effect=_run_git))
out = await svc.diff(branch_name="feature/backend/abc")
assert "+hello" in out
@pytest.mark.asyncio
async def test_read_file_at_branch_returns_committed_content() -> None:
svc = _service()
_bind(svc, "_workspace_for_branch", AsyncMock(return_value=Path("/tmp/ws")))
_bind(svc, "_token_for_branch", AsyncMock(return_value=None))
_bind(svc, "_resolve_head_ref", AsyncMock(return_value="HEAD"))
_bind(
svc,
"_run_git",
AsyncMock(return_value=MagicMock(stdout="# API\nbody\n", returncode=0)),
)
out = await svc.read_file_at_branch(
branch_name="feature/backend/abc", path="docs/api.md"
)
assert out == "# API\nbody\n"
@pytest.mark.asyncio
async def test_read_file_at_branch_missing_returns_none() -> None:
svc = _service()
_bind(svc, "_workspace_for_branch", AsyncMock(return_value=Path("/tmp/ws")))
_bind(svc, "_token_for_branch", AsyncMock(return_value=None))
_bind(svc, "_resolve_head_ref", AsyncMock(return_value="HEAD"))
# git show on a path that isn't in the tree exits non-zero.
_bind(
svc,
"_run_git",
AsyncMock(return_value=MagicMock(stdout="", returncode=128)),
)
out = await svc.read_file_at_branch(
branch_name="feature/backend/abc", path="nope.md"
)
assert out is None
# ---------------------------------------------------------------------------
# pr_target: GitHub round-trip
# ---------------------------------------------------------------------------
@pytest.mark.asyncio
async def test_pr_target_returns_base_ref() -> None:
project_id = uuid4()
fake_task = MagicMock(project_id=project_id, assigned_to=uuid4())
fake_project = MagicMock(slug="roboco")
result = MagicMock()
result.scalar_one_or_none.return_value = fake_task
svc = _service(execute_returns=result)
_bind(svc, "get_workspace", AsyncMock(return_value=Path("/tmp/ws")))
_bind(svc, "_parse_github_remote", MagicMock(return_value=("acme", "repo")))
_bind(svc, "_get_project_token_or_raise", AsyncMock(return_value="token"))
fake_response = MagicMock()
fake_response.is_success = True
fake_response.json.return_value = {"base": {"ref": "feature/parent"}}
fake_client = MagicMock()
fake_client.__aenter__ = AsyncMock(return_value=fake_client)
fake_client.__aexit__ = AsyncMock(return_value=False)
fake_client.get = AsyncMock(return_value=fake_response)
with (
_patch_project_service(fake_project),
patch("roboco.services.git.httpx.AsyncClient", return_value=fake_client),
):
out = await svc.pr_target(42)
assert out == "feature/parent"
@pytest.mark.asyncio
async def test_pr_target_raises_when_pr_not_found() -> None:
result = MagicMock()
result.scalar_one_or_none.return_value = None
svc = _service(execute_returns=result)
with pytest.raises(NotFoundError):
await svc.pr_target(99)
# ---------------------------------------------------------------------------
# create_pr: parses response and stores PR
# ---------------------------------------------------------------------------
@pytest.mark.asyncio
async def test_create_pr_returns_pr_dict() -> None:
project_id = uuid4()
fake_task = MagicMock(
id=uuid4(),
project_id=project_id,
assigned_to=uuid4(),
title="Add login",
description="A short description",
)
fake_project = MagicMock(slug="roboco")
svc = _service()
_bind(svc, "_task_for_branch", AsyncMock(return_value=fake_task))
_bind(svc, "_workspace_for_branch", AsyncMock(return_value=Path("/tmp/ws")))
_bind(svc, "_get_project_token_or_raise", AsyncMock(return_value="tok"))
_bind(svc, "_parse_github_remote", MagicMock(return_value=("acme", "repo")))
_bind(svc, "_record_pr_atomically", AsyncMock())
# parent == default → _ensure_base_on_remote short-circuits (no git call)
_bind(svc, "_project_default_branch", AsyncMock(return_value="master"))
fake_resp = MagicMock()
fake_resp.is_success = True
fake_resp.status_code = 201
fake_resp.json.return_value = {
"number": _EXPECTED_PR_NUMBER,
"html_url": f"https://github.com/acme/repo/pull/{_EXPECTED_PR_NUMBER}",
}
_bind(svc, "_post_pr", AsyncMock(return_value=fake_resp))
with _patch_project_service(fake_project):
out = await svc.create_pr(
"feature/backend/abc12345", parent="master", is_root_pr=True
)
assert out["pr_number"] == _EXPECTED_PR_NUMBER
assert "github.com" in out["pr_url"]
assert out["is_root_pr"] is True
@pytest.mark.asyncio
async def test_create_pr_raises_when_branch_not_found() -> None:
svc = _service()
_bind(svc, "_task_for_branch", AsyncMock(return_value=None))
with pytest.raises(NotFoundError):
await svc.create_pr("missing/branch", parent="master", is_root_pr=False)
# ---------------------------------------------------------------------------
# _ensure_base_on_remote: create the PR base branch if it's missing on origin
# ---------------------------------------------------------------------------
@pytest.mark.asyncio
async def test_ensure_base_creates_missing_base_off_default() -> None:
"""Missing base branch is created on origin off the default branch tip."""
svc = _service()
_bind(svc, "_project_default_branch", AsyncMock(return_value="master"))
calls: list[list[str]] = []
async def fake_run_git(_ws: Path, args: list[str], **_: object) -> MagicMock:
calls.append(args)
if args[0] == "ls-remote":
return MagicMock(stdout="", returncode=0, stderr="") # base absent
return MagicMock(stdout="", returncode=0, stderr="")
_bind(svc, "_run_git", fake_run_git)
out = await svc._ensure_base_on_remote(
Path("/tmp/ws"), "feature/frontend/abc--def", "roboco", "tok"
)
assert out == "feature/frontend/abc--def"
assert any(
a[0] == "push" and a[-1] == "origin/master:refs/heads/feature/frontend/abc--def"
for a in calls
), calls
@pytest.mark.asyncio
async def test_ensure_base_passthrough_when_present() -> None:
"""An existing base branch is returned unchanged with no push."""
svc = _service()
_bind(svc, "_project_default_branch", AsyncMock(return_value="master"))
pushed = False
async def fake_run_git(_ws: Path, args: list[str], **_: object) -> MagicMock:
nonlocal pushed
if args[0] == "push":
pushed = True
if args[0] == "ls-remote":
return MagicMock(
stdout="sha\trefs/heads/feature/x", returncode=0, stderr=""
)
return MagicMock(stdout="", returncode=0, stderr="")
_bind(svc, "_run_git", fake_run_git)
out = await svc._ensure_base_on_remote(
Path("/tmp/ws"), "feature/x", "roboco", "tok"
)
assert out == "feature/x"
assert pushed is False
@pytest.mark.asyncio
async def test_ensure_base_falls_back_to_default_when_create_fails() -> None:
"""If the create push fails, retarget to the default branch (never 422)."""
svc = _service()
_bind(svc, "_project_default_branch", AsyncMock(return_value="master"))
async def fake_run_git(_ws: Path, args: list[str], **_: object) -> MagicMock:
if args[0] == "ls-remote":
return MagicMock(stdout="", returncode=0, stderr="")
if args[0] == "push":
return MagicMock(stdout="", returncode=1, stderr="denied")
return MagicMock(stdout="", returncode=0, stderr="")
_bind(svc, "_run_git", fake_run_git)
out = await svc._ensure_base_on_remote(
Path("/tmp/ws"), "feature/x", "roboco", "tok"
)
assert out == "master"
# ---------------------------------------------------------------------------
# pr_merge: returns merge commit dict
# ---------------------------------------------------------------------------
@pytest.mark.asyncio
async def test_pr_merge_returns_merge_commit_dict() -> None:
project_id = uuid4()
fake_task = MagicMock(
project_id=project_id,
# Root task — no parent to lock; concurrency tests cover the
# parent-lock + retry-on-409 paths separately.
parent_task_id=None,
assigned_to=uuid4(),
work_session_id=None,
)
fake_project = MagicMock(slug="roboco")
result = MagicMock()
result.scalar_one_or_none.return_value = fake_task
svc = _service(execute_returns=result)
_bind(svc, "get_workspace", AsyncMock(return_value=Path("/tmp/ws")))
_bind(svc, "_get_project_token_or_raise", AsyncMock(return_value="tok"))
_bind(svc, "_parse_github_remote", MagicMock(return_value=("acme", "repo")))
fake_resp = MagicMock(is_success=True, status_code=200)
_bind(svc, "_call_merge_api", AsyncMock(return_value=fake_resp))
_bind(svc, "_delete_pr_branch_best_effort", AsyncMock())
_bind(svc, "_sync_target_branch", AsyncMock(return_value="abc123sha"))
_bind(svc, "_project_default_branch", AsyncMock(return_value="master"))
# Merges flow UP the chain (cell -> Main-PM branch), never into master via
# this agent path — target is the integration branch, not the default branch.
with _patch_project_service(fake_project):
out = await svc.pr_merge(11, target="feature/main_pm/root1234")
assert out == {"merge_commit_sha": "abc123sha"}
@pytest.mark.asyncio
async def test_pr_merge_into_default_branch_is_ceo_only() -> None:
"""The agent merge path refuses to merge into a repo's default branch."""
fake_task = MagicMock(project_id=uuid4(), parent_task_id=None, assigned_to=uuid4())
fake_project = MagicMock(slug="roboco")
result = MagicMock()
result.scalar_one_or_none.return_value = fake_task
svc = _service(execute_returns=result)
_bind(svc, "get_workspace", AsyncMock(return_value=Path("/tmp/ws")))
_bind(svc, "_get_project_token_or_raise", AsyncMock(return_value="tok"))
_bind(svc, "_parse_github_remote", MagicMock(return_value=("acme", "repo")))
_bind(svc, "_project_default_branch", AsyncMock(return_value="master"))
merge_api = AsyncMock()
_bind(svc, "_call_merge_api", merge_api)
with (
_patch_project_service(fake_project),
pytest.raises(UnauthorizedError, match="CEO_ONLY"),
):
await svc.pr_merge(11, target="master")
# Guard fires before any GitHub merge call.
merge_api.assert_not_called()
# ---------------------------------------------------------------------------
# commit: stages + commits a large changeset with the longer git timeout
# (issue #13 — the panel commit verb timed out on the 30s default budget).
# ---------------------------------------------------------------------------
@pytest.mark.asyncio
async def test_commit_uses_longer_timeout_for_staging_and_commit() -> None:
"""`add`/`commit` must run with the commit-timeout, not the default.
Large multi-file changesets exceeded the 30s default git timeout. The
staging (`git add`) and `git commit` ops now pass
`settings.git_commit_timeout_seconds` so big changesets don't time out.
"""
svc = _service()
_bind(svc, "_workspace_for_branch", AsyncMock(return_value=Path("/tmp/ws")))
_bind(svc, "_assert_on_task_branch", AsyncMock())
_bind(svc, "_task_for_branch", AsyncMock(return_value=None))
_bind(svc, "_parse_commit_stats", MagicMock(return_value=(1, 0, 1)))
timeouts_by_subcmd: dict[str, int | None] = {}
async def _run_git(
_workspace: Path,
args: list[str],
check: bool = True,
token: str | None = None,
timeout: int | None = None,
) -> MagicMock:
del check, token
timeouts_by_subcmd[args[0]] = timeout
if args[:2] == ["log", "-1"]:
return MagicMock(stdout="deadbeef|feat: big change\n", returncode=0)
return MagicMock(stdout="", returncode=0)
_bind(svc, "_run_git", AsyncMock(side_effect=_run_git))
out = await svc.commit(
branch_name="feature/frontend/abc12345",
message="implement the panel dashboard layout and routing",
task_id=uuid4(),
)
assert out["sha"] == "deadbeef"
# Staging + commit ran with the longer commit budget...
assert timeouts_by_subcmd["add"] == settings.git_commit_timeout_seconds
assert timeouts_by_subcmd["commit"] == settings.git_commit_timeout_seconds
# ...while the cheap read-only ops kept the default (None → default budget).
assert timeouts_by_subcmd["log"] is None
@pytest.mark.asyncio
async def test_create_branch_idempotent_when_branch_already_exists() -> None:
# A prior attempt may have created the branch on disk before the DB recorded
# branch_name; `checkout -b` then fails 128. create_branch must switch to the
# existing branch instead of raising (the raise triggered a retry cascade).
branch = "feature/backend/abc12345--def67890"
svc = _service()
object.__setattr__(svc, "_resolve_base_branch", AsyncMock(return_value="master"))
object.__setattr__(svc, "_project_default_branch", AsyncMock(return_value="master"))
object.__setattr__(svc, "_token_for_project", AsyncMock(return_value=None))
object.__setattr__(
svc, "_checkout_base_with_fallback", AsyncMock(return_value="master")
)
calls: list[list[str]] = []
async def fake_run_git(
_workspace: object, args: list[str], **_kw: object
) -> object:
calls.append(list(args))
rc = 1 if list(args[:2]) == ["checkout", "-b"] else 0
return MagicMock(stdout="", returncode=rc)
object.__setattr__(svc, "_run_git", fake_run_git)
with (
patch("roboco.services.git.build_branch_name", AsyncMock(return_value=branch)),
patch(
"roboco.services.git.get_task_service",
MagicMock(return_value=MagicMock(update=AsyncMock())),
),
):
await svc.create_branch(
Path("/tmp/ws"),
"backend",
GitCreateBranchRequest(
project_slug="roboco-api",
task_id=uuid4(),
branch_type="feature",
parent_branch=None,
),
)
assert ["checkout", "-b", branch] in calls, "checkout -b attempted"
assert ["checkout", branch] in calls, "fell back to existing branch on 128"
def _create_branch_stubs(svc: GitService) -> None:
object.__setattr__(svc, "_resolve_base_branch", AsyncMock(return_value="master"))
object.__setattr__(svc, "_project_default_branch", AsyncMock(return_value="master"))
object.__setattr__(svc, "_token_for_project", AsyncMock(return_value=None))
object.__setattr__(
svc, "_checkout_base_with_fallback", AsyncMock(return_value="master")
)
async def _run_create_branch_with_existing_branch(
svc: GitService, branch: str, unique_commits: str
) -> list[list[str]]:
"""Drive create_branch where `checkout -b` fails (branch exists) and the
branch has `unique_commits` commits of its own. Returns the git argv calls.
"""
calls: list[list[str]] = []
async def fake_run_git(
_workspace: object, args: list[str], **_kw: object
) -> object:
calls.append(list(args))
if list(args[:2]) == ["checkout", "-b"]:
return MagicMock(stdout="", returncode=1) # branch already exists
if list(args[:2]) == ["rev-list", "--count"]:
return MagicMock(stdout=f"{unique_commits}\n", returncode=0)
return MagicMock(stdout="", returncode=0)
object.__setattr__(svc, "_run_git", fake_run_git)
with (
patch("roboco.services.git.build_branch_name", AsyncMock(return_value=branch)),
patch(
"roboco.services.git.get_task_service",
MagicMock(return_value=MagicMock(update=AsyncMock())),
),
):
await svc.create_branch(
Path("/tmp/ws"),
"frontend",
GitCreateBranchRequest(
project_slug="roboco-panel",
task_id=uuid4(),
branch_type="feature",
parent_branch=None,
),
)
return calls
@pytest.mark.asyncio
async def test_create_branch_refreshes_no_work_existing_branch_to_base() -> None:
"""An existing branch with no commits of its own is re-pointed at the fresh
base — a dependency-blocked task re-claimed after its upstream merged must
not keep building on the stale snapshot."""
svc = _service()
_create_branch_stubs(svc)
calls = await _run_create_branch_with_existing_branch(
svc, "feature/frontend/abc12345--def67890", unique_commits="0"
)
assert ["reset", "--hard", "master"] in calls, (
"a no-work existing branch must be reset onto the fresh base"
)
@pytest.mark.asyncio
async def test_create_branch_keeps_existing_branch_that_has_work() -> None:
"""An existing branch carrying its own commits is NOT reset (work preserved)."""
svc = _service()
_create_branch_stubs(svc)
calls = await _run_create_branch_with_existing_branch(
svc, "feature/frontend/abc12345--def67890", unique_commits="3"
)
assert not any(c[:2] == ["reset", "--hard"] for c in calls), (
"a branch with real work must never be reset"
)
@pytest.mark.asyncio
async def test_push_restates_gh001_as_permanent() -> None:
"""A >100MB push rejection (GH001) is re-raised with a clear, permanent
message that points at i_am_blocked — not the raw output an agent mis-reads
as a transient timeout and blind-retries."""
svc = _service()
_bind(svc, "get_current_branch", AsyncMock(return_value="feature/x"))
_bind(svc, "_token_for_workspace", AsyncMock(return_value=None))
async def _run_git(_workspace: object, args: list[str], **_kw: object) -> object:
if args[:1] == ["push"]:
raise GitCommandError(
"git push",
"remote: error: GH001: large.bin is 115.00 MB; this exceeds "
"GitHub's file size limit of 100.00 MB",
)
return MagicMock(returncode=0, stdout="1", stderr="")
_bind(svc, "_run_git", AsyncMock(side_effect=_run_git))
with pytest.raises(GitCommandError, match="i_am_blocked"):
await svc.push(Path("/tmp/ws"))
@pytest.mark.asyncio
async def test_push_propagates_non_gh001_error_unchanged() -> None:
"""A non-size push failure is re-raised as-is (not reclassified)."""
svc = _service()
_bind(svc, "get_current_branch", AsyncMock(return_value="feature/x"))
_bind(svc, "_token_for_workspace", AsyncMock(return_value=None))
async def _run_git(_workspace: object, args: list[str], **_kw: object) -> object:
if args[:1] == ["push"]:
raise GitCommandError("git push", "fatal: Authentication failed")
return MagicMock(returncode=0, stdout="1", stderr="")
_bind(svc, "_run_git", AsyncMock(side_effect=_run_git))
with pytest.raises(GitCommandError, match="Authentication failed"):
await svc.push(Path("/tmp/ws"))