Enforce no-work-on-main rule for agents

Document Gitea workflow for future sessions
Merge pull request 'Attach bridge to existing tmux Claude session' (#4 ) from feat/tmux-attach-bridge into main
2026-02-17 04:18:24 +09:00 · 2026-02-17 04:16:34 +09:00 · 2026-02-17 04:06:53 +09:00 · 2026-02-17 04:04:28 +09:00 · 2026-02-17 03:53:08 +09:00 · 2026-02-17 03:52:12 +09:00
10 changed files with 228 additions and 44 deletions
--- a/.env.example
+++ b/.env.example
@@ -6,8 +6,8 @@ SLACK_APP_TOKEN=xapp-your-app-token
 SLACK_ALLOWED_USER_ID=U0XXXXXXXXX
 SLACK_ALLOWED_CHANNEL_ID=C0XXXXXXXXX

-# PTY 설정
-DEFAULT_SHELL=claude
+# PTY / tmux 연결 설정
+TMUX_SESSION_NAME=claude
 PTY_READ_TIMEOUT=5

 # 출력 버퍼 설정
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -42,3 +42,35 @@ Current git history is minimal (`Initial commit`), so enforce clear conventions
 ## Security & Configuration Tips
 Do not commit secrets. Copy `.env.example` to `.env` locally.  
 Restrict Slack access with `SLACK_ALLOWED_USER_ID` and `SLACK_ALLOWED_CHANNEL_ID` before running in shared workspaces.
+
+## Git & Gitea Workflow Notes
+Use `tea` (Gitea CLI), not `gh`.
+
+Hard rule:
+- Never implement changes, stage files, or commit on `main`.
+- Always create/use a feature branch first, and merge via PR.
+
+- Check login:
+  - `tea login ls`
+  - `tea whoami`
+- Create/update feature branch:
+  - `git checkout -b <branch>` (or `git checkout <branch>`)
+  - `git add <files>`
+  - `git commit -m "<message>"`
+- Push to Gitea:
+  - Normal: `git push -u origin <branch>`
+  - If HTTP username prompt fails in this environment, use the token from `~/.config/tea/config.yml`:
+    - `TOKEN=$(sed -n 's/^[[:space:]]*token: //p' ~/.config/tea/config.yml | head -n1)`
+    - `git push "http://agentson:${TOKEN}@localhost:3000/jihoson/LazyEnter.git" <branch>`
+- After token-based push, ensure tracking is on `origin/<branch>` (not token URL):
+  - `git fetch origin <branch>:refs/remotes/origin/<branch>`
+  - `git branch --set-upstream-to=origin/<branch> <branch>`
+- Create PR on Gitea:
+  - `tea pr create --base main --head <branch> --title "<title>" --description "<body>"`
+- Sync local main:
+  - `git checkout main`
+  - `git pull --ff-only`
+
+Safety:
+- Do not commit or print tokens in logs/docs.
+- Keep unrelated local files (for example `uv.lock`) out of PRs unless intentionally changed.
--- a/README.md
+++ b/README.md
@@ -5,11 +5,12 @@

 ## 동작 방식

-1. Slack에서 `/start-claude` 실행
-2. 로컬에서 `claude` 프로세스(기본값)가 PTY로 시작됨
-3. Slack 채널 메시지가 CLI 입력으로 전달됨
-4. CLI 출력이 Slack으로 다시 전송됨
-5. `/stop-claude`로 세션 종료
+1. 로컬에서 Claude를 tmux 세션으로 미리 실행 (`tmux new -s claude claude`)
+2. Slack에서 `/start-claude` 실행
+3. 브릿지가 기존 tmux 세션에 attach
+4. Slack 채널 메시지가 CLI 입력으로 전달됨
+5. CLI 출력이 Slack으로 다시 전송됨
+6. `/stop-claude`로 브릿지 연결 해제 (tmux 세션은 유지)

 ## 빠른 시작

@@ -34,7 +35,7 @@ cp .env.example .env
 - `SLACK_ALLOWED_CHANNEL_ID`

 선택 환경 변수:
- `DEFAULT_SHELL` (기본: `claude`)
+- `TMUX_SESSION_NAME` (기본: `claude`)
 - `PTY_READ_TIMEOUT` (기본: `5`)
 - `OUTPUT_BUFFER_INTERVAL` (기본: `2.0`)
 - `MAX_MESSAGE_LENGTH` (기본: `3000`)
@@ -55,6 +56,14 @@ cp .env.example .env

 ## 실행

+먼저 로컬에서 Claude tmux 세션을 실행:
+
+```bash
+tmux new -s claude claude
+```
+
+그 다음 브릿지 실행:
+
 ```bash
 lazy-enter
 # 또는
@@ -62,9 +71,9 @@ python -m lazy_enter
 ```

 실행 후 Slack의 허용된 채널에서:
- `/start-claude`: 세션 시작
+- `/start-claude`: 기존 세션에 연결
 - 일반 메시지 전송: Claude CLI로 입력 전달
- `/stop-claude`: 세션 종료
+- `/stop-claude`: 브릿지 연결 해제 (세션 유지)

 ## 테스트 및 품질 점검

--- a/src/lazy_enter/bridge.py
+++ b/src/lazy_enter/bridge.py
@@ -8,6 +8,7 @@ import threading
 import time

 from lazy_enter.config import Config
+from lazy_enter.output_filter import clean_terminal_output
 from lazy_enter.pty_manager import PtyManager
 from lazy_enter.slack_handler import SlackHandler

@@ -24,6 +25,7 @@ class Bridge:
        self._output_thread: threading.Thread | None = None
        self._running = False
        self._channel: str = self.config.allowed_channel_id
+        self._last_sent_output: str = ""
        self._last_input_at = time.monotonic()
        self._last_output_at = time.monotonic()
        self._input_idle_reported = False
@@ -46,7 +48,7 @@ class Bridge:
            self._input_idle_reported = False
            logger.info("입력 전달: %s", text)
        else:
-            self.slack.send_message(channel, ":warning: 실행 중인 세션이 없습니다.")
+            self.slack.send_message(channel, ":warning: 연결된 세션이 없습니다.")

    @staticmethod
    def _is_blocked_input(text: str) -> bool:
@@ -71,16 +73,23 @@ class Bridge:
            self._stop_session(channel)

    def _start_session(self, channel: str) -> None:
-        """Claude Code 세션을 시작한다."""
+        """기존 Claude tmux 세션에 연결한다."""
        if self.pty and self.pty.is_alive:
            self.slack.send_message(
-                channel, ":information_source: 이미 세션이 실행 중입니다."
+                channel, ":information_source: 이미 세션에 연결되어 있습니다."
            )
            return

        self._channel = channel
-        self.pty = PtyManager(self.config.default_shell)
-        self.pty.start()
+        self._last_sent_output = ""
+        self.pty = PtyManager(self.config.tmux_session_name)
+        try:
+            self.pty.start()
+        except RuntimeError as exc:
+            self.pty = None
+            self.slack.send_message(channel, f":warning: {exc}")
+            return
+
        self._running = True
        self._last_input_at = time.monotonic()
        self._last_output_at = time.monotonic()
@@ -89,15 +98,16 @@ class Bridge:
        self._output_thread = threading.Thread(target=self._poll_output, daemon=True)
        self._output_thread.start()

-        self.slack.send_message(channel, ":rocket: Claude Code 세션이 시작되었습니다.")
+        self.slack.send_message(channel, ":link: Claude 세션에 연결되었습니다.")

    def _stop_session(self, channel: str) -> None:
-        """Claude Code 세션을 종료한다."""
+        """브릿지 연결만 해제한다."""
        self._running = False
        if self.pty:
            self.pty.stop()
            self.pty = None
-        self.slack.send_message(channel, ":stop_sign: 세션이 종료되었습니다.")
+        self._last_sent_output = ""
+        self.slack.send_message(channel, ":electric_plug: 세션 연결이 해제되었습니다.")

    def _poll_output(self) -> None:
        """PTY 출력을 주기적으로 읽어 Slack으로 전송한다."""
@@ -106,16 +116,20 @@ class Bridge:
            now = time.monotonic()
            output = self.pty.read_output(timeout=self.config.pty_read_timeout)
            if output:
-                buffer += output
-                self._last_output_at = now
-                self._output_idle_reported = False
+                cleaned = clean_terminal_output(output)
+                if cleaned:
+                    buffer += f"{cleaned}\n"
+                    self._last_output_at = now
+                    self._output_idle_reported = False

            if buffer:
                # 메시지 길이 제한 적용
-                message = buffer[: self.config.max_message_length]
+                message = buffer[: self.config.max_message_length].rstrip()
                if len(buffer) > self.config.max_message_length:
                    message += "\n... (truncated)"
-                self.slack.send_message(self._channel, f"```\n{message}\n```")
+                if message and message != self._last_sent_output:
+                    self.slack.send_message(self._channel, f"```\n{message}\n```")
+                    self._last_sent_output = message
                buffer = ""

            output_idle = now - self._last_output_at
@@ -150,8 +164,8 @@ class Bridge:
        if not self._running:
            return

-        # 프로세스가 예기치 않게 종료된 경우
-        self.slack.send_message(self._channel, ":warning: 프로세스가 종료되었습니다.")
+        # attach 프로세스가 예기치 않게 종료된 경우
+        self.slack.send_message(self._channel, ":warning: 세션 연결이 종료되었습니다.")

    def run(self) -> None:
        """브릿지를 시작한다."""
--- a/src/lazy_enter/config.py
+++ b/src/lazy_enter/config.py
@@ -18,8 +18,8 @@ class Config:
    allowed_user_id: str = os.getenv("SLACK_ALLOWED_USER_ID", "")
    allowed_channel_id: str = os.getenv("SLACK_ALLOWED_CHANNEL_ID", "")

-    # PTY
-    default_shell: str = os.getenv("DEFAULT_SHELL", "claude")
+    # PTY / tmux attach
+    tmux_session_name: str = os.getenv("TMUX_SESSION_NAME", "claude")
    pty_read_timeout: int = int(os.getenv("PTY_READ_TIMEOUT", "5"))

    # Buffer
--- a/src/lazy_enter/output_filter.py
+++ b/src/lazy_enter/output_filter.py
@@ -0,0 +1,32 @@
+"""PTY 출력에서 터미널 제어 시퀀스를 제거한다."""
+
+from __future__ import annotations
+
+import re
+
+# ANSI CSI / OSC / DCS / 단일 ESC 시퀀스를 폭넓게 제거한다.
+_ANSI_ESCAPE_RE = re.compile(
+    r"(?:\x1B\[[0-?]*[ -/]*[@-~])"
+    r"|(?:\x1B\][^\x1B\x07]*(?:\x07|\x1B\\))"
+    r"|(?:\x1BP[^\x1B]*(?:\x1B\\))"
+    r"|(?:\x1B[@-_])"
+)
+
+# ESC 문자가 유실된 상태로 남는 CSI 토큰(예: [38;2;153;153;153m) 제거.
+_BROKEN_CSI_RE = re.compile(r"\[(?:[0-9;<=>?]|(?:\d+;))*\d*[A-Za-z]")
+
+# C0 제어문자 중 개행/탭/캐리지리턴을 제외하고 제거.
+_CONTROL_RE = re.compile(r"[\x00-\x08\x0B-\x1F\x7F]")
+
+
+def clean_terminal_output(text: str) -> str:
+    """Slack 전송용 텍스트를 정리한다."""
+    cleaned = _ANSI_ESCAPE_RE.sub("", text)
+    cleaned = _BROKEN_CSI_RE.sub("", cleaned)
+    cleaned = cleaned.replace("\r", "")
+    cleaned = _CONTROL_RE.sub("", cleaned)
+
+    # 제어 코드 제거 후 남는 빈 줄을 축소한다.
+    lines = [line.rstrip() for line in cleaned.splitlines()]
+    compact = "\n".join(lines).strip()
+    return compact
--- a/src/lazy_enter/pty_manager.py
+++ b/src/lazy_enter/pty_manager.py
@@ -1,8 +1,9 @@
-"""pexpect 기반 PTY 프로세스 관리."""
+"""기존 tmux 세션에 attach하여 CLI 입출력을 중계한다."""

 from __future__ import annotations

 import logging
+import subprocess

 import pexpect

@@ -10,21 +11,37 @@ logger = logging.getLogger(__name__)


 class PtyManager:
-    """가상 터미널에서 CLI 프로세스를 생성하고 입출력을 제어한다."""
+    """기존 tmux 세션에 attach하고 입출력을 제어한다."""

-    def __init__(self, command: str = "claude") -> None:
-        self.command = command
+    def __init__(self, session_name: str = "claude") -> None:
+        self.session_name = session_name
        self._process: pexpect.spawn | None = None

    @property
    def is_alive(self) -> bool:
        return self._process is not None and self._process.isalive()

+    def _ensure_session_exists(self) -> None:
+        """attach 대상 tmux 세션 존재 여부를 검증한다."""
+        result = subprocess.run(
+            ["tmux", "has-session", "-t", self.session_name],
+            check=False,
+            capture_output=True,
+            text=True,
+        )
+        if result.returncode != 0:
+            raise RuntimeError(
+                "tmux 세션이 없습니다. 먼저 실행하세요: "
+                f"tmux new -s {self.session_name} claude"
+            )
+
    def start(self) -> None:
-        """프로세스를 시작한다."""
-        logger.info("프로세스 시작: %s", self.command)
+        """기존 tmux 세션에 attach한다."""
+        self._ensure_session_exists()
+        logger.info("tmux 세션 attach: %s", self.session_name)
        self._process = pexpect.spawn(
-            self.command,
+            "tmux",
+            ["attach-session", "-t", self.session_name],
            encoding="utf-8",
            timeout=None,
        )
@@ -49,8 +66,8 @@ class PtyManager:
        return self._process.before or ""

    def stop(self) -> None:
-        """프로세스를 종료한다."""
+        """attach 연결만 종료한다(원격 세션은 유지)."""
        if self._process is not None:
-            logger.info("프로세스 종료")
+            logger.info("tmux attach 종료")
            self._process.close(force=True)
            self._process = None
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -7,7 +7,7 @@ from lazy_enter.config import Config

 def test_config_defaults():
    config = Config()
-    assert config.default_shell == "claude"
+    assert config.tmux_session_name == "claude"
    assert config.pty_read_timeout == 5
    assert config.output_buffer_interval == 2.0
    assert config.max_message_length == 3000
--- a/tests/test_output_filter.py
+++ b/tests/test_output_filter.py
@@ -0,0 +1,18 @@
+"""output_filter 모듈 테스트."""
+
+from lazy_enter.output_filter import clean_terminal_output
+
+
+def test_clean_terminal_output_removes_ansi_sequences():
+    raw = "\x1b[?2004h\x1b[38;2;153;153;153mClaude Code\x1b[39m"
+    assert clean_terminal_output(raw) == "Claude Code"
+
+
+def test_clean_terminal_output_removes_broken_csi_tokens():
+    raw = "[?2004h[38;2;153;153;153mhello[39m"
+    assert clean_terminal_output(raw) == "hello"
+
+
+def test_clean_terminal_output_preserves_plain_text():
+    raw = "line1\nline2"
+    assert clean_terminal_output(raw) == "line1\nline2"
--- a/tests/test_pty_manager.py
+++ b/tests/test_pty_manager.py
@@ -1,22 +1,84 @@
 """PtyManager 테스트."""

+from __future__ import annotations
+
+from collections.abc import Sequence
+
 import pytest

 from lazy_enter.pty_manager import PtyManager


+class FakeSpawn:
+    def __init__(self, *_args: object, **_kwargs: object) -> None:
+        self.before = ""
+        self._alive = True
+
+    def isalive(self) -> bool:
+        return self._alive
+
+    def sendline(self, _text: str) -> None:
+        return None
+
+    def expect(self, *_args: object, **_kwargs: object) -> None:
+        return None
+
+    def close(self, force: bool = False) -> None:
+        assert force is True
+        self._alive = False
+
+
 def test_initial_state():
-    pty = PtyManager("echo hello")
+    pty = PtyManager("claude")
    assert not pty.is_alive


-def test_start_and_stop():
-    pty = PtyManager("cat")
-    try:
-        pty.start()
-    except OSError as exc:
-        pytest.skip(f"PTY unavailable in this environment: {exc}")
+def test_start_raises_when_tmux_session_missing(monkeypatch: pytest.MonkeyPatch):
+    def fake_run(
+        cmd: Sequence[str],
+        check: bool,
+        capture_output: bool,
+        text: bool,
+    ):
+        assert list(cmd) == ["tmux", "has-session", "-t", "claude"]
+        assert check is False
+        assert capture_output is True
+        assert text is True

+        class Result:
+            returncode = 1
+
+        return Result()
+
+    monkeypatch.setattr("lazy_enter.pty_manager.subprocess.run", fake_run)
+
+    pty = PtyManager("claude")
+    with pytest.raises(RuntimeError):
+        pty.start()
+
+
+def test_start_and_stop_attach(monkeypatch: pytest.MonkeyPatch):
+    def fake_run(
+        _cmd: Sequence[str],
+        check: bool,
+        capture_output: bool,
+        text: bool,
+    ):
+        assert check is False
+        assert capture_output is True
+        assert text is True
+
+        class Result:
+            returncode = 0
+
+        return Result()
+
+    monkeypatch.setattr("lazy_enter.pty_manager.subprocess.run", fake_run)
+    monkeypatch.setattr("lazy_enter.pty_manager.pexpect.spawn", FakeSpawn)
+
+    pty = PtyManager("claude")
+    pty.start()
    assert pty.is_alive
+
    pty.stop()
    assert not pty.is_alive
Author	SHA1	Message	Date
jihoson	6a29c5f3dd	Enforce no-work-on-main rule for agents	2026-02-17 04:18:24 +09:00
jihoson	7d3540483b	Document Gitea workflow for future sessions	2026-02-17 04:16:34 +09:00
jihoson	fb7c25ec78	Merge pull request 'Attach bridge to existing tmux Claude session' (#4 ) from feat/tmux-attach-bridge into main Reviewed-on: #4	2026-02-17 04:06:53 +09:00
jihoson	b83929fac2	Attach to existing tmux Claude session	2026-02-17 04:04:28 +09:00
jihoson	e616bebdb9	Merge pull request 'Filter ANSI output before Slack forwarding' (#3 ) from fix/slack-ansi-filter into main Reviewed-on: #3	2026-02-17 03:53:08 +09:00
jihoson	8f8e63f56f	Merge remote-tracking branch 'origin/main' into fix/slack-ansi-filter # Conflicts: # src/lazy_enter/bridge.py	2026-02-17 03:52:12 +09:00
jihoson	df377cf2df	Filter ANSI output before Slack forwarding	2026-02-17 03:46:36 +09:00
jihoson	906022555a	Merge pull request 'Implement reconnect, idle reporting, and security hardening' (#2 ) from feat/remoteenter-hardening into main Reviewed-on: #2	2026-02-16 23:14:07 +09:00