refactorai-cli 0.5.6__tar.gz → 0.5.8__tar.gz

{refactorai_cli-0.5.6 → refactorai_cli-0.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.5.6
+Version: 0.5.8
 Summary: Local-first CLI for the refactor platform
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -8,7 +8,7 @@ Requires-Dist: typer>=0.12.0
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: rich>=13.7.0
 Requires-Dist: PyYAML>=6.0.1
-Requires-Dist: refactorai-core>=3.2.11
+Requires-Dist: refactorai-core>=3.2.13
 
 # refactorai-cli
 

{refactorai_cli-0.5.6 → refactorai_cli-0.5.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "refactorai-cli"
-version = "0.5.6"
+version = "0.5.8"
 description = "Local-first CLI for the refactor platform"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -12,7 +12,7 @@ dependencies = [
   "httpx>=0.27.0",
   "rich>=13.7.0",
   "PyYAML>=6.0.1",
-  "refactorai-core>=3.2.11",
+  "refactorai-core>=3.2.13",
 ]
 
 [project.scripts]

{refactorai_cli-0.5.6 → refactorai_cli-0.5.8}/refactorai_cli/__init__.py

@@ -5,4 +5,4 @@ the shared `refactor_core` pipeline from a project folder while staying
 authenticated to the hosted platform via a developer key.
 """
 
-__version__ = "0.5.6"
+__version__ = "0.5.8"

{refactorai_cli-0.5.6 → refactorai_cli-0.5.8}/refactorai_cli/commands/pre_push_cmds.py

@@ -72,9 +72,10 @@ def _count_requests(project_root: Path) -> tuple[int, int]:
 
 def _record_skip(project_root: Path, *, reasons: list[str], reason: str) -> None:
     try:
-        from refactor_core.paths import ensure_dir, project_store_dir
+        from refactor_core.paths import ensure_dir
+        from refactor_core.store import resolve_store_dir
 
-        audit_path = ensure_dir(project_store_dir(project_root)) / "pre_push_audit.jsonl"
+        audit_path = ensure_dir(resolve_store_dir(project_root)) / "pre_push_audit.jsonl"
         entry = {
             "at": datetime.now(timezone.utc).isoformat(),
             "event": "pre_push_bypass",

{refactorai_cli-0.5.6 → refactorai_cli-0.5.8}/refactorai_cli/commands/run_cmds.py

@@ -90,8 +90,9 @@ from refactor_core.store import (
     create_run,
     head_run_dir,
     list_runs,
-    project_store_dir,
     prune_runs,
+    resolve_project_id as resolve_store_project_id,
+    resolve_store_dir,
     read_findings,
     read_report,
     read_sandbox_install_history,
@@ -913,6 +914,50 @@ def _load_project() -> tuple[Path, object, object]:
     return consti_path.parent, constitution, config
 
 
+def _print_store_context(project_root) -> None:
+    """Surface the resolved project id + central store dir for this run.
+
+    Makes the id-keyed store observable so a wrong/duplicate binding (or an
+    unexpectedly unbound folder) is obvious at a glance instead of surfacing as a
+    confusing "resumed old requests" symptom later.
+    """
+    try:
+        pid = resolve_store_project_id(project_root)
+        store_dir = resolve_store_dir(project_root)
+    except Exception:
+        return
+    label = pid or "(unbound / local)"
+    console.print(f"[dim]project id:[/dim] {label} [dim]· store:[/dim] {store_dir}")
+
+
+def _report_store_binding(project_root) -> None:
+    """Doctor diagnostic: resolved project id, store dir, and binding mismatch.
+
+    A mismatch between the id resolved from ``refactor.config`` and the id stamped
+    on the on-disk store record is the fingerprint of a re-linked/duplicated
+    project; surfacing it here turns a silent state bug into an obvious check.
+    """
+    try:
+        from refactor_core.store import project_record
+
+        pid = resolve_store_project_id(project_root)
+        store_dir = resolve_store_dir(project_root)
+    except Exception:
+        return
+    console.print(f"[bold]project id[/bold]: {pid or '(unbound / local)'}")
+    console.print(f"[bold]store[/bold]: {store_dir}")
+    try:
+        record = project_record(project_root) or {}
+        record_id = str(record.get("project_id", "") or "")
+    except Exception:
+        record_id = ""
+    if pid and record_id and record_id != pid:
+        console.print(
+            f"[yellow]store binding[/yellow]: on-disk record id '{record_id}' differs "
+            f"from resolved '{pid}'. The store will re-key to the resolved id."
+        )
+
+
 def _warn_raw_key(constitution, config) -> None:
     if has_raw_secret_literal(constitution) or bool(raw_secret_matches_config(config)):
         console.print(
@@ -1105,7 +1150,9 @@ def init(
     config_target.write_text(config_text, encoding="utf-8")
 
     constitution = load_constitution(consti_target)
-    record = register_project(project_root, constitution_hash=constitution.content_hash)
+    record = register_project(
+        project_root, constitution_hash=constitution.content_hash, project_id=project_id
+    )
     console.print(f"[green]Created[/green] {consti_target}")
     console.print(f"[green]Created[/green] {config_target}")
     account_note = f" (account {account_slug})" if account_slug else ""
@@ -1125,7 +1172,7 @@ def init(
             "(mode=cloud_byok, env-key-first via provider_key; credential_ref is optional fallback)."
         )
     console.print(
-        f"[green]Registered[/green] project in central store: {project_store_dir(project_root)}"
+        f"[green]Registered[/green] project in central store: {resolve_store_dir(project_root)}"
     )
     console.print(
         f"Only {CONSTITUTION_FILENAME} and {CONFIG_FILENAME} are added to your repo; "
@@ -2787,7 +2834,14 @@ def review(
         )
     for warning in compliance_resolution.warnings:
         console.print(f"[yellow]review: compliance warning:[/yellow] {warning}")
-    register_project(project_root, constitution_hash=constitution.content_hash)
+    from refactorai_cli.commit_telemetry import resolve_project_id
+
+    register_project(
+        project_root,
+        constitution_hash=constitution.content_hash,
+        project_id=resolve_project_id(project_root) or None,
+    )
+    _print_store_context(project_root)
     _maybe_build_graph(project_root, project_config)
 
     # Commit-scoped review (docs/41 `R28`). Works in every execution mode: local
@@ -3121,7 +3175,14 @@ def code(
         )
     for warning in compliance_resolution.warnings:
         console.print(f"[yellow]code: compliance warning:[/yellow] {warning}")
-    register_project(project_root, constitution_hash=constitution.content_hash)
+    from refactorai_cli.commit_telemetry import resolve_project_id
+
+    register_project(
+        project_root,
+        constitution_hash=constitution.content_hash,
+        project_id=resolve_project_id(project_root) or None,
+    )
+    _print_store_context(project_root)
     _maybe_build_graph(project_root, project_config)
 
     # Commit-scoped resolve (docs/41 `R28`, Phase 4), symmetric to `review` and
@@ -4367,7 +4428,7 @@ def gc(
     removed = prune_runs(project_root, keep=keep)
     console.print(
         f"[green]Pruned[/green] {len(removed)} run(s); kept {before - len(removed)} "
-        f"under {project_store_dir(project_root)}."
+        f"under {resolve_store_dir(project_root)}."
     )
 
 
@@ -4602,6 +4663,7 @@ def _cloud_doctor(
     """
     console.print(f"[bold]project[/bold]: {project_root}")
     console.print(f"[bold]mode[/bold]: {execution_mode}")
+    _report_store_binding(project_root)
 
     try:
         auth_ctx = ensure_authenticated(project_root)
@@ -4835,6 +4897,7 @@ def doctor(
     console.print(f"[bold]mode[/bold]: {mode}")
     console.print(f"[bold]provider[/bold]: {provider_name}")
     console.print(f"[bold]supported[/bold]: {', '.join(supported_providers())}")
+    _report_store_binding(project_root)
 
     try:
         auth_ctx = ensure_authenticated(project_root)

{refactorai_cli-0.5.6 → refactorai_cli-0.5.8}/refactorai_cli/local_constitution.py

@@ -46,11 +46,15 @@ def _search_root(start: Path | None = None) -> Path:
 
 
 def find_config(start: Path | None = None) -> Path | None:
+    # Stop at the enclosing git repo root so we never adopt a parent directory's
+    # refactor.config (mirror of refactor_core.constitution discovery guard).
     current = _search_root(start)
     for candidate in [current, *current.parents]:
         config = candidate / CONFIG_FILENAME
         if config.is_file():
             return config
+        if (candidate / ".git").exists():
+            return None
     return None
 
 

refactorai_cli-0.5.8/refactorai_cli/local_paths.py

@@ -0,0 +1,76 @@
+"""Local path helpers for the standalone CLI package.
+
+These mirror the path helpers that were previously imported from ``refactor_core``
+so the public ``refactorai-cli`` package can install without requiring a separate
+``refactor-core`` wheel on PyPI.
+"""
+
+from __future__ import annotations
+
+import os
+import re
+from pathlib import Path
+
+
+def refactor_home() -> Path:
+    override = os.environ.get("REFACTOR_HOME")
+    if override:
+        return Path(override).expanduser()
+    return Path.home() / ".refactor"
+
+
+def encode_project_path(project_root: Path | str) -> str:
+    resolved = str(Path(project_root).resolve())
+    return resolved.lstrip("/").replace("/", "-") or "root"
+
+
+def sanitize_project_id(project_id: str | None) -> str:
+    """Filesystem-safe project id, or ``""`` (mirror of core helper)."""
+    value = str(project_id or "").strip()
+    if not value or value in {".", ".."}:
+        return ""
+    safe = re.sub(r"[^A-Za-z0-9._-]+", "-", value).strip("-")
+    if safe in {"", ".", ".."}:
+        return ""
+    return safe[:128]
+
+
+def project_store_dir_by_id(project_id: str) -> Path:
+    safe = sanitize_project_id(project_id)
+    if not safe:
+        raise ValueError("project_store_dir_by_id requires a non-empty project_id")
+    return refactor_home() / "projects" / safe
+
+
+def ensure_dir(path: Path, *, mode: int = 0o700) -> Path:
+    path.mkdir(parents=True, exist_ok=True, mode=mode)
+    return path
+
+
+def credentials_path() -> Path:
+    return refactor_home() / "credentials.json"
+
+
+def validation_cache_dir() -> Path:
+    return refactor_home() / "cache" / "validation"
+
+
+def project_store_dir(project_root: Path | str) -> Path:
+    """Legacy path-encoded store dir (backward-compat reads + migration only)."""
+    return refactor_home() / "projects" / encode_project_path(project_root)
+
+
+def resolve_store_dir(project_root: Path | str, *, project_id: str | None = None) -> Path:
+    """Return the project's central store dir, keyed by ``project_id``.
+
+    Delegates to ``refactor_core.store.resolve_store_dir`` (the single source of
+    truth, which also migrates any legacy path-encoded dir) when the core package
+    is importable. Falls back to the legacy path-encoded dir for pip-only installs
+    without ``refactor_core`` on disk, preserving this module's standalone role.
+    """
+    try:
+        from refactor_core.store import resolve_store_dir as _core_resolve
+
+        return _core_resolve(project_root, project_id=project_id)
+    except Exception:
+        return project_store_dir(project_root)

{refactorai_cli-0.5.6 → refactorai_cli-0.5.8}/refactorai_cli/refactor_branch_store.py

@@ -16,7 +16,7 @@ from dataclasses import dataclass
 from datetime import datetime, timezone
 from pathlib import Path
 
-from refactorai_cli.local_paths import ensure_dir, project_store_dir
+from refactorai_cli.local_paths import ensure_dir, resolve_store_dir
 
 _DIR = "refactor_branches"
 
@@ -67,7 +67,7 @@ def refactor_branch_name(
 
 
 def _dir(project_root: Path | str) -> Path:
-    return project_store_dir(project_root) / _DIR
+    return resolve_store_dir(project_root) / _DIR
 
 
 def _path(project_root: Path | str, branch: str) -> Path:

{refactorai_cli-0.5.6 → refactorai_cli-0.5.8}/refactorai_cli/watch_supervisor.py

@@ -50,9 +50,9 @@ def lock_path(project_root: Path | str) -> Path:
     directory = commit_queue.runs_dir(project_root)
     if directory is None:
         # Outside a git dir (or tests): fall back to the central project store.
-        from refactorai_cli.local_paths import project_store_dir
+        from refactorai_cli.local_paths import resolve_store_dir
 
-        directory = project_store_dir(project_root)
+        directory = resolve_store_dir(project_root)
     return Path(directory) / LOCK_FILENAME
 
 

{refactorai_cli-0.5.6 → refactorai_cli-0.5.8}/refactorai_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: refactorai-cli
-Version: 0.5.6
+Version: 0.5.8
 Summary: Local-first CLI for the refactor platform
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -8,7 +8,7 @@ Requires-Dist: typer>=0.12.0
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: rich>=13.7.0
 Requires-Dist: PyYAML>=6.0.1
-Requires-Dist: refactorai-core>=3.2.11
+Requires-Dist: refactorai-core>=3.2.13
 
 # refactorai-cli
 

{refactorai_cli-0.5.6 → refactorai_cli-0.5.8}/refactorai_cli.egg-info/requires.txt

@@ -2,4 +2,4 @@ typer>=0.12.0
 httpx>=0.27.0
 rich>=13.7.0
 PyYAML>=6.0.1
-refactorai-core>=3.2.11
+refactorai-core>=3.2.13

refactorai_cli-0.5.6/refactorai_cli/local_paths.py

@@ -1,40 +0,0 @@
-"""Local path helpers for the standalone CLI package.
-
-These mirror the path helpers that were previously imported from ``refactor_core``
-so the public ``refactorai-cli`` package can install without requiring a separate
-``refactor-core`` wheel on PyPI.
-"""
-
-from __future__ import annotations
-
-import os
-from pathlib import Path
-
-
-def refactor_home() -> Path:
-    override = os.environ.get("REFACTOR_HOME")
-    if override:
-        return Path(override).expanduser()
-    return Path.home() / ".refactor"
-
-
-def encode_project_path(project_root: Path | str) -> str:
-    resolved = str(Path(project_root).resolve())
-    return resolved.lstrip("/").replace("/", "-") or "root"
-
-
-def ensure_dir(path: Path, *, mode: int = 0o700) -> Path:
-    path.mkdir(parents=True, exist_ok=True, mode=mode)
-    return path
-
-
-def credentials_path() -> Path:
-    return refactor_home() / "credentials.json"
-
-
-def validation_cache_dir() -> Path:
-    return refactor_home() / "cache" / "validation"
-
-
-def project_store_dir(project_root: Path | str) -> Path:
-    return refactor_home() / "projects" / encode_project_path(project_root)