hcom 0.1.3__tar.gz → 0.1.5__tar.gz

{hcom-0.1.3/src/hcom.egg-info → hcom-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcom
-Version: 0.1.3
+Version: 0.1.5
 Summary: Lightweight CLI tool for real-time messaging between Claude Code subagents using hooks
 Author-email: aannoo <your@email.com>
 License: MIT
@@ -149,12 +149,12 @@ HCOM_INSTANCE_HINTS="always update chat with progress" hcom open nice-subagent-b
 
 | Setting | Default | Environment Variable | Description |
 |---------|---------|---------------------|-------------|
-| `wait_timeout` | 600 | `HCOM_WAIT_TIMEOUT` | How long instances wait for messages (seconds) |
+| `wait_timeout` | 1800 | `HCOM_WAIT_TIMEOUT` | How long instances wait for messages (seconds) |
 | `max_message_size` | 4096 | `HCOM_MAX_MESSAGE_SIZE` | Maximum message length |
-| `max_messages_per_delivery` | 20 | `HCOM_MAX_MESSAGES_PER_DELIVERY` | Messages delivered per batch |
+| `max_messages_per_delivery` | 50 | `HCOM_MAX_MESSAGES_PER_DELIVERY` | Messages delivered per batch |
 | `sender_name` | "bigboss" | `HCOM_SENDER_NAME` | Your name in chat |
 | `sender_emoji` | "🐳" | `HCOM_SENDER_EMOJI` | Your emoji icon |
-| `initial_prompt` | "Say hi" | `HCOM_INITIAL_PROMPT` | What new instances are told to do |
+| `initial_prompt` | "Say hi in chat" | `HCOM_INITIAL_PROMPT` | What new instances are told to do |
 | `first_use_text` | "Essential, concise messages only" | `HCOM_FIRST_USE_TEXT` | Welcome message for instances |
 | `terminal_mode` | "new_window" | `HCOM_TERMINAL_MODE` | How to launch terminals ("new_window", "same_terminal", "show_commands") |
 | `terminal_command` | null | `HCOM_TERMINAL_COMMAND` | Custom terminal command (see Terminal Options) |
@@ -202,7 +202,7 @@ hcom adds hooks to your project directory's `.claude/settings.local.json`:
 - **Identity**: Each instance gets a unique name based on conversation UUID (e.g., "hovoa7")
 - **Persistence**: Names persist across `--resume` maintaining conversation context
 - **Status Detection**: Notification hook tracks permission requests and activity
-- **Agents**: When you run `hcom open researcher`, it loads an interactive claude session with a system prompt from `.claude/agents/researcher.md` (local) or `~/.claude/agents/researcher.md` (global)
+- **Agents**: When you run `hcom open researcher`, it loads an interactive claude session with a system prompt from `.claude/agents/researcher.md` (local) or `~/.claude/agents/researcher.md` (global). Agents can specify `model:` and `tools:` in YAML frontmatter
 
 ### Architecture
 - **Single conversation** - All instances share one global conversation

{hcom-0.1.3 → hcom-0.1.5}/README.md

@@ -121,12 +121,12 @@ HCOM_INSTANCE_HINTS="always update chat with progress" hcom open nice-subagent-b
 
 | Setting | Default | Environment Variable | Description |
 |---------|---------|---------------------|-------------|
-| `wait_timeout` | 600 | `HCOM_WAIT_TIMEOUT` | How long instances wait for messages (seconds) |
+| `wait_timeout` | 1800 | `HCOM_WAIT_TIMEOUT` | How long instances wait for messages (seconds) |
 | `max_message_size` | 4096 | `HCOM_MAX_MESSAGE_SIZE` | Maximum message length |
-| `max_messages_per_delivery` | 20 | `HCOM_MAX_MESSAGES_PER_DELIVERY` | Messages delivered per batch |
+| `max_messages_per_delivery` | 50 | `HCOM_MAX_MESSAGES_PER_DELIVERY` | Messages delivered per batch |
 | `sender_name` | "bigboss" | `HCOM_SENDER_NAME` | Your name in chat |
 | `sender_emoji` | "🐳" | `HCOM_SENDER_EMOJI` | Your emoji icon |
-| `initial_prompt` | "Say hi" | `HCOM_INITIAL_PROMPT` | What new instances are told to do |
+| `initial_prompt` | "Say hi in chat" | `HCOM_INITIAL_PROMPT` | What new instances are told to do |
 | `first_use_text` | "Essential, concise messages only" | `HCOM_FIRST_USE_TEXT` | Welcome message for instances |
 | `terminal_mode` | "new_window" | `HCOM_TERMINAL_MODE` | How to launch terminals ("new_window", "same_terminal", "show_commands") |
 | `terminal_command` | null | `HCOM_TERMINAL_COMMAND` | Custom terminal command (see Terminal Options) |
@@ -174,7 +174,7 @@ hcom adds hooks to your project directory's `.claude/settings.local.json`:
 - **Identity**: Each instance gets a unique name based on conversation UUID (e.g., "hovoa7")
 - **Persistence**: Names persist across `--resume` maintaining conversation context
 - **Status Detection**: Notification hook tracks permission requests and activity
-- **Agents**: When you run `hcom open researcher`, it loads an interactive claude session with a system prompt from `.claude/agents/researcher.md` (local) or `~/.claude/agents/researcher.md` (global)
+- **Agents**: When you run `hcom open researcher`, it loads an interactive claude session with a system prompt from `.claude/agents/researcher.md` (local) or `~/.claude/agents/researcher.md` (global). Agents can specify `model:` and `tools:` in YAML frontmatter
 
 ### Architecture
 - **Single conversation** - All instances share one global conversation

{hcom-0.1.3 → hcom-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hcom"
-version = "0.1.3"
+version = "0.1.5"
 description = "Lightweight CLI tool for real-time messaging between Claude Code subagents using hooks"
 readme = "README.md"
 requires-python = ">=3.6"

{hcom-0.1.3 → hcom-0.1.5}/src/hcom/__init__.py

@@ -1,3 +1,3 @@
 """Claude Hook Comms - Real-time messaging between Claude Code agents."""
 
-__version__ = "0.1.3"
+__version__ = "0.1.5"

{hcom-0.1.3 → hcom-0.1.5}/src/hcom/__main__.py

@@ -25,7 +25,6 @@ IS_WINDOWS = sys.platform == 'win32'
 HCOM_ACTIVE_ENV = 'HCOM_ACTIVE'
 HCOM_ACTIVE_VALUE = '1'
 
-
 EXIT_SUCCESS = 0
 EXIT_ERROR = 1
 EXIT_BLOCK = 2
@@ -68,9 +67,9 @@ DEFAULT_CONFIG = {
     "sender_name": "bigboss",
     "sender_emoji": "🐳",
     "cli_hints": "",
-    "wait_timeout": 600,
+    "wait_timeout": 1800,
     "max_message_size": 4096,
-    "max_messages_per_delivery": 20,
+    "max_messages_per_delivery": 50,
     "first_use_text": "Essential, concise messages only, say hi in hcom chat now",
     "instance_hints": "",
     "env_overrides": {}
@@ -170,6 +169,29 @@ def get_config_value(key, default=None):
     config = get_cached_config()
     return config.get(key, default)
 
+def get_hook_command():
+    """Determine the best hook command approach based on paths"""
+    python_path = sys.executable
+    script_path = os.path.abspath(__file__)
+    
+    # Characters that cause issues in shell expansion
+    problematic_chars = [' ', '`', '"', "'", '\\', '\n', ';', '&', '|', '(', ')', ':', 
+                        '$', '*', '?', '[', ']', '{', '}', '!', '~', '<', '>']
+    
+    has_problematic_chars = any(char in python_path or char in script_path 
+                               for char in problematic_chars)
+    
+    if has_problematic_chars:
+        # Use direct paths with proper escaping
+        # Escape backslashes first, then quotes
+        escaped_python = python_path.replace('\\', '\\\\').replace('"', '\\"')
+        escaped_script = script_path.replace('\\', '\\\\').replace('"', '\\"')
+        return f'"{escaped_python}" "{escaped_script}"', {}
+    else:
+        # Use single clean env var
+        env_vars = {'HCOM': f'{python_path} {script_path}'}
+        return '$HCOM', env_vars
+
 def build_claude_env():
     """Build environment variables for Claude instances"""
     env = {HCOM_ACTIVE_ENV: HCOM_ACTIVE_VALUE}
@@ -184,6 +206,10 @@ def build_claude_env():
     
     env.update(config.get('env_overrides', {}))
     
+    # Add hook-specific env vars if using that approach
+    _, hook_env_vars = get_hook_command()
+    env.update(hook_env_vars)
+    
     return env
 
 # ==================== Message System ====================
@@ -309,6 +335,35 @@ def parse_open_args(args):
     
     return instances, prefix, claude_args
 
+def extract_agent_config(content):
+    """Extract configuration from agent YAML frontmatter"""
+    if not content.startswith('---'):
+        return {}
+    
+    # Find YAML section between --- markers
+    yaml_end = content.find('\n---', 3)
+    if yaml_end < 0:
+        return {}  # No closing marker
+    
+    yaml_section = content[3:yaml_end]
+    config = {}
+    
+    # Extract model field
+    model_match = re.search(r'^model:\s*(.+)$', yaml_section, re.MULTILINE)
+    if model_match:
+        value = model_match.group(1).strip()
+        if value and value.lower() != 'inherit':
+            config['model'] = value
+    
+    # Extract tools field
+    tools_match = re.search(r'^tools:\s*(.+)$', yaml_section, re.MULTILINE)
+    if tools_match:
+        value = tools_match.group(1).strip()
+        if value:
+            config['tools'] = value.replace(', ', ',')
+    
+    return config
+
 def resolve_agent(name):
     """Resolve agent file by name
     
@@ -316,16 +371,17 @@ def resolve_agent(name):
     1. .claude/agents/{name}.md (local)
     2. ~/.claude/agents/{name}.md (global)
     
-    Returns the content after stripping YAML frontmatter
+    Returns tuple: (content after stripping YAML frontmatter, config dict)
     """
     for base_path in [Path('.'), Path.home()]:
         agent_path = base_path / '.claude/agents' / f'{name}.md'
         if agent_path.exists():
             content = agent_path.read_text()
+            config = extract_agent_config(content)
             stripped = strip_frontmatter(content)
             if not stripped.strip():
                 raise ValueError(format_error(f"Agent '{name}' has empty content", 'Check the agent file contains a system prompt'))
-            return stripped
+            return stripped, config
     
     raise FileNotFoundError(format_error(f'Agent not found: {name}', 'Check available agents or create the agent file'))
 
@@ -363,6 +419,22 @@ def _remove_hcom_hooks_from_settings(settings):
     if 'hooks' not in settings:
         return
     
+    import re
+    
+    # Patterns to match any hcom hook command
+    # - $HCOM post/stop/notify
+    # - hcom post/stop/notify  
+    # - /path/to/hcom.py post/stop/notify
+    # - "/path with spaces/python" "/path with spaces/hcom.py" post/stop/notify
+    # - '/path/to/python' '/path/to/hcom.py' post/stop/notify
+    hcom_patterns = [
+        r'\$HCOM\s+(post|stop|notify)\b',           # Environment variable
+        r'\bhcom\s+(post|stop|notify)\b',           # Direct hcom command
+        r'hcom\.py["\']?\s+(post|stop|notify)\b',   # hcom.py with optional quote
+        r'["\'][^"\']*hcom\.py["\']?\s+(post|stop|notify)\b',  # Quoted path with hcom.py
+    ]
+    compiled_patterns = [re.compile(pattern) for pattern in hcom_patterns]
+    
     for event in ['PostToolUse', 'Stop', 'Notification']:
         if event not in settings['hooks']:
             continue
@@ -370,11 +442,12 @@ def _remove_hcom_hooks_from_settings(settings):
         settings['hooks'][event] = [
             matcher for matcher in settings['hooks'][event]
             if not any(
-                any(pattern in hook.get('command', '') 
-                    for pattern in ['hcom post', 'hcom stop', 'hcom notify',
-                                   'hcom.py post', 'hcom.py stop', 'hcom.py notify',
-                                   'hcom.py" post', 'hcom.py" stop', 'hcom.py" notify'])
-                for hook in matcher.get('hooks', []))
+                any(
+                    pattern.search(hook.get('command', ''))
+                    for pattern in compiled_patterns
+                )
+                for hook in matcher.get('hooks', [])
+            )
         ]
         
         if not settings['hooks'][event]:
@@ -409,7 +482,7 @@ def format_warning(message):
     """Format warning message consistently"""
     return f"Warning: {message}"
 
-def build_claude_command(agent_content=None, claude_args=None, initial_prompt="Say hi in chat"):
+def build_claude_command(agent_content=None, claude_args=None, initial_prompt="Say hi in chat", model=None, tools=None):
     """Build Claude command with proper argument handling
     
     Returns tuple: (command_string, temp_file_path_or_none)
@@ -418,6 +491,27 @@ def build_claude_command(agent_content=None, claude_args=None, initial_prompt="S
     cmd_parts = ['claude']
     temp_file_path = None
     
+    # Add model if specified and not already in claude_args
+    if model:
+        # Check if model already specified in args (more concise)
+        has_model = claude_args and any(
+            arg in ['--model', '-m'] or 
+            arg.startswith(('--model=', '-m=')) 
+            for arg in claude_args
+        )
+        if not has_model:
+            cmd_parts.extend(['--model', model])
+    
+    # Add allowed tools if specified and not already in claude_args
+    if tools:
+        has_tools = claude_args and any(
+            arg in ['--allowedTools', '--allowed-tools'] or
+            arg.startswith(('--allowedTools=', '--allowed-tools='))
+            for arg in claude_args
+        )
+        if not has_tools:
+            cmd_parts.extend(['--allowedTools', tools])
+    
     if claude_args:
         for arg in claude_args:
             cmd_parts.append(shlex.quote(arg))
@@ -619,20 +713,8 @@ def setup_hooks():
     if hcom_send_permission not in settings['permissions']['allow']:
         settings['permissions']['allow'].append(hcom_send_permission)
     
-    # Detect hcom executable path
-    try:
-        import subprocess
-        # First, try regular hcom command
-        subprocess.run(['hcom', 'help'], capture_output=True, check=True, timeout=5)
-        hcom_cmd = 'hcom'
-    except (subprocess.CalledProcessError, FileNotFoundError, subprocess.TimeoutExpired):
-        try:
-            # Try uvx hcom
-            subprocess.run(['uvx', 'hcom', 'help'], capture_output=True, check=True, timeout=10)
-            hcom_cmd = 'uvx hcom'
-        except (subprocess.CalledProcessError, FileNotFoundError, subprocess.TimeoutExpired):
-            # Last resort: use full path
-            hcom_cmd = f'"{sys.executable}" "{os.path.abspath(__file__)}"'
+    # Get the hook command approach (env vars or direct paths based on spaces)
+    hook_cmd_base, _ = get_hook_command()
     
     # Add PostToolUse hook
     if 'PostToolUse' not in settings['hooks']:
@@ -642,7 +724,7 @@ def setup_hooks():
         'matcher': '.*',
         'hooks': [{
             'type': 'command',
-            'command': f'{hcom_cmd} post'
+            'command': f'{hook_cmd_base} post'
         }]
     })
     
@@ -650,13 +732,13 @@ def setup_hooks():
     if 'Stop' not in settings['hooks']:
         settings['hooks']['Stop'] = []
     
-    wait_timeout = get_config_value('wait_timeout', 600)
+    wait_timeout = get_config_value('wait_timeout', 1800)
     
     settings['hooks']['Stop'].append({
         'matcher': '',
         'hooks': [{
             'type': 'command',
-            'command': f'{hcom_cmd} stop',
+            'command': f'{hook_cmd_base} stop',
             'timeout': wait_timeout
         }]
     })
@@ -669,7 +751,7 @@ def setup_hooks():
         'matcher': '',
         'hooks': [{
             'type': 'command',
-            'command': f'{hcom_cmd} notify'
+            'command': f'{hook_cmd_base} notify'
         }]
     })
     
@@ -687,16 +769,36 @@ def get_archive_timestamp():
     return datetime.now().strftime("%Y%m%d-%H%M%S")
 
 def get_conversation_uuid(transcript_path):
-    """Get conversation UUID from transcript"""
+    """Get conversation UUID from transcript
+    
+    For resumed sessions, the first line may be a summary with a different leafUuid.
+    We need to find the first user entry which contains the stable conversation UUID.
+    """
     try:
         if not transcript_path or not os.path.exists(transcript_path):
             return None
         
+        # First, try to find the UUID from the first user entry
+        with open(transcript_path, 'r') as f:
+            for line in f:
+                line = line.strip()
+                if not line:
+                    continue
+                try:
+                    entry = json.loads(line)
+                    # Look for first user entry with a UUID - this is the stable identifier
+                    if entry.get('type') == 'user' and entry.get('uuid'):
+                        return entry.get('uuid')
+                except json.JSONDecodeError:
+                    continue
+        
+        # Fallback: If no user entry found, try the first line (original behavior)
         with open(transcript_path, 'r') as f:
             first_line = f.readline().strip()
             if first_line:
                 entry = json.loads(first_line)
-                return entry.get('uuid')
+                # Try both 'uuid' and 'leafUuid' fields
+                return entry.get('uuid') or entry.get('leafUuid')
     except Exception:
         pass
     return None
@@ -846,7 +948,7 @@ def get_transcript_status(transcript_path):
 def get_instance_status(pos_data):
     """Get current status of instance"""
     now = int(time.time())
-    wait_timeout = get_config_value('wait_timeout', 600)
+    wait_timeout = get_config_value('wait_timeout', 1800)
     
     last_permission = pos_data.get("last_permission_request", 0)
     last_stop = pos_data.get("last_stop", 0)
@@ -1088,7 +1190,8 @@ def migrate_instance_name_if_needed(instance_name, conversation_uuid, transcript
     if instance_name.endswith("claude") and conversation_uuid:
         new_instance = get_display_name(transcript_path)
         if new_instance != instance_name and not new_instance.endswith("claude"):
-            # Migrate from fallback name to UUID-based name
+            # Always return the new name if we can generate it
+            # Migration of data only happens if old name exists
             pos_file = get_hcom_dir() / "hcom.json"
             positions = load_positions(pos_file)
             if instance_name in positions:
@@ -1097,8 +1200,7 @@ def migrate_instance_name_if_needed(instance_name, conversation_uuid, transcript
                 # Update the conversation UUID in the migrated data
                 positions[new_instance]["conversation_uuid"] = conversation_uuid
                 atomic_write(pos_file, json.dumps(positions, indent=2))
-                # Instance name migrated
-                return new_instance
+            return new_instance
     return instance_name
 
 def update_instance_position(instance_name, update_fields):
@@ -1251,11 +1353,16 @@ def cmd_open(*args):
             else:
                 # Agent instance
                 try:
-                    agent_content = resolve_agent(instance_type)
+                    agent_content, agent_config = resolve_agent(instance_type)
+                    # Use agent's model and tools if specified and not overridden in claude_args
+                    agent_model = agent_config.get('model')
+                    agent_tools = agent_config.get('tools')
                     claude_cmd, temp_file = build_claude_command(
                         agent_content=agent_content,
                         claude_args=claude_args,
-                        initial_prompt=initial_prompt
+                        initial_prompt=initial_prompt,
+                        model=agent_model,
+                        tools=agent_tools
                     )
                     if temp_file:
                         temp_files_to_cleanup.append(temp_file)
@@ -1377,7 +1484,7 @@ def cmd_watch(*args):
     
     # Interactive dashboard mode
     last_pos = 0
-    status_suffix = f"{DIM} [⏎] chat...{RESET}"
+    status_suffix = f"{DIM} [⏎]...{RESET}"
 
     all_messages = show_main_screen_header()
     
@@ -1575,6 +1682,7 @@ def cleanup_directory_hooks(directory):
     except Exception as e:
         return 1, format_error(f"Cannot modify settings.local.json: {e}")
 
+
 def cmd_cleanup(*args):
     """Remove hcom hooks from current directory or all directories"""
     if args and args[0] == '--all':
@@ -1683,6 +1791,21 @@ def cmd_send(message):
 
 # ==================== Hook Functions ====================
 
+def format_hook_messages(messages, instance_name):
+    """Format messages for hook feedback"""
+    if len(messages) == 1:
+        msg = messages[0]
+        reason = f"{msg['from']} → {instance_name}: {msg['message']}"
+    else:
+        parts = [f"{msg['from']}: {msg['message']}" for msg in messages]
+        reason = f"{len(messages)} messages → {instance_name}: " + " | ".join(parts)
+    
+    instance_hints = get_config_value('instance_hints', '')
+    if instance_hints:
+        reason = f"{reason} {instance_hints}"
+    
+    return reason
+
 def handle_hook_post():
     """Handle PostToolUse hook"""
     # Check if active
@@ -1699,12 +1822,9 @@ def handle_hook_post():
         # Migrate instance name if needed (from fallback to UUID-based)
         instance_name = migrate_instance_name_if_needed(instance_name, conversation_uuid, transcript_path)
         
-        # Initialize instance if needed
-        if not instance_name.endswith("claude") or conversation_uuid:
-            initialize_instance_in_position_file(instance_name, conversation_uuid)
-            
-            # Update instance position
-            update_instance_position(instance_name, {
+        initialize_instance_in_position_file(instance_name, conversation_uuid)
+        
+        update_instance_position(instance_name, {
                 'last_tool': int(time.time()),
                 'last_tool_name': hook_data.get('tool_name', 'unknown'),
                 'session_id': hook_data.get('session_id', ''),
@@ -1713,7 +1833,8 @@ def handle_hook_post():
                 'directory': str(Path.cwd())
             })
         
-        # Check for HCOM_SEND in Bash commands
+        # Check for HCOM_SEND in Bash commands  
+        sent_reason = None
         if hook_data.get('tool_name') == 'Bash':
             command = hook_data.get('tool_input', {}).get('command', '')
             if 'HCOM_SEND:' in command:
@@ -1740,8 +1861,7 @@ def handle_hook_post():
                     elif message and message[-1] in '"\'':
                         message = message[:-1]
                     
-                    if message and not instance_name.endswith("claude"):
-                        # Validate message
+                    if message:
                         error = validate_message(message)
                         if error:
                             output = {"reason": f"❌ {error}"}
@@ -1749,23 +1869,27 @@ def handle_hook_post():
                             sys.exit(EXIT_BLOCK)
                         
                         send_message(instance_name, message)
-        
-        # Check for pending messages to deliver
-        if not instance_name.endswith("claude"):
-            messages = get_new_messages(instance_name)
-            
-            if messages:
-                # Deliver messages via exit code 2
-                max_messages = get_config_value('max_messages_per_delivery', 20)
-                messages_to_show = messages[:max_messages]
-                
-                output = {
-                    "decision": HOOK_DECISION_BLOCK,
-                    "reason": f"New messages from hcom:\n" + 
-                             "\n".join([f"{m['from']}: {m['message']}" for m in messages_to_show])
-                }
-                print(json.dumps(output, ensure_ascii=False), file=sys.stderr)
-                sys.exit(EXIT_BLOCK)
+                        sent_reason = "✓ Sent"
+        
+        messages = get_new_messages(instance_name)
+        
+        if messages and sent_reason:
+            # Both sent and received
+            reason = f"{sent_reason} | {format_hook_messages(messages, instance_name)}"
+            output = {"decision": HOOK_DECISION_BLOCK, "reason": reason}
+            print(json.dumps(output, ensure_ascii=False), file=sys.stderr)
+            sys.exit(EXIT_BLOCK)
+        elif messages:
+            # Just received
+            reason = format_hook_messages(messages, instance_name)
+            output = {"decision": HOOK_DECISION_BLOCK, "reason": reason}
+            print(json.dumps(output, ensure_ascii=False), file=sys.stderr)
+            sys.exit(EXIT_BLOCK)
+        elif sent_reason:
+            # Just sent
+            output = {"reason": sent_reason}
+            print(json.dumps(output, ensure_ascii=False), file=sys.stderr)
+            sys.exit(EXIT_BLOCK)
     
     except Exception:
         pass
@@ -1785,9 +1909,6 @@ def handle_hook_stop():
         instance_name = get_display_name(transcript_path) if transcript_path else f"{Path.cwd().name[:2].lower()}claude"
         conversation_uuid = get_conversation_uuid(transcript_path)
         
-        if instance_name.endswith("claude") and not conversation_uuid:
-            sys.exit(EXIT_SUCCESS)
-        
         # Initialize instance if needed
         initialize_instance_in_position_file(instance_name, conversation_uuid)
         
@@ -1806,7 +1927,7 @@ def handle_hook_stop():
         check_and_show_first_use_help(instance_name)
         
         # Simple polling loop with parent check
-        timeout = get_config_value('wait_timeout', 600)
+        timeout = get_config_value('wait_timeout', 1800)
         start_time = time.time()
         
         while time.time() - start_time < timeout:
@@ -1819,14 +1940,11 @@ def handle_hook_stop():
             
             if messages:
                 # Deliver messages
-                max_messages = get_config_value('max_messages_per_delivery', 20)
+                max_messages = get_config_value('max_messages_per_delivery', 50)
                 messages_to_show = messages[:max_messages]
                 
-                output = {
-                    "decision": HOOK_DECISION_BLOCK,
-                    "reason": f"New messages from hcom:\n" + 
-                             "\n".join([f"{m['from']}: {m['message']}" for m in messages_to_show])
-                }
+                reason = format_hook_messages(messages_to_show, instance_name)
+                output = {"decision": HOOK_DECISION_BLOCK, "reason": reason}
                 print(json.dumps(output, ensure_ascii=False), file=sys.stderr)
                 sys.exit(EXIT_BLOCK)
             
@@ -1855,9 +1973,6 @@ def handle_hook_notification():
         instance_name = get_display_name(transcript_path) if transcript_path else f"{Path.cwd().name[:2].lower()}claude"
         conversation_uuid = get_conversation_uuid(transcript_path)
         
-        if instance_name.endswith("claude") and not conversation_uuid:
-            sys.exit(EXIT_SUCCESS)
-        
         # Initialize instance if needed
         initialize_instance_in_position_file(instance_name, conversation_uuid)
         
@@ -1918,6 +2033,7 @@ def main(argv=None):
         handle_hook_notification()
         return 0
     
+    
     # Unknown command
     else:
         print(format_error(f"Unknown command: {cmd}", "Run 'hcom help' for available commands"), file=sys.stderr)

{hcom-0.1.3 → hcom-0.1.5/src/hcom.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcom
-Version: 0.1.3
+Version: 0.1.5
 Summary: Lightweight CLI tool for real-time messaging between Claude Code subagents using hooks
 Author-email: aannoo <your@email.com>
 License: MIT
@@ -149,12 +149,12 @@ HCOM_INSTANCE_HINTS="always update chat with progress" hcom open nice-subagent-b
 
 | Setting | Default | Environment Variable | Description |
 |---------|---------|---------------------|-------------|
-| `wait_timeout` | 600 | `HCOM_WAIT_TIMEOUT` | How long instances wait for messages (seconds) |
+| `wait_timeout` | 1800 | `HCOM_WAIT_TIMEOUT` | How long instances wait for messages (seconds) |
 | `max_message_size` | 4096 | `HCOM_MAX_MESSAGE_SIZE` | Maximum message length |
-| `max_messages_per_delivery` | 20 | `HCOM_MAX_MESSAGES_PER_DELIVERY` | Messages delivered per batch |
+| `max_messages_per_delivery` | 50 | `HCOM_MAX_MESSAGES_PER_DELIVERY` | Messages delivered per batch |
 | `sender_name` | "bigboss" | `HCOM_SENDER_NAME` | Your name in chat |
 | `sender_emoji` | "🐳" | `HCOM_SENDER_EMOJI` | Your emoji icon |
-| `initial_prompt` | "Say hi" | `HCOM_INITIAL_PROMPT` | What new instances are told to do |
+| `initial_prompt` | "Say hi in chat" | `HCOM_INITIAL_PROMPT` | What new instances are told to do |
 | `first_use_text` | "Essential, concise messages only" | `HCOM_FIRST_USE_TEXT` | Welcome message for instances |
 | `terminal_mode` | "new_window" | `HCOM_TERMINAL_MODE` | How to launch terminals ("new_window", "same_terminal", "show_commands") |
 | `terminal_command` | null | `HCOM_TERMINAL_COMMAND` | Custom terminal command (see Terminal Options) |
@@ -202,7 +202,7 @@ hcom adds hooks to your project directory's `.claude/settings.local.json`:
 - **Identity**: Each instance gets a unique name based on conversation UUID (e.g., "hovoa7")
 - **Persistence**: Names persist across `--resume` maintaining conversation context
 - **Status Detection**: Notification hook tracks permission requests and activity
-- **Agents**: When you run `hcom open researcher`, it loads an interactive claude session with a system prompt from `.claude/agents/researcher.md` (local) or `~/.claude/agents/researcher.md` (global)
+- **Agents**: When you run `hcom open researcher`, it loads an interactive claude session with a system prompt from `.claude/agents/researcher.md` (local) or `~/.claude/agents/researcher.md` (global). Agents can specify `model:` and `tools:` in YAML frontmatter
 
 ### Architecture
 - **Single conversation** - All instances share one global conversation