apm-cli 0.9.3__tar.gz → 0.10.0__tar.gz

{apm_cli-0.9.3/src/apm_cli.egg-info → apm_cli-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apm-cli
-Version: 0.9.3
+Version: 0.10.0
 Summary: MCP configuration tool
 Author-email: Daniel Meppiel <user@example.com>
 License: MIT License
@@ -49,6 +49,7 @@ Requires-Dist: rich>=13.0.0
 Requires-Dist: rich-click>=1.7.0
 Requires-Dist: watchdog>=3.0.0
 Requires-Dist: GitPython>=3.1.0
+Requires-Dist: ruamel.yaml>=0.18.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
@@ -106,6 +107,15 @@ git clone <org/repo> && cd <repo>
 apm install    # every agent is configured
 ```
 
+**Coming from `npx skills add`?** Drop-in:
+
+```bash
+apm install vercel-labs/agent-skills                            # whole bundle, like npx skills add
+apm install vercel-labs/agent-skills --skill deploy-to-vercel   # one skill, persisted to apm.yml
+```
+
+Same install gesture. You also get a [manifest, lockfile, and reproducibility](https://microsoft.github.io/apm/reference/package-types/#skill-collection-skillsnameskillmd).
+
 ## The three promises
 
 ### 1. Portable by manifest

{apm_cli-0.9.3 → apm_cli-0.10.0}/README.md

@@ -44,6 +44,15 @@ git clone <org/repo> && cd <repo>
 apm install    # every agent is configured
 ```
 
+**Coming from `npx skills add`?** Drop-in:
+
+```bash
+apm install vercel-labs/agent-skills                            # whole bundle, like npx skills add
+apm install vercel-labs/agent-skills --skill deploy-to-vercel   # one skill, persisted to apm.yml
+```
+
+Same install gesture. You also get a [manifest, lockfile, and reproducibility](https://microsoft.github.io/apm/reference/package-types/#skill-collection-skillsnameskillmd).
+
 ## The three promises
 
 ### 1. Portable by manifest

{apm_cli-0.9.3 → apm_cli-0.10.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "apm-cli"
-version = "0.9.3"
+version = "0.10.0"
 description = "MCP configuration tool"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -35,6 +35,7 @@ dependencies = [
     "rich-click>=1.7.0",
     "watchdog>=3.0.0",
     "GitPython>=3.1.0",
+    "ruamel.yaml>=0.18.0",
 ]
 
 [project.optional-dependencies]
@@ -74,6 +75,7 @@ warn_unused_configs = true
 addopts = "-m 'not benchmark'"
 markers = [
     "integration: marks tests as integration tests that may require network access",
+    "live: marks tests that hit real GitHub repos (requires network + optional GITHUB_TOKEN)",
     "slow: marks tests as slow running tests",
     "benchmark: marks performance benchmark tests (deselected by default, run with -m benchmark)",
 ]

apm_cli-0.10.0/src/apm_cli/commands/_apm_yml_writer.py

@@ -0,0 +1,81 @@
+"""Write-back helper for persisting skill subset selection in apm.yml.
+
+Single helper ``set_skill_subset_for_entry`` is the one source of truth
+for promoting entries to dict form and setting/clearing the ``skills:``
+field.  Keeps write-back logic isolated and unit-testable.
+"""
+
+from pathlib import Path
+from typing import List, Optional
+
+from ..models.dependency.reference import DependencyReference
+from ..utils.yaml_io import dump_yaml, load_yaml
+
+
+def set_skill_subset_for_entry(
+    manifest_path: Path,
+    repo_url: str,
+    subset: Optional[List[str]],
+) -> bool:
+    """Promote entry to dict form and set/clear skills: field.
+
+    subset=None or empty list -> remove skills: from entry (reset to all).
+    subset=[...] -> set skills: to sorted+deduped list.
+
+    Returns True if file was modified.
+    """
+    data = load_yaml(manifest_path) or {}
+    deps_section = data.get("dependencies", {})
+    apm_deps = deps_section.get("apm", [])
+    if not apm_deps:
+        return False
+
+    modified = False
+    new_deps = []
+
+    for entry in apm_deps:
+        if _entry_matches(entry, repo_url):
+            entry = _apply_subset(entry, subset)
+            modified = True
+        new_deps.append(entry)
+
+    if not modified:
+        return False
+
+    deps_section["apm"] = new_deps
+    data["dependencies"] = deps_section
+    dump_yaml(data, manifest_path)
+    return True
+
+
+def _entry_matches(entry, repo_url: str) -> bool:
+    """Check if an apm.yml entry matches the given repo_url."""
+    try:
+        if isinstance(entry, str):
+            ref = DependencyReference.parse(entry)
+        elif isinstance(entry, dict):
+            ref = DependencyReference.parse_from_dict(entry)
+        else:
+            return False
+        return ref.repo_url == repo_url
+    except (ValueError, TypeError, AttributeError, KeyError):
+        return False
+
+
+def _apply_subset(entry, subset: Optional[List[str]]):
+    """Apply skill subset to an entry, promoting to dict form if needed."""
+    # Parse current entry to get canonical info
+    if isinstance(entry, str):
+        ref = DependencyReference.parse(entry)
+    elif isinstance(entry, dict):
+        ref = DependencyReference.parse_from_dict(entry)
+    else:
+        return entry
+
+    # Determine if we should set or clear
+    if subset:
+        ref.skill_subset = sorted(set(subset))
+    else:
+        ref.skill_subset = None
+
+    return ref.to_apm_yml_entry()

{apm_cli-0.9.3 → apm_cli-0.10.0}/src/apm_cli/commands/_helpers.py

@@ -5,6 +5,7 @@ This module must NOT import from any command module.
 
 import builtins
 import os
+import sys
 import tempfile
 from pathlib import Path
 
@@ -44,6 +45,17 @@ WARNING = f"{Fore.YELLOW}"
 HIGHLIGHT = f"{Fore.MAGENTA}{Style.BRIGHT}"
 RESET = Style.RESET_ALL
 
+
+# -------------------------------------------------------------------
+# TTY detection
+# -------------------------------------------------------------------
+
+
+def _is_interactive():
+    """Return True when both stdin and stdout are attached to a TTY."""
+    return sys.stdin.isatty() and sys.stdout.isatty()
+
+
 # Lazy loading for Rich components to improve startup performance
 _console = None
 

{apm_cli-0.9.3 → apm_cli-0.10.0}/src/apm_cli/commands/config.py

@@ -19,6 +19,7 @@ _BOOLEAN_FALSE_VALUES = {"false", "0", "no"}
 _CONFIG_KEY_DISPLAY_NAMES = {
     "auto_integrate": "auto-integrate",
     "temp_dir": "temp-dir",
+    "copilot_cowork_skills_dir": "copilot-cowork-skills-dir",
 }
 
 
@@ -52,7 +53,7 @@ def _get_config_getters():
 
 def _valid_config_keys() -> str:
     """Return valid config keys for messages."""
-    return ", ".join(["auto-integrate", "temp-dir"])
+    return ", ".join(["auto-integrate", "temp-dir", "copilot-cowork-skills-dir"])
 
 
 @click.group(help="Configure APM CLI", invoke_without_command=True)
@@ -130,6 +131,18 @@ def config(ctx):
             if _temp_dir_val:
                 config_table.add_row("", "Temp Directory", _temp_dir_val)
 
+            from ..core.experimental import is_enabled as _is_enabled
+
+            if _is_enabled("copilot_cowork"):
+                from ..config import get_copilot_cowork_skills_dir as _get_csd
+
+                _csd_val = _get_csd()
+                config_table.add_row(
+                    "",
+                    "Cowork Skills Dir",
+                    _csd_val if _csd_val else "Not set (using auto-detection)",
+                )
+
             console.print(config_table)
 
         except (ImportError, NameError):
@@ -157,6 +170,17 @@ def config(ctx):
             if _temp_dir_fb:
                 click.echo(f"  Temp Directory: {_temp_dir_fb}")
 
+            from ..core.experimental import is_enabled as _is_enabled_fb
+
+            if _is_enabled_fb("copilot_cowork"):
+                from ..config import get_copilot_cowork_skills_dir as _get_csd_fb
+
+                _csd_fb = _get_csd_fb()
+                click.echo(
+                    f"  Cowork Skills Dir: "
+                    f"{_csd_fb if _csd_fb else 'Not set (using auto-detection)'}"
+                )
+
 
 @config.command(help="Set a configuration value")
 @click.argument("key")
@@ -171,6 +195,27 @@ def set(key, value):
     from ..config import get_temp_dir, set_temp_dir
 
     logger = CommandLogger("config set")
+    if key == "copilot-cowork-skills-dir":
+        from ..core.experimental import is_enabled
+
+        if not is_enabled("copilot_cowork"):
+            logger.error(
+                "copilot-cowork-skills-dir requires the copilot-cowork experimental flag. "
+                "Run: apm experimental enable copilot-cowork"
+            )
+            sys.exit(1)
+        from ..config import get_copilot_cowork_skills_dir, set_copilot_cowork_skills_dir
+
+        try:
+            set_copilot_cowork_skills_dir(value)
+            logger.success(
+                f"Cowork skills directory set to: {get_copilot_cowork_skills_dir()}"
+            )
+        except ValueError as exc:
+            logger.error(str(exc))
+            sys.exit(1)
+        return
+
     if key == "temp-dir":
         try:
             set_temp_dir(value)
@@ -218,6 +263,18 @@ def get(key):
     logger = CommandLogger("config get")
     getters = _get_config_getters()
     if key:
+        if key == "copilot-cowork-skills-dir":
+            from ..config import get_copilot_cowork_skills_dir
+
+            value = get_copilot_cowork_skills_dir()
+            if value is None:
+                click.echo(
+                    "copilot-cowork-skills-dir: Not set (using auto-detection)"
+                )
+            else:
+                click.echo(f"copilot-cowork-skills-dir: {value}")
+            return
+
         if key == "temp-dir":
             value = get_temp_dir()
             if value is None:
@@ -244,3 +301,44 @@ def get(key):
         click.echo(f"  auto-integrate: {get_auto_integrate()}")
         temp_dir = get_temp_dir()
         click.echo(f"  temp-dir: {temp_dir if temp_dir is not None else 'Not set (using system default)'}")
+
+        from ..core.experimental import is_enabled as _is_enabled_get
+
+        if _is_enabled_get("copilot_cowork"):
+            from ..config import get_copilot_cowork_skills_dir as _get_csd_get
+
+            csd = _get_csd_get()
+            click.echo(
+                f"  copilot-cowork-skills-dir: "
+                f"{csd if csd is not None else 'Not set (using auto-detection)'}"
+            )
+
+
+@config.command(help="Unset a configuration value")
+@click.argument("key")
+def unset(key):
+    """Unset (remove) a configuration value.
+
+    Examples:
+        apm config unset temp-dir
+        apm config unset copilot-cowork-skills-dir
+    """
+    logger = CommandLogger("config unset")
+
+    if key == "temp-dir":
+        from ..config import unset_temp_dir
+
+        unset_temp_dir()
+        logger.success("Temporary directory configuration removed")
+        return
+
+    if key == "copilot-cowork-skills-dir":
+        from ..config import unset_copilot_cowork_skills_dir
+
+        unset_copilot_cowork_skills_dir()
+        logger.success("Cowork skills directory configuration removed")
+        return
+
+    logger.error(f"Unknown configuration key: '{key}'")
+    logger.progress(f"Valid keys: {_valid_config_keys()}")
+    sys.exit(1)

{apm_cli-0.9.3 → apm_cli-0.10.0}/src/apm_cli/commands/experimental.py

@@ -140,7 +140,6 @@ def _handle_unknown_flag(name: str, logger: CommandLogger) -> None:
 @click.group(
     help="Manage experimental feature flags",
     invoke_without_command=True,
-    context_settings={"allow_interspersed_args": True, "ignore_unknown_options": True},
 )
 @click.option("--verbose", "-v", is_flag=True, default=False, help="Show verbose output")
 @click.pass_context

{apm_cli-0.9.3 → apm_cli-0.10.0}/src/apm_cli/commands/install.py

@@ -1050,43 +1050,29 @@ def _run_mcp_install(
         "or a stdio command (self-defined entries)."
     ),
 )
-@click.option(
-    "--no-policy",
-    "no_policy",
-    is_flag=True,
-    default=False,
-    help="Skip org policy enforcement for this invocation. Loudly logged. Does NOT bypass apm audit --ci.",
-)
+@click.option("--skill", "skill_names", multiple=True, metavar="NAME", help="Install only named skill(s) from a SKILL_BUNDLE. Repeatable. Persisted in apm.yml and apm.lock so bare 'apm install' is deterministic. Use --skill '*' to reset to all skills.")
+@click.option("--no-policy", "no_policy", is_flag=True, default=False, help="Skip org policy enforcement for this invocation. Does NOT bypass apm audit --ci.")
 @click.pass_context
-def install(ctx, packages, runtime, exclude, only, update, dry_run, force, verbose, trust_transitive_mcp, parallel_downloads, dev, target, allow_insecure, allow_insecure_hosts, global_, use_ssh, use_https, allow_protocol_fallback, mcp_name, transport, url, env_pairs, header_pairs, mcp_version, registry_url, no_policy):
+def install(ctx, packages, runtime, exclude, only, update, dry_run, force, verbose, trust_transitive_mcp, parallel_downloads, dev, target, allow_insecure, allow_insecure_hosts, global_, use_ssh, use_https, allow_protocol_fallback, mcp_name, transport, url, env_pairs, header_pairs, mcp_version, registry_url, skill_names, no_policy):
     """Install APM and MCP dependencies from apm.yml (like npm install).
 
     Detects AI runtimes from your apm.yml scripts and installs MCP servers for
     all detected runtimes; also installs APM package dependencies from GitHub.
     --only filters by type (apm or mcp).
 
-    HTTP dependencies require `allow_insecure: true` in apm.yml and
-    `--allow-insecure` on the install command. Transitive HTTP dependencies are
-    allowed automatically when they stay on the same host as a direct HTTP
-    dependency, or explicitly with `--allow-insecure-host <hostname>`.
-
     Examples:
         apm install                             # Install existing deps from apm.yml
         apm install org/pkg1                    # Add package to apm.yml and install
-        apm install org/pkg1 org/pkg2           # Add multiple packages and install
         apm install --exclude codex             # Install for all except Codex CLI
         apm install --only=apm                  # Install only APM dependencies
-        apm install --only=mcp                  # Install only MCP dependencies
         apm install --update                    # Update dependencies to latest Git refs
         apm install --dry-run                   # Show what would be installed
         apm install -g org/pkg1                 # Install to user scope (~/.apm/)
-        apm install --allow-insecure http://my-server.example.com/owner/repo  # Install from HTTP URL with allow_insecure
-        apm install --allow-insecure-host mirror.example.com                  # Allow transitive HTTP dependencies from mirror.example.com
-
-    MCP servers (also: 'apm mcp install'):
-        apm install --mcp io.github.github/github-mcp-server                  # registry shorthand
-        apm install --mcp api --url https://example.com/mcp                   # remote http/sse
-        apm install --mcp fetch -- npx -y @modelcontextprotocol/server-fetch  # stdio (post-- argv)
+        apm install --allow-insecure http://...  # HTTP URL (needs allow_insecure)
+        apm install --skill my-skill org/bundle  # Install one skill from bundle
+        apm install --mcp io.github.github/github-mcp-server   # MCP registry
+        apm install --mcp api --url https://example.com/mcp    # MCP remote
+        apm install --mcp fetch -- npx -y @mcp/server-fetch    # MCP stdio
     """
     # C1 #856: defaults BEFORE try so the finally clause never sees an
     # UnboundLocalError if InstallLogger(...) raises during construction.
@@ -1149,6 +1135,14 @@ def install(ctx, packages, runtime, exclude, only, update, dry_run, force, verbo
             registry_url=validated_registry_url,
         )
 
+        # Normalize --skill: '*' means all (same as absent). Reject with --mcp.
+        _skill_subset = None
+        if skill_names:
+            if mcp_name is not None:
+                raise click.UsageError("--skill cannot be combined with --mcp.")
+            if not any(s == "*" for s in skill_names):
+                _skill_subset = builtins.tuple(skill_names)
+
         if mcp_name is not None:
             # MCP install routing block. This branch has accreted
             # significantly (--mcp / --registry / --transport / --env /
@@ -1463,11 +1457,41 @@ def install(ctx, packages, runtime, exclude, only, update, dry_run, force, verbo
                     protocol_pref=protocol_pref,
                     allow_protocol_fallback=allow_protocol_fallback,
                     no_policy=no_policy,
+                    skill_subset=_skill_subset,
+                    skill_subset_from_cli=bool(skill_names),
                 )
                 apm_count = install_result.installed_count
                 prompt_count = install_result.prompts_integrated
                 agent_count = install_result.agents_integrated
                 apm_diagnostics = install_result.diagnostics
+
+                # -- Skill subset write-back (Phase 11) --
+                # When CLI provided --skill on a SKILL_BUNDLE package, persist
+                # the subset selection in apm.yml so bare `apm install` is
+                # deterministic.
+                if skill_names and packages:
+                    from ._apm_yml_writer import set_skill_subset_for_entry
+
+                    _star_sentinel = any(s == "*" for s in skill_names)
+                    for dep_key, pkg_type in install_result.package_types.items():
+                        if pkg_type == "skill_bundle":
+                            if _star_sentinel:
+                                # Explicit-all: REMOVE any persisted skills:
+                                if set_skill_subset_for_entry(manifest_path, dep_key, None):
+                                    logger.success(f"Cleared skill subset for {dep_key}")
+                            else:
+                                subset_list = sorted(builtins.set(_skill_subset))
+                                if set_skill_subset_for_entry(manifest_path, dep_key, subset_list):
+                                    logger.success(
+                                        f"Persisted skill subset for {dep_key}: "
+                                        f"[{', '.join(subset_list)}]"
+                                    )
+                        elif pkg_type != "skill_bundle" and not _star_sentinel:
+                            # Non-bundle: warn but do NOT persist
+                            logger.warning(
+                                f"--skill ignored for {dep_key} "
+                                f"(package type: {pkg_type}, not a skill bundle)"
+                            )
             except InsecureDependencyPolicyError:
                 _maybe_rollback_manifest(_snapshot_manifest_path, _manifest_snapshot, logger)
                 sys.exit(1)
@@ -1664,6 +1688,8 @@ def _install_apm_dependencies(
     protocol_pref=None,
     allow_protocol_fallback: "Optional[bool]" = None,
     no_policy: bool = False,
+    skill_subset: "Optional[builtins.tuple]" = None,
+    skill_subset_from_cli: bool = False,
 ):
     """Thin wrapper -- builds an :class:`InstallRequest` and delegates to
     :class:`apm_cli.install.service.InstallService`.
@@ -1696,5 +1722,7 @@ def _install_apm_dependencies(
         protocol_pref=protocol_pref,
         allow_protocol_fallback=allow_protocol_fallback,
         no_policy=no_policy,
+        skill_subset=skill_subset,
+        skill_subset_from_cli=skill_subset_from_cli,
     )
     return InstallService().run(request)