@sunnoy/wecom 2.2.1 → 2.3.0

package/wecom/workspace-template.js

@@ -220,7 +220,7 @@ export function seedAgentWorkspace(agentId, config, overrideTemplateDir) {
   }
 }
 
-export function upsertAgentIdOnlyEntry(cfg, agentId) {
+export function upsertAgentIdOnlyEntry(cfg, agentId, baseAgentId) {
   const normalizedId = String(agentId || "")
     .trim()
     .toLowerCase();
@@ -252,8 +252,44 @@ export function upsertAgentIdOnlyEntry(cfg, agentId) {
   }
 
   if (!existingIds.has(normalizedId)) {
-    nextList.push({ id: normalizedId, heartbeat: {} });
+    const entry = { id: normalizedId, heartbeat: {} };
+
+    // Inherit inheritable properties from the base agent so the dynamic
+    // agent retains model, subagents (spawn permissions), and tool config.
+    if (baseAgentId) {
+      const baseEntry = currentList.find(
+        (e) => e && typeof e.id === "string" && e.id === baseAgentId,
+      );
+      if (baseEntry) {
+        for (const key of ["model", "subagents", "tools"]) {
+          if (baseEntry[key] != null) {
+            entry[key] = JSON.parse(JSON.stringify(baseEntry[key]));
+          }
+        }
+      }
+    }
+
+    nextList.push(entry);
     changed = true;
+  } else if (baseAgentId) {
+    // Backfill missing inheritable properties on existing entries that were
+    // persisted before the inheritance logic was added.
+    const existingEntry = nextList.find(
+      (e) => e && typeof e.id === "string" && e.id.trim().toLowerCase() === normalizedId,
+    );
+    if (existingEntry) {
+      const baseEntry = currentList.find(
+        (e) => e && typeof e.id === "string" && e.id === baseAgentId,
+      );
+      if (baseEntry) {
+        for (const key of ["model", "subagents", "tools"]) {
+          if (existingEntry[key] == null && baseEntry[key] != null) {
+            existingEntry[key] = JSON.parse(JSON.stringify(baseEntry[key]));
+            changed = true;
+          }
+        }
+      }
+    }
   }
 
   if (changed) {
@@ -263,7 +299,7 @@ export function upsertAgentIdOnlyEntry(cfg, agentId) {
   return changed;
 }
 
-export async function ensureDynamicAgentListed(agentId, templateDir) {
+export async function ensureDynamicAgentListed(agentId, templateDir, baseAgentId) {
   const normalizedId = String(agentId || "")
     .trim()
     .toLowerCase();
@@ -285,7 +321,7 @@ export async function ensureDynamicAgentListed(agentId, templateDir) {
       }
 
       // Upsert into in-memory config so the running gateway sees it immediately.
-      const changed = upsertAgentIdOnlyEntry(openclawConfig, normalizedId);
+      const changed = upsertAgentIdOnlyEntry(openclawConfig, normalizedId, baseAgentId);
       if (changed) {
         logger.info("WeCom: dynamic agent added to in-memory agents.list", { agentId: normalizedId });
 

package/wecom/ws-monitor.js

@@ -63,6 +63,8 @@ import {
   startMessageStateCleanup,
 } from "./ws-state.js";
 import { ensureDynamicAgentListed } from "./workspace-template.js";
+import { listAccountIds, resolveAccount } from "./accounts.js";
+import { loadWelcomeMessagesFromFile } from "./welcome-messages-file.js";
 
 const DEFAULT_AGENT_ID = "main";
 const DEFAULT_STATE_DIRNAME = ".openclaw";
@@ -138,6 +140,11 @@ function buildWaitingModelContent(seconds) {
   return `<think>${lines.join("\n")}`;
 }
 
+function buildWaitingModelReasoningText(seconds) {
+  const normalizedSeconds = Math.max(1, Number.parseInt(String(seconds ?? 1), 10) || 1);
+  return `等待模型响应 ${normalizedSeconds}s`;
+}
+
 function buildWsStreamContent({ reasoningText = "", visibleText = "", finish = false }) {
   const normalizedReasoning = String(reasoningText ?? "").trim();
   const normalizedVisible = String(visibleText ?? "").trim();
@@ -360,10 +367,23 @@ function resolveAgentWorkspaceDir(config, agentId) {
 }
 
 function resolveConfiguredReplyMediaLocalRoots(config) {
-  const roots = Array.isArray(config?.channels?.[CHANNEL_ID]?.mediaLocalRoots)
+  const topLevel = Array.isArray(config?.channels?.[CHANNEL_ID]?.mediaLocalRoots)
     ? config.channels[CHANNEL_ID].mediaLocalRoots
     : [];
-  return roots.map((entry) => resolveUserPath(entry)).filter(Boolean);
+
+  // Also collect mediaLocalRoots from each account entry (multi-account mode).
+  // In single-account mode the account config IS the top-level config, so
+  // listAccountIds returns ["default"] and the roots are already in topLevel.
+  const accountRoots = [];
+  for (const accountId of listAccountIds(config)) {
+    const accountConfig = resolveAccount(config, accountId)?.config;
+    if (Array.isArray(accountConfig?.mediaLocalRoots)) {
+      accountRoots.push(...accountConfig.mediaLocalRoots);
+    }
+  }
+
+  const merged = [...new Set([...topLevel, ...accountRoots])];
+  return merged.map((entry) => resolveUserPath(entry)).filter(Boolean);
 }
 
 function resolveReplyMediaLocalRoots(config, agentId) {
@@ -398,6 +418,7 @@ function buildReplyMediaGuidance(config, agentId) {
   const workspaceDir = resolveAgentWorkspaceDir(config, agentId || resolveDefaultAgentId(config));
   const browserMediaDir = path.join(resolveStateDir(), "media", "browser");
   const configuredRoots = resolveConfiguredReplyMediaLocalRoots(config);
+  const qwenImageToolsConfig = config?.plugins?.entries?.wecom?.config?.qwenImageTools;
   const guidance = [
     WECOM_REPLY_MEDIA_GUIDANCE_HEADER,
     `Local reply files are allowed only under the current workspace: ${workspaceDir}`,
@@ -418,6 +439,19 @@ function buildReplyMediaGuidance(config, agentId) {
     guidance.push(`Additional configured host roots are also allowed: ${configuredRoots.join(", ")}`);
   }
 
+  if (qwenImageToolsConfig?.enabled === true) {
+    guidance.push(
+      "[WeCom image_studio rule]",
+      "When the user asks to generate an image, use image_studio with action=\"generate\".",
+      "When the user asks to edit an existing image, use image_studio with action=\"edit\" and pass images.",
+      "Use aspect=\"landscape\" for architecture diagrams, flowcharts, and banners unless the user asks otherwise.",
+      "Prefer model_preference=\"qwen\" for text-heavy diagrams or label-rich images, and model_preference=\"wan\" for photorealistic scenes.",
+      "For workspace-local images, always use /workspace/... paths when calling image_studio.",
+      "Prefer n=1 unless the user explicitly asks for multiple images.",
+      "If image_studio returns MEDIA: URLs, treat the image task as completed successfully.",
+    );
+  }
+
   guidance.push("Never reference any other host path.");
   return guidance.join("\n");
 }
@@ -563,6 +597,11 @@ async function sendMediaBatch({ wsClient, frame, state, account, runtime, config
 
     if (result.ok) {
       state.hasMedia = true;
+      if (result.finalType === "image") {
+        state.hasImageMedia = true;
+      } else {
+        state.hasFileMedia = true;
+      }
       if (result.downgraded) {
         logger.info(`[WS] Media downgraded: ${result.downgradeNote}`);
       }
@@ -601,7 +640,19 @@ async function finishThinkingStream({ wsClient, frame, state, accountId }) {
       finish: true,
     });
   } else if (state.hasMedia) {
-    finishText = "文件已发送，请查收。";
+    const mediaVisibleText = state.hasImageMedia && !state.hasFileMedia
+      ? "图片已生成，请查收。"
+      : "文件已发送，请查收。";
+    const fallbackReasoningText = state.waitingModelSeconds > 0
+      ? buildWaitingModelReasoningText(state.waitingModelSeconds)
+      : state.hasImageMedia && !state.hasFileMedia
+        ? "正在生成图片"
+        : "正在整理并发送文件";
+    finishText = buildWsStreamContent({
+      reasoningText: fallbackReasoningText,
+      visibleText: mediaVisibleText,
+      finish: true,
+    });
   } else if (state.hasMediaFailed && state.mediaErrorSummary) {
     finishText = state.mediaErrorSummary;
   } else {
@@ -624,6 +675,12 @@ function resolveWelcomeMessage(account) {
     return configured;
   }
 
+  const fromFile = loadWelcomeMessagesFromFile(account?.config);
+  if (fromFile?.length) {
+    const pick = Math.floor(Math.random() * fromFile.length);
+    return fromFile[pick];
+  }
+
   const index = Math.floor(Math.random() * DEFAULT_WELCOME_MESSAGES.length);
   return DEFAULT_WELCOME_MESSAGES[index] || DEFAULT_WELCOME_MESSAGE;
 }
@@ -1160,9 +1217,12 @@ async function processWsMessage({ frame, account, config, runtime, wsClient, req
     replyMediaUrls: [],
     pendingMediaUrls: [],
     hasMedia: false,
+    hasImageMedia: false,
+    hasFileMedia: false,
     hasMediaFailed: false,
     mediaErrorSummary: "",
     deliverCalled: false,
+    waitingModelSeconds: 0,
   };
   setMessageState(messageId, state);
 
@@ -1194,6 +1254,7 @@ async function processWsMessage({ frame, account, config, runtime, wsClient, req
 
   const sendWaitingModelUpdate = async (seconds) => {
     const waitingText = buildWaitingModelContent(seconds);
+    state.waitingModelSeconds = seconds;
     lastStreamSentAt = Date.now();
     lastNonEmptyStreamText = waitingText;
     try {
@@ -1523,6 +1584,7 @@ async function processWsMessage({ frame, account, config, runtime, wsClient, req
   if (account.sendThinkingMessage !== false) {
     waitingModelActive = true;
     waitingModelSeconds = 1;
+    state.waitingModelSeconds = waitingModelSeconds;
     await sendThinkingReply({
       wsClient,
       frame,
@@ -1547,10 +1609,6 @@ async function processWsMessage({ frame, account, config, runtime, wsClient, req
       ? generateAgentId(peerKind, peerId, account.accountId)
       : null;
 
-  if (dynamicAgentId) {
-    await ensureDynamicAgentListed(dynamicAgentId, account.config.workspaceTemplate);
-  }
-
   const route = core.routing.resolveAgentRoute({
     cfg: config,
     channel: CHANNEL_ID,
@@ -1565,8 +1623,15 @@ async function processWsMessage({ frame, account, config, runtime, wsClient, req
     );
 
   if (dynamicAgentId && !hasExplicitBinding) {
+    const routeAgentId = route.agentId;
+    // Use the account's configured agentId as the base for property inheritance
+    // (model, subagents, tools). route.agentId may resolve to "main" when
+    // there is no explicit binding, but the account's agentId points to the
+    // actual parent agent whose properties the dynamic agent should inherit.
+    const baseAgentId = account.config.agentId || routeAgentId;
+    await ensureDynamicAgentListed(dynamicAgentId, account.config.workspaceTemplate, baseAgentId);
+    route.sessionKey = route.sessionKey.replace(`agent:${routeAgentId}:`, `agent:${dynamicAgentId}:`);
     route.agentId = dynamicAgentId;
-    route.sessionKey = `agent:${dynamicAgentId}:${peerKind}:${peerId}`;
   }
 
   const { ctxPayload, storePath } = buildInboundContext({