@ozaiya/openclaw-channel 0.10.51 → 0.10.53

package/dist/src/channel.js

@@ -30,8 +30,9 @@ import { summarizeWithYuanbao } from "./yuanbao.js";
 import { summarizeWithDoubao } from "./doubao.js";
 import { fetchXueqiuPost, searchXueqiuPosts } from "./xueqiu.js";
 import { fetchSocialMediaPost, searchSocialMedia, extractSocialMediaContent } from "./socialMedia.js";
-import { requestConfirmation, parseActionCallback, resolveConfirmation } from "./actionConfirmation.js";
+import { requestConfirmation, requestLastingConfirmation, parseActionCallback, resolveConfirmation, restoreParkedActions, takeParkedAction } from "./actionConfirmation.js";
 import { STAGED_NAME_SUFFIX, createBotEmailTool, emailAddonOf, newMailNotice, watchMailboxes } from "./botEmail.js";
+import { cancelScheduledMail, restoreScheduledMails, scheduleMail, scheduledMails } from "./mailSchedule.js";
 import { createBotMcpTool, mcpAddonOf } from "./botMcp.js";
 import { lastChatFromSessionStore } from "./lastChat.js";
 import { writeBotLocalSettings } from "./botLocalSettings.js";
@@ -109,6 +110,8 @@ function categorize(toolName) {
 }
 // Active dispatches keyed by accountId (one dispatch at a time per account)
 const activeDispatches = new Map();
+/** Bots whose parked approval cards were restored after this gateway started. */
+const parkedRestored = new Set();
 /** Bot id → the chat a new-mail turn is running in (the owner's chat with the bot). */
 const mailTurns = new Map();
 /**
@@ -1121,6 +1124,43 @@ async function sendEncryptedChatContent(params) {
     recordState(account.accountId, { lastOutboundAt: Date.now() });
     return result;
 }
+/** Deps for a lasting card (mail, business-system writes): parked actions live in the gateway's state dir. */
+function makeLastingDeps(account) {
+    return { ...makeConfirmationDeps(account), accountId: account.accountId, stateDir: getOzaiyaRuntime().state.resolveStateDir() };
+}
+/** A lasting card's answer as the tools take it: true / false now, or "later" (runs on a later Approve). */
+async function askOwnerLasting(account, groupId, kind, label, params, args) {
+    if (!groupId)
+        return false;
+    const answer = await requestLastingConfirmation(makeLastingDeps(account), groupId, kind, params, label, { tool: kind, args });
+    return answer === "later" ? "later" : answer === "approved";
+}
+/** The mcp tool for this bot; its writes ask on a lasting card in the owner's chat. */
+function createMcpToolFor(account, config) {
+    return createBotMcpTool(account, config, {
+        askOwner: (label, params, args) => askOwnerLasting(account, config.ownerGroupId, "mcp", label, params, args),
+    });
+}
+/**
+ * The owner approved a parked card after its first wait: do it now with the tool it came from,
+ * approval already given, and post what came of it in that chat.
+ */
+async function runParkedAction(account, cfg, action) {
+    const zh = /[\u3400-\u9fff]/.test(`${action.label} ${JSON.stringify(action.card.params)}`);
+    let result;
+    if (action.tool === "email") {
+        const config = emailAddonOf(account);
+        result = config ? await createEmailToolFor(account, config, cfg).runApproved(action.args) : zh ? "邮箱 add-on 已关闭，没有执行。" : "The email add-on is off; nothing was done.";
+    }
+    else {
+        const config = mcpAddonOf(account);
+        result = config ? await createMcpToolFor(account, config).runApproved(action.args) : zh ? "业务系统 add-on 已关闭，没有执行。" : "The business-system add-on is off; nothing was done.";
+    }
+    // What the tool tells the model, minus the data markers meant for it.
+    const shown = result.replace(/^<<(end )?external [^>]*>>\n?/gm, "").trim();
+    const text = `${zh ? "✅ 已按你的同意执行" : "✅ Done on your approval"}：${action.label}\n${shown.length > 1500 ? `${shown.slice(0, 1500)}…` : shown}`;
+    await sendEncryptedChatContent({ account, groupId: action.groupId, content: { text } }).catch(() => { });
+}
 /** Build ConfirmationDeps for the action confirmation module. */
 function makeConfirmationDeps(account) {
     return {
@@ -1571,11 +1611,8 @@ function buildChannelTools(account, cfg) {
         tools.push(createEmailToolFor(account, emailConfig, cfg));
     // The owner's business systems over MCP (mcp add-on): one tool, write operations behind a card.
     const mcpConfig = mcpAddonOf(account);
-    if (mcpConfig) {
-        tools.push(createBotMcpTool(account, mcpConfig, {
-            askOwner: async (label, params) => !!mcpConfig.ownerGroupId && requestConfirmation(makeConfirmationDeps(account), mcpConfig.ownerGroupId, "mcp", params, label),
-        }));
-    }
+    if (mcpConfig)
+        tools.push(createMcpToolFor(account, mcpConfig));
     // Plan tool: lets the agent declare + maintain a high-level task plan that the
     // app renders as a live "task progress N/M" checklist (distinct from tool steps).
     tools.push({
@@ -2204,6 +2241,11 @@ export const ozaiyaPlugin = {
                     });
                     ctx.log?.info(`[${botAccount.accountId}] registered webhook at ${botAccount.webhookPath}`);
                     syncMailWatch(botAccount, ctx.cfg, stateDir, ctx.log);
+                    if (!parkedRestored.has(botAccount.accountId)) {
+                        parkedRestored.add(botAccount.accountId);
+                        void restoreParkedActions(makeLastingDeps(botAccount)).catch(() => { });
+                        void restoreScheduledMails(mailScheduleDeps(botAccount, ctx.cfg)).catch(() => { });
+                    }
                     // The app's model + add-on settings, for helpers beside the gateway (e.g. a 闲鱼 inbox watcher).
                     writeBotLocalSettings(stateDir, botAccount).catch((err) => {
                         ctx.log?.warn?.(`[${botAccount.accountId}] could not write local settings: ${String(err)}`);
@@ -3248,11 +3290,7 @@ function createEmailToolFor(account, config, cfg) {
             const running = [activeDispatches.get(account.accountId)?.groupId, mailTurns.get(account.accountId)].filter(Boolean);
             return running.length > 0 && running.every((groupId) => groupId === ownerGroupId);
         },
-        askOwner: async (label, params) => {
-            if (!ownerGroupId)
-                return false;
-            return requestConfirmation(makeConfirmationDeps(account), ownerGroupId, "email", params, label);
-        },
+        askOwner: (label, params, args) => askOwnerLasting(account, ownerGroupId, "email", label, params, args),
         // Files the owner sends in that chat are staged here (stageInboundAttachmentsForAgent).
         ownerFiles: () => ownerGroupId
             ? path.join(getOzaiyaRuntime().state.resolveStateDir(), "media", "ozaiya", sanitizePathSegment(ownerGroupId, "group"))
@@ -3263,8 +3301,33 @@ function createEmailToolFor(account, config, cfg) {
             const uploaded = await uploadFile(account.apiBaseUrl, account.botToken, ownerGroupId, file.name, resolveAttachmentMime(file.name, file.mime), file.data);
             await sendEncryptedChatContent({ account, groupId: ownerGroupId, content: { files: [uploaded], ...(file.caption ? { text: file.caption } : {}) } });
         },
+        schedule: async (entry) => {
+            if (!ownerGroupId)
+                throw new Error("no chat with the owner");
+            return (await scheduleMail(mailScheduleDeps(account, cfg), { ...entry, groupId: ownerGroupId })).id;
+        },
+        scheduledList: () => scheduledMails(account.accountId),
+        cancelScheduled: (id) => cancelScheduledMail(mailScheduleDeps(account, cfg), id),
     });
 }
+/**
+ * Scheduled sending for a bot: at the time, the email tool — built then, from the bot's config as it
+ * is by then — sends with approval already given, and the outcome goes to the owner's chat.
+ */
+function mailScheduleDeps(account, cfg) {
+    return {
+        accountId: account.accountId,
+        stateDir: getOzaiyaRuntime().state.resolveStateDir(),
+        send: async (args) => {
+            const current = gatewayBotAccounts.get(account.accountId) ?? account;
+            const config = emailAddonOf(current);
+            return config ? createEmailToolFor(current, config, cfg).runApproved(args) : "Failed: the email add-on is off.";
+        },
+        notify: async (groupId, text) => {
+            await sendEncryptedChatContent({ account: gatewayBotAccounts.get(account.accountId) ?? account, groupId, content: { text } });
+        },
+    };
+}
 /**
  * New mail reached the bot's own mailbox: run a turn in the owner's chat with the bot, so it tells
  * them and, where it may, answers. The mail's headers come in marked as outside data; the agent
@@ -3372,6 +3435,14 @@ function syncMailWatch(account, cfg, stateDir, log) {
     const stop = watchMailboxes(account, {
         stateDir,
         log: { info: (msg) => log?.info?.(msg), warn: (msg) => log?.warn?.(msg) },
+        onLoginRejected: async (mailbox, detail) => {
+            const groupId = config?.ownerGroupId;
+            if (!groupId)
+                return;
+            const text = `⚠️ 邮箱 ${mailbox.email} 登录被邮件服务器拒绝（${detail}），暂时收不到新邮件。\n`
+                + "如果改过这个邮箱的密码，请在 app 里把邮箱重新添加一次；如果没改过，可能是服务商暂时限制了登录，我会每 30 分钟重试一次，恢复后自动继续。";
+            await sendEncryptedChatContent({ account: gatewayBotAccounts.get(botId) ?? account, groupId, content: { text } });
+        },
         onNewMail: (mailbox, mails) => {
             // One new-mail turn at a time per bot, with the bot's config as it is by then.
             const next = (mailTurnQueues.get(botId) ?? Promise.resolve())
@@ -4529,6 +4600,13 @@ ctx) {
         const resolved = await resolveConfirmation(deps, actionCallback.actionId, actionCallback.approved);
         if (resolved)
             return; // intercepted — don't dispatch to agent
+        // A lasting card answered after its first wait: run the parked action now.
+        const late = await takeParkedAction(makeLastingDeps(account), actionCallback.actionId, actionCallback.approved);
+        if (late.found) {
+            if (late.run)
+                await runParkedAction(account, ctx.cfg, late.run);
+            return;
+        }
     }
     // Intercept task-control callbacks from the chat task card.
     //   oz_stop:<taskId>     → abort the running dispatch mid-flight (interrupts the LLM turn)