apcore-cli 0.9.0__tar.gz → 0.10.1__tar.gz

{apcore_cli-0.9.0 → apcore_cli-0.10.1}/CHANGELOG.md

@@ -5,6 +5,46 @@ All notable changes to apcore-cli (Python SDK) will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.10.1] - 2026-06-15
+
+### Changed
+
+- **Required runtime bumped to apcore 0.24.0 and apcore-toolkit 0.8.1.** Dependency
+  floors in `pyproject.toml` raised from `apcore>=0.22.0` / `apcore-toolkit>=0.8.0`
+  to `apcore>=0.24.0` / `apcore-toolkit>=0.8.1`, tracking the aligned apcore 0.24.0
+  and apcore-toolkit 0.8.1 releases. **No source changes** — the full test suite
+  passes unchanged.
+
+  The apcore 0.22.0 → 0.24.0 delta does not touch any surface the CLI consumes:
+  - **Per-instance `ToggleState` isolation (#71)** — the CLI never constructs
+    `ToggleState`/`APCore` nor calls the free `is_module_disabled()`; module
+    toggling is delegated to the `system.control.toggle_feature` module via
+    `Executor.call()`.
+  - **Default AI error-recovery metadata (#70)** and **error `details` snake_case
+    key alignment (A-D-019)** — the CLI reads error fields (`details`, `suggestion`,
+    `ai_guidance`, `retryable`, `user_fixable`) via `getattr()` and passes `details`
+    through verbatim, so it is agnostic to both new defaults and inner-key casing.
+  - **`Registry.list()` / `get_definition()` / `Executor.call()` / `call_with_trace()`
+    / `set_approval_handler()`** signatures are unchanged across the delta; descriptor
+    fields are read defensively with fallbacks.
+  - Out of scope and unused by the CLI: `CircuitBreakerMiddleware`, `A2ASubscriber`,
+    DLQ/`original_event`, `apcore.Config.validate()`, `Context.create()`, redaction
+    utilities, `EventEmitter`.
+
+## [0.10.0] - 2026-05-18
+
+### Changed — BREAKING
+
+- **Removed graceful ImportError fallbacks for `apcore` and `apcore-toolkit` (resolves 6.2).** Both packages are declared as required runtime dependencies in `pyproject.toml` (`apcore>=0.21.0`, `apcore-toolkit>=0.7.0`) — the prior `try: from apcore_toolkit import X; except ImportError: logger.warning(...); return` pattern in `factory.py` and the `try: from apcore import Config; except (ImportError, AttributeError): return False` pattern in `config.py` were self-contradictory: the dep was hard-required by the package manifest but soft-degraded at runtime. The fallbacks have been removed; missing or too-old `apcore` / `apcore-toolkit` now fails fast at import time with `ModuleNotFoundError`, matching the manifest contract.
+  - Sites cleaned up: `factory.py:581-616` (DisplayResolver/RegistryWriter/ConventionScanner/BindingLoader), `output.py:144-146/270-272` (format_module/format_modules), `config.py:32-35` (apcore.Config).
+  - Toolkit symbols are now imported once at the top of `factory.py` and `output.py`.
+  - The `_TOOLKIT_MISSING_HINT` constant in `output.py` is removed (no longer reachable).
+- **Tests updated**: two tests that asserted the removed fallback behaviour (`test_toolkit_missing_logs_warning_and_returns`, `test_binding_loader_missing_warns_but_continues`) are deleted; the import-time failure mode is covered by Python's standard `ModuleNotFoundError`. Remaining `_apply_toolkit_integration` tests now patch `apcore_cli.factory.{BindingLoader,DisplayResolver,RegistryWriter,ConventionScanner}` instead of `apcore_toolkit.X` (standard "patch where the name is used" Python mock convention now that the imports are static).
+
+### Migration
+
+- If your environment previously relied on the soft-degrade behaviour (apcore-cli running with `apcore-toolkit` uninstalled), install the package: `pip install apcore-toolkit>=0.7.0`. With the manifest already declaring it required, this should already be satisfied by any standard `pip install apcore-cli` invocation.
+
 ## [0.9.0] - 2026-05-13
 
 ### Added

{apcore_cli-0.9.0 → apcore_cli-0.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apcore-cli
-Version: 0.9.0
+Version: 0.10.1
 Summary: Terminal adapter for apcore — execute AI-Perceivable modules from the command line
 Project-URL: Homepage, https://aiperceivable.com
 Project-URL: Repository, https://github.com/aiperceivable/apcore-cli-python
@@ -21,8 +21,8 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.11
-Requires-Dist: apcore-toolkit>=0.7.0
-Requires-Dist: apcore>=0.21.0
+Requires-Dist: apcore-toolkit>=0.8.1
+Requires-Dist: apcore>=0.24.0
 Requires-Dist: click>=8.1
 Requires-Dist: cryptography>=41.0
 Requires-Dist: jsonschema>=4.20

{apcore_cli-0.9.0 → apcore_cli-0.10.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "apcore-cli"
-version = "0.9.0"
+version = "0.10.1"
 description = "Terminal adapter for apcore — execute AI-Perceivable modules from the command line"
 readme = "README.md"
 license = "Apache-2.0"
@@ -26,8 +26,8 @@ classifiers = [
     "Environment :: Console",
 ]
 dependencies = [
-    "apcore>=0.21.0",
-    "apcore-toolkit>=0.7.0",
+    "apcore>=0.24.0",
+    "apcore-toolkit>=0.8.1",
     "click>=8.1",
     "jsonschema>=4.20",
     "rich>=13.0",

{apcore_cli-0.9.0 → apcore_cli-0.10.1}/src/apcore_cli/config.py

@@ -26,13 +26,16 @@ def register_config_namespace() -> bool:
     Public helper mirroring apcore-cli-typescript's ``registerConfigNamespace``
     and apcore-cli-rust's equivalent registration call site so embedders can
     invoke registration explicitly. Returns ``True`` when registration
-    succeeded, ``False`` when apcore is missing or too old (which silently
-    skips registration — matching the prior inline behaviour).
+    succeeded.
+
+    ``apcore`` is a required runtime dependency
+    (``pyproject.toml`` pins ``apcore>=0.21.0``) so the import is performed
+    locally rather than guarded — a missing or too-old apcore is a hard
+    install error, not a silent no-op. The prior graceful-fallback path
+    was removed in the 6.2 fix.
     """
-    try:
-        from apcore import Config
-    except (ImportError, AttributeError):
-        return False
+    from apcore import Config
+
     Config.register_namespace(
         name="apcore-cli",
         schema=None,

{apcore_cli-0.9.0 → apcore_cli-0.10.1}/src/apcore_cli/factory.py

@@ -18,6 +18,14 @@ from typing import Any
 
 import click
 
+# apcore-toolkit is a REQUIRED runtime dependency (pyproject.toml pins
+# `apcore-toolkit>=0.7.0`). Static import — no ImportError fallback. If
+# toolkit is missing the import fails at module load time with a clear
+# ModuleNotFoundError, matching the pyproject contract. See CHANGELOG for
+# the 6.2 fix that removed the prior graceful-fallback path.
+from apcore_toolkit import BindingLoader, DisplayResolver, RegistryWriter
+from apcore_toolkit.convention_scanner import ConventionScanner
+
 from apcore_cli.builtin_group import ApcliGroup
 from apcore_cli.cli import GroupedModuleGroup, set_audit_logger, set_verbose_help
 from apcore_cli.config import ConfigResolver
@@ -571,25 +579,18 @@ def _apply_toolkit_integration(
     single registration path ensures ``--allowed-prefix`` protection
     applies to both sources consistently.
 
-    Silently no-op if ``apcore-toolkit`` is not installed; individual
-    optional features (``BindingLoader`` in toolkit < 0.5) degrade to
-    a WARNING and are skipped.
+    Toolkit symbols are imported statically at module top — the package
+    is a required runtime dep (``pyproject.toml`` pins
+    ``apcore-toolkit>=0.7.0``). Operational failures inside scanner /
+    loader / writer calls still degrade to a WARNING.
     """
     if commands_dir is None and binding_path is None:
         return
 
-    try:
-        from apcore_toolkit import DisplayResolver, RegistryWriter
-    except ImportError:
-        logger.warning("apcore-toolkit not installed — toolkit features unavailable")
-        return
-
     scanned: list[Any] = []
 
     if commands_dir is not None:
         try:
-            from apcore_toolkit.convention_scanner import ConventionScanner
-
             scanner = ConventionScanner()
             scanned.extend(scanner.scan(commands_dir))
         except Exception as e:
@@ -597,23 +598,16 @@ def _apply_toolkit_integration(
 
     if binding_path is not None:
         try:
-            from apcore_toolkit import BindingLoader
-        except ImportError:
-            # apcore-toolkit < 0.5.0 — silently skip the overlay (parity with
-            # TS main.ts:761 "apcore-toolkit < 0.5.0 (no BindingLoader)").
-            logger.warning("apcore-toolkit < 0.5.0: BindingLoader unavailable, --binding skipped")
-        else:
-            try:
-                loader = BindingLoader()
-                loaded = loader.load(binding_path)
-                scanned.extend(loaded)
-                logger.info(
-                    "BindingLoader: parsed %d module(s) from %s",
-                    len(loaded),
-                    binding_path,
-                )
-            except Exception as e:
-                logger.warning("BindingLoader failed on '%s': %s", binding_path, e)
+            loader = BindingLoader()
+            loaded = loader.load(binding_path)
+            scanned.extend(loaded)
+            logger.info(
+                "BindingLoader: parsed %d module(s) from %s",
+                len(loaded),
+                binding_path,
+            )
+        except Exception as e:
+            logger.warning("BindingLoader failed on '%s': %s", binding_path, e)
 
     if not scanned:
         return

{apcore_cli-0.9.0 → apcore_cli-0.10.1}/src/apcore_cli/init_cmd.py

@@ -7,6 +7,12 @@ from pathlib import Path
 
 import click
 
+# Templates emit `# TODO: implement` placeholders into the GENERATED user
+# module. These are user-facing scaffolding — not SDK source-level TODOs —
+# and intentionally match the parity templates in
+# `../apcore-cli-typescript/src/init-cmd.ts` and
+# `../apcore-cli-rust/src/init_cmd.rs`. Audit tools that grep for "TODO"
+# should treat occurrences inside the template literals below as expected.
 _DECORATOR_TEMPLATE = '''"""Module: {module_id}"""
 
 from apcore import module

{apcore_cli-0.9.0 → apcore_cli-0.10.1}/src/apcore_cli/output.py

@@ -8,7 +8,7 @@ import sys
 from typing import TYPE_CHECKING, Any
 
 import click
-from apcore_toolkit import format_csv, format_jsonl
+from apcore_toolkit import format_csv, format_jsonl, format_module, format_modules
 from rich.console import Console
 from rich.panel import Panel
 from rich.syntax import Syntax
@@ -23,12 +23,6 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
-_TOOLKIT_MISSING_HINT = (
-    "The 'markdown' and 'skill' output formats require the apcore-toolkit "
-    "extra. Install with: pip install 'apcore-cli[toolkit]'"
-)
-
-
 def _to_rows_for_tabular(value: Any) -> list[dict] | None:
     """Coerce an exec result into the row-shape expected by the toolkit's
     tabular formatters (csv / jsonl). Returns ``None`` for shapes that don't
@@ -140,11 +134,6 @@ def format_module_list(
 
         Console().print(table)
     elif format in ("markdown", "skill"):
-        try:
-            from apcore_toolkit import format_modules
-        except ImportError as exc:  # pragma: no cover - exercised via integration only
-            raise click.ClickException(_TOOLKIT_MISSING_HINT) from exc
-
         scanned = [_descriptor_to_scanned(m) for m in modules]
         click.echo(format_modules(scanned, style=format, display=True))
     elif format in ("json", "csv", "yaml", "jsonl"):
@@ -266,11 +255,6 @@ def format_module_detail(module_def: ModuleDescriptor, format: str) -> None:
             click.echo(f"\nTags: {', '.join(tags)}")
 
     elif format in ("markdown", "skill"):
-        try:
-            from apcore_toolkit import format_module
-        except ImportError as exc:  # pragma: no cover - exercised via integration only
-            raise click.ClickException(_TOOLKIT_MISSING_HINT) from exc
-
         click.echo(format_module(_descriptor_to_scanned(module_def), style=format, display=True))
 
     elif format == "json":

{apcore_cli-0.9.0 → apcore_cli-0.10.1}/src/apcore_cli/shell.py

@@ -597,46 +597,3 @@ def register_completion_command(apcli_group: click.Group, prog_name: str = "apco
         click.echo(generators[shell]())
 
     _ = completion_cmd
-
-
-def register_shell_commands(cli: click.Group, prog_name: str = "apcore-cli") -> None:
-    """Legacy wrapper — registers ``completion`` and ``man`` on the given group.
-
-    FE-13 canonical wiring attaches ``completion`` to the ``apcli`` group via
-    :func:`register_completion_command`; ``man`` remains at the root per
-    spec §4.1 (meta-commands stay at root). This shim preserves the pre-v0.7
-    flat shape for existing tests.
-    """
-    register_completion_command(cli, prog_name=prog_name)
-
-    @cli.command("man")
-    @click.argument("command")
-    @click.pass_context
-    def man_cmd(ctx: click.Context, command: str) -> None:
-        """Generate a roff man page for COMMAND and print it to stdout.
-
-        \b
-        View immediately:
-          PROG man list | man -
-          PROG man describe | col -bx | less
-
-        Install system-wide:
-          PROG man list > /usr/local/share/man/man1/PROG-list.1
-          mandb   # (Linux)   or   /usr/libexec/makewhatis   # (macOS)
-        """
-        parent = ctx.parent
-        if parent is None:
-            click.echo(f"Error: Unknown command '{command}'.", err=True)
-            sys.exit(2)
-
-        resolved_prog = ctx.find_root().info_name or prog_name
-        parent_group = parent.command
-        cmd = parent_group.commands.get(command) if isinstance(parent_group, click.Group) else None
-
-        known_builtins = {"completion", "describe", "exec", "init", "list", "man"}
-        if cmd is None and command not in known_builtins:
-            click.echo(f"Error: Unknown command '{command}'.", err=True)
-            sys.exit(2)
-
-        roff = _generate_man_page(command, cmd, resolved_prog)
-        click.echo(roff)

apcore_cli-0.10.1/tests/shell_test_utils.py

@@ -0,0 +1,49 @@
+"""Test-only helper that builds the pre-v0.7 *flat* CLI shape.
+
+The production CLI (``factory.create_cli``) registers ``completion`` under the
+``apcli`` builtin group and exposes ``man`` as a root ``--man`` overlay
+(``configure_man_help``). This helper instead reproduces the legacy flat shape —
+``completion`` and ``man`` as root subcommands — purely so the completion
+generators and the man-page builder can be exercised through a CLI in tests.
+
+Relocated from ``apcore_cli.shell.register_shell_commands`` (audit D9-001): the
+shim had zero production callers and was removed from the shipped package to
+match apcore-cli-rust and apcore-cli-typescript, both of which dropped the
+equivalent wrapper in v0.7.0 / FE-13. Keeping it here preserves the behavioral
+coverage without shipping dead code.
+"""
+
+import sys
+
+import click
+
+from apcore_cli.shell import _generate_man_page, register_completion_command
+
+
+def register_shell_commands(cli: click.Group, prog_name: str = "apcore-cli") -> None:
+    """Attach flat ``completion`` and ``man`` subcommands to *cli* (test-only)."""
+    register_completion_command(cli, prog_name=prog_name)
+
+    @cli.command("man")
+    @click.argument("command")
+    @click.pass_context
+    def man_cmd(ctx: click.Context, command: str) -> None:
+        """Generate a roff man page for COMMAND and print it to stdout."""
+        parent = ctx.parent
+        if parent is None:
+            click.echo(f"Error: Unknown command '{command}'.", err=True)
+            sys.exit(2)
+
+        resolved_prog = ctx.find_root().info_name or prog_name
+        parent_group = parent.command
+        cmd = parent_group.commands.get(command) if isinstance(parent_group, click.Group) else None
+
+        known_builtins = {"completion", "describe", "exec", "init", "list", "man"}
+        if cmd is None and command not in known_builtins:
+            click.echo(f"Error: Unknown command '{command}'.", err=True)
+            sys.exit(2)
+
+        roff = _generate_man_page(command, cmd, resolved_prog)
+        click.echo(roff)
+
+    _ = man_cmd

{apcore_cli-0.9.0 → apcore_cli-0.10.1}/tests/test_e2e.py

@@ -15,7 +15,8 @@ from click.testing import CliRunner
 
 from apcore_cli.cli import LazyModuleGroup, build_module_command, set_audit_logger
 from apcore_cli.discovery import register_discovery_commands
-from apcore_cli.shell import register_shell_commands
+
+from .shell_test_utils import register_shell_commands
 
 # ---------------------------------------------------------------------------
 # Real apcore module definitions

{apcore_cli-0.9.0 → apcore_cli-0.10.1}/tests/test_integration.py

@@ -9,7 +9,8 @@ from click.testing import CliRunner
 
 from apcore_cli.cli import LazyModuleGroup, build_module_command, set_audit_logger
 from apcore_cli.discovery import register_discovery_commands
-from apcore_cli.shell import register_shell_commands
+
+from .shell_test_utils import register_shell_commands
 
 
 def _make_module_def(

{apcore_cli-0.9.0 → apcore_cli-0.10.1}/tests/test_shell.py

@@ -9,9 +9,10 @@ from apcore_cli.shell import (
     _generate_zsh_completion,
     build_program_man_page,
     configure_man_help,
-    register_shell_commands,
 )
 
+from .shell_test_utils import register_shell_commands
+
 _PROG = "apcore-cli"
 
 

{apcore_cli-0.9.0 → apcore_cli-0.10.1}/tests/test_toolkit_integration.py

@@ -61,9 +61,9 @@ class TestApplyToolkitIntegration:
         fake_writer_cls = MagicMock(return_value=fake_writer)
 
         with (
-            patch("apcore_toolkit.BindingLoader", fake_loader_cls),
-            patch("apcore_toolkit.DisplayResolver", fake_resolver_cls),
-            patch("apcore_toolkit.RegistryWriter", fake_writer_cls),
+            patch("apcore_cli.factory.BindingLoader", fake_loader_cls),
+            patch("apcore_cli.factory.DisplayResolver", fake_resolver_cls),
+            patch("apcore_cli.factory.RegistryWriter", fake_writer_cls),
         ):
             registry = MagicMock()
             _apply_toolkit_integration(
@@ -92,9 +92,9 @@ class TestApplyToolkitIntegration:
         fake_writer.write.return_value = []
 
         with (
-            patch("apcore_toolkit.BindingLoader", MagicMock(return_value=fake_loader)),
-            patch("apcore_toolkit.DisplayResolver", MagicMock(return_value=MagicMock(resolve=lambda m, **kw: m))),
-            patch("apcore_toolkit.RegistryWriter", MagicMock(return_value=fake_writer)),
+            patch("apcore_cli.factory.BindingLoader", MagicMock(return_value=fake_loader)),
+            patch("apcore_cli.factory.DisplayResolver", MagicMock(return_value=MagicMock(resolve=lambda m, **kw: m))),
+            patch("apcore_cli.factory.RegistryWriter", MagicMock(return_value=fake_writer)),
         ):
             _apply_toolkit_integration(
                 MagicMock(),
@@ -121,10 +121,10 @@ class TestApplyToolkitIntegration:
         fake_writer.write.return_value = []
 
         with (
-            patch("apcore_toolkit.convention_scanner.ConventionScanner", fake_scanner_cls),
-            patch("apcore_toolkit.BindingLoader", MagicMock(return_value=fake_loader)),
-            patch("apcore_toolkit.DisplayResolver", MagicMock(return_value=MagicMock(resolve=lambda m, **kw: m))),
-            patch("apcore_toolkit.RegistryWriter", MagicMock(return_value=fake_writer)),
+            patch("apcore_cli.factory.ConventionScanner", fake_scanner_cls),
+            patch("apcore_cli.factory.BindingLoader", MagicMock(return_value=fake_loader)),
+            patch("apcore_cli.factory.DisplayResolver", MagicMock(return_value=MagicMock(resolve=lambda m, **kw: m))),
+            patch("apcore_cli.factory.RegistryWriter", MagicMock(return_value=fake_writer)),
         ):
             _apply_toolkit_integration(
                 MagicMock(),
@@ -138,54 +138,17 @@ class TestApplyToolkitIntegration:
         assert scan_module in written
         assert bind_module in written
 
-    def test_toolkit_missing_logs_warning_and_returns(self, caplog):
-        import builtins
-        import logging as pylogging
-
-        real_import = builtins.__import__
-
-        def fail_toolkit(name, *args, **kw):
-            if name == "apcore_toolkit":
-                raise ImportError("no toolkit")
-            return real_import(name, *args, **kw)
-
-        with (
-            caplog.at_level(pylogging.WARNING, logger="apcore_cli"),
-            patch("builtins.__import__", side_effect=fail_toolkit),
-        ):
-            _apply_toolkit_integration(
-                MagicMock(),
-                commands_dir="/cmds",
-                binding_path=None,
-                allowed_prefixes=None,
-            )
-        assert "apcore-toolkit not installed" in caplog.text
-
-    def test_binding_loader_missing_warns_but_continues(self, caplog):
-        """toolkit < 0.5.0 lacks BindingLoader — match TS parity: warn + skip."""
-        import builtins
-        import logging as pylogging
-
-        real_import = builtins.__import__
-
-        def partial_import(name, globals_=None, locals_=None, fromlist=(), level=0):
-            # Simulate toolkit installed but missing BindingLoader: when the
-            # factory tries `from apcore_toolkit import BindingLoader`, raise.
-            if name == "apcore_toolkit" and "BindingLoader" in (fromlist or ()):
-                raise ImportError("BindingLoader not in 0.4.x")
-            return real_import(name, globals_, locals_, fromlist, level)
-
-        with (
-            caplog.at_level(pylogging.WARNING, logger="apcore_cli"),
-            patch("builtins.__import__", side_effect=partial_import),
-        ):
-            _apply_toolkit_integration(
-                MagicMock(),
-                commands_dir=None,
-                binding_path="/bindings",
-                allowed_prefixes=None,
-            )
-        assert "BindingLoader unavailable" in caplog.text
+    # Removed in 0.10.0 (resolves 6.2): the prior graceful-fallback paths
+    # for "apcore-toolkit missing" and "apcore-toolkit < 0.5.0 (no
+    # BindingLoader)" no longer exist — apcore-toolkit >= 0.7.0 is a hard
+    # runtime dependency declared in pyproject.toml, so a missing or
+    # too-old toolkit is a ModuleNotFoundError at import time, not a
+    # silently logged WARNING. The two former tests
+    # (`test_toolkit_missing_logs_warning_and_returns` and
+    # `test_binding_loader_missing_warns_but_continues`) are intentionally
+    # deleted — they asserted behaviour that the fix removed. The
+    # import-time failure mode is already covered by Python's standard
+    # ModuleNotFoundError contract and does not need a bespoke test.
 
     def test_binding_loader_failure_is_soft(self, caplog):
         """BindingLoader.load() raises → WARN, don't crash create_cli."""
@@ -199,9 +162,9 @@ class TestApplyToolkitIntegration:
 
         with (
             caplog.at_level(pylogging.WARNING, logger="apcore_cli"),
-            patch("apcore_toolkit.BindingLoader", MagicMock(return_value=fake_loader)),
-            patch("apcore_toolkit.DisplayResolver", MagicMock()),
-            patch("apcore_toolkit.RegistryWriter", MagicMock()),
+            patch("apcore_cli.factory.BindingLoader", MagicMock(return_value=fake_loader)),
+            patch("apcore_cli.factory.DisplayResolver", MagicMock()),
+            patch("apcore_cli.factory.RegistryWriter", MagicMock()),
         ):
             _apply_toolkit_integration(
                 MagicMock(),
@@ -219,9 +182,9 @@ class TestApplyToolkitIntegration:
         fake_writer = MagicMock()
 
         with (
-            patch("apcore_toolkit.BindingLoader", MagicMock(return_value=fake_loader)),
-            patch("apcore_toolkit.DisplayResolver", MagicMock()),
-            patch("apcore_toolkit.RegistryWriter", MagicMock(return_value=fake_writer)),
+            patch("apcore_cli.factory.BindingLoader", MagicMock(return_value=fake_loader)),
+            patch("apcore_cli.factory.DisplayResolver", MagicMock()),
+            patch("apcore_cli.factory.RegistryWriter", MagicMock(return_value=fake_writer)),
         ):
             _apply_toolkit_integration(
                 MagicMock(),
@@ -320,9 +283,9 @@ class TestBindingPathStandaloneE2E:
         fake_writer.write.return_value = []
 
         with (
-            patch("apcore_toolkit.BindingLoader", MagicMock(return_value=fake_loader)),
-            patch("apcore_toolkit.DisplayResolver", MagicMock(return_value=MagicMock(resolve=lambda m, **kw: m))),
-            patch("apcore_toolkit.RegistryWriter", MagicMock(return_value=fake_writer)),
+            patch("apcore_cli.factory.BindingLoader", MagicMock(return_value=fake_loader)),
+            patch("apcore_cli.factory.DisplayResolver", MagicMock(return_value=MagicMock(resolve=lambda m, **kw: m))),
+            patch("apcore_cli.factory.RegistryWriter", MagicMock(return_value=fake_writer)),
         ):
             cli = create_cli(
                 extensions_dir=str(tmp_path),