Add -a/--output-auto flag to all commands

This flag creates output in a subdirectory named after:
- The session ID for web command
- The file stem for json and local commands

Uses -o as parent directory if specified, otherwise current directory.
When -a is used, auto-open browser is disabled.

Author: claude

src/claude_code_publish/__init__.py

@@ -1082,7 +1082,13 @@ def cli():
     "-o",
     "--output",
     type=click.Path(),
-    help="Output directory (default: temp dir, or '.' with -o .)",
+    help="Output directory. If not specified, writes to temp dir and opens in browser.",
+)
+@click.option(
+    "-a",
+    "--output-auto",
+    is_flag=True,
+    help="Auto-name output subdirectory based on session filename (uses -o as parent, or current dir).",
 )
 @click.option(
     "--repo",
@@ -1103,14 +1109,14 @@ def cli():
     "--open",
     "open_browser",
     is_flag=True,
-    help="Open the generated index.html in your default browser.",
+    help="Open the generated index.html in your default browser (default if no -o specified).",
 )
 @click.option(
     "--limit",
     default=10,
     help="Maximum number of sessions to show (default: 10)",
 )
-def local_cmd(output, repo, gist, include_json, open_browser, limit):
+def local_cmd(output, output_auto, repo, gist, include_json, open_browser, limit):
     """Select and convert a local Claude Code session to HTML."""
     from datetime import datetime
 
@@ -1152,15 +1158,22 @@ def local_cmd(output, repo, gist, include_json, open_browser, limit):
 
     session_file = selected
 
-    # Determine output directory
-    if (gist or open_browser) and output is None:
-        output = Path(tempfile.gettempdir()) / session_file.stem
+    # Determine output directory and whether to open browser
+    # If no -o specified, use temp dir and open browser by default
+    auto_open = output is None and not gist and not output_auto
+    if output_auto:
+        # Use -o as parent dir (or current dir), with auto-named subdirectory
+        parent_dir = Path(output) if output else Path(".")
+        output = parent_dir / session_file.stem
     elif output is None:
-        output = Path(tempfile.gettempdir()) / session_file.stem
+        output = Path(tempfile.gettempdir()) / f"claude-session-{session_file.stem}"
 
     output = Path(output)
     generate_html(session_file, output, github_repo=repo)
 
+    # Show output directory
+    click.echo(f"Output: {output.resolve()}")
+
     # Copy JSONL file to output directory if requested
     if include_json:
         output.mkdir(exist_ok=True)
@@ -1177,9 +1190,8 @@ def local_cmd(output, repo, gist, include_json, open_browser, limit):
         preview_url = f"https://gistpreview.github.io/?{gist_id}/index.html"
         click.echo(f"Gist: {gist_url}")
         click.echo(f"Preview: {preview_url}")
-        click.echo(f"Files: {output}")
 
-    if open_browser:
+    if open_browser or auto_open:
         index_url = (output / "index.html").resolve().as_uri()
         webbrowser.open(index_url)
 
@@ -1190,7 +1202,13 @@ def local_cmd(output, repo, gist, include_json, open_browser, limit):
     "-o",
     "--output",
     type=click.Path(),
-    help="Output directory (default: current directory, or temp dir with --gist/--open)",
+    help="Output directory. If not specified, writes to temp dir and opens in browser.",
+)
+@click.option(
+    "-a",
+    "--output-auto",
+    is_flag=True,
+    help="Auto-name output subdirectory based on filename (uses -o as parent, or current dir).",
 )
 @click.option(
     "--repo",
@@ -1211,23 +1229,26 @@ def local_cmd(output, repo, gist, include_json, open_browser, limit):
     "--open",
     "open_browser",
     is_flag=True,
-    help="Open the generated index.html in your default browser.",
+    help="Open the generated index.html in your default browser (default if no -o specified).",
 )
-def json_cmd(json_file, output, repo, gist, include_json, open_browser):
+def json_cmd(json_file, output, output_auto, repo, gist, include_json, open_browser):
     """Convert a Claude Code session JSON/JSONL file to HTML."""
-    # Determine output directory
-    if (gist or open_browser) and output is None:
-        # Extract session ID from JSON file for temp directory name
-        with open(json_file, "r") as f:
-            data = json.load(f)
-        session_id = data.get("sessionId", Path(json_file).stem)
-        output = Path(tempfile.gettempdir()) / session_id
+    # Determine output directory and whether to open browser
+    # If no -o specified, use temp dir and open browser by default
+    auto_open = output is None and not gist and not output_auto
+    if output_auto:
+        # Use -o as parent dir (or current dir), with auto-named subdirectory
+        parent_dir = Path(output) if output else Path(".")
+        output = parent_dir / Path(json_file).stem
     elif output is None:
-        output = "."
+        output = Path(tempfile.gettempdir()) / f"claude-session-{Path(json_file).stem}"
 
     output = Path(output)
     generate_html(json_file, output, github_repo=repo)
 
+    # Show output directory
+    click.echo(f"Output: {output.resolve()}")
+
     # Copy JSON file to output directory if requested
     if include_json:
         output.mkdir(exist_ok=True)
@@ -1245,9 +1266,8 @@ def json_cmd(json_file, output, repo, gist, include_json, open_browser):
         preview_url = f"https://gistpreview.github.io/?{gist_id}/index.html"
         click.echo(f"Gist: {gist_url}")
         click.echo(f"Preview: {preview_url}")
-        click.echo(f"Files: {output}")
 
-    if open_browser:
+    if open_browser or auto_open:
         index_url = (output / "index.html").resolve().as_uri()
         webbrowser.open(index_url)
 
@@ -1491,7 +1511,13 @@ def generate_html_from_session_data(session_data, output_dir, github_repo=None):
     "-o",
     "--output",
     type=click.Path(),
-    help="Output directory (default: creates folder with session ID, or temp dir with --gist/--open)",
+    help="Output directory. If not specified, writes to temp dir and opens in browser.",
+)
+@click.option(
+    "-a",
+    "--output-auto",
+    is_flag=True,
+    help="Auto-name output subdirectory based on session ID (uses -o as parent, or current dir).",
 )
 @click.option("--token", help="API access token (auto-detected from keychain on macOS)")
 @click.option(
@@ -1516,10 +1542,18 @@ def generate_html_from_session_data(session_data, output_dir, github_repo=None):
     "--open",
     "open_browser",
     is_flag=True,
-    help="Open the generated index.html in your default browser.",
+    help="Open the generated index.html in your default browser (default if no -o specified).",
 )
 def web_cmd(
-    session_id, output, token, org_uuid, repo, gist, include_json, open_browser
+    session_id,
+    output,
+    output_auto,
+    token,
+    org_uuid,
+    repo,
+    gist,
+    include_json,
+    open_browser,
 ):
     """Select and convert a web session from the Claude API to HTML.
 
@@ -1579,16 +1613,23 @@ def web_cmd(
     except httpx.RequestError as e:
         raise click.ClickException(f"Network error: {e}")
 
-    # Determine output directory
-    if (gist or open_browser) and output is None:
-        output = Path(tempfile.gettempdir()) / session_id
+    # Determine output directory and whether to open browser
+    # If no -o specified, use temp dir and open browser by default
+    auto_open = output is None and not gist and not output_auto
+    if output_auto:
+        # Use -o as parent dir (or current dir), with auto-named subdirectory
+        parent_dir = Path(output) if output else Path(".")
+        output = parent_dir / session_id
     elif output is None:
-        output = session_id
+        output = Path(tempfile.gettempdir()) / f"claude-session-{session_id}"
 
     output = Path(output)
     click.echo(f"Generating HTML in {output}/...")
     generate_html_from_session_data(session_data, output, github_repo=repo)
 
+    # Show output directory
+    click.echo(f"Output: {output.resolve()}")
+
     # Save JSON session data if requested
     if include_json:
         output.mkdir(exist_ok=True)
@@ -1606,9 +1647,8 @@ def web_cmd(
         preview_url = f"https://gistpreview.github.io/?{gist_id}/index.html"
         click.echo(f"Gist: {gist_url}")
         click.echo(f"Preview: {preview_url}")
-        click.echo(f"Files: {output}")
 
-    if open_browser:
+    if open_browser or auto_open:
         index_url = (output / "index.html").resolve().as_uri()
         webbrowser.open(index_url)
 

tests/test_generate_html.py

@@ -1192,3 +1192,174 @@ def ask(self):
 
         assert result.exit_code == 0
         assert "No session selected" in result.output
+
+
+class TestOutputAutoOption:
+    """Tests for the -a/--output-auto flag."""
+
+    def test_json_output_auto_creates_subdirectory(self, tmp_path):
+        """Test that json -a creates output subdirectory named after file stem."""
+        from click.testing import CliRunner
+        from claude_code_publish import cli
+
+        fixture_path = Path(__file__).parent / "sample_session.json"
+
+        runner = CliRunner()
+        result = runner.invoke(
+            cli,
+            ["json", str(fixture_path), "-a", "-o", str(tmp_path)],
+        )
+
+        assert result.exit_code == 0
+        # Output should be in tmp_path/sample_session/
+        expected_dir = tmp_path / "sample_session"
+        assert expected_dir.exists()
+        assert (expected_dir / "index.html").exists()
+
+    def test_json_output_auto_uses_cwd_when_no_output(self, tmp_path, monkeypatch):
+        """Test that json -a uses current directory when -o not specified."""
+        from click.testing import CliRunner
+        from claude_code_publish import cli
+        import os
+
+        fixture_path = Path(__file__).parent / "sample_session.json"
+
+        # Change to tmp_path
+        monkeypatch.chdir(tmp_path)
+
+        runner = CliRunner()
+        result = runner.invoke(
+            cli,
+            ["json", str(fixture_path), "-a"],
+        )
+
+        assert result.exit_code == 0
+        # Output should be in ./sample_session/
+        expected_dir = tmp_path / "sample_session"
+        assert expected_dir.exists()
+        assert (expected_dir / "index.html").exists()
+
+    def test_json_output_auto_no_browser_open(self, tmp_path, monkeypatch):
+        """Test that json -a does not auto-open browser."""
+        from click.testing import CliRunner
+        from claude_code_publish import cli
+
+        fixture_path = Path(__file__).parent / "sample_session.json"
+
+        # Track webbrowser.open calls
+        opened_urls = []
+
+        def mock_open(url):
+            opened_urls.append(url)
+            return True
+
+        monkeypatch.setattr("claude_code_publish.webbrowser.open", mock_open)
+
+        runner = CliRunner()
+        result = runner.invoke(
+            cli,
+            ["json", str(fixture_path), "-a", "-o", str(tmp_path)],
+        )
+
+        assert result.exit_code == 0
+        assert len(opened_urls) == 0  # No browser opened
+
+    def test_local_output_auto_creates_subdirectory(self, tmp_path, monkeypatch):
+        """Test that local -a creates output subdirectory named after file stem."""
+        from click.testing import CliRunner
+        from claude_code_publish import cli
+        import questionary
+
+        # Create mock .claude/projects structure
+        projects_dir = tmp_path / ".claude" / "projects" / "test-project"
+        projects_dir.mkdir(parents=True)
+
+        session_file = projects_dir / "my-session-file.jsonl"
+        session_file.write_text(
+            '{"type":"summary","summary":"Test local session"}\n'
+            '{"type":"user","timestamp":"2025-01-01T00:00:00Z","message":{"role":"user","content":"Hello"}}\n'
+        )
+
+        output_parent = tmp_path / "output"
+        output_parent.mkdir()
+
+        # Mock Path.home() to return our tmp_path
+        monkeypatch.setattr(Path, "home", lambda: tmp_path)
+
+        # Mock questionary.select to return the session file
+        class MockSelect:
+            def __init__(self, *args, **kwargs):
+                pass
+
+            def ask(self):
+                return session_file
+
+        monkeypatch.setattr(questionary, "select", MockSelect)
+
+        runner = CliRunner()
+        result = runner.invoke(cli, ["local", "-a", "-o", str(output_parent)])
+
+        assert result.exit_code == 0
+        # Output should be in output_parent/my-session-file/
+        expected_dir = output_parent / "my-session-file"
+        assert expected_dir.exists()
+        assert (expected_dir / "index.html").exists()
+
+    def test_web_output_auto_creates_subdirectory(self, httpx_mock, tmp_path):
+        """Test that web -a creates output subdirectory named after session ID."""
+        from click.testing import CliRunner
+        from claude_code_publish import cli
+
+        # Load sample session to mock API response
+        fixture_path = Path(__file__).parent / "sample_session.json"
+        with open(fixture_path) as f:
+            session_data = json.load(f)
+
+        httpx_mock.add_response(
+            url="https://api.anthropic.com/v1/session_ingress/session/my-web-session-id",
+            json=session_data,
+        )
+
+        runner = CliRunner()
+        result = runner.invoke(
+            cli,
+            [
+                "web",
+                "my-web-session-id",
+                "--token",
+                "test-token",
+                "--org-uuid",
+                "test-org",
+                "-a",
+                "-o",
+                str(tmp_path),
+            ],
+        )
+
+        assert result.exit_code == 0
+        # Output should be in tmp_path/my-web-session-id/
+        expected_dir = tmp_path / "my-web-session-id"
+        assert expected_dir.exists()
+        assert (expected_dir / "index.html").exists()
+
+    def test_output_auto_with_jsonl_uses_stem(self, tmp_path, monkeypatch):
+        """Test that -a with JSONL file uses file stem (without .jsonl extension)."""
+        from click.testing import CliRunner
+        from claude_code_publish import cli
+
+        # Create a JSONL file
+        fixture_path = Path(__file__).parent / "sample_session.jsonl"
+
+        monkeypatch.chdir(tmp_path)
+
+        runner = CliRunner()
+        result = runner.invoke(
+            cli,
+            ["json", str(fixture_path), "-a"],
+        )
+
+        assert result.exit_code == 0
+        # Output should be in ./sample_session/ (not ./sample_session.jsonl/)
+        expected_dir = tmp_path / "sample_session"
+        assert expected_dir.exists()
+        assert (expected_dir / "index.html").exists()