@mcinteerj/openclaw-gmail 1.2.5 → 1.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcinteerj/openclaw-gmail",
-  "version": "1.2.5",
+  "version": "1.2.8",
   "description": "Gmail channel plugin for OpenClaw - uses gog CLI for secure Gmail access",
   "type": "module",
   "main": "index.ts",

package/src/accounts.ts

@@ -17,7 +17,7 @@ export function resolveGmailAccount(
   accountId?: string,
 ): ResolvedGmailAccount {
   const resolvedId = accountId || DEFAULT_ACCOUNT_ID;
-  const account = cfg.channels?.gmail?.accounts?.[resolvedId];
+  const account = cfg.channels?.['openclaw-gmail']?.accounts?.[resolvedId];
 
   if (!account) {
     // Graceful fallback for UI logic that queries 'default' on unconfigured channels
@@ -46,7 +46,7 @@ export function resolveGmailAccount(
 }
 
 export function listGmailAccountIds(cfg: ChannelConfig<GmailConfig>): string[] {
-  return Object.keys(cfg.channels?.gmail?.accounts || {});
+  return Object.keys(cfg.channels?.['openclaw-gmail']?.accounts || {});
 }
 
 export function resolveDefaultGmailAccountId(cfg: ChannelConfig<GmailConfig>): string {

package/src/channel.ts

@@ -211,7 +211,7 @@ export const gmailPlugin: ChannelPlugin<ResolvedGmailAccount> = {
     setAccountEnabled: ({ cfg, accountId, enabled }) =>
       setAccountEnabledInConfigSection({
         cfg,
-        sectionKey: "gmail",
+        sectionKey: "openclaw-gmail",
         accountId,
         enabled,
         allowTopLevel: true,
@@ -219,7 +219,7 @@ export const gmailPlugin: ChannelPlugin<ResolvedGmailAccount> = {
     deleteAccount: ({ cfg, accountId }) =>
       deleteAccountFromConfigSection({
         cfg,
-        sectionKey: "gmail",
+        sectionKey: "openclaw-gmail",
         accountId,
       }),
   },
@@ -277,6 +277,10 @@ export const gmailPlugin: ChannelPlugin<ResolvedGmailAccount> = {
     messageToolHints: ({ cfg, accountId }: { cfg: OpenClawConfig; accountId: string }) => {
       const account = resolveGmailAccount(cfg, accountId);
       return [
+        "### Channel Behavior",
+        "- Email is an async channel—avoid narration or progress updates (each message becomes a separate email).",
+        "- Work silently; send ONE reply when complete. For long-running tasks, notify before starting or after completing.",
+        "",
         "### Gmail Messaging",
         "- To reply to this email, just write your response normally as text in your turn. This will Reply All to everyone on the thread.",
         "- Your Markdown response is automatically converted to a rich HTML email using the `marked` library.",
@@ -331,31 +335,31 @@ export const gmailPlugin: ChannelPlugin<ResolvedGmailAccount> = {
 
       ctx.setStatus({ accountId: ctx.accountId, running: true, connected: true });
 
-      // Create abort signal for stopping the monitor
-      const abortController = new AbortController();
+      // The channel manager treats startAccount's promise resolving as the channel
+      // "exiting", which triggers auto-restart. We must keep this promise pending
+      // until the channel manager signals stop via ctx.abortSignal.
+      const signal = ctx.abortSignal;
 
-      // Start the Gmail polling monitor
-      monitorGmail({
+      // Start the Gmail polling monitor (awaits until signal is aborted)
+      await monitorGmail({
         account: ctx.account,
         onMessage: async (msg) => {
           await dispatchGmailMessage(ctx, msg);
         },
-        signal: abortController.signal,
+        signal,
         log: ctx.log,
         setStatus: ctx.setStatus,
       }).catch((err) => {
-        ctx.log?.error(`[gmail] Monitor error: ${String(err)}`);
+        if (!signal.aborted) {
+          ctx.log?.error(`[gmail] Monitor error: ${String(err)}`);
+        }
       });
 
-      return {
-        stop: async () => {
-          abortController.abort();
-          if (ctx.account.email) {
-            activeAccounts.delete(ctx.account.email.toLowerCase());
-          }
-          ctx.setStatus({ accountId: ctx.accountId, running: false, connected: false });
-        },
-      };
+      // Cleanup after monitor exits
+      if (ctx.account.email) {
+        activeAccounts.delete(ctx.account.email.toLowerCase());
+      }
+      ctx.setStatus({ accountId: ctx.accountId, running: false, connected: false });
     },
   },
 };