fix: address PR review feedback -- ASCII compliance and cleanup (microsoft#628)

- Replace all non-ASCII characters (em dashes, Unicode arrows, box-drawing)
  with ASCII equivalents across 4 source files
- Fix normalize_target_list('all') to return sorted target list instead
  of None (clearer semantics, function currently unused)
- Add code comment documenting dict.update() last-wins limitation in
  cross-target map merging for multi-target packs
- Move CHANGELOG entry to [Unreleased] section, reference PR microsoft#628

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: Sergio Sisternes

CHANGELOG.md

@@ -6,11 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [Unreleased]
+
+### Added
+
+- Multi-target support: `apm.yml` `target` field now accepts a list (`target: [claude, copilot]`) and CLI `--target` accepts comma-separated values (`-t claude,copilot`). Only specified targets are compiled, installed, and packed -- no redundant output for unused tools. Single-string syntax is fully backward compatible. (#628)
+
 ## [0.8.11] - 2026-04-06
 
 ### Added
 
-- Multi-target support: `apm.yml` `target` field now accepts a list (`target: [claude, copilot]`) and CLI `--target` accepts comma-separated values (`-t claude,copilot`). Only specified targets are compiled, installed, and packed -- no redundant output for unused tools. Single-string syntax is fully backward compatible. (#529)
 - Artifactory archive entry download for virtual file packages (#525)
 - `apm view <package> [field]` command for viewing package metadata and remote refs (#613)
 - `apm view <package> versions` field selector lists remote tags and branches via `git ls-remote` (#613)

src/apm_cli/bundle/lockfile_enrichment.py

@@ -82,6 +82,10 @@ def _filter_files_by_target(
                     seen_prefixes.add(p)
                     prefixes.append(p)
         # Union all cross-target maps
+        # NOTE: dict.update() means the last target's mapping wins when
+        # multiple targets map the same source prefix. In practice this
+        # is benign -- common multi-target combos (e.g. claude+copilot)
+        # match prefixes directly without needing cross-maps.
         cross_map: Dict[str, str] = {}
         for t in target:
             cross_map.update(_CROSS_TARGET_MAPS.get(t, {}))

src/apm_cli/core/target_detection.py

@@ -231,10 +231,10 @@ def get_target_description(target: UserTargetType) -> str:
 # ---------------------------------------------------------------------------
 
 #: The complete set of real (non-pseudo) canonical targets.
-#: "minimal" is intentionally excluded — it is a fallback pseudo-target.
+#: "minimal" is intentionally excluded -- it is a fallback pseudo-target.
 ALL_CANONICAL_TARGETS = frozenset({"vscode", "claude", "cursor", "opencode", "codex"})
 
-#: Alias mapping: user-facing name → canonical internal name.
+#: Alias mapping: user-facing name -> canonical internal name.
 TARGET_ALIASES: dict[str, str] = {
     "copilot": "vscode",
     "agents": "vscode",
@@ -248,29 +248,29 @@ def normalize_target_list(
     """Normalize a user-provided target value to a list of canonical names.
 
     Handles:
-    - ``None`` → ``None`` (auto-detect)
-    - ``"claude"`` → ``["claude"]``
-    - ``"copilot"`` → ``["vscode"]``  (alias resolution)
-    - ``"all"`` → ``None``  (let ``active_targets()`` expand)
-    - ``["claude", "copilot"]`` → ``["claude", "vscode"]``
+    - ``None`` -> ``None`` (auto-detect)
+    - ``"claude"`` -> ``["claude"]``
+    - ``"copilot"`` -> ``["vscode"]``  (alias resolution)
+    - ``"all"`` -> ``["claude", "codex", "copilot", "cursor", "opencode"]``
+    - ``["claude", "copilot"]`` -> ``["claude", "vscode"]``
     - Deduplicates while preserving first-seen order.
 
     Args:
         value: A single target string, a list of target strings, or ``None``.
 
     Returns:
         A deduplicated list of canonical target names, or ``None`` if the
-        input was ``None`` or ``"all"`` (meaning "expand to everything").
+        input was ``None`` (meaning "auto-detect").
     """
     if value is None:
         return None
 
     raw: List[str] = [value] if isinstance(value, str) else list(value)
 
-    # "all" anywhere in the input means "every target" — return None so the
-    # caller (active_targets) can expand using folder detection + full set.
+    # "all" anywhere in the input means "every target" -- expand to the
+    # full sorted list of canonical targets.
     if "all" in raw:
-        return None
+        return sorted(ALL_CANONICAL_TARGETS)
 
     seen: set[str] = set()
     result: List[str] = []
@@ -302,10 +302,10 @@ class TargetParamType(click.ParamType):
 
     Examples::
 
-        -t claude             → "claude"
-        -t claude,copilot     → ["claude", "vscode"]
-        -t all                → "all"
-        -t copilot,vscode     → ["vscode"]  (deduped aliases)
+        -t claude             -> "claude"
+        -t claude,copilot     -> ["claude", "vscode"]
+        -t all                -> "all"
+        -t copilot,vscode     -> ["vscode"]  (deduped aliases)
     """
 
     name = "target"
@@ -337,7 +337,7 @@ def convert(
                     ctx,
                 )
 
-        # "all" is exclusive — reject combinations like "all,claude".
+        # "all" is exclusive -- reject combinations like "all,claude".
         if "all" in parts:
             if len(parts) > 1:
                 self.fail(
@@ -347,7 +347,7 @@ def convert(
                 )
             return "all"
 
-        # Single target → plain string (backward compat).
+        # Single target -> plain string (backward compat).
         if len(parts) == 1:
             return parts[0]
 

tests/unit/integration/test_targets.py

@@ -134,7 +134,7 @@ def test_explicit_list_multiple_targets(self):
         assert [t.name for t in targets] == ["claude", "copilot"]
 
     def test_explicit_list_deduplicates_aliases(self):
-        """copilot and vscode are aliases — should return one profile."""
+        """copilot and vscode are aliases -- should return one profile."""
         targets = active_targets(self.root, explicit_target=["copilot", "vscode"])
         assert [t.name for t in targets] == ["copilot"]
 
@@ -168,7 +168,7 @@ def test_explicit_list_agents_alias(self):
         assert [t.name for t in targets] == ["copilot", "claude"]
 
     def test_explicit_empty_list_falls_through_to_autodetect(self):
-        """Empty list is falsy — should auto-detect (fallback to copilot)."""
+        """Empty list is falsy -- should auto-detect (fallback to copilot)."""
         targets = active_targets(self.root, explicit_target=[])
         assert [t.name for t in targets] == ["copilot"]  # fallback
 

tests/unit/policy/test_policy_checks.py

@@ -42,7 +42,7 @@
 )
 
 
-# ── Helpers ────────────────────────────────────────────────────────
+# -- Helpers --------------------------------------------------------
 
 
 def _write_apm_yml(project: Path, data: dict) -> None:
@@ -89,7 +89,7 @@ def _make_lockfile(deps_data: list[dict]):
     return lock
 
 
-# ── Fixtures ───────────────────────────────────────────────────────
+# -- Fixtures -------------------------------------------------------
 
 
 @pytest.fixture(autouse=True)
@@ -100,7 +100,7 @@ def _clear_cache():
     clear_apm_yml_cache()
 
 
-# ── Check 1: dependency-allowlist ──────────────────────────────────
+# -- Check 1: dependency-allowlist ----------------------------------
 
 
 class TestDependencyAllowlist:
@@ -130,7 +130,7 @@ def test_empty_deps(self):
         assert result.passed
 
 
-# ── Check 2: dependency-denylist ───────────────────────────────────
+# -- Check 2: dependency-denylist -----------------------------------
 
 
 class TestDependencyDenylist:
@@ -154,7 +154,7 @@ def test_fail_when_denied(self):
         assert "denied by pattern" in result.details[0]
 
 
-# ── Check 3: required-packages ─────────────────────────────────────
+# -- Check 3: required-packages -------------------------------------
 
 
 class TestRequiredPackages:
@@ -192,7 +192,7 @@ def test_no_prefix_collision(self):
         assert "org/package" in result.details
 
 
-# ── Check 4: required-packages-deployed ────────────────────────────
+# -- Check 4: required-packages-deployed ----------------------------
 
 
 class TestRequiredPackagesDeployed:
@@ -220,15 +220,15 @@ def test_fail_not_deployed(self):
         assert "org/pkg" in result.details[0]
 
     def test_skip_if_not_in_manifest(self):
-        """Required package not in manifest — check 3 handles that."""
+        """Required package not in manifest -- check 3 handles that."""
         deps = _make_dep_refs(["other/pkg"])
         lock = _make_lockfile([{"repo_url": "other/pkg", "deployed_files": ["x.md"]}])
         policy = DependencyPolicy(require=["org/missing"])
         result = _check_required_packages_deployed(deps, lock, policy)
         assert result.passed
 
 
-# ── Check 5: required-package-version ──────────────────────────────
+# -- Check 5: required-package-version ------------------------------
 
 
 class TestRequiredPackageVersion:
@@ -284,7 +284,7 @@ def test_pass_project_wins_mismatch(self):
         assert len(result.details) > 0
 
 
-# ── Check 6: transitive-depth ──────────────────────────────────────
+# -- Check 6: transitive-depth --------------------------------------
 
 
 class TestTransitiveDepth:
@@ -315,7 +315,7 @@ def test_fail_exceeds_limit(self):
         assert "depth 5" in result.details[0]
 
 
-# ── Check 7: mcp-allowlist ─────────────────────────────────────────
+# -- Check 7: mcp-allowlist -----------------------------------------
 
 
 class TestMcpAllowlist:
@@ -338,7 +338,7 @@ def test_fail_not_in_allow_list(self):
         assert not result.passed
 
 
-# ── Check 8: mcp-denylist ──────────────────────────────────────────
+# -- Check 8: mcp-denylist ------------------------------------------
 
 
 class TestMcpDenylist:
@@ -362,7 +362,7 @@ def test_fail_denied(self):
         assert "denied by pattern" in result.details[0]
 
 
-# ── Check 9: mcp-transport ─────────────────────────────────────────
+# -- Check 9: mcp-transport -----------------------------------------
 
 
 class TestMcpTransport:
@@ -392,7 +392,7 @@ def test_skip_no_transport_set(self):
         assert result.passed
 
 
-# ── Check 10: mcp-self-defined ─────────────────────────────────────
+# -- Check 10: mcp-self-defined -------------------------------------
 
 
 class TestMcpSelfDefined:
@@ -428,7 +428,7 @@ def test_pass_no_self_defined_servers(self):
         assert result.passed
 
 
-# ── Check 11: compilation-target ───────────────────────────────────
+# -- Check 11: compilation-target -----------------------------------
 
 
 class TestCompilationTarget:
@@ -474,7 +474,7 @@ def test_pass_no_target_in_manifest(self):
         result = _check_compilation_target({}, policy)
         assert result.passed
 
-    # ── Multi-target (list) tests ──────────────────────────────────
+    # -- Multi-target (list) tests ----------------------------------
 
     def test_target_list_enforce_present(self):
         """List target containing the enforced value passes."""
@@ -539,7 +539,7 @@ def test_target_list_single_item(self):
         assert result.passed
 
 
-# ── Check 12: compilation-strategy ─────────────────────────────────
+# -- Check 12: compilation-strategy ---------------------------------
 
 
 class TestCompilationStrategy:
@@ -575,7 +575,7 @@ def test_pass_no_strategy_in_manifest(self):
         assert result.passed
 
 
-# ── Check 13: source-attribution ───────────────────────────────────
+# -- Check 13: source-attribution -----------------------------------
 
 
 class TestSourceAttribution:
@@ -596,7 +596,7 @@ def test_fail_not_enabled(self):
         assert not result.passed
 
 
-# ── Check 14: required-manifest-fields ─────────────────────────────
+# -- Check 14: required-manifest-fields -----------------------------
 
 
 class TestRequiredManifestFields:
@@ -627,7 +627,7 @@ def test_fail_field_empty(self):
         assert not result.passed
 
 
-# ── Check 15: scripts-policy ───────────────────────────────────────
+# -- Check 15: scripts-policy ---------------------------------------
 
 
 class TestScriptsPolicy:
@@ -651,7 +651,7 @@ def test_fail_deny_with_scripts(self):
         assert "build" in result.details
 
 
-# ── Check 16: unmanaged-files ──────────────────────────────────────
+# -- Check 16: unmanaged-files --------------------------------------
 
 
 class TestUnmanagedFiles:
@@ -749,7 +749,7 @@ def test_rglob_cap_skips_check(self, tmp_path, monkeypatch):
         assert "capped" in result.message.lower()
 
 
-# ── Integration: run_policy_checks ─────────────────────────────────
+# -- Integration: run_policy_checks ---------------------------------
 
 
 class TestRunPolicyChecks: