@ozaiya/openclaw-channel 0.10.51 → 0.10.53

package/dist/src/actionConfirmation.d.ts

@@ -15,6 +15,51 @@ export interface ConfirmationDeps {
     }>;
     editEncrypted: (groupId: string, messageId: string, content: OzaiyaMessageContent) => Promise<void>;
 }
+/** What a lasting card ends in: answered within the first wait, or still open ("later"). */
+export type LastingAnswer = "approved" | "rejected" | "later";
+/**
+ * An action whose card was not answered within the first wait: kept (on disk too, so a gateway
+ * restart keeps it) until the owner answers or it expires. On Approve, the tool named here runs
+ * it again with exactly these args, approval already given.
+ */
+export interface ParkedAction {
+    actionId: string;
+    accountId: string;
+    groupId: string;
+    messageId: string;
+    tool: "email" | "mcp";
+    args: unknown;
+    label: string;
+    card: ActionCardContent;
+    expiresAt: number;
+}
+export interface LastingDeps extends ConfirmationDeps {
+    accountId: string;
+    /** The gateway's state dir; parked actions live in <stateDir>/ozaiya-approvals. */
+    stateDir: string;
+}
+/**
+ * Like requestConfirmation, but the card doesn't die with the wait: when nobody answers within the
+ * first 5 minutes, the action is parked for 24 hours ("later") and runs when the owner taps
+ * Approve (takeParkedAction). For actions that can wait: sending mail, writing to a business system.
+ */
+export declare function requestLastingConfirmation(deps: LastingDeps, groupId: string, action: string, params: Record<string, unknown>, label: string, replay: {
+    tool: ParkedAction["tool"];
+    args: unknown;
+}): Promise<LastingAnswer>;
+/**
+ * The owner answered a card that was parked: take it out (so a double tap can't run it twice) and,
+ * when it was approved and is still valid, hand it back to be run (`run`). The card shows the answer
+ * either way. `found: false` when there is no such parked action (not a lasting card, or answered).
+ */
+export declare function takeParkedAction(deps: LastingDeps, actionId: string, approved: boolean): Promise<{
+    found: false;
+} | {
+    found: true;
+    run: ParkedAction | null;
+}>;
+/** After a gateway (re)start: expire the account's parked actions on time again. */
+export declare function restoreParkedActions(deps: LastingDeps): Promise<number>;
 /**
  * Send a confirmation card and block until the user approves, rejects, or timeout.
  *

package/dist/src/actionConfirmation.js

@@ -10,9 +10,13 @@
  * callbacks processed by the agent.
  */
 import { randomBytes } from "node:crypto";
+import fs from "node:fs/promises";
+import path from "node:path";
 // ─── Constants ───────────────────────────────────────────────────────────────
 const ACTION_CALLBACK_PREFIX = "oz_ac:";
 const CONFIRMATION_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
+// A lasting card (mail, business-system writes) stays open this long after the first wait.
+const LASTING_VALID_MS = 24 * 60 * 60 * 1000;
 // ─── State ───────────────────────────────────────────────────────────────────
 const pendingConfirmations = new Map();
 // ─── Action label mapping (server-side fallback) ─────────────────────────────
@@ -22,6 +26,111 @@ const ACTION_LABELS = {
     message_user: "Send Direct Message",
     create_group: "Create Group",
 };
+const parked = new Map();
+const expiryTimers = new Map();
+const hasCjk = (text) => /[\u3400-\u9fff]/.test(text);
+const parkedDir = (stateDir) => path.join(stateDir, "ozaiya-approvals");
+const parkedFile = (stateDir, actionId) => path.join(parkedDir(stateDir), `${actionId.replace(/[^a-f0-9]/g, "")}.json`);
+async function forgetParked(stateDir, actionId) {
+    parked.delete(actionId);
+    clearTimeout(expiryTimers.get(actionId));
+    expiryTimers.delete(actionId);
+    await fs.rm(parkedFile(stateDir, actionId), { force: true }).catch(() => { });
+}
+function scheduleExpiry(deps, action) {
+    clearTimeout(expiryTimers.get(action.actionId));
+    // setTimeout caps at ~24.8 days; a day is well inside.
+    const timer = setTimeout(() => {
+        void forgetParked(deps.stateDir, action.actionId).then(() => updateCardStatus(deps, action.groupId, action.messageId, action.card, "expired"));
+    }, Math.max(0, action.expiresAt - Date.now()));
+    timer.unref?.();
+    expiryTimers.set(action.actionId, timer);
+}
+/**
+ * Like requestConfirmation, but the card doesn't die with the wait: when nobody answers within the
+ * first 5 minutes, the action is parked for 24 hours ("later") and runs when the owner taps
+ * Approve (takeParkedAction). For actions that can wait: sending mail, writing to a business system.
+ */
+export async function requestLastingConfirmation(deps, groupId, action, params, label, replay) {
+    const actionId = randomBytes(8).toString("hex");
+    const zh = hasCjk(`${label} ${Object.values(params).join(" ")}`);
+    const actionCard = {
+        action,
+        actionId,
+        status: "pending",
+        params: { ...params, [zh ? "有效期" : "Valid for"]: zh ? "24 小时（期间随时点同意都会执行）" : "24 hours (approving any time before then runs it)" },
+        label,
+    };
+    const result = await deps.sendEncrypted(groupId, {
+        text: `⏳ ${label}`,
+        actionCard,
+        inlineKeyboard: {
+            rows: [[
+                    { text: zh ? "✅ 同意" : "✅ Approve", callbackData: `${ACTION_CALLBACK_PREFIX}approve:${actionId}` },
+                    { text: zh ? "❌ 拒绝" : "❌ Reject", callbackData: `${ACTION_CALLBACK_PREFIX}reject:${actionId}` },
+                ]],
+        },
+    });
+    const messageId = result.message.id;
+    const answered = await new Promise((resolve) => {
+        const timer = setTimeout(() => {
+            if (pendingConfirmations.delete(actionId))
+                resolve(null);
+        }, CONFIRMATION_TIMEOUT_MS);
+        pendingConfirmations.set(actionId, { messageId, groupId, card: actionCard, resolve, timer });
+    });
+    if (answered !== null)
+        return answered ? "approved" : "rejected";
+    const parkedAction = {
+        actionId,
+        accountId: deps.accountId,
+        groupId,
+        messageId,
+        tool: replay.tool,
+        args: replay.args,
+        label,
+        card: actionCard,
+        expiresAt: Date.now() + LASTING_VALID_MS,
+    };
+    parked.set(actionId, parkedAction);
+    await fs.mkdir(parkedDir(deps.stateDir), { recursive: true }).catch(() => { });
+    await fs.writeFile(parkedFile(deps.stateDir, actionId), JSON.stringify(parkedAction), { mode: 0o600 }).catch(() => { });
+    scheduleExpiry(deps, parkedAction);
+    return "later";
+}
+/**
+ * The owner answered a card that was parked: take it out (so a double tap can't run it twice) and,
+ * when it was approved and is still valid, hand it back to be run (`run`). The card shows the answer
+ * either way. `found: false` when there is no such parked action (not a lasting card, or answered).
+ */
+export async function takeParkedAction(deps, actionId, approved) {
+    let action = parked.get(actionId);
+    if (!action) {
+        const raw = await fs.readFile(parkedFile(deps.stateDir, actionId), "utf8").catch(() => null);
+        action = raw ? JSON.parse(raw) : undefined;
+    }
+    if (!action || action.accountId !== deps.accountId)
+        return { found: false };
+    await forgetParked(deps.stateDir, actionId);
+    const expired = action.expiresAt < Date.now();
+    await updateCardStatus(deps, action.groupId, action.messageId, action.card, expired ? "expired" : approved ? "approved" : "rejected");
+    return { found: true, run: approved && !expired ? action : null };
+}
+/** After a gateway (re)start: expire the account's parked actions on time again. */
+export async function restoreParkedActions(deps) {
+    const names = await fs.readdir(parkedDir(deps.stateDir)).catch(() => []);
+    let restored = 0;
+    for (const name of names.filter((n) => n.endsWith(".json"))) {
+        const raw = await fs.readFile(path.join(parkedDir(deps.stateDir), name), "utf8").catch(() => null);
+        const action = raw ? JSON.parse(raw) : null;
+        if (!action || action.accountId !== deps.accountId || parked.has(action.actionId))
+            continue;
+        parked.set(action.actionId, action);
+        scheduleExpiry(deps, action);
+        restored++;
+    }
+    return restored;
+}
 // ─── Public API ──────────────────────────────────────────────────────────────
 /**
  * Send a confirmation card and block until the user approves, rejects, or timeout.
@@ -62,6 +171,7 @@ export async function requestConfirmation(deps, groupId, action, params, label)
         pendingConfirmations.set(actionId, {
             messageId: result.message.id,
             groupId,
+            card: actionCard,
             resolve,
             timer,
         });
@@ -101,22 +211,21 @@ export async function resolveConfirmation(deps, actionId, approved) {
     pendingConfirmations.delete(actionId);
     // Update card to show final status and remove keyboard
     const status = approved ? "approved" : "rejected";
-    await updateCardStatus(deps, entry.groupId, entry.messageId, undefined, status);
+    await updateCardStatus(deps, entry.groupId, entry.messageId, entry.card, status);
     entry.resolve(approved);
     return true;
 }
 // ─── Internal ────────────────────────────────────────────────────────────────
-async function updateCardStatus(deps, groupId, messageId, existingCard, newStatus) {
+async function updateCardStatus(deps, groupId, messageId, card, newStatus) {
     try {
         const statusEmoji = newStatus === "approved" ? "✅" : newStatus === "rejected" ? "❌" : "⏰";
-        const statusLabel = newStatus === "approved" ? "Approved" : newStatus === "rejected" ? "Rejected" : "Expired";
-        const label = existingCard?.label ?? "";
-        const updatedCard = existingCard
-            ? { ...existingCard, status: newStatus }
-            : { action: "", actionId: "", status: newStatus, params: {} };
+        const label = card.label ?? "";
+        // A card shown in Chinese says its outcome in Chinese.
+        const zh = hasCjk(label);
+        const statusLabel = newStatus === "approved" ? (zh ? "已同意" : "Approved") : newStatus === "rejected" ? (zh ? "已拒绝" : "Rejected") : (zh ? "已过期" : "Expired");
         const updatedContent = {
             text: `${statusEmoji} ${label} — ${statusLabel}`,
-            actionCard: updatedCard,
+            actionCard: { ...card, status: newStatus },
             // No inlineKeyboard — removes the buttons
         };
         await deps.editEncrypted(groupId, messageId, updatedContent);

package/dist/src/actionConfirmation.js.map

@@ -1 +1 @@
-{"version":3,"file":"actionConfirmation.js","sourceRoot":"","sources":["../../src/actionConfirmation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"actionConfirmation.js","sourceRoot":"","sources":["../../src/actionConfirmation.ts"],"names":[],"mappings":"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"}

package/dist/src/botEmail.d.ts

@@ -75,8 +75,11 @@ export declare function attachmentParts(root: MailStructureNode | undefined): Ma
 export interface BotEmailToolDeps {
     /** True when this tool call (by its id) was made in the owner's own chat with the bot. */
     inOwnerChat: (toolCallId?: string) => boolean;
-    /** Show an approval card in the owner's chat and wait for the answer (false on reject or no answer). */
-    askOwner: (label: string, params: Record<string, string>) => Promise<boolean>;
+    /**
+     * Show an approval card in the owner's chat. true / false when they answer within the first wait;
+     * "later" when the card stays open and the action (these args) runs on a later Approve.
+     */
+    askOwner: (label: string, params: Record<string, string>, args: unknown) => Promise<boolean | "later">;
     /** Where the files the owner sent in their chat with the bot are kept; outgoing attachments come only from there. */
     ownerFiles?: () => string | null;
     /** Post a file into the owner's chat with the bot. */
@@ -86,7 +89,28 @@ export interface BotEmailToolDeps {
         data: Buffer;
         caption?: string;
     }) => Promise<void>;
+    /** Keep an approved mail to send later (the args to run then, without send_at); returns its id. */
+    schedule?: (entry: {
+        sendAt: number;
+        args: unknown;
+        to: string;
+        subject: string;
+    }) => Promise<string>;
+    /** This bot's mails waiting to be sent, and cancelling one. */
+    scheduledList?: () => Array<{
+        id: string;
+        sendAt: number;
+        to: string;
+        subject: string;
+    }>;
+    cancelScheduled?: (id: string) => Promise<boolean>;
 }
+/** Told to the model when the card stays open past the first wait. */
+export declare const APPROVAL_LATER = "Your owner hasn't answered yet. The approval card stays open for 24 hours: when they tap Approve, it is done then and the result is posted in this chat. Tell your owner in one line that it waits for their approval, and don't do it again yourself.";
+/** The email tool, plus the way back in for an action approved later (not a model-callable tool). */
+export type BotEmailTool = ChannelAgentTool & {
+    runApproved: (args: unknown) => Promise<string>;
+};
 interface OutgoingFile {
     filename: string;
     content: Buffer;
@@ -101,7 +125,7 @@ export declare const STAGED_NAME_SUFFIX = ".name";
  */
 export declare function ownerChatFiles(paths: string[], root: string | null): Promise<OutgoingFile[]>;
 /** The `email` tool for a bot with the add-on: its own mailbox(es). */
-export declare function createBotEmailTool(account: ResolvedOzaiyaAccount, config: EmailAddonConfig, deps: BotEmailToolDeps): ChannelAgentTool;
+export declare function createBotEmailTool(account: ResolvedOzaiyaAccount, config: EmailAddonConfig, deps: BotEmailToolDeps): BotEmailTool;
 export interface NewMail {
     uid: number;
     from: string;
@@ -115,6 +139,11 @@ export interface MailWatchDeps {
         id: string;
         email: string;
     }, mails: NewMail[]) => Promise<void>;
+    /** The mail server refused the mailbox's login (told once until a login works again). */
+    onLoginRejected?: (mailbox: {
+        id: string;
+        email: string;
+    }, detail: string) => Promise<void>;
     log: {
         info: (msg: string) => void;
         warn: (msg: string) => void;