openclaw-memory-atmem 2.0.1 → 2.2.0

package/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/README.md

@@ -5,11 +5,15 @@ This npm package is the host bridge for AtMem. It is not a standalone memory eng
 Use the Python-owned installer:
 
 ```bash
-python -m pip install atmem==2.0.1
+python -m pip install --upgrade atmem==2.2.0
 atmem openclaw install
 ```
 
-The installer pins `openclaw-memory-atmem@2.0.1`, binds the exact `atmem` executable, copies existing OpenClaw memory, configures shadow mode, restarts the gateway and verifies the loaded plugin. Direct npm installation cannot perform or prove those steps.
+The installer pins `openclaw-memory-atmem@2.2.0`, binds the exact `atmem` executable, copies existing OpenClaw memory, configures shadow mode, restarts the gateway and verifies the loaded plugin. Direct npm installation cannot perform or prove those steps.
+
+Existing AtMem 2.1 users run `atmem openclaw upgrade` after upgrading the Python
+package. This preserves the current memory mode and migration, verifies the new
+bridge with a self-test flight, and rolls back the bridge on failure.
 
 In shadow mode the bridge observes native-memory changes without injecting AtMem context. In active mode it exposes compatible memory search/get tools, model-semantic capture, bounded recall and native-path protection. `atmem control restore` restores the saved OpenClaw configuration and native memory.
 

package/dist/index.js

@@ -43,6 +43,19 @@ function parseConfig(raw) {
     const cfg = (raw ?? {});
     const dbPath = expandHome(String(cfg.dbPath ?? "~/.atmem/memories.db"));
     const subject = String(cfg.subject ?? "default");
+    const stringMap = (value) => value && typeof value === "object" && !Array.isArray(value)
+        ? Object.fromEntries(Object.entries(value)
+            .filter(([, item]) => typeof item === "string" && item.trim())
+            .map(([key, item]) => [key, String(item)]))
+        : {};
+    const agentSubjects = stringMap(cfg.agentSubjects);
+    const agentWorkspaces = Object.fromEntries(Object.entries(stringMap(cfg.agentWorkspaces)).map(([key, value]) => [key, expandHome(value)]));
+    const nativeWorkspace = expandHome(String(cfg.nativeWorkspace ?? ""));
+    const nativeWorkspaces = [...new Set([
+            ...(Array.isArray(cfg.nativeWorkspaces) ? cfg.nativeWorkspaces.map((item) => expandHome(String(item))) : []),
+            ...Object.values(agentWorkspaces),
+            nativeWorkspace,
+        ].filter(Boolean))];
     const controlPlane = {
         enabled: cfg.controlPlane?.enabled === true,
         statePath: expandHome(String(cfg.controlPlane?.statePath ?? "~/.atmem/control-plane.json")),
@@ -57,8 +70,12 @@ function parseConfig(raw) {
                 : ["mcp", "--db", dbPath, "--subject", subject],
         dbPath,
         subject,
+        defaultAgentId: String(cfg.defaultAgentId ?? "main"),
+        agentSubjects,
+        agentWorkspaces,
         takeoverActive: cfg.takeoverActive === true,
-        nativeWorkspace: expandHome(String(cfg.nativeWorkspace ?? "")),
+        nativeWorkspace,
+        nativeWorkspaces,
         recall: {
             enabled: cfg.recall?.enabled !== false,
             maxRecords: Number(cfg.recall?.maxRecords ?? 3),
@@ -312,7 +329,31 @@ function register(api) {
     const inboundAttachments = new Map();
     const inboundAttachmentGeneration = new Map();
     let nextAttachmentGeneration = 0;
-    const contextIds = (ctx) => [...new Set([ctx.runId, ctx.sessionKey, ctx.sessionId].filter((value) => Boolean(value)))];
+    const agentIdFor = (ctx) => {
+        if (ctx.agentId?.trim())
+            return ctx.agentId.trim();
+        const session = ctx.sessionKey ?? ctx.sessionId ?? "";
+        const match = /^agent:([^:]+)(?::|$)/.exec(session);
+        return match?.[1] ?? cfg.defaultAgentId;
+    };
+    const subjectFor = (ctx) => {
+        const agentId = agentIdFor(ctx);
+        if (Object.keys(cfg.agentSubjects).length) {
+            const mapped = cfg.agentSubjects[agentId];
+            if (!mapped)
+                throw new Error(`unmapped OpenClaw persistent agent: ${agentId}`);
+            return mapped;
+        }
+        return cfg.subject;
+    };
+    const scopedKey = (value, ctx) => `${agentIdFor(ctx)}:${value}`;
+    const contextIds = (ctx) => [...new Set([ctx.runId, ctx.sessionKey, ctx.sessionId].filter((value) => Boolean(value)).map((value) => scopedKey(value, ctx)))];
+    const callFor = (ctx, name, args, timeoutMs = cfg.recall.timeoutMs) => {
+        const scoped = cfg.controlPlane.enabled && !Object.keys(cfg.agentSubjects).length
+            ? args
+            : { ...args, subject_id: subjectFor(ctx) };
+        return client.callTool(name, scoped, timeoutMs);
+    };
     const digestText = (value) => createHash("sha256").update(value, "utf8").digest("hex");
     const stableValue = (value) => {
         if (Array.isArray(value))
@@ -346,6 +387,8 @@ function register(api) {
             await blackboxClient.callTool("control_record_blackbox_event", {
                 event_type: eventType,
                 run_id: flightRunId(eventRunId, ctx),
+                agent_id: agentIdFor(ctx),
+                subject_id: Object.keys(cfg.agentSubjects).length ? subjectFor(ctx) : undefined,
                 session_id: ctx.sessionId ?? ctx.sessionKey,
                 tool_call_id: toolCallId,
                 turn_id: correlation.turnId ?? flightRunId(eventRunId, ctx),
@@ -382,7 +425,7 @@ function register(api) {
         const ids = contextIds(ctx);
         if (!ids.length)
             return;
-        await client.callTool("memory_stage_user_message", {
+        await callFor(ctx, "memory_stage_user_message", {
             message: text.trim(),
             source_aliases: ids,
             run_id: ctx.runId,
@@ -499,7 +542,7 @@ function register(api) {
         const visibleText = responses.map(String).join("");
         const assistantVisibleTextSha256 = digestText(visibleText);
         const modelOutputBundleSha256 = digestJson(responses);
-        const sessionKey = ctx.sessionKey ?? ctx.sessionId ?? event.sessionId ?? "default-session";
+        const sessionKey = scopedKey(ctx.sessionKey ?? ctx.sessionId ?? event.sessionId ?? "default-session", ctx);
         const pending = pendingPrompts.get(sessionKey);
         if (pending) {
             pendingPrompts.set(sessionKey, {
@@ -570,7 +613,7 @@ function register(api) {
     }, { commands: ["atmem"] });
     // L3 persona cache: rebuilt on TTL expiry and invalidated when capture
     // writes new memory, so the snapshot never lags a correction.
-    let personaCache = null;
+    const personaCaches = new Map();
     const sweep = () => {
         const now = Date.now();
         for (const [key, value] of pendingPrompts) {
@@ -582,40 +625,43 @@ function register(api) {
                 inboundAttachments.delete(key);
         }
     };
-    async function personaBlock(sessionKey) {
+    async function personaBlock(sessionKey, ctx) {
         if (!cfg.persona.enabled)
             return { block: "", recordIds: [] };
         const now = Date.now();
+        const subject = subjectFor(ctx);
+        const personaCache = personaCaches.get(subject);
         if (personaCache && now - personaCache.ts < cfg.persona.ttlSeconds * 1000) {
             return personaCache;
         }
-        const result = (await client.callTool("memory_persona", {
+        const result = (await callFor(ctx, "memory_persona", {
             session_id: sessionKey,
             max_chars: cfg.persona.maxChars,
             reference_mode: cfg.cacheAware.enabled && cfg.cacheAware.compactReferences
                 ? "compact"
                 : "full",
         }, cfg.recall.timeoutMs));
-        personaCache = {
+        const refreshed = {
             block: result?.block ?? "",
             recordIds: result?.record_ids ?? [],
             contextEventId: result?.context_event_id,
             ts: now,
         };
-        return personaCache;
+        personaCaches.set(subject, refreshed);
+        return refreshed;
     }
     // ---- auto-recall: persona + bounded, audited recall injection ---------
     api.on("before_prompt_build", async (event, ctx) => {
         const userText = event.prompt;
         if (!userText)
             return;
-        const sessionKey = ctx.sessionKey ?? ctx.sessionId ?? "default-session";
+        const sessionKey = scopedKey(ctx.sessionKey ?? ctx.sessionId ?? "default-session", ctx);
         const takeoverGuidance = cfg.takeoverActive ? TAKEOVER_GUIDANCE : "";
         pendingPrompts.set(sessionKey, { text: userText, ts: Date.now() });
         sweep();
         if (cfg.controlPlane.enabled) {
             try {
-                const prepared = (await client.callTool("control_prepare", { query: userText, session_id: sessionKey }, cfg.recall.timeoutMs));
+                const prepared = (await callFor(ctx, "control_prepare", { query: userText, session_id: sessionKey, agent_id: agentIdFor(ctx) }, cfg.recall.timeoutMs));
                 pendingPrompts.set(sessionKey, {
                     text: userText,
                     ts: Date.now(),
@@ -687,7 +733,7 @@ function register(api) {
         let recall = "";
         let recallFailed = false;
         try {
-            const personaResult = await personaBlock(sessionKey);
+            const personaResult = await personaBlock(sessionKey, ctx);
             persona = personaResult.block;
             personaRecordIds = personaResult.recordIds;
             personaContextEventId = personaResult.contextEventId;
@@ -698,7 +744,7 @@ function register(api) {
         }
         try {
             if (cfg.recall.enabled) {
-                const result = (await client.callTool("memory_recall_block", {
+                const result = (await callFor(ctx, "memory_recall_block", {
                     query: userText,
                     session_id: sessionKey,
                     max_records: cfg.recall.maxRecords,
@@ -803,7 +849,7 @@ function register(api) {
                 ? event.derivedPaths.map((value) => digestText(String(value)))
                 : [],
         }, event.toolCallId);
-        if (!cfg.takeoverActive || !touchesNativeMemory(event, cfg.nativeWorkspace))
+        if (!cfg.takeoverActive || !cfg.nativeWorkspaces.some((workspace) => touchesNativeMemory(event, workspace)))
             return;
         const reason = "AtMem takeover blocked access to OpenClaw's frozen native memory " +
             "(MEMORY.md or memory/*). Use memory_remember for durable user facts, " +
@@ -831,20 +877,20 @@ function register(api) {
     });
     // ---- auto-capture: user turn through the pipeline, assistant as digest -
     api.on("agent_end", async (event, ctx) => {
-        const sessionKey = ctx.sessionKey ?? ctx.sessionId ?? "default-session";
+        const sessionKey = scopedKey(ctx.sessionKey ?? ctx.sessionId ?? "default-session", ctx);
         const cached = pendingPrompts.get(sessionKey);
         pendingPrompts.delete(sessionKey);
         const userText = cached?.text?.replace(INJECT_RE, "").trim();
         try {
             if (cfg.takeoverActive) {
-                await client.callTool("memory_clear_user_message", { source_aliases: contextIds(ctx) }, cfg.recall.timeoutMs);
+                await callFor(ctx, "memory_clear_user_message", { source_aliases: contextIds(ctx) }, cfg.recall.timeoutMs);
             }
             if (cfg.controlPlane.enabled) {
                 if (cached?.exposureId) {
-                    await client.callTool("control_exposure_shown", { exposure_id: cached.exposureId }, cfg.recall.timeoutMs);
+                    await callFor(ctx, "control_exposure_shown", { exposure_id: cached.exposureId }, cfg.recall.timeoutMs);
                 }
                 if (event.success !== false) {
-                    await client.callTool("control_sync_openclaw_memory", {}, cfg.recall.timeoutMs);
+                    await callFor(ctx, "control_sync_openclaw_memory", {}, cfg.recall.timeoutMs);
                 }
                 return;
             }
@@ -857,7 +903,7 @@ function register(api) {
                     const responseText = messageText(message.content);
                     if (responseText) {
                         const assistantVisibleTextSha256 = cached.assistantVisibleTextSha256 ?? digestText(responseText);
-                        await client.callTool("memory_log_action", {
+                        await callFor(ctx, "memory_log_action", {
                             action_type: "agent.response_after_memory",
                             payload: {
                                 response_sha256: assistantVisibleTextSha256,
@@ -882,12 +928,12 @@ function register(api) {
                 !cfg.takeoverActive &&
                 event.success !== false &&
                 userText) {
-                await client.callTool("memory_capture", {
+                await callFor(ctx, "memory_capture", {
                     role: "user",
                     content: userText,
                     session_id: sessionKey,
                 });
-                personaCache = null; // new memory may change the persona
+                personaCaches.delete(subjectFor(ctx)); // new memory may change the persona
             }
             if (cfg.capture.enabled &&
                 !cfg.takeoverActive &&
@@ -899,7 +945,7 @@ function register(api) {
                     if (message?.role === "assistant") {
                         const text = messageText(message.content);
                         if (text) {
-                            await client.callTool("memory_capture", {
+                            await callFor(ctx, "memory_capture", {
                                 role: "assistant",
                                 content: text,
                                 session_id: sessionKey,
@@ -1005,9 +1051,9 @@ function register(api) {
                     additionalProperties: false,
                 },
                 async execute(toolCallId, params) {
-                    const sessionKey = toolCtx.sessionKey ?? toolCtx.sessionId;
-                    const sourceAliases = [toolCtx.sessionKey, toolCtx.sessionId]
-                        .filter((value) => Boolean(value));
+                    const rawSessionKey = toolCtx.sessionKey ?? toolCtx.sessionId;
+                    const sessionKey = rawSessionKey ? scopedKey(rawSessionKey, toolCtx) : undefined;
+                    const sourceAliases = contextIds(toolCtx);
                     if (!sessionKey || !sourceAliases.length) {
                         throw new Error("no current authenticated user message is available; memory was not stored");
                     }
@@ -1019,7 +1065,7 @@ function register(api) {
                             .filter(Boolean)
                             .join(":") ??
                         "openclaw-agent";
-                    const result = (await client.callTool("memory_remember", {
+                    const result = (await callFor(toolCtx, "memory_remember", {
                         source_aliases: sourceAliases,
                         interpreted_fact: fact,
                         interpreted_fact_key: params.factKey,
@@ -1032,7 +1078,7 @@ function register(api) {
                     const duplicateId = result.duplicate_ids?.[0];
                     const stored = Boolean(record || duplicateId);
                     if (stored) {
-                        personaCache = null;
+                        personaCaches.delete(subjectFor(toolCtx));
                     }
                     return {
                         content: [{
@@ -1055,7 +1101,7 @@ function register(api) {
         // is disabled. Existing agent prompts and workflows can keep using the
         // same tool names; only the governed storage/retrieval implementation
         // changes underneath them.
-        api.registerTool({
+        api.registerTool((toolCtx) => ({
             name: "memory_search",
             label: "Memory Search",
             description: "Search governed AtMem long-term memory. Compatible with OpenClaw's " +
@@ -1092,7 +1138,7 @@ function register(api) {
                 }
                 const sessionId = `openclaw-memory-search:${toolCallId}`;
                 const maxResults = Math.min(Math.max(Number(params.maxResults) || 6, 1), 20);
-                const records = (await client.callTool("memory_recall", {
+                const records = (await callFor(toolCtx, "memory_recall", {
                     query: String(params.query ?? ""),
                     session_id: sessionId,
                     limit: maxResults,
@@ -1128,8 +1174,8 @@ function register(api) {
                     details: { count: results.length, corpus, sessionId },
                 };
             },
-        }, { name: "memory_search" });
-        api.registerTool({
+        }), { name: "memory_search" });
+        api.registerTool((toolCtx) => ({
             name: "memory_get",
             label: "Memory Get",
             description: "Read one exact governed AtMem record returned by memory_search. " +
@@ -1150,7 +1196,7 @@ function register(api) {
                 const recordId = recordIdFromPath(lookup);
                 if (!recordId) {
                     const sessionId = `openclaw-memory-get:${toolCallId}`;
-                    const sourceResult = (await client.callTool("memory_get_source", {
+                    const sourceResult = (await callFor(toolCtx, "memory_get_source", {
                         path: lookup,
                         session_id: sessionId,
                     }));
@@ -1188,7 +1234,7 @@ function register(api) {
                     };
                 }
                 const sessionId = `openclaw-memory-get:${toolCallId}`;
-                const result = (await client.callTool("memory_get_record", {
+                const result = (await callFor(toolCtx, "memory_get_record", {
                     record_id: recordId,
                     session_id: sessionId,
                 }));
@@ -1211,8 +1257,8 @@ function register(api) {
                     details: { found: Boolean(result?.record), sessionId },
                 };
             },
-        }, { name: "memory_get" });
-        api.registerTool({
+        }), { name: "memory_get" });
+        api.registerTool((toolCtx) => ({
             name: "atmem_search",
             label: "Memory Search (atmem)",
             description: "Search the user's long-term auditable memory. Use when you need " +
@@ -1228,7 +1274,7 @@ function register(api) {
             },
             async execute(toolCallId, params) {
                 const sessionId = `openclaw-tool:${toolCallId}`;
-                const records = (await client.callTool("memory_recall", {
+                const records = (await callFor(toolCtx, "memory_recall", {
                     query: String(params.query ?? ""),
                     session_id: sessionId,
                     limit: Math.min(Math.max(Number(params.limit) || 5, 1), 20),
@@ -1241,8 +1287,8 @@ function register(api) {
                     details: { count: records.length, sessionId },
                 };
             },
-        }, { name: "atmem_search" });
-        api.registerTool({
+        }), { name: "atmem_search" });
+        api.registerTool((toolCtx) => ({
             name: "atmem_forget",
             label: "Memory Forget (atmem)",
             description: "Delete the user's memories matching their request — only call when " +
@@ -1261,13 +1307,13 @@ function register(api) {
             },
             async execute(toolCallId, params) {
                 const sessionId = `openclaw-tool:${toolCallId}`;
-                const result = (await client.callTool("memory_forget", {
+                const result = (await callFor(toolCtx, "memory_forget", {
                     utterance: String(params.utterance ?? ""),
                     session_id: sessionId,
                     turn_id: toolCallId,
                 }));
                 if (result.deleted)
-                    personaCache = null;
+                    personaCaches.delete(subjectFor(toolCtx));
                 const text = result.deleted
                     ? `Deleted ${result.record_ids.length} memorie(s). Receipt: ${JSON.stringify(result.receipt)}`
                     : "No matching memories found to delete.";
@@ -1276,7 +1322,7 @@ function register(api) {
                     details: { deleted: result.deleted, sessionId },
                 };
             },
-        }, { name: "atmem_forget" });
+        }), { name: "atmem_forget" });
         api.registerTool((toolCtx) => ({
             name: "atmem_observe",
             label: "Media Observation (atmem)",
@@ -1392,7 +1438,7 @@ function register(api) {
                     if (suppliedSegment[key] !== undefined)
                         segment[key] = suppliedSegment[key];
                 }
-                const result = (await client.callTool("memory_observe", {
+                const result = (await callFor(toolCtx, "memory_observe", {
                     text: String(params.text ?? ""),
                     modality: requestedModality,
                     media_sha256: mediaSha256,
@@ -1426,7 +1472,7 @@ function register(api) {
                 };
             },
         }), { name: "atmem_observe" });
-        api.registerTool({
+        api.registerTool((toolCtx) => ({
             name: "atmem_forget_artifact",
             label: "Forget Media Artifact (atmem)",
             description: "Only when the user explicitly requests deletion, purge all AtMem " +
@@ -1448,14 +1494,14 @@ function register(api) {
             },
             async execute(toolCallId, params) {
                 const sessionId = `openclaw-tool:${toolCallId}`;
-                const result = (await client.callTool("memory_forget_artifact", {
+                const result = (await callFor(toolCtx, "memory_forget_artifact", {
                     media_sha256: String(params.media_sha256 ?? ""),
                     artifact_id: params.artifact_id,
                     session_id: sessionId,
                     turn_id: toolCallId,
                 }));
                 if (result.deleted)
-                    personaCache = null;
+                    personaCaches.delete(subjectFor(toolCtx));
                 const text = result.deleted
                     ? `Purged ${result.record_ids.length} derived memorie(s). Receipt: ${JSON.stringify(result.receipt)}`
                     : "No active AtMem artifact matched that exact digest.";
@@ -1464,7 +1510,7 @@ function register(api) {
                     details: { deleted: result.deleted, sessionId },
                 };
             },
-        }, { name: "atmem_forget_artifact" });
+        }), { name: "atmem_forget_artifact" });
     }
     api.logger.info(`${TAG} registered (db=${cfg.dbPath}, subject=${cfg.subject}, ` +
         `recall=${cfg.recall.enabled}, capture=${cfg.capture.enabled}, ` +

package/dist/src/rpc-client.js

@@ -106,7 +106,7 @@ export class AtmemClient {
         });
         child.on("exit", (code) => {
             this.options.logError?.(`[atmem] server exited (code ${code})`);
-            this.teardown(new Error(`atmem server exited (code ${code})`));
+            this.teardown(new Error(`atmem server exited (code ${code})`), child);
         });
         child.on("error", (error) => {
             const spawnError = error;
@@ -119,7 +119,7 @@ export class AtmemClient {
                     ? error
                     : new Error(String(error));
             this.options.logError?.(`[atmem] spawn failed: ${actionable.message}`);
-            this.teardown(actionable);
+            this.teardown(actionable, child);
         });
     }
     async handshake() {
@@ -128,7 +128,7 @@ export class AtmemClient {
             capabilities: {},
             clientInfo: {
                 name: "openclaw-memory-atmem",
-                version: "2.0.1",
+                version: "2.2.0",
             },
         });
         this.notify("notifications/initialized", {});
@@ -176,7 +176,12 @@ export class AtmemClient {
             pending.resolve(message.result);
         }
     }
-    teardown(error) {
+    teardown(error, sourceChild) {
+        // A closed process can emit its exit event after the next request has
+        // already spawned a replacement. Never let that stale event tear down the
+        // live child or reject its requests.
+        if (sourceChild && this.child !== sourceChild)
+            return;
         for (const pending of this.pending.values()) {
             clearTimeout(pending.timer);
             pending.reject(error);

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "memory-atmem",
   "name": "Memory (atmem)",
   "description": "OpenClaw bridge installed and managed by the AtMem memory control plane.",
-  "version": "2.0.1",
+  "version": "2.2.0",
   "commandAliases": ["memory-atmem"],
   "activation": {
     "onStartup": true
@@ -42,6 +42,21 @@
         "default": "default",
         "description": "Subject id used for all memory operations (single-user assistant)"
       },
+      "defaultAgentId": {
+        "type": "string",
+        "default": "main",
+        "description": "Persistent OpenClaw agent used when a legacy hook does not expose an agent id. Managed by AtMem."
+      },
+      "agentSubjects": {
+        "type": "object",
+        "additionalProperties": { "type": "string" },
+        "description": "Persistent-agent to governed-memory-subject map. Agents sharing an exact workspace intentionally share a subject."
+      },
+      "agentWorkspaces": {
+        "type": "object",
+        "additionalProperties": { "type": "string" },
+        "description": "Persistent-agent to canonical workspace map. Managed by AtMem."
+      },
       "takeoverActive": {
         "type": "boolean",
         "default": false,
@@ -51,6 +66,11 @@
         "type": "string",
         "description": "Absolute OpenClaw workspace path protected during verified takeover. Set by `atmem control activate`; do not configure manually."
       },
+      "nativeWorkspaces": {
+        "type": "array",
+        "items": { "type": "string" },
+        "description": "All OpenClaw workspaces protected during takeover, including separate and nested persistent-agent workspaces."
+      },
       "recall": {
         "type": "object",
         "description": "Auto-recall injection before each prompt",

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "openclaw-memory-atmem",
-  "version": "2.0.1",
+  "version": "2.2.0",
   "description": "OpenClaw Agent Black Box and memory control-plane bridge for AtMem",
   "type": "module",
   "main": "./dist/index.js",
   "files": [
+    "LICENSE",
     "dist",
     "openclaw.plugin.json",
     "README.md"
@@ -26,7 +27,7 @@
   "bugs": {
     "url": "https://github.com/aetna000/atmem/issues"
   },
-  "license": "AGPL-3.0-only",
+  "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
   },