claude-code-tools 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

claude_code_tools/__init__.py

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

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"
@@ -509,15 +530,20 @@ def copy_session_file(session_file_path: str) -> None:
         print(f"\nError copying file: {e}")
 
 
-def resume_session(session_id: str, project_path: str, shell_mode: bool = False):
+def resume_session(session_id: str, project_path: str, shell_mode: bool = False, claude_home: Optional[str] = None):
     """Resume a Claude session using claude -r command."""
     current_dir = os.getcwd()
-    
+
     # In shell mode, output commands for the shell to evaluate
     if shell_mode:
         if project_path != current_dir:
             print(f'cd {shlex.quote(project_path)}')
-        print(f'claude -r {shlex.quote(session_id)}')
+        # Set CLAUDE_CONFIG_DIR environment variable if custom path specified
+        if claude_home:
+            expanded_home = str(Path(claude_home).expanduser().absolute())
+            print(f'CLAUDE_CONFIG_DIR={shlex.quote(expanded_home)} claude -r {shlex.quote(session_id)}')
+        else:
+            print(f'claude -r {shlex.quote(session_id)}')
         return
     
     # Check if we need to change directory
@@ -560,7 +586,13 @@ def resume_session(session_id: str, project_path: str, shell_mode: bool = False)
         # Change directory if needed (won't persist after exit)
         if change_dir and project_path != current_dir:
             os.chdir(project_path)
-        
+
+        # Set CLAUDE_CONFIG_DIR environment variable if custom path specified
+        if claude_home:
+            # Expand ~ and make absolute
+            expanded_home = str(Path(claude_home).expanduser().absolute())
+            os.environ['CLAUDE_CONFIG_DIR'] = expanded_home
+
         # Execute claude
         os.execvp("claude", ["claude", "-r", session_id])
         
@@ -598,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",
@@ -625,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'):
@@ -645,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
@@ -665,7 +696,7 @@ To persist directory changes when resuming sessions:
 
             # Perform selected action
             if action == "resume":
-                resume_session(session_id, project_path, shell_mode=args.shell)
+                resume_session(session_id, project_path, shell_mode=args.shell, claude_home=args.claude_home)
             elif action == "path":
                 session_file_path = get_session_file_path(session_id, project_path, args.claude_home)
                 print(f"\nSession file path:")
@@ -695,7 +726,7 @@ To persist directory changes when resuming sessions:
             if not args.shell:
                 print("\nOnly one match found. Resuming automatically...")
             session_id, _, _, _, _, _, project_path, _ = matching_sessions[0]
-            resume_session(session_id, project_path, shell_mode=args.shell)
+            resume_session(session_id, project_path, shell_mode=args.shell, claude_home=args.claude_home)
         else:
             try:
                 if args.shell:
@@ -714,7 +745,7 @@ To persist directory changes when resuming sessions:
                 idx = int(choice) - 1
                 if 0 <= idx < min(args.num_matches, len(matching_sessions)):
                     session_id, _, _, _, _, project_path, _ = matching_sessions[idx]
-                    resume_session(session_id, project_path, shell_mode=args.shell)
+                    resume_session(session_id, project_path, shell_mode=args.shell, claude_home=args.claude_home)
                 else:
                     print("Invalid choice", file=sys.stderr)
                     sys.exit(1)

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.3.dist-info → claude_code_tools-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-code-tools
-Version: 0.2.3
+Version: 0.2.5
 Summary: Collection of tools for working with Claude Code
 License-File: LICENSE
 Requires-Python: >=3.11
@@ -208,13 +208,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 +259,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 +278,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.3.dist-info → claude_code_tools-0.2.5.dist-info}/RECORD

@@ -1,9 +1,9 @@
-claude_code_tools/__init__.py,sha256=hfbv25WvyGLPMYxee_dRz0B8vl3PT0SguYpS4enKghE,89
+claude_code_tools/__init__.py,sha256=0G7bWv5VJixTjc4F_ntWd_gL1ff2ndWml5zVHh1K10U,89
 claude_code_tools/codex_bridge_mcp.py,sha256=0roYm3YgEFB6y2MvGovzHyY7avKtire4qBtz3kVaYoY,12596
 claude_code_tools/dotenv_vault.py,sha256=KPI9NDFu5HE6FfhQUYw6RhdR-miN0ScJHsBg0OVG61k,9617
 claude_code_tools/env_safe.py,sha256=TSSkOjEpzBwNgbeSR-0tR1-pAW_qmbZNmn3fiAsHJ4w,7659
-claude_code_tools/find_claude_session.py,sha256=aQ9l2gctpr9cDLBXMKZJictjnFe-4p8bAFss4VOATa0,29945
-claude_code_tools/find_codex_session.py,sha256=uSXtg9CFZ7mdkIoYiVCqUHLTJMDT4RoI_iDdkVeNxao,18957
+claude_code_tools/find_claude_session.py,sha256=Mc75CnAdp8mgO9y2s1_oG1rH9svZAUAdqOg_7ezkRg4,31482
+claude_code_tools/find_codex_session.py,sha256=oRSHux_0kwSxKZe5m_Nzjx2aV0b--cVzPJ-w6RXLh0c,20791
 claude_code_tools/tmux_cli_controller.py,sha256=5QDrDlv3oabIghRHuP8jMhUfxPeyYZxizNWW5sVuJIg,34607
 claude_code_tools/tmux_remote_controller.py,sha256=eY1ouLtUzJ40Ik4nqUBvc3Gl1Rx0_L4TFW4j708lgvI,9942
 docs/cc-codex-instructions.md,sha256=5E9QotkrcVYIE5VrvJGi-sg7tdyITDrsbhaqBKr4MUk,1109
@@ -15,8 +15,8 @@ docs/lmsh.md,sha256=o2TNP1Yfl3zW23GzEqK8Bx6z1hQof_lplaeEucuHNRU,1335
 docs/reddit-post.md,sha256=ZA7kPoJNi06t6F9JQMBiIOv039ADC9lM8YXFt8UA_Jg,2345
 docs/tmux-cli-instructions.md,sha256=hKGOdaPdBlb5XFzHfi0Mm7CVlysBuJUAfop3GHreyuw,5008
 docs/vault-documentation.md,sha256=5XzNpHyhGU38JU2hKEWEL1gdPq3rC2zBg8yotK4eNF4,3600
-claude_code_tools-0.2.3.dist-info/METADATA,sha256=_UW9K8bc7JBdFhM_90zxIAKmNaXeSlbseEF30vrMRfU,17530
-claude_code_tools-0.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-claude_code_tools-0.2.3.dist-info/entry_points.txt,sha256=rAHzNUN7b_HIRbFlvpYwK38FG6jREYWaO0ssnhAVPrg,287
-claude_code_tools-0.2.3.dist-info/licenses/LICENSE,sha256=BBQdOBLdFB3CEPmb3pqxeOThaFCIdsiLzmDANsCHhoM,1073
-claude_code_tools-0.2.3.dist-info/RECORD,,
+claude_code_tools-0.2.5.dist-info/METADATA,sha256=Yxzyidh8hiBahZa1Bzusr2Wo53OqOxldYbmz62zHIas,17960
+claude_code_tools-0.2.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+claude_code_tools-0.2.5.dist-info/entry_points.txt,sha256=rAHzNUN7b_HIRbFlvpYwK38FG6jREYWaO0ssnhAVPrg,287
+claude_code_tools-0.2.5.dist-info/licenses/LICENSE,sha256=BBQdOBLdFB3CEPmb3pqxeOThaFCIdsiLzmDANsCHhoM,1073
+claude_code_tools-0.2.5.dist-info/RECORD,,