clawsocial-plugin 1.6.6 → 1.6.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawsocial-plugin",
-  "version": "1.6.6",
+  "version": "1.6.8",
   "description": "ClawSocial OpenClaw Plugin — social discovery for AI agents",
   "type": "module",
   "author": "ClawSocial",

package/src/api.ts

@@ -35,6 +35,7 @@ async function doRequest<T = unknown>(
     method,
     headers: {
       "Content-Type": "application/json",
+      "X-App-Name": "clawsocial-plugin",
       ...(authToken ? { Authorization: `Bearer ${authToken}` } : {}),
     },
     body: body ? JSON.stringify(body) : undefined,

package/src/store.ts

@@ -79,12 +79,26 @@ function settingsFile(): string {
 }
 
 export function getSettings(): Settings {
-  return { ...DEFAULT_SETTINGS, ...readJSON<Partial<Settings>>(settingsFile(), {}) };
+  const s = readJSON<Partial<Settings>>(settingsFile(), {});
+  if (Object.keys(s).length === 0) {
+    const agentId = getState().agent_id;
+    if (agentId) {
+      const backup = backupRead<Partial<Settings>>(agentId, "settings.json", {});
+      if (Object.keys(backup).length > 0) {
+        writeJSON(settingsFile(), backup);
+        return { ...DEFAULT_SETTINGS, ...backup };
+      }
+    }
+  }
+  return { ...DEFAULT_SETTINGS, ...s };
 }
 
 export function setSettings(data: Partial<Settings>): void {
   const s = getSettings();
-  writeJSON(settingsFile(), { ...s, ...data });
+  const merged = { ...s, ...data };
+  writeJSON(settingsFile(), merged);
+  const agentId = readJSON<AgentState>(stateFile(), {}).agent_id;
+  if (agentId) backupWrite(agentId, "settings.json", merged);
 }
 
 // ── Agent state ─────────────────────────────────────────────────────
@@ -101,17 +115,34 @@ export type AgentState = {
 // ── Sessions ────────────────────────────────────────────────────────
 
 export function getSessions(): SessionsMap {
-  return readJSON<SessionsMap>(sessionsFile(), {});
+  const sessions = readJSON<SessionsMap>(sessionsFile(), {});
+  if (Object.keys(sessions).length === 0) {
+    const agentId = getState().agent_id;
+    if (agentId) {
+      const backup = backupRead<SessionsMap>(agentId, "sessions.json", {});
+      if (Object.keys(backup).length > 0) {
+        writeJSON(sessionsFile(), backup);
+        return backup;
+      }
+    }
+  }
+  return sessions;
 }
 
 export function getSession(id: string): LocalSession | null {
   return getSessions()[id] ?? null;
 }
 
+function writeSessions(sessions: SessionsMap): void {
+  writeJSON(sessionsFile(), sessions);
+  const agentId = readJSON<AgentState>(stateFile(), {}).agent_id;
+  if (agentId) backupWrite(agentId, "sessions.json", sessions);
+}
+
 export function upsertSession(id: string, data: Partial<LocalSession>): LocalSession {
   const sessions = getSessions();
   sessions[id] = { ...(sessions[id] ?? { id, messages: [], unread: 0 }), ...data, id };
-  writeJSON(sessionsFile(), sessions);
+  writeSessions(sessions);
   return sessions[id];
 }
 
@@ -127,59 +158,74 @@ export function addMessage(sessionId: string, msg: LocalMessage): void {
     sessions[sessionId].unread = (sessions[sessionId].unread ?? 0) + 1;
   }
   sessions[sessionId].updated_at = Math.floor(Date.now() / 1000);
-  writeJSON(sessionsFile(), sessions);
+  writeSessions(sessions);
 }
 
 export function markRead(sessionId: string): void {
   const sessions = getSessions();
   if (sessions[sessionId]) {
     sessions[sessionId].unread = 0;
-    writeJSON(sessionsFile(), sessions);
+    writeSessions(sessions);
   }
 }
 
-// ── Credential backup (survives plugin/OpenClaw reinstall) ──────────
+// ── Backup (survives plugin/OpenClaw reinstall) ─────────────────────
+// Backup layout:
+//   ~/.clawsocial/
+//     last_active              ← agent_id of most recently used account
+//     <agent_id>/
+//       credentials.json
+//       sessions.json
+//       settings.json
+//       contacts.json
+
+const BACKUP_ROOT = path.join(os.homedir(), ".clawsocial");
 
-function credentialBackupFile(): string {
-  return path.join(os.homedir(), ".clawsocial", "credentials.json");
+function backupDir(agentId: string): string {
+  return path.join(BACKUP_ROOT, agentId);
 }
 
-function backupCredentials(state: AgentState): void {
-  if (!state.agent_id || !state.api_key) return;
+function backupWrite(agentId: string, name: string, data: unknown): void {
   try {
-    const dir = path.dirname(credentialBackupFile());
+    const dir = backupDir(agentId);
     fs.mkdirSync(dir, { recursive: true });
-    writeJSON(credentialBackupFile(), {
-      agent_id: state.agent_id,
-      api_key: state.api_key,
-      public_name: state.public_name,
-      lang: state.lang,
-    });
+    writeJSON(path.join(dir, name), data);
+    // Update last_active marker
+    fs.writeFileSync(path.join(BACKUP_ROOT, "last_active"), agentId);
   } catch {
     // best-effort backup, don't fail if write fails
   }
 }
 
-function restoreCredentials(): AgentState | null {
+function backupRead<T>(agentId: string, name: string, fallback: T): T {
   try {
-    const backup = readJSON<AgentState>(credentialBackupFile(), {});
-    if (backup.agent_id && backup.api_key) return backup;
+    return readJSON<T>(path.join(backupDir(agentId), name), fallback);
   } catch {
-    // no backup available
+    return fallback;
+  }
+}
+
+function getLastActiveAgentId(): string | null {
+  try {
+    return fs.readFileSync(path.join(BACKUP_ROOT, "last_active"), "utf8").trim() || null;
+  } catch {
+    return null;
   }
-  return null;
 }
 
 // ── Agent state ─────────────────────────────────────────────────────
 
 export function getState(): AgentState {
   const state = readJSON<AgentState>(stateFile(), {});
-  // If state is empty (e.g. after reinstall), try restoring from backup
   if (!state.agent_id || !state.api_key) {
-    const backup = restoreCredentials();
-    if (backup) {
-      writeJSON(stateFile(), backup);
-      return backup;
+    // Try restoring from backup using last_active agent
+    const lastId = getLastActiveAgentId();
+    if (lastId) {
+      const backup = backupRead<AgentState>(lastId, "credentials.json", {});
+      if (backup.agent_id && backup.api_key) {
+        writeJSON(stateFile(), backup);
+        return backup;
+      }
     }
   }
   return state;
@@ -189,8 +235,14 @@ export function setState(data: Partial<AgentState>): void {
   const s = getState();
   const merged = { ...s, ...data };
   writeJSON(stateFile(), merged);
-  // Backup credentials whenever they change
-  backupCredentials(merged);
+  if (merged.agent_id && merged.api_key) {
+    backupWrite(merged.agent_id, "credentials.json", {
+      agent_id: merged.agent_id,
+      api_key: merged.api_key,
+      public_name: merged.public_name,
+      lang: merged.lang,
+    });
+  }
 }
 
 // ── Contacts ─────────────────────────────────────────────────────────
@@ -211,10 +263,20 @@ function contactsFile(): string {
 export function readContacts(): Contact[] {
   try {
     const data = JSON.parse(fs.readFileSync(contactsFile(), "utf8"));
-    return Array.isArray(data?.contacts) ? data.contacts : [];
+    if (Array.isArray(data?.contacts) && data.contacts.length > 0) return data.contacts;
   } catch {
-    return [];
+    // fall through to backup
+  }
+  const agentId = getState().agent_id;
+  if (agentId) {
+    const backup = backupRead<{ contacts?: Contact[] }>(agentId, "contacts.json", {});
+    if (Array.isArray(backup?.contacts) && backup.contacts.length > 0) {
+      fs.mkdirSync(path.dirname(contactsFile()), { recursive: true });
+      fs.writeFileSync(contactsFile(), JSON.stringify({ contacts: backup.contacts }, null, 2));
+      return backup.contacts;
+    }
   }
+  return [];
 }
 
 export function upsertContact(contact: Omit<Contact, "added_at"> & { added_at?: number }): void {
@@ -226,7 +288,10 @@ export function upsertContact(contact: Omit<Contact, "added_at"> & { added_at?:
   } else {
     contacts.push(entry);
   }
-  fs.writeFileSync(contactsFile(), JSON.stringify({ contacts }, null, 2));
+  const data = { contacts };
+  fs.writeFileSync(contactsFile(), JSON.stringify(data, null, 2));
+  const agentId = readJSON<AgentState>(stateFile(), {}).agent_id;
+  if (agentId) backupWrite(agentId, "contacts.json", data);
 }
 
 export function lookupContactByName(name: string): Contact[] {