mammoth-cli 2.2.69__tar.gz → 2.2.70__tar.gz

{mammoth_cli-2.2.69 → mammoth_cli-2.2.70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mammoth-cli
-Version: 2.2.69
+Version: 2.2.70
 Summary: Command-line interface for the Mammoth Analytics platform
 Project-URL: homepage, https://mammoth.io
 Project-URL: repository, https://github.com/EdgeMetric/mammothsdk
@@ -17,7 +17,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: <3.15,>=3.12
 Requires-Dist: jsonschema>=4.20
 Requires-Dist: keyring<26,>=25.7
-Requires-Dist: mammoth-io<0.9,>=0.8.31
+Requires-Dist: mammoth-io<0.9,>=0.8.32
 Requires-Dist: platformdirs<5,>=4.10
 Requires-Dist: pydantic<3,>=2.12.5
 Requires-Dist: pyyaml<7,>=6

{mammoth_cli-2.2.69 → mammoth_cli-2.2.70}/mammoth_cli/__init__.py

@@ -6,7 +6,7 @@ not implement a second HTTP client and does not call private SDK members.
 
 from __future__ import annotations
 
-__version__ = "2.2.69"
+__version__ = "2.2.70"
 
 # The versioned machine output envelope contract.
 SCHEMA_VERSION = 1

{mammoth_cli-2.2.69 → mammoth_cli-2.2.70}/mammoth_cli/context/oauth.py

@@ -44,6 +44,7 @@ from mammoth_cli.errors.envelope import EXIT_AUTH, EXIT_USAGE, CliError
 OAUTH_CLIENT_IDS: dict[str, str] = {
     "challenger": "oc_aea5c2ce829da3f8",
     "koyal": "oc_f2566336e235795c",
+    "app": "oc_b559f85cfb4de34c",
 }
 
 #: Refresh when the access token has less than this long to live.

{mammoth_cli-2.2.69 → mammoth_cli-2.2.70}/mammoth_cli/runtime/executor.py

@@ -17,6 +17,7 @@ from typing import Any
 import typer
 
 from mammoth_cli.errors.envelope import (
+    EXIT_AUTH,
     EXIT_USAGE,
     CliError,
     cancelled_error,
@@ -242,6 +243,7 @@ def run(
     # The update notice is read from the daily cache (no network); the cache
     # itself is refreshed only after the command has produced its output.
     update = updates.available_update(command_id)
+    report_failed = False
     try:
         _validate_output(output)
         _refuse_if_embedded(command_id)
@@ -254,6 +256,10 @@ def run(
         update = updates.available_update(command_id)
         emit_success(command_id, data, output, update_available=update, **meta_extra)
         updates.emit_hint(update, output=output)
+        # doctor prints its report either way; a failed report must not exit 0.
+        report_failed = (
+            command_id == "doctor" and isinstance(data, dict) and data.get("ok") is False
+        )
     except CliError as error:
         running = (
             running_handle(error, command_id)
@@ -292,9 +298,11 @@ def run(
         fail(mapped_error)
         raise typer.Exit(mapped_error.exit_status) from None
     if run_log is not None:
-        run_log.finish(0)
+        run_log.finish(EXIT_AUTH if report_failed else 0)
     updates.refresh_in_background(command_id)
     _sync_skill_installs(command_id, output)
+    if report_failed:
+        raise typer.Exit(EXIT_AUTH)
 
 
 def _sync_skill_installs(command_id: str, output: str) -> None:

{mammoth_cli-2.2.69 → mammoth_cli-2.2.70}/mammoth_cli/services/mapping.py

@@ -358,16 +358,25 @@ def map_sdk_exception(
         if mismatch is not None:
             return mismatch
         in_app = embedded.active()
+        server_hint = getattr(exc, "hint", None)
+        server_code = getattr(exc, "error_code", None)
         return CliError(
             code=CODE_AUTHENTICATION_FAILED,
-            message="Mammoth rejected the provided credentials.",
+            message=(
+                "Mammoth rejected the provided credentials."
+                if server_code is None
+                else f"Mammoth rejected the provided credentials [{server_code}]."
+            ),
             exit_status=EXIT_AUTH,
             hint=(
-                EMBEDDED_AUTH_HINT
-                if in_app
-                else (
-                    "Your sign-in may have expired or been revoked: "
-                    "run `mammoth auth login` again, or check the API token."
+                server_hint
+                or (
+                    EMBEDDED_AUTH_HINT
+                    if in_app
+                    else (
+                        "Your sign-in may have expired or been revoked: "
+                        "run `mammoth auth login` again, or check the API token."
+                    )
                 )
             ),
             details=_metadata(exc),

{mammoth_cli-2.2.69 → mammoth_cli-2.2.70}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "mammoth-cli"
-version = "2.2.69"
+version = "2.2.70"
 description = "Command-line interface for the Mammoth Analytics platform"
 authors = [{name = "Mammoth Analytics", email = "support@mammoth.io"}]
 readme = "README.md"
 license = "LicenseRef-Proprietary"
 requires-python = ">=3.12,<3.15"
 dependencies = [
-    "mammoth-io (>=0.8.31,<0.9)",
+    "mammoth-io (>=0.8.32,<0.9)",
     "typer (>=0.27,<0.28)",
     "rich (>=15,<16)",
     "platformdirs (>=4.10,<5)",

{mammoth_cli-2.2.69 → mammoth_cli-2.2.70}/spec/manifests/commands/doctor.yaml

@@ -31,5 +31,5 @@ commands:
   - CT-DOCTOR-ERROR
   draft_test: null
   undo_test: null
-  known_restrictions: null
+  known_restrictions: Prints the report either way; exits 4 when the report's ok is false.
   reviewed_by: primary