sibyl-dev 1.4.2__tar.gz → 1.4.4__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 (141) hide show
  1. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/PKG-INFO +2 -2
  2. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/pyproject.toml +2 -2
  3. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/auth.py +285 -16
  4. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/client_memory.py +11 -0
  5. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/client_transport.py +36 -11
  6. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/common.py +1 -1
  7. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/config_store.py +312 -120
  8. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/connect.py +6 -3
  9. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/context.py +16 -5
  10. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/data/skill-packs/core.md +2 -2
  11. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/entity.py +41 -1
  12. sibyl_dev-1.4.4/src/sibyl_cli/link_paths.py +100 -0
  13. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/main.py +15 -0
  14. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/memory_admin.py +184 -23
  15. sibyl_dev-1.4.4/src/sibyl_cli/migrate.py +1468 -0
  16. sibyl_dev-1.4.4/src/sibyl_cli/migrate_graph.py +1365 -0
  17. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/org.py +108 -18
  18. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/pending.py +8 -9
  19. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/pending_writes.py +113 -4
  20. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/project.py +105 -5
  21. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/skill.py +11 -3
  22. sibyl_dev-1.4.4/tests/test_auth_api_keys.py +198 -0
  23. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_client_errors.py +249 -2
  24. sibyl_dev-1.4.4/tests/test_correct_actions.py +508 -0
  25. sibyl_dev-1.4.4/tests/test_entity.py +148 -0
  26. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_exit_codes.py +6 -1
  27. sibyl_dev-1.4.4/tests/test_health_readiness.py +98 -0
  28. sibyl_dev-1.4.4/tests/test_login_team_org.py +256 -0
  29. sibyl_dev-1.4.4/tests/test_migrate_graph.py +2319 -0
  30. sibyl_dev-1.4.4/tests/test_migrate_to_team.py +905 -0
  31. sibyl_dev-1.4.4/tests/test_org.py +265 -0
  32. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_pending_visibility.py +4 -4
  33. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_pending_writes.py +199 -4
  34. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_resolver_is_single.py +4 -0
  35. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_skill.py +13 -0
  36. sibyl_dev-1.4.4/tests/test_worktree_routing.py +405 -0
  37. sibyl_dev-1.4.2/src/sibyl_cli/migrate.py +0 -426
  38. sibyl_dev-1.4.2/tests/test_entity.py +0 -62
  39. sibyl_dev-1.4.2/tests/test_org.py +0 -43
  40. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/.gitignore +0 -0
  41. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/README.md +0 -0
  42. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/__init__.py +0 -0
  43. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/archive.py +0 -0
  44. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/auth_store.py +0 -0
  45. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/capture.py +0 -0
  46. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/capture_support.py +0 -0
  47. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/client.py +0 -0
  48. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/client_admin.py +0 -0
  49. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/client_auth.py +0 -0
  50. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/client_graph.py +0 -0
  51. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/client_sources.py +0 -0
  52. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/client_work.py +0 -0
  53. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/command_support.py +0 -0
  54. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/config_cmd.py +0 -0
  55. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/context_quick.py +0 -0
  56. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/crawl.py +0 -0
  57. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/crawl_shared.py +0 -0
  58. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/data/hooks/session-start.py +0 -0
  59. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/data/skill-packs/contract.md +0 -0
  60. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/data/skill-packs/examples.md +0 -0
  61. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/data/skill-packs/migration.md +0 -0
  62. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/data/skill-packs/quick.md +0 -0
  63. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/data/skill-packs/workflows.md +0 -0
  64. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/data/skills/sibyl/SKILL.md +0 -0
  65. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/debug.py +0 -0
  66. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/dev.py +0 -0
  67. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/docker.py +0 -0
  68. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/docker_storage.py +0 -0
  69. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/doctor.py +0 -0
  70. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/document.py +0 -0
  71. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/entrypoint.py +0 -0
  72. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/epic.py +0 -0
  73. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/explore.py +0 -0
  74. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/export.py +0 -0
  75. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/host.py +0 -0
  76. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/id_resolution.py +0 -0
  77. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/ingest.py +0 -0
  78. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/local.py +0 -0
  79. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/logs.py +0 -0
  80. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/memory.py +0 -0
  81. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/memory_display.py +0 -0
  82. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/memory_review.py +0 -0
  83. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/memory_space.py +0 -0
  84. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/memory_views.py +0 -0
  85. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/onboarding.py +0 -0
  86. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/pending_identity.py +0 -0
  87. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/project_refs.py +0 -0
  88. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/project_scope.py +0 -0
  89. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/recall.py +0 -0
  90. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/root_commands.py +0 -0
  91. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/session.py +0 -0
  92. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/setup.py +0 -0
  93. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/state.py +0 -0
  94. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/synthesis.py +0 -0
  95. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/task.py +0 -0
  96. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/team.py +0 -0
  97. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/update.py +0 -0
  98. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/version_drift.py +0 -0
  99. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/src/sibyl_cli/view_shared.py +0 -0
  100. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/__init__.py +0 -0
  101. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/conftest.py +0 -0
  102. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_archive.py +0 -0
  103. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_auth_login.py +0 -0
  104. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_auth_store.py +0 -0
  105. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_client_auth_refresh.py +0 -0
  106. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_client_contract.py +0 -0
  107. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_command_hints.py +0 -0
  108. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_common.py +0 -0
  109. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_config_store.py +0 -0
  110. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_context_pack.py +0 -0
  111. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_debug.py +0 -0
  112. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_docker_runtime.py +0 -0
  113. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_docs.py +0 -0
  114. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_doctor.py +0 -0
  115. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_entrypoint.py +0 -0
  116. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_epic.py +0 -0
  117. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_export_memory.py +0 -0
  118. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_host_runtime.py +0 -0
  119. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_id_resolution.py +0 -0
  120. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_ingest.py +0 -0
  121. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_init.py +0 -0
  122. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_local_surreal.py +0 -0
  123. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_local_upgrade.py +0 -0
  124. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_logs.py +0 -0
  125. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_main_capture.py +0 -0
  126. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_main_search.py +0 -0
  127. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_packaged_data.py +0 -0
  128. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_pending_cli.py +0 -0
  129. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_pending_identity_store.py +0 -0
  130. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_pending_recovery.py +0 -0
  131. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_project.py +0 -0
  132. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_recall_project_scope.py +0 -0
  133. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_server_url_independence.py +0 -0
  134. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_session.py +0 -0
  135. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_setup_connect.py +0 -0
  136. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_source.py +0 -0
  137. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_task.py +0 -0
  138. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_task_notes.py +0 -0
  139. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_update.py +0 -0
  140. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_update_server_axis.py +0 -0
  141. {sibyl_dev-1.4.2 → sibyl_dev-1.4.4}/tests/test_version_drift.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.5
2
2
  Name: sibyl-dev
3
- Version: 1.4.2
3
+ Version: 1.4.4
4
4
  Summary: CLI for Sibyl knowledge graph and task workflow
5
5
  Project-URL: Homepage, https://github.com/hyperb1iss/sibyl
6
6
  Project-URL: Repository, https://github.com/hyperb1iss/sibyl
@@ -19,7 +19,7 @@ Requires-Dist: httpx>=0.27
19
19
  Requires-Dist: packaging>=26.0
20
20
  Requires-Dist: pyyaml>=6.0
21
21
  Requires-Dist: rich>=13.0
22
- Requires-Dist: sibyl-core==1.4.2
22
+ Requires-Dist: sibyl-core==1.4.4
23
23
  Requires-Dist: tomli-w>=1.2.0
24
24
  Requires-Dist: typer>=0.27.1
25
25
  Requires-Dist: websockets>=16.1.1
@@ -42,7 +42,7 @@ dependencies = [
42
42
  # WebSocket (logs --follow)
43
43
  "websockets>=16.1.1",
44
44
  # Shared library
45
- "sibyl-core==1.4.2",
45
+ "sibyl-core==1.4.4",
46
46
  ]
47
47
 
48
48
  # =============================================================================
@@ -55,7 +55,7 @@ dev = [
55
55
  "pytest-asyncio",
56
56
  "pytest-cov>=7.0.0",
57
57
  "ruff",
58
- "ty>=0.0.78",
58
+ "ty>=0.0.84",
59
59
  ]
60
60
 
61
61
  [project.scripts]
@@ -9,10 +9,13 @@ import secrets
9
9
  import threading
10
10
  import time
11
11
  import webbrowser
12
+ from collections.abc import Mapping
13
+ from datetime import UTC, datetime
12
14
  from http.server import BaseHTTPRequestHandler, HTTPServer
13
15
  from urllib.parse import parse_qs, urlencode, urlsplit, urlunsplit
14
16
 
15
17
  import typer
18
+ from rich.markup import escape
16
19
 
17
20
  from sibyl_cli.auth_store import (
18
21
  clear_tokens,
@@ -24,10 +27,20 @@ from sibyl_cli.auth_store import (
24
27
  from sibyl_cli.client import (
25
28
  SibylClient,
26
29
  SibylClientError,
30
+ clear_client_cache,
27
31
  get_client,
28
32
  resolve_api_base_url,
29
33
  )
30
- from sibyl_cli.common import error, info, print_json, run_async, success, warn
34
+ from sibyl_cli.common import (
35
+ console,
36
+ create_table,
37
+ error,
38
+ info,
39
+ print_json,
40
+ run_async,
41
+ success,
42
+ warn,
43
+ )
31
44
 
32
45
  app = typer.Typer(help="Authentication and credentials")
33
46
  CLI_AUTH_SCOPE = "mcp api:read api:write"
@@ -143,6 +156,13 @@ def _scope_for_login_target(
143
156
  return _current_credential_scope(matched) if matched else None
144
157
 
145
158
 
159
+ def _login_target_context(api_url: str, explicit_target: bool) -> str | None:
160
+ """The context a login without --context stored its credential for."""
161
+ if not explicit_target:
162
+ return _effective_context_name()
163
+ return _context_for_server(api_url)
164
+
165
+
146
166
  def _load_oauth_metadata(*, issuer_url: str, insecure: bool = False) -> dict:
147
167
  import httpx
148
168
 
@@ -585,9 +605,12 @@ def _login_auto(
585
605
  break_glass_reason: str | None = None,
586
606
  insecure: bool = False,
587
607
  credential_scope_name: str | None = None,
588
- ) -> None:
608
+ ) -> bool:
589
609
  """Single login entrypoint.
590
610
 
611
+ Returns True when credentials were saved, False when a no-browser login
612
+ only printed its approval URL.
613
+
591
614
  Preference order:
592
615
  1) Local password login when email/password are provided
593
616
  2) Device authorization flow (best for remote/headless)
@@ -625,7 +648,7 @@ def _login_auto(
625
648
  )
626
649
  _warn_if_env_token_overrides_login()
627
650
  success(f"Login complete (saved credentials for {api_url})")
628
- return
651
+ return True
629
652
 
630
653
  # 2) Device flow (preferred for browser-based login)
631
654
  try:
@@ -644,10 +667,10 @@ def _login_auto(
644
667
  )
645
668
  _warn_if_env_token_overrides_login()
646
669
  success(f"Login complete (saved credentials for {api_url})")
647
- return
670
+ return True
648
671
  except _NoBrowserLoginPrinted as e:
649
672
  success(str(e))
650
- return
673
+ return False
651
674
  except TimeoutError as e:
652
675
  error("Timed out waiting for approval")
653
676
  raise typer.Exit(1) from e
@@ -683,10 +706,10 @@ def _login_auto(
683
706
  )
684
707
  _warn_if_env_token_overrides_login()
685
708
  success(f"Login complete (saved credentials for {api_url})")
686
- return
709
+ return True
687
710
  except _NoBrowserLoginPrinted as e:
688
711
  success(str(e))
689
- return
712
+ return False
690
713
  except TimeoutError as e:
691
714
  error("Timed out waiting for browser login")
692
715
  raise typer.Exit(1) from e
@@ -711,6 +734,111 @@ def _login_auto(
711
734
  raise typer.Exit(1)
712
735
 
713
736
 
737
+ def _settle_login_org(api_url: str, context_name: str | None, saved_scope: str | None) -> None:
738
+ """Land a fresh login in the org its context means.
739
+
740
+ A device or OAuth login receives a token for whatever org the server picks,
741
+ which on a team server is the caller's auto-created personal org, so every
742
+ later command silently acts there. A context that names an org is switched
743
+ to it. A context without one adopts the caller's only team org, and several
744
+ team orgs are the caller's choice, not a guess.
745
+
746
+ Every request here carries the token this login just saved: an ambient
747
+ SIBYL_AUTH_TOKEN could belong to another user, and switching with it would
748
+ store that user's credential under this context.
749
+ """
750
+ from sibyl_cli import config_store
751
+ from sibyl_cli.org import pin_context_org, store_org_tokens
752
+
753
+ ctx = config_store.get_context(context_name) if context_name else None
754
+ if ctx is None:
755
+ return
756
+ saved = read_server_credentials(api_url, credential_scope=saved_scope)
757
+ saved_token = str(saved.get("access_token") or "").strip()
758
+ if not saved_token:
759
+ return
760
+ client = SibylClient(base_url=api_url, auth_token=saved_token, context_name=ctx.name)
761
+
762
+ @run_async
763
+ async def _identity() -> tuple[dict, dict]:
764
+ try:
765
+ me = await client._request("GET", "/auth/me", _replay_pending=False)
766
+ orgs = await client._request("GET", "/orgs", _replay_pending=False)
767
+ return me, orgs
768
+ finally:
769
+ await client.close()
770
+
771
+ @run_async
772
+ async def _switch(slug: str) -> dict:
773
+ try:
774
+ return await client._request(
775
+ "POST",
776
+ f"/orgs/{slug}/switch",
777
+ _buffer_pending=False,
778
+ _replay_pending=False,
779
+ )
780
+ finally:
781
+ await client.close()
782
+
783
+ try:
784
+ me, listing = _identity()
785
+ except SibylClientError as e:
786
+ warn(f"Signed in, but could not confirm which org this login uses: {e}")
787
+ return
788
+
789
+ current = me.get("organization") or {}
790
+ orgs = [org for org in listing.get("orgs") or [] if isinstance(org, dict)]
791
+ pinned = (ctx.org_slug or "").strip()
792
+ if pinned:
793
+ if current.get("slug") == pinned:
794
+ return
795
+ target_slug = pinned
796
+ else:
797
+ current_org = next((org for org in orgs if org.get("id") == current.get("id")), None)
798
+ if current_org is None or not current_org.get("is_personal"):
799
+ return
800
+ teams = [org for org in orgs if not org.get("is_personal")]
801
+ if not teams:
802
+ return
803
+ if len(teams) > 1:
804
+ warn(
805
+ f"Signed in to your personal org. This server also has team orgs: "
806
+ f"{', '.join(str(org.get('slug')) for org in teams)}."
807
+ )
808
+ info(f"Work in one with: sibyl -C {ctx.name} org switch <slug>")
809
+ return
810
+ target_slug = str(teams[0].get("slug") or "")
811
+ if not target_slug:
812
+ return
813
+
814
+ try:
815
+ switched = _switch(target_slug)
816
+ except SibylClientError as e:
817
+ warn(f"Signed in, but could not switch to org '{target_slug}': {e}")
818
+ return
819
+ token = str(switched.get("access_token") or "").strip()
820
+ if not token:
821
+ warn(f"Signed in, but the switch to org '{target_slug}' returned no token")
822
+ return
823
+ try:
824
+ expires_in = int(switched["expires_in"]) if switched.get("expires_in") is not None else None
825
+ except (TypeError, ValueError):
826
+ # An unreadable expiry only costs the early-refresh hint; the switch
827
+ # itself succeeded and the login must not fail after saving.
828
+ expires_in = None
829
+ store_org_tokens(
830
+ client.base_url,
831
+ token,
832
+ refresh_token=str(switched.get("refresh_token") or "").strip() or None,
833
+ expires_in=expires_in,
834
+ scope_name=credential_scope(ctx.name, target_slug),
835
+ )
836
+ pin_context_org(ctx.name, target_slug)
837
+ clear_client_cache()
838
+ organization = switched.get("organization") or {}
839
+ success(f"Using org {organization.get('name') or target_slug} ({target_slug})")
840
+
841
+
714
842
  def _warn_if_env_token_overrides_login() -> None:
715
843
  if os.environ.get("SIBYL_AUTH_TOKEN", "").strip():
716
844
  warn(
@@ -854,9 +982,19 @@ def login_cmd(
854
982
  "-k",
855
983
  help="Disable SSL certificate verification (for self-signed certs)",
856
984
  ),
985
+ use: bool = typer.Option(
986
+ False,
987
+ "--use",
988
+ "-u",
989
+ help="Make a newly created --context the active context",
990
+ ),
857
991
  ) -> None:
858
992
  """Login to a Sibyl server and save credentials.
859
993
 
994
+ A new --context becomes active only with --use or when no context is
995
+ active yet, so logging in to a team server never redirects the commands
996
+ other sessions on this machine are running.
997
+
860
998
  Examples:
861
999
  sibyl auth login # Login to active context or default
862
1000
  sibyl auth login https://sibyl.example.com # Login to specific server
@@ -872,7 +1010,7 @@ def login_cmd(
872
1010
  )
873
1011
 
874
1012
  # Perform login
875
- _login_auto(
1013
+ logged_in = _login_auto(
876
1014
  api_url=api_url,
877
1015
  no_browser=no_browser,
878
1016
  timeout_seconds=timeout_seconds,
@@ -885,9 +1023,9 @@ def login_cmd(
885
1023
 
886
1024
  # Create/update context if requested
887
1025
  if context:
888
- from sibyl_cli.client import clear_client_cache
889
1026
  from sibyl_cli.config_store import (
890
1027
  create_context,
1028
+ get_active_context_name,
891
1029
  get_context,
892
1030
  update_context,
893
1031
  )
@@ -902,11 +1040,29 @@ def login_cmd(
902
1040
  update_context(context, server_url=server_url, insecure=insecure)
903
1041
  info(f"Updated context '{context}' with server {server_url}")
904
1042
  else:
905
- create_context(name=context, server_url=server_url, set_active=True, insecure=insecure)
906
- success(f"Created context '{context}' and set as active")
1043
+ active = get_active_context_name()
1044
+ activate = use or not active
1045
+ create_context(
1046
+ name=context, server_url=server_url, set_active=activate, insecure=insecure
1047
+ )
1048
+ if activate:
1049
+ success(f"Created context '{context}' and set as active")
1050
+ else:
1051
+ success(f"Created context '{context}'; the active context is still '{active}'")
1052
+ info(
1053
+ f"Target it with: sibyl -C {context} <command>, or make it active "
1054
+ f"with: sibyl config context use {context}"
1055
+ )
907
1056
 
908
1057
  clear_client_cache()
909
1058
 
1059
+ if logged_in:
1060
+ _settle_login_org(
1061
+ api_url,
1062
+ context or _login_target_context(api_url, bool(effective_server)),
1063
+ scope,
1064
+ )
1065
+
910
1066
 
911
1067
  @app.command("local-signup")
912
1068
  def local_signup_cmd(
@@ -943,21 +1099,134 @@ api_key_app = typer.Typer(help="API key management")
943
1099
  app.add_typer(api_key_app, name="api-key")
944
1100
 
945
1101
 
1102
+ # Fields a listed key may carry into output. The key secret is shown only once,
1103
+ # at creation, so this allowlist keeps any field the server adds later out of the
1104
+ # terminal and out of pipes.
1105
+ API_KEY_LIST_FIELDS: tuple[str, ...] = (
1106
+ "id",
1107
+ "name",
1108
+ "prefix",
1109
+ "scopes",
1110
+ "project_ids",
1111
+ "memory_space_ids",
1112
+ "created_at",
1113
+ "expires_at",
1114
+ "last_used_at",
1115
+ "revoked_at",
1116
+ )
1117
+
1118
+
1119
+ def _listed_api_keys(result: object) -> list[dict[str, object]]:
1120
+ """Project the server's key listing onto the allowlist.
1121
+
1122
+ A listing that is not an object holding a list of key objects is a server
1123
+ fault, and reporting it as "no keys" would hide that, so it raises instead.
1124
+ """
1125
+ raw_keys = result.get("keys") if isinstance(result, Mapping) else None
1126
+ if not isinstance(raw_keys, list) or not all(isinstance(key, Mapping) for key in raw_keys):
1127
+ raise SibylClientError(
1128
+ "Server returned a malformed API key listing; expected a list of keys.",
1129
+ error_code="api_key_listing_invalid",
1130
+ )
1131
+ return [
1132
+ {field: key[field] for field in API_KEY_LIST_FIELDS if field in key} for key in raw_keys
1133
+ ]
1134
+
1135
+
1136
+ def _parse_timestamp(value: object) -> datetime | None:
1137
+ if not value:
1138
+ return None
1139
+ try:
1140
+ parsed = datetime.fromisoformat(str(value))
1141
+ except ValueError:
1142
+ return None
1143
+ return parsed if parsed.tzinfo else parsed.replace(tzinfo=UTC)
1144
+
1145
+
1146
+ def _short_date(value: object) -> str:
1147
+ return str(value)[:10] if value else "-"
1148
+
1149
+
1150
+ def _api_key_limits(key: Mapping[str, object]) -> str:
1151
+ limits: list[str] = []
1152
+ for field, singular, plural in (
1153
+ ("project_ids", "project", "projects"),
1154
+ ("memory_space_ids", "space", "spaces"),
1155
+ ):
1156
+ ids = key.get(field)
1157
+ count = len(ids) if isinstance(ids, list) else 0
1158
+ if count:
1159
+ limits.append(f"{count} {singular if count == 1 else plural}")
1160
+ return ", ".join(limits) or "-"
1161
+
1162
+
1163
+ def _api_key_status(key: Mapping[str, object], now: datetime) -> str:
1164
+ if key.get("revoked_at"):
1165
+ return "revoked"
1166
+ raw_expiry = key.get("expires_at")
1167
+ if not raw_expiry:
1168
+ return "active"
1169
+ expires_at = _parse_timestamp(raw_expiry)
1170
+ if expires_at is None:
1171
+ return "unknown"
1172
+ return "expired" if expires_at <= now else "active"
1173
+
1174
+
946
1175
  @api_key_app.command("list")
947
- def api_key_list() -> None:
1176
+ def api_key_list(
1177
+ json_output: bool = typer.Option(False, "--json", "-j", help="JSON output (for scripting)"),
1178
+ ) -> None:
1179
+ """List your API keys in the active organization. Default: table output."""
948
1180
  client = get_client()
949
1181
 
950
1182
  @run_async
951
- async def _run() -> dict:
952
- return await client.list_api_keys()
1183
+ async def _run() -> list[dict[str, object]]:
1184
+ return _listed_api_keys(await client.list_api_keys())
953
1185
 
954
1186
  try:
955
- result = _run()
956
- print_json(result)
1187
+ keys = _run()
957
1188
  except SibylClientError as e:
958
1189
  error(str(e))
959
1190
  raise typer.Exit(1) from e
960
1191
 
1192
+ if json_output:
1193
+ print_json({"keys": keys})
1194
+ return
1195
+
1196
+ if not keys:
1197
+ info("No API keys found")
1198
+ return
1199
+
1200
+ now = datetime.now(UTC)
1201
+ table = create_table(
1202
+ "API Keys",
1203
+ "Name",
1204
+ "ID",
1205
+ "Prefix",
1206
+ "Scopes",
1207
+ "Limits",
1208
+ "Created",
1209
+ "Last Used",
1210
+ "Expires",
1211
+ "Status",
1212
+ )
1213
+ for key in keys:
1214
+ scopes = key.get("scopes")
1215
+ cells = (
1216
+ str(key.get("name") or ""),
1217
+ str(key.get("id") or ""),
1218
+ str(key.get("prefix") or ""),
1219
+ ", ".join(str(scope) for scope in scopes) if isinstance(scopes, list) else "",
1220
+ _api_key_limits(key),
1221
+ _short_date(key.get("created_at")),
1222
+ _short_date(key.get("last_used_at")),
1223
+ _short_date(key.get("expires_at")),
1224
+ _api_key_status(key, now),
1225
+ )
1226
+ # Key names are free text; unescaped brackets would parse as Rich markup.
1227
+ table.add_row(*(escape(cell) for cell in cells))
1228
+ console.print(table)
1229
+
961
1230
 
962
1231
  @api_key_app.command("create")
963
1232
  def api_key_create(
@@ -22,6 +22,7 @@ class ClientMemoryMixin:
22
22
  metadata: dict[str, Any] | None = None,
23
23
  provenance: dict[str, Any] | None = None,
24
24
  capture_surface: str = "cli",
25
+ _idempotency_key: str | None = None,
25
26
  ) -> dict[str, Any]:
26
27
  """Store verbatim raw memory."""
27
28
  data: dict[str, Any] = {
@@ -42,6 +43,16 @@ class ClientMemoryMixin:
42
43
  data["agent_id"] = agent_id
43
44
  if project_id:
44
45
  data["project_id"] = project_id
46
+ if _idempotency_key is not None:
47
+ # The migration owns durable retry identity across process restarts.
48
+ return await self._request(
49
+ "POST",
50
+ "/memory/raw",
51
+ json=data,
52
+ params={"replay_interrupted": "false"},
53
+ _idempotency_key=_idempotency_key,
54
+ _buffer_pending=False,
55
+ )
45
56
  return await self._request("POST", "/memory/raw", json=data)
46
57
 
47
58
  async def recall_raw_memory(
@@ -32,11 +32,13 @@ from sibyl_cli.pending_writes import (
32
32
  create_pending_write,
33
33
  delete_pending_write,
34
34
  increment_attempts,
35
+ is_buffered_read_like,
35
36
  is_corrupt_pending_write,
36
37
  is_read_like_post,
37
38
  list_pending_writes,
38
39
  pending_replay_lock,
39
- pending_write_resource,
40
+ pending_resources_overlap,
41
+ pending_write_resources,
40
42
  read_pending_write,
41
43
  record_pending_failure,
42
44
  record_pending_metric,
@@ -615,15 +617,13 @@ class ClientTransportMixin:
615
617
  blocked: set[str] = set()
616
618
  attempted = 0
617
619
  for item in matching:
618
- resource = pending_write_resource(item)
620
+ resources = pending_write_resources(item)
619
621
  if (
620
- "*" in blocked
621
- or resource in blocked
622
- or (resource == "*" and blocked)
622
+ pending_resources_overlap(resources, blocked)
623
623
  or item.get("status") == "attention"
624
624
  or (not ignore_backoff and not _ready_for_auto_replay(item))
625
625
  ):
626
- blocked.add(resource)
626
+ blocked.update(resources)
627
627
  continue
628
628
  write_id = str(item["id"])
629
629
  attempted += 1
@@ -640,11 +640,11 @@ class ClientTransportMixin:
640
640
  )
641
641
  record_pending_metric("replayed")
642
642
  except SibylClientError as exc:
643
- blocked.add(resource)
643
+ blocked.update(resources)
644
644
  if exc.status_code == 401 or exc.error_code == "token_refresh_failed":
645
645
  break
646
646
  except (FileNotFoundError, OSError, ValueError):
647
- blocked.add(resource)
647
+ blocked.update(resources)
648
648
  if attempted == AUTO_REPLAY_LIMIT:
649
649
  break
650
650
  except Exception:
@@ -749,11 +749,14 @@ class ClientTransportMixin:
749
749
  bind_pending_write_identity(
750
750
  pending_write_id, identity, replay_scope=self._replay_scope
751
751
  )
752
- resource = pending_write_resource(pending)
752
+ resources = pending_write_resources(pending)
753
753
  order = (str(pending.get("created_at", "")), pending_write_id)
754
754
  for earlier in list_pending_writes():
755
755
  if (
756
756
  is_corrupt_pending_write(earlier)
757
+ # A buffered read (a preview queued by an older client)
758
+ # changed nothing, so nothing can depend on it.
759
+ or is_buffered_read_like(earlier)
757
760
  or earlier.get("base_url") != self.base_url
758
761
  or not pending_identity_matches(
759
762
  earlier,
@@ -764,8 +767,7 @@ class ClientTransportMixin:
764
767
  or (str(earlier.get("created_at", "")), str(earlier["id"])) >= order
765
768
  ):
766
769
  continue
767
- predecessor = pending_write_resource(earlier)
768
- if resource == "*" or predecessor == "*" or resource == predecessor:
770
+ if pending_resources_overlap(resources, pending_write_resources(earlier)):
769
771
  raise SibylClientError(
770
772
  "An earlier related write is unresolved; this write remains "
771
773
  "buffered and no mutation was sent. Inspect pending-writes list.",
@@ -867,6 +869,29 @@ class ClientTransportMixin:
867
869
  remediation=payload.remediation,
868
870
  details=payload.details,
869
871
  )
872
+ if (
873
+ pending_write_id is not None
874
+ and method.upper() == "DELETE"
875
+ and response.status_code == 404
876
+ ):
877
+ # The resource is already gone, which is all a delete asks
878
+ # for, and there is no body worth keeping. A replay of a
879
+ # delete that already landed is done; a first attempt at an
880
+ # id that never existed still reports the 404 to its caller.
881
+ # An unbuffered delete has no queued write, so its 404 is
882
+ # simply the caller's answer.
883
+ if pending_write_created:
884
+ _resolve_pending_write(pending_write_id, "dropped")
885
+ raise exc
886
+ _resolve_pending_write(pending_write_id, None)
887
+ return {}
888
+ if pending_write_created and payload.error == "revision_conflict":
889
+ # A write pinned to a revision the resource has left can
890
+ # never apply, so queueing it only blocks the rerun that
891
+ # would draw a fresh plan. A replay that meets the same
892
+ # answer parks with the server's reason instead.
893
+ _resolve_pending_write(pending_write_id, "dropped")
894
+ raise exc
870
895
  self._record_pending_failure(pending_write_id, exc)
871
896
  raise exc
872
897
 
@@ -228,7 +228,7 @@ def format_write_age(seconds: float) -> str:
228
228
  # Each class gets the words an operator needs to recognize it, and the counts
229
229
  # are named separately so one line can carry the whole decision.
230
230
  _PENDING_CLASS_LABELS: tuple[tuple[str, str], ...] = (
231
- ("needs_attention", "rejected by the server"),
231
+ ("needs_attention", "rejected or stuck on the server"),
232
232
  ("unowned", "with no owner this login can replay"),
233
233
  ("foreign_server", "for another server"),
234
234
  ("read_like", "re-runnable reads"),