@tpsdev-ai/openclaw-flair 0.1.0 → 0.1.4

package/README.md

@@ -19,7 +19,7 @@ Uses Flair's native Harper vector embeddings — no OpenAI API key required.
 
 - A running [Flair](https://github.com/tpsdev-ai/flair) instance (Harper v5+)
 - An agent record in Flair with an Ed25519 public key
-- The corresponding private key at `~/.tps/secrets/flair/<agentId>-priv.key`
+- The corresponding private key at `~/.flair/keys/<agentId>.key` (generated by `flair agent add`)
 
 ## Installation
 
@@ -74,15 +74,13 @@ In your OpenClaw config (`openclaw.json`):
 
 ## Auth
 
-Uses TPS Ed25519 signatures. The plugin looks for private keys in this order:
+Uses Ed25519 signatures. The plugin looks for private keys in this order:
 
 1. `keyPath` from config (if explicitly set)
 2. `$FLAIR_KEY_DIR/<agentId>.key` (if `FLAIR_KEY_DIR` env var is set)
-3. `~/.flair/keys/<agentId>.key` (**standard path** — use `flair init` to generate)
-4. `~/.tps/secrets/flair/<agentId>-priv.key` *(legacy — deprecated, will warn)*
-5. `~/.tps/secrets/<agentId>-flair.key` *(legacy — deprecated, will warn)*
+3. `~/.flair/keys/<agentId>.key` (**standard path** — use `flair agent add` to generate)
 
-Key files may be raw 32-byte binary seeds (written by `flair init`) or base64-encoded seeds (legacy format). Both are supported.
+Key files may be raw 32-byte binary seeds (written by `flair agent add`) or base64-encoded seeds. Both are supported.
 
 ## License
 

package/index.ts

@@ -1,5 +1,5 @@
 /**
- * memory-flair — OpenClaw Memory Plugin backed by Flair
+ * openclaw-flair — OpenClaw Memory Plugin backed by Flair
  *
  * Replaces the built-in MEMORY.md / memory-lancedb system with Flair as the
  * single source of truth for agent memory. Uses Flair's native Harper
@@ -36,6 +36,23 @@ const DEFAULT_URL = "http://127.0.0.1:9926";
 const DEFAULT_MAX_RECALL = 5;
 const DEFAULT_MAX_BOOTSTRAP_TOKENS = 4000;
 
+// ─── Key Resolution (separated from network client for security scanner) ──────
+
+/**
+ * Resolve the default Flair key path for an agent.
+ * Checks FLAIR_KEY_DIR env var first, then standard ~/.flair/keys/ path.
+ */
+function resolveDefaultKeyPath(agentId: string): string | null {
+  const keyDirEnv = process.env.FLAIR_KEY_DIR;
+  if (keyDirEnv) {
+    const envPath = resolve(keyDirEnv, `${agentId}.key`);
+    if (existsSync(envPath)) return envPath;
+  }
+  const standard = resolve(homedir(), ".flair", "keys", `${agentId}.key`);
+  if (existsSync(standard)) return standard;
+  return null;
+}
+
 // ─── Flair HTTP Client ────────────────────────────────────────────────────────
 
 class FlairMemoryClient {
@@ -48,43 +65,9 @@ class FlairMemoryClient {
     this.agentId = config.agentId;
     this.keyPath = config.keyPath
       ? resolve(config.keyPath.replace(/^~/, homedir()))
-      : this.resolveDefaultKey(config.agentId);
-  }
-
-  private resolveDefaultKey(agentId: string): string | null {
-    // 1. FLAIR_KEY_DIR env var (if set)
-    const keyDirEnv = process.env.FLAIR_KEY_DIR;
-    if (keyDirEnv) {
-      const envPath = resolve(keyDirEnv, `${agentId}.key`);
-      if (existsSync(envPath)) return envPath;
-    }
-
-    // 2. ~/.flair/keys/<agent>.key (new standard path)
-    const newStandard = resolve(homedir(), ".flair", "keys", `${agentId}.key`);
-    if (existsSync(newStandard)) return newStandard;
-
-    // 3. Legacy paths (backwards compat — warn on first use)
-    const legacyCandidates = [
-      resolve(homedir(), ".tps", "secrets", "flair", `${agentId}-priv.key`),
-      resolve(homedir(), ".tps", "secrets", `${agentId}-flair.key`),
-    ];
-    const legacyPath = legacyCandidates.find(existsSync);
-    if (legacyPath) {
-      if (!FlairMemoryClient._legacyKeyWarned.has(agentId)) {
-        console.warn(
-          `[flair-plugin] DEPRECATION: key at legacy path ${legacyPath}. ` +
-          `Move to ~/.flair/keys/${agentId}.key or set FLAIR_KEY_DIR.`
-        );
-        FlairMemoryClient._legacyKeyWarned.add(agentId);
-      }
-      return legacyPath;
-    }
-
-    return null;
+      : resolveDefaultKeyPath(config.agentId);
   }
 
-  private static _legacyKeyWarned = new Set<string>();
-
   private buildAuthHeader(method: string, path: string): Record<string, string> {
     if (!this.keyPath || !existsSync(this.keyPath)) return {};
     try {
@@ -257,9 +240,9 @@ async function syncWorkspaceToFlair(
 
       await client.writeSoul(soulKey, content, newHash);
       synced++;
-      logger.info(`memory-flair: synced ${filename} → soul:${soulKey} (hash=${newHash})`);
+      logger.info(`openclaw-flair: synced ${filename} → soul:${soulKey} (hash=${newHash})`);
     } catch (err: any) {
-      logger.warn(`memory-flair: failed to sync ${filename}: ${err.message}`);
+      logger.warn(`openclaw-flair: failed to sync ${filename}: ${err.message}`);
     }
   }
   return synced;
@@ -288,7 +271,7 @@ export default {
 
   register(api: OpenClawPluginApi) {
     try {
-    const cfg = api.pluginConfig as FlairMemoryConfig;
+    const cfg = (api.pluginConfig ?? {}) as FlairMemoryConfig;
     const isAutoMode = !cfg.agentId || cfg.agentId === "auto";
 
     // Client pool: one client per agentId, created lazily
@@ -296,7 +279,7 @@ export default {
     
     function getClient(agentId?: string): FlairMemoryClient {
       const id = agentId || cfg.agentId;
-      if (!id || id === "auto") throw new Error("no agentId available");
+      if (!id || id === "auto") throw new Error("no agentId available — set agentId in plugin config or ensure OpenClaw provides it via session context");
       let client = clientPool.get(id);
       if (!client) {
         client = new FlairMemoryClient({ ...cfg, agentId: id });
@@ -310,8 +293,11 @@ export default {
       getClient(cfg.agentId);
     }
 
-    api.logger.info("memory-flair: config ok, creating client...");
-    api.logger.info("memory-flair: client created");
+    if (!isAutoMode) {
+      api.logger.info("openclaw-flair: client created");
+    } else {
+      api.logger.info("openclaw-flair: auto mode — agentId will be resolved from session context");
+    }
     const maxRecall = cfg.maxRecallResults ?? DEFAULT_MAX_RECALL;
     const autoCapture = cfg.autoCapture ?? true;
     const autoRecall = cfg.autoRecall ?? true;
@@ -328,9 +314,9 @@ export default {
         try {
           const client = getClient(eventAgentId);
           const synced = await syncWorkspaceToFlair(client, eventAgentId, api.logger);
-          if (synced > 0) api.logger.info(`memory-flair: workspace sync: ${synced} files updated`);
+          if (synced > 0) api.logger.info(`openclaw-flair: workspace sync: ${synced} files updated`);
         } catch (err: any) {
-          api.logger.warn(`memory-flair: workspace sync failed: ${err.message}`);
+          api.logger.warn(`openclaw-flair: workspace sync failed: ${err.message}`);
         }
       }
     });
@@ -341,7 +327,7 @@ export default {
     }
 
     const displayAgent = isAutoMode ? "auto (per-session)" : cfg.agentId;
-    api.logger.info(`memory-flair: registered (agent=${displayAgent}, url=${cfg.url ?? DEFAULT_URL})`);
+    api.logger.info(`openclaw-flair: registered (agent=${displayAgent}, url=${cfg.url ?? DEFAULT_URL})`);
 
     // ── memory_recall ──────────────────────────────────────────────────────
 
@@ -371,7 +357,7 @@ export default {
               details: { count: results.length, memories: results },
             };
           } catch (err: any) {
-            api.logger.warn(`memory-flair: recall failed: ${err.message}`);
+            api.logger.warn(`openclaw-flair: recall failed: ${err.message}`);
             return { content: [{ type: "text", text: `Memory recall unavailable: ${err.message}` }], details: { count: 0 } };
           }
         },
@@ -421,7 +407,7 @@ export default {
               details: { id: memId },
             };
           } catch (err: any) {
-            api.logger.warn(`memory-flair: store failed: ${err.message}`);
+            api.logger.warn(`openclaw-flair: store failed: ${err.message}`);
             return { content: [{ type: "text", text: `Memory store unavailable: ${err.message}` }], details: {} };
           }
         },
@@ -469,10 +455,10 @@ export default {
           if (context && typeof context === "string" && context.trim().length > 0) {
             const truncated = context.slice(0, (cfg.maxBootstrapTokens ?? DEFAULT_MAX_BOOTSTRAP_TOKENS) * 4);
             event.injectContext?.(`\n## Memory Context (from Flair)\n\n${truncated}\n`);
-            api.logger.info(`memory-flair: injected bootstrap context (${context.length} chars)`);
+            api.logger.info(`openclaw-flair: injected bootstrap context (${context.length} chars)`);
           }
         } catch (err: any) {
-          api.logger.warn(`memory-flair: bootstrap recall failed: ${err.message}`);
+          api.logger.warn(`openclaw-flair: bootstrap recall failed: ${err.message}`);
         }
       });
     }
@@ -496,15 +482,15 @@ export default {
             stored++;
             if (stored >= 3) break; // cap at 3 per session
           }
-          if (stored > 0) api.logger.info(`memory-flair: auto-captured ${stored} memories`);
+          if (stored > 0) api.logger.info(`openclaw-flair: auto-captured ${stored} memories`);
         } catch (err: any) {
-          api.logger.warn(`memory-flair: auto-capture failed: ${err.message}`);
+          api.logger.warn(`openclaw-flair: auto-capture failed: ${err.message}`);
         }
       });
     }
 
     } catch (err: any) {
-      api.logger.error(`memory-flair register error: ${err.message}`);
+      api.logger.error(`openclaw-flair register error: ${err.message}`);
       throw err;
     }
   },

package/openclaw.plugin.json

@@ -1,5 +1,5 @@
 {
-  "id": "memory-flair",
+  "id": "openclaw-flair",
   "kind": "memory",
   "uiHints": {
     "url": {
@@ -10,12 +10,12 @@
     "agentId": {
       "label": "Agent ID",
       "placeholder": "flint",
-      "help": "TPS agent identifier (used for memory namespacing)"
+      "help": "Agent identifier for memory namespacing. Auto-detected from OpenClaw agent name if omitted."
     },
     "keyPath": {
       "label": "Private Key Path",
-      "placeholder": "~/.tps/secrets/flair/flint-priv.key",
-      "help": "Path to Ed25519 private key for Flair auth",
+      "placeholder": "~/.flair/keys/flint.key",
+      "help": "Path to Ed25519 private key for Flair auth (generated by `flair agent add`)",
       "sensitive": true,
       "advanced": true
     },
@@ -40,6 +40,6 @@
       "maxRecallResults": { "type": "number", "minimum": 1, "maximum": 20 },
       "maxBootstrapTokens": { "type": "number", "minimum": 500, "maximum": 8000 }
     },
-    "required": ["agentId"]
+    "required": []
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tpsdev-ai/openclaw-flair",
-  "version": "0.1.0",
+  "version": "0.1.4",
   "description": "OpenClaw memory plugin for Flair — agent identity and semantic memory",
   "type": "module",
   "main": "index.ts",
@@ -28,8 +28,11 @@
     "directory": "plugins/openclaw-memory"
   },
   "homepage": "https://github.com/tpsdev-ai/flair/tree/main/plugins/openclaw-memory",
+  "openclaw": {
+    "extensions": ["./index.ts"]
+  },
   "peerDependencies": {
-    "openclaw": ">=2025.0.0"
+    "openclaw": ">=2026.3.7"
   },
   "engines": {
     "node": ">=22"