fix(hooks): preserve dashed project names + route through normalize_wing_name (#10)

jphein · claude · web-flow · commit d76134d34218 · 2026-05-05T19:05:48.000-07:00
Two findings from Copilot review on #9 (already merged): 1. **Last-dash-token rule lost hyphenated project names.** A project directory named ``realm-watch`` is encoded by Claude Code as ``-home-jp-Projects-realm-watch``, and the previous primary regex's ``rsplit('-', 1)[-1]`` returned ``watch`` — collapsing the project name. Reorder the resolution: try the explicit ``-Projects-<name>`` segment FIRST (preserves dashes), fall back to the last-dash-token only when the path is in a non-Projects layout (``~/dev/<parent>/<project>``). 2. **Inconsistent normalization vs operator mines.** Hook used ``.lower().replace(' ', '_')`` (no hyphen handling) while ``mempalace mine`` runs the dirname through ``normalize_wing_name`` (lowercases, dashes/spaces → underscores). Same project mined two ways produced two different wings. Route the hook through ``normalize_wing_name`` for parity. Net behavior: ``-Projects-realm-watch`` → ``realm_watch`` (matches operator-mine output). Existing tests for non-dashed projects still pass; 4 new tests cover dashed-project + uppercase-mixed cases + explicit operator-mine convergence assertion. Tests: 1551 pass, 1 skipped. Ruff lint + format clean. Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
diff --git a/mempalace/hooks_cli.py b/mempalace/hooks_cli.py
@@ -522,30 +522,38 @@ def _wing_from_transcript_path(transcript_path: str) -> str:
         ~/.claude/projects/-home-<user>-dev-<parent>-<project>/session.jsonl
         ~/.claude/projects/-Users-<user>-<folder>-<project>/session.jsonl
 
-    Returns the project directory's basename, lowercased, with spaces
-    collapsed to underscores. Falls back to ``"sessions"`` for paths
-    that don't match the standard Claude Code projects layout.
-
-    The earlier shape returned ``wing_<project>``, which silently split
-    content between hook-derived ``wing_<project>`` wings and
-    operator-mined bare-name wings. The bare project name converges
-    them.
+    Returns the project's basename run through
+    :func:`mempalace.config.normalize_wing_name` (lowercases, replaces
+    spaces and hyphens with underscores) so hook-derived wings match
+    operator-mined wing names exactly. Falls back to ``"sessions"`` for
+    paths that don't match the standard Claude Code projects layout.
+
+    Resolution order:
+
+    1. ``-Projects-<name>`` segment when present — preserves project
+       names containing dashes (``realm-watch`` resolves to
+       ``realm_watch`` instead of collapsing to ``watch``). Closes
+       Copilot finding on jphein/mempalace#9.
+    2. Last dash-separated token of ``/.claude/projects/-...`` — covers
+       non-Projects layouts (``-Users-<user>-<folder>-<project>``).
+    3. ``"sessions"`` fallback.
     """
-    # Normalize path separators for cross-platform (Windows backslashes)
+    from .config import normalize_wing_name
+
     normalized = transcript_path.replace("\\", "/")
-    # Primary: pull the encoded project folder out of ``.claude/projects/``
-    # and take its last dash-separated token.
+    # Primary: explicit ``-Projects-<name>`` segment. Preferred because
+    # it preserves project names that themselves contain dashes.
+    match = re.search(r"-Projects-([^/]+?)(?:/|$)", normalized)
+    if match:
+        return normalize_wing_name(match.group(1))
+    # Secondary: last dash-separated token of ``/.claude/projects/-...``.
+    # Used for projects under non-Projects parents (e.g. ~/dev, ~/code).
     match = re.search(r"/\.claude/projects/-([^/]+)", normalized)
     if match:
         encoded = match.group(1)
         project = encoded.rsplit("-", 1)[-1]
         if project:
-            return project.lower().replace(" ", "_")
-    # Legacy fallback: explicit ``-Projects-<name>`` segment, useful for
-    # transcripts not under the standard Claude Code projects dir.
-    match = re.search(r"-Projects-([^/]+?)(?:/|$)", normalized)
-    if match:
-        return match.group(1).lower().replace(" ", "_")
+            return normalize_wing_name(project)
     return "sessions"
 
 
diff --git a/tests/test_hooks_cli.py b/tests/test_hooks_cli.py
@@ -347,6 +347,34 @@ def test_wing_from_transcript_path_nested_deep():
     assert _wing_from_transcript_path(path) == "frontend"
 
 
+def test_wing_from_transcript_path_dashed_project():
+    """Project names containing dashes (realm-watch) survive intact via
+    normalize_wing_name — dashes become underscores. Closes Copilot
+    finding on jphein/mempalace#9: previously the last-dash-token rule
+    collapsed ``realm-watch`` to ``watch``.
+    """
+    path = "/home/jp/.claude/projects/-home-jp-Projects-realm-watch/session.jsonl"
+    assert _wing_from_transcript_path(path) == "realm_watch"
+
+
+def test_wing_from_transcript_path_dashed_project_uppercase():
+    """Combined: dashes preserved AND lowercased."""
+    path = "/home/jp/.claude/projects/-home-jp-Projects-Realm-Watch/session.jsonl"
+    assert _wing_from_transcript_path(path) == "realm_watch"
+
+
+def test_wing_from_transcript_path_matches_operator_mine():
+    """The wing this returns matches what `mempalace mine ~/Projects/X`
+    would produce when --wing is omitted (convo_miner.normalize_wing_name
+    over the dir basename). This is the convergence the bare-name shape
+    is supposed to deliver."""
+    from mempalace.config import normalize_wing_name
+
+    path = "/home/jp/.claude/projects/-home-jp-Projects-realm-watch/session.jsonl"
+    operator_wing = normalize_wing_name("realm-watch")
+    assert _wing_from_transcript_path(path) == operator_wing
+
+
 # --- _log ---
 
 
