agentforge-multi 0.1.3 → 0.1.5

package/agentforge

@@ -76,11 +76,16 @@ WORKER_TOOLS = [
     {
         "type": "function",
         "name": "shell",
-        "description": "Execute a shell command. Use for running scripts, compiling, testing, installing packages, etc.",
+        "description": (
+            "Execute a shell command. Default timeout is 120s. "
+            "For long-running training/monitoring commands, set timeout_seconds (max 7200). "
+            "For fire-and-forget background jobs use '... &' and a short follow-up tail command."
+        ),
         "parameters": {
             "type": "object",
             "properties": {
                 "command": {"type": "string", "description": "Shell command to run"},
+                "timeout_seconds": {"type": "integer", "description": "Max seconds to wait (default 120, max 7200)"},
             },
             "required": ["command"],
         },
@@ -129,14 +134,12 @@ WORKER_TOOLS = [
 ]
 
 
-def _stream_response(payload: dict) -> list:
+def _iter_events(payload: dict):
     """
     ChatGPT backend-api/codex/responses 스트리밍 호출.
-    SSE 이벤트를 파싱하여 (event_type, data_dict) 리스트 반환.
-    _interrupt_event가 set되면 조기 종료.
+    SSE 이벤트를 실시간으로 yield.  _interrupt_event가 set되면 조기 종료.
     """
     headers = _get_auth_headers()
-    events = []
     try:
         r = _requests.post(
             CHATGPT_RESPONSES_URL, headers=headers,
@@ -151,23 +154,22 @@ def _stream_response(payload: dict) -> list:
             decoded = line.decode("utf-8", errors="replace")
             if decoded.startswith("data: "):
                 try:
-                    ev = json.loads(decoded[6:])
-                    events.append(ev)
+                    yield json.loads(decoded[6:])
                 except Exception:
                     pass
     except Exception as e:
-        events.append({"type": "_error", "message": str(e)})
-    return events
+        yield {"type": "_error", "message": str(e)}
 
 
 def _execute_tool(name: str, args: dict, workdir: str) -> str:
     """Worker 도구 실행."""
     try:
         if name == "shell":
+            timeout = min(int(args.get("timeout_seconds", 120)), 7200)
             result = subprocess.run(
                 args["command"], shell=True,
                 capture_output=True, text=True, errors='replace',
-                cwd=workdir, timeout=120,
+                cwd=workdir, timeout=timeout,
             )
             out = (result.stdout + result.stderr).strip()
             return (out[:6000] if out else "(no output)") + (
@@ -465,28 +467,25 @@ def run_worker(prompt: str, workdir: str, model: str | None,
             "stream": True,
         }
 
-        events = _stream_response(payload)
+        # 실시간 스트리밍 처리
+        text_parts: list[str] = []
+        fc_items: list[dict] = []   # {call_id, name, arguments}
+        got_error = False
 
-        # 에러 처리
-        for ev in events:
-            if ev["type"] == "_error":
+        for ev in _iter_events(payload):
+            evtype = ev["type"]
+            if evtype == "_error":
                 buf.append(f"[red]API 오류: {ev['message']}[/red]")
                 status_ref[0] = "error"
                 if line_buf.strip():
                     buf.append(colorize_line(line_buf))
-                return "\n".join(all_text_parts), 1
-
-        # 텍스트 + 도구 호출 수집
-        text_parts: list[str] = []
-        fc_items: list[dict] = []   # {call_id, name, arguments}
-
-        for ev in events:
-            t = ev["type"]
-            if t == "response.output_text.delta":
+                got_error = True
+                break
+            elif evtype == "response.output_text.delta":
                 delta = ev.get("delta", "")
                 text_parts.append(delta)
                 _flush_line(delta)
-            elif t == "response.output_item.done" and ev.get("item", {}).get("type") == "function_call":
+            elif evtype == "response.output_item.done" and ev.get("item", {}).get("type") == "function_call":
                 item = ev["item"]
                 fc_items.append({
                     "call_id": item["call_id"],
@@ -494,6 +493,9 @@ def run_worker(prompt: str, workdir: str, model: str | None,
                     "arguments": item["arguments"],
                 })
 
+        if got_error:
+            return "\n".join(all_text_parts), 1
+
         round_text = "".join(text_parts)
         if round_text:
             all_text_parts.append(round_text)
@@ -542,15 +544,13 @@ def run_evaluator(prompt: str, workdir: str, model: str | None) -> tuple[str, in
         "store": False,
         "stream": True,
     }
-    events = _stream_response(payload)
-    for ev in events:
+    parts: list[str] = []
+    for ev in _iter_events(payload):
         if ev["type"] == "_error":
             return f"[Evaluator error] {ev['message']}", 1
-    text = "".join(
-        ev.get("delta", "") for ev in events
-        if ev["type"] == "response.output_text.delta"
-    )
-    return text, 0
+        if ev["type"] == "response.output_text.delta":
+            parts.append(ev.get("delta", ""))
+    return "".join(parts), 0
 
 
 def parse_decision(text: str) -> tuple[str, str]:
@@ -689,6 +689,56 @@ def render_evaluator_panel(eval_history: list, iteration: int,
     )
 
 
+# ── tmux 자동 래핑 ────────────────────────────────────────────────────────────
+
+import shlex as _shlex
+import shutil as _shutil
+
+TMUX_SESSION = "agentforge"
+
+
+def _in_tmux() -> bool:
+    return bool(os.environ.get("TMUX"))
+
+
+def _tmux_session_exists() -> bool:
+    r = subprocess.run(["tmux", "has-session", "-t", TMUX_SESSION],
+                       capture_output=True)
+    return r.returncode == 0
+
+
+def _tmux_launch(extra_args: list):
+    """현재 프로세스를 tmux 세션 안의 agentforge로 교체."""
+    if _tmux_session_exists():
+        console.print(
+            f"[yellow]이미 실행 중인 agentforge 세션이 있습니다.[/yellow]\n"
+            f"  재접속:  [cyan]agentforge -r[/cyan]\n"
+            f"  새 세션: [cyan]agentforge --new-session[/cyan]"
+        )
+        sys.exit(0)
+
+    exe = _shutil.which("agentforge") or os.path.abspath(sys.argv[0])
+    cmd_str = " ".join(_shlex.quote(p) for p in [exe] + extra_args)
+    try:
+        os.execvp("tmux", ["tmux", "new-session", "-s", TMUX_SESSION, cmd_str])
+    except OSError:
+        pass  # tmux 실행 실패 → 그냥 일반 모드로 계속
+
+
+def _tmux_reconnect():
+    """기존 agentforge tmux 세션에 재접속."""
+    if not _shutil.which("tmux"):
+        console.print("[red]tmux가 설치되지 않았습니다.[/red]")
+        sys.exit(1)
+    if not _tmux_session_exists():
+        console.print(
+            "[yellow]실행 중인 agentforge 세션이 없습니다.[/yellow]\n"
+            "새 세션 시작: [cyan]agentforge[/cyan]"
+        )
+        sys.exit(1)
+    os.execvp("tmux", ["tmux", "attach-session", "-t", TMUX_SESSION])
+
+
 # ── Agent Loop ────────────────────────────────────────────────────────────────
 
 def run_agent_loop(goal: str, workdir: str, worker_model: str | None,
@@ -746,7 +796,7 @@ def run_agent_loop(goal: str, workdir: str, worker_model: str | None,
                 break  # worker 스레드는 _interrupt_event 확인 후 자체 중단
             refresh("worker", iteration)
             time.sleep(0.1)
-        t.join()
+        t.join(timeout=10)  # 최대 10초 대기 후 포기
         refresh("worker", iteration)
 
         # ESC로 중단된 경우
@@ -865,6 +915,22 @@ def _handle_interrupt(goal: str, workdir: str, args, max_iter: int) -> str:
 # ── Main ──────────────────────────────────────────────────────────────────────
 
 def main():
+    # ── tmux 자동 래핑 ─────────────────────────────────────────────────
+    # -r / --reconnect: 기존 세션 재접속
+    if len(sys.argv) >= 2 and sys.argv[1] in ("-r", "--reconnect"):
+        _tmux_reconnect()
+        return
+
+    # --new-session: 기존 세션 무시하고 강제로 새 세션
+    force_new = len(sys.argv) >= 2 and sys.argv[1] == "--new-session"
+    extra_args = [a for a in sys.argv[1:] if a != "--new-session"]
+
+    if not _in_tmux() and _shutil.which("tmux"):
+        if force_new and _tmux_session_exists():
+            subprocess.run(["tmux", "kill-session", "-t", TMUX_SESSION])
+        _tmux_launch(extra_args)
+        # execvp 실패 또는 세션 이미 존재 시 여기까지 옴 → 일반 모드로 계속
+
     parser = argparse.ArgumentParser(
         prog="agentforge",
         description="Worker + Evaluator 인터랙티브 멀티에이전트 CLI",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentforge-multi",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Multi-agent CLI: Worker + Evaluator agents collaborate in a loop to achieve your goal",
   "keywords": [
     "ai",