netconverter-cli 0.7.2__tar.gz → 0.7.3__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (129) hide show
  1. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/CHANGELOG.md +6 -0
  2. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/PKG-INFO +2 -2
  3. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/README.md +1 -1
  4. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/docs/COMMANDS.md +4 -0
  5. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/docs/VERIFICATION.md +17 -0
  6. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/pyproject.toml +1 -1
  7. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/__init__.py +1 -1
  8. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/clerk.py +63 -16
  9. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/mcp_server.py +21 -2
  10. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/remote_mcp.py +17 -2
  11. netconverter_cli-0.7.3/tests/test_clerk_recovery_issue_11.py +350 -0
  12. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/.gitignore +0 -0
  13. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/LICENSE +0 -0
  14. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/QUICK_START.md +0 -0
  15. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/SECURITY.md +0 -0
  16. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/docs/PRIVACY.md +0 -0
  17. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/docs/RELEASING.md +0 -0
  18. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/docs/connect/README.md +0 -0
  19. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/docs/connect/chatgpt.md +0 -0
  20. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/docs/connect/claude-ai.md +0 -0
  21. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/docs/connect/claude-code.md +0 -0
  22. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/docs/connect/claude-desktop.md +0 -0
  23. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/docs/connect/compatibility.md +0 -0
  24. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/docs/connect/getting-access.md +0 -0
  25. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/docs/connect/openclaw.md +0 -0
  26. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/docs/connect/other-assistants.md +0 -0
  27. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/docs/guided-workflows.md +0 -0
  28. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/examples/README.md +0 -0
  29. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/activity.py +0 -0
  30. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/api.py +0 -0
  31. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/backend.py +0 -0
  32. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/branding.py +0 -0
  33. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/catalog.py +0 -0
  34. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/cli.py +0 -0
  35. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/commands.py +0 -0
  36. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/connect.py +0 -0
  37. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/connect_openclaw.py +0 -0
  38. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/controller.py +0 -0
  39. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/credential_file.py +0 -0
  40. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/credentials.py +0 -0
  41. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/design_catalog.py +0 -0
  42. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/diagrams.py +0 -0
  43. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/draft_cli.py +0 -0
  44. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/draft_io.py +0 -0
  45. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/drafts.py +0 -0
  46. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/errors.py +0 -0
  47. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/exposure.py +0 -0
  48. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/guided.py +0 -0
  49. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/guided_operations.json +0 -0
  50. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/guided_projects.json +0 -0
  51. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/job_options.py +0 -0
  52. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/license.py +0 -0
  53. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/mcp_client_features.py +0 -0
  54. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/mcp_workflows.py +0 -0
  55. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/one_shot.py +0 -0
  56. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/palette.py +0 -0
  57. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/presentation.py +0 -0
  58. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/privacy.py +0 -0
  59. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/privacy_apply.py +0 -0
  60. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/privacy_cli.py +0 -0
  61. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/project_cli.py +0 -0
  62. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/projects.py +0 -0
  63. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/providers.py +0 -0
  64. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/setup.py +0 -0
  65. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/summary.py +0 -0
  66. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/tui.py +0 -0
  67. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/update.py +0 -0
  68. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/walkthrough.py +0 -0
  69. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/windows_draft_io.py +0 -0
  70. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/src/netconverter_cli/workspace.py +0 -0
  71. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/conftest.py +0 -0
  72. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/fixtures/jobs/opt_4056e02e5b66.json +0 -0
  73. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/fixtures/jobs/tra_4058ef406cd6.json +0 -0
  74. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/fixtures/jobs/tra_running.json +0 -0
  75. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/fixtures/jobs/val_9f9acb9b5a59.json +0 -0
  76. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/fixtures/jobs/val_9f9acb9b5a59.sarif +0 -0
  77. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_autodetect_v5.py +0 -0
  78. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_boundaries.py +0 -0
  79. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_bridge_polish_021.py +0 -0
  80. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_clerk.py +0 -0
  81. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_clerk_host_binding.py +0 -0
  82. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_cli_020.py +0 -0
  83. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_connect_030.py +0 -0
  84. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_connect_031.py +0 -0
  85. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_connect_compat_014.py +0 -0
  86. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_connect_direct_entry.py +0 -0
  87. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_connect_openclaw_014.py +0 -0
  88. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_credential_file_010.py +0 -0
  89. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_diagrams.py +0 -0
  90. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_download_analysis.py +0 -0
  91. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_draft_cli.py +0 -0
  92. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_draft_io.py +0 -0
  93. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_draft_jobs.py +0 -0
  94. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_drafts.py +0 -0
  95. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_errors_009.py +0 -0
  96. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_exposure_levels_013.py +0 -0
  97. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_folders_cd_ls.py +0 -0
  98. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_guided_full_api_019.py +0 -0
  99. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_guided_mapping_012.py +0 -0
  100. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_guided_prescan_037.py +0 -0
  101. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_help_008.py +0 -0
  102. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_inline.py +0 -0
  103. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_keyring_bus_017.py +0 -0
  104. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_keyring_timeout_010.py +0 -0
  105. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_license.py +0 -0
  106. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_mcp.py +0 -0
  107. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_mcp_auth_016.py +0 -0
  108. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_mcp_features_020.py +0 -0
  109. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_mcp_jobs.py +0 -0
  110. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_mcp_workflows.py +0 -0
  111. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_options_011_019.py +0 -0
  112. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_polish_028.py +0 -0
  113. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_presentation.py +0 -0
  114. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_privacy_apply_013.py +0 -0
  115. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_privacy_cli_013.py +0 -0
  116. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_projects.py +0 -0
  117. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_protocols.py +0 -0
  118. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_readonly_workspace.py +0 -0
  119. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_sessions.py +0 -0
  120. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_setup.py +0 -0
  121. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_signin_default.py +0 -0
  122. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_stage_029.py +0 -0
  123. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_strict_default_011.py +0 -0
  124. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_strict_view_015.py +0 -0
  125. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_summary_007.py +0 -0
  126. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_update.py +0 -0
  127. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_vendor_error_022.py +0 -0
  128. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_walkthrough.py +0 -0
  129. {netconverter_cli-0.7.2 → netconverter_cli-0.7.3}/tests/test_windows_draft_io.py +0 -0
@@ -1,5 +1,11 @@
1
1
  # Changelog
2
2
 
3
+ ## 0.7.3 — 2026-11-03
4
+
5
+ - Recover an expired Clerk sign-in in the running MCP bridge after a separate `netconverter login --clerk`, without restarting the assistant.
6
+ - Keep REST and remote MCP on the same credential, clear previous-login session/view/confirmation caches, and preserve a newer login when an older refresh or logout finishes.
7
+ - Refuse rejected credentials left behind by a failed store deletion; preserve bounded refresh and trusted-host restrictions.
8
+
3
9
  ## 0.7.2 — 2026-11-02
4
10
 
5
11
  - Validation downloads include canonical NCIR, receipt JSON, TXT, PDF and XLSX from the governed export API, alongside the summary JSON.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.5
2
2
  Name: netconverter-cli
3
- Version: 0.7.2
3
+ Version: 0.7.3
4
4
  Summary: NetConverter CLI — any-vendor network configuration migration, validation and optimization, and a local MCP bridge for your AI assistant
5
5
  Project-URL: Homepage, https://netconverter.ai
6
6
  Project-URL: Repository, https://github.com/valeronlabs/netconverter_terminals
@@ -42,7 +42,7 @@ Description-Content-Type: text/markdown
42
42
  NetConverter — by ValeronLabs LLC.
43
43
 
44
44
  ```text
45
- ◆ NetConverter v0.7.2 ● Server ◆ Bridge claude-code · 2m ago
45
+ ◆ NetConverter v0.7.3 ● Server ◆ Bridge claude-code · 2m ago
46
46
  ▍ Start
47
47
  ▍ /convert Migrate a configuration to another vendor
48
48
  ▍ /validate Check a configuration before migrating
@@ -7,7 +7,7 @@
7
7
  NetConverter — by ValeronLabs LLC.
8
8
 
9
9
  ```text
10
- ◆ NetConverter v0.7.2 ● Server ◆ Bridge claude-code · 2m ago
10
+ ◆ NetConverter v0.7.3 ● Server ◆ Bridge claude-code · 2m ago
11
11
  ▍ Start
12
12
  ▍ /convert Migrate a configuration to another vendor
13
13
  ▍ /validate Check a configuration before migrating
@@ -352,3 +352,7 @@ file is reported as a missing file, never as "not signed in".
352
352
  Use the server job ID and client version when asking for help. Do not attach
353
353
  real configurations, credentials, object names, addresses, or unredacted reports
354
354
  to public issues. Redacted reproductions with synthetic data are preferred.
355
+
356
+ ### Re-login while the MCP bridge is running
357
+
358
+ From 0.7.3, after an expired Clerk login, run `netconverter login --clerk` in a terminal. The running bridge reads the replacement from the same credential store on its next call; REST and remote tools keep using Clerk. Cached session, view and confirmation state is discarded, so an earlier confirmation token must be requested again. If the store is locked, unlock it and retry. Older installed bridges need one reconnect after upgrading to load the new code.
@@ -2,6 +2,23 @@
2
2
 
3
3
  Updated for client 0.1.5, October 1, 2026.
4
4
 
5
+ ## 0.7.3 Clerk recovery candidate
6
+
7
+ The complete client suite passed: **875 passed, 24 skipped**. Seventeen synthetic
8
+ recovery cases include a persistent newline-delimited MCP server, external saved-login
9
+ replacement, remote session/view reset, stale confirmation refusal, failed deletion,
10
+ logout and locked-store recovery. The focused authentication suite passed 84 tests;
11
+ the frozen 0.7.2 implementation failed 14 of the 17 regression cases.
12
+
13
+ The built 0.7.3 wheel was installed in an isolated macOS environment. A genuine MCP
14
+ SDK client negotiated protocol 2025-11-25 and successfully read the authenticated
15
+ account and paginated evidence for an existing synthetic job. No configuration was
16
+ uploaded and no real credential was expired or revoked. This proves installed-wheel
17
+ read compatibility; expired-session recovery itself is tested with synthetic stores
18
+ and transports. Windows and other assistant UI acceptance are not newly claimed.
19
+
20
+ Release publication remains separate from this candidate verification.
21
+
5
22
  ## 0.3.0 status: pending
6
23
 
7
24
  Not verified for 0.3.0. The client suite passes with mocked servers and a mocked
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
4
4
 
5
5
  [project]
6
6
  name = "netconverter-cli"
7
- version = "0.7.2"
7
+ version = "0.7.3"
8
8
  description = "NetConverter CLI — any-vendor network configuration migration, validation and optimization, and a local MCP bridge for your AI assistant"
9
9
  readme = "README.md"
10
10
  license = "LicenseRef-NetConverter-Proprietary"
@@ -1,3 +1,3 @@
1
1
  """NetConverter CLI: file transfer and conversation are separate paths."""
2
2
 
3
- __version__ = "0.7.2"
3
+ __version__ = "0.7.3"
@@ -25,7 +25,7 @@ from urllib.parse import parse_qs, urlencode, urlsplit
25
25
 
26
26
  import httpx
27
27
 
28
- from .credentials import CredentialStoreError, delete_secret, load_secret, prepare_store, save_secret
28
+ from .credentials import CredentialStoreError, KeyringLocked, delete_secret, load_secret, prepare_store, save_secret
29
29
  from .errors import SIGNED_OUT
30
30
 
31
31
  ISSUER = "https://clerk.netconverter.ai"
@@ -481,6 +481,8 @@ class ClerkSession:
481
481
  self._transport = transport
482
482
  self._clock = clock
483
483
  self._tokens = self.store.load()
484
+ self._invalidated_fingerprint: str | None = None
485
+ self._session_generation = 0
484
486
  self._discovery: Discovery | None = None
485
487
  self._lock = threading.Lock()
486
488
 
@@ -493,8 +495,35 @@ class ClerkSession:
493
495
  self._discovery = discover(http, self.issuer)
494
496
  return self._discovery
495
497
 
498
+ @staticmethod
499
+ def _fingerprint(tokens: TokenSet) -> str:
500
+ # Keep only a digest of rejected credentials, not another token copy.
501
+ value = json.dumps([tokens.access_token, tokens.refresh_token])
502
+ return hashlib.sha256(value.encode()).hexdigest()
503
+
504
+ def _reload_locked(self) -> bool:
505
+ """Recover a later login from this session's existing issuer-bound store."""
506
+ if self._tokens is not None:
507
+ return False
508
+ try:
509
+ saved = self.store.load()
510
+ except (CredentialStoreError, KeyringLocked):
511
+ raise ClerkError("Could not read your NetConverter sign-in; unlock the credential store and retry") from None
512
+ if saved is None or self._fingerprint(saved) == self._invalidated_fingerprint:
513
+ return False
514
+ self._tokens = saved
515
+ self._session_generation += 1
516
+ return True
517
+
518
+ def session_generation(self) -> int:
519
+ """Reload a later login and identify caches belonging to an older login."""
520
+ with self._lock:
521
+ self._reload_locked()
522
+ return self._session_generation
523
+
496
524
  def token(self) -> str:
497
525
  with self._lock:
526
+ self._reload_locked()
498
527
  if self._tokens is None:
499
528
  raise ClerkError(SIGNED_OUT)
500
529
  if self._tokens.expired(self._clock()) and self._tokens.refresh_token:
@@ -503,6 +532,10 @@ class ClerkSession:
503
532
 
504
533
  def refresh(self) -> bool:
505
534
  with self._lock:
535
+ # A new login already replaced the refused token; don't immediately
536
+ # exchange its refresh token in response to the old request's 401.
537
+ if self._reload_locked() and not self._tokens.expired(self._clock()):
538
+ return True
506
539
  if self._tokens is None or not self._tokens.refresh_token:
507
540
  return False
508
541
  try:
@@ -517,8 +550,14 @@ class ClerkSession:
517
550
  tokens = refresh_tokens(http, self._disc(http), self._tokens.refresh_token)
518
551
  except OAuthError as exc:
519
552
  if exc.error in {"invalid_grant", "invalid_token", "unauthorized_client"}:
520
- self.store.clear()
553
+ self._invalidated_fingerprint = self._fingerprint(self._tokens)
521
554
  self._tokens = None
555
+ self._session_generation += 1
556
+ # A separate login may have finished while refresh was in
557
+ # flight. Its replacement must not be cleared by this failure.
558
+ saved = self.store.load()
559
+ if saved is not None and self._fingerprint(saved) == self._invalidated_fingerprint:
560
+ self.store.clear()
522
561
  raise ClerkError(
523
562
  "Your NetConverter sign-in expired; run `netconverter login --clerk`"
524
563
  ) from None
@@ -547,20 +586,28 @@ class ClerkSession:
547
586
  return {}
548
587
 
549
588
  def revoke_and_clear(self) -> bool:
550
- tokens, self._tokens = self._tokens, None
551
- if tokens:
552
- try:
553
- with _http(self._transport) as http:
554
- disc = self._disc(http)
555
- if disc.revocation_endpoint:
556
- for value, hint in ((tokens.refresh_token, "refresh_token"),
557
- (tokens.access_token, "access_token")):
558
- if value:
559
- http.post(disc.revocation_endpoint, data={
560
- "token": value, "token_type_hint": hint, "client_id": CLIENT_ID})
561
- except (httpx.HTTPError, ClerkError):
562
- pass # local removal below is what logout guarantees
563
- return self.store.clear()
589
+ with self._lock:
590
+ self._reload_locked()
591
+ tokens, self._tokens = self._tokens, None
592
+ if tokens:
593
+ self._invalidated_fingerprint = self._fingerprint(tokens)
594
+ self._session_generation += 1
595
+ if tokens:
596
+ try:
597
+ with _http(self._transport) as http:
598
+ disc = self._disc(http)
599
+ if disc.revocation_endpoint:
600
+ for value, hint in ((tokens.refresh_token, "refresh_token"),
601
+ (tokens.access_token, "access_token")):
602
+ if value:
603
+ http.post(disc.revocation_endpoint, data={
604
+ "token": value, "token_type_hint": hint, "client_id": CLIENT_ID})
605
+ except (httpx.HTTPError, ClerkError):
606
+ pass # local removal below is what logout guarantees
607
+ saved = self.store.load()
608
+ if tokens and saved and self._fingerprint(saved) != self._fingerprint(tokens):
609
+ return True # a later login is not the session being revoked
610
+ return self.store.clear()
564
611
 
565
612
 
566
613
  UNNAMED_ORG = "(unnamed organization)"
@@ -27,7 +27,7 @@ from pathlib import Path
27
27
  from . import __version__, activity, update
28
28
  from .api import APIError, Client, ExternalClient
29
29
  from .backend import EXTERNAL_MAX_BYTES, detect_profile, download_external, submit_external
30
- from .clerk import ClerkError
30
+ from .clerk import ClerkError, ClerkSession
31
31
  from .controller import fetch_artifacts
32
32
  from .credentials import keyring_problem
33
33
  from . import errors, job_options, mcp_workflows
@@ -465,6 +465,7 @@ class Bridge:
465
465
  self._draft_service = draft_service
466
466
  self.server = server
467
467
  self.rest_credential = rest_credential
468
+ self._credential_generation = 0
468
469
  self.remote = remote
469
470
  self._server_view: str | None = None # the server's view mode for this session, once known
470
471
  self._view_warned = False
@@ -489,6 +490,16 @@ class Bridge:
489
490
  # -- REST clients ------------------------------------------------------
490
491
 
491
492
  def _reload_credential(self) -> None:
493
+ if isinstance(self.rest_credential, ClerkSession):
494
+ generation = self.rest_credential.session_generation()
495
+ if generation != self._credential_generation:
496
+ self._credential_generation = generation
497
+ self._profile, self._server_view = None, None
498
+ self._view_warned = False
499
+ self._remote_names.clear()
500
+ self._confirm_tokens.clear()
501
+ if isinstance(self.remote, RemoteMCP):
502
+ self.remote.sync_login()
492
503
  if self.rest_credential is not None or self._credential_loader is None:
493
504
  return
494
505
  try:
@@ -506,9 +517,9 @@ class Bridge:
506
517
 
507
518
  def profile(self) -> tuple[str, frozenset]:
508
519
  """('external', job types) for full API credentials, ('quick', ...) for terminal keys."""
520
+ self._reload_credential()
509
521
  if self._profile:
510
522
  return self._profile
511
- self._reload_credential()
512
523
  if self.rest_credential is None:
513
524
  self._client(ExternalClient) # raises not_signed_in
514
525
  try:
@@ -1119,6 +1130,10 @@ class Bridge:
1119
1130
  "text": json.dumps(payload, sort_keys=True)}]}
1120
1131
 
1121
1132
  def list_tools(self) -> list[dict]:
1133
+ try:
1134
+ self._reload_credential()
1135
+ except (ClerkError, RemoteError):
1136
+ return [json.loads(json.dumps(tool)) for tool in LOCAL_TOOLS]
1122
1137
  if self.guided:
1123
1138
  return mcp_workflows.tools_for(self._guided_request("capabilities", {}))
1124
1139
  tools = [json.loads(json.dumps(tool)) for tool in LOCAL_TOOLS]
@@ -1153,6 +1168,10 @@ class Bridge:
1153
1168
  return tools
1154
1169
 
1155
1170
  def call(self, name: str, arguments: dict) -> dict:
1171
+ try:
1172
+ self._reload_credential()
1173
+ except (ClerkError, RemoteError) as exc:
1174
+ return _error_result("not_signed_in", str(exc))
1156
1175
  if self.guided:
1157
1176
  return self._guided_call(name, arguments)
1158
1177
  if name in LOCAL_NAMES:
@@ -12,7 +12,7 @@ import json
12
12
  import httpx
13
13
 
14
14
  from .api import BearerAuth, as_credential, check_url
15
- from .clerk import ClerkError
15
+ from .clerk import ClerkError, ClerkSession
16
16
 
17
17
  DEFAULT_MCP_URL = "https://api.netconverter.ai/mcp/v1/"
18
18
  CLIENT_PROTOCOL = "2025-06-18"
@@ -45,9 +45,11 @@ class RemoteMCP:
45
45
  self.view_mode = view_mode # requested on every request (#15, #13); the server decides
46
46
  self._account_view: str | None = None
47
47
  self.view_details: dict = {} # get_account's view fields, once known
48
+ self.credential = as_credential(credential)
49
+ self._credential_generation = 0
48
50
  self.http = httpx.Client(
49
51
  timeout=90,
50
- auth=BearerAuth(as_credential(credential)),
52
+ auth=BearerAuth(self.credential),
51
53
  transport=transport,
52
54
  follow_redirects=False,
53
55
  trust_env=False,
@@ -61,6 +63,17 @@ class RemoteMCP:
61
63
  def close(self):
62
64
  self.http.close()
63
65
 
66
+ def sync_login(self):
67
+ if isinstance(self.credential, ClerkSession):
68
+ try:
69
+ generation = self.credential.session_generation()
70
+ except ClerkError as exc:
71
+ raise RemoteError("unauthorized", str(exc)) from None
72
+ if generation != self._credential_generation:
73
+ self._credential_generation = generation
74
+ self.session_id, self.protocol, self._initialized = None, None, False
75
+ self._account_view, self.view_details = None, {}
76
+
64
77
  # -- transport ---------------------------------------------------------
65
78
 
66
79
  def _headers(self) -> dict:
@@ -164,6 +177,7 @@ class RemoteMCP:
164
177
  self._initialized = True
165
178
 
166
179
  def rpc(self, method: str, params: dict | None = None) -> dict:
180
+ self.sync_login()
167
181
  if not self._initialized:
168
182
  self._initialize()
169
183
  try:
@@ -194,6 +208,7 @@ class RemoteMCP:
194
208
 
195
209
  None when the server does not say (an older server, a refused call).
196
210
  """
211
+ self.sync_login()
197
212
  if self._account_view is None:
198
213
  payload = self.call_tool("get_account", {})
199
214
  self._account_view = _view_mode_of(payload) or ""
@@ -0,0 +1,350 @@
1
+ """Public #11: an existing MCP process recovers a renewed Clerk sign-in.
2
+
3
+ Synthetic stores and MockTransport only. No OS credentials or live requests.
4
+ """
5
+ import json
6
+ import io
7
+ import time
8
+
9
+ import httpx
10
+ import pytest
11
+
12
+ from netconverter_cli import cli, update
13
+ from netconverter_cli.clerk import ClerkError, ClerkSession, TokenSet
14
+ from netconverter_cli.credentials import CredentialStoreError, KeyringLocked
15
+ from netconverter_cli.mcp_server import Bridge, StdioServer
16
+ from netconverter_cli.remote_mcp import RemoteMCP
17
+ from tests.test_clerk import form, oauth_server
18
+ from tests.test_mcp import AccountServer, RemoteServer
19
+
20
+
21
+ class Store:
22
+ def __init__(self, value=None, *, clear_works=True):
23
+ self.value = value
24
+ self.clear_works = clear_works
25
+
26
+ def load(self):
27
+ return self.value
28
+
29
+ def save(self, value):
30
+ self.value = value
31
+ return True
32
+
33
+ def clear(self):
34
+ if self.clear_works:
35
+ self.value = None
36
+ return self.clear_works
37
+
38
+
39
+ def tokens(name, *, expired=False):
40
+ return TokenSet('synthetic-access-' + name, 'synthetic-refresh-' + name,
41
+ 0 if expired else time.time() + 3600)
42
+
43
+
44
+ def failed_session(store, *, during_failure=None):
45
+ attempts = []
46
+
47
+ def reject(request):
48
+ attempts.append(form(request))
49
+ if during_failure:
50
+ during_failure()
51
+ return httpx.Response(400, json={'error': 'invalid_grant'})
52
+
53
+ transport, _ = oauth_server(reject)
54
+ return ClerkSession(store, transport=transport), attempts
55
+
56
+
57
+ def invalidate(session):
58
+ with pytest.raises(ClerkError):
59
+ session.token()
60
+
61
+
62
+ def rpc_account(server, request_id):
63
+ # Actual JSON-RPC dispatch/response serialization, same server and credential.
64
+ request = json.loads(json.dumps({'jsonrpc': '2.0', 'id': request_id,
65
+ 'method': 'tools/call', 'params': {'name': 'account', 'arguments': {}}}))
66
+ response = json.loads(json.dumps(server.handle(request)))
67
+ return response, json.loads(response['result']['content'][0]['text'])
68
+
69
+
70
+ def test_persistent_mcp_account_recovers_external_login_without_principal_fallback(tmp_path, monkeypatch, capsys):
71
+ store = Store(tokens('old', expired=True))
72
+ credential, refreshes = failed_session(store)
73
+ api = AccountServer({'principal': {'kind': 'clerk_oauth'}, 'tier': 'professional'},
74
+ {'job_types': ['convert', 'validate']})
75
+ monkeypatch.setattr(update, 'status', lambda: {'latest': None, 'update_available': None})
76
+ bridge = Bridge(tmp_path, 'https://api.netconverter.ai/external/v1', credential,
77
+ transport=httpx.MockTransport(api), credential_source='clerk_session',
78
+ credential_loader=lambda: pytest.fail('must not switch to an API key or another principal'))
79
+ server = StdioServer(bridge)
80
+ _, first = rpc_account(server, 1)
81
+ assert first.get('signed_in') is False or first.get('error') == 'not_signed_in'
82
+ assert len(refreshes) == 1 and not api.requests
83
+
84
+ # Another terminal process has saved a successful replacement login.
85
+ replacement = tokens('renewed')
86
+ store.save(replacement)
87
+ response, second = rpc_account(server, 2)
88
+ assert second.get('auth_kind') == 'clerk_oauth'
89
+ assert second['credential_source'] == 'clerk_session'
90
+ assert bridge.rest_credential is credential
91
+ assert len(refreshes) == 1
92
+ assert all(r.headers['Authorization'] == 'Bearer ' + replacement.access_token for r in api.requests)
93
+ captured = capsys.readouterr()
94
+ public_output = json.dumps(response) + captured.out + captured.err
95
+ for secret in (replacement.access_token, replacement.refresh_token, 'synthetic-access-old', 'synthetic-refresh-old'):
96
+ assert secret not in public_output
97
+
98
+
99
+ @pytest.mark.parametrize('clear_works', [True, False])
100
+ def test_invalidated_session_without_new_credentials_stays_signed_out(clear_works):
101
+ store = Store(tokens('revoked', expired=True), clear_works=clear_works)
102
+ session, calls = failed_session(store)
103
+ invalidate(session)
104
+ for _ in range(3):
105
+ invalidate(session)
106
+ assert session.refresh() is False
107
+ assert len(calls) == 1 # no resurrection or revoked-token refresh loop
108
+
109
+
110
+ @pytest.mark.parametrize('replacement_timing', ['before_refresh', 'during_refresh'])
111
+ def test_stale_refresh_failure_cannot_delete_an_external_replacement(replacement_timing):
112
+ old = tokens('old', expired=True)
113
+ replacement = tokens('concurrent-login')
114
+ store = Store(old)
115
+ session, _ = failed_session(store, during_failure=(
116
+ lambda: store.save(replacement)) if replacement_timing == 'during_refresh' else None)
117
+ if replacement_timing == 'before_refresh':
118
+ store.save(replacement)
119
+ try:
120
+ session.token()
121
+ except ClerkError:
122
+ pass
123
+ assert store.load() == replacement, 'stale failure must not erase the newer login'
124
+ assert session.token() == replacement.access_token
125
+
126
+
127
+ @pytest.mark.parametrize('clear_works', [True, False])
128
+ def test_explicit_logout_cannot_resurrect_the_same_saved_tokens(clear_works):
129
+ original = tokens('logout')
130
+ store = Store(original, clear_works=clear_works)
131
+ transport, calls = oauth_server()
132
+ session = ClerkSession(store, transport=transport)
133
+ assert session.revoke_and_clear() is clear_works
134
+ for _ in range(2):
135
+ invalidate(session)
136
+ assert session.refresh() is False
137
+ assert not [r for r in calls if r.url.path == '/oauth/token']
138
+ # A later deliberate login is allowed, even after explicit logout.
139
+ replacement = tokens('after-logout')
140
+ store.save(replacement)
141
+ assert session.token() == replacement.access_token
142
+
143
+
144
+ def test_recovered_expired_record_uses_normal_single_refresh():
145
+ store = Store(tokens('revoked', expired=True))
146
+ calls = []
147
+
148
+ def dispatch(request):
149
+ body = form(request)
150
+ calls.append(body)
151
+ if body['refresh_token'] == 'synthetic-refresh-revoked':
152
+ return httpx.Response(400, json={'error': 'invalid_grant'})
153
+ assert body['refresh_token'] == 'synthetic-refresh-replacement'
154
+ return httpx.Response(200, json={'access_token': 'synthetic-rotated',
155
+ 'refresh_token': 'synthetic-rotated-refresh', 'expires_in': 3600})
156
+
157
+ transport, _ = oauth_server(dispatch)
158
+ session = ClerkSession(store, transport=transport)
159
+ invalidate(session)
160
+ store.save(tokens('replacement', expired=True))
161
+ assert session.token() == 'synthetic-rotated'
162
+ assert session.token() == 'synthetic-rotated'
163
+ assert len(calls) == 2
164
+ assert all(c['resource'] == 'https://api.netconverter.ai/mcp/v1' for c in calls)
165
+
166
+
167
+ def test_refresh_entry_point_recovers_a_new_saved_session():
168
+ store = Store(tokens('old', expired=True))
169
+ session, _ = failed_session(store)
170
+ invalidate(session)
171
+ replacement = tokens('new')
172
+ store.save(replacement)
173
+ assert session.refresh() is True
174
+ assert session.token() == replacement.access_token
175
+
176
+
177
+ def test_recovered_credential_still_requires_trusted_mcp_and_rest_hosts(monkeypatch):
178
+ store = Store(tokens('old', expired=True))
179
+ session, _ = failed_session(store)
180
+ invalidate(session)
181
+ replacement = tokens('new')
182
+ store.save(replacement)
183
+ assert session.token() == replacement.access_token
184
+ monkeypatch.setattr(cli, '_clerk_session', lambda: session)
185
+ monkeypatch.setattr(cli, 'get_secret', lambda *a, **k: '')
186
+ monkeypatch.delenv('NETCONVERTER_TRUSTED_HOSTS', raising=False)
187
+ trusted = 'https://api.netconverter.ai/external/v1'
188
+ evil = 'https://untrusted.example.test/mcp/v1/'
189
+ rest, remote, _, _ = cli.choose_mcp_credential('clerk', trusted, evil)
190
+ assert rest is session and remote is None
191
+ rest, remote, _, _ = cli.choose_mcp_credential('clerk', evil, evil)
192
+ assert rest is None and remote is None
193
+
194
+
195
+ def test_same_stdio_line_stream_recovers_without_restarting(tmp_path, monkeypatch):
196
+ store = Store(tokens('old', expired=True))
197
+ credential, _ = failed_session(store)
198
+ api = AccountServer({'principal': {'kind': 'clerk_oauth'}}, {'job_types': ['validate']})
199
+ monkeypatch.setattr(update, 'status', lambda: {'latest': None, 'update_available': None})
200
+ bridge = Bridge(tmp_path, 'https://api.netconverter.ai/external/v1', credential,
201
+ transport=httpx.MockTransport(api), credential_source='clerk_session')
202
+ server = StdioServer(bridge)
203
+
204
+ def lines():
205
+ yield json.dumps({'jsonrpc': '2.0', 'id': 1, 'method': 'initialize', 'params': {
206
+ 'protocolVersion': '2025-06-18', 'capabilities': {},
207
+ 'clientInfo': {'name': 'synthetic-recovery-verifier', 'version': '1'}}}) + '\n'
208
+ yield json.dumps({'jsonrpc': '2.0', 'id': 2, 'method': 'tools/call',
209
+ 'params': {'name': 'account', 'arguments': {}}}) + '\n'
210
+ store.save(tokens('new'))
211
+ yield json.dumps({'jsonrpc': '2.0', 'id': 3, 'method': 'tools/call',
212
+ 'params': {'name': 'account', 'arguments': {}}}) + '\n'
213
+
214
+ output = io.StringIO()
215
+ server.serve(lines(), output)
216
+ responses = [json.loads(line) for line in output.getvalue().splitlines()]
217
+ assert [r['id'] for r in responses] == [1, 2, 3]
218
+ first = json.loads(responses[1]['result']['content'][0]['text'])
219
+ last = json.loads(responses[2]['result']['content'][0]['text'])
220
+ assert first.get('signed_in') is False or first.get('error') == 'not_signed_in'
221
+ assert last['auth_kind'] == 'clerk_oauth'
222
+ assert 'synthetic-access-' not in output.getvalue()
223
+ assert 'synthetic-refresh-' not in output.getvalue()
224
+
225
+
226
+ def test_logout_in_flight_does_not_delete_a_later_external_login():
227
+ store = Store(tokens('logout'))
228
+ replacement = tokens('later-login')
229
+ transport, _ = oauth_server()
230
+ base_handler = transport.handler
231
+
232
+ def handler(request):
233
+ if request.url.path == '/oauth/token/revoke':
234
+ store.save(replacement)
235
+ return base_handler(request)
236
+
237
+ session = ClerkSession(store, transport=httpx.MockTransport(handler))
238
+ assert session.revoke_and_clear()
239
+ assert store.load() == replacement
240
+ assert session.token() == replacement.access_token
241
+
242
+
243
+ def test_relogin_invalidates_remote_session_view_and_bridge_profile(tmp_path, monkeypatch):
244
+ store = Store(tokens('old'))
245
+ credential, _ = failed_session(store)
246
+ seen = []
247
+
248
+ def remote_api(request):
249
+ body = json.loads(request.content)
250
+ renewed = request.headers['Authorization'] == 'Bearer synthetic-access-new'
251
+ seen.append((body['method'], renewed, request.headers.get('mcp-session-id')))
252
+ if body['method'] == 'notifications/initialized':
253
+ return httpx.Response(202)
254
+ if body['method'] == 'initialize':
255
+ result = {'protocolVersion': '2025-06-18', 'capabilities': {},
256
+ 'serverInfo': {'name': 'synthetic', 'version': '1'}}
257
+ return httpx.Response(200, headers={'mcp-session-id': 'new-session' if renewed else 'old-session'},
258
+ json={'jsonrpc': '2.0', 'id': body['id'], 'result': result})
259
+ result = {'content': [], 'structuredContent': {'data': {
260
+ 'view_mode': 'strict' if renewed else 'default',
261
+ 'view_mode_grant': 'strict' if renewed else 'default'}}}
262
+ return httpx.Response(200, json={'jsonrpc': '2.0', 'id': body['id'], 'result': result})
263
+
264
+ def rest_api(request):
265
+ renewed = request.headers['Authorization'] == 'Bearer synthetic-access-new'
266
+ return httpx.Response(200, json={'success': True, 'data': {
267
+ 'principal': {'kind': 'clerk_oauth'},
268
+ 'job_types': ['validate'] if renewed else ['convert', 'validate']}})
269
+
270
+ monkeypatch.setattr(update, 'status', lambda: {'latest': None, 'update_available': None})
271
+ remote = RemoteMCP('https://api.netconverter.ai/mcp/v1/', credential,
272
+ transport=httpx.MockTransport(remote_api))
273
+ bridge = Bridge(tmp_path, 'https://api.netconverter.ai/external/v1', credential, remote,
274
+ transport=httpx.MockTransport(rest_api), credential_source='clerk_session')
275
+ try:
276
+ first = bridge.account()
277
+ assert first['view_mode'] == 'default'
278
+ assert bridge.profile()[1] == frozenset({'convert', 'validate'})
279
+ assert remote.session_id == 'old-session'
280
+ assert credential.refresh() is False # existing credential is invalidated
281
+ store.save(tokens('new'))
282
+ second = bridge.account()
283
+ assert bridge.profile()[1] == frozenset({'validate'})
284
+ assert second['view_mode'] == second['view_mode_grant'] == 'strict'
285
+ assert remote.session_id == 'new-session'
286
+ new_initializations = [r for r in seen if r[0] == 'initialize' and r[1]]
287
+ assert new_initializations == [('initialize', True, None)]
288
+ finally:
289
+ remote.close()
290
+
291
+
292
+ def test_old_confirmation_cannot_authorize_remote_write_after_relogin(tmp_path):
293
+ store = Store(tokens('old'))
294
+ credential, _ = failed_session(store)
295
+ upstream = RemoteServer(require_token='synthetic-access-old', tools=('get_account', 'submit_conversion'))
296
+ remote = RemoteMCP('https://api.netconverter.ai/mcp/v1/', credential,
297
+ transport=httpx.MockTransport(upstream))
298
+ bridge = Bridge(tmp_path, 'https://api.netconverter.ai/external/v1', credential, remote,
299
+ transport=httpx.MockTransport(AccountServer()), credential_source='clerk_session')
300
+ bridge.confirm_apply = lambda details: 'client_declined'
301
+ args = {'job_id': 'psc_0123456789ab', 'revision': 2}
302
+ try:
303
+ first = bridge.call('submit_conversion', args)
304
+ pending = json.loads(first['content'][0]['text'])
305
+ assert pending['error'] == 'confirmation_required'
306
+ assert credential.refresh() is False
307
+ store.save(tokens('new'))
308
+ upstream.require_token = 'synthetic-access-new'
309
+ second = bridge.call('submit_conversion', {**args, 'confirm_token': pending['confirm_token']})
310
+ assert json.loads(second['content'][0]['text'])['error'] == 'invalid_confirm_token'
311
+ actual = [json.loads(r.content) for r in upstream.requests]
312
+ assert not [r for r in actual if r.get('params', {}).get('name') == 'submit_conversion']
313
+ finally:
314
+ remote.close()
315
+
316
+
317
+ @pytest.mark.parametrize('store_error', [KeyringLocked(), CredentialStoreError('synthetic-private-store-detail')])
318
+ def test_locked_or_failed_store_has_safe_mcp_error_and_can_retry(tmp_path, monkeypatch, store_error):
319
+ store = Store(tokens('old', expired=True))
320
+ credential, _ = failed_session(store)
321
+ invalidate(credential)
322
+ original_load = store.load
323
+ store.load = lambda: (_ for _ in ()).throw(store_error)
324
+ api = AccountServer({'principal': {'kind': 'clerk_oauth'}}, {'job_types': ['validate']})
325
+ monkeypatch.setattr(update, 'status', lambda: {'latest': None, 'update_available': None})
326
+ bridge = Bridge(tmp_path, 'https://api.netconverter.ai/external/v1', credential,
327
+ transport=httpx.MockTransport(api), credential_source='clerk_session')
328
+ response, payload = rpc_account(StdioServer(bridge), 1)
329
+ assert payload['error'] == 'not_signed_in'
330
+ assert 'credential store' in payload['message']
331
+ assert 'synthetic-private-store-detail' not in json.dumps(response)
332
+ assert not api.requests
333
+ store.load = original_load
334
+ store.save(tokens('new'))
335
+ _, recovered = rpc_account(StdioServer(bridge), 2)
336
+ assert recovered['auth_kind'] == 'clerk_oauth'
337
+
338
+
339
+ def test_logout_after_invalidation_rejects_new_store_record_when_clear_fails():
340
+ store = Store(tokens('revoked', expired=True))
341
+ session, _ = failed_session(store)
342
+ invalidate(session)
343
+ # Logout was requested after another process logged in, before token() loaded it.
344
+ replacement = tokens('new-before-logout')
345
+ store.save(replacement)
346
+ store.clear_works = False
347
+ assert session.revoke_and_clear() is False
348
+ assert store.load() == replacement # failed removal cannot silently authenticate
349
+ invalidate(session)
350
+ assert session.refresh() is False