@keychat-io/keychat-openclaw 0.1.15 → 0.1.17

package/openclaw.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "keychat-openclaw",
-  "channels": ["keychat"],
+  "channels": ["keychat-openclaw"],
   "name": "Keychat",
   "description": "Sovereign identity + E2E encrypted chat via Signal Protocol over Nostr relays. Lightning wallet support via LNURL-pay and NWC.",
   "version": "0.1.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keychat-io/keychat-openclaw",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Keychat — E2E encrypted chat + Lightning wallet for OpenClaw agents",
   "license": "AGPL-3.0",
   "repository": {

package/scripts/install.sh

@@ -10,6 +10,13 @@ BINARY="$INSTALL_DIR/bridge/target/release/keychat-openclaw"
 echo "🔑 Installing Keychat"
 echo ""
 
+# ── Clean up conflicting installs ──
+NPM_DIR="${OPENCLAW_EXTENSIONS:-$HOME/.openclaw/extensions}/keychat-openclaw"
+if [ -d "$NPM_DIR" ] && [ "$INSTALL_DIR" != "$NPM_DIR" ]; then
+  echo "🧹 Removing npm-installed copy ($NPM_DIR)..."
+  rm -rf "$NPM_DIR"
+fi
+
 # ── Check OpenClaw ──
 if ! command -v openclaw &>/dev/null; then
   echo "❌ OpenClaw not found. Install it first: https://docs.openclaw.ai"

package/scripts/postinstall.mjs

@@ -4,7 +4,7 @@
  * Runs automatically after `npm install` / `openclaw plugins install`.
  * Uses native fetch/https — no child_process dependency.
  */
-import { existsSync, mkdirSync, chmodSync, writeFileSync, readFileSync } from "node:fs";
+import { existsSync, mkdirSync, chmodSync, writeFileSync, readFileSync, rmSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import https from "node:https";
@@ -25,6 +25,15 @@ const currentVersion = existsSync(versionFile)
   ? readFileSync(versionFile, "utf-8").trim()
   : null;
 
+// Clean up conflicting script-installed copy (extensions/keychat vs extensions/keychat-openclaw)
+const pluginDir = join(__dirname, "..");
+const pluginDirName = pluginDir.split("/").pop();
+const scriptInstallDir = join(pluginDir, "..", "keychat");
+if (pluginDirName === "keychat-openclaw" && existsSync(scriptInstallDir)) {
+  console.log(`[keychat] Removing conflicting script-installed copy...`);
+  try { rmSync(scriptInstallDir, { recursive: true, force: true }); } catch {}
+}
+
 if (existsSync(BINARY_PATH) && currentVersion === pkgVersion) {
   console.log(`[keychat] Binary already exists (v${pkgVersion}), skipping download`);
   process.exit(0);
@@ -87,7 +96,7 @@ try {
   // Don't fail install — user can build manually
 }
 
-// Auto-initialize config if channels.keychat not set
+// Auto-initialize config if channels["keychat-openclaw"] not set
 import { homedir } from "node:os";
 
 const configPath = join(homedir(), ".openclaw", "openclaw.json");
@@ -97,16 +106,23 @@ try {
     config = JSON.parse(readFileSync(configPath, "utf-8"));
   }
 
-  if (config.channels?.keychat) {
+  if (config.channels?.["keychat-openclaw"] || config.channels?.keychat) {
     console.log("[keychat] Config already contains keychat settings, skipping init");
+    // Migrate old channels.keychat → channels.keychat-openclaw
+    if (config.channels?.keychat && !config.channels?.["keychat-openclaw"]) {
+      config.channels["keychat-openclaw"] = config.channels.keychat;
+      delete config.channels.keychat;
+      writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
+      console.log("[keychat] ✅ Migrated channels.keychat → channels.keychat-openclaw");
+    }
   } else {
     if (!config.channels) config.channels = {};
-    config.channels.keychat = { enabled: true, dmPolicy: "open" };
+    config.channels["keychat-openclaw"] = { enabled: true, dmPolicy: "open" };
     writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
-    console.log("[keychat] ✅ Config initialized (channels.keychat.enabled = true)");
+    console.log('[keychat] ✅ Config initialized (channels.keychat-openclaw.enabled = true)');
     console.log("[keychat] Restart gateway to activate: openclaw gateway restart");
   }
 } catch (err) {
   console.warn(`[keychat] Could not auto-configure: ${err.message}`);
-  console.warn("[keychat] Run manually: openclaw config set channels.keychat.enabled true");
+  console.warn('[keychat] Run manually: openclaw config set channels.keychat-openclaw.enabled true');
 }

package/src/bridge-client.ts

@@ -252,6 +252,15 @@ export class KeychatBridgeClient {
           setTimeout(() => reject(new Error("health check timeout")), this.HEALTH_CHECK_TIMEOUT_MS),
         );
         await Promise.race([pingPromise, timeoutPromise]);
+        // Also check relay connectivity and auto-reconnect if needed
+        try {
+          const result = await this.call("relay_health_check") as { reconnected?: boolean };
+          if (result?.reconnected) {
+            console.log(`[keychat-openclaw] Relay health check: reconnected and resubscribed`);
+          }
+        } catch (relayErr) {
+          console.warn(`[keychat-openclaw] Relay health check failed: ${relayErr}`);
+        }
       } catch {
         console.error(`[keychat-openclaw] Health check failed — killing stale process`);
         try { this.process?.kill(); } catch { /* ignore */ }

package/src/channel.ts

@@ -54,6 +54,12 @@ const pendingOutbound: PendingMessage[] = [];
 const MAX_PENDING_QUEUE = 100;
 const MAX_MESSAGE_RETRIES = 5;
 
+// ═══════════════════════════════════════════════════════════════════════════
+// Per-account startup mutex — prevents concurrent startAccount from corrupting state
+// during rapid hot-reloads (e.g. two config changes <1s apart)
+// ═══════════════════════════════════════════════════════════════════════════
+const accountStartupLocks = new Map<string, Promise<void>>();
+
 // ═══════════════════════════════════════════════════════════════════════════
 // Pending hello messages — queued while waiting for session establishment
 // ═══════════════════════════════════════════════════════════════════════════
@@ -327,9 +333,9 @@ function bech32Decode(npub: string): string | null {
 }
 
 export const keychatPlugin: ChannelPlugin<ResolvedKeychatAccount> = {
-  id: "keychat",
+  id: "keychat-openclaw",
   meta: {
-    id: "keychat",
+    id: "keychat-openclaw",
     label: "Keychat",
     selectionLabel: "Keychat (E2E Encrypted)",
     docsPath: "/channels/keychat",
@@ -691,6 +697,18 @@ export const keychatPlugin: ChannelPlugin<ResolvedKeychatAccount> = {
       const runtime = getKeychatRuntime();
       const account = ctx.account;
 
+      // Serialize startAccount calls for the same account — wait for any in-flight
+      // startup/cleanup to finish before proceeding (prevents hot-reload race conditions)
+      const prevLock = accountStartupLocks.get(account.accountId);
+      if (prevLock) {
+        ctx.log?.info(`[${account.accountId}] Waiting for previous startup to finish...`);
+        await prevLock.catch(() => {}); // ignore errors from previous run
+      }
+
+      let lockResolve: () => void;
+      const lock = new Promise<void>((resolve) => { lockResolve = resolve; });
+      accountStartupLocks.set(account.accountId, lock);
+
       ctx.log?.info(`[${account.accountId}] Starting Keychat channel...`);
 
       // Clean up any existing bridge from a previous start
@@ -1139,6 +1157,10 @@ export const keychatPlugin: ChannelPlugin<ResolvedKeychatAccount> = {
         bridgeReadyPromises.delete(account.accountId);
       }
 
+      // Release startup lock — initialization is complete, bridge is ready
+      lockResolve!();
+      ctx.log?.info(`[${account.accountId}] Startup lock released — channel fully initialized`);
+
       // Keep the channel alive until abortSignal fires (OpenClaw expects startAccount
       // to stay pending while the channel is running — resolving triggers auto-restart)
       const abortSignal = (ctx as any).abortSignal as AbortSignal | undefined;
@@ -1152,15 +1174,29 @@ export const keychatPlugin: ChannelPlugin<ResolvedKeychatAccount> = {
         await new Promise<void>(() => {});
       }
 
-      // Cleanup on abort
+      // Cleanup on abort — clear ALL module-level state for this account
+      // to prevent stale data leaking into the next startAccount call
       bridge.disableAutoRestart();
       await bridge.disconnect();
       await bridge.stop();
+      // Clear peerSubscribedAddresses entries for this account's peers BEFORE deleting peer sessions
+      const peersToClean = peerSessionsByAccount.get(account.accountId);
+      if (peersToClean) {
+        for (const [peerPk] of peersToClean) {
+          peerSubscribedAddresses.delete(peerPk);
+        }
+      }
+      // Now clear all per-account state so next startup reads fresh from DB
       activeBridges.delete(account.accountId);
       accountInfoCache.delete(account.accountId);
       bridgeReadyPromises.delete(account.accountId);
       bridgeReadyResolvers.delete(account.accountId);
-      ctx.log?.info(`[${account.accountId}] Keychat provider stopped`);
+      accountStartupLocks.delete(account.accountId);
+      peerSessionsByAccount.delete(account.accountId);
+      addressToPeerByAccount.delete(account.accountId);
+      seenEventIdsByAccount.delete(account.accountId);
+      mlsInitialized.delete(account.accountId);
+      ctx.log?.info(`[${account.accountId}] Keychat provider stopped (all state cleared)`);
     },
   },
 };