openclaw-mobile 1.0.7 → 1.0.8

package/index.ts

@@ -460,7 +460,7 @@ function cleanupRelay(state: RelayState) {
         state.reconnectTimer = null;
     }
     if (state.ws) {
-        try { state.ws.close(); } catch {}
+        try { state.ws.close(); } catch { }
         state.ws = null;
     }
     // Clear all per-session E2E states — new handshakes needed on reconnect
@@ -636,13 +636,14 @@ async function handleRelayMessage(ctx: any, accountId: string, state: RelayState
         const plaintext = await e2eDecrypt(sessionE2E, msg.nonce, msg.ct);
         ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] [E2E] Session ${sessionKey} decrypted: ${plaintext.slice(0, 200)}`);
         const innerMsg = JSON.parse(plaintext);
-        // Preserve sessionKey through decryption so handleInbound can use it
+        innerMsg._connSessionKey = sessionKey; // routing key
         if (!innerMsg.sessionKey) innerMsg.sessionKey = sessionKey;
         await handleInbound(ctx, accountId, innerMsg);
         return;
     }
 
     // Plaintext message (no E2E or during handshake)
+    msg._connSessionKey = msg.sessionKey;
     await handleInbound(ctx, accountId, msg);
 }
 
@@ -677,14 +678,11 @@ async function handleInbound(ctx: any, accountId: string, msg: any) {
             peer: { kind: "direct", id: senderId },
         });
 
-        // If the app specified a sessionKey (UUID-based), derive an isolated
-        // Gateway session so each mobile conversation has its own context.
-        // Format: "agent:main:mobile-<uuid>"
-        // No appSessionKey → use the route's mainSessionKey (default conversation).
         let sessionKey: string;
         const appSessionKey = msg.sessionKey ? String(msg.sessionKey) : null;
+        const connSessionKey = msg._connSessionKey ? String(msg._connSessionKey) : appSessionKey;
+
         if (appSessionKey) {
-            // Extract agent prefix from mainSessionKey e.g. "agent:main:" from "agent:main:main"
             const mainKey = route.mainSessionKey as string;
             const colonIdx = mainKey.lastIndexOf(':');
             const agentPrefix = colonIdx > 0 ? mainKey.substring(0, colonIdx + 1) : '';
@@ -703,7 +701,7 @@ async function handleInbound(ctx: any, accountId: string, msg: any) {
 
         runtime.system.enqueueSystemEvent(
             `Mobile message from ${senderName}: ${text.slice(0, 160)}`,
-            { sessionKey, contextKey: `${CHANNEL_ID}:message:${Date.now()}` },
+            { sessionKey, contextKey: `${CHANNEL_ID}:${Date.now()}` },
         );
 
         const body = runtime.channel.reply.formatInboundEnvelope({
@@ -754,9 +752,11 @@ async function handleInbound(ctx: any, accountId: string, msg: any) {
                     );
                     const chunkMode = runtime.channel.text.resolveChunkMode(cfg, CHANNEL_ID, accountId);
                     const chunks = runtime.channel.text.chunkMarkdownTextWithMode(replyText, textLimit, chunkMode);
-                    // The relay routes plugin→app by sessionKey in the JSON payload
+
                     const replySessionKey = appSessionKey ?? sessionKey;
-                    const sessionE2E = relayState.e2eSessions.get(replySessionKey);
+                    const routingSessionKey = connSessionKey ?? sessionKey;
+                    const sessionE2E = relayState.e2eSessions.get(routingSessionKey);
+
                     for (const chunk of chunks.length > 0 ? chunks : [replyText]) {
                         if (!chunk) continue;
                         const plainMsg = JSON.stringify({
@@ -765,10 +765,17 @@ async function handleInbound(ctx: any, accountId: string, msg: any) {
                             content: chunk,
                             sessionKey: replySessionKey,
                         });
-                        // Encrypt with the per-session key if handshake is complete
-                        const outMsg = sessionE2E?.ready
+
+                        let outMsg = sessionE2E?.ready
                             ? await e2eEncrypt(sessionE2E, plainMsg)
                             : plainMsg;
+
+                        try {
+                            const parsedOut = JSON.parse(outMsg);
+                            parsedOut.sessionKey = routingSessionKey;
+                            outMsg = JSON.stringify(parsedOut);
+                        } catch { }
+
                         relayState.ws.send(outMsg);
                     }
                     ctx.log?.info?.(`[${CHANNEL_ID}] [${accountId}] Reply delivered (${replyText.length} chars) to sessionKey=${replySessionKey}`);

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
     "id": "openclaw-mobile",
     "name": "OpenClaw Mobile",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "description": "Mobile app channel for OpenClaw — chat via the OpenClaw Mobile app through a Cloudflare Worker relay.",
     "channels": [
         "openclaw-mobile"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "openclaw-mobile",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "description": "OpenClaw Mobile channel plugin — relay bridge for the OpenClaw Mobile app",
     "main": "index.ts",
     "type": "module",