cafe-engine 0.1.2__tar.gz → 0.1.3__tar.gz

{cafe_engine-0.1.2 → cafe_engine-0.1.3}/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.3]
+
+### Added
+- Added `--post-todo-list` option to `cafe pr` command to post PR comment todo list as GitHub PR comment
+- Added `--post-pr-todo-list` option to `cafe prepare` command to set post-PR-todo-list mode for prepare phase
+- Added token usage summary display after PR comment organization completes
+
+### Fixed
+- Fixed copilot session_id detection to recognize both file-based (.jsonl) and directory-based session formats
+- Fixed `_print_token_usage_summary` to gracefully handle mocked agent_manager in tests
+
 ## [0.1.2]
 
 ### Fixed

{cafe_engine-0.1.2 → cafe_engine-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cafe-engine
-Version: 0.1.2
+Version: 0.1.3
 Summary: CLI Agent Flow Engine - Automated development workflow with AI agents
 License-File: LICENSE
 Requires-Python: >=3.10

{cafe_engine-0.1.2 → cafe_engine-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cafe-engine"
-version = "0.1.2"
+version = "0.1.3"
 description = "CLI Agent Flow Engine - Automated development workflow with AI agents"
 readme = "README.md"
 requires-python = ">=3.10"

{cafe_engine-0.1.2 → cafe_engine-0.1.3}/src/cafe/agents/cli/copilot.py

@@ -221,7 +221,7 @@ class CopilotCLI(AbstractCLI):
 
         if copilot_session_dir.exists():
             self._existing_sessions = {
-                f.name for f in copilot_session_dir.iterdir() if f.is_file()
+                f.name for f in copilot_session_dir.iterdir() if f.is_file() or f.is_dir()
             }
         else:
             self._existing_sessions = set()
@@ -229,7 +229,7 @@ class CopilotCLI(AbstractCLI):
     def extract_session_id(self, output_lines: List[str]) -> Optional[str]:
         """Extract newly created session ID from file system.
 
-        Copilot automatically creates session files, need to detect from file system.
+        Copilot automatically creates session directories, need to detect from file system.
 
         Args:
             output_lines: List of lines from CLI output (not used here)
@@ -245,9 +245,9 @@ class CopilotCLI(AbstractCLI):
         # Wait for file system to update
         time.sleep(0.1)
 
-        # Get current session files
+        # Get current session files and directories
         current_sessions = {
-            f.name for f in copilot_session_dir.iterdir() if f.is_file()
+            f.name for f in copilot_session_dir.iterdir() if f.is_file() or f.is_dir()
         }
 
         # Find newly created sessions
@@ -256,7 +256,7 @@ class CopilotCLI(AbstractCLI):
         if new_sessions:
             # Get newest session (sorted by name)
             newest_session = sorted(new_sessions)[-1]
-            # Remove .jsonl extension
+            # Remove .jsonl extension if present (for file-based sessions)
             session_id = newest_session.replace(".jsonl", "")
             return session_id
 

{cafe_engine-0.1.2 → cafe_engine-0.1.3}/src/cafe/core/phase.py

@@ -1136,8 +1136,15 @@ class Phase(ABC):
         if not hasattr(self, "agent_manager"):
             return
 
-        token_usage = self.agent_manager.get_total_token_usage()
-        model = self.agent_manager.get_last_model()
+        try:
+            token_usage = self.agent_manager.get_total_token_usage()
+            model = self.agent_manager.get_last_model()
+
+            # Verify we have real token usage data (not mocks)
+            if not isinstance(token_usage.input_tokens, int):
+                return
+        except (AttributeError, TypeError):
+            return
 
         print()
         print("=" * 60)

{cafe_engine-0.1.2 → cafe_engine-0.1.3}/src/cafe/phases/pr_phase.py

@@ -38,6 +38,7 @@ class PRPhase(Phase):
         force_push: bool = False,
         interactive: bool = True,
         base_branch: Optional[str] = None,
+        post_todo_list: Optional[bool] = None,
     ) -> None:
         """Initialize PR phase.
 
@@ -57,6 +58,7 @@ class PRPhase(Phase):
             force_push: Force push to remote (default: False)
             interactive: Enable interactive mode (default: True)
             base_branch: Target base branch (None for auto-detection from config)
+            post_todo_list: Post organized todo list as PR comment (None for auto-detect from config)
         """
         super().__init__(interactive=interactive)
 
@@ -93,6 +95,19 @@ class PRPhase(Phase):
             config_base = self._get_issue_config_value(config_file, "base_branch")
             self.base_branch = config_base if config_base else "main"
 
+        # Resolve post_todo_list: CLI value > config file value > default (True)
+        if post_todo_list is not None:
+            # CLI parameter takes precedence
+            self.post_todo_list = post_todo_list
+        else:
+            config_file = self.issue_dir / "issue.yaml"
+            config_value = self._get_issue_config_value(config_file, "pr.post_todo_list")
+            if config_value is not None:
+                self.post_todo_list = bool(config_value)
+            else:
+                # Default to True to maintain backward compatibility
+                self.post_todo_list = True
+
         # Set up history tracking (like other phases)
         self.phase_dir = self.issue_dir / "pr"
         self.history_dir = self.phase_dir / "history"
@@ -1078,6 +1093,21 @@ class PRPhase(Phase):
             console.print(f"[yellow]⚠️  Warning: Failed to fetch/save PR comments: {e}[/yellow]")
             return None
 
+    @staticmethod
+    def _build_todo_list_comment(todo_content: str, user_input_path: str) -> str:
+        """Build PR comment body with todo list and user_input.md reference.
+
+        Args:
+            todo_content: The organized todo list content
+            user_input_path: File path to user_input.md for reference
+
+        Returns:
+            Formatted comment body with file path reference and todo list
+        """
+        return f"""> 📋 Original review comments: `{user_input_path}`
+
+{todo_content}"""
+
     def _organize_comments_to_todo_list(self, pr_number: int, pr_url: str, branch_name: str) -> PhaseResult:
         """Organize PR comments into actionable todo list format.
 
@@ -1139,13 +1169,13 @@ class PRPhase(Phase):
             output_file_path=output_pattern,
             prev_output_file_path=prev_output_pattern,
             checklist_file_path=checklist_file,
+            basic_principles=None,
         )
 
-        # Copy user_input.md to output.md as starting point
-        # Agent will then append todo list below the original content
-        if user_input_file.exists() and not output_file.exists():
-            import shutil
-            shutil.copy2(user_input_file, output_file)
+        # Create empty output.md file for agent to write todo list only
+        # Original PR comments remain in user_input.md for reference
+        if not output_file.exists():
+            output_file.write_text("", encoding="utf-8")
 
         # Get relative paths for tool permissions
         try:
@@ -1202,16 +1232,11 @@ Do NOT return a status code until ALL checklist items are marked as [x].
 **Task:** Organize PR comments into actionable todo list.
 
 **Context:**
-- Output file: {output_pattern} (already contains PR comments, append todo list below){images_instruction}
-
-**Instructions:**
-1. Read the output file which already contains the PR comments
-2. Analyze the comments and organize them into actionable todo items
-3. Append the todo list to the END of the output file (do not remove the original content)
+- PR comments source: {user_input_pattern} (original review comments)
+- Output file: {output_pattern} (write organized todo list here){images_instruction}
 
-**Output format to append:**
+**Output format to write:**
 ```markdown
-
 ## Todo List
 
 ### [Category/Theme]
@@ -1268,18 +1293,24 @@ The system will verify checklist completion. If unchecked items remain, you will
                 message=f"Checklist validation failed - {validation_result.unchecked_count} items not marked as complete",
             )
 
-        # Validate output.md was updated (should differ from user_input.md)
-        pr_dir = self.issue_dir / "pr"
-        was_updated = self._check_output_file_updated(
-            output_file=output_file,
-            iteration=self.iteration,
-            phase_dir=pr_dir,
-            compare_content=user_input_file.read_text(encoding="utf-8") if user_input_file.exists() else None,
-        )
-        if not was_updated:
+        # Validate output.md contains todo list content
+        if not output_file.exists():
+            return PhaseResult(
+                status=PhaseStatus.FAILED,
+                message="Agent did not create output.md file",
+            )
+
+        output_content = output_file.read_text(encoding="utf-8")
+        # Check if output.md contains todo list markers (either ## Todo List or checkbox items)
+        has_todo_list = ("## Todo List" in output_content or
+                        "## Todo" in output_content or
+                        "- [ ]" in output_content or
+                        "- [x]" in output_content)
+
+        if not has_todo_list:
             return PhaseResult(
                 status=PhaseStatus.FAILED,
-                message="Agent did not update output.md with todo list",
+                message="Agent did not write todo list to output.md (missing todo list markers)",
             )
 
         # Additional validation: if agent returned CONFIRMED, verify this is correct
@@ -1332,12 +1363,33 @@ Return ONLY the status code (CAFE_CONFIRMED or CAFE_NEEDS_CHANGES) with no expla
         pr_dir = self.issue_dir / "pr"
         iteration_dir = pr_dir / f"iteration_{self.iteration:03d}"
         output_file = iteration_dir / "output.md"
+        # Post todo list as PR comment in GitHub mode (if enabled)
+        if pr_number > 0 and self.post_todo_list:  # Only post in GitHub mode when option is enabled
+            try:
+                todo_list_content = output_file.read_text(encoding="utf-8")
+                from cafe.utils.git_utils import to_cwd_relative_path
+                try:
+                    user_input_display = to_cwd_relative_path(user_input_file)
+                except ValueError:
+                    user_input_display = str(user_input_file)
+
+                comment_body = self._build_todo_list_comment(todo_list_content, user_input_display)
+                self.github_ops.add_pr_comment(str(pr_number), comment_body)
+            except Exception as e:
+                # Don't fail the workflow if posting comment fails - just warn
+                from rich.console import Console
+                console = Console()
+                console.print(f"[yellow]⚠️  Warning: Failed to post todo list as PR comment: {e}[/yellow]")
+
         from cafe.utils.git_utils import to_cwd_relative_path
         try:
             output_display = to_cwd_relative_path(output_file)
         except ValueError:
             output_display = str(output_file)
 
+        # Display token usage summary before returning
+        self._print_token_usage_summary()
+
         return PhaseResult(
             status=PhaseStatus.COMPLETED,
             message=f"Organized PR comments into todo list ({output_display})",

{cafe_engine-0.1.2 → cafe_engine-0.1.3}/src/cafe/ui/cli.py

@@ -816,6 +816,11 @@ def prepare(
         "--sync-plan-github/--no-sync-plan-github",
         help="Sync plan to GitHub issue when confirmed (default: auto-detect based on issue_id)",
     ),
+    post_pr_todo_list: Optional[bool] = typer.Option(
+        None,
+        "--post-pr-todo-list/--no-post-pr-todo-list",
+        help="Post organized PR comments as todo list to PR (default: True when auto-create PR is enabled)",
+    ),
 ) -> None:
     """Prepare issue environment (directory, config, git branch) before running spec phase.
 
@@ -1045,9 +1050,12 @@ def prepare(
                 # Auto create PR depends on whether it's a GitHub repo
                 if is_github_repo():
                     pr_config["auto_create"] = True
+                    # In Quick setup, auto_create is always True for GitHub repos,
+                    # so always enable post_todo_list as well
+                    pr_config["post_todo_list"] = True
                 else:
                     pr_config["auto_create"] = False
-                
+
                 # Display default values summary
                 console.print()
                 console.print("[green]✓ Quick setup applied with recommended defaults:[/green]")
@@ -1058,6 +1066,7 @@ def prepare(
                 if is_github_repo():
                     console.print(f"  • Sync to GitHub: {spec_config.get('sync_github', False)}")
                     console.print(f"  • Auto create PR: {pr_config.get('auto_create', False)}")
+                    console.print(f"  • Post PR todo list: {pr_config.get('post_todo_list', False)}")
                 console.print()
             else:
                 # Custom configuration: Prompt for remaining settings
@@ -1131,6 +1140,15 @@ def prepare(
                 config_file = Path(".cafe") / "issues" / issue_name / "issue.yaml"
                 auto_create_pr_result = prompt_and_save_auto_create(config_file, "pr.auto_create")
                 pr_config["auto_create"] = auto_create_pr_result
+
+                # Prompt for post_todo_list only when auto_create is enabled
+                if auto_create_pr_result:
+                    console.print()
+                    post_todo_list_result = prompt_confirm(
+                        "Post organized PR comments as todo list to PR?",
+                        default=True,
+                    )
+                    pr_config["post_todo_list"] = post_todo_list_result
         elif not interactive:
             # Explicit non-interactive mode (--no-interactive): use CLI parameters
             from cafe.utils.git_utils import is_github_repo
@@ -1154,6 +1172,8 @@ def prepare(
             # PR config (only for GitHub repos)
             if is_github_repo() and auto_create_pr:
                 pr_config["auto_create"] = True
+            if post_pr_todo_list is not None:
+                pr_config["post_todo_list"] = post_pr_todo_list
         # else: issue_name was provided as argument but not --no-interactive
         #       Don't save any config (old behavior for backward compatibility)
 
@@ -3397,6 +3417,11 @@ def pr(
         "--interactive/--no-interactive",
         help="Allow interactive prompts (default: True)",
     ),
+    post_todo_list: Optional[bool] = typer.Option(
+        None,
+        "--post-todo-list/--no-post-todo-list",
+        help="Post organized todo list as PR comment (default: auto-detect from config)",
+    ),
 ) -> None:
     """Create pull request for the issue.
 
@@ -3470,6 +3495,7 @@ def pr(
             force_push=force,
             interactive=interactive,
             base_branch=base if base != "main" else None,  # Pass base only if not default
+            post_todo_list=post_todo_list,
         )
 
         result = phase.execute()

{cafe_engine-0.1.2 → cafe_engine-0.1.3}/src/cafe/utils/checklist_generator.py

@@ -371,6 +371,7 @@ def generate_pr_comments_checklist(
     output_file_path: str,
     prev_output_file_path: Optional[str],
     checklist_file_path: Path,
+    basic_principles: Optional[str] = None,
 ) -> None:
     """Generate checklist file for PR comments organization.
 
@@ -380,6 +381,7 @@ def generate_pr_comments_checklist(
         output_file_path: Path to output.md where todo list will be written
         prev_output_file_path: Path to previous output.md (None if first iteration)
         checklist_file_path: Path where checklist file should be created
+        basic_principles: Basic principles text in "- item" format (optional)
     """
     # Get agent file path
     agent_file = AgentManager.get_agent_file_path(agent_name, "developer")
@@ -390,8 +392,13 @@ def generate_pr_comments_checklist(
     # Get agent guidelines checklist
     agent_guidelines = extract_agent_guidelines_checklist(agent_file)
 
+    # Convert basic principles to checklist format
+    basic_principles_checklist = ""
+    if basic_principles:
+        basic_principles_checklist = convert_to_checklist(basic_principles, "Basic Principles")
+
     # Combine all sections
-    checklist_content = f"{execution_steps}\n{agent_guidelines}"
+    checklist_content = f"{execution_steps}\n{basic_principles_checklist}\n{agent_guidelines}"
 
     # Build placeholders dict
     placeholders = {

{cafe_engine-0.1.2 → cafe_engine-0.1.3}/src/cafe/utils/checklist_templates.py

@@ -236,10 +236,10 @@ PR_EXECUTION_STEPS_ITERATION_N = """## Checklist
 PR_COMMENTS_ORGANIZATION_STEPS = """## Checklist
 
 [ ] Read {agent_file} to understand your role and native language
-[ ] Read {output_file} which already contains PR comments
+[ ] Read {user_input_file} which contains the original PR review comments
 [ ] Check {prev_output_file} (if exists) - skip todo items that are already completed there
 [ ] Group related comments together
 [ ] Convert comments into actionable todo list items (markdown checkbox format: - [ ] Item - keep all items UNCHECKED as they represent work to be done)
-[ ] Append organized todo list to the END of {output_file} (do not remove original content)
+[ ] Write ONLY the organized todo list to {output_file} (do NOT copy original PR comments)
 [ ] Return ONLY the status code in your response
 """

{cafe_engine-0.1.2 → cafe_engine-0.1.3}/tests/unit/test_cli_pr_command.py

@@ -199,10 +199,96 @@ class TestPRCommandGitHubMode:
         assert pr_url in result.stdout
         
         # Verify subprocess was called with gh pr diff --web
-        calls = [call for call in mock_subprocess_run.call_args_list 
+        calls = [call for call in mock_subprocess_run.call_args_list
                  if call[0][0] == ["gh", "pr", "diff", "--web"]]
         assert len(calls) >= 1, "Expected subprocess to be called with gh pr diff --web"
 
+
+class TestPRCommandPostTodoListOption:
+    """Test --post-todo-list / --no-post-todo-list option passing to PRPhase."""
+
+    def _make_mocks(self, mock_git_cls, mock_config_cls, mock_agent_cls,
+                    mock_perm_cls, mock_github_ops_cls, mock_pr_phase_cls):
+        """Helper to set up common mocks."""
+        mock_git = MagicMock()
+        mock_git.get_current_branch.return_value = "test-issue"
+        mock_git_cls.return_value = mock_git
+
+        mock_config = MagicMock()
+        mock_config.get.return_value = {"name": "David", "cli": "copilot"}
+        mock_config_cls.return_value = mock_config
+
+        mock_agent_cls.return_value = MagicMock()
+        mock_perm_cls.return_value = MagicMock()
+        mock_github_ops_cls.return_value = MagicMock()
+
+        mock_pr_phase = MagicMock()
+        mock_pr_phase.execute.return_value = PhaseResult(
+            status=PhaseStatus.COMPLETED,
+            message="Done",
+            data={"pr_url": "https://github.com/test/repo/pull/1", "pr_number": 1},
+        )
+        mock_pr_phase_cls.return_value = mock_pr_phase
+        return mock_pr_phase_cls
+
+    @patch("subprocess.run")
+    @patch("cafe.ui.cli.GitHubOps")
+    @patch("cafe.ui.cli.PermissionHandler")
+    @patch("cafe.ui.cli.AgentManager")
+    @patch("cafe.ui.cli.ConfigManager")
+    @patch("cafe.ui.cli.GitOperations")
+    @patch("cafe.ui.cli.PRPhase")
+    def test_post_todo_list_flag_passes_true_to_pr_phase(
+        self,
+        mock_pr_phase_cls,
+        mock_git_cls,
+        mock_config_cls,
+        mock_agent_cls,
+        mock_perm_cls,
+        mock_github_ops_cls,
+        mock_subprocess_run,
+        temp_repo_dir,
+    ):
+        """Test 2.1: --post-todo-list フラグが PRPhase に post_todo_list=True で渡される。"""
+        mock_subprocess_run.return_value = MagicMock(returncode=0)
+        self._make_mocks(mock_git_cls, mock_config_cls, mock_agent_cls,
+                         mock_perm_cls, mock_github_ops_cls, mock_pr_phase_cls)
+
+        result = runner.invoke(app, ["pr", "--post-todo-list"])
+
+        assert result.exit_code == 0
+        call_kwargs = mock_pr_phase_cls.call_args[1]
+        assert call_kwargs.get("post_todo_list") is True
+
+    @patch("subprocess.run")
+    @patch("cafe.ui.cli.GitHubOps")
+    @patch("cafe.ui.cli.PermissionHandler")
+    @patch("cafe.ui.cli.AgentManager")
+    @patch("cafe.ui.cli.ConfigManager")
+    @patch("cafe.ui.cli.GitOperations")
+    @patch("cafe.ui.cli.PRPhase")
+    def test_no_post_todo_list_flag_passes_false_to_pr_phase(
+        self,
+        mock_pr_phase_cls,
+        mock_git_cls,
+        mock_config_cls,
+        mock_agent_cls,
+        mock_perm_cls,
+        mock_github_ops_cls,
+        mock_subprocess_run,
+        temp_repo_dir,
+    ):
+        """Test 2.2: --no-post-todo-list フラグが PRPhase に post_todo_list=False で渡される。"""
+        mock_subprocess_run.return_value = MagicMock(returncode=0)
+        self._make_mocks(mock_git_cls, mock_config_cls, mock_agent_cls,
+                         mock_perm_cls, mock_github_ops_cls, mock_pr_phase_cls)
+
+        result = runner.invoke(app, ["pr", "--no-post-todo-list"])
+
+        assert result.exit_code == 0
+        call_kwargs = mock_pr_phase_cls.call_args[1]
+        assert call_kwargs.get("post_todo_list") is False
+
     @patch("subprocess.run")
     @patch("cafe.ui.cli.GitHubOps")
     @patch("cafe.ui.cli.PermissionHandler")

{cafe_engine-0.1.2 → cafe_engine-0.1.3}/tests/unit/test_cli_prepare.py

@@ -971,3 +971,189 @@ class TestPrepareCommandSetupMode:
         # 驗證沒有詢問 templates 或其他設定
         mock_template_list.assert_not_called()
         mock_phase_confirm.assert_not_called()
+
+
+class TestPrepareCommandPostPrTodoList:
+    """Test --post-pr-todo-list option in cafe prepare command."""
+
+    @patch("cafe.ui.phase_prompts.prompt_text")
+    @patch("cafe.ui.phase_prompts.GitHubOps")
+    @patch("cafe.ui.cli.GitHubOps")
+    @patch("cafe.ui.phase_prompts.prompt_confirm")
+    @patch("cafe.ui.cli.prompt_confirm")
+    @patch("cafe.ui.template_selector.prompt_list")
+    @patch("cafe.ui.phase_prompts.prompt_list")
+    @patch("cafe.ui.cli.prompt_list")
+    @patch("cafe.ui.cli.prompt_text")
+    def test_quick_setup_sets_post_todo_list_true(
+        self,
+        mock_prompt_text_cli,
+        mock_cli_list,
+        mock_phase_list,
+        mock_template_list,
+        mock_cli_confirm,
+        mock_phase_confirm,
+        MockGitHubOps_cli,
+        MockGitHubOps_phase,
+        mock_prompt_text_phase,
+        temp_repo_dir,
+        mock_git_ops,
+    ):
+        """Test 3.1: Quick setup モードでは pr_config.post_todo_list が True に設定される。"""
+        mock_github_ops = MagicMock()
+        MockGitHubOps_cli.return_value = mock_github_ops
+        MockGitHubOps_phase.return_value = mock_github_ops
+        mock_github_ops.extract_issue_number.return_value = "123"
+
+        mock_prompt_text_cli.return_value = "quick-setup-test"
+        mock_prompt_text_phase.return_value = "123"
+        mock_cli_confirm.return_value = False  # worktree (n)
+
+        mock_phase_list.return_value = "2. Fetch from GitHub Issue"
+        mock_cli_list.return_value = "Quick setup (use recommended defaults)"
+
+        result = runner.invoke(app, ["prepare"])
+
+        assert result.exit_code == 0
+
+        config_file = temp_repo_dir / ".cafe" / "issues" / "quick-setup-test" / "issue.yaml"
+        with open(config_file) as f:
+            config_data = yaml.safe_load(f)
+            assert config_data["pr"]["auto_create"] is True
+            assert config_data["pr"]["post_todo_list"] is True
+
+    @patch("cafe.ui.phase_prompts.prompt_text")
+    @patch("cafe.ui.phase_prompts.GitHubOps")
+    @patch("cafe.ui.cli.GitHubOps")
+    @patch("cafe.ui.phase_prompts.prompt_confirm")
+    @patch("cafe.ui.cli.prompt_confirm")
+    @patch("cafe.ui.template_selector.prompt_list")
+    @patch("cafe.ui.phase_prompts.prompt_list")
+    @patch("cafe.ui.cli.prompt_list")
+    @patch("cafe.ui.cli.prompt_text")
+    def test_custom_config_auto_create_true_prompts_post_todo_list(
+        self,
+        mock_prompt_text_cli,
+        mock_cli_list,
+        mock_phase_list,
+        mock_template_list,
+        mock_cli_confirm,
+        mock_phase_confirm,
+        MockGitHubOps_cli,
+        MockGitHubOps_phase,
+        mock_prompt_text_phase,
+        temp_repo_dir,
+        mock_git_ops,
+    ):
+        """Test 3.2: Custom 設定モードで auto_create=True の場合、post_todo_list が尋ねられる。"""
+        mock_github_ops = MagicMock()
+        MockGitHubOps_cli.return_value = mock_github_ops
+        MockGitHubOps_phase.return_value = mock_github_ops
+        mock_github_ops.extract_issue_number.return_value = "42"
+
+        mock_prompt_text_cli.return_value = "custom-auto-create"
+        mock_prompt_text_phase.return_value = "42"
+        # worktree=No, sync_spec=True, sync_plan=True, auto_create=True, post_todo_list=False
+        mock_cli_confirm.side_effect = [False, True, True, True, False]
+        mock_phase_confirm.side_effect = [True]  # auto_create prompt in phase_prompts
+
+        mock_phase_list.return_value = "2. Fetch from GitHub Issue"
+        mock_cli_list.return_value = "Custom configuration"
+        mock_template_list.return_value = "default (system default)"
+
+        result = runner.invoke(app, ["prepare"])
+
+        assert result.exit_code == 0
+
+        # post_todo_list should have been set (either True or False from prompt)
+        config_file = temp_repo_dir / ".cafe" / "issues" / "custom-auto-create" / "issue.yaml"
+        with open(config_file) as f:
+            config_data = yaml.safe_load(f)
+            # post_todo_list should be present when auto_create is True
+            assert "post_todo_list" in config_data.get("pr", {})
+
+    @patch("cafe.ui.phase_prompts.prompt_text")
+    @patch("cafe.ui.phase_prompts.GitHubOps")
+    @patch("cafe.ui.cli.GitHubOps")
+    @patch("cafe.ui.phase_prompts.prompt_confirm")
+    @patch("cafe.ui.cli.prompt_confirm")
+    @patch("cafe.ui.template_selector.prompt_list")
+    @patch("cafe.ui.phase_prompts.prompt_list")
+    @patch("cafe.ui.cli.prompt_list")
+    @patch("cafe.ui.cli.prompt_text")
+    def test_custom_config_auto_create_false_does_not_prompt_post_todo_list(
+        self,
+        mock_prompt_text_cli,
+        mock_cli_list,
+        mock_phase_list,
+        mock_template_list,
+        mock_cli_confirm,
+        mock_phase_confirm,
+        MockGitHubOps_cli,
+        MockGitHubOps_phase,
+        mock_prompt_text_phase,
+        temp_repo_dir,
+        mock_git_ops,
+    ):
+        """Test 3.3: Custom 設定モードで auto_create=False の場合、post_todo_list は尋ねられない。"""
+        mock_github_ops = MagicMock()
+        MockGitHubOps_cli.return_value = mock_github_ops
+        MockGitHubOps_phase.return_value = mock_github_ops
+        mock_github_ops.extract_issue_number.return_value = "42"
+
+        mock_prompt_text_cli.return_value = "custom-no-auto-create"
+        mock_prompt_text_phase.return_value = "42"
+        # worktree=No, sync_spec=True, sync_plan=True
+        mock_cli_confirm.side_effect = [False, True, True]
+        # auto_create prompt in phase_prompts returns False
+        mock_phase_confirm.side_effect = [False]
+
+        mock_phase_list.return_value = "2. Fetch from GitHub Issue"
+        mock_cli_list.return_value = "Custom configuration"
+        mock_template_list.return_value = "default (system default)"
+
+        result = runner.invoke(app, ["prepare"])
+
+        assert result.exit_code == 0
+
+        # post_todo_list should NOT be set when auto_create is False
+        config_file = temp_repo_dir / ".cafe" / "issues" / "custom-no-auto-create" / "issue.yaml"
+        with open(config_file) as f:
+            config_data = yaml.safe_load(f)
+            assert "post_todo_list" not in config_data.get("pr", {})
+
+    def test_non_interactive_post_pr_todo_list_flag_saves_to_config(self, temp_repo_dir, mock_git_ops):
+        """Test 3.4/3.5: --no-interactive モードで --post-pr-todo-list フラグが issue.yaml に保存される。"""
+        result = runner.invoke(app, [
+            "prepare", "noninteractive-test",
+            "--no-interactive",
+            "--input-method", "manual",
+            "--rigor", "medium",
+            "--auto-create-pr",
+            "--post-pr-todo-list",
+        ])
+
+        assert result.exit_code == 0
+
+        config_file = temp_repo_dir / ".cafe" / "issues" / "noninteractive-test" / "issue.yaml"
+        with open(config_file) as f:
+            config_data = yaml.safe_load(f)
+            assert config_data["pr"]["post_todo_list"] is True
+
+    def test_non_interactive_no_post_pr_todo_list_flag_saves_false_to_config(self, temp_repo_dir, mock_git_ops):
+        """Test 3.4b: --no-interactive モードで --no-post-pr-todo-list フラグが issue.yaml に保存される。"""
+        result = runner.invoke(app, [
+            "prepare", "noninteractive-false-test",
+            "--no-interactive",
+            "--input-method", "manual",
+            "--rigor", "medium",
+            "--auto-create-pr",
+            "--no-post-pr-todo-list",
+        ])
+
+        assert result.exit_code == 0
+
+        config_file = temp_repo_dir / ".cafe" / "issues" / "noninteractive-false-test" / "issue.yaml"
+        with open(config_file) as f:
+            config_data = yaml.safe_load(f)
+            assert config_data["pr"]["post_todo_list"] is False