@agenticmail/openclaw 0.5.51 → 0.5.53

package/dist/index.cjs

@@ -3199,44 +3199,11 @@ function activate(api) {
   if (!api?.on) return;
   api.on("before_agent_start", async (_event, context) => {
     const sessionKey = context?.sessionKey ?? "";
-    let agentApiKey = ctx.config.apiKey;
-    const prependLines = [];
     const isSubAgent = isSubagentSession(sessionKey);
     const taskMode = taskModes.get(sessionKey) || taskModes.get(sessionKey.split(":").pop() || "") || "standard";
-    taskModes.delete(sessionKey);
-    if (isSubAgent && taskMode === "light") {
-      prependLines.push(
-        "<agenticmail-coordination>",
-        "Use agenticmail_complete_task(id, result) to submit your answer in one call.",
-        "</agenticmail-coordination>"
-      );
-    } else if (isSubAgent) {
-      prependLines.push(
-        "<agenticmail-coordination>",
-        "\u{1F380} AgenticMail coordination tools available:",
-        "- agenticmail_call_agent: Call another agent and get structured JSON result (preferred method)",
-        "- agenticmail_check_tasks / claim_task / submit_result / complete_task: Task queue with lifecycle tracking",
-        "- agenticmail_message_agent: Message an agent by name",
-        "- agenticmail_list_agents: Discover available agents",
-        "- agenticmail_check_tasks: Check task status (pending/claimed/completed)",
-        "- agenticmail_wait_for_email: Push-based wait for replies (no polling)",
-        "Prefer these over sessions_spawn/sessions_send for agent coordination.",
-        "</agenticmail-coordination>"
-      );
-    } else {
-      prependLines.push(
-        "<agenticmail-coordination>",
-        "\u{1F380} AgenticMail is installed \u2014 prefer these over sessions_spawn/sessions_send:",
-        '- agenticmail_call_agent(target, task, mode?) \u2192 RPC call, returns structured JSON. Use mode="light" for simple tasks (no email overhead). Use async=true for long-running tasks.',
-        "- agenticmail_message_agent \u2192 message agent by name; agenticmail_list_agents \u2192 discover agents",
-        "- agenticmail_check_tasks \u2192 check task status; agenticmail_wait_for_email \u2192 push-based wait (no polling)",
-        "Use call_agent for ALL agent delegation (sync and async). It auto-detects complexity and spawns sessions.",
-        "</agenticmail-coordination>"
-      );
-    }
     if (isSubAgent && taskMode === "light") {
       console.log(`[agenticmail] Light mode sub-agent (${sessionKey}) \u2014 skipping email provisioning`);
-      return prependLines.length > 0 ? { prependContext: prependLines.join("\n") } : void 0;
+      return;
     }
     if (isSubagentSession(sessionKey) && masterKey) {
       let account = subagentAccounts.get(sessionKey);
@@ -3326,12 +3293,9 @@ function activate(api) {
         }
       }
       if (account) {
-        agentApiKey = account.apiKey;
         const teammates = [];
         for (const [key, sibling] of subagentAccounts) {
-          if (key !== sessionKey) {
-            teammates.push({ name: sibling.name, email: sibling.email });
-          }
+          if (key !== sessionKey) teammates.push({ name: sibling.name, email: sibling.email });
         }
         const rawParentEmail = parentEmail || account.parentEmail;
         const parentLocal = rawParentEmail.split("@")[0];
@@ -3383,6 +3347,61 @@ function activate(api) {
             console.warn(`[agenticmail] Failed to send intro email: ${err.message}`);
           }
         }
+      }
+    }
+  });
+  api.on("before_prompt_build", async (_event, context) => {
+    const sessionKey = context?.sessionKey ?? "";
+    let agentApiKey = ctx.config.apiKey;
+    const prependLines = [];
+    const isSubAgent = isSubagentSession(sessionKey);
+    const taskMode = taskModes.get(sessionKey) || taskModes.get(sessionKey.split(":").pop() || "") || "standard";
+    taskModes.delete(sessionKey);
+    for (const key of taskModes.keys()) {
+      if (key.endsWith(sessionKey.split(":").pop() || "___none___")) taskModes.delete(key);
+    }
+    let systemContext = "";
+    if (isSubAgent && taskMode === "light") {
+      systemContext = [
+        "<agenticmail-coordination>",
+        "Use agenticmail_complete_task(id, result) to submit your answer in one call.",
+        "</agenticmail-coordination>"
+      ].join("\n");
+    } else if (isSubAgent) {
+      systemContext = [
+        "<agenticmail-coordination>",
+        "\u{1F380} AgenticMail coordination tools available:",
+        "- agenticmail_call_agent: Call another agent and get structured JSON result (preferred method)",
+        "- agenticmail_check_tasks / claim_task / submit_result / complete_task: Task queue with lifecycle tracking",
+        "- agenticmail_message_agent: Message an agent by name",
+        "- agenticmail_list_agents: Discover available agents",
+        "- agenticmail_check_tasks: Check task status (pending/claimed/completed)",
+        "- agenticmail_wait_for_email: Push-based wait for replies (no polling)",
+        "Prefer these over sessions_spawn/sessions_send for agent coordination.",
+        "</agenticmail-coordination>"
+      ].join("\n");
+    } else {
+      systemContext = [
+        "<agenticmail-coordination>",
+        "\u{1F380} AgenticMail is installed \u2014 prefer these over sessions_spawn/sessions_send:",
+        '- agenticmail_call_agent(target, task, mode?) \u2192 RPC call, returns structured JSON. Use mode="light" for simple tasks (no email overhead). Use async=true for long-running tasks.',
+        "- agenticmail_message_agent \u2192 message agent by name; agenticmail_list_agents \u2192 discover agents",
+        "- agenticmail_check_tasks \u2192 check task status; agenticmail_wait_for_email \u2192 push-based wait (no polling)",
+        "Use call_agent for ALL agent delegation (sync and async). It auto-detects complexity and spawns sessions.",
+        "</agenticmail-coordination>"
+      ].join("\n");
+    }
+    if (isSubAgent && taskMode === "light") {
+      return { prependSystemContext: systemContext };
+    }
+    if (isSubagentSession(sessionKey)) {
+      const account = subagentAccounts.get(sessionKey);
+      if (account) {
+        agentApiKey = account.apiKey;
+        const teammates = [];
+        for (const [key, sibling] of subagentAccounts) {
+          if (key !== sessionKey) teammates.push({ name: sibling.name, email: sibling.email });
+        }
         const teammateLines = teammates.length > 0 ? [
           "Your teammates (message them by name with agenticmail_message_agent):",
           ...teammates.map((t) => `  - ${t.name} (${t.email})`),
@@ -3456,78 +3475,77 @@ function activate(api) {
         );
       }
     }
-    if (isSubAgent && taskMode === "standard") {
-      return prependLines.length > 0 ? { prependContext: prependLines.join("\n") } : void 0;
-    }
-    if (!agentApiKey) return prependLines.length > 0 ? { prependContext: prependLines.join("\n") } : void 0;
-    try {
-      const headers = { "Authorization": `Bearer ${agentApiKey}` };
-      const searchRes = await fetch(`${baseUrl}/mail/search`, {
-        method: "POST",
-        headers: { ...headers, "Content-Type": "application/json" },
-        body: JSON.stringify({ seen: false }),
-        signal: AbortSignal.timeout(5e3)
-      });
-      if (!searchRes.ok) {
-        return prependLines.length > 0 ? { prependContext: prependLines.join("\n") } : void 0;
-      }
-      const data = await searchRes.json();
-      const uids = data?.uids ?? [];
-      if (uids.length === 0) {
-        return prependLines.length > 0 ? { prependContext: prependLines.join("\n") } : void 0;
-      }
-      let myName = "";
+    if (!(isSubAgent && taskMode === "standard") && agentApiKey) {
       try {
-        const meRes = await fetch(`${baseUrl}/accounts/me`, {
-          headers,
-          signal: AbortSignal.timeout(3e3)
+        const headers = { "Authorization": `Bearer ${agentApiKey}` };
+        const searchRes = await fetch(`${baseUrl}/mail/search`, {
+          method: "POST",
+          headers: { ...headers, "Content-Type": "application/json" },
+          body: JSON.stringify({ seen: false }),
+          signal: AbortSignal.timeout(5e3)
         });
-        if (meRes.ok) {
-          const me = await meRes.json();
-          myName = me?.name ?? "";
-        }
-      } catch {
-      }
-      const summaries = [];
-      for (const uid of uids.slice(0, 5)) {
-        try {
-          const msgRes = await fetch(`${baseUrl}/mail/messages/${uid}`, {
-            headers,
-            signal: AbortSignal.timeout(5e3)
-          });
-          if (!msgRes.ok) continue;
-          const msg = await msgRes.json();
-          const from = msg.from?.[0]?.address ?? "unknown";
-          const subject = msg.subject ?? "(no subject)";
-          const isAgent = from.endsWith("@localhost");
-          const tag = isAgent ? "[agent]" : "[external]";
-          const preview = (msg.text ?? "").slice(0, 200).replace(/\n/g, " ").trim();
-          summaries.push(`  - ${tag} UID ${uid}: from ${from} \u2014 "${subject}"${preview ? "\n    " + preview : ""}`);
-          if (isAgent && myName) {
-            const senderName = from.split("@")[0] ?? "";
-            if (senderName) recordInboundAgentMessage(senderName, myName);
+        if (searchRes.ok) {
+          const data = await searchRes.json();
+          const uids = data?.uids ?? [];
+          if (uids.length > 0) {
+            let myName = "";
+            try {
+              const meRes = await fetch(`${baseUrl}/accounts/me`, {
+                headers,
+                signal: AbortSignal.timeout(3e3)
+              });
+              if (meRes.ok) {
+                const me = await meRes.json();
+                myName = me?.name ?? "";
+              }
+            } catch {
+            }
+            const summaries = [];
+            for (const uid of uids.slice(0, 5)) {
+              try {
+                const msgRes = await fetch(`${baseUrl}/mail/messages/${uid}`, {
+                  headers,
+                  signal: AbortSignal.timeout(5e3)
+                });
+                if (!msgRes.ok) continue;
+                const msg = await msgRes.json();
+                const from = msg.from?.[0]?.address ?? "unknown";
+                const subject = msg.subject ?? "(no subject)";
+                const isAgentMsg = from.endsWith("@localhost");
+                const tag = isAgentMsg ? "[agent]" : "[external]";
+                const preview = (msg.text ?? "").slice(0, 200).replace(/\n/g, " ").trim();
+                summaries.push(`  - ${tag} UID ${uid}: from ${from} \u2014 "${subject}"${preview ? "\n    " + preview : ""}`);
+                if (isAgentMsg && myName) {
+                  const senderName = from.split("@")[0] ?? "";
+                  if (senderName) recordInboundAgentMessage(senderName, myName);
+                }
+              } catch {
+              }
+            }
+            if (summaries.length > 0) {
+              const more = uids.length > 5 ? `
+  (${uids.length - 5} more unread messages not shown)` : "";
+              prependLines.push(
+                "<unread-emails>",
+                `You have ${uids.length} unread email(s) in your inbox:`,
+                ...summaries,
+                more,
+                "",
+                "ACTION REQUIRED: You MUST read each unread email with agenticmail_read and briefly tell the user what it says.",
+                "Do this BEFORE responding to anything else. After reporting emails, continue with your original task.",
+                "Do NOT skip or defer reading emails \u2014 the user expects you to handle their inbox proactively.",
+                "</unread-emails>"
+              );
+            }
           }
-        } catch {
         }
+      } catch {
       }
-      if (summaries.length > 0) {
-        const more = uids.length > 5 ? `
-  (${uids.length - 5} more unread messages not shown)` : "";
-        prependLines.push(
-          "<unread-emails>",
-          `You have ${uids.length} unread email(s) in your inbox:`,
-          ...summaries,
-          more,
-          "",
-          "ACTION REQUIRED: You MUST read each unread email with agenticmail_read and briefly tell the user what it says.",
-          "Do this BEFORE responding to anything else. After reporting emails, continue with your original task.",
-          "Do NOT skip or defer reading emails \u2014 the user expects you to handle their inbox proactively.",
-          "</unread-emails>"
-        );
-      }
-    } catch {
     }
-    return prependLines.length > 0 ? { prependContext: prependLines.filter(Boolean).join("\n") } : void 0;
+    const result = {};
+    if (systemContext) result.prependSystemContext = systemContext;
+    if (prependLines.length > 0) result.prependContext = prependLines.filter(Boolean).join("\n");
+    return Object.keys(result).length > 0 ? result : void 0;
   });
   api.on("before_tool_call", async (event, context) => {
     const toolName = event?.toolName ?? "";
@@ -3597,6 +3615,6 @@ function activate(api) {
   });
 }
 var index_default = {
-  id: "agenticmail",
+  id: "openclaw",
   register: activate
 };

package/dist/index.js

@@ -3163,44 +3163,11 @@ function activate(api) {
   if (!api?.on) return;
   api.on("before_agent_start", async (_event, context) => {
     const sessionKey = context?.sessionKey ?? "";
-    let agentApiKey = ctx.config.apiKey;
-    const prependLines = [];
     const isSubAgent = isSubagentSession(sessionKey);
     const taskMode = taskModes.get(sessionKey) || taskModes.get(sessionKey.split(":").pop() || "") || "standard";
-    taskModes.delete(sessionKey);
-    if (isSubAgent && taskMode === "light") {
-      prependLines.push(
-        "<agenticmail-coordination>",
-        "Use agenticmail_complete_task(id, result) to submit your answer in one call.",
-        "</agenticmail-coordination>"
-      );
-    } else if (isSubAgent) {
-      prependLines.push(
-        "<agenticmail-coordination>",
-        "\u{1F380} AgenticMail coordination tools available:",
-        "- agenticmail_call_agent: Call another agent and get structured JSON result (preferred method)",
-        "- agenticmail_check_tasks / claim_task / submit_result / complete_task: Task queue with lifecycle tracking",
-        "- agenticmail_message_agent: Message an agent by name",
-        "- agenticmail_list_agents: Discover available agents",
-        "- agenticmail_check_tasks: Check task status (pending/claimed/completed)",
-        "- agenticmail_wait_for_email: Push-based wait for replies (no polling)",
-        "Prefer these over sessions_spawn/sessions_send for agent coordination.",
-        "</agenticmail-coordination>"
-      );
-    } else {
-      prependLines.push(
-        "<agenticmail-coordination>",
-        "\u{1F380} AgenticMail is installed \u2014 prefer these over sessions_spawn/sessions_send:",
-        '- agenticmail_call_agent(target, task, mode?) \u2192 RPC call, returns structured JSON. Use mode="light" for simple tasks (no email overhead). Use async=true for long-running tasks.',
-        "- agenticmail_message_agent \u2192 message agent by name; agenticmail_list_agents \u2192 discover agents",
-        "- agenticmail_check_tasks \u2192 check task status; agenticmail_wait_for_email \u2192 push-based wait (no polling)",
-        "Use call_agent for ALL agent delegation (sync and async). It auto-detects complexity and spawns sessions.",
-        "</agenticmail-coordination>"
-      );
-    }
     if (isSubAgent && taskMode === "light") {
       console.log(`[agenticmail] Light mode sub-agent (${sessionKey}) \u2014 skipping email provisioning`);
-      return prependLines.length > 0 ? { prependContext: prependLines.join("\n") } : void 0;
+      return;
     }
     if (isSubagentSession(sessionKey) && masterKey) {
       let account = subagentAccounts.get(sessionKey);
@@ -3290,12 +3257,9 @@ function activate(api) {
         }
       }
       if (account) {
-        agentApiKey = account.apiKey;
         const teammates = [];
         for (const [key, sibling] of subagentAccounts) {
-          if (key !== sessionKey) {
-            teammates.push({ name: sibling.name, email: sibling.email });
-          }
+          if (key !== sessionKey) teammates.push({ name: sibling.name, email: sibling.email });
         }
         const rawParentEmail = parentEmail || account.parentEmail;
         const parentLocal = rawParentEmail.split("@")[0];
@@ -3347,6 +3311,61 @@ function activate(api) {
             console.warn(`[agenticmail] Failed to send intro email: ${err.message}`);
           }
         }
+      }
+    }
+  });
+  api.on("before_prompt_build", async (_event, context) => {
+    const sessionKey = context?.sessionKey ?? "";
+    let agentApiKey = ctx.config.apiKey;
+    const prependLines = [];
+    const isSubAgent = isSubagentSession(sessionKey);
+    const taskMode = taskModes.get(sessionKey) || taskModes.get(sessionKey.split(":").pop() || "") || "standard";
+    taskModes.delete(sessionKey);
+    for (const key of taskModes.keys()) {
+      if (key.endsWith(sessionKey.split(":").pop() || "___none___")) taskModes.delete(key);
+    }
+    let systemContext = "";
+    if (isSubAgent && taskMode === "light") {
+      systemContext = [
+        "<agenticmail-coordination>",
+        "Use agenticmail_complete_task(id, result) to submit your answer in one call.",
+        "</agenticmail-coordination>"
+      ].join("\n");
+    } else if (isSubAgent) {
+      systemContext = [
+        "<agenticmail-coordination>",
+        "\u{1F380} AgenticMail coordination tools available:",
+        "- agenticmail_call_agent: Call another agent and get structured JSON result (preferred method)",
+        "- agenticmail_check_tasks / claim_task / submit_result / complete_task: Task queue with lifecycle tracking",
+        "- agenticmail_message_agent: Message an agent by name",
+        "- agenticmail_list_agents: Discover available agents",
+        "- agenticmail_check_tasks: Check task status (pending/claimed/completed)",
+        "- agenticmail_wait_for_email: Push-based wait for replies (no polling)",
+        "Prefer these over sessions_spawn/sessions_send for agent coordination.",
+        "</agenticmail-coordination>"
+      ].join("\n");
+    } else {
+      systemContext = [
+        "<agenticmail-coordination>",
+        "\u{1F380} AgenticMail is installed \u2014 prefer these over sessions_spawn/sessions_send:",
+        '- agenticmail_call_agent(target, task, mode?) \u2192 RPC call, returns structured JSON. Use mode="light" for simple tasks (no email overhead). Use async=true for long-running tasks.',
+        "- agenticmail_message_agent \u2192 message agent by name; agenticmail_list_agents \u2192 discover agents",
+        "- agenticmail_check_tasks \u2192 check task status; agenticmail_wait_for_email \u2192 push-based wait (no polling)",
+        "Use call_agent for ALL agent delegation (sync and async). It auto-detects complexity and spawns sessions.",
+        "</agenticmail-coordination>"
+      ].join("\n");
+    }
+    if (isSubAgent && taskMode === "light") {
+      return { prependSystemContext: systemContext };
+    }
+    if (isSubagentSession(sessionKey)) {
+      const account = subagentAccounts.get(sessionKey);
+      if (account) {
+        agentApiKey = account.apiKey;
+        const teammates = [];
+        for (const [key, sibling] of subagentAccounts) {
+          if (key !== sessionKey) teammates.push({ name: sibling.name, email: sibling.email });
+        }
         const teammateLines = teammates.length > 0 ? [
           "Your teammates (message them by name with agenticmail_message_agent):",
           ...teammates.map((t) => `  - ${t.name} (${t.email})`),
@@ -3420,78 +3439,77 @@ function activate(api) {
         );
       }
     }
-    if (isSubAgent && taskMode === "standard") {
-      return prependLines.length > 0 ? { prependContext: prependLines.join("\n") } : void 0;
-    }
-    if (!agentApiKey) return prependLines.length > 0 ? { prependContext: prependLines.join("\n") } : void 0;
-    try {
-      const headers = { "Authorization": `Bearer ${agentApiKey}` };
-      const searchRes = await fetch(`${baseUrl}/mail/search`, {
-        method: "POST",
-        headers: { ...headers, "Content-Type": "application/json" },
-        body: JSON.stringify({ seen: false }),
-        signal: AbortSignal.timeout(5e3)
-      });
-      if (!searchRes.ok) {
-        return prependLines.length > 0 ? { prependContext: prependLines.join("\n") } : void 0;
-      }
-      const data = await searchRes.json();
-      const uids = data?.uids ?? [];
-      if (uids.length === 0) {
-        return prependLines.length > 0 ? { prependContext: prependLines.join("\n") } : void 0;
-      }
-      let myName = "";
+    if (!(isSubAgent && taskMode === "standard") && agentApiKey) {
       try {
-        const meRes = await fetch(`${baseUrl}/accounts/me`, {
-          headers,
-          signal: AbortSignal.timeout(3e3)
+        const headers = { "Authorization": `Bearer ${agentApiKey}` };
+        const searchRes = await fetch(`${baseUrl}/mail/search`, {
+          method: "POST",
+          headers: { ...headers, "Content-Type": "application/json" },
+          body: JSON.stringify({ seen: false }),
+          signal: AbortSignal.timeout(5e3)
         });
-        if (meRes.ok) {
-          const me = await meRes.json();
-          myName = me?.name ?? "";
-        }
-      } catch {
-      }
-      const summaries = [];
-      for (const uid of uids.slice(0, 5)) {
-        try {
-          const msgRes = await fetch(`${baseUrl}/mail/messages/${uid}`, {
-            headers,
-            signal: AbortSignal.timeout(5e3)
-          });
-          if (!msgRes.ok) continue;
-          const msg = await msgRes.json();
-          const from = msg.from?.[0]?.address ?? "unknown";
-          const subject = msg.subject ?? "(no subject)";
-          const isAgent = from.endsWith("@localhost");
-          const tag = isAgent ? "[agent]" : "[external]";
-          const preview = (msg.text ?? "").slice(0, 200).replace(/\n/g, " ").trim();
-          summaries.push(`  - ${tag} UID ${uid}: from ${from} \u2014 "${subject}"${preview ? "\n    " + preview : ""}`);
-          if (isAgent && myName) {
-            const senderName = from.split("@")[0] ?? "";
-            if (senderName) recordInboundAgentMessage(senderName, myName);
+        if (searchRes.ok) {
+          const data = await searchRes.json();
+          const uids = data?.uids ?? [];
+          if (uids.length > 0) {
+            let myName = "";
+            try {
+              const meRes = await fetch(`${baseUrl}/accounts/me`, {
+                headers,
+                signal: AbortSignal.timeout(3e3)
+              });
+              if (meRes.ok) {
+                const me = await meRes.json();
+                myName = me?.name ?? "";
+              }
+            } catch {
+            }
+            const summaries = [];
+            for (const uid of uids.slice(0, 5)) {
+              try {
+                const msgRes = await fetch(`${baseUrl}/mail/messages/${uid}`, {
+                  headers,
+                  signal: AbortSignal.timeout(5e3)
+                });
+                if (!msgRes.ok) continue;
+                const msg = await msgRes.json();
+                const from = msg.from?.[0]?.address ?? "unknown";
+                const subject = msg.subject ?? "(no subject)";
+                const isAgentMsg = from.endsWith("@localhost");
+                const tag = isAgentMsg ? "[agent]" : "[external]";
+                const preview = (msg.text ?? "").slice(0, 200).replace(/\n/g, " ").trim();
+                summaries.push(`  - ${tag} UID ${uid}: from ${from} \u2014 "${subject}"${preview ? "\n    " + preview : ""}`);
+                if (isAgentMsg && myName) {
+                  const senderName = from.split("@")[0] ?? "";
+                  if (senderName) recordInboundAgentMessage(senderName, myName);
+                }
+              } catch {
+              }
+            }
+            if (summaries.length > 0) {
+              const more = uids.length > 5 ? `
+  (${uids.length - 5} more unread messages not shown)` : "";
+              prependLines.push(
+                "<unread-emails>",
+                `You have ${uids.length} unread email(s) in your inbox:`,
+                ...summaries,
+                more,
+                "",
+                "ACTION REQUIRED: You MUST read each unread email with agenticmail_read and briefly tell the user what it says.",
+                "Do this BEFORE responding to anything else. After reporting emails, continue with your original task.",
+                "Do NOT skip or defer reading emails \u2014 the user expects you to handle their inbox proactively.",
+                "</unread-emails>"
+              );
+            }
           }
-        } catch {
         }
+      } catch {
       }
-      if (summaries.length > 0) {
-        const more = uids.length > 5 ? `
-  (${uids.length - 5} more unread messages not shown)` : "";
-        prependLines.push(
-          "<unread-emails>",
-          `You have ${uids.length} unread email(s) in your inbox:`,
-          ...summaries,
-          more,
-          "",
-          "ACTION REQUIRED: You MUST read each unread email with agenticmail_read and briefly tell the user what it says.",
-          "Do this BEFORE responding to anything else. After reporting emails, continue with your original task.",
-          "Do NOT skip or defer reading emails \u2014 the user expects you to handle their inbox proactively.",
-          "</unread-emails>"
-        );
-      }
-    } catch {
     }
-    return prependLines.length > 0 ? { prependContext: prependLines.filter(Boolean).join("\n") } : void 0;
+    const result = {};
+    if (systemContext) result.prependSystemContext = systemContext;
+    if (prependLines.length > 0) result.prependContext = prependLines.filter(Boolean).join("\n");
+    return Object.keys(result).length > 0 ? result : void 0;
   });
   api.on("before_tool_call", async (event, context) => {
     const toolName = event?.toolName ?? "";
@@ -3561,7 +3579,7 @@ function activate(api) {
   });
 }
 var index_default = {
-  id: "agenticmail",
+  id: "openclaw",
   register: activate
 };
 export {

package/openclaw.plugin.json

@@ -1,5 +1,5 @@
 {
-  "id": "agenticmail",
+  "id": "openclaw",
   "name": "agenticmail",
   "version": "0.2.0",
   "displayName": "🎀 AgenticMail",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agenticmail/openclaw",
-  "version": "0.5.51",
+  "version": "0.5.53",
   "description": "OpenClaw plugin for AgenticMail — email, SMS, and phone number access for OpenClaw agents",
   "type": "module",
   "main": "dist/index.js",

package/scripts/uninstall.mjs

@@ -21,9 +21,9 @@ try {
 
   let changed = false;
 
-  // Remove plugins.entries.agenticmail
-  if (config.plugins?.entries?.agenticmail) {
-    delete config.plugins.entries.agenticmail;
+  // Remove plugins.entries.openclaw
+  if (config.plugins?.entries?.openclaw) {
+    delete config.plugins.entries.openclaw;
     changed = true;
 
     // Clean up empty entries object

package/skill/SKILL.md

@@ -2,7 +2,7 @@
 name: agenticmail
 description: 🎀 AgenticMail — Full email, SMS, storage & multi-agent coordination for AI agents. 63 tools.
 homepage: https://github.com/agenticmail/agenticmail
-metadata: { "openclaw": { "emoji": "🎀", "primaryEnv": "AGENTICMAIL_API_KEY", "requires": { "bins": ["docker"], "config": ["plugins.entries.agenticmail.config.apiKey"] } } }
+metadata: { "openclaw": { "emoji": "🎀", "primaryEnv": "AGENTICMAIL_API_KEY", "requires": { "bins": ["docker"], "config": ["plugins.entries.openclaw.config.apiKey"] } } }
 ---
 
 # 🎀 AgenticMail