minder-cli 0.4.1__tar.gz → 0.4.2__tar.gz

{minder_cli-0.4.1 → minder_cli-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minder-cli
-Version: 0.4.1
+Version: 0.4.2
 Summary: Minder CLI is the command-line interface for the Minder self-hosted MCP platform.
 Project-URL: Homepage, https://github.com/hiimtrung/minder
 Project-URL: Repository, https://github.com/hiimtrung/minder

{minder_cli-0.4.1 → minder_cli-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "minder-cli"
-version = "0.4.1"
+version = "0.4.2"
 description = "Minder CLI is the command-line interface for the Minder self-hosted MCP platform."
 readme = "README.md"
 requires-python = ">=3.14"

{minder_cli-0.4.1 → minder_cli-0.4.2}/src/minder/presentation/cli/commands/agent.py

@@ -7,6 +7,7 @@ from ..utils.common import (
     upsert_managed_block,
     remove_managed_block,
     wrap_managed_block,
+    marker_pair,
 )
 from ..utils.version import installed_package_version
 
@@ -15,6 +16,11 @@ _ANTIGRAVITY_FRONT_MATTER = """---
 description: Minder is your agentic engineering copilot for repo-aware development, workflow governance, and persistent session continuity.
 ---"""
 
+_CLAUDE_CODE_FRONT_MATTER = """---
+name: minder
+description: Minder is your agentic engineering copilot for repo-aware development, workflow governance, and persistent session continuity.
+---"""
+
 MINDER_AGENT_PROMPT = """# Minder Agent Orchestration Rules
 
 You are an expert AI software engineer equipped with **Minder**, an agentic development infrastructure. Your goal is to provide deep, grounded assistance by orchestrating Minder's tools effectively.
@@ -93,27 +99,48 @@ When implementing a feature or fix:
 
 def _agent_instruction_path(target: str, cwd: Path) -> Path | None:
     if target == "vscode":
-        return cwd / ".github" / "copilot-instructions.md"
+        return Path.home() / ".copilot" / "agents" / "minder.agent.md"
     if target == "cursor":
-        return cwd / ".cursor" / "rules" / "minder.mdc"
+        return cwd / "AGENTS.md"
     if target == "claude-code":
-        return cwd / "CLAUDE.md"
+        return Path.home() / ".claude" / "agents" / "minder.md"
     if target == "antigravity":
-        return cwd / ".agents" / "workflows" / "minder.md"
+        return cwd / ".gemini" / "antigravity" / "global_workflows" / "minder.md"
     if target == "codex":
         return Path.home() / ".codex" / "AGENTS.md"
     return None
 
 
-def _upsert_antigravity_workflow(path: Path, body: str) -> None:
+def _get_installed_version(path: Path) -> str | None:
+    """Extract the minder version embedded in an installed agent managed block."""
+    if not path.is_file():
+        return None
+    content = path.read_text(encoding="utf-8")
+    start, _ = marker_pair(path, _AGENT_INSTRUCTIONS_KEY)
+    if start not in content:
+        return None
+    _, after = content.split(start, 1)
+    first_line = after.lstrip("\n").split("\n")[0].strip()
+    prefix = "<!-- minder-agent-version:"
+    suffix = "-->"
+    if first_line.startswith(prefix) and first_line.endswith(suffix):
+        return first_line[len(prefix):-len(suffix)].strip()
+    return None
+
+
+def _agent_body_with_version(body: str, version: str) -> str:
+    return f"<!-- minder-agent-version: {version} -->\n{body}"
+
+
+def _upsert_with_front_matter(path: Path, front_matter: str, body: str) -> None:
     # Migrate away legacy layout where managed marker was the first line.
     remove_managed_block(path, _AGENT_INSTRUCTIONS_KEY)
     existing = path.read_text(encoding="utf-8") if path.is_file() else ""
     tail = existing
-    if tail.startswith(_ANTIGRAVITY_FRONT_MATTER):
-        tail = tail[len(_ANTIGRAVITY_FRONT_MATTER):].lstrip("\n")
+    if tail.startswith(front_matter):
+        tail = tail[len(front_matter):].lstrip("\n")
     managed = wrap_managed_block(path, _AGENT_INSTRUCTIONS_KEY, body).rstrip("\n")
-    updated = f"{_ANTIGRAVITY_FRONT_MATTER}\n\n{managed}"
+    updated = f"{front_matter}\n\n{managed}"
     tail = tail.strip("\n")
     if tail:
         updated = f"{updated}\n\n{tail}"
@@ -121,67 +148,105 @@ def _upsert_antigravity_workflow(path: Path, body: str) -> None:
     path.write_text(updated + "\n", encoding="utf-8")
 
 
-def _cleanup_antigravity_front_matter(path: Path) -> None:
+def _cleanup_front_matter(path: Path, front_matter: str) -> None:
     if not path.is_file():
         return
     content = path.read_text(encoding="utf-8")
-    if not content.startswith(_ANTIGRAVITY_FRONT_MATTER):
+    if not content.startswith(front_matter):
         return
-    tail = content[len(_ANTIGRAVITY_FRONT_MATTER):].lstrip("\n")
+    tail = content[len(front_matter):].lstrip("\n")
     if tail:
         path.write_text(tail, encoding="utf-8")
     else:
         path.unlink(missing_ok=True)
 
+
+def _display_path(path: Path, cwd: Path) -> str:
+    try:
+        return str(path.relative_to(cwd))
+    except ValueError:
+        return str(path)
+
 def install_agent_command(args: argparse.Namespace) -> int:
     cwd = Path(args.cwd).resolve()
     targets = args.target or ["all"]
     if "all" in targets:
         targets = ["vscode", "cursor", "claude-code", "antigravity", "codex"]
-        
+
     version = installed_package_version() or "unknown"
-    installed_paths = []
+    installed_list: list[tuple[Path, str | None]] = []
+    skipped_list: list[tuple[Path, str]] = []
+
     for target in targets:
         path = _agent_instruction_path(target, cwd)
-        if path:
-            path.parent.mkdir(parents=True, exist_ok=True)
-            body = MINDER_AGENT_PROMPT
-            if target == "antigravity":
-                _upsert_antigravity_workflow(path, body)
-                installed_paths.append(path)
-                continue
-            if target == "codex":
-                # Prefix with version as requested
-                body = f"# Minder Agent (v{version})\n\n" + body
-                
-            upsert_managed_block(
-                path,
-                _AGENT_INSTRUCTIONS_KEY,
-                body,
-            )
-            installed_paths.append(path)
-            
-    if not installed_paths:
+        if not path:
+            continue
+
+        existing_version = _get_installed_version(path)
+        if existing_version == version:
+            skipped_list.append((path, version))
+            continue
+
+        path.parent.mkdir(parents=True, exist_ok=True)
+        body = _agent_body_with_version(MINDER_AGENT_PROMPT, version)
+
+        if target == "antigravity":
+            _upsert_with_front_matter(path, _ANTIGRAVITY_FRONT_MATTER, body)
+        elif target == "claude-code":
+            _upsert_with_front_matter(path, _CLAUDE_CODE_FRONT_MATTER, body)
+        else:
+            upsert_managed_block(path, _AGENT_INSTRUCTIONS_KEY, body)
+
+        installed_list.append((path, existing_version))
+
+    if not installed_list and not skipped_list:
         print("No valid targets found for agent installation.")
         return 1
-        
-    print(f"Installed sophisticated Minder Agent rules in {len(installed_paths)} location(s).")
-    for p in installed_paths:
-        print(f"  - {p.relative_to(cwd) if p.is_relative_to(cwd) else p}")
+
+    for path, old_ver in installed_list:
+        display = _display_path(path, cwd)
+        if old_ver:
+            print(f"  Updated {display} (v{old_ver} → v{version})")
+        else:
+            print(f"  Installed {display} (v{version})")
+
+    for path, ver in skipped_list:
+        print(f"  Already up to date: {_display_path(path, cwd)} (v{ver})")
+
+    if installed_list:
+        print(f"Minder Agent rules installed/updated in {len(installed_list)} location(s).")
+    else:
+        print(f"All {len(skipped_list)} agent file(s) already up to date (v{version}).")
+
     return 0
 
+
 def uninstall_agent_command(args: argparse.Namespace) -> int:
     cwd = Path(args.cwd).resolve()
     targets = args.target or ["all"]
     if "all" in targets:
         targets = ["vscode", "cursor", "claude-code", "antigravity", "codex"]
-        
+
+    removed: list[Path] = []
     for target in targets:
         path = _agent_instruction_path(target, cwd)
-        if path:
-            remove_managed_block(path, _AGENT_INSTRUCTIONS_KEY)
-            if target == "antigravity":
-                _cleanup_antigravity_front_matter(path)
-            
-    print(f"Removed Minder Agent rules from {cwd}")
+        if not path:
+            continue
+        removed_block = remove_managed_block(path, _AGENT_INSTRUCTIONS_KEY)
+        if target == "antigravity":
+            _cleanup_front_matter(path, _ANTIGRAVITY_FRONT_MATTER)
+        elif target == "claude-code":
+            _cleanup_front_matter(path, _CLAUDE_CODE_FRONT_MATTER)
+        if removed_block:
+            removed.append(path)
+
+    if removed:
+        print(f"Removed Minder Agent rules from {len(removed)} location(s).")
+        for p in removed:
+            print(f"  - {_display_path(p, cwd)}")
+    else:
+        print("No Minder Agent rules found to remove.")
     return 0
+
+
+remove_agent_command = uninstall_agent_command

{minder_cli-0.4.1 → minder_cli-0.4.2}/src/minder/presentation/cli/commands/mcp.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import argparse
 import platform
+import re
 from pathlib import Path
 from typing import Any
 
@@ -15,6 +16,11 @@ from ..utils.common import (
 from ..utils.config import require_client_settings
 
 _LOCAL_MCP_TARGETS = ("vscode", "cursor", "claude-code", "antigravity")
+_ALL_MCP_TARGETS = (*_LOCAL_MCP_TARGETS, "codex")
+
+# Matches [mcp_servers.minder] and all its key/value lines up to the next
+# section header or end of file. [^\[] also matches newlines in Python.
+_CODEX_SECTION_RE = re.compile(r"^\[mcp_servers\.minder\][^\[]*", re.MULTILINE)
 
 
 def _global_target_path(target: str) -> Path:
@@ -39,9 +45,49 @@ def _global_target_path(target: str) -> Path:
         return Path.home() / ".config" / "Claude" / "claude_desktop_config.json"
     if target == "antigravity":
         return Path.home() / ".gemini" / "antigravity" / "mcp_config.json"
+    if target == "codex":
+        return Path.home() / ".codex" / "config.toml"
     raise ValueError(f"Unknown global target: {target}")
 
 
+def _codex_mcp_section(url: str, client_key: str) -> str:
+    return (
+        "[mcp_servers.minder]\n"
+        f'url = "{url}"\n'
+        f'http_headers = {{ "X-Minder-Client-Key" = "{client_key}" }}\n'
+    )
+
+
+def _install_codex_mcp(url: str, client_key: str) -> None:
+    path = _global_target_path("codex")
+    new_section = _codex_mcp_section(url, client_key)
+    existing = path.read_text(encoding="utf-8") if path.is_file() else ""
+    if _CODEX_SECTION_RE.search(existing):
+        updated = _CODEX_SECTION_RE.sub(new_section, existing)
+    else:
+        updated = existing.rstrip("\n")
+        if updated:
+            updated += "\n\n"
+        updated += new_section
+    path.parent.mkdir(parents=True, exist_ok=True)
+    path.write_text(updated, encoding="utf-8")
+
+
+def _uninstall_codex_mcp() -> bool:
+    path = _global_target_path("codex")
+    if not path.is_file():
+        return False
+    existing = path.read_text(encoding="utf-8")
+    if not _CODEX_SECTION_RE.search(existing):
+        return False
+    updated = _CODEX_SECTION_RE.sub("", existing).strip("\n")
+    if updated:
+        path.write_text(updated + "\n", encoding="utf-8")
+    else:
+        path.unlink(missing_ok=True)
+    return True
+
+
 def local_target_path(target: str, cwd: Path) -> Path:
     if target == "vscode":
         return cwd / ".vscode" / "mcp.json"
@@ -101,14 +147,25 @@ def _target_entry(
 def install_mcp_command(args: argparse.Namespace) -> int:
     config_path = Path(args.config_path).expanduser().resolve()
     settings = require_client_settings(config_path)
-    
+
     targets = args.target or ["all"]
     if "all" in targets:
-        targets = list(_LOCAL_MCP_TARGETS)
-        
+        targets = list(_ALL_MCP_TARGETS)
+
     cwd = Path(args.cwd).resolve()
-    
+
     for target in targets:
+        if target == "codex":
+            try:
+                _install_codex_mcp(
+                    sse_url(settings.get("server_url") or ""),
+                    settings["client_api_key"],
+                )
+                print(f"Installed Minder MCP config for codex at {_global_target_path('codex')}")
+            except Exception as e:
+                print(f"Failed to install MCP for codex: {e}")
+            continue
+
         try:
             if args.global_install:
                 path = _global_target_path(target)
@@ -138,11 +195,20 @@ def install_mcp_command(args: argparse.Namespace) -> int:
 def uninstall_mcp_command(args: argparse.Namespace) -> int:
     targets = args.target or ["all"]
     if "all" in targets:
-        targets = list(_LOCAL_MCP_TARGETS)
-        
+        targets = list(_ALL_MCP_TARGETS)
+
     cwd = Path(args.cwd).resolve()
-    
+
     for target in targets:
+        if target == "codex":
+            try:
+                removed = _uninstall_codex_mcp()
+                if removed:
+                    print(f"Removed Minder MCP config for codex from {_global_target_path('codex')}")
+            except Exception as e:
+                print(f"Failed to uninstall MCP for codex: {e}")
+            continue
+
         try:
             if args.global_install:
                 path = _global_target_path(target)
@@ -165,5 +231,8 @@ def uninstall_mcp_command(args: argparse.Namespace) -> int:
                 print(f"Removed Minder MCP config for {target} from {path}")
         except Exception as e:
             print(f"Failed to uninstall MCP for {target}: {e}")
-            
+
     return 0
+
+
+remove_mcp_command = uninstall_mcp_command

{minder_cli-0.4.1 → minder_cli-0.4.2}/src/minder/presentation/cli/main.py

@@ -5,9 +5,9 @@ import argparse
 from .utils.version import installed_package_version
 from .utils.common import client_config_path
 from .commands.auth import login_command
-from .commands.mcp import install_mcp_command, uninstall_mcp_command
+from .commands.mcp import install_mcp_command, uninstall_mcp_command, remove_mcp_command, _global_target_path
 from .commands.ide import install_ide_command, uninstall_ide_command
-from .commands.agent import install_agent_command, uninstall_agent_command
+from .commands.agent import install_agent_command, uninstall_agent_command, remove_agent_command
 from .commands.update import version_command, check_update_command, update_command
 from .commands.sync import sync_command
 
@@ -41,10 +41,29 @@ def build_parser() -> argparse.ArgumentParser:
     install = subparsers.add_parser("install", help="Install Minder integration (MCP/IDE).")
     install_subs = install.add_subparsers(dest="subcommand", required=True)
     
-    mcp_in = install_subs.add_parser("mcp", help="Install MCP server config.")
-    mcp_in.add_argument("--target", action="append", help="Target IDE (vscode, cursor, claude-code, all).")
-    mcp_in.add_argument("--global", dest="global_install", action="store_true", help="Install globally.")
-    mcp_in.add_argument("--cwd", default=".", help="Workspace directory.")
+    _cwd_placeholder = "<repo>"
+    _mcp_epilog = (
+        "targets:\n"
+        f"  vscode       per-repo:  {_cwd_placeholder}/.vscode/mcp.json\n"
+        f"               --global:  {_global_target_path('vscode')}\n"
+        f"  cursor       per-repo:  {_cwd_placeholder}/.cursor/mcp.json\n"
+        f"               --global:  {_global_target_path('cursor')}\n"
+        f"  claude-code  per-repo:  {_cwd_placeholder}/.claude/mcp.json\n"
+        f"               --global:  {_global_target_path('claude-code')}\n"
+        f"  antigravity  always:    {_global_target_path('antigravity')}  [--global has no effect]\n"
+        f"  codex        always:    {_global_target_path('codex')}  [--global has no effect]\n"
+        "  all          all targets above (default)\n"
+    )
+
+    mcp_in = install_subs.add_parser(
+        "mcp",
+        help="Install MCP server config.",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog=_mcp_epilog,
+    )
+    mcp_in.add_argument("--target", action="append", metavar="TARGET", help="Target to install (see targets below).")
+    mcp_in.add_argument("--global", dest="global_install", action="store_true", help="Write to the IDE's global config instead of the repo-local file.")
+    mcp_in.add_argument("--cwd", default=".", help="Workspace directory (used for per-repo targets).")
     mcp_in.add_argument("--config-path", default=str(client_config_path()), help="Path to client config.")
     mcp_in.set_defaults(func=install_mcp_command)
     
@@ -54,18 +73,37 @@ def build_parser() -> argparse.ArgumentParser:
     ide_in.add_argument("--config-path", default=str(client_config_path()), help="Path to client config.")
     ide_in.set_defaults(func=install_ide_command)
     
-    agent_in = install_subs.add_parser("agent", help="Install sophisticated Minder Agent rules.")
-    agent_in.add_argument("--target", action="append", help="Target IDE.")
-    agent_in.add_argument("--cwd", default=".", help="Workspace directory.")
+    _agent_epilog = """\
+targets (scope):
+  vscode       ~/.copilot/agents/minder.agent.md               [global – all repos]
+  claude-code  ~/.claude/agents/minder.md                      [global – all repos]
+  codex        ~/.codex/AGENTS.md                              [global – all repos]
+  cursor       <repo>/AGENTS.md                                [per-repo]
+  antigravity  <repo>/.gemini/antigravity/global_workflows/    [per-repo]
+  all          all targets above (default)
+"""
+    agent_in = install_subs.add_parser(
+        "agent",
+        help="Install Minder Agent rules.",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog=_agent_epilog,
+    )
+    agent_in.add_argument("--target", action="append", metavar="TARGET", help="Target to install (see targets below).")
+    agent_in.add_argument("--cwd", default=".", help="Workspace directory (used for per-repo targets).")
     agent_in.set_defaults(func=install_agent_command)
     
     uninstall = subparsers.add_parser("uninstall", help="Remove Minder integration.")
     uninstall_subs = uninstall.add_subparsers(dest="subcommand", required=True)
     
-    mcp_un = uninstall_subs.add_parser("mcp", help="Remove MCP server config.")
-    mcp_un.add_argument("--target", action="append", help="Target IDE.")
-    mcp_un.add_argument("--global", dest="global_install", action="store_true", help="Remove from global config.")
-    mcp_un.add_argument("--cwd", default=".", help="Workspace directory.")
+    mcp_un = uninstall_subs.add_parser(
+        "mcp",
+        help="Remove MCP server config.",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog=_mcp_epilog,
+    )
+    mcp_un.add_argument("--target", action="append", metavar="TARGET", help="Target to remove (see targets below).")
+    mcp_un.add_argument("--global", dest="global_install", action="store_true", help="Remove from the IDE's global config instead of the repo-local file.")
+    mcp_un.add_argument("--cwd", default=".", help="Workspace directory (used for per-repo targets).")
     mcp_un.set_defaults(func=uninstall_mcp_command)
     
     ide_un = uninstall_subs.add_parser("ide", help="Remove IDE bootstrap assets.")
@@ -73,11 +111,41 @@ def build_parser() -> argparse.ArgumentParser:
     ide_un.add_argument("--cwd", default=".", help="Workspace directory.")
     ide_un.set_defaults(func=uninstall_ide_command)
     
-    agent_un = uninstall_subs.add_parser("agent", help="Remove Minder Agent rules.")
-    agent_un.add_argument("--target", action="append", help="Target IDE.")
-    agent_un.add_argument("--cwd", default=".", help="Workspace directory.")
+    agent_un = uninstall_subs.add_parser(
+        "agent",
+        help="Remove Minder Agent rules.",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog=_agent_epilog,
+    )
+    agent_un.add_argument("--target", action="append", metavar="TARGET", help="Target to remove (see targets below).")
+    agent_un.add_argument("--cwd", default=".", help="Workspace directory (used for per-repo targets).")
     agent_un.set_defaults(func=uninstall_agent_command)
     
+    # --- Remove (alias for uninstall) ---
+    remove = subparsers.add_parser("remove", help="Remove Minder integration (alias for uninstall).")
+    remove_subs = remove.add_subparsers(dest="subcommand", required=True)
+
+    remove_mcp = remove_subs.add_parser(
+        "mcp",
+        help="Remove MCP server config.",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog=_mcp_epilog,
+    )
+    remove_mcp.add_argument("--target", action="append", metavar="TARGET", help="Target to remove (see targets below).")
+    remove_mcp.add_argument("--global", dest="global_install", action="store_true", help="Remove from the IDE's global config instead of the repo-local file.")
+    remove_mcp.add_argument("--cwd", default=".", help="Workspace directory (used for per-repo targets).")
+    remove_mcp.set_defaults(func=remove_mcp_command)
+
+    remove_agent = remove_subs.add_parser(
+        "agent",
+        help="Remove Minder Agent rules.",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog=_agent_epilog,
+    )
+    remove_agent.add_argument("--target", action="append", metavar="TARGET", help="Target to remove (see targets below).")
+    remove_agent.add_argument("--cwd", default=".", help="Workspace directory (used for per-repo targets).")
+    remove_agent.set_defaults(func=remove_agent_command)
+
     # --- Sync ---
     sync = subparsers.add_parser("sync", help="Sync repository state with Minder server.")
     sync.add_argument("--repo-id", help="Repository UUID.")