ZYT/zyt
2
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

first commit

Browse Source
This commit is contained in:
long
2026-04-20 16:01:59 +08:00
parent 6bcd073ba0
commit b03c079099
103 changed files with 19736 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.trellis/scripts/multi_agent/start.py
Executable
+539
View File
@@ -0,0 +1,539 @@
#!/usr/bin/env python3
"""
Multi-Agent Pipeline: Start Worktree Agent.
Usage: python3 start.py <task-dir>
Example: python3 start.py .trellis/tasks/01-21-my-task
This script:
1. Creates worktree (if not exists) with dependency install
2. Copies environment files (from worktree.yaml config)
3. Sets .current-task in worktree
4. Starts claude agent in background
5. Registers agent to registry.json
Prerequisites:
- task.json must exist with 'branch' field
- agents/dispatch.md must exist (in .claude/, .cursor/, .iflow/, or .opencode/)
Configuration: .trellis/worktree.yaml
"""
from __future__ import annotations
import os
import shutil
import subprocess
import sys
import uuid
from pathlib import Path
import _bootstrap # noqa: F401 — adds parent scripts/ dir to sys.path
from common.cli_adapter import get_cli_adapter
from common.git import run_git
from common.io import read_json, write_json
from common.log import Colors, log_info, log_success, log_warn, log_error
from common.paths import (
DIR_WORKFLOW,
FILE_CURRENT_TASK,
FILE_TASK_JSON,
get_repo_root,
)
from common.registry import (
registry_add_agent,
registry_get_file,
)
from common.config import (
get_default_package,
get_packages,
get_submodule_packages,
validate_package,
)
from common.worktree import (
get_worktree_base_dir,
get_worktree_config,
get_worktree_copy_files,
get_worktree_post_create_hooks,
)
# Colors, log_info, log_success, log_warn, log_error, read_json, write_json
# are now imported from common.log and common.io above.
# =============================================================================
# Constants
# =============================================================================
DEFAULT_PLATFORM = "claude"
# =============================================================================
# Submodule Init
# =============================================================================
def _init_submodules_for_task(
task_data: dict, worktree_path: str, project_root: Path
) -> None:
"""Initialize submodules in worktree based on task's target package.
Resolves the target package from task_data.package -> default_package -> None.
Only initializes submodule-type packages. Idempotent: skips already-initialized
submodules to avoid detaching HEAD on in-progress work.
"""
# Skip if not a monorepo (no packages configured)
if get_packages(project_root) is None:
return
# Resolve package: task.package -> default_package -> None
task_package = task_data.get("package")
package = None
if task_package and isinstance(task_package, str):
if validate_package(task_package, project_root):
package = task_package
else:
log_warn(
f"package '{task_package}' not found in config.yaml, "
"skipping submodule init"
)
return
else:
# Fallback to default_package
default_pkg = get_default_package(project_root)
if default_pkg:
if validate_package(default_pkg, project_root):
package = default_pkg
else:
log_warn(
f"package '{default_pkg}' not found in config.yaml, "
"skipping submodule init"
)
return
if not package:
log_warn("no package specified, skipping submodule init")
return
# Check if this package is a submodule
submodule_packages = get_submodule_packages(project_root)
if package not in submodule_packages:
log_info(f"Package '{package}' is not a submodule, skipping submodule init")
return
submodule_path = submodule_packages[package]
log_info(f"Checking submodule status for '{package}' ({submodule_path})...")
# Run git submodule status in worktree directory
ret, status_out, status_err = run_git(
["submodule", "status", submodule_path], cwd=Path(worktree_path)
)
if ret != 0:
log_warn(
f"git submodule status failed for '{submodule_path}': {status_err.strip()}, "
"skipping submodule init"
)
return
# Parse the prefix character from submodule status output
# Format: "<prefix><sha1> <path> (<describe>)"
# Prefix: '-' (uninitialized), ' ' (normal), '+' (commit mismatch), 'U' (conflict)
status_line = status_out.rstrip("\n\r")
if not status_line:
log_warn(f"Empty submodule status for '{submodule_path}', skipping")
return
prefix = status_line[0]
if prefix == "-":
# Uninitialized: run git submodule update --init
log_info(f"Initializing submodule '{submodule_path}'...")
ret, _, err = run_git(
["submodule", "update", "--init", submodule_path],
cwd=Path(worktree_path),
)
if ret != 0:
log_warn(f"Failed to initialize submodule '{submodule_path}': {err.strip()}")
else:
log_success(f"Submodule '{submodule_path}' initialized")
elif prefix == " ":
log_info(f"Submodule '{submodule_path}' already initialized, skipping")
elif prefix == "+":
log_warn(
f"submodule {submodule_path} has local changes, skipping update"
)
elif prefix == "U":
log_warn(
f"submodule {submodule_path} has conflicts, skipping"
)
else:
log_warn(
f"Unknown submodule status prefix '{prefix}' for '{submodule_path}', skipping"
)
# =============================================================================
# Main
# =============================================================================
def main() -> int:
"""Main entry point."""
import argparse
parser = argparse.ArgumentParser(description="Multi-Agent Pipeline: Start Worktree Agent")
parser.add_argument("task_dir", help="Task directory path")
parser.add_argument(
"--platform", "-p",
choices=["claude", "cursor", "iflow", "opencode", "codex", "qoder"],
default=DEFAULT_PLATFORM,
help="Platform to use (default: claude)"
)
args = parser.parse_args()
task_dir_arg = args.task_dir
platform = args.platform
# Initialize CLI adapter
adapter = get_cli_adapter(platform)
project_root = get_repo_root()
# Normalize paths
task_dir_path = Path(task_dir_arg)
if task_dir_path.is_absolute():
task_dir_abs = task_dir_path
else:
task_dir_abs = project_root / task_dir_path
try:
task_dir_relative = task_dir_abs.relative_to(project_root).as_posix()
except ValueError:
task_dir_relative = str(task_dir_abs)
task_json_path = task_dir_abs / FILE_TASK_JSON
# =============================================================================
# Validation
# =============================================================================
if not task_json_path.is_file():
log_error(f"task.json not found at {task_json_path}")
return 1
if adapter.requires_agent_definition_file:
dispatch_md = adapter.get_agent_path("dispatch", project_root)
if not dispatch_md.is_file():
log_error(f"Agent definition not found at {dispatch_md}")
log_info(f"Platform: {platform}")
return 1
config_file = get_worktree_config(project_root)
if not config_file.is_file():
log_error(f"worktree.yaml not found at {config_file}")
return 1
# =============================================================================
# Read Task Config
# =============================================================================
print()
print(f"{Colors.BLUE}=== Multi-Agent Pipeline: Start ==={Colors.NC}")
log_info(f"Task: {task_dir_abs}")
task_data = read_json(task_json_path)
if not task_data:
log_error("Failed to read task.json")
return 1
branch = task_data.get("branch")
task_name = task_data.get("name")
task_status = task_data.get("status")
worktree_path = task_data.get("worktree_path")
# Check if task was rejected
if task_status == "rejected":
log_error("Task was rejected by Plan Agent")
rejected_file = task_dir_abs / "REJECTED.md"
if rejected_file.is_file():
print()
print(f"{Colors.YELLOW}Rejection reason:{Colors.NC}")
print(rejected_file.read_text(encoding="utf-8"))
print()
log_info(
"To retry, delete this directory and run plan.py again with revised requirements"
)
return 1
# Check if prd.md exists (plan completed successfully)
prd_file = task_dir_abs / "prd.md"
if not prd_file.is_file():
log_error("prd.md not found - Plan Agent may not have completed")
log_info(f"Check plan log: {task_dir_abs}/.plan-log")
return 1
if not branch:
log_error("branch field not set in task.json")
log_info("Please set branch field first, e.g.:")
log_info(
" jq '.branch = \"task/my-task\"' task.json > tmp && mv tmp task.json"
)
return 1
log_info(f"Branch: {branch}")
log_info(f"Name: {task_name}")
# =============================================================================
# Step 1: Create Worktree (if not exists)
# =============================================================================
if not worktree_path or not Path(worktree_path).is_dir():
log_info("Step 1: Creating worktree...")
# Record current branch as base_branch (PR target)
_, base_branch_out, _ = run_git(
["branch", "--show-current"], cwd=project_root
)
base_branch = base_branch_out.strip()
log_info(f"Base branch (PR target): {base_branch}")
# Calculate worktree path
worktree_base = get_worktree_base_dir(project_root)
worktree_base.mkdir(parents=True, exist_ok=True)
worktree_base = worktree_base.resolve()
worktree_path_obj = worktree_base / branch
worktree_path = str(worktree_path_obj)
# Create parent directory
worktree_path_obj.parent.mkdir(parents=True, exist_ok=True)
# Create branch if not exists
ret, _, _ = run_git(
["show-ref", "--verify", "--quiet", f"refs/heads/{branch}"],
cwd=project_root,
)
if ret == 0:
log_info("Branch exists, checking out...")
ret, _, err = run_git(
["worktree", "add", worktree_path, branch], cwd=project_root
)
else:
log_info(f"Creating new branch: {branch}")
ret, _, err = run_git(
["worktree", "add", "-b", branch, worktree_path], cwd=project_root
)
if ret != 0:
log_error(f"Failed to create worktree: {err}")
return 1
log_success(f"Worktree created: {worktree_path}")
# Update task.json with worktree_path and base_branch
task_data["worktree_path"] = worktree_path
task_data["base_branch"] = base_branch
write_json(task_json_path, task_data)
# ----- Copy environment files -----
log_info("Copying environment files...")
copy_list = get_worktree_copy_files(project_root)
copy_count = 0
for item in copy_list:
if not item:
continue
source = project_root / item
target = Path(worktree_path) / item
if source.is_file():
target.parent.mkdir(parents=True, exist_ok=True)
shutil.copy2(str(source), str(target))
copy_count += 1
if copy_count > 0:
log_success(f"Copied {copy_count} file(s)")
# ----- Copy task directory (may not be committed yet) -----
log_info("Copying task directory...")
task_target_dir = Path(worktree_path) / task_dir_relative
task_target_dir.parent.mkdir(parents=True, exist_ok=True)
if task_target_dir.exists():
shutil.rmtree(str(task_target_dir))
shutil.copytree(str(task_dir_abs), str(task_target_dir))
log_success("Task directory copied to worktree")
# ----- Initialize submodules (before hooks, so hooks can use submodule content) -----
_init_submodules_for_task(task_data, worktree_path, project_root)
# ----- Run post_create hooks -----
log_info("Running post_create hooks...")
post_create = get_worktree_post_create_hooks(project_root)
hook_count = 0
for cmd in post_create:
if not cmd:
continue
log_info(f" Running: {cmd}")
ret = subprocess.run(cmd, shell=True, cwd=worktree_path)
if ret.returncode != 0:
log_error(f"Hook failed: {cmd}")
return 1
hook_count += 1
if hook_count > 0:
log_success(f"Ran {hook_count} hook(s)")
else:
log_info(f"Step 1: Using existing worktree: {worktree_path}")
# ----- Initialize submodules (idempotent, for reused worktrees) -----
_init_submodules_for_task(task_data, worktree_path, project_root)
# =============================================================================
# Step 2: Set .current-task in Worktree
# =============================================================================
log_info("Step 2: Setting current task in worktree...")
worktree_workflow_dir = Path(worktree_path) / DIR_WORKFLOW
worktree_workflow_dir.mkdir(parents=True, exist_ok=True)
current_task_file = worktree_workflow_dir / FILE_CURRENT_TASK
current_task_file.write_text(task_dir_relative, encoding="utf-8")
log_success(f"Current task set: {task_dir_relative}")
# =============================================================================
# Step 3: Prepare and Start Claude Agent
# =============================================================================
log_info(f"Step 3: Starting {adapter.cli_name} agent...")
# Update task status
task_data["status"] = "in_progress"
write_json(task_json_path, task_data)
log_file = Path(worktree_path) / ".agent-log"
session_id_file = Path(worktree_path) / ".session-id"
log_file.touch()
# Generate session ID for resume support (Claude Code only)
# OpenCode generates its own session ID, we'll extract it from logs later
if adapter.supports_session_id_on_create:
session_id = str(uuid.uuid4()).lower()
session_id_file.write_text(session_id, encoding="utf-8")
log_info(f"Session ID: {session_id}")
else:
session_id = None # Will be extracted from logs after startup
log_info("Session ID will be extracted from logs after startup")
# Get proxy environment variables
https_proxy = os.environ.get("https_proxy", "")
http_proxy = os.environ.get("http_proxy", "")
all_proxy = os.environ.get("all_proxy", "")
# Start agent in background (cross-platform, no shell script needed)
env = os.environ.copy()
env["https_proxy"] = https_proxy
env["http_proxy"] = http_proxy
env["all_proxy"] = all_proxy
# Clear nested-session detection so the new CLI process can start
# (when this script runs inside a Claude Code session, CLAUDECODE=1 is inherited)
env.pop("CLAUDECODE", None)
# Set non-interactive env var based on platform
env.update(adapter.get_non_interactive_env())
# Build CLI command using adapter
# Note: Use explicit prompt to avoid confusion with CI/CD pipelines
# Also remind the model to follow its agent definition for better cross-model compatibility
cli_cmd = adapter.build_run_command(
agent="dispatch",
prompt="Follow your agent instructions to execute the task workflow. Start by reading .trellis/.current-task to get the task directory, then execute each action in task.json next_action array in order.",
session_id=session_id if adapter.supports_session_id_on_create else None,
skip_permissions=True,
verbose=True,
json_output=True,
)
with log_file.open("w") as log_f:
# Use shell=False for cross-platform compatibility
# creationflags for Windows, start_new_session for Unix
popen_kwargs = {
"stdout": log_f,
"stderr": subprocess.STDOUT,
"cwd": worktree_path,
"env": env,
}
if sys.platform == "win32":
popen_kwargs["creationflags"] = subprocess.CREATE_NEW_PROCESS_GROUP
else:
popen_kwargs["start_new_session"] = True
process = subprocess.Popen(cli_cmd, **popen_kwargs)
agent_pid = process.pid
log_success(f"Agent started with PID: {agent_pid}")
# For OpenCode: extract session ID from logs after startup
if not adapter.supports_session_id_on_create:
import time
log_info("Waiting for session ID from logs...")
# Wait a bit for the log to have session ID
for _ in range(10): # Try for up to 5 seconds
time.sleep(0.5)
try:
log_content = log_file.read_text(encoding="utf-8", errors="replace")
session_id = adapter.extract_session_id_from_log(log_content)
if session_id:
session_id_file.write_text(session_id, encoding="utf-8")
log_success(f"Session ID extracted: {session_id}")
break
except Exception:
pass
else:
log_warn("Could not extract session ID from logs")
session_id = "unknown"
# =============================================================================
# Step 4: Register to Registry (in main repo, not worktree)
# =============================================================================
log_info("Step 4: Registering agent to registry...")
# Generate agent ID
task_id = task_data.get("id")
if not task_id:
task_id = branch.replace("/", "-")
registry_add_agent(
task_id, worktree_path, agent_pid, task_dir_relative, project_root, platform
)
log_success(f"Agent registered: {task_id}")
# =============================================================================
# Summary
# =============================================================================
print()
print(f"{Colors.GREEN}=== Agent Started ==={Colors.NC}")
print()
print(f" ID: {task_id}")
print(f" PID: {agent_pid}")
print(f" Session: {session_id}")
print(f" Worktree: {worktree_path}")
print(f" Task: {task_dir_relative}")
print(f" Log: {log_file}")
print(f" Registry: {registry_get_file(project_root)}")
print()
print(f"{Colors.YELLOW}To monitor:{Colors.NC} tail -f {log_file}")
print(f"{Colors.YELLOW}To stop:{Colors.NC} kill {agent_pid}")
if session_id and session_id != "unknown":
resume_cmd = adapter.get_resume_command_str(session_id, cwd=worktree_path)
print(f"{Colors.YELLOW}To resume:{Colors.NC} {resume_cmd}")
else:
print(f"{Colors.YELLOW}To resume:{Colors.NC} (session ID not available)")
return 0
if __name__ == "__main__":
sys.exit(main())