feat: merge geekan:cli-etc

metagpt/actions/prepare_documents.py

@@ -12,7 +12,7 @@ from pathlib import Path
 
 from metagpt.actions import Action, ActionOutput
 from metagpt.config import CONFIG
-from metagpt.const import DOCS_FILE_REPO, REQUIREMENT_FILENAME, WORKSPACE_ROOT
+from metagpt.const import DEFAULT_WORKSPACE_ROOT, DOCS_FILE_REPO, REQUIREMENT_FILENAME
 from metagpt.schema import Document
 from metagpt.utils.file_repository import FileRepository
 from metagpt.utils.git_repository import GitRepository
@@ -28,8 +28,11 @@ class PrepareDocuments(Action):
             return ActionOutput(content=doc.json(exclue="content"), instruct_content=doc)
 
         # Create and initialize the workspace folder, initialize the Git environment.
+        default_workspace_root = CONFIG.project_path or DEFAULT_WORKSPACE_ROOT
+        default_project_name = CONFIG.project_name or FileRepository.new_filename()
+        default_workdir = Path(default_workspace_root) / default_project_name
         CONFIG.git_repo = GitRepository()
-        workdir = Path(CONFIG.WORKDIR) if CONFIG.WORKDIR else WORKSPACE_ROOT / FileRepository.new_filename()
+        workdir = Path(CONFIG.WORKDIR) if CONFIG.WORKDIR else default_workdir
         CONFIG.git_repo.open(local_path=workdir, auto_init=True)
 
         # Write the newly added requirements from the main parameter idea to `docs/requirement.txt`.

metagpt/startup.py

@@ -4,6 +4,8 @@ import asyncio
 
 import typer
 
+from metagpt.config import CONFIG
+
 app = typer.Typer()
 
 
@@ -17,6 +19,10 @@ def startup(
     implement: bool = typer.Option(True, help="Enable or disable code implementation."),
     project_name: str = typer.Option("", help="Unique project name, such as 'game_2048'."),
     inc: bool = typer.Option(False, help="Incremental mode. Use it to coop with existing repo."),
+    project_path: str = typer.Option(
+        help="Specify the directory path of the old version project to fulfill the " "incremental requirements."
+    ),
+    reqa_file: str = typer.Option(help="Specify the source file name for rewriting the quality test code."),
 ):
     """Run a startup. Be a boss."""
     from metagpt.roles import (
@@ -28,6 +34,12 @@ def startup(
     )
     from metagpt.team import Team
 
+    # Use in the PrepareDocuments action according to Section 2.2.3.5.1 of RFC 135.
+    CONFIG.project_name = project_name
+    CONFIG.inc = inc
+    CONFIG.project_path = project_path
+    CONFIG.reqa_file = reqa_file
+
     company = Team()
     company.hire(
         [
@@ -44,9 +56,9 @@ def startup(
         company.hire([QaEngineer()])
 
     company.invest(investment)
-    company.run_project(idea, project_name=project_name, inc=inc)
+    company.run_project(idea)
     asyncio.run(company.run(n_round=n_round))
 
 
 if __name__ == "__main__":
-    startup(idea="Make a 2048 game.")
+    app()

metagpt/team.py

@@ -11,6 +11,7 @@ from pydantic import BaseModel, Field
 
 from metagpt.actions import UserRequirement
 from metagpt.config import CONFIG
+from metagpt.const import MESSAGE_ROUTE_TO_ALL
 from metagpt.environment import Environment
 from metagpt.logs import logger
 from metagpt.roles import Role
@@ -45,16 +46,14 @@ class Team(BaseModel):
         if CONFIG.total_cost > CONFIG.max_budget:
             raise NoMoneyException(CONFIG.total_cost, f"Insufficient funds: {CONFIG.max_budget}")
 
-    def run_project(self, idea, send_to: str = "", project_name: str = "", inc: bool = False):
+    def run_project(self, idea, send_to: str = ""):
         """Start a project from publishing user requirement."""
         self.idea = idea
-        # If user set project_name, then use it.
-        if project_name:
-            path = CONFIG.workspace_path / project_name
-            self.env.load_existing_repo(path, inc=inc)
 
         # Human requirement.
-        self.env.publish_message(Message(role="Human", content=idea, cause_by=UserRequirement, send_to=send_to))
+        self.env.publish_message(
+            Message(role="Human", content=idea, cause_by=UserRequirement, send_to=send_to or MESSAGE_ROUTE_TO_ALL)
+        )
 
     def _save(self):
         logger.info(self.json(ensure_ascii=False))

metagpt/utils/git_repository.py

@@ -16,7 +16,7 @@ from typing import Dict
 from git.repo import Repo
 from git.repo.fun import is_git_dir
 
-from metagpt.const import WORKSPACE_ROOT
+from metagpt.const import DEFAULT_WORKSPACE_ROOT
 from metagpt.logs import logger
 from metagpt.utils.dependency_file import DependencyFile
 from metagpt.utils.file_repository import FileRepository
@@ -201,7 +201,7 @@ class GitRepository:
 
 
 if __name__ == "__main__":
-    path = WORKSPACE_ROOT / "git"
+    path = DEFAULT_WORKSPACE_ROOT / "git"
     path.mkdir(exist_ok=True, parents=True)
 
     repo = GitRepository()