swarph-cli 0.7.4__tar.gz → 0.7.5__tar.gz

{swarph_cli-0.7.4/src/swarph_cli.egg-info → swarph_cli-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swarph-cli
-Version: 0.7.4
+Version: 0.7.5
 Summary: The `swarph` binary — multi-LLM CLI with mesh-gateway integration. v0.7.0 ships Phase 7 substrate-doc R7 §11.1.7 operator-tooling layer in 5 increments: PR-A `--new-instance` flag (sibling-spawn case) + PR-B auto-suffix on collision (sibling-slot persistence) + PR-C SessionStart hook (closes bare-claude operator-paste gap) + watchdog (stranded-session recovery) + PR-D swarph-shared cell.yaml relocation (cell-yaml schema graduates to swarph-shared 0.3.0 kernel-tier; substrate-doc R7 §11.1.5 (O5) RESOLVED).
 Author: Pierre Samson, Claude Opus
 License: MIT

{swarph_cli-0.7.4 → swarph_cli-0.7.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "swarph-cli"
-version = "0.7.4"
+version = "0.7.5"
 description = "The `swarph` binary — multi-LLM CLI with mesh-gateway integration. v0.7.0 ships Phase 7 substrate-doc R7 §11.1.7 operator-tooling layer in 5 increments: PR-A `--new-instance` flag (sibling-spawn case) + PR-B auto-suffix on collision (sibling-slot persistence) + PR-C SessionStart hook (closes bare-claude operator-paste gap) + watchdog (stranded-session recovery) + PR-D swarph-shared cell.yaml relocation (cell-yaml schema graduates to swarph-shared 0.3.0 kernel-tier; substrate-doc R7 §11.1.5 (O5) RESOLVED)."
 readme = "README.md"
 license = { text = "MIT" }

{swarph_cli-0.7.4 → swarph_cli-0.7.5}/src/swarph_cli/__init__.py

@@ -16,6 +16,6 @@ The architecture splits CLI from substrate so:
 
 from __future__ import annotations
 
-__version__ = "0.7.4"
+__version__ = "0.7.5"
 
 __all__ = ["__version__"]

{swarph_cli-0.7.4 → swarph_cli-0.7.5}/src/swarph_cli/commands/spawn.py

@@ -27,6 +27,7 @@ import argparse
 import os
 import shutil
 import sys
+from pathlib import Path
 from typing import Optional
 
 from swarph_cli import __version__
@@ -200,6 +201,33 @@ def _resolve_cell(args: argparse.Namespace) -> tuple[Cell, Optional[str]]:
     return load_cell(path), requested_role
 
 
+def _session_state_exists(session_id: str) -> bool:
+    """True if Claude Code already has on-disk session state for this UUID.
+
+    Closes v0.7.4 spawn-bug surfaced 2026-05-14 post-reboot (DM #1255):
+    `claude --session-id <UUID>` rejects with "Session ID <UUID> is already
+    in use" when session-state files exist on disk, even after reboot
+    (files persist; the in-use check is filesystem-based not runtime-lock-
+    based). Switching to `claude --resume <UUID>` is the correct semantic
+    when the UUID's state already exists.
+
+    Probes the three filesystem locations Claude Code stores per-session
+    state in: ~/.claude/file-history/<UUID>, ~/.claude/session-env/<UUID>,
+    and ~/.claude/projects/<project-hash>/<UUID>.jsonl (the latter
+    discovered via glob since project-hash varies).
+    """
+    claude_dir = Path.home() / ".claude"
+    if (claude_dir / "file-history" / session_id).exists():
+        return True
+    if (claude_dir / "session-env" / session_id).exists():
+        return True
+    projects_dir = claude_dir / "projects"
+    if projects_dir.exists():
+        for _ in projects_dir.glob(f"*/{session_id}.jsonl"):
+            return True
+    return False
+
+
 def _build_claude_argv(
     cell: Cell,
     session_id: str,
@@ -208,7 +236,14 @@ def _build_claude_argv(
     effective_role: Optional[str] = None,
 ) -> list[str]:
     name_value = effective_role if effective_role is not None else cell.role
-    argv: list[str] = ["claude", "--name", name_value, "--session-id", session_id]
+    # v0.7.5: auto-detect existing session state and switch from --session-id
+    # (create-new-with-pinned-UUID semantic) to --resume (attach-to-existing
+    # semantic). Both pass the same UUID; the verb determines whether claude
+    # treats it as fresh-create vs resume-existing.
+    if _session_state_exists(session_id):
+        argv: list[str] = ["claude", "--name", name_value, "--resume", session_id]
+    else:
+        argv = ["claude", "--name", name_value, "--session-id", session_id]
 
     if not no_starter:
         starter = read_starter_prompt(cell)

{swarph_cli-0.7.4 → swarph_cli-0.7.5/src/swarph_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swarph-cli
-Version: 0.7.4
+Version: 0.7.5
 Summary: The `swarph` binary — multi-LLM CLI with mesh-gateway integration. v0.7.0 ships Phase 7 substrate-doc R7 §11.1.7 operator-tooling layer in 5 increments: PR-A `--new-instance` flag (sibling-spawn case) + PR-B auto-suffix on collision (sibling-slot persistence) + PR-C SessionStart hook (closes bare-claude operator-paste gap) + watchdog (stranded-session recovery) + PR-D swarph-shared cell.yaml relocation (cell-yaml schema graduates to swarph-shared 0.3.0 kernel-tier; substrate-doc R7 §11.1.5 (O5) RESOLVED).
 Author: Pierre Samson, Claude Opus
 License: MIT

{swarph_cli-0.7.4 → swarph_cli-0.7.5}/tests/test_spawn_command.py

@@ -339,3 +339,92 @@ def test_run_spawn_dry_run_redacts_starter_prompt_in_command(
     assert rc == 0
     assert "redacted" not in captured.out  # the literal word from the prompt
     assert "starter prompt>" in captured.out  # the redaction marker
+
+
+# ---------------------------------------------------------------------------
+# v0.7.5 — _session_state_exists + --resume on existing session
+# ---------------------------------------------------------------------------
+#
+# Closes the bug surfaced 2026-05-14 post-reboot: claude --session-id <UUID>
+# rejects with "Session ID <UUID> is already in use" when on-disk session
+# state exists, even after host reboot (files persist; check is filesystem-
+# based not runtime-lock-based). Fix: detect existing state + switch from
+# --session-id (create-new semantic) to --resume (attach-existing semantic).
+
+
+def test_session_state_exists_false_for_fresh_uuid(tmp_path, monkeypatch):
+    """No filesystem state for the UUID = fresh; _build_claude_argv uses
+    --session-id (create-new semantic)."""
+    from swarph_cli.commands.spawn import _session_state_exists
+
+    monkeypatch.setattr("pathlib.Path.home", lambda: tmp_path)
+    fresh_uuid = "00000000-0000-0000-0000-000000000000"
+    assert _session_state_exists(fresh_uuid) is False
+
+
+def test_session_state_exists_true_when_file_history_present(tmp_path, monkeypatch):
+    """File-history dir alone is enough to flip detection (any one of the
+    three location signals triggers)."""
+    from swarph_cli.commands.spawn import _session_state_exists
+
+    monkeypatch.setattr("pathlib.Path.home", lambda: tmp_path)
+    uuid = "a30e406c-8bae-4ea2-8cb2-fb0dff35a6f0"
+    (tmp_path / ".claude" / "file-history" / uuid).mkdir(parents=True)
+    assert _session_state_exists(uuid) is True
+
+
+def test_session_state_exists_true_when_session_env_present(tmp_path, monkeypatch):
+    from swarph_cli.commands.spawn import _session_state_exists
+
+    monkeypatch.setattr("pathlib.Path.home", lambda: tmp_path)
+    uuid = "a30e406c-8bae-4ea2-8cb2-fb0dff35a6f0"
+    (tmp_path / ".claude" / "session-env").mkdir(parents=True)
+    (tmp_path / ".claude" / "session-env" / uuid).write_text("")
+    assert _session_state_exists(uuid) is True
+
+
+def test_session_state_exists_true_when_project_jsonl_present(tmp_path, monkeypatch):
+    """Projects path varies by project-hash; glob discovers any match."""
+    from swarph_cli.commands.spawn import _session_state_exists
+
+    monkeypatch.setattr("pathlib.Path.home", lambda: tmp_path)
+    uuid = "a30e406c-8bae-4ea2-8cb2-fb0dff35a6f0"
+    proj = tmp_path / ".claude" / "projects" / "-some-project-hash"
+    proj.mkdir(parents=True)
+    (proj / f"{uuid}.jsonl").write_text("{}\n")
+    assert _session_state_exists(uuid) is True
+
+
+def test_build_claude_argv_uses_session_id_when_fresh(fake_cell_yaml, tmp_path, monkeypatch):
+    """No prior session state → --session-id (create-new) verb."""
+    monkeypatch.setattr("pathlib.Path.home", lambda: tmp_path)
+    cell = load_cell(fake_cell_yaml)
+    argv = _build_claude_argv(
+        cell=cell,
+        session_id="00000000-0000-0000-0000-000000000000",
+        no_starter=True,
+        passthrough=[],
+    )
+    assert "--session-id" in argv
+    assert "--resume" not in argv
+
+
+def test_build_claude_argv_uses_resume_when_state_exists(fake_cell_yaml, tmp_path, monkeypatch):
+    """Prior session state exists → --resume (attach-existing) verb.
+
+    Closes the v0.7.4 spawn-after-reboot rejection class.
+    """
+    monkeypatch.setattr("pathlib.Path.home", lambda: tmp_path)
+    uuid = "a30e406c-8bae-4ea2-8cb2-fb0dff35a6f0"
+    (tmp_path / ".claude" / "file-history" / uuid).mkdir(parents=True)
+    cell = load_cell(fake_cell_yaml)
+    argv = _build_claude_argv(
+        cell=cell,
+        session_id=uuid,
+        no_starter=True,
+        passthrough=[],
+    )
+    assert "--resume" in argv
+    assert "--session-id" not in argv
+    # UUID still passed (just as --resume's value not --session-id's)
+    assert uuid in argv