steerdev 1.1.43__tar.gz → 1.1.44__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {steerdev-1.1.43 → steerdev-1.1.44}/PKG-INFO +1 -1
- {steerdev-1.1.43 → steerdev-1.1.44}/pyproject.toml +1 -1
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/cli.py +17 -39
- steerdev-1.1.44/src/steerdev_agent/git/pr.py +192 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/runner.py +64 -0
- steerdev-1.1.44/tests/test_git_pr.py +210 -0
- steerdev-1.1.44/tests/test_runner_wave_pr.py +83 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/.github/workflows/pre-commit.yml +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/.github/workflows/publish.yml +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/.gitignore +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/.pre-commit-config.yaml +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/AGENTS.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/CLAUDE.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/README.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/docs/superpowers/plans/2026-06-05-wave-id-implies-unlimited-max-tasks.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/docs/superpowers/specs/2026-06-05-wave-id-implies-unlimited-max-tasks-design.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/scripts/pre-commit-version-bump.sh +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/snapshots/steerdev-agent-v1/Dockerfile +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/snapshots/steerdev-agent-v1/start-agent.sh +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/__init__.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/agent_loop.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/__init__.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/activity.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/agents.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/canals.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/client.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/commands.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/configs.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/context.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/events.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/hooks.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/implementation_plan.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/merger.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/messages.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/prd.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/reports.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/runs.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/sessions.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/specs.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/tasks.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/workflow_runs.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/api/workflows.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/config/__init__.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/config/models.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/config/platform.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/config/settings.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/evidence.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/evidence_assets.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/executor/__init__.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/executor/base.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/executor/claude.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/executor/stream.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/git/__init__.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/git/commit.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/git_ops.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/handlers/__init__.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/handlers/prd.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/integration.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/prompt/__init__.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/prompt/builder.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/prompt/templates.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/prompt/workflow_template.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/py.typed +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/retry.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/__init__.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/claude_setup.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/repo_setup.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/ci/canal-integration.yml +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/claude_md_section.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/settings.json +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/skills/steerdev-activity-skill/SKILL.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/skills/steerdev-canal-workflow-skill/SKILL.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/skills/steerdev-context-skill/SKILL.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/skills/steerdev-git-workflow-skill/SKILL.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/skills/steerdev-merge-into-canal-skill/SKILL.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/skills/steerdev-progress-logging-skill/SKILL.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/skills/steerdev-single-task-merge-skill/SKILL.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/skills/steerdev-specs-management-skill/SKILL.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/skills/steerdev-task-management-skill/SKILL.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/skills/steerdev-wave-tasks-merge-skill/SKILL.md +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/steerdev.yaml +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/worktrunk.config.toml +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/update_check.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/version.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/workflow/__init__.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/workflow/context.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/workflow/executor.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/workflow/memory.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/workspace/__init__.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/workspace/preparation.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/workspace/project_manager.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/workspace/tool_detection.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/worktree.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/__init__.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_agent_loop.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_agent_loop_extended.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_agents_api.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_api_client.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_claude_executor.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_claude_setup.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_client_methods.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_commands_api.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_config.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_config_extended.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_conflict_mitigation.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_context_search.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_executor.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_git_commit.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_git_ops.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_hooks_post_tool_use.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_platform_config.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_preparation.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_preparation_provenance.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_prompt.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_reports_client.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_resolve_max_tasks.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_retry.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_runner_boundary_commit.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_runner_merge_modes.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_runner_worktrees.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_stream_parser.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_tasks.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_tasks_update_branch.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_version.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_wave_scoped_fetch.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_workflow_context.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_workflow_memory.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_workflow_prompt_template.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_workflow_runs_api.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_workspace.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_workspace_extended.py +0 -0
- {steerdev-1.1.43 → steerdev-1.1.44}/tests/test_worktree.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: steerdev
|
|
3
|
-
Version: 1.1.
|
|
3
|
+
Version: 1.1.44
|
|
4
4
|
Summary: Backend task runner for steerdev.com - orchestrates CLI coding agents with activity reporting
|
|
5
5
|
Project-URL: Homepage, https://github.com/pentoai/steerdev-agent
|
|
6
6
|
Project-URL: Repository, https://github.com/pentoai/steerdev-agent
|
|
@@ -1365,7 +1365,11 @@ def git_pr(
|
|
|
1365
1365
|
steerdev git pr --title "Add auth" --body "Implements JWT auth"
|
|
1366
1366
|
steerdev git pr --title "Add auth" --task-id abc123...
|
|
1367
1367
|
"""
|
|
1368
|
-
import
|
|
1368
|
+
from steerdev_agent.git.pr import (
|
|
1369
|
+
STEERDEV_SIGNATURE,
|
|
1370
|
+
create_pr,
|
|
1371
|
+
resolve_task_base_branch,
|
|
1372
|
+
)
|
|
1369
1373
|
|
|
1370
1374
|
# Build PR body
|
|
1371
1375
|
pr_body = body or ""
|
|
@@ -1374,49 +1378,23 @@ def git_pr(
|
|
|
1374
1378
|
pr_body += task_ref
|
|
1375
1379
|
|
|
1376
1380
|
# Add steerdev signature
|
|
1377
|
-
pr_body +=
|
|
1381
|
+
pr_body += STEERDEV_SIGNATURE
|
|
1378
1382
|
|
|
1379
1383
|
# Prefer the persisted base branch so the PR targets the correct base.
|
|
1380
|
-
|
|
1384
|
+
base_branch = resolve_task_base_branch(task_id)
|
|
1381
1385
|
|
|
1382
|
-
|
|
1383
|
-
if
|
|
1384
|
-
|
|
1385
|
-
|
|
1386
|
-
if pr_client.check_api_key():
|
|
1387
|
-
task = pr_client.get_task(task_id)
|
|
1388
|
-
if task:
|
|
1389
|
-
base_branch = task.get("base_branch")
|
|
1390
|
-
except Exception: # fall back to gh default base
|
|
1391
|
-
base_branch = None
|
|
1392
|
-
|
|
1393
|
-
try:
|
|
1394
|
-
# Build the gh pr create command
|
|
1395
|
-
cmd = ["gh", "pr", "create", "--title", title, "--body", pr_body]
|
|
1396
|
-
if base_branch:
|
|
1397
|
-
cmd += ["--base", base_branch]
|
|
1398
|
-
if draft:
|
|
1399
|
-
cmd.append("--draft")
|
|
1400
|
-
|
|
1401
|
-
result = subprocess.run(cmd, capture_output=True, text=True)
|
|
1402
|
-
|
|
1403
|
-
if result.returncode != 0:
|
|
1404
|
-
console.print(f"[red]Error creating PR: {result.stderr}[/red]")
|
|
1405
|
-
raise typer.Exit(1)
|
|
1386
|
+
result = create_pr(title, pr_body, base_branch=base_branch, draft=draft)
|
|
1387
|
+
if not result.created:
|
|
1388
|
+
console.print(f"[red]Error creating PR: {result.error}[/red]")
|
|
1389
|
+
raise typer.Exit(1)
|
|
1406
1390
|
|
|
1407
|
-
|
|
1408
|
-
|
|
1409
|
-
|
|
1410
|
-
|
|
1411
|
-
|
|
1412
|
-
title="Success",
|
|
1413
|
-
border_style="green",
|
|
1414
|
-
)
|
|
1391
|
+
console.print(
|
|
1392
|
+
Panel(
|
|
1393
|
+
f"[bold green]Pull request created[/bold green]\n\nTitle: {title}\nURL: {result.url}",
|
|
1394
|
+
title="Success",
|
|
1395
|
+
border_style="green",
|
|
1415
1396
|
)
|
|
1416
|
-
|
|
1417
|
-
except FileNotFoundError:
|
|
1418
|
-
console.print("[red]Error: gh not found. Install GitHub CLI: https://cli.github.com[/red]")
|
|
1419
|
-
raise typer.Exit(1) from None
|
|
1397
|
+
)
|
|
1420
1398
|
|
|
1421
1399
|
|
|
1422
1400
|
@git_app.command("status")
|
|
@@ -0,0 +1,192 @@
|
|
|
1
|
+
"""Pull-request helpers shared by the CLI and the runner's wave PR safety net.
|
|
2
|
+
|
|
3
|
+
The wave-tasks-merge skill instructs the agent to open a PR at wave end, but
|
|
4
|
+
nothing guarantees the agent does. `ensure_wave_pr` is the deterministic
|
|
5
|
+
fallback: at wave completion the runner checks whether a PR already exists for
|
|
6
|
+
the wave branch and creates one if not.
|
|
7
|
+
|
|
8
|
+
All functions are best-effort and never raise — a PR failure must never break
|
|
9
|
+
the run. Synchronous, mirroring `git_ops` (these run once at wave end, outside
|
|
10
|
+
the hot path).
|
|
11
|
+
"""
|
|
12
|
+
|
|
13
|
+
from __future__ import annotations
|
|
14
|
+
|
|
15
|
+
import json
|
|
16
|
+
import shutil
|
|
17
|
+
import subprocess
|
|
18
|
+
from dataclasses import dataclass
|
|
19
|
+
from typing import TYPE_CHECKING, Any
|
|
20
|
+
|
|
21
|
+
from loguru import logger
|
|
22
|
+
|
|
23
|
+
from steerdev_agent.git_ops import current_branch
|
|
24
|
+
|
|
25
|
+
if TYPE_CHECKING:
|
|
26
|
+
from pathlib import Path
|
|
27
|
+
|
|
28
|
+
from steerdev_agent.prompt.builder import WaveContext
|
|
29
|
+
|
|
30
|
+
_GH_TIMEOUT = 60 # seconds; gh talks to the GitHub API
|
|
31
|
+
|
|
32
|
+
STEERDEV_SIGNATURE = "\n\n---\nCreated with [steerdev](https://steerdev.com)"
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
@dataclass
|
|
36
|
+
class PrResult:
|
|
37
|
+
"""Outcome of a `gh pr create` invocation."""
|
|
38
|
+
|
|
39
|
+
created: bool
|
|
40
|
+
url: str | None = None
|
|
41
|
+
error: str | None = None
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
def _run_gh(cwd: str | Path | None, *args: str) -> tuple[int, str, str]:
|
|
45
|
+
"""Run gh, returning (returncode, stdout, stderr). Raises only on missing gh/timeout."""
|
|
46
|
+
proc = subprocess.run(
|
|
47
|
+
["gh", *args],
|
|
48
|
+
cwd=str(cwd) if cwd else None,
|
|
49
|
+
capture_output=True,
|
|
50
|
+
text=True,
|
|
51
|
+
timeout=_GH_TIMEOUT,
|
|
52
|
+
)
|
|
53
|
+
return proc.returncode, (proc.stdout or "").strip(), (proc.stderr or "").strip()
|
|
54
|
+
|
|
55
|
+
|
|
56
|
+
def find_existing_pr(cwd: str | Path | None, branch: str) -> str:
|
|
57
|
+
"""Check whether a PR (any state) already exists for *branch*.
|
|
58
|
+
|
|
59
|
+
Returns one of:
|
|
60
|
+
"exists", "none", "unknown" (gh missing or the lookup failed).
|
|
61
|
+
"""
|
|
62
|
+
try:
|
|
63
|
+
if shutil.which("gh") is None:
|
|
64
|
+
logger.warning("find_existing_pr: gh not found")
|
|
65
|
+
return "unknown"
|
|
66
|
+
rc, out, err = _run_gh(
|
|
67
|
+
cwd, "pr", "list", "--head", branch, "--state", "all", "--json", "number,state"
|
|
68
|
+
)
|
|
69
|
+
if rc != 0:
|
|
70
|
+
logger.warning(f"find_existing_pr: gh pr list failed (non-fatal): {err}")
|
|
71
|
+
return "unknown"
|
|
72
|
+
return "exists" if json.loads(out or "[]") else "none"
|
|
73
|
+
except Exception as exc: # broad catch intentional: durability must never break the run
|
|
74
|
+
logger.warning(f"find_existing_pr: unexpected error (non-fatal): {exc}")
|
|
75
|
+
return "unknown"
|
|
76
|
+
|
|
77
|
+
|
|
78
|
+
def create_pr(
|
|
79
|
+
title: str,
|
|
80
|
+
body: str,
|
|
81
|
+
*,
|
|
82
|
+
cwd: str | Path | None = None,
|
|
83
|
+
base_branch: str | None = None,
|
|
84
|
+
draft: bool = False,
|
|
85
|
+
) -> PrResult:
|
|
86
|
+
"""Create a PR for the current branch via `gh pr create`. Never raises."""
|
|
87
|
+
try:
|
|
88
|
+
cmd = ["pr", "create", "--title", title, "--body", body]
|
|
89
|
+
if base_branch:
|
|
90
|
+
cmd += ["--base", base_branch]
|
|
91
|
+
if draft:
|
|
92
|
+
cmd.append("--draft")
|
|
93
|
+
|
|
94
|
+
rc, out, err = _run_gh(cwd, *cmd)
|
|
95
|
+
if rc != 0:
|
|
96
|
+
return PrResult(created=False, error=err or out)
|
|
97
|
+
return PrResult(created=True, url=out)
|
|
98
|
+
except FileNotFoundError:
|
|
99
|
+
return PrResult(
|
|
100
|
+
created=False, error="gh not found. Install GitHub CLI: https://cli.github.com"
|
|
101
|
+
)
|
|
102
|
+
except Exception as exc: # broad catch intentional: durability must never break the run
|
|
103
|
+
return PrResult(created=False, error=str(exc))
|
|
104
|
+
|
|
105
|
+
|
|
106
|
+
def resolve_task_base_branch(task_id: str | None, api_key: str | None = None) -> str | None:
|
|
107
|
+
"""Resolve the persisted PR base from a task's `base_branch`, if available.
|
|
108
|
+
|
|
109
|
+
For a stacked wave this is the predecessor wave's branch. Falls back to
|
|
110
|
+
None (gh's default base) on any failure.
|
|
111
|
+
"""
|
|
112
|
+
if not task_id:
|
|
113
|
+
return None
|
|
114
|
+
try:
|
|
115
|
+
from steerdev_agent.api.tasks import TasksClient
|
|
116
|
+
|
|
117
|
+
with TasksClient(api_key=api_key) as client:
|
|
118
|
+
if not client.check_api_key():
|
|
119
|
+
return None
|
|
120
|
+
task = client.get_task(task_id)
|
|
121
|
+
return task.get("base_branch") if task else None
|
|
122
|
+
except Exception: # fall back to gh default base
|
|
123
|
+
logger.debug("resolve_task_base_branch: lookup failed", exc_info=True)
|
|
124
|
+
return None
|
|
125
|
+
|
|
126
|
+
|
|
127
|
+
def build_wave_pr_title(wave_context: WaveContext) -> str:
|
|
128
|
+
"""Build the fallback PR title for a completed wave."""
|
|
129
|
+
name = (wave_context.wave_name or "").strip()
|
|
130
|
+
if name and name != f"wave-{wave_context.wave_number}":
|
|
131
|
+
return f"Wave {wave_context.wave_number}: {name}"
|
|
132
|
+
return f"Wave {wave_context.wave_number}"
|
|
133
|
+
|
|
134
|
+
|
|
135
|
+
def build_wave_pr_body(completed_tasks: list[dict[str, Any]]) -> str:
|
|
136
|
+
"""Build the fallback PR body: one bullet per completed task, plus signature."""
|
|
137
|
+
lines = ["## Completed tasks", ""]
|
|
138
|
+
for task in completed_tasks:
|
|
139
|
+
task_id = task.get("id", "unknown")
|
|
140
|
+
short = task_id[:8] if len(task_id) > 8 else task_id
|
|
141
|
+
title = (task.get("title") or "").strip() or "(untitled)"
|
|
142
|
+
lines.append(f"- `{short}` {title}")
|
|
143
|
+
if not completed_tasks:
|
|
144
|
+
lines.append("- (no task summary available)")
|
|
145
|
+
return "\n".join(lines) + STEERDEV_SIGNATURE
|
|
146
|
+
|
|
147
|
+
|
|
148
|
+
def ensure_wave_pr(
|
|
149
|
+
cwd: str | Path,
|
|
150
|
+
wave_context: WaveContext,
|
|
151
|
+
completed_tasks: list[dict[str, Any]],
|
|
152
|
+
api_key: str | None = None,
|
|
153
|
+
) -> str:
|
|
154
|
+
"""Create the wave PR if the agent didn't. Best-effort; never raises.
|
|
155
|
+
|
|
156
|
+
Returns one of:
|
|
157
|
+
"created", "already_exists", "skipped_detached", "failed".
|
|
158
|
+
"""
|
|
159
|
+
try:
|
|
160
|
+
branch = current_branch(cwd)
|
|
161
|
+
if branch is None:
|
|
162
|
+
logger.info("ensure_wave_pr: detached HEAD, skipping")
|
|
163
|
+
return "skipped_detached"
|
|
164
|
+
|
|
165
|
+
existing = find_existing_pr(cwd, branch)
|
|
166
|
+
if existing == "exists":
|
|
167
|
+
logger.info(f"ensure_wave_pr: PR already exists for {branch}, skipping")
|
|
168
|
+
return "already_exists"
|
|
169
|
+
if existing == "unknown":
|
|
170
|
+
logger.warning("ensure_wave_pr: could not check for existing PR, skipping")
|
|
171
|
+
return "failed"
|
|
172
|
+
|
|
173
|
+
last_task = completed_tasks[-1] if completed_tasks else None
|
|
174
|
+
base_branch = resolve_task_base_branch(
|
|
175
|
+
last_task.get("id") if last_task else None, api_key=api_key
|
|
176
|
+
)
|
|
177
|
+
|
|
178
|
+
result = create_pr(
|
|
179
|
+
build_wave_pr_title(wave_context),
|
|
180
|
+
build_wave_pr_body(completed_tasks),
|
|
181
|
+
cwd=cwd,
|
|
182
|
+
base_branch=base_branch,
|
|
183
|
+
)
|
|
184
|
+
if not result.created:
|
|
185
|
+
logger.warning(f"ensure_wave_pr: PR creation failed (non-fatal): {result.error}")
|
|
186
|
+
return "failed"
|
|
187
|
+
|
|
188
|
+
logger.info(f"ensure_wave_pr: created PR for {branch}: {result.url}")
|
|
189
|
+
return "created"
|
|
190
|
+
except Exception as exc: # broad catch intentional: durability must never break the run
|
|
191
|
+
logger.warning(f"ensure_wave_pr: unexpected error (non-fatal): {exc}")
|
|
192
|
+
return "failed"
|
|
@@ -30,6 +30,7 @@ from steerdev_agent.executor import ExecutorFactory
|
|
|
30
30
|
from steerdev_agent.executor.base import AgentExecutor, EventType, StreamEvent
|
|
31
31
|
from steerdev_agent.executor.claude import ClaudeExecutorError
|
|
32
32
|
from steerdev_agent.git.commit import commit_task_boundary
|
|
33
|
+
from steerdev_agent.git.pr import ensure_wave_pr
|
|
33
34
|
from steerdev_agent.git_ops import checkpoint_push
|
|
34
35
|
from steerdev_agent.prompt.builder import (
|
|
35
36
|
ProjectContext,
|
|
@@ -248,6 +249,11 @@ def compute_worktree_name(task_id: str, wave_context: WaveContext | None = None)
|
|
|
248
249
|
return f"task-{task_short}"
|
|
249
250
|
|
|
250
251
|
|
|
252
|
+
def wave_identity(wave_context: WaveContext) -> str:
|
|
253
|
+
"""Stable identity for a wave; matches the wave branch/worktree naming."""
|
|
254
|
+
return wave_context.wave_name or f"wave-{wave_context.wave_number}"
|
|
255
|
+
|
|
256
|
+
|
|
251
257
|
def build_workflow_task_context(
|
|
252
258
|
task: dict[str, Any],
|
|
253
259
|
wave_context: WaveContext | None,
|
|
@@ -409,6 +415,11 @@ class Runner:
|
|
|
409
415
|
self._tasks_failed = 0
|
|
410
416
|
self._events_sent = 0
|
|
411
417
|
|
|
418
|
+
# Wave PR safety-net state (see _maybe_create_wave_pr)
|
|
419
|
+
self._last_wave_ctx: WaveContext | None = None
|
|
420
|
+
self._wave_completed_tasks: list[dict[str, Any]] = []
|
|
421
|
+
self._wave_working_dir: str | None = None
|
|
422
|
+
|
|
412
423
|
# Components
|
|
413
424
|
self._sessions_client: SessionsClient | None = None
|
|
414
425
|
self._events_client: EventsClient | None = None
|
|
@@ -983,6 +994,7 @@ class Runner:
|
|
|
983
994
|
"exit_code": exit_code,
|
|
984
995
|
"agent_session_id": agent_session_id,
|
|
985
996
|
"events_sent": self._events_sent,
|
|
997
|
+
"working_dir": str(effective_working_dir),
|
|
986
998
|
}
|
|
987
999
|
|
|
988
1000
|
except (KeyboardInterrupt, asyncio.CancelledError):
|
|
@@ -1140,6 +1152,7 @@ class Runner:
|
|
|
1140
1152
|
"phases_completed": phases_completed,
|
|
1141
1153
|
"phases_failed": phases_failed,
|
|
1142
1154
|
"total_phases": total_phases,
|
|
1155
|
+
"working_dir": str(effective_working_dir),
|
|
1143
1156
|
}
|
|
1144
1157
|
|
|
1145
1158
|
except Exception as e:
|
|
@@ -1267,8 +1280,20 @@ class Runner:
|
|
|
1267
1280
|
console.print("[yellow]No tasks available[/yellow]")
|
|
1268
1281
|
else:
|
|
1269
1282
|
console.print("[yellow]No more tasks available[/yellow]")
|
|
1283
|
+
# No more wave tasks → the wave is done; make sure its PR exists.
|
|
1284
|
+
self._maybe_create_wave_pr()
|
|
1270
1285
|
break
|
|
1271
1286
|
|
|
1287
|
+
# Moving on to a different wave means the previous one
|
|
1288
|
+
# completed — flush its PR safety net before tracking the new
|
|
1289
|
+
# wave.
|
|
1290
|
+
if (
|
|
1291
|
+
wave_ctx is not None
|
|
1292
|
+
and self._last_wave_ctx is not None
|
|
1293
|
+
and wave_identity(wave_ctx) != wave_identity(self._last_wave_ctx)
|
|
1294
|
+
):
|
|
1295
|
+
self._maybe_create_wave_pr()
|
|
1296
|
+
|
|
1272
1297
|
# Resolve workflow: force override > API suggestion > none
|
|
1273
1298
|
per_task_workflow_id = self.workflow_id or suggested_workflow_id
|
|
1274
1299
|
|
|
@@ -1296,6 +1321,14 @@ class Runner:
|
|
|
1296
1321
|
if result.get("success"):
|
|
1297
1322
|
self._tasks_succeeded += 1
|
|
1298
1323
|
console.print("[green]Task completed successfully[/green]")
|
|
1324
|
+
if wave_ctx is not None:
|
|
1325
|
+
# Track wave progress for the PR safety net.
|
|
1326
|
+
self._last_wave_ctx = wave_ctx
|
|
1327
|
+
self._wave_completed_tasks.append(
|
|
1328
|
+
{"id": task.get("id"), "title": task.get("title")}
|
|
1329
|
+
)
|
|
1330
|
+
if result.get("working_dir"):
|
|
1331
|
+
self._wave_working_dir = result["working_dir"]
|
|
1299
1332
|
else:
|
|
1300
1333
|
self._tasks_failed += 1
|
|
1301
1334
|
console.print(f"[red]Task failed: {result.get('error', 'Unknown')}[/red]")
|
|
@@ -1388,6 +1421,37 @@ class Runner:
|
|
|
1388
1421
|
"error": str(run_error) if run_error else None,
|
|
1389
1422
|
}
|
|
1390
1423
|
|
|
1424
|
+
def _maybe_create_wave_pr(self) -> None:
|
|
1425
|
+
"""Wave PR safety net: create the wave PR if the agent didn't.
|
|
1426
|
+
|
|
1427
|
+
Fires when a wave finishes — either no more wave tasks come back, or
|
|
1428
|
+
the run moves on to a different wave. The wave-tasks-merge skill
|
|
1429
|
+
normally has the agent create a richer PR; this only acts when no PR
|
|
1430
|
+
exists for the wave branch yet. Best-effort: never raises, never fails
|
|
1431
|
+
the run. Always resets the tracked wave state.
|
|
1432
|
+
"""
|
|
1433
|
+
wave_ctx = self._last_wave_ctx
|
|
1434
|
+
try:
|
|
1435
|
+
if wave_ctx is None or self.dry_run:
|
|
1436
|
+
return
|
|
1437
|
+
working_dir = self._wave_working_dir or str(self.working_directory)
|
|
1438
|
+
status = ensure_wave_pr(
|
|
1439
|
+
working_dir,
|
|
1440
|
+
wave_ctx,
|
|
1441
|
+
self._wave_completed_tasks,
|
|
1442
|
+
api_key=self._api_key,
|
|
1443
|
+
)
|
|
1444
|
+
if status == "created":
|
|
1445
|
+
console.print("[green]Wave PR created (safety net)[/green]")
|
|
1446
|
+
else:
|
|
1447
|
+
logger.info(f"Wave PR safety net: {status}")
|
|
1448
|
+
except Exception: # broad catch intentional: safety net must never break the run
|
|
1449
|
+
logger.warning("Wave PR safety net failed (non-fatal)", exc_info=True)
|
|
1450
|
+
finally:
|
|
1451
|
+
self._last_wave_ctx = None
|
|
1452
|
+
self._wave_completed_tasks = []
|
|
1453
|
+
self._wave_working_dir = None
|
|
1454
|
+
|
|
1391
1455
|
async def resume(
|
|
1392
1456
|
self,
|
|
1393
1457
|
session_id: str,
|
|
@@ -0,0 +1,210 @@
|
|
|
1
|
+
"""Tests for the shared PR helpers (steerdev_agent.git.pr)."""
|
|
2
|
+
|
|
3
|
+
from unittest.mock import MagicMock, patch
|
|
4
|
+
|
|
5
|
+
from steerdev_agent.git.pr import (
|
|
6
|
+
STEERDEV_SIGNATURE,
|
|
7
|
+
build_wave_pr_body,
|
|
8
|
+
build_wave_pr_title,
|
|
9
|
+
create_pr,
|
|
10
|
+
ensure_wave_pr,
|
|
11
|
+
find_existing_pr,
|
|
12
|
+
)
|
|
13
|
+
from tests.test_runner_merge_modes import _make_wave_context
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
def _proc(returncode=0, stdout="", stderr=""):
|
|
17
|
+
proc = MagicMock()
|
|
18
|
+
proc.returncode = returncode
|
|
19
|
+
proc.stdout = stdout
|
|
20
|
+
proc.stderr = stderr
|
|
21
|
+
return proc
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
# ---------------------------------------------------------------- create_pr
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
def test_create_pr_builds_gh_command():
|
|
28
|
+
with patch("steerdev_agent.git.pr.subprocess.run") as run:
|
|
29
|
+
run.return_value = _proc(stdout="https://github.com/o/r/pull/1\n")
|
|
30
|
+
result = create_pr("My title", "My body", base_branch="wave-1", draft=True)
|
|
31
|
+
|
|
32
|
+
assert result.created
|
|
33
|
+
assert result.url == "https://github.com/o/r/pull/1"
|
|
34
|
+
cmd = run.call_args.args[0]
|
|
35
|
+
assert cmd == [
|
|
36
|
+
"gh",
|
|
37
|
+
"pr",
|
|
38
|
+
"create",
|
|
39
|
+
"--title",
|
|
40
|
+
"My title",
|
|
41
|
+
"--body",
|
|
42
|
+
"My body",
|
|
43
|
+
"--base",
|
|
44
|
+
"wave-1",
|
|
45
|
+
"--draft",
|
|
46
|
+
]
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
def test_create_pr_omits_base_and_draft_by_default():
|
|
50
|
+
with patch("steerdev_agent.git.pr.subprocess.run") as run:
|
|
51
|
+
run.return_value = _proc(stdout="url")
|
|
52
|
+
create_pr("t", "b")
|
|
53
|
+
|
|
54
|
+
cmd = run.call_args.args[0]
|
|
55
|
+
assert "--base" not in cmd
|
|
56
|
+
assert "--draft" not in cmd
|
|
57
|
+
|
|
58
|
+
|
|
59
|
+
def test_create_pr_failure_returns_error():
|
|
60
|
+
with patch("steerdev_agent.git.pr.subprocess.run") as run:
|
|
61
|
+
run.return_value = _proc(returncode=1, stderr="no commits between main and wave-1")
|
|
62
|
+
result = create_pr("t", "b")
|
|
63
|
+
|
|
64
|
+
assert not result.created
|
|
65
|
+
assert "no commits" in (result.error or "")
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
def test_create_pr_handles_missing_gh():
|
|
69
|
+
with patch("steerdev_agent.git.pr.subprocess.run", side_effect=FileNotFoundError):
|
|
70
|
+
result = create_pr("t", "b")
|
|
71
|
+
|
|
72
|
+
assert not result.created
|
|
73
|
+
assert "gh not found" in (result.error or "")
|
|
74
|
+
|
|
75
|
+
|
|
76
|
+
# ---------------------------------------------------------- find_existing_pr
|
|
77
|
+
|
|
78
|
+
|
|
79
|
+
def test_find_existing_pr_exists(tmp_path):
|
|
80
|
+
with (
|
|
81
|
+
patch("steerdev_agent.git.pr.shutil.which", return_value="/usr/bin/gh"),
|
|
82
|
+
patch("steerdev_agent.git.pr.subprocess.run") as run,
|
|
83
|
+
):
|
|
84
|
+
run.return_value = _proc(stdout='[{"number": 7, "state": "OPEN"}]')
|
|
85
|
+
assert find_existing_pr(tmp_path, "wave-1") == "exists"
|
|
86
|
+
|
|
87
|
+
|
|
88
|
+
def test_find_existing_pr_none(tmp_path):
|
|
89
|
+
with (
|
|
90
|
+
patch("steerdev_agent.git.pr.shutil.which", return_value="/usr/bin/gh"),
|
|
91
|
+
patch("steerdev_agent.git.pr.subprocess.run") as run,
|
|
92
|
+
):
|
|
93
|
+
run.return_value = _proc(stdout="[]")
|
|
94
|
+
assert find_existing_pr(tmp_path, "wave-1") == "none"
|
|
95
|
+
|
|
96
|
+
|
|
97
|
+
def test_find_existing_pr_unknown_when_gh_missing(tmp_path):
|
|
98
|
+
with patch("steerdev_agent.git.pr.shutil.which", return_value=None):
|
|
99
|
+
assert find_existing_pr(tmp_path, "wave-1") == "unknown"
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
def test_find_existing_pr_unknown_on_gh_failure(tmp_path):
|
|
103
|
+
with (
|
|
104
|
+
patch("steerdev_agent.git.pr.shutil.which", return_value="/usr/bin/gh"),
|
|
105
|
+
patch("steerdev_agent.git.pr.subprocess.run") as run,
|
|
106
|
+
):
|
|
107
|
+
run.return_value = _proc(returncode=1, stderr="auth error")
|
|
108
|
+
assert find_existing_pr(tmp_path, "wave-1") == "unknown"
|
|
109
|
+
|
|
110
|
+
|
|
111
|
+
# ---------------------------------------------------------------- builders
|
|
112
|
+
|
|
113
|
+
|
|
114
|
+
def test_build_wave_pr_title_with_distinct_name():
|
|
115
|
+
ctx = _make_wave_context()
|
|
116
|
+
ctx.wave_number = 2
|
|
117
|
+
ctx.wave_name = "wave-532d5c"
|
|
118
|
+
assert build_wave_pr_title(ctx) == "Wave 2: wave-532d5c"
|
|
119
|
+
|
|
120
|
+
|
|
121
|
+
def test_build_wave_pr_title_without_name():
|
|
122
|
+
ctx = _make_wave_context()
|
|
123
|
+
ctx.wave_number = 2
|
|
124
|
+
ctx.wave_name = ""
|
|
125
|
+
assert build_wave_pr_title(ctx) == "Wave 2"
|
|
126
|
+
|
|
127
|
+
|
|
128
|
+
def test_build_wave_pr_title_with_default_name():
|
|
129
|
+
ctx = _make_wave_context()
|
|
130
|
+
ctx.wave_number = 2
|
|
131
|
+
ctx.wave_name = "wave-2"
|
|
132
|
+
assert build_wave_pr_title(ctx) == "Wave 2"
|
|
133
|
+
|
|
134
|
+
|
|
135
|
+
def test_build_wave_pr_body_lists_tasks():
|
|
136
|
+
body = build_wave_pr_body(
|
|
137
|
+
[
|
|
138
|
+
{"id": "abcdef0123456789", "title": "Add auth"},
|
|
139
|
+
{"id": "short", "title": ""},
|
|
140
|
+
]
|
|
141
|
+
)
|
|
142
|
+
assert "- `abcdef01` Add auth" in body
|
|
143
|
+
assert "- `short` (untitled)" in body
|
|
144
|
+
assert body.endswith(STEERDEV_SIGNATURE)
|
|
145
|
+
|
|
146
|
+
|
|
147
|
+
def test_build_wave_pr_body_empty():
|
|
148
|
+
body = build_wave_pr_body([])
|
|
149
|
+
assert "no task summary available" in body
|
|
150
|
+
|
|
151
|
+
|
|
152
|
+
# ------------------------------------------------------------- ensure_wave_pr
|
|
153
|
+
|
|
154
|
+
|
|
155
|
+
def test_ensure_wave_pr_creates_when_missing(tmp_path):
|
|
156
|
+
tasks = [{"id": "abcdef0123456789", "title": "Add auth"}]
|
|
157
|
+
with (
|
|
158
|
+
patch("steerdev_agent.git.pr.current_branch", return_value="wave-1"),
|
|
159
|
+
patch("steerdev_agent.git.pr.find_existing_pr", return_value="none"),
|
|
160
|
+
patch("steerdev_agent.git.pr.resolve_task_base_branch", return_value="main") as base,
|
|
161
|
+
patch("steerdev_agent.git.pr.create_pr") as create,
|
|
162
|
+
):
|
|
163
|
+
create.return_value = MagicMock(created=True, url="https://github.com/o/r/pull/1")
|
|
164
|
+
assert ensure_wave_pr(tmp_path, _make_wave_context(), tasks) == "created"
|
|
165
|
+
|
|
166
|
+
base.assert_called_once_with("abcdef0123456789", api_key=None)
|
|
167
|
+
assert create.call_args.kwargs["base_branch"] == "main"
|
|
168
|
+
|
|
169
|
+
|
|
170
|
+
def test_ensure_wave_pr_skips_when_pr_exists(tmp_path):
|
|
171
|
+
with (
|
|
172
|
+
patch("steerdev_agent.git.pr.current_branch", return_value="wave-1"),
|
|
173
|
+
patch("steerdev_agent.git.pr.find_existing_pr", return_value="exists"),
|
|
174
|
+
patch("steerdev_agent.git.pr.create_pr") as create,
|
|
175
|
+
):
|
|
176
|
+
assert ensure_wave_pr(tmp_path, _make_wave_context(), []) == "already_exists"
|
|
177
|
+
|
|
178
|
+
create.assert_not_called()
|
|
179
|
+
|
|
180
|
+
|
|
181
|
+
def test_ensure_wave_pr_skips_when_check_fails(tmp_path):
|
|
182
|
+
with (
|
|
183
|
+
patch("steerdev_agent.git.pr.current_branch", return_value="wave-1"),
|
|
184
|
+
patch("steerdev_agent.git.pr.find_existing_pr", return_value="unknown"),
|
|
185
|
+
patch("steerdev_agent.git.pr.create_pr") as create,
|
|
186
|
+
):
|
|
187
|
+
assert ensure_wave_pr(tmp_path, _make_wave_context(), []) == "failed"
|
|
188
|
+
|
|
189
|
+
create.assert_not_called()
|
|
190
|
+
|
|
191
|
+
|
|
192
|
+
def test_ensure_wave_pr_detached_head(tmp_path):
|
|
193
|
+
with patch("steerdev_agent.git.pr.current_branch", return_value=None):
|
|
194
|
+
assert ensure_wave_pr(tmp_path, _make_wave_context(), []) == "skipped_detached"
|
|
195
|
+
|
|
196
|
+
|
|
197
|
+
def test_ensure_wave_pr_failed_create(tmp_path):
|
|
198
|
+
with (
|
|
199
|
+
patch("steerdev_agent.git.pr.current_branch", return_value="wave-1"),
|
|
200
|
+
patch("steerdev_agent.git.pr.find_existing_pr", return_value="none"),
|
|
201
|
+
patch("steerdev_agent.git.pr.resolve_task_base_branch", return_value=None),
|
|
202
|
+
patch("steerdev_agent.git.pr.create_pr") as create,
|
|
203
|
+
):
|
|
204
|
+
create.return_value = MagicMock(created=False, error="boom")
|
|
205
|
+
assert ensure_wave_pr(tmp_path, _make_wave_context(), []) == "failed"
|
|
206
|
+
|
|
207
|
+
|
|
208
|
+
def test_ensure_wave_pr_never_raises(tmp_path):
|
|
209
|
+
with patch("steerdev_agent.git.pr.current_branch", side_effect=RuntimeError("boom")):
|
|
210
|
+
assert ensure_wave_pr(tmp_path, _make_wave_context(), []) == "failed"
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
"""Tests for the runner's wave PR safety net."""
|
|
2
|
+
|
|
3
|
+
from pathlib import Path
|
|
4
|
+
from unittest.mock import patch
|
|
5
|
+
|
|
6
|
+
from steerdev_agent.runner import Runner, wave_identity
|
|
7
|
+
from tests.test_runner_merge_modes import _make_wave_context
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
def _make_runner(**kwargs) -> Runner:
|
|
11
|
+
return Runner(project_id="p", api_key="k", working_directory=Path("/code/repo"), **kwargs)
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
class TestWaveIdentity:
|
|
15
|
+
def test_uses_wave_name(self):
|
|
16
|
+
ctx = _make_wave_context()
|
|
17
|
+
assert wave_identity(ctx) == "wave-a1b2c3"
|
|
18
|
+
|
|
19
|
+
def test_falls_back_to_wave_number(self):
|
|
20
|
+
ctx = _make_wave_context()
|
|
21
|
+
ctx.wave_name = ""
|
|
22
|
+
assert wave_identity(ctx) == "wave-3"
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
class TestMaybeCreateWavePr:
|
|
26
|
+
def test_creates_pr_for_tracked_wave(self):
|
|
27
|
+
runner = _make_runner()
|
|
28
|
+
ctx = _make_wave_context()
|
|
29
|
+
runner._last_wave_ctx = ctx
|
|
30
|
+
runner._wave_completed_tasks = [{"id": "abc", "title": "do work"}]
|
|
31
|
+
runner._wave_working_dir = "/code/repo/.worktrees/wave-a1b2c3"
|
|
32
|
+
|
|
33
|
+
with patch("steerdev_agent.runner.ensure_wave_pr", return_value="created") as ensure:
|
|
34
|
+
runner._maybe_create_wave_pr()
|
|
35
|
+
|
|
36
|
+
ensure.assert_called_once_with(
|
|
37
|
+
"/code/repo/.worktrees/wave-a1b2c3",
|
|
38
|
+
ctx,
|
|
39
|
+
[{"id": "abc", "title": "do work"}],
|
|
40
|
+
api_key="k",
|
|
41
|
+
)
|
|
42
|
+
# State is reset so the next wave starts clean.
|
|
43
|
+
assert runner._last_wave_ctx is None
|
|
44
|
+
assert runner._wave_completed_tasks == []
|
|
45
|
+
assert runner._wave_working_dir is None
|
|
46
|
+
|
|
47
|
+
def test_noop_without_wave_context(self):
|
|
48
|
+
runner = _make_runner()
|
|
49
|
+
|
|
50
|
+
with patch("steerdev_agent.runner.ensure_wave_pr") as ensure:
|
|
51
|
+
runner._maybe_create_wave_pr()
|
|
52
|
+
|
|
53
|
+
ensure.assert_not_called()
|
|
54
|
+
|
|
55
|
+
def test_noop_in_dry_run(self):
|
|
56
|
+
runner = _make_runner(dry_run=True)
|
|
57
|
+
runner._last_wave_ctx = _make_wave_context()
|
|
58
|
+
runner._wave_completed_tasks = [{"id": "abc", "title": "do work"}]
|
|
59
|
+
|
|
60
|
+
with patch("steerdev_agent.runner.ensure_wave_pr") as ensure:
|
|
61
|
+
runner._maybe_create_wave_pr()
|
|
62
|
+
|
|
63
|
+
ensure.assert_not_called()
|
|
64
|
+
# Dry-run still resets tracked state.
|
|
65
|
+
assert runner._last_wave_ctx is None
|
|
66
|
+
|
|
67
|
+
def test_falls_back_to_runner_working_directory(self):
|
|
68
|
+
runner = _make_runner()
|
|
69
|
+
runner._last_wave_ctx = _make_wave_context()
|
|
70
|
+
|
|
71
|
+
with patch("steerdev_agent.runner.ensure_wave_pr", return_value="created") as ensure:
|
|
72
|
+
runner._maybe_create_wave_pr()
|
|
73
|
+
|
|
74
|
+
assert ensure.call_args.args[0] == str(Path("/code/repo"))
|
|
75
|
+
|
|
76
|
+
def test_never_raises(self):
|
|
77
|
+
runner = _make_runner()
|
|
78
|
+
runner._last_wave_ctx = _make_wave_context()
|
|
79
|
+
|
|
80
|
+
with patch("steerdev_agent.runner.ensure_wave_pr", side_effect=RuntimeError("boom")):
|
|
81
|
+
runner._maybe_create_wave_pr() # must not raise
|
|
82
|
+
|
|
83
|
+
assert runner._last_wave_ctx is None
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/ci/canal-integration.yml
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{steerdev-1.1.43 → steerdev-1.1.44}/src/steerdev_agent/setup/templates/worktrunk.config.toml
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|