Extract shared logic from all/project commands into commands/__init__.py

Adds collect_raw_projects, build_project, and copy_jsonl_files helpers
to eliminate duplication between the two batch conversion commands.
Updates test patch targets to match new import locations.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: zackman0010

src/claude_code_transcripts/commands/__init__.py

@@ -1,7 +1,98 @@
-"""Shared Click option decorators for commands."""
+"""Shared Click option decorators and utilities for commands."""
+
+import shutil
+from pathlib import Path
 
 import click
 
+from claude_code_transcripts.html_generation import Project, Session
+from claude_code_transcripts.parser import parse_session_file
+from claude_code_transcripts.sessions import find_all_sessions, find_cowork_sessions
+
+
+def collect_raw_projects(source, include_agents=False):
+    """Discover raw project dicts from the given source.
+
+    Args:
+        source: 'code', 'cowork', None (both), or a path string.
+        include_agents: Whether to include agent-* session files.
+
+    Returns:
+        List of raw project dicts, each with 'name' and 'sessions'.
+    """
+    raw_projects = []
+
+    if source != "cowork":
+        code_folder = (
+            Path.home() / ".claude" / "projects"
+            if source in (None, "code")
+            else Path(source)
+        )
+        if not code_folder.exists():
+            raise click.ClickException(f"Source directory not found: {code_folder}")
+        raw_projects = find_all_sessions(code_folder, include_agents=include_agents)
+
+    if source in (None, "cowork"):
+        raw_cowork = find_cowork_sessions()
+        if raw_cowork:
+            cowork_sessions = []
+            for session in raw_cowork:
+                jsonl_path = session["jsonl_path"]
+                stat = jsonl_path.stat()
+                cowork_sessions.append(
+                    {
+                        "path": jsonl_path,
+                        "summary": session["title"],
+                        "mtime": session["mtime"],
+                        "size": stat.st_size,
+                        "transcript_label": "Claude Cowork",
+                    }
+                )
+            raw_projects.append({"name": "Cowork", "sessions": cowork_sessions})
+
+    return raw_projects
+
+
+def build_project(raw_project, output):
+    """Build a Project object (with Sessions) from a raw project dict.
+
+    Args:
+        raw_project: Dict with 'name' and 'sessions' (each having 'path', 'size', etc.).
+        output: Base output directory; project files go in output/name/.
+
+    Returns:
+        A Project instance ready for generate_batch_html.
+    """
+    project_dir = output / raw_project["name"]
+    sessions = []
+    for raw_session in raw_project["sessions"]:
+        session_name = raw_session["path"].stem
+        loglines = parse_session_file(raw_session["path"])
+        sessions.append(
+            Session(
+                name=session_name,
+                session_dir=project_dir / session_name,
+                loglines=loglines,
+                size_kb=raw_session["size"] / 1024,
+                transcript_label=raw_session.get("transcript_label", "Claude Code"),
+            )
+        )
+    return Project(name=raw_project["name"], project_dir=project_dir, sessions=sessions)
+
+
+def copy_jsonl_files(raw_project, output):
+    """Copy source JSONL files into each session's output directory.
+
+    Args:
+        raw_project: Dict with 'name' and 'sessions'.
+        output: Base output directory matching what was passed to generate_batch_html.
+    """
+    project_dir = output / raw_project["name"]
+    for raw_session in raw_project["sessions"]:
+        session_name = raw_session["path"].stem
+        session_dir = project_dir / session_name
+        shutil.copy(raw_session["path"], session_dir / raw_session["path"].name)
+
 
 def output_options(func):
     """Apply the common output-related options to a command.

src/claude_code_transcripts/commands/all.py

@@ -1,4 +1,3 @@
-import shutil
 import webbrowser
 from datetime import datetime
 from pathlib import Path
@@ -7,14 +6,14 @@
 
 from claude_code_transcripts.cli import cli
 
-from claude_code_transcripts.html_generation import (
-    Project,
-    Session,
-    generate_batch_html,
+from claude_code_transcripts.html_generation import generate_batch_html
+from claude_code_transcripts.commands import (
+    build_project,
+    collect_raw_projects,
+    copy_jsonl_files,
+    output_options,
+    source_option,
 )
-from claude_code_transcripts.commands import output_options, source_option
-from claude_code_transcripts.parser import parse_session_file
-from claude_code_transcripts.sessions import find_all_sessions, find_cowork_sessions
 
 
 @cli.command("all")
@@ -44,43 +43,15 @@ def all_cmd(output, include_json, open_browser, source, include_agents, dry_run,
     - Per-project pages listing sessions
     - Individual session transcripts
     """
-    output = Path(output) if output else Path("./claude-archive")
-    raw_projects = []
-
-    if source != "cowork":
+    if not quiet and source != "cowork":
         code_folder = (
             Path.home() / ".claude" / "projects"
             if source in (None, "code")
             else Path(source)
         )
-        if not code_folder.exists():
-            raise click.ClickException(f"Source directory not found: {code_folder}")
-        if not quiet:
-            click.echo(f"Scanning {code_folder}...")
-        raw_projects = find_all_sessions(code_folder, include_agents=include_agents)
-
-    if source in (None, "cowork"):
-        raw_cowork = find_cowork_sessions()
-        if raw_cowork:
-            cowork_sessions = []
-            for session in raw_cowork:
-                jsonl_path = session["jsonl_path"]
-                stat = jsonl_path.stat()
-                cowork_sessions.append(
-                    {
-                        "path": jsonl_path,
-                        "summary": session["title"],
-                        "mtime": session["mtime"],
-                        "size": stat.st_size,
-                        "transcript_label": "Claude Cowork",
-                    }
-                )
-            raw_projects.append(
-                {
-                    "name": "Cowork",
-                    "sessions": cowork_sessions,
-                }
-            )
+        click.echo(f"Scanning {code_folder}...")
+
+    raw_projects = collect_raw_projects(source, include_agents=include_agents)
 
     if not raw_projects:
         if not quiet:
@@ -108,31 +79,12 @@ def all_cmd(output, include_json, open_browser, source, include_agents, dry_run,
                     click.echo(f"    ... and {len(project['sessions']) - 3} more")
         return
 
+    output = Path(output) if output else Path("./claude-archive")
+
     if not quiet:
         click.echo(f"\nParsing sessions...")
 
-    projects = []
-    for raw_project in raw_projects:
-        project_dir = output / raw_project["name"]
-        sessions = []
-        for raw_session in raw_project["sessions"]:
-            session_name = raw_session["path"].stem
-            session_dir = project_dir / session_name
-            loglines = parse_session_file(raw_session["path"])
-            sessions.append(
-                Session(
-                    name=session_name,
-                    session_dir=session_dir,
-                    loglines=loglines,
-                    size_kb=raw_session["size"] / 1024,
-                    transcript_label=raw_session.get("transcript_label", "Claude Code"),
-                )
-            )
-        projects.append(
-            Project(
-                name=raw_project["name"], project_dir=project_dir, sessions=sessions
-            )
-        )
+    projects = [build_project(raw, output) for raw in raw_projects]
 
     if not quiet:
         click.echo(f"Generating archive in {output}...")
@@ -149,11 +101,7 @@ def on_progress(project_name, session_name, current, total):
 
     if include_json:
         for raw_project in raw_projects:
-            for raw_session in raw_project["sessions"]:
-                session_name = raw_session["path"].stem
-                session_dir = output / raw_project["name"] / session_name
-                json_dest = session_dir / raw_session["path"].name
-                shutil.copy(raw_session["path"], json_dest)
+            copy_jsonl_files(raw_project, output)
 
     if stats["failed_sessions"]:
         click.echo(f"\nWarning: {len(stats['failed_sessions'])} session(s) failed:")

src/claude_code_transcripts/commands/project.py

@@ -1,60 +1,26 @@
-import shutil
 import webbrowser
 from pathlib import Path
 
 import click
 import questionary
 
 from claude_code_transcripts.cli import cli
-from claude_code_transcripts.commands import output_options, source_option
-from claude_code_transcripts.html_generation import (
-    Project,
-    Session,
-    generate_batch_html,
+from claude_code_transcripts.commands import (
+    build_project,
+    collect_raw_projects,
+    copy_jsonl_files,
+    output_options,
+    source_option,
 )
-from claude_code_transcripts.parser import parse_session_file
-from claude_code_transcripts.sessions import find_all_sessions, find_cowork_sessions
+from claude_code_transcripts.html_generation import generate_batch_html
 
 
 @cli.command("project")
 @output_options
 @source_option
 def project_cmd(output, include_json, open_browser, source):
     """Select a project and convert all its sessions to a browsable HTML archive."""
-    raw_projects = []
-
-    if source != "cowork":
-        code_folder = (
-            Path.home() / ".claude" / "projects"
-            if source in (None, "code")
-            else Path(source)
-        )
-        if not code_folder.exists():
-            raise click.ClickException(f"Source directory not found: {code_folder}")
-        raw_projects = find_all_sessions(code_folder)
-
-    if source in (None, "cowork"):
-        raw_cowork = find_cowork_sessions()
-        if raw_cowork:
-            cowork_sessions = []
-            for session in raw_cowork:
-                jsonl_path = session["jsonl_path"]
-                stat = jsonl_path.stat()
-                cowork_sessions.append(
-                    {
-                        "path": jsonl_path,
-                        "summary": session["title"],
-                        "mtime": session["mtime"],
-                        "size": stat.st_size,
-                        "transcript_label": "Claude Cowork",
-                    }
-                )
-            raw_projects.append(
-                {
-                    "name": "Cowork",
-                    "sessions": cowork_sessions,
-                }
-            )
+    raw_projects = collect_raw_projects(source)
 
     if not raw_projects:
         click.echo("No projects found.")
@@ -75,35 +41,14 @@ def project_cmd(output, include_json, open_browser, source):
         return
 
     output = Path(output) if output else Path("./claude-archive")
-    project_dir = output / selected["name"]
 
-    sessions = []
-    for raw_session in selected["sessions"]:
-        session_name = raw_session["path"].stem
-        session_dir = project_dir / session_name
-        loglines = parse_session_file(raw_session["path"])
-        sessions.append(
-            Session(
-                name=session_name,
-                session_dir=session_dir,
-                loglines=loglines,
-                size_kb=raw_session["size"] / 1024,
-                transcript_label=raw_session.get("transcript_label", "Claude Code"),
-            )
-        )
-
-    projects = [
-        Project(name=selected["name"], project_dir=project_dir, sessions=sessions)
-    ]
+    project = build_project(selected, output)
 
     click.echo(f"Generating archive in {output}...")
-    stats = generate_batch_html(projects, output)
+    stats = generate_batch_html([project], output)
 
     if include_json:
-        for raw_session in selected["sessions"]:
-            session_name = raw_session["path"].stem
-            session_dir = project_dir / session_name
-            shutil.copy(raw_session["path"], session_dir / raw_session["path"].name)
+        copy_jsonl_files(selected, output)
 
     if stats["failed_sessions"]:
         click.echo(f"\nWarning: {len(stats['failed_sessions'])} session(s) failed:")
@@ -119,5 +64,5 @@ def project_cmd(output, include_json, open_browser, source):
     click.echo(f"Output: {output.resolve()}")
 
     if open_browser:
-        index_url = (project_dir / "index.html").resolve().as_uri()
+        index_url = (project.project_dir / "index.html").resolve().as_uri()
         webbrowser.open(index_url)

tests/test_all.py

@@ -485,7 +485,7 @@ def test_all_processes_cowork_sessions(self, tmp_path):
 
         runner = CliRunner()
         with patch(
-            "claude_code_transcripts.commands.all.find_cowork_sessions"
+            "claude_code_transcripts.commands.find_cowork_sessions"
         ) as mock_cowork:
             mock_cowork.return_value = [cowork_session]
             result = runner.invoke(
@@ -546,9 +546,9 @@ def test_source_code_skips_cowork(self, mock_projects_dir):
         """--source code queries Code sessions and never calls find_cowork_sessions."""
         runner = CliRunner()
         with (
-            patch("claude_code_transcripts.commands.all.find_all_sessions") as mock_all,
+            patch("claude_code_transcripts.commands.find_all_sessions") as mock_all,
             patch(
-                "claude_code_transcripts.commands.all.find_cowork_sessions"
+                "claude_code_transcripts.commands.find_cowork_sessions"
             ) as mock_cowork,
         ):
             mock_all.return_value = []
@@ -562,9 +562,9 @@ def test_source_cowork_skips_code(self):
         """--source cowork queries Cowork sessions and never calls find_all_sessions."""
         runner = CliRunner()
         with (
-            patch("claude_code_transcripts.commands.all.find_all_sessions") as mock_all,
+            patch("claude_code_transcripts.commands.find_all_sessions") as mock_all,
             patch(
-                "claude_code_transcripts.commands.all.find_cowork_sessions"
+                "claude_code_transcripts.commands.find_cowork_sessions"
             ) as mock_cowork,
         ):
             mock_cowork.return_value = []
@@ -578,9 +578,9 @@ def test_source_path_uses_that_path_and_skips_cowork(self, mock_projects_dir):
         """--source <path> searches Code at that path and never calls find_cowork_sessions."""
         runner = CliRunner()
         with (
-            patch("claude_code_transcripts.commands.all.find_all_sessions") as mock_all,
+            patch("claude_code_transcripts.commands.find_all_sessions") as mock_all,
             patch(
-                "claude_code_transcripts.commands.all.find_cowork_sessions"
+                "claude_code_transcripts.commands.find_cowork_sessions"
             ) as mock_cowork,
         ):
             mock_all.return_value = []
@@ -598,9 +598,9 @@ def test_no_source_searches_both(self, tmp_path, monkeypatch):
 
         runner = CliRunner()
         with (
-            patch("claude_code_transcripts.commands.all.find_all_sessions") as mock_all,
+            patch("claude_code_transcripts.commands.find_all_sessions") as mock_all,
             patch(
-                "claude_code_transcripts.commands.all.find_cowork_sessions"
+                "claude_code_transcripts.commands.find_cowork_sessions"
             ) as mock_cowork,
         ):
             mock_all.return_value = []