@rethinkingstudio/clawpilot 2.1.21-beta.0 → 2.1.21-beta.10

package/dist/terminal/pty-manager.js

@@ -0,0 +1,193 @@
+import { randomUUID } from "crypto";
+import { homedir } from "os";
+import { existsSync, statSync } from "fs";
+import { spawn } from "node-pty";
+export class PtyManager {
+    emitEvent;
+    activeSession = null;
+    constructor(emitEvent) {
+        this.emitEvent = emitEvent;
+    }
+    open(rawParams) {
+        if (this.activeSession) {
+            throw new Error("terminal session already active");
+        }
+        const params = isRecord(rawParams) ? rawParams : {};
+        const cols = clampInt(params.cols, 120, 20, 400);
+        const rows = clampInt(params.rows, 32, 10, 200);
+        const cwd = resolveWorkingDirectory(normalizeString(params.cwd));
+        const shellCandidates = resolveShellCandidates(normalizeString(params.shell));
+        const sessionId = randomUUID();
+        const { pty, shell } = spawnWithFallback(shellCandidates, cwd, cols, rows);
+        const session = {
+            sessionId,
+            shell,
+            cwd,
+            cols,
+            rows,
+            pty,
+        };
+        this.activeSession = session;
+        pty.onData((data) => {
+            if (this.activeSession?.sessionId !== sessionId)
+                return;
+            this.emitEvent("terminal.data", { sessionId, data });
+        });
+        pty.onExit(({ exitCode, signal }) => {
+            if (this.activeSession?.sessionId !== sessionId)
+                return;
+            this.activeSession = null;
+            this.emitEvent("terminal.closed", {
+                sessionId,
+                exitCode,
+                signal,
+                reason: "process_exited",
+            });
+        });
+        const info = stripPty(session);
+        this.emitEvent("terminal.opened", info);
+        return info;
+    }
+    input(rawParams) {
+        const session = this.requireSession(rawParams);
+        const params = isRecord(rawParams) ? rawParams : {};
+        const data = normalizeString(params.data);
+        if (!data) {
+            throw new Error("terminal input data is required");
+        }
+        session.pty.write(data);
+    }
+    resize(rawParams) {
+        const session = this.requireSession(rawParams);
+        const params = isRecord(rawParams) ? rawParams : {};
+        const cols = clampInt(params.cols, session.cols, 20, 400);
+        const rows = clampInt(params.rows, session.rows, 10, 200);
+        session.pty.resize(cols, rows);
+        session.cols = cols;
+        session.rows = rows;
+        return stripPty(session);
+    }
+    close(rawParams, reason = "closed_by_client") {
+        const session = this.requireSession(rawParams);
+        this.activeSession = null;
+        session.pty.kill();
+        this.emitEvent("terminal.closed", {
+            sessionId: session.sessionId,
+            reason,
+        });
+    }
+    shutdown(reason = "relay_disconnected") {
+        if (!this.activeSession)
+            return;
+        const session = this.activeSession;
+        this.activeSession = null;
+        session.pty.kill();
+        this.emitEvent("terminal.closed", {
+            sessionId: session.sessionId,
+            reason,
+        });
+    }
+    currentSession() {
+        return this.activeSession ? stripPty(this.activeSession) : null;
+    }
+    requireSession(rawParams) {
+        const params = isRecord(rawParams) ? rawParams : {};
+        const sessionId = normalizeString(params.sessionId);
+        if (!this.activeSession) {
+            throw new Error("terminal session is not active");
+        }
+        if (sessionId && sessionId != this.activeSession.sessionId) {
+            throw new Error("terminal session not found");
+        }
+        return this.activeSession;
+    }
+}
+function stripPty(session) {
+    return {
+        sessionId: session.sessionId,
+        shell: session.shell,
+        cwd: session.cwd,
+        cols: session.cols,
+        rows: session.rows,
+    };
+}
+function isRecord(value) {
+    return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function normalizeString(value) {
+    if (typeof value !== "string") {
+        return undefined;
+    }
+    const trimmed = value.trim();
+    return trimmed.length === 0 ? undefined : trimmed;
+}
+function clampInt(value, fallback, min, max) {
+    const numeric = typeof value === "number" ? value : Number(value);
+    if (!Number.isFinite(numeric))
+        return fallback;
+    return Math.max(min, Math.min(max, Math.floor(numeric)));
+}
+function defaultShell() {
+    if (process.platform === "win32") {
+        return "pwsh.exe";
+    }
+    return process.env.SHELL || "/bin/bash";
+}
+function resolveShellCandidates(requestedShell) {
+    if (requestedShell) {
+        return dedupe([requestedShell, ...platformShellFallbacks()]);
+    }
+    return dedupe([defaultShell(), ...platformShellFallbacks()]);
+}
+function platformShellFallbacks() {
+    if (process.platform === "win32") {
+        return ["powershell.exe", "cmd.exe"];
+    }
+    return ["/bin/zsh", "/bin/bash", "/bin/sh"];
+}
+function resolveWorkingDirectory(requestedCwd) {
+    const candidates = dedupe([
+        requestedCwd,
+        process.env.HOME,
+        homedir(),
+        process.cwd(),
+        "/",
+    ].filter((value) => !!value));
+    for (const candidate of candidates) {
+        if (directoryExists(candidate)) {
+            return candidate;
+        }
+    }
+    return process.cwd();
+}
+function directoryExists(path) {
+    try {
+        return existsSync(path) && statSync(path).isDirectory();
+    }
+    catch {
+        return false;
+    }
+}
+function spawnWithFallback(shellCandidates, cwd, cols, rows) {
+    let lastError;
+    for (const shell of shellCandidates) {
+        try {
+            const pty = spawn(shell, [], {
+                name: "xterm-256color",
+                cols,
+                rows,
+                cwd,
+                env: { ...process.env },
+            });
+            return { pty, shell };
+        }
+        catch (error) {
+            lastError = error;
+        }
+    }
+    throw new Error(`failed to open terminal: ${String(lastError)}; shells tried: ${shellCandidates.join(", ")}; cwd=${cwd}`);
+}
+function dedupe(values) {
+    return [...new Set(values)];
+}
+//# sourceMappingURL=pty-manager.js.map

package/dist/terminal/pty-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pty-manager.js","sourceRoot":"","sources":["../../src/terminal/pty-manager.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rethinkingstudio/clawpilot",
-  "version": "2.1.21-beta.0",
+  "version": "2.1.21-beta.10",
   "description": "ClawAI relay client for Mac mini",
   "type": "module",
   "bin": {

package/scripts/hermes_agent_bridge.py

@@ -87,30 +87,102 @@ def read_base_config_for_profile() -> Dict[str, Any]:
     return read_yaml_config(parent.parent / "config.yaml")
 
 
+def normalize_message_content(value: Any) -> Any:
+    if value is None:
+        return ""
+    if isinstance(value, str):
+        return value
+    if isinstance(value, list):
+        parts: List[Any] = []
+        for part in value:
+            if isinstance(part, str):
+                parts.append({"type": "text", "text": part})
+                continue
+            if not isinstance(part, dict):
+                continue
+            clean_part = {k: v for k, v in part.items() if v is not None}
+            if clean_part.get("type") == "text":
+                clean_part["text"] = str(clean_part.get("text") or "")
+            if clean_part:
+                parts.append(clean_part)
+        return parts if parts else ""
+    return str(value)
+
+
+def normalize_tool_calls(value: Any) -> List[Dict[str, Any]]:
+    if not isinstance(value, list):
+        return []
+    clean_calls: List[Dict[str, Any]] = []
+    for index, call in enumerate(value):
+        if not isinstance(call, dict):
+            continue
+        raw_function = call.get("function")
+        function = raw_function if isinstance(raw_function, dict) else {}
+        name = str(function.get("name") or call.get("name") or "").strip()
+        if not name:
+            continue
+        raw_arguments = function.get("arguments")
+        if raw_arguments is None:
+            arguments = "{}"
+        elif isinstance(raw_arguments, str):
+            arguments = raw_arguments
+        else:
+            try:
+                arguments = json.dumps(raw_arguments, ensure_ascii=False)
+            except Exception:
+                arguments = str(raw_arguments)
+        call_id = str(call.get("id") or call.get("call_id") or f"call_{index}").strip()
+        clean_calls.append(
+            {
+                "id": call_id,
+                "type": str(call.get("type") or "function"),
+                "function": {
+                    "name": name,
+                    "arguments": arguments,
+                },
+            }
+        )
+    return clean_calls
+
+
 def sanitize_messages_for_api(messages: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
     valid_tool_call_ids: set[str] = set()
     for msg in messages:
         if not isinstance(msg, dict):
             continue
         if msg.get("role") == "assistant":
-            for tc in msg.get("tool_calls") or []:
-                if isinstance(tc, dict):
-                    tid = tc.get("id") or tc.get("call_id") or ""
-                    if tid:
-                        valid_tool_call_ids.add(str(tid))
+            for tc in normalize_tool_calls(msg.get("tool_calls")):
+                tid = tc.get("id") or ""
+                if tid:
+                    valid_tool_call_ids.add(str(tid))
 
     clean: List[Dict[str, Any]] = []
     for msg in messages:
         if not isinstance(msg, dict):
             continue
-        role = msg.get("role")
+        role = str(msg.get("role") or "").strip()
+        if role not in {"system", "user", "assistant", "tool"}:
+            continue
+        sanitized: Dict[str, Any] = {"role": role}
         if role == "tool":
             tid = str(msg.get("tool_call_id") or "")
             if not tid or tid not in valid_tool_call_ids:
                 continue
-        sanitized = {k: v for k, v in msg.items() if k in _API_SAFE_MSG_KEYS}
-        if sanitized.get("role"):
-            clean.append(sanitized)
+            sanitized["tool_call_id"] = tid
+            if msg.get("name"):
+                sanitized["name"] = str(msg.get("name"))
+
+        if role == "assistant":
+            tool_calls = normalize_tool_calls(msg.get("tool_calls"))
+            if tool_calls:
+                sanitized["tool_calls"] = tool_calls
+
+        content = normalize_message_content(msg.get("content"))
+        if content or role != "assistant" or sanitized.get("tool_calls"):
+            sanitized["content"] = content
+        if msg.get("refusal") is not None:
+            sanitized["refusal"] = str(msg.get("refusal"))
+        clean.append(sanitized)
     return clean
 
 
@@ -147,9 +219,10 @@ def read_session_history_from_json(session_id: Optional[str]) -> List[Dict[str,
 
 
 def read_session_history(session_id: Optional[str], session_db: Optional[SessionDB]) -> List[Dict[str, Any]]:
-    from_db = read_session_history_from_db(session_id, session_db)
-    if from_db:
-        return from_db
+    if os.environ.get("CLAWPILOT_HERMES_BRIDGE_DISABLE_SESSIONDB_HISTORY") != "1":
+        from_db = read_session_history_from_db(session_id, session_db)
+        if from_db:
+            return from_db
     return read_session_history_from_json(session_id)
 
 
@@ -221,6 +294,16 @@ def resolve_runtime(
     )
 
 
+def resolve_toolsets(cfg: Dict[str, Any]) -> List[str]:
+    raw_toolsets = _get_platform_tools(cfg, "cli")
+    if raw_toolsets is None:
+        return []
+    try:
+        return [str(toolset) for toolset in raw_toolsets]
+    except TypeError as exc:
+        raise TypeError("Hermes CLI toolset config must be iterable") from exc
+
+
 def derive_agent_inputs(payload: Dict[str, Any], session_db: Optional[SessionDB] = None) -> Dict[str, Any]:
     user_message = str(payload.get("userMessage") or "").strip()
     if not user_message:
@@ -230,6 +313,8 @@ def derive_agent_inputs(payload: Dict[str, Any], session_db: Optional[SessionDB]
     session_title = str(payload.get("sessionTitle") or "").strip() or None
     model = str(payload.get("model") or "").strip() or None
     provider = str(payload.get("provider") or "").strip() or None
+    base_url = str(payload.get("baseUrl") or "").strip() or None
+    api_key = str(payload.get("apiKey") or "").strip() or None
 
     inherit_base_env_for_profile()
 
@@ -248,16 +333,18 @@ def derive_agent_inputs(payload: Dict[str, Any], session_db: Optional[SessionDB]
     if not default_model:
         raise ValueError("missing model")
 
+    configured_base_url = str(model_cfg.get("base_url") or "").strip() or None
     runtime = normalize_runtime_config(
-        resolve_runtime(
-            provider or model_cfg.get("provider"),
-            explicit_base_url=model_cfg.get("base_url"),
+        resolve_runtime_provider(
+            requested=provider or model_cfg.get("provider"),
+            explicit_api_key=api_key,
+            explicit_base_url=base_url or configured_base_url,
             target_model=default_model,
         )
     )
-    if model_cfg.get("base_url") and not runtime.get("base_url"):
-        runtime["base_url"] = model_cfg.get("base_url")
-    toolsets = list(_get_platform_tools(cfg, "cli"))
+    if configured_base_url and not runtime.get("base_url"):
+        runtime["base_url"] = configured_base_url
+    toolsets = resolve_toolsets(cfg)
 
     history = read_session_history(session_id, session_db)
     return {
@@ -412,6 +499,16 @@ def main() -> int:
             task_id=agent.session_id,
             persist_user_message=agent_inputs["user_message"],
         )
+        if not isinstance(result, dict):
+            emit(
+                {
+                    "type": "error",
+                    "message": "Hermes agent returned no result."
+                    if result is None
+                    else f"Hermes agent returned invalid result: {type(result).__name__}.",
+                }
+            )
+            return 1
         final_text = extract_final_text(result, accumulated_text)
         if not final_text.strip():
             error_text = extract_error_text(result)