diff --git a/python/obsidian_rag/cli.py b/python/obsidian_rag/cli.py
index de468a7..b5d68f6 100644
--- a/python/obsidian_rag/cli.py
+++ b/python/obsidian_rag/cli.py
@@ -51,7 +51,10 @@ def _index(config) -> int:
         gen = indexer.full_index()
         result: dict = {"indexed_files": 0, "total_chunks": 0, "errors": []}
         for item in gen:
-            result = item  # progress yields are dicts; final dict from return
+            if item.get("type") == "complete":
+                result = item
+            elif item.get("type") == "progress":
+                pass  # skip progress logs in result
         duration_ms = int((time.monotonic() - t0) * 1000)
         print(
             json.dumps(
diff --git a/python/obsidian_rag/indexer.py b/python/obsidian_rag/indexer.py
index 11b0377..09d03ac 100644
--- a/python/obsidian_rag/indexer.py
+++ b/python/obsidian_rag/indexer.py
@@ -184,8 +184,8 @@ class Indexer:
                 for e, v in zip(enriched, vectors):
                     e["vector"] = v
                 # Store
-                upsert_chunks(table, enriched)
-                total_chunks += num_chunks
+                stored = upsert_chunks(table, enriched)
+                total_chunks += stored
                 indexed_files += 1
             except Exception as exc:
                 errors.append({"file": str(filepath), "error": str(exc)})