@ozaiya/openclaw-channel 0.10.39 → 0.10.41

package/dist/src/botLocalSettings.d.ts

@@ -0,0 +1,20 @@
+/**
+ * A bot's non-secret settings from the app — its AI model and its add-ons' configs — written where
+ * helpers running beside the gateway can read them: `<stateDir>/ozaiya-bots/<botId>.json`.
+ *
+ * A host-side helper (e.g. a 闲鱼 inbox watcher that wakes the bot) thereby follows the owner's
+ * choices in the app — which model, whether to auto-reply — without its own Ozaiya credentials.
+ * Rewritten whenever the gateway (re)loads the bot's config; skipped when nothing changed.
+ */
+export interface BotLocalSettings {
+    botId: string;
+    /** The app's per-bot AI model ("provider/model"), or null for the gateway's default. */
+    model: string | null;
+    addons: Record<string, Record<string, unknown>>;
+}
+export declare function botLocalSettingsPath(stateDir: string, botId: string): string;
+export declare function writeBotLocalSettings(stateDir: string, account: {
+    accountId: string;
+    model?: string;
+    addons?: Record<string, Record<string, unknown>>;
+}): Promise<boolean>;

package/dist/src/botLocalSettings.js

@@ -0,0 +1,20 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+const lastWritten = new Map();
+export function botLocalSettingsPath(stateDir, botId) {
+    return path.join(stateDir, "ozaiya-bots", `${botId}.json`);
+}
+export async function writeBotLocalSettings(stateDir, account) {
+    const settings = { botId: account.accountId, model: account.model ?? null, addons: account.addons ?? {} };
+    const body = JSON.stringify(settings, null, 2) + "\n";
+    if (lastWritten.get(account.accountId) === body)
+        return false;
+    const file = botLocalSettingsPath(stateDir, account.accountId);
+    await fs.mkdir(path.dirname(file), { recursive: true });
+    // Write-then-rename: a reader never sees half a file.
+    await fs.writeFile(`${file}.tmp`, body);
+    await fs.rename(`${file}.tmp`, file);
+    lastWritten.set(account.accountId, body);
+    return true;
+}
+//# sourceMappingURL=botLocalSettings.js.map

package/dist/src/botLocalSettings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"botLocalSettings.js","sourceRoot":"","sources":["../../src/botLocalSettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAiB7B,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;AAE9C,MAAM,UAAU,oBAAoB,CAAC,QAAgB,EAAE,KAAa;IAClE,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,QAAgB,EAChB,OAAgG;IAEhG,MAAM,QAAQ,GAAqB,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;IAC5H,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC;IACtD,IAAI,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC9D,MAAM,IAAI,GAAG,oBAAoB,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC/D,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,sDAAsD;IACtD,MAAM,EAAE,CAAC,SAAS,CAAC,GAAG,IAAI,MAAM,EAAE,IAAI,CAAC,CAAC;IACxC,MAAM,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,EAAE,IAAI,CAAC,CAAC;IACrC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACzC,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/src/channel.js

@@ -33,6 +33,8 @@ import { fetchSocialMediaPost, searchSocialMedia, extractSocialMediaContent } fr
 import { requestConfirmation, parseActionCallback, resolveConfirmation } from "./actionConfirmation.js";
 import { createBotEmailTool, emailAddonOf, newMailNotice, watchMailboxes } from "./botEmail.js";
 import { createBotMcpTool, mcpAddonOf } from "./botMcp.js";
+import { lastChatFromSessionStore } from "./lastChat.js";
+import { writeBotLocalSettings } from "./botLocalSettings.js";
 const DEFAULT_API_BASE_URL = "https://api.ozaiya.com";
 const DEFAULT_WEBHOOK_PATH = "/ozaiya/webhook";
 const DEFAULT_ACCOUNT_ID = "default";
@@ -1481,6 +1483,25 @@ async function buildNativeDocumentContext(params) {
  * Non-read-only tools are wrapped to report progress steps to the active
  * dispatch's task progress card (when one exists for this account).
  */
+/**
+ * The chat a tool works for: the message being answered, else the last one this bot received, else —
+ * a turn started from outside (gateway `agent` call, host watcher) or the first after a restart, when
+ * no inbound message has set the in-memory origin — the bot's newest chat in the session store.
+ */
+async function currentChatGroupId(account, cfg) {
+    const live = activeDispatches.get(account.accountId)?.groupId ?? accountToOriginGroupId.get(account.accountId);
+    if (live)
+        return live;
+    try {
+        const ch = getOzaiyaRuntime().channel;
+        const route = ch.routing.resolveAgentRoute({ cfg, channel: "ozaiya", accountId: account.accountId, peer: { kind: "group", id: "" } });
+        const storePath = String(ch.session.resolveStorePath(undefined, { agentId: route.agentId }));
+        return lastChatFromSessionStore(await fs.readFile(storePath, "utf8"), account.accountId);
+    }
+    catch {
+        return undefined;
+    }
+}
 function buildChannelTools(account, cfg) {
     const resolveForGroup = (groupId) => resolveAccountForGroup(cfg, groupId) ?? account;
     const tools = [
@@ -1606,7 +1627,7 @@ function buildChannelTools(account, cfg) {
         execute: async (_toolCallId, rawArgs) => {
             const args = (rawArgs ?? {});
             const dispatch = activeDispatches.get(account.accountId);
-            const groupId = dispatch?.groupId ?? accountToOriginGroupId.get(account.accountId);
+            const groupId = await currentChatGroupId(account, cfg);
             if (!groupId) {
                 return { content: [{ type: "text", text: "No active task to attach a deliverable to." }] };
             }
@@ -1679,8 +1700,7 @@ function buildChannelTools(account, cfg) {
         },
         execute: async (_toolCallId, rawArgs) => {
             const args = (rawArgs ?? {});
-            const dispatch = activeDispatches.get(account.accountId);
-            const groupId = dispatch?.groupId ?? accountToOriginGroupId.get(account.accountId);
+            const groupId = await currentChatGroupId(account, cfg);
             if (!groupId) {
                 return { content: [{ type: "text", text: "No active chat to send the login request to." }] };
             }
@@ -2113,6 +2133,10 @@ export const ozaiyaPlugin = {
                     });
                     ctx.log?.info(`[${botAccount.accountId}] registered webhook at ${botAccount.webhookPath}`);
                     syncMailWatch(botAccount, ctx.cfg, stateDir, ctx.log);
+                    // 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)}`);
+                    });
                 };
                 const stopBotHandler = (botId) => {
                     botUnregisters.get(botId)?.();