claude-code-telegrammer 0.1.0__tar.gz → 0.2.0__tar.gz

{claude_code_telegrammer-0.1.0 → claude_code_telegrammer-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-code-telegrammer
-Version: 0.1.0
+Version: 0.2.0
 Summary: Screen-based auto-responder watchdog for Claude Code TUI
 Project-URL: Homepage, https://github.com/ywatanabe1989/claude-code-telegrammer
 Project-URL: Repository, https://github.com/ywatanabe1989/claude-code-telegrammer.git

claude_code_telegrammer-0.2.0/bin/telegrammer-relay

@@ -0,0 +1,55 @@
+#!/bin/bash
+# telegrammer-relay — Send messages to Orochi from telegrammer
+# Usage: telegrammer-relay send "message" [--channel '#telegram']
+#        telegrammer-relay health
+#        telegrammer-relay who
+#        telegrammer-relay --self-test
+
+set -uo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+source "${SCRIPT_DIR}/../lib/orochi-relay.sh"
+
+case "${1:-}" in
+    send)
+        shift
+        message="${1:?Usage: telegrammer-relay send \"message\" [--channel '#channel']}"
+        channel="${OROCHI_CHANNEL}"
+        # Parse optional --channel flag
+        if [[ "${2:-}" == "--channel" && -n "${3:-}" ]]; then
+            channel="$3"
+        fi
+        result=$(orochi_relay "$message" "$channel")
+        case "$result" in
+            rest)
+                echo "Sent via REST API"
+                ;;
+            screen)
+                echo "WARNING: REST unavailable, sent via screen fallback"
+                ;;
+            failed)
+                echo "ERROR: Both REST and screen delivery failed" >&2
+                exit 1
+                ;;
+        esac
+        ;;
+    health)
+        orochi_health
+        ;;
+    who)
+        orochi_who
+        ;;
+    --self-test)
+        orochi_self_test
+        ;;
+    *)
+        echo "Usage: telegrammer-relay {send|health|who|--self-test}"
+        echo ""
+        echo "Commands:"
+        echo "  send \"message\" [--channel '#channel']  Send message to Orochi"
+        echo "  health                                  Check Orochi connectivity"
+        echo "  who                                     List connected agents"
+        echo "  --self-test                             Run self-tests"
+        exit 1
+        ;;
+esac

{claude_code_telegrammer-0.1.0 → claude_code_telegrammer-0.2.0}/config/telegram-master.yaml

@@ -24,6 +24,11 @@ spec:
       waiting: "/speak-and-call"
   lock:
     path: ~/.claude/channels/telegram/telegram.lock
+  orochi:
+    host: 192.168.0.102
+    dashboard_port: 8559
+    channel: "#telegram"
+    master_screen: "orochi-agent:master"
   restart:
     enabled: false
     max_retries: 3

claude_code_telegrammer-0.2.0/lib/orochi-relay.sh

@@ -0,0 +1,149 @@
+#!/bin/bash
+# orochi-relay.sh — Relay messages from telegrammer to Orochi hub
+# Multi-route: tries all available routes, reports results honestly (no silent fallbacks)
+
+# Configuration (from env or defaults)
+OROCHI_HOST="${SCITEX_OROCHI_HOST:-192.168.0.102}"
+OROCHI_DASHBOARD_PORT="${SCITEX_OROCHI_DASHBOARD_PORT:-8559}"
+OROCHI_CHANNEL="${TELEGRAMMER_OROCHI_CHANNEL:-#telegram}"
+OROCHI_MASTER_SCREEN="${TELEGRAMMER_OROCHI_MASTER_SCREEN:-orochi-agent:master}"
+
+# Send message to Orochi via all available routes
+# Returns JSON-like status: "rest:OK screen:OK" / "rest:FAIL(503) screen:OK" / etc.
+# No silent fallbacks — every route's result is reported
+orochi_relay() {
+    local message="$1"
+    local channel="${2:-$OROCHI_CHANNEL}"
+    local results=""
+
+    # Route 1: REST API
+    local rest_response
+    rest_response=$(curl -s -o /dev/null -w "%{http_code}" \
+        -X POST "http://${OROCHI_HOST}:${OROCHI_DASHBOARD_PORT}/api/messages" \
+        -H "Content-Type: application/json" \
+        -d "{\"channel\": \"${channel}\", \"content\": \"${message}\", \"sender\": \"telegrammer\"}" \
+        --connect-timeout 3 --max-time 5 2>/dev/null) || rest_response="000"
+
+    if [[ "$rest_response" =~ ^2 ]]; then
+        results="rest:OK"
+    else
+        results="rest:FAIL(${rest_response})"
+    fi
+
+    # Route 2: Screen stuff
+    if screen -ls "$OROCHI_MASTER_SCREEN" 2>/dev/null | grep -q "$OROCHI_MASTER_SCREEN"; then
+        screen -S "$OROCHI_MASTER_SCREEN" -X stuff "${message}\r"
+        results="${results} screen:OK"
+    else
+        results="${results} screen:FAIL(no-session)"
+    fi
+
+    echo "$results"
+
+    # Return success if at least one route worked
+    if echo "$results" | grep -q "OK"; then
+        return 0
+    fi
+    return 1
+}
+
+# Check if Orochi is reachable
+orochi_health() {
+    local response
+    response=$(curl -s -o /dev/null -w "%{http_code}" \
+        "http://${OROCHI_HOST}:${OROCHI_DASHBOARD_PORT}/api/stats" \
+        --connect-timeout 3 --max-time 5 2>/dev/null) || response="000"
+
+    if [[ "$response" =~ ^2 ]]; then
+        echo "healthy"
+        return 0
+    else
+        echo "unreachable (HTTP ${response})"
+        return 1
+    fi
+}
+
+# Get connected agents from Orochi
+orochi_who() {
+    curl -s "http://${OROCHI_HOST}:${OROCHI_DASHBOARD_PORT}/api/agents" \
+        --connect-timeout 3 --max-time 5 2>/dev/null || echo "[]"
+}
+
+# Self-test with mocked curl
+orochi_self_test() {
+    local pass=0
+    local fail=0
+
+    echo "=== orochi-relay self-test ==="
+
+    # Test 1: REST relay (mocked 200, screen unavailable)
+    echo -n "Test 1: REST success... "
+    curl() { echo "200"; }
+    export -f curl
+    local result
+    result=$(orochi_relay "test message" "#test")
+    local rc=$?
+    unset -f curl
+    if echo "$result" | grep -q "rest:OK" && [[ "$rc" -eq 0 ]]; then
+        echo "PASS"
+        ((pass++))
+    else
+        echo "FAIL (got: $result rc=$rc)"
+        ((fail++))
+    fi
+
+    # Test 2: Both unavailable
+    echo -n "Test 2: Both unavailable... "
+    curl() { echo "000"; return 1; }
+    export -f curl
+    screen() { return 1; }
+    export -f screen
+    result=$(orochi_relay "test message" "#test")
+    rc=$?
+    unset -f curl
+    unset -f screen
+    if echo "$result" | grep -q "rest:FAIL" && [[ "$rc" -eq 1 ]]; then
+        echo "PASS"
+        ((pass++))
+    else
+        echo "FAIL (got: $result rc=$rc)"
+        ((fail++))
+    fi
+
+    # Test 3: orochi_health healthy case
+    echo -n "Test 3: Health check (mocked 200)... "
+    curl() { echo "200"; }
+    export -f curl
+    result=$(orochi_health)
+    unset -f curl
+    if [[ "$result" == "healthy" ]]; then
+        echo "PASS"
+        ((pass++))
+    else
+        echo "FAIL (got: $result, expected: healthy)"
+        ((fail++))
+    fi
+
+    # Test 4: orochi_health unreachable case
+    echo -n "Test 4: Health check (mocked 503)... "
+    curl() { echo "503"; }
+    export -f curl
+    result=$(orochi_health)
+    local rc=$?
+    unset -f curl
+    if [[ "$result" == "unreachable (HTTP 503)" && "$rc" -eq 1 ]]; then
+        echo "PASS"
+        ((pass++))
+    else
+        echo "FAIL (got: '$result' rc=$rc)"
+        ((fail++))
+    fi
+
+    echo "=== Results: ${pass} passed, ${fail} failed ==="
+    [[ "$fail" -eq 0 ]] && return 0 || return 1
+}
+
+# Run self-test if invoked directly (not sourced) with --self-test
+if [[ "${BASH_SOURCE[0]}" == "${0}" && "${1:-}" == "--self-test" ]]; then
+    orochi_self_test
+fi

{claude_code_telegrammer-0.1.0 → claude_code_telegrammer-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "claude-code-telegrammer"
-version = "0.1.0"
+version = "0.2.0"
 description = "Screen-based auto-responder watchdog for Claude Code TUI"
 readme = "README.md"
 license = "AGPL-3.0"
@@ -34,6 +34,7 @@ telegrammer = "claude_code_telegrammer.cli:telegrammer"
 telegrammer-watchdog = "claude_code_telegrammer.cli:telegrammer_watchdog"
 telegrammer-guard = "claude_code_telegrammer.cli:telegrammer_guard"
 telegrammer-init = "claude_code_telegrammer.cli:telegrammer_init"
+telegrammer-relay = "claude_code_telegrammer.cli:telegrammer_relay"
 
 [project.urls]
 Homepage = "https://github.com/ywatanabe1989/claude-code-telegrammer"

{claude_code_telegrammer-0.1.0 → claude_code_telegrammer-0.2.0}/src/claude_code_telegrammer/__init__.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import pathlib
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"
 
 # Package directory (works for both editable and regular installs)
 _PKG_DIR = pathlib.Path(__file__).resolve().parent

{claude_code_telegrammer-0.1.0 → claude_code_telegrammer-0.2.0}/src/claude_code_telegrammer/cli.py

@@ -28,3 +28,7 @@ def telegrammer_guard() -> None:
 
 def telegrammer_init() -> None:
     _exec_script("telegrammer-init")
+
+
+def telegrammer_relay() -> None:
+    _exec_script("telegrammer-relay")