gewe-openclaw 2026.3.13 → 2026.3.23

package/src/accounts.ts

@@ -1,6 +1,6 @@
 import { readFileSync } from "node:fs";
 
-import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk";
+import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "./openclaw-compat.js";
 
 import { CHANNEL_CONFIG_KEY } from "./constants.js";
 import type { CoreConfig, GeweAccountConfig, GeweAppIdSource, GeweTokenSource } from "./types.js";
@@ -29,10 +29,47 @@ function listConfiguredAccountIds(cfg: CoreConfig): string[] {
   return [...ids];
 }
 
+export function mergeGeweGroups(
+  baseGroups?: GeweAccountConfig["groups"],
+  accountGroups?: GeweAccountConfig["groups"],
+): GeweAccountConfig["groups"] | undefined {
+  const merged = { ...(baseGroups ?? {}) };
+  for (const [key, value] of Object.entries(accountGroups ?? {})) {
+    merged[key] = merged[key] ? { ...merged[key], ...value } : value;
+  }
+  return Object.keys(merged).length > 0 ? merged : undefined;
+}
+
+export function mergeGeweDms(
+  baseDms?: GeweAccountConfig["dms"],
+  accountDms?: GeweAccountConfig["dms"],
+): GeweAccountConfig["dms"] | undefined {
+  const merged = { ...(baseDms ?? {}) };
+  for (const [key, value] of Object.entries(accountDms ?? {})) {
+    merged[key] = merged[key] ? { ...merged[key], ...value } : value;
+  }
+  return Object.keys(merged).length > 0 ? merged : undefined;
+}
+
+function hasTopLevelDefaultAccount(cfg: CoreConfig): boolean {
+  const section = cfg.channels?.[CHANNEL_CONFIG_KEY];
+  const hasEnvCredentials = Boolean(
+    process.env.GEWE_TOKEN?.trim() || process.env.GEWE_APP_ID?.trim(),
+  );
+  if (!section || typeof section !== "object") return hasEnvCredentials;
+  return (
+    hasEnvCredentials ||
+    Object.keys(section).some((key) => key !== "accounts" && key !== "enabled")
+  );
+}
+
 export function listGeweAccountIds(cfg: CoreConfig): string[] {
-  const ids = listConfiguredAccountIds(cfg);
-  if (ids.length === 0) return [DEFAULT_ACCOUNT_ID];
-  return ids.sort((a, b) => a.localeCompare(b));
+  const ids = new Set(listConfiguredAccountIds(cfg));
+  if (hasTopLevelDefaultAccount(cfg)) {
+    ids.add(DEFAULT_ACCOUNT_ID);
+  }
+  if (ids.size === 0) return [DEFAULT_ACCOUNT_ID];
+  return [...ids].sort((a, b) => a.localeCompare(b));
 }
 
 export function resolveDefaultGeweAccountId(cfg: CoreConfig): string {
@@ -56,7 +93,16 @@ function mergeGeweAccountConfig(cfg: CoreConfig, accountId: string): GeweAccount
     accounts?: unknown;
   };
   const account = resolveAccountConfig(cfg, accountId) ?? {};
-  return { ...base, ...account };
+  const merged = { ...base, ...account };
+  const groups = mergeGeweGroups(base.groups, account.groups);
+  if (groups) {
+    merged.groups = groups;
+  }
+  const dms = mergeGeweDms(base.dms, account.dms);
+  if (dms) {
+    merged.dms = dms;
+  }
+  return merged;
 }
 
 function resolveToken(