sibyl-memory-cli 0.3.5__tar.gz → 0.3.7__tar.gz

{sibyl_memory_cli-0.3.5 → sibyl_memory_cli-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sibyl-memory-cli
-Version: 0.3.5
+Version: 0.3.7
 Summary: Command-line interface for the Sibyl Memory Plugin. `sibyl init` activates, `sibyl upgrade` runs the staker / subscription flow, `sibyl status` shows current tier and DB stats, `sibyl whoami` gives a one-line account summary, `sibyl devices` lists active devices and supports per-device revoke.
 Author-email: "SIBYL, Sibyl Labs LLC" <sibyl@sibyllabs.org>
 License: MIT
@@ -48,39 +48,37 @@ sibyl health                Run the SibylMemoryProvider self-check (schema versi
 ```bash
 $ sibyl init
 
-  activation · three paths · pick whichever fits your device
+  Sibyl Memory Plugin · activation
 
-  Session          a1b2c3d4…e5f6
-  Code             1 2 3 4 5 6   (use this in the email panel)
-  Opening          https://auth.sibyllabs.org/a1b2c3d4-…
+  Session:     a1b2c3d4…e5f6
+  Opening:     https://sibyllabs.org/plugin/activate?session=a1b2c3d4-…
 
-  desktop wallet · email + code · or send USDC from any mobile wallet
-  this terminal will pick up automatically when you bind.
+  Sign in with your wallet in the browser. This terminal will pick up automatically.
 
-  ⠹ watching the network for your bind … 9:42 left
+  ⠹ waiting for browser activation … 9:42 left
 ```
 
-The browser opens to a dedicated short-URL auth subdomain (`auth.sibyllabs.org/<session-uuid>`). Pick a wallet from the EIP-6963 picker (Rabby / MetaMask / Coinbase Wallet / Frame / Brave / Rainbow), enter email + 6-digit code, or send a unique sub-cent USDC amount from any mobile wallet on Base. The terminal picks up the moment any of the three paths binds. Credentials are written to `~/.sibyl-memory/credentials.json` at mode 0600.
+The browser opens. Sign a SIWE message with your wallet. The terminal picks up the moment the binding lands. Credentials are written to `~/.sibyl-memory/credentials.json` at mode 0600.
 
 ## Upgrade
 
 ```bash
 $ sibyl upgrade
 
-  upgrade · lift the 2 MB free-tier cap
+  Sibyl Memory Plugin · upgrade
 
   Account            a1b2c3d4…e5f6
   Current tier       FREE
   Opening            https://sibyllabs.org/plugin/upgrade?session=…
 
-  two paths in the browser:
-    1. stake $SIBYL on Base (free unlimited if you qualify)
-    2. subscribe in USDC (monthly / quarterly / annual)
+  Two paths in your browser:
+    1. Stake $SIBYL on Base (free unlimited if you qualify)
+    2. Subscribe in USDC (monthly / quarterly / annual)
 ```
 
 In the browser:
-- **Stake** — connect your wallet (browser or Coinbase Smart Wallet), sign to bind, and the page checks your `$SIBYL` balance on Base. If you hold the threshold (default 100,000 $SIBYL liquid+staked, configurable), the local cap lifts.
-- **Subscribe** — pick monthly ($29) / quarterly ($79) / annual ($290) USDC, sign the transfer, the server records the subscription. Tier flips immediately.
+- **Stake**: connect your wallet (browser or Coinbase Smart Wallet), sign to bind, and the page checks your `$SIBYL` balance on Base. If you hold the threshold (default 100,000 $SIBYL liquid+staked, configurable), the local cap lifts.
+- **Subscribe**: pick monthly ($29) / quarterly ($79) / annual ($290) USDC, sign the transfer, the server records the subscription. Tier flips immediately.
 
 On either path, the CLI sees the tier change, rewrites `credentials.json`, and clears `tier_cache.json` so your next write picks up the new entitlement without delay.
 
@@ -115,16 +113,14 @@ For internal testing only:
 
 ```bash
 SIBYL_API_BASE=https://staging.api.sibyllabs.org sibyl init
-SIBYL_ACTIVATE_BASE=https://staging.auth.sibyllabs.org sibyl init
+SIBYL_ACTIVATE_BASE=https://staging.sibyllabs.org/plugin/activate sibyl init
 SIBYL_UPGRADE_BASE=https://staging.sibyllabs.org/plugin/upgrade sibyl upgrade
 ```
 
-`SIBYL_ACTIVATE_BASE` accepts both subdomain form (`https://auth.example.org` → path-based session URL: `https://auth.example.org/<uuid>`) and legacy path form (`https://example.org/plugin/activate` → query-based: `?session=<uuid>`). The CLI auto-detects from the hostname.
-
 ## Security
 
 - `credentials.json` is written atomically at mode 0600.
-- `session_token` is never printed in full — only a short slice.
+- `session_token` is never printed in full: only a short slice.
 - No memory content ever transits these endpoints. The CLI never reads `memory.db` content; it only checks file size.
 - Wallet operations happen in the browser. The CLI sees only the resulting tier change.
 

{sibyl_memory_cli-0.3.5 → sibyl_memory_cli-0.3.7}/README.md

@@ -22,39 +22,37 @@ sibyl health                Run the SibylMemoryProvider self-check (schema versi
 ```bash
 $ sibyl init
 
-  activation · three paths · pick whichever fits your device
+  Sibyl Memory Plugin · activation
 
-  Session          a1b2c3d4…e5f6
-  Code             1 2 3 4 5 6   (use this in the email panel)
-  Opening          https://auth.sibyllabs.org/a1b2c3d4-…
+  Session:     a1b2c3d4…e5f6
+  Opening:     https://sibyllabs.org/plugin/activate?session=a1b2c3d4-…
 
-  desktop wallet · email + code · or send USDC from any mobile wallet
-  this terminal will pick up automatically when you bind.
+  Sign in with your wallet in the browser. This terminal will pick up automatically.
 
-  ⠹ watching the network for your bind … 9:42 left
+  ⠹ waiting for browser activation … 9:42 left
 ```
 
-The browser opens to a dedicated short-URL auth subdomain (`auth.sibyllabs.org/<session-uuid>`). Pick a wallet from the EIP-6963 picker (Rabby / MetaMask / Coinbase Wallet / Frame / Brave / Rainbow), enter email + 6-digit code, or send a unique sub-cent USDC amount from any mobile wallet on Base. The terminal picks up the moment any of the three paths binds. Credentials are written to `~/.sibyl-memory/credentials.json` at mode 0600.
+The browser opens. Sign a SIWE message with your wallet. The terminal picks up the moment the binding lands. Credentials are written to `~/.sibyl-memory/credentials.json` at mode 0600.
 
 ## Upgrade
 
 ```bash
 $ sibyl upgrade
 
-  upgrade · lift the 2 MB free-tier cap
+  Sibyl Memory Plugin · upgrade
 
   Account            a1b2c3d4…e5f6
   Current tier       FREE
   Opening            https://sibyllabs.org/plugin/upgrade?session=…
 
-  two paths in the browser:
-    1. stake $SIBYL on Base (free unlimited if you qualify)
-    2. subscribe in USDC (monthly / quarterly / annual)
+  Two paths in your browser:
+    1. Stake $SIBYL on Base (free unlimited if you qualify)
+    2. Subscribe in USDC (monthly / quarterly / annual)
 ```
 
 In the browser:
-- **Stake** — connect your wallet (browser or Coinbase Smart Wallet), sign to bind, and the page checks your `$SIBYL` balance on Base. If you hold the threshold (default 100,000 $SIBYL liquid+staked, configurable), the local cap lifts.
-- **Subscribe** — pick monthly ($29) / quarterly ($79) / annual ($290) USDC, sign the transfer, the server records the subscription. Tier flips immediately.
+- **Stake**: connect your wallet (browser or Coinbase Smart Wallet), sign to bind, and the page checks your `$SIBYL` balance on Base. If you hold the threshold (default 100,000 $SIBYL liquid+staked, configurable), the local cap lifts.
+- **Subscribe**: pick monthly ($29) / quarterly ($79) / annual ($290) USDC, sign the transfer, the server records the subscription. Tier flips immediately.
 
 On either path, the CLI sees the tier change, rewrites `credentials.json`, and clears `tier_cache.json` so your next write picks up the new entitlement without delay.
 
@@ -89,16 +87,14 @@ For internal testing only:
 
 ```bash
 SIBYL_API_BASE=https://staging.api.sibyllabs.org sibyl init
-SIBYL_ACTIVATE_BASE=https://staging.auth.sibyllabs.org sibyl init
+SIBYL_ACTIVATE_BASE=https://staging.sibyllabs.org/plugin/activate sibyl init
 SIBYL_UPGRADE_BASE=https://staging.sibyllabs.org/plugin/upgrade sibyl upgrade
 ```
 
-`SIBYL_ACTIVATE_BASE` accepts both subdomain form (`https://auth.example.org` → path-based session URL: `https://auth.example.org/<uuid>`) and legacy path form (`https://example.org/plugin/activate` → query-based: `?session=<uuid>`). The CLI auto-detects from the hostname.
-
 ## Security
 
 - `credentials.json` is written atomically at mode 0600.
-- `session_token` is never printed in full — only a short slice.
+- `session_token` is never printed in full: only a short slice.
 - No memory content ever transits these endpoints. The CLI never reads `memory.db` content; it only checks file size.
 - Wallet operations happen in the browser. The CLI sees only the resulting tier change.
 

{sibyl_memory_cli-0.3.5 → sibyl_memory_cli-0.3.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sibyl-memory-cli"
-version = "0.3.5"
+version = "0.3.7"
 description = "Command-line interface for the Sibyl Memory Plugin. `sibyl init` activates, `sibyl upgrade` runs the staker / subscription flow, `sibyl status` shows current tier and DB stats, `sibyl whoami` gives a one-line account summary, `sibyl devices` lists active devices and supports per-device revoke."
 authors = [{ name = "SIBYL, Sibyl Labs LLC", email = "sibyl@sibyllabs.org" }]
 license = { text = "MIT" }

{sibyl_memory_cli-0.3.5 → sibyl_memory_cli-0.3.7}/src/sibyl_memory_cli/cli.py

@@ -825,6 +825,162 @@ def cmd_health(args: argparse.Namespace) -> int:
     return 0 if ok_state else 1
 
 
+# ---- `sibyl update` ----------------------------------------------------
+
+# Three user-facing packages we offer to upgrade. `mcp` is opt-in and not
+# bundled by default — skip it here so we don't tell users to "update"
+# something they may not have installed. Add it back when an `--include-mcp`
+# flag is shipped.
+UPDATE_PACKAGES = ("sibyl-memory-cli", "sibyl-memory-hermes", "sibyl-memory-client")
+
+
+def _installed_version(pkg: str) -> str | None:
+    """Return the locally-installed version of a package, or None if not installed."""
+    try:
+        from importlib.metadata import PackageNotFoundError, version as _v
+        try:
+            return _v(pkg)
+        except PackageNotFoundError:
+            return None
+    except Exception:
+        return None
+
+
+def _pypi_latest(pkg: str, timeout: float = 4.0) -> str | None:
+    """Hit PyPI's JSON endpoint for the latest published version. Best-effort."""
+    url = f"https://pypi.org/pypi/{pkg}/json"
+    try:
+        req = urllib.request.Request(url, headers={"User-Agent": f"sibyl-memory-cli/{_client_version()}"})
+        with urllib.request.urlopen(req, timeout=timeout) as r:
+            data = json.loads(r.read().decode("utf-8"))
+        return (data.get("info") or {}).get("version")
+    except Exception:
+        return None
+
+
+def _ver_tuple(v: str) -> tuple:
+    """Lenient version tuple for comparison. Splits on '.', tolerates non-numeric tails."""
+    out = []
+    for part in (v or "").split("."):
+        digits = ""
+        for ch in part:
+            if ch.isdigit():
+                digits += ch
+            else:
+                break
+        out.append(int(digits) if digits else 0)
+    return tuple(out)
+
+
+def _detect_install_method() -> str:
+    """Best-guess of how the CLI was installed — pipx / venv / system-pip / pep668-blocked."""
+    exe = sys.executable
+    if "/pipx/" in exe or "/.local/pipx/" in exe:
+        return "pipx"
+    if exe and ("venv" in exe.lower() or "virtualenv" in exe.lower() or os.environ.get("VIRTUAL_ENV")):
+        return "venv"
+    # Look for PEP 668 marker file
+    for parent in Path(exe).resolve().parents:
+        marker = parent / "lib" / "EXTERNALLY-MANAGED"
+        if marker.exists():
+            return "pep668"
+        marker2 = parent / "EXTERNALLY-MANAGED"
+        if marker2.exists():
+            return "pep668"
+        if str(parent) in ("/", "/home", "/usr"):
+            break
+    return "system"
+
+
+def cmd_update(args: argparse.Namespace) -> int:
+    """Check installed package versions against PyPI, optionally apply upgrade."""
+    rows = []
+    any_outdated = False
+    for pkg in UPDATE_PACKAGES:
+        installed = _installed_version(pkg)
+        latest = _pypi_latest(pkg)
+        outdated = False
+        if installed and latest:
+            outdated = _ver_tuple(installed) < _ver_tuple(latest)
+        rows.append({"pkg": pkg, "installed": installed, "latest": latest, "outdated": outdated})
+        if outdated:
+            any_outdated = True
+
+    if args.json:
+        print(json.dumps({"packages": rows, "any_outdated": any_outdated}, indent=2))
+        return 0 if not any_outdated else 2
+
+    # ASCII output — keep it small and readable, follow `sibyl status` style.
+    print()
+    if any_outdated:
+        print(a.err_line("Updates available."))
+    else:
+        # Distinguish "all current" from "could not reach PyPI"
+        any_unreachable = any(r["latest"] is None for r in rows)
+        if any_unreachable:
+            print(a.dim("Could not reach PyPI for one or more packages — showing what we know."))
+        else:
+            print(a.success_line("All packages current."))
+    print()
+
+    name_w = max(len(r["pkg"]) for r in rows)
+    for r in rows:
+        installed = r["installed"] or "(not installed)"
+        latest = r["latest"] or "(unreachable)"
+        if r["outdated"]:
+            line = f"  {yellow(r['pkg'].ljust(name_w))}  {installed}  →  {green(latest)}"
+        elif r["installed"] is None:
+            line = f"  {a.dim(r['pkg'].ljust(name_w))}  {a.dim(installed)}"
+        else:
+            line = f"  {r['pkg'].ljust(name_w)}  {a.dim(installed)}"
+        print(line)
+    print()
+
+    if not any_outdated:
+        return 0
+
+    pip_cmd_pkgs = " ".join(r["pkg"] for r in rows if r["outdated"])
+    method = _detect_install_method()
+
+    if args.apply:
+        # Best-effort in-process pip invocation
+        import subprocess
+        pip_args = [sys.executable, "-m", "pip", "install", "-U", *pip_cmd_pkgs.split()]
+        if method == "pep668":
+            pip_args.append("--break-system-packages")
+        if method == "pipx":
+            # pipx is a separate tool; we can't drive it via `pip install`.
+            print(a.err_line("Detected pipx install. Run instead:"))
+            print(f"    pipx upgrade {' '.join(r['pkg'] for r in rows if r['outdated'])}")
+            return 2
+        print(a.dim("Running: ") + " ".join(pip_args))
+        try:
+            rc = subprocess.call(pip_args)
+        except FileNotFoundError:
+            print(a.err_line("pip not found at " + sys.executable + " -m pip"))
+            return 2
+        if rc == 0:
+            print()
+            print(a.success_line("Upgrade complete. Re-run `sibyl update` to confirm."))
+        return rc
+
+    # Default: print the command, do not execute
+    print(a.dim("To upgrade, run:"))
+    if method == "pipx":
+        print(f"    pipx upgrade {pip_cmd_pkgs}")
+    elif method == "pep668":
+        print(f"    pip install --break-system-packages -U {pip_cmd_pkgs}")
+        print()
+        print(a.dim("  (Your Python flags itself as externally-managed under PEP 668.)"))
+        print(a.dim("  (Cleanest: install inside a venv. See https://beta.sibyllabs.org for the recommended path.)"))
+    else:
+        print(f"    pip install -U {pip_cmd_pkgs}")
+    print()
+    print(a.dim("Or let sibyl run it:") + "  sibyl update --apply")
+    print()
+    return 2  # exit 2 signals "outdated" without being a hard error
+
+
 # ---- Dispatch ----------------------------------------------------------
 
 def build_parser() -> argparse.ArgumentParser:
@@ -871,6 +1027,14 @@ def build_parser() -> argparse.ArgumentParser:
     p_h = sub.add_parser("health", help="Run the provider self-check")
     p_h.set_defaults(func=cmd_health)
 
+    p_update = sub.add_parser(
+        "update",
+        help="Check for newer sibyl-memory-* releases on PyPI (use --apply to upgrade)",
+    )
+    p_update.add_argument("--apply", action="store_true", help="Run pip install -U for the outdated packages")
+    p_update.add_argument("--json", action="store_true", help="Machine-readable output")
+    p_update.set_defaults(func=cmd_update)
+
     # v0.1.4: one-command auto-detect-and-wire setup for any agent stack
     from .setup import cmd_setup
     p_setup = sub.add_parser(
@@ -878,7 +1042,7 @@ def build_parser() -> argparse.ArgumentParser:
         help="Auto-detect Hermes / Claude Code and wire SIBYL as the memory provider",
     )
     p_setup.add_argument(
-        "target", nargs="?", choices=list(["hermes", "claude-code"]),
+        "target", nargs="?", choices=list(["hermes", "claude-code", "codex"]),
         help="Wire just this framework (default: detect all)",
     )
     p_setup.add_argument(
@@ -899,7 +1063,11 @@ def build_parser() -> argparse.ArgumentParser:
     )
     p_setup.add_argument(
         "--claude-settings", default=None,
-        help="Override ~/.claude/settings.json autodetection",
+        help="Override ~/.claude.json autodetection",
+    )
+    p_setup.add_argument(
+        "--codex-config", default=None,
+        help="Override ~/.codex/config.toml autodetection",
     )
     p_setup.set_defaults(func=cmd_setup)
 

{sibyl_memory_cli-0.3.5 → sibyl_memory_cli-0.3.7}/src/sibyl_memory_cli/setup.py

@@ -3,11 +3,12 @@
 Maximum-efficiency onboarding command. Single-command path for the user:
 
     pip install sibyl-memory-cli
-    sibyl setup          # auto-detects Hermes + Claude Code, prompts per stack, wires
+    sibyl setup          # auto-detects Hermes + Claude Code + Codex, prompts per stack, wires
 
-Two wirers in v0.1.4:
+Three wirers in v0.3.7:
   - HermesWirer:     install-plugin + edit $HERMES_HOME/config.yaml (memory.provider)
-  - ClaudeCodeWirer: edit ~/.claude/settings.json (mcpServers.sibyl-memory)
+  - ClaudeCodeWirer: edit ~/.claude.json (mcpServers.sibyl-memory)
+  - CodexWirer:      edit ~/.codex/config.toml ([mcp_servers.sibyl_memory])
 
 Each wirer follows the same protocol:
   is_present()       -> bool          (filesystem + PATH detect)
@@ -26,6 +27,7 @@ from __future__ import annotations
 import argparse
 import json
 import os
+import re
 import shutil
 import sys
 from dataclasses import dataclass
@@ -229,9 +231,15 @@ class ClaudeCodeWirer:
     SIBYL_MCP_BLOCK = {"command": "sibyl-memory-mcp"}
 
     def __init__(self, *, settings_path: Optional[Union[str, Path]] = None):
+        # v0.3.7 (2026-05-22): default flipped from ~/.claude/settings.json to
+        # ~/.claude.json. Recent Claude Code reads MCP server config from the
+        # user-level ~/.claude.json — writing to ~/.claude/settings.json was a
+        # silent-failure path (wirer reported success but MCP server didn't
+        # appear in Claude Code). Override with --claude-settings if your
+        # install uses a non-standard location.
         self.settings_path = (
             Path(settings_path).expanduser() if settings_path
-            else Path.home() / ".claude" / "settings.json"
+            else Path.home() / ".claude.json"
         )
 
     def is_present(self) -> bool:
@@ -333,6 +341,158 @@ class ClaudeCodeWirer:
         os.replace(tmp, self.settings_path)
 
 
+# ----------------------------------------------------------------------
+# CodexWirer — edits ~/.codex/config.toml
+# ----------------------------------------------------------------------
+
+class CodexWirer:
+    """Auto-wire Codex CLI's MCP server registry at ~/.codex/config.toml.
+
+    Codex reads server defs from a TOML table named `[mcp_servers.<name>]`.
+    We use `[mcp_servers.sibyl_memory]` (snake_case is TOML-idiomatic; the
+    Claude Code side uses `sibyl-memory` because JSON keys allow hyphens
+    and Anthropic docs use that form).
+
+    Idempotency is text-based rather than full TOML round-trip, so we
+    preserve operator hand-edits and comments in the rest of the file
+    instead of reformatting on every run. The cost: we won't catch
+    pathological TOML edge cases (e.g., comments mid-key). For the
+    canonical Codex config layout this is fine.
+    """
+    name = "codex"
+    display_name = "Codex CLI"
+    initial = "x"  # 'c' is taken by Claude Code; 'x' from codeX
+
+    SIBYL_TOML_BLOCK = '[mcp_servers.sibyl_memory]\ncommand = "sibyl-memory-mcp"\n'
+    BLOCK_HEADER_RE = re.compile(
+        r'^\s*\[\s*mcp_servers\s*\.\s*sibyl_memory\s*\]\s*$', re.MULTILINE
+    )
+    NEXT_TABLE_RE = re.compile(r'^\s*\[', re.MULTILINE)
+    SIBYL_COMMAND_RE = re.compile(
+        r'^\s*command\s*=\s*"sibyl-memory-mcp"\s*$', re.MULTILINE
+    )
+
+    def __init__(self, *, config_path: Optional[Union[str, Path]] = None):
+        self.config_path = (
+            Path(config_path).expanduser() if config_path
+            else Path.home() / ".codex" / "config.toml"
+        )
+
+    def is_present(self) -> bool:
+        if self.config_path.exists():
+            return True
+        if shutil.which("codex"):
+            return True
+        return False
+
+    def _read(self) -> str:
+        if not self.config_path.exists():
+            return ""
+        try:
+            return self.config_path.read_text(encoding="utf-8")
+        except Exception:
+            return ""
+
+    def _extract_block(self, content: str) -> Optional[str]:
+        m = self.BLOCK_HEADER_RE.search(content)
+        if not m:
+            return None
+        # Find next [...] table header after our match (start-of-line "[").
+        next_tbl = self.NEXT_TABLE_RE.search(content, m.end())
+        end = next_tbl.start() if next_tbl else len(content)
+        return content[m.start():end]
+
+    def current_state(self) -> dict:
+        content = self._read()
+        block = self._extract_block(content)
+        sibyl_block_present = block is not None
+        wired_with_sibyl = bool(block and self.SIBYL_COMMAND_RE.search(block))
+        return {
+            "config_path": str(self.config_path),
+            "config_exists": self.config_path.exists(),
+            "sibyl_block_present": sibyl_block_present,
+            "wired_with_sibyl": wired_with_sibyl,
+        }
+
+    def wire(self, *, force: bool = False, dry_run: bool = False,
+             prompt_fn: Optional[Callable[..., str]] = None) -> WireOutcome:
+        state = self.current_state()
+
+        if state["wired_with_sibyl"]:
+            return WireOutcome(
+                self.name, "already",
+                f"Codex CLI already has [mcp_servers.sibyl_memory] block in {self.config_path}",
+            )
+
+        if state["sibyl_block_present"] and not force:
+            if prompt_fn is None:
+                return WireOutcome(
+                    self.name, "skipped",
+                    "Existing [mcp_servers.sibyl_memory] differs. Use --force to overwrite.",
+                )
+            ans = prompt_fn(
+                "Codex has [mcp_servers.sibyl_memory] but command differs. Update?",
+                default="N",
+            )
+            if ans != "y":
+                return WireOutcome(self.name, "skipped", "TOML block update declined.")
+
+        if dry_run:
+            verb = "replace" if state["sibyl_block_present"] else "append"
+            return WireOutcome(
+                self.name, "dry-run",
+                f"Would {verb} [mcp_servers.sibyl_memory] in {self.config_path}",
+            )
+
+        backup = self._backup_config()
+        try:
+            self._write_config_with_sibyl(replace_existing=state["sibyl_block_present"])
+        except Exception as e:
+            return WireOutcome(
+                self.name, "error",
+                f"config write failed: {type(e).__name__}: {e}",
+                backup_path=backup,
+            )
+        return WireOutcome(
+            self.name, "wired",
+            f"Added [mcp_servers.sibyl_memory] to {self.config_path}",
+            backup_path=backup,
+        )
+
+    def _backup_config(self) -> Optional[Path]:
+        if not self.config_path.exists():
+            return None
+        backup = self.config_path.with_suffix(".toml.bak")
+        shutil.copy2(self.config_path, backup)
+        return backup
+
+    def _write_config_with_sibyl(self, *, replace_existing: bool) -> None:
+        content = self._read()
+
+        if replace_existing:
+            existing = self._extract_block(content) or ""
+            # Rstrip the existing block to a single newline before splice so
+            # we don't accumulate blank lines on repeat replaces.
+            stripped = existing.rstrip("\n")
+            new_content = content.replace(stripped, self.SIBYL_TOML_BLOCK.rstrip("\n"), 1)
+            # Ensure file ends with a newline
+            if not new_content.endswith("\n"):
+                new_content += "\n"
+        else:
+            # Append: one blank line of separator if file is non-empty
+            if not content:
+                new_content = self.SIBYL_TOML_BLOCK
+            else:
+                # Normalize trailing whitespace to exactly "\n\n"
+                trimmed = content.rstrip("\n") + "\n\n"
+                new_content = trimmed + self.SIBYL_TOML_BLOCK
+
+        self.config_path.parent.mkdir(parents=True, exist_ok=True)
+        tmp = self.config_path.with_suffix(".toml.tmp")
+        tmp.write_text(new_content, encoding="utf-8")
+        os.replace(tmp, self.config_path)
+
+
 # ----------------------------------------------------------------------
 # Registry + dispatch
 # ----------------------------------------------------------------------
@@ -340,6 +500,7 @@ class ClaudeCodeWirer:
 ALL_WIRERS: dict = {
     "hermes": HermesWirer,
     "claude-code": ClaudeCodeWirer,
+    "codex": CodexWirer,
 }
 
 
@@ -366,6 +527,8 @@ def _wirer_kwargs(args: argparse.Namespace, name: str) -> dict:
         kw["hermes_home"] = args.hermes_home
     if name == "claude-code" and getattr(args, "claude_settings", None):
         kw["settings_path"] = args.claude_settings
+    if name == "codex" and getattr(args, "codex_config", None):
+        kw["config_path"] = args.codex_config
     return kw
 
 
@@ -402,12 +565,13 @@ def cmd_setup(args: argparse.Namespace) -> int:
         print(dim("Looked for:"))
         for name, w in wirers.items():
             st = w.current_state()
-            loc = st.get("hermes_home") or st.get("settings_path")
+            loc = st.get("hermes_home") or st.get("settings_path") or st.get("config_path")
             print(f"  {w.display_name}: {loc}")
         print()
         print(dim("To override detection, point setup at a custom path:"))
         print(f"  {cyan('sibyl setup --hermes-home /custom/path')}")
-        print(f"  {cyan('sibyl setup --claude-settings /custom/settings.json')}")
+        print(f"  {cyan('sibyl setup --claude-settings /custom/.claude.json')}")
+        print(f"  {cyan('sibyl setup --codex-config /custom/config.toml')}")
         print()
         return 0
 
@@ -415,7 +579,7 @@ def cmd_setup(args: argparse.Namespace) -> int:
     print(dim("Detected:"))
     for name, w in detected.items():
         st = w.current_state()
-        loc = st.get("hermes_home") or st.get("settings_path")
+        loc = st.get("hermes_home") or st.get("settings_path") or st.get("config_path")
         print(f"  {w.display_name} at {loc}")
     print()
 
@@ -449,11 +613,14 @@ def cmd_setup(args: argparse.Namespace) -> int:
 
         # Pre-prompt for fresh adds (interactive only). Already-wired and
         # existing-other-provider are handled inside wire() itself.
+        # State keys per wirer: hermes → memory_provider; claude-code →
+        # sibyl_mcp; codex → sibyl_block_present.
         if (
             not args.yes
             and not st.get("wired_with_sibyl")
             and not st.get("memory_provider")
             and not st.get("sibyl_mcp")
+            and not st.get("sibyl_block_present")
         ):
             if name == "hermes":
                 q = f"Set SIBYL as default memory provider in {wirer.display_name}?"

{sibyl_memory_cli-0.3.5 → sibyl_memory_cli-0.3.7}/src/sibyl_memory_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sibyl-memory-cli
-Version: 0.3.5
+Version: 0.3.7
 Summary: Command-line interface for the Sibyl Memory Plugin. `sibyl init` activates, `sibyl upgrade` runs the staker / subscription flow, `sibyl status` shows current tier and DB stats, `sibyl whoami` gives a one-line account summary, `sibyl devices` lists active devices and supports per-device revoke.
 Author-email: "SIBYL, Sibyl Labs LLC" <sibyl@sibyllabs.org>
 License: MIT
@@ -48,39 +48,37 @@ sibyl health                Run the SibylMemoryProvider self-check (schema versi
 ```bash
 $ sibyl init
 
-  activation · three paths · pick whichever fits your device
+  Sibyl Memory Plugin · activation
 
-  Session          a1b2c3d4…e5f6
-  Code             1 2 3 4 5 6   (use this in the email panel)
-  Opening          https://auth.sibyllabs.org/a1b2c3d4-…
+  Session:     a1b2c3d4…e5f6
+  Opening:     https://sibyllabs.org/plugin/activate?session=a1b2c3d4-…
 
-  desktop wallet · email + code · or send USDC from any mobile wallet
-  this terminal will pick up automatically when you bind.
+  Sign in with your wallet in the browser. This terminal will pick up automatically.
 
-  ⠹ watching the network for your bind … 9:42 left
+  ⠹ waiting for browser activation … 9:42 left
 ```
 
-The browser opens to a dedicated short-URL auth subdomain (`auth.sibyllabs.org/<session-uuid>`). Pick a wallet from the EIP-6963 picker (Rabby / MetaMask / Coinbase Wallet / Frame / Brave / Rainbow), enter email + 6-digit code, or send a unique sub-cent USDC amount from any mobile wallet on Base. The terminal picks up the moment any of the three paths binds. Credentials are written to `~/.sibyl-memory/credentials.json` at mode 0600.
+The browser opens. Sign a SIWE message with your wallet. The terminal picks up the moment the binding lands. Credentials are written to `~/.sibyl-memory/credentials.json` at mode 0600.
 
 ## Upgrade
 
 ```bash
 $ sibyl upgrade
 
-  upgrade · lift the 2 MB free-tier cap
+  Sibyl Memory Plugin · upgrade
 
   Account            a1b2c3d4…e5f6
   Current tier       FREE
   Opening            https://sibyllabs.org/plugin/upgrade?session=…
 
-  two paths in the browser:
-    1. stake $SIBYL on Base (free unlimited if you qualify)
-    2. subscribe in USDC (monthly / quarterly / annual)
+  Two paths in your browser:
+    1. Stake $SIBYL on Base (free unlimited if you qualify)
+    2. Subscribe in USDC (monthly / quarterly / annual)
 ```
 
 In the browser:
-- **Stake** — connect your wallet (browser or Coinbase Smart Wallet), sign to bind, and the page checks your `$SIBYL` balance on Base. If you hold the threshold (default 100,000 $SIBYL liquid+staked, configurable), the local cap lifts.
-- **Subscribe** — pick monthly ($29) / quarterly ($79) / annual ($290) USDC, sign the transfer, the server records the subscription. Tier flips immediately.
+- **Stake**: connect your wallet (browser or Coinbase Smart Wallet), sign to bind, and the page checks your `$SIBYL` balance on Base. If you hold the threshold (default 100,000 $SIBYL liquid+staked, configurable), the local cap lifts.
+- **Subscribe**: pick monthly ($29) / quarterly ($79) / annual ($290) USDC, sign the transfer, the server records the subscription. Tier flips immediately.
 
 On either path, the CLI sees the tier change, rewrites `credentials.json`, and clears `tier_cache.json` so your next write picks up the new entitlement without delay.
 
@@ -115,16 +113,14 @@ For internal testing only:
 
 ```bash
 SIBYL_API_BASE=https://staging.api.sibyllabs.org sibyl init
-SIBYL_ACTIVATE_BASE=https://staging.auth.sibyllabs.org sibyl init
+SIBYL_ACTIVATE_BASE=https://staging.sibyllabs.org/plugin/activate sibyl init
 SIBYL_UPGRADE_BASE=https://staging.sibyllabs.org/plugin/upgrade sibyl upgrade
 ```
 
-`SIBYL_ACTIVATE_BASE` accepts both subdomain form (`https://auth.example.org` → path-based session URL: `https://auth.example.org/<uuid>`) and legacy path form (`https://example.org/plugin/activate` → query-based: `?session=<uuid>`). The CLI auto-detects from the hostname.
-
 ## Security
 
 - `credentials.json` is written atomically at mode 0600.
-- `session_token` is never printed in full — only a short slice.
+- `session_token` is never printed in full: only a short slice.
 - No memory content ever transits these endpoints. The CLI never reads `memory.db` content; it only checks file size.
 - Wallet operations happen in the browser. The CLI sees only the resulting tier change.
 

{sibyl_memory_cli-0.3.5 → sibyl_memory_cli-0.3.7}/tests/test_setup.py

@@ -36,7 +36,7 @@ from sibyl_memory_cli.setup import (  # noqa: E402
 # ----------------------------------------------------------------------
 
 def _stub_install_plugin(hermes_home: str):
-    """Replacement for sibyl_memory_hermes.install_plugin.install — drops a fake
+    """Replacement for sibyl_memory_hermes.install_plugin.install: drops a fake
     adapter file so the wirer sees plugin_installed=True afterwards."""
     plugin_dir = Path(hermes_home) / "plugins" / "sibyl"
     plugin_dir.mkdir(parents=True, exist_ok=True)