claude-code-tools 0.2.4__tar.gz → 0.2.6__tar.gz

{claude_code_tools-0.2.4 → claude_code_tools-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-code-tools
-Version: 0.2.4
+Version: 0.2.6
 Summary: Collection of tools for working with Claude Code
 License-File: LICENSE
 Requires-Python: >=3.11
@@ -23,6 +23,7 @@ and other CLI coding agents.
 - [🚀 Quick Start](#quick-start)
 - [🎮 tmux-cli Deep Dive](#tmux-cli-deep-dive)
 - [🚀 lmsh (Experimental) — natural language to shell commands](#lmsh-experimental)
+- [🔍 find-session — unified search across Claude & Codex sessions](#find-session)
 - [🔍 find-claude-session — search and resume Claude sessions](#find-claude-session)
 - [🔍 find-codex-session — search and resume Codex sessions](#find-codex-session)
 - [🔐 vault — encrypted .env backup & sync](#vault)
@@ -81,6 +82,7 @@ uv tool install git+https://github.com/pchalasani/claude-code-tools
 
 This gives you:
 - `tmux-cli` - The interactive CLI controller we just covered
+- `find-session` - Unified search across Claude Code and Codex sessions
 - `find-claude-session` - Search and resume Claude Code sessions by keywords
 - `find-codex-session` - Search and resume Codex sessions by keywords
 - `vault` - Encrypted backup for your .env files
@@ -175,6 +177,86 @@ cp target/release/lmsh ~/.cargo/bin/
 
 See [docs/lmsh.md](docs/lmsh.md) for details.
 
+<a id="find-session"></a>
+## 🔍 find-session
+
+**Unified session finder** - Search across both Claude Code and Codex sessions simultaneously.
+
+> **⚠️ Note about the `fs` command**: For convenience, this tool is available as both `find-session` and `fs`. The short `fs` alias may conflict with existing commands or aliases in your shell. If you have a conflict, you can:
+> - Use the full `find-session` command instead
+> - Create your own alias: `alias mysearch='find-session'`
+> - Uninstall and reinstall without the `fs` entry point (edit `pyproject.toml`)
+
+### Usage
+
+```bash
+# Search all agents in current project
+fs "keyword1,keyword2"
+
+# Show all sessions across all agents in current project
+fs
+
+# Search across all projects (Claude + Codex)
+fs "keywords" -g
+
+# Show all sessions across all projects
+fs -g
+
+# Search only specific agent(s)
+fs "bug,fix" --agents claude
+fs "error" --agents codex
+
+# Limit number of results
+fs "keywords" -n 15
+```
+
+### Features
+
+- **Multi-agent search**: Searches both Claude Code and Codex sessions simultaneously
+- **Unified display**: Single table showing sessions from all agents with agent column
+- **Smart resume**: Automatically uses correct CLI tool (`claude` or `codex`) based on selected session
+- **Optional keyword search**: Keywords are optional—omit them to show all sessions
+- **Action menu** after session selection:
+  - Resume session (default)
+  - Show session file path
+  - Copy session file to file (*.jsonl) or directory
+- **Project filtering**: Search current project only (default) or all projects with `-g`
+- **Agent filtering**: Use `--agents claude codex` to search specific agents only
+- **Configurable**: Optional config file at `~/.config/find-session/config.json` for customizing agents
+- Interactive session selection with Rich table display
+- Shows agent, project, git branch, date, line count, and preview
+- Reverse chronological ordering (most recent first)
+- Press Enter to cancel (no need for Ctrl+C)
+
+### Configuration (Optional)
+
+Create `~/.config/find-session/config.json` to customize agent settings:
+
+```json
+{
+  "agents": [
+    {
+      "name": "claude",
+      "display_name": "Claude",
+      "home_dir": "~/.claude",
+      "enabled": true
+    },
+    {
+      "name": "codex",
+      "display_name": "Codex",
+      "home_dir": "~/.codex",
+      "enabled": true
+    }
+  ]
+}
+```
+
+This allows you to:
+- Enable/disable specific agents
+- Override default home directories
+- Customize display names
+- Prepare for future agent additions
+
 <a id="find-claude-session"></a>
 ## 🔍 find-claude-session
 
@@ -208,13 +290,20 @@ source /path/to/claude-code-tools/scripts/fcs-function.sh
 # Search in current project
 fcs "keyword1,keyword2,keyword3"
 
-# Search across all Claude projects  
+# Show all sessions in current project (no keyword filtering)
+fcs
+
+# Search across all Claude projects
 fcs "keywords" --global
 fcs "keywords" -g
+
+# Show all sessions across all projects
+fcs -g
 ```
 
 ### Features
 
+- **Optional keyword search**: Keywords are optional—omit them to show all sessions
 - **Action menu** after session selection:
   - Resume session (default)
   - Show session file path
@@ -252,10 +341,16 @@ Search and resume Codex sessions by keywords. Usage is similar to `find-claude-s
 # Search in current project only (default)
 find-codex-session "keyword1,keyword2"
 
+# Show all sessions in current project (no keyword filtering)
+find-codex-session
+
 # Search across all projects
 find-codex-session "keywords" -g
 find-codex-session "keywords" --global
 
+# Show all sessions across all projects
+find-codex-session -g
+
 # Limit number of results
 find-codex-session "keywords" -n 5
 
@@ -265,6 +360,7 @@ find-codex-session "keywords" --codex-home /custom/path
 
 ### Features
 
+- **Optional keyword search**: Keywords are optional—omit them to show all sessions
 - **Action menu** after session selection:
   - Resume session (default)
   - Show session file path

{claude_code_tools-0.2.4 → claude_code_tools-0.2.6}/README.md

@@ -9,6 +9,7 @@ and other CLI coding agents.
 - [🚀 Quick Start](#quick-start)
 - [🎮 tmux-cli Deep Dive](#tmux-cli-deep-dive)
 - [🚀 lmsh (Experimental) — natural language to shell commands](#lmsh-experimental)
+- [🔍 find-session — unified search across Claude & Codex sessions](#find-session)
 - [🔍 find-claude-session — search and resume Claude sessions](#find-claude-session)
 - [🔍 find-codex-session — search and resume Codex sessions](#find-codex-session)
 - [🔐 vault — encrypted .env backup & sync](#vault)
@@ -67,6 +68,7 @@ uv tool install git+https://github.com/pchalasani/claude-code-tools
 
 This gives you:
 - `tmux-cli` - The interactive CLI controller we just covered
+- `find-session` - Unified search across Claude Code and Codex sessions
 - `find-claude-session` - Search and resume Claude Code sessions by keywords
 - `find-codex-session` - Search and resume Codex sessions by keywords
 - `vault` - Encrypted backup for your .env files
@@ -161,6 +163,86 @@ cp target/release/lmsh ~/.cargo/bin/
 
 See [docs/lmsh.md](docs/lmsh.md) for details.
 
+<a id="find-session"></a>
+## 🔍 find-session
+
+**Unified session finder** - Search across both Claude Code and Codex sessions simultaneously.
+
+> **⚠️ Note about the `fs` command**: For convenience, this tool is available as both `find-session` and `fs`. The short `fs` alias may conflict with existing commands or aliases in your shell. If you have a conflict, you can:
+> - Use the full `find-session` command instead
+> - Create your own alias: `alias mysearch='find-session'`
+> - Uninstall and reinstall without the `fs` entry point (edit `pyproject.toml`)
+
+### Usage
+
+```bash
+# Search all agents in current project
+fs "keyword1,keyword2"
+
+# Show all sessions across all agents in current project
+fs
+
+# Search across all projects (Claude + Codex)
+fs "keywords" -g
+
+# Show all sessions across all projects
+fs -g
+
+# Search only specific agent(s)
+fs "bug,fix" --agents claude
+fs "error" --agents codex
+
+# Limit number of results
+fs "keywords" -n 15
+```
+
+### Features
+
+- **Multi-agent search**: Searches both Claude Code and Codex sessions simultaneously
+- **Unified display**: Single table showing sessions from all agents with agent column
+- **Smart resume**: Automatically uses correct CLI tool (`claude` or `codex`) based on selected session
+- **Optional keyword search**: Keywords are optional—omit them to show all sessions
+- **Action menu** after session selection:
+  - Resume session (default)
+  - Show session file path
+  - Copy session file to file (*.jsonl) or directory
+- **Project filtering**: Search current project only (default) or all projects with `-g`
+- **Agent filtering**: Use `--agents claude codex` to search specific agents only
+- **Configurable**: Optional config file at `~/.config/find-session/config.json` for customizing agents
+- Interactive session selection with Rich table display
+- Shows agent, project, git branch, date, line count, and preview
+- Reverse chronological ordering (most recent first)
+- Press Enter to cancel (no need for Ctrl+C)
+
+### Configuration (Optional)
+
+Create `~/.config/find-session/config.json` to customize agent settings:
+
+```json
+{
+  "agents": [
+    {
+      "name": "claude",
+      "display_name": "Claude",
+      "home_dir": "~/.claude",
+      "enabled": true
+    },
+    {
+      "name": "codex",
+      "display_name": "Codex",
+      "home_dir": "~/.codex",
+      "enabled": true
+    }
+  ]
+}
+```
+
+This allows you to:
+- Enable/disable specific agents
+- Override default home directories
+- Customize display names
+- Prepare for future agent additions
+
 <a id="find-claude-session"></a>
 ## 🔍 find-claude-session
 
@@ -194,13 +276,20 @@ source /path/to/claude-code-tools/scripts/fcs-function.sh
 # Search in current project
 fcs "keyword1,keyword2,keyword3"
 
-# Search across all Claude projects  
+# Show all sessions in current project (no keyword filtering)
+fcs
+
+# Search across all Claude projects
 fcs "keywords" --global
 fcs "keywords" -g
+
+# Show all sessions across all projects
+fcs -g
 ```
 
 ### Features
 
+- **Optional keyword search**: Keywords are optional—omit them to show all sessions
 - **Action menu** after session selection:
   - Resume session (default)
   - Show session file path
@@ -238,10 +327,16 @@ Search and resume Codex sessions by keywords. Usage is similar to `find-claude-s
 # Search in current project only (default)
 find-codex-session "keyword1,keyword2"
 
+# Show all sessions in current project (no keyword filtering)
+find-codex-session
+
 # Search across all projects
 find-codex-session "keywords" -g
 find-codex-session "keywords" --global
 
+# Show all sessions across all projects
+find-codex-session -g
+
 # Limit number of results
 find-codex-session "keywords" -n 5
 
@@ -251,6 +346,7 @@ find-codex-session "keywords" --codex-home /custom/path
 
 ### Features
 
+- **Optional keyword search**: Keywords are optional—omit them to show all sessions
 - **Action menu** after session selection:
   - Resume session (default)
   - Show session file path

{claude_code_tools-0.2.4 → claude_code_tools-0.2.6}/claude_code_tools/__init__.py

@@ -1,3 +1,3 @@
 """Claude Code Tools - Collection of utilities for Claude Code."""
 
-__version__ = "0.2.4"
+__version__ = "0.2.6"

{claude_code_tools-0.2.4 → claude_code_tools-0.2.6}/claude_code_tools/find_claude_session.py

@@ -124,29 +124,49 @@ def extract_project_name(original_path: str) -> str:
 def search_keywords_in_file(filepath: Path, keywords: List[str]) -> tuple[bool, int, Optional[str]]:
     """
     Check if all keywords are present in the JSONL file, count lines, and extract git branch.
-    
+
     Args:
         filepath: Path to the JSONL file
-        keywords: List of keywords to search for (case-insensitive)
-        
+        keywords: List of keywords to search for (case-insensitive). Empty list matches all files.
+
     Returns:
         Tuple of (matches: bool, line_count: int, git_branch: Optional[str])
-        - matches: True if ALL keywords are found in the file
+        - matches: True if ALL keywords are found in the file (or True if no keywords)
         - line_count: Total number of lines in the file
         - git_branch: Git branch name from the first message that has it, or None
     """
+    # If no keywords, match all files
+    if not keywords:
+        line_count = 0
+        git_branch = None
+        try:
+            with open(filepath, 'r', encoding='utf-8') as f:
+                for line in f:
+                    line_count += 1
+                    # Extract git branch from JSON if not already found
+                    if git_branch is None:
+                        try:
+                            data = json.loads(line.strip())
+                            if 'gitBranch' in data and data['gitBranch']:
+                                git_branch = data['gitBranch']
+                        except (json.JSONDecodeError, KeyError):
+                            pass
+        except Exception:
+            return False, 0, None
+        return True, line_count, git_branch
+
     # Convert keywords to lowercase for case-insensitive search
     keywords_lower = [k.lower() for k in keywords]
     found_keywords = set()
     line_count = 0
     git_branch = None
-    
+
     try:
         with open(filepath, 'r', encoding='utf-8') as f:
             for line in f:
                 line_count += 1
                 line_lower = line.lower()
-                
+
                 # Extract git branch from JSON if not already found
                 if git_branch is None:
                     try:
@@ -155,7 +175,7 @@ def search_keywords_in_file(filepath: Path, keywords: List[str]) -> tuple[bool,
                             git_branch = data['gitBranch']
                     except (json.JSONDecodeError, KeyError):
                         pass
-                
+
                 # Check which keywords are in this line
                 for keyword in keywords_lower:
                     if keyword in line_lower:
@@ -163,7 +183,7 @@ def search_keywords_in_file(filepath: Path, keywords: List[str]) -> tuple[bool,
     except Exception:
         # Skip files that can't be read
         return False, 0, None
-    
+
     matches = len(found_keywords) == len(keywords_lower)
     return matches, line_count, git_branch
 
@@ -310,22 +330,23 @@ def display_interactive_ui(sessions: List[Tuple[str, float, int, str, str, str,
     """Display interactive UI for session selection."""
     if not RICH_AVAILABLE:
         return None
-    
+
     # Use stderr console if in stderr mode
     ui_console = Console(file=sys.stderr) if stderr_mode else console
     if not ui_console:
         return None
-    
+
     # Limit to specified number of sessions
     display_sessions = sessions[:num_matches]
-    
+
     if not display_sessions:
         ui_console.print("[red]No sessions found[/red]")
         return None
-    
+
     # Create table
+    title = f"Sessions matching: {', '.join(keywords)}" if keywords else "All sessions"
     table = Table(
-        title=f"Sessions matching: {', '.join(keywords)}",
+        title=title,
         box=box.ROUNDED,
         show_header=True,
         header_style="bold cyan"
@@ -609,7 +630,9 @@ To persist directory changes when resuming sessions:
     )
     parser.add_argument(
         "keywords",
-        help="Comma-separated keywords to search for (case-insensitive)"
+        nargs='?',
+        default="",
+        help="Comma-separated keywords to search for (case-insensitive). If omitted, shows all sessions."
     )
     parser.add_argument(
         "-g", "--global",
@@ -636,11 +659,7 @@ To persist directory changes when resuming sessions:
     args = parser.parse_args()
     
     # Parse keywords
-    keywords = [k.strip() for k in args.keywords.split(",") if k.strip()]
-    
-    if not keywords:
-        print("Error: No keywords provided", file=sys.stderr)
-        sys.exit(1)
+    keywords = [k.strip() for k in args.keywords.split(",") if k.strip()] if args.keywords else []
     
     # Check if searching current project only
     if not getattr(args, 'global'):
@@ -656,10 +675,11 @@ To persist directory changes when resuming sessions:
     
     if not matching_sessions:
         scope = "all projects" if getattr(args, 'global') else "current project"
+        keyword_msg = f" containing all keywords: {', '.join(keywords)}" if keywords else ""
         if RICH_AVAILABLE and console and not args.shell:
-            console.print(f"[yellow]No sessions found containing all keywords in {scope}:[/yellow] {', '.join(keywords)}")
+            console.print(f"[yellow]No sessions found{keyword_msg} in {scope}[/yellow]")
         else:
-            print(f"No sessions found containing all keywords in {scope}: {', '.join(keywords)}", file=sys.stderr)
+            print(f"No sessions found{keyword_msg} in {scope}", file=sys.stderr)
         sys.exit(0)
     
     # If we have rich and there are results, show interactive UI

{claude_code_tools-0.2.4 → claude_code_tools-0.2.6}/claude_code_tools/find_codex_session.py

@@ -112,10 +112,44 @@ def search_keywords_in_file(
     Search for keywords in a Codex session file.
 
     Returns: (found, line_count, preview)
-    - found: True if all keywords found (case-insensitive AND logic)
+    - found: True if all keywords found (case-insensitive AND logic), or True if no keywords
     - line_count: total lines in file
     - preview: best user message content (skips system messages)
     """
+    # If no keywords, match all files
+    if not keywords:
+        line_count = 0
+        last_user_message = None
+        try:
+            with open(session_file, "r", encoding="utf-8") as f:
+                for line in f:
+                    line_count += 1
+                    if not line.strip():
+                        continue
+                    try:
+                        entry = json.loads(line)
+                        # Extract user messages (skip system messages)
+                        if (
+                            entry.get("type") == "response_item"
+                            and entry.get("payload", {}).get("role") == "user"
+                        ):
+                            content = entry.get("payload", {}).get("content", [])
+                            if isinstance(content, list) and len(content) > 0:
+                                first_item = content[0]
+                                if isinstance(first_item, dict):
+                                    text = first_item.get("text", "")
+                                    if text and not is_system_message(text):
+                                        cleaned = text[:400].replace("\n", " ").strip()
+                                        if len(cleaned) > 20:
+                                            last_user_message = cleaned
+                                        elif last_user_message is None:
+                                            last_user_message = cleaned
+                    except json.JSONDecodeError:
+                        continue
+            return True, line_count, last_user_message
+        except (OSError, IOError):
+            return False, 0, None
+
     keywords_lower = [k.lower() for k in keywords]
     found_keywords = set()
     line_count = 0
@@ -277,6 +311,7 @@ def find_sessions(
 
 def display_interactive_ui(
     matches: list[dict],
+    keywords: list[str] = None,
 ) -> Optional[dict]:
     """
     Display matches in interactive UI and get user selection.
@@ -289,7 +324,8 @@ def display_interactive_ui(
 
     if RICH_AVAILABLE:
         console = Console()
-        table = Table(title="Codex Sessions", show_header=True)
+        title = f"Codex Sessions matching: {', '.join(keywords)}" if keywords else "All Codex Sessions"
+        table = Table(title=title, show_header=True)
         table.add_column("#", style="cyan", justify="right")
         table.add_column("Session ID", style="yellow", no_wrap=True)
         table.add_column("Project", style="green")
@@ -486,7 +522,9 @@ Examples:
 
     parser.add_argument(
         "keywords",
-        help="Comma-separated keywords to search (AND logic)",
+        nargs='?',
+        default="",
+        help="Comma-separated keywords to search (AND logic). If omitted, shows all sessions.",
     )
     parser.add_argument(
         "-g",
@@ -515,10 +553,7 @@ Examples:
     args = parser.parse_args()
 
     # Parse keywords
-    keywords = [k.strip() for k in args.keywords.split(",") if k.strip()]
-    if not keywords:
-        print("Error: No keywords provided", file=sys.stderr)
-        sys.exit(1)
+    keywords = [k.strip() for k in args.keywords.split(",") if k.strip()] if args.keywords else []
 
     # Get Codex home
     codex_home = get_codex_home(args.codex_home)
@@ -532,7 +567,7 @@ Examples:
     )
 
     # Display and get selection
-    selected_match = display_interactive_ui(matches)
+    selected_match = display_interactive_ui(matches, keywords)
     if not selected_match:
         return
 

claude_code_tools-0.2.6/claude_code_tools/find_session.py

@@ -0,0 +1,438 @@
+#!/usr/bin/env python3
+"""
+Unified session finder - search across multiple coding agents (Claude Code, Codex, etc.)
+
+Usage:
+    find-session [keywords] [OPTIONS]
+    fs [keywords] [OPTIONS]  # via shell wrapper
+
+Examples:
+    find-session "langroid,MCP"      # Search all agents in current project
+    find-session -g                  # Show all sessions across all projects
+    find-session "bug" --agents claude  # Search only Claude sessions
+"""
+
+import argparse
+import json
+import os
+import sys
+from dataclasses import dataclass
+from pathlib import Path
+from typing import List, Optional
+
+# Import search functions from existing tools
+from claude_code_tools.find_claude_session import (
+    find_sessions as find_claude_sessions,
+    resume_session as resume_claude_session,
+    get_session_file_path as get_claude_session_file_path,
+    copy_session_file as copy_claude_session_file,
+)
+from claude_code_tools.find_codex_session import (
+    find_sessions as find_codex_sessions,
+    resume_session as resume_codex_session,
+    get_codex_home,
+    copy_session_file as copy_codex_session_file,
+)
+
+try:
+    from rich.console import Console
+    from rich.table import Table
+    from rich import box
+
+    RICH_AVAILABLE = True
+except ImportError:
+    RICH_AVAILABLE = False
+
+
+@dataclass
+class AgentConfig:
+    """Configuration for a coding agent."""
+
+    name: str  # Internal name (e.g., "claude", "codex")
+    display_name: str  # Display name (e.g., "Claude", "Codex")
+    home_dir: Optional[str]  # Custom home directory (None = default)
+    enabled: bool = True
+
+
+def get_default_agents() -> List[AgentConfig]:
+    """Get default agent configurations."""
+    return [
+        AgentConfig(name="claude", display_name="Claude", home_dir=None),
+        AgentConfig(name="codex", display_name="Codex", home_dir=None),
+    ]
+
+
+def load_config() -> List[AgentConfig]:
+    """Load agent configuration from config file or use defaults."""
+    config_path = Path.home() / ".config" / "find-session" / "config.json"
+
+    if config_path.exists():
+        try:
+            with open(config_path, "r") as f:
+                data = json.load(f)
+                agents = []
+                for agent_data in data.get("agents", []):
+                    agents.append(
+                        AgentConfig(
+                            name=agent_data["name"],
+                            display_name=agent_data.get(
+                                "display_name", agent_data["name"].title()
+                            ),
+                            home_dir=agent_data.get("home_dir"),
+                            enabled=agent_data.get("enabled", True),
+                        )
+                    )
+                return agents
+        except (json.JSONDecodeError, KeyError, IOError):
+            pass
+
+    # Return defaults if config doesn't exist or is invalid
+    return get_default_agents()
+
+
+def search_all_agents(
+    keywords: List[str],
+    global_search: bool = False,
+    num_matches: int = 10,
+    agents: Optional[List[str]] = None,
+    claude_home: Optional[str] = None,
+    codex_home: Optional[str] = None,
+) -> List[dict]:
+    """
+    Search sessions across all enabled agents.
+
+    Returns list of dicts with agent metadata added.
+    """
+    agent_configs = load_config()
+
+    # Filter by requested agents if specified
+    if agents:
+        agent_configs = [a for a in agent_configs if a.name in agents]
+
+    # Filter by enabled agents
+    agent_configs = [a for a in agent_configs if a.enabled]
+
+    all_sessions = []
+
+    for agent_config in agent_configs:
+        if agent_config.name == "claude":
+            # Search Claude sessions
+            home = claude_home or agent_config.home_dir
+            sessions = find_claude_sessions(
+                keywords, global_search=global_search, claude_home=home
+            )
+
+            # Add agent metadata to each session
+            for session in sessions:
+                session_dict = {
+                    "agent": "claude",
+                    "agent_display": agent_config.display_name,
+                    "session_id": session[0],
+                    "mod_time": session[1],
+                    "create_time": session[2],
+                    "lines": session[3],
+                    "project": session[4],
+                    "preview": session[5],
+                    "cwd": session[6],
+                    "branch": session[7] if len(session) > 7 else "",
+                    "claude_home": home,
+                }
+                all_sessions.append(session_dict)
+
+        elif agent_config.name == "codex":
+            # Search Codex sessions
+            home = codex_home or agent_config.home_dir
+            codex_home_path = get_codex_home(home)
+
+            if codex_home_path.exists():
+                sessions = find_codex_sessions(
+                    codex_home_path,
+                    keywords,
+                    num_matches=num_matches * 2,  # Get more for merging
+                    global_search=global_search,
+                )
+
+                # Add agent metadata to each session
+                for session in sessions:
+                    session_dict = {
+                        "agent": "codex",
+                        "agent_display": agent_config.display_name,
+                        "session_id": session["session_id"],
+                        "mod_time": session["mod_time"],
+                        "create_time": session.get("mod_time"),  # Codex doesn't separate these
+                        "lines": session["lines"],
+                        "project": session["project"],
+                        "preview": session["preview"],
+                        "cwd": session["cwd"],
+                        "branch": session.get("branch", ""),
+                        "file_path": session.get("file_path", ""),
+                    }
+                    all_sessions.append(session_dict)
+
+    # Sort by modification time (newest first) and limit
+    all_sessions.sort(key=lambda x: x["mod_time"], reverse=True)
+    return all_sessions[:num_matches]
+
+
+def display_interactive_ui(
+    sessions: List[dict], keywords: List[str], stderr_mode: bool = False, num_matches: int = 10
+) -> Optional[dict]:
+    """Display unified session selection UI."""
+    if not RICH_AVAILABLE:
+        return None
+
+    # Use stderr console if in stderr mode
+    ui_console = Console(file=sys.stderr) if stderr_mode else Console()
+
+    # Limit to specified number of sessions
+    display_sessions = sessions[:num_matches]
+
+    if not display_sessions:
+        ui_console.print("[red]No sessions found[/red]")
+        return None
+
+    # Create table
+    title = (
+        f"Sessions matching: {', '.join(keywords)}" if keywords else "All sessions"
+    )
+    table = Table(
+        title=title, box=box.ROUNDED, show_header=True, header_style="bold cyan"
+    )
+
+    table.add_column("#", style="bold yellow", width=3)
+    table.add_column("Agent", style="magenta", width=6)
+    table.add_column("Session ID", style="dim", width=10)
+    table.add_column("Project", style="green")
+    table.add_column("Branch", style="cyan")
+    table.add_column("Date", style="blue")
+    table.add_column("Lines", style="cyan", justify="right", width=6)
+    table.add_column("Last User Message", style="white", max_width=50, overflow="fold")
+
+    for idx, session in enumerate(display_sessions, 1):
+        # Format date from mod_time
+        from datetime import datetime
+
+        mod_time = session["mod_time"]
+        date_str = datetime.fromtimestamp(mod_time).strftime("%m/%d %H:%M")
+
+        branch_display = session.get("branch", "") or "N/A"
+
+        table.add_row(
+            str(idx),
+            session["agent_display"],
+            session["session_id"][:8] + "...",
+            session["project"],
+            branch_display,
+            date_str,
+            str(session["lines"]),
+            session["preview"],
+        )
+
+    ui_console.print(table)
+    ui_console.print("\n[bold]Select a session:[/bold]")
+    ui_console.print(f"  • Enter number (1-{len(display_sessions)}) to select")
+    ui_console.print("  • Press Enter to cancel\n")
+
+    while True:
+        try:
+            from rich.prompt import Prompt
+
+            choice = Prompt.ask(
+                "Your choice", default="", show_default=False, console=ui_console
+            )
+
+            # Handle empty input - cancel
+            if not choice or not choice.strip():
+                ui_console.print("[yellow]Cancelled[/yellow]")
+                return None
+
+            idx = int(choice) - 1
+            if 0 <= idx < len(display_sessions):
+                return display_sessions[idx]
+            else:
+                ui_console.print("[red]Invalid choice. Please try again.[/red]")
+
+        except KeyboardInterrupt:
+            ui_console.print("\n[yellow]Cancelled[/yellow]")
+            return None
+        except EOFError:
+            ui_console.print("\n[yellow]Cancelled (EOF)[/yellow]")
+            return None
+        except ValueError:
+            ui_console.print("[red]Invalid choice. Please try again.[/red]")
+
+
+def show_action_menu(session: dict) -> Optional[str]:
+    """Show action menu for selected session."""
+    print(f"\n=== Session: {session['session_id'][:16]}... ===")
+    print(f"Agent: {session['agent_display']}")
+    print(f"Project: {session['project']}")
+    if session.get("branch"):
+        print(f"Branch: {session['branch']}")
+    print(f"\nWhat would you like to do?")
+    print("1. Resume session (default)")
+    print("2. Show session file path")
+    print("3. Copy session file to file (*.jsonl) or directory")
+    print()
+
+    try:
+        choice = input("Enter choice [1-3] (or Enter for 1): ").strip()
+        if not choice or choice == "1":
+            return "resume"
+        elif choice == "2":
+            return "path"
+        elif choice == "3":
+            return "copy"
+        else:
+            print("Invalid choice.")
+            return None
+    except KeyboardInterrupt:
+        print("\nCancelled.")
+        return None
+
+
+def handle_action(session: dict, action: str, shell_mode: bool = False) -> None:
+    """Handle the selected action based on agent type."""
+    agent = session["agent"]
+
+    if action == "resume":
+        if agent == "claude":
+            resume_claude_session(
+                session["session_id"],
+                session["cwd"],
+                shell_mode=shell_mode,
+                claude_home=session.get("claude_home"),
+            )
+        elif agent == "codex":
+            resume_codex_session(
+                session["session_id"], session["cwd"], shell_mode=shell_mode
+            )
+
+    elif action == "path":
+        if agent == "claude":
+            file_path = get_claude_session_file_path(
+                session["session_id"],
+                session["cwd"],
+                claude_home=session.get("claude_home"),
+            )
+            print(f"\nSession file path:")
+            print(file_path)
+        elif agent == "codex":
+            print(f"\nSession file path:")
+            print(session.get("file_path", "Unknown"))
+
+    elif action == "copy":
+        if agent == "claude":
+            file_path = get_claude_session_file_path(
+                session["session_id"],
+                session["cwd"],
+                claude_home=session.get("claude_home"),
+            )
+            copy_claude_session_file(file_path)
+        elif agent == "codex":
+            copy_codex_session_file(session.get("file_path", ""))
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="Unified session finder - search across multiple coding agents",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""
+Examples:
+    find-session "langroid,MCP"           # Search all agents in current project
+    find-session -g                       # Show all sessions across all projects
+    find-session "bug" --agents claude    # Search only Claude sessions
+    find-session "error" --agents codex   # Search only Codex sessions
+        """,
+    )
+    parser.add_argument(
+        "keywords",
+        nargs="?",
+        default="",
+        help="Comma-separated keywords to search (AND logic). If omitted, shows all sessions.",
+    )
+    parser.add_argument(
+        "-g",
+        "--global",
+        dest="global_search",
+        action="store_true",
+        help="Search across all projects, not just the current one",
+    )
+    parser.add_argument(
+        "-n",
+        "--num-matches",
+        type=int,
+        default=10,
+        help="Number of matching sessions to display (default: 10)",
+    )
+    parser.add_argument(
+        "--agents",
+        nargs="+",
+        choices=["claude", "codex"],
+        help="Limit search to specific agents (default: all)",
+    )
+    parser.add_argument(
+        "--shell",
+        action="store_true",
+        help="Output shell commands for evaluation (for use with shell function)",
+    )
+    parser.add_argument(
+        "--claude-home", type=str, help="Path to Claude home directory (default: ~/.claude)"
+    )
+    parser.add_argument(
+        "--codex-home", type=str, help="Path to Codex home directory (default: ~/.codex)"
+    )
+
+    args = parser.parse_args()
+
+    # Parse keywords
+    keywords = (
+        [k.strip() for k in args.keywords.split(",") if k.strip()]
+        if args.keywords
+        else []
+    )
+
+    # Search all agents
+    matching_sessions = search_all_agents(
+        keywords,
+        global_search=args.global_search,
+        num_matches=args.num_matches,
+        agents=args.agents,
+        claude_home=args.claude_home,
+        codex_home=args.codex_home,
+    )
+
+    if not matching_sessions:
+        scope = "all projects" if args.global_search else "current project"
+        keyword_msg = (
+            f" containing all keywords: {', '.join(keywords)}" if keywords else ""
+        )
+        if RICH_AVAILABLE:
+            console = Console()
+            console.print(f"[yellow]No sessions found{keyword_msg} in {scope}[/yellow]")
+        else:
+            print(f"No sessions found{keyword_msg} in {scope}", file=sys.stderr)
+        sys.exit(0)
+
+    # Display interactive UI
+    if RICH_AVAILABLE:
+        selected_session = display_interactive_ui(
+            matching_sessions, keywords, stderr_mode=args.shell, num_matches=args.num_matches
+        )
+        if selected_session:
+            # Show action menu
+            action = show_action_menu(selected_session)
+            if action:
+                handle_action(selected_session, action, shell_mode=args.shell)
+    else:
+        # Fallback without rich
+        print("\nMatching sessions:")
+        for idx, session in enumerate(matching_sessions[: args.num_matches], 1):
+            print(
+                f"{idx}. [{session['agent_display']}] {session['session_id'][:16]}... | "
+                f"{session['project']} | {session.get('branch', 'N/A')}"
+            )
+
+
+if __name__ == "__main__":
+    main()

{claude_code_tools-0.2.4 → claude_code_tools-0.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "claude-code-tools"
-version = "0.2.4"
+version = "0.2.6"
 description = "Collection of tools for working with Claude Code"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -17,6 +17,8 @@ dev = ["commitizen>=3.0.0"]
 [project.scripts]
 find-claude-session = "claude_code_tools.find_claude_session:main"
 find-codex-session = "claude_code_tools.find_codex_session:main"
+find-session = "claude_code_tools.find_session:main"
+fs = "claude_code_tools.find_session:main"
 vault = "claude_code_tools.dotenv_vault:main"
 tmux-cli = "claude_code_tools.tmux_cli_controller:main"
 env-safe = "claude_code_tools.env_safe:main"
@@ -43,7 +45,7 @@ exclude = [
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.2.4"
+version = "0.2.6"
 tag_format = "v$version"
 version_files = [
     "pyproject.toml:version",