x-ipe 1.0.20__tar.gz → 1.0.22__tar.gz

{x_ipe-1.0.20 → x_ipe-1.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: x-ipe
-Version: 1.0.20
+Version: 1.0.22
 Summary: X-IPE: AI-powered development framework
 License-File: LICENSE
 Requires-Python: >=3.12

{x_ipe-1.0.20 → x_ipe-1.0.22}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "x-ipe"
-version = "1.0.20"
+version = "1.0.22"
 description = "X-IPE: AI-powered development framework"
 requires-python = ">=3.12"
 dependencies = [

{x_ipe-1.0.20 → x_ipe-1.0.22}/src/x_ipe/cli/main.py

@@ -175,8 +175,13 @@ def info(ctx: click.Context) -> None:
     is_flag=True,
     help="Skip copying skills from package.",
 )
+@click.option(
+    "--no-mcp",
+    is_flag=True,
+    help="Skip MCP config merge prompt.",
+)
 @click.pass_context
-def init(ctx: click.Context, force: bool, dry_run: bool, no_skills: bool) -> None:
+def init(ctx: click.Context, force: bool, dry_run: bool, no_skills: bool, no_mcp: bool) -> None:
     """Initialize X-IPE in the current project.
     
     Creates the standard X-IPE folder structure:
@@ -199,7 +204,6 @@ def init(ctx: click.Context, force: bool, dry_run: bool, no_skills: bool) -> Non
     
     # Create folder structure
     scaffold.create_docs_structure()
-    scaffold.create_runtime_folder()
     
     # Copy skills if requested
     if not no_skills:
@@ -208,6 +212,9 @@ def init(ctx: click.Context, force: bool, dry_run: bool, no_skills: bool) -> Non
     # Copy/merge copilot-instructions.md
     scaffold.copy_copilot_instructions()
     
+    # Copy MCP config (.github/copilot/mcp-config.json)
+    scaffold.copy_mcp_config()
+    
     # Copy config files (copilot-prompt.json, tools.json, .env.example)
     scaffold.copy_config_files()
     
@@ -220,13 +227,9 @@ def init(ctx: click.Context, force: bool, dry_run: bool, no_skills: bool) -> Non
     # Create config file
     scaffold.create_config_file()
     
-    # Update .gitignore if in git repo
-    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:
+    if mcp_servers and not dry_run and not no_mcp:
         click.echo("\n" + "-" * 40)
         click.echo("MCP Server Configuration")
         click.echo("-" * 40)
@@ -393,9 +396,14 @@ def serve(ctx: click.Context, host: Optional[str], port: Optional[int],
     default=None,
     help="Upgrade only the specified skill.",
 )
+@click.option(
+    "--no-mcp",
+    is_flag=True,
+    help="Skip MCP config merge prompt.",
+)
 @click.pass_context
 def upgrade(ctx: click.Context, force: bool, dry_run: bool, 
-            backup: bool, skill: Optional[str]) -> None:
+            backup: bool, skill: Optional[str], no_mcp: bool) -> None:
     """Upgrade skills from the X-IPE package.
     
     Syncs skills from the installed X-IPE package to the local
@@ -412,76 +420,80 @@ def upgrade(ctx: click.Context, force: bool, dry_run: bool,
     
     # Check for package skills
     package_skills = skills_manager.get_package_skills()
+    has_skills = bool(package_skills)
+    
     if not package_skills:
         click.echo("No package skills available to sync.")
         click.echo("X-IPE may not be installed as a package, or skills are not bundled.")
-        return
-    
-    click.echo(f"Package skills available: {len(package_skills)}")
-    
-    # Check local skills
-    local_skills = skills_manager.get_local_skills()
-    modified = skills_manager.detect_modifications()
+    else:
+        click.echo(f"Package skills available: {len(package_skills)}")
     
-    if local_skills:
-        click.echo(f"Local skills: {len(local_skills)}")
-        if modified:
-            click.echo(f"Modified skills: {len(modified)}")
-    
-    # Filter by specific skill if requested
-    if skill:
-        package_skills = [s for s in package_skills if s.name == skill]
-        if not package_skills:
-            click.echo(f"\nError: Skill '{skill}' not found in package.")
-            raise click.Abort()
-        click.echo(f"\nUpgrading skill: {skill}")
-    
-    # Check for modifications that would be overwritten
-    skills_to_warn = []
-    if not force:
-        for pkg_skill in package_skills:
-            local_skill = skills_manager.get_skill_info(pkg_skill.name)
-            if local_skill and local_skill.source == "local" and local_skill.modified:
-                skills_to_warn.append(local_skill)
-    
-    if skills_to_warn:
-        click.echo(f"\nThe following skills have local modifications:")
-        for s in skills_to_warn:
-            click.echo(f"  ⚠ {s.name}")
+    # Only process skills if package skills are available
+    if has_skills:
+        # Check local skills
+        local_skills = skills_manager.get_local_skills()
+        modified = skills_manager.detect_modifications()
+        
+        if local_skills:
+            click.echo(f"Local skills: {len(local_skills)}")
+            if modified:
+                click.echo(f"Modified skills: {len(modified)}")
+        
+        # Filter by specific skill if requested
+        if skill:
+            package_skills = [s for s in package_skills if s.name == skill]
+            if not package_skills:
+                click.echo(f"\nError: Skill '{skill}' not found in package.")
+                raise click.Abort()
+            click.echo(f"\nUpgrading skill: {skill}")
+        
+        # Check for modifications that would be overwritten
+        skills_to_warn = []
+        if not force:
+            for pkg_skill in package_skills:
+                local_skill = skills_manager.get_skill_info(pkg_skill.name)
+                if local_skill and local_skill.source == "local" and local_skill.modified:
+                    skills_to_warn.append(local_skill)
+        
+        if skills_to_warn:
+            click.echo(f"\nThe following skills have local modifications:")
+            for s in skills_to_warn:
+                click.echo(f"  ⚠ {s.name}")
+            
+            if not dry_run:
+                if not force:
+                    if not click.confirm("\nOverwrite modified skills?"):
+                        click.echo("Aborted.")
+                        # Continue to MCP config section
         
         if not dry_run:
-            if not force:
-                if not click.confirm("\nOverwrite modified skills?"):
-                    click.echo("Aborted.")
-                    return
-    
-    if dry_run:
-        click.echo("\nDry run - would sync:")
-        for pkg_skill in package_skills:
-            click.echo(f"  → {pkg_skill.name}")
-        click.echo("\nRun without --dry-run to apply changes.")
-        return
-    
-    # Perform the sync
-    synced = skills_manager.sync_from_package(
-        skill_name=skill,
-        backup=backup
-    )
-    
-    if synced:
-        click.echo(f"\n✓ Synced {len(synced)} skill(s):")
-        for name in synced:
-            click.echo(f"  ✓ {name}")
-    else:
-        click.echo("\nNo skills were synced.")
-    
-    if backup and skills_to_warn:
-        click.echo(f"\nBackups created in: {project_root / '.x-ipe' / 'backups'}")
+            # Perform the sync
+            synced = skills_manager.sync_from_package(
+                skill_name=skill,
+                backup=backup
+            )
+            
+            if synced:
+                click.echo(f"\n✓ Synced {len(synced)} skill(s):")
+                for name in synced:
+                    click.echo(f"  ✓ {name}")
+            else:
+                click.echo("\nNo skills were synced.")
+            
+            if backup and skills_to_warn:
+                click.echo(f"\nBackups created in: {project_root / '.x-ipe' / 'backups'}")
+        else:
+            click.echo("\nDry run - would sync:")
+            for pkg_skill in package_skills:
+                click.echo(f"  → {pkg_skill.name}")
+    
+    # Copy/update MCP config from package, then merge to global
+    scaffold = ScaffoldManager(project_root, dry_run=dry_run, force=force)
+    scaffold.copy_mcp_config()
     
     # MCP config merge with user confirmation
-    scaffold = ScaffoldManager(project_root, dry_run=dry_run, force=force)
     mcp_servers = scaffold.get_project_mcp_servers()
-    if mcp_servers and not dry_run:
+    if mcp_servers and not dry_run and not no_mcp:
         click.echo("\n" + "-" * 40)
         click.echo("MCP Server Configuration")
         click.echo("-" * 40)

{x_ipe-1.0.20 → x_ipe-1.0.22}/src/x_ipe/core/scaffold.py

@@ -12,17 +12,12 @@ class ScaffoldManager:
     DOCS_STRUCTURE = [
         "x-ipe-docs/requirements",
         "x-ipe-docs/planning",
-        "x-ipe-docs/features",
         "x-ipe-docs/ideas",
         "x-ipe-docs/config",
         "x-ipe-docs/themes",
     ]
     
-    GITIGNORE_ENTRIES = [
-        "# X-IPE Runtime (managed by x-ipe)",
-        ".x-ipe/",
-        "",
-    ]
+    GITIGNORE_ENTRIES: list = []  # No X-IPE specific gitignore entries needed
     
     def __init__(self, project_root: Path, dry_run: bool = False, force: bool = False):
         """Initialize ScaffoldManager.
@@ -145,6 +140,28 @@ class ScaffoldManager:
             shutil.copy2(source, target)
         self.created.append(target)
     
+    def copy_mcp_config(self) -> None:
+        """Copy mcp-config.json to .github/copilot/."""
+        source = self._get_resource_path("copilot")
+        if source is None or not source.exists():
+            return
+        
+        source_file = source / "mcp-config.json"
+        if not source_file.exists():
+            return
+        
+        target = self.project_root / ".github" / "copilot" / "mcp-config.json"
+        
+        if target.exists():
+            if not self.force:
+                self.skipped.append(target)
+                return
+        
+        if not self.dry_run:
+            target.parent.mkdir(parents=True, exist_ok=True)
+            shutil.copy2(source_file, target)
+        self.created.append(target)
+    
     def get_project_mcp_servers(self) -> dict:
         """Get MCP servers from project's .github/copilot/mcp-config.json.
         
@@ -366,11 +383,12 @@ server:
             return
         
         # Append X-IPE entries
-        if not content.endswith("\n"):
-            content += "\n"
-        content += "\n".join(self.GITIGNORE_ENTRIES)
-        gitignore_path.write_text(content)
-        self.created.append(gitignore_path)
+        if self.GITIGNORE_ENTRIES:
+            if not content.endswith("\n"):
+                content += "\n"
+            content += "\n".join(self.GITIGNORE_ENTRIES)
+            gitignore_path.write_text(content)
+            self.created.append(gitignore_path)
     
     def scaffold_all(self) -> Tuple[List[Path], List[Path]]:
         """Run all scaffolding operations.
@@ -379,14 +397,13 @@ server:
             Tuple of (created_paths, skipped_paths).
         """
         self.create_docs_structure()
-        self.create_runtime_folder()
         self.copy_skills()
         self.copy_copilot_instructions()
+        self.copy_mcp_config()
         self.copy_config_files()
         self.copy_planning_templates()
         self.copy_themes()
         self.create_config_file()
-        self.update_gitignore()
         self.merge_mcp_config()
         return self.get_summary()
     

x_ipe-1.0.22/src/x_ipe/resources/copilot/mcp-config.json

@@ -0,0 +1,15 @@
+{
+  "mcpServers": {
+    "chrome-devtools": {
+      "type": "local",
+      "command": "npx",
+      "tools": [
+        "*"
+      ],
+      "args": [
+        "-y",
+        "chrome-devtools-mcp@latest"
+      ]
+    }
+  }
+}

{x_ipe-1.0.20 → x_ipe-1.0.22}/tests/test_cli.py

@@ -192,31 +192,32 @@ class TestInitCommand:
     def test_init_creates_docs_folder(self, runner, temp_project):
         """Init creates x-ipe-docs/ folder."""
         from src.x_ipe.cli.main import cli
-        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills"])
+        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills", "--no-mcp"])
         assert result.exit_code == 0
         assert (temp_project / "x-ipe-docs").exists()
     
     def test_init_creates_docs_subfolders(self, runner, temp_project):
         """Init creates x-ipe-docs/ideas, x-ipe-docs/planning, x-ipe-docs/requirements."""
         from src.x_ipe.cli.main import cli
-        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills"])
+        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills", "--no-mcp"])
         assert result.exit_code == 0
         assert (temp_project / "x-ipe-docs" / "planning").exists()
         assert (temp_project / "x-ipe-docs" / "requirements").exists()
     
     def test_init_creates_runtime_folder(self, runner, temp_project):
-        """Init creates .x-ipe/ hidden folder."""
+        """Init does not create .x-ipe/ folder (removed from init)."""
         from src.x_ipe.cli.main import cli
-        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills"])
+        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills", "--no-mcp"])
         assert result.exit_code == 0
-        assert (temp_project / ".x-ipe").exists()
+        # .x-ipe folder is no longer created by init
+        assert not (temp_project / ".x-ipe").exists()
     
     def test_init_creates_github_skills(self, runner, temp_project):
         """Init creates .github/skills/ folder."""
         from src.x_ipe.cli.main import cli
         # Note: Without package skills set up, this may not create skills
         # Just test the command runs without error
-        result = runner.invoke(cli, ["-p", str(temp_project), "init"])
+        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-mcp"])
         assert result.exit_code == 0
     
     def test_init_creates_copilot_instructions(self, runner, temp_project):
@@ -227,7 +228,7 @@ class TestInitCommand:
     def test_init_creates_config_file(self, runner, temp_project):
         """Init creates .x-ipe.yaml config file."""
         from src.x_ipe.cli.main import cli
-        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills"])
+        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills", "--no-mcp"])
         assert result.exit_code == 0
         assert (temp_project / ".x-ipe.yaml").exists()
     
@@ -235,24 +236,25 @@ class TestInitCommand:
         """Init creates valid YAML config."""
         import yaml
         from src.x_ipe.cli.main import cli
-        runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills"])
+        runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills", "--no-mcp"])
         config = yaml.safe_load((temp_project / ".x-ipe.yaml").read_text())
         assert config["version"] == 1
         assert "paths" in config
     
     def test_init_updates_gitignore_in_git_repo(self, runner, git_project):
-        """Init updates .gitignore in git repository."""
+        """Init does not update .gitignore (no X-IPE specific entries)."""
         from src.x_ipe.cli.main import cli
-        result = runner.invoke(cli, ["-p", str(git_project), "init", "--no-skills"])
+        result = runner.invoke(cli, ["-p", str(git_project), "init", "--no-skills", "--no-mcp"])
         assert result.exit_code == 0
         gitignore = git_project / ".gitignore"
         assert gitignore.exists()
-        assert ".x-ipe/" in gitignore.read_text()
+        # .gitignore should be unchanged (no X-IPE entries added)
+        assert "node_modules/" in gitignore.read_text()
     
     def test_init_skips_gitignore_without_git(self, runner, temp_project):
         """Init does not create .gitignore without git."""
         from src.x_ipe.cli.main import cli
-        runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills"])
+        runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills", "--no-mcp"])
         # If .gitignore was not there before and not created, test passes
         # Or if it's empty/minimal, test passes
         if (temp_project / ".gitignore").exists():
@@ -267,7 +269,7 @@ class TestInitCommand:
         (temp_project / "x-ipe-docs").mkdir()
         (temp_project / ".x-ipe.yaml").write_text("version: 1\n")
         
-        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills"])
+        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills", "--no-mcp"])
         assert result.exit_code == 0
         assert "Skipped" in result.output
     
@@ -277,7 +279,7 @@ class TestInitCommand:
         # Create existing config with custom content
         (temp_project / ".x-ipe.yaml").write_text("version: 1\ncustom: true\n")
         
-        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills", "-f"])
+        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills", "--no-mcp", "-f"])
         assert result.exit_code == 0
         # Config should be overwritten
         content = (temp_project / ".x-ipe.yaml").read_text()
@@ -286,7 +288,7 @@ class TestInitCommand:
     def test_init_dry_run_shows_preview(self, runner, temp_project):
         """Init --dry-run shows changes without writing."""
         from src.x_ipe.cli.main import cli
-        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills", "--dry-run"])
+        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills", "--no-mcp", "--dry-run"])
         assert result.exit_code == 0
         assert "Dry run" in result.output
         # Files should NOT be created
@@ -295,7 +297,7 @@ class TestInitCommand:
     def test_init_shows_summary(self, runner, temp_project):
         """Init shows summary of created items."""
         from src.x_ipe.cli.main import cli
-        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills"])
+        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-skills", "--no-mcp"])
         assert result.exit_code == 0
         assert "Created:" in result.output or "✓" in result.output
     
@@ -306,7 +308,7 @@ class TestInitCommand:
         (temp_project / ".github").mkdir()
         (temp_project / ".github" / "FUNDING.yml").write_text("github: [user]")
         
-        result = runner.invoke(cli, ["-p", str(temp_project), "init"])
+        result = runner.invoke(cli, ["-p", str(temp_project), "init", "--no-mcp"])
         assert result.exit_code == 0
         # Existing file should still be there
         assert (temp_project / ".github" / "FUNDING.yml").exists()
@@ -505,7 +507,8 @@ class TestUpgradeCommand:
     def test_upgrade_without_init_shows_error(self, runner, temp_project):
         """Upgrade in non-initialized project works with warning."""
         from src.x_ipe.cli.main import cli
-        result = runner.invoke(cli, ["-p", str(temp_project), "upgrade"])
+        # Use --no-mcp to avoid interactive prompt
+        result = runner.invoke(cli, ["-p", str(temp_project), "upgrade", "--no-mcp"])
         # Should complete (may show no skills available)
         assert result.exit_code == 0
 
@@ -806,7 +809,7 @@ class TestScaffoldModule:
         assert config_path in created
     
     def test_scaffold_updates_gitignore(self, git_project):
-        """ScaffoldManager updates .gitignore."""
+        """ScaffoldManager update_gitignore is a no-op (no X-IPE entries needed)."""
         from src.x_ipe.core.scaffold import ScaffoldManager
         
         scaffold = ScaffoldManager(git_project)
@@ -815,7 +818,8 @@ class TestScaffoldModule:
         gitignore = git_project / ".gitignore"
         assert gitignore.exists()
         content = gitignore.read_text()
-        assert ".x-ipe/" in content
+        # No X-IPE entries should be added (GITIGNORE_ENTRIES is empty)
+        assert "node_modules/" in content  # Original content preserved
 
 
 # =============================================================================

{x_ipe-1.0.20 → x_ipe-1.0.22}/uv.lock

@@ -1349,7 +1349,7 @@ wheels = [
 
 [[package]]
 name = "x-ipe"
-version = "1.0.19"
+version = "1.0.21"
 source = { editable = "." }
 dependencies = [
     { name = "beautifulsoup4" },