@neoline/hostbridge 0.2.2 → 1.0.0

package/src/server_control_mcp/manager.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import base64
+import hashlib
 import re
 import shlex
 import threading
@@ -8,7 +10,8 @@ import uuid
 from collections.abc import Callable
 from contextlib import suppress
 from dataclasses import dataclass, field
-from typing import Protocol
+from pathlib import Path
+from typing import Protocol, cast
 
 import pexpect
 
@@ -21,6 +24,7 @@ DEFAULT_REAPER_INTERVAL_SECONDS = 60
 MAX_OUTPUT_CHARS = 120_000
 REMOTE_JOB_ROOT = "$HOME/.hostbridge/jobs"
 REMOTE_SHELL = "bash"
+DEFAULT_MAX_TRANSFER_BYTES = 1024 * 1024
 
 class PolicyDeniedError(RuntimeError):
     """Raised when a command is blocked by the configured policy."""
@@ -62,6 +66,7 @@ class RemoteSession:
     created_at: float = field(default_factory=time.time)
     last_used_at: float = field(default_factory=time.time)
     busy: bool = False
+    owner_agent_id: str | None = None
     last_output: str = ""
 
 
@@ -83,6 +88,7 @@ class RemoteTask:
     command: str
     job_dir: str
     remote_pid: int | None
+    owner_agent_id: str | None = None
     created_at: float = field(default_factory=time.time)
 
 
@@ -146,6 +152,7 @@ class SessionManager:
         remote_shell: str = REMOTE_SHELL,
         policy: PolicyConfig | None = None,
         audit_sink: AuditSink | None = None,
+        max_sessions_per_host: int = 0,
     ):
         self.hosts = hosts
         self.child_factory = child_factory
@@ -154,6 +161,7 @@ class SessionManager:
         self._tasks: dict[str, RemoteTask] = {}
         self._policy = policy
         self._audit = audit_sink
+        self._max_sessions_per_host = max(0, int(max_sessions_per_host))
         self._reaper_stop = threading.Event()
         self._reaper_thread: threading.Thread | None = None
 
@@ -223,8 +231,10 @@ class SessionManager:
         *,
         connect_timeout: int = DEFAULT_CONNECT_TIMEOUT,
         token_factory: TokenFactory = _new_token,
+        owner_agent_id: str | None = None,
     ) -> RemoteSession:
         host = self.hosts.get(host_id)
+        self._check_host_session_limit(host.id)
         child = self.child_factory(host.command, list(host.args), connect_timeout)
         token = token_factory()
         marker = f"__SCM_READY_{token}__"
@@ -247,6 +257,7 @@ class SessionManager:
             command=host.command,
             args=list(host.args),
             child=child,
+            owner_agent_id=owner_agent_id,
             last_output=_tail(str(child.before)),
         )
         self._sessions[session.id] = session
@@ -286,14 +297,23 @@ class SessionManager:
             closed.append(session_id)
         return {"closed": closed, "count": len(closed)}
 
-    def close_session(self, session_id: str) -> dict[str, object]:
+    def close_session(
+        self,
+        session_id: str,
+        *,
+        owner_agent_id: str | None = None,
+        force: bool = False,
+    ) -> dict[str, object]:
         session = self._get_session(session_id)
+        self._check_owner(session, owner_agent_id, force=force)
+        if session.busy and not force:
+            raise RemoteCommandError(f"session {session_id} is busy; retry later or close with force")
         session.child.close(force=True)
         self._sessions.pop(session_id, None)
-        self._emit("session_closed", session_id=session_id, host_id=session.host_id, outcome="user")
+        self._emit("session_closed", session_id=session_id, host_id=session.host_id, outcome="forced" if force else "user")
         return {"session_id": session_id, "closed": True}
 
-    def stop_task(self, session_id: str, task_id: str) -> dict[str, object]:
+    def stop_task(self, session_id: str, task_id: str, *, owner_agent_id: str | None = None, force: bool = False) -> dict[str, object]:
         """Best-effort terminate a background task by killing its remote PID."""
 
         task = self._tasks.get(task_id)
@@ -301,10 +321,11 @@ class SessionManager:
             raise RemoteCommandError(f"unknown task {task_id}")
         if task.session_id != session_id:
             raise RemoteCommandError(f"task {task_id} does not belong to session {session_id}")
+        self._check_task_owner(task, owner_agent_id, force=force)
         if task.remote_pid is None:
             raise RemoteCommandError(f"task {task_id} has no recorded remote pid")
         kill_script = f'if [ -f "{task.job_dir}/exit_code" ]; then echo already; else kill -TERM {task.remote_pid} 2>/dev/null && echo killed || echo noop; fi'
-        result = self.run_command(session_id, kill_script, timeout=10)
+        result = self.run_command(session_id, kill_script, timeout=10, owner_agent_id=owner_agent_id)
         outcome = result.output.strip().splitlines()[-1] if result.output.strip() else "unknown"
         self._emit(
             "task_stopped",
@@ -322,6 +343,8 @@ class SessionManager:
         *,
         timeout: int = DEFAULT_COMMAND_TIMEOUT,
         token_factory: TokenFactory = _new_token,
+        owner_agent_id: str | None = None,
+        output_limit: int = MAX_OUTPUT_CHARS,
     ) -> CommandResult:
         if not command.strip():
             raise RemoteCommandError("command must not be empty")
@@ -336,6 +359,7 @@ class SessionManager:
             )
             raise PolicyDeniedError(decision.reason)
         session = self._get_session(session_id)
+        self._check_owner(session, owner_agent_id)
         if session.busy:
             raise RemoteCommandError(f"session {session_id} is busy")
         if not session.child.isalive():
@@ -351,7 +375,7 @@ class SessionManager:
             session.child.expect(exit_pattern, timeout=timeout)
             output = _extract_between_markers(str(session.child.before), start_marker)
             exit_code = _parse_exit_marker(session.child.after, token)
-            result = CommandResult(session.id, session.host_id, command, exit_code, _tail(output))
+            result = CommandResult(session.id, session.host_id, command, exit_code, _tail(output, max(1, output_limit)))
             self._emit(
                 "command_run",
                 session_id=session.id,
@@ -381,6 +405,7 @@ class SessionManager:
         command: str,
         *,
         token_factory: TokenFactory = _new_token,
+        owner_agent_id: str | None = None,
     ) -> RemoteTask:
         if not command.strip():
             raise RemoteCommandError("command must not be empty")
@@ -406,7 +431,7 @@ class SessionManager:
             'date -u +%Y-%m-%dT%H:%M:%SZ > "$job_dir/finished_at") & '
             'pid=$!; printf "%s\\n" "$pid" > "$job_dir/pid"; printf "%s" "$pid"'
         )
-        result = self.run_command(session_id, script, timeout=10, token_factory=lambda: f"task_{task_id}")
+        result = self.run_command(session_id, script, timeout=10, token_factory=lambda: f"task_{task_id}", owner_agent_id=owner_agent_id)
         pid_match = re.search(r"(\d+)", result.output)
         task = RemoteTask(
             id=task_id,
@@ -415,17 +440,26 @@ class SessionManager:
             command=command,
             job_dir=job_dir,
             remote_pid=int(pid_match.group(1)) if pid_match else None,
+            owner_agent_id=owner_agent_id,
         )
         self._tasks[task.id] = task
         self._emit("task_started", session_id=session_id, task_id=task.id, host_id=task.host_id, command=command, outcome="ok")
         return task
 
-    def task_status(self, session_id: str, task_id: str, *, tail_lines: int = 80) -> dict[str, object]:
+    def task_status(
+        self,
+        session_id: str,
+        task_id: str,
+        *,
+        tail_lines: int = 80,
+        owner_agent_id: str | None = None,
+    ) -> dict[str, object]:
         task = self._tasks.get(task_id)
         if task is None:
             raise RemoteCommandError(f"unknown task {task_id}")
         if task.session_id != session_id:
             raise RemoteCommandError(f"task {task_id} does not belong to session {session_id}")
+        self._check_task_owner(task, owner_agent_id)
         safe_tail_lines = max(1, min(int(tail_lines), 500))
         script = (
             f'job_dir="{task.job_dir}"; '
@@ -436,7 +470,7 @@ class SessionManager:
             'printf "STATE=%s\\nPID=%s\\nEXIT=%s\\n---LOG---\\n" "$state" "$pid" "$exit_code"; '
             f'tail -n {safe_tail_lines} "$job_dir/stdout.log" 2>/dev/null || true'
         )
-        result = self.run_command(session_id, script, timeout=15)
+        result = self.run_command(session_id, script, timeout=15, owner_agent_id=owner_agent_id)
         metadata, _, log = result.output.partition("---LOG---\n")
         fields: dict[str, str] = {}
         for line in metadata.splitlines():
@@ -456,14 +490,243 @@ class SessionManager:
             "log_tail": log,
         }
 
-    def write(self, session_id: str, text: str) -> dict[str, object]:
+
+    def file_write_text(
+        self,
+        session_id: str,
+        remote_path: str,
+        content: str,
+        *,
+        mode: str = "0644",
+        max_bytes: int = DEFAULT_MAX_TRANSFER_BYTES,
+        token_factory: TokenFactory = _new_token,
+        owner_agent_id: str | None = None,
+    ) -> dict[str, object]:
+        data = content.encode("utf-8")
+        return self._upload_bytes(
+            session_id,
+            data,
+            remote_path,
+            mode=mode,
+            max_bytes=max_bytes,
+            token_factory=token_factory,
+            owner_agent_id=owner_agent_id,
+        )
+
+    def file_read_text(
+        self,
+        session_id: str,
+        remote_path: str,
+        *,
+        max_bytes: int = DEFAULT_MAX_TRANSFER_BYTES,
+        token_factory: TokenFactory = _new_token,
+        owner_agent_id: str | None = None,
+    ) -> dict[str, object]:
+        result = self._download_bytes(
+            session_id,
+            remote_path,
+            max_bytes=max_bytes,
+            token_factory=token_factory,
+            owner_agent_id=owner_agent_id,
+        )
+        data = cast(bytes, result.pop("data_bytes"))
+        result["content"] = data.decode("utf-8")
+        return result
+
+    def file_upload(
+        self,
+        session_id: str,
+        local_path: Path | str,
+        remote_path: str,
+        *,
+        mode: str = "0644",
+        max_bytes: int = DEFAULT_MAX_TRANSFER_BYTES,
+        token_factory: TokenFactory = _new_token,
+        owner_agent_id: str | None = None,
+    ) -> dict[str, object]:
+        path = Path(local_path).expanduser()
+        if not path.is_absolute():
+            raise RemoteCommandError("local_path must be absolute")
+        if not path.is_file():
+            raise RemoteCommandError(f"local file not found: {path}")
+        size = path.stat().st_size
+        self._check_transfer_size(size, max_bytes)
+        return self._upload_bytes(
+            session_id,
+            path.read_bytes(),
+            remote_path,
+            mode=mode,
+            max_bytes=max_bytes,
+            token_factory=token_factory,
+            owner_agent_id=owner_agent_id,
+            local_path=str(path),
+        )
+
+    def file_download(
+        self,
+        session_id: str,
+        remote_path: str,
+        local_path: Path | str,
+        *,
+        max_bytes: int = DEFAULT_MAX_TRANSFER_BYTES,
+        token_factory: TokenFactory = _new_token,
+        owner_agent_id: str | None = None,
+    ) -> dict[str, object]:
+        path = Path(local_path).expanduser()
+        if not path.is_absolute():
+            raise RemoteCommandError("local_path must be absolute")
+        result = self._download_bytes(
+            session_id,
+            remote_path,
+            max_bytes=max_bytes,
+            token_factory=token_factory,
+            owner_agent_id=owner_agent_id,
+        )
+        data = cast(bytes, result.pop("data_bytes"))
+        path.parent.mkdir(parents=True, exist_ok=True)
+        path.write_bytes(data)
+        result["local_path"] = str(path)
+        return result
+
+    def _upload_bytes(
+        self,
+        session_id: str,
+        data: bytes,
+        remote_path: str,
+        *,
+        mode: str,
+        max_bytes: int,
+        token_factory: TokenFactory,
+        owner_agent_id: str | None,
+        local_path: str | None = None,
+    ) -> dict[str, object]:
+        self._check_transfer_size(len(data), max_bytes)
+        self._validate_remote_path(remote_path)
+        b64 = base64.b64encode(data).decode("ascii")
+        sha256 = hashlib.sha256(data).hexdigest()
+        token = token_factory()
+        remote_q = shlex.quote(remote_path)
+        mode_q = shlex.quote(mode)
+        heredoc = f"__HOSTBRIDGE_B64_{token}__"
+        script = (
+            "set -e; "
+            f"target={remote_q}; mode={mode_q}; "
+            'dir=$(dirname "$target"); mkdir -p "$dir"; '
+            'tmp_b64=$(mktemp "${TMPDIR:-/tmp}/hostbridge.XXXXXX.b64"); '
+            'tmp_out=$(mktemp "${TMPDIR:-/tmp}/hostbridge.XXXXXX.out"); '
+            f"cat > \"$tmp_b64\" <<'{heredoc}'\n{b64}\n{heredoc}\n"
+            'base64 -d "$tmp_b64" > "$tmp_out"; '
+            'chmod "$mode" "$tmp_out"; mv "$tmp_out" "$target"; rm -f "$tmp_b64"; '
+            f"printf 'BYTES=%s\\nSHA256=%s\\n' {len(data)} {shlex.quote(sha256)}"
+        )
+        result = self.run_command(session_id, script, timeout=60, token_factory=lambda: token, owner_agent_id=owner_agent_id)
+        if result.exit_code != 0:
+            raise RemoteCommandError(result.output or f"failed to upload {remote_path}")
+        payload: dict[str, object] = {
+            "session_id": session_id,
+            "remote_path": remote_path,
+            "bytes": len(data),
+            "sha256": sha256,
+            "strategy": "shell_base64",
+        }
+        if local_path is not None:
+            payload["local_path"] = local_path
+        self._emit("file_uploaded", session_id=session_id, command=remote_path, outcome=f"bytes={len(data)}")
+        return payload
+
+    def _download_bytes(
+        self,
+        session_id: str,
+        remote_path: str,
+        *,
+        max_bytes: int,
+        token_factory: TokenFactory,
+        owner_agent_id: str | None,
+    ) -> dict[str, object]:
+        self._validate_remote_path(remote_path)
+        token = token_factory()
+        remote_q = shlex.quote(remote_path)
+        script = (
+            "set -e; "
+            f"target={remote_q}; "
+            'bytes=$(wc -c < "$target" | tr -d " "); '
+            f"if [ \"$bytes\" -gt {int(max_bytes)} ]; then echo 'FILE_TOO_LARGE remote pull required' >&2; exit 73; fi; "
+            "if command -v sha256sum >/dev/null 2>&1; then sha=$(sha256sum \"$target\" | awk '{print $1}'); "
+            "else sha=$(shasum -a 256 \"$target\" | awk '{print $1}'); fi; "
+            "printf 'BYTES=%s\\nSHA256=%s\\n---BASE64---\\n' \"$bytes\" \"$sha\"; base64 \"$target\""
+        )
+        output_limit = max(MAX_OUTPUT_CHARS, int(max_bytes) * 2 + 4096)
+        result = self.run_command(
+            session_id,
+            script,
+            timeout=60,
+            token_factory=lambda: token,
+            owner_agent_id=owner_agent_id,
+            output_limit=output_limit,
+        )
+        if result.exit_code == 73:
+            self._raise_remote_pull_required(max_bytes)
+        if result.exit_code != 0:
+            raise RemoteCommandError(result.output or f"failed to download {remote_path}")
+        metadata, sep, encoded = result.output.partition("---BASE64---\n")
+        if not sep:
+            raise RemoteCommandError("download response missing base64 marker")
+        fields: dict[str, str] = {}
+        for line in metadata.splitlines():
+            key, _, value = line.partition("=")
+            if key:
+                fields[key] = value
+        data = base64.b64decode("".join(encoded.split()))
+        byte_count = int(fields.get("BYTES") or len(data))
+        self._check_transfer_size(byte_count, max_bytes)
+        sha256 = hashlib.sha256(data).hexdigest()
+        remote_sha = fields.get("SHA256") or sha256
+        if remote_sha != "ignored" and sha256 != remote_sha:
+            raise RemoteCommandError("download checksum mismatch")
+        self._emit("file_downloaded", session_id=session_id, command=remote_path, outcome=f"bytes={len(data)}")
+        return {
+            "session_id": session_id,
+            "remote_path": remote_path,
+            "bytes": len(data),
+            "sha256": remote_sha,
+            "strategy": "shell_base64",
+            "data_bytes": data,
+        }
+
+    def _validate_remote_path(self, remote_path: str) -> None:
+        if not remote_path or remote_path.strip() in {"", "/"}:
+            raise RemoteCommandError("remote_path must not be empty or root")
+
+    def _check_transfer_size(self, size: int, max_bytes: int) -> None:
+        if size > int(max_bytes):
+            self._raise_remote_pull_required(max_bytes)
+
+    def _raise_remote_pull_required(self, max_bytes: int) -> None:
+        raise RemoteCommandError(
+            f"file exceeds HostBridge shell transfer limit ({int(max_bytes)} bytes); use remote pull (curl/wget/modelscope/git) for large files"
+        )
+
+    def write(self, session_id: str, text: str, *, owner_agent_id: str | None = None) -> dict[str, object]:
         session = self._get_session(session_id)
+        self._check_owner(session, owner_agent_id)
+        if session.busy:
+            raise RemoteCommandError(f"session {session_id} is busy")
+        if not session.child.isalive():
+            raise RemoteCommandError(f"session {session_id} is not alive")
         session.child.sendline(text)
         session.last_used_at = time.time()
         return {"session_id": session_id, "written": True}
 
-    def read(self, session_id: str, *, timeout: float = 1.0, max_chars: int = 20_000) -> dict[str, object]:
+    def read(
+        self,
+        session_id: str,
+        *,
+        timeout: float = 1.0,
+        max_chars: int = 20_000,
+        owner_agent_id: str | None = None,
+    ) -> dict[str, object]:
         session = self._get_session(session_id)
+        self._check_owner(session, owner_agent_id)
         chunks: list[str] = []
         deadline = time.time() + max(0.0, timeout)
         while len("".join(chunks)) < max_chars:
@@ -488,6 +751,25 @@ class SessionManager:
         except KeyError as exc:
             raise RemoteCommandError(f"unknown session {session_id}") from exc
 
+    def _check_owner(self, session: RemoteSession, owner_agent_id: str | None, *, force: bool = False) -> None:
+        if force or owner_agent_id is None or session.owner_agent_id is None:
+            return
+        if owner_agent_id != session.owner_agent_id:
+            raise RemoteCommandError(f"session {session.id} is owned by another agent")
+
+    def _check_task_owner(self, task: RemoteTask, owner_agent_id: str | None, *, force: bool = False) -> None:
+        if force or owner_agent_id is None or task.owner_agent_id is None:
+            return
+        if owner_agent_id != task.owner_agent_id:
+            raise RemoteCommandError(f"task {task.id} is owned by another agent")
+
+    def _check_host_session_limit(self, host_id: str) -> None:
+        if self._max_sessions_per_host <= 0:
+            return
+        open_count = sum(1 for session in self._sessions.values() if session.host_id == host_id and session.child.isalive())
+        if open_count >= self._max_sessions_per_host:
+            raise RemoteCommandError(f"host {host_id} reached session limit {self._max_sessions_per_host}")
+
     def _build_remote_line(self, command: str, token: str, start_marker: str) -> str:
         quoted_command = shlex.quote(command)
         return (
@@ -507,6 +789,7 @@ class SessionManager:
             "args": session.args,
             "alive": session.child.isalive(),
             "busy": session.busy,
+            "owner_agent_id": session.owner_agent_id,
             "created_at": session.created_at,
             "last_used_at": session.last_used_at,
         }