@searchfe/openclaw-baiduapp 0.1.12-beta.1 → 0.1.12-beta.2

package/cli.js

@@ -1,10 +1,15 @@
 #!/usr/bin/env node
 
 import {execSync, spawnSync} from 'node:child_process';
+import {createRequire} from 'node:module';
 import readline from 'node:readline';
+import {Writable} from 'node:stream';
 
 import {printQRCode} from './src/cli-qrcode.mjs';
 
+const _require = createRequire(import.meta.url);
+const CLI_VERSION = _require('./package.json').version;
+
 const PLUGIN_SPEC = '@searchfe/openclaw-baiduapp';
 const CHANNEL_ID = 'openclaw-baiduapp';
 const QR_URL = 'https://www.baidu.com';
@@ -14,6 +19,8 @@ function parseArgs(argv) {
     let command;
     let ak;
     let sk;
+    let agent;
+    let yes = false;
 
     for (let index = 0; index < args.length; index++) {
         const token = args[index];
@@ -25,6 +32,11 @@ function parseArgs(argv) {
             continue;
         }
 
+        if (token === '--yes' || token === '-y') {
+            yes = true;
+            continue;
+        }
+
         if (token === '--ak') {
             ak = args[index + 1];
             index += 1;
@@ -47,12 +59,23 @@ function parseArgs(argv) {
             continue;
         }
 
+        if (token === '--agent') {
+            agent = args[index + 1];
+            index += 1;
+            continue;
+        }
+
+        if (token.startsWith('--agent=')) {
+            agent = token.slice('--agent='.length);
+            continue;
+        }
+
         if (!token.startsWith('--') && !command) {
             command = token;
         }
     }
 
-    return {command, ak, sk};
+    return {command, ak, sk, agent, yes};
 }
 
 function prompt(question, {hidden = false} = {}) {
@@ -61,36 +84,30 @@ function prompt(question, {hidden = false} = {}) {
     }
 
     const askOnce = () => new Promise(resolve => {
+        if (hidden) {
+            process.stdout.write(question);
+            const rl = readline.createInterface({
+                input: process.stdin,
+                output: new Writable({write(_chunk, _enc, cb) { cb(); }}),
+                terminal: true,
+            });
+            rl.on('SIGINT', () => { rl.close(); process.stdout.write('\n'); process.exit(1); });
+            rl.question('', answer => {
+                rl.close();
+                process.stdout.write('\n');
+                resolve(String(answer || '').trim());
+            });
+            return;
+        }
+
         const rl = readline.createInterface({
             input: process.stdin,
             output: process.stdout,
             terminal: true,
         });
-
-        rl.on('SIGINT', () => {
-            rl.close();
-            process.exit(1);
-        });
-
-        if (hidden) {
-            rl.stdoutMuted = true;
-            rl._writeToOutput = chunk => {
-                if (rl.stdoutMuted) {
-                    if (chunk.startsWith(question)) {
-                        rl.output.write(chunk);
-                    }
-                    return;
-                }
-
-                rl.output.write(chunk);
-            };
-        }
-
+        rl.on('SIGINT', () => { rl.close(); process.exit(1); });
         rl.question(question, answer => {
             rl.close();
-            if (hidden) {
-                process.stdout.write('\n');
-            }
             resolve(String(answer || '').trim());
         });
     });
@@ -111,6 +128,73 @@ function prompt(question, {hidden = false} = {}) {
     })();
 }
 
+function promptOptional(question) {
+    if (!process.stdin.isTTY) {
+        return Promise.resolve('');
+    }
+    return new Promise(resolve => {
+        const rl = readline.createInterface({
+            input: process.stdin,
+            output: process.stdout,
+            terminal: true,
+        });
+        rl.on('SIGINT', () => {
+            rl.close();
+            process.exit(1);
+        });
+        rl.question(question, answer => {
+            rl.close();
+            resolve(String(answer || '').trim());
+        });
+    });
+}
+
+async function checkAndCreateAgent(agentId, {yes = false} = {}) {
+    let agentsList;
+    try {
+        const agentsJson = run('openclaw', ['agents', 'list', '--json']);
+        agentsList = JSON.parse(agentsJson);
+    } catch {
+        // 解析失败时假设 agent 不存在，继续后续流程
+        agentsList = [];
+    }
+
+    const exists = Array.isArray(agentsList) && agentsList.some(a => a.id === agentId);
+    if (exists) {
+        return;
+    }
+
+    log(`Agent "${agentId}" 不存在`);
+    console.log(`  你可以手动执行以下命令新建：`);
+    console.log(`  openclaw agents add ${agentId}`);
+    console.log();
+
+    let confirm;
+    if (yes) {
+        confirm = 'y';
+    } else {
+        try {
+            confirm = await prompt(`是否立即自动新建 agent "${agentId}"？[y/N]: `);
+        } catch {
+            confirm = '';
+        }
+    }
+
+    if (confirm.toLowerCase() !== 'y') {
+        error('已取消，请手动新建 agent 后重试');
+        process.exit(1);
+    }
+
+    log(`正在新建 agent "${agentId}"...`);
+    try {
+        run('openclaw', ['agents', 'add', agentId], {silent: false});
+    } catch {
+        error('新建 agent 失败，请手动执行：');
+        console.log(`  openclaw agents add ${agentId}`);
+        process.exit(1);
+    }
+}
+
 function run(cmd, args = [], {silent = true} = {}) {
     const stdio = silent ? ['pipe', 'pipe', 'pipe'] : 'inherit';
     const result = spawnSync(cmd, args, {encoding: 'utf-8', stdio});
@@ -153,13 +237,19 @@ function error(msg) {
 }
 
 async function install() {
-    let {ak, sk} = parseArgs(process.argv);
+    let {ak, sk, agent, yes} = parseArgs(process.argv);
 
     if ((!ak || !sk) && !process.stdin.isTTY) {
         error('非交互环境：请通过 --ak/--sk 参数传入凭证');
         process.exit(1);
     }
 
+    if (agent !== undefined && !agent.trim()) {
+        error('--agent 参数不能为空');
+        process.exit(1);
+    }
+    let agentId = agent?.trim();
+
     if (!which('openclaw')) {
         error('未找到 openclaw，请先安装：');
         console.log('  npm install -g openclaw');
@@ -168,36 +258,44 @@ async function install() {
     }
     log('已找到本地安装的 openclaw');
 
-    log('正在安装插件...');
+    log('正在检查插件版本...');
+    let installedVersion = null;
     try {
-        const out = run('openclaw', ['plugins', 'install', PLUGIN_SPEC]);
-        if (out) {
-            log(out);
-        }
-    } catch (installErr) {
-        if (installErr.stderr && installErr.stderr.includes('already exists')) {
-            log('检测到本地已安装，正在更新...');
-            try {
-                const updateOut = run('openclaw', ['plugins', 'update', CHANNEL_ID]);
-                if (updateOut) {
-                    log(updateOut);
-                }
-            } catch (updateErr) {
-                error('插件更新失败，请手动执行：');
-                if (updateErr.stderr) {
-                    console.error(updateErr.stderr);
-                }
-                console.log(`  openclaw plugins update "${CHANNEL_ID}"`);
-                process.exit(1);
-            }
-        } else {
+        const infoJson = run('openclaw', ['config', 'get', `plugins.installs.${CHANNEL_ID}`, '--json']);
+        const info = JSON.parse(infoJson);
+        installedVersion = info?.version ?? null;
+    } catch {
+        // 未安装或无法读取，后续走安装流程
+    }
+
+    if (installedVersion === null) {
+        log(`插件未安装，正在安装 ${PLUGIN_SPEC}@${CLI_VERSION}...`);
+        try {
+            run('openclaw', ['plugins', 'install', `${PLUGIN_SPEC}@${CLI_VERSION}`], {silent: false});
+        } catch (installErr) {
             error('插件安装失败，请手动执行：');
-            if (installErr.stderr) {
-                console.error(installErr.stderr);
-            }
-            console.log(`  openclaw plugins install "${PLUGIN_SPEC}"`);
+            console.log(`  openclaw plugins install "${PLUGIN_SPEC}@${CLI_VERSION}"`);
+            process.exit(1);
+        }
+    } else if (installedVersion !== CLI_VERSION) {
+        log(`插件版本不一致（已安装: ${installedVersion}，当前 CLI: ${CLI_VERSION}），正在更新...`);
+        try {
+            run('openclaw', ['config', 'set', `plugins.installs.${CHANNEL_ID}.spec`, `${PLUGIN_SPEC}@${CLI_VERSION}`]);
+            run('openclaw', ['config', 'unset', `plugins.installs.${CHANNEL_ID}.integrity`]);
+            run('openclaw', ['config', 'unset', `plugins.installs.${CHANNEL_ID}.shasum`]);
+            run('openclaw', ['plugins', 'update', CHANNEL_ID], {silent: false});
+            run('openclaw', ['gateway', 'restart'], {silent: false});
+        } catch (updateErr) {
+            error('插件更新失败，请手动执行：');
+            console.log(`  openclaw config set plugins.installs.${CHANNEL_ID}.spec ${PLUGIN_SPEC}@${CLI_VERSION}`);
+            console.log(`  openclaw config unset plugins.installs.${CHANNEL_ID}.integrity`);
+            console.log(`  openclaw config unset plugins.installs.${CHANNEL_ID}.shasum`);
+            console.log(`  openclaw plugins update ${CHANNEL_ID}`);
+            console.log(`  openclaw gateway restart`);
             process.exit(1);
         }
+    } else {
+        log(`插件版本已是最新（${CLI_VERSION}），跳过更新`);
     }
 
     try {
@@ -217,17 +315,36 @@ async function install() {
         process.exit(1);
     }
 
+    // 插件已确认安装，再询问/校验 agent
+    if (!agentId && process.stdin.isTTY) {
+        agentId = await promptOptional('请输入 Agent ID（可选，用于多 agent 配置，直接回车跳过）：') || undefined;
+    }
+
+    if (agentId) {
+        await checkAndCreateAgent(agentId, {yes});
+    }
+
     log('正在写入配置...');
+    const akPath = agentId
+        ? `channels.${CHANNEL_ID}.accounts.${agentId}.appKey`
+        : `channels.${CHANNEL_ID}.appKey`;
+    const skPath = agentId
+        ? `channels.${CHANNEL_ID}.accounts.${agentId}.appSecret`
+        : `channels.${CHANNEL_ID}.appSecret`;
     try {
-        run('openclaw', ['config', 'set', `channels.${CHANNEL_ID}.appKey`, ak.trim()]);
-        run('openclaw', ['config', 'set', `channels.${CHANNEL_ID}.appSecret`, sk.trim()]);
+        run('openclaw', ['config', 'set', akPath, ak.trim()]);
+        run('openclaw', ['config', 'set', skPath, sk.trim()]);
     } catch {
         error('配置写入失败，请手动执行：');
-        console.log(`  openclaw config set channels.${CHANNEL_ID}.appKey <your-app-key>`);
-        console.log(`  openclaw config set channels.${CHANNEL_ID}.appSecret <your-app-secret>`);
+        console.log(`  openclaw config set ${akPath} <your-app-key>`);
+        console.log(`  openclaw config set ${skPath} <your-app-secret>`);
         process.exit(1);
     }
-    log('配置写入成功');
+    if (agentId) {
+        log(`配置写入成功（agent: ${agentId}）`);
+    } else {
+        log('配置写入成功');
+    }
 
     log('正在重启 OpenClaw Gateway...');
     try {
@@ -255,10 +372,16 @@ function help() {
 选项:
   --ak <appKey>       App Key（必填，缺省时交互输入）
   --sk <appSecret>    App Secret（必填，缺省时交互输入，不回显）
+  --agent <agentId>   Agent ID（可选，指定后写入 accounts.<agentId> 以支持多 agent 配置）
+                      交互模式下也会提示输入，直接回车跳过（写入根路径）
+                      指定后自动校验 agent 是否存在，不存在时提示确认新建
+  --yes, -y           自动确认所有交互提示（如 agent 不存在时自动新建，适合 CI/脚本环境）
   --help, -h          显示帮助信息
 
 示例:
   npx @searchfe/openclaw-baiduapp install --ak your-key --sk your-secret
+  npx @searchfe/openclaw-baiduapp install --agent my-agent --ak your-key --sk your-secret
+  npx @searchfe/openclaw-baiduapp install --agent my-agent --ak your-key --sk your-secret --yes
   npx @searchfe/openclaw-baiduapp install`);
 }
 

package/dist/index.js

@@ -28506,6 +28506,7 @@ async function handleBaiduAppWebhookRequest(req, res) {
 // src/poller.ts
 var DEFAULT_POLL_INTERVAL_MS = 3e3;
 var DEFAULT_POLL_REQUEST_TIMEOUT_MS = 1e4;
+var pollerLogger = createLogger("openclaw-baiduapp:poller");
 var accountPollers = /* @__PURE__ */ new Map();
 function buildPollingTextInboundMessage(content) {
   return {
@@ -28541,8 +28542,10 @@ async function dispatchPendingPollingMessages(data, target) {
     const list = Array.isArray(item.list) ? item.list : [];
     const { content, files } = parseTextAndFilesFromList(list);
     if (typeof content !== "string" && files.length === 0) {
+      pollerLogger.debug(`dispatch skip: msgId=${item.msgId ?? "?"} agentId=${item.agentId ?? "none"} reason=no-content`);
       continue;
     }
+    pollerLogger.info(`dispatch msg: msgId=${item.msgId ?? "?"} agentId=${item.agentId ?? "none"} files=${files.length} hasText=${typeof content === "string"}`);
     await processBaiduAppInboundMessage({
       target,
       msg: {
@@ -28627,6 +28630,7 @@ async function pollBaiduAppChatlistOnce(account, loggerOptions, requestOptions)
     version: PLUGIN_VERSION
   };
   const body = JSON.stringify(payload);
+  logger3.debug(`poll request: accountId=${account.accountId} url=${endpoint} sessionId=${payload.sessionId}`);
   const requestSignal = createAbortSignalController({
     signal: requestOptions?.signal,
     timeoutMs: requestOptions?.timeoutMs
@@ -28645,6 +28649,7 @@ async function pollBaiduAppChatlistOnce(account, loggerOptions, requestOptions)
   } catch (error) {
     requestSignal.cleanup();
     if (requestSignal.didTimeout()) {
+      logger3.warn(`poll timeout: accountId=${account.accountId} timeoutMs=${requestOptions?.timeoutMs}`);
       return buildPollResult({
         ok: false,
         error: {
@@ -28654,6 +28659,7 @@ async function pollBaiduAppChatlistOnce(account, loggerOptions, requestOptions)
       });
     }
     if (isAbortError2(error)) {
+      logger3.debug(`poll aborted: accountId=${account.accountId}`);
       return buildPollResult({
         ok: false,
         error: {
@@ -28662,17 +28668,20 @@ async function pollBaiduAppChatlistOnce(account, loggerOptions, requestOptions)
         }
       });
     }
+    const errMsg = error instanceof Error ? error.message : String(error);
+    logger3.error(`poll request failed: accountId=${account.accountId} error=${errMsg}`);
     return buildPollResult({
       ok: false,
       error: {
         kind: "request-failed",
-        message: error instanceof Error ? error.message : String(error)
+        message: errMsg
       }
     });
   }
   const responseText = await response.text();
   requestSignal.cleanup();
   if (!responseText) {
+    logger3.warn(`poll empty response: accountId=${account.accountId} status=${response.status}`);
     return buildPollResult({
       ok: false,
       error: {
@@ -28685,6 +28694,7 @@ async function pollBaiduAppChatlistOnce(account, loggerOptions, requestOptions)
   try {
     parsed = JSON.parse(responseText);
   } catch {
+    logger3.warn(`poll invalid json: accountId=${account.accountId} status=${response.status}`);
     return buildPollResult({
       ok: false,
       error: {
@@ -28693,10 +28703,12 @@ async function pollBaiduAppChatlistOnce(account, loggerOptions, requestOptions)
       }
     });
   }
+  const msgList = Array.isArray(parsed.data?.msgList) ? parsed.data.msgList : [];
   if (parsed.code !== 0) {
-    logger3.debug(`Baidu poll returned non-zero code=${String(parsed.code)}, message=${parsed.message}`);
+    logger3.debug(`poll non-zero code: accountId=${account.accountId} code=${String(parsed.code)} message=${parsed.message}`);
+  } else {
+    logger3.debug(`poll ok: accountId=${account.accountId} status=${response.status} msgCount=${msgList.length}`);
   }
-  const msgList = Array.isArray(parsed.data?.msgList) ? parsed.data.msgList : [];
   return buildPollResult({
     ok: true,
     data: msgList
@@ -28706,6 +28718,7 @@ function scheduleNextPoll(account, state) {
   if (state.stopped) {
     return;
   }
+  pollerLogger.debug(`schedule next poll: accountId=${account.accountId} intervalMs=${state.intervalMs}`);
   state.timer = setTimeout(() => {
     void runPollCycle(account, state);
   }, state.intervalMs);
@@ -28714,6 +28727,9 @@ async function runPollCycle(account, state) {
   if (state.stopped || state.pending) {
     return;
   }
+  state.cycleCount += 1;
+  const cycle = state.cycleCount;
+  pollerLogger.debug(`poll cycle #${cycle} start: accountId=${account.accountId}`);
   const controller = new AbortController();
   state.activeController = controller;
   const pending = (async () => {
@@ -28723,9 +28739,18 @@ async function runPollCycle(account, state) {
         fetchImpl: state.fetchImpl,
         timeoutMs: state.requestTimeoutMs
       });
+      if (!result2.ok && result2.error) {
+        if (result2.error.kind !== "aborted") {
+          pollerLogger.warn(`poll cycle #${cycle} error: accountId=${account.accountId} kind=${result2.error.kind} msg=${result2.error.message}`);
+        }
+      } else if (result2.data.length > 0) {
+        pollerLogger.info(`poll cycle #${cycle} msgs: accountId=${account.accountId} count=${result2.data.length}`);
+      }
       await dispatchPendingPollingMessages(result2.data, state.dispatchTarget);
     } catch (error) {
       if (!(state.stopped && isAbortError2(error))) {
+        const errMsg = error instanceof Error ? error.message : String(error);
+        pollerLogger.error(`poll cycle #${cycle} unhandled error: accountId=${account.accountId} error=${errMsg}`);
         state.onError?.(error);
       }
     } finally {
@@ -28743,18 +28768,23 @@ async function runPollCycle(account, state) {
 }
 function startAccountPolling(params) {
   if (accountPollers.has(params.account.accountId)) {
+    pollerLogger.debug(`polling already running: accountId=${params.account.accountId}, skip`);
     return;
   }
+  const intervalMs = params.intervalMs ?? DEFAULT_POLL_INTERVAL_MS;
+  const requestTimeoutMs = params.requestTimeoutMs ?? DEFAULT_POLL_REQUEST_TIMEOUT_MS;
+  pollerLogger.info(`start polling: accountId=${params.account.accountId} intervalMs=${intervalMs} timeoutMs=${requestTimeoutMs} apiBase=${params.account.apiBase}`);
   const state = {
     stopped: false,
     timer: null,
     activeController: null,
     pending: null,
-    intervalMs: params.intervalMs ?? DEFAULT_POLL_INTERVAL_MS,
-    requestTimeoutMs: params.requestTimeoutMs ?? DEFAULT_POLL_REQUEST_TIMEOUT_MS,
+    intervalMs,
+    requestTimeoutMs,
     fetchImpl: params.fetchImpl,
     onError: params.onError,
-    dispatchTarget: params.dispatchTarget
+    dispatchTarget: params.dispatchTarget,
+    cycleCount: 0
   };
   accountPollers.set(params.account.accountId, state);
   void runPollCycle(params.account, state);
@@ -28764,6 +28794,7 @@ function stopAccountPolling(accountId) {
   if (!state) {
     return;
   }
+  pollerLogger.info(`stop polling: accountId=${accountId} totalCycles=${state.cycleCount}`);
   state.stopped = true;
   if (state.timer) {
     clearTimeout(state.timer);