pycastle 0.1.3.7.dev0__tar.gz → 0.1.3.8.dev0__tar.gz

{pycastle-0.1.3.7.dev0 → pycastle-0.1.3.8.dev0}/CONTEXT.md

@@ -186,10 +186,11 @@
 | **GithubService** | Service that encapsulates `gh` CLI calls for GitHub issue operations: closing issues, querying parent issues, listing open sub-issues, and reading issue labels | GitHub wrapper, gh provider |
 | **Logger** | Injectable abstraction that owns all structured log output for one iteration; exposes named channels (`log_error`, `log_agent_output`) each writing to a dedicated file under `logs/`; injected via `Deps` so tests never touch the filesystem | log writer, output handler |
 | **RecordingLogger** | Test double for `Logger` that records every call in memory; tests assert on recorded calls rather than capturing stderr or reading log files | mock logger, spy logger |
-| **StatusDisplay** | Injectable abstraction that owns the live terminal status line; exposes `add_agent(name, phase, work_body="")`, `update_phase`, `reset_idle_timer`, `remove_agent`, and `print` methods; backed by a `rich` `Live` display in production and a `NullStatusDisplay` no-op in tests; injected via `Deps` as a separate concern from `Logger` | terminal display, status bar |
-| **work_body** | The caller-constructed string passed as the third argument to `add_agent`; displayed in the body column of the agent status row during the Work phase; empty string for agents that do not reach Work | — |
-| **NullStatusDisplay** | Test/no-op implementation of `StatusDisplay`; all methods are no-ops; `print` falls back to `builtins.print` | — |
-| **agent status row** | One headerless line in the `StatusDisplay` live panel representing one active agent; format: `elapsed \| RoleName \| idle \| body`; elapsed is dim and right-justified so all role names align across rows; role name is bold, with any numeric part (e.g. `5` in `Implementer #5`) styled bold cyan; idle is dim; body column shows the current lifecycle phase name (e.g. `Setup`, `Running ruff Checks`, `Prepare`) for all non-Work states, or the `work_body` string during Work (caller-constructed: `"implementing \"{issue_title}\""` for Implementers, `"reviewing \"{issue_title}\""` for Reviewers, `"Creating Plan from {n} issues"` for the Planner, `"Merging {n} Branches"` for the Merger, `"Checking"` for the preflight-checks agent, `"reporting {check_name} issue"` for the preflight-issue agent); elapsed counts up from agent start and never resets; idle resets on each Docker stream chunk; the live panel is preceded by one blank line to visually separate it from scrollback output; ordered by orchestration phase (plan → implement → review → merge) then by issue number; disappears when the agent finishes | status entry, agent row |
+| **StatusDisplay** | Injectable abstraction that owns the live terminal status panel and all formatted terminal output; exposes `register(caller, startup_message="started", work_body="")`, `update_phase`, `reset_idle_timer`, `remove(caller, shutdown_message="finished", shutdown_style="success")`, and `print(caller, message, style=None)` methods; backed by a `rich` `Live` display in production and a `PlainStatusDisplay` in tests; injected via `Deps` as a separate concern from `Logger`; defined in `status_display` module | terminal display, status bar |
+| **caller** | The identity string passed as the first argument to `StatusDisplay.register`, `remove`, and `print`; rendered as a `[Caller]` prefix on every terminal output line; empty string `""` is the anonymous caller — no brackets are printed and the message is output as-is; a blank line is inserted before a `print` call when the caller differs from the previous one; canonical callers — orchestration: `"pycastle"`; phase rows: `"Preflight"`, `"Plan"`, `"Implement"`, `"Merge"`; agents: `"Preflight Agent"`, `"Plan Agent"`, `"Implement Agent #N"`, `"Review Agent #N"`, `"Merge Agent"` | source, label |
+| **work_body** | The caller-constructed string passed as the third argument to `register`; displayed in the body column of the status row during the Work phase; empty string for callers that do not reach Work | — |
+| **PlainStatusDisplay** | Plain-terminal adapter for `StatusDisplay` defined in `status_display` module; panel methods (`update_phase`, `reset_idle_timer`) are no-ops; `register` and `remove` print their startup/shutdown messages; `print(caller, message, style=None)` formats output as `[Caller] message` with no ANSI colour codes and style ignored; used in tests so assertions can match the full formatted line | NullStatusDisplay |
+| **status row** | One headerless line in the `StatusDisplay` live panel; created by `register` and removed by `remove`; two kinds: **agent rows** (one per active agent — `"Preflight Agent"`, `"Plan Agent"`, `"Implement Agent #N"`, `"Review Agent #N"`, `"Merge Agent"`) and **phase rows** (one per active phase — `"Preflight"`, `"Plan"`, `"Implement"`, `"Merge"`); phase rows and agent rows within the same phase coexist; format: `elapsed \| Name \| idle \| body`; elapsed is dim and right-justified; name is bold with any numeric part styled bold cyan; idle is dim; body shows the current lifecycle phase name for all non-Work states, or the `work_body` string during Work; elapsed counts up from `register` and never resets; idle resets on each Docker stream chunk; the live panel is preceded by one blank line to visually separate it from scrollback; ordered by orchestration phase (plan → implement → review → merge) then by issue number | agent status row, status entry, agent row |
 | **IterationOutcome** | Sealed return type of `run_iteration()`; one of four variants: `Continue` (iteration completed, keep looping), `Done` (no issues found, stop cleanly), `AbortedHITL` (HITL verdict — carries `issue_number`; orchestrator exits non-zero), `AbortedUsageLimit` (token ceiling hit — worktrees preserved, safe to retry; orchestrator exits non-zero) | iteration result, loop result |
 
 ## Test Anti-Patterns (Red Flags)
@@ -221,9 +222,9 @@
 - Host mounts per container: host repo → RO at `/home/agent/repo`; worktree → RW at `/home/agent/workspace`; `<host-repo>/.git` → RW at `/.pycastle-parent-git`; on Windows, gitdir overlay → RO over `/home/agent/workspace/.git`.
 - A **Service** defines a Custom exception hierarchy so callers never handle raw subprocess exceptions; tests inject Default implementations from a test fixture and override per-test for error paths.
 - **StatusDisplay** is a separate injectable in `Deps` alongside `Logger`; `Logger` owns file I/O, `StatusDisplay` owns the live terminal UI — they never overlap.
-- The **agent status row** is created when the Setup phase begins; the row is removed when the agent finishes or errors; the `rich` `Live` display is started on the first `add_agent` call and stopped after the last `remove_agent` call.
+- A **status row** is created by `StatusDisplay.register` and removed by `StatusDisplay.remove`; phase rows are registered at the start of each orchestration phase and removed at its end; agent rows are registered at container Setup and removed when the agent finishes or errors; the `rich` `Live` display is started on the first `register` call and stopped after the last `remove` call.
 - All orchestrator-level terminal output (e.g. "Planning complete…") is routed through `StatusDisplay.print()` so `rich` can coordinate it with the live panel; bare `print()` calls are not used while a `StatusDisplay` is active.
-- The streaming loop calls `reset_idle_timer` on every Docker chunk (matching the kill-agent timeout behavior); each complete line is fed to `StreamParser.feed()` — during the Work phase, if a complete assistant turn is returned, it is printed to the console via `StatusDisplay.print()` with the agent-name prefix and a trailing blank line; tool-use blocks are silently dropped; Setup, Pre-flight, and Prepare phases produce no console output — their activity is reflected only in the body column of the agent status row.
+- The streaming loop calls `reset_idle_timer` on every Docker chunk (matching the kill-agent timeout behavior); each complete line is fed to `StreamParser.feed()` — during the Work phase, if a complete assistant turn is returned, it is printed to the console via `StatusDisplay.print()` with the agent-name prefix; tool-use blocks are silently dropped; Setup, Pre-flight, and Prepare phases produce no console output — their activity is reflected only in the body column of the agent status row.
 
 ## Example dialogue
 

{pycastle-0.1.3.7.dev0 → pycastle-0.1.3.8.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycastle
-Version: 0.1.3.7.dev0
+Version: 0.1.3.8.dev0
 Summary: Python orchestrator for autonomous Claude Code agents in Docker
 License: MIT License
         

{pycastle-0.1.3.7.dev0 → pycastle-0.1.3.8.dev0}/src/pycastle/agent_runner.py

@@ -9,6 +9,7 @@ from .config import Config
 from .container_runner import ContainerRunner
 from .errors import AgentTimeoutError, BranchCollisionError, UsageLimitError
 from .services import GitService
+from .status_display import PlainStatusDisplay
 from .worktree import patch_gitdir_for_container, worktree_name_for_branch
 
 
@@ -73,9 +74,7 @@ class AgentRunner:
         work_body = request.work_body
 
         if status_display is None:
-            from .iteration._deps import NullStatusDisplay
-
-            status_display = NullStatusDisplay()
+            status_display = PlainStatusDisplay()
 
         _token = token if token is not None else CancellationToken()
         if _token.is_cancelled:
@@ -169,9 +168,9 @@ class AgentRunner:
                             raise
                         restart_num = self._cfg.timeout_retries - retries_left + 1
                         status_display.print(
-                            f"[{name}] Timeout — restarting"
+                            name,
+                            f"Timeout — restarting"
                             f" (attempt {restart_num}/{self._cfg.timeout_retries})",
-                            source="agent-timeout",
                         )
                         retries_left -= 1
                     except UsageLimitError:
@@ -179,7 +178,7 @@ class AgentRunner:
                         raise
                 return output
         finally:
-            status_display.remove_agent(name)
+            status_display.remove(name)
             if lock is not None and lock.locked():
                 lock.release()
 
@@ -193,9 +192,7 @@ class AgentRunner:
         work_body: str = "",
     ) -> list[tuple[str, str, str]]:
         if status_display is None:
-            from .iteration._deps import NullStatusDisplay
-
-            status_display = NullStatusDisplay()
+            status_display = PlainStatusDisplay()
 
         git_name = self._git_service.get_user_name()
         git_email = self._git_service.get_user_email()
@@ -211,7 +208,7 @@ class AgentRunner:
             await runner.setup(git_name, git_email, work_body)
             return await runner.preflight(list(self._cfg.preflight_checks))
         finally:
-            status_display.remove_agent(name)
+            status_display.remove(name)
             try:
                 runner.__exit__(None, None, None)
             except Exception:

{pycastle-0.1.3.7.dev0 → pycastle-0.1.3.8.dev0}/src/pycastle/container_runner.py

@@ -11,7 +11,6 @@ import threading
 from pathlib import Path
 
 import docker
-from rich.text import Text
 from docker.models.containers import Container as DockerContainer
 
 from .config import Config
@@ -21,6 +20,7 @@ from .errors import (
     DockerTimeoutError,
     UsageLimitError,
 )
+from .status_display import PlainStatusDisplay
 from .stream_parser import StreamParser
 from .worktree import (
     CONTAINER_PARENT_GIT,
@@ -57,16 +57,6 @@ def _build_claude_command(model: str = "", effort: str = "") -> str:
     return f"claude {flags} < /tmp/.pycastle_prompt"
 
 
-def _build_agent_prefix(name: str) -> Text:
-    """Return a styled Text object for the agent output prefix, e.g. ``[Implementer #1] ``."""
-    msg = Text()
-    msg.append("[", style="bold")
-    for segment in re.split(r"(\d+)", name):
-        if segment:
-            msg.append(segment, style="bold cyan" if segment.isdigit() else "bold")
-    msg.append("] ", style="bold")
-    return msg
-
 
 class ContainerRunner:
     def __init__(
@@ -94,9 +84,7 @@ class ContainerRunner:
         self.effort = effort
         self._cfg = cfg
         if status_display is None:
-            from .iteration._deps import NullStatusDisplay
-
-            status_display = NullStatusDisplay()
+            status_display = PlainStatusDisplay()
         self._status_display = status_display
         self._owns_client = docker_client is None
         self._client = docker_client if docker_client is not None else docker.from_env()
@@ -268,7 +256,7 @@ class ContainerRunner:
     async def setup(self, git_name: str, git_email: str, work_body: str = "") -> None:
         loop = asyncio.get_running_loop()
         await loop.run_in_executor(None, self.__enter__)
-        self._status_display.add_agent(self.name, "Setup", work_body)
+        self._status_display.register(self.name, work_body=work_body)
         await loop.run_in_executor(
             None,
             self.exec_simple,
@@ -362,9 +350,7 @@ class ContainerRunner:
                             raise UsageLimitError(line)
                         turn = parser.feed(line)
                         if print_output and turn is not None:
-                            msg = _build_agent_prefix(self.name)
-                            msg.append(f"{turn}\n")
-                            self._status_display.print(msg, source=self.name)
+                            self._status_display.print(self.name, turn)
         finally:
             try:
                 self._active_container.exec_run(
@@ -374,4 +360,3 @@ class ContainerRunner:
             except Exception:
                 pass
         return "".join(parts)
-

{pycastle-0.1.3.7.dev0 → pycastle-0.1.3.8.dev0}/src/pycastle/iteration/__init__.py

@@ -33,12 +33,16 @@ IterationOutcome: TypeAlias = Continue | Done | AbortedHITL | AbortedUsageLimit
 
 
 async def run_iteration(deps: Deps) -> IterationOutcome:
-    preflight_result = await preflight_phase(deps)
+    deps.status_display.register("Preflight")
+    try:
+        preflight_result = await preflight_phase(deps)
+    finally:
+        deps.status_display.remove("Preflight")
 
     if isinstance(preflight_result, PreflightHITL):
         deps.status_display.print(
+            "pycastle",
             f"Preflight issue #{preflight_result.issue_number} requires human intervention. Exiting.",
-            source="preflight-request-human-error",
         )
         return AbortedHITL(issue_number=preflight_result.issue_number)
 
@@ -48,7 +52,11 @@ async def run_iteration(deps: Deps) -> IterationOutcome:
         sha = preflight_result.sha
         open_issues = preflight_result.issues
         if len(open_issues) >= 2:
-            plan_result = await planning_phase(deps, sha, open_issues)
+            deps.status_display.register("Plan")
+            try:
+                plan_result = await planning_phase(deps, sha, open_issues)
+            finally:
+                deps.status_display.remove("Plan")
             sha = plan_result.worktree_sha
             issues = plan_result.issues
         else:
@@ -59,15 +67,19 @@ async def run_iteration(deps: Deps) -> IterationOutcome:
 
     issues = issues[: deps.cfg.max_parallel]
 
-    deps.status_display.print(f"Planning complete. {len(issues)} issue(s):", source="planning")
+    deps.status_display.print("pycastle", f"Planning complete. {len(issues)} issue(s):")
     for issue in issues:
         deps.status_display.print(
+            "pycastle",
             f"  #{issue['number']}: {issue['title']} → {branch_for(issue['number'])}",
-            source="planning",
         )
 
     token = CancellationToken()
-    impl_result = await implement_phase(issues, sha, deps, token=token)
+    deps.status_display.register("Implement")
+    try:
+        impl_result = await implement_phase(issues, sha, deps, token=token)
+    finally:
+        deps.status_display.remove("Implement")
 
     if impl_result.usage_limit_hit:
         return AbortedUsageLimit()
@@ -76,32 +88,32 @@ async def run_iteration(deps: Deps) -> IterationOutcome:
         match error:
             case PreflightFailure(failures=fs):
                 deps.status_display.print(
+                    "pycastle",
                     f"  ✗ #{issue['number']} ({branch_for(issue['number'])}) pre-flight failed:",
-                    source="execution-errors",
                 )
                 for check_name, command, output in fs:
                     deps.status_display.print(
+                        "pycastle",
                         f"    ✗ {check_name} ({command}): {output}",
-                        source="execution-errors",
                     )
             case _:
                 deps.status_display.print(
+                    "pycastle",
                     f"  ✗ #{issue['number']} ({branch_for(issue['number'])}) failed: {error}",
-                    source="execution-errors",
                 )
 
     completed = impl_result.completed
 
     if not completed:
-        deps.status_display.print("No commits produced. Nothing to merge.", source="execution-complete")
+        deps.status_display.print("pycastle", "No commits produced. Nothing to merge.")
         return Continue()
 
     deps.status_display.print(
+        "pycastle",
         f"Execution complete. {len(completed)} branch(es) with commits:",
-        source="execution-complete",
     )
     for i in completed:
-        deps.status_display.print(f"  {branch_for(i['number'])}", source="execution-complete")
+        deps.status_display.print("pycastle", f"  {branch_for(i['number'])}")
 
     await merge_phase(completed, deps)
 

{pycastle-0.1.3.7.dev0 → pycastle-0.1.3.8.dev0}/src/pycastle/iteration/_deps.py

@@ -1,15 +1,15 @@
 import asyncio
-import builtins
 import dataclasses
 from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Protocol, runtime_checkable
+from typing import Any, Protocol
 
 from ..agent_result import PreflightFailure
 from ..agent_runner import AgentRunnerProtocol, RunRequest
 from ..config import Config
 from ..services import GitService
 from ..services import GithubService
+from ..status_display import StatusDisplay
 
 
 class Logger(Protocol):
@@ -29,50 +29,24 @@ class RecordingLogger:
         self.agent_outputs.append((agent_name, output))
 
 
-@runtime_checkable
-class StatusDisplay(Protocol):
-    def add_agent(self, name: str, phase: str, work_body: str = "") -> None: ...
-    def update_phase(self, name: str, phase: str) -> None: ...
-    def remove_agent(self, name: str) -> None: ...
-    def reset_idle_timer(self, name: str) -> None: ...
-    def print(self, message: object, *, source: str = "") -> None: ...
-
-
-class NullStatusDisplay:
-    def add_agent(self, name: str, phase: str, work_body: str = "") -> None:
-        pass
-
-    def update_phase(self, name: str, phase: str) -> None:
-        pass
-
-    def remove_agent(self, name: str) -> None:
-        pass
-
-    def reset_idle_timer(self, name: str) -> None:
-        pass
-
-    def print(self, message: object, *, source: str = "") -> None:
-        builtins.print(message)
-
-
 class RecordingStatusDisplay:
     def __init__(self) -> None:
         self.calls: list[tuple] = []
 
-    def add_agent(self, name: str, phase: str, work_body: str = "") -> None:
-        self.calls.append(("add_agent", name, phase, work_body))
+    def register(self, caller: str, startup_message: str = "started", work_body: str = "") -> None:
+        self.calls.append(("register", caller, startup_message, work_body))
 
     def update_phase(self, name: str, phase: str) -> None:
         self.calls.append(("update_phase", name, phase))
 
-    def remove_agent(self, name: str) -> None:
-        self.calls.append(("remove_agent", name))
-
     def reset_idle_timer(self, name: str) -> None:
         self.calls.append(("reset_idle_timer", name))
 
-    def print(self, message: object, *, source: str = "") -> None:
-        self.calls.append(("print", message, source))
+    def remove(self, caller: str, shutdown_message: str = "finished", shutdown_style: str = "success") -> None:
+        self.calls.append(("remove", caller, shutdown_message, shutdown_style))
+
+    def print(self, caller: str, message: object, style: str | None = None) -> None:
+        self.calls.append(("print", caller, message, style))
 
 
 class FakeAgentRunner:

{pycastle-0.1.3.7.dev0 → pycastle-0.1.3.8.dev0}/src/pycastle/iteration/_utils.py

@@ -7,9 +7,9 @@ async def _wait_for_clean_working_tree(deps: Deps, phase: str = "merge") -> None
     if deps.git_svc.is_working_tree_clean(deps.repo_root):
         return
     deps.status_display.print(
+        "pycastle",
         "[red]Working tree has uncommitted changes. "
         f"Please commit or revert all local changes before the {phase} phase can proceed.[/red]",
-        source="working-tree-dirty",
     )
     while not deps.git_svc.is_working_tree_clean(deps.repo_root):
         await asyncio.sleep(10)

{pycastle-0.1.3.7.dev0 → pycastle-0.1.3.8.dev0}/src/pycastle/iteration/implement.py

@@ -54,7 +54,7 @@ async def run_issue(
 
     result = await _bounded_run_agent(
         RunRequest(
-            name=f"Implementer #{issue['number']}",
+            name=f"Implement Agent #{issue['number']}",
             prompt_file=deps.cfg.prompts_dir / "implement-prompt.md",
             mount_path=deps.repo_root,
             prompt_args=prompt_args,
@@ -74,11 +74,11 @@ async def run_issue(
         return result
 
     assert_complete(result)
-    deps.logger.log_agent_output(f"Implementer #{issue['number']}", result)
+    deps.logger.log_agent_output(f"Implement Agent #{issue['number']}", result)
 
     review_result = await _bounded_run_agent(
         RunRequest(
-            name=f"Reviewer #{issue['number']}",
+            name=f"Review Agent #{issue['number']}",
             prompt_file=deps.cfg.prompts_dir / "review-prompt.md",
             mount_path=deps.repo_root,
             prompt_args=prompt_args,

pycastle-0.1.3.8.dev0/src/pycastle/iteration/merge.py

@@ -0,0 +1,111 @@
+import dataclasses
+import sys
+
+from ..agent_output_protocol import assert_complete
+from ..agent_result import PreflightFailure
+from ..agent_runner import RunRequest
+from ..services import GitCommandError
+from ..worktree import branch_worktree, worktree_name_for_branch, worktree_path
+from ._deps import Deps
+from ._utils import _wait_for_clean_working_tree
+from .implement import branch_for
+
+MERGE_SANDBOX = "pycastle/merge-sandbox"
+
+
+@dataclasses.dataclass
+class MergeResult:
+    clean: list[dict]
+    conflicts: list[dict]
+
+
+def _delete_merged_branches(branches: list[str], deps: Deps) -> None:
+    registered_worktrees = deps.git_svc.list_worktrees(deps.repo_root)
+    for branch in branches:
+        if not deps.git_svc.is_ancestor(branch, deps.repo_root):
+            continue
+        worktree_path_ = worktree_path(worktree_name_for_branch(branch), deps)
+        if worktree_path_ in registered_worktrees:
+            try:
+                deps.git_svc.remove_worktree(deps.repo_root, worktree_path_)
+            except Exception as e:
+                print(
+                    f"Warning: could not remove worktree for {branch!r}: {e}",
+                    file=sys.stderr,
+                )
+
+        try:
+            deps.git_svc.delete_branch(branch, deps.repo_root)
+            deps.status_display.print("pycastle", f"Deleted merged branch: {branch}")
+        except GitCommandError as e:
+            print(f"Warning: could not delete branch {branch!r}: {e}", file=sys.stderr)
+
+
+async def merge_phase(completed: list[dict], deps: Deps) -> MergeResult:
+    deps.status_display.register("Merge", work_body="Merging")
+    _merge_row_active = True
+    try:
+        await _wait_for_clean_working_tree(deps)
+
+        conflict_issues: list[dict] = []
+        for issue in completed:
+            if deps.git_svc.try_merge(deps.repo_root, branch_for(issue["number"])):
+                deps.github_svc.close_issue(issue["number"])
+            else:
+                conflict_issues.append(issue)
+
+        clean_issues = [i for i in completed if i not in conflict_issues]
+
+        if clean_issues:
+            deps.github_svc.close_completed_parent_issues()
+
+        _delete_merged_branches([branch_for(i["number"]) for i in clean_issues], deps)
+
+        if not conflict_issues:
+            deps.status_display.remove("Merge")
+            _merge_row_active = False
+        else:
+            target_branch = deps.git_svc.get_current_branch(deps.repo_root)
+            sha = deps.git_svc.get_head_sha(deps.repo_root)
+            async with branch_worktree("merge-sandbox", MERGE_SANDBOX, sha, deps) as sandbox_path:
+                deps.status_display.remove("Merge")
+                _merge_row_active = False
+                merger_result = await deps.agent_runner.run(
+                    RunRequest(
+                        name="Merge Agent",
+                        prompt_file=deps.cfg.prompts_dir / "merge-prompt.md",
+                        mount_path=sandbox_path,
+                        prompt_args={
+                            "BRANCHES": "\n".join(
+                                f"- {branch_for(i['number'])}" for i in conflict_issues
+                            ),
+                            "CHECKS": " && ".join(cmd for _, cmd in deps.cfg.preflight_checks),
+                        },
+                        model=deps.cfg.merge_override.model,
+                        status_display=deps.status_display,
+                        effort=deps.cfg.merge_override.effort,
+                        stage="pre-merge",
+                        work_body=f"Merging {len(conflict_issues)} Branches",
+                    )
+                )
+                if isinstance(merger_result, PreflightFailure):
+                    raise RuntimeError(
+                        "Merger preflight checks failed; merge did not complete"
+                    )
+                assert_complete(merger_result)
+                deps.git_svc.fast_forward_branch(
+                    deps.repo_root, target_branch, MERGE_SANDBOX
+                )
+            deps.status_display.print("pycastle", "Branches merged.")
+            _delete_merged_branches(
+                [branch_for(i["number"]) for i in conflict_issues], deps
+            )
+            for issue in conflict_issues:
+                deps.github_svc.close_issue(issue["number"])
+            deps.github_svc.close_completed_parent_issues()
+
+        return MergeResult(clean=clean_issues, conflicts=conflict_issues)
+    except BaseException:
+        if _merge_row_active:
+            deps.status_display.remove("Merge", shutdown_message="failed", shutdown_style="error")
+        raise

{pycastle-0.1.3.7.dev0 → pycastle-0.1.3.8.dev0}/src/pycastle/iteration/planning.py

@@ -18,7 +18,7 @@ async def planning_phase(deps: Deps, sha: str, open_issues: list[dict]) -> PlanR
     async with detached_worktree("plan-sandbox", sha, deps) as wt:
         raw = await deps.agent_runner.run(
             RunRequest(
-                name="Planner",
+                name="Plan Agent",
                 prompt_file=deps.cfg.prompts_dir / "plan-prompt.md",
                 mount_path=wt,
                 prompt_args={"OPEN_ISSUES_JSON": json.dumps(open_issues)},

{pycastle-0.1.3.7.dev0 → pycastle-0.1.3.8.dev0}/src/pycastle/iteration/preflight.py

@@ -94,9 +94,9 @@ async def preflight_phase(deps: Deps) -> PreflightResult:
         deps.git_svc.pull(deps.repo_root)
     except GitCommandError:
         deps.status_display.print(
+            "pycastle",
             "[red]git pull --ff-only failed — remote branch has diverged or is unreachable. "
             "Resolve manually and retry.[/red]",
-            source="preflight-phase",
         )
         raise
     sha = deps.git_svc.get_head_sha(deps.repo_root)
@@ -108,7 +108,7 @@ async def preflight_phase(deps: Deps) -> PreflightResult:
 
     async with detached_worktree("pre-flight-sandbox", sha, deps) as wt:
         failures = await deps.agent_runner.run_preflight(
-            name="Pre-Flight",
+            name="Preflight Agent",
             mount_path=wt,
             stage="PREFLIGHT",
             status_display=deps.status_display,
@@ -129,5 +129,4 @@ async def preflight_phase(deps: Deps) -> PreflightResult:
                 worktree_sha=sha, issues=[{"number": pf_num, "title": pf_title}]
             )
 
-        deps.status_display.print("Preflight checks passed.", source="preflight-phase")
         return PreflightReady(sha=sha, issues=open_issues)