Add Codex target commands and session routing
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
"""LazyEnter - Slack을 통한 Claude Code 원격 제어 브릿지."""
|
||||
"""LazyEnter - Slack을 통한 Claude/Codex 원격 제어 브릿지."""
|
||||
|
||||
__version__ = "0.1.0"
|
||||
|
||||
@@ -25,6 +25,7 @@ class Bridge:
|
||||
self._output_thread: threading.Thread | None = None
|
||||
self._running = False
|
||||
self._channel: str = self.config.allowed_channel_id
|
||||
self._active_target: str | None = None
|
||||
self._last_sent_output: str = ""
|
||||
self._last_input_at = time.monotonic()
|
||||
self._last_output_at = time.monotonic()
|
||||
@@ -65,15 +66,30 @@ class Bridge:
|
||||
)
|
||||
return any(pattern in normalized for pattern in blocked_patterns)
|
||||
|
||||
def _handle_command(self, command: str, channel: str) -> None:
|
||||
@staticmethod
|
||||
def _display_name(target: str) -> str:
|
||||
if target == "codex":
|
||||
return "Codex"
|
||||
return "Claude"
|
||||
|
||||
def _session_name_for_target(self, target: str) -> str:
|
||||
if target == "codex":
|
||||
return self.config.codex_tmux_session_name
|
||||
return self.config.tmux_session_name
|
||||
|
||||
def _handle_command(self, action: str, target: str, channel: str) -> None:
|
||||
"""슬래시 커맨드를 처리한다."""
|
||||
if command == "start":
|
||||
self._start_session(channel)
|
||||
elif command == "stop":
|
||||
if target not in {"claude", "codex"}:
|
||||
self.slack.send_message(channel, ":warning: 지원하지 않는 대상입니다.")
|
||||
return
|
||||
|
||||
if action == "start":
|
||||
self._start_session(channel, target)
|
||||
elif action == "stop":
|
||||
self._stop_session(channel)
|
||||
|
||||
def _start_session(self, channel: str) -> None:
|
||||
"""기존 Claude tmux 세션에 연결한다."""
|
||||
def _start_session(self, channel: str, target: str) -> None:
|
||||
"""지정한 대상의 tmux 세션에 연결한다."""
|
||||
if self.pty and self.pty.is_alive:
|
||||
self.slack.send_message(
|
||||
channel, ":information_source: 이미 세션에 연결되어 있습니다."
|
||||
@@ -81,8 +97,12 @@ class Bridge:
|
||||
return
|
||||
|
||||
self._channel = channel
|
||||
self._active_target = target
|
||||
self._last_sent_output = ""
|
||||
self.pty = PtyManager(self.config.tmux_session_name)
|
||||
self.pty = PtyManager(
|
||||
self._session_name_for_target(target),
|
||||
cli_name=target,
|
||||
)
|
||||
try:
|
||||
self.pty.start()
|
||||
except RuntimeError as exc:
|
||||
@@ -98,7 +118,10 @@ class Bridge:
|
||||
self._output_thread = threading.Thread(target=self._poll_output, daemon=True)
|
||||
self._output_thread.start()
|
||||
|
||||
self.slack.send_message(channel, ":link: Claude 세션에 연결되었습니다.")
|
||||
display_name = self._display_name(target)
|
||||
self.slack.send_message(
|
||||
channel, f":link: {display_name} 세션에 연결되었습니다."
|
||||
)
|
||||
|
||||
def _stop_session(self, channel: str) -> None:
|
||||
"""브릿지 연결만 해제한다."""
|
||||
@@ -106,6 +129,7 @@ class Bridge:
|
||||
if self.pty:
|
||||
self.pty.stop()
|
||||
self.pty = None
|
||||
self._active_target = None
|
||||
self._last_sent_output = ""
|
||||
self.slack.send_message(channel, ":electric_plug: 세션 연결이 해제되었습니다.")
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@ class Config:
|
||||
|
||||
# PTY / tmux attach
|
||||
tmux_session_name: str = os.getenv("TMUX_SESSION_NAME", "claude")
|
||||
codex_tmux_session_name: str = os.getenv("CODEX_TMUX_SESSION_NAME", "codex")
|
||||
pty_read_timeout: int = int(os.getenv("PTY_READ_TIMEOUT", "5"))
|
||||
|
||||
# Buffer
|
||||
|
||||
@@ -13,8 +13,9 @@ logger = logging.getLogger(__name__)
|
||||
class PtyManager:
|
||||
"""기존 tmux 세션에 attach하고 입출력을 제어한다."""
|
||||
|
||||
def __init__(self, session_name: str = "claude") -> None:
|
||||
def __init__(self, session_name: str = "claude", cli_name: str = "claude") -> None:
|
||||
self.session_name = session_name
|
||||
self.cli_name = cli_name
|
||||
self._process: pexpect.spawn | None = None
|
||||
|
||||
@property
|
||||
@@ -32,7 +33,7 @@ class PtyManager:
|
||||
if result.returncode != 0:
|
||||
raise RuntimeError(
|
||||
"tmux 세션이 없습니다. 먼저 실행하세요: "
|
||||
f"tmux new -s {self.session_name} claude"
|
||||
f"tmux new -s {self.session_name} {self.cli_name}"
|
||||
)
|
||||
|
||||
def start(self) -> None:
|
||||
|
||||
@@ -4,6 +4,7 @@ from __future__ import annotations
|
||||
|
||||
import logging
|
||||
import time
|
||||
from collections.abc import Callable
|
||||
|
||||
from slack_bolt import App
|
||||
from slack_bolt.adapter.socket_mode import SocketModeHandler
|
||||
@@ -22,8 +23,8 @@ class SlackHandler:
|
||||
self.app = App(token=config.slack_bot_token)
|
||||
self._handler: SocketModeHandler | None = None
|
||||
self._stop_requested = False
|
||||
self._on_message_callback: callable | None = None
|
||||
self._on_command_callback: callable | None = None
|
||||
self._on_message_callback: Callable[[str, str], None] | None = None
|
||||
self._on_command_callback: Callable[[str, str, str], None] | None = None
|
||||
|
||||
self._register_listeners()
|
||||
|
||||
@@ -46,7 +47,7 @@ class SlackHandler:
|
||||
"""Slack 이벤트 리스너를 등록한다."""
|
||||
|
||||
@self.app.event("message")
|
||||
def handle_message(event: dict, say: callable) -> None:
|
||||
def handle_message(event: dict, say: Callable[..., None]) -> None:
|
||||
user_id = event.get("user", "")
|
||||
channel_id = event.get("channel", "")
|
||||
text = event.get("text", "")
|
||||
@@ -58,7 +59,7 @@ class SlackHandler:
|
||||
self._on_message_callback(text, channel_id)
|
||||
|
||||
@self.app.command("/start-claude")
|
||||
def handle_start(ack: callable, body: dict) -> None:
|
||||
def handle_start_claude(ack: Callable[..., None], body: dict) -> None:
|
||||
ack()
|
||||
user_id = body.get("user_id", "")
|
||||
channel_id = body.get("channel_id", "")
|
||||
@@ -67,10 +68,10 @@ class SlackHandler:
|
||||
return
|
||||
|
||||
if self._on_command_callback:
|
||||
self._on_command_callback("start", channel_id)
|
||||
self._on_command_callback("start", "claude", channel_id)
|
||||
|
||||
@self.app.command("/stop-claude")
|
||||
def handle_stop(ack: callable, body: dict) -> None:
|
||||
def handle_stop_claude(ack: Callable[..., None], body: dict) -> None:
|
||||
ack()
|
||||
user_id = body.get("user_id", "")
|
||||
channel_id = body.get("channel_id", "")
|
||||
@@ -79,13 +80,37 @@ class SlackHandler:
|
||||
return
|
||||
|
||||
if self._on_command_callback:
|
||||
self._on_command_callback("stop", channel_id)
|
||||
self._on_command_callback("stop", "claude", channel_id)
|
||||
|
||||
def on_message(self, callback: callable) -> None:
|
||||
@self.app.command("/start-codex")
|
||||
def handle_start_codex(ack: Callable[..., None], body: dict) -> None:
|
||||
ack()
|
||||
user_id = body.get("user_id", "")
|
||||
channel_id = body.get("channel_id", "")
|
||||
|
||||
if not self._is_authorized(user_id, channel_id):
|
||||
return
|
||||
|
||||
if self._on_command_callback:
|
||||
self._on_command_callback("start", "codex", channel_id)
|
||||
|
||||
@self.app.command("/stop-codex")
|
||||
def handle_stop_codex(ack: Callable[..., None], body: dict) -> None:
|
||||
ack()
|
||||
user_id = body.get("user_id", "")
|
||||
channel_id = body.get("channel_id", "")
|
||||
|
||||
if not self._is_authorized(user_id, channel_id):
|
||||
return
|
||||
|
||||
if self._on_command_callback:
|
||||
self._on_command_callback("stop", "codex", channel_id)
|
||||
|
||||
def on_message(self, callback: Callable[[str, str], None]) -> None:
|
||||
"""메시지 수신 콜백을 등록한다."""
|
||||
self._on_message_callback = callback
|
||||
|
||||
def on_command(self, callback: callable) -> None:
|
||||
def on_command(self, callback: Callable[[str, str, str], None]) -> None:
|
||||
"""슬래시 커맨드 콜백을 등록한다."""
|
||||
self._on_command_callback = callback
|
||||
|
||||
|
||||
Reference in New Issue
Block a user