opencode-collaboration 2.2.0.post2__tar.gz → 2.2.0.post4__tar.gz

{opencode_collaboration-2.2.0.post2 → opencode_collaboration-2.2.0.post4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opencode-collaboration
-Version: 2.2.0.post2
+Version: 2.2.0.post4
 Summary: 双Agent协作框架 - 产品经理与开发的分离式协作工具
 Author-email: liuzhen <dev@opencode.ai>
 License: MIT

{opencode_collaboration-2.2.0.post2 → opencode_collaboration-2.2.0.post4}/opencode_collaboration.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opencode-collaboration
-Version: 2.2.0.post2
+Version: 2.2.0.post4
 Summary: 双Agent协作框架 - 产品经理与开发的分离式协作工具
 Author-email: liuzhen <dev@opencode.ai>
 License: MIT

{opencode_collaboration-2.2.0.post2 → opencode_collaboration-2.2.0.post4}/opencode_collaboration.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ src/core/auto_engine.py
 src/core/auto_git_sync.py
 src/core/auto_retry.py
 src/core/brain_engine.py
+src/core/change_compliance.py
 src/core/config_reloader.py
 src/core/daemon.py
 src/core/design_review_notifier.py
@@ -35,7 +36,9 @@ src/core/monitor.py
 src/core/phase_advance.py
 src/core/project_manager.py
 src/core/resource_lock.py
+src/core/session_manager.py
 src/core/signoff.py
+src/core/signoff_record_manager.py
 src/core/state_machine.py
 src/core/state_manager.py
 src/core/state_migrator.py
@@ -44,8 +47,10 @@ src/core/story_manager.py
 src/core/supervisor.py
 src/core/task_executor.py
 src/core/workflow.py
+src/core/workflow_inference.py
 src/utils/__init__.py
 src/utils/date.py
+src/utils/environment.py
 src/utils/file.py
 src/utils/lock.py
 src/utils/yaml.py
@@ -59,6 +64,7 @@ tests/test_auto_git_sync.py
 tests/test_auto_retry.py
 tests/test_blackbox_v210.py
 tests/test_brain_engine.py
+tests/test_cli_integrity.py
 tests/test_config_reloader.py
 tests/test_daemon.py
 tests/test_daemon_integration.py
@@ -80,6 +86,7 @@ tests/test_package_completeness.py
 tests/test_phase_advance.py
 tests/test_project_manager.py
 tests/test_resource_lock.py
+tests/test_session_manager.py
 tests/test_signoff.py
 tests/test_state_machine.py
 tests/test_state_manager.py

{opencode_collaboration-2.2.0.post2 → opencode_collaboration-2.2.0.post4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "opencode-collaboration"
-version = "2.2.0.post2"
+version = "2.2.0.post4"
 description = "双Agent协作框架 - 产品经理与开发的分离式协作工具"
 readme = "README.md"
 requires-python = ">=3.8"

{opencode_collaboration-2.2.0.post2 → opencode_collaboration-2.2.0.post4}/src/cli/main.py

@@ -17,6 +17,7 @@ from ..core.auto_engine import AutoCollaborationEngine, TodoCommandExecutor, Wor
 from ..core.auto_retry import AutoRetry, AutoRetryConfig
 from ..core.auto_docs import AutoDocs, AutoDocsConfig
 from ..core.phase_advance import PhaseAdvanceEngine
+from ..core.session_manager import SessionManager
 from ..utils.lock import LockExistsError
 
 
@@ -123,6 +124,9 @@ def status_command():
         req_status = state_manager.get_signoff_status("requirements")
         console.print(f"需求签署 - 产品经理: {'✓' if req_status['pm_signoff'] else '✗'}, 开发: {'✓' if req_status['dev_signoff'] else '✗'}")
 
+        session_manager = SessionManager(project_path)
+        session_manager.show_welcome(active_agent)
+
     except StateFileNotFoundError:
         click.echo("错误: 未找到项目状态文件，请先初始化项目")
         sys.exit(1)
@@ -136,22 +140,33 @@ def status_command():
 
 @main.command("switch")
 @click.argument("agent_id", type=click.IntRange(1, 2))
-def switch_command(agent_id: int):
+@click.option("--welcome/--no-welcome", "-w", default=True, help="显示欢迎信息")
+def switch_command(agent_id: int, welcome: bool):
     """切换Agent角色。"""
     try:
         project_path = get_project_path()
         state_manager = StateManager(project_path)
-        
+
         current_agent = state_manager.get_active_agent()
         if current_agent == f"agent{agent_id}":
             click.echo(f"已经是 Agent {agent_id}")
             return
-        
+
         state_manager.set_active_agent(f"agent{agent_id}")
-        
-        agent_info = state_manager.load_state()["agents"][f"agent{agent_id}"]
-        click.echo(f"已切换到 Agent {agent_id} ({agent_info['role']})")
-        
+
+        if welcome:
+            session_manager = SessionManager(project_path)
+            session_manager.show_welcome(f"agent{agent_id}")
+        else:
+            try:
+                state = state_manager.load_state()
+                agents = state.get("agents", {})
+                agent_info = agents.get(f"agent{agent_id}", {})
+                role = agent_info.get("role", "未知")
+            except Exception:
+                role = "未知"
+            click.echo(f"已切换到 Agent {agent_id} ({role})")
+
     except Exception as e:
         click.echo(f"错误: {e}")
         sys.exit(1)
@@ -159,26 +174,27 @@ def switch_command(agent_id: int):
 
 @main.command("review")
 @click.argument("stage", type=click.Choice(["requirements", "design", "test"]))
+@click.option("--file", "-f", help="指定评审文件路径")
 @click.option("--new", is_flag=True, default=False)
 @click.option("--list", "-l", is_flag=True, default=False)
-def review_command(stage: str, new: bool, list: bool):
+def review_command(stage: str, file: str, new: bool, list: bool):
     """管理评审流程。"""
     try:
         project_path = get_project_path()
         state_manager = StateManager(project_path)
         workflow_engine = WorkflowEngine(state_manager)
-        
+
         if new:
             workflow_engine.start_review(stage)
             click.echo(f"已发起 {stage} 评审")
-        
+
         if list:
             history = state_manager.get_history()
             console.print(f"\n[bold]{stage.upper()} 评审历史[/bold]")
             for item in history[:10]:
                 if "review" in item["action"] or "signoff" in item["action"]:
                     console.print(f"- {item['timestamp']}: Agent {item['agent']} - {item['details']}")
-        
+
     except Exception as e:
         click.echo(f"错误: {e}")
         sys.exit(1)
@@ -188,26 +204,74 @@ def review_command(stage: str, new: bool, list: bool):
 @click.argument("stage", type=click.Choice(["requirements", "design", "test"]))
 @click.option("--comment", "-m", default="")
 @click.option("--reject", "-r", default=None)
-def signoff_command(stage: str, comment: str, reject: str):
+@click.option("--sync", "-s", is_flag=True, default=False, help="签署后自动同步到远程")
+def signoff_command(stage: str, comment: str, reject: str, sync: bool):
     """签署确认。"""
     try:
         project_path = get_project_path()
         state_manager = StateManager(project_path)
         workflow_engine = WorkflowEngine(state_manager)
         signoff_engine = SignoffEngine(state_manager, workflow_engine)
-        
+
         agent_id = state_manager.get_active_agent()
-        
+
         if reject:
             result = signoff_engine.reject(stage, agent_id, reject)
             click.echo(f"已拒签 {stage} 阶段")
         else:
-            result = signoff_engine.sign(stage, agent_id, comment)
-            click.echo(f"已签署 {stage} 阶段")
-            
+            if sync:
+                from ..core.git import GitHelper
+                git_helper = GitHelper(project_path)
+                result = signoff_engine.signoff_with_sync(stage, agent_id, comment, git_helper)
+                click.echo(result.message)
+            else:
+                result = signoff_engine.sign(stage, agent_id, comment)
+                click.echo(f"已签署 {stage} 阶段")
+
             if state_manager.can_proceed_to_next_phase():
                 click.echo("双方已签署，可以推进到下一阶段")
-        
+
+    except Exception as e:
+        click.echo(f"错误: {e}")
+        sys.exit(1)
+
+
+@main.command("signoffs")
+@click.option("--list", "-l", is_flag=True, default=False, help="列出所有签署记录")
+@click.option("--id", "-i", help="查看特定签署记录ID")
+def signoffs_command(list: bool, id: str):
+    """查看签署记录。"""
+    try:
+        from ..core.signoff_record_manager import SignoffRecordManager
+
+        project_path = get_project_path()
+        manager = SignoffRecordManager(project_path)
+
+        if id:
+            record = manager.get_signoff(id)
+            if record:
+                console.print(f"\n[bold]签署记录: {id}[/bold]")
+                console.print(f"里程碑: {record.get('milestone')}")
+                console.print(f"阶段: {record.get('phase')}")
+                console.print(f"状态: {record.get('status')}")
+                console.print("\n签署者:")
+                for signer in record.get("signers", []):
+                    status_icon = "✓" if signer.get("status") == "approved" else "○"
+                    console.print(f"  {status_icon} {signer.get('role')} ({signer.get('agent')}) - {signer.get('timestamp')}")
+            else:
+                click.echo(f"未找到签署记录: {id}")
+        elif list:
+            signoffs = manager.list_signoffs()
+            if signoffs:
+                console.print("\n[bold]签署记录列表[/bold]")
+                for record in signoffs:
+                    status_icon = "✓" if record.get("status") == "APPROVED" else "○"
+                    console.print(f"{status_icon} {record.get('signoff_id')} - {record.get('milestone')} - {record.get('phase')}")
+            else:
+                click.echo("暂无签署记录")
+        else:
+            click.echo("请使用 --list 列出所有记录，或 --id 查看特定记录")
+
     except Exception as e:
         click.echo(f"错误: {e}")
         sys.exit(1)
@@ -1104,5 +1168,87 @@ def advance_command(phase: str, force: bool, check: bool):
         sys.exit(1)
 
 
+@main.command("workflow")
+@click.option("--check", "-c", is_flag=True, help="显示合规检查结果")
+@click.option("--suggest", "-s", is_flag=True, help="显示下一步建议")
+def workflow_command(check: bool, suggest: bool):
+    """查看当前工作流状态和推理。"""
+    try:
+        from ..core.workflow_inference import WorkflowInferenceEngine
+
+        project_path = get_project_path()
+        state_manager = StateManager(project_path)
+        engine = WorkflowInferenceEngine(project_path, state_manager)
+
+        result = engine.infer_next_action()
+
+        if result.unknown:
+            click.echo("⚠️ 无法确定当前流程状态")
+            click.echo("请先初始化项目: oc-collab project init")
+        else:
+            console.print(Panel(
+                f"当前阶段: {result.current_phase}\n\n{result.suggestion}",
+                title="工作流状态",
+                style="blue"
+            ))
+
+            if check or suggest:
+                compliance = result.compliance_check
+                if compliance.valid:
+                    click.echo("\n✅ 流程合规")
+                else:
+                    click.echo("\n⚠️ 流程不合规:")
+                    for violation in compliance.violations:
+                        click.echo(f"  - {violation}")
+                    for suggestion in compliance.suggestions:
+                        click.echo(f"  💡 {suggestion}")
+
+    except Exception as e:
+        click.echo(f"错误: {e}")
+        sys.exit(1)
+
+
+@main.command("compliance")
+@click.option("--prd", "-p", help="检查 PRD 文件")
+@click.option("--rfc", "-r", help="检查 RFC 文件")
+@click.option("--detect", "-d", is_flag=True, help="检测冲突")
+def compliance_command(prd: str, rfc: str, detect: bool):
+    """检查变更合规性。"""
+    try:
+        from ..core.change_compliance import ChangeComplianceChecker
+
+        project_path = get_project_path()
+        checker = ChangeComplianceChecker(project_path)
+
+        if prd:
+            result = checker.check_prd_compliance(prd)
+            if result.valid:
+                click.echo("✅ PRD 合规")
+            else:
+                for v in result.violations:
+                    click.echo(f"❌ {v}")
+
+        if rfc:
+            result = checker.check_rfc_compliance(rfc, prd)
+            if result.valid:
+                click.echo("✅ RFC 合规")
+            else:
+                for v in result.violations:
+                    click.echo(f"❌ {v}")
+
+        if detect and prd and rfc:
+            conflicts = checker.detect_conflicts(prd, rfc)
+            if conflicts:
+                click.echo(f"⚠️ 发现 {len(conflicts)} 个冲突:")
+                for c in conflicts:
+                    click.echo(f"  - {c.type}: {c.description}")
+            else:
+                click.echo("✅ 未检测到冲突")
+
+    except Exception as e:
+        click.echo(f"错误: {e}")
+        sys.exit(1)
+
+
 if __name__ == "__main__":
     main()

{opencode_collaboration-2.2.0.post2 → opencode_collaboration-2.2.0.post4}/src/core/brain_engine.py

@@ -141,11 +141,11 @@ class BrainEngine:
                 agent_type=AgentType.AGENT_1,
                 conditions=[
                     Condition("phase_equals", {"value": "requirements_review"}),
-                    Condition("signoff_complete", {"stage": "requirements"})
+                    Condition("custom", {"function": lambda ctx: not ctx.get("signoff", {}).get("requirements", {}).get("pm_signoff", False)})
                 ],
                 action=ActionType.SIGNOFF_REQUIREMENTS,
                 priority=90,
-                description="当阶段为requirements_review且双方签署后，签署需求"
+                description="当阶段为requirements_review且Agent1未签署时，签署需求"
             ),
             Rule(
                 id="agent1-review-design",
@@ -191,11 +191,11 @@ class BrainEngine:
                 agent_type=AgentType.AGENT_2,
                 conditions=[
                     Condition("phase_equals", {"value": "requirements_review"}),
-                    Condition("signoff_complete", {"stage": "requirements"})
+                    Condition("custom", {"function": lambda ctx: not ctx.get("signoff", {}).get("requirements", {}).get("dev_signoff", False)})
                 ],
                 action=ActionType.SIGNOFF_REQUIREMENTS,
                 priority=95,
-                description="当阶段为requirements_review且双方签署后，签署需求"
+                description="当阶段为requirements_review且Agent2未签署时，签署需求"
             ),
             Rule(
                 id="agent2-create-design",

opencode_collaboration-2.2.0.post4/src/core/change_compliance.py

@@ -0,0 +1,112 @@
+"""变更合规检查器模块。"""
+from pathlib import Path
+from typing import List, Dict, Any, Optional, Tuple
+from dataclasses import dataclass, field
+import re
+import logging
+
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass
+class ComplianceResult:
+    """合规检查结果"""
+    valid: bool
+    violations: List[str] = field(default_factory=list)
+    warnings: List[str] = field(default_factory=list)
+    suggestions: List[str] = field(default_factory=list)
+
+
+@dataclass
+class Conflict:
+    """冲突信息"""
+    type: str
+    file: str
+    description: str
+    details: str
+
+
+class ChangeComplianceChecker:
+    """变更合规检查器"""
+
+    PRD_PATTERN = r'(?:FR|UR|NFR|BUG)-[\w]+(?:[-][\w]+)*'
+    RFC_PATTERN = r'RFC-[\d]+'
+
+    def __init__(self, project_path: str):
+        self.project_path = Path(project_path)
+
+    def check_prd_compliance(self, prd_file: str) -> ComplianceResult:
+        """检查 PRD 合规性"""
+        result = ComplianceResult(valid=True)
+
+        if not Path(prd_file).exists():
+            result.valid = False
+            result.violations.append(f"PRD 文件不存在: {prd_file}")
+            return result
+
+        with open(prd_file, 'r') as f:
+            content = f.read()
+
+        if "## 签署确认" not in content:
+            result.violations.append("PRD 缺少签署确认章节")
+            result.suggestions.append("请添加签署确认表格")
+
+        prd_ids = re.findall(self.PRD_PATTERN, content)
+        if prd_ids:
+            result.warnings.append(f"发现 {len(set(prd_ids))} 个需求 ID，建议检查追溯性")
+
+        return result
+
+    def check_rfc_compliance(self, rfc_file: str, prd_file: str = None) -> ComplianceResult:
+        """检查 RFC 合规性"""
+        result = ComplianceResult(valid=True)
+
+        if not Path(rfc_file).exists():
+            result.valid = False
+            result.violations.append(f"RFC 文件不存在: {rfc_file}")
+            return result
+
+        with open(rfc_file, 'r') as f:
+            content = f.read()
+
+        rfc_ids = re.findall(self.RFC_PATTERN, content)
+        if rfc_ids:
+            result.suggestions.append(f"发现 {len(set(rfc_ids))} 个 RFC 引用")
+
+        if prd_file and Path(prd_file).exists():
+            with open(prd_file, 'r') as f:
+                prd_content = f.read()
+
+            if content.strip()[-100:] in prd_content[-200:]:
+                result.warnings.append("RFC 内容可能已包含在 PRD 中，可作为记录无需单独评审")
+
+        return result
+
+    def detect_conflicts(self, prd_file: str, rfc_file: str) -> List[Conflict]:
+        """检测 PRD 与 RFC 之间的冲突"""
+        conflicts = []
+
+        if not Path(prd_file).exists() or not Path(rfc_file).exists():
+            return conflicts
+
+        with open(prd_file, 'r') as f:
+            prd_content = f.read()
+
+        with open(rfc_file, 'r') as f:
+            rfc_content = f.read()
+
+        prd_ids = set(re.findall(self.PRD_PATTERN, prd_content))
+        rfc_refs = set(re.findall(self.RFC_PATTERN, rfc_content))
+
+        for prd_id in prd_ids:
+            for rfc_ref in rfc_refs:
+                if prd_id in rfc_content and prd_id not in rfc_ref:
+                    conflicts.append(Conflict(
+                        type="内容冲突",
+                        file=f"PRD vs RFC",
+                        description=f"需求 {prd_id} 在 RFC 中被引用，但 RFC 编号不一致",
+                        details=f"PRD 引用: {prd_id}, RFC 内容: 包含 {prd_id}"
+                    ))
+
+        return conflicts

opencode_collaboration-2.2.0.post4/src/core/session_manager.py

@@ -0,0 +1,213 @@
+from pathlib import Path
+from typing import Optional, List
+from rich.console import Console
+from rich.panel import Panel
+from rich.text import Text
+
+from .state_manager import StateManager
+
+console = Console()
+
+AGENT_ROLES = {
+    "agent1": {
+        "role": "产品经理",
+        "responsibilities": [
+            "编写和评审需求文档",
+            "定义验收标准",
+            "签署需求确认",
+            "评审设计文档",
+            "评审测试报告"
+        ]
+    },
+    "agent2": {
+        "role": "开发负责人",
+        "responsibilities": [
+            "评审需求文档",
+            "编写详细设计",
+            "代码实现",
+            "编写单元测试",
+            "签署技术确认"
+        ]
+    }
+}
+
+COMMON_COMMANDS = [
+    ("oc-collab status", "查看项目状态"),
+    ("oc-collab todo", "查看待办事项"),
+    ("oc-collab review", "评审文档"),
+    ("oc-collab signoff", "签署确认"),
+    ("oc-collab history", "查看协作历史"),
+    ("oc-collab switch <1|2>", "切换Agent角色")
+]
+
+
+class SessionConfig:
+    def __init__(self, project_path: str):
+        self.project_path = project_path
+        self.enabled = True
+        self.show_responsibilities = True
+        self.show_todo = True
+        self.show_pending = True
+        self.load_config()
+
+    def load_config(self):
+        state_file = Path(self.project_path) / "state" / "project_state.yaml"
+        if state_file.exists():
+            try:
+                import yaml
+                with open(state_file) as f:
+                    state = yaml.safe_load(f) or {}
+                session_config = state.get("session_start", {})
+                self.enabled = session_config.get("enabled", True)
+                self.show_responsibilities = session_config.get("show_responsibilities", True)
+                self.show_todo = session_config.get("show_todo", True)
+                self.show_pending = session_config.get("show_pending", True)
+            except Exception:
+                pass
+
+
+class SessionManager:
+    def __init__(self, project_path: str):
+        self.project_path = project_path
+        self.state_manager = StateManager(project_path)
+        self.config = SessionConfig(project_path)
+
+    def get_project_info(self) -> dict:
+        try:
+            state = self.state_manager.load_state()
+            metadata = state.get("metadata", {})
+            project_info = state.get("project", {})
+
+            return {
+                "name": metadata.get("project_name") or project_info.get("name", "未配置"),
+                "phase": project_info.get("phase") or state.get("phase", "未知"),
+                "milestone": state.get("current_milestone", "待定义")
+            }
+        except Exception:
+            return {"name": "未配置", "phase": "未知", "milestone": "待定义"}
+
+    def get_agent_info(self, agent_id: str) -> dict:
+        agent_config = AGENT_ROLES.get(agent_id, {
+            "role": "未知",
+            "responsibilities": []
+        })
+
+        try:
+            state = self.state_manager.load_state()
+            agents = state.get("agents", {})
+            agent_state = agents.get(agent_id, {})
+        except KeyError:
+            agent_state = {}
+        except Exception:
+            agent_state = {}
+
+        return {
+            "id": agent_id,
+            "role": agent_config["role"],
+            "current_task": agent_state.get("current_task", ""),
+            "responsibilities": agent_config["responsibilities"]
+        }
+
+    def get_responsibilities_text(self, agent_id: str) -> str:
+        agent = self.get_agent_info(agent_id)
+        if not self.config.show_responsibilities:
+            return ""
+
+        lines = ["你的职责:"]
+        for resp in agent["responsibilities"]:
+            lines.append(f"  - {resp}")
+        return "\n".join(lines)
+
+    def get_todo_items(self) -> str:
+        if not self.config.show_todo:
+            return ""
+
+        try:
+            from .auto_engine import TodoCommandExecutor
+            executor = TodoCommandExecutor(self.project_path)
+            todo_list = executor.get_todo_list()
+
+            if not todo_list:
+                return "待办事项:\n  暂无待办事项"
+
+            lines = ["待办事项:"]
+            for item in todo_list[:5]:
+                task = item.get("task", "")
+                lines.append(f"  [ ] {task}")
+            return "\n".join(lines)
+        except Exception:
+            return "待办事项:\n  暂无待办事项"
+
+    def get_pending_issues(self) -> str:
+        if not self.config.show_pending:
+            return ""
+
+        pending_file = Path(self.project_path) / "state" / "memory" / "pending.yaml"
+        if not pending_file.exists():
+            return "上次会话遗留:\n  无遗留问题"
+
+        try:
+            import yaml
+            with open(pending_file) as f:
+                pending = yaml.safe_load(f) or []
+
+            if not pending:
+                return "上次会话遗留:\n  无遗留问题"
+
+            lines = ["上次会话遗留:"]
+            for item in pending[:5]:
+                desc = item.get("description", item)
+                lines.append(f"  - {desc}")
+            return "\n".join(lines)
+        except Exception:
+            return "上次会话遗留:\n  无遗留问题"
+
+    def get_common_commands(self) -> str:
+        lines = ["常用命令:"]
+        for cmd, desc in COMMON_COMMANDS:
+            lines.append(f"  - {cmd}: {desc}")
+        return "\n".join(lines)
+
+    def get_welcome_message(self, agent_id: str) -> str:
+        if not self.config.enabled:
+            return ""
+
+        project = self.get_project_info()
+        agent = self.get_agent_info(agent_id)
+
+        parts = [
+            f"=== Agent {agent_id.replace('agent', '')} ({agent['role']}) ===",
+            "",
+            f"当前项目: {project['name']}",
+            f"当前阶段: {project['phase']}",
+            f"当前里程碑: {project['milestone']}",
+            ""
+        ]
+
+        resp_text = self.get_responsibilities_text(agent_id)
+        if resp_text:
+            parts.append(resp_text)
+            parts.append("")
+
+        todo_text = self.get_todo_items()
+        if todo_text:
+            parts.append(todo_text)
+            parts.append("")
+
+        pending_text = self.get_pending_issues()
+        if pending_text:
+            parts.append(pending_text)
+            parts.append("")
+
+        parts.append(self.get_common_commands())
+
+        return "\n".join(parts)
+
+    def show_welcome(self, agent_id: str):
+        message = self.get_welcome_message(agent_id)
+        if message:
+            console.print(Panel(
+                Text(message, justify="left"),
+                title="会话引导",
+                style="blue"
+            ))