caura-bus-cli 0.3.1__tar.gz → 0.3.4__tar.gz

{caura_bus_cli-0.3.1/src/caura_bus_cli.egg-info → caura_bus_cli-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: caura-bus-cli
-Version: 0.3.1
+Version: 0.3.4
 Summary: Caura messaging CLI: setup / doctor / replay / agents / threads / send / status
 Author: Caura, Inc.
 License: Apache-2.0
@@ -10,7 +10,7 @@ Project-URL: Changelog, https://github.com/caura-ai/caura/blob/main/clients/coll
 Requires-Python: >=3.12
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: caura-bus-core==0.3.1
-Requires-Dist: caura-bus-mcp==0.3.1
+Requires-Dist: caura-bus-core==0.3.4
+Requires-Dist: caura-bus-mcp==0.3.4
 Requires-Dist: typer>=0.12
 Dynamic: license-file

{caura_bus_cli-0.3.1 → caura_bus_cli-0.3.4}/pyproject.toml

@@ -1,14 +1,14 @@
 [project]
 name = "caura-bus-cli"
-version = "0.3.1"  # x-release-please-version
+version = "0.3.4"  # x-release-please-version
 description = "Caura messaging CLI: setup / doctor / replay / agents / threads / send / status"
 requires-python = ">=3.12"
 license = { text = "Apache-2.0" }
 authors = [{ name = "Caura, Inc." }]
 dependencies = [
-    "caura-bus-core==0.3.1",  # x-release-please-version
+    "caura-bus-core==0.3.4",  # x-release-please-version
     # `caura-bus setup` wires this MCP server into Claude Code / Codex.
-    "caura-bus-mcp==0.3.1",  # x-release-please-version
+    "caura-bus-mcp==0.3.4",  # x-release-please-version
     "typer>=0.12",
 ]
 

{caura_bus_cli-0.3.1 → caura_bus_cli-0.3.4}/src/caura_bus_cli/hooks.py

@@ -102,7 +102,7 @@ def install_hooks(
         written[event] = entry
     path.parent.mkdir(parents=True, exist_ok=True)
     temporary = path.with_suffix(".json.tmp")
-    temporary.write_text(json.dumps(settings, indent=2) + "\n")
+    temporary.write_text(json.dumps(settings, indent=2) + "\n", encoding="utf-8")
     temporary.replace(path)
     return {"path": str(path), "hooks": written}
 
@@ -117,7 +117,7 @@ def load_settings(path):
     """
     if not path.exists():
         return {}
-    text = path.read_text()
+    text = path.read_text(encoding="utf-8")
     if not text.strip():
         return {}
     try:

{caura_bus_cli-0.3.1 → caura_bus_cli-0.3.4}/src/caura_bus_cli/main.py

@@ -238,7 +238,7 @@ def setup(
 def tty_prompt(label: str, secret: bool = False) -> str:
     """Prompt on the controlling terminal, also when stdin is a pipe (``curl ... | sh``)."""
     try:
-        tty = open("/dev/tty", "r+")
+        tty = open("/dev/tty", "r+", encoding="locale")
     except OSError:
         raise JoinError(f"no terminal to ask for the {label.lower()}") from None
     with tty:
@@ -275,12 +275,12 @@ def join(
     (`caura`) is installed, join prints the equivalent `caura agent connect`
     command and offers to run it instead.
     """
+    # Remove sign-in secrets before broker discovery or any other child process.
+    password = os.environ.pop("CAURA_PASSWORD", "")
+    totp_env = os.environ.pop("CAURA_TOTP_CODE", "").strip()
     if broker is not False:
         prefer_broker(url, name, runtime, directory, description, tenant, not no_hooks, broker, not no_memory)
     try:
-        # Take the secrets out of the environment so no child process (claude mcp add) inherits them.
-        password = os.environ.pop("CAURA_PASSWORD", "")
-        totp_env = os.environ.pop("CAURA_TOTP_CODE", "").strip()
         if not email:
             email = tty_prompt("Caura email")
         password = password or tty_prompt("Caura password", secret=True)

{caura_bus_cli-0.3.1 → caura_bus_cli-0.3.4}/src/caura_bus_cli/runtime.py

@@ -95,12 +95,12 @@ class WakeState:
         self.recheck_seconds = recheck_seconds
 
     def load(self):
-        return json.loads(self.path.read_text()) if self.path.exists() else {}
+        return json.loads(self.path.read_text(encoding="utf-8")) if self.path.exists() else {}
 
     def save(self, data):
         temporary = self.path.with_suffix(".tmp")
         fd = os.open(temporary, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0o600)
-        with os.fdopen(fd, "w") as stream:
+        with os.fdopen(fd, "w", encoding="utf-8") as stream:
             json.dump(data, stream)
             stream.flush()
             os.fsync(stream.fileno())
@@ -212,7 +212,7 @@ def latest_codex_thread(directory, home=None):
     rollouts = sorted(sessions.rglob("rollout-*.jsonl"), key=lambda p: p.name, reverse=True)
     for rollout in rollouts:
         try:
-            with rollout.open() as stream:
+            with rollout.open(encoding="utf-8") as stream:
                 meta = json.loads(stream.readline())
         except (OSError, ValueError):
             continue
@@ -548,7 +548,7 @@ def load_key(key_file=None):
     path = Path(key_file)
     if path.stat().st_mode & 0o077:
         raise ValueError(f"{path} must be private to you (chmod 600 {path})")
-    key = path.read_text().strip()
+    key = path.read_text(encoding="utf-8").strip()
     if not key:
         return False
     os.environ["CAURA_API_KEY"] = key

{caura_bus_cli-0.3.1 → caura_bus_cli-0.3.4}/src/caura_bus_cli/setup.py

@@ -14,8 +14,8 @@ import os
 import re
 import shlex
 import shutil
-import subprocess
 import sys
+import tempfile
 import tomllib
 from collections.abc import Callable
 from dataclasses import dataclass, field
@@ -130,7 +130,7 @@ def find_mcp_binary() -> Path | None:
 
 
 def peer_template() -> str:
-    return files("caura_bus_cli").joinpath("peer_instructions.md").read_text()
+    return files("caura_bus_cli").joinpath("peer_instructions.md").read_text(encoding="utf-8")
 
 
 # --- 1. verify the key ----------------------------------------------------
@@ -166,7 +166,7 @@ def render_config(url: str, insecure: bool, identity: dict, existing: Path) -> s
     consultation: dict[str, Any] = {}
     if existing.is_file():
         try:
-            old = tomllib.loads(existing.read_text())
+            old = tomllib.loads(existing.read_text(encoding="utf-8"))
         except (tomllib.TOMLDecodeError, OSError):
             old = {}
         if isinstance(old.get("peers"), list):
@@ -200,69 +200,75 @@ def render_config(url: str, insecure: bool, identity: dict, existing: Path) -> s
 
 def write_private(path: Path, text: str) -> None:
     path.parent.mkdir(parents=True, exist_ok=True, mode=0o700)
-    temporary = path.with_name(path.name + ".tmp")
-    fd = os.open(temporary, os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0o600)
-    with os.fdopen(fd, "w") as handle:
-        handle.write(text)
-    os.chmod(temporary, 0o600)
-    temporary.replace(path)
+    fd, temporary = tempfile.mkstemp(dir=path.parent, prefix=".caura-bus-")
+    try:
+        with os.fdopen(fd, "w", encoding="utf-8") as handle:
+            os.fchmod(handle.fileno(), 0o600)
+            handle.write(text)
+            handle.flush()
+            os.fsync(handle.fileno())
+        os.replace(temporary, path)
+    finally:
+        if os.path.exists(temporary):
+            os.unlink(temporary)
 
 
 # --- 3. runtime wiring ----------------------------------------------------
 
 
-def claude_add_argv(claude: str, key: str, config: Path, mcp: Path) -> list[str]:
-    return [
-        claude,
-        "mcp",
-        "add",
-        "--scope",
-        "local",
-        SERVER_NAME,
-        "-e",
-        f"CAURA_API_KEY={key}",
-        "-e",
-        f"CAURA_BUS_AGENT_CONFIG={config}",
-        "--",
-        str(mcp),
-    ]
-
-
-def claude_manual_command(directory: Path, config: Path, mcp: Path) -> str:
-    """The exact command to run by hand; the key comes from the user's environment."""
-    argv = claude_add_argv("claude", "KEYPLACEHOLDER", config, mcp)
-    command = shlex.join(argv).replace(
-        "CAURA_API_KEY=KEYPLACEHOLDER", '"CAURA_API_KEY=${CAURA_API_KEY:?export your agent key first}"'
-    )
-    return f"cd {shlex.quote(str(directory))} && {command}"
-
-
-def wire_claude(directory: Path, key: str, config: Path, mcp: Path) -> str:
-    claude = shutil.which("claude")
-    if not claude:
+def wire_claude_entries(directory: Path, entries: dict[str, dict]) -> str:
+    """Update local-scope entries together, with one backup before a change."""
+    path = claude_config_file()
+    # Claude local scope uses the nearest repository root, or the launch directory
+    # outside a repository. A worktree's .git marker is a file rather than a directory.
+    project = next((p for p in (directory, *directory.parents) if (p / ".git").exists()), directory)
+    try:
+        exists = path.exists()
+        text = path.read_text(encoding="utf-8") if exists else ""
+        data = json.loads(text) if text else {}
+        if not isinstance(data, dict):
+            raise ValueError("expected a JSON object")
+        projects = data.setdefault("projects", {})
+        if not isinstance(projects, dict):
+            raise ValueError("projects must be an object")
+        settings = projects.setdefault(str(project), {})
+        if not isinstance(settings, dict):
+            raise ValueError("project settings must be an object")
+        servers = settings.setdefault("mcpServers", {})
+        if not isinstance(servers, dict):
+            raise ValueError("mcpServers must be an object")
+        servers.update(entries)
+        updated = json.dumps(data, indent=2) + "\n"
+        if updated == text:
+            os.chmod(path, 0o600)
+        else:
+            if exists:
+                write_private(path.with_name(path.name + ".caura-bus-setup.bak"), text)
+            write_private(path, updated)
+    except (OSError, ValueError) as exc:
+        # JSON decode errors can carry snippets of the original file; do not echo them.
         raise SetupError(
-            "`claude` is not on PATH. Run this yourself (with CAURA_API_KEY exported):\n  "
-            + claude_manual_command(directory, config, mcp)
-        )
-    # Replace a previous entry so re-running updates the key and paths in place.
-    subprocess.run(
-        [claude, "mcp", "remove", "--scope", "local", SERVER_NAME],
-        cwd=directory,
-        capture_output=True,
-        text=True,
-        check=False,
-    )
-    result = subprocess.run(
-        claude_add_argv(claude, key, config, mcp),
-        cwd=directory,
-        capture_output=True,
-        text=True,
-        check=False,
-    )
-    if result.returncode != 0:
-        detail = scrub((result.stderr or result.stdout).strip(), key)
-        raise SetupError(f"`claude mcp add` failed ({result.returncode}): {detail}")
-    return f"claude mcp add --scope local {SERVER_NAME} (project {show(directory)})"
+            f"could not update private Claude config {show(path)} ({type(exc).__name__})"
+        ) from None
+    return f"{', '.join(entries)} in {show(path)} (project {show(project)}; mode 600)"
+
+
+def wire_claude(directory: Path, key: str, config: Path, mcp: Path, server_url: str | None = None) -> str:
+    entries = {
+        SERVER_NAME: {
+            "type": "stdio",
+            "command": str(mcp),
+            "args": [],
+            "env": {"CAURA_API_KEY": key, "CAURA_BUS_AGENT_CONFIG": str(config)},
+        },
+    }
+    if server_url is not None:
+        entries[MEMORY_SERVER_NAME] = {
+            "type": "http",
+            "url": memory_url(server_url),
+            "headers": {MEMORY_HEADER: key},
+        }
+    return wire_claude_entries(directory, entries)
 
 
 def codex_block(key: str, config: Path, mcp: Path) -> list[str]:
@@ -375,7 +381,7 @@ def update_codex_text(text: str, key: str, config: Path, mcp: Path) -> str:
 def wire_codex(tables: list[CodexTable], path: Path | None = None) -> list[str]:
     """Update every table in one write, with one backup of the previous file."""
     path = path or codex_config_path()
-    text = path.read_text() if path.exists() else ""
+    text = path.read_text(encoding="utf-8") if path.exists() else ""
     updated = text
     for table in tables:
         updated = update_codex_table(updated, table)
@@ -451,7 +457,7 @@ def claude_config_file() -> Path:
 
 def read_json(path: Path) -> dict:
     try:
-        data = json.loads(path.read_text())
+        data = json.loads(path.read_text(encoding="utf-8"))
     except (OSError, ValueError):
         return {}
     return data if isinstance(data, dict) else {}
@@ -492,57 +498,6 @@ def codex_memory_warnings(text: str, url: str) -> list[str]:
     ]
 
 
-def claude_memory_argv(claude: str, url: str, key: str) -> list[str]:
-    # --header is variadic, so it goes after the name and URL.
-    return [
-        claude,
-        "mcp",
-        "add",
-        "--scope",
-        "local",
-        "--transport",
-        "http",
-        MEMORY_SERVER_NAME,
-        memory_url(url),
-        "--header",
-        f"{MEMORY_HEADER}: {key}",
-    ]
-
-
-def claude_memory_manual_command(directory: Path, url: str) -> str:
-    command = shlex.join(claude_memory_argv("claude", url, "KEYPLACEHOLDER")).replace(
-        f"'{MEMORY_HEADER}: KEYPLACEHOLDER'",
-        f'"{MEMORY_HEADER}: ${{CAURA_API_KEY:?export your agent key first}}"',
-    )
-    return f"cd {shlex.quote(str(directory))} && {command}"
-
-
-def wire_claude_memory(directory: Path, url: str, key: str) -> str:
-    claude = shutil.which("claude")
-    if not claude:
-        raise SetupError(
-            "`claude` is not on PATH. Run this yourself (with CAURA_API_KEY exported):\n  "
-            + claude_memory_manual_command(directory, url)
-        )
-    subprocess.run(
-        [claude, "mcp", "remove", "--scope", "local", MEMORY_SERVER_NAME],
-        cwd=directory,
-        capture_output=True,
-        text=True,
-        check=False,
-    )
-    result = subprocess.run(
-        claude_memory_argv(claude, url, key), cwd=directory, capture_output=True, text=True, check=False
-    )
-    if result.returncode != 0:
-        detail = scrub((result.stderr or result.stdout).strip(), key)
-        raise SetupError(f"`claude mcp add` for the memory server failed ({result.returncode}): {detail}")
-    return (
-        f"claude mcp add --scope local --transport http {MEMORY_SERVER_NAME} {memory_url(url)} "
-        f"(project {show(directory)}; the key is stored in {show(claude_config_file())})"
-    )
-
-
 # --- 4. peer instructions -------------------------------------------------
 
 
@@ -572,11 +527,11 @@ def merge_instructions(existing: str | None) -> tuple[str, str]:
 
 
 def write_instructions(path: Path) -> str:
-    existing = path.read_text() if path.exists() else None
+    existing = path.read_text(encoding="utf-8") if path.exists() else None
     updated, action = merge_instructions(existing)
     if action != "unchanged":
         temporary = path.with_name(path.name + ".tmp")
-        temporary.write_text(updated)
+        temporary.write_text(updated, encoding="utf-8")
         if path.exists():
             os.chmod(temporary, path.stat().st_mode & 0o777)
         temporary.replace(path)
@@ -699,7 +654,7 @@ def run_setup(options: Options, echo: Callable[[str], None], run_async) -> int:
     options.config_path = config_path
     text = render_config(url, insecure, identity, config_path)
     AgentConfig.model_validate(tomllib.loads(text))
-    unchanged = config_path.is_file() and config_path.read_text() == text
+    unchanged = config_path.is_file() and config_path.read_text(encoding="utf-8") == text
     if options.dry_run:
         echo(f"  {prefix}write agent config {show(config_path)} (mode 600)")
     else:
@@ -717,15 +672,15 @@ def run_setup(options: Options, echo: Callable[[str], None], run_async) -> int:
         )
     if runtime == "claude":
         if options.dry_run:
-            echo(f"  {prefix}run in {directory}:")
-            echo("      " + shlex.join(claude_add_argv("claude", mask(key), config_path, mcp)))
+            echo(f"  {prefix}write local caura-bus entry in {show(claude_config_file())} (mode 600)")
             if options.memory:
-                echo("      " + shlex.join(claude_memory_argv("claude", url, mask(key))))
+                echo(f"  {prefix}write local caura {memory_url(url)} entry in the same private config")
         else:
             try:
-                echo("  [ok] MCP server " + wire_claude(directory, key, config_path, mcp))
-                if options.memory:
-                    echo("  [ok] memory MCP server " + wire_claude_memory(directory, url, key))
+                echo(
+                    "  [ok] MCP configuration "
+                    + wire_claude(directory, key, config_path, mcp, url if options.memory else None)
+                )
             except SetupError as exc:
                 echo(f"  [!!] {exc}")
                 return finish(options, runtime, directory, config_path, echo, run_async, key, failed=True)
@@ -740,7 +695,7 @@ def run_setup(options: Options, echo: Callable[[str], None], run_async) -> int:
         tables = [bus_table(key, config_path, mcp)]
         if options.memory:
             tables.append(memory_table(url, key))
-        current = codex_path.read_text() if codex_path.exists() else ""
+        current = codex_path.read_text(encoding="utf-8") if codex_path.exists() else ""
         if options.dry_run:
             planned = current
             for table in tables:
@@ -768,7 +723,9 @@ def finish(options, runtime, directory, config_path, echo, run_async, key, *, fa
     prefix = "[dry-run] would " if options.dry_run else ""
     instructions = directory / INSTRUCTION_FILES[runtime]
     if options.dry_run:
-        _, action = merge_instructions(instructions.read_text() if instructions.exists() else None)
+        _, action = merge_instructions(
+            instructions.read_text(encoding="utf-8") if instructions.exists() else None
+        )
         verb = {"created": "create", "appended": "append to", "updated": "update", "unchanged": "keep"}[
             action
         ]

{caura_bus_cli-0.3.1 → caura_bus_cli-0.3.4/src/caura_bus_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: caura-bus-cli
-Version: 0.3.1
+Version: 0.3.4
 Summary: Caura messaging CLI: setup / doctor / replay / agents / threads / send / status
 Author: Caura, Inc.
 License: Apache-2.0
@@ -10,7 +10,7 @@ Project-URL: Changelog, https://github.com/caura-ai/caura/blob/main/clients/coll
 Requires-Python: >=3.12
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: caura-bus-core==0.3.1
-Requires-Dist: caura-bus-mcp==0.3.1
+Requires-Dist: caura-bus-core==0.3.4
+Requires-Dist: caura-bus-mcp==0.3.4
 Requires-Dist: typer>=0.12
 Dynamic: license-file

caura_bus_cli-0.3.4/src/caura_bus_cli.egg-info/requires.txt

@@ -0,0 +1,3 @@
+caura-bus-core==0.3.4
+caura-bus-mcp==0.3.4
+typer>=0.12

caura_bus_cli-0.3.1/src/caura_bus_cli.egg-info/requires.txt

@@ -1,3 +0,0 @@
-caura-bus-core==0.3.1
-caura-bus-mcp==0.3.1
-typer>=0.12