claude-session-backup 0.4.2__tar.gz → 0.4.6__tar.gz

{claude_session_backup-0.4.2 → claude_session_backup-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-session-backup
-Version: 0.4.2
+Version: 0.4.6
 Summary: Git-backed Claude Code session backup with timeline view, folder analysis, deletion detection, and session restore.
 Author-email: djdarcy <6962246+djdarcy@users.noreply.github.com>
 License: GPL-3.0-or-later
@@ -246,7 +246,7 @@ Like the project?
 
 ## Acknowledgements
 
-- [claude-vault](https://github.com/kuroko1t/claude-vault) by [@kuroko1t](https://github.com/kuroko1t) -- FTS5 search design, JSONL parsing patterns, Claude Code hook integration. Serendipitously started development on `csb` a week or so before [kuroko1t's blog post](https://dev.to/kuroko1t/i-built-a-tool-to-stop-losing-my-claude-code-conversation-history-5500) laying out the problem.
+- [claude-vault](https://github.com/kuroko1t/claude-vault) by [@kuroko1t](https://github.com/kuroko1t) -- Serendipitously started development on `csb` a week or so before [kuroko1t's blog post](https://dev.to/kuroko1t/i-built-a-tool-to-stop-losing-my-claude-code-conversation-history-5500) laying out the problem.
 - [claude-code-history-viewer](https://github.com/jhlee0409/claude-code-history-viewer) by [@jhlee0409](https://github.com/jhlee0409) - GUI session reader that `csb view` launches.
 
 ## License

{claude_session_backup-0.4.2 → claude_session_backup-0.4.6}/README.md

@@ -214,7 +214,7 @@ Like the project?
 
 ## Acknowledgements
 
-- [claude-vault](https://github.com/kuroko1t/claude-vault) by [@kuroko1t](https://github.com/kuroko1t) -- FTS5 search design, JSONL parsing patterns, Claude Code hook integration. Serendipitously started development on `csb` a week or so before [kuroko1t's blog post](https://dev.to/kuroko1t/i-built-a-tool-to-stop-losing-my-claude-code-conversation-history-5500) laying out the problem.
+- [claude-vault](https://github.com/kuroko1t/claude-vault) by [@kuroko1t](https://github.com/kuroko1t) -- Serendipitously started development on `csb` a week or so before [kuroko1t's blog post](https://dev.to/kuroko1t/i-built-a-tool-to-stop-losing-my-claude-code-conversation-history-5500) laying out the problem.
 - [claude-code-history-viewer](https://github.com/jhlee0409/claude-code-history-viewer) by [@jhlee0409](https://github.com/jhlee0409) - GUI session reader that `csb view` launches.
 
 ## License

{claude_session_backup-0.4.2 → claude_session_backup-0.4.6}/claude_session_backup/_version.py

@@ -15,13 +15,13 @@ To bump version: python scripts/sync-versions.py --bump patch
 # Version components - edit these for version bumps
 MAJOR = 0
 MINOR = 4
-PATCH = 2
+PATCH = 6
 PHASE = ""  # Per-MINOR feature set: None, "alpha", "beta", "rc1", etc.
 PRE_RELEASE_NUM = 1  # PEP 440 pre-release number (e.g., a1, b2)
 PROJECT_PHASE = "alpha"  # Project-wide: "prealpha", "alpha", "beta", "stable"
 
 # Auto-updated by git hooks - do not edit manually
-__version__ = "0.4.2"
+__version__ = "0.4.6_main_56-20260614-54d2a56b"
 __app_name__ = "claude-session-backup"
 
 

{claude_session_backup-0.4.2 → claude_session_backup-0.4.6}/claude_session_backup/cli.py

@@ -53,6 +53,12 @@ for flag, spec in _COMMON_FLAGS.items():
     if "short" in spec:
         _COMMON_FLAG_NAMES.add(spec["short"])
 
+# Commands that launch a wrapped subtool and therefore accept `--` passthrough
+# (#47): everything after a standalone `--` is forwarded verbatim to the child
+# (resume -> claude, view -> the history viewer). Any other command rejects a
+# passthrough rather than silently dropping it.
+PASSTHROUGH_COMMANDS = {"resume", "view"}
+
 
 def _add_common_flags(parser):
     """Add common flags to a subcommand parser."""
@@ -227,7 +233,19 @@ def build_parser():
     )
 
     # resume
-    p_resume = sub.add_parser("resume", help="Launch claude --resume with full UUID")
+    p_resume = sub.add_parser(
+        "resume",
+        help="Launch claude --resume with full UUID",
+        description=(
+            "Resolve a session, cd to its start folder, and launch\n"
+            "`claude --resume <uuid>`. Forward extra args to claude after `--`:\n\n"
+            "  csb resume <query>                    resume it\n"
+            "  csb resume <query> -- --fork-session  resume + forward --fork-session to claude\n\n"
+            "Everything after `--` is passed verbatim to claude (don't re-pass\n"
+            "--resume / -r -- csb already supplies it)."
+        ),
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+    )
     _add_common_flags(p_resume)
     p_resume.add_argument(
         "session_id", metavar="query",
@@ -270,7 +288,9 @@ def build_parser():
             "key (csb config viewer_path <path>), then platform install\n"
             "locations. Without a viewer, prints the transcript path.\n"
             "Pruned sessions offer restore-from-git first (same flags as\n"
-            "`csb resume`)."
+            "`csb resume`).\n\n"
+            "Forward extra args to the viewer after `--`:\n"
+            "  csb view <query> -- <viewer-args>"
         ),
         formatter_class=argparse.RawDescriptionHelpFormatter,
     )
@@ -612,9 +632,9 @@ def build_parser():
     p_update_rebuild.add_argument(
         "--include-fts5", action="store_true",
         help=(
-            "Also refresh the per-project FTS5 indexes (currently a no-op "
-            "stub on this branch -- main wires the actual refresh in "
-            "post-merge)."
+            "Also force-rebuild the per-project FTS5 content indexes after "
+            "the index rebuild. Fails soft -- an FTS5 problem warns but never "
+            "fails the rebuild."
         ),
     )
     p_update_rebuild.add_argument(
@@ -732,21 +752,57 @@ def build_parser():
     return parser
 
 
+def _split_passthrough(argv):
+    """Split argv at the first standalone ``--`` token (#47).
+
+    Returns ``(csb_argv, passthrough)`` -- everything before the ``--`` for
+    csb's own parsing, everything after it forwarded verbatim to a wrapped
+    subtool. No ``--`` -> ``(argv, [])``. Matches only the exact two-char
+    token, never ``--db``/``--force``. Must run BEFORE ``_hoist_common_flags``
+    so forwarded flags are never hoisted into csb's own options.
+    """
+    if "--" in argv:
+        i = argv.index("--")
+        return list(argv[:i]), list(argv[i + 1:])
+    return list(argv), []
+
+
 def main(argv=None):
     """Entry point for csb CLI."""
     # Hoist common flags from before the subcommand to after it.
     # This makes `csb --quiet backup` work the same as `csb backup --quiet`.
     if argv is None:
         argv = sys.argv[1:]
+
+    # `--` passthrough (#47): everything after the first standalone `--` token
+    # is forwarded verbatim to the wrapped subtool. Carve it off BEFORE
+    # flag-hoisting so a forwarded flag (e.g. `csb resume x -- --db /other`)
+    # is never mistaken for one of csb's own options. argparse never sees the
+    # `--` -- the tail is reattached to the namespace as `args.passthrough`.
+    argv, passthrough = _split_passthrough(argv)
+
     argv = _hoist_common_flags(argv)
 
     parser = build_parser()
     args = parser.parse_args(argv)
+    args.passthrough = passthrough
 
     if args.command is None:
         parser.print_help()
         return 0
 
+    # Only subtool-launchers can forward args; reject (never silently drop)
+    # a passthrough given to any other command.
+    if passthrough and args.command not in PASSTHROUGH_COMMANDS:
+        capable = ", ".join(sorted(PASSTHROUGH_COMMANDS))
+        print(
+            f"csb {args.command}: `--` passthrough is only supported by: "
+            f"{capable}. (Everything after `--` is forwarded to the wrapped "
+            f"tool, which `{args.command}` does not launch.)",
+            file=sys.stderr,
+        )
+        return 2
+
     # Import handlers lazily to keep startup fast
     if args.command == "backup":
         from .commands import cmd_backup

{claude_session_backup-0.4.2 → claude_session_backup-0.4.6}/claude_session_backup/commands.py

@@ -70,6 +70,7 @@ from .metadata import (
     read_name_cache,
     read_session_state,
 )
+from .pathkit import ClaudePaths
 from .scanner import scan_projects
 from .timeline import format_session_line, format_timeline, render_timeline_rich, HAS_RICH
 
@@ -192,8 +193,10 @@ def _cmd_backup_inner(args, config, claude_dir, quiet) -> int:
             # Upsert into index. Store rel_path with forward slashes so it
             # works directly with `git show <commit>:<path>` (which rejects
             # backslash separators on Windows). Path operations downstream
-            # accept either separator.
-            rel_path = sf.jsonl_path.relative_to(claude_dir).as_posix()
+            # accept either separator. ClaudePaths.rel() also survives a
+            # junction/symlink claude_dir, where a resolved-vs-raw prefix
+            # mismatch made bare relative_to() raise ValueError (#46).
+            rel_path = ClaudePaths.from_dir(claude_dir).rel(sf.jsonl_path)
             # Restore-verify gate (v0.3.16): only let a reappeared JSONL
             # clear an existing deleted_at if it's a genuine transcript
             # (>=1 parsed event). A stub / garbage file (event_count == 0,
@@ -454,9 +457,9 @@ def find_unbacked_sessions(conn, claude_dir, exclude=None):
     aren't in the index at all) -- i.e. sessions with un-backed-up changes.
 
     The single source of truth for "what isn't backed up", shared by the
-    SessionStart hook's `_check` and (future) user-facing surfacing in
-    ``csb status`` / ``csb list``. ``exclude`` is a set of full session ids to
-    skip (e.g. the currently-active session, whose JSONL is mid-write).
+    SessionStart hook's `_check` and ``csb status``'s un-backed-up section
+    (and, eventually, ``csb list``). ``exclude`` is a set of full session ids
+    to skip (e.g. the currently-active session, whose JSONL is mid-write).
     """
     exclude = set(exclude or [])
     stale = []
@@ -961,8 +964,9 @@ def cmd_restore(args) -> int:
 #
 # Single source of truth for the file-level restore policy. Used by:
 #   - cmd_restore     -- the `csb restore <uuid>` command
-#   - cmd_resume      -- (v0.3.14+) prompts-to-restore when session is pruned
-#   - cmd_view        -- (future, #14 + #34 phase B) same when viewing pruned
+#   - cmd_resume      -- prompts-to-restore when the session is pruned
+#   - cmd_view        -- same when viewing a pruned session (#14 / #34)
+#   - cmd_distill     -- same when distilling a pruned session (#12)
 #
 # Callers are responsible for resolving the UUID, finding `jsonl_path` (DB
 # row OR git-history fallback), and finding `commit` (parent-of-deletion).
@@ -1020,8 +1024,8 @@ def _restore_session(
             from the DB row OR via `git_find_jsonl_by_uuid` fallback.
         commit: commit-ish to restore from. Caller obtains via
             `git_find_deleted_file(claude_dir, jsonl_path)`.
-        jsonl_only: if True, restore only the main transcript (v0.3.11
-            behavior preserved behind this flag).
+        jsonl_only: if True, restore only the main transcript JSONL
+            (skip the session subtree and logger sidecars).
         force: if True, overwrite present on-disk files from git.
             Default behavior preserves on-disk content (idempotent;
             never clobbers local content with newer-than-git writes).
@@ -1211,8 +1215,11 @@ def _recreate_transcript_symlink(
         from dazzle_filekit import create_symlink
     except ImportError:
         return False
-    link_path = Path(claude_dir) / link_rel
-    target_abs = (Path(claude_dir) / "projects" / slug / f"{uuid}.jsonl").resolve()
+    cp = ClaudePaths.from_dir(claude_dir)
+    link_path = cp.abs_of(link_rel)
+    # .resolve() stays: the is_symlink comparison below resolves the live
+    # link's target, so both sides must share resolve semantics (#46).
+    target_abs = cp.jsonl(slug, uuid).resolve()
     # Skip work if a correct symlink already exists (idempotent, no churn).
     try:
         if link_path.is_symlink() and Path(os.readlink(link_path)).resolve() == target_abs:
@@ -1442,11 +1449,7 @@ def _extract_slug_from_jsonl_path(jsonl_path: str) -> str:
     """
     if not jsonl_path:
         return ""
-    norm = jsonl_path.replace("\\", "/")
-    parts = norm.split("/")
-    if len(parts) >= 3 and parts[0] == "projects":
-        return parts[1]
-    return ""
+    return ClaudePaths.parse_rel(jsonl_path).slug or ""
 
 
 def _categorize_restored_paths(
@@ -1652,7 +1655,7 @@ def cmd_search(args) -> int:
 
 
 def cmd_build_fts5(args) -> int:
-    """Build / refresh per-project FTS5 content indices (Phase 2 of #3).
+    """Build / refresh per-project FTS5 content indices.
 
     Idempotent: by default only re-indexes sessions whose JSONL mtime
     has advanced past ``indexed_sessions.last_jsonl_mtime``. Use
@@ -1739,16 +1742,49 @@ def cmd_update(args) -> int:
 
 
 def _maybe_refresh_fts5(args) -> None:
-    """Stub seam for main's FTS5 refresh integration (post-merge).
-
-    Per the v0.3.11 handoff
-    (private/claude/2026-06-02__14-14-02__handoff__...md), main will wire
-    the actual `csb update rebuild-index --include-fts5` and
-    `csb backup --refresh-fts5` work on the unified base after the
-    reverse-merge. This stub is the agreed-on hook point. Currently a
-    no-op so the flag plumbs through without effect.
+    """Wipe + rebuild the per-project FTS5 content indexes after a
+    `csb update rebuild-index --include-fts5` (#3, the last open AC).
+
+    Force-rebuild on purpose: rebuild-index is the nuclear
+    reconstruct-everything verb, so the content indexes are rebuilt
+    unconditionally too rather than mtime-gated (that incremental path
+    is `csb update build-fts5` without --force).
+
+    Fails SOFT in every case: by the time this seam runs the main index
+    rebuild has already succeeded, so a missing-FTS5 SQLite build or an
+    indexing error downgrades to a stderr warning with the manual
+    command, never a non-zero rebuild exit.
+
+    (Backup-time incremental FTS5 indexing -- the other half of the
+    original #3 Phase 2 spec -- was REJECTED by design: it would add
+    latency inside the PreCompact/SessionEnd hooks, and v0.3.22's
+    search-time freshness rescue makes it unnecessary.)
     """
-    pass
+    from . import fts5_db, fts5_index
+
+    quiet = getattr(args, "quiet", False)
+    if not fts5_db.fts5_available():
+        print(
+            "Warning: this Python's SQLite lacks FTS5; skipped the "
+            "--include-fts5 refresh (main index rebuild is intact).",
+            file=sys.stderr,
+        )
+        return
+    config = _get_config(args)
+    conn = open_db(config["index_path"])
+    init_schema(conn, quiet=quiet)
+    try:
+        fts5_index.build_all(
+            conn, Path(config["claude_dir"]), force=True, quiet=quiet,
+        )
+    except Exception as e:  # noqa: BLE001 -- secondary refresh must not fail the rebuild
+        print(
+            f"Warning: FTS5 refresh failed ({e}); main index rebuild is "
+            f"intact. Run `csb update build-fts5 --force` manually.",
+            file=sys.stderr,
+        )
+    finally:
+        conn.close()
 
 
 def cmd_backfill_deleted(args) -> int:
@@ -1776,11 +1812,12 @@ def cmd_backfill_deleted(args) -> int:
 
     Flags:
       --dry-run -- preview without writing anything
-      --full    -- (currently identical to default; incremental refresh
-                   via the last_refreshed_at marker is a follow-on)
+      --full    -- accepted but not yet differentiated from the default
+                   run (the last_refreshed_at marker is recorded but not
+                   yet used as an incremental-skip gate)
 
-    Plan ref: private/claude/2026-06-02__15-46-56__claude-plan__safe-
-    update-umbrella-and-backfill-v0.3.11.md (Phase 4)
+    Plan ref: 2026-06-02__15-46-56__claude-plan__safe-update-umbrella-
+    and-backfill-v0.3.11.md
     """
     from .index import (
         count_git_deleted_jsonls,
@@ -1907,8 +1944,7 @@ def cmd_backfill_deleted(args) -> int:
                 continue
 
             # Derive the project slug from the path: projects/<slug>/<uuid>.jsonl
-            parts = jp.split("/")
-            project = parts[1] if len(parts) >= 3 and parts[0] == "projects" else ""
+            project = ClaudePaths.parse_rel(jp).slug or ""
 
             meta = extract_metadata_from_bytes(blob, session_id=sid, project=project)
             new_folder_count = len(meta.folder_usage)
@@ -2009,14 +2045,14 @@ def cmd_rebuild_index(args) -> int:
          deleted-session rows back in (skipping any UUIDs the live
          rescan already repopulated, which would mean the JSONL came
          back somehow).
-      7. Optionally runs ``_maybe_refresh_fts5`` (stub on this branch;
-         main wires the real refresh post-merge) if ``--include-fts5``.
+      7. Optionally runs ``_maybe_refresh_fts5`` (force wipe + rebuild
+         of the per-project FTS5 DBs, fail-soft) if ``--include-fts5``.
       8. Optionally chains ``cmd_backfill_deleted`` if
          ``--include-backfill-deleted`` is set.
       9. Removes the ``.bak`` on full success.
 
-    Plan ref: private/claude/2026-06-02__15-46-56__claude-plan__safe-
-    update-umbrella-and-backfill-v0.3.11.md (Phase 2)
+    Plan ref: 2026-06-02__15-46-56__claude-plan__safe-update-umbrella-
+    and-backfill-v0.3.11.md
     """
     config = _get_config(args)
     claude_dir = config["claude_dir"]
@@ -2089,11 +2125,12 @@ def cmd_rebuild_index(args) -> int:
                 print(f"Preserved {restored} deleted-session {noun} "
                       f"across rebuild")
 
-        # 5. Optional --include-fts5 (stub seam; main fills this in post-merge)
+        # 5. Optional --include-fts5: wipe + rebuild per-project FTS5 DBs
+        # against the freshly rebuilt index (fails soft -- see the helper).
         if getattr(args, "include_fts5", False):
             _maybe_refresh_fts5(args)
 
-        # 6. Optional --include-backfill-deleted (Phase 4 fills in cmd_backfill_deleted)
+        # 6. Optional --include-backfill-deleted -- chain cmd_backfill_deleted
         if getattr(args, "include_backfill_deleted", False):
             cmd_backfill_deleted(args)
 
@@ -2448,19 +2485,27 @@ def _find_viewer(config) -> Optional[dict]:
     return None
 
 
-def _launch_viewer(viewer: dict, session_value: str) -> int:
+def _passthrough_args(args) -> list:
+    """The args after a standalone `--` (#47), forwarded verbatim to the
+    wrapped subtool. Empty list when none were given."""
+    return list(getattr(args, "passthrough", None) or [])
+
+
+def _launch_viewer(viewer: dict, session_value: str, passthrough: list = None) -> int:
     """Launch CCHV focused on ``session_value`` (a full session UUID).
 
     Binary mode launches DETACHED so the viewer outlives this shell.
     Dev mode runs ``pnpm tauri:dev`` in the foreground (build output
-    visible; Ctrl-C stops it).
+    visible; Ctrl-C stops it). ``passthrough`` (anything after `--`, #47)
+    is appended verbatim to the viewer's argv.
     """
     import platform as _platform
     import subprocess
 
+    extra = list(passthrough or [])
     mode, path = viewer["mode"], viewer["path"]
     if mode == "dev":
-        cmd = ["pnpm", "tauri:dev", "--", "--", "--session", session_value]
+        cmd = ["pnpm", "tauri:dev", "--", "--", "--session", session_value] + extra
         print(f"Launching in dev mode from: {path}")
         print("  (Vite + cargo run -- Ctrl-C to stop)")
         try:
@@ -2470,7 +2515,7 @@ def _launch_viewer(viewer: dict, session_value: str) -> int:
             print("  Is pnpm installed?", file=sys.stderr)
             return 1
 
-    cmd = [path, "--session", session_value]
+    cmd = [path, "--session", session_value] + extra
     try:
         if _platform.system() == "Windows":
             subprocess.Popen(
@@ -2696,7 +2741,7 @@ def cmd_view(args) -> int:
         print("  - install: https://github.com/jhlee0409/claude-code-history-viewer")
         return 0
 
-    return _launch_viewer(viewer, full_id)
+    return _launch_viewer(viewer, full_id, _passthrough_args(args))
 
 
 # ── csb distill (#12): human-readable chat-log rendering ────────────────────
@@ -2714,7 +2759,7 @@ def _distill_canonical_path(claude_dir: str, session: dict) -> Path:
     jsonl_rel = session.get("jsonl_path") or ""
     slug = (Path(jsonl_rel).parent.name if jsonl_rel
             else (session.get("project") or "unknown"))
-    return Path(claude_dir) / "distilled" / slug / f"{session['session_id']}.md"
+    return ClaudePaths.from_dir(claude_dir).distilled_md(slug, session["session_id"])
 
 
 def _safe_stdout_write(text: str) -> None:
@@ -2740,7 +2785,7 @@ def _render_session_distill(
 
     full_id = session["session_id"]
     jsonl_rel = session.get("jsonl_path") or ""
-    jsonl_abs = Path(claude_dir) / jsonl_rel if jsonl_rel else None
+    jsonl_abs = ClaudePaths.from_dir(claude_dir).abs_of(jsonl_rel) if jsonl_rel else None
     convo_type, convo_path, tool_paths = pick_channels(
         src_rows, jsonl_abs, source_override,
     )
@@ -3132,11 +3177,16 @@ def cmd_resume(args) -> int:
     if target is None:
         target = session.get("start_folder")
 
+    # Forward anything after `--` straight to claude (#47), e.g.
+    # `csb resume <name> -- --fork-session`.
+    claude_cmd = ["claude", "--resume", full_id] + _passthrough_args(args)
+    launch_str = " ".join(claude_cmd)
+
     print(f"Resuming: {name}")
     print(f"  ID: {full_id}")
     if target:
         print(f"  cd {target}")
-    print(f"  claude --resume {full_id}")
+    print(f"  {launch_str}")
     print()
 
     # Launch claude --resume as a child process. We use subprocess.run with
@@ -3153,7 +3203,7 @@ def cmd_resume(args) -> int:
     import subprocess
     try:
         result = subprocess.run(
-            ["claude", "--resume", full_id],
+            claude_cmd,
             cwd=target if target else None,
             check=False,
         )
@@ -3166,10 +3216,10 @@ def cmd_resume(args) -> int:
         if target and not os.path.isdir(target):
             print(f"Error: cannot cd to {target}: {e}", file=sys.stderr)
             print("The folder may have been deleted. Run manually:", file=sys.stderr)
-            print(f"  cd <correct-folder> && claude --resume {full_id}", file=sys.stderr)
+            print(f"  cd <correct-folder> && {launch_str}", file=sys.stderr)
             return 1
         print("Error: 'claude' command not found in PATH.", file=sys.stderr)
-        print(f"Run manually: claude --resume {full_id}", file=sys.stderr)
+        print(f"Run manually: {launch_str}", file=sys.stderr)
         return 1
     except NotADirectoryError as e:
         # Edge case: target exists but isn't a directory (file with same name).
@@ -3701,7 +3751,7 @@ def _bulk_restore_jsonls(results, args, config, scope_label: str, quiet: bool) -
         skipped = 0
         failed = 0
         for s, jsonl_rel in candidates:
-            full_path = Path(claude_dir) / jsonl_rel
+            full_path = ClaudePaths.from_dir(claude_dir).abs_of(jsonl_rel)
             if full_path.exists() and not force:
                 print(f"  SKIP  {s['session_id'][:8]}  {jsonl_rel} "
                       f"(already exists; use --force to overwrite)")

{claude_session_backup-0.4.2 → claude_session_backup-0.4.6}/claude_session_backup/config.py

@@ -8,6 +8,8 @@ import json
 import os
 from pathlib import Path
 
+from .pathkit import ClaudePaths
+
 DEFAULT_CONFIG = {
     "claude_dir": "~/.claude",
     "index_path": "~/.claude/session-backup.db",
@@ -52,7 +54,7 @@ ENV_CLAUDE_DIR = "CLAUDE_DIR"
 ENV_CLAUDE_CONFIG_DIR = "CLAUDE_CONFIG_DIR"
 ENV_DB_PATH = "CLAUDE_SESSION_BACKUP_DB"
 
-CONFIG_FILENAME = "session-backup-config.json"
+CONFIG_FILENAME = ClaudePaths.CONFIG_FILE  # canonical spelling lives in pathkit (#46)
 
 
 def _env_claude_dir():
@@ -90,7 +92,7 @@ def get_settings_path(claude_dir=None):
     can edit the TTL through it.
     """
     base = Path(claude_dir).expanduser() if claude_dir else _default_claude_dir()
-    return base / "settings.json"
+    return base / ClaudePaths.SETTINGS_FILE
 
 
 def load_config(claude_dir=None):
@@ -132,10 +134,15 @@ def load_config(claude_dir=None):
     # (#45): when index_path is still the stock default but claude_dir
     # was relocated (flag / CLAUDE_DIR / CLAUDE_CONFIG_DIR / config),
     # follow the relocation -- otherwise sessions would scan from the
-    # new dir while the index silently pinned to ~/.claude.
-    if config["index_path"] == DEFAULT_CONFIG["index_path"]:
+    # new dir while the index silently pinned to ~/.claude. Compared
+    # Path-normalized (#46): a config file carrying the EXPANDED default
+    # spelling still counts as "stock default" and follows relocation.
+    stock_db = DEFAULT_CONFIG["index_path"]
+    if (config["index_path"] == stock_db
+            or Path(str(config["index_path"])).expanduser()
+            == Path(stock_db).expanduser()):
         config["index_path"] = str(
-            Path(config["claude_dir"]).expanduser() / "session-backup.db"
+            Path(config["claude_dir"]).expanduser() / ClaudePaths.DEFAULT_DB
         )
 
     return config

{claude_session_backup-0.4.2 → claude_session_backup-0.4.6}/claude_session_backup/fts5_db.py

@@ -1,5 +1,5 @@
 """
-Per-project SQLite FTS5 content database (Phase 2 of #3).
+Per-project SQLite FTS5 content database.
 
 One DB per project at ``~/.claude/csb-fts/<project>__<slug-hash>_<USER>.db``
 (path convention locked in :mod:`fts_paths`). Each DB is self-contained --
@@ -9,12 +9,12 @@ main DB tracks WHICH sessions have been indexed via the already-reserved
 per-project FTS5 DB independently tracks the same fact via its own
 ``indexed_sessions`` table (source of truth for "did this row land?").
 
-Why per-project (not one monolithic vault like claude-vault): smaller
-files, faster targeted queries, per-project archive/move/delete, no
-contention when multiple projects refresh in parallel. Locked at v0.2.5
-in :mod:`fts_paths`.
+Why per-project (rather than one monolithic content store): smaller
+files, faster targeted queries, per-project archive/move/delete, and no
+contention when multiple projects refresh in parallel. The path
+convention lives in :mod:`fts_paths`.
 
-Schema (mirrors claude-vault's pattern at ``db.rs``)::
+Schema::
 
     messages(id PK, session_id, uuid, message_index, role,
              role_subtype, content, timestamp,
@@ -91,9 +91,9 @@ CREATE TABLE IF NOT EXISTS indexed_sessions (
 --
 -- `strength` column (v0.3.1): per-row importance weight assigned at
 -- import time. 3 = wrote/edited/notebook_edit (active modification),
--- 2 = read (passive view), 1 = searched (Grep probe). Used by future
--- ranking queries (`csb search -d` directory-scope mode). Default 2
--- so legacy rows pre-migration land on the median.
+-- 2 = read (passive view), 1 = searched (Grep probe). Used by
+-- `csb search -d/-D` directory-scope ranking. Default 2 so legacy
+-- rows pre-migration land on the median.
 CREATE TABLE IF NOT EXISTS file_operations (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
     session_id TEXT NOT NULL,

{claude_session_backup-0.4.2 → claude_session_backup-0.4.6}/claude_session_backup/fts5_importer.py

@@ -1,5 +1,5 @@
 """
-JSONL -> FTS5 ingest (Phase 2 of #3; refactored for v0.3.1 parity).
+JSONL -> FTS5 ingest.
 
 This module is now a thin shim over :mod:`transcript_walker`. The shared
 walker yields ``ImportRow`` + ``FileOpRow`` instances; we insert them

{claude_session_backup-0.4.2 → claude_session_backup-0.4.6}/claude_session_backup/fts5_index.py

@@ -1,5 +1,5 @@
 """
-FTS5 build orchestrator (Phase 2 of #3).
+FTS5 build orchestrator.
 
 Walks the main DB's ``sessions`` + ``session_sources`` tables to
 discover candidate sessions, opens the per-project FTS5 DB for each,
@@ -10,15 +10,17 @@ session import.
 
 The orchestrator is intentionally explicit -- no hidden background
 indexing, no triggers in the main DB. ``csb backup`` does NOT call
-this (would slow the hook). Users opt in via ``csb update build-fts5`` or
-the future ``csb backup --refresh-fts5`` flag.
+this (would slow the hook). Users opt in via ``csb update build-fts5``,
+or ``csb update rebuild-index --include-fts5`` to refresh alongside an
+index rebuild.
 
 Source of truth (per design doc):
   - Per-project FTS5 DB's ``indexed_sessions`` table: authoritative
     "is this session in the index, at what mtime"
   - Main DB's ``session_sources.fts5_indexed_at`` / ``content_hash``:
-    HINT columns (kept in sync as a UX nicety; not consulted by the
-    runtime search dispatcher in v0.3.1)
+    HINT columns kept in sync for inspection; the search dispatcher
+    checks freshness against the per-project DB's ``indexed_sessions``,
+    not these columns.
 """
 
 from __future__ import annotations