@rethinkingstudio/clawpilot 1.1.15-beta.0 → 1.1.15-beta.2

package/src/media/oss-uploader.ts

@@ -0,0 +1,280 @@
+import { createHmac } from "crypto";
+import { randomUUID } from "crypto";
+
+// ---------------------------------------------------------------------------
+// Types
+// ---------------------------------------------------------------------------
+
+export interface StsCredentials {
+  bucket: string;
+  region: string;
+  endpoint: string;
+  baseUrl: string;
+  dirPrefix: string;
+  expiresAt: number;
+  credentials: {
+    accessKeyId: string;
+    accessKeySecret: string;
+    securityToken: string;
+  };
+}
+
+export interface UploadResult {
+  url: string;          // public CDN URL
+  thumbnailUrl?: string; // OSS snapshot URL (video only)
+  mimeType: string;
+  size: number;
+}
+
+// ---------------------------------------------------------------------------
+// OSS HMAC-SHA1 request signing (with STS security token)
+// ---------------------------------------------------------------------------
+
+function ossSign(
+  method: string,
+  contentMd5: string,
+  contentType: string,
+  date: string,
+  canonicalizedHeaders: string,
+  canonicalizedResource: string,
+  secretKey: string
+): string {
+  const stringToSign = [
+    method,
+    contentMd5,
+    contentType,
+    date,
+    canonicalizedHeaders + canonicalizedResource,
+  ].join("\n");
+  return createHmac("sha1", secretKey).update(stringToSign).digest("base64");
+}
+
+// ---------------------------------------------------------------------------
+// Simple PutObject upload (images / small files)
+// ---------------------------------------------------------------------------
+
+export async function putObject(
+  sts: StsCredentials,
+  data: Buffer,
+  ext: string,
+  mimeType: string
+): Promise<UploadResult> {
+  const { bucket, endpoint, baseUrl, dirPrefix, credentials } = sts;
+  const objectKey = `${dirPrefix}/${randomUUID()}${ext}`;
+  const date = new Date().toUTCString();
+  const canonicalizedResource = `/${bucket}/${objectKey}`;
+  const canonicalizedHeaders = `x-oss-security-token:${credentials.securityToken}\n`;
+
+  const sig = ossSign(
+    "PUT",
+    "",
+    mimeType,
+    date,
+    canonicalizedHeaders,
+    canonicalizedResource,
+    credentials.accessKeySecret
+  );
+
+  const url = `${endpoint.replace(/\/$/, "")}/${objectKey}`;
+  const res = await fetch(url, {
+    method: "PUT",
+    headers: {
+      "Content-Type": mimeType,
+      "Date": date,
+      "x-oss-security-token": credentials.securityToken,
+      "Authorization": `OSS ${credentials.accessKeyId}:${sig}`,
+    },
+    body: data as unknown as BodyInit,
+  });
+
+  if (!res.ok) {
+    const text = await res.text().catch(() => "");
+    throw new Error(`OSS PutObject failed: ${res.status} ${text}`);
+  }
+
+  const publicUrl = `${baseUrl.replace(/\/$/, "")}/${objectKey}`;
+  return { url: publicUrl, mimeType, size: data.length };
+}
+
+// ---------------------------------------------------------------------------
+// Multipart upload (videos > 10 MB)
+// ---------------------------------------------------------------------------
+
+const PART_SIZE = 5 * 1024 * 1024; // 5 MB per part
+
+export async function multipartUpload(
+  sts: StsCredentials,
+  data: Buffer,
+  ext: string,
+  mimeType: string
+): Promise<UploadResult> {
+  const { bucket, endpoint, baseUrl, dirPrefix, credentials } = sts;
+  const objectKey = `${dirPrefix}/${randomUUID()}${ext}`;
+  const baseOssUrl = `${endpoint.replace(/\/$/, "")}/${objectKey}`;
+
+  function makeHeaders(
+    method: string,
+    contentType: string,
+    extraHeaders: Record<string, string>,
+    resource: string
+  ): Headers {
+    const date = new Date().toUTCString();
+    const canonicalizedHeaders = [
+      "x-oss-security-token:" + credentials.securityToken,
+      ...Object.entries(extraHeaders)
+        .filter(([k]) => k.startsWith("x-oss-"))
+        .sort()
+        .map(([k, v]) => `${k}:${v}`),
+    ]
+      .sort()
+      .join("\n") + "\n";
+
+    const sig = ossSign(
+      method,
+      "",
+      contentType,
+      date,
+      canonicalizedHeaders,
+      `/${bucket}/${objectKey}`,
+      credentials.accessKeySecret
+    );
+
+    const headers = new Headers({
+      "Date": date,
+      "x-oss-security-token": credentials.securityToken,
+      "Authorization": `OSS ${credentials.accessKeyId}:${sig}`,
+      ...extraHeaders,
+    });
+    if (contentType) headers.set("Content-Type", contentType);
+    return headers;
+  }
+
+  // 1. Initiate
+  const initRes = await fetch(`${baseOssUrl}?uploads`, {
+    method: "POST",
+    headers: makeHeaders("POST", mimeType, {}, `/${bucket}/${objectKey}`),
+  });
+  if (!initRes.ok) throw new Error(`OSS InitiateMultipartUpload failed: ${initRes.status}`);
+  const initText = await initRes.text();
+  const uploadIdMatch = initText.match(/<UploadId>([^<]+)<\/UploadId>/);
+  if (!uploadIdMatch) throw new Error("OSS: could not parse UploadId");
+  const uploadId = uploadIdMatch[1];
+
+  // 2. Upload parts
+  const parts: Array<{ partNumber: number; etag: string }> = [];
+  let partNumber = 1;
+  let offset = 0;
+
+  try {
+    while (offset < data.length) {
+      const chunk = data.slice(offset, offset + PART_SIZE);
+      const partDate = new Date().toUTCString();
+      const canonicalizedHeaders = `x-oss-security-token:${credentials.securityToken}\n`;
+      const sig = ossSign(
+        "PUT", "", "application/octet-stream", partDate,
+        canonicalizedHeaders, `/${bucket}/${objectKey}`,
+        credentials.accessKeySecret
+      );
+      const partRes = await fetch(
+        `${baseOssUrl}?partNumber=${partNumber}&uploadId=${uploadId}`,
+        {
+          method: "PUT",
+          headers: {
+            "Content-Type": "application/octet-stream",
+            "Date": partDate,
+            "x-oss-security-token": credentials.securityToken,
+            "Authorization": `OSS ${credentials.accessKeyId}:${sig}`,
+          },
+          body: chunk as unknown as BodyInit,
+        }
+      );
+      if (!partRes.ok) throw new Error(`OSS UploadPart ${partNumber} failed: ${partRes.status}`);
+      const etag = partRes.headers.get("etag") ?? "";
+      parts.push({ partNumber, etag });
+      partNumber++;
+      offset += PART_SIZE;
+    }
+
+    // 3. Complete
+    const completeBody = [
+      "<CompleteMultipartUpload>",
+      ...parts.map(
+        (p) => `<Part><PartNumber>${p.partNumber}</PartNumber><ETag>${p.etag}</ETag></Part>`
+      ),
+      "</CompleteMultipartUpload>",
+    ].join("");
+
+    const completeDate = new Date().toUTCString();
+    const cHeaders = `x-oss-security-token:${credentials.securityToken}\n`;
+    const cSig = ossSign(
+      "POST", "", "application/xml", completeDate,
+      cHeaders, `/${bucket}/${objectKey}`, credentials.accessKeySecret
+    );
+    const completeRes = await fetch(`${baseOssUrl}?uploadId=${uploadId}`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/xml",
+        "Date": completeDate,
+        "x-oss-security-token": credentials.securityToken,
+        "Authorization": `OSS ${credentials.accessKeyId}:${cSig}`,
+      },
+      body: completeBody,
+    });
+    if (!completeRes.ok) throw new Error(`OSS CompleteMultipartUpload failed: ${completeRes.status}`);
+
+  } catch (err) {
+    // Best-effort abort to avoid billing for incomplete upload
+    try {
+      const abortDate = new Date().toUTCString();
+      const aHeaders = `x-oss-security-token:${credentials.securityToken}\n`;
+      const aSig = ossSign(
+        "DELETE", "", "", abortDate,
+        aHeaders, `/${bucket}/${objectKey}`, credentials.accessKeySecret
+      );
+      await fetch(`${baseOssUrl}?uploadId=${uploadId}`, {
+        method: "DELETE",
+        headers: {
+          "Date": abortDate,
+          "x-oss-security-token": credentials.securityToken,
+          "Authorization": `OSS ${credentials.accessKeyId}:${aSig}`,
+        },
+      });
+    } catch { /* ignore abort errors */ }
+    throw err;
+  }
+
+  const publicUrl = `${baseUrl.replace(/\/$/, "")}/${objectKey}`;
+  // OSS video snapshot thumbnail URL
+  const thumbnailUrl = `${publicUrl}?x-oss-process=video/snapshot,t_0,f_jpg,w_0,h_0,m_fast`;
+  return { url: publicUrl, thumbnailUrl, mimeType, size: data.length };
+}
+
+// ---------------------------------------------------------------------------
+// Convenience: auto-select PutObject vs multipart based on size
+// ---------------------------------------------------------------------------
+
+const MULTIPART_THRESHOLD = 10 * 1024 * 1024; // 10 MB
+
+export async function uploadMedia(
+  sts: StsCredentials,
+  data: Buffer,
+  mimeType: string
+): Promise<UploadResult> {
+  const ext = mimeTypeToExt(mimeType);
+  if (data.length >= MULTIPART_THRESHOLD) {
+    return multipartUpload(sts, data, ext, mimeType);
+  }
+  return putObject(sts, data, ext, mimeType);
+}
+
+function mimeTypeToExt(mimeType: string): string {
+  const map: Record<string, string> = {
+    "image/jpeg": ".jpg",
+    "image/png": ".png",
+    "image/gif": ".gif",
+    "image/webp": ".webp",
+    "video/mp4": ".mp4",
+    "video/quicktime": ".mov",
+  };
+  return map[mimeType] ?? ".bin";
+}

package/src/platform/service-manager.ts

@@ -225,19 +225,23 @@ function installLinuxServiceNohup(): boolean {
 }
 
 function installLinuxService(): boolean {
+  try {
+    if (installLinuxServiceNohup()) {
+      return true;
+    }
+  } catch {
+    // Fall back to systemd below.
+  }
+
   if (canUseSystemdUser()) {
     try {
       return installLinuxServiceSystemd();
     } catch {
-      // Fall back to nohup below.
+      // Give up below.
     }
   }
 
-  try {
-    return installLinuxServiceNohup();
-  } catch {
-    return false;
-  }
+  return false;
 }
 
 function installWindowsService(): boolean {

package/src/relay/relay-manager.ts

@@ -2,6 +2,8 @@ import { WebSocket } from "ws";
 import { OpenClawGatewayClient } from "./gateway-client.js";
 import { handleLocalCommand } from "../commands/local-handlers.js";
 import { handleProviderCommand } from "../commands/provider-handlers.js";
+import { getServicePlatform } from "../platform/service-manager.js";
+import { uploadAssistantAttachments } from "../media/assistant-attachments.js";
 import { homedir } from "os";
 import { join } from "path";
 import { mkdir, writeFile } from "fs/promises";
@@ -19,6 +21,7 @@ const OUTBOUND_DIR = join(homedir(), ".openclaw", "media", "outbound");
 
 /** Messages the relay client sends to the relay server. */
 type ToServer =
+  | { type: "relay_hello"; platform: "macos" | "linux" | "windows" | "unsupported" }
   | { type: "gateway_connected" }
   | { type: "gateway_disconnected"; reason: string }
   | { type: "event"; event: string; payload: unknown }
@@ -82,6 +85,7 @@ export async function runRelayManager(opts: RelayManagerOptions): Promise<boolea
 
     relayWs.on("open", () => {
       console.log(`Connected to relay server (gatewayId=${opts.gatewayId})`);
+      send({ type: "relay_hello", platform: getServicePlatform() });
       opts.onConnected?.();
 
       // Start the persistent gateway connection as soon as we're connected
@@ -102,15 +106,15 @@ export async function runRelayManager(opts: RelayManagerOptions): Promise<boolea
         },
 
         onEvent: (event, payload) => {
-          // On chat final, fetch history to get actual content (OpenClaw 2026.3.2+
-          // no longer includes message content in the chat final event payload).
-          // This mirrors what the macOS 2026.3.2 client does.
+          // On chat final, fetch history to get actual content + extract media attachments.
+          // OpenClaw 2026.3.2+ no longer includes message content in chat final payload.
           if (event === "chat") {
             const p = payload as { state?: string; sessionKey?: string; runId?: string; message?: unknown };
             if (p?.state === "final" && p?.sessionKey) {
               const sessionKey = p.sessionKey;
               const runId = p.runId;
-              type HistoryResponse = { messages?: Array<{ role: string; content?: Array<{ type: string; text?: string }> }> };
+              type ContentBlock = { type: string; text?: string; source?: { type?: string; media_type?: string; data?: string; path?: string } };
+              type HistoryResponse = { messages?: Array<{ role: string; content?: ContentBlock[] }> };
               const fetchHistory = () =>
                 gatewayClient!.request<HistoryResponse>("chat.history", { sessionKey, limit: 10 });
               const extractText = (h: HistoryResponse | undefined) => {
@@ -126,10 +130,28 @@ export async function runRelayManager(opts: RelayManagerOptions): Promise<boolea
                     await new Promise((resolve) => setTimeout(resolve, 600));
                     const retryHistory = await fetchHistory();
                     text = extractText(retryHistory);
+                    history = retryHistory;
                   }
                   if (text) {
                     (p as Record<string, unknown>).message = { content: [{ type: "text", text }] };
                   }
+
+                  // Upload any media blocks found in the history
+                  try {
+                    const attachments = await uploadAssistantAttachments(
+                      history ?? {},
+                      opts.relayServerUrl,
+                      opts.gatewayId,
+                      opts.relaySecret
+                    );
+                    if (attachments.length > 0) {
+                      (p as Record<string, unknown>).attachments = attachments;
+                      console.log(`[relay] chat final: injected ${attachments.length} attachment(s) runId=${runId}`);
+                    }
+                  } catch (mediaErr) {
+                    console.error(`[relay] media upload error (non-fatal): ${mediaErr}`);
+                  }
+
                   console.log(`[relay] chat final (history fetched): runId=${runId} textLength=${text?.length ?? 0}`);
                   send({ type: "event", event, payload });
                 })
@@ -137,7 +159,7 @@ export async function runRelayManager(opts: RelayManagerOptions): Promise<boolea
                   console.error(`[relay] chat.history fetch failed: ${err}`);
                   send({ type: "event", event, payload });
                 });
-              return; // will send after history fetch
+              return; // will send after history fetch + media upload
             }
           }
           send({ type: "event", event, payload });

package/dist/relay/session-proxy.d.ts

@@ -1,18 +0,0 @@
-import { WebSocket } from "ws";
-/**
- * Proxies WebSocket frames between the relay server (via relayWs) and the
- * local OpenClaw Gateway (via a new direct WebSocket connection).
- *
- * All frames are forwarded as raw bytes — no parsing of OpenClaw protocol.
- */
-export declare class SessionProxy {
-    private readonly sessionId;
-    private readonly relayWs;
-    private readonly gatewayUrl;
-    private gwWs;
-    private closed;
-    constructor(sessionId: string, relayWs: WebSocket, gatewayUrl: string);
-    start(): Promise<void>;
-    forwardToGateway(base64Data: string): void;
-    close(): void;
-}

package/dist/relay/session-proxy.js

@@ -1,75 +0,0 @@
-import { WebSocket } from "ws";
-/**
- * Proxies WebSocket frames between the relay server (via relayWs) and the
- * local OpenClaw Gateway (via a new direct WebSocket connection).
- *
- * All frames are forwarded as raw bytes — no parsing of OpenClaw protocol.
- */
-export class SessionProxy {
-    sessionId;
-    relayWs;
-    gatewayUrl;
-    gwWs = null;
-    closed = false;
-    constructor(sessionId, relayWs, gatewayUrl) {
-        this.sessionId = sessionId;
-        this.relayWs = relayWs;
-        this.gatewayUrl = gatewayUrl;
-    }
-    async start() {
-        return new Promise((resolve, reject) => {
-            const gw = new WebSocket(this.gatewayUrl);
-            this.gwWs = gw;
-            const timeout = setTimeout(() => {
-                gw.terminate();
-                reject(new Error(`Timeout connecting to gateway at ${this.gatewayUrl}`));
-            }, 10_000);
-            gw.on("open", () => {
-                clearTimeout(timeout);
-                resolve();
-            });
-            gw.on("error", (err) => {
-                clearTimeout(timeout);
-                if (!this.closed)
-                    reject(err);
-            });
-            // Gateway → relay server
-            gw.on("message", (raw) => {
-                if (this.relayWs.readyState !== WebSocket.OPEN)
-                    return;
-                const data = raw instanceof Buffer ? raw : Buffer.from(raw);
-                const msg = {
-                    ctrl: "DATA",
-                    sessionId: this.sessionId,
-                    data: data.toString("base64"),
-                };
-                this.relayWs.send(JSON.stringify(msg));
-            });
-            gw.on("close", () => {
-                if (!this.closed) {
-                    this.closed = true;
-                    // Notify relay server that session is done
-                    if (this.relayWs.readyState === WebSocket.OPEN) {
-                        const msg = {
-                            ctrl: "SESSION_CLOSE",
-                            sessionId: this.sessionId,
-                        };
-                        this.relayWs.send(JSON.stringify(msg));
-                    }
-                }
-            });
-        });
-    }
-    // Called when DATA arrives from the relay server for this session
-    forwardToGateway(base64Data) {
-        if (!this.gwWs || this.gwWs.readyState !== WebSocket.OPEN)
-            return;
-        const buf = Buffer.from(base64Data, "base64");
-        this.gwWs.send(buf);
-    }
-    close() {
-        this.closed = true;
-        this.gwWs?.close();
-    }
-}
-//# sourceMappingURL=session-proxy.js.map

package/dist/relay/session-proxy.js.map

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