@codefilabs/tq 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codefilabs/tq",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A lightweight task queue runner that spawns Claude AI tasks as independent tmux sessions",
   "keywords": [
     "claude",

package/scripts/tq-install.sh

@@ -67,6 +67,59 @@ mkdir -p ~/.tq/queues ~/.tq/logs ~/.tq/config
 # Use $INSTALL_DIR directly — PATH may not reflect the just-created symlink yet
 "$INSTALL_DIR/tq-cron-sync" --interval 20
 
+# ---------------------------------------------------------------------------
+# Step 4: Set up Telegram long-poll daemon via launchd (if bot is configured)
+# ---------------------------------------------------------------------------
+PLIST_LABEL="com.codefi.tq-telegram"
+PLIST_PATH="$HOME/Library/LaunchAgents/${PLIST_LABEL}.plist"
+
+if [[ -f "$HOME/.tq/config/message.yaml" ]] && grep -q 'bot_token' "$HOME/.tq/config/message.yaml" 2>/dev/null; then
+  # Remove old cron-based poll entries (replaced by launchd daemon)
+  CRONTAB_CURRENT="$(crontab -l 2>/dev/null || true)"
+  if echo "$CRONTAB_CURRENT" | grep -q 'tq-telegram-poll'; then
+    echo "$CRONTAB_CURRENT" | grep -v 'tq-telegram-poll' | grep -v 'tq-telegram-watchdog' | crontab -
+    echo "  removed cron-based telegram poll (replaced by launchd daemon)"
+  fi
+
+  cat > "$PLIST_PATH" <<PLISTEOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>${PLIST_LABEL}</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>${INSTALL_DIR}/tq-telegram-poll</string>
+    <string>--daemon</string>
+  </array>
+  <key>RunAtLoad</key>
+  <true/>
+  <key>KeepAlive</key>
+  <true/>
+  <key>StandardOutPath</key>
+  <string>${HOME}/.tq/logs/tq-telegram.log</string>
+  <key>StandardErrorPath</key>
+  <string>${HOME}/.tq/logs/tq-telegram.log</string>
+  <key>EnvironmentVariables</key>
+  <dict>
+    <key>PATH</key>
+    <string>/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin</string>
+  </dict>
+</dict>
+</plist>
+PLISTEOF
+
+  # (Re)load the daemon
+  launchctl bootout "gui/$(id -u)/${PLIST_LABEL}" 2>/dev/null || true
+  launchctl bootstrap "gui/$(id -u)" "$PLIST_PATH"
+  echo "  telegram daemon started (launchd: ${PLIST_LABEL})"
+else
+  echo ""
+  echo "Telegram bot not configured yet. After running tq-setup, re-run this"
+  echo "installer to start the long-poll daemon automatically."
+fi
+
 echo ""
 echo "tq installed. Cron schedules are managed automatically."
 echo ""
@@ -84,9 +137,6 @@ echo "  tq-setup"
 echo ""
 echo "Or from Claude Code: /setup-telegram"
 echo ""
-echo "To relay Telegram messages as tq tasks, add to crontab:"
-echo "  * * * * * /opt/homebrew/bin/tq-telegram-poll >> ~/.tq/logs/tq-telegram.log 2>&1"
-echo ""
 echo "Conversation mode (interactive Telegram <-> Claude Code):"
 echo "  tq-converse start [--cwd /path/to/project]"
 echo "  Or send /converse from Telegram"

package/scripts/tq-telegram-poll

@@ -6,6 +6,13 @@ export PATH="/opt/homebrew/bin:/usr/local/bin:$PATH"
 CONFIG_FILE="$HOME/.tq/config/message.yaml"
 OFFSET_FILE="$HOME/.tq/telegram-poll-offset"
 ORCHESTRATOR_SESSION="tq-orchestrator"
+DAEMON_MODE=0
+POLL_TIMEOUT=0
+
+if [[ "${1:-}" == "--daemon" ]]; then
+  DAEMON_MODE=1
+  POLL_TIMEOUT=30
+fi
 
 # --- Read config ---
 if [[ ! -f "$CONFIG_FILE" ]]; then
@@ -13,7 +20,8 @@ if [[ ! -f "$CONFIG_FILE" ]]; then
 fi
 
 CONFIG_SCRIPT=$(mktemp /tmp/tq-poll-config-XXXXXX)
-trap 'rm -f "$CONFIG_SCRIPT"' EXIT
+PROCESS_SCRIPT=$(mktemp /tmp/tq-poll-process-XXXXXX)
+trap 'rm -f "$CONFIG_SCRIPT" "$PROCESS_SCRIPT"' EXIT
 
 cat > "$CONFIG_SCRIPT" <<'PYEOF'
 import sys, os, re, json
@@ -52,27 +60,6 @@ print(json.dumps({
 }))
 PYEOF
 
-CONFIG_JSON="$(python3 "$CONFIG_SCRIPT" "$CONFIG_FILE")"
-BOT_TOKEN="$(python3 -c "import sys,json; print(json.loads(sys.argv[1]).get('bot_token',''))" "$CONFIG_JSON")"
-USER_ID="$(python3 -c "import sys,json; print(json.loads(sys.argv[1]).get('user_id',''))" "$CONFIG_JSON")"
-
-if [[ -z "$BOT_TOKEN" || -z "$USER_ID" ]]; then
-  exit 0
-fi
-
-# --- Read offset ---
-OFFSET=0
-if [[ -f "$OFFSET_FILE" ]]; then
-  OFFSET="$(cat "$OFFSET_FILE")"
-fi
-
-# --- Fetch updates ---
-UPDATES="$(curl -s "https://api.telegram.org/bot${BOT_TOKEN}/getUpdates?offset=${OFFSET}&limit=10&timeout=0" 2>&1)"
-
-# --- Process updates (extract msg_id, chat_id, reply_to_msg_id, text) ---
-PROCESS_SCRIPT=$(mktemp /tmp/tq-poll-process-XXXXXX)
-trap 'rm -f "$CONFIG_SCRIPT" "$PROCESS_SCRIPT"' EXIT
-
 cat > "$PROCESS_SCRIPT" <<'PYEOF'
 import sys, json
 
@@ -104,7 +91,8 @@ for update in results:
         # Extract reply_to_message_id if present
         reply_to = msg.get('reply_to_message', {}).get('message_id', '')
         # Output: chat_id<TAB>message_id<TAB>reply_to<TAB>text
-        messages.append(f"{chat_id}\t{message_id}\t{reply_to}\t{text}")
+        # Use '-' placeholder for empty reply_to (bash read collapses consecutive tabs)
+        messages.append(f"{chat_id}\t{message_id}\t{reply_to or '-'}\t{text}")
 
 if new_offset is not None:
     with open(offset_file, 'w') as f:
@@ -114,12 +102,18 @@ for m in messages:
     print(m)
 PYEOF
 
-MESSAGES="$(python3 "$PROCESS_SCRIPT" "$UPDATES" "$USER_ID" "$OFFSET_FILE")"
+CONFIG_JSON="$(python3 "$CONFIG_SCRIPT" "$CONFIG_FILE")"
+BOT_TOKEN="$(python3 -c "import sys,json; print(json.loads(sys.argv[1]).get('bot_token',''))" "$CONFIG_JSON")"
+USER_ID="$(python3 -c "import sys,json; print(json.loads(sys.argv[1]).get('user_id',''))" "$CONFIG_JSON")"
+
+if [[ -z "$BOT_TOKEN" || -z "$USER_ID" ]]; then
+  exit 0
+fi
 
-# --- Check if orchestrator is running ---
-ORCHESTRATOR_ACTIVE=0
-if tmux has-session -t "$ORCHESTRATOR_SESSION" 2>/dev/null; then
-  ORCHESTRATOR_ACTIVE=1
+# --- Read offset ---
+OFFSET=0
+if [[ -f "$OFFSET_FILE" ]]; then
+  OFFSET="$(cat "$OFFSET_FILE")"
 fi
 
 # --- Handle Telegram commands ---
@@ -194,88 +188,124 @@ handle_command() {
   return 1
 }
 
-# --- Route messages ---
-mkdir -p "$HOME/.tq/workspace"
+# --- poll_once: fetch and process a single batch of updates ---
+poll_once() {
+  local UPDATES MESSAGES
+
+  UPDATES="$(curl -s --max-time $((POLL_TIMEOUT + 10)) "https://api.telegram.org/bot${BOT_TOKEN}/getUpdates?offset=${OFFSET}&limit=10&timeout=${POLL_TIMEOUT}" 2>&1)"
+
+  MESSAGES="$(python3 "$PROCESS_SCRIPT" "$UPDATES" "$USER_ID" "$OFFSET_FILE")"
 
-while IFS=$'\t' read -r CHAT_ID MSG_ID REPLY_TO MSG; do
-  if [[ -z "$MSG" ]]; then
-    continue
+  # Re-read offset (python may have updated it)
+  if [[ -f "$OFFSET_FILE" ]]; then
+    OFFSET="$(cat "$OFFSET_FILE")"
   fi
 
-  echo "[tq-telegram-poll] message: ${MSG:0:60}"
+  if [[ -z "$MESSAGES" ]]; then
+    return 0
+  fi
+
+  # Check if orchestrator is running
+  ORCHESTRATOR_ACTIVE=0
+  if tmux has-session -t "$ORCHESTRATOR_SESSION" 2>/dev/null; then
+    ORCHESTRATOR_ACTIVE=1
+  fi
 
-  # React with 👀 to acknowledge receipt
-  curl -s -X POST "https://api.telegram.org/bot${BOT_TOKEN}/setMessageReaction" \
-    -H "Content-Type: application/json" \
-    --data-raw "{\"chat_id\":${CHAT_ID},\"message_id\":${MSG_ID},\"reaction\":[{\"type\":\"emoji\",\"emoji\":\"👀\"}]}" \
-    > /dev/null 2>&1 || true
+  mkdir -p "$HOME/.tq/workspace"
 
-  # Check for Telegram commands first
-  if [[ "$MSG" == /* ]]; then
-    if handle_command "$MSG" "$CHAT_ID"; then
+  while IFS=$'\t' read -r CHAT_ID MSG_ID REPLY_TO MSG; do
+    if [[ -z "$MSG" ]]; then
       continue
     fi
-  fi
 
-  # --- Routing logic (3-tier) ---
-
-  # Store the latest message ID for reply threading
-  echo "$MSG_ID" > "$HOME/.tq/conversations/latest-msg-id" 2>/dev/null || true
-  echo "$CHAT_ID" > "$HOME/.tq/conversations/latest-chat-id" 2>/dev/null || true
-
-  ROUTED=0
-
-  # Tier 1: Telegram reply → deterministic routing via registry
-  if [[ -n "$REPLY_TO" && "$ORCHESTRATOR_ACTIVE" == "1" ]]; then
-    SLUG="$(tq-converse lookup-msg "$REPLY_TO" 2>/dev/null || true)"
-    if [[ -n "$SLUG" ]]; then
-      CHILD_SESSION="tq-conv-${SLUG}"
-      if tmux has-session -t "$CHILD_SESSION" 2>/dev/null; then
-        echo "[tq-telegram-poll] reply-routing to: $SLUG (via msg $REPLY_TO)"
-        tq-converse track-msg "$SLUG" "$MSG_ID"
-        # Store msg_id for this session's reply threading
-        echo "$MSG_ID" > "$HOME/.tq/conversations/sessions/$SLUG/reply-to-msg-id" 2>/dev/null || true
-        tq-converse route "$SLUG" "$MSG"
-        ROUTED=1
+    echo "[tq-telegram-poll] message: ${MSG:0:60}"
+
+    # React with 👀 to acknowledge receipt
+    curl -s -X POST "https://api.telegram.org/bot${BOT_TOKEN}/setMessageReaction" \
+      -H "Content-Type: application/json" \
+      --data-raw "{\"chat_id\":${CHAT_ID},\"message_id\":${MSG_ID},\"reaction\":[{\"type\":\"emoji\",\"emoji\":\"👀\"}]}" \
+      > /dev/null 2>&1 || true
+
+    # Check for Telegram commands first
+    if [[ "$MSG" == /* ]]; then
+      if handle_command "$MSG" "$CHAT_ID"; then
+        continue
       fi
     fi
-  fi
 
-  # Tier 2: Explicit #slug prefix → deterministic routing
-  if [[ "$ROUTED" == "0" && "$MSG" == \#* && "$ORCHESTRATOR_ACTIVE" == "1" ]]; then
-    # Extract slug from #slug-name prefix
-    SLUG="$(echo "$MSG" | sed 's/^#\([a-z0-9-]*\).*/\1/')"
-    ACTUAL_MSG="$(echo "$MSG" | sed 's/^#[a-z0-9-]* *//')"
-    if [[ -n "$SLUG" && -n "$ACTUAL_MSG" ]]; then
-      CHILD_SESSION="tq-conv-${SLUG}"
-      if tmux has-session -t "$CHILD_SESSION" 2>/dev/null; then
-        echo "[tq-telegram-poll] explicit routing to: $SLUG"
-        tq-converse track-msg "$SLUG" "$MSG_ID"
-        echo "$MSG_ID" > "$HOME/.tq/conversations/sessions/$SLUG/reply-to-msg-id" 2>/dev/null || true
-        tq-converse route "$SLUG" "$ACTUAL_MSG"
-        ROUTED=1
+    # --- Routing logic (3-tier) ---
+
+    # Store the latest message ID for reply threading
+    echo "$MSG_ID" > "$HOME/.tq/conversations/latest-msg-id" 2>/dev/null || true
+    echo "$CHAT_ID" > "$HOME/.tq/conversations/latest-chat-id" 2>/dev/null || true
+
+    ROUTED=0
+
+    # Normalize placeholder
+    [[ "$REPLY_TO" == "-" ]] && REPLY_TO=""
+
+    # Tier 1: Telegram reply → deterministic routing via registry
+    if [[ -n "$REPLY_TO" && "$ORCHESTRATOR_ACTIVE" == "1" ]]; then
+      SLUG="$(tq-converse lookup-msg "$REPLY_TO" 2>/dev/null || true)"
+      if [[ -n "$SLUG" ]]; then
+        CHILD_SESSION="tq-conv-${SLUG}"
+        if tmux has-session -t "$CHILD_SESSION" 2>/dev/null; then
+          echo "[tq-telegram-poll] reply-routing to: $SLUG (via msg $REPLY_TO)"
+          tq-converse track-msg "$SLUG" "$MSG_ID"
+          # Store msg_id for this session's reply threading
+          echo "$MSG_ID" > "$HOME/.tq/conversations/sessions/$SLUG/reply-to-msg-id" 2>/dev/null || true
+          tq-converse route "$SLUG" "$MSG"
+          ROUTED=1
+        fi
       fi
     fi
-  fi
 
-  # Tier 3: Orchestrator routing (smart, Claude-powered)
-  if [[ "$ROUTED" == "0" && "$ORCHESTRATOR_ACTIVE" == "1" ]]; then
-    echo "[tq-telegram-poll] routing via orchestrator"
-    # Format message with metadata for the orchestrator
-    FORMATTED_MSG="[tq-msg msg_id=${MSG_ID} chat_id=${CHAT_ID}"
-    if [[ -n "$REPLY_TO" ]]; then
-      FORMATTED_MSG="${FORMATTED_MSG} reply_to=${REPLY_TO}"
+    # Tier 2: Explicit #slug prefix → deterministic routing
+    if [[ "$ROUTED" == "0" && "$MSG" == \#* && "$ORCHESTRATOR_ACTIVE" == "1" ]]; then
+      # Extract slug from #slug-name prefix
+      SLUG="$(echo "$MSG" | sed 's/^#\([a-z0-9-]*\).*/\1/')"
+      ACTUAL_MSG="$(echo "$MSG" | sed 's/^#[a-z0-9-]* *//')"
+      if [[ -n "$SLUG" && -n "$ACTUAL_MSG" ]]; then
+        CHILD_SESSION="tq-conv-${SLUG}"
+        if tmux has-session -t "$CHILD_SESSION" 2>/dev/null; then
+          echo "[tq-telegram-poll] explicit routing to: $SLUG"
+          tq-converse track-msg "$SLUG" "$MSG_ID"
+          echo "$MSG_ID" > "$HOME/.tq/conversations/sessions/$SLUG/reply-to-msg-id" 2>/dev/null || true
+          tq-converse route "$SLUG" "$ACTUAL_MSG"
+          ROUTED=1
+        fi
+      fi
     fi
-    FORMATTED_MSG="${FORMATTED_MSG}]
+
+    # Tier 3: Orchestrator routing (smart, Claude-powered)
+    if [[ "$ROUTED" == "0" && "$ORCHESTRATOR_ACTIVE" == "1" ]]; then
+      echo "[tq-telegram-poll] routing via orchestrator"
+      # Format message with metadata for the orchestrator
+      FORMATTED_MSG="[tq-msg msg_id=${MSG_ID} chat_id=${CHAT_ID}"
+      if [[ -n "$REPLY_TO" ]]; then
+        FORMATTED_MSG="${FORMATTED_MSG} reply_to=${REPLY_TO}"
+      fi
+      FORMATTED_MSG="${FORMATTED_MSG}]
 ${MSG}"
-    tq-converse send "$FORMATTED_MSG"
-    ROUTED=1
-  fi
+      tq-converse send "$FORMATTED_MSG"
+      ROUTED=1
+    fi
 
-  # Fallback: no orchestrator — spawn one-off task (legacy behavior)
-  if [[ "$ROUTED" == "0" ]]; then
-    echo "[tq-telegram-poll] no orchestrator — spawning one-off task"
-    tq --no-chrome --prompt "$MSG"
-  fi
+    # Fallback: no orchestrator — spawn one-off task (legacy behavior)
+    if [[ "$ROUTED" == "0" ]]; then
+      echo "[tq-telegram-poll] no orchestrator — spawning one-off task"
+      tq --no-chrome --prompt "$MSG"
+    fi
 
-done <<< "$MESSAGES"
+  done <<< "$MESSAGES" || true
+}
+
+# --- Main: single run or daemon loop ---
+if [[ "$DAEMON_MODE" == "1" ]]; then
+  echo "[tq-telegram-poll] daemon started (long-poll timeout=${POLL_TIMEOUT}s)"
+  while true; do
+    poll_once || true
+  done
+else
+  poll_once
+fi