let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: tighten webchat types and formatting

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-08 17:09:32 +01:00
parent 838a9c000c
commit 636f2d659f
1 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/webchat/server.ts
View File

@@ -1,20 +1,19 @@
import http from "node:http";
import path from "node:path";
import os from "node:os";
import { fileURLToPath } from "node:url";
import crypto from "node:crypto"; import crypto from "node:crypto";
import fs from "node:fs"; import fs from "node:fs";
import http from "node:http";
import os from "node:os";
import path from "node:path";
import { fileURLToPath } from "node:url";
import sharp from "sharp"; import sharp from "sharp";
import { agentCommand } from "../commands/agent.js";
import { loadConfig } from "../config/config.js"; import { loadConfig } from "../config/config.js";
import { import {
loadSessionStore, loadSessionStore,
resolveStorePath, resolveStorePath,
type SessionEntry, type SessionEntry,
} from "../config/sessions.js"; } from "../config/sessions.js";
import { danger, info } from "../globals.js";
import { logDebug } from "../logger.js"; import { logDebug } from "../logger.js";
import { agentCommand } from "../commands/agent.js";
import type { RuntimeEnv } from "../runtime.js"; import type { RuntimeEnv } from "../runtime.js";
const WEBCHAT_DEFAULT_PORT = 18788; const WEBCHAT_DEFAULT_PORT = 18788;
@@ -24,18 +23,23 @@ type WebChatServerState = {
port: number; port: number;
}; };
type ChatMessage = { role: string; content: string };
type AttachmentInput = {
content?: string;
mimeType?: string;
fileName?: string;
type?: string;
};
type RpcPayload = { role: string; content: string };
let state: WebChatServerState | null = null; let state: WebChatServerState | null = null;
function resolveWebRoot() { function resolveWebRoot() {
const here = path.dirname(fileURLToPath(import.meta.url)); const here = path.dirname(fileURLToPath(import.meta.url));
// 1) Packaged app: resources live next to the relay bundle at
// Contents/Resources/WebChat. The relay binary runs from
// Contents/Resources/Relay/bun, so walk up one and check.
const packagedRoot = path.resolve(path.dirname(process.execPath), "../WebChat"); const packagedRoot = path.resolve(path.dirname(process.execPath), "../WebChat");
if (fs.existsSync(packagedRoot)) return packagedRoot; if (fs.existsSync(packagedRoot)) return packagedRoot;
// 2) Dev / source checkout: repo-relative path.
return path.resolve(here, "../../apps/macos/Sources/Clawdis/Resources/WebChat"); return path.resolve(here, "../../apps/macos/Sources/Clawdis/Resources/WebChat");
} }
@@ -55,9 +59,12 @@ function pickSessionId(sessionKey: string, store: Record<string, SessionEntry>):
return first ?? null; return first ?? null;
} }
function readSessionMessages(sessionId: string, storePath: string): any[] { function readSessionMessages(sessionId: string, storePath: string): ChatMessage[] {
const dir = path.dirname(storePath); const dir = path.dirname(storePath);
const candidates = [path.join(dir, `${sessionId}.jsonl`), path.join(os.homedir(), ".tau/agent/sessions/clawdis", `${sessionId}.jsonl`)]; const candidates = [
path.join(dir, `${sessionId}.jsonl`),
path.join(os.homedir(), ".tau/agent/sessions/clawdis", `${sessionId}.jsonl`),
];
let content: string | null = null; let content: string | null = null;
for (const p of candidates) { for (const p of candidates) {
if (fs.existsSync(p)) { if (fs.existsSync(p)) {
@@ -71,7 +78,7 @@ function readSessionMessages(sessionId: string, storePath: string): any[] {
} }
if (!content) return []; if (!content) return [];
const messages: any[] = []; const messages: ChatMessage[] = [];
for (const line of content.split(/\r?\n/)) { for (const line of content.split(/\r?\n/)) {
if (!line.trim()) continue; if (!line.trim()) continue;
try { try {
@@ -87,7 +94,7 @@ function readSessionMessages(sessionId: string, storePath: string): any[] {
} }
async function persistAttachments( async function persistAttachments(
attachments: any[], attachments: AttachmentInput[],
sessionId: string, sessionId: string,
): Promise<{ placeholder: string; path: string }[]> { ): Promise<{ placeholder: string; path: string }[]> {
const out: { placeholder: string; path: string }[] = []; const out: { placeholder: string; path: string }[] = [];
@@ -100,7 +107,8 @@ async function persistAttachments(
for (const att of attachments) { for (const att of attachments) {
try { try {
if (!att?.content || typeof att.content !== "string") continue; if (!att?.content || typeof att.content !== "string") continue;
const mime = typeof att.mimeType === "string" ? att.mimeType : "application/octet-stream"; const mime =
typeof att.mimeType === "string" ? att.mimeType : "application/octet-stream";
const baseName = att.fileName || `${att.type || "attachment"}-${idx}`; const baseName = att.fileName || `${att.type || "attachment"}-${idx}`;
const ext = mime.startsWith("image/") ? mime.split("/")[1] || "bin" : "bin"; const ext = mime.startsWith("image/") ? mime.split("/")[1] || "bin" : "bin";
const fileName = `${baseName}.${ext}`.replace(/[^a-zA-Z0-9._-]/g, "_"); const fileName = `${baseName}.${ext}`.replace(/[^a-zA-Z0-9._-]/g, "_");
@@ -123,7 +131,6 @@ async function persistAttachments(
} }
} }
// Hard cap ~6MB after processing
if (finalBuf.length > 6 * 1024 * 1024) { if (finalBuf.length > 6 * 1024 * 1024) {
out.push({ out.push({
placeholder: `[Attachment too large: ${baseName} (${(finalBuf.length / 1024 / 1024).toFixed(1)} MB)]`, placeholder: `[Attachment too large: ${baseName} (${(finalBuf.length / 1024 / 1024).toFixed(1)} MB)]`,
@@ -149,16 +156,35 @@ async function persistAttachments(
return out; return out;
} }
function formatMessageWithAttachments(text: string, saved: { placeholder: string }[]): string { function formatMessageWithAttachments(
text: string,
saved: { placeholder: string }[],
): string {
if (!saved || saved.length === 0) return text; if (!saved || saved.length === 0) return text;
const parts = [text, ...saved.map((s) => `\n\n${s.placeholder}`)]; const parts = [text, ...saved.map((s) => `\n\n${s.placeholder}`)];
return parts.join(""); return parts.join("");
} }
async function handleRpc(body: any, sessionKey: string): Promise<{ ok: boolean; payloads?: any[]; error?: string }> { async function handleRpc(
const text: string = (body?.text ?? "").toString(); body: unknown,
sessionKey: string,
): Promise<{ ok: boolean; payloads?: RpcPayload[]; error?: string }> {
const payload = body as {
text?: unknown;
attachments?: unknown;
thinking?: unknown;
deliver?: unknown;
to?: unknown;
};
const text: string = (payload.text ?? "").toString();
if (!text.trim()) return { ok: false, error: "empty text" }; if (!text.trim()) return { ok: false, error: "empty text" };
const attachments = Array.isArray(body?.attachments) ? body.attachments : []; const attachments = Array.isArray(payload.attachments)
? (payload.attachments as AttachmentInput[])
: [];
const thinking = typeof payload.thinking === "string" ? payload.thinking : undefined;
const to = typeof payload.to === "string" ? payload.to : undefined;
const deliver = Boolean(payload.deliver);
const cfg = loadConfig(); const cfg = loadConfig();
const replyCfg = cfg.inbound?.reply; const replyCfg = cfg.inbound?.reply;
@@ -172,7 +198,6 @@ async function handleRpc(body: any, sessionKey: string): Promise<{ ok: boolean;
const store = loadSessionStore(storePath); const store = loadSessionStore(storePath);
const sessionId = pickSessionId(sessionKey, store) ?? crypto.randomUUID(); const sessionId = pickSessionId(sessionKey, store) ?? crypto.randomUUID();
// Run the agent in-process and capture JSON output instead of spawning the CLI.
const logs: string[] = []; const logs: string[] = [];
const runtime: RuntimeEnv = { const runtime: RuntimeEnv = {
log: (msg: string) => void logs.push(String(msg)), log: (msg: string) => void logs.push(String(msg)),
@@ -189,10 +214,9 @@ async function handleRpc(body: any, sessionKey: string): Promise<{ ok: boolean;
{ {
message: formatMessageWithAttachments(text, savedAttachments), message: formatMessageWithAttachments(text, savedAttachments),
sessionId, sessionId,
thinking: body?.thinking, thinking,
thinkingOnce: body?.thinkingOnce, deliver,
deliver: Boolean(body?.deliver), to,
to: body?.to,
json: true, json: true,
}, },
runtime, runtime,
@@ -222,7 +246,6 @@ export async function startWebChatServer(port = WEBCHAT_DEFAULT_PORT) {
const root = resolveWebRoot(); const root = resolveWebRoot();
const server = http.createServer(async (req, res) => { const server = http.createServer(async (req, res) => {
if (!req.url) return notFound(res); if (!req.url) return notFound(res);
// enforce loopback only
if (req.socket.remoteAddress && !req.socket.remoteAddress.startsWith("127.")) { if (req.socket.remoteAddress && !req.socket.remoteAddress.startsWith("127.")) {
res.statusCode = 403; res.statusCode = 403;
res.end("loopback only"); res.end("loopback only");
@@ -242,9 +265,9 @@ export async function startWebChatServer(port = WEBCHAT_DEFAULT_PORT) {
: resolveStorePath(undefined); : resolveStorePath(undefined);
const store = loadSessionStore(storePath); const store = loadSessionStore(storePath);
const sessionId = pickSessionId(sessionKey, store); const sessionId = pickSessionId(sessionKey, store);
const sessionEntry = sessionKey ? store[sessionKey] : undefined; const messages = sessionId
const persistedThinking = sessionEntry?.thinkingLevel; ? readSessionMessages(sessionId, storePath)
const messages = sessionId ? readSessionMessages(sessionId, storePath) : []; : [];
res.setHeader("Content-Type", "application/json"); res.setHeader("Content-Type", "application/json");
res.end( res.end(
JSON.stringify({ JSON.stringify({
@@ -254,10 +277,6 @@ export async function startWebChatServer(port = WEBCHAT_DEFAULT_PORT) {
sessionId, sessionId,
initialMessages: messages, initialMessages: messages,
basePath: "/", basePath: "/",
thinkingLevel:
typeof persistedThinking === "string"
? persistedThinking
: cfg.inbound?.reply?.thinkingDefault ?? "off",
}), }),
); );
return; return;
@@ -265,13 +284,13 @@ export async function startWebChatServer(port = WEBCHAT_DEFAULT_PORT) {
if (isRpc && req.method === "POST") { if (isRpc && req.method === "POST") {
const bodyBuf = await readBody(req); const bodyBuf = await readBody(req);
let body: any = {}; let body: Record<string, unknown> = {};
try { try {
body = JSON.parse(bodyBuf.toString("utf-8")); body = JSON.parse(bodyBuf.toString("utf-8"));
} catch { } catch {
// ignore // ignore
} }
const sessionKey = body.session || "main"; const sessionKey = typeof body.session === "string" ? body.session : "main";
const result = await handleRpc(body, sessionKey); const result = await handleRpc(body, sessionKey);
res.setHeader("Content-Type", "application/json"); res.setHeader("Content-Type", "application/json");
res.end(JSON.stringify(result)); res.end(JSON.stringify(result));
@@ -280,7 +299,7 @@ export async function startWebChatServer(port = WEBCHAT_DEFAULT_PORT) {
if (url.pathname.startsWith("/webchat")) { if (url.pathname.startsWith("/webchat")) {
let rel = url.pathname.replace(/^\/webchat\/?/, ""); let rel = url.pathname.replace(/^\/webchat\/?/, "");
if (!rel || rel.endsWith("/")) rel = rel + "index.html"; if (!rel || rel.endsWith("/")) rel = `${rel}index.html`;
const filePath = path.join(root, rel); const filePath = path.join(root, rel);
if (!filePath.startsWith(root)) return notFound(res); if (!filePath.startsWith(root)) return notFound(res);
if (!fs.existsSync(filePath)) return notFound(res); if (!fs.existsSync(filePath)) return notFound(res);
@@ -307,22 +326,12 @@ export async function startWebChatServer(port = WEBCHAT_DEFAULT_PORT) {
return; return;
} }
// Static files from root (when served at /)
const relPath = url.pathname.replace(/^\//, ""); const relPath = url.pathname.replace(/^\//, "");
if (relPath) { if (relPath) {
const filePath = path.join(root, relPath); const filePath = path.join(root, relPath);
if (filePath.startsWith(root) && fs.existsSync(filePath)) { if (filePath.startsWith(root) && fs.existsSync(filePath)) {
const data = fs.readFileSync(filePath); const data = fs.readFileSync(filePath);
const ext = path.extname(filePath).toLowerCase(); res.setHeader("Content-Type", "application/octet-stream");
const type =
ext === ".html"
? "text/html"
: ext === ".js"
? "application/javascript"
: ext === ".css"
? "text/css"
: "application/octet-stream";
res.setHeader("Content-Type", type);
res.end(data); res.end(data);
return; return;
} }
@@ -337,7 +346,7 @@ export async function startWebChatServer(port = WEBCHAT_DEFAULT_PORT) {
}); });
state = { server, port }; state = { server, port };
logDebug(info(`webchat server listening on 127.0.0.1:${port}`)); logDebug(`webchat server listening on 127.0.0.1:${port}`);
return state; return state;
} }
@@ -352,13 +361,4 @@ export async function ensureWebChatServerFromConfig() {
throw err; throw err;
} }
} }
*** End
export function getWebChatServer(): WebChatServerState | null {
return state;
}
export async function stopWebChatServer() {
if (!state) return;
await new Promise<void>((resolve) => state?.server.close(() => resolve()));
state = null;
}