apm-cli 0.7.8__tar.gz → 0.7.9__tar.gz

{apm_cli-0.7.8/src/apm_cli.egg-info → apm_cli-0.7.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apm-cli
-Version: 0.7.8
+Version: 0.7.9
 Summary: MCP configuration tool
 Author-email: Daniel Meppiel <user@example.com>
 License: MIT License
@@ -52,7 +52,7 @@ Requires-Dist: GitPython>=3.1.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
-Requires-Dist: black>=23.0.0; extra == "dev"
+Requires-Dist: black>=26.3.1; python_version >= "3.10" and extra == "dev"
 Requires-Dist: isort>=5.0.0; extra == "dev"
 Requires-Dist: mypy>=1.0.0; extra == "dev"
 Provides-Extra: build
@@ -107,13 +107,25 @@ apm install    # every agent is configured
 
 ## Get Started
 
+#### Linux / macOS
+
 ```bash
 curl -sSL https://raw.githubusercontent.com/microsoft/apm/main/install.sh | sh
 ```
 
+#### Windows
+
+```powershell
+irm https://raw.githubusercontent.com/microsoft/apm/main/install.ps1 | iex
+```
+
+Native release binaries are published for macOS, Linux, and Windows x86_64. `apm update` reuses the matching platform installer.
+
 <details>
 <summary>Other install methods</summary>
 
+#### Linux / macOS
+
 ```bash
 # Homebrew
 brew install microsoft/apm/apm
@@ -121,6 +133,16 @@ brew install microsoft/apm/apm
 pip install apm-cli
 ```
 
+#### Windows
+
+```powershell
+# Scoop
+scoop bucket add apm https://github.com/microsoft/scoop-apm
+scoop install apm
+# pip
+pip install apm-cli
+```
+
 </details>
 
 Then start adding packages:

{apm_cli-0.7.8 → apm_cli-0.7.9}/README.md

@@ -46,13 +46,25 @@ apm install    # every agent is configured
 
 ## Get Started
 
+#### Linux / macOS
+
 ```bash
 curl -sSL https://raw.githubusercontent.com/microsoft/apm/main/install.sh | sh
 ```
 
+#### Windows
+
+```powershell
+irm https://raw.githubusercontent.com/microsoft/apm/main/install.ps1 | iex
+```
+
+Native release binaries are published for macOS, Linux, and Windows x86_64. `apm update` reuses the matching platform installer.
+
 <details>
 <summary>Other install methods</summary>
 
+#### Linux / macOS
+
 ```bash
 # Homebrew
 brew install microsoft/apm/apm
@@ -60,6 +72,16 @@ brew install microsoft/apm/apm
 pip install apm-cli
 ```
 
+#### Windows
+
+```powershell
+# Scoop
+scoop bucket add apm https://github.com/microsoft/scoop-apm
+scoop install apm
+# pip
+pip install apm-cli
+```
+
 </details>
 
 Then start adding packages:

{apm_cli-0.7.8 → apm_cli-0.7.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "apm-cli"
-version = "0.7.8"
+version = "0.7.9"
 description = "MCP configuration tool"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -41,7 +41,7 @@ dependencies = [
 dev = [
     "pytest>=7.0.0",
     "pytest-cov>=4.0.0",
-    "black>=23.0.0",
+    "black>=26.3.1; python_version>='3.10'",
     "isort>=5.0.0",
     "mypy>=1.0.0",
 ]

{apm_cli-0.7.8 → apm_cli-0.7.9}/src/apm_cli/adapters/client/codex.py

@@ -122,7 +122,7 @@ class CodexClientAdapter(MCPClientAdapter):
             
             # If server has only remote endpoints and no packages, it's a remote-only server
             if remotes and not packages:
-                print(f"⚠️  Warning: MCP server '{server_url}' is a remote server (SSE type)")
+                print(f"[!]  Warning: MCP server '{server_url}' is a remote server (SSE type)")
                 print("   Codex CLI only supports local servers with command/args configuration")
                 print("   Remote servers are not supported by Codex CLI")
                 print("   Skipping installation for Codex CLI")
@@ -174,7 +174,7 @@ class CodexClientAdapter(MCPClientAdapter):
             "id": server_info.get("id", "")  # Add registry UUID for conflict detection
         }
 
-        # Self-defined stdio deps carry raw command/args — use directly
+        # Self-defined stdio deps carry raw command/args  -- use directly
         raw = server_info.get("_raw_stdio")
         if raw:
             config["command"] = raw["command"]
@@ -328,7 +328,7 @@ class CodexClientAdapter(MCPClientAdapter):
         # Check for CI/automated environment via APM_E2E_TESTS flag (more reliable than TTY detection)
         if os.getenv('APM_E2E_TESTS') == '1':
             skip_prompting = True
-            print(f"💡 APM_E2E_TESTS detected, will skip environment variable prompts")
+            print(f" APM_E2E_TESTS detected, will skip environment variable prompts")
         
         # Also skip prompting if we're in a non-interactive environment (fallback)
         is_interactive = sys.stdin.isatty() and sys.stdout.isatty()

{apm_cli-0.7.8 → apm_cli-0.7.9}/src/apm_cli/adapters/client/copilot.py

@@ -166,7 +166,7 @@ class CopilotClientAdapter(MCPClientAdapter):
             "id": server_info.get("id", "")  # Add registry UUID for conflict detection
         }
 
-        # Self-defined stdio deps carry raw command/args — use directly
+        # Self-defined stdio deps carry raw command/args  -- use directly
         raw = server_info.get("_raw_stdio")
         if raw:
             config["command"] = raw["command"]
@@ -331,7 +331,7 @@ class CopilotClientAdapter(MCPClientAdapter):
         # Check for CI/automated environment via APM_E2E_TESTS flag (more reliable than TTY detection)
         if os.getenv('APM_E2E_TESTS') == '1':
             skip_prompting = True
-            print(f"💡 APM_E2E_TESTS detected, will skip environment variable prompts")
+            print(f" APM_E2E_TESTS detected, will skip environment variable prompts")
         
         # Also skip prompting if we're in a non-interactive environment (fallback)
         is_interactive = sys.stdin.isatty() and sys.stdout.isatty()

{apm_cli-0.7.8 → apm_cli-0.7.9}/src/apm_cli/adapters/client/vscode.py

@@ -187,7 +187,7 @@ class VSCodeClientAdapter(MCPClientAdapter):
         server_config = {}
         input_vars = []
 
-        # Self-defined stdio deps carry raw command/args — use directly
+        # Self-defined stdio deps carry raw command/args  -- use directly
         raw = server_info.get("_raw_stdio")
         if raw:
             server_config = {

{apm_cli-0.7.8 → apm_cli-0.7.9}/src/apm_cli/bundle/lockfile_enrichment.py

@@ -12,7 +12,7 @@ def enrich_lockfile_for_pack(
 ) -> str:
     """Create an enriched copy of the lockfile YAML with a ``pack:`` section.
 
-    Does NOT mutate the original *lockfile* object — serialises a copy and
+    Does NOT mutate the original *lockfile* object  -- serialises a copy and
     prepends the pack metadata.
 
     Args:

{apm_cli-0.7.8 → apm_cli-0.7.9}/src/apm_cli/bundle/packer.py

@@ -1,4 +1,4 @@
-"""Bundle packer — creates self-contained APM bundles from the resolved dependency tree."""
+"""Bundle packer  -- creates self-contained APM bundles from the resolved dependency tree."""
 
 import shutil
 import tarfile
@@ -6,7 +6,7 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import List, Optional
 
-from ..deps.lockfile import LockFile
+from ..deps.lockfile import LockFile, get_lockfile_path, migrate_lockfile_if_needed
 from ..models.apm_package import APMPackage
 from ..core.target_detection import detect_target
 from .lockfile_enrichment import enrich_lockfile_for_pack
@@ -47,10 +47,10 @@ def pack_bundle(
     """Create a self-contained bundle from installed APM dependencies.
 
     Args:
-        project_root: Root of the project containing ``apm.lock`` and ``apm.yml``.
+        project_root: Root of the project containing ``apm.lock.yaml`` and ``apm.yml``.
         output_dir: Directory where the bundle will be created.
-        fmt: Bundle format — ``"apm"`` (default) or ``"plugin"``.
-        target: Target filter — ``"vscode"``, ``"claude"``, ``"all"``, or *None*
+        fmt: Bundle format  -- ``"apm"`` (default) or ``"plugin"``.
+        target: Target filter  -- ``"vscode"``, ``"claude"``, ``"all"``, or *None*
             (auto-detect from apm.yml / project structure).
         archive: If *True*, produce a ``.tar.gz`` and remove the directory.
         dry_run: If *True*, resolve the file list but write nothing to disk.
@@ -59,15 +59,16 @@ def pack_bundle(
         :class:`PackResult` describing what was (or would be) produced.
 
     Raises:
-        FileNotFoundError: If ``apm.lock`` is missing.
+        FileNotFoundError: If ``apm.lock.yaml`` is missing.
         ValueError: If deployed files referenced in the lockfile are missing on disk.
     """
-    # 1. Read lockfile
-    lockfile_path = project_root / "apm.lock"
+    # 1. Read lockfile (migrate legacy apm.lock → apm.lock.yaml if needed)
+    migrate_lockfile_if_needed(project_root)
+    lockfile_path = get_lockfile_path(project_root)
     lockfile = LockFile.read(lockfile_path)
     if lockfile is None:
         raise FileNotFoundError(
-            "apm.lock not found — run 'apm install' first to resolve dependencies."
+            "apm.lock.yaml not found  -- run 'apm install' first to resolve dependencies."
         )
 
     # 2. Read apm.yml for name / version / config target
@@ -77,7 +78,19 @@ def pack_bundle(
         pkg_name = package.name
         pkg_version = package.version or "0.0.0"
         config_target = package.target
-    except (FileNotFoundError, ValueError):
+
+        # Guard: reject local-path dependencies (non-portable)
+        for dep_ref in package.get_apm_dependencies():
+            if dep_ref.is_local:
+                raise ValueError(
+                    f"Cannot pack — apm.yml contains local path dependency: "
+                    f"{dep_ref.local_path}\n"
+                    f"Local dependencies are for development only. Replace them with "
+                    f"remote references (e.g., 'owner/repo') before packing."
+                )
+    except ValueError:
+        raise
+    except FileNotFoundError:
         pkg_name = project_root.resolve().name
         pkg_version = "0.0.0"
         config_target = None
@@ -88,7 +101,7 @@ def pack_bundle(
         explicit_target=target,
         config_target=config_target,
     )
-    # For packing purposes, "minimal" means nothing to pack — treat as "all"
+    # For packing purposes, "minimal" means nothing to pack  -- treat as "all"
     if effective_target == "minimal":
         effective_target = "all"
 
@@ -126,7 +139,7 @@ def pack_bundle(
             missing.append(rel_path)
     if missing:
         raise ValueError(
-            f"The following deployed files are missing on disk — "
+            f"The following deployed files are missing on disk  -- "
             f"run 'apm install' to restore them:\n"
             + "\n".join(f"  - {m}" for m in missing)
         )
@@ -156,7 +169,7 @@ def pack_bundle(
 
     # 8. Enrich lockfile copy and write to bundle
     enriched_yaml = enrich_lockfile_for_pack(lockfile, fmt, effective_target)
-    (bundle_dir / "apm.lock").write_text(enriched_yaml, encoding="utf-8")
+    (bundle_dir / "apm.lock.yaml").write_text(enriched_yaml, encoding="utf-8")
 
     result = PackResult(
         bundle_path=bundle_dir,

{apm_cli-0.7.8 → apm_cli-0.7.9}/src/apm_cli/bundle/unpacker.py

@@ -1,4 +1,4 @@
-"""Bundle unpacker — extracts and verifies APM bundles."""
+"""Bundle unpacker  -- extracts and verifies APM bundles."""
 
 import shutil
 import sys
@@ -8,7 +8,7 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Dict, List
 
-from ..deps.lockfile import LockFile
+from ..deps.lockfile import LockFile, LOCKFILE_NAME, LEGACY_LOCKFILE_NAME
 
 
 @dataclass
@@ -44,7 +44,7 @@ def unpack_bundle(
         :class:`UnpackResult` describing what was (or would be) extracted.
 
     Raises:
-        FileNotFoundError: If the bundle's ``apm.lock`` is missing.
+        FileNotFoundError: If the bundle's ``apm.lock.yaml`` is missing.
         ValueError: If verification finds files listed in the lockfile but
             absent from the bundle.
     """
@@ -65,7 +65,7 @@ def unpack_bundle(
                 if sys.version_info >= (3, 12):
                     tar.extractall(temp_dir, filter="data")
                 else:
-                    tar.extractall(temp_dir)  # noqa: S202 — manual checks above
+                    tar.extractall(temp_dir)  # noqa: S202  -- manual checks above
         except Exception:
             shutil.rmtree(temp_dir, ignore_errors=True)
             raise
@@ -83,16 +83,21 @@ def unpack_bundle(
         raise FileNotFoundError(f"Bundle not found or unsupported format: {bundle_path}")
 
     try:
-        # 2. Read apm.lock from bundle
-        lockfile_path = source_dir / "apm.lock"
+        # 2. Read apm.lock.yaml (or legacy apm.lock) from bundle
+        lockfile_path = source_dir / LOCKFILE_NAME
+        if not lockfile_path.exists():
+            # Backward compat: older bundles used "apm.lock"
+            legacy_lockfile_path = source_dir / LEGACY_LOCKFILE_NAME
+            if legacy_lockfile_path.exists():
+                lockfile_path = legacy_lockfile_path
         lockfile = LockFile.read(lockfile_path)
         if lockfile is None:
             if not lockfile_path.exists():
                 raise FileNotFoundError(
-                    "apm.lock not found in the bundle — the bundle may be incomplete."
+                    f"{lockfile_path.name} not found in the bundle  -- the bundle may be incomplete."
                 )
             raise FileNotFoundError(
-                "apm.lock in the bundle could not be parsed — the bundle may be corrupt."
+                f"{lockfile_path.name} in the bundle could not be parsed  -- the bundle may be corrupt."
             )
 
         # Collect deployed_files per dependency and deduplicated global list
@@ -118,7 +123,7 @@ def unpack_bundle(
             ]
             if missing:
                 raise ValueError(
-                    "Bundle verification failed — the following deployed files "
+                    "Bundle verification failed  -- the following deployed files "
                     "are missing from the bundle:\n"
                     + "\n".join(f"  - {m}" for m in missing)
                 )
@@ -142,7 +147,7 @@ def unpack_bundle(
         for rel_path in unique_files:
             # Guard against absolute paths or path-traversal entries in deployed_files
             p = Path(rel_path)
-            if p.is_absolute() or ".." in p.parts:
+            if p.is_absolute() or rel_path.startswith("/") or ".." in p.parts:
                 raise ValueError(
                     f"Refusing to unpack unsafe path from bundle lockfile: {rel_path!r}"
                 )

{apm_cli-0.7.8 → apm_cli-0.7.9}/src/apm_cli/cli.py

@@ -1,8 +1,10 @@
 """Command-line interface for Agent Package Manager (APM).
 
-Thin wiring layer — all command logic lives in ``apm_cli.commands.*`` modules.
+Thin wiring layer  -- all command logic lives in ``apm_cli.commands.*`` modules.
 """
 
+import ctypes
+import os
 import sys
 
 import click
@@ -67,8 +69,51 @@ cli.add_command(runtime)
 cli.add_command(mcp)
 
 
+def _configure_encoding() -> None:
+    """Configure stdout/stderr for full Unicode on Windows.
+
+    The default Windows console encoding (cp1252) cannot represent many Unicode
+    characters used in APM output (box-drawing, check marks, arrows, etc.).
+
+    This function:
+    1. Sets ``PYTHONIOENCODING`` so child processes and redirected pipes
+       default to UTF-8.
+    2. Switches the console codepage to 65001 (UTF-8) via the Win32 API so
+       the terminal itself renders UTF-8 byte sequences correctly.
+    3. Reconfigures the Python text-mode streams to UTF-8.
+
+    On non-Windows platforms this is a no-op.
+    """
+    if sys.platform != "win32":
+        return
+
+    # 1. Help child processes / pipes default to UTF-8
+    os.environ.setdefault("PYTHONIOENCODING", "utf-8")
+
+    # 2. Switch the console codepage to UTF-8
+    try:
+        kernel32 = ctypes.windll.kernel32  # type: ignore[attr-defined]
+        kernel32.SetConsoleOutputCP(65001)
+        kernel32.SetConsoleCP(65001)
+    except (OSError, AttributeError):
+        pass  # not a real console or ctypes unavailable
+
+    # 3. Reconfigure Python streams to UTF-8
+    for name in ("stdout", "stderr"):
+        stream = getattr(sys, name, None)
+        if stream is not None and hasattr(stream, "reconfigure"):
+            try:
+                stream.reconfigure(encoding="utf-8")
+            except Exception:
+                try:
+                    stream.reconfigure(encoding="utf-8", errors="backslashreplace")
+                except Exception:
+                    pass
+
+
 def main():
     """Main entry point for the CLI."""
+    _configure_encoding()
     try:
         cli(obj={})
     except Exception as e:

{apm_cli-0.7.8 → apm_cli-0.7.9}/src/apm_cli/commands/_helpers.py

@@ -120,7 +120,7 @@ def _build_expected_install_paths(declared_deps, lockfile, apm_modules_dir: Path
         install_path = dep.get_install_path(apm_modules_dir)
         try:
             relative_path = install_path.relative_to(apm_modules_dir)
-            expected.add(str(relative_path))
+            expected.add(relative_path.as_posix())
         except ValueError:
             expected.add(str(install_path))
 
@@ -136,7 +136,7 @@ def _build_expected_install_paths(declared_deps, lockfile, apm_modules_dir: Path
                 install_path = dep_ref.get_install_path(apm_modules_dir)
                 try:
                     relative_path = install_path.relative_to(apm_modules_dir)
-                    expected.add(str(relative_path))
+                    expected.add(relative_path.as_posix())
                 except ValueError:
                     pass
     return expected
@@ -185,11 +185,11 @@ def _check_orphaned_packages():
 
         try:
             from ..models.apm_package import APMPackage
-            from ..deps.lockfile import LockFile
+            from ..deps.lockfile import LockFile, get_lockfile_path
 
             apm_package = APMPackage.from_apm_yml(Path("apm.yml"))
             declared_deps = apm_package.get_apm_dependencies()
-            lockfile = LockFile.read(Path.cwd() / "apm.lock")
+            lockfile = LockFile.read(get_lockfile_path(Path.cwd()))
             expected = _build_expected_install_paths(declared_deps, lockfile, apm_modules_dir)
         except Exception:
             return []