obris-cli 0.6.0__tar.gz → 0.6.2__tar.gz

{obris_cli-0.6.0 → obris_cli-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: obris-cli
-Version: 0.6.0
+Version: 0.6.2
 Summary: Save, organize, and access your knowledge from the command line
 Project-URL: Homepage, https://obris.ai
 Project-URL: Repository, https://github.com/obris-dev/obris

{obris_cli-0.6.0 → obris_cli-0.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "obris-cli"
-version = "0.6.0"
+version = "0.6.2"
 description = "Save, organize, and access your knowledge from the command line"
 
 requires-python = ">=3.10"

{obris_cli-0.6.0 → obris_cli-0.6.2}/src/obris/commands/sync.py

@@ -8,7 +8,7 @@ from obris.commands.sync_conflicts import register as _register_conflicts_subgro
 from obris.output import as_json, is_json
 from obris.sync.commands import add_file, link_file
 from obris.sync.resolver import assert_all_roots, find_root_id, resolve_targets
-from obris.sync.runner import run_sync_pass
+from obris.sync.runner import preview_first_sync, run_sync_pass
 from obris.sync.state import SyncState
 
 
@@ -66,19 +66,28 @@ def sync(ctx, path, topic_id, item_ids, include_patterns, dry_run, add_all_files
     sync_dir = Path(path).resolve()
     patterns = list(include_patterns) if include_patterns else None
 
-    targets = resolve_targets(sync_dir, topic_id, no_create=no_create)
-    assert_all_roots(targets, sync_dir)
-
-    totals = run_sync_pass(
-        sync_dir,
-        targets,
-        item_ids,
-        patterns,
-        dry_run=dry_run,
-        add_all_files=add_all_files,
-        allow_subtopics=not no_subtopics,
-        verbose=verbose,
-    )
+    targets = resolve_targets(sync_dir, topic_id, no_create=no_create, dry_run=dry_run)
+
+    if not targets:
+        # dry-run + no state + no --topic: preview the bootstrap +
+        # initial-add locally without creating a phantom server topic.
+        totals = preview_first_sync(
+            sync_dir,
+            add_all_files=add_all_files,
+            allow_subtopics=not no_subtopics,
+        )
+    else:
+        assert_all_roots(targets, sync_dir)
+        totals = run_sync_pass(
+            sync_dir,
+            targets,
+            item_ids,
+            patterns,
+            dry_run=dry_run,
+            add_all_files=add_all_files,
+            allow_subtopics=not no_subtopics,
+            verbose=verbose,
+        )
 
     if is_json():
         as_json(

{obris_cli-0.6.0 → obris_cli-0.6.2}/src/obris/sync/mapping.py

@@ -118,14 +118,30 @@ _PATH_SEP_TRANSLATE = str.maketrans({"/": "-", "\\": "-"})
 def slugify_topic_name(name: str) -> str:
     """Convert a topic name into a safe directory component.
 
-    Strips path separators (prevents traversal), drops Windows-hostile
-    trailing chars, preserves unicode/spaces, no case-folding. Returns
-    "untitled" if the name slugifies away to nothing.
+    Translates path separators to dashes — actual traversal defense, not
+    aesthetics — and bottoms out at "untitled" when the name leaves
+    nothing safe to use (empty, ``.``, or ``..``). Otherwise the topic
+    name passes through unchanged: leading dots, trailing dots, leading
+    or trailing whitespace, unicode, case — all preserved.
+
+    Why so minimal: if a topic was created with a particular name (via
+    the CLI itself, the web app, or an MCP tool), that name *is* the
+    user's intent. Stripping leading dots silently renames ``.claude/``
+    to ``claude/`` on first sync; stripping trailing dots breaks
+    ``foo./``; trimming whitespace breaks ``"  intentional  "``.
+    Cross-platform pain (Windows-hostile trailing dots, APFS case
+    folding) is addressed when it actually comes up, not pre-emptively
+    at the cost of common AI-tool config dirs.
     """
-    name = (name or "").strip()
+    name = name or ""
     name = name.translate(_PATH_SEP_TRANSLATE)
-    name = Path(name).name  # defense-in-depth against any remaining traversal
-    name = name.strip(" .")
+    name = Path(name).name  # blocks `.` and leftover `/foo` traversal
+    # ``Path("..").name`` keeps ``..`` verbatim (POSIX quirk: it's a
+    # legal path component, just dangerous as a directory name).
+    # Catch it explicitly so a topic named ``..`` doesn't materialize
+    # as the parent directory at sync time.
+    if name == "..":
+        name = ""
     return name or "untitled"
 
 

{obris_cli-0.6.0 → obris_cli-0.6.2}/src/obris/sync/resolver.py

@@ -13,7 +13,13 @@ from .state import SyncState
 _MAX_ANCESTOR_DEPTH = 64
 
 
-def resolve_targets(sync_dir: Path, topic_id: str | None, *, no_create: bool = False) -> list[tuple]:
+def resolve_targets(
+    sync_dir: Path,
+    topic_id: str | None,
+    *,
+    no_create: bool = False,
+    dry_run: bool = False,
+) -> list[tuple]:
     """Determine which topic(s) to sync.
 
     Returns a list of ``(SyncState | None, topic_id, topic_name)``
@@ -21,6 +27,11 @@ def resolve_targets(sync_dir: Path, topic_id: str | None, *, no_create: bool = F
     new root topic named after the directory is created automatically.
     Pass ``no_create=True`` to error instead of bootstrapping — the
     safety net for AI agents and scripts that don't want surprises.
+
+    With ``dry_run=True``, the bootstrap branch returns an empty list
+    instead of calling ``create_topic`` so a preview of a fresh-dir
+    sync doesn't leave a phantom topic on the server. The caller
+    emits a local-only preview when this happens.
     """
     if topic_id:
         state = SyncState.load(topic_id, sync_dir)
@@ -42,6 +53,9 @@ def resolve_targets(sync_dir: Path, topic_id: str | None, *, no_create: bool = F
             f"Run without --no-create to create one, or pass --topic <id> to link an existing topic."
         )
 
+    if dry_run:
+        return []
+
     topic_name = sync_dir.name
     topic = create_topic(topic_name)
     click.echo(f'Created topic "{topic_name}" ({topic.id}).')

{obris_cli-0.6.0 → obris_cli-0.6.2}/src/obris/sync/runner.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from pathlib import Path
+from pathlib import Path, PurePosixPath
 
 import click
 
@@ -168,3 +168,84 @@ def _print_capped(items, cap):
         click.echo(f"  {line}")
     if cap is not None and len(items) > cap:
         click.echo(f"  ... ({len(items) - cap} more)")
+
+
+def preview_first_sync(sync_dir: Path, *, add_all_files: bool, allow_subtopics: bool) -> dict:
+    """Local-only dry-run preview for a fresh directory.
+
+    Called when ``resolve_targets`` returned ``[]`` (dry-run + no
+    state + no ``--topic``). Side-effect free: walks the dir using a
+    synthetic empty ``SyncState`` so ``find_untracked`` reuses the
+    same exclusion + symlink logic the live path uses, then prints
+    what create_topic / _ensure_subtopic_path / add_all would do.
+
+    Ignored files are surfaced unconditionally — the user explicitly
+    asked for the full picture before committing to a real sync.
+
+    Returns the same totals dict shape as ``run_sync_pass`` so the
+    JSON output stays consistent.
+    """
+    sync_dir = Path(sync_dir).resolve()
+    topic_name = sync_dir.name
+    click.echo("  (dry run — no changes will be made)")
+    click.echo(f'  Would create topic "{topic_name}" at {sync_dir}/')
+
+    synthetic = SyncState("__preview__", str(sync_dir))
+    scan = find_untracked(sync_dir, [(synthetic, "__preview__")])
+
+    # Subtopic projection: every directory segment under sync_dir that
+    # contains an untracked file would become a subtopic level. Mirrors
+    # the cache walk in ``scanner._ensure_subtopic_path``.
+    subdirs: set[str] = set()
+    skipped_subdir = 0
+    if allow_subtopics:
+        for rel in scan.untracked:
+            rel_dir = str(PurePosixPath(rel).parent)
+            if rel_dir == ".":
+                continue
+            walked = ""
+            for seg in rel_dir.split("/"):
+                walked = f"{walked}/{seg}" if walked else seg
+                subdirs.add(walked)
+    else:
+        skipped_subdir = sum(1 for rel in scan.untracked if "/" in rel)
+
+    if subdirs:
+        click.echo(f"\nWould create {len(subdirs)} subtopic(s):")
+        for sd in sorted(subdirs):
+            click.echo(f"  {sd}/")
+
+    if scan.untracked:
+        if not add_all_files:
+            click.echo(f"\n{len(scan.untracked)} untracked file(s) (would NOT add — re-run with --add-all):")
+            _print_capped(scan.untracked, None)
+        elif not allow_subtopics:
+            top_level = [r for r in scan.untracked if "/" not in r]
+            click.echo(f"\nWould add {len(top_level)} top-level file(s):")
+            _print_capped(top_level, None)
+            if skipped_subdir:
+                click.echo(f"\nWould skip {skipped_subdir} file(s) in subdirs (--no-subtopics):")
+                _print_capped([r for r in scan.untracked if "/" in r], None)
+        else:
+            click.echo(f"\nWould add {len(scan.untracked)} file(s):")
+            _print_capped(scan.untracked, None)
+
+    if scan.excluded:
+        click.echo(f"\n{len(scan.excluded)} file(s) matched ignore rules:")
+        _print_capped(scan.excluded, None)
+
+    if scan.symlinks:
+        click.echo(f"\n{len(scan.symlinks)} symlink(s) skipped:")
+        _print_capped([f"{p} -> {t}" for p, t in scan.symlinks], None)
+
+    return {
+        "pulled": 0,
+        "pushed": 0,
+        "conflicts": 0,
+        "errors": 0,
+        "untracked": list(scan.untracked),
+        "excluded_count": len(scan.excluded),
+        "symlinks": [{"path": p, "target": t} for p, t in scan.symlinks],
+        "conflicts_pending": [],
+        "missing_local": [],
+    }

{obris_cli-0.6.0 → obris_cli-0.6.2}/uv.lock

@@ -141,7 +141,7 @@ wheels = [
 
 [[package]]
 name = "obris-cli"
-version = "0.6.0"
+version = "0.6.2"
 source = { editable = "." }
 dependencies = [
     { name = "click" },