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

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

@@ -5,6 +5,52 @@ 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.9.0] - 2026-05-13
+
+### Added
+
+- **`tests/conformance/test_snake_case_kwargs.py`** — runs the cross-language Algorithm C-SNAKE fixture (`apcore-cli/conformance/fixtures/snake-case-kwargs/cases.json`) against `build_module_command` via `click.testing.CliRunner`. Five cases verify that schema property names with underscores (`has_solution`, `sort_by`, `sort_order`) survive the round trip from CLI parse to the input dict received by `executor.call`. No source change required — click natively maps `--has-solution` to `has_solution`; the Python SDK is the parity reference for the parallel TypeScript fix. Surfaced as part of the cross-SDK regression coverage gap audit.
+
+### Fixed (2026-05-13 — cross-SDK audit D10/D11/D1)
+
+- **`ConfigEncryptor` LOGNAME key-derivation chain** (D10-001 / D11-003) — PBKDF2 username fallback was `USER → USERNAME → "unknown"` (3-tier); now `USER → LOGNAME → USERNAME → "unknown"` (4-tier) matching the spec and Rust. On hosts where `USER` is unset but `LOGNAME` is set (cron, `sudo -i`, container init), ciphertext written by the Python SDK now round-trips correctly with the Rust SDK. `src/apcore_cli/security/config_encryptor.py:96, 165`.
+- **`ConfigEncryptor.store` keyring write-failure not wrapped** (D11-004) — raw `keyring.set_password` exceptions now caught and re-raised as `ConfigDecryptionError`, matching TypeScript and Rust. `src/apcore_cli/security/config_encryptor.py:31`.
+- **`ref_resolver` only descended into `properties`** (D11-001) — recursive schema walk now visits every dict-valued child (items, additionalProperties, patternProperties, if/then/else, not, contains, propertyNames), matching TypeScript and Rust. `$ref` under array schemas and conditional schemas is now resolved. `src/apcore_cli/ref_resolver.py:142`.
+- **`ref_resolver` copy-on-write visited-set** (D11-002) — now uses a single mutable set with remove-on-unwind, allowing diamond `$ref` patterns (two sibling schemas referencing the same `$def`) to resolve correctly. `src/apcore_cli/ref_resolver.py:71`.
+- **`AuditLogger._get_user` uses real UID instead of effective UID** (D11-010) — switched from `os.getuid()` to `os.geteuid()` so audit records reflect the privileges the process actually runs with under `sudo` / setuid binaries. Matches Rust (`geteuid`) and TypeScript (`os.userInfo`). `src/apcore_cli/security/audit.py:77`.
+- **`check_approval` ignores `APCORE_CLI_APPROVAL_TIMEOUT` env var** (D11-012) — `CliApprovalHandler` and the legacy `check_approval()` wrapper now honor the env var when no explicit timeout is passed (precedence: constructor arg > env var > 60 s default). Matches TypeScript. `src/apcore_cli/approval.py`.
+- **`exec --dry-run` crashes with `AttributeError` when executor lacks `validate`** (D11-013) — guarded with `hasattr(executor, "validate")`; falls back to synthetic `{"valid": True}` matching TypeScript. `src/apcore_cli/discovery.py:378`.
+- **`CliApprovalHandler.request_approval` missing `requires_approval=False` short-circuit** (D11-014) — now returns `approved/not_required` when the request explicitly carries `requires_approval=False`, matching Rust. `src/apcore_cli/approval.py:66`.
+- **CLI brand string in auth error messages** (D11-006) — remediation strings now say `apcli config set auth.api_key` (canonical FE-13 name) instead of `apcore-cli config set auth.api_key`. `src/apcore_cli/security/auth.py`.
+- **`reconvert_enum_values` missing from public re-export** (D1-W2) — added to `__init__.py` import block and `__all__`. Embedders can now `from apcore_cli import reconvert_enum_values` for parity with TypeScript and Rust.
+- **Ref-resolver error hierarchy missing from public re-export** (D1-W3) — `CircularRefError`, `MaxDepthExceededError`, `UnresolvableRefError`, `RefResolverError` added to `__init__.py` import block and `__all__`. Parity with TypeScript `index.ts:82-84`.
+- **`DEFAULT_BUILTIN_GROUP_NAME` missing from public re-export** (D1 re-audit) — added to `__init__.py`. Parity with Rust `lib.rs:190`.
+- **Dead exit-code constants removed** (D9-W1) — `EXIT_CONFIG_ENV_PREFIX_CONFLICT` and `EXIT_CONFIG_ENV_MAP_CONFLICT` (both = 78, zero callers) deleted from `src/apcore_cli/exit_codes.py`.
+- **Unused `pytest-asyncio` dev dependency removed** (D6) — the package was declared but never exercised; no async tests exist. Removed from `[project.optional-dependencies].dev`.
+
+### Fixed
+
+- **CSV `--format csv` Python-repr bug** — `csv.DictWriter` was called with `{k: str(v) for k, v in row.items()}` which emitted Python repr `{'k': 'v'}` (single quotes) for nested dict/list values. The output was not valid JSON and any downstream JSON parser would fail. Now delegates to `apcore_toolkit.format_csv(rows)` which emits canonical compact JSON. `src/apcore_cli/output.py:149, 378`.
+- **CSV heterogeneous-keys data loss** — header is now the union of keys across all rows (was first-row only via `list(rows[0].keys())`).
+- **CSV line terminator** — now `\r\n` per RFC 4180.
+- **JSONL canonical form** — now compact (no spaces between separators), matching the cross-SDK contract. Tests updated.
+
+### Changed
+
+- **User-visible help/man/completion text no longer leaks the `apcore` framework name** to end users of downstream CLIs built on apcore-cli. Affected strings: `init` group description (`Scaffold new apcore modules` → `Scaffold new modules`, `init_cmd.py:45`), `--extensions-dir` option help (`Path to apcore extensions directory.` → `Path to extensions directory.`, `factory.py:460`), zsh/fish completion descriptions for `exec` (`Execute an apcore module` → `Execute a module`, `shell.py:130, 211`), and man-page `ENVIRONMENT` section text (`shell.py:299, 314, 319, 458`) — drops `apcore` from the descriptive copy (`Path to the apcore extensions directory` → `Path to the extensions directory`, `Global apcore logging verbosity` → `Global logging verbosity`, `API key for authenticating with the apcore registry` → `API key for authenticating with the registry`). Logger names, source comments, module docstrings, and environment-variable identifiers (`APCORE_*`) are unchanged — only descriptive copy that appears in `--help`, shell completion, and `man` output. Cross-SDK parity with TypeScript 0.8.2 and Rust 0.8.1.
+
+### Changed (breaking CLI surface)
+
+- **Global `--verbose` flag renamed to `--all-options`** — The help-display flag is now `--all-options`; use `apcore-cli module --help --all-options` to reveal hidden built-in options. `verbose` is removed from the reserved schema property names set — module schemas may now freely define `verbose: boolean` for runtime output control. Internal API: `set_verbose_help()` renamed to `set_all_options_help()`; module-level global `_verbose_help` renamed to `_all_options_help`. Tracked in [apcore-cli#21](https://github.com/aiperceivable/apcore-cli/issues/21).
+
+### Changed (breaking dependency semantics)
+
+- **`apcore-toolkit` promoted from optional extra to REQUIRED runtime dependency** (`>=0.7.0`). The previous `pip install 'apcore-cli[toolkit]'` extras pattern is retained as a no-op for backward compat with install scripts, but the toolkit is now always installed alongside apcore-cli. All `--format` operations route through the toolkit's reference implementation for csv/jsonl/markdown/skill.
+
+### Why
+
+See ADR-09 in `apcore-cli/docs/tech-design.md` for the byte-equivalent toolkit-delegated tier rationale.
+
 
 ## [0.8.0] - 2026-05-08
 

{apcore_cli-0.8.0 → apcore_cli-0.9.0}/CLAUDE.md

@@ -28,15 +28,16 @@
 
 - Python >= 3.11
 - Key dependencies: click >= 8.1, rich >= 13.0, jsonschema >= 4.20, pyyaml >= 6.0, keyring >= 24, cryptography >= 41
-- Runtime: apcore >= 0.19.0 (v0.7.0 bump, was 0.17.1)
-- Optional: apcore-toolkit >= 0.4 (install via `pip install apcore-cli[toolkit]`)
+- Runtime: apcore >= 0.21.0 (v0.9.0 bump, was 0.19.0 at v0.7.0)
+- Runtime (required, v0.9.0+): apcore-toolkit >= 0.7.0. The `[toolkit]` extras group is retained as a no-op for downstream install scripts.
 - Dev: pytest, pytest-asyncio, pytest-cov, mypy, ruff
 
-## v0.7.0 Conventions
+## v0.9.0 Conventions
 
 - Public surface (`__init__.py`): `__version__`, `create_cli`, `ExposureFilter`,
   `ApcliGroup`, `ApcliMode`, `RESERVED_GROUP_NAMES`, `CliApprovalHandler`,
   `resolve_refs`, `schema_to_click_options`, `format_exec_result`,
+  `set_verbose_help`, `set_docs_url`, `set_audit_logger`,
   `ConfigResolver`, `AuditLogger`, `AuthProvider`, `ConfigEncryptor`, `Sandbox`,
   plus error classes (AuthenticationError, ConfigDecryptionError,
   ModuleExecutionError, ApprovalTimeoutError, ApprovalDeniedError).
@@ -45,9 +46,16 @@
 - ExposureFilter + `expose=` kwarg on create_cli (FE-12).
 - `extra_commands=[...]` kwarg on create_cli as the FE-11 extension point (with
   collision detection against RESERVED_GROUP_NAMES — `BUILTIN_COMMANDS` retired v0.7.0).
+- `builtin_group_name="apcli"` kwarg on create_cli (v0.8.0+) for embed-API renaming (FE-13).
 - Default click Group class is `GroupedModuleGroup` (multi-level grouping since v0.3.0).
-- All apcore-cli commands live under the `apcli` group (FE-13). Deprecation shims
-  remain at root level for back-compat until v0.8.
+- All apcore-cli commands live exclusively under the `apcli` group (FE-13). Root-level
+  deprecation shims were removed in v0.9.0 (deprecated in v0.8.x).
+- `--verbose` global flag renamed to `--all-options` in v0.9.0; `set_verbose_help(bool)` is
+  the programmatic equivalent (internal name retained for back-compat; Rust uses `set_all_options_help`).
+- `verbose` removed from reserved schema property names set in v0.9.0; modules may now
+  define `verbose: boolean` freely.
+- apcore-toolkit promoted from optional to REQUIRED runtime dep in v0.9.0; csv/jsonl/markdown/skill
+  output formats now toolkit-delegated (ADR-09).
 - `system_cmd` module registers runtime system commands (health/usage/enable/disable/
   reload/config) — FE-11.
 - `strategy` module registers describe-pipeline + --strategy flag — FE-11.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apcore-cli
-Version: 0.8.0
+Version: 0.9.0
 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,6 +21,7 @@ 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: click>=8.1
 Requires-Dist: cryptography>=41.0
@@ -32,12 +33,10 @@ Provides-Extra: dev
 Requires-Dist: apdev[dev]>=0.2.3; extra == 'dev'
 Requires-Dist: mypy>=1.0; extra == 'dev'
 Requires-Dist: pre-commit>=3.5; extra == 'dev'
-Requires-Dist: pytest-asyncio>=0.23; extra == 'dev'
 Requires-Dist: pytest-cov>=4.0; extra == 'dev'
 Requires-Dist: pytest>=7.0; extra == 'dev'
 Requires-Dist: ruff>=0.1; extra == 'dev'
 Provides-Extra: toolkit
-Requires-Dist: apcore-toolkit>=0.6; extra == 'toolkit'
 Description-Content-Type: text/markdown
 
 <div align="center">
@@ -90,10 +89,10 @@ Terminal adapter for apcore. Execute AI-Perceivable modules from the command lin
 pip install apcore-cli
 ```
 
-Requires Python 3.11+ and `apcore >= 0.21.0`. The optional `toolkit` extra requires `apcore-toolkit >= 0.6`:
+Requires Python 3.11+, `apcore >= 0.21.0`, and `apcore-toolkit >= 0.7.0` (now a **required** runtime dependency as of v0.9.0 — previously optional; see the [tech-design ADR-09](https://github.com/aiperceivable/apcore-cli/blob/main/docs/tech-design.md) for the byte-equivalent toolkit-delegated tier rationale). The `[toolkit]` extras group is retained as a no-op for backward compat:
 
 ```bash
-pip install "apcore-cli[toolkit]"
+pip install "apcore-cli[toolkit]"   # equivalent to plain `pip install apcore-cli`
 ```
 
 ## Quick Start
@@ -168,7 +167,7 @@ The `apcore_cli` package re-exports the following public surface (see [`src/apco
 | Export | Description |
 |--------|-------------|
 | `__version__` | Package version string |
-| `create_cli(...)` | Factory that builds a ready-to-invoke `click.Group`. See the [`create_cli` reference](https://github.com/aiperceivable/apcore-cli) in the docs site for the full 13-parameter signature: `extensions_dir`, `prog_name`, `commands_dir`, `binding_path`, `registry`, `executor`, `extra_commands`, `app`, `expose`, **`apcli`** (FE-13 P0 break), `allowed_prefixes`, `version`, `description`. The `app`, `allowed_prefixes`, `version`, and `description` parameters were added in v0.8.0. |
+| `create_cli(...)` | Factory that builds a ready-to-invoke `click.Group`. See the [`create_cli` reference](https://github.com/aiperceivable/apcore-cli) in the docs site for the full 14-parameter signature: `extensions_dir`, `prog_name`, `commands_dir`, `binding_path`, `registry`, `executor`, `extra_commands`, `app`, `expose`, **`apcli`** (FE-13 P0 break), `allowed_prefixes`, `version`, `description`, **`builtin_group_name`** (default `"apcli"`, v0.8.0+). |
 | `ApcliGroup`, `ApcliMode`, `RESERVED_GROUP_NAMES` | FE-13 built-in `apcli` group surface (P0 break in v0.8.0). |
 | `ExposureFilter` | Declarative filter controlling which modules are exposed by the CLI (FE-12). |
 | `CliApprovalHandler`, `check_approval` | TTY-aware HITL approval handler / helper (FE-11). |
@@ -314,12 +313,12 @@ apcore-cli [OPTIONS] COMMAND [ARGS]
 | `--log-level` | `WARNING` | Logging: `DEBUG`, `INFO`, `WARNING`, `ERROR` |
 | `--version` | | Show version and exit |
 | `--help` | | Show help and exit |
-| `--verbose` | | Show hidden built-in options in `--help` output |
+| `--all-options` | | Show hidden built-in options in `--help` output |
 | `--man` | | Print man page to stdout (use with `--help`) |
 
 ### Built-in Commands
 
-apcore-cli ships with 13 built-in commands, all accessible under the `apcli` subgroup (e.g. `apcore-cli apcli list`). Root-level shims emit a deprecation warning in v0.8.x and are scheduled for removal in v0.9. Use `apcore-cli apcli <subcommand>` to avoid the warning.
+apcore-cli ships with 13 built-in commands, all accessible under the `apcli` subgroup (e.g. `apcore-cli apcli list`). Root-level shims were removed in v0.9.0 (they emitted deprecation warnings in v0.8.x). Use `apcore-cli apcli <subcommand>`.
 
 **Module invocation**
 
@@ -358,14 +357,14 @@ The full-program man page is reachable via the root flag combination `apcore-cli
 
 ### Module Execution Options
 
-When executing a module (e.g. `apcore-cli math add`), these built-in options are available (hidden by default; pass `--help --verbose` to display them):
+When executing a module (e.g. `apcore-cli math add`), these built-in options are available (hidden by default; pass `--help --all-options` to display them):
 
 | Option | Description |
 |--------|-------------|
 | `--input -` | Read JSON input from STDIN |
 | `--yes` / `-y` | Bypass approval prompts |
 | `--large-input` | Allow STDIN input larger than 10MB |
-| `--format` | Output format: `{json, table, csv, yaml, jsonl}` |
+| `--format` | Output format: `{json, table, csv, yaml, jsonl, markdown, skill}`. **v0.9.0:** `csv` and `jsonl` are byte-identical across SDKs (delegated to `apcore-toolkit.format_csv` / `format_jsonl`); fixes the prior `str(v)` Python-repr bug for nested values. |
 | `--sandbox` | Run module in subprocess sandbox *(not yet implemented)* |
 | `--dry-run` | Run preflight checks without executing (FE-11, v0.6.0) |
 | `--trace` | Emit execution pipeline trace (v0.6.0) |
@@ -505,7 +504,7 @@ apcore-cli (the adapter)
     +-- system_cmd                Runtime system-management (health/usage/enable/disable/reload/config)
     +-- strategy                  Execution strategy dispatch (--strategy flag and describe-pipeline)
     +-- init_cmd                  Module scaffolding (init subcommand)
-    +-- set_verbose_help          Toggle built-in option visibility
+    +-- set_verbose_help          Toggle built-in option visibility (internal name; controls --all-options behaviour)
     +-- set_docs_url              Set base URL for online docs
     +-- build_program_man_page    Full-program roff man page
     +-- configure_man_help        Add --help --man support to any CLI

{apcore_cli-0.8.0 → apcore_cli-0.9.0}/README.md

@@ -48,10 +48,10 @@ Terminal adapter for apcore. Execute AI-Perceivable modules from the command lin
 pip install apcore-cli
 ```
 
-Requires Python 3.11+ and `apcore >= 0.21.0`. The optional `toolkit` extra requires `apcore-toolkit >= 0.6`:
+Requires Python 3.11+, `apcore >= 0.21.0`, and `apcore-toolkit >= 0.7.0` (now a **required** runtime dependency as of v0.9.0 — previously optional; see the [tech-design ADR-09](https://github.com/aiperceivable/apcore-cli/blob/main/docs/tech-design.md) for the byte-equivalent toolkit-delegated tier rationale). The `[toolkit]` extras group is retained as a no-op for backward compat:
 
 ```bash
-pip install "apcore-cli[toolkit]"
+pip install "apcore-cli[toolkit]"   # equivalent to plain `pip install apcore-cli`
 ```
 
 ## Quick Start
@@ -126,7 +126,7 @@ The `apcore_cli` package re-exports the following public surface (see [`src/apco
 | Export | Description |
 |--------|-------------|
 | `__version__` | Package version string |
-| `create_cli(...)` | Factory that builds a ready-to-invoke `click.Group`. See the [`create_cli` reference](https://github.com/aiperceivable/apcore-cli) in the docs site for the full 13-parameter signature: `extensions_dir`, `prog_name`, `commands_dir`, `binding_path`, `registry`, `executor`, `extra_commands`, `app`, `expose`, **`apcli`** (FE-13 P0 break), `allowed_prefixes`, `version`, `description`. The `app`, `allowed_prefixes`, `version`, and `description` parameters were added in v0.8.0. |
+| `create_cli(...)` | Factory that builds a ready-to-invoke `click.Group`. See the [`create_cli` reference](https://github.com/aiperceivable/apcore-cli) in the docs site for the full 14-parameter signature: `extensions_dir`, `prog_name`, `commands_dir`, `binding_path`, `registry`, `executor`, `extra_commands`, `app`, `expose`, **`apcli`** (FE-13 P0 break), `allowed_prefixes`, `version`, `description`, **`builtin_group_name`** (default `"apcli"`, v0.8.0+). |
 | `ApcliGroup`, `ApcliMode`, `RESERVED_GROUP_NAMES` | FE-13 built-in `apcli` group surface (P0 break in v0.8.0). |
 | `ExposureFilter` | Declarative filter controlling which modules are exposed by the CLI (FE-12). |
 | `CliApprovalHandler`, `check_approval` | TTY-aware HITL approval handler / helper (FE-11). |
@@ -272,12 +272,12 @@ apcore-cli [OPTIONS] COMMAND [ARGS]
 | `--log-level` | `WARNING` | Logging: `DEBUG`, `INFO`, `WARNING`, `ERROR` |
 | `--version` | | Show version and exit |
 | `--help` | | Show help and exit |
-| `--verbose` | | Show hidden built-in options in `--help` output |
+| `--all-options` | | Show hidden built-in options in `--help` output |
 | `--man` | | Print man page to stdout (use with `--help`) |
 
 ### Built-in Commands
 
-apcore-cli ships with 13 built-in commands, all accessible under the `apcli` subgroup (e.g. `apcore-cli apcli list`). Root-level shims emit a deprecation warning in v0.8.x and are scheduled for removal in v0.9. Use `apcore-cli apcli <subcommand>` to avoid the warning.
+apcore-cli ships with 13 built-in commands, all accessible under the `apcli` subgroup (e.g. `apcore-cli apcli list`). Root-level shims were removed in v0.9.0 (they emitted deprecation warnings in v0.8.x). Use `apcore-cli apcli <subcommand>`.
 
 **Module invocation**
 
@@ -316,14 +316,14 @@ The full-program man page is reachable via the root flag combination `apcore-cli
 
 ### Module Execution Options
 
-When executing a module (e.g. `apcore-cli math add`), these built-in options are available (hidden by default; pass `--help --verbose` to display them):
+When executing a module (e.g. `apcore-cli math add`), these built-in options are available (hidden by default; pass `--help --all-options` to display them):
 
 | Option | Description |
 |--------|-------------|
 | `--input -` | Read JSON input from STDIN |
 | `--yes` / `-y` | Bypass approval prompts |
 | `--large-input` | Allow STDIN input larger than 10MB |
-| `--format` | Output format: `{json, table, csv, yaml, jsonl}` |
+| `--format` | Output format: `{json, table, csv, yaml, jsonl, markdown, skill}`. **v0.9.0:** `csv` and `jsonl` are byte-identical across SDKs (delegated to `apcore-toolkit.format_csv` / `format_jsonl`); fixes the prior `str(v)` Python-repr bug for nested values. |
 | `--sandbox` | Run module in subprocess sandbox *(not yet implemented)* |
 | `--dry-run` | Run preflight checks without executing (FE-11, v0.6.0) |
 | `--trace` | Emit execution pipeline trace (v0.6.0) |
@@ -463,7 +463,7 @@ apcore-cli (the adapter)
     +-- system_cmd                Runtime system-management (health/usage/enable/disable/reload/config)
     +-- strategy                  Execution strategy dispatch (--strategy flag and describe-pipeline)
     +-- init_cmd                  Module scaffolding (init subcommand)
-    +-- set_verbose_help          Toggle built-in option visibility
+    +-- set_verbose_help          Toggle built-in option visibility (internal name; controls --all-options behaviour)
     +-- set_docs_url              Set base URL for online docs
     +-- build_program_man_page    Full-program roff man page
     +-- configure_man_help        Add --help --man support to any CLI

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "apcore-cli"
-version = "0.8.0"
+version = "0.9.0"
 description = "Terminal adapter for apcore — execute AI-Perceivable modules from the command line"
 readme = "README.md"
 license = "Apache-2.0"
@@ -27,6 +27,7 @@ classifiers = [
 ]
 dependencies = [
     "apcore>=0.21.0",
+    "apcore-toolkit>=0.7.0",
     "click>=8.1",
     "jsonschema>=4.20",
     "rich>=13.0",
@@ -39,15 +40,15 @@ dependencies = [
 dev = [
     "apdev[dev]>=0.2.3",
     "pytest>=7.0",
-    "pytest-asyncio>=0.23",
     "pytest-cov>=4.0",
     "mypy>=1.0",
     "ruff>=0.1",
     "pre-commit>=3.5",
 ]
-toolkit = [
-    "apcore-toolkit>=0.6",
-]
+# `toolkit` is kept as a no-op extras group for backward compat with downstream
+# `apcore-cli[toolkit]` install commands; apcore-toolkit is now a required
+# runtime dependency (see ADR-09).
+toolkit = []
 
 [project.scripts]
 apcore-cli = "apcore_cli.__main__:main"

{apcore_cli-0.8.0 → apcore_cli-0.9.0}/src/apcore_cli/__init__.py

@@ -17,6 +17,7 @@ from apcore_cli.approval import (
 )
 from apcore_cli.builtin_group import (
     APCLI_SUBCOMMAND_NAMES,
+    DEFAULT_BUILTIN_GROUP_NAME,
     RESERVED_GROUP_NAMES,
     ApcliConfig,
     ApcliGroup,
@@ -26,6 +27,7 @@ from apcore_cli.builtin_group import (
 from apcore_cli.cli import (
     build_module_command,
     collect_input,
+    set_all_options_help,
     set_audit_logger,
     set_docs_url,
     set_verbose_help,
@@ -77,8 +79,14 @@ from apcore_cli.output import (
     format_module_list,
     resolve_format,
 )
-from apcore_cli.ref_resolver import resolve_refs
-from apcore_cli.schema_parser import schema_to_click_options
+from apcore_cli.ref_resolver import (
+    CircularRefError,
+    MaxDepthExceededError,
+    RefResolverError,
+    UnresolvableRefError,
+    resolve_refs,
+)
+from apcore_cli.schema_parser import reconvert_enum_values, schema_to_click_options
 from apcore_cli.security.audit import AuditLogger
 from apcore_cli.security.auth import AuthenticationError, AuthProvider
 from apcore_cli.security.config_encryptor import ConfigDecryptionError, ConfigEncryptor
@@ -114,6 +122,7 @@ __all__ = [
     "ApcliGroupError",
     "ApcliMode",
     "APCLI_SUBCOMMAND_NAMES",
+    "DEFAULT_BUILTIN_GROUP_NAME",
     "RESERVED_GROUP_NAMES",
     # FE-11 approval
     "CliApprovalHandler",
@@ -123,6 +132,7 @@ __all__ = [
     # Schema / output / ref resolution
     "resolve_refs",
     "schema_to_click_options",
+    "reconvert_enum_values",  # parity with TS reconvertEnumValues / Rust reconvert_enum_values
     "format_exec_result",
     "format_module_list",
     "format_module_detail",
@@ -139,8 +149,9 @@ __all__ = [
     "build_module_command",
     "collect_input",
     "validate_module_id",
+    "set_all_options_help",
     "set_audit_logger",
-    "set_verbose_help",
+    "set_verbose_help",  # deprecated alias for set_all_options_help
     "set_docs_url",
     # Per-subcommand registrar factories (parity with TS/Rust embedder API).
     "register_list_command",
@@ -164,6 +175,11 @@ __all__ = [
     "ConfigDecryptionError",
     "ModuleExecutionError",
     "ModuleNotFoundError",
+    # Ref-resolver error hierarchy (parity with TS index.ts:82-84).
+    "RefResolverError",
+    "CircularRefError",
+    "MaxDepthExceededError",
+    "UnresolvableRefError",
     # Deprecated alias kept for backward compat — prefer ModuleNotFoundError.
     # Will be removed in v0.10.0.
     "CliModuleNotFoundError",

{apcore_cli-0.8.0 → apcore_cli-0.9.0}/src/apcore_cli/approval.py

@@ -44,6 +44,33 @@ def _get_annotation(annotations: Any, key: str, default: Any = None) -> Any:
     return getattr(annotations, key, default)
 
 
+def _read_timeout_from_env() -> int | None:
+    """Parse APCORE_CLI_APPROVAL_TIMEOUT, warn on malformed, return None on absent/invalid.
+
+    D11-012 cross-SDK parity: TS's `readTimeoutFromEnv()` reads the same
+    variable; Rust will be aligned in a follow-up. Documented precedence is
+    `CLI flag > env var > 60s default`.
+    """
+    raw = os.environ.get("APCORE_CLI_APPROVAL_TIMEOUT")
+    if raw is None or raw == "":
+        return None
+    try:
+        parsed = int(raw)
+    except ValueError:
+        print(
+            f"Warning: APCORE_CLI_APPROVAL_TIMEOUT='{raw}' is not an integer. Ignoring.",
+            file=sys.stderr,
+        )
+        return None
+    if parsed <= 0:
+        print(
+            f"Warning: APCORE_CLI_APPROVAL_TIMEOUT='{raw}' must be > 0. Ignoring.",
+            file=sys.stderr,
+        )
+        return None
+    return parsed
+
+
 # ---------------------------------------------------------------------------
 # CliApprovalHandler — implements apcore ApprovalHandler protocol (FE-11 §3.5)
 # ---------------------------------------------------------------------------
@@ -59,8 +86,13 @@ class CliApprovalHandler:
     Pass to Executor via ``executor.set_approval_handler(handler)``.
     """
 
-    def __init__(self, auto_approve: bool = False, timeout: int = 60) -> None:
+    def __init__(self, auto_approve: bool = False, timeout: int | None = None) -> None:
         self.auto_approve = auto_approve
+        # D11-012: default-timeout resolution honors APCORE_CLI_APPROVAL_TIMEOUT
+        # env var when caller did not pass an explicit timeout. Precedence:
+        # constructor arg > env var > 60s default. Matches TS readTimeoutFromEnv.
+        if timeout is None:
+            timeout = _read_timeout_from_env() or 60
         self.timeout = max(1, min(timeout, 3600))
 
     async def request_approval(self, request: Any) -> Any:
@@ -72,6 +104,20 @@ class CliApprovalHandler:
         """
         module_id = getattr(request, "module_id", "unknown")
 
+        # D11-014: defense-in-depth — short-circuit when the request explicitly
+        # declares it does not require approval. Matches Rust approval.rs:421
+        # (`if !get_requires_approval(module_def) { return Approved::not_required }`).
+        requires_attr = getattr(request, "requires_approval", None)
+        if requires_attr is False:
+            return {"status": "approved", "approved_by": "not_required"}
+        module_def = getattr(request, "module_def", None)
+        if module_def is not None:
+            annotations = getattr(module_def, "annotations", None)
+            if annotations is not None:
+                requires = _get_annotation(annotations, "requires_approval", None)
+                if requires is False:
+                    return {"status": "approved", "approved_by": "not_required"}
+
         # Bypass: auto_approve flag
         if self.auto_approve:
             logger.info("Approval bypassed via --yes flag for module '%s'.", module_id)
@@ -130,7 +176,7 @@ class CliApprovalHandler:
 # ---------------------------------------------------------------------------
 
 
-def check_approval(module_def: Any, auto_approve: bool, timeout: int = 60) -> None:
+def check_approval(module_def: Any, auto_approve: bool, timeout: int | None = None) -> None:
     """Check if module requires approval and handle accordingly.
 
     Returns None if approved (or approval not required).
@@ -155,6 +201,10 @@ def check_approval(module_def: Any, auto_approve: bool, timeout: int = 60) -> No
     if requires is not True:
         return
 
+    # D11-012: resolve timeout precedence — explicit arg > APCORE_CLI_APPROVAL_TIMEOUT env > 60s.
+    if timeout is None:
+        timeout = _read_timeout_from_env() or 60
+
     module_id = getattr(module_def, "module_id", getattr(module_def, "canonical_id", "unknown"))
 
     # Bypass: --yes flag (highest priority)

{apcore_cli-0.8.0 → apcore_cli-0.9.0}/src/apcore_cli/cli.py

@@ -46,14 +46,26 @@ logger = logging.getLogger("apcore_cli.cli")
 # Module-level audit logger, set during CLI init
 _audit_logger: AuditLogger | None = None
 
-# Module-level verbose help flag, set during CLI init
-_verbose_help: bool = False
+# Module-level all-options help flag, set during CLI init
+_all_options_help: bool = False
+
+
+def set_all_options_help(all_options: bool) -> None:
+    """Set the all-options help flag. When False, built-in options are hidden.
+
+    Controls the ``--all-options`` flag introduced in FR-DISP-007 (v0.9.0).
+    """
+    global _all_options_help
+    _all_options_help = all_options
 
 
 def set_verbose_help(verbose: bool) -> None:
-    """Set the verbose help flag. When False, built-in options are hidden."""
-    global _verbose_help
-    _verbose_help = verbose
+    """Deprecated alias for :func:`set_all_options_help`.
+
+    The name ``set_verbose_help`` is kept for backward compatibility.
+    Use ``set_all_options_help`` in new code.
+    """
+    set_all_options_help(verbose)
 
 
 # Module-level docs URL, set by downstream projects
@@ -411,7 +423,7 @@ class GroupedModuleGroup(LazyModuleGroup):
         # Footer hints for discoverability
         formatter.write_paragraph()
         formatter.write(
-            "Use --help --verbose to show all options (including built-in options).\n"
+            "Use --help --all-options to show all options (including built-in options).\n"
             "Use --help --man to display a formatted man page."
         )
 
@@ -807,8 +819,8 @@ def build_module_command(
 
     # Build the command with schema-generated options + built-in options
     _epilog_parts: list[str] = []
-    if not _verbose_help:
-        _epilog_parts.append("Use --verbose to show all options (including built-in options).")
+    if not _all_options_help:
+        _epilog_parts.append("Use --all-options to show all options (including built-in options).")
     if _docs_url:
         _epilog_parts.append(f"Docs: {_docs_url}/commands/{effective_cmd_name}")
     _epilog = "\n".join(_epilog_parts) if _epilog_parts else None
@@ -819,8 +831,8 @@ def build_module_command(
         epilog=_epilog,
     )
 
-    # Add built-in options (hidden unless --verbose is passed with --help)
-    _hide = not _verbose_help
+    # Add built-in options (hidden unless --all-options is passed with --help)
+    _hide = not _all_options_help
     cmd.params.append(
         click.Option(
             ["--input"],
@@ -936,7 +948,7 @@ def build_module_command(
         "format",
         "fields",
         "sandbox",
-        "verbose",
+        "all_options",
         "dry_run",
         "trace",
         "stream",

{apcore_cli-0.8.0 → apcore_cli-0.9.0}/src/apcore_cli/discovery.py

@@ -371,11 +371,17 @@ def register_exec_command(
 
         audit_start = time.monotonic()
         try:
-            timeout = approval_timeout if approval_timeout is not None else 60
-            check_approval(module_def, auto_approve=auto_approve, timeout=timeout)
+            # D11-012: pass approval_timeout through unchanged; check_approval
+            # internally resolves explicit arg > APCORE_CLI_APPROVAL_TIMEOUT env > 60s.
+            check_approval(module_def, auto_approve=auto_approve, timeout=approval_timeout)
 
             if dry_run:
-                preflight = executor.validate(module_id, merged)
+                # D11-013: defensive guard mirroring TS discovery.ts:334. Some
+                # embedder-provided Executor subclasses lack `validate`; emit a
+                # synthetic `{valid: True}` preflight instead of crashing with
+                # AttributeError. Rust uses build_preflight_result for the same
+                # synthetic fallback.
+                preflight = executor.validate(module_id, merged) if hasattr(executor, "validate") else {"valid": True}
                 format_preflight_result(preflight, output_format)
                 return
 

{apcore_cli-0.8.0 → apcore_cli-0.9.0}/src/apcore_cli/exit_codes.py

@@ -40,11 +40,9 @@ EXIT_CONFIG_BIND_ERROR = 65
 EXIT_CONFIG_MOUNT_ERROR = 66
 EXIT_ERROR_FORMATTER_DUPLICATE = 70
 EXIT_ACL_DENIED = 77
-# All four namespace/env errors share exit code 78 per protocol spec.
+# Both namespace errors share exit code 78 per protocol spec.
 EXIT_CONFIG_NAMESPACE_RESERVED = 78
 EXIT_CONFIG_NAMESPACE_DUPLICATE = 78
-EXIT_CONFIG_ENV_PREFIX_CONFLICT = 78
-EXIT_CONFIG_ENV_MAP_CONFLICT = 78
 EXIT_SIGINT = 130
 
 # ---------------------------------------------------------------------------

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

@@ -55,10 +55,10 @@ logger = logging.getLogger("apcore_cli")
 EXIT_CONFIG_NOT_FOUND = 47
 
 
-def _has_verbose_flag(argv: list[str] | None = None) -> bool:
-    """Check if --verbose is present in argv (pre-parse, before Click)."""
+def _has_all_options_flag(argv: list[str] | None = None) -> bool:
+    """Check if --all-options is present in argv (pre-parse, before Click)."""
     args = argv if argv is not None else sys.argv[1:]
-    return "--verbose" in args
+    return "--all-options" in args
 
 
 def create_cli(
@@ -166,9 +166,9 @@ def create_cli(
     if prog_name is None:
         prog_name = os.path.basename(sys.argv[0]) or "apcore-cli"
 
-    # Pre-parse --verbose before Click runs so build_module_command knows
+    # Pre-parse --all-options before Click runs so build_module_command knows
     # whether to hide built-in options.
-    verbose = _has_verbose_flag()
+    verbose = _has_all_options_flag()
     set_verbose_help(verbose)
 
     # Resolve CLI log level (3-tier precedence, evaluated before Click runs):
@@ -423,8 +423,8 @@ def create_cli(
         help="Log verbosity. Overrides APCORE_CLI_LOGGING_LEVEL and APCORE_LOGGING_LEVEL env vars.",
     )
     @click.option(
-        "--verbose",
-        "verbose_help",
+        "--all-options",
+        "all_options_help",
         is_flag=True,
         default=False,
         help="Show all options in help output (including built-in options).",
@@ -433,7 +433,7 @@ def create_cli(
     def cli(
         ctx: click.Context,
         log_level: str | None = None,
-        verbose_help: bool = False,
+        all_options_help: bool = False,
         **_discovery_opts: Any,  # --extensions-dir/--commands-dir/--binding when standalone
     ) -> None:
         if log_level is not None:
@@ -443,7 +443,7 @@ def create_cli(
             logging.getLogger("apcore").setLevel(apcore_level)
         ctx.ensure_object(dict)
         ctx.obj["extensions_dir"] = ext_dir
-        ctx.obj["verbose_help"] = verbose_help
+        ctx.obj["all_options_help"] = all_options_help
         ctx.obj["exposure_filter"] = exposure_filter
 
     # FE-13 §4.1 / FR-13-13: --extensions-dir, --commands-dir, --binding are
@@ -457,7 +457,7 @@ def create_cli(
                 click.Option(
                     ["--extensions-dir", "extensions_dir_opt"],
                     default=None,
-                    help="Path to apcore extensions directory.",
+                    help="Path to extensions directory.",
                 ),
                 click.Option(
                     ["--commands-dir", "commands_dir_opt"],

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

@@ -42,7 +42,7 @@ def register_init_command(cli: click.Group) -> None:
 
     @cli.group("init")
     def init_group():
-        """Scaffold new apcore modules."""
+        """Scaffold new modules."""
         pass
 
     @init_group.command("module")