@yach.zhiyinlou.com/yach 2.16.0 → 2.16.1-beta.1

package/dist/src/core/authorization-flow.js

@@ -0,0 +1,157 @@
+import { randomUUID } from "node:crypto";
+export function createWebAuthorizationWaiter(binding, scopes, trace = () => { }) {
+    return {
+        key: `webchat:${binding.sessionKey}:${binding.requestId}`,
+        isActive: () => binding.isActive(),
+        register: (id, detach) => binding.defer(id, "authorization", detach),
+        pending(id, silent) {
+            trace("authorization.waiting");
+            binding.publish({
+                type: "authorization", status: "waiting",
+                text: silent ? undefined : "请在知音楼完成授权，完成后将继续当前网页操作。",
+                data: { flowId: id, scopes: [...scopes], silent },
+            });
+        },
+        async authorized(id) {
+            trace("authorization.authorized");
+            binding.publish({ type: "authorization", status: "authorized", data: { flowId: id } });
+            binding.settle(id);
+            try {
+                await binding.resume(`用户授权已完成。请只继续 Web 请求 ${JSON.stringify(binding.requestId)} 中尚未完成的操作，不重复已完成步骤，其他请求另行处理。`, `authorization:${id}`);
+            }
+            catch {
+                trace("authorization.resume.failed");
+                binding.settle(id, "authorization_resume_failed");
+            }
+        },
+        async failed(id, failure) {
+            trace("authorization.failed");
+            binding.publish({ type: "authorization", status: "failed", text: failure.message, data: { flowId: id, error: failure.error } });
+            binding.settle(id, failure.error);
+        },
+    };
+}
+function abortable(promise, signal) {
+    return new Promise((resolve, reject) => {
+        const onAbort = () => {
+            signal.removeEventListener("abort", onAbort);
+            reject(signal.reason);
+        };
+        signal.addEventListener("abort", onAbort, { once: true });
+        if (signal.aborted)
+            onAbort();
+        promise.then((result) => { signal.removeEventListener("abort", onAbort); resolve(result); }, (error) => { signal.removeEventListener("abort", onAbort); reject(error); });
+    });
+}
+/** 授权按用户/scopes 合并，操作等待者独立保存，取消不影响其他入口。 */
+export function createAuthorizationFlows() {
+    const flows = new Map();
+    function cleanup(key, flow) {
+        if (flows.get(key) === flow)
+            flows.delete(key);
+        if (flow.timer)
+            clearTimeout(flow.timer);
+        flow.controller.abort();
+    }
+    async function finish(key, flow, failure) {
+        if (flows.get(key) !== flow)
+            return;
+        const waiters = [...flow.waiters.values()];
+        flow.failure = failure;
+        flow.waiters.clear();
+        cleanup(key, flow);
+        const notices = new Set();
+        const claimNotice = (noticeKey) => {
+            if (notices.has(noticeKey))
+                return false;
+            notices.add(noticeKey);
+            return true;
+        };
+        await Promise.allSettled(waiters.filter((waiter) => waiter.isActive()).map((waiter) => failure ? waiter.failed(flow.id, failure, flow.silent, claimNotice) : waiter.authorized(flow.id, flow.silent, claimNotice)));
+    }
+    function add(key, flow, waiter) {
+        if (flow.waiters.has(waiter.key))
+            return true;
+        if (!waiter.isActive())
+            return false;
+        const detach = () => {
+            flow.waiters.delete(waiter.key);
+            if (!flow.waiters.size)
+                cleanup(key, flow);
+        };
+        if (!waiter.register(flow.id, detach))
+            return false;
+        flow.waiters.set(waiter.key, waiter);
+        if (flow.ready)
+            waiter.pending(flow.id, flow.silent);
+        return true;
+    }
+    return {
+        async start(key, waiter, setup) {
+            const existing = flows.get(key);
+            if (existing) {
+                if (!add(key, existing, waiter)) {
+                    return { flowId: existing.id, reused: true, failure: { error: "cancelled", message: "请求已失效。" } };
+                }
+                return { flowId: existing.id, reused: true };
+            }
+            const flow = {
+                id: randomUUID(), controller: new AbortController(), waiters: new Map(), silent: false, ready: false,
+            };
+            flows.set(key, flow);
+            if (!add(key, flow, waiter)) {
+                cleanup(key, flow);
+                return { flowId: flow.id, reused: false, failure: { error: "cancelled", message: "请求已失效。" } };
+            }
+            let deviceDeadlineArmed = false;
+            const scheduleDeadline = (expiresIn) => {
+                if (flow.timer)
+                    clearTimeout(flow.timer);
+                flow.timer = setTimeout(() => {
+                    void finish(key, flow, { error: "expired_token", message: "授权超时，请重新发起。" });
+                }, (expiresIn + 30) * 1000);
+                flow.timer.unref?.();
+            };
+            const armDeadline = (expiresIn) => {
+                if (flows.get(key) !== flow || flow.controller.signal.aborted)
+                    return;
+                deviceDeadlineArmed = true;
+                scheduleDeadline(expiresIn);
+            };
+            // 初始化网络请求也有上界；拿到设备码后立即改为设备码有效期，不能等发卡返回。
+            scheduleDeadline(60);
+            try {
+                const prepared = await abortable(setup(flow.controller.signal, flow.id, armDeadline), flow.controller.signal);
+                if (flows.get(key) !== flow) {
+                    return { flowId: flow.id, reused: false, failure: { error: "cancelled", message: "请求已失效。" } };
+                }
+                flow.silent = prepared.silent;
+                flow.ready = true;
+                for (const waiting of flow.waiters.values()) {
+                    if (waiting.isActive())
+                        waiting.pending(flow.id, flow.silent);
+                }
+                if (!deviceDeadlineArmed)
+                    armDeadline(prepared.expiresIn);
+                void prepared.poll(flow.controller.signal).then((result) => finish(key, flow, result.ok ? undefined : result), () => finish(key, flow, { error: "device_flow_failed", message: "授权轮询失败，请重新发起。" }));
+                return { flowId: flow.id, reused: false };
+            }
+            catch (err) {
+                const aborted = err instanceof Error && err.name === "AbortError";
+                const failure = flow.failure ?? {
+                    error: aborted ? "cancelled" : err instanceof Error && err.name === "YachAppScopeError" ? "app_scope_missing" : "device_flow_failed",
+                    message: aborted ? "授权请求已失效。" : err instanceof Error && err.name === "YachAppScopeError"
+                        ? "应用尚未开通所需权限。" : "无法发起授权流程，请稍后重试。",
+                    setup: true,
+                };
+                await finish(key, flow, failure);
+                return { flowId: flow.id, reused: false, failure };
+            }
+        },
+        clear() {
+            for (const [key, flow] of flows)
+                cleanup(key, flow);
+        },
+    };
+}
+//# sourceMappingURL=authorization-flow.js.map

package/dist/src/core/authorization-flow.js.map

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

package/dist/src/core/device-flow.js

@@ -22,7 +22,7 @@ export class YachAppScopeError extends Error {
     }
 }
 export async function sendYachAuthCard(params) {
-    const { baseUrl, appKey, appSecret, deviceCode, toUserId, groupTid, conversationType } = params;
+    const { baseUrl, appKey, appSecret, deviceCode, toUserId, groupTid, conversationType, sourceType } = params;
     const appToken = await getAccessToken(baseUrl, { appKey, appSecret });
     const body = {
         access_token: appToken,
@@ -33,6 +33,8 @@ export async function sendYachAuthCard(params) {
         body.to_userid = toUserId;
     if (conversationType === "2" && groupTid)
         body.group_tid = groupTid;
+    if (sourceType !== undefined)
+        body.source_type = sourceType;
     const resp = await oapiFetch(`${baseUrl}/openapi/v2/auth/apply/send`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },

package/dist/src/core/device-flow.js.map

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

package/dist/src/core/execution-context.js

@@ -0,0 +1,73 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+const storage = new AsyncLocalStorage();
+const webchatTurns = new Map();
+/** 核心可能隔离工具的异步上下文，仅保留本次已验签且仍在执行的会话绑定。 */
+export async function withWebchatTurn(binding, fn) {
+    if (webchatTurns.has(binding.sessionKey))
+        throw new Error("同一 Web 会话不能并发派发。");
+    webchatTurns.set(binding.sessionKey, binding);
+    try {
+        return await withExecutionContext({ source: "webchat", binding, sessionKey: binding.sessionKey }, fn);
+    }
+    finally {
+        if (webchatTurns.get(binding.sessionKey) === binding)
+            webchatTurns.delete(binding.sessionKey);
+    }
+}
+export function getExecutionContext() {
+    return storage.getStore();
+}
+export function withExecutionContext(context, fn) {
+    return storage.run(Object.freeze(context), fn);
+}
+export function resolveMessageSource(ctx) {
+    const channel = ctx?.messageChannel ?? ctx?.deliveryContext?.channel;
+    return channel === "yach" || channel === "webchat" ? channel : "unknown";
+}
+/** 本轮来源优先于外层 ALS，避免 Web 工具继承到旧的 IM 身份或投递目标。 */
+export function resolveToolExecutionContext(ctx, ticket) {
+    const current = getExecutionContext();
+    const hasSource = Boolean(ctx?.messageChannel || ctx?.deliveryContext?.channel);
+    const source = hasSource ? resolveMessageSource(ctx) : (current?.source ?? "unknown");
+    const trace = {
+        sessionKey: ctx?.sessionKey ?? current?.sessionKey,
+        sessionId: ctx?.sessionId ?? current?.sessionId,
+        toolCallId: current?.toolCallId,
+        toolName: current?.toolName,
+    };
+    if (source === "webchat") {
+        const binding = (current?.source === "webchat" ? current.binding : undefined) ??
+            (ctx?.sessionKey ? webchatTurns.get(ctx.sessionKey) : undefined);
+        const matches = binding?.isActive() &&
+            (!ctx || (ctx.sessionKey === binding.sessionKey && ctx.requesterSenderId === binding.senderId));
+        return { ...trace, source, binding: matches ? binding : undefined };
+    }
+    if (source === "yach" && ticket &&
+        (!ctx?.requesterSenderId || ctx.requesterSenderId === ticket.senderId)) {
+        return { ...trace, source, ticket };
+    }
+    return { ...trace, source: "unknown" };
+}
+export function executionIdentity(context = getExecutionContext()) {
+    if (context?.source === "yach")
+        return context.ticket;
+    if (context?.source === "webchat" && context.binding?.isActive())
+        return context.binding;
+    return undefined;
+}
+export function executionTrace(context = getExecutionContext()) {
+    const ticket = context?.source === "yach" ? context.ticket : undefined;
+    const binding = context?.source === "webchat" ? context.binding : undefined;
+    const identity = ticket ?? binding;
+    return {
+        source: context?.source ?? "unknown",
+        sessionKey: context?.sessionKey ?? ticket?.sessionKey ?? binding?.sessionKey,
+        sessionId: context?.sessionId,
+        accountId: identity?.accountId,
+        msgId: ticket?.msgId,
+        requestId: binding?.requestId,
+        toolCallId: context?.toolCallId,
+        toolName: context?.toolName,
+    };
+}
+//# sourceMappingURL=execution-context.js.map

package/dist/src/core/execution-context.js.map

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

package/dist/src/core/fetch.js

@@ -95,7 +95,9 @@ export async function oapiFetch(url, init, options) {
     const method = init?.method ?? "GET";
     const reqBody = typeof init?.body === "string" ? init.body.slice(0, 1_000_000) : undefined;
     const versionArea = configManager.getVersionArea();
-    log.debug(`${method} ${url} versionArea: ${versionArea}`, reqBody ? { body: reqBody } : undefined);
+    // 仅新查询接口选择隐藏Token查询参数，旧调用的日志行为不变。
+    const logUrl = options?.omitQueryFromLog ? url.split("?")[0] : url;
+    log.debug(`${method} ${logUrl} versionArea: ${versionArea}`, reqBody ? { body: reqBody } : undefined);
     const res = await fetch(url, {
         ...init,
         headers: {
@@ -105,7 +107,7 @@ export async function oapiFetch(url, init, options) {
         },
     });
     const text = await res.clone().text();
-    log.debug(`${method} ${url} → ${res.status}`, { body: text.slice(0, 500) });
+    log.debug(`${method} ${logUrl} → ${res.status}`, { body: text.slice(0, 500) });
     const bizErr = parseBusinessError(text);
     const bizIgnored = bizErr && options?.ignoreBizCodes?.includes(bizErr.bizCode);
     if (!res.ok || (bizErr && !bizIgnored)) {

package/dist/src/core/fetch.js.map

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

package/dist/src/core/web-sender.js

@@ -0,0 +1,66 @@
+import { getAccessToken } from "./app-token.js";
+import { oapiFetch } from "./fetch.js";
+// 主人属于应用账号；缓存和并发去重只减少重复 HTTP请求，不依赖 Channel SDK。
+const CACHE_TTL_MS = 5 * 60 * 1000;
+// key为[接口地址,账号ID,appKey]；senderId是主人业务UUID，expiresAt是缓存失效时间戳。
+const cache = new Map();
+// 同账号正在进行的查询：多个工具共享一次Promise，结束即移除，失败也允许下次重试。
+const inFlight = new Map();
+/**
+ * 只执行一次GET查询，不做缓存或消息投递。
+ * account提供应用凭证；baseUrl是去掉末尾斜杠的接口地址；返回obj.sender_id原字符串。
+ */
+async function querySenderId(account, baseUrl) {
+    let appToken;
+    try {
+        appToken = await getAccessToken(baseUrl, { appKey: account.appKey, appSecret: account.appSecret });
+    }
+    catch {
+        throw new Error("获取应用访问凭证失败，请稍后重试。");
+    }
+    let response;
+    try {
+        response = await oapiFetch(`${baseUrl}/openapi/v2/openclaw/plugin/get_uuid/by/token?access_token=${encodeURIComponent(appToken)}`, { method: "GET" }, { omitQueryFromLog: true });
+    }
+    catch {
+        // 请求异常可能包含 URL，不把带 Token的 URL作为工具结果返回。
+        throw new Error("无法获取用户 ID，请稍后重试。");
+    }
+    if (!response.ok)
+        throw new Error(`无法获取用户 ID（HTTP ${response.status}），请稍后重试。`);
+    const data = await response.json();
+    if (data.code !== 200 || typeof data.obj?.sender_id !== "string" || !data.obj.sender_id.trim()) {
+        throw new Error("无法获取用户 ID，授权失败。");
+    }
+    // 业务 UUID是opaque字符串，可能是大整数字符串，不能转成 Number。
+    return data.obj.sender_id;
+}
+/**
+ * 从Control UI已选定的应用账号获取主人UUID，复用短缓存/并发请求。
+ * 不要求Channel SDK在线；Yach上下文不会调用，Yach发送者仍来自原消息。
+ */
+export async function resolveWebSenderId(account) {
+    if (!account.configured || !account.appKey || !account.appSecret) {
+        throw new Error(`账号 ${account.accountId} 未配置，无法发起授权。`);
+    }
+    const baseUrl = account.baseUrl.replace(/\/+$/, "");
+    const key = JSON.stringify([baseUrl, account.accountId, account.appKey]);
+    const saved = cache.get(key);
+    if (saved && saved.expiresAt > Date.now())
+        return saved.senderId;
+    const pending = inFlight.get(key);
+    if (pending)
+        return pending;
+    const request = querySenderId(account, baseUrl).then((senderId) => {
+        cache.set(key, { senderId, expiresAt: Date.now() + CACHE_TTL_MS });
+        return senderId;
+    });
+    inFlight.set(key, request);
+    try {
+        return await request;
+    }
+    finally {
+        inFlight.delete(key);
+    }
+}
+//# sourceMappingURL=web-sender.js.map

package/dist/src/core/web-sender.js.map

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

package/dist/src/core/webchat-reply.js

@@ -0,0 +1,177 @@
+import { getYachRuntime } from "./runtime.js";
+import { enqueueChatTask } from "../messaging/outbound/chat-queue.js";
+// 模块加载Promise：只加载一次SDK，多个通知/恢复共用，不是授权任务状态。
+let sdkPromise;
+/** 动态加载并确认三个公开函数可用；当前安装包缺types声明，不能静态导入其类型。 */
+export function loadWebTranscriptSdk() {
+    if (!sdkPromise) {
+        // 此 SDK子路径只有 JS导出，动态加载避免依赖缺失的类型声明。
+        const specifier = "openclaw/plugin-sdk/session-transcript-runtime";
+        sdkPromise = import(specifier).then((sdk) => {
+            for (const name of ["appendAssistantMirrorMessageByIdentity", "readSessionTranscriptEvents", "publishSessionTranscriptUpdateByIdentity"]) {
+                if (typeof sdk[name] !== "function")
+                    throw new Error(`OpenClaw SDK 不支持 Web 会话：${name}`);
+            }
+            return sdk;
+        });
+    }
+    return sdkPromise;
+}
+/** 从组织虾ticket取原会话身份；缺信息时不猜目标、不改用知音楼IM。 */
+function sessionIdentity(ticket) {
+    if (ticket.source !== "orgclaw-zxl" || !ticket.agentId || !ticket.sessionKey || !ticket.sessionId) {
+        throw new Error("组织虾授权缺少原 Web 会话信息");
+    }
+    return { agentId: ticket.agentId, sessionKey: ticket.sessionKey, sessionId: ticket.sessionId };
+}
+/**
+ * 将固定授权反馈写入原Web聊天记录，不调用模型、不发送知音楼IM。
+ * @param ticket 授权发起时保存的来源和原会话信息。
+ * @param text 沿用知音楼渠道语气的用户可见文案。
+ * @param cfg 当前OpenClaw配置，用于SDK会话写入。
+ * @param messageId 本次通知的唯一ID，同时用于幂等和来源标记，不是用户UUID。
+ * @param deps 测试依赖；生产调用省略。
+ */
+export async function notifyWebSession(ticket, text, cfg, messageId, deps = {}) {
+    const sdk = deps.sdk ?? await loadWebTranscriptSdk();
+    const result = await sdk.appendAssistantMirrorMessageByIdentity({
+        ...sessionIdentity(ticket), config: cfg, text, idempotencyKey: messageId,
+        deliveryMirror: { kind: "channel-final", sourceMessageId: messageId }, updateMode: "inline",
+    });
+    if (!result.ok)
+        throw new Error(`Web 会话通知写入失败：${result.reason}`);
+}
+/** 只保留有消息ID的assistant事件，用户消息和工具调用不作为助手答案发布。 */
+function entries(events) {
+    return events.filter((event) => {
+        const row = event;
+        return !!row && typeof row.id === "string" && !!row.message && row.message.role === "assistant";
+    });
+}
+/** 提取可见文字作比较/展示，忽略thinking、tool call等非文字内容。 */
+function messageText(entry) {
+    const content = entry.message.content;
+    if (typeof content === "string")
+        return content.trim();
+    if (!Array.isArray(content))
+        return "";
+    return content.filter((part) => part?.type === "text").map((part) => part.text).join("\n").trim();
+}
+/**
+ * 插件主动在原Web会话发起一轮回复，沿用现有per-chat队列，不新增状态服务。
+ * @param ticket 原用户UUID、会话身份及等待授权的工具调用信息。
+ * @param cfg 原OpenClaw配置，沿用既有模型、工具和会话策略。
+ * @param messageId 本次合成恢复输入的ID，用作MessageSid及补交回复ID前缀。
+ * @param deps 测试可替换SDK/模型运行时，生产不传。
+ */
+export async function resumeWebSession(ticket, cfg, messageId, deps = {}) {
+    const identity = sessionIdentity(ticket);
+    const sdk = deps.sdk ?? await loadWebTranscriptSdk();
+    const runtime = deps.runtime ?? getYachRuntime();
+    const { promise } = enqueueChatTask({
+        accountId: ticket.accountId, chatId: `webchat:${identity.sessionKey}`,
+        task: async () => {
+            // 本轮开始前的消息基线，用于识别模型后来写入的回答，不能拿它作“已发布”集合。
+            const beforeIds = new Set(entries(await sdk.readSessionTranscriptEvents(identity)).map((entry) => entry.id));
+            // 仅本轮的消息ID→已发布正文，避免多个block重复刷新不变的内容；不是任务状态。
+            const publishedText = new Map();
+            const publish = async (entry, text = messageText(entry)) => {
+                if (publishedText.get(entry.id) === text)
+                    return;
+                await sdk.publishSessionTranscriptUpdateByIdentity({
+                    // 聊天正文只发布可见文本，思考/tool call块不再次作为答案推送。
+                    ...identity, update: { message: { ...entry.message, content: [{ type: "text", text }] }, messageId: entry.id },
+                });
+                publishedText.set(entry.id, text);
+            };
+            // 最终/直接回复：复用本轮已存的模型消息，仅补写未保存的文字或附件。
+            const deliver = async (reply) => {
+                const text = reply.text?.trim();
+                const mediaUrls = [...new Set([...(reply.mediaUrls ?? []), ...(reply.mediaUrl ? [reply.mediaUrl] : [])])];
+                if ((!text || /^(NO_REPLY|HEARTBEAT_OK)$/.test(text)) && !mediaUrls.length)
+                    return;
+                const current = entries(await sdk.readSessionTranscriptEvents(identity));
+                // 模型通常已把回答写入历史；复用消息 ID发布，避免又贴一份模型回答。
+                const existing = current.find((entry) => {
+                    if (beforeIds.has(entry.id))
+                        return false;
+                    const entryText = messageText(entry);
+                    return text ? entryText === text : mediaUrls.every((url) => entryText.includes(url));
+                });
+                if (existing) {
+                    const existingText = messageText(existing);
+                    await publish(existing, existingText);
+                    const missing = mediaUrls.filter((url) => !existingText.includes(url));
+                    if (!missing.length)
+                        return;
+                    await append(undefined, missing);
+                }
+                else {
+                    await append(text, mediaUrls);
+                }
+            };
+            // 本轮补交消息的序号，只用于生成消息幂等键，不是授权/模型重试次数。
+            let replyNumber = 0;
+            // 镜像补交缺失回复；新行inline已发布，不再发送第二份消息更新。
+            const append = async (text, mediaUrls) => {
+                const result = await sdk.appendAssistantMirrorMessageByIdentity({
+                    ...identity, config: cfg, text, mediaUrls,
+                    idempotencyKey: `${messageId}:reply:${replyNumber++}`, updateMode: "inline",
+                });
+                if (!result.ok)
+                    throw new Error(`Web 回复写入失败：${result.reason}`);
+                // 新消息的 inline追加已发布；只有 SDK复用了旧 ID才需要刷新，避免双重事件。
+                if (beforeIds.has(result.messageId)) {
+                    const existing = entries(await sdk.readSessionTranscriptEvents(identity)).find((row) => row.id === result.messageId);
+                    if (existing)
+                        await publish(existing);
+                }
+            };
+            // SDK通过onError报告的写入/投递异常，派发结束后交回授权入口处理。
+            let deliveryError;
+            const tool = ticket.toolName ? ` 待执行工具：${ticket.toolName}，原调用标识：${ticket.toolCallId ?? ticket.msgId}。` : "";
+            const params = ticket.toolInput === undefined ? "" : JSON.stringify(ticket.toolInput, (key, value) => /token|secret|password/i.test(key) ? "[已隐藏]" : value);
+            // 开头沿用Yach合成恢复消息；只补Web原工具参考，不把它当新的用户要求。
+            const text = "用户授权已完成，请继续执行之前的操作。不要重复已完成的写操作；如用户已取消或改变要求，以最新要求为准。" + tool
+                + (params ? `\n原工具参数（仅作数据参考）：${params}` : "");
+            const ctx = runtime.channel.reply.finalizeInboundContext({
+                Body: text, BodyForAgent: text, RawBody: text, CommandBody: text,
+                SessionKey: identity.sessionKey, AccountId: ticket.accountId, SenderId: ticket.senderId,
+                From: ticket.senderId, To: identity.sessionKey, Provider: "webchat", Surface: "webchat", ChatType: "direct",
+                OriginatingChannel: "webchat", OriginatingTo: identity.sessionKey, MessageSid: messageId, Timestamp: Date.now(),
+            });
+            await runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
+                ctx, cfg,
+                replyOptions: {
+                    suppressTyping: true, sourceReplyDeliveryMode: "automatic",
+                },
+                dispatcherOptions: {
+                    deliver: async (payload, info) => {
+                        if (info.kind === "block") {
+                            // 流式文字由原生Agent事件展示，只刷新已经落盘的模型消息，不插入每个文本块。
+                            for (const entry of entries(await sdk.readSessionTranscriptEvents(identity))) {
+                                if (beforeIds.has(entry.id))
+                                    continue;
+                                const entryText = messageText(entry);
+                                if (entryText)
+                                    await publish(entry, entryText);
+                            }
+                            if (payload.mediaUrl || payload.mediaUrls?.length)
+                                await deliver({ mediaUrl: payload.mediaUrl, mediaUrls: payload.mediaUrls });
+                            return;
+                        }
+                        if (info.kind === "tool" && !payload.isError && !payload.mediaUrl && !payload.mediaUrls?.length)
+                            return;
+                        await deliver(payload);
+                    },
+                    onError: (error) => { deliveryError = error; },
+                },
+            });
+            // SDK负责会话排队和实际模型运行；返回不代表业务成功，用户看原会话的真实回复。
+            if (deliveryError)
+                throw deliveryError;
+        },
+    });
+    await promise;
+}
+//# sourceMappingURL=webchat-reply.js.map

package/dist/src/core/webchat-reply.js.map

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

package/dist/src/core/yach-ticket.js

@@ -11,6 +11,8 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { getYachConfig } from "./runtime.js";
+import { listYachAccountIds, resolveYachAccount } from "../accounts/index.js";
+import { resolveWebSenderId } from "./web-sender.js";
 // ── AsyncLocalStorage ─────────────────────────────────────────────────────
 const store = new AsyncLocalStorage();
 // ── 公开 API ──────────────────────────────────────────────────────────────
@@ -40,10 +42,10 @@ export function ticketElapsed() {
 //   sessionKey → agent:main:yach:{account}:{direct|group}:{peer}
 // 因此工具执行时若 ALS 无 ticket，就用该 ctx 重建一个。
 //
-// 注意：仅限「用户消息触发的工具调用」——requesterSenderId 来自核心入站的
-// 真实发送者。cron / subagent / heartbeat 触发的 run 核心明确不设置 senderId
-// （requesterSenderId 为 undefined），此时不重建（返回 undefined），工具走
-// 现有「不在消息上下文中」降级路径，绝不伪造发送者身份。
+// Yach 仅限「用户消息触发的工具调用」：requesterSenderId 来自真实入站，
+// 缺失时不重建，也不会改走 Web 查询。组织虾 Web 仅在核心明确标记
+// messageChannel=webchat 且提供完整原会话身份时，以应用 Token 查询主人 UUID。
+// cron / subagent / heartbeat / 未知渠道绝不触发 UUID 查询。
 /**
  * 把核心下发的账号标识（appKey / accountId）解析为插件侧账号 ID：
  * 先按 appKey 匹配 channels.yach.accounts，命中返回其 ID；否则原样归一化。
@@ -67,20 +69,71 @@ function resolveAccountIdForToolContext(ctx) {
     }
     return normalizeAccountId(raw);
 }
+/** 检查核心提供的会话标识是否为有效非空字符串，不生成或猜测会话身份。 */
+function isNonEmptyString(value) {
+    return typeof value === "string" && value.trim().length > 0;
+}
 /**
- * 用 OpenClawPluginToolContext 重建 YachTicket（ALS 兜底）。
- *
- * 仅当 ctx 明确属于 yach 渠道且 requesterSenderId 存在（真实用户消息触发）时
- * 重建；cron/subagent 等无发送者场景返回 undefined，不伪造发送者身份。
+ * 选择Control UI对应的应用账号：优先匹配核心给出的账号ID/appKey，否则只用唯一配置。
+ * 与旧Yach默认账号兜底分开，是为了避免应用Token查询到另一个账号的主人；不改旧函数。
+ */
+function resolveWebAccountForToolContext(ctx) {
+    let accounts;
+    try {
+        const cfg = getYachConfig();
+        accounts = listYachAccountIds(cfg)
+            .map((accountId) => resolveYachAccount({ cfg, accountId }))
+            // 与原工具客户端一样，只要求应用凭证配置；不要求消息通道启用或在线。
+            .filter((account) => account.configured);
+    }
+    catch {
+        return undefined;
+    }
+    const raw = ctx.deliveryContext?.accountId?.trim() || ctx.agentAccountId?.trim();
+    const matches = raw
+        ? accounts.filter((account) => account.appKey === raw || account.accountId === normalizeAccountId(raw))
+        : accounts;
+    if (matches.length !== 1)
+        return undefined;
+    return matches[0];
+}
+/**
+ * 用 OpenClawPluginToolContext 异步重建 Ticket（ALS 兜底）。
+ * Web 仅支持当前 messageChannel=webchat 且完整原会话身份的组织虾入口；
+ * Yach 必须有真实 requesterSenderId，始终保留原 ID，绝不查询 UUID。
  */
-export function rebuildTicketFromToolContext(ctx) {
+export async function rebuildTicketFromToolContext(ctx) {
     if (!ctx)
         return undefined;
+    const messageChannel = ctx.messageChannel;
     const delivery = ctx.deliveryContext;
+    if (messageChannel === "webchat") {
+        const { sessionKey, sessionId, agentId } = ctx;
+        if (!isNonEmptyString(sessionKey) || !isNonEmptyString(sessionId) || !isNonEmptyString(agentId)) {
+            return undefined;
+        }
+        const account = resolveWebAccountForToolContext(ctx);
+        if (!account)
+            return undefined;
+        // 组织虾使用应用主人 UUID；恢复轮复用缓存，不把 SDK客户端标识当业务用户。
+        const senderId = await resolveWebSenderId(account);
+        return {
+            source: "orgclaw-zxl",
+            sessionKey,
+            sessionId,
+            agentId,
+            msgId: sessionId,
+            // 仅兼容既有必填字段；Web 通知不能用此目标发送 Yach IM。
+            toId: senderId,
+            senderId,
+            accountId: account.accountId,
+            conversationType: "1",
+            startTime: Date.now(),
+        };
+    }
     if (delivery?.channel && delivery.channel !== "yach")
         return undefined;
-    // 发送者必须来自核心入站的真实 requesterSenderId；
-    // 缺失（cron/subagent/heartbeat）时不从 sessionKey 猜测，避免误用会话归属用户。
+    // 缺失（cron/subagent/heartbeat）时不猜发送者，也不映射为 Web。
     const senderId = ctx.requesterSenderId;
     if (!senderId)
         return undefined;
@@ -88,6 +141,7 @@ export function rebuildTicketFromToolContext(ctx) {
     const isGroup = to.startsWith("group:");
     const toId = isGroup ? to.replace(/^group:/, "") : senderId;
     return {
+        source: "yach",
         // msgId 无来源时用 sessionId 保证唯一性（仅用于日志关联/合成消息前缀）
         msgId: ctx.sessionId ?? "tool-ctx",
         toId,
@@ -104,7 +158,7 @@ export function rebuildTicketFromToolContext(ctx) {
 export async function runToolWithContext(ctx, fn) {
     if (getYachTicket())
         return fn();
-    const ticket = rebuildTicketFromToolContext(ctx);
+    const ticket = await rebuildTicketFromToolContext(ctx);
     if (!ticket)
         return fn();
     return withYachTicket(ticket, fn);

package/dist/src/core/yach-ticket.js.map

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

package/dist/src/messaging/inbound/handler.js

@@ -238,6 +238,7 @@ export async function handleInboundMessage(params) {
         }
     }
     const ticket = {
+        source: "yach",
         msgId,
         msgIdClient: message.msgIdClient,
         toId,

package/dist/src/messaging/inbound/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../../src/messaging/inbound/handler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAIhD,0EAA0E;AAE1E,MAAM,UAAU,YAAY,CAAC,OAA2B;IACtD,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3B,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC;QACtB,MAAM;QACN,OAAO;QACP,OAAO;QACP,MAAM;QACN,OAAO;QACP,OAAO;QACP,MAAM;QACN,MAAM;QACN,eAAe;QACf,WAAW;QACX,mBAAmB;QACnB,UAAU;KACX,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAED,2CAA2C;AAC3C,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC;AAI9D,0EAA0E;AAE1E,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,MAK1C;IACC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IACjD,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC;IAEjC,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,SAAS,GAAG,cAAc,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,EAAE,QAAQ,CAAC,CAAC;IAEnG,sCAAsC;IACtC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC;QAAE,OAAO;IAEtE,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QACjE,MAAM,CAAC,KAAK,CAAC,iBAAiB,GAAG,OAAO,CAAC,SAAS,GAAG,kCAAkC,CAAC,CAAC;QACzF,WAAW,CAAC,iBAAiB,EAAE,wBAAwB,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAC7G,OAAO;IACT,CAAC;IAED,aAAa;IACb,IAAI,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvC,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,SAAS,GAAG,0CAA0C,GAAG,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC;QAC/G,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEzC,IAAI,QAAgB,CAAC;IACrB,IAAI,cAAsB,CAAC;IAC3B,IAAI,KAAa,CAAC;IAElB,IAAI,aAAiC,CAAC;IACtC,IAAI,CAAC;QACH,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QACvD,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACjG,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtE,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAC1B,IAAI,CAAC;gBAAC,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;QACxG,CAAC;QACD,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;YACvB,OAAO,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,KAAK,CAAC,yBAAyB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACtD,WAAW,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACvH,OAAO;IACT,CAAC;IAED,yCAAyC;IACzC,IAAI,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC;QAAE,OAAO;IAE3C,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;QAAE,OAAO;IAEnC,WAAW;IACX,MAAM,QAAQ,GAAG,KAAK,IAAI,OAAO,CAAC,WAAW,CAAC;IAC9C,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAClD,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,SAAS,GAAG,sCAAsC,GAAG,QAAQ,GAAG,GAAG,CAAC,CAAC;YACnG,OAAO;QACT,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAyB,OAAO,CAAC,gBAAgB,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAC5F,MAAM,OAAO,GAAG,gBAAgB,KAAK,GAAG,CAAC;IAEzC,IAAI,UAAU,GAAG,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,UAAU,IAAI,QAAQ,CAAC;IAC1E,IAAI,SAA6B,CAAC;IAClC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAIvC,CAAC;YACF,IAAI,IAAI,CAAC,IAAI;gBAAE,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC;YACtC,MAAM,QAAQ,GAAa,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,QAAQ;gBAAE,QAAQ,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAChE,IAAI,IAAI,CAAC,IAAI;gBAAE,QAAQ,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACnD,IAAI,IAAI,CAAC,QAAQ;gBAAE,QAAQ,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACjE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;gBAAE,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,CAAC;QAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC;IAEjD,yEAAyE;IACzE,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAElC,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,WAAW,GAAG,UAAU,CAAC,WAAW,IAAI,MAAM,CAAC;QACrD,IAAI,WAAW,KAAK,UAAU,EAAE,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;YACnE,OAAO;QACT,CAAC;QACD,IAAI,WAAW,KAAK,WAAW,EAAE,CAAC;YAChC,MAAM,OAAO,GAAG,CAAC,UAAU,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC9D,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBAChE,MAAM,CAAC,IAAI,CAAC,eAAe,GAAG,cAAc,GAAG,iCAAiC,CAAC,CAAC;gBAClF,OAAO;YACT,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,IAAI,MAAM,CAAC;QAC/C,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;YAC5B,MAAM,CAAC,IAAI,CAAC,2BAA2B,GAAG,QAAQ,GAAG,sBAAsB,CAAC,CAAC;YAC7E,OAAO;QACT,CAAC;QACD,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACxB,MAAM,IAAI,GAAG,cAAc,EAAE,CAAC;YAC9B,MAAM,eAAe,GAAG,CAAC,UAAU,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACjE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO;iBAC9C,kBAAkB,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;iBACrE,KAAK,CAAC,GAAG,EAAE,CAAC,EAAc,CAAC,CAAC;YAC/B,MAAM,kBAAkB,GAAG,CAAC,GAAG,eAAe,EAAE,GAAG,cAAc,CAAC,CAAC;YACnE,MAAM,OAAO,GAAG,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAE1F,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;oBAC3B,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC;wBACxE,OAAO,EAAE,MAAM;wBACf,SAAS,EAAE,OAAO,CAAC,SAAS;wBAC5B,EAAE,EAAE,QAAQ;wBACZ,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE;qBAC3B,CAAC,CAAC;oBACH,IAAI,OAAO,EAAE,CAAC;wBACZ,MAAM,CAAC,IAAI,CAAC,iCAAiC,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,CAAC,CAAC;wBAClF,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC;4BACvD,OAAO,EAAE,MAAM;4BACf,MAAM,EAAE,qBAAqB,GAAG,QAAQ;4BACxC,IAAI;yBACL,CAAC,CAAC;wBACH,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC;4BACnD,IAAI,EAAE,QAAQ;4BACd,gBAAgB,EAAE,GAAG;4BACrB,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;yBAC3D,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC7E,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,IAAI,CAAC,qCAAqC,GAAG,QAAQ,GAAG,aAAa,GAAG,QAAQ,GAAG,GAAG,CAAC,CAAC;gBACjG,CAAC;gBACD,OAAO;YACT,CAAC;QACH,CAAC;IACH,CAAC;IAED,4EAA4E;IAC5E,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;QAC3B,MAAM,qBAAqB,CAAC;YAC1B,OAAO;YACP,OAAO;YACP,GAAG;YACH,MAAM;YACN,kBAAkB;YAClB,QAAQ;YACR,cAAc;YACd,OAAO;YACP,UAAU;YACV,IAAI;SACL,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,oEAAoE;IACpE,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,CAAC,CAAC,QAAQ,QAAQ,EAAE,CAAC;IACxE,MAAM,GAAG,GAAmB;QAC1B,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS;QACtD,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;KACjD,CAAC;IAEF,wDAAwD;IACxD,yDAAyD;IACzD,wBAAwB;IACxB,sDAAsD;IACtD,qBAAqB;IACrB,0CAA0C;IAC1C,qDAAqD;IACrD,0CAA0C;IAC1C,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACpE,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;QACpD,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,QAAQ,GAAG,MAAM,0BAA0B,CAAC;gBAChD,GAAG;gBACH,QAAQ;gBACR,MAAM;gBACN,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,GAAG,CAAC,CAAC;aAC1D,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACf,MAAM,CAAC,KAAK,CAAC,uCAAuC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBACpE,OAAO,EAAE,OAAO,EAAE,KAAc,EAAE,CAAC;YACrC,CAAC,CAAC,CAAC;YACH,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACrB,MAAM,CAAC,IAAI,CACT,OAAO,GAAG,OAAO,CAAC,SAAS,GAAG,kDAAkD,GAAG,QAAQ;oBAC3F,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC,CAC1F,CAAC;gBACF,IAAI,QAAQ,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;oBAC5C,iDAAiD;oBACjD,MAAM,qBAAqB,CAAC;wBAC1B,GAAG;wBACH,OAAO;wBACP,QAAQ;wBACR,cAAc;wBACd,OAAO;wBACP,MAAM;wBACN,IAAI;wBACJ,UAAU;wBACV,IAAI,EAAE,QAAQ,CAAC,MAAM;wBACrB,MAAM;qBACP,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;wBACf,MAAM,CAAC,KAAK,CAAC,uDAAuD,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;oBACtF,CAAC,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO;YACT,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG;QACb,KAAK;QACL,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,IAAI;QACJ,QAAQ;QACR,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,gBAAgB;QAChB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,aAAa;KACd,CAAC;IAEF,iBAAiB;IACjB,MAAM,SAAS,GAAG,oBAAoB,CAAC;QACrC,OAAO;QACP,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,OAAO;QACP,OAAO,EAAE,OAAO,CAAC,eAAe;KACjC,CAAC,CAAC;IACH,IAAI,SAAS,IAAI,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9C,MAAM,CAAC,IAAI,CACT,OAAO,GAAG,OAAO,CAAC,SAAS,GAAG,gCAAgC,GAAG,QAAQ;YACzE,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CACrC,CAAC;QACF,KAAK,OAAO,CAAC,OAAO,CAClB,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CACpE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,qCAAqC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YAClE,WAAW,CAAC,uBAAuB,EAAE,sBAAsB,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAChL,CAAC,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,oBAAoB;IACpB,MAAM,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC;QACjC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,MAAM;QACN,IAAI,EAAE,GAAG,EAAE,CACT,OAAO,CAAC,OAAO,CACb,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CACpE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,wCAAwC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACrE,WAAW,CAAC,uBAAuB,EAAE,+BAA+B,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACzL,CAAC,CAAC;KACL,CAAC,CAAC;IAEH,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACxB,MAAM,CAAC,IAAI,CACT,OAAO,GAAG,OAAO,CAAC,SAAS,GAAG,6BAA6B,GAAG,MAAM,GAAG,oBAAoB,CAC5F,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACH,KAAK,UAAU,qBAAqB,CAAC,MAWpC;IACC,MAAM,EACJ,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GACxF,GAAG,MAAM,CAAC;IACX,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,gBAAgB,GAAyB,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IACnE,MAAM,KAAK,GAAG,sBAAsB,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;IAE5F,MAAM,SAAS,GAAuB;QACpC,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;QAC3B,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC;QACvC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;QACxE,gBAAgB;QAChB,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC;QAC7C,UAAU,EAAE,UAAU;QACtB,cAAc,EAAE,UAAU;QAC1B,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;KAC7B,CAAC;IAEF,MAAM,YAAY,GAAmB;QACnC,QAAQ;QACR,cAAc;QACd,KAAK;QACL,UAAU;QACV,gBAAgB;QAChB,OAAO;QACP,MAAM;QACN,IAAI;QACJ,OAAO,EAAE,SAAS;KACnB,CAAC;IAEF,MAAM,CAAC,IAAI,CACT,OAAO,GAAG,OAAO,CAAC,SAAS,GAAG,uCAAuC,GAAG,QAAQ;QAChF,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAClE,CAAC;IACF,MAAM,cAAc,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;AAC5D,CAAC"}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../../src/messaging/inbound/handler.ts"],"names":[],"mappings":"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"}

package/dist/src/tools/auto-auth.js

@@ -13,6 +13,7 @@
  *   - 账号未配置
  *   - Device Flow 本身抛异常
  */
+import { randomUUID } from "node:crypto";
 import { jsonResult } from "openclaw/plugin-sdk/agent-runtime";
 import { getYachTicket, withYachTicket } from "../core/yach-ticket.js";
 import { NeedUserAuthorizationError } from "../core/user-token-errors.js";
@@ -22,6 +23,7 @@ import { resolveYachAccount } from "../accounts/index.js";
 import { YachClient } from "../core/yach-client.js";
 import { getYachConfig } from "../core/runtime.js";
 import { yachLogger } from "../core/yach-logger.js";
+import { loadWebTranscriptSdk, notifyWebSession, resumeWebSession } from "../core/webchat-reply.js";
 import { reportError, reportEvent } from "../core/reporter.js";
 const log = yachLogger("auto-auth");
 import { enqueueChatTask } from "../messaging/outbound/chat-queue.js";
@@ -33,10 +35,13 @@ function mergeScopes(a, b) {
     const setB = new Set((b ?? "").split(/[\s,]+/).filter(Boolean));
     return [...new Set([...setA, ...setB])].join(",");
 }
-async function persistMergedDeviceToken(appKey, senderId, t) {
+/**
+ * 保存设备授权取得的用户Token；senderId仍写入旧存储的userId字段。
+ * mergePrevious默认保留Yach原scope合并，Web传false，仅保存此次Token实际授予的scope。
+ */
+async function persistMergedDeviceToken(appKey, senderId, t, mergePrevious = true) {
     const now = Date.now();
-    const existingForMerge = await getStoredToken(appKey, senderId);
-    const mergedScope = mergeScopes(existingForMerge?.scope, t.scope);
+    const scope = mergePrevious ? mergeScopes((await getStoredToken(appKey, senderId))?.scope, t.scope) : t.scope;
     await setStoredToken({
         userId: senderId,
         appKey,
@@ -44,17 +49,18 @@ async function persistMergedDeviceToken(appKey, senderId, t) {
         refreshToken: t.refreshToken,
         expiresAt: now + t.expiresIn * 1000,
         refreshExpiresAt: now + t.refreshExpiresIn * 1000,
-        scope: mergedScope,
+        // Yach保留原合并行为；组织虾按此次 Token的真实 scope保存。
+        scope,
         grantedAt: now,
     });
 }
-/** Key: `${appKey}:${userId}` */
+/** Yach按应用/用户/权限去重；组织虾额外按原 Web会话隔离。 */
 const pendingFlows = new Map();
 /**
  * 执行知音楼 OAuth Device Flow。
  *
  * 1. 检查本地 token 是否已存在且 scope 足够 → 跳过授权
- * 2. Guard：已有 in-flight flow → 终止旧流，复用已有卡片（实际是覆盖）
+ * 2. Guard：已有相同来源/会话/权限的授权流程则复用，不重复发卡
  * 3. 请求 device_code
  * 4. apply/send；若 already_authorized 则标记静默（不发群提示、不发成功/失败 IM），仍后台轮询
  * 5. 群聊非静默时可发群内提示；后台轮询（fire-and-forget）
@@ -64,6 +70,18 @@ const pendingFlows = new Map();
 export async function executeYachAuthorize(params) {
     const { account, senderId, scopes, cfg, ticket } = params;
     const { appKey, appSecret, baseUrl } = account;
+    // 平台来源参数只取一次：组织虾传原来源值，Yach不传，保留默认投递。
+    const sourceType = ticket.source === "orgclaw-zxl" ? ticket.source : undefined;
+    const isOrgclaw = sourceType !== undefined;
+    // 此次授权通知/恢复的消息编号，不是用户UUID或会话ID；Yach仍用原消息编号。
+    const authId = isOrgclaw ? randomUUID() : "";
+    if (isOrgclaw) {
+        if (!ticket.sessionKey || !ticket.sessionId || !ticket.agentId) {
+            return jsonResult({ error: "missing_web_session", message: "无法确定原 Web 会话，不能发起授权。" });
+        }
+        // 只检查组织虾新增能力，不影响 Yach原来的 SDK/IM链路。
+        await loadWebTranscriptSdk();
+    }
     // ── 1. 检查已有 token 是否覆盖所需 scope ──────────────────────────────
     const existing = await getStoredToken(appKey, senderId);
     if (existing && tokenStatus(existing) !== "expired") {
@@ -78,7 +96,13 @@ export async function executeYachAuthorize(params) {
     }
     // ── 2. Guard：防止同一用户+相同scope并发触发授权 ────────────────────────
     const scopeKey = scopes.slice().sort().join(",");
-    const flowKey = `${appKey}:${senderId}:${scopeKey}`;
+    // Yach保持原 guard；组织虾按原会话隔离，避免两端互相吞掉重试。
+    const flowKey = isOrgclaw
+        ? `${sourceType}:${appKey}:${senderId}:${ticket.sessionKey}:${ticket.sessionId}:${scopeKey}`
+        : `${appKey}:${senderId}:${scopeKey}`;
+    if (isOrgclaw && pendingFlows.get(flowKey)?.retrying) {
+        return jsonResult({ error: "authorization_retry_failed", message: "授权后操作仍缺少同一权限，请检查权限或重新发起操作。" });
+    }
     if (pendingFlows.has(flowKey)) {
         // 已有 in-flight flow，本次请求复用，不重复发送卡片
         return jsonResult({
@@ -128,13 +152,18 @@ export async function executeYachAuthorize(params) {
             appSecret,
             deviceCode: deviceAuth.deviceCode,
             toUserId: senderId,
-            conversationType: "1", // 始终发 DM，授权消息应私密
+            conversationType: "1", // 保留平台原私聊参数；source_type决定投递业务。
+            // Yach不传，保持平台默认推送；只有Control UI传组织虾来源。
+            sourceType,
         });
     }
     catch (err) {
         if (err instanceof YachAppScopeError) {
             log.warn(`app missing scope permission, aborting flow: ${err.message}`);
             cleanupFlow();
+            if (isOrgclaw) {
+                return jsonResult({ error: "app_scope_unavailable", message: "应用未开通所需权限，用户授权无法解决，请联系管理员。" });
+            }
             return jsonResult({
                 awaiting_authorization: true,
                 message: "授权卡片已发送，正在等待用户完成授权。" +
@@ -151,7 +180,7 @@ export async function executeYachAuthorize(params) {
         log.info("auth apply/send returned already_authorized: background poll, no user-facing IM/card");
     }
     // ── 4b. 群聊时在群里推送提示消息 ──────────────────────────────────────────
-    if (!silentNoUserIm && params.conversationType === "2" && ticket.chatbotUserId) {
+    if (!isOrgclaw && !silentNoUserIm && params.conversationType === "2" && ticket.chatbotUserId) {
         const notifyText = `正在为您授权中,请您前往数字伙伴[查看](yach://yach.zhiyinlou.com/session/p2p?sessionid=${ticket.chatbotUserId})`;
         await new YachClient({ baseUrl, appKey, appSecret }).im.sendMessage({
             toId: params.toId,
@@ -181,13 +210,18 @@ export async function executeYachAuthorize(params) {
             if (!result.ok) {
                 cleanupFlow();
                 reportError("oauth.device-flow", "polling failed", { appKey, senderId, error: result.error });
-                if (silentNoUserIm) {
+                // 两端共用原知音楼反馈文案，只区分投递方式，不维护两套提示。
+                const failMsg = result.error === "access_denied"
+                    ? "❌ 您拒绝了授权请求。如需使用相关功能，请重新发起操作。"
+                    : `❌ 授权超时或失败（${result.message}）。请重新发起操作。`;
+                if (isOrgclaw) {
+                    await notifyWebSession(ticket, failMsg, cfg, `${authId}:failed`)
+                        .catch((e) => log.warn(`Web fail notify error: ${e}`));
+                }
+                else if (silentNoUserIm) {
                     log.warn(`silent auth poll finished without token: ${result.error} ${result.message}`);
                 }
                 else {
-                    const failMsg = result.error === "access_denied"
-                        ? "❌ 您拒绝了授权请求。如需使用相关功能，请重新发起操作。"
-                        : `❌ 授权超时或失败（${result.message}）。请重新发起操作。`;
                     await new YachClient({ baseUrl, appKey, appSecret }).im.sendMessage({
                         toId: senderId,
                         conversationType: "1",
@@ -196,10 +230,14 @@ export async function executeYachAuthorize(params) {
                 }
                 return;
             }
-            await persistMergedDeviceToken(appKey, senderId, result.token);
+            await persistMergedDeviceToken(appKey, senderId, result.token, !isOrgclaw);
             reportEvent("oauth.device-flow", "token obtained", { appKey, senderId, scope: result.token.scope });
-            if (!silentNoUserIm) {
-                const successMsg = "✅ 授权成功！正在为您重试之前的操作...";
+            const successMsg = "✅ 授权成功！正在为您重试之前的操作...";
+            if (isOrgclaw) {
+                // 沿用知音楼成功文案，先写原Web会话，再恢复模型，不经过IM。
+                await notifyWebSession(ticket, successMsg, cfg, `${authId}:success`);
+            }
+            else if (!silentNoUserIm) {
                 await new YachClient({ baseUrl, appKey, appSecret }).im.sendMessage({
                     toId: senderId,
                     conversationType: "1",
@@ -213,8 +251,14 @@ export async function executeYachAuthorize(params) {
                     }).catch((e) => log.warn(`group success notify error: ${e}`));
                 }
             }
-            // 发送合成消息触发 AI 重试
-            await sendSyntheticMessage({ ticket, account, cfg });
+            // 同样由插件主动恢复：组织虾固定原Web会话；Yach保持原合成入站消息。
+            if (isOrgclaw) {
+                flow.retrying = true;
+                await resumeWebSession(ticket, cfg, `${authId}:resume`);
+            }
+            else {
+                await sendSyntheticMessage({ ticket, account, cfg });
+            }
             // 延迟清理 guard：合成消息可能立即触起重试，
             // 如果 guard 已删除，重试会走完整 OAuth 再发一张卡
             setTimeout(() => cleanupFlow(), 30_000); // 30 秒后清理
@@ -224,6 +268,10 @@ export async function executeYachAuthorize(params) {
                 return; // 正常取消
             log.error(`polling error: ${err}`);
             cleanupFlow();
+            if (isOrgclaw) {
+                await notifyWebSession(ticket, "❌ 授权处理或重试失败。请重新发起操作。", cfg, `${authId}:error`)
+                    .catch((e) => log.warn(`Web error notify error: ${e}`));
+            }
         }
     })();
     const silenceHint = "【重要】请保持沉默，不要向用户输出任何内容，不要解释授权流程，不要建议替代方案。" +

package/dist/src/tools/auto-auth.js.map

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

package/dist/src/tools/index.js

@@ -1,4 +1,4 @@
-import { runToolWithContext } from "../core/yach-ticket.js";
+import { getYachTicket, runToolWithContext, withYachTicket } from "../core/yach-ticket.js";
 import { registerCalendarTools } from "./calendar/index.js";
 import { registerDocTools } from "./doc/index.js";
 import { registerSpaceTools } from "./space/space-node.js";
@@ -33,7 +33,13 @@ function withToolContext(ctx, tool) {
     // 多会话并发 run 会互相覆盖 execute 闭包导致 ctx 串台。
     return {
         ...tool,
-        execute: (async (...args) => runToolWithContext(ctx, () => execute(...args))),
+        execute: (async (...args) => runToolWithContext(ctx, async () => {
+            const ticket = getYachTicket();
+            if (ticket?.source !== "orgclaw-zxl")
+                return execute(...args);
+            // 只给Web保存恢复参考；args[0]是工具调用ID，args[1]是原参数，旧Yach ticket不变。
+            return withYachTicket({ ...ticket, toolName: tool.name, toolCallId: args[0], toolInput: args[1] }, () => execute(...args));
+        })),
     };
 }
 export function registerYachTools(api) {

package/dist/src/tools/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/index.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAI5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;;GAIG;AACH,SAAS,eAAe,CAAC,GAAsB;IAC7C,MAAM,oBAAoB,GAAG,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxD,GAAG,CAAC,YAAY,GAAG,CACjB,IAA8C,EAC9C,IAAgC,EAChC,EAAE;QACF,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,cAAc;YACd,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACjC,OAAO;QACT,CAAC;QACD,oBAAoB,CAClB,CAAC,GAA8B,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,EAC9D,IAAI,CACL,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAyB,GAA8B,EAAE,IAAO;IACtF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAE7B,wCAAwC;IACxC,gDAAgD;IAChD,uCAAuC;IACvC,OAAO;QACL,GAAG,IAAI;QACP,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,IAAU,EAAE,EAAE,CAChC,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,CAAiB;KACnE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAsB;IACtD,eAAe,CAAC,GAAG,CAAC,CAAC;IACrB,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC3B,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACtB,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACxB,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC3B,eAAe,CAAC,GAAG,CAAC,CAAC;IACrB,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACxB,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACzB,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACtB,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACxB,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACxB,oBAAoB,CAAC,GAAG,CAAC,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/index.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAI3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;;GAIG;AACH,SAAS,eAAe,CAAC,GAAsB;IAC7C,MAAM,oBAAoB,GAAG,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxD,GAAG,CAAC,YAAY,GAAG,CACjB,IAA8C,EAC9C,IAAgC,EAChC,EAAE;QACF,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,cAAc;YACd,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACjC,OAAO;QACT,CAAC;QACD,oBAAoB,CAClB,CAAC,GAA8B,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,EAC9D,IAAI,CACL,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAyB,GAA8B,EAAE,IAAO;IACtF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAE7B,wCAAwC;IACxC,gDAAgD;IAChD,uCAAuC;IACvC,OAAO;QACL,GAAG,IAAI;QACP,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,IAAU,EAAE,EAAE,CAChC,kBAAkB,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE;YACjC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;YAC/B,IAAI,MAAM,EAAE,MAAM,KAAK,aAAa;gBAAE,OAAO,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;YAC9D,yDAAyD;YACzD,OAAO,cAAc,CACnB,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAC3E,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CACvB,CAAC;QACJ,CAAC,CAAC,CAAiB;KACtB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAsB;IACtD,eAAe,CAAC,GAAG,CAAC,CAAC;IACrB,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC3B,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACtB,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACxB,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC3B,eAAe,CAAC,GAAG,CAAC,CAAC;IACrB,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACxB,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACzB,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACtB,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACxB,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACxB,oBAAoB,CAAC,GAAG,CAAC,CAAC;AAC5B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yach.zhiyinlou.com/yach",
-  "version": "2.16.0",
+  "version": "2.16.1-beta.1",
   "description": "OpenClaw Yach (知音楼) channel plugin",
   "type": "module",
   "main": "./dist/index.js",
@@ -22,6 +22,7 @@
     "server:callback": "npx tsx scripts/test-callback-server.ts",
     "test:config": "npx tsx scripts/test-config.js",
     "test:task-progress": "npm run build && node --test scripts/test-task-progress.mjs",
+    "test:web-auth": "npm run build && node --test scripts/test-web-auth.mjs",
     "npm:publish": "npm run build && npm publish --tag latest",
     "npm:publish:beta": "npm run build && npm publish --tag beta",
     "tag": "bash scripts/tag.sh",
@@ -66,7 +67,7 @@
       "order": 80
     },
     "install": {
-      "npmSpec": "@yach.zhiyinlou.com/yach@2.16.0",
+      "npmSpec": "@yach.zhiyinlou.com/yach@2.16.1-beta.1",
       "defaultChoice": "npm",
       "minHostVersion": ">=2026.3.22"
     }