@neoline/hostbridge 2.0.3 → 2.0.5

package/src/server_control_mcp/remote_task_agent.py

@@ -0,0 +1,102 @@
+from __future__ import annotations
+
+import shlex
+from collections.abc import Iterable
+
+REMOTE_TASK_LOG_MAX_BYTES = 1024 * 1024
+REMOTE_TASK_READ_CHUNK_BYTES = 64 * 1024
+
+REMOTE_TASK_AGENT = r"""
+import os
+import pathlib
+import subprocess
+import sys
+
+command, job_dir_text, log_limit_text = sys.argv[1], sys.argv[2], sys.argv[3]
+job_dir = pathlib.Path(job_dir_text)
+log_limit = int(log_limit_text)
+
+
+def write_atomic(name, value):
+    temporary = job_dir / ("." + name + ".tmp")
+    temporary.write_text(str(value) + "\n", encoding="ascii")
+    os.replace(temporary, job_dir / name)
+
+
+os.setsid()
+write_atomic("pid", os.getpid())
+with (job_dir / "stdout.log").open("w+b", buffering=0) as output:
+    process = subprocess.Popen(
+        ["/bin/sh", "-lc", command],
+        stdin=subprocess.DEVNULL,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+    )
+    current_size = 0
+    while True:
+        chunk = process.stdout.read(65536)
+        if not chunk:
+            break
+        if len(chunk) >= log_limit:
+            retained = chunk[-log_limit:]
+        elif current_size + len(chunk) > log_limit:
+            keep = log_limit - len(chunk)
+            output.seek(current_size - keep)
+            retained = output.read(keep) + chunk
+        else:
+            output.seek(current_size)
+            output.write(chunk)
+            current_size += len(chunk)
+            continue
+        output.seek(0)
+        output.write(retained)
+        output.truncate()
+        current_size = len(retained)
+    returncode = process.wait()
+status = returncode if returncode >= 0 else 128 - returncode
+write_atomic("exit_code", status)
+"""
+
+
+def remote_job_dir(task_id: str) -> str:
+    return f"$HOME/.hostbridge/jobs/{task_id}"
+
+
+def remote_job_dir_assignment(task_id: str) -> str:
+    relative_path = shlex.quote(f".hostbridge/jobs/{task_id}")
+    return f'job_dir="$HOME"/{relative_path}'
+
+
+def build_remote_task_command(command: str, task_id: str) -> str:
+    supervisor = (
+        f'python3 -u -c {shlex.quote(REMOTE_TASK_AGENT)} {shlex.quote(command)} "$job_dir" {REMOTE_TASK_LOG_MAX_BYTES}'
+    )
+    return (
+        'umask 077; [ -n "${HOME:-}" ] || exit 1; '
+        f'{remote_job_dir_assignment(task_id)}; mkdir -p -- "$job_dir" || exit $?; '
+        'chmod 700 "$HOME/.hostbridge" "$HOME/.hostbridge/jobs" "$job_dir" || exit $?; '
+        f"nohup {supervisor} </dev/null >/dev/null 2>&1 & launcher=$!; "
+        'attempt=0; while [ "$attempt" -lt 100 ]; do '
+        'if [ -s "$job_dir/pid" ]; then cat "$job_dir/pid"; exit 0; fi; '
+        'if ! kill -0 "$launcher" 2>/dev/null; then break; fi; '
+        "attempt=$((attempt + 1)); sleep 0.05; done; exit 1"
+    )
+
+
+def build_remote_tasks_cleanup_command(tasks: Iterable[tuple[str, int | None]]) -> str:
+    cleanup_steps = ["umask 077", '[ -n "${HOME:-}" ] || exit 1']
+    for task_id, recorded_pid in tasks:
+        fallback_pid = str(recorded_pid) if recorded_pid is not None else ""
+        cleanup_steps.extend(
+            (
+                remote_job_dir_assignment(task_id),
+                f'pid=$(cat "$job_dir/pid" 2>/dev/null || printf %s {shlex.quote(fallback_pid)})',
+                'if [ ! -f "$job_dir/exit_code" ] && [ -n "$pid" ] && kill -0 -- -"$pid" 2>/dev/null; then '
+                'kill -TERM -- -"$pid" 2>/dev/null || true; attempt=0; '
+                'while kill -0 -- -"$pid" 2>/dev/null && [ "$attempt" -lt 20 ]; do '
+                "attempt=$((attempt + 1)); sleep 0.05; done; "
+                'kill -KILL -- -"$pid" 2>/dev/null || true; fi',
+                'rm -rf -- "$job_dir" || exit $?',
+            )
+        )
+    return "; ".join(cleanup_steps)

package/src/server_control_mcp/runtime.py

@@ -9,6 +9,8 @@ import tempfile
 from dataclasses import dataclass
 from pathlib import Path
 
+from .secure_files import ensure_private_directory
+
 
 @dataclass(frozen=True, slots=True)
 class RuntimePaths:
@@ -18,8 +20,7 @@ class RuntimePaths:
     log: Path
 
     def ensure_directory(self) -> None:
-        self.directory.mkdir(mode=0o700, parents=True, exist_ok=True)
-        self.directory.chmod(0o700)
+        ensure_private_directory(self.directory)
 
 
 def _default_runtime_dir() -> Path: