@searchfe/openclaw-baiduapp 0.1.4 → 0.1.5

package/dist/index.js

@@ -6,6 +6,173 @@ var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
+function decodeEncodingAESKey(encodingAESKey) {
+  const trimmed = encodingAESKey.trim();
+  if (!trimmed) {
+    throw new Error("encodingAESKey missing");
+  }
+  const withPadding = trimmed.endsWith("=") ? trimmed : `${trimmed}=`;
+  const key = Buffer.from(withPadding, "base64");
+  if (key.length !== 32) {
+    throw new Error(`invalid encodingAESKey (expected 32 bytes after base64 decode, got ${key.length})`);
+  }
+  return key;
+}
+var PKCS7_BLOCK_SIZE = 32;
+function pkcs7Pad(buf, blockSize) {
+  const mod = buf.length % blockSize;
+  const pad = mod === 0 ? blockSize : blockSize - mod;
+  return Buffer.concat([buf, Buffer.alloc(pad, pad)]);
+}
+function pkcs7Unpad(buf, blockSize) {
+  if (buf.length === 0) {
+    throw new Error("invalid pkcs7 payload");
+  }
+  const pad = buf[buf.length - 1];
+  if (!pad || pad < 1 || pad > blockSize || pad > buf.length) {
+    throw new Error("invalid pkcs7 padding");
+  }
+  for (let i = 1; i <= pad; i += 1) {
+    if (buf[buf.length - i] !== pad) {
+      throw new Error("invalid pkcs7 padding");
+    }
+  }
+  return buf.subarray(0, buf.length - pad);
+}
+function sha1Hex(input) {
+  return crypto.createHash("sha1").update(input).digest("hex");
+}
+function computeBaiduAppMsgSignature(params) {
+  const parts = [params.token, params.timestamp, params.nonce, params.encrypt].map((value) => String(value ?? "")).sort();
+  return sha1Hex(parts.join(""));
+}
+function verifyBaiduAppSignature(params) {
+  const expected = computeBaiduAppMsgSignature({
+    token: params.token,
+    timestamp: params.timestamp,
+    nonce: params.nonce,
+    encrypt: params.encrypt
+  });
+  return expected === params.signature;
+}
+function decryptBaiduAppEncrypted(params) {
+  const aesKey = decodeEncodingAESKey(params.encodingAESKey);
+  const iv = aesKey.subarray(0, 16);
+  const decipher = crypto.createDecipheriv("aes-256-cbc", aesKey, iv);
+  decipher.setAutoPadding(false);
+  const decryptedPadded = Buffer.concat([decipher.update(Buffer.from(params.encrypt, "base64")), decipher.final()]);
+  const decrypted = pkcs7Unpad(decryptedPadded, PKCS7_BLOCK_SIZE);
+  if (decrypted.length < 20) {
+    throw new Error(`invalid decrypted payload (expected at least 20 bytes, got ${decrypted.length})`);
+  }
+  const msgLen = decrypted.readUInt32BE(16);
+  const msgStart = 20;
+  const msgEnd = msgStart + msgLen;
+  if (msgEnd > decrypted.length) {
+    throw new Error(`invalid decrypted msg length (msgEnd=${msgEnd}, payloadLength=${decrypted.length})`);
+  }
+  return decrypted.subarray(msgStart, msgEnd).toString("utf8");
+}
+function encryptBaiduAppPlaintext(params) {
+  const aesKey = decodeEncodingAESKey(params.encodingAESKey);
+  const iv = aesKey.subarray(0, 16);
+  const random16 = crypto.randomBytes(16);
+  const msg = Buffer.from(params.plaintext ?? "", "utf8");
+  const msgLen = Buffer.alloc(4);
+  msgLen.writeUInt32BE(msg.length, 0);
+  const raw = Buffer.concat([random16, msgLen, msg]);
+  const padded = pkcs7Pad(raw, PKCS7_BLOCK_SIZE);
+  const cipher = crypto.createCipheriv("aes-256-cbc", aesKey, iv);
+  cipher.setAutoPadding(false);
+  const encrypted = Buffer.concat([cipher.update(padded), cipher.final()]);
+  return encrypted.toString("base64");
+}
+
+// src/shared/logger.ts
+function createLogger(prefix, opts) {
+  const logFn = opts?.log ?? console.log;
+  const errorFn = opts?.error ?? console.error;
+  return {
+    debug: (msg) => logFn(`[${prefix}] [DEBUG] ${msg}`),
+    info: (msg) => logFn(`[${prefix}] ${msg}`),
+    warn: (msg) => logFn(`[${prefix}] [WARN] ${msg}`),
+    error: (msg) => errorFn(`[${prefix}] [ERROR] ${msg}`)
+  };
+}
+var require2 = createRequire(import.meta.url);
+var pkg = require2("../package.json");
+var PLUGIN_VERSION = pkg.version;
+
+// src/api.ts
+var logger = createLogger("openclaw-baiduapp");
+async function sendBaiduAppMessage(account, message, options) {
+  if (!account.canSendActive) {
+    logger.error("Account not configured for active sending (missing appKey, token, or encodingAESKey)");
+    return {
+      ok: false,
+      errcode: -1,
+      errmsg: "Account not configured for active sending (missing appKey, token, or encodingAESKey)"
+    };
+  }
+  const payload = {
+    msgtype: "text",
+    text: { content: message },
+    version: PLUGIN_VERSION,
+    ...options?.msgid != null ? { msgid: options.msgid } : {},
+    ...options?.streamId != null ? { streamId: options.streamId } : {},
+    ...options?.chunkKey != null ? { chunkKey: options.chunkKey } : {}
+  };
+  const plaintext = JSON.stringify(payload);
+  const encrypt = encryptBaiduAppPlaintext({
+    encodingAESKey: account.encodingAESKey ?? "",
+    plaintext
+  });
+  const timestamp = String(Math.floor(Date.now() / 1e3));
+  const nonce = crypto.randomBytes(8).toString("hex");
+  const msgSignature = computeBaiduAppMsgSignature({
+    token: account.token ?? "",
+    timestamp,
+    nonce,
+    encrypt
+  });
+  const sendMessageUrl = `${account.apiBase}/chat/openclaw/callback`;
+  const url = `${sendMessageUrl}?timestamp=${encodeURIComponent(timestamp)}&ak=${encodeURIComponent(account.appKey ?? "")}&nonce=${encodeURIComponent(nonce)}&msg_signature=${encodeURIComponent(msgSignature)}`;
+  const body = JSON.stringify({ encrypt });
+  logger.info(`POST ${url}`);
+  logger.debug(`request body: ${body}`);
+  const resp = await fetch(url, {
+    method: "POST",
+    body,
+    headers: { "Content-Type": "application/json" }
+  });
+  const text = await resp.text();
+  if (!text) {
+    const errmsg = `empty response from server (status=${resp.status})`;
+    logger.error(`request failed: ${errmsg}`);
+    return { ok: false, errcode: resp.status, errmsg };
+  }
+  let data;
+  try {
+    data = JSON.parse(text);
+  } catch {
+    const errmsg = `invalid JSON response (status=${resp.status}, body=${text.slice(0, 200)})`;
+    logger.error(`request failed: ${errmsg}`);
+    return { ok: false, errcode: resp.status, errmsg };
+  }
+  const result = {
+    ok: data.errcode === 0,
+    errcode: data.errcode,
+    errmsg: data.errmsg,
+    invaliduser: data.invaliduser,
+    msgid: data.msgid
+  };
+  if (result.ok) {
+    logger.info(`request succeeded: msgid=${result.msgid ?? "unknown"}`);
+  } else {
+    logger.error(`request failed: errcode=${result.errcode} errmsg=${result.errmsg ?? "unknown"}`);
+  }
+  return result;
+}
 
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/external.js
 var external_exports = {};
@@ -4171,172 +4338,15 @@ function resolveBaiduAppAccount(params) {
     config: merged
   };
 }
-
-// src/shared/logger.ts
-function createLogger(prefix, opts) {
-  const logFn = opts?.log ?? console.log;
-  const errorFn = opts?.error ?? console.error;
-  return {
-    debug: (msg) => logFn(`[${prefix}] [DEBUG] ${msg}`),
-    info: (msg) => logFn(`[${prefix}] ${msg}`),
-    warn: (msg) => logFn(`[${prefix}] [WARN] ${msg}`),
-    error: (msg) => errorFn(`[${prefix}] [ERROR] ${msg}`)
-  };
-}
-function decodeEncodingAESKey(encodingAESKey) {
-  const trimmed = encodingAESKey.trim();
-  if (!trimmed) {
-    throw new Error("encodingAESKey missing");
-  }
-  const withPadding = trimmed.endsWith("=") ? trimmed : `${trimmed}=`;
-  const key = Buffer.from(withPadding, "base64");
-  if (key.length !== 32) {
-    throw new Error(`invalid encodingAESKey (expected 32 bytes after base64 decode, got ${key.length})`);
-  }
-  return key;
-}
-var PKCS7_BLOCK_SIZE = 32;
-function pkcs7Pad(buf, blockSize) {
-  const mod = buf.length % blockSize;
-  const pad = mod === 0 ? blockSize : blockSize - mod;
-  return Buffer.concat([buf, Buffer.alloc(pad, pad)]);
-}
-function pkcs7Unpad(buf, blockSize) {
-  if (buf.length === 0) {
-    throw new Error("invalid pkcs7 payload");
-  }
-  const pad = buf[buf.length - 1];
-  if (!pad || pad < 1 || pad > blockSize || pad > buf.length) {
-    throw new Error("invalid pkcs7 padding");
-  }
-  for (let i = 1; i <= pad; i += 1) {
-    if (buf[buf.length - i] !== pad) {
-      throw new Error("invalid pkcs7 padding");
+function findAccountIdByAppKey(cfg, appKey) {
+  const ids = listBaiduAppAccountIds(cfg);
+  for (const id of ids) {
+    const account = resolveBaiduAppAccount({ cfg, accountId: id });
+    if (account.appKey === appKey) {
+      return id;
     }
   }
-  return buf.subarray(0, buf.length - pad);
-}
-function sha1Hex(input) {
-  return crypto.createHash("sha1").update(input).digest("hex");
-}
-function computeBaiduAppMsgSignature(params) {
-  const parts = [params.token, params.timestamp, params.nonce, params.encrypt].map((value) => String(value ?? "")).sort();
-  return sha1Hex(parts.join(""));
-}
-function verifyBaiduAppSignature(params) {
-  const expected = computeBaiduAppMsgSignature({
-    token: params.token,
-    timestamp: params.timestamp,
-    nonce: params.nonce,
-    encrypt: params.encrypt
-  });
-  return expected === params.signature;
-}
-function decryptBaiduAppEncrypted(params) {
-  const aesKey = decodeEncodingAESKey(params.encodingAESKey);
-  const iv = aesKey.subarray(0, 16);
-  const decipher = crypto.createDecipheriv("aes-256-cbc", aesKey, iv);
-  decipher.setAutoPadding(false);
-  const decryptedPadded = Buffer.concat([decipher.update(Buffer.from(params.encrypt, "base64")), decipher.final()]);
-  const decrypted = pkcs7Unpad(decryptedPadded, PKCS7_BLOCK_SIZE);
-  if (decrypted.length < 20) {
-    throw new Error(`invalid decrypted payload (expected at least 20 bytes, got ${decrypted.length})`);
-  }
-  const msgLen = decrypted.readUInt32BE(16);
-  const msgStart = 20;
-  const msgEnd = msgStart + msgLen;
-  if (msgEnd > decrypted.length) {
-    throw new Error(`invalid decrypted msg length (msgEnd=${msgEnd}, payloadLength=${decrypted.length})`);
-  }
-  return decrypted.subarray(msgStart, msgEnd).toString("utf8");
-}
-function encryptBaiduAppPlaintext(params) {
-  const aesKey = decodeEncodingAESKey(params.encodingAESKey);
-  const iv = aesKey.subarray(0, 16);
-  const random16 = crypto.randomBytes(16);
-  const msg = Buffer.from(params.plaintext ?? "", "utf8");
-  const msgLen = Buffer.alloc(4);
-  msgLen.writeUInt32BE(msg.length, 0);
-  const raw = Buffer.concat([random16, msgLen, msg]);
-  const padded = pkcs7Pad(raw, PKCS7_BLOCK_SIZE);
-  const cipher = crypto.createCipheriv("aes-256-cbc", aesKey, iv);
-  cipher.setAutoPadding(false);
-  const encrypted = Buffer.concat([cipher.update(padded), cipher.final()]);
-  return encrypted.toString("base64");
-}
-var require2 = createRequire(import.meta.url);
-var pkg = require2("../package.json");
-var PLUGIN_VERSION = pkg.version;
-
-// src/api.ts
-var logger = createLogger("openclaw-baiduapp");
-async function sendBaiduAppMessage(account, message, options) {
-  if (!account.canSendActive) {
-    logger.error("Account not configured for active sending (missing appKey, token, or encodingAESKey)");
-    return {
-      ok: false,
-      errcode: -1,
-      errmsg: "Account not configured for active sending (missing appKey, token, or encodingAESKey)"
-    };
-  }
-  const payload = {
-    msgtype: "text",
-    text: { content: message },
-    version: PLUGIN_VERSION,
-    ...options?.msgid != null ? { msgid: options.msgid } : {},
-    ...options?.streamId != null ? { streamId: options.streamId } : {},
-    ...options?.chunkKey != null ? { chunkKey: options.chunkKey } : {}
-  };
-  const plaintext = JSON.stringify(payload);
-  const encrypt = encryptBaiduAppPlaintext({
-    encodingAESKey: account.encodingAESKey ?? "",
-    plaintext
-  });
-  const timestamp = String(Math.floor(Date.now() / 1e3));
-  const nonce = crypto.randomBytes(8).toString("hex");
-  const msgSignature = computeBaiduAppMsgSignature({
-    token: account.token ?? "",
-    timestamp,
-    nonce,
-    encrypt
-  });
-  const sendMessageUrl = `${account.apiBase}/chat/openclaw/callback`;
-  const url = `${sendMessageUrl}?timestamp=${encodeURIComponent(timestamp)}&ak=${encodeURIComponent(account.appKey ?? "")}&nonce=${encodeURIComponent(nonce)}&msg_signature=${encodeURIComponent(msgSignature)}`;
-  const body = JSON.stringify({ encrypt });
-  logger.info(`POST ${url}`);
-  logger.debug(`request body: ${body}`);
-  const resp = await fetch(url, {
-    method: "POST",
-    body,
-    headers: { "Content-Type": "application/json" }
-  });
-  const text = await resp.text();
-  if (!text) {
-    const errmsg = `empty response from server (status=${resp.status})`;
-    logger.error(`request failed: ${errmsg}`);
-    return { ok: false, errcode: resp.status, errmsg };
-  }
-  let data;
-  try {
-    data = JSON.parse(text);
-  } catch {
-    const errmsg = `invalid JSON response (status=${resp.status}, body=${text.slice(0, 200)})`;
-    logger.error(`request failed: ${errmsg}`);
-    return { ok: false, errcode: resp.status, errmsg };
-  }
-  const result = {
-    ok: data.errcode === 0,
-    errcode: data.errcode,
-    errmsg: data.errmsg,
-    invaliduser: data.invaliduser,
-    msgid: data.msgid
-  };
-  if (result.ok) {
-    logger.info(`request succeeded: msgid=${result.msgid ?? "unknown"}`);
-  } else {
-    logger.error(`request failed: errcode=${result.errcode} errmsg=${result.errmsg ?? "unknown"}`);
-  }
-  return result;
+  return void 0;
 }
 
 // src/bot.ts
@@ -4357,25 +4367,24 @@ function extractBaiduAppContent(msg) {
 async function dispatchBaiduAppMessage(params) {
   const { cfg, account, msg, core, hooks } = params;
   const safeCfg = cfg ?? {};
-  const logger2 = createLogger("openclaw-baiduapp", { log: params.log, error: params.error });
+  const logger3 = createLogger("openclaw-baiduapp", { log: params.log, error: params.error });
   const channel = core.channel;
   if (!channel?.routing?.resolveAgentRoute || !channel.reply?.dispatchReplyWithBufferedBlockDispatcher) {
-    logger2.warn("core routing or buffered dispatcher missing, skipping dispatch");
+    logger3.warn("core routing or buffered dispatcher missing, skipping dispatch");
     return;
   }
+  const userId = account.appKey ?? account.accountId;
   const route = channel.routing.resolveAgentRoute({
     cfg: safeCfg,
     channel: "openclaw-baiduapp",
-    accountId: account.accountId,
-    peer: { kind: "dm", id: "default" }
+    accountId: userId,
+    peer: { kind: "dm", id: userId }
   });
-  logger2.info(`SessionKey: ${route.sessionKey}`);
-  route.sessionKey = "agent:main:main";
-  logger2.info(
+  logger3.info(
     `route resolved: sessionKey=${route.sessionKey} agentId=${route.agentId ?? "default"} accountId=${route.accountId}`
   );
   const rawBody = extractBaiduAppContent(msg);
-  logger2.debug(
+  logger3.debug(
     `message content extracted: len=${rawBody.length} preview="${rawBody.slice(0, 80)}${rawBody.length > 80 ? "..." : ""}"`
   );
   const storePath = channel.session?.resolveStorePath?.(safeCfg.session?.store, {
@@ -4386,9 +4395,10 @@ async function dispatchBaiduAppMessage(params) {
     sessionKey: route.sessionKey
   }) ?? void 0 : void 0;
   const envelopeOptions = channel.reply?.resolveEnvelopeFormatOptions ? channel.reply.resolveEnvelopeFormatOptions(safeCfg) : void 0;
+  const fromLabel = `user:${userId}`;
   const body = channel.reply?.formatAgentEnvelope ? channel.reply.formatAgentEnvelope({
     channel: "Baidu App",
-    from: "",
+    from: `user:${userId}`,
     previousTimestamp,
     envelope: envelopeOptions,
     body: rawBody
@@ -4398,32 +4408,32 @@ async function dispatchBaiduAppMessage(params) {
     Body: body,
     RawBody: rawBody,
     CommandBody: rawBody,
-    From: "openclaw-baiduapp:user",
-    To: "user",
+    From: `openclaw-baiduapp:${userId}`,
+    To: `openclaw-baiduapp:${userId}`,
     SessionKey: route.sessionKey,
-    AccountId: route.accountId ?? account.accountId,
+    AccountId: route.accountId,
     ChatType: "direct",
-    ConversationLabel: "user",
+    ConversationLabel: fromLabel,
     Provider: "openclaw-baiduapp",
     Surface: "openclaw-baiduapp",
     MessageSid: msgid,
     OriginatingChannel: "openclaw-baiduapp",
-    OriginatingTo: "user"
+    OriginatingTo: `openclaw-baiduapp:${userId}`
   }) : {
     Body: body,
     RawBody: rawBody,
     CommandBody: rawBody,
-    From: "openclaw-baiduapp:user",
-    To: "user",
+    From: `openclaw-baiduapp:${userId}`,
+    To: `openclaw-baiduapp:${userId}`,
     SessionKey: route.sessionKey,
-    AccountId: route.accountId ?? account.accountId,
+    AccountId: route.accountId,
     ChatType: "direct",
-    ConversationLabel: "user",
+    ConversationLabel: fromLabel,
     Provider: "openclaw-baiduapp",
     Surface: "openclaw-baiduapp",
     MessageSid: msgid,
     OriginatingChannel: "openclaw-baiduapp",
-    OriginatingTo: "user"
+    OriginatingTo: `openclaw-baiduapp:${userId}`
   };
   if (channel.session?.recordInboundSession && storePath) {
     await channel.session.recordInboundSession({
@@ -4431,7 +4441,7 @@ async function dispatchBaiduAppMessage(params) {
       sessionKey: ctxPayload.SessionKey ?? route.sessionKey,
       ctx: ctxPayload,
       onRecordError: (err) => {
-        logger2.error(`openclaw-baiduapp: failed updating session meta: ${String(err)}`);
+        logger3.error(`openclaw-baiduapp: failed updating session meta: ${String(err)}`);
       }
     });
   }
@@ -4440,7 +4450,7 @@ async function dispatchBaiduAppMessage(params) {
     channel: "openclaw-baiduapp",
     accountId: account.accountId
   }) : void 0;
-  logger2.info(`dispatching to agent: sessionKey=${route.sessionKey}`);
+  logger3.info(`dispatching to agent: sessionKey=${route.sessionKey}`);
   await channel.reply.dispatchReplyWithBufferedBlockDispatcher({
     ctx: ctxPayload,
     cfg: safeCfg,
@@ -4448,20 +4458,20 @@ async function dispatchBaiduAppMessage(params) {
       deliver: async (payload) => {
         const rawText = payload.text ?? "";
         if (!rawText.trim()) {
-          logger2.debug("deliver callback: empty text, skipping");
+          logger3.debug("deliver callback: empty text, skipping");
           return;
         }
         const converted = channel.text?.convertMarkdownTables && tableMode ? channel.text.convertMarkdownTables(rawText, tableMode) : rawText;
-        logger2.debug(`deliver callback: textLen=${converted.length}`);
+        logger3.debug(`deliver callback: textLen=${converted.length}`);
         hooks.onChunk(converted);
       },
       onError: (err, info) => {
         hooks.onError?.(err);
-        logger2.error(`${info.kind} reply failed: ${String(err)}`);
+        logger3.error(`${info.kind} reply failed: ${String(err)}`);
       }
     }
   });
-  logger2.info(`agent reply dispatch complete: sessionKey=${route.sessionKey}`);
+  logger3.info(`agent reply dispatch complete: sessionKey=${route.sessionKey}`);
 }
 
 // src/runtime.ts
@@ -4750,7 +4760,7 @@ async function handleBaiduAppWebhookRequest(req, res) {
   const nonce = query.get("nonce") ?? "";
   const signature = resolveSignatureParam(query);
   const primary = targets[0];
-  const logger2 = buildLogger(primary);
+  const logger3 = buildLogger(primary);
   if (req.method === "GET") {
     const echostr = query.get("echostr") ?? "";
     if (!timestamp || !nonce || !signature || !echostr) {
@@ -4786,7 +4796,7 @@ async function handleBaiduAppWebhookRequest(req, res) {
       jsonError(res, "decrypt failed");
       return true;
     }
-    const selected2 = selectDecryptedTarget({ candidates: decryptedCandidates2, logger: logger2 });
+    const selected2 = selectDecryptedTarget({ candidates: decryptedCandidates2, logger: logger3 });
     jsonOk(res, selected2.plaintext);
     return true;
   }
@@ -4814,14 +4824,14 @@ async function handleBaiduAppWebhookRequest(req, res) {
     msgSignature = xmlData.MsgSignature ?? signature;
     msgTimestamp = xmlData.TimeStamp ?? timestamp;
     msgNonce = xmlData.Nonce ?? nonce;
-    logger2.info(`inbound xml parsed: hasEncrypt=${Boolean(encrypt)}, msg_signature=${msgSignature ? "yes" : "no"}`);
+    logger3.info(`inbound xml parsed: hasEncrypt=${Boolean(encrypt)}, msg_signature=${msgSignature ? "yes" : "no"}`);
   } else {
     try {
       const record = JSON.parse(rawBody);
       encrypt = String(record.encrypt ?? record.Encrypt ?? "");
-      logger2.info(`inbound json parsed: hasEncrypt=${Boolean(encrypt)}`);
+      logger3.info(`inbound json parsed: hasEncrypt=${Boolean(encrypt)}`);
     } catch {
-      logger2.warn(`inbound payload parse failed: not valid xml or json`);
+      logger3.warn(`inbound payload parse failed: not valid xml or json`);
       jsonError(res, "invalid payload format");
       return true;
     }
@@ -4843,14 +4853,14 @@ async function handleBaiduAppWebhookRequest(req, res) {
     });
   });
   if (signatureMatched.length === 0) {
-    logger2.warn(`signature verification failed: checked ${targets.length} account(s), none matched`);
+    logger3.warn(`signature verification failed: checked ${targets.length} account(s), none matched`);
     jsonError(res, "unauthorized");
     return true;
   }
-  logger2.debug(`signature verified: ${signatureMatched.length} account(s) matched`);
+  logger3.debug(`signature verified: ${signatureMatched.length} account(s) matched`);
   const decryptable = signatureMatched.filter((candidate) => Boolean(candidate.account.encodingAESKey));
   if (decryptable.length === 0) {
-    logger2.warn(`no account has encodingAESKey configured`);
+    logger3.warn(`no account has encodingAESKey configured`);
     jsonError(res, "openclaw-baiduapp not configured");
     return true;
   }
@@ -4859,14 +4869,14 @@ async function handleBaiduAppWebhookRequest(req, res) {
     encrypt
   });
   if (decryptedCandidates.length === 0) {
-    logger2.warn(`decrypt failed for all ${decryptable.length} candidate account(s)`);
+    logger3.warn(`decrypt failed for all ${decryptable.length} candidate account(s)`);
     jsonError(res, "decrypt failed");
     return true;
   }
-  const selected = selectDecryptedTarget({ candidates: decryptedCandidates, logger: logger2 });
+  const selected = selectDecryptedTarget({ candidates: decryptedCandidates, logger: logger3 });
   const target = selected.target;
   if (!target.account.configured || !target.account.token || !target.account.encodingAESKey) {
-    logger2.warn(`selected account ${target.account.accountId} not fully configured`);
+    logger3.warn(`selected account ${target.account.accountId} not fully configured`);
     jsonError(res, "openclaw-baiduapp not configured");
     return true;
   }
@@ -4874,11 +4884,11 @@ async function handleBaiduAppWebhookRequest(req, res) {
   target.statusSink?.({ lastInboundAt: Date.now() });
   const msgtype = String(msg.msgtype ?? msg.MsgType ?? "").toLowerCase();
   const msgid = msg.msgid ?? msg.MsgId ? String(msg.msgid ?? msg.MsgId) : void 0;
-  logger2.info(`inbound: type=${msgtype || "unknown"} msgid=${msgid ?? "none"} account=${target.account.accountId}`);
+  logger3.info(`inbound: type=${msgtype || "unknown"} msgid=${msgid ?? "none"} account=${target.account.accountId}`);
   if (msgtype === "stream") {
     const streamId2 = String(msg.stream?.id ?? "").trim();
     const state = streamId2 ? streams.get(streamId2) : void 0;
-    logger2.info(
+    logger3.info(
       `[REPLY-MODE:STREAM-POLL] stream poll request: streamId=${streamId2 || "none"} found=${Boolean(state)} finished=${state?.finished ?? "n/a"} contentLen=${state?.content.length ?? 0}`
     );
     const reply = state ? buildStreamReplyFromState(state) : buildStreamReplyFromState({
@@ -4899,7 +4909,7 @@ async function handleBaiduAppWebhookRequest(req, res) {
   }
   if (msgid && msgidToStreamId.has(msgid)) {
     const streamId2 = msgidToStreamId.get(msgid) ?? "";
-    logger2.debug(`duplicate msgid detected: msgid=${msgid} streamId=${streamId2}, returning placeholder`);
+    logger3.debug(`duplicate msgid detected: msgid=${msgid} streamId=${streamId2}, returning placeholder`);
     const reply = buildStreamPlaceholderReply(streamId2);
     jsonOk(
       res,
@@ -4916,13 +4926,13 @@ async function handleBaiduAppWebhookRequest(req, res) {
     const eventtype = String(
       msg.event?.eventtype ?? msg.Event ?? ""
     ).toLowerCase();
-    logger2.info(`event received: type=${eventtype || "unknown"}`);
+    logger3.info(`event received: type=${eventtype || "unknown"}`);
     if (eventtype === "enter_chat" || eventtype === "subscribe") {
       const welcome = target.account.config.welcomeText?.trim();
       if (welcome && target.account.canSendActive) {
-        logger2.info("sending welcome message");
+        logger3.info("sending welcome message");
         sendBaiduAppMessage(target.account, welcome).catch((err) => {
-          logger2.error(`failed to send welcome message: ${String(err)}`);
+          logger3.error(`failed to send welcome message: ${String(err)}`);
         });
       }
       jsonOk(
@@ -4960,14 +4970,14 @@ async function handleBaiduAppWebhookRequest(req, res) {
     finished: false,
     content: ""
   });
-  logger2.info(`stream created: streamId=${streamId} msgid=${msgid ?? "none"}`);
+  logger3.info(`stream created: streamId=${streamId} msgid=${msgid ?? "none"}`);
   const core = tryGetBaiduAppRuntime();
   if (core) {
     const state = streams.get(streamId);
     if (state) {
       state.started = true;
     }
-    logger2.info(`agent dispatch started: streamId=${streamId} canSendActive=${target.account.canSendActive}`);
+    logger3.info(`agent dispatch started: streamId=${streamId} canSendActive=${target.account.canSendActive}`);
     const hooks = {
       onChunk: (text) => {
         const current = streams.get(streamId);
@@ -4975,7 +4985,7 @@ async function handleBaiduAppWebhookRequest(req, res) {
           return;
         }
         appendStreamContent(current, text);
-        logger2.debug(
+        logger3.debug(
           `chunk received: streamId=${streamId} chunkLen=${text.length} totalLen=${current.content.length}`
         );
         target.statusSink?.({ lastOutboundAt: Date.now() });
@@ -4988,7 +4998,7 @@ async function handleBaiduAppWebhookRequest(req, res) {
           current.finished = true;
           current.updatedAt = Date.now();
         }
-        logger2.error(`openclaw-baiduapp agent failed: ${String(err)}`);
+        logger3.error(`openclaw-baiduapp agent failed: ${String(err)}`);
       }
     };
     dispatchBaiduAppMessage({
@@ -5005,20 +5015,20 @@ async function handleBaiduAppWebhookRequest(req, res) {
         current.finished = true;
         current.updatedAt = Date.now();
         const contentLen = current.content.trim().length;
-        logger2.info(
+        logger3.info(
           `agent dispatch done: streamId=${streamId} contentLen=${contentLen} canSendActive=${target.account.canSendActive}`
         );
         if (!target.account.canSendActive) {
-          logger2.warn(
+          logger3.warn(
             `active send skipped: appKey/appSecret not configured for account ${target.account.accountId}`
           );
         } else if (!contentLen) {
-          logger2.warn(`active send skipped: agent produced no content`);
+          logger3.warn(`active send skipped: agent produced no content`);
         }
         if (target.account.canSendActive && current.content.trim()) {
           try {
             const chunks = splitMessageByBytes(current.content, MAX_MESSAGE_BYTES);
-            logger2.info(
+            logger3.info(
               `[REPLY-MODE:ACTIVE-SEND] active send starting: streamId=${streamId} chunks=${chunks.length} contentLen=${contentLen}`
             );
             for (let i = 0; i < chunks.length; i++) {
@@ -5027,13 +5037,13 @@ async function handleBaiduAppWebhookRequest(req, res) {
                 streamId,
                 chunkKey: i
               });
-              logger2.debug(`active send chunk ${i + 1}/${chunks.length} sent: streamId=${streamId}`);
+              logger3.debug(`active send chunk ${i + 1}/${chunks.length} sent: streamId=${streamId}`);
             }
-            logger2.info(
+            logger3.info(
               `[REPLY-MODE:ACTIVE-SEND] active send complete: streamId=${streamId} chunks=${chunks.length}`
             );
           } catch (err) {
-            logger2.error(`active send failed: streamId=${streamId} error=${String(err)}`);
+            logger3.error(`active send failed: streamId=${streamId} error=${String(err)}`);
           }
         }
       }
@@ -5045,10 +5055,10 @@ async function handleBaiduAppWebhookRequest(req, res) {
         current.finished = true;
         current.updatedAt = Date.now();
       }
-      logger2.error(`agent dispatch failed: streamId=${streamId} error=${String(err)}`);
+      logger3.error(`agent dispatch failed: streamId=${streamId} error=${String(err)}`);
     });
   } else {
-    logger2.warn(`runtime not available: streamId=${streamId} \u2014 agent dispatch skipped, no reply will be generated`);
+    logger3.warn(`runtime not available: streamId=${streamId} \u2014 agent dispatch skipped, no reply will be generated`);
     const state = streams.get(streamId);
     if (state) {
       state.finished = true;
@@ -5056,7 +5066,7 @@ async function handleBaiduAppWebhookRequest(req, res) {
     }
   }
   const placeholderReply = buildStreamPlaceholderReply(streamId);
-  logger2.debug(`stream placeholder reply sent: streamId=${streamId}`);
+  logger3.debug(`stream placeholder reply sent: streamId=${streamId}`);
   jsonOk(
     res,
     buildEncryptedJsonReply({
@@ -5070,6 +5080,7 @@ async function handleBaiduAppWebhookRequest(req, res) {
 }
 
 // src/channel.ts
+var logger2 = createLogger("openclaw-baiduapp");
 var meta = {
   id: "openclaw-baiduapp",
   label: "Baidu App",
@@ -5197,8 +5208,10 @@ var baiduAppPlugin = {
       return true;
     },
     resolveTarget: (params) => {
+      logger2.debug(`resolveTarget called with target: ${params.target}`);
       let raw = (params.target ?? "").trim();
       if (!raw) {
+        logger2.debug("resolveTarget: empty target, returning null");
         return null;
       }
       const channelPrefix = "openclaw-baiduapp:";
@@ -5216,9 +5229,17 @@ var baiduAppPlugin = {
         }
       }
       if (to.startsWith("user:")) {
-        return { channel: "openclaw-baiduapp", accountId, to: to.slice(5) };
+        to = to.slice(5);
       }
-      return { channel: "openclaw-baiduapp", accountId, to };
+      if (!accountId) {
+        const matched = findAccountIdByAppKey(params.cfg, to);
+        if (matched) {
+          accountId = matched;
+        }
+      }
+      const result = { channel: "openclaw-baiduapp", accountId, to };
+      logger2.debug(`resolveTarget result: ${JSON.stringify(result)}`);
+      return result;
     },
     resolveTargets: (params) => {
       const results = [];
@@ -5414,6 +5435,42 @@ var plugin = {
     if (api.registerHttpHandler) {
       api.registerHttpHandler(handleBaiduAppWebhookRequest);
     }
+    if (api.on) {
+      const log = api.logger ?? { info: console.log, error: console.error, warn: console.warn, debug: console.log };
+      api.on("message_received", (event, ctx) => {
+        log.info(
+          `[openclaw-baiduapp] message_received event=${JSON.stringify(event)} ctx=${JSON.stringify(ctx)}`
+        );
+      });
+    }
+    if (api.hook) {
+      const log = api.logger ?? { info: console.log, error: console.error, warn: console.warn, debug: console.log };
+      api.hook(
+        "before_agent_start",
+        {
+          name: "openclaw-baiduapp-before-agent-start",
+          description: "Capture all agent inputs including internal ones (sessions_send, cron, etc.)"
+        },
+        async (event, ctx) => {
+          log.info(
+            `[openclaw-baiduapp] before_agent_start prompt=${String(event.prompt ?? "").slice(0, 200)} sessionKey=${String(ctx.sessionKey ?? "")} agentId=${String(ctx.agentId ?? "")} provider=${String(ctx.messageProvider ?? "")}`
+          );
+        }
+      );
+      api.hook(
+        "agent_end",
+        {
+          name: "openclaw-baiduapp-agent-end",
+          description: "Capture agent completion results"
+        },
+        async (event, ctx) => {
+          const messageCount = Array.isArray(event.messages) ? event.messages.length : 0;
+          log.info(
+            `[openclaw-baiduapp] agent_end success=${String(event.success ?? "unknown")} messages=${messageCount} sessionKey=${String(ctx.sessionKey ?? "")} agentId=${String(ctx.agentId ?? "")}`
+          );
+        }
+      );
+    }
   }
 };
 var index_default = plugin;