claude-code-tools 1.4.1__py3-none-any.whl → 1.4.6__py3-none-any.whl

claude_code_tools/__init__.py

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

claude_code_tools/export_session.py

@@ -2,11 +2,39 @@
 
 import json
 import os
+import re
 from datetime import datetime
 from io import StringIO
 from pathlib import Path
 from typing import Any, Optional
 
+# Known system-injected XML tags that appear at the start of messages.
+# Using a whitelist of specific tags avoids filtering legitimate user
+# messages that start with HTML/XML like <div> or <svg>.
+NON_GENUINE_XML_TAGS = {
+    # Claude system tags (local command execution)
+    "command-name",
+    "command-message",
+    "command-args",
+    "local-command-stdout",
+    "bash-input",
+    "bash-stdout",
+    "bash-stderr",
+    "bash-notification",
+    # Codex system tags (environment/context injection)
+    "environment_context",
+    "user_instructions",
+    "user_shell_command",
+}
+
+# Regex patterns for non-genuine user messages (system-injected content).
+# Messages matching any of these patterns are filtered out when finding
+# the first real user message. Used for both Claude and Codex sessions.
+NON_GENUINE_MSG_PATTERNS = [
+    re.compile(r"^Caveat:", re.IGNORECASE),  # Caveat warnings about local commands
+    re.compile(r"^\s*\[SESSION LINEAGE\]", re.IGNORECASE),  # Session continuation context
+]
+
 # Lazy import yaml to allow module to load even if not installed
 try:
     import yaml
@@ -139,22 +167,60 @@ def _extract_codex_message_text(data: dict) -> Optional[str]:
     return None
 
 
+def _is_meta_user_message(data: dict, text: str) -> bool:
+    """
+    Check if a user message is a meta/system-injected message.
+
+    These include local command injections that Claude Code records
+    in the session file but aren't actual user queries.
+
+    Args:
+        data: The parsed JSON data for the message
+        text: The extracted text content
+
+    Returns:
+        True if this is a meta message that should be skipped
+    """
+    # Check isMeta flag
+    if data.get("isMeta") is True:
+        return True
+
+    # Check against regex patterns (Caveat, SESSION LINEAGE, etc.)
+    for pattern in NON_GENUINE_MSG_PATTERNS:
+        if pattern.search(text):
+            return True
+
+    # Check if message starts with a known system-injected XML tag
+    text_stripped = text.strip()
+    match = re.match(r"^<([a-z][a-z0-9_-]*)>", text_stripped)
+    if match and match.group(1) in NON_GENUINE_XML_TAGS:
+        return True
+
+    return False
+
+
 def extract_first_last_messages(
     session_file: Path, agent: str
-) -> tuple[Optional[dict[str, str]], Optional[dict[str, str]]]:
+) -> tuple[
+    Optional[dict[str, str]],
+    Optional[dict[str, str]],
+    Optional[dict[str, str]],
+]:
     """
-    Extract first and last user/assistant messages from a session.
+    Extract first/last messages and the first real user message from a session.
 
     Args:
         session_file: Path to session JSONL file
         agent: Agent type ('claude' or 'codex')
 
     Returns:
-        Tuple of (first_msg, last_msg) where each is a dict with 'role' and
-        'content' keys, or None if not found
+        Tuple of (first_msg, last_msg, first_user_msg) where each is a dict
+        with 'role' and 'content' keys, or None if not found.
+        first_user_msg skips meta messages (local command injections).
     """
     first_msg: Optional[dict[str, str]] = None
     last_msg: Optional[dict[str, str]] = None
+    first_user_msg: Optional[dict[str, str]] = None
 
     try:
         with open(session_file, "r", encoding="utf-8") as f:
@@ -190,13 +256,20 @@ def extract_first_last_messages(
                     }
                     if first_msg is None:
                         first_msg = msg_dict
+                    # Track first real user message (skip meta messages)
+                    if (
+                        role == "user"
+                        and first_user_msg is None
+                        and not _is_meta_user_message(data, text)
+                    ):
+                        first_user_msg = msg_dict
                     # Always update last_msg to get the last one
                     last_msg = msg_dict
 
     except (OSError, IOError):
         pass
 
-    return first_msg, last_msg
+    return first_msg, last_msg, first_user_msg
 
 
 def extract_session_metadata(session_file: Path, agent: str) -> dict[str, Any]:
@@ -236,6 +309,7 @@ def extract_session_metadata(session_file: Path, agent: str) -> dict[str, Any]:
         "trim_stats": None,
         "first_msg": None,
         "last_msg": None,
+        "first_user_msg": None,
     }
 
     # Track session start timestamp from JSON metadata
@@ -371,9 +445,12 @@ def extract_session_metadata(session_file: Path, agent: str) -> dict[str, Any]:
         metadata["project"] = Path(metadata["cwd"]).name
 
     # Extract first and last messages
-    first_msg, last_msg = extract_first_last_messages(session_file, agent)
+    first_msg, last_msg, first_user_msg = extract_first_last_messages(
+        session_file, agent
+    )
     metadata["first_msg"] = first_msg
     metadata["last_msg"] = last_msg
+    metadata["first_user_msg"] = first_user_msg
 
     return metadata
 
@@ -458,6 +535,8 @@ def generate_yaml_frontmatter(metadata: dict[str, Any]) -> str:
         yaml_data["first_msg"] = metadata["first_msg"]
     if metadata.get("last_msg"):
         yaml_data["last_msg"] = metadata["last_msg"]
+    if metadata.get("first_user_msg"):
+        yaml_data["first_user_msg"] = metadata["first_user_msg"]
 
     # Trim stats (only for trimmed sessions)
     if metadata.get("trim_stats"):

claude_code_tools/search_index.py

@@ -10,6 +10,7 @@ from importlib.metadata import version as get_pkg_version
 from pathlib import Path
 from typing import Any, Optional
 
+from claude_code_tools.export_session import _is_meta_user_message
 from claude_code_tools.session_utils import is_valid_session
 
 
@@ -177,6 +178,7 @@ class SessionIndex:
         self.schema_builder.add_text_field("first_msg_content", stored=True)
         self.schema_builder.add_text_field("last_msg_role", stored=True)
         self.schema_builder.add_text_field("last_msg_content", stored=True)
+        self.schema_builder.add_text_field("first_user_msg_content", stored=True)
 
         # Session type fields (for filtering in TUI)
         self.schema_builder.add_text_field("derivation_type", stored=True)
@@ -321,10 +323,12 @@ class SessionIndex:
             # First and last message fields
             first_msg = metadata.get("first_msg", {}) or {}
             last_msg = metadata.get("last_msg", {}) or {}
+            first_user_msg = metadata.get("first_user_msg", {}) or {}
             doc.add_text("first_msg_role", first_msg.get("role", ""))
             doc.add_text("first_msg_content", first_msg.get("content", ""))
             doc.add_text("last_msg_role", last_msg.get("role", ""))
             doc.add_text("last_msg_content", last_msg.get("content", ""))
+            doc.add_text("first_user_msg_content", first_user_msg.get("content", ""))
 
             # Session type fields
             doc.add_text("derivation_type", metadata.get("derivation_type", "") or "")
@@ -405,10 +409,12 @@ class SessionIndex:
             # First and last message fields
             first_msg = metadata.get("first_msg", {}) or {}
             last_msg = metadata.get("last_msg", {}) or {}
+            first_user_msg = metadata.get("first_user_msg", {}) or {}
             doc.add_text("first_msg_role", first_msg.get("role", ""))
             doc.add_text("first_msg_content", first_msg.get("content", ""))
             doc.add_text("last_msg_role", last_msg.get("role", ""))
             doc.add_text("last_msg_content", last_msg.get("content", ""))
+            doc.add_text("first_user_msg_content", first_user_msg.get("content", ""))
 
             # Session type fields
             doc.add_text(
@@ -525,9 +531,10 @@ class SessionIndex:
                         message = data.get("message", {})
                         content = message.get("content")
 
-                        # Count user messages, but exclude tool results
-                        # Tool results have content as list with {"type": "tool_result"}
-                        # Real user messages have content as string or list with text
+                        # Count user messages, but exclude:
+                        # - Tool results (content is list with {"type": "tool_result"})
+                        # - Meta messages (isMeta: true, e.g., "Caveat:" warnings)
+                        # - Local command messages (<command-name>, <local-command-stdout>)
                         if role == "user":
                             is_tool_result = (
                                 isinstance(content, list)
@@ -535,7 +542,12 @@ class SessionIndex:
                                 and isinstance(content[0], dict)
                                 and content[0].get("type") == "tool_result"
                             )
-                            if not is_tool_result:
+                            # Check for meta/non-genuine messages
+                            text_content = content if isinstance(content, str) else ""
+                            if (
+                                not is_tool_result
+                                and not _is_meta_user_message(data, text_content)
+                            ):
                                 user_count += 1
 
                         if not content:
@@ -575,13 +587,23 @@ class SessionIndex:
                             continue
 
                         role = payload.get("role")
-                        if role == "user":
-                            user_count += 1
                         content = payload.get("content", [])
 
                         if not isinstance(content, list):
                             continue
 
+                        # Extract text first to check for meta patterns
+                        codex_text = ""
+                        for block in content:
+                            if isinstance(block, dict):
+                                if block.get("type") in ("input_text", "output_text"):
+                                    codex_text += block.get("text", "")
+
+                        # Count user messages, but exclude non-genuine messages
+                        if role == "user":
+                            if not _is_meta_user_message({}, codex_text):
+                                user_count += 1
+
                         for block in content:
                             if not isinstance(block, dict):
                                 continue
@@ -635,6 +657,7 @@ class SessionIndex:
             # Map metadata fields to expected format
             first_msg = metadata.get("first_msg") or {"role": "", "content": ""}
             last_msg = metadata.get("last_msg") or {"role": "", "content": ""}
+            first_user_msg = metadata.get("first_user_msg") or {"role": "", "content": ""}
 
             # Always use filename-derived session_id (the canonical identifier)
             # Internal sessionId field can be stale in forked sessions
@@ -660,6 +683,7 @@ class SessionIndex:
                 "content": content,
                 "first_msg": first_msg,
                 "last_msg": last_msg,
+                "first_user_msg": first_user_msg,
                 "lines": msg_count,
                 "file_path": str(jsonl_path),
             }
@@ -742,6 +766,7 @@ class SessionIndex:
             metadata = parsed["metadata"]
             first_msg = parsed["first_msg"]
             last_msg = parsed["last_msg"]
+            first_user_msg = parsed.get("first_user_msg", {}) or {}
 
             # Skip helper sessions (SDK/headless sessions used for analysis)
             if metadata.get("session_type") == "helper":
@@ -785,6 +810,7 @@ class SessionIndex:
                 doc.add_text("first_msg_content", first_msg.get("content", ""))
                 doc.add_text("last_msg_role", last_msg.get("role", ""))
                 doc.add_text("last_msg_content", last_msg.get("content", ""))
+                doc.add_text("first_user_msg_content", first_user_msg.get("content", ""))
 
                 # Session type fields
                 doc.add_text(
@@ -1007,6 +1033,7 @@ class SessionIndex:
             first_msg_content = doc.get_first("first_msg_content") or ""
             last_msg_role = doc.get_first("last_msg_role") or ""
             last_msg_content = doc.get_first("last_msg_content") or ""
+            first_user_msg_content = doc.get_first("first_user_msg_content") or ""
 
             results.append({
                 "session_id": session_id,
@@ -1024,6 +1051,7 @@ class SessionIndex:
                 "first_msg_content": first_msg_content,
                 "last_msg_role": last_msg_role,
                 "last_msg_content": last_msg_content,
+                "first_user_msg_content": first_user_msg_content,
             })
 
             if len(results) >= limit:
@@ -1087,6 +1115,7 @@ class SessionIndex:
                 "first_msg_content": doc.get_first("first_msg_content") or "",
                 "last_msg_role": doc.get_first("last_msg_role") or "",
                 "last_msg_content": doc.get_first("last_msg_content") or "",
+                "first_user_msg_content": doc.get_first("first_user_msg_content") or "",
                 "claude_home": doc.get_first("claude_home") or "",
             })
 
@@ -1186,6 +1215,7 @@ class SessionIndex:
                 "first_msg_content": doc.get_first("first_msg_content") or "",
                 "last_msg_role": doc.get_first("last_msg_role") or "",
                 "last_msg_content": doc.get_first("last_msg_content") or "",
+                "first_user_msg_content": doc.get_first("first_user_msg_content") or "",
                 "derivation_type": doc.get_first("derivation_type") or "",
                 "is_sidechain": doc.get_first("is_sidechain") or "false",
             }

{claude_code_tools-1.4.1.dist-info → claude_code_tools-1.4.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-code-tools
-Version: 1.4.1
+Version: 1.4.6
 Summary: Collection of tools for working with Claude Code
 License-File: LICENSE
 Requires-Python: >=3.11
@@ -26,9 +26,8 @@ Description-Content-Type: text/markdown
 [![claude-code-tools](https://img.shields.io/github/v/release/pchalasani/claude-code-tools?filter=v*&label=claude-code-tools&color=blue)](https://pypi.org/project/claude-code-tools/)
 [![aichat-search](https://img.shields.io/github/v/release/pchalasani/claude-code-tools?filter=rust-v*&label=aichat-search&color=orange)](https://github.com/pchalasani/claude-code-tools/releases?q=rust)
 
-Collection of tools I built for productivity with
-Claude Code, Codex-CLI, and similar CLI coding agents:
-CLI commands, skills, agents, hooks, plugins.
+Productivity tools for Claude Code, Codex-CLI, and similar CLI coding agents:
+CLI commands, skills, agents, hooks, plugins. Click on a card below to navigate.
 
 
 <div align="center">

{claude_code_tools-1.4.1.dist-info → claude_code_tools-1.4.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-claude_code_tools/__init__.py,sha256=eZWXonter7xAmVmfsqiT653lgnwVI1MifxxGlirbR0A,89
+claude_code_tools/__init__.py,sha256=lJ_ty7aXHz-OaAsz_ikznt_x0M6lgCfbFZqflfmM_-U,89
 claude_code_tools/action_rpc.py,sha256=6NfWUjt22qqkDKq7ftNH2V9B8VSQycbFx_jDA0UrlJQ,17016
 claude_code_tools/aichat.py,sha256=s8pfRTmXR55J4yNElJdztXnfjFifaJbjrBtVo6NUe-s,95346
 claude_code_tools/claude_continue.py,sha256=GwgKGbTpj4ES615yCadjz0Q6wOb69T76rf_-wPnHix8,11727
@@ -10,7 +10,7 @@ claude_code_tools/env_safe.py,sha256=TSSkOjEpzBwNgbeSR-0tR1-pAW_qmbZNmn3fiAsHJ4w
 claude_code_tools/export_all.py,sha256=GOWj_5IZrrngeRUsDxbE48cOOZIxo7drZJWZh9QiuHg,9848
 claude_code_tools/export_claude_session.py,sha256=rEJLMcaCMuWbWxs1rfd0LuT6gSmjEsej6nueGrH1ujo,16256
 claude_code_tools/export_codex_session.py,sha256=V2deRcI6FMCEWYAEvvL74XXuW798B1esgTs6PH3_-7E,15650
-claude_code_tools/export_session.py,sha256=6GdZ6aVM3gPbQwWr6wg8w2TfbGAWDpCElY2_1EBSBlA,19141
+claude_code_tools/export_session.py,sha256=I2ncN3lbbrfc8M-3URQVimyM2fAbcu4BXITtCdNfL6E,21860
 claude_code_tools/find_claude_session.py,sha256=QRv6u4T5X9c9QLj-1X8-uYj3wul5YsbFI5LgUUTFMW0,70559
 claude_code_tools/find_codex_session.py,sha256=dpZVek3cJ-se4JMwzGEDkZ50_XvtK6dfP36mo8KDHnI,48177
 claude_code_tools/find_original_session.py,sha256=JlHeati0X1KkPkmz4knvdfCqRHjuJRLfRRcn3ZsuG8o,4120
@@ -19,7 +19,7 @@ claude_code_tools/find_trimmed_sessions.py,sha256=JvMSetHD4DgXzKDFaZlAndBT_dYaw_
 claude_code_tools/gdoc2md.py,sha256=J83CZJomHquOBIl15fISqtDyGsmkqqMuRY-nN7-7K1I,6346
 claude_code_tools/md2gdoc.py,sha256=sA6gU2QsWanJpAwfSC6HnSPQuSywv0xUopXSvbRUX_o,17945
 claude_code_tools/node_menu_ui.py,sha256=CQ6PxxNQ5jbLRLYESJ-klLSxSIIuLegU8s-Sj5yRl8Q,12621
-claude_code_tools/search_index.py,sha256=NHEV9W1nR5SUqAZOaBj2fS5Ld7mhhyPJ0elQ3b_ns_g,48562
+claude_code_tools/search_index.py,sha256=_ORSD2E6PF-Gjtzrnvp03KyfGueO5FA3WCzTbg7n208,50557
 claude_code_tools/session_lineage.py,sha256=BYKpAolPGLJUv97-xMXvNFMzgauUVNAsRx8Shw0X_hk,8430
 claude_code_tools/session_menu.py,sha256=5M1AlqhmCWly3r3P1u-GhxWB0_rbGKsKSlIPEgTaN9w,6095
 claude_code_tools/session_menu_cli.py,sha256=SnCdm1xyJQAC0ogZ5-PRc8SkAZVKHXYu6mtc0Lp_las,15426
@@ -36,6 +36,7 @@ docs/claude-code-chutes.md,sha256=jCnYAAHZm32NGHE0CzGGl3vpO_zlF_xdmr23YxuCjPg,80
 docs/claude-code-tmux-tutorials.md,sha256=S-9U3a1AaPEBPo3oKpWuyOfKK7yPFOIu21P_LDfGUJk,7558
 docs/dot-zshrc.md,sha256=DC2fOiGrUlIzol6N_47CW53a4BsnMEvCnhlRRVxFCTc,7160
 docs/find-claude-session.md,sha256=fACbQP0Bj5jqIpNWk0lGDOQQaji-K9Va3gUv2RA47VQ,4284
+docs/linked-in-20260102.md,sha256=wCihbQGGqS-GpQ7z9-q6UObiJBJ8_VfbUufXTvqB6hY,1159
 docs/lmsh.md,sha256=Kf5tKt1lh7eDV-B6mrMi2hsjUMZv1EGfkrsNS29HYBA,2226
 docs/local-llm-setup.md,sha256=JnMF4m1e0s8DZxfB-8S3Y20W74KBMm2RXwBjTK0o27U,7596
 docs/reddit-aichat-resume-v2.md,sha256=Rpq4E-tMDpgjWiSfb-jS50AeUxgdnOJIwDHs7rdLTZw,2980
@@ -1806,8 +1807,8 @@ node_ui/node_modules/yoga-wasm-web/dist/wrapAsm-f766f97f.js,sha256=-82_XGQhP7kkD
 node_ui/node_modules/yoga-wasm-web/dist/wrapAsm.d.ts,sha256=2l7bSIMruV8KTC2I4XKJBDQx8nsgwVR43q9rvkClpUE,4877
 node_ui/node_modules/yoga-wasm-web/dist/yoga.wasm,sha256=R_tPgdJ0kyGEzRnHXtNPkC0T8FGTAVkHiaN_cHeXfic,88658
 node_ui/node_modules/yoga-wasm-web/dist/generated/YGEnums.d.ts,sha256=kE3_7yS8iqNd5sMfXtD9B3Tq_JcJkVOQkdwxhch1pI4,8893
-claude_code_tools-1.4.1.dist-info/METADATA,sha256=5pqcjxo3yEyrSmCe4R0bylwzf8w-OWO_NmVFR6hL4jQ,42990
-claude_code_tools-1.4.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-claude_code_tools-1.4.1.dist-info/entry_points.txt,sha256=-hVowB6m8tgqV_dCyzCLbt7vthEDiBxodGMqMvD4F2M,280
-claude_code_tools-1.4.1.dist-info/licenses/LICENSE,sha256=BBQdOBLdFB3CEPmb3pqxeOThaFCIdsiLzmDANsCHhoM,1073
-claude_code_tools-1.4.1.dist-info/RECORD,,
+claude_code_tools-1.4.6.dist-info/METADATA,sha256=O2zrPX_UYG6uRdKknR5S0P9ACZJEvOlzyxaCuy89_NU,42998
+claude_code_tools-1.4.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+claude_code_tools-1.4.6.dist-info/entry_points.txt,sha256=-hVowB6m8tgqV_dCyzCLbt7vthEDiBxodGMqMvD4F2M,280
+claude_code_tools-1.4.6.dist-info/licenses/LICENSE,sha256=BBQdOBLdFB3CEPmb3pqxeOThaFCIdsiLzmDANsCHhoM,1073
+claude_code_tools-1.4.6.dist-info/RECORD,,

docs/linked-in-20260102.md

@@ -0,0 +1,32 @@
+The top pain for users of Claude Code and similar CLI agents is...
+
+Sesesion Continuity: What do you do when you've filled your context window?
+
+Compaction?  you lose valuable detail that you have to explain all over again.
+
+Here's what I do instead, to recover the precise, full context I need, to continue my work:
+
+In my Claude Code session, I type ">resume" -- This triggers a hook that copies the current session ID to the clipboard. 
+
+Then I run: 
+
+aichat resume <paste-session-id>
+
+This launches a TUI that shows a few ways to continue my work: I select 
+the "rollover" option: it creates a new session and injects the session log file 
+path into the first user message. 
+
+Then I prompt it to retrieve the exact context I need, or use a slash command /aichat:recover-context
+
+This works with Codex-CLI as well, and you can even do cross-agent handoff: start in
+Claude-Code, continue with Codex-CLI or vice versa.
+
+The aichat command is one of several productivity tools in my claude-code-tools repo:
+If you'd like to try them out, see the repo for instructions on how to install the suite of tools
+
+https://github.com/pchalasani/claude-code-tools
+
+
+
+
+