mostlyright-data 0.20.1__tar.gz → 0.20.2__tar.gz

{mostlyright_data-0.20.1 → mostlyright_data-0.20.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mostlyright-data
-Version: 0.20.1
+Version: 0.20.2
 Summary: Mostly Right hosted CLI for reviewed datasets
 Project-URL: Homepage, https://mostlyright.md/
 Project-URL: Documentation, https://mostlyright.md/docs/guides/cli/

{mostlyright_data-0.20.1 → mostlyright_data-0.20.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mostlyright-data"
-version = "0.20.1"
+version = "0.20.2"
 description = "Mostly Right hosted CLI for reviewed datasets"
 readme = "README.md"
 requires-python = ">=3.11"

{mostlyright_data-0.20.1 → mostlyright_data-0.20.2}/src/mostlyright/data_harness/ux/commands/auth.py

@@ -509,6 +509,19 @@ def recover_payload(
         with credential_lock(store.config_dir):
             envelope = store.load_under_held_lock()
             if envelope is None:
+                if local_only:
+                    # Resume a crash after deleting an empty pending store but before
+                    # removing its selector. Never claim remote cleanup from local absence.
+                    remove_credential_manifest_under_held_lock(path)
+                    return _with_environment_authority(
+                        {
+                            "schema_version": _RECOVERY_SCHEMA,
+                            "status": "local_recovery_completed",
+                            "remote_revocation": "unproved",
+                            "local_state": "removed",
+                            "mint_outcome": "unproved",
+                        }
+                    )
                 return _mutation_error(
                     _RECOVERY_SCHEMA,
                     status="refused",
@@ -534,16 +547,37 @@ def recover_payload(
                 )
             if envelope.state == "login_pending":
                 if not local_only:
-                    return _mutation_error(
-                        _RECOVERY_SCHEMA, status="refused", local_state="pending"
+                    return {
+                        **_mutation_error(
+                            _RECOVERY_SCHEMA, status="refused", local_state="pending"
+                        ),
+                        "next_action": "Finish or stop the previous sign-in. If it has stopped, "
+                        "run mr-data auth recover --local-only, then retry logout or login. "
+                        "Local recovery does not prove remote revocation.",
+                    }
+                # The outer lock already owns this generation. Calling the standalone
+                # recovery helper here would try to acquire the same non-reentrant lock.
+                if envelope.active is None:
+                    # Keep the selector retryable if the native delete refuses access.
+                    store.delete_under_held_lock(
+                        expected_generation=envelope.generation,
+                        expected_states=frozenset({"login_pending"}),
+                    )
+                    remove_credential_manifest_under_held_lock(path)
+                else:
+                    store.replace_under_held_lock(
+                        CredentialEnvelope.active_envelope(
+                            generation=envelope.generation + 1, active=envelope.active
+                        ),
+                        expected_generation=envelope.generation,
+                        expected_states=frozenset({"login_pending"}),
                     )
-                store.recover_login_lease_local_only()
                 return _with_environment_authority(
                     {
                         "schema_version": _RECOVERY_SCHEMA,
                         "status": "local_recovery_completed",
                         "remote_revocation": "unproved",
-                        "local_state": "recovered",
+                        "local_state": "active" if envelope.active is not None else "removed",
                         "mint_outcome": "unproved",
                     }
                 )