cc-session-tools 3.9.0__tar.gz → 3.9.1__tar.gz

{cc_session_tools-3.9.0/src/cc_session_tools.egg-info → cc_session_tools-3.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cc-session-tools
-Version: 3.9.0
+Version: 3.9.1
 Summary: Claude Code session management CLI tools (ccd, ccr, ccs, claude-code-usage, ccst) and hook library (hooks package)
 Author: raffishquartan
 License: MIT License

{cc_session_tools-3.9.0 → cc_session_tools-3.9.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cc-session-tools"
-version = "3.9.0"
+version = "3.9.1"
 description = "Claude Code session management CLI tools (ccd, ccr, ccs, claude-code-usage, ccst) and hook library (hooks package)"
 readme = "README.md"
 license = { file = "LICENSE" }

{cc_session_tools-3.9.0 → cc_session_tools-3.9.1}/src/cc_session_tools/lib/pdata/init_paths.py

@@ -112,13 +112,41 @@ def project_db_dir_override(rehearse: Path | None) -> Iterator[None]:
     override_dir = rehearse / REHEARSAL_DB_DIRNAME
     previous = os.environ.get(store.PROJECT_DB_DIR_ENV)
     os.environ[store.PROJECT_DB_DIR_ENV] = str(override_dir)
+    _live_db_dir_env_stack.append(previous)
     try:
         yield
     finally:
-        if previous is None:
-            os.environ.pop(store.PROJECT_DB_DIR_ENV, None)
-        else:
-            os.environ[store.PROJECT_DB_DIR_ENV] = previous
+        _live_db_dir_env_stack.pop()
+        _restore_db_dir_env(previous)
+
+
+# The CCST_PROJECT_DB_DIR value in effect before each active project_db_dir_override (None =
+# unset), outermost first - what live_project_db_dir() restores.
+_live_db_dir_env_stack: list[str | None] = []
+
+
+def _restore_db_dir_env(value: str | None) -> None:
+    if value is None:
+        os.environ.pop(store.PROJECT_DB_DIR_ENV, None)
+    else:
+        os.environ[store.PROJECT_DB_DIR_ENV] = value
+
+
+@contextmanager
+def live_project_db_dir() -> Iterator[None]:
+    """Inside a project_db_dir_override block, temporarily point store.db_path() back at the
+    real per-project .db dir. For questions about the machine rather than the rehearsal copy
+    (e.g. "is this project already migrated here?"): a `cp -r` rehearsal copy never contains the
+    real .db, so the sandbox always answers "no". No-op outside an override."""
+    if not _live_db_dir_env_stack:
+        yield
+        return
+    inside = os.environ.get(store.PROJECT_DB_DIR_ENV)
+    _restore_db_dir_env(_live_db_dir_env_stack[0])
+    try:
+        yield
+    finally:
+        _restore_db_dir_env(inside)
 
 
 @contextmanager

{cc_session_tools-3.9.0 → cc_session_tools-3.9.1}/src/cc_session_tools/lib/pdata/init_service.py

@@ -324,7 +324,11 @@ def _pending_adoption(*, project: str, project_root: Path) -> dump.DumpInfo | No
             "project. Publish a fresh dump from a known-good machine (ccst pdata dump --force) "
             "or reconcile manually (ccst pdata resolve) once those commands exist."
         )
-    if _already_locally_migrated(project):
+    # The live .db, not a --rehearse sandbox's: a rehearsal copy never contains the real .db, so
+    # the sandbox would always look unmigrated and rehearsal would never reach classification.
+    with init_paths.live_project_db_dir():
+        already_migrated = _already_locally_migrated(project)
+    if already_migrated:
         return None
     return info
 

{cc_session_tools-3.9.0 → cc_session_tools-3.9.1/src/cc_session_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cc-session-tools
-Version: 3.9.0
+Version: 3.9.1
 Summary: Claude Code session management CLI tools (ccd, ccr, ccs, claude-code-usage, ccst) and hook library (hooks package)
 Author: raffishquartan
 License: MIT License

{cc_session_tools-3.9.0 → cc_session_tools-3.9.1}/tests/test_ccst_pdata_init_cli.py

@@ -368,3 +368,58 @@ def test_pdata_init_write_still_adopts_after_an_earlier_dry_run(base_env, tmp_pa
     assert "Adopting existing pdata from sync dump" in r_write.stdout
     assert "macbook" in r_write.stdout
     assert "SUCCESS" in r_write.stdout
+
+
+def _publish_dump(base_env, project_dir, monkeypatch, *, with_record):
+    """Build a published dump for project `demo`; keep the live .db only if `with_record`."""
+    from cc_session_tools.lib.pdata import dump, repository, service, vector_clock_store
+
+    monkeypatch.setenv("CCST_PROJECT_DB_DIR", base_env["CCST_PROJECT_DB_DIR"])
+    con = repository.connect("demo")
+    with repository._immediate(con):
+        vector_clock_store.write_vector(con, {"macbook": 3}, updated_at=100)
+    dump.write_latest(con, project_root=project_dir, machine_id="macbook", vector={"macbook": 3})
+    con.close()
+    db_file = Path(base_env["CCST_PROJECT_DB_DIR"]) / "demo.db"
+    if with_record:
+        service.add_record(project="demo", record_group="notes", content="live content", file_path=None, fields={})
+    else:
+        db_file.unlink()
+    return db_file
+
+
+def test_pdata_init_rehearse_classifies_when_live_project_already_migrated(
+    base_env, tmp_path, monkeypatch,
+):
+    """A rehearsal copy is a plain `cp -r` of the project: it carries the published dump but not
+    the real .db. The adopt-vs-classify decision must still use the real .db, so a project that
+    already has local pdata content gets a classification report, not an adoption message."""
+    project_dir = tmp_path / "projects" / "demo"
+    project_dir.mkdir(parents=True)
+    (project_dir / "ideas.csv").write_text("idea\nfirst\n")
+    db_file = _publish_dump(base_env, project_dir, monkeypatch, with_record=True)
+    rehearsal_dir = tmp_path / "rehearsal-demo"
+    shutil.copytree(project_dir, rehearsal_dir)
+    before = db_file.read_bytes()
+
+    r = _run(base_env, "pdata", "init", "--project", "demo", "--rehearse", str(rehearsal_dir))
+
+    assert r.returncode == 0, r.stderr
+    assert "a published sync dump already exists" not in r.stdout
+    assert "ideas.csv" in r.stdout
+    assert db_file.read_bytes() == before
+
+
+def test_pdata_init_rehearse_still_reports_adoption_when_no_local_content(
+    base_env, tmp_path, monkeypatch,
+):
+    project_dir = tmp_path / "projects" / "demo"
+    project_dir.mkdir(parents=True)
+    _publish_dump(base_env, project_dir, monkeypatch, with_record=False)
+    rehearsal_dir = tmp_path / "rehearsal-demo"
+    shutil.copytree(project_dir, rehearsal_dir)
+
+    r = _run(base_env, "pdata", "init", "--project", "demo", "--rehearse", str(rehearsal_dir))
+
+    assert r.returncode == 0, r.stderr
+    assert "a published sync dump already exists" in r.stdout