x-ipe 1.0.17__py3-none-any.whl → 1.0.18__py3-none-any.whl

x_ipe/cli/main.py

@@ -211,6 +211,9 @@ def init(ctx: click.Context, force: bool, dry_run: bool, no_skills: bool) -> Non
     # Copy config files (copilot-prompt.json, tools.json, .env.example)
     scaffold.copy_config_files()
     
+    # Copy planning templates (features.md, task-board.md)
+    scaffold.copy_planning_templates()
+    
     # Create config file
     scaffold.create_config_file()
     
@@ -218,6 +221,39 @@ def init(ctx: click.Context, force: bool, dry_run: bool, no_skills: bool) -> Non
     if (project_root / ".git").exists():
         scaffold.update_gitignore()
     
+    # MCP config merge with user confirmation
+    mcp_servers = scaffold.get_project_mcp_servers()
+    if mcp_servers and not dry_run:
+        click.echo("\n" + "-" * 40)
+        click.echo("MCP Server Configuration")
+        click.echo("-" * 40)
+        
+        # Show available servers
+        click.echo(f"\nFound {len(mcp_servers)} MCP server(s) in project config:")
+        for name in mcp_servers:
+            click.echo(f"  • {name}")
+        
+        # Confirm each server
+        servers_to_merge = []
+        for name in mcp_servers:
+            if click.confirm(f"\nAdd '{name}' to global MCP config?", default=True):
+                servers_to_merge.append(name)
+        
+        if servers_to_merge:
+            # Confirm target path
+            default_path = Path.home() / ".copilot" / "mcp-config.json"
+            target_path = click.prompt(
+                "\nTarget MCP config path",
+                default=str(default_path),
+                type=click.Path(dir_okay=False, path_type=Path)
+            )
+            
+            scaffold.merge_mcp_config(
+                servers_to_merge=servers_to_merge,
+                target_path=target_path
+            )
+            click.echo(f"\n✓ Merged {len(servers_to_merge)} MCP server(s) to {target_path}")
+    
     # Show summary
     created, skipped = scaffold.get_summary()
     

x_ipe/core/scaffold.py

@@ -3,6 +3,7 @@ from pathlib import Path
 from typing import List, Tuple, Optional
 import shutil
 import os
+import json
 
 
 class ScaffoldManager:
@@ -143,6 +144,90 @@ class ScaffoldManager:
             shutil.copy2(source, target)
         self.created.append(target)
     
+    def get_project_mcp_servers(self) -> dict:
+        """Get MCP servers from project's .github/copilot/mcp-config.json.
+        
+        Returns:
+            Dict of server_name -> server_config, or empty dict if not found.
+        """
+        project_mcp = self.project_root / ".github" / "copilot" / "mcp-config.json"
+        if not project_mcp.exists():
+            return {}
+        
+        try:
+            project_config = json.loads(project_mcp.read_text())
+            return project_config.get("mcpServers", {})
+        except (json.JSONDecodeError, IOError):
+            return {}
+    
+    def merge_mcp_config(
+        self,
+        servers_to_merge: Optional[List[str]] = None,
+        target_path: Optional[Path] = None
+    ) -> None:
+        """Merge project's MCP servers into global config.
+        
+        Args:
+            servers_to_merge: List of server names to merge. If None, merges all.
+            target_path: Path to target mcp-config.json. Defaults to ~/.copilot/mcp-config.json.
+        
+        This allows project-specific MCP servers to be available globally.
+        Deep-merges mcpServers objects, with project servers added to global config.
+        Existing global servers are preserved unless --force is used for conflicts.
+        """
+        project_servers = self.get_project_mcp_servers()
+        if not project_servers:
+            return
+        
+        # Filter to requested servers if specified
+        if servers_to_merge is not None:
+            project_servers = {k: v for k, v in project_servers.items() if k in servers_to_merge}
+            if not project_servers:
+                return
+        
+        # Target: configurable or default to ~/.copilot/mcp-config.json
+        if target_path is None:
+            global_copilot_dir = Path.home() / ".copilot"
+            global_mcp = global_copilot_dir / "mcp-config.json"
+        else:
+            global_mcp = Path(target_path)
+            global_copilot_dir = global_mcp.parent
+        
+        if self.dry_run:
+            self.created.append(global_mcp)
+            return
+        
+        # Load or create global config
+        global_config = {"mcpServers": {}}
+        if global_mcp.exists():
+            try:
+                global_config = json.loads(global_mcp.read_text())
+                if "mcpServers" not in global_config:
+                    global_config["mcpServers"] = {}
+            except (json.JSONDecodeError, IOError):
+                global_config = {"mcpServers": {}}
+        
+        # Merge: add project servers to global
+        merged_count = 0
+        skipped_count = 0
+        for server_name, server_config in project_servers.items():
+            if server_name in global_config["mcpServers"]:
+                if self.force:
+                    global_config["mcpServers"][server_name] = server_config
+                    merged_count += 1
+                else:
+                    skipped_count += 1
+            else:
+                global_config["mcpServers"][server_name] = server_config
+                merged_count += 1
+        
+        if merged_count > 0:
+            global_copilot_dir.mkdir(parents=True, exist_ok=True)
+            global_mcp.write_text(json.dumps(global_config, indent=2) + "\n")
+            self.created.append(global_mcp)
+        elif skipped_count > 0:
+            self.skipped.append(global_mcp)
+    
     def copy_config_files(self) -> None:
         """Copy config files (copilot-prompt.json, tools.json, .env.example) to x-ipe-docs/config/."""
         config_source = self._get_resource_path("config")
@@ -170,6 +255,33 @@ class ScaffoldManager:
                 shutil.copy2(source_file, target_file)
             self.created.append(target_file)
     
+    def copy_planning_templates(self) -> None:
+        """Copy planning templates (features.md, task-board.md) to x-ipe-docs/planning/."""
+        planning_source = self._get_resource_path("planning")
+        if planning_source is None or not planning_source.exists():
+            return
+        
+        target_dir = self.project_root / "x-ipe-docs" / "planning"
+        
+        # Copy each planning file individually (don't overwrite existing)
+        planning_files = ["features.md", "task-board.md"]
+        for filename in planning_files:
+            source_file = planning_source / filename
+            target_file = target_dir / filename
+            
+            if not source_file.exists():
+                continue
+                
+            if target_file.exists():
+                if not self.force:
+                    self.skipped.append(target_file)
+                    continue
+            
+            if not self.dry_run:
+                target_dir.mkdir(parents=True, exist_ok=True)
+                shutil.copy2(source_file, target_file)
+            self.created.append(target_file)
+    
     def create_config_file(self, config_content: Optional[str] = None) -> None:
         """Create .x-ipe.yaml with defaults.
         
@@ -243,8 +355,10 @@ server:
         self.copy_skills()
         self.copy_copilot_instructions()
         self.copy_config_files()
+        self.copy_planning_templates()
         self.create_config_file()
         self.update_gitignore()
+        self.merge_mcp_config()
         return self.get_summary()
     
     def get_summary(self) -> Tuple[List[Path], List[Path]]:

x_ipe/resources/planning/features.md

@@ -0,0 +1,53 @@
+# Feature Board
+
+> Last Updated: {DATE}
+
+## Overview
+
+This board tracks all features across the project lifecycle.
+
+**Status Definitions:**
+- **Planned** - Feature identified, awaiting refinement
+- **Refined** - Specification complete, ready for design
+- **Designed** - Technical design complete, ready for implementation
+- **Implemented** - Code complete, ready for testing
+- **Tested** - Tests complete, ready for deployment
+- **Completed** - Feature fully deployed and verified
+
+---
+
+## Feature Tracking
+
+| Feature ID | Feature Title | Version | Status | Specification Link | Created | Last Updated |
+|------------|---------------|---------|--------|-------------------|---------|--------------|
+| _No features yet_ | | | | | | |
+
+---
+
+## Status Details
+
+### Planned (0)
+- None
+
+### Refined (0)
+- None
+
+### Designed (0)
+- None
+
+### Implemented (0)
+- None
+
+### Tested (0)
+- None
+
+### Completed (0)
+- None
+
+---
+
+## Feature Details
+
+_Features will appear here after creation_
+
+---

x_ipe/resources/planning/task-board.md

@@ -0,0 +1,77 @@
+# Task Board
+
+> Task Board Management - Task Tracking
+
+## Global Settings
+
+```yaml
+auto_proceed: false  # Set to true for automatic task chaining
+```
+
+---
+
+## Active Tasks
+
+| Task ID | Task Type | Description | Role | Status | Last Updated | Output Links | Next Task |
+|---------|-----------|-------------|------|--------|--------------|--------------|----------|
+| | | | | | | | |
+
+---
+
+## Completed Tasks
+
+| Task ID | Task Type | Description | Role | Last Updated | Output Links | Notes |
+|---------|-----------|-------------|------|--------------|--------------|-------|
+| | | | | | | |
+
+---
+
+## Cancelled Tasks
+
+| Task ID | Task Type | Description | Reason | Last Updated | Output Links |
+|---------|-----------|-------------|--------|--------------|--------------|
+| | | | | | |
+
+---
+
+## Status Legend
+
+| Status | Symbol | Description |
+|--------|--------|-------------|
+| pending | ⏳ | Waiting to start |
+| in_progress | 🔄 | Working |
+| blocked | 🚫 | Waiting for dependency |
+| deferred | ⏸️ | Paused by human |
+| completed | ✅ | Done |
+| cancelled | ❌ | Stopped |
+
+---
+
+## Task Type Quick Reference
+
+| Task Type | Skill | Default Next |
+|-----------|-------|--------------|
+| Requirement Gathering | task-type-requirement-gathering | Feature Breakdown |
+| Feature Breakdown | task-type-feature-breakdown | Technical Design |
+| Technical Design | task-type-technical-design | Test Generation |
+| Test Generation | task-type-test-generation | Code Implementation |
+| Code Implementation | task-type-code-implementation | Human Playground |
+| Human Playground | task-type-human-playground | Feature Closing |
+| Feature Closing | task-type-feature-closing | - |
+| Code Refactor | task-type-code-refactor | - |
+| Project Initialization | task-type-project-init | Dev Environment Setup |
+| Dev Environment Setup | task-type-dev-environment | - |
+
+---
+
+## Quick Stats
+
+- **Total Active:** 0
+- **In Progress:** 0
+- **Pending:** 0
+- **Pending Review:** 0
+- **Blocked:** 0
+- **Deferred:** 0
+- **Completed:** 0
+
+---