openclaw-plugin-yuanbao 2.11.0 → 3.0.1-beta.fc13eaa5

package/README.md

@@ -40,7 +40,6 @@ openclaw channels add
 ## 🛠️ Bot 常用命令
 
 ```
-/yuanbaobot-upgrade   # 升级元宝插件（需机器人主人权限）
 /issue-log            # 提交问题日志
 ```
 

package/api.ts

@@ -0,0 +1,12 @@
+/**
+ * Aggregated export file
+ * 供 index.ts 通过 loadBundledEntryExportSync 懒加载引用
+ */
+
+export { yuanbaoPlugin } from "./src/channel.js";
+export { yuanbaoSetupPlugin } from "./src/channel.setup.js";
+export { initLogger } from "./src/logger.js";
+export { initEnv } from "./src/infra/env.js";
+export { registerTools } from "./src/business/tools/index.js";
+export { logUploadCommandDefinition } from "./src/business/commands/log-upload/index.js";
+export { initBuiltinStickers } from "./src/business/actions/sticker/init-builtin-stickers.js";

package/dist/api.d.ts

@@ -0,0 +1,7 @@
+export { yuanbaoPlugin } from "./src/channel.js";
+export { yuanbaoSetupPlugin } from "./src/channel.setup.js";
+export { initLogger } from "./src/logger.js";
+export { initEnv } from "./src/infra/env.js";
+export { registerTools } from "./src/business/tools/index.js";
+export { logUploadCommandDefinition } from "./src/business/commands/log-upload/index.js";
+export { initBuiltinStickers } from "./src/business/actions/sticker/init-builtin-stickers.js";

package/dist/api.js

@@ -0,0 +1,7 @@
+export { yuanbaoPlugin } from "./src/channel.js";
+export { yuanbaoSetupPlugin } from "./src/channel.setup.js";
+export { initLogger } from "./src/logger.js";
+export { initEnv } from "./src/infra/env.js";
+export { registerTools } from "./src/business/tools/index.js";
+export { logUploadCommandDefinition } from "./src/business/commands/log-upload/index.js";
+export { initBuiltinStickers } from "./src/business/actions/sticker/init-builtin-stickers.js";

package/dist/index.d.ts

@@ -1,9 +1,2 @@
-import type { OpenClawPluginApi } from 'openclaw/plugin-sdk';
-declare const plugin: {
-    id: string;
-    name: string;
-    description: string;
-    configSchema: any;
-    register(api: OpenClawPluginApi): void;
-};
-export default plugin;
+declare const _default: import("openclaw/plugin-sdk/channel-entry-contract").BundledChannelEntryContract<import("openclaw/plugin-sdk").ChannelPlugin>;
+export default _default;

package/dist/index.js

@@ -1,39 +1,54 @@
-import { emptyPluginConfigSchema } from 'openclaw/plugin-sdk';
-import { setYuanbaoRuntime } from './src/runtime.js';
-import { yuanbaoPlugin } from './src/channel.js';
-import { initLogger } from './src/logger.js';
-import { registerTools } from './src/tools/index.js';
-import { yuanbaoUpgradeCommand, yuanbaobotUpgradeCommand } from './src/commands/upgrade/index.js';
-import { logUploadCommandDefinition } from './src/commands/log-upload.js';
-import { registerPluginCommand } from './src/commands/slash-commands/index.js';
-import { initEnv } from './src/utils/get-env.js';
-import { initBuiltinStickers } from './src/sticker/init-builtin-stickers.js';
-import pluginManifest from './openclaw.plugin.json' with { type: 'json' };
-function patchCommandQueueState() {
-    const key = Symbol.for('openclaw.commandQueueState');
-    const state = globalThis[key];
-    if (state && !state.activeTaskWaiters) {
-        state.activeTaskWaiters = new Set();
-    }
+import { defineBundledChannelEntry, loadBundledEntryExportSync, } from "openclaw/plugin-sdk/channel-entry-contract";
+function registerTools(api) {
+    const register = loadBundledEntryExportSync(import.meta.url, {
+        specifier: "./api.js",
+        exportName: "registerTools",
+    });
+    register(api);
 }
-const plugin = {
-    id: pluginManifest.id,
-    name: pluginManifest.name,
-    description: pluginManifest.description,
-    configSchema: emptyPluginConfigSchema(),
-    register(api) {
-        patchCommandQueueState();
+function registerCommands(api) {
+    const logUploadCommandDefinition = loadBundledEntryExportSync(import.meta.url, { specifier: "./api.js", exportName: "logUploadCommandDefinition" });
+    api.registerCommand(logUploadCommandDefinition);
+}
+function initBuiltinStickers() {
+    const init = loadBundledEntryExportSync(import.meta.url, {
+        specifier: "./api.js",
+        exportName: "initBuiltinStickers",
+    });
+    init();
+}
+function initEnv(api) {
+    const init = loadBundledEntryExportSync(import.meta.url, {
+        specifier: "./api.js",
+        exportName: "initEnv",
+    });
+    init(api);
+}
+function initLogger(api) {
+    const init = loadBundledEntryExportSync(import.meta.url, {
+        specifier: "./api.js",
+        exportName: "initLogger",
+    });
+    init(api);
+}
+export default defineBundledChannelEntry({
+    id: "yuanbao",
+    name: "YuanBao",
+    description: "YuanBao channel plugin",
+    importMetaUrl: import.meta.url,
+    plugin: {
+        specifier: "./api.js",
+        exportName: "yuanbaoPlugin",
+    },
+    runtime: {
+        specifier: "./runtime-api.js",
+        exportName: "setYuanbaoRuntime",
+    },
+    registerFull(api) {
         initEnv(api);
         initLogger(api);
-        setYuanbaoRuntime(api.runtime);
-        api.registerChannel({ plugin: yuanbaoPlugin });
         registerTools(api);
-        api.registerCommand(yuanbaoUpgradeCommand);
-        api.registerCommand(yuanbaobotUpgradeCommand);
-        registerPluginCommand(yuanbaobotUpgradeCommand.name, yuanbaobotUpgradeCommand.description);
-        api.registerCommand(logUploadCommandDefinition);
-        registerPluginCommand(logUploadCommandDefinition.name, logUploadCommandDefinition.description);
+        registerCommands(api);
         initBuiltinStickers();
     },
-};
-export default plugin;
+});

package/dist/runtime-api.d.ts

@@ -0,0 +1,5 @@
+export type { ChannelPlugin, OpenClawPluginApi, PluginRuntime } from "openclaw/plugin-sdk/core";
+export type { OpenClawConfig } from "openclaw/plugin-sdk/config-runtime";
+export type { OpenClawPluginService, OpenClawPluginServiceContext, PluginLogger, } from "openclaw/plugin-sdk/core";
+export type { ResolvedYuanbaoAccount } from "./src/types.js";
+export { getYuanbaoRuntime, setYuanbaoRuntime } from "./src/runtime.js";

package/dist/runtime-api.js

@@ -0,0 +1 @@
+export { getYuanbaoRuntime, setYuanbaoRuntime } from "./src/runtime.js";

package/dist/setup-entry.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("openclaw/plugin-sdk/channel-entry-contract").BundledChannelSetupEntryContract<import("openclaw/plugin-sdk").ChannelPlugin>;
+export default _default;

package/dist/setup-entry.js

@@ -0,0 +1,8 @@
+import { defineBundledChannelSetupEntry } from "openclaw/plugin-sdk/channel-entry-contract";
+export default defineBundledChannelSetupEntry({
+    importMetaUrl: import.meta.url,
+    plugin: {
+        specifier: "./api.js",
+        exportName: "yuanbaoSetupPlugin",
+    },
+});

package/dist/src/{yuanbao-server → access}/api.d.ts

@@ -1,3 +1,3 @@
-export type { SignTokenData, AuthHeaders, CosUploadConfig, Log } from './http/request.js';
-export { clearSignTokenCache, clearAllSignTokenCache, getTokenStatus, verifySignature, getSignToken, forceRefreshSignToken, getAuthHeaders, yuanbaoPost, yuanbaoGet, } from './http/request.js';
-export { apiGetUploadInfo, apiGetDownloadUrl } from './http/main.js';
+export type { SignTokenData, AuthHeaders, CosUploadConfig, Log } from "./http/request.js";
+export { clearSignTokenCache, clearAllSignTokenCache, getTokenStatus, verifySignature, getSignToken, forceRefreshSignToken, getAuthHeaders, yuanbaoPost, yuanbaoGet, } from "./http/request.js";
+export { apiGetUploadInfo, apiGetDownloadUrl } from "./http/main.js";

package/dist/src/access/api.js

@@ -0,0 +1,2 @@
+export { clearSignTokenCache, clearAllSignTokenCache, getTokenStatus, verifySignature, getSignToken, forceRefreshSignToken, getAuthHeaders, yuanbaoPost, yuanbaoGet, } from "./http/request.js";
+export { apiGetUploadInfo, apiGetDownloadUrl } from "./http/main.js";

package/dist/src/access/http/bot-id-cache.d.ts

@@ -0,0 +1,3 @@
+export declare function getCachedBotId(accountId: string): string | undefined;
+export declare function setCachedBotId(accountId: string, botId: string | undefined): void;
+export declare function clearCachedBotId(accountId: string): void;

package/dist/src/access/http/bot-id-cache.js

@@ -0,0 +1,14 @@
+const botIdCache = new Map();
+export function getCachedBotId(accountId) {
+    const value = botIdCache.get(accountId);
+    return value && value.length > 0 ? value : undefined;
+}
+export function setCachedBotId(accountId, botId) {
+    if (!accountId || !botId) {
+        return;
+    }
+    botIdCache.set(accountId, botId);
+}
+export function clearCachedBotId(accountId) {
+    botIdCache.delete(accountId);
+}

package/dist/src/access/http/main.d.ts

@@ -0,0 +1,4 @@
+import type { ResolvedYuanbaoAccount } from "../../types.js";
+import type { Log, CosUploadConfig } from "./request.js";
+export declare function apiGetUploadInfo(account: ResolvedYuanbaoAccount, fileName: string, fileId: string, log?: Log): Promise<CosUploadConfig>;
+export declare function apiGetDownloadUrl(account: ResolvedYuanbaoAccount, resourceId: string, log?: Log): Promise<string>;

package/dist/src/access/http/main.js

@@ -0,0 +1,18 @@
+import { yuanbaoPost, yuanbaoGet } from "./request.js";
+const UPLOAD_INFO_PATH = "/api/resource/genUploadInfo";
+const DOWNLOAD_INFO_PATH = "/api/resource/v1/download";
+export async function apiGetUploadInfo(account, fileName, fileId, log) {
+    const data = await yuanbaoPost(account, UPLOAD_INFO_PATH, { fileName, fileId, docFrom: "localDoc", docOpenId: "" }, log);
+    if (!data.bucketName || !data.location) {
+        throw new Error(`[yuanbao-api] genUploadInfo incomplete config: ${JSON.stringify(data)}`);
+    }
+    return data;
+}
+export async function apiGetDownloadUrl(account, resourceId, log) {
+    const data = await yuanbaoGet(account, DOWNLOAD_INFO_PATH, { resourceId }, log);
+    const downloadUrl = data.url ?? data.realUrl;
+    if (!downloadUrl) {
+        throw new Error(`[yuanbao-api] resource/v1/download returned no valid URL: ${JSON.stringify(data)}`);
+    }
+    return downloadUrl;
+}

package/dist/src/{yuanbao-server → access}/http/request.d.ts

@@ -1,21 +1,21 @@
-import { BotCreateType, type ResolvedYuanbaoAccount } from '../../types.js';
+import type { ResolvedYuanbaoAccount } from "../../types.js";
+export { getCachedBotId } from "./bot-id-cache.js";
 export type SignTokenData = {
     bot_id: string;
     duration: number;
     product: string;
     source: string;
     token: string;
-    create_type?: BotCreateType;
 };
 export type AuthHeaders = {
-    'X-ID': string;
-    'X-Token': string;
-    'X-Source': string;
-    'X-Route-Env'?: string;
-    'X-AppVersion': string;
-    'X-OperationSystem': string;
-    'X-Instance-Id': string;
-    'X-Bot-Version': string;
+    "X-ID": string;
+    "X-Token": string;
+    "X-Source": string;
+    "X-Route-Env"?: string;
+    "X-AppVersion": string;
+    "X-OperationSystem": string;
+    "X-Instance-Id": string;
+    "X-Bot-Version": string;
 };
 export type CosUploadConfig = {
     bucketName: string;
@@ -40,13 +40,12 @@ export declare const DOWNLOAD_INFO_PATH = "/api/resource/v1/download";
 export declare function clearSignTokenCache(accountId: string): void;
 export declare function clearAllSignTokenCache(): void;
 export declare function getTokenStatus(accountId: string): {
-    status: 'valid' | 'expired' | 'refreshing' | 'none';
+    status: "valid" | "expired" | "refreshing" | "none";
     expiresAt: number | null;
 };
-export declare function getCachedBotId(accountId: string): string | undefined;
 export declare function verifySignature(expected: string, actual: string): boolean;
-export declare function getSignToken(account: ResolvedYuanbaoAccount): Promise<SignTokenData>;
-export declare function forceRefreshSignToken(account: ResolvedYuanbaoAccount): Promise<SignTokenData>;
-export declare function getAuthHeaders(account: ResolvedYuanbaoAccount): Promise<AuthHeaders>;
-export declare function yuanbaoPost<T>(account: ResolvedYuanbaoAccount, path: string, body: unknown): Promise<T>;
-export declare function yuanbaoGet<T>(account: ResolvedYuanbaoAccount, path: string, params?: Record<string, string>): Promise<T>;
+export declare function getSignToken(account: ResolvedYuanbaoAccount, log?: Log): Promise<SignTokenData>;
+export declare function forceRefreshSignToken(account: ResolvedYuanbaoAccount, log?: Log): Promise<SignTokenData>;
+export declare function getAuthHeaders(account: ResolvedYuanbaoAccount, log?: Log): Promise<AuthHeaders>;
+export declare function yuanbaoPost<T>(account: ResolvedYuanbaoAccount, path: string, body: unknown, log?: Log): Promise<T>;
+export declare function yuanbaoGet<T>(account: ResolvedYuanbaoAccount, path: string, params?: Record<string, string>, log?: Log): Promise<T>;

package/dist/src/{yuanbao-server → access}/http/request.js

@@ -1,9 +1,11 @@
-import { createHmac, randomBytes, timingSafeEqual } from 'node:crypto';
-import { createLog } from '../../logger.js';
-import { getOpenclawVersion, getOperationSystem, getPluginVersion } from '../../utils/get-env.js';
-export const SIGN_TOKEN_PATH = '/api/v5/robotLogic/sign-token';
-export const UPLOAD_INFO_PATH = '/api/resource/genUploadInfo';
-export const DOWNLOAD_INFO_PATH = '/api/resource/v1/download';
+import { createHmac, randomBytes, timingSafeEqual } from "node:crypto";
+import { getOpenclawVersion, getOperationSystem, getPluginVersion } from "../../infra/env.js";
+import { createLog } from "../../logger.js";
+import { clearCachedBotId, setCachedBotId } from "./bot-id-cache.js";
+export { getCachedBotId } from "./bot-id-cache.js";
+export const SIGN_TOKEN_PATH = "/api/v5/robotLogic/sign-token";
+export const UPLOAD_INFO_PATH = "/api/resource/genUploadInfo";
+export const DOWNLOAD_INFO_PATH = "/api/resource/v1/download";
 const RETRYABLE_SIGN_CODE = 10099;
 const SIGN_MAX_RETRIES = 3;
 const SIGN_RETRY_DELAY_MS = 1000;
@@ -15,6 +17,7 @@ const tokenFetchPromises = new Map();
 const tokenRefreshTimers = new Map();
 export function clearSignTokenCache(accountId) {
     tokenCacheMap.delete(accountId);
+    clearCachedBotId(accountId);
     const timer = tokenRefreshTimers.get(accountId);
     if (timer) {
         clearTimeout(timer);
@@ -30,111 +33,109 @@ export function clearAllSignTokenCache() {
 }
 export function getTokenStatus(accountId) {
     if (tokenFetchPromises.has(accountId)) {
-        return { status: 'refreshing', expiresAt: tokenCacheMap.get(accountId)?.expiresAt ?? null };
+        return { status: "refreshing", expiresAt: tokenCacheMap.get(accountId)?.expiresAt ?? null };
     }
     const cached = tokenCacheMap.get(accountId);
-    if (!cached)
-        return { status: 'none', expiresAt: null };
+    if (!cached) {
+        return { status: "none", expiresAt: null };
+    }
     return {
-        status: cached.expiresAt > Date.now() ? 'valid' : 'expired',
+        status: cached.expiresAt > Date.now() ? "valid" : "expired",
         expiresAt: cached.expiresAt,
     };
 }
-export function getCachedBotId(accountId) {
-    const cached = tokenCacheMap.get(accountId);
-    if (!cached || cached.expiresAt <= Date.now())
-        return undefined;
-    return cached.data.bot_id || undefined;
-}
 function computeSignature(params) {
     const plain = params.nonce + params.timestamp + params.appKey + params.appSecret;
-    return createHmac('sha256', params.appSecret).update(plain)
-        .digest('hex');
+    return createHmac("sha256", params.appSecret).update(plain)
+        .digest("hex");
 }
 export function verifySignature(expected, actual) {
-    const expectedBuf = Buffer.from(expected, 'hex');
-    const actualBuf = Buffer.from(actual, 'hex');
+    const expectedBuf = Buffer.from(expected, "hex");
+    const actualBuf = Buffer.from(actual, "hex");
     if (expectedBuf.length !== actualBuf.length) {
         return false;
     }
     return timingSafeEqual(expectedBuf, actualBuf);
 }
-async function doFetchSignToken(account) {
-    const mlog = createLog('http');
+async function doFetchSignToken(account, log) {
+    const mlog = createLog("http", log);
     const { appKey, appSecret, apiDomain } = account;
-    if (!appKey || !appSecret)
-        throw new Error('签票失败: 缺少 appKey 或 appSecret');
+    if (!appKey || !appSecret) {
+        throw new Error("sign-token failed: missing appKey or appSecret");
+    }
     const url = `https://${apiDomain}${SIGN_TOKEN_PATH}`;
     for (let attempt = 0; attempt <= SIGN_MAX_RETRIES; attempt++) {
-        const nonce = randomBytes(16).toString('hex');
+        const nonce = randomBytes(16).toString("hex");
         const bjTime = new Date(Date.now() + 8 * 3600000);
-        const timestamp = bjTime.toISOString().replace('Z', '+08:00')
-            .replace(/\.\d{3}/, '');
+        const timestamp = bjTime
+            .toISOString()
+            .replace("Z", "+08:00")
+            .replace(/\.\d{3}/, "");
         const signature = computeSignature({ nonce, timestamp, appKey, appSecret });
         const body = { app_key: appKey, nonce, signature, timestamp };
-        mlog.info(`正在签票: url=${url}${attempt > 0 ? ` (重试 ${attempt}/${SIGN_MAX_RETRIES})` : ''}`);
-        mlog.info('签票入参', body);
+        mlog.info(`signing token: url=${url}${attempt > 0 ? ` (retry ${attempt}/${SIGN_MAX_RETRIES})` : ""}`);
+        mlog.info("sign-token params", body);
         const headers = {
-            'Content-Type': 'application/json',
-            'X-AppVersion': getPluginVersion(),
-            'X-OperationSystem': getOperationSystem(),
-            'X-Instance-Id': '16',
-            'X-Bot-Version': getOpenclawVersion(),
+            "Content-Type": "application/json",
+            "X-AppVersion": getPluginVersion(),
+            "X-OperationSystem": getOperationSystem(),
+            "X-Instance-Id": "16",
+            "X-Bot-Version": getOpenclawVersion(),
         };
         if (account.config?.routeEnv) {
-            headers['x-route-env'] = account.config.routeEnv;
+            headers["x-route-env"] = account.config.routeEnv;
         }
         const response = await fetch(url, {
-            method: 'POST',
+            method: "POST",
             headers,
             body: JSON.stringify(body),
         });
         if (!response.ok) {
-            throw new Error(`签票请求失败: HTTP ${response.status} ${response.statusText}`);
+            throw new Error(`sign-token HTTP error: ${response.status} ${response.statusText}`);
         }
         const result = (await response.json());
         if (result.code === 0) {
-            mlog.info(`签票成功: bot_id=${result.data.bot_id}, create_type=${result.data.create_type}`);
+            mlog.info(`sign-token success: bot_id=${result.data.bot_id}`);
             return result.data;
         }
         if (result.code === RETRYABLE_SIGN_CODE && attempt < SIGN_MAX_RETRIES) {
-            mlog.warn(`签票可重试: code=${result.code}, 将在 ${SIGN_RETRY_DELAY_MS}ms 后重试`);
+            mlog.warn(`sign-token retryable: code=${result.code}, retrying in ${SIGN_RETRY_DELAY_MS}ms`);
             await new Promise(r => setTimeout(r, SIGN_RETRY_DELAY_MS));
             continue;
         }
-        throw new Error(`签票错误: code=${result.code}, msg=${result.msg}`);
+        throw new Error(`sign-token error: code=${result.code}, msg=${result.msg}`);
     }
-    throw new Error('签票失败: 超过最大重试次数');
+    throw new Error("sign-token failed: max retries exceeded");
 }
-function scheduleTokenRefresh(account, durationSec) {
-    const mlog = createLog('http');
+function scheduleTokenRefresh(account, durationSec, log) {
+    const mlog = createLog("http", log);
     const existing = tokenRefreshTimers.get(account.accountId);
     if (existing) {
         clearTimeout(existing);
     }
     const rawMs = durationSec * 1000 - CACHE_REFRESH_MARGIN_MS;
     const refreshAfterMs = Math.min(Math.max(rawMs, 60_000), MAX_SAFE_TIMEOUT_MS);
-    const clampedHint = rawMs > MAX_SAFE_TIMEOUT_MS ? ', clamped to max safe timeout' : '';
-    mlog.info(`[${account.accountId}][token-timer] 已安排定时刷新: `
-        + `${Math.round(refreshAfterMs / 1000)}s 后 (duration=${durationSec}s, `
+    const clampedHint = rawMs > MAX_SAFE_TIMEOUT_MS ? ", clamped to max safe timeout" : "";
+    mlog.info(`[${account.accountId}][token-timer] scheduled refresh: `
+        + `${Math.round(refreshAfterMs / 1000)}s later (duration=${durationSec}s, `
         + `margin=${CACHE_REFRESH_MARGIN_MS / 1000}s${clampedHint})`);
     const timer = setTimeout(async () => {
         tokenRefreshTimers.delete(account.accountId);
         try {
-            mlog.info(`[${account.accountId}][token-timer]定时刷新触发，开始重新签票`);
-            await forceRefreshSignToken(account);
-            mlog.info(`[${account.accountId}][token-timer]定时刷新完成`);
+            mlog.info(`[${account.accountId}][token-timer] scheduled refresh triggered, re-signing token`);
+            await forceRefreshSignToken(account, log);
+            mlog.info(`[${account.accountId}][token-timer] scheduled refresh done`);
         }
         catch (err) {
-            mlog.error(`[${account.accountId}][token-timer]定时刷新失败: ${String(err)}，30s 后重试`);
+            mlog.error(`[${account.accountId}][token-timer] scheduled refresh failed: ${String(err)}, retrying in 30s`);
             const retryTimer = setTimeout(async () => {
                 tokenRefreshTimers.delete(account.accountId);
                 try {
-                    await forceRefreshSignToken(account);
-                    mlog.info(`[${account.accountId}][token-timer]定时刷新重试成功`);
+                    await forceRefreshSignToken(account, log);
+                    mlog.info(`[${account.accountId}][token-timer] scheduled refresh retry succeeded`);
                 }
                 catch (retryErr) {
-                    mlog.error(`[${account.accountId}][token-timer]定时刷新重试也失败: ${String(retryErr)}，等待下次请求触发刷新`);
+                    mlog.error(`[${account.accountId}][token-timer] scheduled refresh retry also failed: ${String(retryErr)}, waiting for next request to trigger refresh`);
                 }
             }, 30_000);
             tokenRefreshTimers.set(account.accountId, retryTimer);
@@ -142,35 +143,36 @@ function scheduleTokenRefresh(account, durationSec) {
     }, refreshAfterMs);
     tokenRefreshTimers.set(account.accountId, timer);
 }
-export async function getSignToken(account) {
+export async function getSignToken(account, log) {
     if (account.token) {
         return {
-            bot_id: account.botId || '',
+            bot_id: account.botId || "",
             duration: 0,
-            product: 'yuanbao',
-            source: 'bot',
+            product: "yuanbao",
+            source: "bot",
             token: account.token,
         };
     }
-    const tlog = createLog('http');
+    const tlog = createLog("http", log);
     const cached = tokenCacheMap.get(account.accountId);
     if (cached && cached.expiresAt > Date.now()) {
         const remainSec = Math.round((cached.expiresAt - Date.now()) / 1000);
-        tlog.info(`[${account.accountId}]使用缓存 token (剩余 ${remainSec}s)`);
+        tlog.info(`[${account.accountId}] using cached token (${remainSec}s remaining)`);
         return cached.data;
     }
     let fetchPromise = tokenFetchPromises.get(account.accountId);
     if (fetchPromise) {
-        tlog.info(`[${account.accountId}]签票进行中，等待已有请求`);
+        tlog.info(`[${account.accountId}] sign-token in progress, waiting for existing request`);
         return fetchPromise;
     }
     fetchPromise = (async () => {
         try {
-            const data = await doFetchSignToken(account);
+            const data = await doFetchSignToken(account, log);
             const ttlMs = data.duration > 0 ? data.duration * 1000 : 0;
             if (ttlMs > 0) {
                 tokenCacheMap.set(account.accountId, { data, expiresAt: Date.now() + ttlMs });
-                scheduleTokenRefresh(account, data.duration);
+                setCachedBotId(account.accountId, data.bot_id);
+                scheduleTokenRefresh(account, data.duration, log);
             }
             return data;
         }
@@ -181,48 +183,48 @@ export async function getSignToken(account) {
     tokenFetchPromises.set(account.accountId, fetchPromise);
     return fetchPromise;
 }
-export async function forceRefreshSignToken(account) {
-    const flog = createLog('http');
-    flog.warn(`[${account.accountId}][force-refresh]清除缓存并重新签票`);
+export async function forceRefreshSignToken(account, log) {
+    const flog = createLog("http", log);
+    flog.warn(`[${account.accountId}][force-refresh] clearing cache and re-signing token`);
     clearSignTokenCache(account.accountId);
     tokenFetchPromises.delete(account.accountId);
-    return getSignToken(account);
+    return getSignToken(account, log);
 }
-export async function getAuthHeaders(account) {
-    const data = await getSignToken(account);
+export async function getAuthHeaders(account, log) {
+    const data = await getSignToken(account, log);
     if (data.bot_id && !account.botId) {
         account.botId = data.bot_id;
     }
     const authHeaders = {
-        'X-ID': data.bot_id || account.botId || '',
-        'X-Token': data.token,
-        'X-Source': data.source || 'web',
-        'X-AppVersion': getPluginVersion(),
-        'X-OperationSystem': getOperationSystem(),
-        'X-Instance-Id': '16',
-        'X-Bot-Version': getOpenclawVersion(),
+        "X-ID": data.bot_id || account.botId || "",
+        "X-Token": data.token,
+        "X-Source": data.source || "web",
+        "X-AppVersion": getPluginVersion(),
+        "X-OperationSystem": getOperationSystem(),
+        "X-Instance-Id": "16",
+        "X-Bot-Version": getOpenclawVersion(),
     };
     if (account.config?.routeEnv) {
-        authHeaders['X-Route-Env'] = account.config.routeEnv;
+        authHeaders["X-Route-Env"] = account.config.routeEnv;
     }
     return authHeaders;
 }
-export async function yuanbaoPost(account, path, body) {
-    const plog = createLog('http');
+export async function yuanbaoPost(account, path, body, log) {
+    const plog = createLog("http", log);
     const url = `https://${account.apiDomain}${path}`;
     for (let attempt = 0; attempt <= HTTP_AUTH_RETRY_MAX; attempt++) {
-        const authHeaders = await getAuthHeaders(account);
+        const authHeaders = await getAuthHeaders(account, log);
         const response = await fetch(url, {
-            method: 'POST',
+            method: "POST",
             headers: {
-                'Content-Type': 'application/json',
+                "Content-Type": "application/json",
                 ...authHeaders,
             },
             body: JSON.stringify(body),
         });
         if (response.status === 401 && attempt < HTTP_AUTH_RETRY_MAX) {
-            plog.warn(`[post][${account.accountId}] ${path} 收到 401，刷新 token 后重试 (attempt=${attempt + 1})`);
-            await forceRefreshSignToken(account);
+            plog.warn(`[post][${account.accountId}] ${path} received 401, refreshing token and retrying (attempt=${attempt + 1})`);
+            await forceRefreshSignToken(account, log);
             continue;
         }
         if (!response.ok) {
@@ -230,28 +232,28 @@ export async function yuanbaoPost(account, path, body) {
         }
         const json = (await response.json());
         if (json.code !== 0 && json.code !== undefined) {
-            throw new Error(`[yuanbao-api][POST] ${path} 业务错误: code=${json.code}, msg=${json.msg}`);
+            throw new Error(`[yuanbao-api][POST] ${path} business error: code=${json.code}, msg=${json.msg}`);
         }
-        plog.info(`[post][${account.accountId}] ${path} 请求成功`);
+        plog.info(`[post][${account.accountId}] ${path} request succeeded`);
         return (json.data ?? json);
     }
-    throw new Error(`[yuanbao-api][POST] ${path} 401 重试次数已耗尽`);
+    throw new Error(`[yuanbao-api][POST] ${path} 401 retries exhausted`);
 }
-export async function yuanbaoGet(account, path, params) {
-    const glog = createLog('http');
-    const url = `https://${account.apiDomain}${path}${params ? `?${new URLSearchParams(params).toString()}` : ''}`;
+export async function yuanbaoGet(account, path, params, log) {
+    const glog = createLog("http", log);
+    const url = `https://${account.apiDomain}${path}${params ? `?${new URLSearchParams(params).toString()}` : ""}`;
     for (let attempt = 0; attempt <= HTTP_AUTH_RETRY_MAX; attempt++) {
-        const authHeaders = await getAuthHeaders(account);
+        const authHeaders = await getAuthHeaders(account, log);
         const response = await fetch(url, {
-            method: 'GET',
+            method: "GET",
             headers: {
-                'Content-Type': 'application/json',
+                "Content-Type": "application/json",
                 ...authHeaders,
             },
         });
         if (response.status === 401 && attempt < HTTP_AUTH_RETRY_MAX) {
-            glog.warn(`[get][${account.accountId}] ${path} 收到 401，刷新 token 后重试 (attempt=${attempt + 1})`);
-            await forceRefreshSignToken(account);
+            glog.warn(`[get][${account.accountId}] ${path} received 401, refreshing token and retrying (attempt=${attempt + 1})`);
+            await forceRefreshSignToken(account, log);
             continue;
         }
         if (!response.ok) {
@@ -259,9 +261,9 @@ export async function yuanbaoGet(account, path, params) {
         }
         const json = (await response.json());
         if (json.code !== 0 && json.code !== undefined) {
-            throw new Error(`[yuanbao-api][GET] ${path} 业务错误: code=${json.code}, msg=${json.msg}`);
+            throw new Error(`[yuanbao-api][GET] ${path} business error: code=${json.code}, msg=${json.msg}`);
         }
         return (json.data ?? json);
     }
-    throw new Error(`[yuanbao-api][GET] ${path} 401 重试次数已耗尽`);
+    throw new Error(`[yuanbao-api][GET] ${path} 401 retries exhausted`);
 }